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

Merge branch 'develop_declinaison_price_multiple_merge' of github.com:atm-john/dolibarr into develop_declinaison_price_multiple_merge

Browse Source
This commit is contained in:
John Botella 2020-08-13 11:46:07 +02:00
commit 2405082bb1
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/variants/combinations.php
View File

@ -245,7 +245,8 @@ if ($_POST) {
// for conf PRODUIT_MULTIPRICES // for conf PRODUIT_MULTIPRICES
if ($conf->global->PRODUIT_MULTIPRICES) { if ($conf->global->PRODUIT_MULTIPRICES) {
$level_price_impact = array_map('price2num', $level_price_impact); $level_price_impact = array_map('price2num', $level_price_impact);
$level_price_impact_percent = array_map(function($a){ return !empty($a);}, $level_price_impact_percent); $level_price_impact_percent = array_map(function ($a) {
return !empty($a);}, $level_price_impact_percent);
$prodcomb->variation_price = $level_price_impact[1]; $prodcomb->variation_price = $level_price_impact[1];
$prodcomb->variation_price_percentage = (bool) $level_price_impact_percent[1]; $prodcomb->variation_price_percentage = (bool) $level_price_impact_percent[1];
@ -647,7 +648,6 @@ if (!empty($id) || !empty($ref))
for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++)
{ {
print '<tr>'; print '<tr>';
print '<td><label for="level_price_impact_'.$i.'">'.$langs->trans('ImpactOnPriceLevel', $i).'</label>'; print '<td><label for="level_price_impact_'.$i.'">'.$langs->trans('ImpactOnPriceLevel', $i).'</label>';
if ($i===1){ if ($i===1){