lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into

Browse Source 
develop

Conflicts:
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
This commit is contained in:
moreauf 2016-11-15 08:35:25 +01:00
commit f97bab6fb8
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
View File

@ -221,4 +221,6 @@ drop table tmp_links_double;
ALTER TABLE llx_links ADD UNIQUE INDEX uk_links (objectid,label); ALTER TABLE llx_links ADD UNIQUE INDEX uk_links (objectid,label);
ALTER TABLE llx_c_actioncomm MODIFY COLUMN type varchar(50) DEFAULT 'system' NOT NULL;
ALTER TABLE llx_loan ADD COLUMN fk_project integer DEFAULT NULL; ALTER TABLE llx_loan ADD COLUMN fk_project integer DEFAULT NULL;

2
htdocs/install/mysql/tables/llx_c_actioncomm.sql
View File

@ -22,7 +22,7 @@ create table llx_c_actioncomm
( (
id integer PRIMARY KEY, id integer PRIMARY KEY,
code varchar(12) NOT NULL, code varchar(12) NOT NULL,
type varchar(10) DEFAULT 'system' NOT NULL, type varchar(50) DEFAULT 'system' NOT NULL,
libelle varchar(48) NOT NULL, libelle varchar(48) NOT NULL,
module varchar(16) DEFAULT NULL, module varchar(16) DEFAULT NULL,
active tinyint DEFAULT 1 NOT NULL, active tinyint DEFAULT 1 NOT NULL,

1
htdocs/langs/en_US/bills.lang
View File

@ -76,6 +76,7 @@ PaymentsBackAlreadyDone=Payments back already done
PaymentRule=Payment rule PaymentRule=Payment rule
PaymentMode=Payment type PaymentMode=Payment type
PaymentTypeDC=Debit/Credit Card PaymentTypeDC=Debit/Credit Card
PaymentTypePP=PayPal
IdPaymentMode=Payment type (id) IdPaymentMode=Payment type (id)
LabelPaymentMode=Payment type (label) LabelPaymentMode=Payment type (label)
PaymentModeShort=Payment type PaymentModeShort=Payment type