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

Fix NPR Vat is working correctly with multiprice too

Browse Source
This commit is contained in:
Laurent Destailleur 2016-02-19 03:59:43 +01:00
parent b70f2f329c
commit 3864bd35c9
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/product/price.php
View File

@ -1129,7 +1129,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
print '<input type="hidden" name="localtax1_tx[' . $i . ']" value="' . $object->localtax1_tx . '">'; print '<input type="hidden" name="localtax1_tx[' . $i . ']" value="' . $object->localtax1_tx . '">';
print '<input type="hidden" name="localtax1_type[' . $i . ']" value="' . $object->localtax1_type . '">'; print '<input type="hidden" name="localtax1_type[' . $i . ']" value="' . $object->localtax1_type . '">';
print '<input type="hidden" name="localtax2_tx[' . $i . ']" value="' . $object->localtax2_tx . '">'; print '<input type="hidden" name="localtax2_tx[' . $i . ']" value="' . $object->localtax2_tx . '">';
print '<input type="hidden" name="localtax2_tx[' . $i . ']" value="' . $object->localtax2_type . '">'; print '<input type="hidden" name="localtax2_type[' . $i . ']" value="' . $object->localtax2_type . '">';
} else { } else {
// This option is kept for backward compatibility but has no sense // This option is kept for backward compatibility but has no sense
print '<td style="text-align: center">'; print '<td style="text-align: center">';

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

@ -372,6 +372,8 @@ $head[1][1] = $langs->trans("ReplenishmentOrders");
$head[1][2] = 'replenishorders'; $head[1][2] = 'replenishorders';
print load_fiche_titre($langs->trans('Replenishment'), '', 'title_generic.png');
print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="formulaire">'. print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="formulaire">'.
'<input type="hidden" name="token" value="' .$_SESSION['newtoken'] . '">'. '<input type="hidden" name="token" value="' .$_SESSION['newtoken'] . '">'.
@ -382,7 +384,7 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="formulaire">'
'<input type="hidden" name="action" value="order">'. '<input type="hidden" name="action" value="order">'.
'<input type="hidden" name="mode" value="' . $mode . '">'; '<input type="hidden" name="mode" value="' . $mode . '">';
dol_fiche_head($head, 'replenish', $langs->trans('Replenishment'), 0, 'stock'); dol_fiche_head($head, 'replenish', '', 0, '');
print $langs->trans("ReplenishmentStatusDesc").'<br>'."\n"; print $langs->trans("ReplenishmentStatusDesc").'<br>'."\n";
if ($usevirtualstock == 1) if ($usevirtualstock == 1)

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

@ -52,6 +52,8 @@ $texte = $langs->trans('ReplenishmentOrders');
llxHeader('', $texte, $helpurl, ''); llxHeader('', $texte, $helpurl, '');
print load_fiche_titre($langs->trans('Replenishment'), '', 'title_generic.png');
$head = array(); $head = array();
$head[0][0] = DOL_URL_ROOT.'/product/stock/replenish.php'; $head[0][0] = DOL_URL_ROOT.'/product/stock/replenish.php';
$head[0][1] = $langs->trans('Status'); $head[0][1] = $langs->trans('Status');
@ -60,7 +62,7 @@ $head[1][0] = DOL_URL_ROOT.'/product/stock/replenishorders.php';
$head[1][1] = $texte; $head[1][1] = $texte;
$head[1][2] = 'replenishorders'; $head[1][2] = 'replenishorders';
dol_fiche_head($head, 'replenishorders', $langs->trans('Replenishment'), 0, 'stock'); dol_fiche_head($head, 'replenishorders', '', 0, '');
$commandestatic = new CommandeFournisseur($db); $commandestatic = new CommandeFournisseur($db);
$sref = GETPOST('search_ref', 'alpha'); $sref = GETPOST('search_ref', 'alpha');