[Erp5-report] r16847 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...

[nobody at svn.erp5.org]

Author: romain
Date: Fri Oct  5 10:21:38 2007
New Revision: 16847

URL: http://svn.erp5.org?rev=16847&view=rev
Log:
Keep compatibility with previous implementation.
Do not generate applied related to Production Packing List and Production Report (even if it has to be improve in the futur)

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Delivery_updateAppliedRule.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Delivery_updateAppliedRule.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Delivery_updateAppliedRule.xml?rev=16847&r1=16846&r2=16847&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Delivery_updateAppliedRule.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Delivery_updateAppliedRule.xml Fri Oct  5 10:21:38 2007
@@ -83,6 +83,9 @@
   \'Sale Order\': \'default_order_rule\',\n
   \'Sale Packing List\': \'default_delivery_rule\',\n
   \'Sale Invoice Transaction\': \'default_invoice_rule\',\n
+\n
+  \'Production Packing List\': None,\n
+  \'Production Report\': None,\n
   }\n
 \n
 marker = []\n
@@ -90,8 +93,9 @@
 \n
 if applied_rule is marker:\n
   raise "SimulationError", "No rule defined for %s, see Delivery_updateAppliedRule python script" % delivery_type\n
-\n
-if applied_rule:\n
+elif applied_rule is None:\n
+  pass  \n
+elif applied_rule:\n
   delivery.updateAppliedRule(rule_id=applied_rule, **kw)\n
 </string> </value>
         </item>
@@ -146,6 +150,7 @@
                             <string>delivery</string>
                             <string>_getattr_</string>
                             <string>delivery_type</string>
+                            <string>None</string>
                             <string>applied_rule_dict</string>
                             <string>marker</string>
                             <string>applied_rule</string>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=16847&r1=16846&r2=16847&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Fri Oct  5 10:21:38 2007
@@ -1,1 +1,1 @@
-501
+502