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

Fix: Miscellanous fix on i18n

Browse Source
This commit is contained in:
Laurent Destailleur 2009-01-25 16:45:07 +00:00
parent 6da0d25acc
commit d371bd7fe4
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/propal.class.php
View File

@ -716,7 +716,7 @@ class Propal extends CommonObject
$sql.= ", p.fk_mode_reglement";
$sql.= ", c.label as statut_label";
$sql.= ", cr.code as cond_reglement_code, cr.libelle, cr.libelle_facture";
$sql.= ", cp.code as mode_reglement_code";
$sql.= ", cp.code as mode_reglement_code, cp.libelle as mode_reglement";
$sql.= " FROM ".MAIN_DB_PREFIX."c_propalst as c, ".MAIN_DB_PREFIX."propal as p";
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as cp ON p.fk_mode_reglement = cp.id';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'cond_reglement as cr ON p.fk_cond_reglement = cr.rowid';
@ -757,12 +757,13 @@ class Propal extends CommonObject
$this->date_livraison = $this->db->jdate($obj->date_livraison);
$this->adresse_livraison_id = $obj->fk_adresse_livraison;
$this->mode_reglement_id = $obj->fk_mode_reglement;
$this->mode_reglement_code = $obj->mode_reglement_code;
$this->cond_reglement_id = $obj->fk_cond_reglement;
$this->cond_reglement_code = $obj->cond_reglement_code;
$this->cond_reglement = $objc->libelle;
$this->cond_reglement_document = $objc->libelle_facture;
$this->mode_reglement_id = $obj->fk_mode_reglement;
$this->mode_reglement_code = $obj->mode_reglement_code;
$this->mode_reglement = $obj->mode_reglement;
$this->cond_reglement_id = $obj->fk_cond_reglement;
$this->cond_reglement_code = $obj->cond_reglement_code;
$this->cond_reglement = $objc->libelle;
$this->cond_reglement_document = $objc->libelle_facture;
$this->user_author_id = $obj->fk_user_author;

1
htdocs/translate.class.php
View File

@ -405,6 +405,7 @@ class Translate {
* \brief Return translated value of a text string
* Si il n'y a pas de correspondance pour ce texte, on cherche dans fichier alternatif
* et si toujours pas trouve, il est retourne tel quel.
* No convert to encoding charset of lang object is done.
* Parameters of this method must not contains any HTML tags.
* \param key key of string to translate
* \param param1 chaine de param1