[Erp5-report] r36743 jerome - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_s...

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Jun 30 15:44:07 2010
New Revision: 36743

URL: http://svn.erp5.org?rev=36743&view=rev
Log:
General Ledger: use glossary term "Document Reference" for reference
Account Statement: add Document Reference column, hide third party column only if a third party is selected

Modified:
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountStatementReportSectionList.xml
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml
    erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_Build.xml
    erp5/trunk/bt5/erp5_accounting/bt/revision

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountStatementReportSectionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountStatementReportSectionList.xml?rev=36743&r1=36742&r2=36743&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountStatementReportSectionList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountStatementReportSectionList.xml [utf8] Wed Jun 30 15:44:07 2010
@@ -138,8 +138,11 @@ selection_columns = (\n
   (\'Movement_getExplanationTitle\', \'Accounting Transaction Title\'), )\n
 if len(section_uid) > 1:\n
   selection_columns += ( (\'section_title\', \'Section\'), )\n
-selection_columns += analytic_column_list + (\n
-  (\'Movement_getMirrorSectionTitle\', \'Third Party\'),\n
+selection_columns += analytic_column_list\n
+if not mirror_section:\n
+  selection_columns += ( (\'Movement_getMirrorSectionTitle\', \'Third Party\'), )\n
+selection_columns += (\n
+  (\'Movement_getExplanationReference\', \'Document Reference\'),\n
   (\'debit_price\', \'Debit\'),\n
   (\'credit_price\', \'Credit\'),\n
   (\'running_total_price\', \'Net\'),)\n

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml?rev=36743&r1=36742&r2=36743&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml [utf8] Wed Jun 30 15:44:07 2010
@@ -121,7 +121,7 @@ account_columns = (\n
       (\'Movement_getExplanationTitle\', \'Title\'),\n
       (\'date\', \'Date\'),\n
       (\'Movement_getExplanationTranslatedPortalType\', \'Type\'),\n
-      (\'Movement_getExplanationReference\', \'Invoice Number\'),\n
+      (\'Movement_getExplanationReference\', \'Document Reference\'),\n
       (\'Movement_getMirrorSectionTitle\', \'Third Party\'),)\n
 if len(simulation_state) > 1:\n
   account_columns += (\n

Modified: erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_Build.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_Build.xml?rev=36743&r1=36742&r2=36743&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_Build.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_Build.xml [utf8] Wed Jun 30 15:44:07 2010
@@ -208,7 +208,6 @@ if builder_by_ptype.has_key(delivery_por
                             <string>order</string>
                             <string>build_trade_model_tag</string>
                             <string>build_accounting_tag</string>
-                            <string>path</string>
                             <string>update_applied_rule_tag</string>
                             <string>dict</string>
                           </tuple>

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=36743&r1=36742&r2=36743&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Wed Jun 30 15:44:07 2010
@@ -1 +1 @@
-1294
\ No newline at end of file
+1295
\ No newline at end of file