Index: core/install/install_schema.sql =================================================================== --- core/install/install_schema.sql +++ core/install/install_schema.sql @@ -267,7 +267,7 @@ `Name` varchar(255) NOT NULL DEFAULT '', Description varchar(255) DEFAULT NULL, CreatedOn int(10) unsigned DEFAULT NULL, - System tinyint(4) NOT NULL DEFAULT '0', + `System` tinyint(4) NOT NULL DEFAULT '0', Personal tinyint(4) NOT NULL DEFAULT '0', Enabled tinyint(4) NOT NULL DEFAULT '1', FrontRegistration tinyint(3) unsigned NOT NULL DEFAULT '0', Index: modules/in-commerce/units/products/products_config.php =================================================================== --- modules/in-commerce/units/products/products_config.php +++ modules/in-commerce/units/products/products_config.php @@ -547,7 +547,7 @@ 'QtyOnOrder' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'InventoryComment' => Array ('type' => 'string', 'default' => null), 'Qty' => Array ('type' => 'int', 'formatter' => 'kFormatter', 'regexp' => '/^[\d]+$/', 'error_msgs' => Array ('invalid_format' => '!la_invalid_integer!')), - 'AccessGroupId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'UserGroups WHERE System!=1 AND Personal !=1 ORDER BY Name', 'option_key_field' => 'GroupId', 'option_title_field' => 'Name', 'default' => NULL), + 'AccessGroupId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'UserGroups WHERE `System`!=1 AND Personal !=1 ORDER BY Name', 'option_key_field' => 'GroupId', 'option_title_field' => 'Name', 'default' => NULL), 'AccessDuration' => Array ('type' => 'int', 'default' => NULL), 'AccessDurationType' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' =>Array (1 => 'la_opt_sec', 2 => 'la_opt_min', 3 => 'la_opt_hour', 4 => 'la_opt_day', 5 => 'la_opt_week', 6 => 'la_opt_month', 7 => 'la_opt_year' ), 'default' => NULL,), 'AccessStart' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), Index: modules/in-commerce/units/products/products_event_handler.php =================================================================== --- modules/in-commerce/units/products/products_event_handler.php +++ modules/in-commerce/units/products/products_event_handler.php @@ -667,7 +667,7 @@ } // products from package: end - $object->addFilter('not_virtual', '%1$s.Virtual = 0'); + $object->addFilter('not_virtual', '%1$s.`Virtual` = 0'); if ( !$this->Application->isAdminUser ) { $object->addFilter('expire_filter', '%1$s.Expire IS NULL OR %1$s.Expire > ' . adodb_mktime());