Merge branch '1925excludeTables' of verdnatura/salix into dev

db/dump/fixtures.sql

@@ -1502,13 +1502,13 @@ INSERT INTO `vn`.`ticketServiceType`(`id`, `name`)
         (4, 'Cargo FITOSANITARIO'),
         (5, 'Documentos');
 
-INSERT INTO `vn`.`ticketService`(`id`, `description`, `quantity`, `price`, `taxClassFk`, `ticketFk`)
+INSERT INTO `vn`.`ticketService`(`id`, `description`, `quantity`, `price`, `taxClassFk`, `ticketFk`, `ticketServiceTypeFk`)
     VALUES
-        (1, 'Documentos',    1, 2.00,  1, 1),
+        (1, 'Documentos',    1, 2.00,  1, 1,  1),
-        (2, 'Porte Agencia', 1, 10.00, 1, 2),
+        (2, 'Porte Agencia', 1, 10.00, 1, 2,  1),
-        (3, 'Documentos',    1, 5.50,  1, 11),
+        (3, 'Documentos',    1, 5.50,  1, 11, 1),
-        (4, 'Documentos',    1, 2.00,  1, 9),
+        (4, 'Documentos',    1, 2.00,  1, 9,  1),
-        (5, 'Documentos',    1, 2.00,  1, 8);
+        (5, 'Documentos',    1, 2.00,  1, 8,  1);
 
 INSERT INTO `pbx`.`sip`(`user_id`, `extension`)
     VALUES

db/export-structure.sh

@@ -17,6 +17,83 @@ SCHEMAS=(
     vncontrol
 )
 
+IGNORETABLES=(
+    --ignore-table=bi.last_Id_Cubo
+    --ignore-table=bi.v_clientes_jerarquia
+    --ignore-table=bi.v_ventas_contables
+    --ignore-table=bs.horasSilla
+    --ignore-table=bs.productionIndicators
+    --ignore-table=bs.VentasPorCliente
+    --ignore-table=bs.v_ventas
+    --ignore-table=edi.supplyOffer
+    --ignore-table=postgresql.currentWorkersStats
+    --ignore-table=vn.accounting__
+    --ignore-table=vn.agencyModeZone
+    --ignore-table=vn.agencyProvince
+    --ignore-table=vn.agencyWarehouse
+    --ignore-table=vn.awb
+    --ignore-table=vn.botanicExport__
+    --ignore-table=vn.clientDefaultCompany
+    --ignore-table=vn.color
+    --ignore-table=vn.comparative
+    --ignore-table=vn.comparativeFilter
+    --ignore-table=vn.coolerPath
+    --ignore-table=vn.coolerPathDetail
+    --ignore-table=vn.department__
+    --ignore-table=vn.doc
+    --ignore-table=vn.entity
+    --ignore-table=vn.especialPrice
+    --ignore-table=vn.exchangeInsurance
+    --ignore-table=vn.exchangeInsuranceInPrevious
+    --ignore-table=vn.exchangeReportSource
+    --ignore-table=vn.grant
+    --ignore-table=vn.grantGroup
+    --ignore-table=vn.invoiceCorrection__
+    --ignore-table=vn.invoiceIn
+    --ignore-table=vn.invoiceInAwb
+    --ignore-table=vn.invoiceInDueDay
+    --ignore-table=vn.invoiceInEntry
+    --ignore-table=vn.invoiceInIntrastat
+    --ignore-table=vn.invoiceInTax
+    --ignore-table=vn.itemTaxCountrySpain
+    --ignore-table=vn.mail__
+    --ignore-table=vn.manaSpellers
+    --ignore-table=vn.outgoingInvoiceKk
+    --ignore-table=vn.payment
+    --ignore-table=vn.paymentExchangeInsurance
+    --ignore-table=vn.payrollCenter
+    --ignore-table=vn.plantpassport
+    --ignore-table=vn.plantpassportAuthority
+    --ignore-table=vn.preparationException
+    --ignore-table=vn.priceFixed__
+    --ignore-table=vn.printer
+    --ignore-table=vn.printingQueue
+    --ignore-table=vn.printServerQueue__
+    --ignore-table=vn.promissoryNote
+    --ignore-table=vn.rate
+    --ignore-table=vn.referenceRate__
+    --ignore-table=vn.routesControl
+    --ignore-table=vn.salesToPrePrepare
+    --ignore-table=vn.specialPrice__
+    --ignore-table=vn.ticketDownBuffer
+    --ignore-table=vn.ticketeToPreparePrepared
+    --ignore-table=vn.ticketObservation__
+    --ignore-table=vn.ticketRequest__
+    --ignore-table=vn.ticketToPrepare
+    --ignore-table=vn.till__
+    --ignore-table=vn.time
+    --ignore-table=vn.travelThermograph__
+    --ignore-table=vn.travel_cloneWeekly
+    --ignore-table=vn.unary
+    --ignore-table=vn.unaryScan
+    --ignore-table=vn.unaryScanLine
+    --ignore-table=vn.unaryScanLineBuy
+    --ignore-table=vn.unaryScanLineExpedition
+    --ignore-table=vn.warehouseAlias__
+    --ignore-table=vn.warehouseJoined
+    --ignore-table=vn.workerTeam__
+    --ignore-table=vn.XDiario__
+)
 mysqldump \
     --defaults-file=config.production.ini \
     --default-character-set=utf8 \
@@ -25,4 +102,5 @@ mysqldump \
     --triggers --routines --events \
     --databases \
     ${SCHEMAS[@]} \
+    ${IGNORETABLES[@]} \
     > dump/structure.sql

loopback/locale/es.json

@@ -117,5 +117,6 @@
 	"You should specify a date": "Debes especificar una fecha",
 	"You should specify at least a start or end date": "Debes especificar al menos una fecha de inicio o de fín",
 	"Start date should be lower than end date": "La fecha de inicio debe ser menor que la fecha de fín",
-	"You should mark at least one week day": "Debes marcar al menos un día de la semana"
+	"You should mark at least one week day": "Debes marcar al menos un día de la semana",
+	"Swift / BIC can't be empty": "Swift / BIC no puede estar vacio"
 }