This commit is contained in:
Laurent Destailleur 2022-08-10 14:32:26 +02:00
parent 9e55377f0a
commit ec042b1701
2 changed files with 12 additions and 3 deletions

View File

@ -464,6 +464,9 @@ if ($id > 0 || $ref) {
if (($action == 'add_price' || $action == 'update_price') && $usercancreate) {
$langs->load("suppliers");
print "<!-- form to add a supplier price -->\n";
print '<br>';
if ($rowid) {
$object->fetch_product_fournisseur_price($rowid, 1); //Ignore the math expression when getting the price
print load_fiche_titre($langs->trans("ChangeSupplierPrice"));
@ -471,7 +474,6 @@ if ($id > 0 || $ref) {
print load_fiche_titre($langs->trans("AddSupplierPrice"));
}
print "<!-- form to add a supplier price -->\n";
print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST">';
print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="action" value="save_price">';

View File

@ -1391,6 +1391,7 @@ if ($action == 'edit_vat' && ($user->rights->produit->creer || $user->rights->se
}
if ($action == 'edit_price' && $object->getRights()->creer) {
print '<br>';
print load_fiche_titre($langs->trans("NewPrice"), '');
if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
@ -1915,14 +1916,17 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
// Form to add a new customer price
$maxpricesupplier = $object->min_recommended_price();
print load_fiche_titre($langs->trans('PriceByCustomer'));
print '<!-- add_customer_price -->';
print load_fiche_titre($langs->trans('AddCustomerPrice'));
print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="action" value="add_customer_price_confirm">';
print '<input type="hidden" name="id" value="'.$object->id.'">';
print '<table class="liste centpercent">';
print '<div class="tabBar tabBarWithBottom">';
print '<table class="border centpercent">';
print '<tr>';
print '<td class="fieldrequired">'.$langs->trans('ThirdParty').'</td>';
print '<td>';
@ -1976,6 +1980,8 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
print '</table>';
print '</div>';
print '<div class="center">';
@ -1992,6 +1998,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
// Edit mode
$maxpricesupplier = $object->min_recommended_price();
print '<!-- edit_customer_price -->';
print load_fiche_titre($langs->trans('PriceByCustomer'));
$result = $prodcustprice->fetch(GETPOST('lineid', 'int'));