Skip to content

erp5
erp5
Commit 68f4d3c1 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

Improve forms for conversion. 

Only display a value if conversion is actually set (empty instead of 0), and display the stats as they are actually calculated to check the balance

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@39019 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 08a1b670
Show whitespace changes
Inline Side-by-side
Showing with 105 additions and 9 deletions
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_statDestinationAssetCredit.xml
View file @ 68f4d3c1
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<value> <string>total = 0\n <value> <string>total = 0\n
for line in context.objectValues(\n for line in context.objectValues(\n
portal_type = context.getPortalAccountingMovementTypeList()) :\n portal_type = context.getPortalAccountingMovementTypeList()) :\n
total += line.getDestinationAssetCredit()\n total += line.getDestinationInventoriatedTotalAssetCredit()\n
\n \n
return total\n return total\n
</string> </value> </string> </value>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_statDestinationAssetDebit.xml
View file @ 68f4d3c1
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<value> <string>total = 0\n <value> <string>total = 0\n
for line in context.objectValues(\n for line in context.objectValues(\n
portal_type = context.getPortalAccountingMovementTypeList()) :\n portal_type = context.getPortalAccountingMovementTypeList()) :\n
total += line.getDestinationAssetDebit()\n total += line.getDestinationInventoriatedTotalAssetDebit()\n
\n \n
return total\n return total\n
</string> </value> </string> </value>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_statSourceAssetCredit.xml
View file @ 68f4d3c1
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<value> <string>total = 0\n <value> <string>total = 0\n
for line in context.objectValues(\n for line in context.objectValues(\n
portal_type = context.getPortalAccountingMovementTypeList()) :\n portal_type = context.getPortalAccountingMovementTypeList()) :\n
total += line.getSourceAssetCredit()\n total += line.getSourceInventoriatedTotalAssetCredit()\n
\n \n
return total\n return total\n
</string> </value> </string> </value>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_statSourceAssetDebit.xml
View file @ 68f4d3c1
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<value> <string>total = 0\n <value> <string>total = 0\n
for line in context.objectValues(\n for line in context.objectValues(\n
portal_type = context.getPortalAccountingMovementTypeList()) :\n portal_type = context.getPortalAccountingMovementTypeList()) :\n
total += line.getSourceAssetDebit()\n total += line.getSourceInventoriatedTotalAssetDebit()\n
\n \n
return total\n return total\n
</string> </value> </string> </value>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_destination_asset_credit.xml
View file @ 68f4d3c1
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>default</string>
<string>precision</string> <string>precision</string>
</list> </list>
</value> </value>
...@@ -52,6 +53,12 @@ ...@@ -52,6 +53,12 @@
<key> <string>tales</string> </key> <key> <string>tales</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -63,7 +70,7 @@ ...@@ -63,7 +70,7 @@
<item> <item>
<key> <string>precision</string> </key> <key> <string>precision</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -77,6 +84,10 @@ ...@@ -77,6 +84,10 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_money_quantity</string> </value> <value> <string>my_money_quantity</string> </value>
...@@ -100,6 +111,19 @@ ...@@ -100,6 +111,19 @@
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: test(cell.getDestinationTotalAssetPrice() is None, None, cell.getDestinationAssetCredit())</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/> <global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle> </pickle>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_destination_asset_debit.xml
View file @ 68f4d3c1
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>default</string>
<string>precision</string> <string>precision</string>
</list> </list>
</value> </value>
...@@ -52,6 +53,12 @@ ...@@ -52,6 +53,12 @@
<key> <string>tales</string> </key> <key> <string>tales</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -63,7 +70,7 @@ ...@@ -63,7 +70,7 @@
<item> <item>
<key> <string>precision</string> </key> <key> <string>precision</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -77,6 +84,10 @@ ...@@ -77,6 +84,10 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_money_quantity</string> </value> <value> <string>my_money_quantity</string> </value>
...@@ -100,6 +111,19 @@ ...@@ -100,6 +111,19 @@
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: test(cell.getDestinationTotalAssetPrice() is None, None, cell.getDestinationAssetDebit())</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/> <global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle> </pickle>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_source_asset_credit.xml
View file @ 68f4d3c1
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>default</string>
<string>precision</string> <string>precision</string>
</list> </list>
</value> </value>
...@@ -52,6 +53,12 @@ ...@@ -52,6 +53,12 @@
<key> <string>tales</string> </key> <key> <string>tales</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -63,7 +70,7 @@ ...@@ -63,7 +70,7 @@
<item> <item>
<key> <string>precision</string> </key> <key> <string>precision</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -77,6 +84,10 @@ ...@@ -77,6 +84,10 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_money_quantity</string> </value> <value> <string>my_money_quantity</string> </value>
...@@ -100,6 +111,19 @@ ...@@ -100,6 +111,19 @@
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: test(cell.getSourceTotalAssetPrice() is None, None, cell.getSourceAssetCredit())</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/> <global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle> </pickle>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_source_asset_debit.xml
View file @ 68f4d3c1
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>default</string>
<string>precision</string> <string>precision</string>
</list> </list>
</value> </value>
...@@ -52,6 +53,12 @@ ...@@ -52,6 +53,12 @@
<key> <string>tales</string> </key> <key> <string>tales</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -63,7 +70,7 @@ ...@@ -63,7 +70,7 @@
<item> <item>
<key> <string>precision</string> </key> <key> <string>precision</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -77,6 +84,10 @@ ...@@ -77,6 +84,10 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_money_quantity</string> </value> <value> <string>my_money_quantity</string> </value>
...@@ -100,6 +111,19 @@ ...@@ -100,6 +111,19 @@
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: test(cell.getSourceTotalAssetPrice() is None, None, cell.getSourceAssetDebit())</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/> <global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle> </pickle>
......
bt5/erp5_accounting/bt/revision
View file @ 68f4d3c1
1365 1367
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7