Merge branch 'dev' into 8167-incoiceOutCheckIsActive

db/dump/fixtures.before.sql

@@ -3965,7 +3965,7 @@ VALUES(1, '');
 
 INSERT INTO dipole.expedition_PrintOut (expeditionFk, ticketFk, addressFk, street, postalCode, city, shopName, isPrinted, created, printerFk, routeFk, parkingCode,
 truckName, clientFk, phone, province, agency, m3, workerCode, itemFk, quantity, longName, shelvingFk, comments)
-VALUES(1, 1, 0, ' ', ' ', ' ', ' ', 0, '2001-01-01 00:00:00', 1, 0, ' ', ' ', 0, NULL, '', NULL, 0.000, NULL, 10, NULL, NULL, 'NCC', NULL);
+VALUES(1, 1, 0, ' ', ' ', ' ', ' ', 0, '2001-01-01 00:00:00', 1, 0, ' ', ' ', 0, NULL, '', NULL, 0.000, NULL, 10, NULL, 'Ranged Reinforced weapon sniper rifle 700mm' , 'NCC', NULL);
 
 INSERT INTO vn.accountDetail
 (id, value, accountDetailTypeFk, supplierAccountFk)

modules/invoiceIn/back/locale/invoiceIn/en.yml

@@ -17,4 +17,6 @@ columns:
   isVatDeductible: is VAT deductible
   withholdingSageFk: withholding
   expenseFkDeductible: expense deductible
-  editorFk: editor
+  editorFk: editor
+  siiTrasCendencyInvoiceInFk: SII tax regime
+  siiTypeInvoiceInFk: SII Type

modules/invoiceIn/back/locale/invoiceIn/es.yml

@@ -5,7 +5,7 @@ columns:
   serial: serie
   supplierFk: proveedor
   issued: fecha emisión
-  supplierRef: referéncia proveedor
+  supplierRef: referencia proveedor
   isBooked: facturado
   currencyFk: moneda
   created: creado
@@ -17,4 +17,6 @@ columns:
   isVatDeductible: impuesto deducible
   withholdingSageFk: código de retención
   expenseFkDeductible: gasto deducible
-  editorFk: editor
+  editorFk: editor
+  siiTrasCendencyInvoiceInFk: régimen fiscal SII
+  siiTypeInvoiceInFk: tipo SII

modules/ticket/back/methods/expedition/filter.js

@@ -50,7 +50,8 @@ module.exports = Self => {
                         su.name scannerUserName,
                         es.scanned,
                         est.description state,
-                        de.longName
+                        de.longName,
+                        de.itemFk
                     FROM vn.expedition e
                         LEFT JOIN vn.expeditionStateType est ON est.id = e.stateTypeFk 
                         INNER JOIN vn.item i1 ON i1.id = e.freightItemFk