Skip to content

erp5
erp5
Commit 9d841b1d authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

use credit_price for converted amounts, and credit for non converted 

use the title of function category inside of "Function"

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@36124 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 95fb3bc3
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 137 deletions
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingLineReportLineList.xml
View file @ 9d841b1d
...@@ -172,11 +172,11 @@ for delivery in delivery_list:\n ...@@ -172,11 +172,11 @@ for delivery in delivery_list:\n
project_title=getTitle(movement.getSourceProjectValue()),\n project_title=getTitle(movement.getSourceProjectValue()),\n
product_line=movement.getProductLineTranslatedTitle(),\n product_line=movement.getProductLineTranslatedTitle(),\n
date=movement.getStartDate(),\n date=movement.getStartDate(),\n
debit=movement.getSourceInventoriatedTotalAssetDebit(),\n debit_price=movement.getSourceInventoriatedTotalAssetDebit(),\n
credit=movement.getSourceInventoriatedTotalAssetCredit(),\n credit_price=movement.getSourceInventoriatedTotalAssetCredit(),\n
currency=getAccountingCurrencyReference(movement.getSourceSection()),\n currency=getAccountingCurrencyReference(movement.getSourceSection()),\n
debit_quantity=movement.getSourceDebit(),\n debit=movement.getSourceDebit(),\n
credit_quantity=movement.getSourceCredit(),\n credit=movement.getSourceCredit(),\n
resource=movement.getResourceReference(),\n resource=movement.getResourceReference(),\n
quantity_precision=movement.getQuantityPrecisionFromResource(movement.getResource()),\n quantity_precision=movement.getQuantityPrecisionFromResource(movement.getResource()),\n
translated_portal_type=movement.getTranslatedPortalType(),\n translated_portal_type=movement.getTranslatedPortalType(),\n
...@@ -216,11 +216,11 @@ for delivery in delivery_list:\n ...@@ -216,11 +216,11 @@ for delivery in delivery_list:\n
project_title=getTitle(movement.getDestinationProjectValue()),\n project_title=getTitle(movement.getDestinationProjectValue()),\n
product_line=movement.getProductLineTranslatedTitle(),\n product_line=movement.getProductLineTranslatedTitle(),\n
date=movement.getStopDate(),\n date=movement.getStopDate(),\n
debit=movement.getDestinationInventoriatedTotalAssetDebit(),\n debit_price=movement.getDestinationInventoriatedTotalAssetDebit(),\n
credit=movement.getDestinationInventoriatedTotalAssetCredit(),\n credit_price=movement.getDestinationInventoriatedTotalAssetCredit(),\n
currency=getAccountingCurrencyReference(movement.getDestinationSection()),\n currency=getAccountingCurrencyReference(movement.getDestinationSection()),\n
debit_quantity=movement.getDestinationDebit(),\n debit=movement.getDestinationDebit(),\n
credit_quantity=movement.getDestinationCredit(),\n credit=movement.getDestinationCredit(),\n
resource=movement.getResourceReference(),\n resource=movement.getResourceReference(),\n
quantity_precision=movement.getQuantityPrecisionFromResource(movement.getResource()),\n quantity_precision=movement.getQuantityPrecisionFromResource(movement.getResource()),\n
translated_portal_type=movement.getTranslatedPortalType(),\n translated_portal_type=movement.getTranslatedPortalType(),\n
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingLineReportReportSectionList.xml
View file @ 9d841b1d
...@@ -57,8 +57,41 @@ ...@@ -57,8 +57,41 @@
portal = context.getPortalObject()\n portal = context.getPortalObject()\n
request = container.REQUEST\n request = container.REQUEST\n
\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 \n
return [ReportSection(form_id=\'AccountingTransactionModule_viewAccountingLineReportReportSection\',\n return [ReportSection(form_id=\'AccountingTransactionModule_viewAccountingLineReportReportSection\',\n
selection_columns=selection_columns,\n
path=context.getPhysicalPath())]\n path=context.getPhysicalPath())]\n
</string> </value> </string> </value>
</item> </item>
...@@ -103,6 +136,7 @@ return [ReportSection(form_id=\'AccountingTransactionModule_viewAccountingLineRe ...@@ -103,6 +136,7 @@ return [ReportSection(form_id=\'AccountingTransactionModule_viewAccountingLineRe
<string>portal</string> <string>portal</string>
<string>container</string> <string>container</string>
<string>request</string> <string>request</string>
<string>selection_columns</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingLineReportReportSection/listbox.xml
View file @ 9d841b1d
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>columns</string>
<string>editable_columns</string> <string>editable_columns</string>
<string>list_method</string> <string>list_method</string>
<string>selection_name</string> <string>selection_name</string>
...@@ -78,129 +77,6 @@ ...@@ -78,129 +77,6 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <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> <item>
<key> <string>editable_columns</string> </key> <key> <string>editable_columns</string> </key>
<value> <value>
...@@ -218,11 +94,11 @@ ...@@ -218,11 +94,11 @@
<string>Credit</string> <string>Credit</string>
</tuple> </tuple>
<tuple> <tuple>
<string>debit_quantity</string> <string>debit_price</string>
<string>Original Debit</string> <string>Original Debit</string>
</tuple> </tuple>
<tuple> <tuple>
<string>credit_quantity</string> <string>credit_price</string>
<string>Original Credit</string> <string>Original Credit</string>
</tuple> </tuple>
</list> </list>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingLineReportReportSection/listbox_debit_quantity.xml → bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingLineReportReportSection/listbox_credit_price.xml
View file @ 9d841b1d
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>listbox_debit_quantity</string> </value> <value> <string>listbox_credit_price</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingLineReportReportSection/listbox_credit_quantity.xml → bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingLineReportReportSection/listbox_debit_price.xml
View file @ 9d841b1d
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>listbox_credit_quantity</string> </value> <value> <string>listbox_debit_price</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
bt5/erp5_accounting/bt/revision
View file @ 9d841b1d
1260 1261
\ 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