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

Accept larger company names. Up to 60 chars.

Browse Source
This commit is contained in:
Laurent Destailleur 2010-08-24 18:04:05 +00:00
parent 29217c5270
commit ac4dfe00c4
12 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/includes/modules/commande/pdf_edison.modules.php
View File

@ -543,7 +543,7 @@ class pdf_edison extends ModelePDFCommandes
// Sender name // Sender name
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->SetFont('Arial','B',11); $pdf->SetFont('Arial','B',10);
$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L'); $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L');
// Sender properties // Sender properties
@ -584,7 +584,7 @@ class pdf_edison extends ModelePDFCommandes
// Show customer/recipient // Show customer/recipient
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','B',11); $pdf->SetFont('Arial','B',10);
$pdf->SetXY(102,42); $pdf->SetXY(102,42);
$pdf->MultiCell(96, 4, $carac_client_name); $pdf->MultiCell(96, 4, $carac_client_name);
$pdf->SetFont('Arial','',9); $pdf->SetFont('Arial','',9);

4
htdocs/includes/modules/commande/pdf_einstein.modules.php
View File

@ -911,7 +911,7 @@ class pdf_einstein extends ModelePDFCommandes
// Show sender name // Show sender name
$pdf->SetXY($posx+2,$posy+3); $pdf->SetXY($posx+2,$posy+3);
$pdf->SetFont('Arial','B',11); $pdf->SetFont('Arial','B',10);
$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L'); $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L');
// Show sender information // Show sender information
@ -959,7 +959,7 @@ class pdf_einstein extends ModelePDFCommandes
// Show recipient name // Show recipient name
$pdf->SetXY($posx+2,$posy+3); $pdf->SetXY($posx+2,$posy+3);
$pdf->SetFont('Arial','B',11); $pdf->SetFont('Arial','B',10);
$pdf->MultiCell(96,4, $carac_client_name, 0, 'L'); $pdf->MultiCell(96,4, $carac_client_name, 0, 'L');
// Show recipient information // Show recipient information

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

@ -1178,7 +1178,7 @@ class pdf_crabe extends ModelePDFFactures
// Show sender name // Show sender name
$pdf->SetXY($posx+2,$posy+3); $pdf->SetXY($posx+2,$posy+3);
$pdf->SetFont('Arial','B',11); $pdf->SetFont('Arial','B',10);
$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L'); $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L');
// Show sender information // Show sender information
@ -1226,7 +1226,7 @@ class pdf_crabe extends ModelePDFFactures
// Show recipient name // Show recipient name
$pdf->SetXY($posx+2,$posy+3); $pdf->SetXY($posx+2,$posy+3);
$pdf->SetFont('Arial','B',11); $pdf->SetFont('Arial','B',10);
$pdf->MultiCell(96,4, $carac_client_name, 0, 'L'); $pdf->MultiCell(96,4, $carac_client_name, 0, 'L');
// Show recipient information // Show recipient information

8
htdocs/includes/modules/facture/pdf_oursin.modules.php
View File

@ -855,7 +855,7 @@ class pdf_oursin extends ModelePDFFactures
// Sender name // Sender name
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->SetFont('Arial','B',12); $pdf->SetFont('Arial','B',10);
$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L'); $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L');
// Sender properties // Sender properties
@ -871,7 +871,7 @@ class pdf_oursin extends ModelePDFFactures
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','',8); $pdf->SetFont('Arial','',8);
$pdf->SetXY($this->marges['g']+100,$posy-5); $pdf->SetXY($this->marges['g']+100,$posy-5);
$pdf->SetFont('Arial','B',11); $pdf->SetFont('Arial','B',10);
// If BILLING contact defined on invoice, we use it // If BILLING contact defined on invoice, we use it
$usecontact=false; $usecontact=false;
@ -898,11 +898,11 @@ class pdf_oursin extends ModelePDFFactures
$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,$object->contact,$usecontact,'target'); $carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,$object->contact,$usecontact,'target');
// Show customer/recipient // Show customer/recipient
$pdf->SetFont('Arial','B',11); $pdf->SetFont('Arial','B',10);
$pdf->SetXY($this->marges['g']+100,$posy+4); $pdf->SetXY($this->marges['g']+100,$posy+4);
$pdf->MultiCell(86,4, $carac_client_name, 0, 'L'); $pdf->MultiCell(86,4, $carac_client_name, 0, 'L');
$pdf->SetFont('Arial','B',10); $pdf->SetFont('Arial','B',9);
$pdf->SetXY($this->marges['g']+100,$posy+10); $pdf->SetXY($this->marges['g']+100,$posy+10);
$pdf->MultiCell(86,4, $carac_client); $pdf->MultiCell(86,4, $carac_client);

