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

Look and feel v15

Browse Source
This commit is contained in:
Laurent Destailleur 2022-03-14 11:29:17 +01:00
parent 6ffa4fa7ce
commit 4b3b9ed66b
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/langs/en_US/products.lang
View File

@ -137,7 +137,8 @@ ConfirmDeleteProductLine=Are you sure you want to delete this product line?
ProductSpecial=Special ProductSpecial=Special
QtyMin=Min. purchase quantity QtyMin=Min. purchase quantity
PriceQtyMin=Price quantity min. PriceQtyMin=Price quantity min.
PriceQtyMinCurrency=Price (currency) for this qty. (no discount) PriceQtyMinCurrency=Price (currency) for this qty.
WithoutDiscount=Without discount
VATRateForSupplierProduct=VAT Rate (for this vendor/product) VATRateForSupplierProduct=VAT Rate (for this vendor/product)
DiscountQtyMin=Discount for this qty. DiscountQtyMin=Discount for this qty.
NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product

5
htdocs/product/composition/card.php
View File

@ -266,6 +266,11 @@ if ($id > 0 || !empty($ref)) {
print dol_get_fiche_end(); print dol_get_fiche_end();
print '<div class="fichecenter">';
print '<div class="underbanner clearboth"></div>';
print '</div>';
print '<br>'; print '<br>';
$prodsfather = $object->getFather(); // Parent Products $prodsfather = $object->getFather(); // Parent Products

8
htdocs/product/fournisseurs.php
View File

@ -523,7 +523,9 @@ if ($id > 0 || $ref) {
$reshook = $hookmanager->executeHooks('formCreateThirdpartyOptions', $parameters, $object, $action); $reshook = $hookmanager->executeHooks('formCreateThirdpartyOptions', $parameters, $object, $action);
if (empty($reshook)) { if (empty($reshook)) {
if (empty($form->result)) { if (empty($form->result)) {
print ' - <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&type=f&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id.'&action='.$action).'">'.$langs->trans("CreateDolibarrThirdPartySupplier").'</a>'; print '<a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&type=f&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id.'&action='.$action).'">';
print img_picto($langs->trans("CreateDolibarrThirdPartySupplier"), 'add', 'class="marginleftonly"');
print '</a>';
} }
} }
} }
@ -665,7 +667,7 @@ if ($id > 0 || $ref) {
print '</tr>'; print '</tr>';
// Currency price qty min // Currency price qty min
print '<tr><td class="fieldrequired">'.$langs->trans("PriceQtyMinCurrency").'</td>'; print '<tr><td class="fieldrequired">'.$form->textwithpicto($langs->trans("PriceQtyMinCurrency"), $langs->transnoentitiesnoconv("WithoutDiscount")).'</td>';
$pricesupplierincurrencytouse = (GETPOST('multicurrency_price') ? GETPOST('multicurrency_price') : (isset($object->fourn_multicurrency_price) ? $object->fourn_multicurrency_price : '')); $pricesupplierincurrencytouse = (GETPOST('multicurrency_price') ? GETPOST('multicurrency_price') : (isset($object->fourn_multicurrency_price) ? $object->fourn_multicurrency_price : ''));
print '<td><input class="flat" name="multicurrency_price" size="8" value="'.price($pricesupplierincurrencytouse).'">'; print '<td><input class="flat" name="multicurrency_price" size="8" value="'.price($pricesupplierincurrencytouse).'">';
print '&nbsp;'; print '&nbsp;';
@ -673,7 +675,7 @@ if ($id > 0 || $ref) {
print '</td></tr>'; print '</td></tr>';
// Price qty min // Price qty min
print '<tr><td class="fieldrequired">'.$langs->trans("PriceQtyMin").'</td>'; print '<tr><td class="fieldrequired">'.$form->textwithpicto($langs->trans("PriceQtyMin"), $langs->transnoentitiesnoconv("WithoutDiscount")).'</td>';
print '<td><input class="flat" name="disabled_price" size="8" value="">'; print '<td><input class="flat" name="disabled_price" size="8" value="">';
print '<input type="hidden" name="price" value="">'; print '<input type="hidden" name="price" value="">';
print '<input type="hidden" name="price_base_type" value="">'; print '<input type="hidden" name="price_base_type" value="">';