[Erp5-report] r10076 - in /erp5/trunk/bt5/erp5_accounting_l10n_fr_m9: PortalTypeBaseCategor...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Sep 18 10:47:34 CEST 2006
Author: jerome
Date: Mon Sep 18 10:47:30 2006
New Revision: 10076
URL: http://svn.erp5.org?rev=10076&view=rev
Log:
aggregate relation must be set from the invoice to the transmission sheet. Fix scripts and forms.
Modified:
erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_addInvoice.xml
erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_removeInvoice.xml
erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_view/listbox.xml
erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_viewAddInvoiceDialog/listbox.xml
erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_viewInvoiceList/listbox.xml
erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/bt/revision
erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/bt/template_portal_type_base_category_list
erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/bt/version
Modified: erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/PortalTypeBaseCategoryTemplateItem/base_category_list.xml?rev=10076&r1=10075&r2=10076&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/PortalTypeBaseCategoryTemplateItem/base_category_list.xml (original)
+++ erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/PortalTypeBaseCategoryTemplateItem/base_category_list.xml Mon Sep 18 10:47:30 2006
@@ -1,5 +1,8 @@
<base_category_list>
- <portal_type id="Purchase Invoice Transmission Sheet">
+ <portal_type id="Purchase Invoice Transaction">
+ <item>aggregate</item>
+ </portal_type>
+ <portal_type id="Sale Invoice Transaction">
<item>aggregate</item>
</portal_type>
</base_category_list>
Modified: erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_addInvoice.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_addInvoice.xml?rev=10076&r1=10075&r2=10076&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_addInvoice.xml (original)
+++ erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_addInvoice.xml Mon Sep 18 10:47:30 2006
@@ -71,11 +71,13 @@
<value> <string>selection = context.portal_selections.getSelectionFor(\n
"transmission_sheet_add_invoice_selection")\n
\n
-context.setAggregateUidList(context.getAggregateUidList() \\\n
- + (selection.getCheckedUids() or uids))\n
+for uid in uids:\n
+ invoice = context.portal_catalog.getObject(uid)\n
+ aggregate_list = invoice.getAggregateValueList()\n
+ invoice.setAggregateValueList(aggregate_list + [context])\n
\n
return context.REQUEST.RESPONSE.redirect(\n
- "%s/view?portal_status_message=Invoice+Added" % context.absolute_url())\n
+ "%s/view?portal_status_message=Invoice+Added." % context.absolute_url())\n
</string> </value>
</item>
<item>
@@ -135,6 +137,10 @@
<string>_getattr_</string>
<string>context</string>
<string>selection</string>
+ <string>_getiter_</string>
+ <string>uid</string>
+ <string>invoice</string>
+ <string>aggregate_list</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_removeInvoice.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_removeInvoice.xml?rev=10076&r1=10075&r2=10076&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_removeInvoice.xml (original)
+++ erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_removeInvoice.xml Mon Sep 18 10:47:30 2006
@@ -69,13 +69,14 @@
<item>
<key> <string>_body</string> </key>
<value> <string>selection = context.portal_selections.getSelectionFor(\n
- \'purchase_invoice_transmission_sheet_selection\')\n
+ \'purchase_invoice_transmission_sheet_list_selection\')\n
\n
-context.log(\'selection_uid\', selection.getCheckedUids())\n
-removed_uid_list = (selection.getCheckedUids() or uids)\n
-if not removed_uid_list:\n
- return context.REQUEST.RESPONSE.redirect(\n
- "%s/view?portal_status_message=Select+Invoices+to+Remove" % context.absolute_url())\n
+for uid in selection.getCheckedUids():\n
+ invoice = context.portal_catalog.getObject(uid)\n
+ aggregate_list = invoice.getAggregateValueList()\n
+ if context in aggregate_list :\n
+ aggregate_list.remove(context) \n
+ invoice.setAggregateValueList(aggregate_list)\n
\n
old_uid_list = context.getAggregateUidList()\n
context.setAggregateUidList([uid for uid in old_uid_list if uid not in removed_uid_list])\n
@@ -141,12 +142,14 @@
<string>_getattr_</string>
<string>context</string>
<string>selection</string>
- <string>removed_uid_list</string>
+ <string>_getiter_</string>
+ <string>uid</string>
+ <string>invoice</string>
+ <string>aggregate_list</string>
<string>old_uid_list</string>
<string>append</string>
<string>$append0</string>
- <string>_getiter_</string>
- <string>uid</string>
+ <string>removed_uid_list</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_view/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_view/listbox.xml?rev=10076&r1=10075&r2=10076&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_view/listbox.xml (original)
+++ erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_view/listbox.xml Mon Sep 18 10:47:30 2006
@@ -338,7 +338,7 @@
<value>
<list>
<tuple>
- <string>getDestinationSectionTitle</string>
+ <string>getSourceSectionTitle</string>
<string>Third Party</string>
</tuple>
<tuple>
@@ -530,7 +530,7 @@
<dictionary>
<item>
<key> <string>method_name</string> </key>
- <value> <string>getAggregateValueList</string> </value>
+ <value> <string>getAggregateRelatedValueList</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_viewAddInvoiceDialog/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_viewAddInvoiceDialog/listbox.xml?rev=10076&r1=10075&r2=10076&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_viewAddInvoiceDialog/listbox.xml (original)
+++ erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_viewAddInvoiceDialog/listbox.xml Mon Sep 18 10:47:30 2006
@@ -340,6 +340,10 @@
<tuple>
<string>title</string>
<string>Title</string>
+ </tuple>
+ <tuple>
+ <string>reference</string>
+ <string>Reference</string>
</tuple>
<tuple>
<string>source_section_title</string>
Modified: erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_viewInvoiceList/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_viewInvoiceList/listbox.xml?rev=10076&r1=10075&r2=10076&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_viewInvoiceList/listbox.xml (original)
+++ erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr_m9/PurchaseInvoiceTransmissionSheet_viewInvoiceList/listbox.xml Mon Sep 18 10:47:30 2006
@@ -569,7 +569,7 @@
<dictionary>
<item>
<key> <string>method_name</string> </key>
- <value> <string>getAggregateValueList</string> </value>
+ <value> <string>getAggregateRelatedValueList</string> </value>
</item>
</dictionary>
</pickle>
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=10076&r1=10075&r2=10076&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/bt/revision Mon Sep 18 10:47:30 2006
@@ -1,1 +1,1 @@
-4
+5
Modified: erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/bt/template_portal_type_base_category_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/bt/template_portal_type_base_category_list?rev=10076&r1=10075&r2=10076&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/bt/template_portal_type_base_category_list (original)
+++ erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/bt/template_portal_type_base_category_list Mon Sep 18 10:47:30 2006
@@ -1,1 +1,2 @@
-Purchase Invoice Transmission Sheet | aggregate
+Purchase Invoice Transaction | aggregate
+Sale Invoice Transaction | aggregate
Modified: erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/bt/version
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/bt/version?rev=10076&r1=10075&r2=10076&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/bt/version (original)
+++ erp5/trunk/bt5/erp5_accounting_l10n_fr_m9/bt/version Mon Sep 18 10:47:30 2006
@@ -1,1 +1,1 @@
-0.1.1
+0.1.2
More information about the Erp5-report
mailing list