6
htdocs/includes/modules/fichinter/pdf_soleil.modules.php
View File

@ -208,7 +208,7 @@ class pdf_soleil extends ModelePDFFicheinter
// Sender name // Sender name
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->SetFont('Arial','B',11); $pdf->SetFont('Arial','B',10);
$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L'); $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L');
// Sender properties // Sender properties
@ -237,11 +237,11 @@ class pdf_soleil extends ModelePDFFicheinter
// Client destinataire // Client destinataire
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','B',12); $pdf->SetFont('Arial','B',10);
$fichinter->fetch_thirdparty(); $fichinter->fetch_thirdparty();
$pdf->SetXY(102,42); $pdf->SetXY(102,42);
$pdf->MultiCell(86,5, $outputlangs->convToOutputCharset($carac_client_name)); $pdf->MultiCell(86,5, $outputlangs->convToOutputCharset($carac_client_name));
$pdf->SetFont('Arial','B',11); $pdf->SetFont('Arial','B',9);
$pdf->SetXY(102,$pdf->GetY()); $pdf->SetXY(102,$pdf->GetY());
$pdf->MultiCell(66,5, $outputlangs->convToOutputCharset($carac_client)); $pdf->MultiCell(66,5, $outputlangs->convToOutputCharset($carac_client));
$pdf->rect(100, 40, 100, 40); $pdf->rect(100, 40, 100, 40);

4
htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
View File

@ -407,11 +407,11 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,$object->contact,$usecontact,'target'); $carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,$object->contact,$usecontact,'target');
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('Arial','B',12); $pdf->SetFont('Arial','B',11);
$pdf->SetXY(102,42); $pdf->SetXY(102,42);
$pdf->MultiCell(96,5, $carac_client_name); $pdf->MultiCell(96,5, $carac_client_name);
$pdf->SetFont('Arial','B',11); $pdf->SetFont('Arial','B',10);
$pdf->SetXY(102,47); $pdf->SetXY(102,47);
$pdf->MultiCell(96,5, $carac_client); $pdf->MultiCell(96,5, $carac_client);
$pdf->rect(100, 40, 100, 40); $pdf->rect(100, 40, 100, 40);

4
htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
View File

@ -603,7 +603,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
// Nom emetteur // Nom emetteur
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->SetFont('Arial','B',11); $pdf->SetFont('Arial','B',10);
$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L'); $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L');
// Sender properties // Sender properties
@ -649,7 +649,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
// Show customer/recipient // Show customer/recipient
$pdf->SetXY(102,$posy+3); $pdf->SetXY(102,$posy+3);
$pdf->SetFont('Arial','B',11); $pdf->SetFont('Arial','B',10);
$pdf->MultiCell(106,4, $carac_client_name, 0, 'L'); $pdf->MultiCell(106,4, $carac_client_name, 0, 'L');
$pdf->SetFont('Arial','',9); $pdf->SetFont('Arial','',9);

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

