diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index ce1758e7591..efdc7b26ed8 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -212,9 +212,11 @@ class Propal extends CommonObject public $total; public $cond_reglement_code; - public $deposit_percent; + public $cond_reglement_doc; public $mode_reglement_code; + public $deposit_percent; + /** * @deprecated */ diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index e7c22e460c7..78b127ebfff 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -1963,7 +1963,7 @@ if ($action == 'create' && $usercancreate) { if (empty($reshook)) { if (!empty($conf->global->THIRDPARTY_PROPAGATE_EXTRAFIELDS_TO_ORDER) && !empty($soc->id)) { // copy from thirdparty - $tpExtrafields = new Extrafields($db); + $tpExtrafields = new ExtraFields($db); $tpExtrafieldLabels = $tpExtrafields->fetch_name_optionals_label($soc->table_element); if ($soc->fetch_optionals() > 0) { $object->array_options = array_merge($object->array_options, $soc->array_options); diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 29b4fc2aa70..78c4aa4c7db 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -134,6 +134,11 @@ class Commande extends CommonOrder */ public $cond_reglement_code; + /** + * @var string Condition payment label + */ + public $cond_reglement_doc; + /** * @var double Deposit % for payment terms */ diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 851fc3a08b1..c97f2dd0564 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -225,6 +225,7 @@ class Facture extends CommonInvoice public $date_lim_reglement; public $cond_reglement_code; // Code in llx_c_paiement + public $cond_reglement_doc; // Code in llx_c_paiement public $mode_reglement_code; // Code in llx_c_paiement /**