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

[nobody at svn.erp5.org]

Author: alex
Date: Fri Dec 21 11:57:40 2007
New Revision: 18468

URL: http://svn.erp5.org?rev=18468&view=rev
Log:
Invoicing Rule should only be applied if both source_section and destination_section are defined on the simulation movement and are different from each other.

Added:
    erp5/trunk/bt5/erp5_invoicing/bt/template_catalog_datetime_key_list
Modified:
    erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml
    erp5/trunk/bt5/erp5_invoicing/bt/revision

Modified: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml?rev=18468&r1=18467&r2=18468&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml Fri Dec 21 11:57:40 2007
@@ -70,9 +70,16 @@
 parent = movement.getParentValue()\n
 if parent.getPortalType() == \'Applied Rule\':\n
   parent_rule = parent.getSpecialiseValue()\n
-  if parent_rule.getPortalType() in [\'Order Rule\', \'Delivery Rule\']:\n
-    return True\n
-return False\n
+  if parent_rule.getPortalType() not in [\'Order Rule\', \'Delivery Rule\']:\n
+    return False\n
+\n
+source_section = movement.getSourceSection()\n
+destination_section = movement.getDestinationSection()\n
+if source_section == destination_section or source_section is None \\\n
+    or destination_section is None:\n
+  return False\n
+\n
+return True\n
 </string> </value>
         </item>
         <item>
@@ -127,8 +134,11 @@
                             <string>_getattr_</string>
                             <string>parent</string>
                             <string>parent_rule</string>
+                            <string>False</string>
+                            <string>source_section</string>
+                            <string>destination_section</string>
+                            <string>None</string>
                             <string>True</string>
-                            <string>False</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=18468&r1=18467&r2=18468&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/revision (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/revision Fri Dec 21 11:57:40 2007
@@ -1,1 +1,1 @@
-10
+11

Added: erp5/trunk/bt5/erp5_invoicing/bt/template_catalog_datetime_key_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/template_catalog_datetime_key_list?rev=18468&view=auto
==============================================================================
    (empty)