From aaf7389520189c7cdf4b836bc9e7ed9edcd8793f Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Fri, 12 Jun 2009 20:01:52 +0000
Subject: [PATCH] use omit_optional_variation instead of
 omit_option_base_category to suppress deprecation warnings.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27549 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../erp5_mrp/ProductionReportLine_asCellRange.xml             | 2 +-
 bt5/erp5_mrp/bt/revision                                      | 2 +-
 .../my_p_variation_base_category_list.xml                     | 2 +-
 ...my_purchase_supply_line_p_variation_base_category_list.xml | 4 ++--
 .../my_sale_supply_line_p_variation_base_category_list.xml    | 4 ++--
 .../my_p_variation_base_category_list.xml                     | 2 +-
 .../my_discount_ratio_variation_base_category_list.xml        | 2 +-
 ..._exclusive_discount_ratio_variation_base_category_list.xml | 2 +-
 .../my_surcharge_ratio_variation_base_category_list.xml       | 2 +-
 .../portal_skins/erp5_pdm/SupplyLine_asCellRange.xml          | 2 +-
 .../my_p_variation_base_category_list.xml                     | 2 +-
 .../my_discount_ratio_variation_base_category_list.xml        | 2 +-
 ..._exclusive_discount_ratio_variation_base_category_list.xml | 2 +-
 .../my_surcharge_ratio_variation_base_category_list.xml       | 2 +-
 .../my_p_variation_base_category_list.xml                     | 4 ++--
 bt5/erp5_pdm/bt/revision                                      | 2 +-
 .../portal_skins/erp5_trade/ContainerLine_asCellRange.xml     | 2 +-
 .../erp5_trade/DeliveryLine_hashVariationCategoryItemList.xml | 2 +-
 bt5/erp5_trade/bt/revision                                    | 2 +-
 19 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionReportLine_asCellRange.xml b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionReportLine_asCellRange.xml
index 9396306813..72cd412d0e 100644
--- a/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionReportLine_asCellRange.xml
+++ b/bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionReportLine_asCellRange.xml
@@ -59,7 +59,7 @@ resource = context.getResourceValue()\n
 cell_range = []\n
 if resource is not None:\n
   base_category_list = resource.getVariationBaseCategoryList(\n
-                                             omit_option_base_category=1)\n
+                                             omit_optional_variation=1)\n
 \n
   for base_category in base_category_list:\n
     if matrixbox == 1:\n
diff --git a/bt5/erp5_mrp/bt/revision b/bt5/erp5_mrp/bt/revision
index c0db21d808..cbafdca534 100644
--- a/bt5/erp5_mrp/bt/revision
+++ b/bt5/erp5_mrp/bt/revision
@@ -1 +1 @@
-392
\ No newline at end of file
+393
\ No newline at end of file
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_p_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_p_variation_base_category_list.xml
index 03565659b9..3600c8c575 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_p_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_viewBasePrice/my_p_variation_base_category_list.xml
@@ -128,7 +128,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_option_base_category=1)</string> </value>
+            <value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_optional_variation=1)</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_p_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_p_variation_base_category_list.xml
index 22f006b2ed..1e9e27a304 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_p_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultPurchaseSupplyLine/my_purchase_supply_line_p_variation_base_category_list.xml
@@ -135,7 +135,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: here.getVariationBaseCategoryItemList(omit_option_base_category=1)</string> </value>
+            <value> <string>python: here.getVariationBaseCategoryItemList(omit_optional_variation=1)</string> </value>
         </item>
       </dictionary>
     </pickle>
@@ -151,7 +151,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: here.getVariationBaseCategoryItemList(omit_option_base_category=1)</string> </value>
+            <value> <string>python: here.getVariationBaseCategoryItemList(omit_optional_variation=1)</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_p_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_p_variation_base_category_list.xml
index e41e206837..734e429317 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_p_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewDefaultSaleSupplyLine/my_sale_supply_line_p_variation_base_category_list.xml
@@ -135,7 +135,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: here.getVariationBaseCategoryItemList(omit_option_base_category=1)</string> </value>
+            <value> <string>python: here.getVariationBaseCategoryItemList(omit_optional_variation=1)</string> </value>
         </item>
       </dictionary>
     </pickle>
