Fix a problem with apply trade condition, with the previous changes it was not...

Fix a problem with apply trade condition, with the previous changes it was not able to find a trade condition if no categories were defined on the order.
Also change the weighting method so that mirror node and mirror section only add weight if they correspond to what's defined on the order.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25178 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_applyPurchaseTradeCondition.xml

@@ -71,7 +71,7 @@ for base_category in (\'destination_section\', \'destination\',\n
   if context.getProperty(base_category):\n
     tested_base_category_list.append(base_category)\n
 \n
-count = len(tested_base_category_list)\n
+count = len(tested_base_category_list) + 1\n
 \n
 # if no date is defined, use today\'s date to retrieve predicate that define start_date_range_min/max\n
 if order.getStartDate() is None:\n
@@ -81,10 +81,18 @@ else:\n
 \n
 def rank_method(trade_condition):\n
   rank = 0\n
-  if trade_condition.getSourceSection():\n
-    rank += 10\n
-  if trade_condition.getSource():\n
-    rank += 10\n
+  source_section = trade_condition.getSourceSection()\n
+  if source_section:\n
+    if source_section == context.getSourceSection():\n
+      rank += 10\n
+    else:\n
+      rank -= 2\n
+  source = trade_condition.getSource()\n
+  if source:\n
+    if source == context.getSource():\n
+      rank += 10\n
+    else:\n
+      rank -= 2\n
   if trade_condition.getDestinationSection():\n
     rank += 1\n
   if trade_condition.getDestination():\n
@@ -96,11 +104,11 @@ def sort_method(a, b):\n
   return -cmp(rank_method(a), rank_method(b))\n
 \n
 while count > 0 and len(trade_condition_list) == 0:\n
+  count -= 1\n
   trade_condition_list = context.portal_domains.searchPredicateList(\n
       predicate_context, portal_type=trade_condition_portal_type,\n
       tested_base_category_list=tested_base_category_list[:count],\n
       sort_method=sort_method)\n
-  count -= 1\n
 \n
 if len(trade_condition_list ) == 0 :\n
   message = Base_translateString(\'No trade condition.\')\n
@@ -172,8 +180,8 @@ if not batch_mode:\n
                             <string>predicate_context</string>
                             <string>rank_method</string>
                             <string>sort_method</string>
-                            <string>_getitem_</string>
                             <string>_inplacevar_</string>
+                            <string>_getitem_</string>
                             <string>message</string>
                             <string>trade_condition</string>
                             <string>dict</string>

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml

@@ -71,7 +71,7 @@ for base_category in (\'source_section\', \'source\',\n
   if context.getProperty(base_category):\n
     tested_base_category_list.append(base_category)\n
 \n
-count = len(tested_base_category_list)\n
+count = len(tested_base_category_list) + 1\n
 \n
 # if no date is defined, use today\'s date to retrieve predicate that define start_date_range_min/max\n
 if order.getStartDate() is None:\n
@@ -81,10 +81,18 @@ else:\n
 \n
 def rank_method(trade_condition):\n
   rank = 0\n
-  if trade_condition.getDestinationSection():\n
-    rank += 10\n
-  if trade_condition.getDestination():\n
-    rank += 10\n
+  destination_section = trade_condition.getDestinationSection()\n
+  if destination_section:\n
+    if destination_section == context.getDestinationSection():\n
+      rank += 10\n
+    else:\n
+      rank -= 2\n
+  destination = trade_condition.getDestination()\n
+  if destination:\n
+    if destination == context.getDestination():\n
+      rank += 10\n
+    else:\n
+      rank -= 2\n
   if trade_condition.getSourceSection():\n
     rank += 1\n
   if trade_condition.getSource():\n
@@ -96,11 +104,11 @@ def sort_method(a, b):\n
   return -cmp(rank_method(a), rank_method(b))\n
 \n
 while count > 0 and len(trade_condition_list) == 0:\n
+  count -= 1\n
   trade_condition_list = context.portal_domains.searchPredicateList(\n
       predicate_context, portal_type=trade_condition_portal_type,\n
       tested_base_category_list=tested_base_category_list[:count],\n
       sort_method=sort_method)\n
-  count -= 1\n
 \n
 if len(trade_condition_list ) == 0:\n
   message = Base_translateString(\'No trade condition.\')\n
@@ -175,8 +183,8 @@ if not batch_mode:\n
                             <string>predicate_context</string>
                             <string>rank_method</string>
                             <string>sort_method</string>
-                            <string>_getitem_</string>
                             <string>_inplacevar_</string>
+                            <string>_getitem_</string>
                             <string>message</string>
                             <string>trade_condition</string>
                             <string>hasattr</string>

bt5/erp5_trade/bt/revision

-567
\ No newline at end of file
+568
\ No newline at end of file