FIX Clean bad parameters when inserting line of template invoice

Conflicts:
	htdocs/compta/facture/class/facture-rec.class.php
This commit is contained in:
Laurent Destailleur 2017-09-11 01:04:53 +02:00
parent d13c4b7b84
commit 26385fa10d

View File

@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
/** /**
* Classe de gestion des factures recurrentes/Modeles * Class to manage invoice templates
*/ */
class FactureRec extends CommonInvoice class FactureRec extends CommonInvoice
{ {
@ -59,6 +59,9 @@ class FactureRec extends CommonInvoice
var $nb_gen_done; var $nb_gen_done;
var $nb_gen_max; var $nb_gen_max;
var $frequency;
var $unit_frequency;
var $rang; var $rang;
var $special_code; var $special_code;
@ -557,11 +560,14 @@ class FactureRec extends CommonInvoice
if (empty($remise_percent)) $remise_percent=0; if (empty($remise_percent)) $remise_percent=0;
$qty=price2num($qty); $qty=price2num($qty);
if (! $info_bits) $info_bits=0; if (! $info_bits) $info_bits=0;
$pu_ht=price2num($pu_ht); $pu_ht = price2num($pu_ht);
$pu_ttc=price2num($pu_ttc); $pu_ttc = price2num($pu_ttc);
$txtva=price2num($txtva); $txtva = price2num($txtva);
$txlocaltax1 = price2num($txlocaltax1); $txlocaltax1 = price2num($txlocaltax1);
$txlocaltax2 = price2num($txlocaltax2); $txlocaltax2 = price2num($txlocaltax2);
if (empty($txtva)) $txtva=0;
if (empty($txlocaltax1)) $txlocaltax1=0;
if (empty($txlocaltax2)) $txlocaltax2=0;
if ($price_base_type=='HT') if ($price_base_type=='HT')
{ {