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

Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2023-03-29 16:32:19 +02:00
commit bfa531c724
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/fourn/class/fournisseur.product.class.php
View File

@ -1253,7 +1253,7 @@ class ProductFournisseur extends Product
$label .= $this->displayPriceProductFournisseurLog($logPrices);
}
$url = DOL_URL_ROOT.'/product/fournisseurs.php?id='.((int) $this->id).'&action=add_price&token='.newToken().'&socid='.((int) $this->fourn_id).'&rowid='.((int) $this->product_fourn_price_id);
$url = DOL_URL_ROOT.'/product/fournisseurs.php?id='.((int) $this->id).'&action=create_price&token='.newToken().'&socid='.((int) $this->fourn_id).'&rowid='.((int) $this->product_fourn_price_id);
if ($option != 'nolink') {
// Add param to save lastsearch_values or not

10
htdocs/product/fournisseurs.php
View File

@ -346,7 +346,7 @@ if (empty($reshook)) {
$db->rollback();
}
} else {
$action = 'add_price';
$action = 'create_price';
}
}
}
@ -467,7 +467,7 @@ if ($id > 0 || $ref) {
// Form to add or update a price
if (($action == 'add_price' || $action == 'update_price') && $usercancreate) {
if (($action == 'create_price' || $action == 'update_price') && $usercancreate) {
$langs->load("suppliers");
print "<!-- form to add a supplier price -->\n";
@ -507,7 +507,7 @@ if ($id > 0 || $ref) {
$reshook = $hookmanager->executeHooks('formCreateThirdpartyOptions', $parameters, $object, $action);
if (empty($reshook)) {
if (empty($form->result)) {
print '<a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&type=f&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.((int) $object->id).'&action='.urlencode($action).($action == 'add_price' ? '&token='.newToken() : '')).'">';
print '<a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&type=f&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.((int) $object->id).'&action='.urlencode($action).($action == 'create_price' ? '&token='.newToken() : '')).'">';
print img_picto($langs->trans("CreateDolibarrThirdPartySupplier"), 'add', 'class="marginleftonly"');
print '</a>';
}
@ -904,12 +904,12 @@ END;
print '<div class="tabsAction">'."\n";
if ($action != 'add_price' && $action != 'update_price') {
if ($action != 'create_price' && $action != 'update_price') {
$parameters = array();
$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
if (empty($reshook)) {
if ($usercancreate) {
print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/fournisseurs.php?id='.((int) $object->id).'&action=add_price&token='.newToken().'">';
print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/fournisseurs.php?id='.((int) $object->id).'&action=create_price&token='.newToken().'">';
print $langs->trans("AddSupplierPrice").'</a>';
}
}