Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Noah Brackenbury
erp5
Commits
459922bb
Commit
459922bb
authored
Nov 21, 2013
by
Mame Coumba Sall
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use preferred section category instead of defined one
parent
fe72381d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getPaySheetMovementMirrorSectionItemList.xml
...actionModule_getPaySheetMovementMirrorSectionItemList.xml
+1
-1
product/ERP5/tests/testPayroll.py
product/ERP5/tests/testPayroll.py
+4
-0
No files found.
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getPaySheetMovementMirrorSectionItemList.xml
View file @
459922bb
...
@@ -57,7 +57,7 @@ getobject = portal.portal_catalog.getobject\n
...
@@ -57,7 +57,7 @@ getobject = portal.portal_catalog.getobject\n
for x in portal.portal_simulation.getInventoryList(\n
for x in portal.portal_simulation.getInventoryList(\n
portal_type=(\'Pay Sheet Cell\',\n
portal_type=(\'Pay Sheet Cell\',\n
\'Pay Sheet Line\'),\n
\'Pay Sheet Line\'),\n
section_category=
\'group/demo_group\'
,\n
section_category=
portal.portal_preferences.getPreferredAccountingTransactionSectionCategory()
,\n
group_by_resource=0,\n
group_by_resource=0,\n
group_by_section=0,\n
group_by_section=0,\n
group_by_mirror_section=1):\n
group_by_mirror_section=1):\n
...
...
product/ERP5/tests/testPayroll.py
View file @
459922bb
...
@@ -91,6 +91,10 @@ class TestPayrollMixin(TestTradeModelLineMixin, ERP5ReportTestCase):
...
@@ -91,6 +91,10 @@ class TestPayrollMixin(TestTradeModelLineMixin, ERP5ReportTestCase):
self
.
createCategories
()
self
.
createCategories
()
self
.
fixed_quantity
=
self
.
setBaseAmountQuantityMethod
(
'fixed_quantity'
,
self
.
fixed_quantity
=
self
.
setBaseAmountQuantityMethod
(
'fixed_quantity'
,
"return lambda *args, **kw: 1"
)
"return lambda *args, **kw: 1"
)
default_pref
=
self
.
portal
.
portal_preferences
.
default_site_preference
if
default_pref
.
getPreferenceState
()
==
'disabled'
:
default_pref
.
enable
()
default_pref
.
setPreferredAccountingTransactionSectionCategory
(
'group/demo_group'
)
self
.
setPayrollBaseAmountQuantityMethod
(
"base_amount/payroll/base/contribution"
,
self
.
setPayrollBaseAmountQuantityMethod
(
"base_amount/payroll/base/contribution"
,
"""
\
"""
\
def getBaseAmountQuantity(delivery_amount, base_application,
def getBaseAmountQuantity(delivery_amount, base_application,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment