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

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

Browse Source 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/accountancy/admin/categories.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
This commit is contained in:
Laurent Destailleur
2017-03-05 22:11:35 +01:00
parent c2298c2e6b 6e2aaf7408
commit 5f79b2d0c6
41 changed files with 854 additions and 688 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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) DEFAULT '0', -- Hierarchic parent
account_parent varchar(32) DEFAULT '0', -- Hierarchic parent TODO Move this as integer, it is a foreign key of llx_accounting_account.rowid
label varchar(255) NOT NULL,
fk_accounting_category integer DEFAULT 0,
fk_user_author integer DEFAULT NULL,

17
htdocs/install/mysql/tables/llx_contratdet.sql
View File

@@ -29,7 +29,7 @@ create table llx_contratdet
label text, -- libelle du produit
description text,
fk_remise_except integer NULL, -- Lien vers table des remises fixes
fk_remise_except integer NULL, -- Lien vers table des remises fixes
date_commande datetime,
date_ouverture_prevue datetime,
@@ -37,15 +37,16 @@ create table llx_contratdet
date_fin_validite datetime,
date_cloture datetime,
tva_tx double(6,3) DEFAULT 0, -- taux tva
localtax1_tx double(6,3) DEFAULT 0, -- local tax 1 rate
localtax1_type varchar(10) NULL, -- localtax1 type
localtax2_tx double(6,3) DEFAULT 0, -- local tax 2 rate
localtax2_type varchar(10) NULL, -- localtax2 type
vat_src_code varchar(10) DEFAULT '', -- Vat code used as source of vat fields. Not strict foreign key here.
tva_tx double(6,3) DEFAULT 0, -- taux tva
localtax1_tx double(6,3) DEFAULT 0, -- local tax 1 rate
localtax1_type varchar(10) NULL, -- localtax1 type
localtax2_tx double(6,3) DEFAULT 0, -- local tax 2 rate
localtax2_type varchar(10) NULL, -- localtax2 type
qty real NOT NULL, -- quantity
remise_percent real DEFAULT 0, -- pourcentage de remise
remise_percent real DEFAULT 0, -- pourcentage de remise
subprice double(24,8) DEFAULT 0, -- prix unitaire
price_ht real, -- prix final (obsolete)
price_ht real, -- prix final (obsolete)
remise real DEFAULT 0, -- montant de la remise (obsolete)
total_ht double(24,8) DEFAULT 0, -- Total HT de la ligne toute quantite et incluant remise ligne et globale
total_tva double(24,8) DEFAULT 0, -- Total TVA de la ligne toute quantite et incluant remise ligne et globale