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

Merge pull request #5959 from defrance/patch-39

Browse Source 
bad tx_tva if PRODUIT_CUSTOMER_PRICES enabled...
This commit is contained in:
Laurent Destailleur 2016-11-08 14:34:06 +01:00 committed by GitHub
commit bf7916e310
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/propal/card.php
View File

@ -777,7 +777,7 @@ if (empty($reshook))
$pu_ht = price($prodcustprice->lines [0]->price); $pu_ht = price($prodcustprice->lines [0]->price);
$pu_ttc = price($prodcustprice->lines [0]->price_ttc); $pu_ttc = price($prodcustprice->lines [0]->price_ttc);
$price_base_type = $prodcustprice->lines [0]->price_base_type; $price_base_type = $prodcustprice->lines [0]->price_base_type;
$prod->tva_tx = $prodcustprice->lines [0]->tva_tx; $tva_tx = $prodcustprice->lines [0]->tva_tx;
} }
} }
} }

2
htdocs/commande/card.php
View File

@ -730,7 +730,7 @@ if (empty($reshook))
$pu_ht = price($prodcustprice->lines [0]->price); $pu_ht = price($prodcustprice->lines [0]->price);
$pu_ttc = price($prodcustprice->lines [0]->price_ttc); $pu_ttc = price($prodcustprice->lines [0]->price_ttc);
$price_base_type = $prodcustprice->lines [0]->price_base_type; $price_base_type = $prodcustprice->lines [0]->price_base_type;
$prod->tva_tx = $prodcustprice->lines [0]->tva_tx; $tva_tx = $prodcustprice->lines [0]->tva_tx;
} }
} }
else else

2
htdocs/compta/facture.php
View File

@ -1433,7 +1433,7 @@ if (empty($reshook))
$pu_ht = price($prodcustprice->lines[0]->price); $pu_ht = price($prodcustprice->lines[0]->price);
$pu_ttc = price($prodcustprice->lines[0]->price_ttc); $pu_ttc = price($prodcustprice->lines[0]->price_ttc);
$price_base_type = $prodcustprice->lines[0]->price_base_type; $price_base_type = $prodcustprice->lines[0]->price_base_type;
$prod->tva_tx = $prodcustprice->lines[0]->tva_tx; $tva_tx = $prodcustprice->lines[0]->tva_tx;
} }
} }
} }

2
htdocs/compta/facture/fiche-rec.php
View File

@ -504,7 +504,7 @@ if (empty($reshook))
$pu_ht = price($prodcustprice->lines[0]->price); $pu_ht = price($prodcustprice->lines[0]->price);
$pu_ttc = price($prodcustprice->lines[0]->price_ttc); $pu_ttc = price($prodcustprice->lines[0]->price_ttc);
$price_base_type = $prodcustprice->lines[0]->price_base_type; $price_base_type = $prodcustprice->lines[0]->price_base_type;
$prod->tva_tx = $prodcustprice->lines[0]->tva_tx; $tva_tx = $prodcustprice->lines[0]->tva_tx;
} }
} }
} }

2
htdocs/contrat/card.php
View File

@ -494,7 +494,7 @@ if (empty($reshook))
$pu_ht = price($prodcustprice->lines [0]->price); $pu_ht = price($prodcustprice->lines [0]->price);
$pu_ttc = price($prodcustprice->lines [0]->price_ttc); $pu_ttc = price($prodcustprice->lines [0]->price_ttc);
$price_base_type = $prodcustprice->lines [0]->price_base_type; $price_base_type = $prodcustprice->lines [0]->price_base_type;
$prod->tva_tx = $prodcustprice->lines [0]->tva_tx; $tva_tx = $prodcustprice->lines [0]->tva_tx;
} }
} }
} }

2
htdocs/product/card.php
View File

@ -636,7 +636,7 @@ if (empty($reshook))
$pu_ht = price($prodcustprice->lines [0]->price); $pu_ht = price($prodcustprice->lines [0]->price);
$pu_ttc = price($prodcustprice->lines [0]->price_ttc); $pu_ttc = price($prodcustprice->lines [0]->price_ttc);
$price_base_type = $prodcustprice->lines [0]->price_base_type; $price_base_type = $prodcustprice->lines [0]->price_base_type;
$prod->tva_tx = $prodcustprice->lines [0]->tva_tx; $tva_tx = $prodcustprice->lines [0]->tva_tx;
} }
} }
} }