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

FIX resolve conflicts

Browse Source
This commit is contained in:
lvessiller
2022-07-06 09:23:44 +02:00
parent 7b7ecf44ad 59816ce171
commit ed9c7ff251
352 changed files with 5401 additions and 5697 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,3 +21,5 @@ ALTER TABLE llx_cronjob ADD INDEX idx_cronjob_datelastrun (datelastrun);
ALTER TABLE llx_cronjob ADD INDEX idx_cronjob_datenextrun (datenextrun);
ALTER TABLE llx_cronjob ADD INDEX idx_cronjob_datestart (datestart);
ALTER TABLE llx_cronjob ADD INDEX idx_cronjob_dateend (dateend);
ALTER TABLE llx_cronjob ADD UNIQUE INDEX uk_cronjob (label, entity);

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

@@ -24,7 +24,7 @@ CREATE TABLE llx_cronjob
tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
datec datetime,
jobtype varchar(10) NOT NULL, -- 'method', 'function' or 'command'
label text NOT NULL,
label varchar(255) NOT NULL,
command varchar(255),
classesname varchar(255), -- when jobtype is 'method', name of the class file containing the method.
objectname varchar(255),

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

@@ -35,6 +35,8 @@ create table llx_entrepot
fk_pays integer DEFAULT 0,
phone varchar(20), -- phone number
fax varchar(20), -- fax number
barcode varchar(180) DEFAULT NULL, -- barcode
fk_barcode_type integer DEFAULT NULL, -- barcode type
warehouse_usage integer DEFAULT 1, -- 1=internal, 2=external (virtual warehouse or stock out of company)
statut tinyint DEFAULT 1, -- 1 open, 0 close
fk_user_author integer,

1
htdocs/install/mysql/tables/llx_facture.sql
View File

@@ -48,6 +48,7 @@ create table llx_facture
remise real DEFAULT 0, -- remise totale calculee
close_code varchar(16), -- Code motif cloture sans paiement complet
close_missing_amount double(24,8), -- Amount missing when closing with a not complete payment
close_note varchar(128), -- Commentaire cloture sans paiement complet
total_tva double(24,8) DEFAULT 0, -- amount total tva apres remise totale

1
htdocs/install/mysql/tables/llx_facture_fourn.sql
View File

@@ -44,6 +44,7 @@ create table llx_facture_fourn
remise double(24,8) DEFAULT 0,
close_code varchar(16), -- Code motif cloture sans paiement complet
close_missing_amount double(24,8), -- Amount missing when closing with a not complete payment
close_note varchar(128), -- Commentaire cloture sans paiement complet
tva double(24,8) DEFAULT 0,