Index: branches/5.0.x/in-commerce/units/product_option_combinations/product_option_combinations_config.php
===================================================================
diff -u -r12674 -r12699
--- branches/5.0.x/in-commerce/units/product_option_combinations/product_option_combinations_config.php (.../product_option_combinations_config.php) (revision 12674)
+++ branches/5.0.x/in-commerce/units/product_option_combinations/product_option_combinations_config.php (.../product_option_combinations_config.php) (revision 12699)
@@ -1,6 +1,6 @@
Array (
'CombinationId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0, ),
'ProductId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0, ),
- 'Combination' => Array('type' => 'string', 'required' => 1, 'formatter' => 'kCombinationFormatter', 'format'=>"%s: %s
", 'not_null' => 1, 'default' => '', ),
+ 'Combination' => Array('type' => 'string', 'required' => 1, 'formatter' => 'kCombinationFormatter', 'format'=>"%s: %s
", 'default' => NULL),
'CombinationCRC' => Array('type' => 'int', 'not_null' => 1, 'default' => 0, ),
'PriceType' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Txt_=', 2 => 'la_Flat', 3 => 'la_Percent'), 'use_phrases' => 1, 'default' => 3, ),
'Price' => Array('type' => 'float', 'required' => 1, 'formatter' => 'kFormatter', 'default' => '', ),