Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 09:02:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into develop_advtargetemailiing

Browse Source 
Conflicts:
	htdocs/admin/dict.php
	htdocs/core/class/html.formaccounting.class.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/install/mysql/tables/llx_c_accounting_category.sql
This commit is contained in:
Florian HENRY
2016-04-04 14:43:17 +02:00
parent 0ab40f11be 1d700cd286
commit 344a87f970
40 changed files with 1011 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -335,7 +335,7 @@ CREATE TABLE llx_c_accounting_category (
rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
code varchar(16) NOT NULL,
label varchar(255) NOT NULL,
ranges varchar(255) NOT NULL,
range_account varchar(255) NOT NULL,
position integer DEFAULT 0,
fk_country integer DEFAULT NULL, -- This category is dedicated to a country
active integer DEFAULT 1

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

@@ -29,7 +29,7 @@ create table llx_accounting_account
pcg_type varchar(20) NOT NULL,
pcg_subtype varchar(20) NOT NULL,
account_number varchar(32) NOT NULL,
account_parent varchar(32),
account_parent integer, -- Hierarchic parent
label varchar(255) NOT NULL,
fk_accounting_category integer DEFAULT 0,
fk_user_author integer DEFAULT NULL,

2
htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql
View File

@@ -17,4 +17,4 @@
-- ===========================================================================
ALTER TABLE llx_bordereau_cheque ADD UNIQUE INDEX uk_bordereau_cheque (number, entity);
ALTER TABLE llx_bordereau_cheque ADD UNIQUE INDEX uk_bordereau_cheque (ref, entity);

6
htdocs/install/mysql/tables/llx_bordereau_cheque.sql
View File

@@ -24,10 +24,10 @@
create table llx_bordereau_cheque
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
number varchar(16) NOT NULL, -- ref
ref_ext varchar(255), -- ref_ext
ref varchar(30) NOT NULL, -- ref
ref_ext varchar(255), -- ref_ext
datec datetime NOT NULL,
date_bordereau date, -- A quoi sert cette date ?
date_bordereau date,
amount double(24,8) NOT NULL,
nbcheque smallint NOT NULL,
fk_bank_account integer,

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

@@ -21,7 +21,7 @@ CREATE TABLE llx_c_accounting_category (
rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
code varchar(16) NOT NULL,
label varchar(255) NOT NULL,
ranges varchar(255) NOT NULL,
range_account varchar(255) NOT NULL,
position integer DEFAULT 0,
fk_country integer DEFAULT NULL, -- This category is dedicated to a country
active integer DEFAULT 1