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

Merge branch 'dev' into 8167-incoiceOutCheckIsActive

This commit is contained in:
Javi Gallego 2024-12-29 09:36:44 +01:00
parent 9ae27e104e 49263a5458
commit 5acd4520f8
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3965,7 +3965,7 @@ VALUES(1, '');
INSERT INTO dipole.expedition_PrintOut (expeditionFk, ticketFk, addressFk, street, postalCode, city, shopName, isPrinted, created, printerFk, routeFk, parkingCode, 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) 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 INSERT INTO vn.accountDetail
(id, value, accountDetailTypeFk, supplierAccountFk) (id, value, accountDetailTypeFk, supplierAccountFk)

2
modules/invoiceIn/back/locale/invoiceIn/en.yml
View File

@ -18,3 +18,5 @@ columns:
withholdingSageFk: withholding withholdingSageFk: withholding
expenseFkDeductible: expense deductible expenseFkDeductible: expense deductible
editorFk: editor editorFk: editor
siiTrasCendencyInvoiceInFk: SII tax regime
siiTypeInvoiceInFk: SII Type

4
modules/invoiceIn/back/locale/invoiceIn/es.yml
View File

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

3
modules/ticket/back/methods/expedition/filter.js
View File

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