[Erp5-report] r12804 - in /erp5/trunk/bt5/erp5_accounting_l10n_fr_m9: SkinTemplateItem/port...

nobody at svn.erp5.org nobody at svn.erp5.org
Thu Feb 15 19:24:19 CET 2007


Author: jerome
Date: Thu Feb 15 19:24:14 2007
New Revision: 12804

URL: http://svn.erp5.org?rev=12804&view=rev
Log:
sort on date if no int_index defined.
don't show Causalities


Modified:
    erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/AccountingTransactionModule_getM9AccountingTransactionLineList.xml
    erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/AccountingTransactionModule_viewM9AccountingTransactionListReportSection/listbox.xml
    erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/bt/revision

Modified: erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/AccountingTransactionModule_getM9AccountingTransactionLineList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/AccountingTransactionModule_getM9AccountingTransactionLineList.xml?rev=12804&r1=12803&r2=12804&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/AccountingTransactionModule_getM9AccountingTransactionLineList.xml (original)
+++ erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/AccountingTransactionModule_getM9AccountingTransactionLineList.xml Thu Feb 15 19:24:14 2007
@@ -103,7 +103,9 @@
         where_expression="catalog.parent_uid IN (%s)" %\n
                                  stool.callSelectionFor(selection_name),\n
         section_category=selection.getParams().get(\'section_category\'),\n
-        sort_on=\'parent_int_index\'):\n
+        sort_on=((\'parent_int_index\', \'asc\'),\n
+                 (\'date\', \'asc\'),\n
+                 (\'parent_title\', \'asc\'))):\n
 \n
   movement = brain.getObject()\n
   transaction = movement.getParentValue()\n
@@ -123,12 +125,11 @@
              section_uid=brain.section_uid,\n
              node_relative_url=brain.node_relative_url,\n
              getObject=brain.getObject,\n
-             asContext=movement.asContext,\n
+#             asContext=movement.asContext,\n
 #             asContext=lambda *args, **kw: movement, # optim ?\n
 #             Movement_getExplanationUrl=movement.Movement_getExplanationUrl,\n
 \n
              date=brain.date,\n
-             causality_title="\\n".join(transaction.getCausalityTitleList() or []) ,\n
              debit=max(brain.total_price, 0),\n
              credit=max(-(brain.total_price or 0), 0), )\n
   line_list.append(obj)\n

Modified: erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/AccountingTransactionModule_viewM9AccountingTransactionListReportSection/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/AccountingTransactionModule_viewM9AccountingTransactionListReportSection/listbox.xml?rev=12804&r1=12803&r2=12804&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/AccountingTransactionModule_viewM9AccountingTransactionListReportSection/listbox.xml (original)
+++ erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/AccountingTransactionModule_viewM9AccountingTransactionListReportSection/listbox.xml Thu Feb 15 19:24:14 2007
@@ -360,10 +360,6 @@
                         <tuple>
                           <string>Movement_getMirrorSectionTitle</string>
                           <string>Third Party</string>
-                        </tuple>
-                        <tuple>
-                          <string>causality_title</string>
-                          <string>Causalities</string>
                         </tuple>
                         <tuple>
                           <string>payment_mode_codification</string>

Modified: erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/bt/revision?rev=12804&r1=12803&r2=12804&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/bt/revision Thu Feb 15 19:24:14 2007
@@ -1,1 +1,1 @@
-66
+68




More information about the Erp5-report mailing list