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

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Feb 14 15:48:24 2011
New Revision: 43318

URL: http://svn.erp5.org?rev=43318&view=rev
Log:
include more columns

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/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=43318&r1=43317&r2=43318&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] Mon Feb 14 15:48:24 2011
@@ -61,6 +61,7 @@ selection_params = portal_selections.get
 section_category = selection_params.get(\'section_category\')\n
 section_category_strict = selection_params.get(\'section_category_strict\')\n
 \n
+\n
 def isSource(accounting_transaction):\n
   if section_category:\n
     source_section = accounting_transaction.getSourceSectionValue()\n
@@ -118,7 +119,7 @@ def getAccountReference(node):\n
 \n
 def getTitle(document):\n
   if document is not None:\n
-    return document.getTitle()\n
+    return document.getTranslatedTitle()\n
   return \'\'\n
 \n
 bank_account_title_cache = dict()\n
@@ -155,7 +156,11 @@ def getAccountingCurrencyReference(secti
 \n
 \n
 portal_type = context.getPortalAccountingMovementTypeList()\n
+\n
+displayed_delivery_dict = dict()\n
 for delivery in delivery_list:\n
+  if delivery.uid in displayed_delivery_dict: continue\n
+  displayed_delivery_dict[delivery.uid] = True\n
   delivery = delivery.getObject()\n
   is_source = isSource(delivery)\n
   is_destination = isDestination(delivery)\n
@@ -193,15 +198,19 @@ for delivery in delivery_list:\n
         mirror_payment_title=getBankAccountTitle(movement.getDestinationPaymentValue()),\n
         mirror_section_region_title=movement.getDestinationRegionTranslatedTitle(),\n
         function_title=getTitle(movement.getSourceFunctionValue()),\n
+        function_reference=movement.getSourceFunctionReference(),\n
         project_title=getTitle(movement.getSourceProjectValue()),\n
         funding_title=getTitle(movement.getSourceFundingValue()),\n
+        funding_reference=movement.getSourceFundingReference(),\n
         product_line=movement.getProductLineTranslatedTitle(),\n
         date=movement.getStartDate(),\n
         debit_price=movement.getSourceInventoriatedTotalAssetDebit(),\n
         credit_price=movement.getSourceInventoriatedTotalAssetCredit(),\n
+        price=(movement.getSourceInventoriatedTotalAssetCredit() - movement.getSourceInventoriatedTotalAssetDebit()),\n
         currency=getAccountingCurrencyReference(movement.getSourceSection()),\n
         debit=movement.getSourceDebit(),\n
         credit=movement.getSourceCredit(),\n
+        quantity=(movement.getSourceCredit() - movement.getSourceDebit()),\n
         resource=movement.getResourceReference(),\n
         quantity_precision=movement.getQuantityPrecisionFromResource(movement.getResource()),\n
         translated_portal_type=movement.getTranslatedPortalType(),\n
@@ -239,15 +248,19 @@ for delivery in delivery_list:\n
         mirror_section_region_title=movement.getSourceRegionTranslatedTitle(),\n
         mirror_payment_title=getBankAccountTitle(movement.getSourcePaymentValue()),\n
         function_title=getTitle(movement.getDestinationFunctionValue()),\n
+        function_reference=movement.getDestinationFunctionReference(),\n
         funding_title=getTitle(movement.getDestinationFundingValue()),\n
+        funding_reference=movement.getDestinationFundingReference(),\n
         project_title=getTitle(movement.getDestinationProjectValue()),\n
         product_line=movement.getProductLineTranslatedTitle(),\n
         date=movement.getStopDate(),\n
         debit_price=movement.getDestinationInventoriatedTotalAssetDebit(),\n
         credit_price=movement.getDestinationInventoriatedTotalAssetCredit(),\n
+        price=(movement.getDestinationInventoriatedTotalAssetCredit() - movement.getDestinationInventoriatedTotalAssetDebit()),\n
         currency=getAccountingCurrencyReference(movement.getDestinationSection()),\n
         debit=movement.getDestinationDebit(),\n
         credit=movement.getDestinationCredit(),\n
+        quantity=(movement.getDestinationCredit() - movement.getDestinationDebit()),\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=43318&r1=43317&r2=43318&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] Mon Feb 14 15:48:24 2011
@@ -71,8 +71,11 @@ selection_columns = (\n
   (\'mirror_section_title\', \'Third Party\',),\n
   (\'mirror_payment_title\', \'Third Party Bank Account\',),\n
   (\'mirror_section_region_title\', \'Third Party Region\',),\n
+  (\'function_reference\',\n
+      \'%s Reference\' % context.AccountingTransactionLine_getFunctionBaseCategoryTitle()), \n
   (\'function_title\',\n
       context.AccountingTransactionLine_getFunctionBaseCategoryTitle()),\n
+  (\'funding_reference\', \'Funding Reference\',),\n
   (\'funding_title\', \'Funding\',),\n
   (\'project_title\', \'Project\',),\n
   (\'product_line\', \'Product Line\'),\n
@@ -80,9 +83,11 @@ selection_columns = (\n
   (\'date\', \'Operation Date\'),\n
   (\'debit_price\', \'Converted Debit\'),\n
   (\'credit_price\', \'Converted Credit\'),\n
+  (\'price\', \'Converted Net\'),\n
   (\'currency\', \'Accounting Currency\'),\n
   (\'debit\', \'Debit\'),\n
   (\'credit\', \'Credit\'),\n
+  (\'quantity\', \'Net\'),\n
   (\'resource\', \'Transaction Currency\'),\n
   (\'translated_portal_type\', \'Line Type\'),\n
   (\'parent_translated_portal_type\', \'Transaction Type\'),\n

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=43318&r1=43317&r2=43318&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Mon Feb 14 15:48:24 2011
@@ -1 +1 @@
-1441
\ No newline at end of file
+1442
\ No newline at end of file