clean code
This commit is contained in:
parent
400b246266
commit
aff284b267
@ -284,7 +284,7 @@ class CommandeFournisseur extends CommonOrder
|
||||
'fk_cond_reglement' =>array('type'=>'integer', 'label'=>'PaymentTerm', 'enabled'=>1, 'visible'=>3, 'position'=>175),
|
||||
'fk_mode_reglement' =>array('type'=>'integer', 'label'=>'PaymentMode', 'enabled'=>1, 'visible'=>3, 'position'=>180),
|
||||
'extraparams' =>array('type'=>'varchar(255)', 'label'=>'Extraparams', 'enabled'=>1, 'visible'=>0, 'position'=>190),
|
||||
'fk_account' =>array('type'=>'integer', 'label'=>'BankAccount', 'enabled'=>'$conf->banque->enabled', 'visible'=>3, 'position'=>200),
|
||||
'fk_account' =>array('type'=>'integer', 'label'=>'BankAccount', 'enabled'=>'isModEnabled("banque")', 'visible'=>3, 'position'=>200),
|
||||
'fk_incoterms' =>array('type'=>'integer', 'label'=>'IncotermCode', 'enabled'=>1, 'visible'=>3, 'position'=>205),
|
||||
'location_incoterms' =>array('type'=>'varchar(255)', 'label'=>'IncotermLocation', 'enabled'=>1, 'visible'=>3, 'position'=>210),
|
||||
'fk_multicurrency' =>array('type'=>'integer', 'label'=>'Fk multicurrency', 'enabled'=>1, 'visible'=>0, 'position'=>215),
|
||||
@ -1010,8 +1010,8 @@ class CommandeFournisseur extends CommonOrder
|
||||
if (!empty($conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER)) {
|
||||
$mybool = false;
|
||||
|
||||
$file = $conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER.'.php';
|
||||
$classname = $conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER;
|
||||
$file = getDolGlobalString('COMMANDE_SUPPLIER_ADDON_NUMBER').'.php';
|
||||
$classname = getDolGlobalString('COMMANDE_SUPPLIER_ADDON_NUMBER');
|
||||
|
||||
// Include file with class
|
||||
$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
|
||||
@ -1473,7 +1473,7 @@ class CommandeFournisseur extends CommonOrder
|
||||
$sql .= ", ".((int) $user->id);
|
||||
$sql .= ", ".self::STATUS_DRAFT;
|
||||
$sql .= ", ".((int) $this->source);
|
||||
$sql .= ", '".$this->db->escape($conf->global->COMMANDE_SUPPLIER_ADDON_PDF)."'";
|
||||
$sql .= ", '".$this->db->escape(getDolGlobalString('COMMANDE_SUPPLIER_ADDON_PDF'))."'";
|
||||
$sql .= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : 'null');
|
||||
$sql .= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : 'null');
|
||||
$sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
|
||||
@ -3280,7 +3280,7 @@ class CommandeFournisseur extends CommonOrder
|
||||
if (!empty($this->model_pdf)) {
|
||||
$modele = $this->model_pdf;
|
||||
} elseif (!empty($conf->global->COMMANDE_SUPPLIER_ADDON_PDF)) {
|
||||
$modele = $conf->global->COMMANDE_SUPPLIER_ADDON_PDF;
|
||||
$modele = getDolGlobalString('COMMANDE_SUPPLIER_ADDON_PDF');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user