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

Le code des identifiants professionnel depend du pays emetteur et non de la langue

Browse Source
This commit is contained in:
Laurent Destailleur 2005-08-26 19:22:23 +00:00
parent 27e234f116
commit c9faf58401
3 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/includes/modules/facture/pdf_crabe.modules.php
View File

@ -43,7 +43,7 @@ class pdf_crabe extends ModelePDFFactures
*/ */
function pdf_crabe($db) function pdf_crabe($db)
{ {
global $langs; global $conf,$langs;
$this->db = $db; $this->db = $db;
$this->name = "crabe"; $this->name = "crabe";
@ -59,14 +59,14 @@ class pdf_crabe extends ModelePDFFactures
if (defined("FACTURE_TVAOPTION") && FACTURE_TVAOPTION == 'franchise') if (defined("FACTURE_TVAOPTION") && FACTURE_TVAOPTION == 'franchise')
$this->franchise=1; $this->franchise=1;
// Recupere code pays // Recupere code pays de l'emmetteur
$this->code_pays=substr($langs->defaultlang,-2); // Par defaut, pays de la localisation $this->emetteur->code_pays=substr($langs->defaultlang,-2); // Par defaut, si on trouve pas
$sql = "SELECT code from ".MAIN_DB_PREFIX."c_pays"; $sql = "SELECT code from ".MAIN_DB_PREFIX."c_pays";
$sql .= " WHERE rowid = ".MAIN_INFO_SOCIETE_PAYS; $sql .= " WHERE rowid = '".$conf->global->MAIN_INFO_SOCIETE_PAYS."'";
$result=$this->db->query($sql); $result=$this->db->query($sql);
if ($result) { if ($result) {
$obj = $this->db->fetch_object($result); $obj = $this->db->fetch_object($result);
if ($obj->code) $this->code_pays=$obj->code; if ($obj->code) $this->emetteur->code_pays=$obj->code;
} }
else { else {
dolibarr_print_error($this->db); dolibarr_print_error($this->db);
@ -645,10 +645,12 @@ class pdf_crabe extends ModelePDFFactures
// Logo // Logo
if (defined("FAC_PDF_LOGO") && FAC_PDF_LOGO) if (defined("FAC_PDF_LOGO") && FAC_PDF_LOGO)
{ {
if (file_exists(FAC_PDF_LOGO)) { if (file_exists(FAC_PDF_LOGO))
{
$pdf->Image(FAC_PDF_LOGO, 10, 5, 0, 24); $pdf->Image(FAC_PDF_LOGO, 10, 5, 0, 24);
} }
else { else
{
$pdf->SetTextColor(200,0,0); $pdf->SetTextColor(200,0,0);
$pdf->SetFont('Arial','B',8); $pdf->SetFont('Arial','B',8);
$pdf->MultiCell(80, 3, $langs->trans("ErrorLogoFileNotFound",FAC_PDF_LOGO), 0, 'L'); $pdf->MultiCell(80, 3, $langs->trans("ErrorLogoFileNotFound",FAC_PDF_LOGO), 0, 'L');
@ -786,15 +788,15 @@ class pdf_crabe extends ModelePDFFactures
} }
if ($conf->global->MAIN_INFO_SIRET) if ($conf->global->MAIN_INFO_SIRET)
{ {
$ligne.=($ligne?" - ":"").$langs->transcountry("ProfId2",$this->code_pays).": ".$conf->global->MAIN_INFO_SIRET; $ligne.=($ligne?" - ":"").$langs->transcountry("ProfId2",$this->emetteur->code_pays).": ".$conf->global->MAIN_INFO_SIRET;
} }
elseif ($conf->global->MAIN_INFO_SIREN) if ($conf->global->MAIN_INFO_SIREN && (! $conf->global->MAIN_INFO_SIRET || $this->emetteur->code_pays != 'FR'))
{ {
$ligne.=($ligne?" - ":"").$langs->transcountry("ProfId1",$this->code_pays).": ".$conf->global->MAIN_INFO_SIREN; $ligne.=($ligne?" - ":"").$langs->transcountry("ProfId1",$this->emetteur->code_pays).": ".$conf->global->MAIN_INFO_SIREN;
} }
if ($conf->global->MAIN_INFO_APE) if ($conf->global->MAIN_INFO_APE)
{ {
$ligne.=($ligne?" - ":"").$langs->transcountry("ProfId3",$this->code_pays).": ".MAIN_INFO_APE; $ligne.=($ligne?" - ":"").$langs->transcountry("ProfId3",$this->emetteur->code_pays).": ".MAIN_INFO_APE;
} }
if ($ligne) if ($ligne)
@ -807,7 +809,7 @@ class pdf_crabe extends ModelePDFFactures
$ligne=""; $ligne="";
if ($conf->global->MAIN_INFO_RCS) if ($conf->global->MAIN_INFO_RCS)
{ {
$ligne.=($ligne?" - ":"").$langs->transcountry("ProfId4",$this->code_pays).": ".$conf->global->MAIN_INFO_RCS; $ligne.=($ligne?" - ":"").$langs->transcountry("ProfId4",$this->emetteur->code_pays).": ".$conf->global->MAIN_INFO_RCS;
} }
if ($conf->global->MAIN_INFO_TVAINTRA != '') if ($conf->global->MAIN_INFO_TVAINTRA != '')
{ {

28
htdocs/includes/modules/propale/pdf_propale_azur.modules.php
View File

@ -44,7 +44,7 @@ class pdf_propale_azur extends ModelePDFPropales
*/ */
function pdf_propale_azur($db) function pdf_propale_azur($db)
{ {
global $langs; global $conf,$langs;
$this->db = $db; $this->db = $db;
$this->name = "azur"; $this->name = "azur";
@ -60,14 +60,14 @@ class pdf_propale_azur extends ModelePDFPropales
if (defined("FACTURE_TVAOPTION") && FACTURE_TVAOPTION == 'franchise') if (defined("FACTURE_TVAOPTION") && FACTURE_TVAOPTION == 'franchise')
$this->franchise=1; $this->franchise=1;
// Recupere code pays // Recupere code pays de l'emmetteur
$this->code_pays=substr($langs->defaultlang,-2); // Par defaut, pays de la localisation $this->emetteur->code_pays=substr($langs->defaultlang,-2); // Par defaut, si on trouve pas
$sql = "SELECT code from ".MAIN_DB_PREFIX."c_pays"; $sql = "SELECT code from ".MAIN_DB_PREFIX."c_pays";
$sql .= " WHERE rowid = ".MAIN_INFO_SOCIETE_PAYS; $sql .= " WHERE rowid = '".$conf->global->MAIN_INFO_SOCIETE_PAYS."'";
$result=$this->db->query($sql); $result=$this->db->query($sql);
if ($result) { if ($result) {
$obj = $this->db->fetch_object($result); $obj = $this->db->fetch_object($result);
if ($obj->code) $this->code_pays=$obj->code; if ($obj->code) $this->emetteur->code_pays=$obj->code;
} }
else { else {
dolibarr_print_error($this->db); dolibarr_print_error($this->db);
@ -379,7 +379,7 @@ class pdf_propale_azur extends ModelePDFPropales
/* /*
* \brief Affiche le total à payer * \brief Affiche le total à payer
* \param pdf Objet PDF * \param pdf Objet PDF
* \param fac Objet propale * \param prop Objet propale
* \param deja_regle Montant deja regle * \param deja_regle Montant deja regle
* \return y Position pour suite * \return y Position pour suite
*/ */
@ -676,7 +676,7 @@ class pdf_propale_azur extends ModelePDFPropales
/* /*
* \brief Affiche le pied de page de la propale * \brief Affiche le pied de page de la propale
* \param pdf objet PDF * \param pdf objet PDF
* \param fac objet propale * \param prop objet propale
*/ */
function _pagefoot(&$pdf, $prop) function _pagefoot(&$pdf, $prop)
{ {
@ -707,15 +707,15 @@ class pdf_propale_azur extends ModelePDFPropales
} }
if ($conf->global->MAIN_INFO_SIRET) if ($conf->global->MAIN_INFO_SIRET)
{ {
$ligne.=($ligne?" - ":"").$langs->transcountry("ProfId2",$this->code_pays).": ".$conf->global->MAIN_INFO_SIRET; $ligne.=($ligne?" - ":"").$langs->transcountry("ProfId2",$this->emetteur->code_pays).": ".$conf->global->MAIN_INFO_SIRET;
} }
elseif ($conf->global->MAIN_INFO_SIREN) if ($conf->global->MAIN_INFO_SIREN && (! $conf->global->MAIN_INFO_SIRET || $this->emetteur->code_pays != 'FR'))
{ {
$ligne.=($ligne?" - ":"").$langs->transcountry("ProfId1",$this->code_pays).": ".$conf->global->MAIN_INFO_SIREN; $ligne.=($ligne?" - ":"").$langs->transcountry("ProfId1",$this->emetteur->code_pays).": ".$conf->global->MAIN_INFO_SIREN;
} }
if ($conf->global->MAIN_INFO_APE) if ($conf->global->MAIN_INFO_APE)
{ {
$ligne.=($ligne?" - ":"").$langs->transcountry("ProfId3",$this->code_pays).": ".MAIN_INFO_APE; $ligne.=($ligne?" - ":"").$langs->transcountry("ProfId3",$this->emetteur->code_pays).": ".MAIN_INFO_APE;
} }
if ($ligne) if ($ligne)
@ -728,7 +728,7 @@ class pdf_propale_azur extends ModelePDFPropales
$ligne=""; $ligne="";
if ($conf->global->MAIN_INFO_RCS) if ($conf->global->MAIN_INFO_RCS)
{ {
$ligne.=($ligne?" - ":"").$langs->transcountry("ProfId4",$this->code_pays).": ".$conf->global->MAIN_INFO_RCS; $ligne.=($ligne?" - ":"").$langs->transcountry("ProfId4",$this->emetteur->code_pays).": ".$conf->global->MAIN_INFO_RCS;
} }
if ($conf->global->MAIN_INFO_TVAINTRA != '') if ($conf->global->MAIN_INFO_TVAINTRA != '')
{ {
@ -738,8 +738,8 @@ class pdf_propale_azur extends ModelePDFPropales
if ($ligne) if ($ligne)
{ {
$footy-=3; $footy-=3;
$pdf->SetxY(8,-$footy); $pdf->SetXY(8,-$footy);
$pdf->MultiCell(200, 2, $ligne , 0, 'C'); $pdf->MultiCell(200, 2, $ligne , 0, 'C', 0);
} }
$pdf->SetXY(-20,-$footy); $pdf->SetXY(-20,-$footy);

4
htdocs/langs/fr_FR/companies.lang
View File

@ -42,8 +42,8 @@ ProfId2BE=-
ProfId3BE=- ProfId3BE=-
ProfId4BE=- ProfId4BE=-
ProfId1PT=NIPC ProfId1PT=NIPC
ProfId2PT=Social security number ProfId2PT=Numéro de sécurité social
ProfId3PT=Commercial Record number ProfId3PT=Numéro enregistrement commercial
ProfId4PT=Conservatory ProfId4PT=Conservatory
TVAIntra=Numéro de TVA Intracommunautaire TVAIntra=Numéro de TVA Intracommunautaire
VATIntraShort=N° TVA Intra-communautaire VATIntraShort=N° TVA Intra-communautaire