Commit 2d5188a8 authored by Julien Muchembled's avatar Julien Muchembled

Sync with trunk@37637

Conflicts:
	bt5/erp5_accounting/bt/revision
	bt5/erp5_accounting/bt/template_action_path_list
	bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverDecision_view/my_delivery_title_list.xml
	bt5/erp5_base/bt/revision
	bt5/erp5_dms/bt/revision
	bt5/erp5_simulation/bt/revision
	bt5/erp5_trade/bt/revision
	products/ERP5/Document/SolverProcess.py
	products/ERP5/Document/TradeCondition.py
	products/ERP5/tests/testERP5Simulation.py
	products/ERP5/tests/testOrder.py
	products/ERP5/tests/testTradeModelLine.py

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@38070 20353a03-c40f-0410-a6d1-a30d3c3de9de
parents e03bb1c7 6871941a

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

...@@ -33,7 +33,9 @@ ...@@ -33,7 +33,9 @@
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string></string> </value> <value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>icon</string> </key> <key> <string>icon</string> </key>
...@@ -77,7 +79,7 @@ ...@@ -77,7 +79,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<value> <string>string:${object_url}/SaleTradeCondition_viewProfile</string> </value> <value> <string>string:${object_url}/SaleInvoiceTransaction_viewProfile</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<value> <string>string:${object_url}/SaleTradeCondition_viewProfile</string> </value> <value> <string>string:${object_url}/SaleInvoiceTransaction_viewProfile</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_exchange</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_exchange</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>account_statement_export</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>3.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Account Statement</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="Expression" module="Products.CMFCore.Expression"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string encoding="cdata"><![CDATA[
string:${object_url}/accounting_module/AccountModule_viewAccountStatementReportDialog?mirror_section=${object/getRelativeUrl}&your_portal_skin=ODS&your_format=
]]></string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="Expression" module="Products.CMFCore.Expression"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>python:portal.Base_checkPermission(\'accounting_module\', \'View\')</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_report</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_report</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>account_statement_report</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>3.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Account Statement</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="Expression" module="Products.CMFCore.Expression"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/accounting_module/AccountModule_viewAccountStatementReportDialog?mirror_section=${object/getRelativeUrl}</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="Expression" module="Products.CMFCore.Expression"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>python:portal.Base_checkPermission(\'accounting_module\', \'View\')</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_exchange</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_exchange</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>general_ledger_export</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>2.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>General Ledger</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="Expression" module="Products.CMFCore.Expression"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string encoding="cdata"><![CDATA[
string:${object_url}/accounting_module/AccountModule_viewGeneralLedgerReportDialog?mirror_section=${object/getRelativeUrl}&your_portal_skin=ODS&your_format=
]]></string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="Expression" module="Products.CMFCore.Expression"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>python:portal.Base_checkPermission(\'accounting_module\', \'View\')</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_report</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_report</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>general_ledger_report</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>2.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>General Ledger</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="Expression" module="Products.CMFCore.Expression"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/accounting_module/AccountModule_viewGeneralLedgerReportDialog?mirror_section=${object/getRelativeUrl}</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="Expression" module="Products.CMFCore.Expression"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>python:portal.Base_checkPermission(\'accounting_module\', \'View\')</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -35,7 +35,9 @@ ...@@ -35,7 +35,9 @@
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string></string> </value> <value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>icon</string> </key> <key> <string>icon</string> </key>
...@@ -79,7 +81,7 @@ ...@@ -79,7 +81,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<value> <string>string:${object_url}/PurchaseTradeCondition_viewProfile</string> </value> <value> <string>string:${object_url}/PurchaseInvoiceTransaction_viewProfile</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -35,7 +35,9 @@ ...@@ -35,7 +35,9 @@
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string></string> </value> <value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>icon</string> </key> <key> <string>icon</string> </key>
...@@ -79,7 +81,7 @@ ...@@ -79,7 +81,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<value> <string>string:${object_url}/SaleTradeCondition_viewProfile</string> </value> <value> <string>string:${object_url}/SaleInvoiceTransaction_viewProfile</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_exchange</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_exchange</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>account_statement_export</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>3.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Account Statement</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="Expression" module="Products.CMFCore.Expression"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string encoding="cdata"><![CDATA[
string:${object_url}/accounting_module/AccountModule_viewAccountStatementReportDialog?mirror_section=${object/getRelativeUrl}&your_portal_skin=ODS&your_format=
]]></string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="Expression" module="Products.CMFCore.Expression"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>python:portal.Base_checkPermission(\'accounting_module\', \'View\')</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_report</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_report</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>account_statement_report</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>3.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Account Statement</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="Expression" module="Products.CMFCore.Expression"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/accounting_module/AccountModule_viewAccountStatementReportDialog?mirror_section=${object/getRelativeUrl}</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="Expression" module="Products.CMFCore.Expression"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>python:portal.Base_checkPermission(\'accounting_module\', \'View\')</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_exchange</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_exchange</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>general_ledger_export</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>2.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>General Ledger</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="Expression" module="Products.CMFCore.Expression"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string encoding="cdata"><![CDATA[
string:${object_url}/accounting_module/AccountModule_viewGeneralLedgerReportDialog?mirror_section=${object/getRelativeUrl}&your_portal_skin=ODS&your_format=
]]></string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="Expression" module="Products.CMFCore.Expression"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>python:portal.Base_checkPermission(\'accounting_module\', \'View\')</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_report</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_report</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>general_ledger_report</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>2.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>General Ledger</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="Expression" module="Products.CMFCore.Expression"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/accounting_module/AccountModule_viewGeneralLedgerReportDialog?mirror_section=${object/getRelativeUrl}</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="Expression" module="Products.CMFCore.Expression"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>python:portal.Base_checkPermission(\'accounting_module\', \'View\')</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -33,7 +33,9 @@ ...@@ -33,7 +33,9 @@
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string></string> </value> <value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>icon</string> </key> <key> <string>icon</string> </key>
...@@ -77,7 +79,7 @@ ...@@ -77,7 +79,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<value> <string>string:${object_url}/PurchaseTradeCondition_viewProfile</string> </value> <value> <string>string:${object_url}/PurchaseInvoiceTransaction_viewProfile</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -33,7 +33,9 @@ ...@@ -33,7 +33,9 @@
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string></string> </value> <value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>icon</string> </key> <key> <string>icon</string> </key>
...@@ -77,7 +79,7 @@ ...@@ -77,7 +79,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<value> <string>string:${object_url}/SaleTradeCondition_viewProfile</string> </value> <value> <string>string:${object_url}/SaleInvoiceTransaction_viewProfile</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -173,7 +173,7 @@ def getAnalyticTitleFromUid(uid):\n ...@@ -173,7 +173,7 @@ def getAnalyticTitleFromUid(uid):\n
for node in getInventoryList(\n for node in getInventoryList(\n
node_category_strict_membership=account_type_to_group_by_node,\n node_category_strict_membership=account_type_to_group_by_node,\n
group_by_node=1,\n group_by_node=1,\n
omit_output=1,\n omit_asset_decrease=1,\n
from_date=from_date,\n from_date=from_date,\n
at_date=at_date,\n at_date=at_date,\n
portal_type=accounting_movement_type_list,\n portal_type=accounting_movement_type_list,\n
...@@ -187,7 +187,7 @@ for node in getInventoryList(\n ...@@ -187,7 +187,7 @@ for node in getInventoryList(\n
for node in getInventoryList(\n for node in getInventoryList(\n
node_category_strict_membership=account_type_to_group_by_node,\n node_category_strict_membership=account_type_to_group_by_node,\n
group_by_node=1,\n group_by_node=1,\n
omit_input=1,\n omit_asset_increase=1,\n
from_date=from_date,\n from_date=from_date,\n
at_date=at_date,\n at_date=at_date,\n
portal_type=accounting_movement_type_list,\n portal_type=accounting_movement_type_list,\n
...@@ -204,7 +204,7 @@ for node in getInventoryList(\n ...@@ -204,7 +204,7 @@ for node in getInventoryList(\n
node_category=profit_and_loss_account_type,\n node_category=profit_and_loss_account_type,\n
from_date=max(period_start_date, from_date),\n from_date=max(period_start_date, from_date),\n
group_by_node=1,\n group_by_node=1,\n
omit_output=1,\n omit_asset_decrease=1,\n
at_date=at_date,\n at_date=at_date,\n
portal_type=accounting_movement_type_list,\n portal_type=accounting_movement_type_list,\n
**inventory_params):\n **inventory_params):\n
...@@ -218,7 +218,7 @@ for node in getInventoryList(\n ...@@ -218,7 +218,7 @@ for node in getInventoryList(\n
node_category=profit_and_loss_account_type,\n node_category=profit_and_loss_account_type,\n
from_date=max(period_start_date, from_date),\n from_date=max(period_start_date, from_date),\n
group_by_node=1,\n group_by_node=1,\n
omit_input=1,\n omit_asset_increase=1,\n
at_date=at_date,\n at_date=at_date,\n
portal_type=accounting_movement_type_list,\n portal_type=accounting_movement_type_list,\n
**inventory_params):\n **inventory_params):\n
...@@ -236,7 +236,7 @@ if account_type_to_group_by_mirror_section:\n ...@@ -236,7 +236,7 @@ if account_type_to_group_by_mirror_section:\n
account_type_to_group_by_mirror_section,\n account_type_to_group_by_mirror_section,\n
group_by_mirror_section=1,\n group_by_mirror_section=1,\n
group_by_node=1,\n group_by_node=1,\n
omit_output=1,\n omit_asset_decrease=1,\n
from_date=from_date,\n from_date=from_date,\n
at_date=at_date,\n at_date=at_date,\n
portal_type=accounting_movement_type_list,\n portal_type=accounting_movement_type_list,\n
...@@ -254,7 +254,7 @@ if account_type_to_group_by_mirror_section:\n ...@@ -254,7 +254,7 @@ if account_type_to_group_by_mirror_section:\n
account_type_to_group_by_mirror_section,\n account_type_to_group_by_mirror_section,\n
group_by_mirror_section=1,\n group_by_mirror_section=1,\n
group_by_node=1,\n group_by_node=1,\n
omit_input=1,\n omit_asset_increase=1,\n
from_date=from_date,\n from_date=from_date,\n
at_date=at_date,\n at_date=at_date,\n
portal_type=accounting_movement_type_list,\n portal_type=accounting_movement_type_list,\n
...@@ -275,7 +275,7 @@ if account_type_to_group_by_payment:\n ...@@ -275,7 +275,7 @@ if account_type_to_group_by_payment:\n
account_type_to_group_by_payment,\n account_type_to_group_by_payment,\n
group_by_payment=1,\n group_by_payment=1,\n
group_by_node=1,\n group_by_node=1,\n
omit_output=1,\n omit_asset_decrease=1,\n
from_date=from_date,\n from_date=from_date,\n
at_date=at_date,\n at_date=at_date,\n
portal_type=accounting_movement_type_list,\n portal_type=accounting_movement_type_list,\n
...@@ -293,7 +293,7 @@ if account_type_to_group_by_payment:\n ...@@ -293,7 +293,7 @@ if account_type_to_group_by_payment:\n
account_type_to_group_by_payment,\n account_type_to_group_by_payment,\n
group_by_payment=1,\n group_by_payment=1,\n
group_by_node=1,\n group_by_node=1,\n
omit_input=1,\n omit_asset_increase=1,\n
from_date=from_date,\n from_date=from_date,\n
at_date=at_date,\n at_date=at_date,\n
portal_type=accounting_movement_type_list,\n portal_type=accounting_movement_type_list,\n
...@@ -387,7 +387,7 @@ for node in getInventoryList(\n ...@@ -387,7 +387,7 @@ for node in getInventoryList(\n
node_category_strict_membership=\n node_category_strict_membership=\n
account_type_to_group_by_node,\n account_type_to_group_by_node,\n
group_by_node=1,\n group_by_node=1,\n
omit_output=1,\n omit_asset_decrease=1,\n
from_date=period_start_date,\n from_date=period_start_date,\n
to_date=from_date,\n to_date=from_date,\n
portal_type=period_movement_type_list,\n portal_type=period_movement_type_list,\n
...@@ -401,7 +401,7 @@ for node in getInventoryList(\n ...@@ -401,7 +401,7 @@ for node in getInventoryList(\n
node_category_strict_membership=\n node_category_strict_membership=\n
account_type_to_group_by_node,\n account_type_to_group_by_node,\n
group_by_node=1,\n group_by_node=1,\n
omit_input=1,\n omit_asset_increase=1,\n
from_date=period_start_date,\n from_date=period_start_date,\n
to_date=from_date,\n to_date=from_date,\n
portal_type=period_movement_type_list,\n portal_type=period_movement_type_list,\n
...@@ -415,7 +415,7 @@ for node in getInventoryList(\n ...@@ -415,7 +415,7 @@ for node in getInventoryList(\n
### profit & loss accounts {{{\n ### profit & loss accounts {{{\n
for node in getInventoryList(\n for node in getInventoryList(\n
node_category=profit_and_loss_account_type,\n node_category=profit_and_loss_account_type,\n
omit_output=1,\n omit_asset_decrease=1,\n
from_date=min(period_start_date,\n from_date=min(period_start_date,\n
initial_balance_date),\n initial_balance_date),\n
at_date=initial_balance_date,\n at_date=initial_balance_date,\n
...@@ -429,7 +429,7 @@ for node in getInventoryList(\n ...@@ -429,7 +429,7 @@ for node in getInventoryList(\n
\n \n
for node in getInventoryList(\n for node in getInventoryList(\n
node_category=profit_and_loss_account_type,\n node_category=profit_and_loss_account_type,\n
omit_input=1,\n omit_asset_increase=1,\n
from_date=min(period_start_date,\n from_date=min(period_start_date,\n
initial_balance_date),\n initial_balance_date),\n
at_date=initial_balance_date,\n at_date=initial_balance_date,\n
...@@ -505,7 +505,7 @@ if expand_accounts:\n ...@@ -505,7 +505,7 @@ if expand_accounts:\n
account_type_to_group_by_mirror_section,\n account_type_to_group_by_mirror_section,\n
group_by_mirror_section=1,\n group_by_mirror_section=1,\n
group_by_node=1,\n group_by_node=1,\n
omit_output=1,\n omit_asset_decrease=1,\n
from_date=period_start_date,\n from_date=period_start_date,\n
to_date=from_date,\n to_date=from_date,\n
portal_type=period_movement_type_list,\n portal_type=period_movement_type_list,\n
...@@ -522,7 +522,7 @@ if expand_accounts:\n ...@@ -522,7 +522,7 @@ if expand_accounts:\n
account_type_to_group_by_mirror_section,\n account_type_to_group_by_mirror_section,\n
group_by_mirror_section=1,\n group_by_mirror_section=1,\n
group_by_node=1,\n group_by_node=1,\n
omit_input=1,\n omit_asset_increase=1,\n
from_date=period_start_date,\n from_date=period_start_date,\n
to_date=from_date,\n to_date=from_date,\n
portal_type=period_movement_type_list,\n portal_type=period_movement_type_list,\n
...@@ -587,7 +587,7 @@ if account_type_to_group_by_payment:\n ...@@ -587,7 +587,7 @@ if account_type_to_group_by_payment:\n
account_type_to_group_by_payment,\n account_type_to_group_by_payment,\n
group_by_payment=1,\n group_by_payment=1,\n
group_by_node=1,\n group_by_node=1,\n
omit_output=1,\n omit_asset_decrease=1,\n
from_date=period_start_date,\n from_date=period_start_date,\n
to_date=from_date,\n to_date=from_date,\n
portal_type=period_movement_type_list,\n portal_type=period_movement_type_list,\n
...@@ -605,7 +605,7 @@ if account_type_to_group_by_payment:\n ...@@ -605,7 +605,7 @@ if account_type_to_group_by_payment:\n
account_type_to_group_by_payment,\n account_type_to_group_by_payment,\n
group_by_payment=1,\n group_by_payment=1,\n
group_by_node=1,\n group_by_node=1,\n
omit_input=1,\n omit_asset_increase=1,\n
from_date=period_start_date,\n from_date=period_start_date,\n
to_date=from_date,\n to_date=from_date,\n
portal_type=period_movement_type_list,\n portal_type=period_movement_type_list,\n
......
...@@ -55,8 +55,8 @@ ...@@ -55,8 +55,8 @@
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>portal = context.getPortalObject()\n <value> <string>portal = context.getPortalObject()\n
params = portal.ERP5Accounting_getParams(selection_name)\n params = portal.ERP5Accounting_getParams(selection_name)\n
params[\'omit_input\'] = omit_input\n params[\'omit_asset_increase\'] = omit_asset_increase\n
params[\'omit_output\'] = omit_output\n params[\'omit_asset_decrease\'] = omit_asset_decrease\n
# For now, we omit simulation to be compatible with other reports.\n # For now, we omit simulation to be compatible with other reports.\n
params[\'omit_simulation\'] = True\n params[\'omit_simulation\'] = True\n
\n \n
...@@ -73,7 +73,7 @@ return portal.portal_simulation.getInventoryAssetPrice(\n ...@@ -73,7 +73,7 @@ return portal.portal_simulation.getInventoryAssetPrice(\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>brain=None, selection=None, omit_input=0, omit_output=0, selection_name=None, **kw</string> </value> <value> <string>brain=None, selection=None, omit_asset_increase=0, omit_asset_decrease=0, selection_name=None, **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -101,8 +101,8 @@ return portal.portal_simulation.getInventoryAssetPrice(\n ...@@ -101,8 +101,8 @@ return portal.portal_simulation.getInventoryAssetPrice(\n
<tuple> <tuple>
<string>brain</string> <string>brain</string>
<string>selection</string> <string>selection</string>
<string>omit_input</string> <string>omit_asset_increase</string>
<string>omit_output</string> <string>omit_asset_decrease</string>
<string>selection_name</string> <string>selection_name</string>
<string>kw</string> <string>kw</string>
<string>_getattr_</string> <string>_getattr_</string>
......
...@@ -74,9 +74,11 @@ hide_analytic = request[\'hide_analytic\']\n ...@@ -74,9 +74,11 @@ hide_analytic = request[\'hide_analytic\']\n
from_date = request.get(\'from_date\', None)\n from_date = request.get(\'from_date\', None)\n
mirror_section_category_list = request.get(\'mirror_section_category_list\',\n mirror_section_category_list = request.get(\'mirror_section_category_list\',\n
None)\n None)\n
mirror_section = request.get(\'mirror_section\', None)\n
\n
gap_list = []\n gap_list = []\n
for gap in request.get(\'gap_list\', ()):\n for gap in request.get(\'gap_list\', ()):\n
# XXX the field should maybe use base=1 on the category...\n # XXX the field should maybe use base=1 on the category, but it is also used in other contexts\n
gap_list.append(\'gap/%s\' % gap)\n gap_list.append(\'gap/%s\' % gap)\n
\n \n
display_categories = request.get(\'display_categories\', False)\n display_categories = request.get(\'display_categories\', False)\n
...@@ -112,6 +114,9 @@ if function:\n ...@@ -112,6 +114,9 @@ if function:\n
params[\'function_uid\'] = Query(function_uid=None)\n params[\'function_uid\'] = Query(function_uid=None)\n
else:\n else:\n
params[\'function_uid\'] = portal.portal_categories.restrictedTraverse(function).getUid()\n params[\'function_uid\'] = portal.portal_categories.restrictedTraverse(function).getUid()\n
if mirror_section:\n
mirror_section_uid = portal.restrictedTraverse(mirror_section).getUid()\n
params[\'mirror_section_uid\'] = mirror_section_uid\n
\n \n
default_selection_params = params.copy()\n default_selection_params = params.copy()\n
\n \n
...@@ -234,7 +239,7 @@ for inventory in portal.portal_simulation.getInventoryList(\n ...@@ -234,7 +239,7 @@ for inventory in portal.portal_simulation.getInventoryList(\n
selection_params[\'at_date\'] = at_date\n selection_params[\'at_date\'] = at_date\n
selection_params[\'node_uid\'] = inventory.node_uid\n selection_params[\'node_uid\'] = inventory.node_uid\n
selection_params[\'payment_uid\'] = None\n selection_params[\'payment_uid\'] = None\n
selection_params[\'mirror_section_uid\'] = None\n selection_params.setdefault(\'mirror_section_uid\', None)\n
report_section_list.append(\n report_section_list.append(\n
ReportSection(\n ReportSection(\n
path=inventory.node_relative_url,\n path=inventory.node_relative_url,\n
...@@ -267,7 +272,7 @@ for inventory in portal.portal_simulation.getInventoryList(\n ...@@ -267,7 +272,7 @@ for inventory in portal.portal_simulation.getInventoryList(\n
selection_params[\'at_date\'] = at_date\n selection_params[\'at_date\'] = at_date\n
selection_params[\'node_uid\'] = inventory.node_uid\n selection_params[\'node_uid\'] = inventory.node_uid\n
selection_params[\'payment_uid\'] = None\n selection_params[\'payment_uid\'] = None\n
selection_params[\'mirror_section_uid\'] = None\n selection_params.setdefault(\'mirror_section_uid\', None)\n
report_section_list.append(\n report_section_list.append(\n
ReportSection(\n ReportSection(\n
path=inventory.node_relative_url,\n path=inventory.node_relative_url,\n
...@@ -297,7 +302,7 @@ for inventory in portal.portal_simulation.getInventoryList(\n ...@@ -297,7 +302,7 @@ for inventory in portal.portal_simulation.getInventoryList(\n
selection_params[\'period_start_date\'] = max(from_date, period_start_date)\n selection_params[\'period_start_date\'] = max(from_date, period_start_date)\n
selection_params[\'node_uid\'] = inventory.node_uid\n selection_params[\'node_uid\'] = inventory.node_uid\n
selection_params[\'payment_uid\'] = None\n selection_params[\'payment_uid\'] = None\n
selection_params[\'mirror_section_uid\'] = None\n selection_params.setdefault(\'mirror_section_uid\', None)\n
report_section_list.append(\n report_section_list.append(\n
ReportSection(\n ReportSection(\n
path=inventory.node_relative_url,\n path=inventory.node_relative_url,\n
...@@ -394,7 +399,7 @@ for inventory in portal.portal_simulation.getInventoryList(\n ...@@ -394,7 +399,7 @@ for inventory in portal.portal_simulation.getInventoryList(\n
selection_params[\'at_date\'] = at_date\n selection_params[\'at_date\'] = at_date\n
selection_params[\'node_uid\'] = inventory.node_uid\n selection_params[\'node_uid\'] = inventory.node_uid\n
selection_params[\'payment_uid\'] = inventory.payment_uid\n selection_params[\'payment_uid\'] = inventory.payment_uid\n
selection_params[\'mirror_section_uid\'] = None\n selection_params.setdefault(\'mirror_section_uid\', None)\n
report_section_list.append(\n report_section_list.append(\n
ReportSection(\n ReportSection(\n
path=inventory.node_relative_url,\n path=inventory.node_relative_url,\n
...@@ -427,7 +432,7 @@ for inventory in portal.portal_simulation.getInventoryList(\n ...@@ -427,7 +432,7 @@ for inventory in portal.portal_simulation.getInventoryList(\n
selection_params[\'at_date\'] = at_date\n selection_params[\'at_date\'] = at_date\n
selection_params[\'node_uid\'] = inventory.node_uid\n selection_params[\'node_uid\'] = inventory.node_uid\n
selection_params[\'payment_uid\'] = inventory.payment_uid\n selection_params[\'payment_uid\'] = inventory.payment_uid\n
selection_params[\'mirror_section_uid\'] = None\n selection_params.setdefault(\'mirror_section_uid\', None)\n
report_section_list.append(\n report_section_list.append(\n
ReportSection(\n ReportSection(\n
path=inventory.node_relative_url,\n path=inventory.node_relative_url,\n
...@@ -508,6 +513,7 @@ return report_section_list\n ...@@ -508,6 +513,7 @@ return report_section_list\n
<string>None</string> <string>None</string>
<string>from_date</string> <string>from_date</string>
<string>mirror_section_category_list</string> <string>mirror_section_category_list</string>
<string>mirror_section</string>
<string>gap_list</string> <string>gap_list</string>
<string>_getiter_</string> <string>_getiter_</string>
<string>gap</string> <string>gap</string>
...@@ -523,6 +529,7 @@ return report_section_list\n ...@@ -523,6 +529,7 @@ return report_section_list\n
<string>params</string> <string>params</string>
<string>project</string> <string>project</string>
<string>function</string> <string>function</string>
<string>mirror_section_uid</string>
<string>default_selection_params</string> <string>default_selection_params</string>
<string>analytic_column_list</string> <string>analytic_column_list</string>
<string>account_columns</string> <string>account_columns</string>
......
...@@ -67,17 +67,19 @@ if project_uid:\n ...@@ -67,17 +67,19 @@ if project_uid:\n
inventory_kw[\'project_uid\'] = project_uid\n inventory_kw[\'project_uid\'] = project_uid\n
if mirror_section_category:\n if mirror_section_category:\n
inventory_kw[\'mirror_section_category\'] = mirror_section_category\n inventory_kw[\'mirror_section_category\'] = mirror_section_category\n
if mirror_section_uid:\n
inventory_kw[\'mirror_section_uid\'] = mirror_section_uid\n
\n \n
if node_category:\n if node_category:\n
# XXX if node category is passed, income or balance accounts are not\n # XXX if node category is passed, income or balance accounts are not\n
# calculated differently. As a result, the summary doesn\'t take from_date\n # calculated differently. As a result, the summary doesn\'t take from_date\n
# into account for income accounts.\n # into account for income accounts.\n
return [Object(\n return [Object(\n
debit_price=getInventoryAssetPrice(omit_output=1,\n debit_price=getInventoryAssetPrice(omit_asset_decrease=1,\n
node_category=node_category,\n node_category=node_category,\n
precision=precision,\n precision=precision,\n
**inventory_kw),\n **inventory_kw),\n
credit_price=-getInventoryAssetPrice(omit_input=1,\n credit_price=-getInventoryAssetPrice(omit_asset_increase=1,\n
node_category=node_category,\n node_category=node_category,\n
precision=precision,\n precision=precision,\n
**inventory_kw) or 0 ) ]\n **inventory_kw) or 0 ) ]\n
...@@ -86,24 +88,24 @@ income_node_category = [\'account_type/income\', \'account_type/expense\']\n ...@@ -86,24 +88,24 @@ income_node_category = [\'account_type/income\', \'account_type/expense\']\n
balance_node_category = [\'account_type/equity\', \'account_type/asset\',\n balance_node_category = [\'account_type/equity\', \'account_type/asset\',\n
\'account_type/liability\']\n \'account_type/liability\']\n
\n \n
debit = getInventoryAssetPrice(omit_output=1,\n debit = getInventoryAssetPrice(omit_asset_decrease=1,\n
from_date=period_start_date,\n from_date=period_start_date,\n
node_category=income_node_category,\n node_category=income_node_category,\n
precision=precision,\n precision=precision,\n
**inventory_kw)\n **inventory_kw)\n
\n \n
credit = - getInventoryAssetPrice(omit_input=1,\n credit = - getInventoryAssetPrice(omit_asset_increase=1,\n
from_date=period_start_date,\n from_date=period_start_date,\n
node_category=income_node_category,\n node_category=income_node_category,\n
precision=precision,\n precision=precision,\n
**inventory_kw) or 0\n **inventory_kw) or 0\n
\n \n
debit += getInventoryAssetPrice(omit_output=1,\n debit += getInventoryAssetPrice(omit_asset_decrease=1,\n
node_category=balance_node_category,\n node_category=balance_node_category,\n
precision=precision,\n precision=precision,\n
**inventory_kw)\n **inventory_kw)\n
\n \n
credit -= getInventoryAssetPrice(omit_input=1,\n credit -= getInventoryAssetPrice(omit_asset_increase=1,\n
node_category=balance_node_category,\n node_category=balance_node_category,\n
precision=precision,\n precision=precision,\n
**inventory_kw) or 0\n **inventory_kw) or 0\n
...@@ -119,7 +121,7 @@ return [Object(debit_price=debit, credit_price=credit)]\n ...@@ -119,7 +121,7 @@ return [Object(debit_price=debit, credit_price=credit)]\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>section_uid, simulation_state, at_date, period_start_date, precision, node_category=None, function_uid=None, project_uid=None, from_date=\'ignored\', mirror_section_category=None, **kw</string> </value> <value> <string>section_uid, simulation_state, at_date, period_start_date, precision, node_category=None, function_uid=None, project_uid=None, from_date=\'ignored\', mirror_section_category=None, mirror_section_uid=None, **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -139,7 +141,7 @@ return [Object(debit_price=debit, credit_price=credit)]\n ...@@ -139,7 +141,7 @@ return [Object(debit_price=debit, credit_price=credit)]\n
<dictionary> <dictionary>
<item> <item>
<key> <string>co_argcount</string> </key> <key> <string>co_argcount</string> </key>
<value> <int>10</int> </value> <value> <int>11</int> </value>
</item> </item>
<item> <item>
<key> <string>co_varnames</string> </key> <key> <string>co_varnames</string> </key>
...@@ -155,6 +157,7 @@ return [Object(debit_price=debit, credit_price=credit)]\n ...@@ -155,6 +157,7 @@ return [Object(debit_price=debit, credit_price=credit)]\n
<string>project_uid</string> <string>project_uid</string>
<string>from_date</string> <string>from_date</string>
<string>mirror_section_category</string> <string>mirror_section_category</string>
<string>mirror_section_uid</string>
<string>kw</string> <string>kw</string>
<string>Products.PythonScripts.standard</string> <string>Products.PythonScripts.standard</string>
<string>Object</string> <string>Object</string>
...@@ -187,6 +190,7 @@ return [Object(debit_price=debit, credit_price=credit)]\n ...@@ -187,6 +190,7 @@ return [Object(debit_price=debit, credit_price=credit)]\n
<none/> <none/>
<string>ignored</string> <string>ignored</string>
<none/> <none/>
<none/>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>return - context.AccountModule_getBalance(brain=brain, selection=selection, omit_input=1, **kw) or 0.00\n <value> <string>return - context.AccountModule_getBalance(brain=brain, selection=selection, omit_asset_increase=1, **kw) or 0.00\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>return context.AccountModule_getBalance(brain, selection, omit_output=1, **kw)\n <value> <string>return context.AccountModule_getBalance(brain, selection, omit_asset_decrease=1, **kw)\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
......
...@@ -57,8 +57,8 @@ ...@@ -57,8 +57,8 @@
params = portal.ERP5Accounting_getParams(selection_name)\n params = portal.ERP5Accounting_getParams(selection_name)\n
selection_params = context.portal_selections.getSelectionParamsFor(selection_name)\n selection_params = context.portal_selections.getSelectionParamsFor(selection_name)\n
\n \n
params[\'omit_input\'] = omit_input\n params[\'omit_asset_increase\'] = omit_asset_increase\n
params[\'omit_output\'] = omit_output\n params[\'omit_asset_decrease\'] = omit_asset_decrease\n
# For now, we omit simulation to be compatible with other reports.\n # For now, we omit simulation to be compatible with other reports.\n
params[\'omit_simulation\'] = True\n params[\'omit_simulation\'] = True\n
\n \n
...@@ -94,7 +94,7 @@ return portal.portal_simulation.getInventoryAssetPrice( **params )\n ...@@ -94,7 +94,7 @@ return portal.portal_simulation.getInventoryAssetPrice( **params )\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>brain=None, selection=None, omit_input=0, omit_output=0, selection_name=None, **kw</string> </value> <value> <string>brain=None, selection=None, omit_asset_increase=0, omit_asset_decrease=0, selection_name=None, **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -122,8 +122,8 @@ return portal.portal_simulation.getInventoryAssetPrice( **params )\n ...@@ -122,8 +122,8 @@ return portal.portal_simulation.getInventoryAssetPrice( **params )\n
<tuple> <tuple>
<string>brain</string> <string>brain</string>
<string>selection</string> <string>selection</string>
<string>omit_input</string> <string>omit_asset_increase</string>
<string>omit_output</string> <string>omit_asset_decrease</string>
<string>selection_name</string> <string>selection_name</string>
<string>kw</string> <string>kw</string>
<string>_getattr_</string> <string>_getattr_</string>
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>return - context.AccountModule_statBalance(brain=brain, selection_name=selection_name, omit_input=1, **kw) or 0\n <value> <string>return - context.AccountModule_statBalance(brain=brain, selection_name=selection_name, omit_asset_increase=1, **kw) or 0\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>return context.AccountModule_statBalance(brain=brain, selection_name=selection_name, omit_output=1, float_value=1, **kw)\n <value> <string>return context.AccountModule_statBalance(brain=brain, selection_name=selection_name, omit_asset_decrease=1, float_value=1, **kw)\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
......
...@@ -78,7 +78,6 @@ ...@@ -78,7 +78,6 @@
<value> <value>
<list> <list>
<string>your_node</string> <string>your_node</string>
<string>your_mirror_section</string>
<string>your_payment</string> <string>your_payment</string>
</list> </list>
</value> </value>
...@@ -105,6 +104,7 @@ ...@@ -105,6 +104,7 @@
<string>your_portal_skin</string> <string>your_portal_skin</string>
<string>your_format</string> <string>your_format</string>
<string>your_deferred_style</string> <string>your_deferred_style</string>
<string>your_mirror_section</string>
</list> </list>
</value> </value>
</item> </item>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <tuple>
<global name="ListField" module="Products.Formulator.StandardFields"/> <global name="StringField" module="Products.Formulator.StandardFields"/>
<tuple/> <tuple/>
</tuple> </tuple>
</pickle> </pickle>
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
<value> <string>Input is required but no input given.</string> </value> <value> <string>Input is required but no input given.</string> </value>
</item> </item>
<item> <item>
<key> <string>unknown_selection</string> </key> <key> <string>too_long</string> </key>
<value> <string>You selected an item that was not in the list.</string> </value> <value> <string>Too much input was given.</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
...@@ -53,27 +53,27 @@ ...@@ -53,27 +53,27 @@
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>editable</string> </key> <key> <string>display_maxwidth</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>display_width</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>external_validator</string> </key> <key> <string>editable</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>extra</string> </key> <key> <string>enabled</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>extra_item</string> </key> <key> <string>external_validator</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>first_item</string> </key> <key> <string>extra</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>items</string> </key> <key> <string>max_length</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
...@@ -89,11 +89,11 @@ ...@@ -89,11 +89,11 @@
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>size</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>truncate</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
...@@ -130,27 +130,27 @@ ...@@ -130,27 +130,27 @@
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>editable</string> </key> <key> <string>display_maxwidth</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>display_width</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>external_validator</string> </key> <key> <string>editable</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>extra</string> </key> <key> <string>enabled</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>extra_item</string> </key> <key> <string>external_validator</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>first_item</string> </key> <key> <string>extra</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
...@@ -158,21 +158,21 @@ ...@@ -158,21 +158,21 @@
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>items</string> </key> <key> <string>max_length</string> </key>
<value> <value> <string></string> </value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>required</string> </key> <key> <string>required</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>size</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>truncate</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
...@@ -206,6 +206,14 @@ ...@@ -206,6 +206,14 @@
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>display_maxwidth</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_width</string> </key>
<value> <int>20</int> </value>
</item>
<item> <item>
<key> <string>editable</string> </key> <key> <string>editable</string> </key>
<value> <int>1</int> </value> <value> <int>1</int> </value>
...@@ -222,35 +230,25 @@ ...@@ -222,35 +230,25 @@
<key> <string>extra</string> </key> <key> <string>extra</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>extra_item</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>first_item</string> </key>
<value> <int>0</int> </value>
</item>
<item> <item>
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <int>0</int> </value> <value> <int>1</int> </value>
</item> </item>
<item> <item>
<key> <string>items</string> </key> <key> <string>max_length</string> </key>
<value> <value> <string></string> </value>
<list/>
</value>
</item> </item>
<item> <item>
<key> <string>required</string> </key> <key> <string>required</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item> <item>
<key> <string>size</string> </key> <key> <string>title</string> </key>
<value> <int>1</int> </value> <value> <string>(tales)</string> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>truncate</string> </key>
<value> <string>Third Party</string> </value> <value> <int>0</int> </value>
</item> </item>
<item> <item>
<key> <string>unicode</string> </key> <key> <string>unicode</string> </key>
...@@ -277,7 +275,7 @@ ...@@ -277,7 +275,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python:request.get(\'destination_section\', \'\')</string> </value> <value> <string>request/mirror_section | nothing</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -293,7 +291,7 @@ ...@@ -293,7 +291,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python:here.Account_getDestinationSectionItemList(account=request.get(\'your_node\', \'\'), section_category=request.get(\'your_section_category\', preferences.getPreferredAccountingTransactionSectionCategory()), section_category_strict_membership=request.get(\'your_section_category_strict\'))</string> </value> <value> <string>string:</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -94,6 +94,7 @@ ...@@ -94,6 +94,7 @@
<string>your_format</string> <string>your_format</string>
<string>your_deferred_style</string> <string>your_deferred_style</string>
<string>your_landscape</string> <string>your_landscape</string>
<string>your_mirror_section</string>
</list> </list>
</value> </value>
</item> </item>
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
account as node\n account as node\n
"""\n """\n
kw[\'node_uid\'] = context.getUid()\n kw[\'node_uid\'] = context.getUid()\n
kw[\'omit_input\'] = 1\n kw[\'omit_asset_increase\'] = 1\n
kw.update(kw[\'selection\'].getParams())\n kw.update(kw[\'selection\'].getParams())\n
\n \n
# here, or 0 is to prevent displaying "- 0"\n # here, or 0 is to prevent displaying "- 0"\n
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
account as a node\n account as a node\n
"""\n """\n
kw[\'node_uid\'] = context.getUid()\n kw[\'node_uid\'] = context.getUid()\n
kw[\'omit_output\'] = 1\n kw[\'omit_asset_decrease\'] = 1\n
kw.update(kw[\'selection\'].getParams())\n kw.update(kw[\'selection\'].getParams())\n
\n \n
return context.Node_statAccountingBalance(**kw)\n return context.Node_statAccountingBalance(**kw)\n
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
\n \n
section = context\n section = context\n
while section.getPortalType() != \'Organisation\':\n while section.getPortalType() != \'Organisation\':\n
section = context.getParentValue()\n section = section.getParentValue()\n
\n \n
context.accounting_module.newContent(\n context.accounting_module.newContent(\n
portal_type=\'Balance Transaction\',\n portal_type=\'Balance Transaction\',\n
......
...@@ -94,7 +94,6 @@ ...@@ -94,7 +94,6 @@
<value> <value>
<list> <list>
<string>my_source_section</string> <string>my_source_section</string>
<string>my_source_reference</string>
<string>my_title</string> <string>my_title</string>
<string>my_destination_section_title</string> <string>my_destination_section_title</string>
<string>my_reference</string> <string>my_reference</string>
......
...@@ -240,7 +240,7 @@ ...@@ -240,7 +240,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Transaction Reference</string> </value> <value> <string>Document Reference</string> </value>
</item> </item>
<item> <item>
<key> <string>truncate</string> </key> <key> <string>truncate</string> </key>
......
...@@ -94,7 +94,6 @@ ...@@ -94,7 +94,6 @@
<value> <value>
<list> <list>
<string>my_source_section</string> <string>my_source_section</string>
<string>my_source_reference</string>
<string>my_title</string> <string>my_title</string>
<string>my_destination_section_title</string> <string>my_destination_section_title</string>
<string>my_reference</string> <string>my_reference</string>
......
...@@ -240,7 +240,7 @@ ...@@ -240,7 +240,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Transaction Reference</string> </value> <value> <string>Document Reference</string> </value>
</item> </item>
<item> <item>
<key> <string>truncate</string> </key> <key> <string>truncate</string> </key>
......
...@@ -59,9 +59,34 @@ request = context.REQUEST\n ...@@ -59,9 +59,34 @@ request = context.REQUEST\n
portal = context.getPortalObject()\n portal = context.getPortalObject()\n
portal_selections = portal.portal_selections\n portal_selections = portal.portal_selections\n
selection_name = \'accounting_selection\'\n selection_name = \'accounting_selection\'\n
selection_params = portal_selections.getSelectionParamsFor(selection_name)\n
\n
section_category = selection_params.get(\'section_category\')\n
section_category_strict = selection_params.get(\'section_category_strict\')\n
\n
def isSource(accounting_transaction):\n
if section_category:\n
source_section = accounting_transaction.getSourceSectionValue()\n
if source_section is None:\n
return False\n
group = source_section.getGroup(base=True)\n
if section_category_strict:\n
return group == section_category\n
return group.startswith(section_category)\n
return accounting_transaction.AccountingTransaction_isSourceView()\n
\n
def isDestination(accounting_transaction):\n
if section_category:\n
destination_section = accounting_transaction.getDestinationSectionValue()\n
if destination_section is None:\n
return False\n
group = destination_section.getGroup(base=True)\n
if section_category_strict:\n
return group == section_category\n
return group.startswith(section_category)\n
return accounting_transaction.AccountingTransaction_isDestinationView()\n
\n
\n \n
section_category = \\\n
portal_selections.getSelectionParamsFor(selection_name).get(\'section_category\')\n
if section_category:\n if section_category:\n
currency = portal.Base_getCurrencyForSection(section_category)\n currency = portal.Base_getCurrencyForSection(section_category)\n
request.set(\'currency\', currency)\n request.set(\'currency\', currency)\n
...@@ -135,7 +160,8 @@ def getAccountingCurrencyReference(section_relative_url):\n ...@@ -135,7 +160,8 @@ def getAccountingCurrencyReference(section_relative_url):\n
portal_type = context.getPortalAccountingMovementTypeList()\n portal_type = context.getPortalAccountingMovementTypeList()\n
for delivery in delivery_list:\n for delivery in delivery_list:\n
delivery = delivery.getObject()\n delivery = delivery.getObject()\n
is_source = delivery.AccountingTransaction_isSourceView()\n is_source = isSource(delivery)\n
is_destination = isDestination(delivery)\n
\n \n
for movement in delivery.getMovementList(portal_type=portal_type):\n for movement in delivery.getMovementList(portal_type=portal_type):\n
\n \n
...@@ -150,7 +176,7 @@ for delivery in delivery_list:\n ...@@ -150,7 +176,7 @@ for delivery in delivery_list:\n
node_financial_section_title = \\\n node_financial_section_title = \\\n
node.getFinancialSectionTranslatedTitle()\n node.getFinancialSectionTranslatedTitle()\n
\n \n
line_list.append(Object(\n line_list.append(Object(\n
title=movement.hasTitle() and movement.getTitle() or\n title=movement.hasTitle() and movement.getTitle() or\n
delivery.getTitle(),\n delivery.getTitle(),\n
int_index=movement.getIntIndex(),\n int_index=movement.getIntIndex(),\n
...@@ -183,7 +209,7 @@ for delivery in delivery_list:\n ...@@ -183,7 +209,7 @@ for delivery in delivery_list:\n
parent_translated_portal_type=delivery.getTranslatedPortalType(),\n parent_translated_portal_type=delivery.getTranslatedPortalType(),\n
translated_simulation_state_title=movement.getTranslatedSimulationStateTitle(),))\n translated_simulation_state_title=movement.getTranslatedSimulationStateTitle(),))\n
\n \n
if delivery.portal_type == \'Internal Invoice Transaction\' or not is_source:\n if is_destination:\n
node = movement.getDestinationValue(portal_type=\'Account\')\n node = movement.getDestinationValue(portal_type=\'Account\')\n
node_title = \'\'\n node_title = \'\'\n
node_account_type_title = \'\'\n node_account_type_title = \'\'\n
...@@ -194,7 +220,7 @@ for delivery in delivery_list:\n ...@@ -194,7 +220,7 @@ for delivery in delivery_list:\n
node_financial_section_title = \\\n node_financial_section_title = \\\n
node.getFinancialSectionTranslatedTitle()\n node.getFinancialSectionTranslatedTitle()\n
\n \n
line_list.append(Object(\n line_list.append(Object(\n
title=movement.hasTitle() and movement.getTitle() or\n title=movement.hasTitle() and movement.getTitle() or\n
delivery.getTitle(),\n delivery.getTitle(),\n
int_index=movement.getIntIndex(),\n int_index=movement.getIntIndex(),\n
...@@ -275,7 +301,11 @@ return line_list\n ...@@ -275,7 +301,11 @@ return line_list\n
<string>portal</string> <string>portal</string>
<string>portal_selections</string> <string>portal_selections</string>
<string>selection_name</string> <string>selection_name</string>
<string>selection_params</string>
<string>section_category</string> <string>section_category</string>
<string>section_category_strict</string>
<string>isSource</string>
<string>isDestination</string>
<string>currency</string> <string>currency</string>
<string>checked_uid_list</string> <string>checked_uid_list</string>
<string>getObject</string> <string>getObject</string>
...@@ -298,6 +328,7 @@ return line_list\n ...@@ -298,6 +328,7 @@ return line_list\n
<string>portal_type</string> <string>portal_type</string>
<string>delivery</string> <string>delivery</string>
<string>is_source</string> <string>is_source</string>
<string>is_destination</string>
<string>movement</string> <string>movement</string>
<string>node</string> <string>node</string>
<string>node_title</string> <string>node_title</string>
......
...@@ -62,6 +62,7 @@ Base_translateString = container.Base_translateString\n ...@@ -62,6 +62,7 @@ Base_translateString = container.Base_translateString\n
portal_type = request[\'portal_type\']\n portal_type = request[\'portal_type\']\n
simulation_state = request[\'simulation_state\']\n simulation_state = request[\'simulation_state\']\n
hide_analytic = request[\'hide_analytic\']\n hide_analytic = request[\'hide_analytic\']\n
project = request.get(\'project\', None)\n
at_date = request[\'at_date\'].latestTime()\n at_date = request[\'at_date\'].latestTime()\n
from_date = request.get(\'from_date\') or at_date.earliestTime()\n from_date = request.get(\'from_date\') or at_date.earliestTime()\n
section_uid = context.Base_getSectionUidListForSectionCategory(\n section_uid = context.Base_getSectionUidListForSectionCategory(\n
...@@ -87,6 +88,13 @@ selection_params = dict(portal_type=portal_type,\n ...@@ -87,6 +88,13 @@ selection_params = dict(portal_type=portal_type,\n
gap_root=gap_root,\n gap_root=gap_root,\n
payment=payment)\n payment=payment)\n
\n \n
if project:\n
if project == \'None\':\n
selection_params[\'project_uid\'] = project\n
else:\n
selection_params[\'project_uid\'] = \\\n
context.getPortalObject().restrictedTraverse(project).getUid()\n
\n
analytic_column_list = ()\n analytic_column_list = ()\n
if hide_analytic:\n if hide_analytic:\n
selection_params[\'group_by\'] = ( \'explanation_uid\',\n selection_params[\'group_by\'] = ( \'explanation_uid\',\n
...@@ -166,6 +174,8 @@ return [ReportSection(\n ...@@ -166,6 +174,8 @@ return [ReportSection(\n
<string>portal_type</string> <string>portal_type</string>
<string>simulation_state</string> <string>simulation_state</string>
<string>hide_analytic</string> <string>hide_analytic</string>
<string>None</string>
<string>project</string>
<string>at_date</string> <string>at_date</string>
<string>from_date</string> <string>from_date</string>
<string>context</string> <string>context</string>
...@@ -177,8 +187,8 @@ return [ReportSection(\n ...@@ -177,8 +187,8 @@ return [ReportSection(\n
<string>precision</string> <string>precision</string>
<string>dict</string> <string>dict</string>
<string>selection_params</string> <string>selection_params</string>
<string>analytic_column_list</string>
<string>_write_</string> <string>_write_</string>
<string>analytic_column_list</string>
<string>selection_columns</string> <string>selection_columns</string>
<string>len</string> <string>len</string>
<string>_inplacevar_</string> <string>_inplacevar_</string>
......
...@@ -53,7 +53,8 @@ ...@@ -53,7 +53,8 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>from Products.PythonScripts.standard import Object\n <value> <string>from Products.ZSQLCatalog.SQLCatalog import Query\n
from Products.PythonScripts.standard import Object\n
request = container.REQUEST\n request = container.REQUEST\n
portal = context.getPortalObject()\n portal = context.getPortalObject()\n
\n \n
...@@ -67,6 +68,12 @@ if group_by:\n ...@@ -67,6 +68,12 @@ if group_by:\n
extra_kw[\'group_by\'] = group_by\n extra_kw[\'group_by\'] = group_by\n
extra_kw[\'ignore_group_by\'] = True\n extra_kw[\'ignore_group_by\'] = True\n
\n \n
if project_uid:\n
if project_uid == \'None\':\n
extra_kw[\'project_uid\'] = Query(project_uid=None)\n
else:\n
extra_kw[\'project_uid\'] = project_uid\n
\n
account_title_cache = dict()\n account_title_cache = dict()\n
def getAccountId(node_relative_url):\n def getAccountId(node_relative_url):\n
if node_relative_url not in account_title_cache:\n if node_relative_url not in account_title_cache:\n
...@@ -185,7 +192,7 @@ return line_list\n ...@@ -185,7 +192,7 @@ return line_list\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>selection, at_date, from_date, portal_type, simulation_state, section_uid, payment_mode=None, payment=None, gap_root=None, group_by=None, analytic_column_list=[], **kw</string> </value> <value> <string>selection, at_date, from_date, portal_type, simulation_state, section_uid, payment_mode=None, payment=None, gap_root=None, group_by=None, analytic_column_list=[], project_uid=None, **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -205,7 +212,7 @@ return line_list\n ...@@ -205,7 +212,7 @@ return line_list\n
<dictionary> <dictionary>
<item> <item>
<key> <string>co_argcount</string> </key> <key> <string>co_argcount</string> </key>
<value> <int>11</int> </value> <value> <int>12</int> </value>
</item> </item>
<item> <item>
<key> <string>co_varnames</string> </key> <key> <string>co_varnames</string> </key>
...@@ -222,7 +229,10 @@ return line_list\n ...@@ -222,7 +229,10 @@ return line_list\n
<string>gap_root</string> <string>gap_root</string>
<string>group_by</string> <string>group_by</string>
<string>analytic_column_list</string> <string>analytic_column_list</string>
<string>project_uid</string>
<string>kw</string> <string>kw</string>
<string>Products.ZSQLCatalog.SQLCatalog</string>
<string>Query</string>
<string>Products.PythonScripts.standard</string> <string>Products.PythonScripts.standard</string>
<string>Object</string> <string>Object</string>
<string>_getattr_</string> <string>_getattr_</string>
...@@ -235,6 +245,7 @@ return line_list\n ...@@ -235,6 +245,7 @@ return line_list\n
<string>extra_kw</string> <string>extra_kw</string>
<string>_write_</string> <string>_write_</string>
<string>True</string> <string>True</string>
<string>None</string>
<string>account_title_cache</string> <string>account_title_cache</string>
<string>getAccountId</string> <string>getAccountId</string>
<string>account_in_gap_root_cache</string> <string>account_in_gap_root_cache</string>
...@@ -257,7 +268,6 @@ return line_list\n ...@@ -257,7 +268,6 @@ return line_list\n
<string>transaction_reference</string> <string>transaction_reference</string>
<string>title</string> <string>title</string>
<string>date</string> <string>date</string>
<string>None</string>
<string>line</string> <string>line</string>
<string>analytic_info</string> <string>analytic_info</string>
<string>analytic_column</string> <string>analytic_column</string>
...@@ -279,6 +289,7 @@ return line_list\n ...@@ -279,6 +289,7 @@ return line_list\n
<none/> <none/>
<none/> <none/>
<list/> <list/>
<none/>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -78,6 +78,7 @@ ...@@ -78,6 +78,7 @@
<list> <list>
<string>your_section_category</string> <string>your_section_category</string>
<string>your_section_category_strict</string> <string>your_section_category_strict</string>
<string>your_project</string>
<string>your_from_date</string> <string>your_from_date</string>
<string>your_at_date</string> <string>your_at_date</string>
<string>your_hide_analytic</string> <string>your_hide_analytic</string>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>your_project</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_project</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>
...@@ -93,6 +93,7 @@ ...@@ -93,6 +93,7 @@
<value> <value>
<list> <list>
<string>your_section_category</string> <string>your_section_category</string>
<string>your_project</string>
<string>your_payment</string> <string>your_payment</string>
<string>your_payment_mode</string> <string>your_payment_mode</string>
<string>your_currency</string> <string>your_currency</string>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>your_project</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_project</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>
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Reference</string> </value> <value> <string>Document Reference</string> </value>
</item> </item>
<item> <item>
<key> <string>truncate</string> </key> <key> <string>truncate</string> </key>
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</item> </item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>listbox_source_credit</string> </value> <value> <string>listbox_source_debit</string> </value>
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</item> </item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>listbox_source_debit</string> </value> <value> <string>listbox_source_credit</string> </value>
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
......
...@@ -12,9 +12,7 @@ ...@@ -12,9 +12,7 @@
<item> <item>
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list/>
<string>title</string>
</list>
</value> </value>
</item> </item>
<item> <item>
...@@ -86,10 +84,6 @@ ...@@ -86,10 +84,6 @@
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
</item> </item>
<item>
<key> <string>title</string> </key>
<value> <string>Section Transaction Reference</string> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
......
...@@ -74,10 +74,6 @@ ...@@ -74,10 +74,6 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>description</string> </key>
<value> <string>date at which the transaction is effective</string> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_stop_date</string> </value> <value> <string>my_stop_date</string> </value>
...@@ -92,7 +88,7 @@ ...@@ -92,7 +88,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Destination Accounting Operation Date</string> </value> <value> <string>Accounting Operation Date</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</item> </item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>listbox_source_credit</string> </value> <value> <string>listbox_source_debit</string> </value>
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</item> </item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>listbox_source_debit</string> </value> <value> <string>listbox_source_credit</string> </value>
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
......
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Transaction Reference</string> </value> <value> <string>Document Reference</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
...@@ -12,9 +12,7 @@ ...@@ -12,9 +12,7 @@
<item> <item>
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list/>
<string>title</string>
</list>
</value> </value>
</item> </item>
<item> <item>
...@@ -74,10 +72,6 @@ ...@@ -74,10 +72,6 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>description</string> </key>
<value> <string>Reference of the buyer in the purchase transaction</string> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_source_reference</string> </value> <value> <string>my_source_reference</string> </value>
...@@ -90,10 +84,6 @@ ...@@ -90,10 +84,6 @@
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
</item> </item>
<item>
<key> <string>title</string> </key>
<value> <string>Section Transaction Reference</string> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
......
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Vendor</string> </value> <value> <string>Supplier</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
...@@ -12,9 +12,7 @@ ...@@ -12,9 +12,7 @@
<item> <item>
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list/>
<string>title</string>
</list>
</value> </value>
</item> </item>
<item> <item>
...@@ -74,10 +72,6 @@ ...@@ -74,10 +72,6 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>description</string> </key>
<value> <string>Reference of the buyer in the purchase transaction</string> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_source_reference</string> </value> <value> <string>my_source_reference</string> </value>
...@@ -90,10 +84,6 @@ ...@@ -90,10 +84,6 @@
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
</item> </item>
<item>
<key> <string>title</string> </key>
<value> <string>Section Transaction Reference</string> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
......
...@@ -12,9 +12,7 @@ ...@@ -12,9 +12,7 @@
<item> <item>
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list/>
<string>title</string>
</list>
</value> </value>
</item> </item>
<item> <item>
...@@ -86,10 +84,6 @@ ...@@ -86,10 +84,6 @@
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
</item> </item>
<item>
<key> <string>title</string> </key>
<value> <string>Source Accounting Operation Date</string> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
......
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Operation Date</string> </value> <value> <string>Accounting Operation Date</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
entity as a mirror section\n entity as a mirror section\n
"""\n """\n
kw[\'mirror_section_uid\'] = context.getUid()\n kw[\'mirror_section_uid\'] = context.getUid()\n
kw[\'omit_input\'] = 1\n kw[\'omit_asset_increase\'] = 1\n
kw[\'node_category_strict_membership\'] = [\'account_type/asset/receivable\',\n kw[\'node_category_strict_membership\'] = [\'account_type/asset/receivable\',\n
\'account_type/liability/payable\']\n \'account_type/liability/payable\']\n
# here, or 0 is to prevent displaying "- 0"\n # here, or 0 is to prevent displaying "- 0"\n
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
entity as a mirror section\n entity as a mirror section\n
"""\n """\n
kw[\'mirror_section_uid\'] = context.getUid()\n kw[\'mirror_section_uid\'] = context.getUid()\n
kw[\'omit_output\'] = 1\n kw[\'omit_asset_decrease\'] = 1\n
kw[\'node_category_strict_membership\'] = [\'account_type/asset/receivable\',\n kw[\'node_category_strict_membership\'] = [\'account_type/asset/receivable\',\n
\'account_type/liability/payable\']\n \'account_type/liability/payable\']\n
return context.Node_statAccountingBalance(**kw)\n return context.Node_statAccountingBalance(**kw)\n
......
...@@ -158,11 +158,11 @@ if from_date or is_pl_account:\n ...@@ -158,11 +158,11 @@ if from_date or is_pl_account:\n
**get_inventory_kw)\n **get_inventory_kw)\n
\n \n
# then all movement between period_start_date and from_date\n # then all movement between period_start_date and from_date\n
previous_total_debit = getInventoryAssetPrice(omit_output=True,\n previous_total_debit = getInventoryAssetPrice(omit_asset_decrease=True,\n
from_date=period_start_date,\n from_date=period_start_date,\n
to_date=from_date,\n to_date=from_date,\n
**get_inventory_kw) + max(period_openning_balance, 0)\n **get_inventory_kw) + max(period_openning_balance, 0)\n
previous_total_credit = getInventoryAssetPrice(omit_input=True,\n previous_total_credit = getInventoryAssetPrice(omit_asset_increase=True,\n
from_date=period_start_date,\n from_date=period_start_date,\n
to_date=from_date,\n to_date=from_date,\n
**get_inventory_kw) - max(-period_openning_balance, 0)\n **get_inventory_kw) - max(-period_openning_balance, 0)\n
......
...@@ -92,15 +92,6 @@ if kw.get(\'node_category\'):\n ...@@ -92,15 +92,6 @@ if kw.get(\'node_category\'):\n
if kw.get(\'mirror_section_category\'):\n if kw.get(\'mirror_section_category\'):\n
params[\'mirror_section_category\'] = kw[\'mirror_section_category\']\n params[\'mirror_section_category\'] = kw[\'mirror_section_category\']\n
\n \n
if kw.get(\'at_date\'):\n
params[\'at_date\'] = kw[\'at_date\'].latestTime()\n
\n
if kw.get(\'from_date\'):\n
params[\'from_date\'] = kw[\'from_date\']\n
\n
if kw.get(\'to_date\'):\n
params[\'to_date\'] = kw[\'to_date\']\n
\n
###\n ###\n
# Get the \'where_expression\' parameter\n # Get the \'where_expression\' parameter\n
# XXX can be removed ?\n # XXX can be removed ?\n
...@@ -131,13 +122,13 @@ if params.get(\'period_start_date\', 0) and params.get(\'node_uid\'):\n ...@@ -131,13 +122,13 @@ if params.get(\'period_start_date\', 0) and params.get(\'node_uid\'):\n
selection_domain=getSelectionDomainDictFor(selection_name),\n selection_domain=getSelectionDomainDictFor(selection_name),\n
to_date=period_start_date,\n to_date=period_start_date,\n
**params)\n **params)\n
if omit_output:\n if omit_asset_decrease:\n
return getInventoryAssetPrice(omit_output=1,\n return getInventoryAssetPrice(omit_asset_decrease=1,\n
from_date=period_start_date,\n from_date=period_start_date,\n
at_date=at_date,\n at_date=at_date,\n
**params) + max(period_openning_balance, 0)\n **params) + max(period_openning_balance, 0)\n
elif omit_input:\n elif omit_asset_increase:\n
return getInventoryAssetPrice(omit_input=1,\n return getInventoryAssetPrice(omit_asset_increase=1,\n
from_date=period_start_date,\n from_date=period_start_date,\n
at_date=at_date,\n at_date=at_date,\n
**params) - max(-period_openning_balance, 0)\n **params) - max(-period_openning_balance, 0)\n
...@@ -147,8 +138,8 @@ if params.get(\'period_start_date\', 0) and params.get(\'node_uid\'):\n ...@@ -147,8 +138,8 @@ if params.get(\'period_start_date\', 0) and params.get(\'node_uid\'):\n
**params) - max(-period_openning_balance, 0)\n **params) - max(-period_openning_balance, 0)\n
\n \n
return getInventoryAssetPrice(\n return getInventoryAssetPrice(\n
omit_input=omit_input,\n omit_asset_increase=omit_asset_increase,\n
omit_output=omit_output,\n omit_asset_decrease=omit_asset_decrease,\n
selection_domain=getSelectionDomainDictFor(selection_name),\n selection_domain=getSelectionDomainDictFor(selection_name),\n
**params)\n **params)\n
</string> </value> </string> </value>
...@@ -161,7 +152,7 @@ return getInventoryAssetPrice(\n ...@@ -161,7 +152,7 @@ return getInventoryAssetPrice(\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>selection=None, omit_input=0, omit_output=0, selection_name=None, **kw</string> </value> <value> <string>selection=None, omit_asset_increase=0, omit_asset_decrease=0, selection_name=None, **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>_proxy_roles</string> </key> <key> <string>_proxy_roles</string> </key>
...@@ -196,8 +187,8 @@ return getInventoryAssetPrice(\n ...@@ -196,8 +187,8 @@ return getInventoryAssetPrice(\n
<value> <value>
<tuple> <tuple>
<string>selection</string> <string>selection</string>
<string>omit_input</string> <string>omit_asset_increase</string>
<string>omit_output</string> <string>omit_asset_decrease</string>
<string>selection_name</string> <string>selection_name</string>
<string>kw</string> <string>kw</string>
<string>Products.ZSQLCatalog.SQLCatalog</string> <string>Products.ZSQLCatalog.SQLCatalog</string>
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>return - context.Node_statAccountingBalance(omit_input=1, **kw) or 0.0\n <value> <string>return - context.Node_statAccountingBalance(omit_asset_increase=1, **kw) or 0.0\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>return context.Node_statAccountingBalance(omit_output=1, **kw) or 0.0\n <value> <string>return context.Node_statAccountingBalance(omit_asset_decrease=1, **kw) or 0.0\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</item> </item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>listbox_source_credit</string> </value> <value> <string>listbox_source_debit</string> </value>
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</item> </item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>listbox_source_debit</string> </value> <value> <string>listbox_source_credit</string> </value>
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
......
...@@ -74,10 +74,6 @@ ...@@ -74,10 +74,6 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>description</string> </key>
<value> <string>The reference of the transaction for the third party</string> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_destination_reference</string> </value> <value> <string>my_destination_reference</string> </value>
...@@ -92,7 +88,7 @@ ...@@ -92,7 +88,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Third Party Reference</string> </value> <value> <string>Third Party Transaction Reference</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>base_category</string>
<string>catalog_index</string> <string>catalog_index</string>
<string>parameter_list</string> <string>parameter_list</string>
<string>base_category</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -84,10 +84,6 @@ ...@@ -84,10 +84,6 @@
<key> <string>catalog_index</string> </key> <key> <string>catalog_index</string> </key>
<value> <string>title</string> </value> <value> <string>title</string> </value>
</item> </item>
<item>
<key> <string>description</string> </key>
<value> <string>Vendor of the transaction</string> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_source_section_title</string> </value> <value> <string>my_source_section_title</string> </value>
...@@ -106,10 +102,6 @@ ...@@ -106,10 +102,6 @@
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
</item> </item>
<item>
<key> <string>title</string> </key>
<value> <string>Vendor</string> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
......
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
</tuple> </tuple>
<tuple> <tuple>
<string>destination</string> <string>destination</string>
<string>Vendor Account</string> <string>Supplier Account</string>
</tuple> </tuple>
<tuple> <tuple>
<string>destination_debit</string> <string>destination_debit</string>
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</item> </item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>listbox_source_debit</string> </value> <value> <string>listbox_source_credit</string> </value>
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</item> </item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>listbox_source_credit</string> </value> <value> <string>listbox_source_debit</string> </value>
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
......
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Customer Transaction Reference</string> </value> <value> <string>Client Transaction Reference</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
...@@ -74,10 +74,6 @@ ...@@ -74,10 +74,6 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>description</string> </key>
<value> <string>the vendor reference of the sale transaction</string> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_source_reference</string> </value> <value> <string>my_source_reference</string> </value>
...@@ -92,7 +88,7 @@ ...@@ -92,7 +88,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Vendor Transaction Reference</string> </value> <value> <string>Supplier Transaction Reference</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
...@@ -13,10 +13,10 @@ ...@@ -13,10 +13,10 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>base_category</string>
<string>catalog_index</string> <string>catalog_index</string>
<string>portal_type</string>
<string>parameter_list</string> <string>parameter_list</string>
<string>base_category</string> <string>portal_type</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -85,10 +85,6 @@ ...@@ -85,10 +85,6 @@
<key> <string>catalog_index</string> </key> <key> <string>catalog_index</string> </key>
<value> <string>title</string> </value> <value> <string>title</string> </value>
</item> </item>
<item>
<key> <string>description</string> </key>
<value> <string>Vendor of the transaction</string> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_source_section_title</string> </value> <value> <string>my_source_section_title</string> </value>
...@@ -126,10 +122,6 @@ ...@@ -126,10 +122,6 @@
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
</item> </item>
<item>
<key> <string>title</string> </key>
<value> <string>Vendor</string> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ERP5Form" module="Products.ERP5Form.Form"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_objects</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>action</string> </key>
<value> <string>Base_edit</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>edit_order</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>encoding</string> </key>
<value> <string>UTF-8</string> </value>
</item>
<item>
<key> <string>enctype</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>group_list</string> </key>
<value>
<list>
<string>left</string>
<string>right</string>
</list>
</value>
</item>
<item>
<key> <string>groups</string> </key>
<value>
<dictionary>
<item>
<key> <string>left</string> </key>
<value>
<list>
<string>my_destination_section_title</string>
<string>my_destination_title</string>
<string>my_destination_decision_title</string>
<string>my_destination_administration_title</string>
<string>my_destination_payment</string>
<string>my_destination_project_title</string>
<string>my_destination_reference</string>
<string>my_destination_carrier_title</string>
</list>
</value>
</item>
<item>
<key> <string>right</string> </key>
<value>
<list>
<string>my_source_section_title</string>
<string>my_source_title</string>
<string>my_source_decision_title</string>
<string>my_source_administration_title</string>
<string>my_source_payment</string>
<string>my_source_project_title</string>
<string>my_source_reference</string>
<string>my_source_carrier_title</string>
</list>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>PurchaseInvoiceTransaction_viewProfile</string> </value>
</item>
<item>
<key> <string>method</string> </key>
<value> <string>POST</string> </value>
</item>
<item>
<key> <string>name</string> </key>
<value> <string>PurchaseTradeCondition_viewProfile</string> </value>
</item>
<item>
<key> <string>pt</string> </key>
<value> <string>form_view</string> </value>
</item>
<item>
<key> <string>row_length</string> </key>
<value> <int>4</int> </value>
</item>
<item>
<key> <string>stored_encoding</string> </key>
<value> <string>UTF-8</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Profile</string> </value>
</item>
<item>
<key> <string>unicode_mode</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>update_action</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>update_action_title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -133,7 +133,9 @@ ...@@ -133,7 +133,9 @@
</item> </item>
<item> <item>
<key> <string>display_width</string> </key> <key> <string>display_width</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>editable</string> </key> <key> <string>editable</string> </key>
...@@ -200,7 +202,7 @@ ...@@ -200,7 +202,7 @@
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>Reference of the buyer in the purchase transaction</string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>display_maxwidth</string> </key> <key> <string>display_maxwidth</string> </key>
...@@ -208,7 +210,7 @@ ...@@ -208,7 +210,7 @@
</item> </item>
<item> <item>
<key> <string>display_width</string> </key> <key> <string>display_width</string> </key>
<value> <int>20</int> </value> <value> <int>30</int> </value>
</item> </item>
<item> <item>
<key> <string>editable</string> </key> <key> <string>editable</string> </key>
...@@ -240,7 +242,7 @@ ...@@ -240,7 +242,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Section Transaction Reference</string> </value> <value> <string>Supplier Transaction Reference</string> </value>
</item> </item>
<item> <item>
<key> <string>truncate</string> </key> <key> <string>truncate</string> </key>
...@@ -260,4 +262,20 @@ ...@@ -260,4 +262,20 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: preferences.getPreference(\'preferred_string_field_width\', 30)</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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