FIX resolve conflicts

htdocs/install/mysql/data/llx_c_availability.sql

@@ -1,6 +1,8 @@
 -- Copyright (C) 2011 Philippe GRAND      <philippe.grand@atoo-net.com>
 -- Copyright (C) 2020 Alexandre SPANGARO  <aspangaro@open-dsi.fr>
+-- Copyright (C) 2022 Udo Tamm, dolibit   <dev@dolibit.de>
 --
+
 -- 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
 -- the Free Software Foundation; either version 3 of the License, or
@@ -16,7 +18,12 @@
 --
 --
 
+-- WARNING 
+-- Do not place a comment at the end of the line, this file is parsed during
+-- installation and all '--' symbols are removed.
 --
+
+-- ATTENTION
 -- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
 -- de l'install et tous les sigles '--' sont supprimés.
 --
@@ -25,9 +32,15 @@
 -- Availability type
 --
 
-INSERT INTO llx_c_availability (code,label,type_duration,qty,active,position) VALUES ('AV_NOW', 'Immediate', null, 0, 1, 10);
-INSERT INTO llx_c_availability (code,label,type_duration,qty,active,position) VALUES ('AV_1W',  '1 week', 'w', 1, 1, 20);
-INSERT INTO llx_c_availability (code,label,type_duration,qty,active,position) VALUES ('AV_2W',  '2 weeks', 'w', 2, 1, 30);
-INSERT INTO llx_c_availability (code,label,type_duration,qty,active,position) VALUES ('AV_3W',  '3 weeks', 'w', 3, 1, 40);
-INSERT INTO llx_c_availability (code,label,type_duration,qty,active,position) VALUES ('AV_4W',  '4 weeks', 'w', 4, 1, 50);
-
+INSERT INTO llx_c_availability (code, label, type_duration, qty, active, position) VALUES ('AV_NOW', 'Immediate', null, 0, 1,  10);
+INSERT INTO llx_c_availability (code, label, type_duration, qty, active, position) VALUES ('AV_1W',   '1 week',   'w',  1, 1,  20);
+INSERT INTO llx_c_availability (code, label, type_duration, qty, active, position) VALUES ('AV_2W',   '2 weeks',  'w',  2, 1,  30);
+INSERT INTO llx_c_availability (code, label, type_duration, qty, active, position) VALUES ('AV_3W',   '3 weeks',  'w',  3, 1,  40);
+INSERT INTO llx_c_availability (code, label, type_duration, qty, active, position) VALUES ('AV_4W',   '4 weeks',  'w',  4, 1,  50);
+INSERT INTO llx_c_availability (code, label, type_duration, qty, active, position) VALUES ('AV_5W',   '5 weeks',  'w',  5, 1,  60);
+INSERT INTO llx_c_availability (code, label, type_duration, qty, active, position) VALUES ('AV_6W',   '6 weeks',  'w',  6, 1,  70);
+INSERT INTO llx_c_availability (code, label, type_duration, qty, active, position) VALUES ('AV_8W',   '8 weeks',  'w',  8, 1,  80);
+INSERT INTO llx_c_availability (code, label, type_duration, qty, active, position) VALUES ('AV_10W', '10 weeks',  'w', 10, 1,  90);
+INSERT INTO llx_c_availability (code, label, type_duration, qty, active, position) VALUES ('AV_12W', '12 weeks',  'w', 12, 1, 100);
+INSERT INTO llx_c_availability (code, label, type_duration, qty, active, position) VALUES ('AV_14W', '14 weeks',  'w', 14, 1, 110);
+INSERT INTO llx_c_availability (code, label, type_duration, qty, active, position) VALUES ('AV_16W', '16 weeks',  'w', 16, 1, 120);

htdocs/install/mysql/migration/14.0.0-15.0.0.sql

@@ -36,7 +36,8 @@
 -- VPGSQL8.2 ALTER TABLE llx_partnership ALTER COLUMN date_partnership_end DROP NOT NULL;
 
 ALTER TABLE llx_product_fournisseur_price ADD COLUMN packaging real DEFAULT NULL;
-ALTER TABLE llx_product_fournisseur_price MODIFY COLUMN packaging real DEFAULT NULL;
+-- VMYSQL4.3 ALTER TABLE llx_product_fournisseur_price MODIFY COLUMN packaging real DEFAULT NULL;
+-- VPGSQL8.2 ALTER TABLE llx_product_fournisseur_price MODIFY COLUMN packaging real DEFAULT NULL USING packaging::real;
 
 ALTER TABLE llx_accounting_bookkeeping ADD COLUMN date_export datetime DEFAULT NULL;
 
@@ -119,8 +120,8 @@ ALTER TABLE llx_product ADD COLUMN mandatory_period tinyint NULL DEFAULT 0;
 ALTER TABLE llx_holiday ADD COLUMN date_approve   DATETIME DEFAULT NULL;
 ALTER TABLE llx_holiday ADD COLUMN fk_user_approve integer DEFAULT NULL;
 
-ALTER TABLE llx_ticket MODIFY COLUMN progress integer;
-
+-- VMYSQL4.3 ALTER TABLE llx_ticket MODIFY COLUMN progress integer;
+-- VPGSQL8.2 ALTER TABLE llx_ticket MODIFY COLUMN progress integer USING progress::integer;
 
 ALTER TABLE llx_emailcollector_emailcollectoraction MODIFY COLUMN actionparam TEXT;
 

