From 1d2d21de093253ac738a8a844857561857a02ed9 Mon Sep 17 00:00:00 2001 From: IJ Date: Sun, 13 Nov 2016 00:36:24 +0000 Subject: [PATCH 1/2] Add PayPal Missing Translation String Add PayPal missing translation string to expense report payment type --- htdocs/langs/en_US/bills.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 48881c0d569..a149eda6511 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -76,6 +76,7 @@ PaymentsBackAlreadyDone=Payments back already done PaymentRule=Payment rule PaymentMode=Payment type PaymentTypeDC=Debit/Credit Card +PaymentTypePP=PayPal IdPaymentMode=Payment type (id) LabelPaymentMode=Payment type (label) PaymentModeShort=Payment type From 37a9f15fb42bcd8c96f70b1429ab0b4d2135b65a Mon Sep 17 00:00:00 2001 From: florian HENRY Date: Mon, 14 Nov 2016 12:21:08 +0100 Subject: [PATCH 2/2] FIX : increase size of llx_c_actioncomm type column --- htdocs/install/mysql/migration/4.0.0-5.0.0.sql | 2 +- htdocs/install/mysql/tables/llx_c_actioncomm.sql | 2 +- 2 files changed, 2 insertions(+), 2 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 1e0f92a1cac..dc86614df4c 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 @@ -201,4 +201,4 @@ create table llx_user_employment dateemploymentend date -- last and current value stored into llx_user )ENGINE=innodb; - +ALTER TABLE llx_c_actioncomm MODIFY COLUMN type varchar(50) DEFAULT 'system' NOT NULL; diff --git a/htdocs/install/mysql/tables/llx_c_actioncomm.sql b/htdocs/install/mysql/tables/llx_c_actioncomm.sql index d29cd2f8df3..a2b2d0cb069 100644 --- a/htdocs/install/mysql/tables/llx_c_actioncomm.sql +++ b/htdocs/install/mysql/tables/llx_c_actioncomm.sql @@ -22,7 +22,7 @@ create table llx_c_actioncomm ( id integer PRIMARY KEY, code varchar(12) NOT NULL, - type varchar(10) DEFAULT 'system' NOT NULL, + type varchar(50) DEFAULT 'system' NOT NULL, libelle varchar(48) NOT NULL, module varchar(16) DEFAULT NULL, active tinyint DEFAULT 1 NOT NULL,