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

[nobody at svn.erp5.org]

Author: jerome
Date: Fri Jan 28 11:48:40 2011
New Revision: 42731

URL: http://svn.erp5.org?rev=42731&view=rev
Log:
- include funding
- fixes the case where organisation has no group

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=42731&r1=42730&r2=42731&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] Fri Jan 28 11:48:40 2011
@@ -66,10 +66,10 @@ def isSource(accounting_transaction):\n
     source_section = accounting_transaction.getSourceSectionValue()\n
     if source_section is None:\n
       return False\n
-    group = source_section.getGroup(base=True) or \'\'\n
+    group = source_section.getGroup(base=True)\n
     if section_category_strict:\n
       return group == section_category\n
-    return group.startswith(section_category)\n
+    return (group or \'\').startswith(section_category)\n
   return accounting_transaction.AccountingTransaction_isSourceView()\n
 \n
 def isDestination(accounting_transaction):\n
@@ -77,10 +77,10 @@ def isDestination(accounting_transaction
     destination_section = accounting_transaction.getDestinationSectionValue()\n
     if destination_section is None:\n
       return False\n
-    group = destination_section.getGroup(base=True) or \'\' \n
+    group = destination_section.getGroup(base=True)\n
     if section_category_strict:\n
       return group == section_category\n
-    return group.startswith(section_category)\n
+    return (group or \'\').startswith(section_category)\n
   return accounting_transaction.AccountingTransaction_isDestinationView()\n
 \n
 \n
@@ -194,6 +194,7 @@ for delivery in delivery_list:\n
         mirror_section_region_title=movement.getDestinationRegionTranslatedTitle(),\n
         function_title=getTitle(movement.getSourceFunctionValue()),\n
         project_title=getTitle(movement.getSourceProjectValue()),\n
+        funding_title=getTitle(movement.getSourceFundingValue()),\n
         product_line=movement.getProductLineTranslatedTitle(),\n
         date=movement.getStartDate(),\n
         debit_price=movement.getSourceInventoriatedTotalAssetDebit(),\n
@@ -238,6 +239,7 @@ 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
+        funding_title=getTitle(movement.getDestinationFundingValue()),\n
         project_title=getTitle(movement.getDestinationProjectValue()),\n
         product_line=movement.getProductLineTranslatedTitle(),\n
         date=movement.getStopDate(),\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=42731&r1=42730&r2=42731&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] Fri Jan 28 11:48:40 2011
@@ -73,6 +73,7 @@ selection_columns = (\n
   (\'mirror_section_region_title\', \'Third Party Region\',),\n
   (\'function_title\',\n
       context.AccountingTransactionLine_getFunctionBaseCategoryTitle()),\n
+  (\'funding_title\', \'Funding\',),\n
   (\'project_title\', \'Project\',),\n
   (\'product_line\', \'Product Line\'),\n
   (\'string_index\', \'String Index\'),\n

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=42731&r1=42730&r2=42731&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Fri Jan 28 11:48:40 2011
@@ -1 +1 @@
-1432
\ No newline at end of file
+1433
\ No newline at end of file