@ -973,7 +973,7 @@ class pdf_propale_azur extends ModelePDFPropales
// Show sender name // Show sender name
$pdf->SetXY($posx+2,$posy+3); $pdf->SetXY($posx+2,$posy+3);
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->SetFont('Arial','B',11); $pdf->SetFont('Arial','B',10);
$pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L'); $pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L');
// Show sender information // Show sender information
@ -1021,8 +1021,7 @@ class pdf_propale_azur extends ModelePDFPropales
// Show recipient name // Show recipient name
$pdf->SetXY($posx+2,$posy+3); $pdf->SetXY($posx+2,$posy+3);
$pdf->SetFont('Arial','B',11); $pdf->SetFont('Arial','B',10);
//print $carac_client;exit;
$pdf->MultiCell(96,4, $carac_client_name, 0, 'L'); $pdf->MultiCell(96,4, $carac_client_name, 0, 'L');
// Show recipient information // Show recipient information

4
htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
View File

@ -509,7 +509,7 @@ class pdf_propale_jaune extends ModelePDFPropales
// Sender name // Sender name
$pdf->SetTextColor(0,0,00); $pdf->SetTextColor(0,0,00);
$pdf->SetFont('Arial','B',11); $pdf->SetFont('Arial','B',10);
$pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L'); $pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L');
// Sender properties // Sender properties
@ -609,7 +609,7 @@ class pdf_propale_jaune extends ModelePDFPropales
// Show recipient // Show recipient
$pdf->SetXY(102,$posy+3); $pdf->SetXY(102,$posy+3);
$pdf->SetFont('Arial','B',11); $pdf->SetFont('Arial','B',10);
$pdf->MultiCell(96,4, $outputlangs->convToOutputCharset($carac_client_name), 0, 'L'); $pdf->MultiCell(96,4, $outputlangs->convToOutputCharset($carac_client_name), 0, 'L');
// Show address // Show address

4
htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
View File

@ -646,7 +646,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
// Nom emetteur // Nom emetteur
$carac_emetteur_name=$outputlangs->convToOutputCharset($mysoc->nom); $carac_emetteur_name=$outputlangs->convToOutputCharset($mysoc->nom);
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->SetFont('Arial','B',11); $pdf->SetFont('Arial','B',10);
$pdf->SetXY($this->marge_gauche+2,$posy+3); $pdf->SetXY($this->marge_gauche+2,$posy+3);
$pdf->MultiCell(80, 4, $carac_emetteur_name, 0, 'L'); $pdf->MultiCell(80, 4, $carac_emetteur_name, 0, 'L');
@ -689,7 +689,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
// Show customer/recipient // Show customer/recipient
$pdf->SetXY(102,$posy+3); $pdf->SetXY(102,$posy+3);
$pdf->SetFont('Arial','B',11); $pdf->SetFont('Arial','B',10);
$pdf->MultiCell(96,4, $carac_client_name, 0, 'L'); $pdf->MultiCell(96,4, $carac_client_name, 0, 'L');
$pdf->SetFont('Arial','',9); $pdf->SetFont('Arial','',9);

2
htdocs/societe/class/societe.class.php
View File

@ -194,7 +194,7 @@ class Societe extends CommonObject
if ($result >= 0) if ($result >= 0)
{ {
$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, entity, datec, datea, fk_user_creat)"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, entity, datec, datea, fk_user_creat)";
$sql.= " VALUES ('".$db->escape($this->nom)."', ".$conf->entity.", '".$this->db->idate($now)."', '".$this->db->idate($now)."',"; $sql.= " VALUES ('".$this->db->escape($this->nom)."', ".$conf->entity.", '".$this->db->idate($now)."', '".$this->db->idate($now)."',";
$sql.= " ".($user->id > 0 ? "'".$user->id."'":"null"); $sql.= " ".($user->id > 0 ? "'".$user->id."'":"null");
$sql.= ")"; $sql.= ")";

2
htdocs/societe/soc.php
View File

@ -856,7 +856,7 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit')
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
// Name // Name
print '<tr><td><span class="fieldrequired">'.$langs->trans('Name').'</span></td><td colspan="3"><input type="text" size="40" name="nom" value="'.$soc->nom.'"></td></tr>'; print '<tr><td><span class="fieldrequired">'.$langs->trans('Name').'</span></td><td colspan="3"><input type="text" size="40" maxlength="60" name="nom" value="'.$soc->nom.'"></td></tr>';
// Prefix // Prefix
print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">'; print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';