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

Better fix

Browse Source
This commit is contained in:
Laurent Destailleur 2012-02-26 02:54:16 +01:00
parent 1a0793de91
commit 24422afe44
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/fourn/commande/fiche.php
View File

@ -157,8 +157,8 @@ if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
$type = $productsupplier->type; $type = $productsupplier->type;
// Local Taxes // Local Taxes
$localtax1_tx= get_localtax($tva_tx, 1, $object->thirdparty); $localtax1_tx= get_localtax($tva_tx, 1, $mysoc);
$localtax2_tx= get_localtax($tva_tx, 2, $object->thirdparty); $localtax2_tx= get_localtax($tva_tx, 2, $mysoc);
$result=$object->addline( $result=$object->addline(
$desc, $desc,

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

@ -416,8 +416,8 @@ elseif ($action == 'update_line')
} }
$label = $_POST['desc']; $label = $_POST['desc'];
$type = $_POST["type"]?$_POST["type"]:0; $type = $_POST["type"]?$_POST["type"]:0;
$localtax1tx= get_localtax($_POST['tauxtva'], 1, $societe); $localtax1tx= get_localtax($_POST['tauxtva'], 1, $mysoc);
$localtax2tx= get_localtax($_POST['tauxtva'], 2, $societe); $localtax2tx= get_localtax($_POST['tauxtva'], 2, $mysoc);
} }
$result=$object->updateline($_GET['lineid'], $label, $pu, $_POST['tauxtva'], $localtax1tx, $localtax2tx, $_POST['qty'], $_POST['idprod'], $price_base_type, 0, $type); $result=$object->updateline($_GET['lineid'], $label, $pu, $_POST['tauxtva'], $localtax1tx, $localtax2tx, $_POST['qty'], $_POST['idprod'], $price_base_type, 0, $type);
@ -436,12 +436,7 @@ elseif ($action == 'addline')
dol_print_error($db,$object->error); dol_print_error($db,$object->error);
exit; exit;
} }
$ret=$object->fetch_thirdparty();
if ($object->socid)
{
$societe=new Societe($db);
$societe->fetch($object->socid);
}
if ($_POST['idprodfournprice']) // > 0 or -1 if ($_POST['idprodfournprice']) // > 0 or -1
{ {
@ -456,10 +451,10 @@ elseif ($action == 'addline')
// $label = '['.$product->ref.'] - '. $product->libelle; // $label = '['.$product->ref.'] - '. $product->libelle;
$label = $product->description; $label = $product->description;
$tvatx=get_default_tva($societe,$mysoc,$product->id); $tvatx=get_default_tva($object->thirdparty,$mysoc,$product->id);
$localtax1tx= get_localtax($tvatx, 1, $societe); $localtax1tx= get_localtax($tvatx, 1, $mysoc);
$localtax2tx= get_localtax($tvatx, 2, $societe); $localtax2tx= get_localtax($tvatx, 2, $mysoc);
$type = $product->type; $type = $product->type;
@ -476,8 +471,8 @@ elseif ($action == 'addline')
else else
{ {
$tauxtva = price2num($_POST['tauxtva']); $tauxtva = price2num($_POST['tauxtva']);
$localtax1tx= get_localtax($tauxtva, 1, $societe); $localtax1tx= get_localtax($tauxtva, 1, $mysoc);
$localtax2tx= get_localtax($tauxtva, 2, $societe); $localtax2tx= get_localtax($tauxtva, 2, $mysoc);
if (! $_POST['dp_desc']) if (! $_POST['dp_desc'])
{ {