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

english standardization

Browse Source
This commit is contained in:
Grand Philippe 2013-02-22 09:41:56 +01:00
parent 303577a7fa
commit d229d3a594
8 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/contact/class/contact.class.php
View File

@ -520,7 +520,6 @@ class Contact extends CommonObject
$this->prenom = $obj->firstname; // TODO deprecated $this->prenom = $obj->firstname; // TODO deprecated
$this->address = $obj->address; $this->address = $obj->address;
//$this->adresse = $obj->address; // TODO deprecated
$this->cp = $obj->zip; // TODO deprecated $this->cp = $obj->zip; // TODO deprecated
$this->zip = $obj->zip; $this->zip = $obj->zip;
$this->ville = $obj->town; // TODO deprecated $this->ville = $obj->town; // TODO deprecated

2
htdocs/core/boxes/box_comptes.php
View File

@ -76,7 +76,7 @@ class box_comptes extends ModeleBoxes
{ {
$sql = "SELECT rowid, ref, label, bank, number, courant, clos, rappro, url,"; $sql = "SELECT rowid, ref, label, bank, number, courant, clos, rappro, url,";
$sql.= " code_banque, code_guichet, cle_rib, bic, iban_prefix,"; $sql.= " code_banque, code_guichet, cle_rib, bic, iban_prefix,";
$sql.= " domiciliation, proprio, adresse_proprio,"; $sql.= " domiciliation, proprio, owner_address,";
$sql.= " account_number, currency_code,"; $sql.= " account_number, currency_code,";
$sql.= " min_allowed, min_desired, comment"; $sql.= " min_allowed, min_desired, comment";
$sql.= " FROM ".MAIN_DB_PREFIX."bank_account"; $sql.= " FROM ".MAIN_DB_PREFIX."bank_account";

2
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
View File

@ -623,7 +623,7 @@ class pdf_einstein extends ModelePDFCommandes
{ {
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$pdf->SetFont('','', $default_font_size - 3); $pdf->SetFont('','', $default_font_size - 3);
$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->adresse_proprio), 0, 'L', 0); $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
$posy=$pdf->GetY()+2; $posy=$pdf->GetY()+2;
} }
} }

2
htdocs/core/modules/dons/html_cerfafr.html
View File

@ -65,7 +65,7 @@
<b>__Name__ :</b><br> <b>__Name__ :</b><br>
__MAIN_INFO_SOCIETE_NOM__<br> __MAIN_INFO_SOCIETE_NOM__<br>
<b>__Address__ :</b><br> <b>__Address__ :</b><br>
__MAIN_INFO_SOCIETE_ADRESSE__<br> __MAIN_INFO_SOCIETE_ADDRESS__<br>
<b>__Zip__ :</b> __MAIN_INFO_SOCIETE_CP__<br> <b>__Zip__ :</b> __MAIN_INFO_SOCIETE_CP__<br>
<b>__Town__ :</b> __MAIN_INFO_SOCIETE_VILLE__<br> <b>__Town__ :</b> __MAIN_INFO_SOCIETE_VILLE__<br>
</td> </td>

2
htdocs/core/modules/dons/html_cerfafr.modules.php
View File

@ -140,7 +140,7 @@ class html_cerfafr extends ModeleDon
$form = str_replace('__CURRENCY__',$outputlangs->transnoentitiesnoconv("Currency".$conf->currency),$form); $form = str_replace('__CURRENCY__',$outputlangs->transnoentitiesnoconv("Currency".$conf->currency),$form);
$form = str_replace('__CURRENCYCODE__',$conf->currency,$form); $form = str_replace('__CURRENCYCODE__',$conf->currency,$form);
$form = str_replace('__MAIN_INFO_SOCIETE_NOM__',$mysoc->name,$form); $form = str_replace('__MAIN_INFO_SOCIETE_NOM__',$mysoc->name,$form);
$form = str_replace('__MAIN_INFO_SOCIETE_ADRESSE__',$mysoc->address,$form); $form = str_replace('__MAIN_INFO_SOCIETE_ADDRESS__',$mysoc->address,$form);
$form = str_replace('__MAIN_INFO_SOCIETE_CP__',$mysoc->zip,$form); $form = str_replace('__MAIN_INFO_SOCIETE_CP__',$mysoc->zip,$form);
$form = str_replace('__MAIN_INFO_SOCIETE_VILLE__',$mysoc->town,$form); $form = str_replace('__MAIN_INFO_SOCIETE_VILLE__',$mysoc->town,$form);
$form = str_replace('__DONATOR_NAME__',$don->nom,$form); $form = str_replace('__DONATOR_NAME__',$don->nom,$form);

2
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

@ -750,7 +750,7 @@ class pdf_crabe extends ModelePDFFactures
{ {
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$pdf->SetFont('','', $default_font_size - 3); $pdf->SetFont('','', $default_font_size - 3);
$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->adresse_proprio), 0, 'L', 0); $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
$posy=$pdf->GetY()+2; $posy=$pdf->GetY()+2;
} }
} }

2
htdocs/core/modules/propale/doc/pdf_azur.modules.php
View File

@ -651,7 +651,7 @@ class pdf_azur extends ModelePDFPropales
{ {
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$pdf->SetFont('','', $default_font_size - 3); $pdf->SetFont('','', $default_font_size - 3);
$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->adresse_proprio), 0, 'L', 0); $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
$posy=$pdf->GetY()+2; $posy=$pdf->GetY()+2;
} }
} }

2
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
View File

@ -570,7 +570,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$posy=$pdf->GetY()+1; $posy=$pdf->GetY()+1;
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$pdf->SetFont('','', $default_font_size - 3); $pdf->SetFont('','', $default_font_size - 3);
$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->adresse_proprio), 0, 'L', 0); $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
$posy=$pdf->GetY()+2; $posy=$pdf->GetY()+2;
} }
if ($conf->global->FACTURE_CHQ_NUMBER == -1) if ($conf->global->FACTURE_CHQ_NUMBER == -1)