@@ -151,7 +151,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: here.getVariationBaseCategoryItemList(omit_option_base_category=1)</string> </value>
+            <value> <string>python: here.getVariationBaseCategoryItemList(omit_optional_variation=1)</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_p_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_p_variation_base_category_list.xml
index 03565659b9..3600c8c575 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_p_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewBasePrice/my_p_variation_base_category_list.xml
@@ -128,7 +128,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_option_base_category=1)</string> </value>
+            <value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_optional_variation=1)</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_discount_ratio_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_discount_ratio_variation_base_category_list.xml
index 96847c78aa..f481a0b566 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_discount_ratio_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewDiscountRatio/my_discount_ratio_variation_base_category_list.xml
@@ -128,7 +128,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_option_base_category=1)</string> </value>
+            <value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_optional_variation=1)</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_variation_base_category_list.xml
index 68ebdb1175..35a9280463 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_variation_base_category_list.xml
@@ -128,7 +128,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_option_base_category=1)</string> </value>
+            <value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_optional_variation=1)</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_surcharge_ratio_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_surcharge_ratio_variation_base_category_list.xml
index df9a55fe9c..61f63425cf 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_surcharge_ratio_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_viewSurchargeRatio/my_surcharge_ratio_variation_base_category_list.xml
@@ -128,7 +128,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_option_base_category=1)</string> </value>
+            <value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_optional_variation=1)</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_asCellRange.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_asCellRange.xml
index d0f3cba277..bcf8aa2783 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_asCellRange.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_asCellRange.xml
@@ -67,7 +67,7 @@ if option_variation==1:\n
   # Get option base category list\n
   add_predicate = 0\n
   no_option_base_category_list = context.getVariationRangeBaseCategoryList(\n
-                                                 omit_option_base_category=1)\n
+                                                 omit_optional_variation=1)\n
   base_category_list = context.getVariationRangeBaseCategoryList()\n
   option_base_category_list = [x for x in base_category_list \\\n
                                if x not in no_option_base_category_list]\n
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_p_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_p_variation_base_category_list.xml
index 03565659b9..3600c8c575 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_p_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewBasePrice/my_p_variation_base_category_list.xml
@@ -128,7 +128,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_option_base_category=1)</string> </value>
+            <value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_optional_variation=1)</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_discount_ratio_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_discount_ratio_variation_base_category_list.xml
index 96847c78aa..f481a0b566 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_discount_ratio_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewDiscountRatio/my_discount_ratio_variation_base_category_list.xml
@@ -128,7 +128,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_option_base_category=1)</string> </value>
+            <value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_optional_variation=1)</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_variation_base_category_list.xml
index 68ebdb1175..35a9280463 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewExclusiveDiscountRatio/my_exclusive_discount_ratio_variation_base_category_list.xml
@@ -128,7 +128,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_option_base_category=1)</string> </value>
+            <value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_optional_variation=1)</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_surcharge_ratio_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_surcharge_ratio_variation_base_category_list.xml
index df9a55fe9c..61f63425cf 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_surcharge_ratio_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_viewSurchargeRatio/my_surcharge_ratio_variation_base_category_list.xml
@@ -128,7 +128,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_option_base_category=1)</string> </value>
+            <value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_optional_variation=1)</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_p_variation_base_category_list.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_p_variation_base_category_list.xml
index a2af9cd732..4306711c1e 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_p_variation_base_category_list.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Supply_viewFieldLibrary/my_p_variation_base_category_list.xml
@@ -271,7 +271,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: here.getVariationBaseCategoryItemList(omit_option_base_category=1)</string> </value>
+            <value> <string>python: here.getVariationBaseCategoryItemList(omit_optional_variation=1)</string> </value>
         </item>
       </dictionary>
     </pickle>
@@ -287,7 +287,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: here.getVariationBaseCategoryItemList(omit_option_base_category=1)</string> </value>
+            <value> <string>python: here.getVariationBaseCategoryItemList(omit_optional_variation=1)</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_pdm/bt/revision b/bt5/erp5_pdm/bt/revision
index 87d78b292a..871cae9aa6 100644
--- a/bt5/erp5_pdm/bt/revision
+++ b/bt5/erp5_pdm/bt/revision
@@ -1 +1 @@
-322
\ No newline at end of file
+323
\ No newline at end of file
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_asCellRange.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_asCellRange.xml
index 448625ee00..43dc655156 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_asCellRange.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_asCellRange.xml
@@ -58,7 +58,7 @@
 resource = context.getResourceValue()\n
 cell_range = []\n
 if resource is not None:\n
-  base_category_list = resource.getVariationBaseCategoryList(omit_option_base_category=1)\n
+  base_category_list = resource.getVariationBaseCategoryList(omit_optional_variation=1)\n
 \n
   for base_category in base_category_list:\n
     if matrixbox == 1:\n
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_hashVariationCategoryItemList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_hashVariationCategoryItemList.xml
index a3b700e35c..9946a7c496 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_hashVariationCategoryItemList.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_hashVariationCategoryItemList.xml
@@ -62,7 +62,7 @@ split_depth = 1\n
 resource = context.getResourceValue()\n
 if resource is not None:\n
   not_option_base_category_list = resource.getVariationBaseCategoryList(\n
-                                                 omit_option_base_category=1)\n
+                                                 omit_optional_variation=1)\n
 else :\n
   not_option_base_category_list = ()\n
 \n
diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision
index 38017008e6..0552576c87 100644
--- a/bt5/erp5_trade/bt/revision
+++ b/bt5/erp5_trade/bt/revision
@@ -1 +1 @@
-668
\ No newline at end of file
+669
\ No newline at end of file
-- 
2.30.9