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 939630681324f9b8d0a6a65411c3e19d091c2dd5..72cd412d0e4e6b618ba9d22e8429404b7a6ba4e7 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 c0db21d808434d1d2d318e959bc4c7c190a76dcf..cbafdca534b6a2ba9e4ac1da16571516aa607b2d 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 03565659b920dc5a394b541b3dc2e0b1aab36ac2..3600c8c57531775b0d739508d3db1d8029dc9cd2 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 22f006b2edbc8f6ae5b8c9c60366dc2dbc5a4378..1e9e27a304f69c80eda901d6af35598fd2d9d964 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 e41e206837f42d05d8280bfb5408205826a8b5d7..734e4293170b18b20b947fb0488ad40b30a2662f 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 03565659b920dc5a394b541b3dc2e0b1aab36ac2..3600c8c57531775b0d739508d3db1d8029dc9cd2 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 96847c78aa8eff569d31cc872e423a9c670a5fe8..f481a0b56656e243c30f85538acc0a3ccfe3b4bb 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 68ebdb1175ce5ff82892a60568e3eb381331f5d5..35a92804635faaa053a550d3bf37ab9ecc6fea40 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 df9a55fe9c015d4d93359a5b671576c913bc8f5b..61f63425cfbcba0da87a716b1c0dd5f4603b5275 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 d0f3cba2771262c7ac0df0c435435d0c1c66f092..bcf8aa27839e89a3efd96bb47c537f0159a7476d 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 03565659b920dc5a394b541b3dc2e0b1aab36ac2..3600c8c57531775b0d739508d3db1d8029dc9cd2 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 96847c78aa8eff569d31cc872e423a9c670a5fe8..f481a0b56656e243c30f85538acc0a3ccfe3b4bb 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 68ebdb1175ce5ff82892a60568e3eb381331f5d5..35a92804635faaa053a550d3bf37ab9ecc6fea40 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 df9a55fe9c015d4d93359a5b671576c913bc8f5b..61f63425cfbcba0da87a716b1c0dd5f4603b5275 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 a2af9cd732ec3d8f5fd0fe4557570f07d1da7d9f..4306711c1e895ed8daf08a71c085c380c0c181e0 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 87d78b292a2cd276be148291b1418e5637d7bcc7..871cae9aa662ba186a3a1da42301a2cfbbaea7e0 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 448625ee0086ceb9d756adc181ac41ddbd1214d9..43dc655156c280d0b6ffb02175e33872f3757487 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 a3b700e35c6f3d55f779681224428b28df9b4860..9946a7c49640a51a4c02115d8b7f45ec61dfa9c6 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 38017008e6f8d020fcc2f5c3e05b959f7369008f..0552576c870884d40c4101e045c07fcf945e552e 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