Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

merge conflict

Browse Source
This commit is contained in:
jpb
2021-08-12 09:36:34 +02:00
parent 04d406bd39 340949e0a9
commit b1cba14718
80 changed files with 1237 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@ CREATE TABLE llx_partnership(
fk_soc integer,
fk_member integer,
date_partnership_start date NOT NULL,
date_partnership_end date NOT NULL,
date_partnership_end date NULL,
entity integer DEFAULT 1 NOT NULL, -- multi company id, 0 = all
reason_decline_or_cancel text NULL,
date_creation datetime NOT NULL,

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

@@ -106,4 +106,6 @@ create table llx_product
fk_project integer DEFAULT NULL, -- Used when product was generated by a project or is specifif to a project
mandatory_period tinyint DEFAULT 0 -- is used to signal to the user that the start and end dates are mandatory for this type of product the fk_product_type == 1 (service) (non-blocking action)
fk_default_bom integer DEFAULT NULL,
fk_project integer DEFAULT NULL -- Used when the product was generated by a project or is specific to a project
)ENGINE=innodb;