Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix a lot of fixes to have the french vat npr working better

Browse Source
This commit is contained in:
Laurent Destailleur
2016-02-27 11:32:49 +01:00
parent 4ed53edee8
commit c86a1a30d5
16 changed files with 68 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/commande/class/commande.class.php
View File

@@ -1421,8 +1421,11 @@ class Commande extends CommonOrder
$prod->fetch($idproduct);
$tva_tx = get_default_tva($mysoc,$this->client,$prod->id);
$localtax1_tx=get_localtax($tva_tx,1,$this->client);
$localtax2_tx=get_localtax($tva_tx,2,$this->client);
$tva_npr = get_default_npr($mysoc,$this->client,$prod->id);
if (empty($tva_tx)) $tva_npr=0;
$localtax1_tx=get_localtax($tva_tx,1,$this->client,$mysoc,$tva_npr);
$localtax2_tx=get_localtax($tva_tx,2,$this->client,$mysoc,$tva_npr);
// multiprix
if($conf->global->PRODUIT_MULTIPRICES && $this->client->price_level)
$price = $prod->multiprices[$this->client->price_level];