Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
commit
f0472b7ace
|
@ -1973,6 +1973,15 @@ INSERT INTO `vn`.`ticketService`(`id`, `description`, `quantity`, `price`, `taxC
|
||||||
(4, 'Documentos', 1, 2.00, 1, 9, 1),
|
(4, 'Documentos', 1, 2.00, 1, 9, 1),
|
||||||
(5, 'Documentos', 1, 2.00, 1, 8, 1);
|
(5, 'Documentos', 1, 2.00, 1, 8, 1);
|
||||||
|
|
||||||
|
INSERT INTO `pbx`.`config` (id,defaultPrefix)
|
||||||
|
VALUES (1,'0034');
|
||||||
|
|
||||||
|
INSERT INTO `pbx`.`prefix` (country, prefix)
|
||||||
|
VALUES
|
||||||
|
('es', '0034'),
|
||||||
|
('fr', '0033'),
|
||||||
|
('pt', '00351');
|
||||||
|
|
||||||
INSERT INTO `pbx`.`sip`(`user_id`, `extension`)
|
INSERT INTO `pbx`.`sip`(`user_id`, `extension`)
|
||||||
VALUES
|
VALUES
|
||||||
(1, 1010),
|
(1, 1010),
|
||||||
|
@ -3736,18 +3745,3 @@ INSERT INTO vn.ticketLog (originFk,userFk,`action`,creationDate,changedModel,new
|
||||||
INSERT INTO `vn`.`supplierDms`(`supplierFk`, `dmsFk`, `editorFk`)
|
INSERT INTO `vn`.`supplierDms`(`supplierFk`, `dmsFk`, `editorFk`)
|
||||||
VALUES
|
VALUES
|
||||||
(1, 10, 9);
|
(1, 10, 9);
|
||||||
|
|
||||||
INSERT INTO `vn`.`accountReconciliation` (supplierAccountFk,operationDated,valueDated,amount,concept,debitCredit,calculatedCode,created)
|
|
||||||
VALUES
|
|
||||||
(241,'2023-12-13 00:00:00.000','2023-12-07 00:00:00.000',19.36,'BEL 1','debit','2','2023-12-14 08:39:53.000'),
|
|
||||||
(241,'2023-12-13 00:00:00.000','2023-12-07 00:00:00.000',30226.43,'BEL 2','debit','1','2023-12-14 08:39:53.000'),
|
|
||||||
(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',118.81,'RCBO','debit','10','2023-12-14 08:39:53.000'),
|
|
||||||
(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',150.03,'TJ','debit','12','2023-12-14 08:39:53.000'),
|
|
||||||
(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',150.03,'TJ','debit','12','2023-12-14 08:39:53.000'),
|
|
||||||
(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',2149.71,'RCBO.AMAZON','debit','122','2023-12-14 08:39:53.000'),
|
|
||||||
(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',3210.5,'RCBO.VOLVO','debit','121','2023-12-14 08:39:53.000'),
|
|
||||||
(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',6513.7,'RCBO.ENERPLUS','debit','120','2023-12-14 08:39:53.000');
|
|
||||||
|
|
||||||
INSERT INTO `vn`.`accountReconciliationConfig`(currencyFk, warehouseFk)
|
|
||||||
VALUES
|
|
||||||
(1, 1);
|
|
||||||
|
|
|
@ -0,0 +1,35 @@
|
||||||
|
CREATE TABLE IF NOT EXISTS pbx.prefix (
|
||||||
|
country CHAR(2) NOT NULL COMMENT 'Country code',
|
||||||
|
prefix varchar(100) NOT NULL COMMENT 'Country prefix',
|
||||||
|
CONSTRAINT prefix_pk PRIMARY KEY (country)
|
||||||
|
)
|
||||||
|
ENGINE=InnoDB
|
||||||
|
DEFAULT CHARSET=utf8mb3
|
||||||
|
COLLATE=utf8mb3_unicode_ci;
|
||||||
|
|
||||||
|
ALTER TABLE pbx.config
|
||||||
|
CHANGE countryPrefix defaultPrefix varchar(20)
|
||||||
|
CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL NULL;
|
||||||
|
|
||||||
|
ALTER TABLE pbx.config DROP COLUMN IF EXISTS sundayFestive;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS pbx.holiday (
|
||||||
|
id INT UNSIGNED auto_increment NOT NULL,
|
||||||
|
country CHAR(2) NOT NULL,
|
||||||
|
`day` DATE NOT NULL,
|
||||||
|
CONSTRAINT holiday_pk PRIMARY KEY (id)
|
||||||
|
)
|
||||||
|
ENGINE=InnoDB
|
||||||
|
DEFAULT CHARSET=utf8mb3
|
||||||
|
COLLATE=utf8mb3_unicode_ci;
|
||||||
|
CREATE UNIQUE INDEX holiday_country_IDX USING BTREE ON pbx.holiday (country,`day`);
|
||||||
|
|
||||||
|
ALTER TABLE pbx.schedule
|
||||||
|
CHANGE timeStart startTime time NOT NULL,
|
||||||
|
CHANGE timeEnd endTime time NOT NULL,
|
||||||
|
DROP FOREIGN KEY schedule_ibfk_1,
|
||||||
|
DROP COLUMN queue,
|
||||||
|
ADD country CHAR(2) NOT NULL,
|
||||||
|
CHANGE weekDay weekDays set('mon','tue','wed','thu','fri','sat','sun') NOT NULL
|
||||||
|
COMMENT '0 = Monday, 6 = Sunday';
|
||||||
|
|
|
@ -0,0 +1,13 @@
|
||||||
|
INSERT INTO pbx.prefix (country,prefix)
|
||||||
|
VALUES ('es','0034');
|
||||||
|
INSERT INTO pbx.prefix (country,prefix)
|
||||||
|
VALUES ('fr','0033');
|
||||||
|
INSERT INTO pbx.prefix (country,prefix)
|
||||||
|
VALUES ('pt','00351');
|
||||||
|
|
||||||
|
INSERT INTO pbx.schedule (weekDays,startTime,endTime,country)
|
||||||
|
VALUES ('mon,tue,wed,thu,fri,sat,sun','00:00','24:00','es');
|
||||||
|
INSERT INTO pbx.schedule (weekDays,startTime,endTime,country)
|
||||||
|
VALUES ('mon,tue,wed,thu,fri,sat,sun','00:00','24:00','fr');
|
||||||
|
INSERT INTO pbx.schedule (weekDays,startTime,endTime,country)
|
||||||
|
VALUES ('mon,tue,wed,thu,fri,sat,sun','00:00','24:00','pt');
|
Loading…
Reference in New Issue