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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2019-08-10 00:14:27 +02:00
commit f752b96a7e
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/product/admin/product.php
View File

@ -556,7 +556,14 @@ if (! empty($conf->fournisseur->enabled)) $rowspan++;
print '<tr class="oddeven">';
print '<td>'.$langs->trans("PricingRule").'</td>';
if (empty($conf->multicompany->enabled))
{
print '<td>'.$langs->trans("PricingRule").'</td>';
}
else
{
print '<td>'.$form->textwithpicto($langs->trans("PricingRule"), $langs->trans("SamePriceAlsoForSharedCompanies"), 1).'</td>';
}
print '<td width="60" class="right">';
$current_rule = 'PRODUCT_PRICE_UNIQ';
if (!empty($conf->global->PRODUIT_MULTIPRICES)) $current_rule='PRODUIT_MULTIPRICES';
@ -564,10 +571,6 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) $current_rule='PRODUI
if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) $current_rule='PRODUIT_CUSTOMER_PRICES';
if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) $current_rule='PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES';
print $form->selectarray("princingrule", $select_pricing_rules, $current_rule);
if ( empty($conf->multicompany->enabled))
{
print $langs->trans("SamePriceAlsoForSharedCompanies");
}
print '</td><td rowspan="'.$rowspan.'" class="nohover right">';
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print '</td>';

2
htdocs/product/card.php
View File

@ -1028,7 +1028,7 @@ else
if ($type == 1)
{
print '<tr><td>'.$langs->trans("Duration").'</td><td colspan="3">';
print '<input name="surface" size="4" value="'.GETPOST('duration_value', 'int').'">';
print '<input name="duration_value" size="4" value="'.GETPOST('duration_value', 'int').'">';
print $formproduct->selectMeasuringUnits("duration_unit", "time", GETPOST('duration_value', 'alpha'), 0, 1);
print '</td></tr>';
}