[Erp5-report] r22825 - in /erp5/trunk/bt5/erp5_invoicing: SkinTemplateItem/portal_skins/erp...

[nobody at svn.erp5.org]

Author: jerome
Date: Fri Aug  1 15:15:04 2008
New Revision: 22825

URL: http://svn.erp5.org?rev=22825&view=rev
Log:
the order's trade condition

Modified:
    erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml
    erp5/trunk/bt5/erp5_invoicing/bt/revision

Modified: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml?rev=22825&r1=22824&r2=22825&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml Fri Aug  1 15:15:04 2008
@@ -105,7 +105,14 @@
     invoice.edit(\n
        resource=price_currency,\n
        price_currency=price_currency,)\n
-  \n
+\n
+\n
+# copy trade condition:\n
+if not context.getSpecialise():\n
+  related_order = related_packing_list.getDefaultCausalityValue()\n
+  if related_order is not None:\n
+    context.edit(specialise=related_order.getSpecialise())\n
+\n
 # copy title, if not updating a new delivery\n
 if not invoice.getTitle():\n
   invoice.setTitle(related_packing_list.getTitle())\n
@@ -217,6 +224,12 @@
             <value> <string>InvoiceTransaction_postGenerationActivity</string> </value>
         </item>
         <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
             <key> <string>warnings</string> </key>
             <value>
               <tuple/>

Modified: erp5/trunk/bt5/erp5_invoicing/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/revision?rev=22825&r1=22824&r2=22825&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/revision (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/revision Fri Aug  1 15:15:04 2008
@@ -1,1 +1,1 @@
-115
+117