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

fix scrunitizer

Browse Source
This commit is contained in:
florian HENRY 2018-03-10 10:34:11 +01:00
parent 40fb803ffd
commit 594497d085
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/contrat/class/contrat.class.php
View File

@ -899,17 +899,20 @@ class Contrat extends CommonObject
if ($result > 0) if ($result > 0)
{ {
$modCodeContract = new $module(); $modCodeContract = new $module();
}
if (!empty($modCodeContract->code_auto)) { if (!empty($modCodeContract->code_auto)) {
// Mise a jour ref // Mise a jour ref
$sql = 'UPDATE '.MAIN_DB_PREFIX."contrat SET ref='(PROV".$this->id.")' WHERE rowid=".$this->id; $sql = 'UPDATE '.MAIN_DB_PREFIX."contrat SET ref='(PROV".$this->id.")' WHERE rowid=".$this->id;
if ($this->db->query($sql)) if ($this->db->query($sql))
{
if ($this->id)
{ {
$this->ref="(PROV".$this->id.")"; if ($this->id)
{
$this->ref="(PROV".$this->id.")";
}
} }
} else {
$error++;
$this->error='Failed to get PROV number';
} }
} }
@ -1336,6 +1339,7 @@ class Contrat extends CommonObject
function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $price_base_type='HT', $pu_ttc=0.0, $info_bits=0, $fk_fournprice=null, $pa_ht = 0,$array_options=0, $fk_unit = null, $rang=0) function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $price_base_type='HT', $pu_ttc=0.0, $info_bits=0, $fk_fournprice=null, $pa_ht = 0,$array_options=0, $fk_unit = null, $rang=0)
{ {
global $user, $langs, $conf, $mysoc; global $user, $langs, $conf, $mysoc;
$error=0;
dol_syslog(get_class($this)."::addline $desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $price_base_type, $pu_ttc, $info_bits, $rang"); dol_syslog(get_class($this)."::addline $desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $price_base_type, $pu_ttc, $info_bits, $rang");
@ -1544,6 +1548,8 @@ class Contrat extends CommonObject
{ {
global $user, $conf, $langs, $mysoc; global $user, $conf, $langs, $mysoc;
$error=0;
// Clean parameters // Clean parameters
$qty=trim($qty); $qty=trim($qty);
$desc=trim($desc); $desc=trim($desc);