diff --git a/classes/Product.php b/classes/Product.php index 751e63aaf..2aed843c8 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -188,6 +188,12 @@ class ProductCore extends ObjectModel /*** @var array Tags */ public $tags; + /* + * @since 1.5.0 + * @var boolean Product stock management type + */ + public $advanced_stock_management; + public $isFullyLoaded = false; public $cache_is_pack; @@ -4643,17 +4649,17 @@ class ProductCore extends ObjectModel Search::indexation(false, $this->id); return $success; } - + public static function getRealQuantity($id_product, $id_product_attribute = 0, $id_warehouse = 0, $id_shop = null) { static $manager = null; - + if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && is_null($manager)) $manager = StockManagerFactory::getManager(); - + if (is_null($id_shop)) $id_shop = Context::getContext()->shop->getID(true); - + if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && StockAvailable::dependsOnStock($id_product, $id_shop)) return $manager->getProductRealQuantities($id_product, $id_product_attribute, $id_warehouse, true); else diff --git a/classes/ProductSupplier.php b/classes/ProductSupplier.php index 3ef483025..f5e239ccb 100644 --- a/classes/ProductSupplier.php +++ b/classes/ProductSupplier.php @@ -66,13 +66,12 @@ class ProductSupplierCore extends ObjectModel 'table' => 'product_supplier', 'primary' => 'id_product_supplier', 'fields' => array( - 'product_supplier_reference' => array('type' => self::TYPE_INT, 'validate' => 'isReference'), + 'product_supplier_reference' => array('type' => self::TYPE_INT, 'validate' => 'isReference', 'size' => 32), 'id_product' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true), 'id_product_attribute' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true), 'id_supplier' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true), 'product_supplier_price_te' => array('type' => self::TYPE_FLOAT, 'validate' => 'isPrice'), 'id_currency' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'), - 'supplier_reference' => array('type' => self::TYPE_STRING, 'size' => 32), ), );