htdocs/install/mysql/migration/15.0.0-16.0.0.sql

@@ -97,6 +97,12 @@ ALTER TABLE llx_partnership ADD UNIQUE INDEX uk_fk_type_fk_soc (fk_type, fk_soc,
 ALTER TABLE llx_partnership ADD UNIQUE INDEX uk_fk_type_fk_member (fk_type, fk_member, date_partnership_start);
 
 
+-- Add column to help to fix a very critical bug when transferring into accounting bank record of a bank account into another currency.
+-- Idea is to update this column manually in v15 with value in currency of company for bank that are not into the main currency and the transfer
+-- into accounting will use it in priority if value is not null. The script repair.sql contains the sequence to fix datas in llx_bank.
+ALTER TABLE llx_bank ADD COLUMN amount_main_currency double(24,8) NULL;
+
+
 -- v16
 
 UPDATE llx_cronjob set label = 'RecurringInvoicesJob' where label = 'RecurringInvoices';
@@ -328,5 +334,11 @@ ALTER TABLE llx_actioncomm MODIFY COLUMN note mediumtext;
 DELETE FROM llx_boxes WHERE box_id IN (select rowid FROM llx_boxes_def WHERE file IN ('box_bom.php@bom', 'box_bom.php'));
 DELETE FROM llx_boxes_def WHERE file IN ('box_bom.php@bom', 'box_bom.php');
 
+ALTER TABLE llx_takepos_floor_tables ADD UNIQUE(entity,label);
+
+ALTER TABLE llx_partnership ADD COLUMN url_to_check varchar(255);
+ALTER TABLE llx_c_partnership_type ADD COLUMN keyword	varchar(128);
+
+
 ALTER TABLE llx_takepos_floor_tables ADD UNIQUE(entity,label);
 ALTER TABLE llx_inventory ADD COLUMN fk_categories_product VARCHAR(255) DEFAULT NULL AFTER fk_product;

htdocs/install/mysql/migration/repair.sql

@@ -559,6 +559,13 @@ DELETE FROM llx_rights_def WHERE module = 'hrm' AND perms = 'employee';
 
 
 -- Sequence to fix the content of llx_bank.amount_main_currency
+-- Note: amount is amount in currency of bank account
+-- Note: pamount is always amount into the main currency
+-- Note: pmulticurrencyamount is in currency of invoice 
+-- Note: amount_main_currency must be amount in main currency
 -- DROP TABLE tmp_bank;
 -- CREATE TABLE tmp_bank SELECT b.rowid, b.amount, p.rowid as pid, p.amount as pamount, p.multicurrency_amount as pmulticurrencyamount FROM llx_bank as b INNER JOIN llx_bank_url as bu ON bu.fk_bank=b.rowid AND bu.type = 'payment' INNER JOIN llx_paiement as p ON bu.url_id = p.rowid WHERE p.multicurrency_amount <> 0 AND p.multicurrency_amount <> p.amount;
 -- UPDATE llx_bank as b SET b.amount_main_currency = (SELECT tb.pamount FROM tmp_bank as tb WHERE tb.rowid = b.rowid) WHERE b.amount_main_currency IS NULL;
+-- DROP TABLE tmp_bank2;
+-- CREATE TABLE tmp_bank2 SELECT b.rowid, b.amount, p.rowid as pid, p.amount as pamount, p.multicurrency_amount as pmulticurrencyamount FROM llx_bank as b INNER JOIN llx_bank_url as bu ON bu.fk_bank=b.rowid AND bu.type = 'payment_supplier' INNER JOIN llx_paiementfourn as p ON bu.url_id = p.rowid WHERE p.multicurrency_amount <> 0 AND p.multicurrency_amount <> p.amount;
+-- UPDATE llx_bank as b SET b.amount_main_currency = (SELECT tb.pamount FROM tmp_bank2 as tb WHERE tb.rowid = b.rowid) WHERE b.amount_main_currency IS NULL;

htdocs/install/mysql/tables/llx_c_partnership_type-partnership.sql

@@ -31,6 +31,7 @@ create table llx_c_partnership_type
   entity        integer DEFAULT 1 NOT NULL,
   code          varchar(32) NOT NULL,
   label 	    varchar(128)	NOT NULL,
+  keyword		varchar(128),					-- a keyword to check into url of partner website or a dedicated url defined into partneship record 
   active  	    tinyint DEFAULT 1 NOT NULL
 )ENGINE=innodb;
 

htdocs/install/mysql/tables/llx_partnership-partnership.sql

@@ -34,8 +34,9 @@ CREATE TABLE llx_partnership(
 	note_private text, 
 	note_public text, 
 	last_main_doc varchar(255), 
-	count_last_url_check_error integer DEFAULT '0',
-	last_check_backlink datetime NULL,
+	url_to_check varchar(255),							-- url to check to find a specific keyword (defined into llx_c_partnership) to keep status of partnership valid
+	count_last_url_check_error integer DEFAULT '0',		-- last result of check of keyword into url
+	last_check_backlink datetime NULL,					-- date of last check of keyword into url
 	import_key varchar(14),
 	model_pdf varchar(255)
 ) ENGINE=innodb;