Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts: htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
This commit is contained in:
commit
c3733a92e1
@ -248,7 +248,7 @@ if (($action == 'add' || $action == 'create') && empty($massaction) && !GETPOST(
|
||||
exit();
|
||||
}
|
||||
|
||||
$prodcomb->variation_weight = $weight_impact;
|
||||
$prodcomb->variation_weight = price2num($weight_impact);
|
||||
|
||||
// for conf PRODUIT_MULTIPRICES
|
||||
if ($conf->global->PRODUIT_MULTIPRICES) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user