mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-02-07 16:41:48 +01:00
Trad: Traduction des conditions de paiements
New: Ajout date fin validit sur propal azur Fix: Les conditions de paiements n'apparaissaient pas sur les factures ni propales
This commit is contained in:
@@ -810,7 +810,7 @@ class Form
|
||||
if (sizeof($this->cache_conditions_paiements_code)) return 0; // Cache d<>ja charg<72>
|
||||
|
||||
dolibarr_syslog('html.form.class.php::load_cache_conditions_paiements');
|
||||
$sql = "SELECT rowid, libelle";
|
||||
$sql = "SELECT rowid, code, libelle";
|
||||
$sql.= " FROM ".MAIN_DB_PREFIX."cond_reglement";
|
||||
$sql.= " WHERE active=1";
|
||||
$sql.= " ORDER BY sortorder";
|
||||
@@ -824,7 +824,7 @@ class Form
|
||||
$obj = $this->db->fetch_object($resql);
|
||||
|
||||
// Si traduction existe, on l'utilise, sinon on prend le libell<6C> par d<>faut
|
||||
$libelle=($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->libelle!='-'?$obj->libelle:''));
|
||||
$libelle=($langs->trans("PaymentConditionShort".$obj->code)!=("PaymentConditionShort".$obj->code)?$langs->trans("PaymentConditionShort".$obj->code):($obj->libelle!='-'?$obj->libelle:''));
|
||||
$this->cache_conditions_paiements_code[$obj->rowid]=$obj->code;
|
||||
$this->cache_conditions_paiements_libelle[$obj->rowid]=$libelle;
|
||||
$i++;
|
||||
|
||||
Reference in New Issue
Block a user