From ae3ace7e943537ba04e3ceea0cbc9c1c6e142969 Mon Sep 17 00:00:00 2001 From: Andreas Pachler Date: Wed, 8 Feb 2017 12:46:42 +0100 Subject: [PATCH 1/3] added additional payment terms often needed in Austria --- htdocs/install/mysql/data/llx_c_payment_term.sql | 6 ++++++ htdocs/install/mysql/migration/4.0.0-5.0.0.sql | 8 +++++++- htdocs/langs/de_DE/bills.lang | 8 ++++++++ htdocs/langs/en_US/bills.lang | 8 ++++++++ htdocs/langs/fr_FR/bills.lang | 10 +++++++++- 5 files changed, 38 insertions(+), 2 deletions(-) diff --git a/htdocs/install/mysql/data/llx_c_payment_term.sql b/htdocs/install/mysql/data/llx_c_payment_term.sql index 783bf1e0daf..86a5078a4ef 100644 --- a/htdocs/install/mysql/data/llx_c_payment_term.sql +++ b/htdocs/install/mysql/data/llx_c_payment_term.sql @@ -35,3 +35,9 @@ insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_ insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (6,'PT_ORDER', 6,1, 'A réception de commande','A réception de commande',0,1); insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (7,'PT_DELIVERY', 7,1, 'Livraison','Règlement à la livraison',0,1); insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (8,'PT_5050', 8,1, '50 et 50','Règlement 50% à la commande, 50% à la livraison',0,1); + +-- add additional payment terms often needed in Austria +insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (9,'10D', 2,1, '30 jours','Réglement à 10 jours',0,10); +insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (10,'10DENDMONTH', 3,1, '30 jours fin de mois','Réglement à 10 jours fin de mois',1,10); +insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (11,'14D', 2,1, '30 jours','Réglement à 14 jours',0,14); +insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (12,'14DENDMONTH', 3,1, '30 jours fin de mois','Réglement à 14 jours fin de mois',1,14); diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql index 16a9b566bf5..b8441ac4190 100644 --- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql +++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql @@ -286,4 +286,10 @@ CREATE TABLE llx_product_attribute_value value VARCHAR(255) DEFAULT NULL, entity INT DEFAULT 1 NOT NULL ); -ALTER TABLE llx_product_attribute_value ADD CONSTRAINT unique_ref UNIQUE (fk_product_attribute,ref); \ No newline at end of file +ALTER TABLE llx_product_attribute_value ADD CONSTRAINT unique_ref UNIQUE (fk_product_attribute,ref); + +-- add additional payment terms often needed in Austria +insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (9,'10D', 2,1, '30 jours','Réglement à 10 jours',0,10); +insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (10,'10DENDMONTH', 3,1, '30 jours fin de mois','Réglement à 10 jours fin de mois',1,10); +insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (11,'14D', 2,1, '30 jours','Réglement à 14 jours',0,14); +insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (12,'14DENDMONTH', 3,1, '30 jours fin de mois','Réglement à 14 jours fin de mois',1,14); diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang index 261da362f7a..00d5052330c 100644 --- a/htdocs/langs/de_DE/bills.lang +++ b/htdocs/langs/de_DE/bills.lang @@ -351,6 +351,14 @@ PaymentConditionShortPT_ORDER=Bestellung PaymentConditionPT_ORDER=Bei Bestellung PaymentConditionShortPT_5050=50-50 PaymentConditionPT_5050=50%% im Voraus, 50%% bei Lieferung +PaymentConditionShort10D=10 Tage +PaymentCondition10D=10 Tage netto +PaymentConditionShort10DENDMONTH=10 Tage ab Monatsende +PaymentCondition10DENDMONTH=Innerhalb von 10 Tagen, nach Monatsende +PaymentConditionShort14D=14 Tage +PaymentCondition14D=14 Tage netto +PaymentConditionShort14DENDMONTH=14 Tage ab Monatsende +PaymentCondition14DENDMONTH=Innerhalb von 14 Tagen, nach Monatsende FixAmount=Fester Betrag VarAmount=Variabler Betrag (%% tot.) # PaymentType diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 837d09a79b3..1cd65446b90 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -355,6 +355,14 @@ PaymentConditionShortPT_ORDER=Order PaymentConditionPT_ORDER=On order PaymentConditionShortPT_5050=50-50 PaymentConditionPT_5050=50%% in advance, 50%% on delivery +PaymentConditionShort10D=10 days +PaymentCondition10D=10 days +PaymentConditionShort10DENDMONTH=10 days of month-end +PaymentCondition10DENDMONTH=Within 10 days following the end of the month +PaymentConditionShort14D=14 days +PaymentCondition14D=14 days +PaymentConditionShort14DENDMONTH=14 days of month-end +PaymentCondition14DENDMONTH=Within 14 days following the end of the month FixAmount=Fix amount VarAmount=Variable amount (%% tot.) # PaymentType diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index 7f58225576a..f0473d737fa 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -351,6 +351,14 @@ PaymentConditionShortPT_ORDER=A commande PaymentConditionPT_ORDER=À réception de commande PaymentConditionShortPT_5050=50/50 PaymentConditionPT_5050=Règlement 50%% d'avance, 50%% à la livraison +PaymentConditionShort10D=10 jours +PaymentCondition10D=Règlement à 10 jours +PaymentConditionShort10DENDMONTH=10 jours fin de mois +PaymentCondition10DENDMONTH=Règlement à 10 jours fin de mois +PaymentConditionShort14D=14 jours +PaymentCondition14D=Règlement à 14 jours +PaymentConditionShort14DENDMONTH=14 jours fin de mois +PaymentCondition14DENDMONTH=Règlement à 14 jours fin de mois FixAmount=Montant Fixe VarAmount=Montant variable (%% tot.) # PaymentType @@ -492,4 +500,4 @@ ConfirmDeleteRepeatableInvoice=Est-ce votre sûr de vouloir supprimer la facture CreateOneBillByThird=Créer une facture par tiers (sinon, une facture par commande) BillCreated=%s facture(s) créée(s) WithdrawRequest=Demande de prélèvement -BadPaymentMethod=Mauvais mode de paiement \ No newline at end of file +BadPaymentMethod=Mauvais mode de paiement From c45b40075d39ab6366abcba93191a5c814118007 Mon Sep 17 00:00:00 2001 From: Andreas Pachler Date: Wed, 8 Feb 2017 12:55:03 +0100 Subject: [PATCH 2/3] fixed typos --- htdocs/install/mysql/data/llx_c_payment_term.sql | 8 ++++---- htdocs/install/mysql/migration/4.0.0-5.0.0.sql | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/install/mysql/data/llx_c_payment_term.sql b/htdocs/install/mysql/data/llx_c_payment_term.sql index 86a5078a4ef..c7fd08a62d6 100644 --- a/htdocs/install/mysql/data/llx_c_payment_term.sql +++ b/htdocs/install/mysql/data/llx_c_payment_term.sql @@ -37,7 +37,7 @@ insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_ insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (8,'PT_5050', 8,1, '50 et 50','Règlement 50% à la commande, 50% à la livraison',0,1); -- add additional payment terms often needed in Austria -insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (9,'10D', 2,1, '30 jours','Réglement à 10 jours',0,10); -insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (10,'10DENDMONTH', 3,1, '30 jours fin de mois','Réglement à 10 jours fin de mois',1,10); -insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (11,'14D', 2,1, '30 jours','Réglement à 14 jours',0,14); -insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (12,'14DENDMONTH', 3,1, '30 jours fin de mois','Réglement à 14 jours fin de mois',1,14); +insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (9,'10D', 9,1, '10 jours','Réglement à 10 jours',0,10); +insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (10,'10DENDMONTH', 10,1, '10 jours fin de mois','Réglement à 10 jours fin de mois',1,10); +insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (11,'14D', 11,1, '14 jours','Réglement à 14 jours',0,14); +insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (12,'14DENDMONTH', 12,1, '14 jours fin de mois','Réglement à 14 jours fin de mois',1,14); diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql index b8441ac4190..29832ee6765 100644 --- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql +++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql @@ -289,7 +289,7 @@ CREATE TABLE llx_product_attribute_value ALTER TABLE llx_product_attribute_value ADD CONSTRAINT unique_ref UNIQUE (fk_product_attribute,ref); -- add additional payment terms often needed in Austria -insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (9,'10D', 2,1, '30 jours','Réglement à 10 jours',0,10); -insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (10,'10DENDMONTH', 3,1, '30 jours fin de mois','Réglement à 10 jours fin de mois',1,10); -insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (11,'14D', 2,1, '30 jours','Réglement à 14 jours',0,14); -insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (12,'14DENDMONTH', 3,1, '30 jours fin de mois','Réglement à 14 jours fin de mois',1,14); +insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (9,'10D', 9,1, '10 jours','Réglement à 10 jours',0,10); +insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (10,'10DENDMONTH', 10,1, '10 jours fin de mois','Réglement à 10 jours fin de mois',1,10); +insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (11,'14D', 11,1, '14 jours','Réglement à 14 jours',0,14); +insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (12,'14DENDMONTH', 12,1, '14 jours fin de mois','Réglement à 14 jours fin de mois',1,14); From 072fa9987bf24cf837c89595af39d4e4b4352d3c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 8 Feb 2017 16:47:27 +0100 Subject: [PATCH 3/3] Update 4.0.0-5.0.0.sql --- htdocs/install/mysql/migration/4.0.0-5.0.0.sql | 6 ------ 1 file changed, 6 deletions(-) diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql index 29832ee6765..456d5942549 100644 --- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql +++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql @@ -287,9 +287,3 @@ CREATE TABLE llx_product_attribute_value entity INT DEFAULT 1 NOT NULL ); ALTER TABLE llx_product_attribute_value ADD CONSTRAINT unique_ref UNIQUE (fk_product_attribute,ref); - --- add additional payment terms often needed in Austria -insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (9,'10D', 9,1, '10 jours','Réglement à 10 jours',0,10); -insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (10,'10DENDMONTH', 10,1, '10 jours fin de mois','Réglement à 10 jours fin de mois',1,10); -insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (11,'14D', 11,1, '14 jours','Réglement à 14 jours',0,14); -insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (12,'14DENDMONTH', 12,1, '14 jours fin de mois','Réglement à 14 jours fin de mois',1,14);