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 'develop' into FIX_develop_urls_longer_than_255_chars_get_truncated_in_bookmarks

Browse Source
This commit is contained in:
Florian Mortgat
2019-12-24 10:00:20 +01:00
parent 7359c4140d 6f97d163f9
commit cbca0f389a
2041 changed files with 39769 additions and 40568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,7 @@
create table llx_c_action_trigger
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
elementtype varchar(32) NOT NULL,
elementtype varchar(64) NOT NULL,
code varchar(32) NOT NULL,
label varchar(128) NOT NULL,
description varchar(255),

3
htdocs/install/mysql/tables/llx_facturedet.sql
View File

@@ -63,8 +63,9 @@ create table llx_facturedet
fk_code_ventilation integer DEFAULT 0 NOT NULL, -- Id in table llx_accounting_bookeeping to know accounting account for product line
situation_percent real, -- % progression of lines invoicing
situation_percent real DEFAULT 100, -- % progression of lines invoicing
fk_prev_id integer, -- id of the line in the previous situation
fk_user_author integer, -- user making creation
fk_user_modif integer, -- user making last change

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

@@ -1,4 +1,4 @@
-- Copyright (C) ---Put here your own copyright and developer email---
-- Copyright (C) 2019 Laurent Destailleur <eldy@users.sourceforge.net>
--
-- This program is free software: you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
@@ -26,9 +26,11 @@ CREATE TABLE llx_mrp_mo(
note_public text,
note_private text,
date_creation datetime NOT NULL,
date_valid datetime NULL,
tms timestamp,
fk_user_creat integer NOT NULL,
fk_user_modif integer,
fk_user_modif integer,
fk_user_valid integer,
import_key varchar(14),
model_pdf varchar(255),
status integer NOT NULL,

14
htdocs/install/mysql/tables/llx_product_attribute_combination.sql
View File

@@ -18,11 +18,11 @@
CREATE TABLE llx_product_attribute_combination
(
rowid INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
fk_product_parent INT NOT NULL,
fk_product_child INT NOT NULL,
variation_price FLOAT NOT NULL,
variation_price_percentage INT NULL,
variation_weight FLOAT NOT NULL,
entity INT DEFAULT 1 NOT NULL
rowid INTEGER PRIMARY KEY NOT NULL AUTO_INCREMENT,
fk_product_parent INTEGER NOT NULL,
fk_product_child INTEGER NOT NULL,
variation_price DOUBLE(24,8) NOT NULL,
variation_price_percentage INTEGER NULL,
variation_weight REAL NOT NULL,
entity INTEGER DEFAULT 1 NOT NULL
)ENGINE=innodb;

10
htdocs/install/mysql/tables/llx_product_pricerules.sql
View File

@@ -18,9 +18,9 @@
CREATE TABLE llx_product_pricerules
(
rowid INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
level INT NOT NULL, -- Which price level is this rule for?
fk_level INT NOT NULL, -- Price variations are made over price of X
var_percent FLOAT NOT NULL, -- Price variation over based price
var_min_percent FLOAT NOT NULL -- Min price discount over general price
rowid INTEGER PRIMARY KEY NOT NULL AUTO_INCREMENT,
level INTEGER NOT NULL, -- Which price level is this rule for?
fk_level INTEGER NOT NULL, -- Price variations are made over price of X
var_percent REAL NOT NULL, -- Price variation over based price
var_min_percent REAL NOT NULL -- Min price discount over general price
)ENGINE=innodb;

3
htdocs/install/mysql/tables/llx_societe_account.sql
View File

@@ -20,13 +20,14 @@ CREATE TABLE llx_societe_account(
-- BEGIN MODULEBUILDER FIELDS
rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
entity integer DEFAULT 1,
key_account varchar(128),
key_account varchar(128), -- the id of third party in external web site (for site_account if site_account defined)
login varchar(128) NOT NULL,
pass_encoding varchar(24),
pass_crypted varchar(128),
pass_temp varchar(128), -- temporary password when asked for forget password
fk_soc integer,
site varchar(128), -- name of external web site
site_account varchar(128), -- a key to identify the account on external web site
fk_website integer, -- id of local web site
note_private text,
date_last_login datetime,