[Erp5-report] r36123 jerome - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_s...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Jun 9 09:24:44 CEST 2010
Author: jerome
Date: Wed Jun 9 09:24:43 2010
New Revision: 36123
URL: http://svn.erp5.org?rev=36123&view=rev
Log:
use credit_price for converted amounts, and credit for non converted
use the title of function category inside of "Function"
Added:
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingLineReportReportSection/listbox_credit_price.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingLineReportReportSection/listbox_debit_price.xml
Modified:
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingLineReportLineList.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingLineReportReportSectionList.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingLineReportReportSection/listbox.xml
erp5/trunk/bt5/erp5_accounting/bt/revision
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingLineReportLineList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingLineReportLineList.xml?rev=36123&r1=36122&r2=36123&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingLineReportLineList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingLineReportLineList.xml [utf8] Wed Jun 9 09:24:43 2010
@@ -172,11 +172,11 @@
project_title=getTitle(movement.getSourceProjectValue()),\n
product_line=movement.getProductLineTranslatedTitle(),\n
date=movement.getStartDate(),\n
- debit=movement.getSourceInventoriatedTotalAssetDebit(),\n
- credit=movement.getSourceInventoriatedTotalAssetCredit(),\n
+ debit_price=movement.getSourceInventoriatedTotalAssetDebit(),\n
+ credit_price=movement.getSourceInventoriatedTotalAssetCredit(),\n
currency=getAccountingCurrencyReference(movement.getSourceSection()),\n
- debit_quantity=movement.getSourceDebit(),\n
- credit_quantity=movement.getSourceCredit(),\n
+ debit=movement.getSourceDebit(),\n
+ credit=movement.getSourceCredit(),\n
resource=movement.getResourceReference(),\n
quantity_precision=movement.getQuantityPrecisionFromResource(movement.getResource()),\n
translated_portal_type=movement.getTranslatedPortalType(),\n
@@ -216,11 +216,11 @@
project_title=getTitle(movement.getDestinationProjectValue()),\n
product_line=movement.getProductLineTranslatedTitle(),\n
date=movement.getStopDate(),\n
- debit=movement.getDestinationInventoriatedTotalAssetDebit(),\n
- credit=movement.getDestinationInventoriatedTotalAssetCredit(),\n
+ debit_price=movement.getDestinationInventoriatedTotalAssetDebit(),\n
+ credit_price=movement.getDestinationInventoriatedTotalAssetCredit(),\n
currency=getAccountingCurrencyReference(movement.getDestinationSection()),\n
- debit_quantity=movement.getDestinationDebit(),\n
- credit_quantity=movement.getDestinationCredit(),\n
+ debit=movement.getDestinationDebit(),\n
+ credit=movement.getDestinationCredit(),\n
resource=movement.getResourceReference(),\n
quantity_precision=movement.getQuantityPrecisionFromResource(movement.getResource()),\n
translated_portal_type=movement.getTranslatedPortalType(),\n
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingLineReportReportSectionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingLineReportReportSectionList.xml?rev=36123&r1=36122&r2=36123&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingLineReportReportSectionList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingLineReportReportSectionList.xml [utf8] Wed Jun 9 09:24:43 2010
@@ -57,8 +57,41 @@
portal = context.getPortalObject()\n
request = container.REQUEST\n
\n
+selection_columns = (\n
+ (\'title\', \'Title\',),\n
+ (\'int_index\', \'Int Index\',),\n
+ (\'parent_description\', \'Description\',),\n
+ (\'parent_reference\', \'Invoice Number\',),\n
+ (\'specific_reference\', \'Transaction Reference\',),\n
+ (\'node_reference\', \'Account Code\',),\n
+ (\'node_title\', \'Account Name\',),\n
+ (\'node_account_type_title\', \'Account Type\',),\n
+ (\'node_financial_section_title\', \'Financial Section\',),\n
+ (\'section_title\', \'Section\',),\n
+ (\'payment_title\', \'Section Bank Account\',),\n
+ (\'payment_mode\', \'Payment Mode\',),\n
+ (\'mirror_section_title\', \'Third Party\',),\n
+ (\'mirror_payment_title\', \'Third Party Bank Account\',),\n
+ (\'mirror_section_region_title\', \'Third Party Region\',),\n
+ (\'function_title\',\n
+ context.AccountingTransactionLine_getFunctionBaseCategoryTitle()),\n
+ (\'project_title\', \'Project\',),\n
+ (\'product_line\', \'Product Line\'),\n
+ (\'string_index\', \'String Index\'),\n
+ (\'date\', \'Operation Date\'),\n
+ (\'debit_price\', \'Converted Debit\'),\n
+ (\'credit_price\', \'Converted Credit\'),\n
+ (\'currency\', \'Accounting Currency\'),\n
+ (\'debit\', \'Debit\'),\n
+ (\'credit\', \'Credit\'),\n
+ (\'resource\', \'Transaction Currency\'),\n
+ (\'translated_portal_type\', \'Line Type\'),\n
+ (\'parent_translated_portal_type\', \'Transaction Type\'),\n
+ (\'translated_simulation_state_title\', \'State\'),)\n
+\n
\n
return [ReportSection(form_id=\'AccountingTransactionModule_viewAccountingLineReportReportSection\',\n
+ selection_columns=selection_columns,\n
path=context.getPhysicalPath())]\n
</string> </value>
</item>
@@ -103,6 +136,7 @@
<string>portal</string>
<string>container</string>
<string>request</string>
+ <string>selection_columns</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingLineReportReportSection/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingLineReportReportSection/listbox.xml?rev=36123&r1=36122&r2=36123&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingLineReportReportSection/listbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingLineReportReportSection/listbox.xml [utf8] Wed Jun 9 09:24:43 2010
@@ -13,7 +13,6 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>columns</string>
<string>editable_columns</string>
<string>list_method</string>
<string>selection_name</string>
@@ -79,129 +78,6 @@
<value>
<dictionary>
<item>
- <key> <string>columns</string> </key>
- <value>
- <list>
- <tuple>
- <string>title</string>
- <string>Title</string>
- </tuple>
- <tuple>
- <string>int_index</string>
- <string>Int Index</string>
- </tuple>
- <tuple>
- <string>parent_description</string>
- <string>Description</string>
- </tuple>
- <tuple>
- <string>parent_reference</string>
- <string>Invoice Number</string>
- </tuple>
- <tuple>
- <string>specific_reference</string>
- <string>Transaction Reference</string>
- </tuple>
- <tuple>
- <string>node_reference</string>
- <string>Account Code</string>
- </tuple>
- <tuple>
- <string>node_title</string>
- <string>Account Name</string>
- </tuple>
- <tuple>
- <string>node_account_type_title</string>
- <string>Account Type</string>
- </tuple>
- <tuple>
- <string>node_financial_section_title</string>
- <string>Financial Section</string>
- </tuple>
- <tuple>
- <string>section_title</string>
- <string>Section</string>
- </tuple>
- <tuple>
- <string>payment_title</string>
- <string>Section Bank Account</string>
- </tuple>
- <tuple>
- <string>payment_mode</string>
- <string>Payment Mode</string>
- </tuple>
- <tuple>
- <string>mirror_section_title</string>
- <string>Third Party</string>
- </tuple>
- <tuple>
- <string>mirror_payment_title</string>
- <string>Third Party Bank Account</string>
- </tuple>
- <tuple>
- <string>mirror_section_region_title</string>
- <string>Third Party Region</string>
- </tuple>
- <tuple>
- <string>function_title</string>
- <string>Function</string>
- </tuple>
- <tuple>
- <string>project_title</string>
- <string>Project</string>
- </tuple>
- <tuple>
- <string>product_line</string>
- <string>Product Line</string>
- </tuple>
- <tuple>
- <string>string_index</string>
- <string>String Index</string>
- </tuple>
- <tuple>
- <string>date</string>
- <string>Operation Date</string>
- </tuple>
- <tuple>
- <string>debit</string>
- <string>Converted Debit</string>
- </tuple>
- <tuple>
- <string>credit</string>
- <string>Converted Credit</string>
- </tuple>
- <tuple>
- <string>currency</string>
- <string>Accounting Currency</string>
- </tuple>
- <tuple>
- <string>debit_quantity</string>
- <string>Debit</string>
- </tuple>
- <tuple>
- <string>credit_quantity</string>
- <string>Credit</string>
- </tuple>
- <tuple>
- <string>resource</string>
- <string>Transaction Currency</string>
- </tuple>
- <tuple>
- <string>translated_portal_type</string>
- <string>Line Type</string>
- </tuple>
- <tuple>
- <string>parent_translated_portal_type</string>
- <string>Transaction Type</string>
- </tuple>
- <tuple>
- <string>translated_simulation_state_title</string>
- <string>State</string>
- </tuple>
- </list>
- </value>
- </item>
- <item>
<key> <string>editable_columns</string> </key>
<value>
<list>
@@ -218,11 +94,11 @@
<string>Credit</string>
</tuple>
<tuple>
- <string>debit_quantity</string>
+ <string>debit_price</string>
<string>Original Debit</string>
</tuple>
<tuple>
- <string>credit_quantity</string>
+ <string>credit_price</string>
<string>Original Credit</string>
</tuple>
</list>
Added: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingLineReportReportSection/listbox_credit_price.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingLineReportReportSection/listbox_credit_price.xml?rev=36123&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingLineReportReportSection/listbox_credit_price.xml (added)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingLineReportReportSection/listbox_credit_price.xml [utf8] Wed Jun 9 09:24:43 2010
@@ -1,0 +1,121 @@
+<?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>
+ <string>precision</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>listbox_credit_price</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>precision</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </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>my_money_quantity</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>precision</string> </key>
+ <value> <string></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>
+ <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>cell/quantity_precision | python:2</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingLineReportReportSection/listbox_debit_price.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingLineReportReportSection/listbox_debit_price.xml?rev=36123&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingLineReportReportSection/listbox_debit_price.xml (added)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingLineReportReportSection/listbox_debit_price.xml [utf8] Wed Jun 9 09:24:43 2010
@@ -1,0 +1,121 @@
+<?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>
+ <string>precision</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>listbox_debit_price</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>precision</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </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>my_money_quantity</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>precision</string> </key>
+ <value> <string></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>
+ <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>cell/quantity_precision | python:2</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=36123&r1=36122&r2=36123&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Wed Jun 9 09:24:43 2010
@@ -1,1 +1,1 @@
-1260
+1261
More information about the Erp5-report
mailing list