diff --git a/htdocs/includes/modules/facture/pdf_adytek.modules.php b/htdocs/includes/modules/facture/pdf_adytek.modules.php index 40af9261257..7a4bec3ce19 100644 --- a/htdocs/includes/modules/facture/pdf_adytek.modules.php +++ b/htdocs/includes/modules/facture/pdf_adytek.modules.php @@ -404,9 +404,9 @@ class pdf_adytek extends ModelePDFFactures { $pdf->SetFont('Arial','',8); $pdf->SetY(-13); - $pdf->MultiCell(190, 3, FAC_PDF_INTITULE . " - SARL au Capital de " . FAC_CAPITAL_EURO." - " . FAC_PDF_RCS." " . FAC_PDF_SIREN , 0, 'C'); + $pdf->MultiCell(190, 3, FAC_PDF_INTITULE . " - SARL au Capital de " . MAIN_INFO_CAPITAL . " - " . MAIN_INFO_RCS." " . MAIN_INFO_SIREN , 0, 'C'); $pdf->SetY(-10); - $pdf->MultiCell(190, 3, "N° TVA Intracommunautaire : " . FAC_PDF_TVA_INTRA , 0, 'C'); + $pdf->MultiCell(190, 3, "N° TVA Intracommunautaire : " . MAIN_INFO_TVAINTRA , 0, 'C'); $pdf->SetXY(-10,-10); $pdf->MultiCell(10, 3, $pdf->PageNo().'/{nb}', 0, 'R'); diff --git a/htdocs/includes/modules/facture/pdf_bernique.modules.php b/htdocs/includes/modules/facture/pdf_bernique.modules.php index 5d3d8127711..5aa580e1aa6 100644 --- a/htdocs/includes/modules/facture/pdf_bernique.modules.php +++ b/htdocs/includes/modules/facture/pdf_bernique.modules.php @@ -340,10 +340,10 @@ class pdf_bernique extends ModelePDFFactures { $pdf->SetFont('Arial','',10); $pdf->MultiCell(40, 5, "Tél : ".FAC_PDF_TEL); } - if (defined("FAC_PDF_SIREN")) + if (defined("MAIN_INFO_SIREN")) { $pdf->SetFont('Arial','',10); - $pdf->MultiCell(40, 5, "SIREN : ".FAC_PDF_SIREN); + $pdf->MultiCell(40, 5, "SIREN : ".MAIN_INFO_SIREN); } if (defined("FAC_PDF_INTITULE2")) diff --git a/htdocs/includes/modules/facture/pdf_bigorneau.modules.php b/htdocs/includes/modules/facture/pdf_bigorneau.modules.php index 3d47ac7e6a0..ce9574c48af 100644 --- a/htdocs/includes/modules/facture/pdf_bigorneau.modules.php +++ b/htdocs/includes/modules/facture/pdf_bigorneau.modules.php @@ -284,10 +284,10 @@ class pdf_bigorneau extends ModelePDFFactures { $pdf->SetFont('Arial','',10); $pdf->MultiCell(40, 5, "Tél : ".FAC_PDF_TEL); } - if (defined("FAC_PDF_SIREN")) + if (defined("MAIN_INFO_SIREN")) { $pdf->SetFont('Arial','',10); - $pdf->MultiCell(40, 5, "SIREN : ".FAC_PDF_SIREN); + $pdf->MultiCell(40, 5, "SIREN : ".MAIN_INFO_SIREN); } if (defined("FAC_PDF_INTITULE2")) diff --git a/htdocs/includes/modules/facture/pdf_bulot.modules.php b/htdocs/includes/modules/facture/pdf_bulot.modules.php index e6825598217..9ccae997d19 100644 --- a/htdocs/includes/modules/facture/pdf_bulot.modules.php +++ b/htdocs/includes/modules/facture/pdf_bulot.modules.php @@ -349,10 +349,10 @@ class pdf_bulot extends ModelePDFFactures { $pdf->SetFont('Arial','',10); $pdf->MultiCell(40, 5, "Tél : ".FAC_PDF_TEL); } - if (defined("FAC_PDF_SIREN")) + if (defined("MAIN_INFO_SIREN")) { $pdf->SetFont('Arial','',10); - $pdf->MultiCell(40, 5, "SIREN : ".FAC_PDF_SIREN); + $pdf->MultiCell(40, 5, "SIREN : ".MAIN_INFO_SIREN); } if (defined("FAC_PDF_INTITULE2")) diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php index 1c1c519214c..d7668518880 100644 --- a/htdocs/includes/modules/facture/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php @@ -63,11 +63,10 @@ class pdf_crabe extends ModelePDFFactures \remarks FACTURE_RIB_NUMBER \remarks FAC_PDF_INTITULE \remarks FAC_PDF_INTITULE2 - \remarks FAC_PDF_SIREN - \remarks FAC_PDF_SIRET \remarks FAC_PDF_TEL \remarks FAC_PDF_ADRESSE - \remarks MAIN_INFO_RCS + \remarks MAIN_INFO_SIRET + \remarks MAIN_INFO_SIREN \remarks MAIN_INFO_CAPITAL \remarks MAIN_INFO_TVAINTRA */ @@ -573,15 +572,15 @@ class pdf_crabe extends ModelePDFFactures $pdf->SetFont('Arial','',10); $pdf->MultiCell(40, 4, "Tél : ".FAC_PDF_TEL); } - if (defined("FAC_PDF_SIRET")) + if (defined("MAIN_INFO_SIRET")) { $pdf->SetFont('Arial','',10); - $pdf->MultiCell(60, 4, "SIRET : ".FAC_PDF_SIRET); + $pdf->MultiCell(60, 4, "SIRET : ".MAIN_INFO_SIRET); } - elseif (defined("FAC_PDF_SIREN")) + elseif (defined("MAIN_INFO_SIREN")) { $pdf->SetFont('Arial','',10); - $pdf->MultiCell(60, 4, "SIREN : ".FAC_PDF_SIREN); + $pdf->MultiCell(60, 4, "SIREN : ".MAIN_INFO_SIREN); } diff --git a/htdocs/includes/modules/facture/pdf_tourteau.modules.php b/htdocs/includes/modules/facture/pdf_tourteau.modules.php index adc8f549979..57d8e9c227a 100644 --- a/htdocs/includes/modules/facture/pdf_tourteau.modules.php +++ b/htdocs/includes/modules/facture/pdf_tourteau.modules.php @@ -336,10 +336,10 @@ class pdf_tourteau extends ModelePDFFactures { $pdf->SetFont('Arial','',10); $pdf->MultiCell(76, 5, "Tél : ".FAC_PDF_TEL); } - if (defined("FAC_PDF_SIREN")) + if (defined("MAIN_INFO_SIREN")) { $pdf->SetFont('Arial','',10); - $pdf->MultiCell(76, 5, "SIREN : ".FAC_PDF_SIREN); + $pdf->MultiCell(76, 5, "SIREN : ".MAIN_INFO_SIREN); } if (defined("FAC_PDF_INTITULE2")) diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php index f68e525fed5..5d1611facc1 100644 --- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php +++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php @@ -89,10 +89,10 @@ class pdf_soleil extends ModelePDFFicheinter $pdf->SetFont('Arial','',10); $pdf->MultiCell(40, 5, "Tél : ".FAC_PDF_TEL); } - if (defined("FAC_PDF_SIREN")) + if (defined("MAIN_INFO_SIREN")) { $pdf->SetFont('Arial','',10); - $pdf->MultiCell(40, 5, "SIREN : ".FAC_PDF_SIREN); + $pdf->MultiCell(40, 5, "SIREN : ".MAIN_INFO_SIREN); } if (defined("FAC_PDF_INTITULE2")) diff --git a/htdocs/includes/modules/modFacture.class.php b/htdocs/includes/modules/modFacture.class.php index 263c649ce96..9272bdeb262 100644 --- a/htdocs/includes/modules/modFacture.class.php +++ b/htdocs/includes/modules/modFacture.class.php @@ -88,24 +88,17 @@ class modFacture extends DolibarrModules $this->const[3][1] = "chaine"; $this->const[3][2] = "02 97 00 00 00"; - $this->const[4][0] = "FAC_PDF_SIREN"; + $this->const[4][0] = "FAC_PDF_INTITULE2"; $this->const[4][1] = "chaine"; - $this->const[4][2] = "123 456 789"; + $this->const[4][2] = ""; - $this->const[5][0] = "FAC_PDF_SIRET"; + $this->const[5][0] = "FACTURE_ADDON_PDF"; $this->const[5][1] = "chaine"; - $this->const[5][2] = "123 456 789 012"; + $this->const[5][2] = "bulot"; - $this->const[6][0] = "FAC_PDF_INTITULE2"; + $this->const[6][0] = "FACTURE_ADDON"; $this->const[6][1] = "chaine"; - - $this->const[7][0] = "FACTURE_ADDON_PDF"; - $this->const[7][1] = "chaine"; - $this->const[7][2] = "bulot"; - - $this->const[8][0] = "FACTURE_ADDON"; - $this->const[8][1] = "chaine"; - $this->const[8][2] = "pluton"; + $this->const[6][2] = "pluton"; // Boites $this->boxes = array(); diff --git a/htdocs/includes/modules/propale/pdf_propale_adytek.modules.php b/htdocs/includes/modules/propale/pdf_propale_adytek.modules.php index 4edcaba9a36..d75b5af89d9 100644 --- a/htdocs/includes/modules/propale/pdf_propale_adytek.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_adytek.modules.php @@ -259,13 +259,13 @@ class pdf_propale_adytek extends ModelePDFPropales function _pagefoot(&$pdf, $propale) { $pdf->SetFont('Arial','I',8); - // FAC_PDF_ADRESSE FAC_PDF_TEL FAC_PDF_SIREN + // FAC_PDF_ADRESSE FAC_PDF_TEL $pdf->SetFont('Arial','',8); $pdf->SetY(-13); - $pdf->MultiCell(190, 3, FAC_PDF_INTITULE . " - SARL au Capital de " . FAC_CAPITAL_EURO." - " . FAC_PDF_RCS." " . FAC_PDF_SIREN , 0, 'C'); + $pdf->MultiCell(190, 3, FAC_PDF_INTITULE . " - SARL au Capital de " . MAIN_INFO_CAPITAL . " - " . MAIN_INFO_RCS." " . MAIN_INFO_SIREN , 0, 'C'); $pdf->SetY(-10); - $pdf->MultiCell(190, 3, "N° TVA Intracommunautaire : " . FAC_PDF_TVA_INTRA , 0, 'C'); + $pdf->MultiCell(190, 3, "N° TVA Intracommunautaire : " . MAIN_INFO_TVAINTRA , 0, 'C'); $pdf->SetXY(-10,-10); $pdf->MultiCell(10, 3, $pdf->PageNo().'/{nb}', 0, 'R'); diff --git a/htdocs/includes/modules/propale/pdf_propale_bleu.modules.php b/htdocs/includes/modules/propale/pdf_propale_bleu.modules.php index 0038fb23dec..4bffeb574e9 100644 --- a/htdocs/includes/modules/propale/pdf_propale_bleu.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_bleu.modules.php @@ -263,10 +263,10 @@ class pdf_propale_bleu extends ModelePDFPropales $pdf->SetFont('Times','',10); $pdf->MultiCell(76, 5, "Tél : ".FAC_PDF_TEL); } - if (defined("FAC_PDF_SIREN")) + if (defined("MAIN_INFO_SIREN")) { $pdf->SetFont('Times','',10); - $pdf->MultiCell(76, 5, "SIREN : ".FAC_PDF_SIREN); + $pdf->MultiCell(76, 5, "SIREN : ".MAIN_INFO_SIREN); } if (defined("FAC_PDF_INTITULE2")) diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php index 181aa6459ac..cf7a4467b42 100644 --- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php @@ -268,11 +268,11 @@ class pdf_propale_jaune extends ModelePDFPropales $pdf->SetFont('Arial','',10); $pdf->MultiCell(76, 5, "Tél : ".FAC_PDF_TEL); } - if (defined("FAC_PDF_SIREN")) + if (defined("MAIN_INFO_SIREN")) { $pdf->SetX(12); $pdf->SetFont('Arial','',10); - $pdf->MultiCell(76, 5, "SIREN : ".FAC_PDF_SIREN); + $pdf->MultiCell(76, 5, "SIREN : ".MAIN_INFO_SIREN); } $pdf->rect(10, 40, 80, 40); diff --git a/htdocs/includes/modules/propale/pdf_propale_rouge.modules.php b/htdocs/includes/modules/propale/pdf_propale_rouge.modules.php index f067b3d9d71..9f04f95d097 100644 --- a/htdocs/includes/modules/propale/pdf_propale_rouge.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_rouge.modules.php @@ -282,10 +282,10 @@ class pdf_propale_rouge extends ModelePDFPropales $pdf->SetFont('Arial','',10); $pdf->MultiCell(76, 5, "Tél : ".FAC_PDF_TEL); } - if (defined("FAC_PDF_SIREN")) + if (defined("MAIN_INFO_SIREN")) { $pdf->SetFont('Arial','',10); - $pdf->MultiCell(76, 5, "SIREN : ".FAC_PDF_SIREN); + $pdf->MultiCell(76, 5, "SIREN : ".MAIN_INFO_SIREN); } if (defined("FAC_PDF_INTITULE2")) diff --git a/htdocs/includes/modules/propale/pdf_propale_vert.modules.php b/htdocs/includes/modules/propale/pdf_propale_vert.modules.php index 51c563ba6b2..7f1d9340640 100644 --- a/htdocs/includes/modules/propale/pdf_propale_vert.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_vert.modules.php @@ -295,10 +295,10 @@ class pdf_propale_vert extends ModelePDFPropales $pdf->SetFont('Arial','',10); $pdf->MultiCell(76, 5, "Tél : ".FAC_PDF_TEL); } - if (defined("FAC_PDF_SIREN")) + if (defined("MAIN_INFO_SIREN")) { $pdf->SetFont('Arial','',10); - $pdf->MultiCell(76, 5, "SIREN : ".FAC_PDF_SIREN); + $pdf->MultiCell(76, 5, "SIREN : ".MAIN_INFO_SIREN); } if (defined("FAC_PDF_INTITULE2")) diff --git a/mysql/data/data.sql b/mysql/data/data.sql index 66bcfa34875..18fe922188b 100644 --- a/mysql/data/data.sql +++ b/mysql/data/data.sql @@ -150,9 +150,6 @@ insert into llx_const (name, value, type) values ('FAC_PDF_INTITULE','Facture',' insert into llx_const (name, value, type) values ('FAC_PDF_MEL','facture@societe.com','chaine'); insert into llx_const (name, value, type) values ('FAC_PDF_WWW','http://www.societe.com','chaine'); insert into llx_const (name, value, type) values ('FAC_PDF_LOGO','/documents/logo/mylogo.png','chaine'); -insert into llx_const (name, value, type) values ('FAC_CAPITAL_EURO','0','chaine'); -insert into llx_const (name, value, type) values ('FAC_PDF_TVA_INTRA','','chaine'); -insert into llx_const (name, value, type) values ('FAC_PDF_RCS','','chaine'); -- -- Propales