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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2011-11-03 02:02:50 +01:00
commit d872f4d389
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/fourn/facture/fiche.php
View File

@ -415,8 +415,8 @@ if ($action == 'update_line')
if (trim($_POST['label']) != trim($label)) $label=$_POST['label']; if (trim($_POST['label']) != trim($label)) $label=$_POST['label'];
$type = $prod->type; $type = $prod->type;
$localtax1_tx = $prod->localtax1_tx; $localtax1tx = $prod->localtax1_tx;
$localtax2_tx = $prod->localtax2_tx; $localtax2tx = $prod->localtax2_tx;
} }
else else
{ {
@ -474,7 +474,8 @@ if ($action == 'addline')
$type = $product->type; $type = $product->type;
$result=$object->addline($label, $product->fourn_pu, $tvatx, $localtax2tx, $localtax2tx, $_POST['qty'], $idprod); $result=$object->addline($label, $product->fourn_pu, $tvatx, $localtax1tx, $localtax2tx, $_POST['qty'], $idprod);
} }
if ($idprod == -1) if ($idprod == -1)
{ {