[Erp5-report] r33017 kazuhiko - in /erp5/trunk/bt5: erp5_invoicing/SkinTemplateItem/portal_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Feb 23 13:19:23 CET 2010
Author: kazuhiko
Date: Tue Feb 23 13:19:21 2010
New Revision: 33017
URL: http://svn.erp5.org?rev=33017&view=rev
Log:
copy payment conditions from order to packing list, and from packing list to invoice transaction.
Modified:
erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml
erp5/trunk/bt5/erp5_invoicing/bt/revision
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_copyOrderProperties.xml
erp5/trunk/bt5/erp5_trade/bt/revision
Modified: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml?rev=33017&r1=33016&r2=33017&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml [utf8] Tue Feb 23 13:19:21 2010
@@ -53,7 +53,9 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>"""This script is called on the Invoice after the delivery builder has created\n
+ <value> <string encoding="cdata"><![CDATA[
+
+"""This script is called on the Invoice after the delivery builder has created\n
the new Invoice.\n
"""\n
from Products.ERP5Type.Message import translateString\n
@@ -77,8 +79,22 @@
invoice.setResource(invoice.getPriceCurrency())\n
\n
related_packing_list = invoice.getDefaultCausalityValue()\n
-\n
related_order = related_packing_list.getDefaultCausalityValue()\n
+\n
+# copy payment conditions from packing list\n
+# if missing, try to copy from order (for compatibility)\n
+payment_condition_copy_id_list = related_packing_list.contentIds(filter={\'portal_type\':\'Payment Condition\'})\n
+if len(payment_condition_copy_id_list) > 0:\n
+ clipboard = related_packing_list.manage_copyObjects(\n
+ ids=payment_condition_copy_id_list)\n
+ invoice.manage_pasteObjects(clipboard)\n
+elif related_order is not None:\n
+ payment_condition_copy_id_list = related_order.contentIds(filter={\'portal_type\':\'Payment Condition\'})\n
+ if len(payment_condition_copy_id_list) > 0:\n
+ clipboard = related_order.manage_copyObjects(\n
+ ids=payment_condition_copy_id_list)\n
+ invoice.manage_pasteObjects(clipboard)\n
+\n
if related_order is not None:\n
# copy trade condition:\n
if not context.getSpecialise():\n
@@ -113,7 +129,9 @@
# Then an activity should put the causality state in diverged or solved\n
invoice.activate(after_path_and_method_id=(related_simulation_movement_path_list,\n
(\'immediateReindexObject\',\'recursiveImmediateReindexObject\'))).updateCausalityState()\n
-</string> </value>
+
+
+]]></string> </value>
</item>
<item>
<key> <string>_code</string> </key>
@@ -164,6 +182,9 @@
<string>_getattr_</string>
<string>related_packing_list</string>
<string>related_order</string>
+ <string>payment_condition_copy_id_list</string>
+ <string>len</string>
+ <string>clipboard</string>
<string>append</string>
<string>$append0</string>
<string>_getiter_</string>
@@ -171,7 +192,6 @@
<string>invoice_trade_model_line_reference_list</string>
<string>order_trade_model_line_copy_id_list</string>
<string>order_trade_model_line</string>
- <string>clipboard</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_invoicing/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/revision?rev=33017&r1=33016&r2=33017&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] Tue Feb 23 13:19:21 2010
@@ -1,1 +1,1 @@
-339
+340
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_copyOrderProperties.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_copyOrderProperties.xml?rev=33017&r1=33016&r2=33017&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_copyOrderProperties.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_copyOrderProperties.xml [utf8] Tue Feb 23 13:19:21 2010
@@ -53,7 +53,9 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>packing_list = context\n
+ <value> <string encoding="cdata"><![CDATA[
+
+packing_list = context\n
related_order = packing_list.getCausalityValue()\n
\n
if packing_list.getSimulationState() == \'draft\':\n
@@ -61,7 +63,16 @@
comment = related_order.getComment(),\n
title = related_order.getTitle()\n
)\n
-</string> </value>
+\n
+ # copy order\'s payment conditions\n
+ payment_condition_copy_id_list = related_order.contentIds(filter={\'portal_type\':\'Payment Condition\'})\n
+ if len(payment_condition_copy_id_list) > 0:\n
+ clipboard = related_order.manage_copyObjects(\n
+ ids=payment_condition_copy_id_list)\n
+ packing_list.manage_pasteObjects(clipboard)\n
+
+
+]]></string> </value>
</item>
<item>
<key> <string>_code</string> </key>
@@ -101,6 +112,9 @@
<string>packing_list</string>
<string>_getattr_</string>
<string>related_order</string>
+ <string>payment_condition_copy_id_list</string>
+ <string>len</string>
+ <string>clipboard</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=33017&r1=33016&r2=33017&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision [utf8] Tue Feb 23 13:19:21 2010
@@ -1,1 +1,1 @@
-845
+846
More information about the Erp5-report
mailing list