diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php index 32fa03ad48e..3538a3908d1 100644 --- a/htdocs/cashdesk/class/Facturation.class.php +++ b/htdocs/cashdesk/class/Facturation.class.php @@ -118,7 +118,7 @@ class Facturation } // Define part of HT, VAT, TTC - $resultarray=calcul_price_total($this->qte,$this->prix(),$this->remisePercent(),$vat_rate,0,0,0,'HT',$product->type); + $resultarray=calcul_price_total($this->qte,$this->prix(),$this->remisePercent(),$vat_rate,0,0,0,'HT',$product->type,0); // Calcul du total ht sans remise $total_ht = $resultarray[0]; diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index f68710ec740..0fe21564346 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -730,6 +730,8 @@ else if ($action == 'addline' && $user->rights->commande->creer) if ($result > 0) { + $ret=$object->fetch($object->id); // Reload to get new records + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { // Define output language @@ -742,7 +744,6 @@ else if ($action == 'addline' && $user->rights->commande->creer) $outputlangs->setDefaultLang($newlang); } - $ret=$object->fetch($object->id); // Reload to get new records commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); } diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php index 2110b68d388..f863d1c925d 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -622,7 +622,7 @@ class Translate $newdir=dol_osencode($dir); // Check if directory exists - if (! dol_is_dir($dir)) continue; + if (! is_dir($newdir)) continue; // We must not use dol_is_dir here, function may not be loaded $fonc='numberwords'; if (file_exists($newdir.'/functions_'.$fonc.'.lib.php')) diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index 3d7587b249e..fa8a13353fd 100755 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -871,7 +871,7 @@ class pdf_crabe extends ModelePDFFactures $tvakey=str_replace('*','',$tvakey); $tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")"; } - + $totalvat = $outputlangs->transcountrynoentities("TotalLT1",$mysoc->country_code).' '; $totalvat.=vatrate(abs($tvakey),1).$tvacompl; $pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1); diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index f510a561655..61b96bae667 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -301,6 +301,8 @@ TotalHT=Total (net of tax) TotalTTC=Total (inc. tax) TotalTTCToYourCredit=Total (inc. tax) to your credit TotalVAT=Total tax +TotalLT1=Total tax 2 +TotalLT2=Total tax 3 TotalLT1ES=Total RE TotalLT2ES=Total IRPF IncludedVAT=Included tax diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index e01cb97537e..8b30afc4f04 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -303,6 +303,8 @@ TotalHT=Total HT TotalTTC=Total TTC TotalTTCToYourCredit=Total TTC à votre crédit TotalVAT=Total TVA +TotalLT1=Total Taxe 2 +TotalLT2=Total Taxe 3 TotalLT1ES=Total RE TotalLT2ES=Total IRPF IncludedVAT=Dont TVA