verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 65 Releases Wiki Activity

feat: refs #7314 First commit #3364

Open
guillermo wants to merge 1 commits from 7314-newColumnsCmr into dev
pull from: 7314-newColumnsCmr
merge into: verdnatura:dev
Conversation 0 Commits 1 Files Changed 2 +11 -4
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d9a15ffda3 - Show all commits

8
db/dump/fixtures.before.sql
View File

@ -3191,10 +3191,10 @@ INSERT INTO vn.entryType (code,description,isInformal)
('return','Return',0), ('return','Return',0),
('transport','Delivery',0); ('transport','Delivery',0);
INSERT INTO `vn`.`cmr` (id,truckPlate,observations,senderInstruccions,paymentInstruccions,specialAgreements,companyFk,addressToFk,addressFromFk,supplierFk,packagesList,merchandiseDetail,state) INSERT INTO `vn`.`cmr` (id,truckPlate,observations,senderInstruccions,paymentInstruccions,specialAgreements,companyFk,addressToFk,addressFromFk,supplierFk,packagesList,state,marks,merchandiseNature,statisticalNumber,`weight`,volume)
VALUES (1,'123456A','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet',442,1,2,1,'Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet'), VALUES (1,'123456A','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet',442,1,2,1,'Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet', 5000, 20),
(2,'123456N','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet',69,3,4,2,'Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet'), (2,'123456N','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet',69,3,4,2,'Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet', 3000, 30),
(3,'123456B','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet',567,5,6,69,'Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet'); (3,'123456B','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet',567,5,6,69,'Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet', 7000, 700);
UPDATE vn.department UPDATE vn.department
SET workerFk = null; SET workerFk = null;

7
db/versions/11409-crimsonRaphis/00-firstScript.sql Normal file
View File

@ -0,0 +1,7 @@
ALTER TABLE vn.cmr
ADD marks varchar(255) DEFAULT NULL NULL AFTER `state`,
ADD merchandiseNature varchar(255) DEFAULT NULL NULL AFTER marks,
ADD statisticalNumber varchar(255) DEFAULT NULL NULL AFTER merchandiseNature,
ADD `weight` decimal(10,2) DEFAULT NULL NULL AFTER statisticalNumber,
ADD volume decimal(10,6) DEFAULT NULL NULL AFTER `weight`,
DROP COLUMN merchandiseDetail;