lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2023-04-05 01:47:50 +02:00
commit c7f742e361
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/core/modules/modProduct.class.php
View File

@ -748,6 +748,32 @@ class modProduct extends DolibarrModules
$this->import_updatekeys_array[$r] = array_merge($this->import_updatekeys_array[$r], array('p.barcode'=>'BarCode')); //only show/allow barcode as update key if Barcode module enabled $this->import_updatekeys_array[$r] = array_merge($this->import_updatekeys_array[$r], array('p.barcode'=>'BarCode')); //only show/allow barcode as update key if Barcode module enabled
} }
if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE)) {
// Import products limit and desired stock by product and warehouse
$r++;
$this->import_code[$r] = $this->rights_class.'_stock_by_warehouse';
$this->import_label[$r] = "ProductStockWarehouse"; // Translation key
$this->import_icon[$r] = $this->picto;
$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
$this->import_tables_array[$r] = array('pwp'=>MAIN_DB_PREFIX.'product_warehouse_properties');
$this->import_fields_array[$r] = array('pwp.fk_product'=>"Product*",
'pwp.fk_entrepot'=>"Warehouse*", 'pwp.seuil_stock_alerte'=>"StockLimit",
'pwp.desiredstock'=>"DesiredStock");
$this->import_regex_array[$r] = array(
'pwp.fk_product' => 'rowid@'.MAIN_DB_PREFIX.'product',
'pwp.fk_entrepot' => 'rowid@'.MAIN_DB_PREFIX.'entrepot',
);
$this->import_convertvalue_array[$r] = array(
'pwp.fk_product'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/class/product.class.php', 'class'=>'Product', 'method'=>'fetch', 'element'=>'Product')
,'pwp.fk_entrepot'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/stock/class/entrepot.class.php', 'class'=>'Entrepot', 'method'=>'fetch', 'element'=>'Entrepot')
);
$this->import_examplevalues_array[$r] = array('pwp.fk_product'=>"ref:PRODUCT_REF or id:123456",
'pwp.fk_entrepot'=>"ref:WAREHOUSE_REF or id:123456",
'pwp.seuil_stock_alerte'=>"100",
'pwp.desiredstock'=>"110"
);
$this->import_updatekeys_array[$r] = array('pwp.fk_product'=>'Product', 'pwp.fk_entrepot'=>'Warehouse');
}
if ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) { if ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) {
// Import suppliers prices (note: this code is duplicated in module Service) // Import suppliers prices (note: this code is duplicated in module Service)

1
htdocs/langs/en_US/stocks.lang
View File

@ -177,6 +177,7 @@ OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a prod
ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
ProductStockWarehouse=Stock limit for alert and desired optimal stock by product and warehouse
AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
AddStockLocationLine=Decrease quantity then click to split the line AddStockLocationLine=Decrease quantity then click to split the line
InventoryDate=Inventory date InventoryDate=Inventory date