[Erp5-report] r26211 - in /erp5/trunk/bt5/erp5_invoicing: WorkflowTemplateItem/portal_workf...

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Mar 31 16:15:53 2009
New Revision: 26211

URL: http://svn.erp5.org?rev=26211&view=rev
Log:
just like when setting price, only set a destination/source account on the movement only if it's not already present

Modified:
    erp5/trunk/bt5/erp5_invoicing/WorkflowTemplateItem/portal_workflow/delivery_movement_account_interaction_workflow/scripts/copySourceAndDestinationAccount.xml
    erp5/trunk/bt5/erp5_invoicing/bt/revision

Modified: erp5/trunk/bt5/erp5_invoicing/WorkflowTemplateItem/portal_workflow/delivery_movement_account_interaction_workflow/scripts/copySourceAndDestinationAccount.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/WorkflowTemplateItem/portal_workflow/delivery_movement_account_interaction_workflow/scripts/copySourceAndDestinationAccount.xml?rev=26211&r1=26210&r2=26211&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/WorkflowTemplateItem/portal_workflow/delivery_movement_account_interaction_workflow/scripts/copySourceAndDestinationAccount.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/WorkflowTemplateItem/portal_workflow/delivery_movement_account_interaction_workflow/scripts/copySourceAndDestinationAccount.xml [utf8] Tue Mar 31 16:15:53 2009
@@ -57,17 +57,19 @@
 \n
 searchPredicateList = line.getPortalObject().portal_domains.searchPredicateList\n
 \n
-for predicate in searchPredicateList(\n
+if not line.getDestinationAccount():\n
+  for predicate in searchPredicateList(\n
                     context=line, portal_type=\'Purchase Supply Line\'):\n
-  if predicate.getDestinationAccount():\n
-    line.setDestinationAccount(predicate.getDestinationAccount())\n
-    break\n
+    if predicate.getDestinationAccount():\n
+      line.setDestinationAccount(predicate.getDestinationAccount())\n
+      break\n
 \n
-for predicate in searchPredicateList(\n
+if not line.getSourceAccount():\n
+  for predicate in searchPredicateList(\n
                     context=line, portal_type=\'Sale Supply Line\'):\n
-  if predicate.getSourceAccount():\n
-    line.setSourceAccount(predicate.getSourceAccount())\n
-    break\n
+    if predicate.getSourceAccount():\n
+      line.setSourceAccount(predicate.getSourceAccount())\n
+      break\n
 </string> </value>
         </item>
         <item>

Modified: erp5/trunk/bt5/erp5_invoicing/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/revision?rev=26211&r1=26210&r2=26211&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] Tue Mar 31 16:15:53 2009
@@ -1,1 +1,1 @@
-226
+227