diff --git a/db/changes/10260-holidays/00-travel_cloneWithEntries.sql b/db/changes/10260-holidays/00-travel_cloneWithEntries.sql
new file mode 100644
index 0000000000..1302a78ca9
--- /dev/null
+++ b/db/changes/10260-holidays/00-travel_cloneWithEntries.sql
@@ -0,0 +1,135 @@
+-- DROP PROCEDURE `vn`.`clonTravelComplete`;
+
+DELIMITER $$
+USE `vn`$$
+CREATE
+ DEFINER = root@`%` PROCEDURE `vn`.`travel_cloneWithEntries`(IN vTravelFk INT, IN vDateStart DATE, IN vDateEnd DATE,
+ IN vRef VARCHAR(255), OUT vNewTravelFk INT)
+BEGIN
+ DECLARE vEntryNew INT;
+ DECLARE vDone BOOLEAN DEFAULT FALSE;
+ DECLARE vAuxEntryFk INT;
+ DECLARE vRsEntry CURSOR FOR
+ SELECT e.id
+ FROM entry e
+ JOIN travel t
+ ON t.id = e.travelFk
+ WHERE e.travelFk = vTravelFk;
+
+ DECLARE vRsBuy CURSOR FOR
+ SELECT b.*
+ FROM buy b
+ JOIN entry e
+ ON b.entryFk = e.id
+ WHERE e.travelFk = vNewTravelFk and b.entryFk=vNewTravelFk
+ ORDER BY e.id;
+
+ DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+
+ DECLARE EXIT HANDLER FOR SQLEXCEPTION
+ BEGIN
+ ROLLBACK;
+ RESIGNAL;
+ END;
+
+ START TRANSACTION;
+
+ INSERT INTO travel (shipped,landed, warehouseInFk, warehouseOutFk, agencyFk, ref, isDelivered, isReceived, m3, kg)
+ SELECT vDateStart, vDateEnd,warehouseInFk, warehouseOutFk, agencyFk, vRef, isDelivered, isReceived, m3, kg
+ FROM travel
+ WHERE id = vTravelFk;
+
+ SET vNewTravelFk = LAST_INSERT_ID();
+ SET vDone = FALSE;
+ OPEN vRsEntry ;
+ FETCH vRsEntry INTO vAuxEntryFk;
+
+ WHILE NOT vDone DO
+ INSERT INTO entry (supplierFk,
+ ref,
+ isInventory,
+ isConfirmed,
+ isOrdered,
+ isRaid,
+ commission,
+ created,
+ evaNotes,
+ travelFk,
+ currencyFk,
+ companyFk,
+ gestDocFk,
+ invoiceInFk)
+ SELECT supplierFk,
+ ref,
+ isInventory,
+ isConfirmed,
+ isOrdered,
+ isRaid,
+ commission,
+ created,
+ evaNotes,
+ vNewTravelFk,
+ currencyFk,
+ companyFk,
+ gestDocFk,
+ invoiceInFk
+ FROM entry
+ WHERE id = vAuxEntryFk;
+
+ SET vEntryNew = LAST_INSERT_ID();
+
+
+ INSERT INTO buy (entryFk,
+ itemFk,
+ quantity,
+ buyingValue,
+ packageFk,
+ stickers,
+ freightValue,
+ packageValue,
+ comissionValue,
+ packing,
+ `grouping`,
+ groupingMode,
+ location,
+ price1,
+ price2,
+ price3,
+ minPrice,
+ producer,
+ printedStickers,
+ isChecked,
+ weight)
+ SELECT vEntryNew,
+ itemFk,
+ quantity,
+ buyingValue,
+ packageFk,
+ stickers,
+ freightValue,
+ packageValue,
+ comissionValue,
+ packing,
+ `grouping`,
+ groupingMode,
+ location,
+ price1,
+ price2,
+ price3,
+ minPrice,
+ producer,
+ printedStickers,
+ isChecked,
+ weight
+ FROM buy
+ WHERE entryFk = vAuxEntryFk;
+
+
+ FETCH vRsEntry INTO vAuxEntryFk;
+ END WHILE;
+ CLOSE vRsEntry;
+ COMMIT;
+END;$$
+DELIMITER ;
+
+
diff --git a/db/dump/dumpedFixtures.sql b/db/dump/dumpedFixtures.sql
index e11b43059a..93a3c1c680 100644
--- a/db/dump/dumpedFixtures.sql
+++ b/db/dump/dumpedFixtures.sql
@@ -36,7 +36,7 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2020-12-17 8:49:49
+-- Dump completed on 2021-01-05 9:40:22
USE `account`;
-- MySQL dump 10.13 Distrib 5.7.28, for osx10.15 (x86_64)
--
@@ -81,7 +81,7 @@ UNLOCK TABLES;
LOCK TABLES `roleRole` WRITE;
/*!40000 ALTER TABLE `roleRole` DISABLE KEYS */;
-INSERT INTO `roleRole` VALUES (27311,1,1),(27312,1,2),(27313,1,3),(27316,1,6),(27315,1,11),(27314,1,70),(27232,2,2),(27234,2,6),(27233,2,11),(27136,3,3),(27138,3,6),(27137,3,11),(27109,5,1),(27116,5,2),(27115,5,3),(27108,5,5),(27120,5,6),(27119,5,11),(27113,5,13),(27117,5,18),(27110,5,21),(27111,5,33),(27118,5,53),(27114,5,70),(27112,5,102),(27378,6,6),(27276,9,1),(27273,9,2),(27262,9,3),(27260,9,5),(27281,9,6),(27252,9,9),(27257,9,11),(27308,9,13),(27290,9,15),(27291,9,16),(27259,9,17),(27306,9,18),(27305,9,19),(27292,9,20),(27304,9,21),(27309,9,22),(27279,9,30),(27280,9,31),(27277,9,32),(27287,9,33),(27263,9,34),(27267,9,35),(27302,9,36),(27284,9,37),(27285,9,38),(27258,9,39),(27282,9,40),(27283,9,41),(27264,9,42),(27265,9,43),(27255,9,44),(27256,9,45),(27270,9,47),(27272,9,48),(27299,9,49),(27301,9,50),(27293,9,51),(27294,9,52),(27286,9,53),(27288,9,54),(27289,9,55),(27274,9,56),(27275,9,57),(27297,9,58),(27298,9,59),(27300,9,60),(27303,9,61),(27295,9,62),(27266,9,64),(27296,9,65),(27307,9,66),(27261,9,67),(27271,9,69),(27310,9,70),(27268,9,71),(27269,9,72),(27278,9,73),(27253,9,100),(27254,9,102),(27059,11,6),(27058,11,11),(27801,13,1),(27802,13,2),(27803,13,3),(27806,13,6),(27805,13,11),(27800,13,13),(27804,13,70),(27455,15,1),(27458,15,2),(27457,15,3),(27460,15,6),(27459,15,11),(27454,15,13),(27449,15,15),(27450,15,35),(27453,15,56),(27451,15,57),(27456,15,70),(27452,15,102),(27467,16,1),(27470,16,2),(27469,16,3),(27473,16,6),(27472,16,11),(27462,16,13),(27463,16,15),(27461,16,16),(27466,16,35),(27471,16,56),(27465,16,57),(27468,16,70),(27464,16,102),(27083,17,1),(27091,17,2),(27090,17,3),(27082,17,5),(27103,17,6),(27100,17,11),(27086,17,13),(27095,17,15),(27085,17,16),(27076,17,17),(27097,17,18),(27094,17,19),(27077,17,20),(27087,17,21),(27096,17,33),(27093,17,35),(27105,17,36),(27078,17,37),(27079,17,39),(27107,17,44),(27106,17,47),(27102,17,49),(27092,17,50),(27098,17,53),(27099,17,56),(27088,17,57),(27104,17,58),(27101,17,59),(27080,17,64),(27084,17,65),(27089,17,70),(27081,17,102),(27734,18,1),(27737,18,2),(27736,18,3),(27740,18,6),(27739,18,11),(27733,18,18),(27738,18,70),(27735,18,102),(27727,19,1),(27730,19,2),(27729,19,3),(27732,19,6),(27731,19,11),(27723,19,13),(27724,19,18),(27721,19,19),(27722,19,21),(27725,19,53),(27728,19,70),(27726,19,102),(27482,20,1),(27488,20,2),(27487,20,3),(27499,20,6),(27496,20,11),(27475,20,13),(27481,20,15),(27476,20,16),(27494,20,18),(27480,20,19),(27474,20,20),(27484,20,21),(27479,20,35),(27492,20,36),(27498,20,44),(27497,20,47),(27489,20,49),(27483,20,50),(27493,20,53),(27495,20,56),(27485,20,57),(27491,20,58),(27490,20,59),(27477,20,65),(27486,20,70),(27478,20,102),(27715,21,1),(27718,21,2),(27717,21,3),(27720,21,6),(27719,21,11),(27711,21,13),(27712,21,18),(27710,21,21),(27713,21,53),(27716,21,70),(27714,21,102),(27811,22,1),(27816,22,2),(27815,22,3),(27818,22,6),(27817,22,11),(27808,22,13),(27810,22,18),(27809,22,21),(27807,22,22),(27812,22,53),(27814,22,70),(27813,22,102),(27352,30,1),(27358,30,2),(27357,30,3),(27341,30,5),(27368,30,6),(27364,30,11),(27349,30,13),(27354,30,15),(27348,30,16),(27355,30,18),(27353,30,19),(27342,30,20),(27351,30,21),(27343,30,22),(27340,30,30),(27350,30,33),(27359,30,35),(27366,30,36),(27370,30,44),(27369,30,47),(27362,30,49),(27360,30,50),(27344,30,53),(27367,30,56),(27363,30,57),(27365,30,58),(27361,30,59),(27345,30,64),(27347,30,65),(27356,30,70),(27346,30,102),(27372,31,1),(27373,31,2),(27374,31,3),(27377,31,6),(27376,31,11),(27371,31,31),(27375,31,70),(27318,32,1),(27319,32,2),(27320,32,3),(27323,32,6),(27322,32,11),(27317,32,32),(27321,32,70),(27432,33,33),(27140,34,1),(27145,34,2),(27144,34,3),(27147,34,6),(27146,34,11),(27141,34,13),(27142,34,33),(27139,34,34),(27143,34,70),(27180,35,1),(27183,35,2),(27182,35,3),(27186,35,6),(27185,35,11),(27179,35,35),(27184,35,70),(27181,35,102),(27634,36,1),(27636,36,2),(27635,36,3),(27639,36,6),(27638,36,11),(27631,36,36),(27632,36,44),(27633,36,47),(27637,36,70),(27408,37,1),(27411,37,2),(27410,37,3),(27414,37,6),(27413,37,11),(27407,37,37),(27412,37,70),(27409,37,102),(27419,38,1),(27422,38,2),(27421,38,3),(27424,38,6),(27423,38,11),(27416,38,37),(27415,38,38),(27417,38,64),(27420,38,70),(27418,38,102),(27068,39,1),(27073,39,2),(27072,39,3),(27061,39,5),(27075,39,6),(27074,39,11),(27066,39,13),(27065,39,18),(27062,39,21),(27067,39,33),(27060,39,39),(27069,39,53),(27070,39,56),(27063,39,57),(27071,39,70),(27064,39,102),(27380,40,1),(27383,40,2),(27382,40,3),(27390,40,6),(27389,40,11),(27385,40,36),(27379,40,40),(27388,40,44),(27387,40,47),(27381,40,49),(27386,40,58),(27384,40,70),(27397,41,1),(27401,41,2),(27400,41,3),(27406,41,6),(27405,41,11),(27392,41,13),(27393,41,35),(27398,41,36),(27394,41,40),(27391,41,41),(27404,41,44),(27403,41,47),(27396,41,49),(27402,41,58),(27399,41,70),(27395,41,102),(27154,42,1),(27157,42,2),(27156,42,3),(27161,42,6),(27160,42,11),(27149,42,35),(27153,42,36),(27148,42,42),(27158,42,44),(27159,42,47),(27150,42,49),(27152,42,58),(27155,42,70),(27151,42,102),(27166,43,1),(27172,43,2),(27171,43,3),(27177,43,6),(27176,43,11),(27163,43,13),(27165,43,35),(27169,43,36),(27164,43,42),(27162,43,43),(27175,43,44),(27174,43,47),(27167,43,49),(27173,43,58),(27170,43,70),(27168,43,102),(27043,44,1),(27044,44,2),(27045,44,3),(27048,44,6),(27047,44,11),(27042,44,44),(27046,44,70),(27052,45,1),(27054,45,2),(27053,45,3),(27057,45,6),(27056,45,11),(27050,45,13),(27051,45,44),(27049,45,45),(27055,45,70),(27207,47,1),(27208,47,2),(27209,47,3),(27212,47,6),(27211,47,11),(27206,47,47),(27210,47,70),(27226,48,1),(27228,48,2),(27227,48,3),(27231,48,6),(27230,48,11),(27224,48,13),(27225,48,47),(27223,48,48),(27229,48,70),(27579,49,1),(27582,49,2),(27581,49,3),(27584,49,6),(27583,49,11),(27575,49,36),(27578,49,44),(27577,49,47),(27574,49,49),(27576,49,58),(27580,49,70),(27623,50,1),(27628,50,2),(27627,50,3),(27630,50,6),(27629,50,11),(27611,50,13),(27622,50,18),(27612,50,21),(27613,50,35),(27620,50,36),(27625,50,44),(27624,50,47),(27614,50,49),(27610,50,50),(27621,50,53),(27618,50,56),(27615,50,57),(27619,50,58),(27616,50,59),(27626,50,70),(27617,50,102),(27501,51,1),(27502,51,2),(27503,51,3),(27506,51,6),(27505,51,11),(27500,51,51),(27504,51,70),(27514,52,1),(27519,52,2),(27518,52,3),(27521,52,6),(27520,52,11),(27508,52,13),(27516,52,18),(27509,52,19),(27513,52,21),(27510,52,35),(27511,52,51),(27507,52,52),(27515,52,53),(27517,52,70),(27512,52,102),(27426,53,1),(27427,53,2),(27428,53,3),(27431,53,6),(27430,53,11),(27425,53,53),(27429,53,70),(27434,54,1),(27435,54,2),(27436,54,3),(27439,54,6),(27438,54,11),(27433,54,54),(27437,54,70),(27443,55,1),(27445,55,2),(27444,55,3),(27448,55,6),(27447,55,11),(27441,55,13),(27442,55,54),(27440,55,55),(27446,55,70),(27236,56,1),(27237,56,2),(27238,56,3),(27241,56,6),(27240,56,11),(27235,56,56),(27239,56,70),(27246,57,1),(27249,57,2),(27248,57,3),(27251,57,6),(27250,57,11),(27243,57,13),(27244,57,56),(27242,57,57),(27247,57,70),(27245,57,102),(27547,58,1),(27548,58,2),(27549,58,3),(27552,58,6),(27551,58,11),(27546,58,58),(27550,58,70),(27557,59,1),(27567,59,2),(27566,59,3),(27573,59,6),(27572,59,11),(27554,59,13),(27564,59,18),(27556,59,21),(27558,59,35),(27562,59,36),(27571,59,44),(27570,59,47),(27559,59,49),(27555,59,50),(27563,59,53),(27569,59,56),(27560,59,57),(27568,59,58),(27553,59,59),(27565,59,70),(27561,59,102),(27595,60,1),(27605,60,2),(27604,60,3),(27586,60,5),(27609,60,6),(27608,60,11),(27592,60,13),(27602,60,18),(27594,60,21),(27593,60,33),(27591,60,35),(27600,60,36),(27587,60,37),(27607,60,44),(27606,60,47),(27596,60,49),(27588,60,50),(27601,60,53),(27598,60,56),(27589,60,57),(27599,60,58),(27597,60,59),(27585,60,60),(27603,60,70),(27590,60,102),(27644,61,1),(27648,61,2),(27647,61,3),(27650,61,6),(27649,61,11),(27641,61,13),(27642,61,36),(27643,61,44),(27645,61,47),(27640,61,61),(27646,61,70),(27522,62,62),(27178,64,64),(27530,65,1),(27537,65,2),(27536,65,3),(27545,65,6),(27544,65,11),(27529,65,13),(27539,65,18),(27524,65,19),(27531,65,21),(27525,65,35),(27534,65,36),(27543,65,44),(27542,65,47),(27528,65,49),(27526,65,50),(27538,65,53),(27541,65,56),(27532,65,57),(27540,65,58),(27533,65,59),(27523,65,65),(27535,65,70),(27527,65,102),(27766,66,1),(27762,66,2),(27751,66,3),(27749,66,5),(27771,66,6),(27765,66,9),(27746,66,11),(27797,66,13),(27780,66,15),(27781,66,16),(27748,66,17),(27796,66,18),(27795,66,19),(27782,66,20),(27794,66,21),(27798,66,22),(27769,66,30),(27770,66,31),(27767,66,32),(27777,66,33),(27752,66,34),(27756,66,35),(27792,66,36),(27774,66,37),(27775,66,38),(27747,66,39),(27772,66,40),(27773,66,41),(27753,66,42),(27754,66,43),(27744,66,44),(27745,66,45),(27759,66,47),(27761,66,48),(27789,66,49),(27791,66,50),(27783,66,51),(27784,66,52),(27776,66,53),(27778,66,54),(27779,66,55),(27763,66,56),(27764,66,57),(27787,66,58),(27788,66,59),(27790,66,60),(27793,66,61),(27785,66,62),(27755,66,64),(27786,66,65),(27741,66,66),(27750,66,67),(27760,66,69),(27799,66,70),(27757,66,71),(27758,66,72),(27768,66,73),(27742,66,100),(27743,66,102),(27125,67,1),(27131,67,2),(27130,67,3),(27122,67,5),(27135,67,6),(27134,67,11),(27128,67,13),(27132,67,18),(27124,67,21),(27126,67,33),(27123,67,37),(27133,67,53),(27121,67,67),(27129,67,70),(27127,67,102),(27217,69,1),(27219,69,2),(27218,69,3),(27222,69,6),(27221,69,11),(27214,69,35),(27215,69,47),(27213,69,69),(27220,69,70),(27216,69,102),(27821,70,6),(27820,70,11),(27819,70,70),(27189,71,1),(27192,71,2),(27191,71,3),(27195,71,6),(27194,71,11),(27190,71,58),(27193,71,70),(27188,71,71),(27200,72,1),(27202,72,2),(27201,72,3),(27205,72,6),(27204,72,11),(27197,72,13),(27198,72,18),(27203,72,70),(27196,72,72),(27199,72,102),(27330,73,1),(27335,73,2),(27334,73,3),(27325,73,5),(27339,73,6),(27338,73,11),(27332,73,13),(27336,73,18),(27326,73,19),(27329,73,21),(27328,73,33),(27337,73,53),(27327,73,64),(27333,73,70),(27324,73,73),(27331,73,102),(27675,100,1),(27671,100,2),(27659,100,3),(27657,100,5),(27680,100,6),(27674,100,9),(27654,100,11),(27707,100,13),(27689,100,15),(27690,100,16),(27656,100,17),(27705,100,18),(27704,100,19),(27691,100,20),(27703,100,21),(27708,100,22),(27678,100,30),(27679,100,31),(27676,100,32),(27686,100,33),(27660,100,34),(27664,100,35),(27701,100,36),(27683,100,37),(27684,100,38),(27655,100,39),(27681,100,40),(27682,100,41),(27661,100,42),(27662,100,43),(27652,100,44),(27653,100,45),(27668,100,47),(27670,100,48),(27698,100,49),(27700,100,50),(27692,100,51),(27693,100,52),(27685,100,53),(27687,100,54),(27688,100,55),(27672,100,56),(27673,100,57),(27696,100,58),(27697,100,59),(27699,100,60),(27702,100,61),(27694,100,62),(27663,100,64),(27695,100,65),(27706,100,66),(27658,100,67),(27669,100,69),(27709,100,70),(27666,100,71),(27667,100,72),(27677,100,73),(27651,100,100),(27665,100,102),(27187,102,102);
+INSERT INTO `roleRole` VALUES (28091,1,1),(28092,1,2),(28093,1,3),(28096,1,6),(28095,1,11),(28094,1,70),(28012,2,2),(28014,2,6),(28013,2,11),(27916,3,3),(27918,3,6),(27917,3,11),(27889,5,1),(27896,5,2),(27895,5,3),(27888,5,5),(27900,5,6),(27899,5,11),(27893,5,13),(27897,5,18),(27890,5,21),(27891,5,33),(27898,5,53),(27894,5,70),(27892,5,76),(28158,6,6),(28056,9,1),(28053,9,2),(28042,9,3),(28040,9,5),(28061,9,6),(28032,9,9),(28037,9,11),(28088,9,13),(28070,9,15),(28071,9,16),(28039,9,17),(28086,9,18),(28085,9,19),(28072,9,20),(28084,9,21),(28089,9,22),(28059,9,30),(28060,9,31),(28057,9,32),(28067,9,33),(28043,9,34),(28047,9,35),(28082,9,36),(28064,9,37),(28065,9,38),(28038,9,39),(28062,9,40),(28063,9,41),(28044,9,42),(28045,9,43),(28035,9,44),(28036,9,45),(28050,9,47),(28052,9,48),(28079,9,49),(28081,9,50),(28073,9,51),(28074,9,52),(28066,9,53),(28068,9,54),(28069,9,55),(28054,9,56),(28055,9,57),(28077,9,58),(28078,9,59),(28080,9,60),(28083,9,61),(28075,9,62),(28046,9,64),(28076,9,65),(28087,9,66),(28041,9,67),(28051,9,69),(28090,9,70),(28048,9,71),(28049,9,72),(28058,9,73),(28033,9,76),(28034,9,100),(27839,11,6),(27838,11,11),(28581,13,1),(28582,13,2),(28583,13,3),(28586,13,6),(28585,13,11),(28580,13,13),(28584,13,70),(28235,15,1),(28238,15,2),(28237,15,3),(28240,15,6),(28239,15,11),(28234,15,13),(28229,15,15),(28230,15,35),(28233,15,56),(28231,15,57),(28236,15,70),(28232,15,76),(28247,16,1),(28250,16,2),(28249,16,3),(28253,16,6),(28252,16,11),(28242,16,13),(28243,16,15),(28241,16,16),(28246,16,35),(28251,16,56),(28245,16,57),(28248,16,70),(28244,16,76),(27863,17,1),(27871,17,2),(27870,17,3),(27862,17,5),(27883,17,6),(27880,17,11),(27866,17,13),(27875,17,15),(27865,17,16),(27856,17,17),(27877,17,18),(27874,17,19),(27857,17,20),(27867,17,21),(27876,17,33),(27873,17,35),(27885,17,36),(27858,17,37),(27859,17,39),(27887,17,44),(27886,17,47),(27882,17,49),(27872,17,50),(27878,17,53),(27879,17,56),(27868,17,57),(27884,17,58),(27881,17,59),(27860,17,64),(27864,17,65),(27869,17,70),(27861,17,76),(28514,18,1),(28517,18,2),(28516,18,3),(28520,18,6),(28519,18,11),(28513,18,18),(28518,18,70),(28515,18,76),(28507,19,1),(28510,19,2),(28509,19,3),(28512,19,6),(28511,19,11),(28503,19,13),(28504,19,18),(28501,19,19),(28502,19,21),(28505,19,53),(28508,19,70),(28506,19,76),(28262,20,1),(28268,20,2),(28267,20,3),(28279,20,6),(28276,20,11),(28255,20,13),(28261,20,15),(28256,20,16),(28274,20,18),(28260,20,19),(28254,20,20),(28264,20,21),(28259,20,35),(28272,20,36),(28278,20,44),(28277,20,47),(28269,20,49),(28263,20,50),(28273,20,53),(28275,20,56),(28265,20,57),(28271,20,58),(28270,20,59),(28257,20,65),(28266,20,70),(28258,20,76),(28495,21,1),(28498,21,2),(28497,21,3),(28500,21,6),(28499,21,11),(28491,21,13),(28492,21,18),(28490,21,21),(28493,21,53),(28496,21,70),(28494,21,76),(28591,22,1),(28596,22,2),(28595,22,3),(28598,22,6),(28597,22,11),(28588,22,13),(28590,22,18),(28589,22,21),(28587,22,22),(28592,22,53),(28594,22,70),(28593,22,76),(28132,30,1),(28138,30,2),(28137,30,3),(28121,30,5),(28148,30,6),(28144,30,11),(28129,30,13),(28134,30,15),(28128,30,16),(28135,30,18),(28133,30,19),(28122,30,20),(28131,30,21),(28123,30,22),(28120,30,30),(28130,30,33),(28139,30,35),(28146,30,36),(28150,30,44),(28149,30,47),(28142,30,49),(28140,30,50),(28124,30,53),(28147,30,56),(28143,30,57),(28145,30,58),(28141,30,59),(28125,30,64),(28127,30,65),(28136,30,70),(28126,30,76),(28152,31,1),(28153,31,2),(28154,31,3),(28157,31,6),(28156,31,11),(28151,31,31),(28155,31,70),(28098,32,1),(28099,32,2),(28100,32,3),(28103,32,6),(28102,32,11),(28097,32,32),(28101,32,70),(28212,33,33),(27920,34,1),(27925,34,2),(27924,34,3),(27927,34,6),(27926,34,11),(27921,34,13),(27922,34,33),(27919,34,34),(27923,34,70),(27960,35,1),(27963,35,2),(27962,35,3),(27966,35,6),(27965,35,11),(27959,35,35),(27964,35,70),(27961,35,76),(28414,36,1),(28416,36,2),(28415,36,3),(28419,36,6),(28418,36,11),(28411,36,36),(28412,36,44),(28413,36,47),(28417,36,70),(28188,37,1),(28191,37,2),(28190,37,3),(28194,37,6),(28193,37,11),(28187,37,37),(28192,37,70),(28189,37,76),(28199,38,1),(28202,38,2),(28201,38,3),(28204,38,6),(28203,38,11),(28196,38,37),(28195,38,38),(28197,38,64),(28200,38,70),(28198,38,76),(27848,39,1),(27853,39,2),(27852,39,3),(27841,39,5),(27855,39,6),(27854,39,11),(27846,39,13),(27845,39,18),(27842,39,21),(27847,39,33),(27840,39,39),(27849,39,53),(27850,39,56),(27843,39,57),(27851,39,70),(27844,39,76),(28160,40,1),(28163,40,2),(28162,40,3),(28170,40,6),(28169,40,11),(28165,40,36),(28159,40,40),(28168,40,44),(28167,40,47),(28161,40,49),(28166,40,58),(28164,40,70),(28177,41,1),(28181,41,2),(28180,41,3),(28186,41,6),(28185,41,11),(28172,41,13),(28173,41,35),(28178,41,36),(28174,41,40),(28171,41,41),(28184,41,44),(28183,41,47),(28176,41,49),(28182,41,58),(28179,41,70),(28175,41,76),(27934,42,1),(27937,42,2),(27936,42,3),(27941,42,6),(27940,42,11),(27929,42,35),(27933,42,36),(27928,42,42),(27938,42,44),(27939,42,47),(27930,42,49),(27932,42,58),(27935,42,70),(27931,42,76),(27946,43,1),(27952,43,2),(27951,43,3),(27957,43,6),(27956,43,11),(27943,43,13),(27945,43,35),(27949,43,36),(27944,43,42),(27942,43,43),(27955,43,44),(27954,43,47),(27947,43,49),(27953,43,58),(27950,43,70),(27948,43,76),(27823,44,1),(27824,44,2),(27825,44,3),(27828,44,6),(27827,44,11),(27822,44,44),(27826,44,70),(27832,45,1),(27834,45,2),(27833,45,3),(27837,45,6),(27836,45,11),(27830,45,13),(27831,45,44),(27829,45,45),(27835,45,70),(27987,47,1),(27988,47,2),(27989,47,3),(27992,47,6),(27991,47,11),(27986,47,47),(27990,47,70),(28006,48,1),(28008,48,2),(28007,48,3),(28011,48,6),(28010,48,11),(28004,48,13),(28005,48,47),(28003,48,48),(28009,48,70),(28359,49,1),(28362,49,2),(28361,49,3),(28364,49,6),(28363,49,11),(28355,49,36),(28358,49,44),(28357,49,47),(28354,49,49),(28356,49,58),(28360,49,70),(28403,50,1),(28408,50,2),(28407,50,3),(28410,50,6),(28409,50,11),(28391,50,13),(28402,50,18),(28392,50,21),(28393,50,35),(28400,50,36),(28405,50,44),(28404,50,47),(28394,50,49),(28390,50,50),(28401,50,53),(28398,50,56),(28395,50,57),(28399,50,58),(28396,50,59),(28406,50,70),(28397,50,76),(28281,51,1),(28282,51,2),(28283,51,3),(28286,51,6),(28285,51,11),(28280,51,51),(28284,51,70),(28294,52,1),(28299,52,2),(28298,52,3),(28301,52,6),(28300,52,11),(28288,52,13),(28296,52,18),(28289,52,19),(28293,52,21),(28290,52,35),(28291,52,51),(28287,52,52),(28295,52,53),(28297,52,70),(28292,52,76),(28206,53,1),(28207,53,2),(28208,53,3),(28211,53,6),(28210,53,11),(28205,53,53),(28209,53,70),(28214,54,1),(28215,54,2),(28216,54,3),(28219,54,6),(28218,54,11),(28213,54,54),(28217,54,70),(28223,55,1),(28225,55,2),(28224,55,3),(28228,55,6),(28227,55,11),(28221,55,13),(28222,55,54),(28220,55,55),(28226,55,70),(28016,56,1),(28017,56,2),(28018,56,3),(28021,56,6),(28020,56,11),(28015,56,56),(28019,56,70),(28026,57,1),(28029,57,2),(28028,57,3),(28031,57,6),(28030,57,11),(28023,57,13),(28024,57,56),(28022,57,57),(28027,57,70),(28025,57,76),(28327,58,1),(28328,58,2),(28329,58,3),(28332,58,6),(28331,58,11),(28326,58,58),(28330,58,70),(28337,59,1),(28347,59,2),(28346,59,3),(28353,59,6),(28352,59,11),(28334,59,13),(28344,59,18),(28336,59,21),(28338,59,35),(28342,59,36),(28351,59,44),(28350,59,47),(28339,59,49),(28335,59,50),(28343,59,53),(28349,59,56),(28340,59,57),(28348,59,58),(28333,59,59),(28345,59,70),(28341,59,76),(28375,60,1),(28385,60,2),(28384,60,3),(28366,60,5),(28389,60,6),(28388,60,11),(28372,60,13),(28382,60,18),(28374,60,21),(28373,60,33),(28371,60,35),(28380,60,36),(28367,60,37),(28387,60,44),(28386,60,47),(28376,60,49),(28368,60,50),(28381,60,53),(28378,60,56),(28369,60,57),(28379,60,58),(28377,60,59),(28365,60,60),(28383,60,70),(28370,60,76),(28424,61,1),(28428,61,2),(28427,61,3),(28430,61,6),(28429,61,11),(28421,61,13),(28422,61,36),(28423,61,44),(28425,61,47),(28420,61,61),(28426,61,70),(28302,62,62),(27958,64,64),(28310,65,1),(28317,65,2),(28316,65,3),(28325,65,6),(28324,65,11),(28309,65,13),(28319,65,18),(28304,65,19),(28311,65,21),(28305,65,35),(28314,65,36),(28323,65,44),(28322,65,47),(28308,65,49),(28306,65,50),(28318,65,53),(28321,65,56),(28312,65,57),(28320,65,58),(28313,65,59),(28303,65,65),(28315,65,70),(28307,65,76),(28546,66,1),(28542,66,2),(28531,66,3),(28529,66,5),(28551,66,6),(28545,66,9),(28526,66,11),(28577,66,13),(28560,66,15),(28561,66,16),(28528,66,17),(28576,66,18),(28575,66,19),(28562,66,20),(28574,66,21),(28578,66,22),(28549,66,30),(28550,66,31),(28547,66,32),(28557,66,33),(28532,66,34),(28536,66,35),(28572,66,36),(28554,66,37),(28555,66,38),(28527,66,39),(28552,66,40),(28553,66,41),(28533,66,42),(28534,66,43),(28524,66,44),(28525,66,45),(28539,66,47),(28541,66,48),(28569,66,49),(28571,66,50),(28563,66,51),(28564,66,52),(28556,66,53),(28558,66,54),(28559,66,55),(28543,66,56),(28544,66,57),(28567,66,58),(28568,66,59),(28570,66,60),(28573,66,61),(28565,66,62),(28535,66,64),(28566,66,65),(28521,66,66),(28530,66,67),(28540,66,69),(28579,66,70),(28537,66,71),(28538,66,72),(28548,66,73),(28522,66,76),(28523,66,100),(27905,67,1),(27911,67,2),(27910,67,3),(27902,67,5),(27915,67,6),(27914,67,11),(27908,67,13),(27912,67,18),(27904,67,21),(27906,67,33),(27903,67,37),(27913,67,53),(27901,67,67),(27909,67,70),(27907,67,76),(27997,69,1),(27999,69,2),(27998,69,3),(28002,69,6),(28001,69,11),(27994,69,35),(27995,69,47),(27993,69,69),(28000,69,70),(27996,69,76),(28601,70,6),(28600,70,11),(28599,70,70),(27969,71,1),(27972,71,2),(27971,71,3),(27975,71,6),(27974,71,11),(27970,71,58),(27973,71,70),(27968,71,71),(27980,72,1),(27982,72,2),(27981,72,3),(27985,72,6),(27984,72,11),(27977,72,13),(27978,72,18),(27983,72,70),(27976,72,72),(27979,72,76),(28110,73,1),(28115,73,2),(28114,73,3),(28105,73,5),(28119,73,6),(28118,73,11),(28112,73,13),(28116,73,18),(28106,73,19),(28109,73,21),(28108,73,33),(28117,73,53),(28107,73,64),(28113,73,70),(28104,73,73),(28111,73,76),(27967,76,76),(28455,100,1),(28451,100,2),(28439,100,3),(28437,100,5),(28460,100,6),(28454,100,9),(28434,100,11),(28487,100,13),(28469,100,15),(28470,100,16),(28436,100,17),(28485,100,18),(28484,100,19),(28471,100,20),(28483,100,21),(28488,100,22),(28458,100,30),(28459,100,31),(28456,100,32),(28466,100,33),(28440,100,34),(28444,100,35),(28481,100,36),(28463,100,37),(28464,100,38),(28435,100,39),(28461,100,40),(28462,100,41),(28441,100,42),(28442,100,43),(28432,100,44),(28433,100,45),(28448,100,47),(28450,100,48),(28478,100,49),(28480,100,50),(28472,100,51),(28473,100,52),(28465,100,53),(28467,100,54),(28468,100,55),(28452,100,56),(28453,100,57),(28476,100,58),(28477,100,59),(28479,100,60),(28482,100,61),(28474,100,62),(28443,100,64),(28475,100,65),(28486,100,66),(28438,100,67),(28449,100,69),(28489,100,70),(28446,100,71),(28447,100,72),(28457,100,73),(28445,100,76),(28431,100,100);
/*!40000 ALTER TABLE `roleRole` ENABLE KEYS */;
UNLOCK TABLES;
@@ -101,7 +101,7 @@ UNLOCK TABLES;
LOCK TABLES `accountConfig` WRITE;
/*!40000 ALTER TABLE `accountConfig` DISABLE KEYS */;
-INSERT INTO `accountConfig` VALUES (1,'/mnt/storage/homes','/bin/bash',10000,5,60,5,30);
+INSERT INTO `accountConfig` VALUES (1,'/mnt/homes','/bin/bash',10000,5,60,5,30);
/*!40000 ALTER TABLE `accountConfig` ENABLE KEYS */;
UNLOCK TABLES;
@@ -124,7 +124,7 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2020-12-17 8:49:50
+-- Dump completed on 2021-01-05 9:40:24
USE `salix`;
-- MySQL dump 10.13 Distrib 5.7.28, for osx10.15 (x86_64)
--
@@ -172,7 +172,7 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2020-12-17 8:49:52
+-- Dump completed on 2021-01-05 9:40:25
USE `vn`;
-- MySQL dump 10.13 Distrib 5.7.28, for osx10.15 (x86_64)
--
@@ -257,7 +257,7 @@ UNLOCK TABLES;
LOCK TABLES `tag` WRITE;
/*!40000 ALTER TABLE `tag` DISABLE KEYS */;
-INSERT INTO `tag` VALUES (1,'color','Color',0,0,'ink',NULL,NULL,'inkFk'),(2,NULL,'Forma',1,0,NULL,NULL,NULL,NULL),(3,NULL,'Material',1,0,NULL,NULL,NULL,NULL),(4,NULL,'Longitud',1,1,NULL,'mm',NULL,'size'),(5,NULL,'Diámetro',1,1,NULL,'mm',NULL,'diameter'),(6,NULL,'Perímetro',1,1,NULL,'mm',NULL,NULL),(7,NULL,'Ancho de la base',1,1,NULL,'mm',NULL,NULL),(8,NULL,'Altura',1,1,NULL,'mm',NULL,'size'),(9,NULL,'Volumen',1,1,NULL,'ml',NULL,NULL),(10,NULL,'Densidad',1,1,NULL,NULL,NULL,NULL),(11,NULL,'Calidad',1,0,NULL,NULL,NULL,NULL),(12,NULL,'Textura',1,0,NULL,NULL,NULL,NULL),(13,NULL,'Material del mango',1,0,NULL,NULL,NULL,NULL),(14,NULL,'Compra mínima',1,0,NULL,NULL,NULL,NULL),(15,NULL,'Nº pétalos',1,1,NULL,NULL,NULL,NULL),(16,NULL,'Ancho',1,1,NULL,'mm',NULL,NULL),(18,NULL,'Profundidad',1,1,NULL,'mm',NULL,NULL),(19,NULL,'Largo',1,1,NULL,'mm',NULL,'size'),(20,NULL,'Ancho superior',1,1,NULL,'mm',NULL,NULL),(21,NULL,'Ancho inferior',1,1,NULL,'mm',NULL,NULL),(22,NULL,'Gramaje',1,1,NULL,'g',NULL,NULL),(23,'stems','Tallos',1,1,NULL,NULL,NULL,'stems'),(24,NULL,'Estado',1,0,NULL,NULL,NULL,NULL),(25,NULL,'Color principal',0,0,'ink',NULL,NULL,NULL),(26,NULL,'Color secundario',0,0,'ink',NULL,NULL,NULL),(27,NULL,'Longitud(cm)',1,1,NULL,'cm',NULL,NULL),(28,NULL,'Diámetro base',1,1,NULL,'mm',NULL,'diameter'),(29,NULL,'Colección',1,0,NULL,NULL,NULL,NULL),(30,NULL,'Uds / caja',1,1,NULL,NULL,NULL,NULL),(31,NULL,'Contenido',1,0,NULL,NULL,NULL,NULL),(32,NULL,'Peso',1,1,NULL,'g',NULL,NULL),(33,NULL,'Grosor',1,1,NULL,'mm',NULL,NULL),(34,NULL,'Marca',1,0,NULL,NULL,NULL,NULL),(35,'origin','Origen',0,0,'origin',NULL,NULL,'originFk'),(36,NULL,'Proveedor',1,0,NULL,NULL,NULL,NULL),(37,'producer','Productor',0,0,'producer',NULL,NULL,'producerFk'),(38,NULL,'Duración',1,1,NULL,'s',NULL,NULL),(39,NULL,'Flor',1,0,NULL,NULL,NULL,NULL),(40,NULL,'Soporte',1,0,NULL,NULL,NULL,NULL),(41,NULL,'Tamaño flor',1,0,NULL,NULL,NULL,NULL),(42,NULL,'Apertura',1,0,NULL,NULL,NULL,NULL),(43,NULL,'Tallo',1,0,NULL,NULL,NULL,NULL),(44,NULL,'Nº hojas',1,1,NULL,NULL,NULL,NULL),(45,NULL,'Dimensiones',1,0,NULL,NULL,NULL,NULL),(46,NULL,'Diámetro boca',1,1,NULL,'mm',NULL,NULL),(47,NULL,'Nº flores',1,1,NULL,NULL,NULL,NULL),(48,NULL,'Uds / paquete',1,1,NULL,NULL,NULL,NULL),(49,NULL,'Maceta',1,1,NULL,'cm',NULL,'diameter'),(50,NULL,'Textura flor',1,0,NULL,NULL,NULL,NULL),(51,NULL,'Textura hoja',1,0,NULL,NULL,NULL,NULL),(52,NULL,'Tipo de IVA',1,0,NULL,NULL,NULL,NULL),(53,NULL,'Tronco',1,0,NULL,NULL,NULL,NULL),(54,NULL,'Hoja',1,0,NULL,NULL,NULL,NULL),(55,NULL,'Formato',1,0,NULL,NULL,NULL,NULL),(56,NULL,'Genero',1,0,NULL,NULL,NULL,NULL),(57,NULL,'Especie',1,0,NULL,NULL,NULL,NULL),(58,NULL,'Variedad',1,0,NULL,NULL,NULL,NULL),(59,NULL,'Medida grande',1,0,NULL,NULL,NULL,NULL),(60,NULL,'Medida mediano',1,0,NULL,NULL,NULL,NULL),(61,NULL,'Medida pequeño',1,0,NULL,NULL,NULL,NULL),(63,NULL,'Recipiente interior',1,0,NULL,NULL,NULL,NULL),(64,NULL,'Material secundario',1,0,NULL,NULL,NULL,NULL),(65,NULL,'Colores',1,0,NULL,NULL,NULL,NULL),(66,NULL,'Referencia',1,0,NULL,NULL,NULL,NULL),(67,'category','Categoria',1,0,NULL,NULL,NULL,NULL),(68,NULL,'Amb',1,0,NULL,NULL,NULL,NULL),(69,NULL,'Anchura',1,1,NULL,'cm',NULL,NULL),(70,NULL,'Hueco interior',1,0,NULL,NULL,NULL,NULL),(71,NULL,'Tamaño',1,0,NULL,NULL,NULL,NULL),(72,NULL,'Color botón',1,0,NULL,NULL,NULL,NULL),(73,NULL,'Tamaño minimo del botón',1,0,NULL,NULL,NULL,NULL),(74,NULL,'Obtentor',1,0,NULL,NULL,NULL,NULL),(75,NULL,'Longitud del brote',1,0,NULL,NULL,NULL,NULL),(76,NULL,'Tallos / u.v.',1,0,NULL,NULL,NULL,NULL),(77,NULL,'Madera de',1,0,NULL,NULL,NULL,NULL),(78,NULL,'Unidad de venta',1,0,NULL,NULL,NULL,NULL),(79,NULL,'Temporal',1,0,NULL,NULL,NULL,NULL),(80,NULL,'Gramaje/tallo',1,1,NULL,'g',NULL,NULL),(81,NULL,'Peso/paquete',1,1,NULL,'g',NULL,NULL),(82,NULL,'Flexibilidad del tallo',1,0,NULL,NULL,NULL,NULL),(83,NULL,'Nº planchas',1,1,NULL,NULL,NULL,NULL),(84,NULL,'Nº páginas',1,1,NULL,NULL,NULL,NULL),(85,NULL,'Editorial',1,0,NULL,NULL,NULL,NULL),(86,NULL,'Idioma',1,0,NULL,NULL,NULL,NULL),(87,NULL,'Fecha publicación',1,0,NULL,NULL,NULL,NULL),(88,NULL,'Cubierta',1,0,NULL,NULL,NULL,NULL),(89,NULL,'Encuadernación',1,0,NULL,NULL,NULL,NULL),(90,NULL,'Autor',1,0,NULL,NULL,NULL,NULL),(91,NULL,'Envoltorio',1,0,NULL,NULL,NULL,NULL),(92,NULL,'Nombre temporal',1,0,NULL,NULL,NULL,NULL),(93,NULL,'Modelo',1,0,NULL,NULL,NULL,NULL),(94,NULL,'Producto',1,0,NULL,NULL,NULL,NULL),(95,NULL,'Título',1,0,NULL,NULL,NULL,NULL),(96,NULL,'Tomo',1,0,NULL,NULL,NULL,NULL),(97,NULL,'Articulo',1,0,NULL,NULL,NULL,NULL),(98,NULL,'Metodo de cultivo',1,0,NULL,NULL,NULL,NULL),(99,NULL,'Edad',1,0,NULL,NULL,NULL,NULL),(100,NULL,'Agotado',1,0,NULL,NULL,NULL,NULL),(101,NULL,'Altura con asa',1,1,NULL,'cm',NULL,'size'),(102,NULL,'Nº tallos',1,1,NULL,NULL,NULL,NULL),(103,NULL,'Cultivo',1,0,NULL,NULL,NULL,NULL),(104,NULL,'Sabor',1,0,NULL,NULL,NULL,NULL),(105,NULL,'Talla',1,0,NULL,NULL,NULL,NULL),(106,NULL,'Calibre',1,1,NULL,NULL,NULL,NULL),(107,NULL,'Dulzura',1,1,NULL,'bx',NULL,NULL),(108,NULL,'Piezas',1,0,NULL,NULL,NULL,NULL),(109,NULL,'Altura con patas',1,0,NULL,'cm',NULL,'size'),(110,NULL,'Envase',1,0,NULL,NULL,NULL,NULL),(111,NULL,'Nº piezas',1,0,NULL,NULL,NULL,NULL),(112,NULL,'Uso',1,0,NULL,'cm',NULL,NULL),(113,NULL,'Color luz',1,0,NULL,NULL,NULL,NULL),(114,NULL,'Capacidad',1,0,NULL,NULL,NULL,NULL),(184,NULL,'Tallos por paquete',1,0,NULL,NULL,NULL,NULL),(205,NULL,'Apertura',1,0,NULL,NULL,NULL,NULL),(219,NULL,'Altura',1,0,NULL,'cm',NULL,'size'),(552,NULL,'fout kenmerk',1,0,NULL,NULL,NULL,NULL),(553,NULL,'Potinhoud',1,0,NULL,NULL,NULL,NULL),(554,NULL,'Marketingconcept',1,0,NULL,NULL,NULL,NULL),(555,NULL,'Leeftijd',1,0,NULL,NULL,NULL,NULL),(556,NULL,'Base',1,0,NULL,NULL,NULL,NULL),(557,NULL,'Kleurbehandeld',1,0,NULL,NULL,NULL,'inkFk'),(558,NULL,'Verzorging: Standplaats',1,0,NULL,NULL,NULL,NULL),(559,NULL,'Verzorging: Water',1,0,NULL,NULL,NULL,NULL),(560,NULL,'Verzorging: Voeding',1,0,NULL,NULL,NULL,NULL),(561,NULL,'Verzorging: Temperatuur',1,0,NULL,NULL,NULL,NULL),(562,NULL,'Verzorging: Specifieke in',1,0,NULL,NULL,NULL,NULL),(563,NULL,'Verzorging: Consumptie',1,0,NULL,NULL,NULL,NULL),(564,NULL,'Nabehandeling',1,0,NULL,NULL,NULL,NULL),(565,NULL,'Artikel beeld',1,0,NULL,NULL,NULL,NULL),(566,NULL,'Hoofdkleur 1',1,0,NULL,NULL,NULL,NULL),(567,NULL,'Hoofdkleur 2',1,0,NULL,NULL,NULL,NULL),(568,NULL,'RHS hoofdkleur 1',1,0,NULL,NULL,NULL,NULL),(569,NULL,'RHS hoofdkleur 2',1,0,NULL,NULL,NULL,NULL),(570,NULL,'Hoofdkleur 1 blad',1,0,NULL,NULL,NULL,NULL),(571,NULL,'Hoofdkleur 2 blad',1,0,NULL,NULL,NULL,NULL),(572,NULL,'RHS hoofdkleur 1 blad',1,0,NULL,NULL,NULL,NULL),(573,NULL,'RHS hoofdkleur 2 blad',1,0,NULL,NULL,NULL,NULL),(574,NULL,'Botanisch beeld',1,0,NULL,NULL,NULL,NULL),(575,NULL,'Hoofdkleur bes/vrucht',1,0,NULL,NULL,NULL,NULL),(576,NULL,'RHS hoofdkleur bes/vrucht',1,0,NULL,NULL,NULL,NULL),(577,NULL,'UPOV hoofdkleur 1 bloem',1,0,NULL,NULL,NULL,NULL),(578,NULL,'UPOV hoofdkleur 2 bloem',1,0,NULL,NULL,NULL,NULL),(579,NULL,'UPOV hoofdkleur 1 blad',1,0,NULL,NULL,NULL,NULL),(580,NULL,'UPOV hoofdkleur 2 blad',1,0,NULL,NULL,NULL,NULL),(581,NULL,'UPOV hoofdkleur bes/vruch',1,0,NULL,NULL,NULL,NULL),(582,NULL,'Negatieve keurcode 1',1,0,NULL,NULL,NULL,NULL),(583,NULL,'Negatieve keurcode 2',1,0,NULL,NULL,NULL,NULL),(584,NULL,'Bedrijfskenmerk fytosanit',1,0,NULL,NULL,NULL,NULL),(585,NULL,'Certificaten aardwarmte',1,0,NULL,NULL,NULL,NULL),(586,NULL,'Certificaten MPS-TraceCer',1,0,NULL,NULL,NULL,NULL),(587,NULL,'Overige leveranciersinfor',1,0,NULL,NULL,NULL,NULL),(588,NULL,'Certificaten MPS-GAP',1,0,NULL,NULL,NULL,NULL),(589,NULL,'Betrouwbaarheidsindex kla',1,0,NULL,NULL,NULL,NULL),(590,NULL,'Betrouwbaarheidsindex waa',1,0,NULL,NULL,NULL,NULL),(591,NULL,'Productkwaliteitslabel',1,0,NULL,NULL,NULL,NULL),(592,NULL,'Label Fair Flowers Fair P',1,0,NULL,NULL,NULL,NULL),(593,NULL,'Certificaten Socialy Qual',1,0,NULL,NULL,NULL,NULL),(594,NULL,'Certificaten GlobalGAP',1,0,NULL,NULL,NULL,NULL),(595,NULL,'Certificaten MPS Quality',1,0,NULL,NULL,NULL,NULL),(596,NULL,'Certificaten biologisch',1,0,NULL,NULL,NULL,NULL),(597,NULL,'Certificaten eetbare prod',1,0,NULL,NULL,NULL,NULL),(598,NULL,'Certificaten Florimark',1,0,NULL,NULL,NULL,NULL),(599,NULL,'Certificaten Milieukeur',1,0,NULL,NULL,NULL,NULL),(600,NULL,'Certificaten Kenya Flower',1,0,NULL,NULL,NULL,NULL),(601,NULL,'Certificaten Fairtrade',1,0,NULL,NULL,NULL,NULL),(602,NULL,'Keurmerk MPS-ProductProof',1,0,NULL,NULL,NULL,NULL),(603,NULL,'Certificaten ISO',1,0,NULL,NULL,NULL,NULL),(604,NULL,'Certificaten aardwarmte',1,0,NULL,NULL,NULL,NULL),(605,NULL,'Certificaten Florverde',1,0,NULL,NULL,NULL,NULL),(606,NULL,'Certificaten Ethical Trad',1,0,NULL,NULL,NULL,NULL),(607,NULL,'Certificaten Ethiopian EH',1,0,NULL,NULL,NULL,NULL),(608,NULL,'Certificaten gewasbescher',1,0,NULL,NULL,NULL,NULL),(609,NULL,'Certificaten SAN',1,0,NULL,NULL,NULL,NULL),(610,NULL,'Certificaten GRASP',1,0,NULL,NULL,NULL,NULL),(611,NULL,'Label Fair Flora',1,0,NULL,NULL,NULL,NULL),(612,NULL,'GLobalG.A.P. Chain of Cus',1,0,NULL,NULL,NULL,NULL),(613,NULL,'Fust',1,0,NULL,NULL,NULL,NULL),(614,NULL,'Stapelwagen',1,0,NULL,NULL,NULL,NULL),(615,NULL,'Aantal legborden veilings',1,0,NULL,NULL,NULL,NULL),(616,NULL,'Aantal legborden Deense s',1,0,NULL,NULL,NULL,NULL),(617,NULL,'Aantal onderstellen Deens',1,0,NULL,NULL,NULL,NULL),(618,NULL,'Fustsoort',1,0,NULL,NULL,NULL,NULL),(619,NULL,'Envase',1,0,NULL,NULL,NULL,NULL),(620,NULL,'Aantal legborden Eurostap',1,0,NULL,NULL,NULL,NULL),(621,NULL,'Aantal onderstellen Euros',1,0,NULL,NULL,NULL,NULL),(622,NULL,'Tallos/bolsa',1,0,NULL,NULL,NULL,''),(623,NULL,'Aantal bossen per bundel',1,0,NULL,NULL,NULL,NULL),(624,NULL,'Aantal stuks per fust',1,0,NULL,NULL,NULL,NULL),(625,NULL,'Aantal bossen per fust',1,0,NULL,NULL,NULL,NULL),(626,NULL,'Aantal bundels per fust',1,0,NULL,NULL,NULL,NULL),(627,NULL,'Aantal bossen per hoes',1,0,NULL,NULL,NULL,NULL),(628,NULL,'Aantal bundels per hoes',1,0,NULL,NULL,NULL,NULL),(629,NULL,'Fustlabel',1,0,NULL,NULL,NULL,NULL),(630,NULL,'Karlabel',1,0,NULL,NULL,NULL,NULL),(631,NULL,'Service productlabel',1,0,NULL,NULL,NULL,NULL),(632,NULL,'Service fustlabel',1,0,NULL,NULL,NULL,NULL),(633,NULL,'Service karlabel',1,0,NULL,NULL,NULL,NULL),(634,NULL,'Aantal fusten per laag',1,0,NULL,NULL,NULL,NULL),(635,NULL,'Presentatie per schapm2',1,0,NULL,NULL,NULL,NULL),(636,NULL,'Positieve keurcode fytosa',1,0,NULL,NULL,NULL,NULL),(637,NULL,'Positieve keurcode kwalit',1,0,NULL,NULL,NULL,NULL),(638,NULL,'Positieve keurcode veilin',1,0,NULL,NULL,NULL,NULL),(639,NULL,'Maceta',1,1,NULL,'cm',NULL,'diameter'),(640,NULL,'Altura',1,0,NULL,'cm',NULL,'size'),(641,NULL,'nº plantas',1,0,NULL,NULL,NULL,NULL),(642,NULL,'Diámetro',1,0,NULL,NULL,NULL,NULL),(644,NULL,'Altura',1,1,NULL,'cm',NULL,'size'),(645,NULL,'Plantas/Maceta',1,0,NULL,NULL,NULL,NULL),(646,NULL,'Dikte',1,0,NULL,NULL,NULL,NULL),(647,NULL,'nº flores',1,0,NULL,NULL,NULL,NULL),(648,NULL,'Min aantal bloemtrossen p',1,0,NULL,NULL,NULL,NULL),(649,NULL,'nº ramales',1,0,NULL,NULL,NULL,NULL),(650,NULL,'Minimum aantal bollen per',1,0,NULL,NULL,NULL,NULL),(651,NULL,'Minimum aantal bladeren p',1,0,NULL,NULL,NULL,NULL),(652,NULL,'Altura tronco',1,1,NULL,'cm',NULL,'size'),(653,NULL,'Altura caja',1,0,NULL,'cm',NULL,'size'),(654,NULL,'Lengte scheuten',1,0,NULL,NULL,NULL,NULL),(655,NULL,'Min aant vertakkingen pr ',1,0,NULL,NULL,NULL,NULL),(656,NULL,'Altura del capullo',1,0,NULL,NULL,NULL,NULL),(658,NULL,'Peso tallo',1,0,NULL,NULL,NULL,NULL),(659,NULL,'nº flores',1,0,NULL,NULL,NULL,NULL),(660,NULL,'Diámetro de la flor',1,0,NULL,NULL,NULL,NULL),(661,NULL,'Minimum bloemschedelengte',1,0,NULL,NULL,NULL,NULL),(662,NULL,'Aantal bloemkoppen per tr',1,0,NULL,NULL,NULL,NULL),(663,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,NULL,NULL),(664,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,NULL,NULL),(665,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,NULL,NULL),(666,NULL,'Longitud inflorescencia',1,0,NULL,NULL,NULL,NULL),(667,NULL,'Verpakkingswijze snijbloe',1,0,NULL,NULL,NULL,NULL),(668,NULL,'Minimum aant bloemen per ',1,0,NULL,NULL,NULL,NULL),(669,NULL,'Longitud',1,0,NULL,NULL,NULL,'size'),(670,NULL,'Jaartal sortering hout',1,0,NULL,NULL,NULL,NULL),(671,NULL,'Diámetro de la hoja',1,0,NULL,NULL,NULL,NULL),(672,NULL,'Peso paquete',1,0,NULL,NULL,NULL,NULL),(673,NULL,'Maximum planthoogte',1,0,NULL,NULL,NULL,NULL),(674,NULL,'Maximum plantdiameter',1,0,NULL,NULL,NULL,NULL),(675,NULL,'Max aantal bloemen/bloeiw',1,0,NULL,NULL,NULL,NULL),(676,NULL,'Maximum aantal takken per',1,0,NULL,NULL,NULL,NULL),(677,NULL,'Maximum aantal bollen per',1,0,NULL,NULL,NULL,NULL),(678,NULL,'Maximum stamhoogte',1,0,NULL,NULL,NULL,NULL),(679,NULL,'Longitud mínima',1,0,NULL,NULL,NULL,'size'),(680,NULL,'Maximum aantal knoppen sn',1,0,NULL,NULL,NULL,NULL),(681,NULL,'Maximum bloemdiameter',1,0,NULL,NULL,NULL,NULL),(682,NULL,'Maximum bloeiwijzelengte',1,0,NULL,NULL,NULL,NULL),(683,NULL,'Aantal vruchten / trossen',1,0,NULL,NULL,NULL,NULL),(684,NULL,'Verpakkingswijze',1,0,NULL,NULL,NULL,NULL),(685,NULL,'Minimum vruchtdiameter',1,0,NULL,NULL,NULL,NULL),(686,NULL,'Medida',1,1,NULL,'cm',NULL,'size'),(687,NULL,'Bloem/bes/vruchtkleur 1',1,0,NULL,NULL,NULL,NULL),(688,NULL,'Potvorm',1,0,NULL,NULL,NULL,NULL),(689,NULL,'Potkleur',1,0,NULL,NULL,NULL,NULL),(690,NULL,'Material maceta',1,0,NULL,NULL,NULL,NULL),(691,NULL,'Plantvorm',1,0,NULL,NULL,NULL,NULL),(692,NULL,'Aantal kleuren/cultiv per',1,0,NULL,NULL,NULL,NULL),(693,NULL,'Teeltwijze',1,0,NULL,NULL,NULL,NULL),(694,NULL,'Teeltmedium',1,0,NULL,NULL,NULL,NULL),(695,NULL,'Cubierta',1,0,NULL,NULL,NULL,NULL),(696,NULL,'Hoesvorm',1,0,NULL,NULL,NULL,NULL),(697,NULL,'Hoesbedrukking algemeen',1,0,NULL,NULL,NULL,NULL),(698,NULL,'Extra toevoegingen',1,0,NULL,NULL,NULL,NULL),(699,NULL,'Land van herkomst (bedrij',1,0,NULL,NULL,NULL,NULL),(700,NULL,'Verpakte orchidee',1,0,NULL,NULL,NULL,NULL),(701,NULL,'Hoesbedrukking extra',1,0,NULL,NULL,NULL,NULL),(702,NULL,'Voorbehandeling',1,0,NULL,NULL,NULL,NULL),(703,NULL,'Overige niet in pot',1,0,NULL,NULL,NULL,NULL),(704,NULL,'Forma de la flor',1,0,NULL,NULL,NULL,NULL),(705,NULL,'Flexibilidad',1,0,NULL,NULL,NULL,NULL),(706,NULL,'Hoeskleur',1,0,NULL,NULL,NULL,NULL),(707,NULL,'Extra deco',1,0,NULL,NULL,NULL,NULL),(710,NULL,'Altura',1,0,NULL,'cm',NULL,'size'),(711,NULL,'Diametro',1,0,NULL,NULL,NULL,NULL),(712,NULL,'Barcode',1,0,NULL,NULL,NULL,NULL),(713,NULL,'Productlabel',1,0,NULL,NULL,NULL,NULL),(714,NULL,'Eetbaar/ niet eetbaar',1,0,NULL,NULL,NULL,NULL),(715,NULL,'Plantmaat zonder pot',1,0,NULL,NULL,NULL,NULL),(716,NULL,'Aantal kleuren/cultiv per',1,0,NULL,NULL,NULL,NULL),(717,NULL,'Maximum percentage oud ho',1,0,NULL,NULL,NULL,NULL),(718,NULL,'Maximum lengte verschil',1,0,NULL,NULL,NULL,NULL),(719,NULL,'Bladkleur',1,0,NULL,NULL,NULL,NULL),(720,NULL,'Plantgewicht',1,0,NULL,NULL,NULL,NULL),(721,NULL,'Diámetro',1,0,NULL,NULL,NULL,NULL),(722,NULL,'Bloem/bes/vruchtkleur 2',1,0,NULL,NULL,NULL,NULL),(723,NULL,'Winterhardheid (USDA zone',1,0,NULL,NULL,NULL,NULL),(724,NULL,'Kleurbehandeld',1,0,NULL,NULL,NULL,'inkFk'),(725,NULL,'Bloem-/bladkleurverdeling',1,0,NULL,NULL,NULL,NULL),(726,NULL,'Diámetro del capullo',1,0,NULL,NULL,NULL,NULL),(727,NULL,'Volume inhoud',1,0,NULL,NULL,NULL,NULL),(728,NULL,'Vruchtbenaming',1,0,NULL,NULL,NULL,NULL),(729,NULL,'Vaaslevenindex',1,0,NULL,NULL,NULL,NULL),(730,NULL,'Overige informatie plante',1,0,NULL,NULL,NULL,NULL),(731,NULL,'Overige informatie snijbl',1,0,NULL,NULL,NULL,NULL),(732,NULL,'Toepassingsmogelijkheid',1,0,NULL,NULL,NULL,NULL),(733,NULL,'Productbeeld aanvoerder',1,0,NULL,NULL,NULL,NULL),(734,NULL,'MPS certificering',1,0,NULL,NULL,NULL,NULL),(735,NULL,'Kwaliteitsgroep',1,0,NULL,NULL,NULL,NULL),(736,NULL,'Artikelomschrijving',1,0,NULL,NULL,NULL,NULL),(737,NULL,'BTW-tarief',1,0,NULL,NULL,NULL,NULL),(738,NULL,'Prijseenheid',1,0,NULL,NULL,NULL,NULL),(739,NULL,'Transactievorm',1,0,NULL,NULL,NULL,NULL),(740,NULL,'Handelsverpakking voorwaa',1,0,NULL,NULL,NULL,NULL),(741,NULL,'Consumentenverpakking voo',1,0,NULL,NULL,NULL,NULL),(742,NULL,'Leveringsvoorwaarden',1,0,NULL,NULL,NULL,NULL),(743,NULL,'PT heffing voorwaarden',1,0,NULL,NULL,NULL,NULL),(744,NULL,'Serviceheffing voorwaarde',1,0,NULL,NULL,NULL,NULL),(745,NULL,'Algemene voorwaarden',1,0,NULL,NULL,NULL,NULL),(746,NULL,'Marktvorm',1,0,NULL,NULL,NULL,NULL),(747,NULL,'Themadagen',1,0,NULL,NULL,NULL,NULL),(748,NULL,'Handelscategorie',1,0,NULL,NULL,NULL,NULL),(749,NULL,'Producentengroepen',1,0,NULL,NULL,NULL,NULL),(750,NULL,'Favorieten Id',1,0,NULL,NULL,NULL,NULL),(751,NULL,'Verkoopeenheid',1,0,NULL,NULL,NULL,NULL),(752,NULL,'Veilgroep voorkeur',1,0,NULL,NULL,NULL,NULL),(753,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(754,NULL,'Keurmeesternummer FloraHo',1,0,NULL,NULL,NULL,NULL),(755,NULL,'Rijnummer Rijnsburg',1,0,NULL,NULL,NULL,NULL),(756,NULL,'Verwerkingslocatie FloraH',1,0,NULL,NULL,NULL,NULL),(757,NULL,'FloraHolland Financial',1,0,NULL,NULL,NULL,NULL),(758,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(759,NULL,'Benefiet veiling',1,0,NULL,NULL,NULL,NULL),(760,NULL,'Kloksoort',1,0,NULL,NULL,NULL,NULL),(761,NULL,'Minimumprijs aanvoerder',1,0,NULL,NULL,NULL,NULL),(762,NULL,'Rest aantallen',1,0,NULL,NULL,NULL,NULL),(763,NULL,'Veilsoort',1,0,NULL,NULL,NULL,NULL),(764,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(765,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(766,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(767,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(768,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(769,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(770,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(771,NULL,'Gereserveerd',1,0,NULL,NULL,NULL,NULL),(772,NULL,'Veilgroep Aalsmeer',1,0,NULL,NULL,NULL,NULL),(773,NULL,'Promotie kenmerk FloraHol',1,0,NULL,NULL,NULL,NULL),(774,NULL,'Verrekening snijbloemenvo',1,0,NULL,NULL,NULL,NULL),(775,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(776,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(777,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(778,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(779,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(780,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(781,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(782,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(783,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(784,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(785,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(786,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(787,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(788,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(789,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(790,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(791,NULL,'Gereserveerd',1,0,NULL,NULL,NULL,NULL),(792,NULL,'Tussenopslag klok Plantio',1,0,NULL,NULL,NULL,NULL),(793,NULL,'Soort ladingsdrager Plant',1,0,NULL,NULL,NULL,NULL),(794,NULL,'Logistiek middel Plantion',1,0,NULL,NULL,NULL,NULL),(795,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(796,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(797,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(798,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(799,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(800,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(801,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(802,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(803,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(804,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(805,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(806,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(807,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(808,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(809,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(810,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(811,NULL,'Gereserveerd',1,0,NULL,NULL,NULL,NULL),(812,NULL,'Veilgroep Plantion Ede',1,0,NULL,NULL,NULL,NULL),(813,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(814,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(815,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(816,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(817,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(818,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(819,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(820,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(821,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(822,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(823,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(824,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(825,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(826,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(827,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,NULL,NULL),(828,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,NULL,NULL),(829,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,NULL,NULL),(830,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,NULL,NULL),(831,NULL,'Toegevoegde waardes VRM',1,0,NULL,NULL,NULL,NULL),(832,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(833,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(834,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(835,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(836,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(837,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(838,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(839,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(840,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(841,NULL,'Veiling',1,0,NULL,NULL,NULL,NULL),(842,NULL,'kopersaantallen',1,0,NULL,NULL,NULL,NULL),(843,NULL,'Caducidad',1,0,NULL,NULL,NULL,NULL),(844,NULL,'Lote',1,0,NULL,NULL,NULL,NULL),(845,NULL,'Uds palet',1,0,NULL,NULL,NULL,NULL),(4548,NULL,'fout kenmerk',1,0,NULL,NULL,'081',NULL),(4549,NULL,'Potinhoud',1,0,NULL,NULL,'A01',NULL),(4550,NULL,'Marketingconcept',1,0,NULL,NULL,'A02',NULL),(4551,NULL,'Leeftijd',1,0,NULL,NULL,'A03',NULL),(4552,NULL,'Uitgangsmateriaal',1,0,NULL,NULL,'A04',NULL),(4553,NULL,'Kleurbehandeld',1,0,NULL,NULL,'A05',NULL),(4554,NULL,'Verzorging: Standplaats',1,0,NULL,NULL,'A06',NULL),(4555,NULL,'Verzorging: Water',1,0,NULL,NULL,'A07',NULL),(4556,NULL,'Verzorging: Voeding',1,0,NULL,NULL,'A08',NULL),(4557,NULL,'Verzorging: Temperatuur',1,0,NULL,NULL,'A09',NULL),(4558,NULL,'Verzorging: Specifieke in',1,0,NULL,NULL,'A10',NULL),(4559,NULL,'Verzorging: Consumptie',1,0,NULL,NULL,'A11',NULL),(4560,NULL,'Nabehandeling',1,0,NULL,NULL,'A13',NULL),(4561,NULL,'Artikel beeld',1,0,NULL,NULL,'A23',NULL),(4562,NULL,'Hoofdkleur 1',1,0,NULL,NULL,'B01',NULL),(4563,NULL,'Hoofdkleur 2',1,0,NULL,NULL,'B02',NULL),(4564,NULL,'RHS hoofdkleur 1',1,0,NULL,NULL,'B03',NULL),(4565,NULL,'RHS hoofdkleur 2',1,0,NULL,NULL,'B04',NULL),(4566,NULL,'Hoofdkleur 1 blad',1,0,NULL,NULL,'B05',NULL),(4567,NULL,'Hoofdkleur 2 blad',1,0,NULL,NULL,'B06',NULL),(4568,NULL,'RHS hoofdkleur 1 blad',1,0,NULL,NULL,'B07',NULL),(4569,NULL,'RHS hoofdkleur 2 blad',1,0,NULL,NULL,'B08',NULL),(4570,NULL,'Botanisch beeld',1,0,NULL,NULL,'B09',NULL),(4571,NULL,'Hoofdkleur bes/vrucht',1,0,NULL,NULL,'B10',NULL),(4572,NULL,'RHS hoofdkleur bes/vrucht',1,0,NULL,NULL,'B11',NULL),(4573,NULL,'UPOV hoofdkleur 1 bloem',1,0,NULL,NULL,'B12',NULL),(4574,NULL,'UPOV hoofdkleur 2 bloem',1,0,NULL,NULL,'B13',NULL),(4575,NULL,'UPOV hoofdkleur 1 blad',1,0,NULL,NULL,'B14',NULL),(4576,NULL,'UPOV hoofdkleur 2 blad',1,0,NULL,NULL,'B15',NULL),(4577,NULL,'UPOV hoofdkleur bes/vruch',1,0,NULL,NULL,'B16',NULL),(4578,NULL,'Negatieve keurcode 1',1,0,NULL,NULL,'K01',NULL),(4579,NULL,'Negatieve keurcode 2',1,0,NULL,NULL,'K02',NULL),(4580,NULL,'Bedrijfskenmerk fytosanit',1,0,NULL,NULL,'K03',NULL),(4581,NULL,'Certificaten aardwarmte',1,0,NULL,NULL,'K04',NULL),(4582,NULL,'Certificaten MPS-TraceCer',1,0,NULL,NULL,'K05',NULL),(4583,NULL,'Overige leveranciersinfor',1,0,NULL,NULL,'K07',NULL),(4584,NULL,'Certificaten MPS-GAP',1,0,NULL,NULL,'K08',NULL),(4585,NULL,'Betrouwbaarheidsindex kla',1,0,NULL,NULL,'K11',NULL),(4586,NULL,'Betrouwbaarheidsindex waa',1,0,NULL,NULL,'K12',NULL),(4587,NULL,'Productkwaliteitslabel',1,0,NULL,NULL,'K13',NULL),(4588,NULL,'Label Fair Flowers Fair P',1,0,NULL,NULL,'K14',NULL),(4589,NULL,'Certificaten Socialy Qual',1,0,NULL,NULL,'K15',NULL),(4590,NULL,'Certificaten GlobalGAP',1,0,NULL,NULL,'K16',NULL),(4591,NULL,'Certificaten MPS Quality',1,0,NULL,NULL,'K17',NULL),(4592,NULL,'Certificaten biologisch',1,0,NULL,NULL,'K18',NULL),(4593,NULL,'Certificaten eetbare prod',1,0,NULL,NULL,'K19',NULL),(4594,NULL,'Certificaten Florimark',1,0,NULL,NULL,'K20',NULL),(4595,NULL,'Certificaten Milieukeur',1,0,NULL,NULL,'K21',NULL),(4596,NULL,'Certificaten Kenya Flower',1,0,NULL,NULL,'K22',NULL),(4597,NULL,'Certificaten Fairtrade',1,0,NULL,NULL,'K23',NULL),(4598,NULL,'Keurmerk MPS-ProductProof',1,0,NULL,NULL,'K24',NULL),(4599,NULL,'Certificaten ISO',1,0,NULL,NULL,'K25',NULL),(4600,NULL,'Certificaten aardwarmte',1,0,NULL,NULL,'K26',NULL),(4601,NULL,'Certificaten Florverde',1,0,NULL,NULL,'K27',NULL),(4602,NULL,'Certificaten Ethical Trad',1,0,NULL,NULL,'K28',NULL),(4603,NULL,'Certificaten Ethiopian EH',1,0,NULL,NULL,'K29',NULL),(4604,NULL,'Certificaten gewasbescher',1,0,NULL,NULL,'K30',NULL),(4605,NULL,'Certificaten SAN',1,0,NULL,NULL,'K31',NULL),(4606,NULL,'Certificaten GRASP',1,0,NULL,NULL,'K32',NULL),(4607,NULL,'Label Fair Flora',1,0,NULL,NULL,'K33',NULL),(4608,NULL,'GLobalG.A.P. Chain of Cus',1,0,NULL,NULL,'K34',NULL),(4609,NULL,'Certificaten Vegaplan',1,0,NULL,NULL,'K35',NULL),(4610,NULL,'Floriculture Sustainabili',1,0,NULL,NULL,'K99',NULL),(4611,NULL,'Fust',1,0,NULL,NULL,'L01',NULL),(4612,NULL,'Stapelwagen',1,0,NULL,NULL,'L02',NULL),(4613,NULL,'Aantal legborden veilings',1,0,NULL,NULL,'L03',NULL),(4614,NULL,'Aantal legborden Deense s',1,0,NULL,NULL,'L04',NULL),(4615,NULL,'Aantal onderstellen Deens',1,0,NULL,NULL,'L05',NULL),(4616,NULL,'Fustsoort',1,0,NULL,NULL,'L06',NULL),(4617,NULL,'Fustmateriaal',1,0,NULL,NULL,'L07',NULL),(4618,NULL,'Aantal legborden Eurostap',1,0,NULL,NULL,'L08',NULL),(4619,NULL,'Aantal onderstellen Euros',1,0,NULL,NULL,'L09',NULL),(4620,NULL,'Aantal stelen per bos',1,0,NULL,NULL,'L11',NULL),(4621,NULL,'Aantal bossen per bundel',1,0,NULL,NULL,'L12',NULL),(4622,NULL,'Aantal stuks per fust',1,0,NULL,NULL,'L13',NULL),(4623,NULL,'Aantal bossen per fust',1,0,NULL,NULL,'L14',NULL),(4624,NULL,'Aantal bundels per fust',1,0,NULL,NULL,'L15',NULL),(4625,NULL,'Aantal bossen per hoes',1,0,NULL,NULL,'L16',NULL),(4626,NULL,'Aantal bundels per hoes',1,0,NULL,NULL,'L17',NULL),(4627,NULL,'Fustlabel',1,0,NULL,NULL,'L18',NULL),(4628,NULL,'Karlabel',1,0,NULL,NULL,'L19',NULL),(4629,NULL,'Service productlabel',1,0,NULL,NULL,'L20',NULL),(4630,NULL,'Service fustlabel',1,0,NULL,NULL,'L21',NULL),(4631,NULL,'Service karlabel',1,0,NULL,NULL,'L22',NULL),(4632,NULL,'Aantal fusten per laag',1,0,NULL,NULL,'L23',NULL),(4633,NULL,'Presentatie per schapm2',1,0,NULL,NULL,'L24',NULL),(4634,NULL,'Positieve keurcode fytosa',1,0,NULL,NULL,'P01',NULL),(4635,NULL,'Positieve keurcode kwalit',1,0,NULL,NULL,'P02',NULL),(4636,NULL,'Positieve keurcode veilin',1,0,NULL,NULL,'P03',NULL),(4637,NULL,'Maceta',1,0,NULL,NULL,'S01',NULL),(4638,NULL,'Altura mínima',1,1,NULL,'cm','S02','size'),(4639,NULL,'nº plantas',1,0,NULL,NULL,'S03',NULL),(4640,NULL,'Minimum plantdiameter',1,0,NULL,NULL,'S04',NULL),(4641,NULL,'Madurez',1,0,NULL,NULL,'S05',NULL),(4642,NULL,'Combinatiehoogte',1,0,NULL,NULL,'S06',NULL),(4643,NULL,'Min aantal koppen hoogste',1,0,NULL,NULL,'S07',NULL),(4644,NULL,'Dikte',1,0,NULL,NULL,'S08',NULL),(4645,NULL,'Min aantal bloemen/bloeiw',1,0,NULL,NULL,'S09',NULL),(4646,NULL,'Min aantal bloemtrossen p',1,0,NULL,NULL,'S10',NULL),(4647,NULL,'Minimum aantal takken per',1,0,NULL,NULL,'S11',NULL),(4648,NULL,'Minimum aantal bollen per',1,0,NULL,NULL,'S12',NULL),(4649,NULL,'Minimum aantal bladeren p',1,0,NULL,NULL,'S13',NULL),(4650,NULL,'Altura tronco',1,1,NULL,'cm','S14','size'),(4651,NULL,'Altura transporte',1,0,NULL,'cm','S15','size'),(4652,NULL,'Lengte scheuten',1,0,NULL,NULL,'S16',NULL),(4653,NULL,'Min aant vertakkingen pr ',1,0,NULL,NULL,'S17',NULL),(4654,NULL,'Minimum bloemknophoogte',1,0,NULL,NULL,'S19',NULL),(4655,NULL,'Altura',1,1,NULL,'cm','S20','size'),(4656,NULL,'Gewicht (gemiddeld)',1,0,NULL,NULL,'S21',NULL),(4657,NULL,'Aantal bloemknoppen snijb',1,0,NULL,NULL,'S22',NULL),(4658,NULL,'Minimum bloemdiameter',1,0,NULL,NULL,'S23',NULL),(4659,NULL,'Minimum bloemschedelengte',1,0,NULL,NULL,'S24',NULL),(4660,NULL,'Aantal bloemkoppen per tr',1,0,NULL,NULL,'S25',NULL),(4661,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,'S26',NULL),(4662,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,'S27',NULL),(4663,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,'S28',NULL),(4664,NULL,'Minimum bloeiwijzelengte',1,0,NULL,NULL,'S29',NULL),(4665,NULL,'Verpakkingswijze snijbloe',1,0,NULL,NULL,'S30',NULL),(4666,NULL,'Minimum aant bloemen per ',1,0,NULL,NULL,'S31',NULL),(4667,NULL,'Medida',1,0,NULL,'cm','S32',NULL),(4668,NULL,'Jaartal sortering hout',1,0,NULL,NULL,'S33',NULL),(4669,NULL,'Minimum bladdiameter',1,0,NULL,NULL,'S34',NULL),(4670,NULL,'Minimum bundelgewicht',1,0,NULL,NULL,'S35',NULL),(4671,NULL,'Altura máxima',1,0,NULL,NULL,'S36',NULL),(4672,NULL,'Maximum plantdiameter',1,0,NULL,NULL,'S37',NULL),(4673,NULL,'Max aantal bloemen/bloeiw',1,0,NULL,NULL,'S38',NULL),(4674,NULL,'Maximum aantal takken per',1,0,NULL,NULL,'S39',NULL),(4675,NULL,'Maximum aantal bollen per',1,0,NULL,NULL,'S40',NULL),(4676,NULL,'Altura máxima',1,0,NULL,NULL,'S41',NULL),(4677,NULL,'Maximum steellengte',1,0,NULL,NULL,'S42',NULL),(4678,NULL,'Maximum aantal knoppen sn',1,0,NULL,NULL,'S43',NULL),(4679,NULL,'Maximum bloemdiameter',1,0,NULL,NULL,'S44',NULL),(4680,NULL,'Maximum bloeiwijzelengte',1,0,NULL,NULL,'S45',NULL),(4681,NULL,'Aantal vruchten / trossen',1,0,NULL,NULL,'S46',NULL),(4682,NULL,'Verpakkingswijze',1,0,NULL,NULL,'S47',NULL),(4683,NULL,'Minimum vruchtdiameter',1,0,NULL,NULL,'S48',NULL),(4684,NULL,'Medida',1,1,NULL,'cm','S49','size'),(4685,NULL,'Bloem/bes/vruchtkleur 1',1,0,NULL,NULL,'S50',NULL),(4686,NULL,'Potvorm',1,0,NULL,NULL,'S51',NULL),(4687,NULL,'Potkleur',1,0,NULL,NULL,'S52',NULL),(4688,NULL,'Potmateriaal',1,0,NULL,NULL,'S53',NULL),(4689,NULL,'Plantvorm',1,0,NULL,NULL,'S54',NULL),(4690,NULL,'Aantal kleuren/cultiv per',1,0,NULL,NULL,'S55',NULL),(4691,NULL,'Teeltwijze',1,0,NULL,NULL,'S56',NULL),(4692,NULL,'Teeltmedium',1,0,NULL,NULL,'S57',NULL),(4693,NULL,'Hoesmateriaal',1,0,NULL,NULL,'S58',NULL),(4694,NULL,'Hoesvorm',1,0,NULL,NULL,'S59',NULL),(4695,NULL,'Hoesbedrukking algemeen',1,0,NULL,NULL,'S60',NULL),(4696,NULL,'Extra toevoegingen',1,0,NULL,NULL,'S61',NULL),(4697,NULL,'Land van herkomst (bedrij',1,0,NULL,NULL,'S62',NULL),(4698,NULL,'Verpakte orchidee',1,0,NULL,NULL,'S63',NULL),(4699,NULL,'Hoesbedrukking extra',1,0,NULL,NULL,'S64',NULL),(4700,NULL,'Voorbehandeling',1,0,NULL,NULL,'S65',NULL),(4701,NULL,'Overige niet in pot',1,0,NULL,NULL,'S66',NULL),(4702,NULL,'Vorm snijbloemen',1,0,NULL,NULL,'S67',NULL),(4703,NULL,'Buigzaamheid bloemsteel',1,0,NULL,NULL,'S68',NULL),(4704,NULL,'Hoeskleur',1,0,NULL,NULL,'S69',NULL),(4705,NULL,'Extra deco materiaal',1,0,NULL,NULL,'S70',NULL),(4706,NULL,'Productkleur',1,0,NULL,NULL,'S71',NULL),(4707,NULL,'Productmateriaal',1,0,NULL,NULL,'S72',NULL),(4708,NULL,'Altura',1,1,NULL,'cm','S73','size'),(4709,NULL,'Materiaaldiameter',1,0,NULL,NULL,'S74',NULL),(4710,NULL,'Barcode',1,0,NULL,NULL,'S75',NULL),(4711,NULL,'Productlabel',1,0,NULL,NULL,'S76',NULL),(4712,NULL,'Eetbaar/ niet eetbaar',1,0,NULL,NULL,'S77',NULL),(4713,NULL,'Plantmaat zonder pot',1,0,NULL,NULL,'S78',NULL),(4714,NULL,'Aantal kleuren/cultiv per',1,0,NULL,NULL,'S79',NULL),(4715,NULL,'Maximum percentage oud ho',1,0,NULL,NULL,'S80',NULL),(4716,NULL,'Maximum lengte verschil',1,0,NULL,NULL,'S81',NULL),(4717,NULL,'Bladkleur',1,0,NULL,NULL,'S82',NULL),(4718,NULL,'Plantgewicht',1,0,NULL,NULL,'S83',NULL),(4719,NULL,'Gemiddelde bloemdiameter',1,0,NULL,NULL,'S84',NULL),(4720,NULL,'Bloem/bes/vruchtkleur 2',1,0,NULL,NULL,'S85',NULL),(4721,NULL,'Winterhardheid (USDA zone',1,0,NULL,NULL,'S86',NULL),(4722,NULL,'Kleurbehandeld',1,0,NULL,NULL,'S87',NULL),(4723,NULL,'Bloem-/bladkleurverdeling',1,0,NULL,NULL,'S88',NULL),(4724,NULL,'Minimum bloemknopdiameter',1,0,NULL,NULL,'S89',NULL),(4725,NULL,'Volume inhoud',1,0,NULL,NULL,'S90',NULL),(4726,NULL,'Vruchtbenaming',1,0,NULL,NULL,'S91',NULL),(4727,NULL,'Vaaslevenindex',1,0,NULL,NULL,'S92',NULL),(4728,NULL,'Overige informatie plante',1,0,NULL,NULL,'S93',NULL),(4729,NULL,'Overige informatie snijbl',1,0,NULL,NULL,'S94',NULL),(4730,NULL,'Toepassingsmogelijkheid',1,0,NULL,NULL,'S95',NULL),(4731,NULL,'Productbeeld aanvoerder',1,0,NULL,NULL,'S96',NULL),(4732,NULL,'MPS certificering',1,0,NULL,NULL,'S97',NULL),(4733,NULL,'Kwaliteitsgroep',1,0,NULL,NULL,'S98',NULL),(4734,NULL,'Artikelomschrijving',1,0,NULL,NULL,'S99',NULL),(4735,NULL,'BTW-tarief',1,0,NULL,NULL,'T01',NULL),(4736,NULL,'Prijseenheid',1,0,NULL,NULL,'T02',NULL),(4737,NULL,'Transactievorm',1,0,NULL,NULL,'T03',NULL),(4738,NULL,'Handelsverpakking voorwaa',1,0,NULL,NULL,'T10',NULL),(4739,NULL,'Consumentenverpakking voo',1,0,NULL,NULL,'T11',NULL),(4740,NULL,'Leveringsvoorwaarden',1,0,NULL,NULL,'T12',NULL),(4741,NULL,'PT heffing voorwaarden',1,0,NULL,NULL,'T13',NULL),(4742,NULL,'Serviceheffing voorwaarde',1,0,NULL,NULL,'T14',NULL),(4743,NULL,'Algemene voorwaarden',1,0,NULL,NULL,'T15',NULL),(4744,NULL,'Marktvorm',1,0,NULL,NULL,'T16',NULL),(4745,NULL,'Themadagen',1,0,NULL,NULL,'T17',NULL),(4746,NULL,'Handelscategorie',1,0,NULL,NULL,'T18',NULL),(4747,NULL,'Producentengroepen',1,0,NULL,NULL,'T19',NULL),(4748,NULL,'Favorieten Id',1,0,NULL,NULL,'T20',NULL),(4749,NULL,'Verkoopeenheid',1,0,NULL,NULL,'T21',NULL),(4750,NULL,'Veilgroep voorkeur',1,0,NULL,NULL,'V01',NULL),(4751,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V02',NULL),(4752,NULL,'Keurmeesternummer FloraHo',1,0,NULL,NULL,'V03',NULL),(4753,NULL,'Rijnummer Rijnsburg',1,0,NULL,NULL,'V04',NULL),(4754,NULL,'Verwerkingslocatie FloraH',1,0,NULL,NULL,'V05',NULL),(4755,NULL,'FloraHolland Financial',1,0,NULL,NULL,'V06',NULL),(4756,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V07',NULL),(4757,NULL,'Benefiet veiling',1,0,NULL,NULL,'V08',NULL),(4758,NULL,'Kloksoort',1,0,NULL,NULL,'V09',NULL),(4759,NULL,'Minimumprijs aanvoerder',1,0,NULL,NULL,'V10',NULL),(4760,NULL,'Rest aantallen',1,0,NULL,NULL,'V11',NULL),(4761,NULL,'Veilsoort',1,0,NULL,NULL,'V12',NULL),(4762,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V13',NULL),(4763,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V14',NULL),(4764,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V15',NULL),(4765,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V16',NULL),(4766,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V17',NULL),(4767,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V18',NULL),(4768,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V19',NULL),(4769,NULL,'Gereserveerd',1,0,NULL,NULL,'V20',NULL),(4770,NULL,'Veilgroep Aalsmeer',1,0,NULL,NULL,'V21',NULL),(4771,NULL,'Promotie kenmerk FloraHol',1,0,NULL,NULL,'V22',NULL),(4772,NULL,'Verrekening snijbloemenvo',1,0,NULL,NULL,'V23',NULL),(4773,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V24',NULL),(4774,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V25',NULL),(4775,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V26',NULL),(4776,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V27',NULL),(4777,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V28',NULL),(4778,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V29',NULL),(4779,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V30',NULL),(4780,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V31',NULL),(4781,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V32',NULL),(4782,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V33',NULL),(4783,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V34',NULL),(4784,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V35',NULL),(4785,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V36',NULL),(4786,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V37',NULL),(4787,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V38',NULL),(4788,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V39',NULL),(4789,NULL,'Gereserveerd',1,0,NULL,NULL,'V40',NULL),(4790,NULL,'Tussenopslag klok Plantio',1,0,NULL,NULL,'V41',NULL),(4791,NULL,'Soort ladingsdrager Plant',1,0,NULL,NULL,'V42',NULL),(4792,NULL,'Logistiek middel Plantion',1,0,NULL,NULL,'V43',NULL),(4793,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V44',NULL),(4794,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V45',NULL),(4795,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V46',NULL),(4796,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V47',NULL),(4797,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V48',NULL),(4798,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V49',NULL),(4799,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V50',NULL),(4800,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V51',NULL),(4801,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V52',NULL),(4802,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V53',NULL),(4803,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V54',NULL),(4804,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V55',NULL),(4805,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V56',NULL),(4806,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V57',NULL),(4807,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V58',NULL),(4808,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V59',NULL),(4809,NULL,'Gereserveerd',1,0,NULL,NULL,'V60',NULL),(4810,NULL,'Veilgroep Plantion Ede',1,0,NULL,NULL,'V61',NULL),(4811,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V62',NULL),(4812,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V63',NULL),(4813,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V64',NULL),(4814,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V65',NULL),(4815,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V66',NULL),(4816,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V67',NULL),(4817,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V68',NULL),(4818,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V69',NULL),(4819,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V70',NULL),(4820,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V71',NULL),(4821,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V72',NULL),(4822,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V73',NULL),(4823,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V74',NULL),(4824,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V75',NULL),(4825,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,'V76',NULL),(4826,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,'V77',NULL),(4827,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,'V78',NULL),(4828,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,'V79',NULL),(4829,NULL,'Toegevoegde waardes VRM',1,0,NULL,NULL,'V80',NULL),(4830,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V81',NULL),(4831,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V82',NULL),(4832,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V83',NULL),(4833,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V84',NULL),(4834,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V85',NULL),(4835,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V86',NULL),(4836,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V87',NULL),(4837,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V88',NULL),(4838,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V89',NULL),(4839,NULL,'Veiling',1,0,NULL,NULL,'V99',NULL),(4840,NULL,'kopersaantallen',1,0,NULL,NULL,'Z01',NULL);
+INSERT INTO `tag` VALUES (1,'color','Color',0,0,'ink',NULL,NULL,'inkFk'),(2,NULL,'Forma',1,0,NULL,NULL,NULL,NULL),(3,NULL,'Material',1,0,NULL,NULL,NULL,NULL),(4,NULL,'Longitud',1,1,NULL,'mm',NULL,'size'),(5,NULL,'Diámetro',1,1,NULL,'mm',NULL,'diameter'),(6,NULL,'Perímetro',1,1,NULL,'mm',NULL,NULL),(7,NULL,'Ancho de la base',1,1,NULL,'mm',NULL,NULL),(8,NULL,'Altura',1,1,NULL,'mm',NULL,'size'),(9,NULL,'Volumen',1,1,NULL,'ml',NULL,NULL),(10,NULL,'Densidad',1,1,NULL,NULL,NULL,NULL),(11,NULL,'Calidad',1,0,NULL,NULL,NULL,NULL),(12,NULL,'Textura',1,0,NULL,NULL,NULL,NULL),(13,NULL,'Material del mango',1,0,NULL,NULL,NULL,NULL),(14,NULL,'Compra mínima',1,0,NULL,NULL,NULL,NULL),(15,NULL,'Nº pétalos',1,1,NULL,NULL,NULL,NULL),(16,NULL,'Ancho',1,1,NULL,'mm',NULL,NULL),(18,NULL,'Profundidad',1,1,NULL,'mm',NULL,NULL),(19,NULL,'Largo',1,1,NULL,'mm',NULL,'size'),(20,NULL,'Ancho superior',1,1,NULL,'mm',NULL,NULL),(21,NULL,'Ancho inferior',1,1,NULL,'mm',NULL,NULL),(22,NULL,'Gramaje',1,1,NULL,'g',NULL,NULL),(23,'stems','Tallos',1,1,NULL,NULL,NULL,'stems'),(24,NULL,'Estado',1,0,NULL,NULL,NULL,NULL),(25,NULL,'Color principal',0,0,'ink',NULL,NULL,NULL),(26,NULL,'Color secundario',0,0,'ink',NULL,NULL,NULL),(27,NULL,'Longitud(cm)',1,1,NULL,'cm',NULL,NULL),(28,NULL,'Diámetro base',1,1,NULL,'mm',NULL,'diameter'),(29,NULL,'Colección',1,0,NULL,NULL,NULL,NULL),(30,NULL,'Uds / caja',1,1,NULL,NULL,NULL,NULL),(31,NULL,'Contenido',1,0,NULL,NULL,NULL,NULL),(32,NULL,'Peso',1,1,NULL,'g',NULL,NULL),(33,NULL,'Grosor',1,1,NULL,'mm',NULL,NULL),(34,NULL,'Marca',1,0,NULL,NULL,NULL,NULL),(35,'origin','Origen',0,0,'origin',NULL,NULL,'originFk'),(36,NULL,'Proveedor',1,0,NULL,NULL,NULL,NULL),(37,'producer','Productor',0,0,'producer',NULL,NULL,'producerFk'),(38,NULL,'Duración',1,1,NULL,'s',NULL,NULL),(39,NULL,'Flor',1,0,NULL,NULL,NULL,NULL),(40,NULL,'Soporte',1,0,NULL,NULL,NULL,NULL),(41,NULL,'Tamaño flor',1,0,NULL,NULL,NULL,NULL),(42,NULL,'Apertura',1,0,NULL,NULL,NULL,NULL),(43,NULL,'Tallo',1,0,NULL,NULL,NULL,NULL),(44,NULL,'Nº hojas',1,1,NULL,NULL,NULL,NULL),(45,NULL,'Dimensiones',1,0,NULL,NULL,NULL,NULL),(46,NULL,'Diámetro boca',1,1,NULL,'mm',NULL,NULL),(47,NULL,'Nº flores',1,1,NULL,NULL,NULL,NULL),(48,NULL,'Uds / paquete',1,1,NULL,NULL,NULL,NULL),(49,NULL,'Maceta',1,1,NULL,'cm',NULL,'diameter'),(50,NULL,'Textura flor',1,0,NULL,NULL,NULL,NULL),(51,NULL,'Textura hoja',1,0,NULL,NULL,NULL,NULL),(52,NULL,'Tipo de IVA',1,0,NULL,NULL,NULL,NULL),(53,NULL,'Tronco',1,0,NULL,NULL,NULL,NULL),(54,NULL,'Hoja',1,0,NULL,NULL,NULL,NULL),(55,NULL,'Formato',1,0,NULL,NULL,NULL,NULL),(56,NULL,'Genero',1,0,NULL,NULL,NULL,NULL),(57,NULL,'Especie',1,0,NULL,NULL,NULL,NULL),(58,NULL,'Variedad',1,0,NULL,NULL,NULL,NULL),(59,NULL,'Medida grande',1,0,NULL,NULL,NULL,NULL),(60,NULL,'Medida mediano',1,0,NULL,NULL,NULL,NULL),(61,NULL,'Medida pequeño',1,0,NULL,NULL,NULL,NULL),(63,NULL,'Recipiente interior',1,0,NULL,NULL,NULL,NULL),(64,NULL,'Material secundario',1,0,NULL,NULL,NULL,NULL),(65,NULL,'Colores',1,0,NULL,NULL,NULL,NULL),(66,NULL,'Referencia',1,0,NULL,NULL,NULL,NULL),(67,'category','Categoria',1,0,NULL,NULL,NULL,NULL),(68,NULL,'Amb',1,0,NULL,NULL,NULL,NULL),(69,NULL,'Anchura',1,1,NULL,'cm',NULL,NULL),(70,NULL,'Hueco interior',1,0,NULL,NULL,NULL,NULL),(71,NULL,'Tamaño',1,0,NULL,NULL,NULL,NULL),(72,NULL,'Color botón',1,0,NULL,NULL,NULL,NULL),(73,NULL,'Tamaño minimo del botón',1,0,NULL,NULL,NULL,NULL),(74,NULL,'Obtentor',1,0,NULL,NULL,NULL,NULL),(75,NULL,'Longitud del brote',1,0,NULL,NULL,NULL,NULL),(76,NULL,'Tallos / u.v.',1,0,NULL,NULL,NULL,NULL),(77,NULL,'Madera de',1,0,NULL,NULL,NULL,NULL),(78,NULL,'Unidad de venta',1,0,NULL,NULL,NULL,NULL),(79,NULL,'Temporal',1,0,NULL,NULL,NULL,NULL),(80,NULL,'Gramaje/tallo',1,1,NULL,'g',NULL,NULL),(81,NULL,'Peso/paquete',1,1,NULL,'g',NULL,NULL),(82,NULL,'Flexibilidad del tallo',1,0,NULL,NULL,NULL,NULL),(83,NULL,'Nº planchas',1,1,NULL,NULL,NULL,NULL),(84,NULL,'Nº páginas',1,1,NULL,NULL,NULL,NULL),(85,NULL,'Editorial',1,0,NULL,NULL,NULL,NULL),(86,NULL,'Idioma',1,0,NULL,NULL,NULL,NULL),(87,NULL,'Fecha publicación',1,0,NULL,NULL,NULL,NULL),(88,NULL,'Cubierta',1,0,NULL,NULL,NULL,NULL),(89,NULL,'Encuadernación',1,0,NULL,NULL,NULL,NULL),(90,NULL,'Autor',1,0,NULL,NULL,NULL,NULL),(91,NULL,'Envoltorio',1,0,NULL,NULL,NULL,NULL),(92,NULL,'Nombre temporal',1,0,NULL,NULL,NULL,NULL),(93,NULL,'Modelo',1,0,NULL,NULL,NULL,NULL),(94,NULL,'Producto',1,0,NULL,NULL,NULL,NULL),(95,NULL,'Título',1,0,NULL,NULL,NULL,NULL),(96,NULL,'Tomo',1,0,NULL,NULL,NULL,NULL),(97,NULL,'Articulo',1,0,NULL,NULL,NULL,NULL),(98,NULL,'Metodo de cultivo',1,0,NULL,NULL,NULL,NULL),(99,NULL,'Edad',1,0,NULL,NULL,NULL,NULL),(100,NULL,'Agotado',1,0,NULL,NULL,NULL,NULL),(101,NULL,'Altura con asa',1,1,NULL,'cm',NULL,'size'),(102,NULL,'Nº tallos',1,1,NULL,NULL,NULL,NULL),(103,NULL,'Cultivo',1,0,NULL,NULL,NULL,NULL),(104,NULL,'Sabor',1,0,NULL,NULL,NULL,NULL),(105,NULL,'Talla',1,0,NULL,NULL,NULL,NULL),(106,NULL,'Calibre',1,1,NULL,NULL,NULL,NULL),(107,NULL,'Dulzura',1,1,NULL,'bx',NULL,NULL),(108,NULL,'Piezas',1,0,NULL,NULL,NULL,NULL),(109,NULL,'Altura con patas',1,0,NULL,'cm',NULL,'size'),(110,NULL,'Envase',1,0,NULL,NULL,NULL,NULL),(111,NULL,'Nº piezas',1,0,NULL,NULL,NULL,NULL),(112,NULL,'Uso',1,0,NULL,'cm',NULL,NULL),(113,NULL,'Color luz',1,0,NULL,NULL,NULL,NULL),(114,NULL,'Capacidad',1,0,NULL,NULL,NULL,NULL),(184,NULL,'Tallos por paquete',1,0,NULL,NULL,NULL,NULL),(205,NULL,'Apertura',1,0,NULL,NULL,NULL,NULL),(219,NULL,'Altura',1,0,NULL,'cm',NULL,'size'),(552,NULL,'fout kenmerk',1,0,NULL,NULL,NULL,NULL),(553,NULL,'Potinhoud',1,0,NULL,NULL,NULL,NULL),(554,NULL,'Marketingconcept',1,0,NULL,NULL,NULL,NULL),(555,NULL,'Leeftijd',1,0,NULL,NULL,NULL,NULL),(556,NULL,'Base',1,0,NULL,NULL,NULL,NULL),(557,NULL,'Kleurbehandeld',1,0,NULL,NULL,NULL,'inkFk'),(558,NULL,'Verzorging: Standplaats',1,0,NULL,NULL,NULL,NULL),(559,NULL,'Verzorging: Water',1,0,NULL,NULL,NULL,NULL),(560,NULL,'Verzorging: Voeding',1,0,NULL,NULL,NULL,NULL),(561,NULL,'Verzorging: Temperatuur',1,0,NULL,NULL,NULL,NULL),(562,NULL,'Verzorging: Specifieke in',1,0,NULL,NULL,NULL,NULL),(563,NULL,'Verzorging: Consumptie',1,0,NULL,NULL,NULL,NULL),(564,NULL,'Nabehandeling',1,0,NULL,NULL,NULL,NULL),(565,NULL,'Artikel beeld',1,0,NULL,NULL,NULL,NULL),(566,NULL,'Hoofdkleur 1',1,0,NULL,NULL,NULL,NULL),(567,NULL,'Hoofdkleur 2',1,0,NULL,NULL,NULL,NULL),(568,NULL,'RHS hoofdkleur 1',1,0,NULL,NULL,NULL,NULL),(569,NULL,'RHS hoofdkleur 2',1,0,NULL,NULL,NULL,NULL),(570,NULL,'Hoofdkleur 1 blad',1,0,NULL,NULL,NULL,NULL),(571,NULL,'Hoofdkleur 2 blad',1,0,NULL,NULL,NULL,NULL),(572,NULL,'RHS hoofdkleur 1 blad',1,0,NULL,NULL,NULL,NULL),(573,NULL,'RHS hoofdkleur 2 blad',1,0,NULL,NULL,NULL,NULL),(574,NULL,'Botanisch beeld',1,0,NULL,NULL,NULL,NULL),(575,NULL,'Hoofdkleur bes/vrucht',1,0,NULL,NULL,NULL,NULL),(576,NULL,'RHS hoofdkleur bes/vrucht',1,0,NULL,NULL,NULL,NULL),(577,NULL,'UPOV hoofdkleur 1 bloem',1,0,NULL,NULL,NULL,NULL),(578,NULL,'UPOV hoofdkleur 2 bloem',1,0,NULL,NULL,NULL,NULL),(579,NULL,'UPOV hoofdkleur 1 blad',1,0,NULL,NULL,NULL,NULL),(580,NULL,'UPOV hoofdkleur 2 blad',1,0,NULL,NULL,NULL,NULL),(581,NULL,'UPOV hoofdkleur bes/vruch',1,0,NULL,NULL,NULL,NULL),(582,NULL,'Negatieve keurcode 1',1,0,NULL,NULL,NULL,NULL),(583,NULL,'Negatieve keurcode 2',1,0,NULL,NULL,NULL,NULL),(584,NULL,'Bedrijfskenmerk fytosanit',1,0,NULL,NULL,NULL,NULL),(585,NULL,'Certificaten aardwarmte',1,0,NULL,NULL,NULL,NULL),(586,NULL,'Certificaten MPS-TraceCer',1,0,NULL,NULL,NULL,NULL),(587,NULL,'Overige leveranciersinfor',1,0,NULL,NULL,NULL,NULL),(588,NULL,'Certificaten MPS-GAP',1,0,NULL,NULL,NULL,NULL),(589,NULL,'Betrouwbaarheidsindex kla',1,0,NULL,NULL,NULL,NULL),(590,NULL,'Betrouwbaarheidsindex waa',1,0,NULL,NULL,NULL,NULL),(591,NULL,'Productkwaliteitslabel',1,0,NULL,NULL,NULL,NULL),(592,NULL,'Label Fair Flowers Fair P',1,0,NULL,NULL,NULL,NULL),(593,NULL,'Certificaten Socialy Qual',1,0,NULL,NULL,NULL,NULL),(594,NULL,'Certificaten GlobalGAP',1,0,NULL,NULL,NULL,NULL),(595,NULL,'Certificaten MPS Quality',1,0,NULL,NULL,NULL,NULL),(596,NULL,'Certificaten biologisch',1,0,NULL,NULL,NULL,NULL),(597,NULL,'Certificaten eetbare prod',1,0,NULL,NULL,NULL,NULL),(598,NULL,'Certificaten Florimark',1,0,NULL,NULL,NULL,NULL),(599,NULL,'Certificaten Milieukeur',1,0,NULL,NULL,NULL,NULL),(600,NULL,'Certificaten Kenya Flower',1,0,NULL,NULL,NULL,NULL),(601,NULL,'Certificaten Fairtrade',1,0,NULL,NULL,NULL,NULL),(602,NULL,'Keurmerk MPS-ProductProof',1,0,NULL,NULL,NULL,NULL),(603,NULL,'Certificaten ISO',1,0,NULL,NULL,NULL,NULL),(604,NULL,'Certificaten aardwarmte',1,0,NULL,NULL,NULL,NULL),(605,NULL,'Certificaten Florverde',1,0,NULL,NULL,NULL,NULL),(606,NULL,'Certificaten Ethical Trad',1,0,NULL,NULL,NULL,NULL),(607,NULL,'Certificaten Ethiopian EH',1,0,NULL,NULL,NULL,NULL),(608,NULL,'Certificaten gewasbescher',1,0,NULL,NULL,NULL,NULL),(609,NULL,'Certificaten SAN',1,0,NULL,NULL,NULL,NULL),(610,NULL,'Certificaten GRASP',1,0,NULL,NULL,NULL,NULL),(611,NULL,'Label Fair Flora',1,0,NULL,NULL,NULL,NULL),(612,NULL,'GLobalG.A.P. Chain of Cus',1,0,NULL,NULL,NULL,NULL),(613,NULL,'Fust',1,0,NULL,NULL,NULL,NULL),(614,NULL,'Stapelwagen',1,0,NULL,NULL,NULL,NULL),(615,NULL,'Aantal legborden veilings',1,0,NULL,NULL,NULL,NULL),(616,NULL,'Aantal legborden Deense s',1,0,NULL,NULL,NULL,NULL),(617,NULL,'Aantal onderstellen Deens',1,0,NULL,NULL,NULL,NULL),(618,NULL,'Fustsoort',1,0,NULL,NULL,NULL,NULL),(619,NULL,'Envase',1,0,NULL,NULL,NULL,NULL),(620,NULL,'Aantal legborden Eurostap',1,0,NULL,NULL,NULL,NULL),(621,NULL,'Aantal onderstellen Euros',1,0,NULL,NULL,NULL,NULL),(622,NULL,'Tallos/bolsa',1,0,NULL,NULL,NULL,''),(623,NULL,'Aantal bossen per bundel',1,0,NULL,NULL,NULL,NULL),(624,NULL,'Aantal stuks per fust',1,0,NULL,NULL,NULL,NULL),(625,NULL,'Aantal bossen per fust',1,0,NULL,NULL,NULL,NULL),(626,NULL,'Aantal bundels per fust',1,0,NULL,NULL,NULL,NULL),(627,NULL,'Aantal bossen per hoes',1,0,NULL,NULL,NULL,NULL),(628,NULL,'Aantal bundels per hoes',1,0,NULL,NULL,NULL,NULL),(629,NULL,'Fustlabel',1,0,NULL,NULL,NULL,NULL),(630,NULL,'Karlabel',1,0,NULL,NULL,NULL,NULL),(631,NULL,'Service productlabel',1,0,NULL,NULL,NULL,NULL),(632,NULL,'Service fustlabel',1,0,NULL,NULL,NULL,NULL),(633,NULL,'Service karlabel',1,0,NULL,NULL,NULL,NULL),(634,NULL,'Aantal fusten per laag',1,0,NULL,NULL,NULL,NULL),(635,NULL,'Presentatie per schapm2',1,0,NULL,NULL,NULL,NULL),(636,NULL,'Positieve keurcode fytosa',1,0,NULL,NULL,NULL,NULL),(637,NULL,'Positieve keurcode kwalit',1,0,NULL,NULL,NULL,NULL),(638,NULL,'Positieve keurcode veilin',1,0,NULL,NULL,NULL,NULL),(639,NULL,'Maceta',1,1,NULL,'cm',NULL,'diameter'),(640,NULL,'Altura',1,0,NULL,'cm',NULL,'size'),(641,NULL,'nº plantas',1,0,NULL,NULL,NULL,NULL),(642,NULL,'Diámetro',1,0,NULL,NULL,NULL,NULL),(644,NULL,'Altura',1,1,NULL,'cm',NULL,'size'),(645,NULL,'Plantas/Maceta',1,0,NULL,NULL,NULL,NULL),(646,NULL,'Dikte',1,0,NULL,NULL,NULL,NULL),(647,NULL,'nº flores',1,0,NULL,NULL,NULL,NULL),(648,NULL,'Min aantal bloemtrossen p',1,0,NULL,NULL,NULL,NULL),(649,NULL,'nº ramales',1,0,NULL,NULL,NULL,NULL),(650,NULL,'Minimum aantal bollen per',1,0,NULL,NULL,NULL,NULL),(651,NULL,'Minimum aantal bladeren p',1,0,NULL,NULL,NULL,NULL),(652,NULL,'Altura tronco',1,1,NULL,'cm',NULL,'size'),(653,NULL,'Altura caja',1,0,NULL,'cm',NULL,'size'),(654,NULL,'Lengte scheuten',1,0,NULL,NULL,NULL,NULL),(655,NULL,'Min aant vertakkingen pr ',1,0,NULL,NULL,NULL,NULL),(656,NULL,'Altura del capullo',1,0,NULL,NULL,NULL,NULL),(658,NULL,'Peso tallo',1,0,NULL,NULL,NULL,NULL),(659,NULL,'nº flores',1,0,NULL,NULL,NULL,NULL),(660,NULL,'Diámetro de la flor',1,0,NULL,NULL,NULL,NULL),(661,NULL,'Minimum bloemschedelengte',1,0,NULL,NULL,NULL,NULL),(662,NULL,'Aantal bloemkoppen per tr',1,0,NULL,NULL,NULL,NULL),(663,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,NULL,NULL),(664,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,NULL,NULL),(665,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,NULL,NULL),(666,NULL,'Longitud inflorescencia',1,0,NULL,NULL,NULL,NULL),(667,NULL,'Verpakkingswijze snijbloe',1,0,NULL,NULL,NULL,NULL),(668,NULL,'Minimum aant bloemen per ',1,0,NULL,NULL,NULL,NULL),(669,NULL,'Longitud',1,0,NULL,NULL,NULL,'size'),(670,NULL,'Jaartal sortering hout',1,0,NULL,NULL,NULL,NULL),(671,NULL,'Diámetro de la hoja',1,0,NULL,NULL,NULL,NULL),(672,NULL,'Peso paquete',1,0,NULL,NULL,NULL,NULL),(673,NULL,'Maximum planthoogte',1,0,NULL,NULL,NULL,NULL),(674,NULL,'Maximum plantdiameter',1,0,NULL,NULL,NULL,NULL),(675,NULL,'Max aantal bloemen/bloeiw',1,0,NULL,NULL,NULL,NULL),(676,NULL,'Maximum aantal takken per',1,0,NULL,NULL,NULL,NULL),(677,NULL,'Maximum aantal bollen per',1,0,NULL,NULL,NULL,NULL),(678,NULL,'Maximum stamhoogte',1,0,NULL,NULL,NULL,NULL),(679,NULL,'Longitud mínima',1,0,NULL,NULL,NULL,'size'),(680,NULL,'Maximum aantal knoppen sn',1,0,NULL,NULL,NULL,NULL),(681,NULL,'Maximum bloemdiameter',1,0,NULL,NULL,NULL,NULL),(682,NULL,'Maximum bloeiwijzelengte',1,0,NULL,NULL,NULL,NULL),(683,NULL,'Aantal vruchten / trossen',1,0,NULL,NULL,NULL,NULL),(684,NULL,'Verpakkingswijze',1,0,NULL,NULL,NULL,NULL),(685,NULL,'Minimum vruchtdiameter',1,0,NULL,NULL,NULL,NULL),(686,NULL,'Medida',1,1,NULL,'cm',NULL,'size'),(687,NULL,'Bloem/bes/vruchtkleur 1',1,0,NULL,NULL,NULL,NULL),(688,NULL,'Potvorm',1,0,NULL,NULL,NULL,NULL),(689,NULL,'Potkleur',1,0,NULL,NULL,NULL,NULL),(690,NULL,'Material maceta',1,0,NULL,NULL,NULL,NULL),(691,NULL,'Plantvorm',1,0,NULL,NULL,NULL,NULL),(692,NULL,'Aantal kleuren/cultiv per',1,0,NULL,NULL,NULL,NULL),(693,NULL,'Teeltwijze',1,0,NULL,NULL,NULL,NULL),(694,NULL,'Teeltmedium',1,0,NULL,NULL,NULL,NULL),(695,NULL,'Cubierta',1,0,NULL,NULL,NULL,NULL),(696,NULL,'Hoesvorm',1,0,NULL,NULL,NULL,NULL),(697,NULL,'Hoesbedrukking algemeen',1,0,NULL,NULL,NULL,NULL),(698,NULL,'Extra toevoegingen',1,0,NULL,NULL,NULL,NULL),(699,NULL,'Land van herkomst (bedrij',1,0,NULL,NULL,NULL,NULL),(700,NULL,'Verpakte orchidee',1,0,NULL,NULL,NULL,NULL),(701,NULL,'Hoesbedrukking extra',1,0,NULL,NULL,NULL,NULL),(702,NULL,'Voorbehandeling',1,0,NULL,NULL,NULL,NULL),(703,NULL,'Overige niet in pot',1,0,NULL,NULL,NULL,NULL),(704,NULL,'Forma de la flor',1,0,NULL,NULL,NULL,NULL),(705,NULL,'Flexibilidad',1,0,NULL,NULL,NULL,NULL),(706,NULL,'Hoeskleur',1,0,NULL,NULL,NULL,NULL),(707,NULL,'Extra deco',1,0,NULL,NULL,NULL,NULL),(710,NULL,'Altura',1,0,NULL,'cm',NULL,'size'),(711,NULL,'Diametro',1,0,NULL,NULL,NULL,NULL),(712,NULL,'Barcode',1,0,NULL,NULL,NULL,NULL),(713,NULL,'Productlabel',1,0,NULL,NULL,NULL,NULL),(714,NULL,'Eetbaar/ niet eetbaar',1,0,NULL,NULL,NULL,NULL),(715,NULL,'Plantmaat zonder pot',1,0,NULL,NULL,NULL,NULL),(716,NULL,'Aantal kleuren/cultiv per',1,0,NULL,NULL,NULL,NULL),(717,NULL,'Maximum percentage oud ho',1,0,NULL,NULL,NULL,NULL),(718,NULL,'Maximum lengte verschil',1,0,NULL,NULL,NULL,NULL),(719,NULL,'Bladkleur',1,0,NULL,NULL,NULL,NULL),(720,NULL,'Plantgewicht',1,0,NULL,NULL,NULL,NULL),(721,NULL,'Diámetro',1,0,NULL,NULL,NULL,NULL),(722,NULL,'Bloem/bes/vruchtkleur 2',1,0,NULL,NULL,NULL,NULL),(723,NULL,'Winterhardheid (USDA zone',1,0,NULL,NULL,NULL,NULL),(724,NULL,'Kleurbehandeld',1,0,NULL,NULL,NULL,'inkFk'),(725,NULL,'Bloem-/bladkleurverdeling',1,0,NULL,NULL,NULL,NULL),(726,NULL,'Diámetro del capullo',1,0,NULL,NULL,NULL,NULL),(727,NULL,'Volume inhoud',1,0,NULL,NULL,NULL,NULL),(728,NULL,'Vruchtbenaming',1,0,NULL,NULL,NULL,NULL),(729,NULL,'Vaaslevenindex',1,0,NULL,NULL,NULL,NULL),(730,NULL,'Overige informatie plante',1,0,NULL,NULL,NULL,NULL),(731,NULL,'Overige informatie snijbl',1,0,NULL,NULL,NULL,NULL),(732,NULL,'Toepassingsmogelijkheid',1,0,NULL,NULL,NULL,NULL),(733,NULL,'Productbeeld aanvoerder',1,0,NULL,NULL,NULL,NULL),(734,NULL,'MPS certificering',1,0,NULL,NULL,NULL,NULL),(735,NULL,'Kwaliteitsgroep',1,0,NULL,NULL,NULL,NULL),(736,NULL,'Artikelomschrijving',1,0,NULL,NULL,NULL,NULL),(737,NULL,'BTW-tarief',1,0,NULL,NULL,NULL,NULL),(738,NULL,'Prijseenheid',1,0,NULL,NULL,NULL,NULL),(739,NULL,'Transactievorm',1,0,NULL,NULL,NULL,NULL),(740,NULL,'Handelsverpakking voorwaa',1,0,NULL,NULL,NULL,NULL),(741,NULL,'Consumentenverpakking voo',1,0,NULL,NULL,NULL,NULL),(742,NULL,'Leveringsvoorwaarden',1,0,NULL,NULL,NULL,NULL),(743,NULL,'PT heffing voorwaarden',1,0,NULL,NULL,NULL,NULL),(744,NULL,'Serviceheffing voorwaarde',1,0,NULL,NULL,NULL,NULL),(745,NULL,'Algemene voorwaarden',1,0,NULL,NULL,NULL,NULL),(746,NULL,'Marktvorm',1,0,NULL,NULL,NULL,NULL),(747,NULL,'Themadagen',1,0,NULL,NULL,NULL,NULL),(748,NULL,'Handelscategorie',1,0,NULL,NULL,NULL,NULL),(749,NULL,'Producentengroepen',1,0,NULL,NULL,NULL,NULL),(750,NULL,'Favorieten Id',1,0,NULL,NULL,NULL,NULL),(751,NULL,'Verkoopeenheid',1,0,NULL,NULL,NULL,NULL),(752,NULL,'Veilgroep voorkeur',1,0,NULL,NULL,NULL,NULL),(753,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(754,NULL,'Keurmeesternummer FloraHo',1,0,NULL,NULL,NULL,NULL),(755,NULL,'Rijnummer Rijnsburg',1,0,NULL,NULL,NULL,NULL),(756,NULL,'Verwerkingslocatie FloraH',1,0,NULL,NULL,NULL,NULL),(757,NULL,'FloraHolland Financial',1,0,NULL,NULL,NULL,NULL),(758,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(759,NULL,'Benefiet veiling',1,0,NULL,NULL,NULL,NULL),(760,NULL,'Kloksoort',1,0,NULL,NULL,NULL,NULL),(761,NULL,'Minimumprijs aanvoerder',1,0,NULL,NULL,NULL,NULL),(762,NULL,'Rest aantallen',1,0,NULL,NULL,NULL,NULL),(763,NULL,'Veilsoort',1,0,NULL,NULL,NULL,NULL),(764,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(765,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(766,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(767,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(768,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(769,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(770,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,NULL,NULL),(771,NULL,'Gereserveerd',1,0,NULL,NULL,NULL,NULL),(772,NULL,'Veilgroep Aalsmeer',1,0,NULL,NULL,NULL,NULL),(773,NULL,'Promotie kenmerk FloraHol',1,0,NULL,NULL,NULL,NULL),(774,NULL,'Verrekening snijbloemenvo',1,0,NULL,NULL,NULL,NULL),(775,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(776,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(777,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(778,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(779,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(780,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(781,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(782,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(783,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(784,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(785,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(786,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(787,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(788,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(789,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(790,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,NULL,NULL),(791,NULL,'Gereserveerd',1,0,NULL,NULL,NULL,NULL),(792,NULL,'Tussenopslag klok Plantio',1,0,NULL,NULL,NULL,NULL),(793,NULL,'Soort ladingsdrager Plant',1,0,NULL,NULL,NULL,NULL),(794,NULL,'Logistiek middel Plantion',1,0,NULL,NULL,NULL,NULL),(795,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(796,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(797,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(798,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(799,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(800,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(801,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(802,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(803,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(804,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(805,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(806,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(807,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(808,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(809,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(810,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(811,NULL,'Gereserveerd',1,0,NULL,NULL,NULL,NULL),(812,NULL,'Veilgroep Plantion Ede',1,0,NULL,NULL,NULL,NULL),(813,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(814,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(815,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(816,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(817,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(818,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(819,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(820,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(821,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(822,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(823,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(824,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(825,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(826,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,NULL,NULL),(827,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,NULL,NULL),(828,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,NULL,NULL),(829,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,NULL,NULL),(830,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,NULL,NULL),(831,NULL,'Toegevoegde waardes VRM',1,0,NULL,NULL,NULL,NULL),(832,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(833,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(834,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(835,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(836,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(837,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(838,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(839,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(840,NULL,'Gereserveerd VRM',1,0,NULL,NULL,NULL,NULL),(841,NULL,'Veiling',1,0,NULL,NULL,NULL,NULL),(842,NULL,'kopersaantallen',1,0,NULL,NULL,NULL,NULL),(843,NULL,'Caducidad',1,0,NULL,NULL,NULL,NULL),(844,NULL,'Lote',1,0,NULL,NULL,NULL,NULL),(845,NULL,'Uds palet',1,0,NULL,NULL,NULL,NULL),(4548,NULL,'fout kenmerk',1,0,NULL,NULL,'081',NULL),(4549,NULL,'Potinhoud',1,0,NULL,NULL,'A01',NULL),(4550,NULL,'Marketingconcept',1,0,NULL,NULL,'A02',NULL),(4551,NULL,'Leeftijd',1,0,NULL,NULL,'A03',NULL),(4552,NULL,'Uitgangsmateriaal',1,0,NULL,NULL,'A04',NULL),(4553,NULL,'Kleurbehandeld',1,0,NULL,NULL,'A05',NULL),(4554,NULL,'Verzorging: Standplaats',1,0,NULL,NULL,'A06',NULL),(4555,NULL,'Verzorging: Water',1,0,NULL,NULL,'A07',NULL),(4556,NULL,'Verzorging: Voeding',1,0,NULL,NULL,'A08',NULL),(4557,NULL,'Verzorging: Temperatuur',1,0,NULL,NULL,'A09',NULL),(4558,NULL,'Verzorging: Specifieke in',1,0,NULL,NULL,'A10',NULL),(4559,NULL,'Verzorging: Consumptie',1,0,NULL,NULL,'A11',NULL),(4560,NULL,'Nabehandeling',1,0,NULL,NULL,'A13',NULL),(4561,NULL,'Artikel beeld',1,0,NULL,NULL,'A23',NULL),(4562,NULL,'Hoofdkleur 1',1,0,NULL,NULL,'B01',NULL),(4563,NULL,'Hoofdkleur 2',1,0,NULL,NULL,'B02',NULL),(4564,NULL,'RHS hoofdkleur 1',1,0,NULL,NULL,'B03',NULL),(4565,NULL,'RHS hoofdkleur 2',1,0,NULL,NULL,'B04',NULL),(4566,NULL,'Hoofdkleur 1 blad',1,0,NULL,NULL,'B05',NULL),(4567,NULL,'Hoofdkleur 2 blad',1,0,NULL,NULL,'B06',NULL),(4568,NULL,'RHS hoofdkleur 1 blad',1,0,NULL,NULL,'B07',NULL),(4569,NULL,'RHS hoofdkleur 2 blad',1,0,NULL,NULL,'B08',NULL),(4570,NULL,'Botanisch beeld',1,0,NULL,NULL,'B09',NULL),(4571,NULL,'Hoofdkleur bes/vrucht',1,0,NULL,NULL,'B10',NULL),(4572,NULL,'RHS hoofdkleur bes/vrucht',1,0,NULL,NULL,'B11',NULL),(4573,NULL,'UPOV hoofdkleur 1 bloem',1,0,NULL,NULL,'B12',NULL),(4574,NULL,'UPOV hoofdkleur 2 bloem',1,0,NULL,NULL,'B13',NULL),(4575,NULL,'UPOV hoofdkleur 1 blad',1,0,NULL,NULL,'B14',NULL),(4576,NULL,'UPOV hoofdkleur 2 blad',1,0,NULL,NULL,'B15',NULL),(4577,NULL,'UPOV hoofdkleur bes/vruch',1,0,NULL,NULL,'B16',NULL),(4578,NULL,'Negatieve keurcode 1',1,0,NULL,NULL,'K01',NULL),(4579,NULL,'Negatieve keurcode 2',1,0,NULL,NULL,'K02',NULL),(4580,NULL,'Bedrijfskenmerk fytosanit',1,0,NULL,NULL,'K03',NULL),(4581,NULL,'Certificaten aardwarmte',1,0,NULL,NULL,'K04',NULL),(4582,NULL,'Certificaten MPS-TraceCer',1,0,NULL,NULL,'K05',NULL),(4583,NULL,'Overige leveranciersinfor',1,0,NULL,NULL,'K07',NULL),(4584,NULL,'Certificaten MPS-GAP',1,0,NULL,NULL,'K08',NULL),(4585,NULL,'Betrouwbaarheidsindex kla',1,0,NULL,NULL,'K11',NULL),(4586,NULL,'Betrouwbaarheidsindex waa',1,0,NULL,NULL,'K12',NULL),(4587,NULL,'Productkwaliteitslabel',1,0,NULL,NULL,'K13',NULL),(4588,NULL,'Label Fair Flowers Fair P',1,0,NULL,NULL,'K14',NULL),(4589,NULL,'Certificaten Socialy Qual',1,0,NULL,NULL,'K15',NULL),(4590,NULL,'Certificaten GlobalGAP',1,0,NULL,NULL,'K16',NULL),(4591,NULL,'Certificaten MPS Quality',1,0,NULL,NULL,'K17',NULL),(4592,NULL,'Certificaten biologisch',1,0,NULL,NULL,'K18',NULL),(4593,NULL,'Certificaten eetbare prod',1,0,NULL,NULL,'K19',NULL),(4594,NULL,'Certificaten Florimark',1,0,NULL,NULL,'K20',NULL),(4595,NULL,'Certificaten Milieukeur',1,0,NULL,NULL,'K21',NULL),(4596,NULL,'Certificaten Kenya Flower',1,0,NULL,NULL,'K22',NULL),(4597,NULL,'Certificaten Fairtrade',1,0,NULL,NULL,'K23',NULL),(4598,NULL,'Keurmerk MPS-ProductProof',1,0,NULL,NULL,'K24',NULL),(4599,NULL,'Certificaten ISO',1,0,NULL,NULL,'K25',NULL),(4600,NULL,'Certificaten aardwarmte',1,0,NULL,NULL,'K26',NULL),(4601,NULL,'Certificaten Florverde',1,0,NULL,NULL,'K27',NULL),(4602,NULL,'Certificaten Ethical Trad',1,0,NULL,NULL,'K28',NULL),(4603,NULL,'Certificaten Ethiopian EH',1,0,NULL,NULL,'K29',NULL),(4604,NULL,'Certificaten gewasbescher',1,0,NULL,NULL,'K30',NULL),(4605,NULL,'Certificaten SAN',1,0,NULL,NULL,'K31',NULL),(4606,NULL,'Certificaten GRASP',1,0,NULL,NULL,'K32',NULL),(4607,NULL,'Label Fair Flora',1,0,NULL,NULL,'K33',NULL),(4608,NULL,'GLobalG.A.P. Chain of Cus',1,0,NULL,NULL,'K34',NULL),(4609,NULL,'Certificaten Vegaplan',1,0,NULL,NULL,'K35',NULL),(4610,NULL,'Floriculture Sustainabili',1,0,NULL,NULL,'K99',NULL),(4611,NULL,'Fust',1,0,NULL,NULL,'L01',NULL),(4612,NULL,'Stapelwagen',1,0,NULL,NULL,'L02',NULL),(4613,NULL,'Aantal legborden veilings',1,0,NULL,NULL,'L03',NULL),(4614,NULL,'Aantal legborden Deense s',1,0,NULL,NULL,'L04',NULL),(4615,NULL,'Aantal onderstellen Deens',1,0,NULL,NULL,'L05',NULL),(4616,NULL,'Fustsoort',1,0,NULL,NULL,'L06',NULL),(4617,NULL,'Fustmateriaal',1,0,NULL,NULL,'L07',NULL),(4618,NULL,'Aantal legborden Eurostap',1,0,NULL,NULL,'L08',NULL),(4619,NULL,'Aantal onderstellen Euros',1,0,NULL,NULL,'L09',NULL),(4620,NULL,'Aantal stelen per bos',1,0,NULL,NULL,'L11',NULL),(4621,NULL,'Aantal bossen per bundel',1,0,NULL,NULL,'L12',NULL),(4622,NULL,'Aantal stuks per fust',1,0,NULL,NULL,'L13',NULL),(4623,NULL,'Aantal bossen per fust',1,0,NULL,NULL,'L14',NULL),(4624,NULL,'Aantal bundels per fust',1,0,NULL,NULL,'L15',NULL),(4625,NULL,'Aantal bossen per hoes',1,0,NULL,NULL,'L16',NULL),(4626,NULL,'Aantal bundels per hoes',1,0,NULL,NULL,'L17',NULL),(4627,NULL,'Fustlabel',1,0,NULL,NULL,'L18',NULL),(4628,NULL,'Karlabel',1,0,NULL,NULL,'L19',NULL),(4629,NULL,'Service productlabel',1,0,NULL,NULL,'L20',NULL),(4630,NULL,'Service fustlabel',1,0,NULL,NULL,'L21',NULL),(4631,NULL,'Service karlabel',1,0,NULL,NULL,'L22',NULL),(4632,NULL,'Aantal fusten per laag',1,0,NULL,NULL,'L23',NULL),(4633,NULL,'Presentatie per schapm2',1,0,NULL,NULL,'L24',NULL),(4634,NULL,'Positieve keurcode fytosa',1,0,NULL,NULL,'P01',NULL),(4635,NULL,'Positieve keurcode kwalit',1,0,NULL,NULL,'P02',NULL),(4636,NULL,'Positieve keurcode veilin',1,0,NULL,NULL,'P03',NULL),(4637,NULL,'Maceta',1,0,NULL,NULL,'S01',NULL),(4638,NULL,'Altura mínima',1,1,NULL,'cm','S02','size'),(4639,NULL,'nº plantas',1,0,NULL,NULL,'S03',NULL),(4640,NULL,'Minimum plantdiameter',1,0,NULL,NULL,'S04',NULL),(4641,NULL,'Madurez',1,0,NULL,NULL,'S05',NULL),(4642,NULL,'Combinatiehoogte',1,0,NULL,NULL,'S06',NULL),(4643,NULL,'Min aantal koppen hoogste',1,0,NULL,NULL,'S07',NULL),(4644,NULL,'Dikte',1,0,NULL,NULL,'S08',NULL),(4645,NULL,'Min aantal bloemen/bloeiw',1,0,NULL,NULL,'S09',NULL),(4646,NULL,'Min aantal bloemtrossen p',1,0,NULL,NULL,'S10',NULL),(4647,NULL,'Minimum aantal takken per',1,0,NULL,NULL,'S11',NULL),(4648,NULL,'Minimum aantal bollen per',1,0,NULL,NULL,'S12',NULL),(4649,NULL,'Minimum aantal bladeren p',1,0,NULL,NULL,'S13',NULL),(4650,NULL,'Altura tronco',1,1,NULL,'cm','S14','size'),(4651,NULL,'Altura transporte',1,0,NULL,'cm','S15','size'),(4652,NULL,'Lengte scheuten',1,0,NULL,NULL,'S16',NULL),(4653,NULL,'Min aant vertakkingen pr ',1,0,NULL,NULL,'S17',NULL),(4654,NULL,'Minimum bloemknophoogte',1,0,NULL,NULL,'S19',NULL),(4655,NULL,'Altura',1,1,NULL,'cm','S20','size'),(4656,NULL,'Gewicht (gemiddeld)',1,0,NULL,NULL,'S21',NULL),(4657,NULL,'Aantal bloemknoppen snijb',1,0,NULL,NULL,'S22',NULL),(4658,NULL,'Minimum bloemdiameter',1,0,NULL,NULL,'S23',NULL),(4659,NULL,'Minimum bloemschedelengte',1,0,NULL,NULL,'S24',NULL),(4660,NULL,'Aantal bloemkoppen per tr',1,0,NULL,NULL,'S25',NULL),(4661,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,'S26',NULL),(4662,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,'S27',NULL),(4663,NULL,'Aant.kleuren/cultiv/vorme',1,0,NULL,NULL,'S28',NULL),(4664,NULL,'Minimum bloeiwijzelengte',1,0,NULL,NULL,'S29',NULL),(4665,NULL,'Verpakkingswijze snijbloe',1,0,NULL,NULL,'S30',NULL),(4666,NULL,'Minimum aant bloemen per ',1,0,NULL,NULL,'S31',NULL),(4667,NULL,'Medida',1,0,NULL,'cm','S32',NULL),(4668,NULL,'Jaartal sortering hout',1,0,NULL,NULL,'S33',NULL),(4669,NULL,'Minimum bladdiameter',1,0,NULL,NULL,'S34',NULL),(4670,NULL,'Minimum bundelgewicht',1,0,NULL,NULL,'S35',NULL),(4671,NULL,'Altura máxima',1,0,NULL,NULL,'S36',NULL),(4672,NULL,'Maximum plantdiameter',1,0,NULL,NULL,'S37',NULL),(4673,NULL,'Max aantal bloemen/bloeiw',1,0,NULL,NULL,'S38',NULL),(4674,NULL,'Maximum aantal takken per',1,0,NULL,NULL,'S39',NULL),(4675,NULL,'Maximum aantal bollen per',1,0,NULL,NULL,'S40',NULL),(4676,NULL,'Altura máxima',1,0,NULL,NULL,'S41',NULL),(4677,NULL,'Maximum steellengte',1,0,NULL,NULL,'S42',NULL),(4678,NULL,'Maximum aantal knoppen sn',1,0,NULL,NULL,'S43',NULL),(4679,NULL,'Maximum bloemdiameter',1,0,NULL,NULL,'S44',NULL),(4680,NULL,'Maximum bloeiwijzelengte',1,0,NULL,NULL,'S45',NULL),(4681,NULL,'Aantal vruchten / trossen',1,0,NULL,NULL,'S46',NULL),(4682,NULL,'Verpakkingswijze',1,0,NULL,NULL,'S47',NULL),(4683,NULL,'Minimum vruchtdiameter',1,0,NULL,NULL,'S48',NULL),(4684,NULL,'Medida',1,1,NULL,'cm','S49','size'),(4685,NULL,'Bloem/bes/vruchtkleur 1',1,0,NULL,NULL,'S50',NULL),(4686,NULL,'Potvorm',1,0,NULL,NULL,'S51',NULL),(4687,NULL,'Potkleur',1,0,NULL,NULL,'S52',NULL),(4688,NULL,'Potmateriaal',1,0,NULL,NULL,'S53',NULL),(4689,NULL,'Plantvorm',1,0,NULL,NULL,'S54',NULL),(4690,NULL,'Aantal kleuren/cultiv per',1,0,NULL,NULL,'S55',NULL),(4691,NULL,'Teeltwijze',1,0,NULL,NULL,'S56',NULL),(4692,NULL,'Teeltmedium',1,0,NULL,NULL,'S57',NULL),(4693,NULL,'Hoesmateriaal',1,0,NULL,NULL,'S58',NULL),(4694,NULL,'Hoesvorm',1,0,NULL,NULL,'S59',NULL),(4695,NULL,'Hoesbedrukking algemeen',1,0,NULL,NULL,'S60',NULL),(4696,NULL,'Extra toevoegingen',1,0,NULL,NULL,'S61',NULL),(4697,NULL,'Land van herkomst (bedrij',1,0,NULL,NULL,'S62',NULL),(4698,NULL,'Verpakte orchidee',1,0,NULL,NULL,'S63',NULL),(4699,NULL,'Hoesbedrukking extra',1,0,NULL,NULL,'S64',NULL),(4700,NULL,'Voorbehandeling',1,0,NULL,NULL,'S65',NULL),(4701,NULL,'Overige niet in pot',1,0,NULL,NULL,'S66',NULL),(4702,NULL,'Vorm snijbloemen',1,0,NULL,NULL,'S67',NULL),(4703,NULL,'Buigzaamheid bloemsteel',1,0,NULL,NULL,'S68',NULL),(4704,NULL,'Hoeskleur',1,0,NULL,NULL,'S69',NULL),(4705,NULL,'Extra deco materiaal',1,0,NULL,NULL,'S70',NULL),(4706,NULL,'Productkleur',1,0,NULL,NULL,'S71',NULL),(4707,NULL,'Productmateriaal',1,0,NULL,NULL,'S72',NULL),(4708,NULL,'Altura',1,1,NULL,'cm','S73','size'),(4709,NULL,'Materiaaldiameter',1,0,NULL,NULL,'S74',NULL),(4710,NULL,'Barcode',1,0,NULL,NULL,'S75',NULL),(4711,NULL,'Productlabel',1,0,NULL,NULL,'S76',NULL),(4712,NULL,'Eetbaar/ niet eetbaar',1,0,NULL,NULL,'S77',NULL),(4713,NULL,'Plantmaat zonder pot',1,0,NULL,NULL,'S78',NULL),(4714,NULL,'Aantal kleuren/cultiv per',1,0,NULL,NULL,'S79',NULL),(4715,NULL,'Maximum percentage oud ho',1,0,NULL,NULL,'S80',NULL),(4716,NULL,'Maximum lengte verschil',1,0,NULL,NULL,'S81',NULL),(4717,NULL,'Bladkleur',1,0,NULL,NULL,'S82',NULL),(4718,NULL,'Plantgewicht',1,0,NULL,NULL,'S83',NULL),(4719,NULL,'Gemiddelde bloemdiameter',1,0,NULL,NULL,'S84',NULL),(4720,NULL,'Bloem/bes/vruchtkleur 2',1,0,NULL,NULL,'S85',NULL),(4721,NULL,'Winterhardheid (USDA zone',1,0,NULL,NULL,'S86',NULL),(4722,NULL,'Kleurbehandeld',1,0,NULL,NULL,'S87',NULL),(4723,NULL,'Bloem-/bladkleurverdeling',1,0,NULL,NULL,'S88',NULL),(4724,NULL,'Minimum bloemknopdiameter',1,0,NULL,NULL,'S89',NULL),(4725,NULL,'Volume inhoud',1,0,NULL,NULL,'S90',NULL),(4726,NULL,'Vruchtbenaming',1,0,NULL,NULL,'S91',NULL),(4727,NULL,'Vaaslevenindex',1,0,NULL,NULL,'S92',NULL),(4728,NULL,'Overige informatie plante',1,0,NULL,NULL,'S93',NULL),(4729,NULL,'Overige informatie snijbl',1,0,NULL,NULL,'S94',NULL),(4730,NULL,'Toepassingsmogelijkheid',1,0,NULL,NULL,'S95',NULL),(4731,NULL,'Productbeeld aanvoerder',1,0,NULL,NULL,'S96',NULL),(4732,NULL,'MPS certificering',1,0,NULL,NULL,'S97',NULL),(4733,NULL,'Kwaliteitsgroep',1,0,NULL,NULL,'S98',NULL),(4734,NULL,'Artikelomschrijving',1,0,NULL,NULL,'S99',NULL),(4735,NULL,'BTW-tarief',1,0,NULL,NULL,'T01',NULL),(4736,NULL,'Prijseenheid',1,0,NULL,NULL,'T02',NULL),(4737,NULL,'Transactievorm',1,0,NULL,NULL,'T03',NULL),(4738,NULL,'Handelsverpakking voorwaa',1,0,NULL,NULL,'T10',NULL),(4739,NULL,'Consumentenverpakking voo',1,0,NULL,NULL,'T11',NULL),(4740,NULL,'Leveringsvoorwaarden',1,0,NULL,NULL,'T12',NULL),(4741,NULL,'PT heffing voorwaarden',1,0,NULL,NULL,'T13',NULL),(4742,NULL,'Serviceheffing voorwaarde',1,0,NULL,NULL,'T14',NULL),(4743,NULL,'Algemene voorwaarden',1,0,NULL,NULL,'T15',NULL),(4744,NULL,'Marktvorm',1,0,NULL,NULL,'T16',NULL),(4745,NULL,'Themadagen',1,0,NULL,NULL,'T17',NULL),(4746,NULL,'Handelscategorie',1,0,NULL,NULL,'T18',NULL),(4747,NULL,'Producentengroepen',1,0,NULL,NULL,'T19',NULL),(4748,NULL,'Favorieten Id',1,0,NULL,NULL,'T20',NULL),(4749,NULL,'Verkoopeenheid',1,0,NULL,NULL,'T21',NULL),(4750,NULL,'Veilgroep voorkeur',1,0,NULL,NULL,'V01',NULL),(4751,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V02',NULL),(4752,NULL,'Keurmeesternummer FloraHo',1,0,NULL,NULL,'V03',NULL),(4753,NULL,'Rijnummer Rijnsburg',1,0,NULL,NULL,'V04',NULL),(4754,NULL,'Verwerkingslocatie FloraH',1,0,NULL,NULL,'V05',NULL),(4755,NULL,'FloraHolland Financial',1,0,NULL,NULL,'V06',NULL),(4756,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V07',NULL),(4757,NULL,'Benefiet veiling',1,0,NULL,NULL,'V08',NULL),(4758,NULL,'Kloksoort',1,0,NULL,NULL,'V09',NULL),(4759,NULL,'Minimumprijs aanvoerder',1,0,NULL,NULL,'V10',NULL),(4760,NULL,'Rest aantallen',1,0,NULL,NULL,'V11',NULL),(4761,NULL,'Veilsoort',1,0,NULL,NULL,'V12',NULL),(4762,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V13',NULL),(4763,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V14',NULL),(4764,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V15',NULL),(4765,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V16',NULL),(4766,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V17',NULL),(4767,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V18',NULL),(4768,NULL,'Gereserveerd FloraHolland',1,0,NULL,NULL,'V19',NULL),(4769,NULL,'Gereserveerd',1,0,NULL,NULL,'V20',NULL),(4770,NULL,'Veilgroep Aalsmeer',1,0,NULL,NULL,'V21',NULL),(4771,NULL,'Promotie kenmerk FloraHol',1,0,NULL,NULL,'V22',NULL),(4772,NULL,'Verrekening snijbloemenvo',1,0,NULL,NULL,'V23',NULL),(4773,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V24',NULL),(4774,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V25',NULL),(4775,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V26',NULL),(4776,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V27',NULL),(4777,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V28',NULL),(4778,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V29',NULL),(4779,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V30',NULL),(4780,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V31',NULL),(4781,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V32',NULL),(4782,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V33',NULL),(4783,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V34',NULL),(4784,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V35',NULL),(4785,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V36',NULL),(4786,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V37',NULL),(4787,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V38',NULL),(4788,NULL,'Gereserveerd Aalsmeer',1,0,NULL,NULL,'V39',NULL),(4789,NULL,'Gereserveerd',1,0,NULL,NULL,'V40',NULL),(4790,NULL,'Tussenopslag klok Plantio',1,0,NULL,NULL,'V41',NULL),(4791,NULL,'Soort ladingsdrager Plant',1,0,NULL,NULL,'V42',NULL),(4792,NULL,'Logistiek middel Plantion',1,0,NULL,NULL,'V43',NULL),(4793,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V44',NULL),(4794,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V45',NULL),(4795,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V46',NULL),(4796,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V47',NULL),(4797,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V48',NULL),(4798,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V49',NULL),(4799,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V50',NULL),(4800,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V51',NULL),(4801,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V52',NULL),(4802,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V53',NULL),(4803,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V54',NULL),(4804,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V55',NULL),(4805,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V56',NULL),(4806,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V57',NULL),(4807,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V58',NULL),(4808,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V59',NULL),(4809,NULL,'Gereserveerd',1,0,NULL,NULL,'V60',NULL),(4810,NULL,'Veilgroep Plantion Ede',1,0,NULL,NULL,'V61',NULL),(4811,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V62',NULL),(4812,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V63',NULL),(4813,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V64',NULL),(4814,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V65',NULL),(4815,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V66',NULL),(4816,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V67',NULL),(4817,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V68',NULL),(4818,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V69',NULL),(4819,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V70',NULL),(4820,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V71',NULL),(4821,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V72',NULL),(4822,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V73',NULL),(4823,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V74',NULL),(4824,NULL,'Gereserveerd Plantion Ede',1,0,NULL,NULL,'V75',NULL),(4825,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,'V76',NULL),(4826,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,'V77',NULL),(4827,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,'V78',NULL),(4828,NULL,'Gereserveerd Holambra',1,0,NULL,NULL,'V79',NULL),(4829,NULL,'Toegevoegde waardes VRM',1,0,NULL,NULL,'V80',NULL),(4830,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V81',NULL),(4831,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V82',NULL),(4832,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V83',NULL),(4833,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V84',NULL),(4834,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V85',NULL),(4835,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V86',NULL),(4836,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V87',NULL),(4837,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V88',NULL),(4838,NULL,'Gereserveerd VRM',1,0,NULL,NULL,'V89',NULL),(4839,NULL,'Veiling',1,0,NULL,NULL,'V99',NULL),(4840,NULL,'kopersaantallen',1,0,NULL,NULL,'Z01',NULL),(6514,NULL,'Transporte',1,0,NULL,NULL,NULL,NULL);
/*!40000 ALTER TABLE `tag` ENABLE KEYS */;
UNLOCK TABLES;
@@ -380,7 +380,7 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2020-12-17 8:49:57
+-- Dump completed on 2021-01-05 9:40:31
USE `cache`;
-- MySQL dump 10.13 Distrib 5.7.28, for osx10.15 (x86_64)
--
@@ -418,7 +418,7 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2020-12-17 8:49:57
+-- Dump completed on 2021-01-05 9:40:32
USE `hedera`;
-- MySQL dump 10.13 Distrib 5.7.28, for osx10.15 (x86_64)
--
@@ -447,25 +447,6 @@ INSERT INTO `imageCollection` VALUES (1,'catalog','Artículo',3840,2160,'Item','
/*!40000 ALTER TABLE `imageCollection` ENABLE KEYS */;
UNLOCK TABLES;
---
--- Dumping data for table `imageCollectionSize`
---
-LOCK TABLES `imageCollectionSize` WRITE;
-/*!40000 ALTER TABLE `imageCollectionSize` DISABLE KEYS */;
-INSERT INTO `imageCollectionSize` (`id`, `collectionFk`, `width`, `height`, `crop`)
- VALUES
- (2, 1, 50, 50, 1),
- (3, 1, 200, 200, 1),
- (5, 5, 200, 200, 1),
- (6, 1, 70, 70, 1),
- (8, 5, 50, 50, 1),
- (9, 1, 1600, 900, 0),
- (13, 6, 160, 160, 1),
- (14, 6, 520, 520, 1),
- (15, 6, 1600, 1600, 1);
-/*!40000 ALTER TABLE `imageCollectionSize` ENABLE KEYS */;
-UNLOCK TABLES;
-
--
-- Dumping data for table `tpvError`
--
@@ -505,7 +486,7 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2020-12-17 8:50:02
+-- Dump completed on 2021-01-05 9:40:34
USE `postgresql`;
-- MySQL dump 10.13 Distrib 5.7.28, for osx10.15 (x86_64)
--
@@ -580,7 +561,7 @@ UNLOCK TABLES;
LOCK TABLES `workcenter` WRITE;
/*!40000 ALTER TABLE `workcenter` DISABLE KEYS */;
-INSERT INTO `workcenter` VALUES (1,'Silla',20,1091,1,'Av espioca 100',552703),(2,'Mercaflor',19,NULL,NULL,NULL,NULL),(3,'Marjales',26,20008,NULL,NULL,NULL),(4,'VNH',NULL,NULL,3,NULL,NULL),(5,'Madrid',28,2858,5,'Av constitución 3',554145),(6,'Vilassar',88,88031,2,'Cami del Crist, 33',556412),(7,'Tenerife',NULL,NULL,10,NULL,NULL);
+INSERT INTO `workcenter` VALUES (1,'Silla',20,1092,1,'Av espioca 100',552703),(2,'Mercaflor',19,NULL,NULL,NULL,NULL),(3,'Marjales',26,20008,NULL,NULL,NULL),(4,'VNH',NULL,NULL,3,NULL,NULL),(5,'Madrid',28,2858,5,'Av constitución 3',554145),(6,'Vilassar',88,88031,2,'Cami del Crist, 33',556412),(7,'Tenerife',NULL,NULL,10,NULL,NULL);
/*!40000 ALTER TABLE `workcenter` ENABLE KEYS */;
UNLOCK TABLES;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -593,7 +574,7 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2020-12-17 8:50:04
+-- Dump completed on 2021-01-05 9:40:36
USE `sage`;
-- MySQL dump 10.13 Distrib 5.7.28, for osx10.15 (x86_64)
--
@@ -651,4 +632,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2020-12-17 8:50:05
+-- Dump completed on 2021-01-05 9:40:38
diff --git a/db/dump/structure.sql b/db/dump/structure.sql
index 590ab5e914..05eceb3705 100644
--- a/db/dump/structure.sql
+++ b/db/dump/structure.sql
@@ -9007,131 +9007,6 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `ektEntryAssign_setEntry__` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ektEntryAssign_setEntry__`()
-BEGIN
-
-DECLARE done INT DEFAULT FALSE;
-DECLARE vEntryFk INT;
-DECLARE vTravelFk INT;
-DECLARE vId INT;
-DECLARE vLanded DATE DEFAULT CURDATE();
-
-DECLARE cur1 CURSOR FOR SELECT id FROM edi.ektEntryAssign;
-
-DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
-
- IF HOUR(NOW()) > 12 THEN
-
- SET vLanded = TIMESTAMPADD(DAY,1,vLanded);
-
- END IF;
-
-OPEN cur1;
-
- read_loop: LOOP
-
- SET done = FALSE;
- SET vEntryFk = 0;
-
- FETCH cur1 INTO vId;
-
- IF done THEN
- LEAVE read_loop;
- END IF;
-
- SELECT IFNULL(e.id,0) INTO vEntryFk
- FROM vn.entry e
- JOIN vn.travel tr ON tr.id = e.travelFk
- JOIN edi.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk
- AND ea.warehouseInFk = tr.warehouseInFk
- AND ea.agencyModeFk = tr.agencyFk
- AND ea.supplierFk = e.supplierFk
- WHERE ea.id = vId
- AND tr.landed = vLanded
- LIMIT 1;
-
- IF NOT vEntryFk THEN
-
- SELECT IFNULL(e.id,0) INTO vEntryFk
- FROM vn.entry e
- JOIN vn.travel tr ON tr.id = e.travelFk
- JOIN edi.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk
- AND ea.warehouseInFk = tr.warehouseInFk
- AND ea.agencyModeFk = tr.agencyFk
- WHERE ea.id = vId
- AND tr.landed = vLanded
- AND ea.supplierFk IS NULL
- LIMIT 1;
-
- END IF;
-
- IF NOT vEntryFk THEN
-
- SET vTravelFk = 0;
-
- SELECT IFNULL(MAX(tr.id),0) INTO vTravelFk
- FROM vn.travel tr
- JOIN edi.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk
- AND ea.warehouseInFk = tr.warehouseInFk
- AND ea.agencyModeFk = tr.agencyFk
- WHERE ea.id = vId
- AND tr.landed = vLanded;
-
- IF NOT vTravelFk THEN
-
- INSERT INTO vn.travel(landed, shipped, warehouseInFk, warehouseOutFk, agencyFk)
- SELECT vLanded, vLanded, warehouseInFk, warehouseOutFk, agencyModeFk
- FROM edi.ektEntryAssign
- WHERE id = vId;
-
- SELECT MAX(tr.id) INTO vTravelFk
- FROM vn.travel tr
- JOIN edi.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk
- AND ea.warehouseInFk = tr.warehouseInFk
- AND ea.agencyModeFk = tr.agencyFk
- WHERE ea.id = vId
- AND tr.landed = vLanded;
-
- END IF;
-
- INSERT INTO vn.entry(travelFk, supplierFk, companyFk, currencyFk)
- SELECT vTravelFk, IFNULL(ea.supplierFk,s.id), c.id, cu.id
- FROM vn.supplier s
- JOIN vn.company c ON c.code = 'VNL'
- JOIN vn.currency cu ON cu.code = 'EUR'
- JOIN edi.ektEntryAssign ea ON ea.id = vId
- WHERE s.name = 'KONINKLIJE COOPERATIEVE BLOEMENVEILING FLORAHOLLAN';
-
- SELECT MAX(id) INTO vEntryFk
- FROM vn.entry
- WHERE travelFk = vTravelFk;
-
- END IF;
-
- UPDATE edi.ektEntryAssign
- SET entryFk = vEntryFk
- WHERE id = vId;
-
- END LOOP;
-
- CLOSE cur1;
-
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 DROP PROCEDURE IF EXISTS `ekt_load` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
@@ -9229,471 +9104,9 @@ BEGIN
AND IF(t.item, l.item = e.item, TRUE)
AND b.itemFk < 170000
ORDER BY l.now DESC, b.id ASC LIMIT 1;
-/*
- SELECT c.Id_Compra, c.Id_Article INTO vBuy, vItem
- FROM vn2008.buy_edi e
- JOIN item_track t ON t.item_id = e.ref
- LEFT JOIN vn2008.buy_edi l ON l.ref = e.ref
- LEFT JOIN vn2008.Compres c ON c.buy_edi_id = l.id
- JOIN vn2008.config cfg
- WHERE e.id = vSelf
- AND l.id != vSelf
- AND c.Id_Article != cfg.generic_item
- AND IF(t.s1, l.s1 = e.s1, TRUE)
- AND IF(t.s2, l.s2 = e.s2, TRUE)
- AND IF(t.s3, l.s3 = e.s3, TRUE)
- AND IF(t.s4, l.s4 = e.s4, TRUE)
- AND IF(t.s5, l.s5 = e.s5, TRUE)
- AND IF(t.s6, l.s6 = e.s6, TRUE)
- AND IF(t.kop, l.kop = e.kop, TRUE)
- AND IF(t.pac, l.pac = e.pac, TRUE)
- AND IF(t.cat, l.cat = e.cat, TRUE)
- AND IF(t.ori, l.ori = e.ori, TRUE)
- AND IF(t.pro, l.pro = e.pro, TRUE)
- AND IF(t.sub, l.sub = e.sub, TRUE)
- AND IF(t.package, l.package = e.package, TRUE)
- AND IF(t.package, l.package = e.package, TRUE)
- AND c.Id_Article < 170000
- ORDER BY l.now DESC, c.Id_Compra ASC LIMIT 1;
- */
+
END IF;
- -- Inserta la compra asociada al EKT
- /*INSERT INTO vn2008.Compres
- (
- Id_Entrada
- ,buy_edi_id
- ,Costefijo
- ,Id_Article
- ,`grouping`
- ,caja
- ,Packing
- ,Cantidad
- ,Productor
- ,Etiquetas
- ,Id_Cubo
- ,`weight`
- )
- SELECT
- vEntryFk
- ,vSelf
- ,(@t := IF(a.Tallos, a.Tallos, 1)) * e.pri
- ,IFNULL(vItem, cfg.generic_item)
- ,IFNULL(c.`grouping`, e.pac)
- ,vForceToPacking
- ,@pac := e.pac / @t
- ,@pac * e.qty
- ,s.company_name
- ,e.qty
- ,IFNULL(c.Id_Cubo, e.package)
- ,a.density * (vn.item_getVolume(a.Id_Article, IFNULL(c.Id_Cubo, e.package)) / 1000000)
- FROM vn2008.buy_edi e
- LEFT JOIN vn2008.Compres c ON c.Id_Compra = vBuy
- LEFT JOIN vn2008.Articles a ON a.Id_Article = c.Id_Article
- LEFT JOIN supplier s ON e.pro = s.supplier_id
- JOIN vn2008.config cfg
- WHERE e.id = vSelf
- LIMIT 1;*/
-
- INSERT INTO vn.buy
- (
- entryFk
- ,ektFk
- ,buyingValue
- ,itemFk
- ,stickers
- ,packing
- ,`grouping`
- ,quantity
- ,groupingMode
- ,producer
- ,packageFk
- ,weight
- )
- SELECT
- vEntryFk
- ,vSelf
- ,(@t := IF(i.stems, i.stems, 1)) * e.pri / IFNULL(i.stemMultiplier, 1) buyingValue
- ,IFNULL(vItem, cfg.generic_item) itemFk
- ,e.qty stickers
- ,@pac := IFNULL(i.stemMultiplier, 1) * e.pac / @t packing
- ,IFNULL(b.`grouping`, e.pac)
- ,@pac * e.qty
- ,vForceToPacking
- ,s.`name`
- ,IFNULL(b.packageFk, e.package)
- ,i.density * (vn.item_getVolume(i.id, IFNULL(b.packageFk, e.package)) / 1000000)
- FROM edi.ekt e
- LEFT JOIN vn.buy b ON b.id = vBuy
- LEFT JOIN vn.item i ON i.id = b.itemFk
- LEFT JOIN vn.supplier s ON e.pro = s.id
- JOIN vn2008.config cfg
-
- WHERE e.id = vSelf
- LIMIT 1;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc;
-
- CREATE TEMPORARY TABLE tmp.buyRecalc
- SELECT buy.id
- FROM vn.buy
- WHERE ektFk = vSelf;
-
- CALL vn.buy_recalcPrices();
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `ekt_load_beta` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ekt_load_beta`(IN `vSelf` INT)
-BEGIN
- DECLARE vRef INT;
- DECLARE vBuy INT;
- DECLARE vItem INT;
- DECLARE vQty INT;
- DECLARE vPackage INT;
- DECLARE vPutOrderFk INT;
- DECLARE vIsLot BOOLEAN;
- DECLARE vForceToPacking INT DEFAULT 2;
- DECLARE vEntryFk INT;
-
- -- Carga los datos necesarios del EKT
-
- SELECT ref, qty, package, putOrderFk INTO vRef, vQty, vPackage, vPutOrderFk
- FROM ekt e
- LEFT JOIN item i ON e.ref = i.id
- WHERE e.id = vSelf;
-
- -- Asigna la entrada
- SELECT vn.ekt_getEntry(vSelf) INTO vEntryFk;
-
- -- Inserta el cubo si no existe
-
- IF vPackage = 800
- THEN
- SET vPackage = 800 + vQty;
-
- INSERT IGNORE INTO vn2008.Cubos SET
- Id_Cubo = vPackage,
- x = 7200 / vQty,
- y = 1;
- ELSE
- INSERT IGNORE INTO vn2008.Cubos (Id_Cubo, X, Y, Z)
- SELECT bucket_id, ROUND(x_size/10), ROUND(y_size/10), ROUND(z_size/10)
- FROM bucket WHERE bucket_id = vPackage;
-
- IF ROW_COUNT() > 0
- THEN
- INSERT INTO vn2008.mail SET
- `subject` = 'Cubo añadido',
- `text` = CONCAT('Se ha añadido el cubo: ', vPackage),
- `to` = 'ekt@verdnatura.es';
- END IF;
- END IF;
-
- -- Si es una compra de Floramondo obtiene el articulo
- IF vPutOrderFk THEN
-
- SELECT i.id INTO vItem
- FROM edi.putOrder po
- JOIN vn.item i ON i.supplyResponseFk = po.supplyResponseID
- WHERE po.id = vPutOrderFk
- LIMIT 1;
- END IF;
-
- IF IFNULL(vItem,0) = 0 THEN
- -- Intenta obtener el artículo en base a los atributos holandeses
-
- INSERT IGNORE INTO item_track SET
- item_id = vRef;
-
- SELECT b.id, b.itemFk INTO vBuy, vItem
- FROM edi.ekt e
- JOIN edi.item_track t ON t.item_id = e.ref
- LEFT JOIN edi.ekt l ON l.ref = e.ref
- LEFT JOIN vn.buy b ON b.ektFk = l.id
- JOIN vn2008.config cfg
- WHERE e.id = vSelf
- AND l.id != vSelf
- AND b.itemFk != cfg.generic_item
- AND IF(t.s1, l.s1 = e.s1, TRUE)
- AND IF(t.s2, l.s2 = e.s2, TRUE)
- AND IF(t.s3, l.s3 = e.s3, TRUE)
- AND IF(t.s4, l.s4 = e.s4, TRUE)
- AND IF(t.s5, l.s5 = e.s5, TRUE)
- AND IF(t.s6, l.s6 = e.s6, TRUE)
- AND IF(t.kop, l.kop = e.kop, TRUE)
- AND IF(t.pac, l.pac = e.pac, TRUE)
- AND IF(t.cat, l.cat = e.cat, TRUE)
- AND IF(t.ori, l.ori = e.ori, TRUE)
- AND IF(t.pro, l.pro = e.pro, TRUE)
- AND IF(t.sub, l.sub = e.sub, TRUE)
- AND IF(t.package, l.package = e.package, TRUE)
- AND IF(t.item, l.item = e.item, TRUE)
- AND b.itemFk < 170000
- ORDER BY l.now DESC, b.id ASC LIMIT 1;
-/*
- SELECT c.Id_Compra, c.Id_Article INTO vBuy, vItem
- FROM vn2008.buy_edi e
- JOIN item_track t ON t.item_id = e.ref
- LEFT JOIN vn2008.buy_edi l ON l.ref = e.ref
- LEFT JOIN vn2008.Compres c ON c.buy_edi_id = l.id
- JOIN vn2008.config cfg
- WHERE e.id = vSelf
- AND l.id != vSelf
- AND c.Id_Article != cfg.generic_item
- AND IF(t.s1, l.s1 = e.s1, TRUE)
- AND IF(t.s2, l.s2 = e.s2, TRUE)
- AND IF(t.s3, l.s3 = e.s3, TRUE)
- AND IF(t.s4, l.s4 = e.s4, TRUE)
- AND IF(t.s5, l.s5 = e.s5, TRUE)
- AND IF(t.s6, l.s6 = e.s6, TRUE)
- AND IF(t.kop, l.kop = e.kop, TRUE)
- AND IF(t.pac, l.pac = e.pac, TRUE)
- AND IF(t.cat, l.cat = e.cat, TRUE)
- AND IF(t.ori, l.ori = e.ori, TRUE)
- AND IF(t.pro, l.pro = e.pro, TRUE)
- AND IF(t.sub, l.sub = e.sub, TRUE)
- AND IF(t.package, l.package = e.package, TRUE)
- AND IF(t.package, l.package = e.package, TRUE)
- AND c.Id_Article < 170000
- ORDER BY l.now DESC, c.Id_Compra ASC LIMIT 1;
- */
- END IF;
-
- -- Inserta la compra asociada al EKT
- /*INSERT INTO vn2008.Compres
- (
- Id_Entrada
- ,buy_edi_id
- ,Costefijo
- ,Id_Article
- ,`grouping`
- ,caja
- ,Packing
- ,Cantidad
- ,Productor
- ,Etiquetas
- ,Id_Cubo
- ,`weight`
- )
- SELECT
- vEntryFk
- ,vSelf
- ,(@t := IF(a.Tallos, a.Tallos, 1)) * e.pri
- ,IFNULL(vItem, cfg.generic_item)
- ,IFNULL(c.`grouping`, e.pac)
- ,vForceToPacking
- ,@pac := e.pac / @t
- ,@pac * e.qty
- ,s.company_name
- ,e.qty
- ,IFNULL(c.Id_Cubo, e.package)
- ,a.density * (vn.item_getVolume(a.Id_Article, IFNULL(c.Id_Cubo, e.package)) / 1000000)
- FROM vn2008.buy_edi e
- LEFT JOIN vn2008.Compres c ON c.Id_Compra = vBuy
- LEFT JOIN vn2008.Articles a ON a.Id_Article = c.Id_Article
- LEFT JOIN supplier s ON e.pro = s.supplier_id
- JOIN vn2008.config cfg
- WHERE e.id = vSelf
- LIMIT 1;*/
-
- INSERT INTO vn.buy
- (
- entryFk
- ,ektFk
- ,buyingValue
- ,itemFk
- ,stickers
- ,packing
- ,`grouping`
- ,quantity
- ,groupingMode
- ,producer
- ,packageFk
- ,weight
- )
- SELECT
- vEntryFk
- ,vSelf
- ,(@t := IF(i.stems, i.stems, 1)) * e.pri / IFNULL(i.stemMultiplier, 1) buyingValue
- ,IFNULL(vItem, cfg.generic_item) itemFk
- ,e.qty stickers
- ,@pac := IFNULL(i.stemMultiplier, 1) * e.pac / @t packing
- ,IFNULL(b.`grouping`, e.pac)
- ,@pac * e.qty
- ,vForceToPacking
- ,s.`name`
- ,IFNULL(b.packageFk, e.package)
- ,i.density * (vn.item_getVolume(i.id, IFNULL(b.packageFk, e.package)) / 1000000)
- FROM edi.ekt e
- LEFT JOIN vn.buy b ON b.id = vBuy
- LEFT JOIN vn.item i ON i.id = b.itemFk
- LEFT JOIN vn.supplier s ON e.pro = s.id
- JOIN vn2008.config cfg
-
- WHERE e.id = vSelf
- LIMIT 1;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc;
-
- CREATE TEMPORARY TABLE tmp.buyRecalc
- SELECT buy.id
- FROM vn.buy
- WHERE ektFk = vSelf;
-
- CALL vn.buy_recalcPrices();
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `ekt_load___` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `ekt_load___`(IN `vSelf` INT)
-BEGIN
- DECLARE vRef INT;
- DECLARE vBuy INT;
- DECLARE vItem INT;
- DECLARE vQty INT;
- DECLARE vPackage INT;
- DECLARE vPutOrderFk INT;
- DECLARE vIsLot BOOLEAN;
- DECLARE vForceToPacking INT DEFAULT 2;
- DECLARE vEntryFk INT;
-
- -- Carga los datos necesarios del EKT
-
- SELECT ref, qty, package, putOrderFk INTO vRef, vQty, vPackage, vPutOrderFk
- FROM ekt e
- LEFT JOIN item i ON e.ref = i.id
- WHERE e.id = vSelf;
-
- -- Asigna la entrada
- SELECT vn.ekt_getEntry(vSelf) INTO vEntryFk;
-
- -- Inserta el cubo si no existe
-
- IF vPackage = 800
- THEN
- SET vPackage = 800 + vQty;
-
- INSERT IGNORE INTO vn2008.Cubos SET
- Id_Cubo = vPackage,
- x = 7200 / vQty,
- y = 1;
- ELSE
- INSERT IGNORE INTO vn2008.Cubos (Id_Cubo, X, Y, Z)
- SELECT bucket_id, ROUND(x_size/10), ROUND(y_size/10), ROUND(z_size/10)
- FROM bucket WHERE bucket_id = vPackage;
-
- IF ROW_COUNT() > 0
- THEN
- INSERT INTO vn2008.mail SET
- `subject` = 'Cubo añadido',
- `text` = CONCAT('Se ha añadido el cubo: ', vPackage),
- `to` = 'ekt@verdnatura.es';
- END IF;
- END IF;
-
- -- Si es una compra de Floramondo obtiene el articulo
- IF vPutOrderFk THEN
-
- SELECT i.id INTO vItem
- FROM edi.putOrder po
- JOIN vn.item i ON i.supplyResponseFk = po.supplyResponseID
- WHERE po.id = vPutOrderFk
- LIMIT 1;
- END IF;
-
- IF IFNULL(vItem,0) = 0 THEN
- -- Intenta obtener el artículo en base a los atributos holandeses
-
- INSERT IGNORE INTO item_track SET
- item_id = vRef;
-
- SELECT c.Id_Compra, c.Id_Article INTO vBuy, vItem
- FROM vn2008.buy_edi e
- JOIN item_track t ON t.item_id = e.ref
- LEFT JOIN vn2008.buy_edi l ON l.ref = e.ref
- LEFT JOIN vn2008.Compres c ON c.buy_edi_id = l.id
- JOIN vn2008.config cfg
- WHERE e.id = vSelf
- AND l.id != vSelf
- AND c.Id_Article != cfg.generic_item
- AND IF(t.s1, l.s1 = e.s1, TRUE)
- AND IF(t.s2, l.s2 = e.s2, TRUE)
- AND IF(t.s3, l.s3 = e.s3, TRUE)
- AND IF(t.s4, l.s4 = e.s4, TRUE)
- AND IF(t.s5, l.s5 = e.s5, TRUE)
- AND IF(t.s6, l.s6 = e.s6, TRUE)
- AND IF(t.kop, l.kop = e.kop, TRUE)
- AND IF(t.pac, l.pac = e.pac, TRUE)
- AND IF(t.cat, l.cat = e.cat, TRUE)
- AND IF(t.ori, l.ori = e.ori, TRUE)
- AND IF(t.pro, l.pro = e.pro, TRUE)
- AND IF(t.sub, l.sub = e.sub, TRUE)
- AND IF(t.package, l.package = e.package, TRUE)
- AND c.Id_Article < 170000
- ORDER BY l.now DESC, c.Id_Compra ASC LIMIT 1;
- END IF;
-
- -- Inserta la compra asociada al EKT
- /*INSERT INTO vn2008.Compres
- (
- Id_Entrada
- ,buy_edi_id
- ,Costefijo
- ,Id_Article
- ,`grouping`
- ,caja
- ,Packing
- ,Cantidad
- ,Productor
- ,Etiquetas
- ,Id_Cubo
- ,`weight`
- )
- SELECT
- vEntryFk
- ,vSelf
- ,(@t := IF(a.Tallos, a.Tallos, 1)) * e.pri
- ,IFNULL(vItem, cfg.generic_item)
- ,IFNULL(c.`grouping`, e.pac)
- ,vForceToPacking
- ,@pac := e.pac / @t
- ,@pac * e.qty
- ,s.company_name
- ,e.qty
- ,IFNULL(c.Id_Cubo, e.package)
- ,a.density * (vn.item_getVolume(a.Id_Article, IFNULL(c.Id_Cubo, e.package)) / 1000000)
- FROM vn2008.buy_edi e
- LEFT JOIN vn2008.Compres c ON c.Id_Compra = vBuy
- LEFT JOIN vn2008.Articles a ON a.Id_Article = c.Id_Article
- LEFT JOIN supplier s ON e.pro = s.supplier_id
- JOIN vn2008.config cfg
- WHERE e.id = vSelf
- LIMIT 1;*/
INSERT INTO vn.buy
(
@@ -9947,9 +9360,9 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
@@ -9976,7 +9389,9 @@ proc: BEGIN
ROLLBACK;
RESIGNAL;
END;
-
+
+ CALL vn.clean_logiflora();
+
START TRANSACTION;
-- select now(),'Antes de borrar';
DELETE itf.*
@@ -10214,17 +9629,13 @@ proc: BEGIN
WHERE mp.isLatestOrderDateTimeRelevant
AND LatestOrderDateTime BETWEEN CURDATE() AND TIMESTAMPADD(HOUR, fm.MaxLatestDeliveryHour, CURDATE());
- INSERT INTO tmp.kk(fecha) VALUES(vLanded);
-
- IF DATE(vLanded) = CURDATE() THEN
+ IF DATE(vLanded) = CURDATE() THEN
SELECT TIMESTAMPADD(HOUR, fm.MaxLatestDeliveryHour, CURDATE()) INTO vLanded
FROM vn.floramondoConfig;
END IF;
- INSERT INTO tmp.kk(fecha) VALUES(vLanded);
-
ELSE
SELECT MIN(LatestOrderDateTime) INTO vLanded
@@ -10248,19 +9659,23 @@ proc: BEGIN
-- Localiza las entradas de cada almacen
UPDATE edi.warehouseFloramondo
SET entryFk = vn.floramondo_getEntry(TIMESTAMPADD(DAY,travellingDays,vLanded), warehouseFk);
-
-
+
-- Elimina la oferta obsoleta
- DELETE b
- FROM vn.buy b
- JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk
+ UPDATE vn.buy b
+ JOIN vn.entry e ON e.id = b.entryFk
+ JOIN vn.travel tr ON tr.id = e.travelFk
+ JOIN vn.agencyMode am ON am.id = tr.agencyFk
JOIN vn.item i ON i.id = b.itemFk
LEFT JOIN edi.offer o ON i.supplyResponseFk = o.`srId`
- LEFT JOIN putOrder po ON b.deliveryFk = po.deliveryInformationID
- WHERE o.`srId` IS NULL
- AND po.id IS NULL;
-
+ LEFT JOIN edi.putOrder po ON b.deliveryFk = po.deliveryInformationID
+ LEFT JOIN edi.deliveryInformation di ON di.ID = b.deliveryFk
+ SET b.quantity = 0
+ WHERE (po.id IS NULL OR di.LatestOrderDateTime < NOW())
+ AND o.`srId` IS NULL
+ AND am.name = 'LOGIFLORA'
+ AND e.isRaid;
+
UPDATE vn.buy b
JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk
JOIN vn.item i ON i.id = b.itemFk
@@ -10337,868 +9752,6 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `floramondo_offerRefresh__` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `floramondo_offerRefresh__`()
-proc: BEGIN
-
- DECLARE vLanded DATETIME;
- DECLARE done INT DEFAULT FALSE;
- DECLARE vFreeId INT;
- DECLARE vSupplyResponseFk INT;
- DECLARE vLastInserted DATETIME;
- DECLARE vVNH_WarehouseFk INT;
- DECLARE vFloramondo_WarehouseFk INT;
-
- DECLARE cur1 CURSOR FOR
- SELECT id
- FROM edi.item_free;
-
- DECLARE cur2 CURSOR FOR
- SELECT srId
- FROM itemToInsert;
-
- DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
- DECLARE EXIT HANDLER FOR SQLSTATE '45000'
- BEGIN
- ROLLBACK;
- RESIGNAL;
- END;
-
- START TRANSACTION;
-
- SELECT id INTO vVNH_WarehouseFk
- FROM vn.warehouse
- WHERE name = 'VNH';
-
- SELECT id INTO vFloramondo_WarehouseFk
- FROM vn.warehouse
- WHERE name = 'Floramondo';
- -- select now(),'Antes de borrar';
- DELETE itf.*
- FROM edi.item_free itf
- JOIN vn.item i ON i.id = itf.id;
-
- -- -- select now(),'Tras borrar';
- DROP TEMPORARY TABLE IF EXISTS tmp;
- CREATE TEMPORARY TABLE tmp (INDEX (`Item_ArticleCode`)) ENGINE = MEMORY
- SELECT * FROM (
- SELECT *
- FROM edi.supplyOffer
- ORDER BY NumberOfUnits DESC) t
- JOIN edi.item_groupToOffer igo ON igo.group_code = t.group_id
- GROUP BY Item_ArticleCode, s1, s2, s3, s4, s5, s6, company_name, Quality, NumberOfItemsPerCask, EmbalageCode, Price;
-
- -- -- select now(),'Antes de crear edi.offer';
- DROP TEMPORARY TABLE IF EXISTS edi.offer;
- CREATE TEMPORARY TABLE edi.offer (INDEX (`srID`), INDEX (`EmbalageCode`)) ENGINE = MEMORY
- SELECT so.*, ev1.type_description s1Value, ev2.type_description s2Value, ev3.type_description s3Value,
- ev4.type_description s4Value, ev5.type_description s5Value, ev6.type_description s6Value,
- eif1.feature ef1, eif2.feature ef2, eif3.feature ef3, eif4.feature ef4, eif5.feature ef5, eif6.feature ef6
- FROM tmp so
- LEFT JOIN edi.item_feature eif1 ON eif1.item_id = so.Item_ArticleCode
- AND eif1.presentation_order = 1 AND eif1.expiry_date IS NULL
- LEFT JOIN edi.item_feature eif2 ON eif2.item_id = so.Item_ArticleCode
- AND eif2.presentation_order = 2 AND eif2.expiry_date IS NULL
- LEFT JOIN edi.item_feature eif3 ON eif3.item_id = so.Item_ArticleCode
- AND eif3.presentation_order = 3 AND eif3.expiry_date IS NULL
- LEFT JOIN edi.item_feature eif4 ON eif4.item_id = so.Item_ArticleCode
- AND eif4.presentation_order = 4 AND eif4.expiry_date IS NULL
- LEFT JOIN edi.item_feature eif5 ON eif5.item_id = so.Item_ArticleCode
- AND eif5.presentation_order = 5 AND eif5.expiry_date IS NULL
- LEFT JOIN edi.item_feature eif6 ON eif6.item_id = so.Item_ArticleCode
- AND eif6.presentation_order = 6 AND eif6.expiry_date IS NULL
- LEFT JOIN edi.`value` ev1 ON ev1.type_id = eif1.feature AND so.s1 = ev1.type_value
- LEFT JOIN edi.`value` ev2 ON ev2.type_id = eif2.feature AND so.s2 = ev2.type_value
- LEFT JOIN edi.`value` ev3 ON ev3.type_id = eif3.feature AND so.s3 = ev3.type_value
- LEFT JOIN edi.`value` ev4 ON ev4.type_id = eif4.feature AND so.s4 = ev4.type_value
- LEFT JOIN edi.`value` ev5 ON ev5.type_id = eif5.feature AND so.s5 = ev5.type_value
- LEFT JOIN edi.`value` ev6 ON ev6.type_id = eif6.feature AND so.s6 = ev6.type_value
- ORDER BY Price;
-
- DROP TEMPORARY TABLE tmp;
--- propuesta para arreglar codigos 90
-
-
- -- Actualizamos el campo supplyResponseFk para aquellos articulos que ya estan creados y reutilizamos
- UPDATE IGNORE edi.offer o
- LEFT JOIN vn.item iExist ON iExist.supplyResponseFk = o.srID
- JOIN vn.item i
- ON i.name = o.product_name
- AND i.subname <=> o.company_name
- AND i.value5 <=> o.s1Value
- AND i.value6 <=> o.s2Value
- AND i.value7 <=> o.s3Value
- AND i.value8 <=> o.s4Value
- AND i.value9 <=> o.s5Value
- AND i.value10 <=> o.s6Value
- AND i.NumberOfItemsPerCask <=> o.NumberOfItemsPerCask
- AND i.EmbalageCode <=> o.EmbalageCode
- AND i.quality <=> o.Quality
- LEFT JOIN deliveryInformation di ON di.supplyResponseID = i.supplyResponseFk
- JOIN vn.itemType it ON it.id = i.typeFk
- SET i.supplyResponseFk = o.srID
- WHERE iExist.id IS NULL
- AND (di.LatestOrderDateTime < NOW() OR di.ID IS NULL)
- AND it.isInventory
- ;
- -- select now(),'Antes de crear ITO';
- DROP TEMPORARY TABLE IF EXISTS itemToInsert;
- CREATE TEMPORARY TABLE itemToInsert ENGINE = MEMORY
- SELECT o.*, CAST(NULL AS DECIMAL(6,0)) as itemFk
- FROM edi.offer o
- LEFT JOIN vn.item i ON i.supplyResponseFk = o.srId
- WHERE i.id IS NULL;
- -- select now(),'Tras crear itemToInsert';
- -- Reciclado de nº de item
- OPEN cur1;
- OPEN cur2;
-
- read_loop: LOOP
-
- FETCH cur2 INTO vSupplyResponseFk;
- FETCH cur1 INTO vFreeId;
-
- IF done THEN
- LEAVE read_loop;
- END IF;
-
- UPDATE itemToInsert
- SET itemFk = vFreeId
- WHERE srId = vSupplyResponseFk;
-
- END LOOP;
-
- CLOSE cur1;
- CLOSE cur2;
-
- -- Insertamos todos los items en Articles de la oferta
- INSERT INTO vn.item( id,
- `name`,
- longName,
- subName,
- expenceFk,
- typeFk,
- intrastatFk,
- originFk,
- supplyResponseFk,
- numberOfItemsPerCask,
- embalageCode,
- quality)
- SELECT itemFk,
- product_name,
- product_name,
- company_name,
- expenseFk,
- itemTypeFk,
- intrastatFk,
- originFk,
- `srId`,
- NumberOfItemsPerCask,
- EmbalageCode,
- Quality
- FROM itemToInsert;
-
- INSERT IGNORE INTO vn.itemImageQueue(itemFk, url)
- SELECT i.id, PictureReference
- FROM itemToInsert ii
- JOIN vn.item i ON i.supplyResponseFk = ii.srId;
-
- -- Inserta si se añadiesen tags nuevos
- INSERT IGNORE INTO vn.tag (name, ediTypeFk)
- SELECT description, type_id FROM edi.type;
-
- -- Inserta los tags sólo en los articulos nuevos
-
- -- desabilita el trigger para recalcular los tags al final
- SET @isTriggerDisabled = TRUE;
-
- INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id , ii.product_name, 1
- FROM itemToInsert ii
- JOIN vn.tag t ON t.`name` = 'Producto'
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`;
-
- INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id , ii.Quality, 3
- FROM itemToInsert ii
- JOIN vn.tag t ON t.`name` = 'Calidad'
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`;
-
- INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id , ii.company_name, 4
- FROM itemToInsert ii
- JOIN vn.tag t ON t.`name` = 'Productor'
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`;
-
- INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id , s1Value, 5
- FROM itemToInsert ii
- JOIN vn.tag t ON t.ediTypeFk = ii.ef1
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
- WHERE s1Value != '';
-
- INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id , s2Value, 6
- FROM itemToInsert ii
- JOIN vn.tag t ON t.ediTypeFk = ii.ef2
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
- WHERE s2Value != '';
-
- INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id , s3Value, 7
- FROM itemToInsert ii
- JOIN vn.tag t ON t.ediTypeFk = ii.ef3
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
- WHERE s3Value != '';
-
- INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id , s4Value, 8
- FROM itemToInsert ii
- JOIN vn.tag t ON t.ediTypeFk = ii.ef4
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
- WHERE s4Value != '';
-
- INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id , s5Value, 9
- FROM itemToInsert ii
- JOIN vn.tag t ON t.ediTypeFk = ii.ef5
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
- WHERE s5Value != '';
-
- INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id , s6Value, 10
- FROM itemToInsert ii
- JOIN vn.tag t ON t.ediTypeFk = ii.ef6
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
- WHERE s6Value != '';
-
- INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id, ink.name, 11
- FROM itemToInsert ii
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
- JOIN vn.tag t ON t.`name` = 'Color'
- JOIN edi.feature f ON f.item_id = ii.Item_ArticleCode
- JOIN edi.`type` tp ON tp.type_id = f.feature_type_id AND tp.`description` = 'Hoofdkleur 1'
- JOIN vn.ink ON ink.dutchCode = f.feature_value;
-
- UPDATE vn.item i
- JOIN itemToInsert ii ON i.supplyResponseFk = ii.`srId`
- JOIN vn.packaging p ON p.id LIKE ii.EmbalageCode AND hasCompressionVariations
- JOIN vn.itemTag diameter ON diameter.itemFk = i.id
- JOIN vn.tag tDiameter ON tDiameter.overwrite = 'diameter' AND tDiameter.id = diameter.tagFk
- JOIN vn.itemTag size ON size.itemFk = i.id
- JOIN vn.tag tSize ON tSize.overwrite = 'size' AND tSize.id = size.tagFk
- SET i.`compression` =
- (PI() * POW(diameter.`value`/ 2, 2) * size.`value`)
- /
- ((p.width * p.depth * p.height) / ii.NumberOfItemsPerCask);
-
- DROP TABLE IF EXISTS tmp.item;
- CREATE TABLE tmp.item
- (PRIMARY KEY (id))
- SELECT i.id FROM vn.item i
- JOIN itemToInsert ii ON i.supplyResponseFk = ii.`srId`;
-
- CALL vn.item_refreshTags();
-
- SET @isTriggerDisabled = FALSE;
-
- SELECT MIN(LatestOrderDateTime) INTO vLanded
- FROM edi.offer o
- JOIN marketPlace mp ON mp.id = o.MarketPlaceID
- WHERE mp.isLatestOrderDateTimeRelevant;
-
- SET @myEntry := vn.floramondo_getEntry(vLanded, vVNH_WarehouseFk);
-
- IF @myEntry THEN
-
- SELECT @myEntry;
-
- -- Elimina la oferta obsoleta
- DELETE b FROM vn.buy b
- JOIN vn.item i ON i.id = b.itemFk
- LEFT JOIN edi.offer o ON i.supplyResponseFk = o.`srId`
- LEFT JOIN putOrder po ON b.deliveryFk = po.deliveryInformationID
- WHERE b.entryFk = @myEntry
- AND o.`srId` IS NULL
- AND po.id IS NULL;
-
- UPDATE vn.buy b
- JOIN vn.item i ON i.id = b.itemFk
- LEFT JOIN edi.offer o ON i.supplyResponseFk = o.`srId`
- SET b.quantity = 0
- WHERE b.entryFk = @myEntry
- AND o.`srId` IS NULL;
-
- -- actualiza la oferta existente
- UPDATE vn.buy b
- JOIN vn.item i ON i.id = b.itemFk
- JOIN edi.offer o ON i.supplyResponseFk = o.`srId`
- SET b.quantity = o.NumberOfUnits * o.NumberOfItemsPerCask,
- b.buyingValue = o.price
- WHERE b.entryFk = @myEntry
- AND (b.quantity <> o.NumberOfUnits * o.NumberOfItemsPerCask OR b.buyingValue <> o.price);
-
- SET vLastInserted := NOW();
- -- Inserta la oferta
- INSERT INTO vn.buy(entryFk,
- itemFk,
- quantity,
- buyingValue,
- stickers,
- packing,
- `grouping`,
- groupingMode,
- packageFk,
- deliveryFk)
-
- SELECT @myEntry,
- i.id,
- o.NumberOfUnits * o.NumberOfItemsPerCask as quantity,
- o.Price,
- o.NumberOfUnits as etiquetas,
- o.NumberOfItemsPerCask as packing,
- o.MinimumQuantity * o.NumberOfItemsPerCask as `grouping`,
- 1, -- Obliga al Packing
- o.embalageCode,
- o.diId
- FROM edi.offer o
- JOIN vn.item i ON i.supplyResponseFk = o.srId
- LEFT JOIN vn.buy b ON i.id = b.itemFk AND b.entryFk = @myEntry
- JOIN vn.packaging p ON p.id LIKE o.embalageCode -- llevar esta linea i mirar de crear els packages a temps real
- WHERE b.id IS NULL;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc;
- CREATE TEMPORARY TABLE tmp.buyRecalc
- SELECT id from vn.buy where entryFk = @myEntry AND created >= vLastInserted;
-
- CALL vn.buy_recalcPrices();
-
- END IF;
- /*
- -- Ara la entrada per a Floramondo
- SET @myFloramondoEntry := vn.floramondo_getEntry(vLanded, vFloramondo_WarehouseFk);
-
- IF @myFloramondoEntry THEN
-
- SELECT @myFloramondoEntry;
-
- -- Elimina la oferta obsoleta
- DELETE b FROM vn.buy b
- JOIN vn.item i ON i.id = b.itemFk
- LEFT JOIN edi.offer o ON i.supplyResponseFk = o.`srId`
- LEFT JOIN putOrder po ON b.deliveryFk = po.deliveryInformationID
- WHERE b.entryFk = @myFloramondoEntry
- AND o.`srId` IS NULL
- AND po.id IS NULL;
-
- UPDATE vn.buy b
- JOIN vn.item i ON i.id = b.itemFk
- LEFT JOIN edi.offer o ON i.supplyResponseFk = o.`srId`
- SET b.quantity = 0
- WHERE b.entryFk = @myFloramondoEntry
- AND o.`srId` IS NULL;
-
- -- actualiza la oferta existente
- UPDATE vn.buy b
- JOIN vn.item i ON i.id = b.itemFk
- JOIN edi.offer o ON i.supplyResponseFk = o.`srId`
- SET b.quantity = o.NumberOfUnits * o.NumberOfItemsPerCask,
- b.buyingValue = o.price
- WHERE b.entryFk = @myFloramondoEntry
- AND (b.quantity <> o.NumberOfUnits * o.NumberOfItemsPerCask OR b.buyingValue <> o.price);
-
- SET vLastInserted := NOW();
- -- Inserta la oferta
- INSERT INTO vn.buy(entryFk,
- itemFk,
- quantity,
- buyingValue,
- stickers,
- packing,
- `grouping`,
- groupingMode,
- packageFk,
- deliveryFk)
-
- SELECT @myFloramondoEntry,
- i.id,
- o.NumberOfUnits * o.NumberOfItemsPerCask as quantity,
- o.Price,
- o.NumberOfUnits as etiquetas,
- o.NumberOfItemsPerCask as packing,
- o.MinimumQuantity * o.NumberOfItemsPerCask as `grouping`,
- 1, -- Obliga al Packing
- o.embalageCode,
- o.diId
- FROM edi.offer o
- JOIN vn.item i ON i.supplyResponseFk = o.srId
- LEFT JOIN vn.buy b ON i.id = b.itemFk AND b.entryFk = @myFloramondoEntry
- JOIN vn.packaging p ON p.id LIKE o.embalageCode -- llevar esta linea i mirar de crear els packages a temps real
- WHERE b.id IS NULL;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc;
- CREATE TEMPORARY TABLE tmp.buyRecalc
- SELECT id from vn.buy where entryFk = @myFloramondoEntry AND created >= vLastInserted;
-
- CALL vn.buy_recalcPrices();
-
-
- END IF;
- */
- DROP TEMPORARY TABLE
- edi.offer,
- itemToInsert;
-
- DROP TABLE tmp.item;
- -- select now(),'FINAL';
- COMMIT;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `floramondo_offerRefresh___` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `floramondo_offerRefresh___`()
-proc: BEGIN
-
- DECLARE vLanded DATETIME;
- DECLARE done INT DEFAULT FALSE;
- DECLARE vFreeId INT;
- DECLARE vSupplyResponseFk INT;
- DECLARE vLastInserted DATETIME;
- DECLARE vVNH_WarehouseFk INT;
- DECLARE vFloramondo_WarehouseFk INT;
-
- DECLARE cur1 CURSOR FOR
- SELECT id
- FROM edi.item_free;
-
- DECLARE cur2 CURSOR FOR
- SELECT srId
- FROM itemToInsert;
-
- DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
- DECLARE EXIT HANDLER FOR SQLSTATE '45000'
- BEGIN
- ROLLBACK;
- RESIGNAL;
- END;
-
- START TRANSACTION;
-
- SELECT id INTO vVNH_WarehouseFk
- FROM vn.warehouse
- WHERE name = 'VNH';
-
- SELECT id INTO vFloramondo_WarehouseFk
- FROM vn.warehouse
- WHERE name = 'Floramondo';
- -- select now(),'Antes de borrar';
- DELETE itf.*
- FROM edi.item_free itf
- JOIN vn.item i ON i.id = itf.id;
-
- -- -- select now(),'Tras borrar';
- DROP TEMPORARY TABLE IF EXISTS tmp;
- CREATE TEMPORARY TABLE tmp (INDEX (`Item_ArticleCode`)) ENGINE = MEMORY
- SELECT * FROM (
- SELECT *
- FROM edi.supplyOffer
- ORDER BY NumberOfUnits DESC) t
- JOIN edi.item_groupToOffer igo ON igo.group_code = t.group_id
- GROUP BY Item_ArticleCode, s1, s2, s3, s4, s5, s6, company_name, Quality, NumberOfItemsPerCask, EmbalageCode, Price;
-
- -- -- select now(),'Antes de crear edi.offer';
- DROP TEMPORARY TABLE IF EXISTS edi.offer;
- CREATE TEMPORARY TABLE edi.offer (INDEX (`srID`), INDEX (`EmbalageCode`)) ENGINE = MEMORY
- SELECT so.*, ev1.type_description s1Value, ev2.type_description s2Value, ev3.type_description s3Value,
- ev4.type_description s4Value, ev5.type_description s5Value, ev6.type_description s6Value,
- eif1.feature ef1, eif2.feature ef2, eif3.feature ef3, eif4.feature ef4, eif5.feature ef5, eif6.feature ef6
- FROM tmp so
- LEFT JOIN edi.item_feature eif1 ON eif1.item_id = so.Item_ArticleCode
- AND eif1.presentation_order = 1 AND eif1.expiry_date IS NULL
- LEFT JOIN edi.item_feature eif2 ON eif2.item_id = so.Item_ArticleCode
- AND eif2.presentation_order = 2 AND eif2.expiry_date IS NULL
- LEFT JOIN edi.item_feature eif3 ON eif3.item_id = so.Item_ArticleCode
- AND eif3.presentation_order = 3 AND eif3.expiry_date IS NULL
- LEFT JOIN edi.item_feature eif4 ON eif4.item_id = so.Item_ArticleCode
- AND eif4.presentation_order = 4 AND eif4.expiry_date IS NULL
- LEFT JOIN edi.item_feature eif5 ON eif5.item_id = so.Item_ArticleCode
- AND eif5.presentation_order = 5 AND eif5.expiry_date IS NULL
- LEFT JOIN edi.item_feature eif6 ON eif6.item_id = so.Item_ArticleCode
- AND eif6.presentation_order = 6 AND eif6.expiry_date IS NULL
- LEFT JOIN edi.`value` ev1 ON ev1.type_id = eif1.feature AND so.s1 = ev1.type_value
- LEFT JOIN edi.`value` ev2 ON ev2.type_id = eif2.feature AND so.s2 = ev2.type_value
- LEFT JOIN edi.`value` ev3 ON ev3.type_id = eif3.feature AND so.s3 = ev3.type_value
- LEFT JOIN edi.`value` ev4 ON ev4.type_id = eif4.feature AND so.s4 = ev4.type_value
- LEFT JOIN edi.`value` ev5 ON ev5.type_id = eif5.feature AND so.s5 = ev5.type_value
- LEFT JOIN edi.`value` ev6 ON ev6.type_id = eif6.feature AND so.s6 = ev6.type_value
- ORDER BY Price;
-
- DROP TEMPORARY TABLE tmp;
--- propuesta para arreglar codigos 90
-
-
- -- Actualizamos el campo supplyResponseFk para aquellos articulos que ya estan creados y reutilizamos
- UPDATE IGNORE edi.offer o
- LEFT JOIN vn.item iExist ON iExist.supplyResponseFk = o.srID
- JOIN vn.item i
- ON i.name = o.product_name
- AND i.subname <=> o.company_name
- AND i.value5 <=> o.s1Value
- AND i.value6 <=> o.s2Value
- AND i.value7 <=> o.s3Value
- AND i.value8 <=> o.s4Value
- AND i.value9 <=> o.s5Value
- AND i.value10 <=> o.s6Value
- AND i.NumberOfItemsPerCask <=> o.NumberOfItemsPerCask
- AND i.EmbalageCode <=> o.EmbalageCode
- AND i.quality <=> o.Quality
- LEFT JOIN deliveryInformation di ON di.supplyResponseID = i.supplyResponseFk
- JOIN vn.itemType it ON it.id = i.typeFk
- SET i.supplyResponseFk = o.srID
- WHERE iExist.id IS NULL
- AND (di.LatestOrderDateTime < NOW() OR di.ID IS NULL)
- AND it.isInventory
- ;
- -- select now(),'Antes de crear ITO';
- DROP TEMPORARY TABLE IF EXISTS itemToInsert;
- CREATE TEMPORARY TABLE itemToInsert ENGINE = MEMORY
- SELECT o.*, CAST(NULL AS DECIMAL(6,0)) as itemFk
- FROM edi.offer o
- LEFT JOIN vn.item i ON i.supplyResponseFk = o.srId
- WHERE i.id IS NULL;
- -- select now(),'Tras crear itemToInsert';
- -- Reciclado de nº de item
- OPEN cur1;
- OPEN cur2;
-
- read_loop: LOOP
-
- FETCH cur2 INTO vSupplyResponseFk;
- FETCH cur1 INTO vFreeId;
-
- IF done THEN
- LEAVE read_loop;
- END IF;
-
- UPDATE itemToInsert
- SET itemFk = vFreeId
- WHERE srId = vSupplyResponseFk;
-
- END LOOP;
-
- CLOSE cur1;
- CLOSE cur2;
-
- -- Insertamos todos los items en Articles de la oferta
- INSERT INTO vn.item( id,
- `name`,
- longName,
- subName,
- expenceFk,
- typeFk,
- intrastatFk,
- originFk,
- supplyResponseFk,
- numberOfItemsPerCask,
- embalageCode,
- quality)
- SELECT itemFk,
- product_name,
- product_name,
- company_name,
- expenseFk,
- itemTypeFk,
- intrastatFk,
- originFk,
- `srId`,
- NumberOfItemsPerCask,
- EmbalageCode,
- Quality
- FROM itemToInsert;
-
- INSERT IGNORE INTO vn.itemImageQueue(itemFk, url)
- SELECT i.id, PictureReference
- FROM itemToInsert ii
- JOIN vn.item i ON i.supplyResponseFk = ii.srId;
-
- -- Inserta si se añadiesen tags nuevos
- INSERT IGNORE INTO vn.tag (name, ediTypeFk)
- SELECT description, type_id FROM edi.type;
-
- -- Inserta los tags sólo en los articulos nuevos
-
- -- desabilita el trigger para recalcular los tags al final
- SET @isTriggerDisabled = TRUE;
-
- INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id , ii.product_name, 1
- FROM itemToInsert ii
- JOIN vn.tag t ON t.`name` = 'Producto'
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`;
-
- INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id , ii.Quality, 3
- FROM itemToInsert ii
- JOIN vn.tag t ON t.`name` = 'Calidad'
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`;
-
- INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id , ii.company_name, 4
- FROM itemToInsert ii
- JOIN vn.tag t ON t.`name` = 'Productor'
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`;
-
- INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id , s1Value, 5
- FROM itemToInsert ii
- JOIN vn.tag t ON t.ediTypeFk = ii.ef1
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
- WHERE s1Value != '';
-
- INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id , s2Value, 6
- FROM itemToInsert ii
- JOIN vn.tag t ON t.ediTypeFk = ii.ef2
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
- WHERE s2Value != '';
-
- INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id , s3Value, 7
- FROM itemToInsert ii
- JOIN vn.tag t ON t.ediTypeFk = ii.ef3
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
- WHERE s3Value != '';
-
- INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id , s4Value, 8
- FROM itemToInsert ii
- JOIN vn.tag t ON t.ediTypeFk = ii.ef4
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
- WHERE s4Value != '';
-
- INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id , s5Value, 9
- FROM itemToInsert ii
- JOIN vn.tag t ON t.ediTypeFk = ii.ef5
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
- WHERE s5Value != '';
-
- INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id , s6Value, 10
- FROM itemToInsert ii
- JOIN vn.tag t ON t.ediTypeFk = ii.ef6
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
- WHERE s6Value != '';
-
- INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
- SELECT i.id, t.id, ink.name, 11
- FROM itemToInsert ii
- JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
- JOIN vn.tag t ON t.`name` = 'Color'
- JOIN edi.feature f ON f.item_id = ii.Item_ArticleCode
- JOIN edi.`type` tp ON tp.type_id = f.feature_type_id AND tp.`description` = 'Hoofdkleur 1'
- JOIN vn.ink ON ink.dutchCode = f.feature_value;
-
- UPDATE vn.item i
- JOIN itemToInsert ii ON i.supplyResponseFk = ii.`srId`
- JOIN vn.packaging p ON p.id LIKE ii.EmbalageCode AND hasCompressionVariations
- JOIN vn.itemTag diameter ON diameter.itemFk = i.id
- JOIN vn.tag tDiameter ON tDiameter.overwrite = 'diameter' AND tDiameter.id = diameter.tagFk
- JOIN vn.itemTag size ON size.itemFk = i.id
- JOIN vn.tag tSize ON tSize.overwrite = 'size' AND tSize.id = size.tagFk
- SET i.`compression` =
- (PI() * POW(diameter.`value`/ 2, 2) * size.`value`)
- /
- ((p.width * p.depth * p.height) / ii.NumberOfItemsPerCask);
-
- DROP TABLE IF EXISTS tmp.item;
- CREATE TABLE tmp.item
- (PRIMARY KEY (id))
- SELECT i.id FROM vn.item i
- JOIN itemToInsert ii ON i.supplyResponseFk = ii.`srId`;
-
- CALL vn.item_refreshTags();
-
- SET @isTriggerDisabled = FALSE;
-
- SELECT MIN(LatestOrderDateTime) INTO vLanded
- FROM edi.offer o
- JOIN marketPlace mp ON mp.id = o.MarketPlaceID
- WHERE mp.isLatestOrderDateTimeRelevant;
-
- SET @myEntry := vn.floramondo_getEntry(vLanded, vVNH_WarehouseFk);
-
- IF @myEntry THEN
-
- SELECT @myEntry;
-
- -- Elimina la oferta obsoleta
- DELETE b FROM vn.buy b
- JOIN vn.item i ON i.id = b.itemFk
- LEFT JOIN edi.offer o ON i.supplyResponseFk = o.`srId`
- LEFT JOIN putOrder po ON b.deliveryFk = po.deliveryInformationID
- WHERE b.entryFk = @myEntry
- AND o.`srId` IS NULL
- AND po.id IS NULL;
-
- UPDATE vn.buy b
- JOIN vn.item i ON i.id = b.itemFk
- LEFT JOIN edi.offer o ON i.supplyResponseFk = o.`srId`
- SET b.quantity = 0
- WHERE b.entryFk = @myEntry
- AND o.`srId` IS NULL;
-
- -- actualiza la oferta existente
- UPDATE vn.buy b
- JOIN vn.item i ON i.id = b.itemFk
- JOIN edi.offer o ON i.supplyResponseFk = o.`srId`
- SET b.quantity = o.NumberOfUnits * o.NumberOfItemsPerCask,
- b.buyingValue = o.price
- WHERE b.entryFk = @myEntry
- AND (b.quantity <> o.NumberOfUnits * o.NumberOfItemsPerCask OR b.buyingValue <> o.price);
-
- SET vLastInserted := NOW();
- -- Inserta la oferta
- INSERT INTO vn.buy(entryFk,
- itemFk,
- quantity,
- buyingValue,
- stickers,
- packing,
- `grouping`,
- groupingMode,
- packageFk,
- deliveryFk)
-
- SELECT @myEntry,
- i.id,
- o.NumberOfUnits * o.NumberOfItemsPerCask as quantity,
- o.Price,
- o.NumberOfUnits as etiquetas,
- o.NumberOfItemsPerCask as packing,
- o.MinimumQuantity * o.NumberOfItemsPerCask as `grouping`,
- 1, -- Obliga al Packing
- o.embalageCode,
- o.diId
- FROM edi.offer o
- JOIN vn.item i ON i.supplyResponseFk = o.srId
- LEFT JOIN vn.buy b ON i.id = b.itemFk AND b.entryFk = @myEntry
- JOIN vn.packaging p ON p.id LIKE o.embalageCode -- llevar esta linea i mirar de crear els packages a temps real
- WHERE b.id IS NULL;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc;
- CREATE TEMPORARY TABLE tmp.buyRecalc
- SELECT id from vn.buy where entryFk = @myEntry AND created >= vLastInserted;
-
- CALL vn.buy_recalcPrices();
-
- END IF;
- /*
- -- Ara la entrada per a Floramondo
- SET @myFloramondoEntry := vn.floramondo_getEntry(vLanded, vFloramondo_WarehouseFk);
-
- IF @myFloramondoEntry THEN
-
- SELECT @myFloramondoEntry;
-
- -- Elimina la oferta obsoleta
- DELETE b FROM vn.buy b
- JOIN vn.item i ON i.id = b.itemFk
- LEFT JOIN edi.offer o ON i.supplyResponseFk = o.`srId`
- LEFT JOIN putOrder po ON b.deliveryFk = po.deliveryInformationID
- WHERE b.entryFk = @myFloramondoEntry
- AND o.`srId` IS NULL
- AND po.id IS NULL;
-
- UPDATE vn.buy b
- JOIN vn.item i ON i.id = b.itemFk
- LEFT JOIN edi.offer o ON i.supplyResponseFk = o.`srId`
- SET b.quantity = 0
- WHERE b.entryFk = @myFloramondoEntry
- AND o.`srId` IS NULL;
-
- -- actualiza la oferta existente
- UPDATE vn.buy b
- JOIN vn.item i ON i.id = b.itemFk
- JOIN edi.offer o ON i.supplyResponseFk = o.`srId`
- SET b.quantity = o.NumberOfUnits * o.NumberOfItemsPerCask,
- b.buyingValue = o.price
- WHERE b.entryFk = @myFloramondoEntry
- AND (b.quantity <> o.NumberOfUnits * o.NumberOfItemsPerCask OR b.buyingValue <> o.price);
-
- SET vLastInserted := NOW();
- -- Inserta la oferta
- INSERT INTO vn.buy(entryFk,
- itemFk,
- quantity,
- buyingValue,
- stickers,
- packing,
- `grouping`,
- groupingMode,
- packageFk,
- deliveryFk)
-
- SELECT @myFloramondoEntry,
- i.id,
- o.NumberOfUnits * o.NumberOfItemsPerCask as quantity,
- o.Price,
- o.NumberOfUnits as etiquetas,
- o.NumberOfItemsPerCask as packing,
- o.MinimumQuantity * o.NumberOfItemsPerCask as `grouping`,
- 1, -- Obliga al Packing
- o.embalageCode,
- o.diId
- FROM edi.offer o
- JOIN vn.item i ON i.supplyResponseFk = o.srId
- LEFT JOIN vn.buy b ON i.id = b.itemFk AND b.entryFk = @myFloramondoEntry
- JOIN vn.packaging p ON p.id LIKE o.embalageCode -- llevar esta linea i mirar de crear els packages a temps real
- WHERE b.id IS NULL;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.buyRecalc;
- CREATE TEMPORARY TABLE tmp.buyRecalc
- SELECT id from vn.buy where entryFk = @myFloramondoEntry AND created >= vLastInserted;
-
- CALL vn.buy_recalcPrices();
-
-
- END IF;
- */
- DROP TEMPORARY TABLE
- edi.offer,
- itemToInsert;
-
- DROP TABLE tmp.item;
- -- select now(),'FINAL';
- COMMIT;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 DROP PROCEDURE IF EXISTS `mail_new` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
@@ -14826,6 +13379,7 @@ BEGIN
JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
WHERE i.id = vItem
AND vAmount / sr.NumberOfItemsPerCask
+ AND di.LatestOrderDateTime > NOW()
LIMIT 1;
-- END IF;
@@ -19135,7 +17689,7 @@ BEGIN
m.enlazadoSage = FALSE
) AS sub ON m.Asiento = sub.Asiento
SET m.Metalico347 = TRUE,
- m.TipoFactura = "",
+ m.TipoFactura = "I",
m.CifDni = sub.fi ,
m.Nombre = sub.Nombre,
m.SiglaNacion = sub.SiglaNacion
@@ -19167,9 +17721,7 @@ BEGIN
GROUP BY pc.codigoCuenta
) sub ON sub.codigoCuenta = pc.codigoCuenta ;
-
-- DUAS
-
UPDATE movConta m
JOIN vn.XDiario x ON x.ASIEN = m.Asiento AND x.SUBCTA =m.CodigoCuenta
JOIN (SELECT ASIEN
@@ -19183,13 +17735,18 @@ BEGIN
m.CuotaIva1 = (x.IVA/100) * x.BASEEURO ,
m.CodigoTransaccion1 = 56 ,
m.CodigoIva1 = IF(x.IVA = 10, 22, 90),
+ m.IvaDeducible1 = TRUE,
m.Serie = x.SERIE,
m.Factura = x.FACTURA,
m.TipoFactura = "R",
- m.FechaFacturaOriginal = x.FECHA_EX
- -- m.Año m.FechaFactura
- WHERE x.SERIE = 'D';
-/*WHERE (x.SUBCTA = '4700000999' OR x.CONTRA = "4330002067") AND
+ m.FechaFacturaOriginal = x.FECHA_EX,
+ m.SuFacturaNo = x.FACTURAEX,
+ m.FechaOperacion = x.FECHA_OP
+ WHERE x.SERIE = 'D';
+
+
+/*-- m.Año m.FechaFactura
+WHERE (x.SUBCTA = '4700000999' OR x.CONTRA = "4330002067") AND
x.SERIE IN ('R','D'); */
@@ -20050,7 +18607,7 @@ BEGIN
SELECT it.taxableBase BASEEURO,
( it.taxableBase/100) * t.PorcentajeIva vat,
t.PorcentajeIva rate,
- i. transactionTypeSageFk transactionCode,
+ it.transactionTypeSageFk transactionCode,
it.taxTypeSageFk taxCode,
t.isIntracommunity,
tt.ClaveOperacionDefecto operationCode,
@@ -20058,51 +18615,56 @@ BEGIN
FROM vn.invoiceIn i
JOIN vn.invoiceInTax it ON it.InvoiceInFk = i.id
JOIN TiposIva t ON t.CodigoIva = it.taxTypeSageFk
- JOIN TiposTransacciones tt ON tt.CodigoTransaccion = i.transactionTypeSageFk
+ JOIN TiposTransacciones tt ON tt.CodigoTransaccion = it.transactionTypeSageFk
LEFT JOIN tmp.invoiceDua id ON id.id = vXDiarioId
- WHERE i.id = vInvoiceInFk;
+ WHERE i.id = vInvoiceInFk AND i.id> 70000; -- los DUAS no son vInvoiceInFk, pero se pasan en el mismo parametro comparten id en tablas distintas de InvoiceIN (100000) dua(20000)
DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
DELETE FROM XDiario_movConta_IVA
WHERE id = vXDiarioId;
+
+ INSERT INTO XDiario_movConta_IVA(id, LibreA1)
+ VALUES (vXDiarioId, vInvoiceInFk);
- OPEN rs;
- FETCH rs INTO vBase,
- vVat,
- vRate,
- vTransactionCode,
- vTaxCode,
- vIsIntracommunity,
- vOperationCode,
- vDuaExcluded;
-
- SET vTransactionCodeOld=vTransactionCode;
- SET vTaxCodeOld=vTaxCode;
-
- IF vDuaExcluded IS NULL THEN
+ OPEN rs;
+ FETCH rs INTO vBase,
+ vVat,
+ vRate,
+ vTransactionCode,
+ vTaxCode,
+ vIsIntracommunity,
+ vOperationCode,
+ vDuaExcluded;
+ SET vTransactionCodeOld=vTransactionCode;
+ SET vTaxCodeOld=vTaxCode;
+
WHILE NOT vDone DO
IF vOperationCode IS NOT NULL THEN
UPDATE XDiario_movConta_IVA
SET ClaveOperacionFactura = vOperationCode
WHERE id = vXDiarioId;
END IF;
-
+
IF vTransactionCode IS NULL THEN
SET vTransactionCode = vTransactionCodeOld;
END IF;
-
+
IF vTaxCodeOld IS NULL THEN
SET vTaxCode = vTaxCodeOld;
END IF;
SET vCounter = vCounter + 1;
-
CASE vCounter
WHEN 1 THEN
- INSERT INTO XDiario_movConta_IVA(id, LibreA1, BaseIva1 , PorIva1 , CuotaIva1, CodigoTransaccion1, CodigoIva1)
- VALUES (vXDiarioId, vInvoiceInFk,vBase, vRate, vVat, vTransactionCode, vTaxCode);
+ UPDATE XDiario_movConta_IVA
+ SET BaseIva1 = vBase,
+ PorIva1 = vRate,
+ CuotaIva1 = vVat,
+ CodigoTransaccion1 = vTransactionCode,
+ CodigoIva1 = vTaxCode
+ WHERE id = vXDiarioId;
WHEN 2 THEN
UPDATE XDiario_movConta_IVA
SET BaseIva2 = vBase,
@@ -20149,10 +18711,6 @@ BEGIN
vOperationCode,
vDuaExcluded;
END WHILE;
- ELSE
- INSERT INTO XDiario_movConta_IVA(id, LibreA1)
- VALUES (vXDiarioId, vInvoiceInFk);
- END IF;
CLOSE rs;
UPDATE XDiario_movConta_IVA xmi
@@ -20176,10 +18734,10 @@ BEGIN
xmi.FechaOperacion = ii.issued,
xmi.MantenerAsiento = TRUE,
xmi.SuFacturaNo = ii.supplierRef,
- xmi.IvaDeducible1 = ii.isVatDeductible,
- xmi.IvaDeducible2 = ii.isVatDeductible,
- xmi.IvaDeducible3 = ii.isVatDeductible,
- xmi.IvaDeducible4 = ii.isVatDeductible,
+ xmi.IvaDeducible1 = IF(id.id,FALSE,IF(IFNULL(xmi.BaseIva1,FALSE),FALSE,ii.isVatDeductible)),
+ xmi.IvaDeducible1 = IF(id.id,FALSE,IF(IFNULL(xmi.BaseIva2,FALSE),FALSE,ii.isVatDeductible)),
+ xmi.IvaDeducible1 = IF(id.id,FALSE,IF(IFNULL(xmi.BaseIva3,FALSE),FALSE,ii.isVatDeductible)),
+ xmi.IvaDeducible1 = IF(id.id,FALSE,IF(IFNULL(xmi.BaseIva4,FALSE),FALSE,ii.isVatDeductible)),
xmi.FechaFacturaOriginal = x.FECHA_EX
WHERE xmi.id = vXDiarioId;
@@ -20368,6 +18926,204 @@ BEGIN
WHERE xmi.id = vXDiarioId AND iit.taxableBase < 0 AND s.account LIKE '_____4____';
*/
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `XDiario_movConta_IVA_InvoiceInAdd_` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `XDiario_movConta_IVA_InvoiceInAdd_`(IN vInvoiceInFk INT, IN vXDiarioId INT)
+BEGIN
+
+ DECLARE vDone BOOL DEFAULT FALSE;
+ DECLARE vBase DOUBLE;
+ DECLARE vVat DOUBLE;
+ DECLARE vRate DOUBLE;
+ DECLARE vTransactionCode INT;
+ DECLARE vCounter INT DEFAULT 0;
+ DECLARE vTransactionCodeOld INT;
+ DECLARE vTaxCode INT;
+ DECLARE vTaxCodeOld INT;
+ DECLARE vOperationCode VARCHAR(1);
+ DECLARE vIsIntracommunity BOOL DEFAULT FALSE;
+ DECLARE vDuaExcluded INT;
+
+ DECLARE rs CURSOR FOR -- IVA
+ SELECT it.taxableBase BASEEURO,
+ ( it.taxableBase/100) * t.PorcentajeIva vat,
+ t.PorcentajeIva rate,
+ i. transactionTypeSageFk transactionCode,
+ it.taxTypeSageFk taxCode,
+ t.isIntracommunity,
+ tt.ClaveOperacionDefecto operationCode,
+ id.id
+ FROM vn.invoiceIn i
+ JOIN vn.invoiceInTax it ON it.InvoiceInFk = i.id
+ JOIN TiposIva t ON t.CodigoIva = it.taxTypeSageFk
+ JOIN TiposTransacciones tt ON tt.CodigoTransaccion = i.transactionTypeSageFk
+ LEFT JOIN tmp.invoiceDua id ON id.id = vXDiarioId
+ WHERE i.id = vInvoiceInFk;
+
+ DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+
+ DELETE FROM XDiario_movConta_IVA
+ WHERE id = vXDiarioId;
+
+ OPEN rs;
+ FETCH rs INTO vBase,
+ vVat,
+ vRate,
+ vTransactionCode,
+ vTaxCode,
+ vIsIntracommunity,
+ vOperationCode,
+ vDuaExcluded;
+
+ SET vTransactionCodeOld=vTransactionCode;
+ SET vTaxCodeOld=vTaxCode;
+
+ IF vDuaExcluded IS NULL THEN
+
+ WHILE NOT vDone DO
+ IF vOperationCode IS NOT NULL THEN
+ UPDATE XDiario_movConta_IVA
+ SET ClaveOperacionFactura = vOperationCode
+ WHERE id = vXDiarioId;
+ END IF;
+
+ IF vTransactionCode IS NULL THEN
+ SET vTransactionCode = vTransactionCodeOld;
+ END IF;
+
+ IF vTaxCodeOld IS NULL THEN
+ SET vTaxCode = vTaxCodeOld;
+ END IF;
+
+ SET vCounter = vCounter + 1;
+
+ CASE vCounter
+ WHEN 1 THEN
+ INSERT INTO XDiario_movConta_IVA(id, LibreA1, BaseIva1 , PorIva1 , CuotaIva1, CodigoTransaccion1, CodigoIva1)
+ VALUES (vXDiarioId, vInvoiceInFk,vBase, vRate, vVat, vTransactionCode, vTaxCode);
+ WHEN 2 THEN
+ UPDATE XDiario_movConta_IVA
+ SET BaseIva2 = vBase,
+ PorIva2 = vRate,
+ CuotaIva2 = vVat,
+ CodigoTransaccion2 = vTransactionCode,
+ CodigoIva2 = vTaxCode
+ WHERE id = vXDiarioId;
+ WHEN 3 THEN
+ UPDATE XDiario_movConta_IVA
+ SET BaseIva3 = vBase,
+ PorIva3 = vRate,
+ CuotaIva3 = vVat,
+ CodigoTransaccion3 = vTransactionCode,
+ CodigoIva3 = vTaxCode
+ WHERE id = vXDiarioId;
+ WHEN 4 THEN
+ UPDATE XDiario_movConta_IVA
+ SET BaseIva4 = vBase,
+ PorIva4 = vRate,
+ CuotaIva4 = vVat,
+ CodigoTransaccion4 = vTransactionCode,
+ CodigoIva4 = vTaxCode
+ WHERE id = vXDiarioId;
+ ELSE
+ SELECT vXDiarioId;
+ END CASE;
+
+ IF vIsIntracommunity THEN
+ UPDATE XDiario_movConta_IVA
+ SET Intracomunitaria = TRUE
+ WHERE id = vXDiarioId;
+ END IF;
+
+ SET vTransactionCodeOld=vTransactionCode;
+ SET vTaxCodeOld=vTaxCode;
+
+ FETCH rs INTO vBase,
+ vVat,
+ vRate,
+ vTransactionCode,
+ vTaxCode,
+ vIsIntracommunity,
+ vOperationCode,
+ vDuaExcluded;
+ END WHILE;
+ ELSE
+ INSERT INTO XDiario_movConta_IVA(id, LibreA1)
+ VALUES (vXDiarioId, vInvoiceInFk);
+ END IF;
+ CLOSE rs;
+
+ UPDATE XDiario_movConta_IVA xmi
+ JOIN tmp.invoiceInList ii ON ii.id = vInvoiceInFk
+ JOIN vn2008.XDiario x ON x.id = xmi.id
+ LEFT JOIN tmp.invoiceDua id ON id.id = xmi.id
+ JOIN vn.supplier s ON s.id = ii.supplierFk
+ JOIN Naciones n ON n.countryFk = s.countryFk
+ SET xmi.CodigoDivisa = ii.currencyFk,
+ xmi.Año = YEAR(ii.issued),
+ xmi.Serie = ii.serial,
+ xmi.Factura = ii.serialNumber, -- x.FACTURA, DUAS¿?
+ xmi.FechaFactura = ii.issued,
+ xmi.ImporteFactura = BaseIva1 + CuotaIva1 + BaseIva2 + CuotaIva2 + BaseIva3 + CuotaIva3 + BaseIva4 + CuotaIva4,
+ xmi.TipoFactura = IF(id.id,IF( ii.serial = 'D', 'R','I'), 'R'), -- MARCAR I para informativa
+ xmi.CodigoCuentaFactura = x.SUBCTA,
+ xmi.CifDni = IF(LEFT(TRIM(s.nif),2) = n.SiglaNacion, SUBSTRING(TRIM(s.nif),3) ,s.nif),
+ xmi.Nombre = s.name,
+ xmi.SiglaNacion = n.SiglaNacion,
+ xmi.EjercicioFactura = YEAR(ii.issued),
+ xmi.FechaOperacion = ii.issued,
+ xmi.MantenerAsiento = TRUE,
+ xmi.SuFacturaNo = ii.supplierRef,
+ xmi.IvaDeducible1 = ii.isVatDeductible,
+ xmi.IvaDeducible2 = ii.isVatDeductible,
+ xmi.IvaDeducible3 = ii.isVatDeductible,
+ xmi.IvaDeducible4 = ii.isVatDeductible,
+ xmi.FechaFacturaOriginal = x.FECHA_EX
+ WHERE xmi.id = vXDiarioId;
+
+ -- RETENCIONES
+ /* UPDATE XDiario_movConta_IVA xmi
+ JOIN vn.invoiceIn ii ON ii.id = vInvoiceInFk
+ JOIN vn2008.XDiario x ON x.id = xmi.id
+ JOIN vn.supplier s ON s.id = supplierFk
+ JOIN vn.invoiceInTax iit ON iit.invoiceInFk = ii.id
+ JOIN TiposRetencion t ON t.CodigoRetencion = ii.withholdingSageFk
+ SET xmi.CodigoRetencion = t.CodigoRetencion,
+ xmi.BaseRetencion = iit.taxableBase,
+ xmi.PorRetencion = t.PorcentajeRetencion,
+ xmi.ImporteRetencion = iit.taxableBase * (t.PorcentajeRetencion / 100)
+ WHERE xmi.id = vXDiarioId AND iit.taxableBase < 0 ;*/
+
+ UPDATE XDiario_movConta_IVA xmi
+ JOIN vn.invoiceIn ii ON ii.id = vInvoiceInFk
+ JOIN vn2008.XDiario x ON x.id = xmi.id
+ JOIN vn.supplier s ON s.id = supplierFk
+ JOIN vn.invoiceInTax iit ON iit.invoiceInFk = ii.id
+ JOIN TiposRetencion t ON t.CodigoRetencion = ii.withholdingSageFk
+ JOIN (SELECT SUM(BASEEURO) taxableBase, SUM(EURODEBE) taxBase
+ FROM vn.XDiario
+ WHERE BASEEURO <> 0 AND ASIEN = (SELECT ASIEN FROM vn.XDiario WHERE id = vXDiarioId)
+ )sub
+ SET xmi.CodigoRetencion = t.CodigoRetencion,
+ xmi.BaseRetencion = IF (t.CodigoRetencion = 2, sub.taxableBase + sub.taxBase, sub.taxableBase),
+ xmi.PorRetencion = t.PorcentajeRetencion,
+ xmi.ImporteRetencion = iit.taxableBase * - 1
+ WHERE xmi.id = vXDiarioId AND iit.expenceFk= 4751000000 ;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -20410,7 +19166,7 @@ BEGIN
SUBCTA = '4700000999'
) AND
NOT CONTRA <=> "4330002067";
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.invoiceInList;
CREATE TEMPORARY TABLE tmp.invoiceInList
SELECT i.id id,
@@ -20447,6 +19203,7 @@ BEGIN
END WHILE;
CLOSE rs;
+/* --Facturas con IVA 0 (-) no se trasladan a sage
UPDATE sage.XDiario_movConta_IVA xmi
JOIN ( SELECT sub.invoiceIn invoiceIn, XDiarioFk, SUM(total) total, tipo
FROM (SELECT IFNULL(ii.id,x.FACTURA) invoiceIn, x.id XDiarioFk,tc.type tipo, 1 as total
@@ -20463,7 +19220,7 @@ BEGIN
GROUP BY sub.invoiceIn, sub.XDiarioFk
HAVING tipo='-' AND total = 1
) sub2 ON sub2.invoiceIn = xmi.LibreA1 AND sub2.XDiarioFk = xmi.id
- SET moveData = FALSE;
+ SET moveData = FALSE;*/
-- Gastos
UPDATE XDiario_movConta_IVA xm
@@ -21184,13 +19941,21 @@ BEGIN
WHERE iot.invoiceOutFk = vInvoiceOutCorrectedFk
) iocTAX
SET xmi.TipoRectificativa = 2,
- xmi.ClaseAbonoRectificativas = ic.invoiceCorrectionTypeFk,
+ xmi.ClaseAbonoRectificativas = 1, -- ic.invoiceCorrectionTypeFk no coincide con las opcioens de SAGE *
xmi.FechaFacturaOriginal = io.issued,
- xmi.BaseImponibleOriginal = iocTAX.Base,
+ xmi.FechaOperacion = io.issued,
+ xmi.BaseImponibleOriginal = iocTAX.Base,
xmi.CuotaIvaOriginal = iocTAX.CuotaIva,
xmi.RecargoEquivalenciaOriginal = RE,
xmi.ClaveOperacionFactura = 'D'
WHERE xmi.id = vXDiarioId;
+ /*
+ Envases y embalajes / descuentos y bonificaciones / eror fundado
+ Concurso de acreedores
+ Creditos incobrables
+ resto de tectificativas
+ Restificativas de facturas simplificadas
+ */
END IF;
END ;;
DELIMITER ;
@@ -24415,6 +23180,7 @@ CREATE TABLE `agencyMode` (
`isExternalAgency` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'obsoleta',
`flag` blob COMMENT 'obsoleta',
`code` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `isRiskFree` tinyint(1) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`),
KEY `Agencias` (`name`),
KEY `Vista` (`deliveryMethodFk`),
@@ -25053,6 +23819,21 @@ SET character_set_client = utf8;
1 AS `nickname`*/;
SET character_set_client = @saved_cs_client;
+--
+-- Temporary table structure for view `buyerSales`
+--
+
+DROP TABLE IF EXISTS `buyerSales`;
+/*!50001 DROP VIEW IF EXISTS `buyerSales`*/;
+SET @saved_cs_client = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE VIEW `buyerSales` AS SELECT
+ 1 AS `importe`,
+ 1 AS `comprador`,
+ 1 AS `año`,
+ 1 AS `semana`*/;
+SET character_set_client = @saved_cs_client;
+
--
-- Table structure for table `calendar`
--
@@ -25822,7 +24603,9 @@ CREATE TABLE `clientCreditLimit` (
`id` int(11) NOT NULL,
`maxAmount` int(10) unsigned NOT NULL,
`roleFk` int(10) unsigned NOT NULL,
- PRIMARY KEY (`id`)
+ PRIMARY KEY (`id`),
+ KEY `clientCreditLimit_FK_idx` (`roleFk`),
+ CONSTRAINT `clientCreditLimit_FK` FOREIGN KEY (`roleFk`) REFERENCES `account`.`role` (`id`) ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -26054,6 +24837,23 @@ CREATE TABLE `clientType` (
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Establece categorias para poder agrupar las ventas';
/*!40101 SET character_set_client = @saved_cs_client */;
+--
+-- Table structure for table `clientYoke`
+--
+
+DROP TABLE IF EXISTS `clientYoke`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `clientYoke` (
+ `leftOx` int(11) NOT NULL,
+ `rightOx` int(11) NOT NULL,
+ PRIMARY KEY (`leftOx`,`rightOx`),
+ KEY `clientYoke_fk2_idx` (`rightOx`),
+ CONSTRAINT `clientYoke_fk1` FOREIGN KEY (`leftOx`) REFERENCES `client` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `clientYoke_fk2` FOREIGN KEY (`rightOx`) REFERENCES `client` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='emparejamiento de clientes a efectos de precios';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `cmr`
--
@@ -26681,6 +25481,8 @@ CREATE TABLE `conveyorMove` (
`fromConveyorFk` int(11) NOT NULL,
`toConveyorFk` int(11) NOT NULL,
`created` datetime NOT NULL,
+ `moved` datetime DEFAULT NULL,
+ `expeditionFk` int(11) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -26720,6 +25522,7 @@ CREATE TABLE `country` (
PRIMARY KEY (`id`),
KEY `Id_Paisreal` (`politicalCountryFk`),
KEY `currency_id_fk_idx` (`currencyFk`),
+ KEY `country_Ix4` (`country`),
CONSTRAINT `currency_id_fk` FOREIGN KEY (`currencyFk`) REFERENCES `currency` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -27723,13 +26526,15 @@ CREATE TABLE `ektEntryAssign` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`kop` int(11) DEFAULT NULL,
`sub` mediumint(8) unsigned DEFAULT NULL,
+ `pro` mediumint(8) unsigned DEFAULT NULL,
`warehouseOutFk` int(11) DEFAULT NULL,
`warehouseInFk` int(11) DEFAULT NULL,
`agencyModeFk` int(11) DEFAULT NULL,
`supplierFk` int(11) DEFAULT NULL,
`entryFk` int(11) DEFAULT NULL,
`ref` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
- PRIMARY KEY (`id`)
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `ektEntryAssign_ix1` (`kop`,`sub`,`pro`)
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='define las condiciones para asignar entradas a los ekt';
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -27809,6 +26614,7 @@ CREATE TABLE `entry` (
`loadPriority` int(11) DEFAULT NULL,
`kop` int(11) DEFAULT NULL,
`sub` mediumint(8) unsigned DEFAULT NULL,
+ `pro` mediumint(8) unsigned DEFAULT NULL,
PRIMARY KEY (`id`),
KEY `Id_Proveedor` (`supplierFk`),
KEY `Fecha` (`dated`),
@@ -29306,8 +28112,7 @@ SET character_set_client = utf8;
1 AS `cplusTrascendency472Fk`,
1 AS `bookEntried`,
1 AS `isVatDeductible`,
- 1 AS `withholdingSageFk`,
- 1 AS `transactionTypeSageFk`*/;
+ 1 AS `withholdingSageFk`*/;
SET character_set_client = @saved_cs_client;
--
@@ -29572,17 +28377,17 @@ CREATE TABLE `item` (
`longName` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
`subName` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
`tag5` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
- `value5` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `value5` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
`tag6` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
- `value6` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `value6` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
`tag7` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
- `value7` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `value7` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
`tag8` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
- `value8` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `value8` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
`tag9` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
- `value9` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `value9` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
`tag10` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
- `value10` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `value10` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
`compression` decimal(5,2) NOT NULL DEFAULT '1.00' COMMENT 'Relacion de compresividad entre el volumen de las entradas en Silla y el empaquetado en los envios a clientes.\n\nMenor que 1 significa que se puede comprimir más que el volumen original.',
`minimum` decimal(10,0) unsigned NOT NULL DEFAULT '3' COMMENT 'Cantidad máxima de cajas / cubos que cabe en un nicho',
`upToDown` decimal(10,0) unsigned NOT NULL DEFAULT '0' COMMENT 'Se muestra el precio por kilo ',
@@ -31832,6 +30637,29 @@ CREATE TABLE `payMethod` (
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
+--
+-- Temporary table structure for view `payment__`
+--
+
+DROP TABLE IF EXISTS `payment__`;
+/*!50001 DROP VIEW IF EXISTS `payment__`*/;
+SET @saved_cs_client = @@character_set_client;
+SET character_set_client = utf8;
+/*!50001 CREATE VIEW `payment__` AS SELECT
+ 1 AS `id`,
+ 1 AS `received`,
+ 1 AS `dueDated`,
+ 1 AS `supplierFk`,
+ 1 AS `amount`,
+ 1 AS `currencyFk`,
+ 1 AS `divisa`,
+ 1 AS `bankFk`,
+ 1 AS `payMethodFk`,
+ 1 AS `companyFk`,
+ 1 AS `exchangeInsuranceFk`,
+ 1 AS `isConciliated`*/;
+SET character_set_client = @saved_cs_client;
+
--
-- Table structure for table `pcs`
--
@@ -34506,6 +33334,7 @@ CREATE TABLE `tag` (
) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Categorias para etiquetar los productos';
/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `tagAbbreviation`
--
@@ -38949,43 +37778,220 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` FUNCTION `ekt_getEntry`(vEktFk INT) RETURNS int(11)
+CREATE DEFINER=`z-developer`@`%` FUNCTION `ekt_getEntry`(vEktFk INT) RETURNS int(11)
+ READS SQL DATA
+BEGIN
+ DECLARE vTravelFk INT;
+ DECLARE vEntryFk INT DEFAULT 0;
+ DECLARE vEntryAssignFk INT;
+
+ SET vTravelFk = vn.ekt_getTravel(vEktFk);
+
+ IF vTravelFk THEN
+
+ SELECT ea.id INTO vEntryAssignFk
+ FROM edi.ekt e
+ JOIN vn.travel tr ON tr.id = vTravelFk
+ JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk
+ AND ea.warehouseInFk = tr.warehouseInFk
+ AND ea.agencyModeFk = tr.agencyFk
+ AND IFNULL(ea.sub, e.sub) <=> e.sub
+ AND IFNULL(ea.kop, e.kop) <=> e.kop
+ AND IFNULL(ea.pro, e.pro) <=> e.pro
+ WHERE e.id = vEktFk
+ ORDER BY ea.sub <=> e.sub AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC,
+ ea.sub <=> e.sub AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
+ ea.sub <=> e.sub AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC,
+ ea.sub <=> e.sub AND ISNULL(ea.kop) AND ISNULL(ea.pro) DESC,
+ ISNULL(ea.sub) AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC,
+ ISNULL(ea.sub) AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
+ ISNULL(ea.sub) AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC
+ LIMIT 1;
+
+ SELECT MAX(e.id) INTO vEntryFk
+ FROM vn.entry e
+ JOIN vn.ektEntryAssign ea ON ea.id = vEntryAssignFk
+ WHERE e.travelFk = vTravelFk
+ AND e.sub <=> ea.sub
+ AND e.kop <=> ea.kop
+ AND e.pro <=> ea.pro;
+
+
+ IF IFNULL(vEntryFk,0) = 0 THEN
+
+ INSERT INTO vn.entry(travelFk, supplierFk, companyFk, currencyFk, kop, sub, ref, pro)
+ SELECT vTravelFk, ea.supplierFk, c.id, cu.id, ea.kop, ea.sub, ea.ref, ea.pro
+ FROM vn.ektEntryAssign ea
+ JOIN vn.company c ON c.code = 'VNL'
+ JOIN vn.currency cu ON cu.code = 'EUR'
+ WHERE ea.id = vEntryAssignFk;
+
+ SELECT MAX(id) INTO vEntryFk
+ FROM vn.entry
+ WHERE travelFk = vTravelFk;
+
+ END IF;
+
+ UPDATE vn.ektEntryAssign
+ SET entryFk = vEntryFk
+ WHERE id = vEntryAssignFk;
+
+ ELSE
+
+ SET vEntryFk = 9200;
+
+ END IF;
+
+ RETURN vEntryFk;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP FUNCTION IF EXISTS `ekt_getEntry_beta` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`z-developer`@`%` FUNCTION `ekt_getEntry_beta`(vEktFk INT) RETURNS int(11)
+ READS SQL DATA
+BEGIN
+ DECLARE vTravelFk INT;
+ DECLARE vEntryFk INT DEFAULT 0;
+ DECLARE vEntryAssignFk INT;
+
+ SET vTravelFk = vn.ekt_getTravel(vEktFk);
+
+ IF vTravelFk THEN
+
+ SELECT ea.id INTO vEntryAssignFk
+ FROM edi.ekt e
+ JOIN vn.travel tr ON tr.id = vTravelFk
+ JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk
+ AND ea.warehouseInFk = tr.warehouseInFk
+ AND ea.agencyModeFk = tr.agencyFk
+ AND IFNULL(ea.sub, e.sub) <=> e.sub
+ AND IFNULL(ea.kop, e.kop) <=> e.kop
+ AND IFNULL(ea.pro, e.pro) <=> e.pro
+ WHERE e.id = vEktFk
+ ORDER BY ea.sub <=> e.sub AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC,
+ ea.sub <=> e.sub AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
+ ea.sub <=> e.sub AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC,
+ ea.sub <=> e.sub AND ISNULL(ea.kop) AND ISNULL(ea.pro) DESC,
+ ISNULL(ea.sub) AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC,
+ ISNULL(ea.sub) AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
+ ISNULL(ea.sub) AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC
+ LIMIT 1;
+
+ SELECT MAX(e.id) INTO vEntryFk
+ FROM vn.entry e
+ JOIN vn.ektEntryAssign ea ON ea.id = vEntryAssignFk
+ WHERE e.travelFk = vTravelFk
+ AND e.sub <=> ea.sub
+ AND e.kop <=> ea.kop
+ AND e.pro <=> ea.pro;
+
+
+ IF IFNULL(vEntryFk,0) = 0 THEN
+
+ INSERT INTO vn.entry(travelFk, supplierFk, companyFk, currencyFk, kop, sub, ref, pro)
+ SELECT vTravelFk, ea.supplierFk, c.id, cu.id, ea.kop, ea.sub, ea.ref, ea.pro
+ FROM vn.ektEntryAssign ea
+ JOIN vn.company c ON c.code = 'VNL'
+ JOIN vn.currency cu ON cu.code = 'EUR'
+ WHERE ea.id = vEntryAssignFk;
+
+ SELECT MAX(id) INTO vEntryFk
+ FROM vn.entry
+ WHERE travelFk = vTravelFk;
+
+ END IF;
+
+ UPDATE vn.ektEntryAssign
+ SET entryFk = vEntryFk
+ WHERE id = vEntryAssignFk;
+
+ ELSE
+
+ SET vEntryFk = 9200;
+
+ END IF;
+
+ RETURN vEntryFk;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP FUNCTION IF EXISTS `ekt_getEntry__` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` FUNCTION `ekt_getEntry__`(vEktFk INT) RETURNS int(11)
READS SQL DATA
BEGIN
DECLARE vTravelFk INT;
DECLARE vEntryFk INT DEFAULT 0;
- SET vTravelFk = ekt_getTravel(vEktFk);
+ SET vTravelFk = vn.ekt_getTravel(vEktFk);
IF vTravelFk THEN
- SELECT e.id INTO vEntryFk
- FROM vn.entry e
- JOIN edi.ekt ON ekt.kop = e.kop AND (ekt.sub <=> e.sub OR e.sub IS NULL)
- WHERE e.travelFk = vTravelFk
- AND ekt.id = vEktFk
- AND e.invoiceInFk IS NULL
- AND NOT (isConfirmed AND isOrdered)
- ORDER BY e.sub <=> ekt.sub DESC
+ SELECT ea.id INTO vEntryFk
+ FROM vn.entry ea
+ JOIN edi.ekt e ON e.id = vEktFk
+ WHERE ea.travelFk = vTravelFk
+ AND ea.invoiceInFk IS NULL
+ AND NOT (ea.isConfirmed AND ea.isOrdered)
+ AND (ea.sub = e.sub OR ea.kop = e.kop OR ea.pro = e.pro)
+ ORDER BY ea.sub <=> e.sub AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC,
+ ea.sub <=> e.sub AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
+ ea.sub <=> e.sub AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC,
+ ea.sub <=> e.sub AND ISNULL(ea.kop) AND ISNULL(ea.pro) DESC,
+ ISNULL(ea.sub) AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC,
+ ISNULL(ea.sub) AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
+ ISNULL(ea.sub) AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC
+
LIMIT 1;
IF NOT vEntryFk THEN
- INSERT INTO vn.entry(travelFk, supplierFk, companyFk, currencyFk, kop, sub, ref)
- SELECT vTravelFk, ea.supplierFk, c.id, cu.id, ea.kop, ea.sub, ea.ref
- FROM edi.ekt
+ INSERT INTO vn.entry(travelFk, supplierFk, companyFk, currencyFk, kop, sub, ref, pro)
+ SELECT vTravelFk, ea.supplierFk, c.id, cu.id, ea.kop, ea.sub, ea.ref, ea.pro
+ FROM edi.ekt e
JOIN vn.travel tr ON tr.id = vTravelFk
JOIN vn.company c ON c.code = 'VNL'
JOIN vn.currency cu ON cu.code = 'EUR'
JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk
- AND ea.warehouseInFk = tr.warehouseInFk
- AND ea.agencyModeFk = tr.agencyFk
- AND ea.kop = ekt.kop
- AND (ea.sub <=> ekt.sub OR ea.sub IS NULL)
- AND tr.landed = ekt.fec
- WHERE ekt.id = vEktFk
- ORDER BY ea.sub <=> ekt.sub DESC
+ AND ea.warehouseInFk = tr.warehouseInFk
+ AND ea.agencyModeFk = tr.agencyFk
+ AND IFNULL(ea.sub, e.sub) <=> e.sub
+ AND IFNULL(ea.kop, e.kop) <=> e.kop
+ AND IFNULL(ea.pro, e.pro) <=> e.pro
+ AND tr.landed = e.fec
+ WHERE e.id = vEktFk
+ ORDER BY ea.sub <=> e.sub AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC,
+ ea.sub <=> e.sub AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
+ ea.sub <=> e.sub AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC,
+ ea.sub <=> e.sub AND ISNULL(ea.kop) AND ISNULL(ea.pro) DESC,
+ ISNULL(ea.sub) AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC,
+ ISNULL(ea.sub) AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
+ ISNULL(ea.sub) AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC
+
LIMIT 1;
SELECT MAX(id) INTO vEntryFk
@@ -39023,19 +38029,53 @@ CREATE DEFINER=`root`@`%` FUNCTION `ekt_getTravel`(vEktFk INT) RETURNS int(11)
BEGIN
DECLARE vTravelFk INT;
-
+ DECLARE vEntryAssignFk INT;
+
+ SELECT ea.id INTO vEntryAssignFk
+ FROM edi.ekt e
+ JOIN vn.ektEntryAssign ea ON IFNULL(ea.sub, e.sub) <=> e.sub
+ AND IFNULL(ea.kop, e.kop) <=> e.kop
+ AND IFNULL(ea.pro, e.pro) <=> e.pro
+ WHERE e.id = vEktFk
+ ORDER BY ea.sub <=> e.sub AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC,
+ ea.sub <=> e.sub AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
+ ea.sub <=> e.sub AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC,
+ ea.sub <=> e.sub AND ISNULL(ea.kop) AND ISNULL(ea.pro) DESC,
+ ISNULL(ea.sub) AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC,
+ ISNULL(ea.sub) AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
+ ISNULL(ea.sub) AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC
+ LIMIT 1;
+
+ SELECT MAX(tr.id) INTO vTravelFk
+ FROM vn.travel tr
+ JOIN vn.ektEntryAssign ea ON ea.id = vEntryAssignFk
+ JOIN edi.ekt e ON e.id = vEktFk
+ WHERE ea.warehouseOutFk = tr.warehouseOutFk
+ AND ea.warehouseInFk = tr.warehouseInFk
+ AND ea.agencyModeFk = tr.agencyFk
+ AND tr.landed = e.fec;
+
+ /*
SELECT tr.id INTO vTravelFk
FROM vn.travel tr
JOIN edi.ekt e ON e.id = vEktFk
JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk
AND ea.warehouseInFk = tr.warehouseInFk
AND ea.agencyModeFk = tr.agencyFk
- AND ea.kop = e.kop
- AND (ea.sub <=> e.sub OR ea.sub IS NULL)
+ AND (ea.sub = e.sub OR ea.kop = e.kop OR ea.pro = e.pro)
AND tr.landed = e.fec
- ORDER BY ea.sub <=> e.sub DESC
+ ORDER BY ea.sub <=> e.sub AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC,
+ ea.sub <=> e.sub AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
+ ea.sub <=> e.sub AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC,
+ ea.sub <=> e.sub AND ISNULL(ea.kop) AND ISNULL(ea.pro) DESC,
+ ISNULL(ea.sub) AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC,
+ ISNULL(ea.sub) AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
+ ISNULL(ea.sub) AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC
LIMIT 1;
-
+ */
+
+
+
IF NOT vTravelFk THEN
INSERT INTO vn.travel(landed, shipped, warehouseInFk, warehouseOutFk, agencyFk)
@@ -39043,19 +38083,25 @@ BEGIN
FROM edi.ekt e
JOIN vn.ektEntryAssign ea ON ea.kop = e.kop
WHERE e.id = vEktFk
- ORDER BY ea.sub <=> e.sub DESC, ea.sub IS NULL DESC
+ ORDER BY ea.sub <=> e.sub AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC,
+ ea.sub <=> e.sub AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
+ ea.sub <=> e.sub AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC,
+ ea.sub <=> e.sub AND ISNULL(ea.kop) AND ISNULL(ea.pro) DESC,
+ ISNULL(ea.sub) AND ea.kop <=> e.kop AND ea.pro <=> e.pro DESC,
+ ISNULL(ea.sub) AND ea.kop <=> e.kop AND ISNULL(ea.pro) DESC,
+ ISNULL(ea.sub) AND ISNULL(ea.kop) AND ea.pro <=> e.pro DESC
LIMIT 1;
- SELECT tr.id INTO vTravelFk
+ SELECT MAX(id) INTO vTravelFk
FROM vn.travel tr
JOIN edi.ekt e ON e.id = vEktFk
JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk
- AND ea.warehouseInFk = tr.warehouseInFk
- AND ea.agencyModeFk = tr.agencyFk
- AND ea.kop = e.kop
- AND tr.landed = e.fec
- ORDER BY ea.sub <=> e.sub DESC, ea.sub IS NULL DESC
- LIMIT 1;
+ AND ea.warehouseInFk = tr.warehouseInFk
+ AND ea.agencyModeFk = tr.agencyFk
+ AND IFNULL(ea.sub, e.sub) <=> e.sub
+ AND IFNULL(ea.kop, e.kop) <=> e.kop
+ AND IFNULL(ea.pro, e.pro) <=> e.pro
+ AND tr.landed = e.fec;
END IF;
@@ -43839,6 +42885,7 @@ proc: BEGIN
DECLARE vIsLogifloraAllowed BOOLEAN DEFAULT 0;
DECLARE vMaxLogifloraDays INT;
DECLARE vRangeLogifloraDays INT DEFAULT 3;
+ DECLARE vVisibleCache INT;
SELECT volume INTO vBoxVolume
FROM vn.packaging
@@ -43859,12 +42906,14 @@ proc: BEGIN
FROM edi.warehouseFloramondo
WHERE warehouseFk = vWarehouseFk;
- IF (NOT vIsLogifloraAllowed AND vVNHWarehouseFk <> vWarehouseFk)
- OR NOT (vShipped BETWEEN TIMESTAMPADD(DAY, vMaxLogifloraDays, CURDATE())
- AND TIMESTAMPADD(DAY, vMaxLogifloraDays + vRangeLogifloraDays, CURDATE()) )
+ CALL cache.visible_refresh(vVisibleCache, FALSE, vWarehouseFk);
+
+ IF (NOT vIsLogifloraAllowed AND vVNHWarehouseFk != vWarehouseFk)
+ OR (vShipped > TIMESTAMPADD(DAY, vMaxLogifloraDays + vRangeLogifloraDays, CURDATE()) )
THEN
DELETE tl FROM tmp.ticketLot tl
JOIN item i ON i.id = tl.itemFk
+ LEFT JOIN cache.visible v ON v.calc_id = vVisibleCache AND v.item_id = i.id
LEFT JOIN (SELECT DISTINCT s.itemFk
FROM vn.sale s
JOIN vn.ticket t ON t.id = s.ticketFk
@@ -43873,7 +42922,8 @@ proc: BEGIN
AND t.shipped = vShipped
AND t.zoneFk = vZoneFk) sub ON sub.itemFk = i.id
WHERE i.supplyResponseFk
- AND ISNULL(sub.itemFk);
+ AND ISNULL(sub.itemFk)
+ AND IFNULL(v.visible ,0) = 0;
END IF;
SET @rate2 := 0;
@@ -43952,13 +43002,28 @@ proc: BEGIN
FROM tmp.ticketComponent tc
JOIN tmp.ticketComponentCalculate tcc ON tcc.itemFk = tc.itemFk AND tcc.warehouseFk = tc.warehouseFk
GROUP BY tc.itemFk, warehouseFk;
-
- INSERT INTO tmp.ticketComponent
+
+ -- RECOBRO
+ /*
+ INSERT INTO tmp.ticketComponent
SELECT tcb.warehouseFk, tcb.itemFk, vRecoveryComponent, ROUND(tcb.base * LEAST(cr.priceIncreasing, 0.25), 3)
FROM tmp.ticketComponentBase tcb
JOIN claimRatio cr ON cr.clientFk = vClientFk
WHERE cr.priceIncreasing > 0.009;
-
+ */
+ INSERT INTO tmp.ticketComponent
+ SELECT tcb.warehouseFk, tcb.itemFk, vRecoveryComponent,
+ ROUND(tcb.base * LEAST(MAX(GREATEST(IFNULL(cr.priceIncreasing,0), IFNULL(cr1.priceIncreasing,0), IFNULL(cr2.priceIncreasing,0))), 0.25), 3)
+ FROM tmp.ticketComponentBase tcb
+ JOIN claimRatio cr ON cr.clientFk = vClientFk
+ LEFT JOIN clientYoke cy1 ON cy1.leftOx = cr.clientFk
+ LEFT JOIN claimRatio cr1 ON cr1.clientFk = cy1.rightOx
+ LEFT JOIN clientYoke cy2 ON cy2.rightOx = cr.clientFk
+ LEFT JOIN claimRatio cr2 ON cr2.clientFk = cy2.leftOx
+ WHERE GREATEST(IFNULL(cr.priceIncreasing,0), IFNULL(cr1.priceIncreasing,0), IFNULL(cr2.priceIncreasing,0)) > 0.009
+ GROUP BY tcb.itemFk;
+
+
INSERT INTO tmp.ticketComponent
SELECT tcb.warehouseFk, tcb.itemFk, vManaAutoComponent, ROUND(base * (0.01 + wm.pricesModifierRate), 3) as manaAuto
FROM tmp.ticketComponentBase tcb
@@ -44328,6 +43393,102 @@ BEGIN
CALL shelving_clean;
CALL ticketPackagingRecovery;
+
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `clean_logiflora` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `clean_logiflora`()
+BEGIN
+
+ DECLARE done INT DEFAULT FALSE;
+ DECLARE vId INT;
+ DECLARE cur1 CURSOR FOR SELECT id FROM tmp.buy;
+ DECLARE cur2 CURSOR FOR SELECT id FROM tmp.item;
+
+ DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.buy;
+
+ CREATE TEMPORARY TABLE tmp.buy
+ ENGINE = MEMORY
+ SELECT b.id
+ FROM vn.buy b
+ JOIN vn.entry e ON e.id = b.entryFk
+ JOIN vn.travel tr ON tr.id = e.travelFk
+ JOIN vn.agencyMode am ON am.id = tr.agencyFk
+ WHERE b.quantity = 0
+ AND am.name = 'LOGIFLORA'
+ AND e.isRaid;
+
+ OPEN cur1;
+
+ read_loop: LOOP
+
+ SET done = FALSE;
+
+ FETCH cur1 INTO vId;
+
+ IF done THEN
+ LEAVE read_loop;
+ END IF;
+
+ DELETE FROM vn.buy WHERE id = vId;
+
+ END LOOP;
+
+ CLOSE cur1;
+
+ DROP TEMPORARY TABLE tmp.buy;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.item;
+
+ CREATE TEMPORARY TABLE tmp.item
+ ENGINE = MEMORY
+ SELECT DISTINCT i.id
+ FROM vn.item i
+ LEFT JOIN hedera.orderRow o ON o.itemFk = i.id
+ LEFT JOIN vn.sale s ON s.itemFk = i.id
+ LEFT JOIN vn.buy b ON b.itemFk = i.id
+ LEFT JOIN vn.entry e ON e.id = b.entryFk
+ WHERE i.supplyResponseFk
+ AND o.id IS NULL
+ AND b.id IS NULL
+ AND s.id IS NULL;
+
+ OPEN cur2;
+
+ read_loop: LOOP
+
+ SET done = FALSE;
+
+ FETCH cur2 INTO vId;
+
+ IF done THEN
+ LEAVE read_loop;
+ END IF;
+
+ DELETE FROM vn.item WHERE id = vId;
+
+ END LOOP;
+
+ CLOSE cur2;
+
+ DROP TEMPORARY TABLE tmp.item;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -45714,7 +44875,7 @@ BEGIN
ish.visible,
IF(ts.isStowaway, - 100000, IF(ish.visible > 0 OR iss.id, 1, 100000)) * p.pickingOrder as `order`,
IFNULL(IF(sc.isPreviousPreparedByPacking, ish.packing, g.`grouping`),1) as `grouping`,
- IF(iss.id, TO_SECONDS(TIMESTAMPADD(YEAR,-vCurrentYear,iss.created)), TO_SECONDS(TIMESTAMPADD(YEAR,-vCurrentYear,ish.created)) + TO_SECONDS(TIMESTAMPADD(YEAR,-vCurrentYear,NOW()))) as priority,
+ IF(iss.id, TO_SECONDS(TIMESTAMPADD(YEAR,-vCurrentYear,iss.created)), TO_SECONDS(TIMESTAMPADD(YEAR,- year(ish.created),ish.created)) + TO_SECONDS(TIMESTAMPADD(YEAR,-vCurrentYear,NOW()))) as priority,
0 as saleOrder,
sc.isPreviousPrepared,
iss.id as itemShelvingSaleFk,
@@ -45774,185 +44935,6 @@ BEGIN
tmp.salePlacementList_2,
tmp.salePlacementList_3;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `collectionPlacement_get_gamma` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `collectionPlacement_get_gamma`(vParamFk INT(11))
-BEGIN
-
- DECLARE vCalcFk INT;
- DECLARE vWarehouseFk INT;
- DECLARE vWarehouseAliasFk INT;
- DECLARE vCurrentYear INT DEFAULT YEAR(NOW());
-
- DROP TEMPORARY TABLE IF EXISTS tmp.sale;
- CREATE TEMPORARY TABLE tmp.sale
- ENGINE = MEMORY
- SELECT 0000000 as ticketFk,
- 0000000 as saleFk,
- 0000000 as itemFk,
- FALSE as isStowaway,
- 0 as quantity;
-
- INSERT INTO tmp.sale(ticketFk, saleFk, itemFk, isStowaway)
- SELECT s.ticketFk, s.id, s.itemFk, FALSE
- FROM vn.ticketCollection tc
- JOIN vn.sale s ON s.ticketFk = tc.ticketFk
- WHERE tc.collectionFk = vParamFk
- UNION ALL
- SELECT sw.shipFk, s.id, s.itemFk, TRUE
- FROM vn.sale s
- JOIN vn.stowaway sw ON sw.id = s.ticketFk
- JOIN vn.ticketCollection tc ON tc.ticketFk = sw.shipFk
- WHERE tc.collectionFk = vParamFk;
-
- INSERT INTO tmp.sale(ticketFk, saleFk, itemFk, isStowaway)
- SELECT s.ticketFk, s.id, s.itemFk, FALSE
- FROM vn.sale s
- JOIN vn.ticket t ON t.id = s.ticketFk
- WHERE s.ticketFk = vParamFk
- AND t.shipped > '2020-01-01'
- UNION ALL
- SELECT sw.shipFk, s.id, s.itemFk, TRUE
- FROM vn.sale s
- JOIN vn.stowaway sw ON sw.id = s.ticketFk
- WHERE sw.shipFk = vParamFk;
-
- DELETE FROM tmp.sale
- WHERE saleFk = 0;
-
- SELECT t.warehouseFk, w.aliasFk
- INTO vWarehouseFk, vWarehouseAliasFk
- FROM vn.ticket t
- JOIN tmp.sale ts ON ts.ticketFk = t.id
- JOIN vn.warehouse w ON w.id = t.warehouseFk
- LIMIT 1;
-
- CALL cache.visible_refresh(vCalcFk,FALSE,vWarehouseFk);
-
- UPDATE tmp.sale ts
- JOIN ( SELECT itemFk, sum(visible) as visible
- FROM vn.itemShelvingStock iss
- JOIN vn.warehouse w ON w.id = iss.warehouseFk
- WHERE w.aliasFk = vWarehouseAliasFk
- GROUP BY iss.itemFk ) iss ON iss.itemFk = ts.itemFk
- SET ts.quantity = iss.visible;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.sale2;
- CREATE TEMPORARY TABLE tmp.sale2
- (PRIMARY KEY (saleFk))
- ENGINE = MEMORY
- SELECT DISTINCT saleFk FROM tmp.sale;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.`grouping`;
- CREATE TEMPORARY TABLE tmp.`grouping`
- ENGINE MEMORY
- SELECT b.itemFk,
- CASE b.groupingMode
- WHEN 0 THEN 1
- WHEN 2 THEN b.packing
- ELSE b.`grouping`
- END AS `grouping`
- FROM buy b
- JOIN cache.last_buy lb ON lb.buy_id = b.id
- WHERE lb.warehouse_id = vWarehouseFk
- ;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.grouping2;
- CREATE TEMPORARY TABLE tmp.grouping2
- ENGINE MEMORY
- SELECT * FROM tmp.`grouping`;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.salePlacementList;
- CREATE TEMPORARY TABLE tmp.salePlacementList
- ENGINE MEMORY
-
- SELECT ts.saleFk,
- ts.itemFk,
- CONCAT(
- IF( iss.id,
- CONCAT('< ', IFNULL(wk.`code`, '---'),' > '),
- ''),
- p.`code`) COLLATE utf8_general_ci as placement ,
- sh.code COLLATE utf8_general_ci as shelving,
- ish.created,
- ish.visible,
- IF(ts.isStowaway, - 100000, IF(ish.visible > 0 OR iss.id, 1, 100000)) * p.pickingOrder as `order`,
- IFNULL(IF(sc.isPreviousPreparedByPacking, ish.packing, g.`grouping`),1) as `grouping`,
- IF(iss.id, TO_SECONDS(TIMESTAMPADD(YEAR,-vCurrentYear,iss.created)), TO_SECONDS(TIMESTAMPADD(YEAR,-vCurrentYear,ish.created)) + TO_SECONDS(TIMESTAMPADD(YEAR,-vCurrentYear,NOW()))) as priority,
- 0 as saleOrder,
- sc.isPreviousPrepared,
- iss.id as itemShelvingSaleFk,
- ts.ticketFk
- ,iss.id
- , st.saleFk as salePreviousPrepared
- , iss.userFk
- FROM tmp.sale ts
- LEFT JOIN (SELECT DISTINCT st.saleFk
- FROM vn.saleTracking st
- JOIN tmp.sale2 s2 ON s2.saleFk = st.saleFk
- JOIN vn.state s ON s.id = st.stateFk
- WHERE st.isChecked
- AND s.semaphore = 1) st ON st.saleFk = ts.saleFk
- JOIN vn.itemShelving ish ON ish.itemFk = ts.itemFk
- JOIN vn.shelving sh ON sh.code = ish.shelvingFk
- JOIN vn.parking p ON p.id = sh.parkingFk
- JOIN vn.sector sc ON sc.id = p.sectorFk
- JOIN vn.warehouse w ON w.id = sc.warehouseFk
- LEFT JOIN tmp.`grouping` g ON g.itemFk = ts.itemFk
- LEFT JOIN vn.itemShelvingSale iss ON iss.saleFk = ts.saleFk AND iss.itemShelvingFk = ish.id
- LEFT JOIN vn.worker wk ON wk.id = iss.userFk
- WHERE w.aliasFk = vWarehouseAliasFk
- HAVING (iss.id AND st.saleFk) OR salePreviousPrepared IS NULL
- ;
- -- select * from tmp.salePlacementList;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.salePlacementList_2;
- CREATE TEMPORARY TABLE tmp.salePlacementList_2
- ENGINE MEMORY
- SELECT saleFk, priority as olderPriority
- FROM (SELECT saleFk, priority
- FROM tmp.salePlacementList
- ORDER BY IF(isPreviousPrepared,2,1), IF(visible > 0 OR itemShelvingSaleFk,1,2), priority
- ) sub
- GROUP BY saleFk;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.salePlacementList_3;
- CREATE TEMPORARY TABLE tmp.salePlacementList_3
- ENGINE MEMORY
- SELECT s1.saleFk, `order`as saleOrder
- FROM tmp.salePlacementList s1
- JOIN tmp.salePlacementList_2 s2 ON s2.saleFk = s1.saleFk AND s2.olderPriority = s1.priority;
-
- UPDATE tmp.salePlacementList s1
- JOIN tmp.salePlacementList_3 s3 ON s3.saleFk = s1.saleFk
- SET s1.saleOrder = s3.saleOrder;
-
- SELECT *
- FROM tmp.salePlacementList
- ORDER BY saleOrder, IF(isPreviousPrepared,2,1), IF(visible > 0 OR itemShelvingSaleFk,1,2),priority;
-
- DROP TEMPORARY TABLE
- tmp.sale,
- tmp.sale2,
- tmp.`grouping`,
- tmp.grouping2,
- tmp.salePlacementList_2,
- tmp.salePlacementList_3;
-
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -61927,7 +60909,7 @@ BEGIN
JOIN vn.address a ON a.id = t.addressFk
JOIN vn.province p ON p.id = a.provinceFk
JOIN vn.country c ON c.id = p.countryFk
- WHERE dat = vDate
+ WHERE dat BETWEEN vDate AND util.dayend(vDate)
AND warehouse_id = vWarehouse
AND c.country != 'Francia'
ON DUPLICATE KEY UPDATE buyed = buyed + @amount;
@@ -64357,9 +63339,9 @@ DELIMITER ;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
@@ -64423,7 +63405,7 @@ BEGIN
JOIN tmp.risk r ON r.clientFk = t.clientFk
JOIN vn.client c ON c.id = t.clientFk
WHERE r.risk > c.credit + 10
- AND a.deliveryMethodFk != 3
+ AND a.isRiskFree = FALSE
ON DUPLICATE KEY UPDATE
risk = r.risk;
@@ -71998,7 +70980,7 @@ DELIMITER ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `xdiarioNextId` */;
+/*!50003 DROP PROCEDURE IF EXISTS `xdiarioNextId__` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
@@ -72008,8 +70990,11 @@ DELIMITER ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`%` PROCEDURE `xdiarioNextId`()
+CREATE DEFINER=`root`@`%` PROCEDURE `xdiarioNextId__`()
BEGIN
+/**
+ * @deprecated Use ledger_next
+ */
DECLARE vNewAsien INT;
DECLARE EXIT HANDLER FOR SQLEXCEPTION
BEGIN
@@ -75217,6 +74202,24 @@ USE `vn`;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
+--
+-- Final view structure for view `buyerSales`
+--
+
+/*!50001 DROP VIEW IF EXISTS `buyerSales`*/;
+/*!50001 SET @saved_cs_client = @@character_set_client */;
+/*!50001 SET @saved_cs_results = @@character_set_results */;
+/*!50001 SET @saved_col_connection = @@collation_connection */;
+/*!50001 SET character_set_client = utf8 */;
+/*!50001 SET character_set_results = utf8 */;
+/*!50001 SET collation_connection = utf8_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
+/*!50001 VIEW `buyerSales` AS select `v`.`importe` AS `importe`,`w`.`code` AS `comprador`,`t`.`year` AS `año`,`t`.`week` AS `semana` from (((`bs`.`ventas` `v` join `vn`.`time` `t` on((`t`.`dated` = `v`.`fecha`))) join `vn`.`itemType` `it` on((`it`.`id` = `v`.`tipo_id`))) join `vn`.`worker` `w` on((`w`.`id` = `it`.`workerFk`))) */;
+/*!50001 SET character_set_client = @saved_cs_client */;
+/*!50001 SET character_set_results = @saved_cs_results */;
+/*!50001 SET collation_connection = @saved_col_connection */;
+
--
-- Final view structure for view `calendar__`
--
@@ -75536,7 +74539,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8_general_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `exchangeInsuranceOut` AS select `p`.`received` AS `received`,sum(`p`.`divisa`) AS `divisa`,(sum(`p`.`divisa`) / sum(`p`.`amount`)) AS `rate` from (`vn`.`payment` `p` join `vn`.`bank` `b` on((`b`.`id` = `p`.`bankFk`))) where ((`p`.`currencyFk` = 2) and (`b`.`cash` = 0) and (`p`.`supplierFk` <> 2213)) group by `p`.`received` */;
+/*!50001 VIEW `exchangeInsuranceOut` AS select `p`.`received` AS `received`,sum(`p`.`divisa`) AS `divisa`,(sum(`p`.`divisa`) / sum(`p`.`amount`)) AS `rate` from (`payment` `p` join `bank` `b` on((`b`.`id` = `p`.`bankFk`))) where ((`p`.`currencyFk` = 2) and (`b`.`cash` = 0) and (`p`.`supplierFk` <> 2213)) group by `p`.`received` */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -75950,7 +74953,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_general_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 VIEW `invoiceIn__` AS select `r`.`id` AS `id`,`r`.`num_recibida` AS `serialNumber`,`r`.`serie` AS `serial`,`r`.`proveedor_id` AS `supplierFk`,`r`.`fecha` AS `issued`,`r`.`sref` AS `supplierRef`,`r`.`contabilizada` AS `isBooked`,`r`.`moneda_id` AS `currencyFk`,`r`.`MYSQL_TIME` AS `created`,`r`.`empresa_id` AS `companyFk`,`r`.`gestdoc_id` AS `docFk`,`r`.`dateBooking` AS `booked`,`r`.`dateOperation` AS `operated`,`r`.`cplusInvoiceType472Fk` AS `cplusInvoiceType472Fk`,`r`.`cplusRectificationTypeFk` AS `cplusRectificationTypeFk`,`r`.`cplusSubjectOpFk` AS `cplusSubjectOpFk`,`r`.`cplusTaxBreakFk` AS `cplusTaxBreakFk`,`r`.`cplusTrascendency472Fk` AS `cplusTrascendency472Fk`,`r`.`bookEntried` AS `bookEntried`,`r`.`isVatDeductible` AS `isVatDeductible`,`r`.`withholdingSageFk` AS `withholdingSageFk`,`r`.`transactionTypeSageFk` AS `transactionTypeSageFk` from `vn2008`.`recibida` `r` */;
+/*!50001 VIEW `invoiceIn__` AS select `r`.`id` AS `id`,`r`.`num_recibida` AS `serialNumber`,`r`.`serie` AS `serial`,`r`.`proveedor_id` AS `supplierFk`,`r`.`fecha` AS `issued`,`r`.`sref` AS `supplierRef`,`r`.`contabilizada` AS `isBooked`,`r`.`moneda_id` AS `currencyFk`,`r`.`MYSQL_TIME` AS `created`,`r`.`empresa_id` AS `companyFk`,`r`.`gestdoc_id` AS `docFk`,`r`.`dateBooking` AS `booked`,`r`.`dateOperation` AS `operated`,`r`.`cplusInvoiceType472Fk` AS `cplusInvoiceType472Fk`,`r`.`cplusRectificationTypeFk` AS `cplusRectificationTypeFk`,`r`.`cplusSubjectOpFk` AS `cplusSubjectOpFk`,`r`.`cplusTaxBreakFk` AS `cplusTaxBreakFk`,`r`.`cplusTrascendency472Fk` AS `cplusTrascendency472Fk`,`r`.`bookEntried` AS `bookEntried`,`r`.`isVatDeductible` AS `isVatDeductible`,`r`.`withholdingSageFk` AS `withholdingSageFk` from `vn2008`.`recibida` `r` */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
@@ -76441,6 +75444,24 @@ USE `vn`;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
+--
+-- Final view structure for view `payment__`
+--
+
+/*!50001 DROP VIEW IF EXISTS `payment__`*/;
+/*!50001 SET @saved_cs_client = @@character_set_client */;
+/*!50001 SET @saved_cs_results = @@character_set_results */;
+/*!50001 SET @saved_col_connection = @@collation_connection */;
+/*!50001 SET character_set_client = utf8mb4 */;
+/*!50001 SET character_set_results = utf8mb4 */;
+/*!50001 SET collation_connection = utf8mb4_general_ci */;
+/*!50001 CREATE ALGORITHM=UNDEFINED */
+/*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
+/*!50001 VIEW `payment__` AS select `p`.`id` AS `id`,`p`.`fecha` AS `received`,`p`.`dueDated` AS `dueDated`,`p`.`id_proveedor` AS `supplierFk`,`p`.`importe` AS `amount`,`p`.`id_moneda` AS `currencyFk`,`p`.`divisa` AS `divisa`,`p`.`id_banco` AS `bankFk`,`p`.`pay_met_id` AS `payMethodFk`,`p`.`empresa_id` AS `companyFk`,`p`.`pago_sdc_id` AS `exchangeInsuranceFk`,`p`.`conciliado` AS `isConciliated` from `vn2008`.`pago` `p` */;
+/*!50001 SET character_set_client = @saved_cs_client */;
+/*!50001 SET character_set_results = @saved_cs_results */;
+/*!50001 SET collation_connection = @saved_col_connection */;
+
--
-- Final view structure for view `personMedia`
--
@@ -77194,4 +76215,4 @@ USE `vncontrol`;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2020-12-17 8:13:33
+-- Dump completed on 2021-01-05 9:34:47
diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index cfc50dc0b5..b629984000 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -832,7 +832,8 @@ export default {
firstSearchResult: 'vn-travel-index vn-tbody > a:nth-child(1)'
},
travelExtraCommunity: {
- firstTravelReference: 'vn-travel-extra-community > vn-data-viewer div > vn-tbody > vn-tr > vn-td-editable',
+ anySearchResult: 'vn-travel-extra-community > vn-data-viewer div > vn-tbody > vn-tr',
+ firstTravelReference: 'vn-travel-extra-community vn-card:nth-child(1) vn-td-editable',
removeContinentFilter: 'vn-searchbar > form > vn-textfield > div.container > div.prepend > prepend > div > span:nth-child(3) > vn-icon > i'
},
travelBasicData: {
@@ -864,7 +865,18 @@ export default {
travelDescriptor: {
filterByAgencyButton: 'vn-descriptor-content .quicklinks > div:nth-child(1) > vn-quick-link > a[vn-tooltip="All travels with current agency"]',
dotMenu: 'vn-travel-descriptor vn-icon-button[icon="more_vert"]',
- dotMenuClone: '#clone'
+ dotMenuClone: '#clone',
+ dotMenuCloneWithEntries: '#cloneWithEntries',
+ acceptClonation: 'tpl-buttons > button[response="accept"]'
+ },
+ travelCreate: {
+ reference: 'vn-travel-create vn-textfield[ng-model="$ctrl.travel.ref"]',
+ agency: 'vn-travel-create vn-autocomplete[ng-model="$ctrl.travel.agencyModeFk"]',
+ shipped: 'vn-travel-create vn-date-picker[ng-model="$ctrl.travel.shipped"]',
+ landed: 'vn-travel-create vn-date-picker[ng-model="$ctrl.travel.landed"]',
+ warehouseOut: 'vn-travel-create vn-autocomplete[ng-model="$ctrl.travel.warehouseOutFk"]',
+ warehouseIn: 'vn-travel-create vn-autocomplete[ng-model="$ctrl.travel.warehouseInFk"]',
+ saveButton: 'vn-travel-create vn-submit[label="Save"]'
},
zoneIndex: {
searchResult: 'vn-zone-index a.vn-tr',
@@ -928,6 +940,14 @@ export default {
newEntryCompany: 'vn-entry-create vn-autocomplete[ng-model="$ctrl.entry.companyFk"]',
saveNewEntry: 'vn-entry-create button[type="submit"]'
},
+ entryObservations: {
+ addNewObservation: 'vn-entry-observation vn-icon-button[icon="add_circle"]',
+ firstObservationType: 'vn-entry-observation vn-horizontal:nth-child(1) > vn-autocomplete[ng-model="observation.observationTypeFk"]',
+ secondObservationType: 'vn-entry-observation vn-horizontal:nth-child(2) > vn-autocomplete[ng-model="observation.observationTypeFk"]',
+ firstObservationDescription: 'vn-entry-observation vn-horizontal:nth-child(1) > vn-textfield[ng-model="observation.description"]',
+ secondObservationDescription: 'vn-entry-observation vn-horizontal:nth-child(2) > vn-textfield[ng-model="observation.description"]',
+ saveObservationsButton: 'vn-entry-observation vn-submit > button'
+ },
supplierSummary: {
header: 'vn-supplier-summary > vn-card > h5',
basicDataId: 'vn-supplier-summary vn-label-value[label="Id"]',
diff --git a/e2e/paths/02-client/03_edit_fiscal_data.spec.js b/e2e/paths/02-client/03_edit_fiscal_data.spec.js
index da04c813aa..614ede0f06 100644
--- a/e2e/paths/02-client/03_edit_fiscal_data.spec.js
+++ b/e2e/paths/02-client/03_edit_fiscal_data.spec.js
@@ -200,7 +200,7 @@ describe('Client Edit fiscalData path', () => {
it('should confirm the sageTransaction have been edited', async() => {
const result = await page.waitToGetProperty(selectors.clientFiscalData.sageTransaction, 'value');
- expect(result).toEqual('Regularización de inversiones');
+ expect(result).toEqual('36: Regularización de inversiones');
});
it('should confirm the transferor have been edited', async() => {
diff --git a/e2e/paths/06-claim/05_summary.spec.js b/e2e/paths/06-claim/05_summary.spec.js
index c63e686cbf..cea5edb559 100644
--- a/e2e/paths/06-claim/05_summary.spec.js
+++ b/e2e/paths/06-claim/05_summary.spec.js
@@ -1,7 +1,7 @@
import selectors from '../../helpers/selectors.js';
import getBrowser from '../../helpers/puppeteer';
-describe('claim Summary path', () => {
+describe('Claim summary path', () => {
let browser;
let page;
const claimId = '4';
diff --git a/e2e/paths/06-claim/06_descriptor.spec.js b/e2e/paths/06-claim/06_descriptor.spec.js
index c0affb3cc5..0826bad633 100644
--- a/e2e/paths/06-claim/06_descriptor.spec.js
+++ b/e2e/paths/06-claim/06_descriptor.spec.js
@@ -1,7 +1,7 @@
import selectors from '../../helpers/selectors.js';
import getBrowser from '../../helpers/puppeteer';
-describe('claim Descriptor path', () => {
+describe('Claim descriptor path', () => {
let browser;
let page;
const claimId = '1';
diff --git a/e2e/paths/08-route/03_create_and_clone.spec.js b/e2e/paths/08-route/03_create_and_clone.spec.js
index be758f7887..c0132362fb 100644
--- a/e2e/paths/08-route/03_create_and_clone.spec.js
+++ b/e2e/paths/08-route/03_create_and_clone.spec.js
@@ -74,6 +74,7 @@ describe('Route create path', () => {
});
it(`should clone the first route`, async() => {
+ await page.waitForTimeout(1000); // needs time for the index to show all items
await page.waitToClick(selectors.routeIndex.firstRouteCheckbox);
await page.waitToClick(selectors.routeIndex.cloneButton);
await page.waitToClick(selectors.routeIndex.submitClonationButton);
diff --git a/e2e/paths/10-travel/03_descriptor.spec.js b/e2e/paths/10-travel/03_descriptor.spec.js
index 3f79bea061..cdca379ad8 100644
--- a/e2e/paths/10-travel/03_descriptor.spec.js
+++ b/e2e/paths/10-travel/03_descriptor.spec.js
@@ -42,4 +42,48 @@ describe('Travel descriptor path', () => {
expect(state).toBe('travel.create');
});
+
+ it('should edit the data to clone and then get redirected to the cloned travel basic data', async() => {
+ await page.clearInput(selectors.travelCreate.reference);
+ await page.write(selectors.travelCreate.reference, 'reference');
+ await page.autocompleteSearch(selectors.travelCreate.agency, 'entanglement');
+ await page.pickDate(selectors.travelCreate.shipped);
+ await page.pickDate(selectors.travelCreate.landed);
+ await page.autocompleteSearch(selectors.travelCreate.warehouseOut, 'warehouse one');
+ await page.autocompleteSearch(selectors.travelCreate.warehouseIn, 'warehouse two');
+ await page.waitToClick(selectors.travelCreate.saveButton);
+ await page.waitForState('travel.card.basicData');
+ const message = await page.waitForSnackbar();
+
+ expect(message.text).toContain('Data saved!');
+ });
+
+ it('should atempt to clone the travel and its entries using the descriptor menu but receive an error', async() => {
+ await page.waitToClick(selectors.travelDescriptor.dotMenu);
+ await page.waitToClick(selectors.travelDescriptor.dotMenuCloneWithEntries);
+ await page.waitToClick(selectors.travelDescriptor.acceptClonation);
+ const message = await page.waitForSnackbar();
+
+ expect(message.text).toContain('A travel with this data already exists');
+ });
+
+ it('should update the landed date to a future date to enable cloneWithEntries', async() => {
+ const nextMonth = new Date();
+ nextMonth.setMonth(nextMonth.getMonth() + 1);
+ await page.pickDate(selectors.travelBasicData.deliveryDate, nextMonth);
+ await page.waitToClick(selectors.travelBasicData.save);
+ await page.waitForState('travel.card.basicData');
+ const message = await page.waitForSnackbar();
+
+ expect(message.text).toContain('Data saved!');
+ });
+
+ it('should navigate to the summary and then clone the travel and its entries using the descriptor menu to get redirected to the cloned travel basic data', async() => {
+ await page.waitToClick('vn-icon[icon="preview"]'); // summary icon
+ await page.waitForState('travel.card.summary');
+ await page.waitToClick(selectors.travelDescriptor.dotMenu);
+ await page.waitToClick(selectors.travelDescriptor.dotMenuCloneWithEntries);
+ await page.waitToClick(selectors.travelDescriptor.acceptClonation);
+ await page.waitForState('travel.card.basicData');
+ });
});
diff --git a/e2e/paths/10-travel/04_extra_community.spec.js b/e2e/paths/10-travel/04_extra_community.spec.js
index bc81c086c8..7a37b89e41 100644
--- a/e2e/paths/10-travel/04_extra_community.spec.js
+++ b/e2e/paths/10-travel/04_extra_community.spec.js
@@ -18,6 +18,7 @@ describe('Travel extra community path', () => {
it('should edit the travel reference', async() => {
await page.waitToClick(selectors.travelExtraCommunity.removeContinentFilter);
+ await page.waitForSpinnerLoad();
await page.writeOnEditableTD(selectors.travelExtraCommunity.firstTravelReference, 'edited reference');
});
diff --git a/e2e/paths/12-entry/06_observations.spec.js b/e2e/paths/12-entry/06_observations.spec.js
new file mode 100644
index 0000000000..107c2e0b6b
--- /dev/null
+++ b/e2e/paths/12-entry/06_observations.spec.js
@@ -0,0 +1,66 @@
+import selectors from '../../helpers/selectors.js';
+import getBrowser from '../../helpers/puppeteer';
+
+describe('Entry observations path', () => {
+ let browser;
+ let page;
+
+ beforeAll(async() => {
+ browser = await getBrowser();
+ page = browser.page;
+ // await page.loginAndModule('buyer', 'entry'); // access denied, awaiting role confirmation
+ await page.loginAndModule('developer', 'entry');
+ await page.accessToSearchResult('2');
+ await page.accessToSection('entry.card.observation');
+ });
+
+ afterAll(async() => {
+ await browser.close();
+ });
+
+ it(`should add two new observations of the same type then fail to save as they can't be repeated`, async() => {
+ await page.waitToClick(selectors.entryObservations.addNewObservation);
+ await page.waitToClick(selectors.entryObservations.addNewObservation);
+ await page.autocompleteSearch(selectors.entryObservations.firstObservationType, 'comercial');
+ await page.autocompleteSearch(selectors.entryObservations.secondObservationType, 'comercial');
+ await page.write(selectors.entryObservations.firstObservationDescription, 'first observation');
+ await page.write(selectors.entryObservations.secondObservationDescription, 'second observation');
+ await page.waitToClick(selectors.entryObservations.saveObservationsButton);
+ const message = await page.waitForSnackbar();
+
+ expect(message.text).toContain(`The observation type can't be repeated`);
+ });
+
+ it('should set the 2nd observation of a different one and successfully save both', async() => {
+ await page.autocompleteSearch(selectors.entryObservations.secondObservationType, 'delivery');
+ await page.waitToClick(selectors.entryObservations.saveObservationsButton);
+ const message = await page.waitForSnackbar();
+
+ expect(message.text).toContain('Data saved!');
+ });
+
+ it('should reload the section and make sure the first observation type was saved correctly', async() => {
+ await page.reloadSection('entry.card.observation');
+ const result = await page.waitToGetProperty(selectors.entryObservations.firstObservationType, 'value');
+
+ expect(result).toEqual('comercial');
+ });
+
+ it('should make sure the first observation description was saved correctly', async() => {
+ const result = await page.waitToGetProperty(selectors.entryObservations.firstObservationDescription, 'value');
+
+ expect(result).toEqual('first observation');
+ });
+
+ it('should make sure the second observation type was saved correctly', async() => {
+ const result = await page.waitToGetProperty(selectors.entryObservations.secondObservationType, 'value');
+
+ expect(result).toEqual('delivery');
+ });
+
+ it('should make sure the second observation description was saved correctly', async() => {
+ const result = await page.waitToGetProperty(selectors.entryObservations.secondObservationDescription, 'value');
+
+ expect(result).toEqual('second observation');
+ });
+});
diff --git a/e2e/paths/13-supplier/03_fiscal_data.spec.js b/e2e/paths/13-supplier/03_fiscal_data.spec.js
index d929288d46..0238c8704a 100644
--- a/e2e/paths/13-supplier/03_fiscal_data.spec.js
+++ b/e2e/paths/13-supplier/03_fiscal_data.spec.js
@@ -23,10 +23,13 @@ describe('Supplier fiscal data path', () => {
await page.clearInput(selectors.supplierFiscalData.country);
await page.clearInput(selectors.supplierFiscalData.postCode);
await page.write(selectors.supplierFiscalData.city, 'Valencia');
+ await page.waitForTimeout(1000); // must repeat this action twice or fails. also #2699 may be a cool solution to this.
+ await page.clearInput(selectors.supplierFiscalData.city);
+ await page.write(selectors.supplierFiscalData.city, 'Valencia');
await page.clearInput(selectors.supplierFiscalData.socialName);
await page.write(selectors.supplierFiscalData.socialName, 'Farmer King SL');
await page.clearInput(selectors.supplierFiscalData.taxNumber);
- await page.write(selectors.supplierFiscalData.taxNumber, 'invalid tax number');
+ await page.write(selectors.supplierFiscalData.taxNumber, 'Wrong tax number');
await page.clearInput(selectors.supplierFiscalData.account);
await page.write(selectors.supplierFiscalData.account, 'edited account number');
await page.autocompleteSearch(selectors.supplierFiscalData.sageWihholding, 'retencion estimacion objetiva');
diff --git a/front/core/styles/icons/salixfont.css b/front/core/styles/icons/salixfont.css
index bdd37b2902..cee22da440 100644
--- a/front/core/styles/icons/salixfont.css
+++ b/front/core/styles/icons/salixfont.css
@@ -24,11 +24,9 @@
}
.icon-invoiceIn:before {
content: "\e960";
- color: #5f5f5f;
}
.icon-invoiceOut:before {
content: "\e961";
- color: #5f5f5f;
}
.icon-supplier:before {
content: "\e936";
@@ -107,7 +105,6 @@
}
.icon-invoices:before {
content: "\e91c";
- color: #5f5f5f;
}
.icon-pets:before {
content: "\e94e";
diff --git a/front/salix/components/upload-photo/style.scss b/front/salix/components/upload-photo/style.scss
index 9f69b39649..609364a2c1 100644
--- a/front/salix/components/upload-photo/style.scss
+++ b/front/salix/components/upload-photo/style.scss
@@ -17,9 +17,7 @@
& > div > img[ng-src] {
width: 256px;
height: 256px;
- display: block;
- height: 100%;
- width: 100%;
+ display: block
}
}
diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index d66126ad46..fc07126e90 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -86,5 +86,7 @@
"The social name cannot be empty": "The social name cannot be empty",
"The nif cannot be empty": "The nif cannot be empty",
"Amount cannot be zero": "Amount cannot be zero",
- "Company has to be official": "Company has to be official"
+ "Company has to be official": "Company has to be official",
+ "A travel with this data already exists": "A travel with this data already exists",
+ "The observation type can't be repeated": "The observation type can't be repeated"
}
\ No newline at end of file
diff --git a/loopback/util/log.js b/loopback/util/log.js
index baba3e8279..d81fc39a09 100644
--- a/loopback/util/log.js
+++ b/loopback/util/log.js
@@ -33,6 +33,9 @@ exports.translateValues = async(instance, changes) => {
}).format(date);
}
+ if (changes instanceof instance)
+ changes = changes.__data;
+
const properties = Object.assign({}, changes);
for (let property in properties) {
const relation = getRelation(instance, property);
@@ -41,13 +44,14 @@ exports.translateValues = async(instance, changes) => {
if (relation) {
let fieldsToShow = ['alias', 'name', 'code', 'description'];
- const log = instance.definition.settings.log;
+ const modelName = relation.model;
+ const model = models[modelName];
+ const log = model.definition.settings.log;
if (log && log.showField)
- fieldsToShow = log.showField;
+ fieldsToShow = [log.showField];
- const model = relation.model;
- const row = await models[model].findById(value, {
+ const row = await model.findById(value, {
fields: fieldsToShow
});
const newValue = getValue(row);
diff --git a/modules/claim/front/basic-data/index.html b/modules/claim/front/basic-data/index.html
index eb3c3b9e32..064a9d4f55 100644
--- a/modules/claim/front/basic-data/index.html
+++ b/modules/claim/front/basic-data/index.html
@@ -1,8 +1,9 @@
+
+ form="form"
+ save="patch">
{
+describe('client sendSms()', () => {
let createdLog;
afterAll(async done => {
diff --git a/modules/client/back/methods/sms/send.spec.js b/modules/client/back/methods/sms/send.spec.js
index 06288ffb52..612a16cf14 100644
--- a/modules/client/back/methods/sms/send.spec.js
+++ b/modules/client/back/methods/sms/send.spec.js
@@ -1,8 +1,7 @@
const app = require('vn-loopback/server/server');
const soap = require('soap');
-// Issue #2471
-xdescribe('sms send()', () => {
+describe('sms send()', () => {
it('should return the expected message and status code', async() => {
const code = 200;
const smsConfig = await app.models.SmsConfig.findOne();
diff --git a/modules/client/front/address/edit/index.js b/modules/client/front/address/edit/index.js
index 30201b880b..b8d2e28a4a 100644
--- a/modules/client/front/address/edit/index.js
+++ b/modules/client/front/address/edit/index.js
@@ -42,9 +42,10 @@ export default class Controller extends Section {
// Town auto complete
set town(selection) {
+ const oldValue = this._town;
this._town = selection;
- if (!selection) return;
+ if (!selection || !oldValue) return;
const province = selection.province;
const postcodes = selection.postcodes;
@@ -62,9 +63,10 @@ export default class Controller extends Section {
// Postcode auto complete
set postcode(selection) {
+ const oldValue = this._postcode;
this._postcode = selection;
- if (!selection) return;
+ if (!selection || !oldValue) return;
const town = selection.town;
const province = town.province;
diff --git a/modules/client/front/fiscal-data/index.html b/modules/client/front/fiscal-data/index.html
index c89bdf6a5a..ac419aa40a 100644
--- a/modules/client/front/fiscal-data/index.html
+++ b/modules/client/front/fiscal-data/index.html
@@ -24,12 +24,6 @@
data="sageTaxTypes"
order="vat">
-
-