From 53e6da8c7c32ad21b7e816a54034cb763c4e3bdf Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Sat, 20 Jan 2018 21:57:36 +0100 Subject: [PATCH] Missing fetch and translation --- htdocs/langs/en_US/companies.lang | 1 + htdocs/societe/class/societe.class.php | 3 +++ 2 files changed, 4 insertions(+) diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index 7cff22df092..04528266b64 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -405,6 +405,7 @@ ProductsIntoElements=List of products/services into %s CurrentOutstandingBill=Current outstanding bill OutstandingBill=Max. for outstanding bill OutstandingBillReached=Max. for outstanding bill reached +OrderMinAmount=Minimum amount for order MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0. LeopardNumRefModelDesc=The code is free. This code can be modified at any time. ManagingDirectors=Manager(s) name (CEO, director, president...) diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index dc91e7f668c..675dd2a3123 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -1142,6 +1142,7 @@ class Societe extends CommonObject $sql .= ', s.mode_reglement_supplier, s.cond_reglement_supplier, s.localtax1_assuj, s.localtax1_value, s.localtax2_assuj, s.localtax2_value, s.fk_prospectlevel, s.default_lang, s.logo'; $sql .= ', s.fk_shipping_method'; $sql .= ', s.outstanding_limit, s.import_key, s.canvas, s.fk_incoterms, s.location_incoterms'; + $sql .= ', s.order_min_amount, s.supplier_order_min_amount'; $sql .= ', s.fk_multicurrency, s.multicurrency_code'; $sql .= ', fj.libelle as forme_juridique'; $sql .= ', e.libelle as effectif'; @@ -1289,6 +1290,8 @@ class Societe extends CommonObject $this->webservices_key = $obj->webservices_key; $this->outstanding_limit = $obj->outstanding_limit; + $this->order_min_amount = $obj->order_min_amount; + $this->supplier_order_min_amount = $obj->supplier_order_min_amount; // multiprix $this->price_level = $obj->price_level;