Skip to content

erp5-Boxiang
erp5-Boxiang
Commit 59b7ccce authored by Nicolas Wavrant's avatar Nicolas Wavrant
Browse files
Options

erp5_payroll: adds filtering on ledger for Net Salary Report

parent 1d5ce3d8
Hide whitespace changes
Inline Side-by-side
Showing with 174 additions and 1 deletion
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getNetSalaryReportSectionLineList.py
View file @ 59b7ccce
...@@ -24,6 +24,8 @@ if request.get('from_date'): ...@@ -24,6 +24,8 @@ if request.get('from_date'):
at_date = DateTime(request['at_date']) at_date = DateTime(request['at_date'])
simulation_state = request['simulation_state'] simulation_state = request['simulation_state']
ledger = request.get('ledger', None)
object_list = [] object_list = []
total_price = 0 total_price = 0
...@@ -38,7 +40,8 @@ for inventory in portal.portal_simulation.getInventoryList( ...@@ -38,7 +40,8 @@ for inventory in portal.portal_simulation.getInventoryList(
from_date=from_date, from_date=from_date,
at_date=at_date, at_date=at_date,
group_by_resource=0, group_by_resource=0,
group_by_node=1, ): group_by_node=1,
ledger=ledger, ):
price = inventory.total_price or 0 price = inventory.total_price or 0
total_price += price total_price += price
movement = inventory.getObject() movement = inventory.getObject()
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReport.xml
View file @ 59b7ccce
...@@ -92,6 +92,7 @@ ...@@ -92,6 +92,7 @@
<string>your_at_date</string> <string>your_at_date</string>
<string>your_from_date</string> <string>your_from_date</string>
<string>your_section_category</string> <string>your_section_category</string>
<string>your_ledger</string>
<string>your_simulation_state</string> <string>your_simulation_state</string>
</list> </list>
</value> </value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReport/your_ledger.xml 0 → 100644
View file @ 59b7ccce
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>your_ledger</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>your_ledger</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>AccountModule_viewReportFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReportDialog.xml
View file @ 59b7ccce
...@@ -99,6 +99,7 @@ ...@@ -99,6 +99,7 @@
<value> <value>
<list> <list>
<string>your_simulation_state</string> <string>your_simulation_state</string>
<string>your_ledger</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReportDialog/your_ledger.xml 0 → 100644
View file @ 59b7ccce
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>your_ledger</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>your_ledger</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>AccountModule_viewDialogFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7