[Erp5-report] r39019 jerome - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_s...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Oct 11 13:32:23 CEST 2010
Author: jerome
Date: Mon Oct 11 13:32:21 2010
New Revision: 39019
URL: http://svn.erp5.org?rev=39019&view=rev
Log:
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
Modified:
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_statDestinationAssetCredit.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_statDestinationAssetDebit.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_statSourceAssetCredit.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_statSourceAssetDebit.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_destination_asset_credit.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_destination_asset_debit.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_source_asset_credit.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_source_asset_debit.xml
erp5/trunk/bt5/erp5_accounting/bt/revision
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_statDestinationAssetCredit.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_statDestinationAssetCredit.xml?rev=39019&r1=39018&r2=39019&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_statDestinationAssetCredit.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_statDestinationAssetCredit.xml [utf8] Mon Oct 11 13:32:21 2010
@@ -53,7 +53,7 @@
<value> <string>total = 0\n
for line in context.objectValues(\n
portal_type = context.getPortalAccountingMovementTypeList()) :\n
- total += line.getDestinationAssetCredit()\n
+ total += line.getDestinationInventoriatedTotalAssetCredit()\n
\n
return total\n
</string> </value>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_statDestinationAssetDebit.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_statDestinationAssetDebit.xml?rev=39019&r1=39018&r2=39019&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_statDestinationAssetDebit.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_statDestinationAssetDebit.xml [utf8] Mon Oct 11 13:32:21 2010
@@ -53,7 +53,7 @@
<value> <string>total = 0\n
for line in context.objectValues(\n
portal_type = context.getPortalAccountingMovementTypeList()) :\n
- total += line.getDestinationAssetDebit()\n
+ total += line.getDestinationInventoriatedTotalAssetDebit()\n
\n
return total\n
</string> </value>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_statSourceAssetCredit.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_statSourceAssetCredit.xml?rev=39019&r1=39018&r2=39019&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_statSourceAssetCredit.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_statSourceAssetCredit.xml [utf8] Mon Oct 11 13:32:21 2010
@@ -53,7 +53,7 @@
<value> <string>total = 0\n
for line in context.objectValues(\n
portal_type = context.getPortalAccountingMovementTypeList()) :\n
- total += line.getSourceAssetCredit()\n
+ total += line.getSourceInventoriatedTotalAssetCredit()\n
\n
return total\n
</string> </value>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_statSourceAssetDebit.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_statSourceAssetDebit.xml?rev=39019&r1=39018&r2=39019&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_statSourceAssetDebit.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_statSourceAssetDebit.xml [utf8] Mon Oct 11 13:32:21 2010
@@ -53,7 +53,7 @@
<value> <string>total = 0\n
for line in context.objectValues(\n
portal_type = context.getPortalAccountingMovementTypeList()) :\n
- total += line.getSourceAssetDebit()\n
+ total += line.getSourceInventoriatedTotalAssetDebit()\n
\n
return total\n
</string> </value>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_destination_asset_credit.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_destination_asset_credit.xml?rev=39019&r1=39018&r2=39019&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_destination_asset_credit.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_destination_asset_credit.xml [utf8] Mon Oct 11 13:32:21 2010
@@ -10,6 +10,7 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
+ <string>default</string>
<string>precision</string>
</list>
</value>
@@ -53,6 +54,12 @@
<value>
<dictionary>
<item>
+ <key> <string>default</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
@@ -63,7 +70,7 @@
<item>
<key> <string>precision</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
@@ -78,6 +85,10 @@
<value>
<dictionary>
<item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string>my_money_quantity</string> </value>
</item>
@@ -107,6 +118,19 @@
<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>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
<value> <string>python: here.getQuantityPrecisionFromResource(here.getDestinationSectionValue().getPriceCurrency())</string> </value>
</item>
</dictionary>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_destination_asset_debit.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_destination_asset_debit.xml?rev=39019&r1=39018&r2=39019&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_destination_asset_debit.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_destination_asset_debit.xml [utf8] Mon Oct 11 13:32:21 2010
@@ -10,6 +10,7 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
+ <string>default</string>
<string>precision</string>
</list>
</value>
@@ -53,6 +54,12 @@
<value>
<dictionary>
<item>
+ <key> <string>default</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
@@ -63,7 +70,7 @@
<item>
<key> <string>precision</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
@@ -78,6 +85,10 @@
<value>
<dictionary>
<item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string>my_money_quantity</string> </value>
</item>
@@ -107,6 +118,19 @@
<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>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
<value> <string>python: here.getQuantityPrecisionFromResource(here.getDestinationSectionValue().getPriceCurrency())</string> </value>
</item>
</dictionary>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_source_asset_credit.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_source_asset_credit.xml?rev=39019&r1=39018&r2=39019&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_source_asset_credit.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_source_asset_credit.xml [utf8] Mon Oct 11 13:32:21 2010
@@ -10,6 +10,7 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
+ <string>default</string>
<string>precision</string>
</list>
</value>
@@ -53,6 +54,12 @@
<value>
<dictionary>
<item>
+ <key> <string>default</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
@@ -63,7 +70,7 @@
<item>
<key> <string>precision</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
@@ -78,6 +85,10 @@
<value>
<dictionary>
<item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string>my_money_quantity</string> </value>
</item>
@@ -107,6 +118,19 @@
<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>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
<value> <string>python: here.getQuantityPrecisionFromResource(here.getSourceSectionValue().getPriceCurrency())</string> </value>
</item>
</dictionary>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_source_asset_debit.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_source_asset_debit.xml?rev=39019&r1=39018&r2=39019&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_source_asset_debit.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_source_asset_debit.xml [utf8] Mon Oct 11 13:32:21 2010
@@ -10,6 +10,7 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
+ <string>default</string>
<string>precision</string>
</list>
</value>
@@ -53,6 +54,12 @@
<value>
<dictionary>
<item>
+ <key> <string>default</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
@@ -63,7 +70,7 @@
<item>
<key> <string>precision</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
@@ -78,6 +85,10 @@
<value>
<dictionary>
<item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string>my_money_quantity</string> </value>
</item>
@@ -107,6 +118,19 @@
<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>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
<value> <string>python: here.getQuantityPrecisionFromResource(here.getSourceSectionValue().getPriceCurrency())</string> </value>
</item>
</dictionary>
Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=39019&r1=39018&r2=39019&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Mon Oct 11 13:32:21 2010
@@ -1 +1 @@
-1365
\ No newline at end of file
+1367
\ No newline at end of file
More information about the Erp5-report
mailing list