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

Fix: Limit of RCS too small

Browse Source
This commit is contained in:
Laurent Destailleur 2010-02-24 14:48:55 +00:00
parent 40abbaa622
commit 4b5bcaa4c7
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/soc.php
View File

@ -558,7 +558,7 @@ $_GET["action"] == 'create' || $_POST["action"] == 'create')
print '</td>'; print '</td>';
} }
else print '<td>&nbsp;</td><td>&nbsp;</td>'; else print '<td>&nbsp;</td><td>&nbsp;</td>';
// IdProf4 (NU pour France) // IdProf4 (RCS pour France)
$idprof=$langs->transcountry('ProfId4',$soc->pays_code); $idprof=$langs->transcountry('ProfId4',$soc->pays_code);
if ($idprof!='-') if ($idprof!='-')
{ {

16
htdocs/societe.class.php
View File

@ -73,11 +73,11 @@ class Societe extends CommonObject
var $tva_assuj; var $tva_assuj;
var $tva_intra; var $tva_intra;
// Local taxes // Local taxes
var $localtax1_assuj; var $localtax1_assuj;
var $localtax2_assuj; var $localtax2_assuj;
var $capital; var $capital;
var $typent_id; var $typent_id;
var $typent_code; var $typent_code;
@ -367,7 +367,7 @@ class Societe extends CommonObject
$this->tva_assuj=trim($this->tva_assuj); $this->tva_assuj=trim($this->tva_assuj);
$this->tva_intra=dol_sanitizeFileName($this->tva_intra,''); $this->tva_intra=dol_sanitizeFileName($this->tva_intra,'');
// Local taxes // Local taxes
$this->localtax1_assuj=trim($this->localtax1_assuj); $this->localtax1_assuj=trim($this->localtax1_assuj);
$this->localtax2_assuj=trim($this->localtax2_assuj); $this->localtax2_assuj=trim($this->localtax2_assuj);
@ -427,11 +427,11 @@ class Societe extends CommonObject
$sql .= ",tva_assuj = ".($this->tva_assuj>=0?"'".$this->tva_assuj."'":"null"); $sql .= ",tva_assuj = ".($this->tva_assuj>=0?"'".$this->tva_assuj."'":"null");
$sql .= ",tva_intra = '" . addslashes($this->tva_intra) ."'"; $sql .= ",tva_intra = '" . addslashes($this->tva_intra) ."'";
// Local taxes // Local taxes
$sql .= ",localtax1_assuj = ".($this->localtax1_assuj>=0?"'".$this->localtax1_assuj."'":"null"); $sql .= ",localtax1_assuj = ".($this->localtax1_assuj>=0?"'".$this->localtax1_assuj."'":"null");
$sql .= ",localtax2_assuj = ".($this->localtax2_assuj>=0?"'".$this->localtax2_assuj."'":"null"); $sql .= ",localtax2_assuj = ".($this->localtax2_assuj>=0?"'".$this->localtax2_assuj."'":"null");
$sql .= ",capital = '" . addslashes($this->capital) ."'"; $sql .= ",capital = '" . addslashes($this->capital) ."'";
$sql .= ",prefix_comm = ".($this->prefix_comm?"'".addslashes($this->prefix_comm)."'":"null"); $sql .= ",prefix_comm = ".($this->prefix_comm?"'".addslashes($this->prefix_comm)."'":"null");
@ -643,11 +643,11 @@ class Societe extends CommonObject
$this->tva_assuj = $obj->tva_assuj; $this->tva_assuj = $obj->tva_assuj;
$this->tva_intra = $obj->tva_intra; $this->tva_intra = $obj->tva_intra;
// Local Taxes // Local Taxes
$this->localtax1_assuj = $obj->localtax1_assuj; $this->localtax1_assuj = $obj->localtax1_assuj;
$this->localtax2_assuj = $obj->localtax2_assuj; $this->localtax2_assuj = $obj->localtax2_assuj;
$this->typent_id = $obj->typent_id; $this->typent_id = $obj->typent_id;
$this->typent_code = $obj->typent_code; $this->typent_code = $obj->typent_code;
@ -2023,7 +2023,7 @@ class Societe extends CommonObject
if ($idprof==1) $formlength=9; if ($idprof==1) $formlength=9;
if ($idprof==2) $formlength=14; if ($idprof==2) $formlength=14;
if ($idprof==3) $formlength=5; // 4 chiffres et 1 lettre depuis janvier if ($idprof==3) $formlength=5; // 4 chiffres et 1 lettre depuis janvier
if ($idprof==4) $formlength=12; if ($idprof==4) $formlength=32; // No maximum as we need to include a town name in this id
} }
$selected=$preselected; $selected=$preselected;
if (! $selected && $idprof==1) $selected=$this->siren; if (! $selected && $idprof==1) $selected=$this->siren;