diff --git a/htdocs/install/mysql/migration/2.9.0-3.0.0.sql b/htdocs/install/mysql/migration/2.9.0-3.0.0.sql index ebb939fd04ceb26d5f078a81d310e94735cdcc20..2e194d17f2bd2b4f6b43f8eb197785e7c97cef4e 100644 --- a/htdocs/install/mysql/migration/2.9.0-3.0.0.sql +++ b/htdocs/install/mysql/migration/2.9.0-3.0.0.sql @@ -45,5 +45,5 @@ ALTER TABLE llx_societe ADD COLUMN canvas varchar(32) DEFAULT NULL AFTER default --UPDATE llx_societe SET canvas='default' WHERE fk_typent <> 8; --UPDATE llx_societe SET canvas='individual' WHERE fk_typent = 8; -RENAME TABLE llx_cond_reglement TO llx_c_payment_term; -RENAME TABLE llx_expedition_method TO llx_c_shipment_mode; +ALTER TABLE llx_cond_reglement RENAME TO llx_c_payment_term; +ALTER TABLE llx_expedition_methode RENAME TO llx_c_shipment_mode; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index c4e9a82576458bc90b7a5f058002e7e92fc5f35e..db02b28314d56f231f658d8371a3696ab19b2615 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -595,7 +595,7 @@ DictionnaryCivility=Civility title DictionnaryActions=Actions list DictionnarySocialContributions=Social contributions types DictionnaryVAT=VAT Rates -DictionnaryPaymentConditions=Payment conditions +DictionnaryPaymentConditions=Payment terms DictionnaryPaymentModes=Payment modes DictionnaryTypeContact=Contact types DictionnaryEcotaxe=Ecotax (WEEE) diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 8fcef977e325e49f134ffd332facc4869292b528..59d6f69d38da9ef282ac96fcad750203eaca7ca1 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -207,7 +207,7 @@ CustomerBillsUnpaid=Unpaid customers invoices DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters NonPercuRecuperable=Non-recoverable -SetConditions=Set payment conditions +SetConditions=Set payment terms SetMode=Set payment mode SetDate= Set date Billed=Billed