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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2022-08-10 18:34:52 +02:00
commit 6d12caae98
5 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/product/fournisseurs.php
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">';

1
htdocs/product/popuprop.php
View File

@ -229,6 +229,7 @@ if ($mode && $mode != '-1') {
}
}
$tmpproduct->id = $prodid;
$tmpproduct->ref = $vals['ref'];
$tmpproduct->label = $vals['label'];
$tmpproduct->type = $vals['type'];

11
htdocs/product/price.php
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'));

7
htdocs/product/stock/replenish.php
View File

@ -623,7 +623,7 @@ if (empty($reshook)) {
}
print '<div class="inline-block valignmiddle">';
print '<input type="submit" class="button small" name="valid" value="'.$langs->trans('ToFilter').'">';
print '<input type="submit" class="button smallpaddingimp" name="valid" value="'.$langs->trans('ToFilter').'">';
print '</div>';
print '</form>';
@ -697,7 +697,7 @@ $texte = $langs->trans('Replenishment');
print '<br>';
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<div class="div-table-responsive-no-min">';
if (!empty($conf->global->REPLENISH_ALLOW_VARIABLESIZELIST)) {
print_barre_liste(
@ -894,7 +894,8 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
print '<td class="nowrap">'.$prod->getNomUrl(1, 'stock').'</td>';
print '<td>'.$objp->label;
print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($objp->label).'">';
print dol_escape_htmltag($objp->label);
print '<input type="hidden" name="desc'.$i.'" value="'.dol_escape_htmltag($objp->description).'">'; // TODO Remove this and make a fetch to get description when creating order instead of a GETPOST
print '</td>';

8
htdocs/product/stock/replenishorders.php
View File

@ -217,13 +217,13 @@ if ($resql) {
print '<tr class="liste_titre_filter">';
print '<td class="liste_titre">';
print '<input type="text" class="flat" name="search_ref" value="'.dol_escape_htmltag($sref).'">';
print '<input type="text" class="flat maxwidth100" name="search_ref" value="'.dol_escape_htmltag($sref).'">';
print '</td>';
print '<td class="liste_titre">';
print '<input type="text" class="flat" name="search_nom" value="'.dol_escape_htmltag($snom).'">';
print '<input type="text" class="flat maxwidth100" name="search_nom" value="'.dol_escape_htmltag($snom).'">';
print '</td>';
print '<td class="liste_titre">';
print '<input type="text" class="flat" name="search_user" value="'.dol_escape_htmltag($suser).'">';
print '<input type="text" class="flat maxwidth100" name="search_user" value="'.dol_escape_htmltag($suser).'">';
print '</td>';
print '<td class="liste_titre right">';
print '<input type="text" class="flat width75" name="search_ttc" value="'.dol_escape_htmltag($sttc).'">';
@ -322,7 +322,7 @@ if ($resql) {
// Company
$href = DOL_URL_ROOT.'/fourn/card.php?socid='.$obj->socid;
print '<td><a href="'.$href.'">'.img_object($langs->trans('ShowCompany'), 'company').' '.$obj->name.'</a></td>';
print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->name).'"><a href="'.$href.'">'.img_object($langs->trans('ShowCompany'), 'company').' '.$obj->name.'</a></td>';
// Author
$userstatic->id = $obj->fk_user_author;