Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
commit
64fb097086
|
|
@ -1516,7 +1516,7 @@ INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed
|
|||
(9, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 10, 0, 442, 'IN2009', 'Movement 9', 1, 1, ''),
|
||||
(10, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 10, 0, 442, 'IN2009', 'Movement 9', 1, 1, '');
|
||||
|
||||
INSERT INTO `bs`.`waste`(`buyerFk`, `year`, `week`, `itemFk`, `itemTypeFk`, `saleTotal`, `saleQuantity`, `saleInternalWaste`, `saleExternalWaste`)
|
||||
INSERT INTO `bs`.`waste`(`buyerFk`, `year`, `week`, `itemFk`, `itemTypeFk`, `saleTotal`, `saleWasteQuantity`, `saleInternalWaste`, `saleExternalWaste`)
|
||||
VALUES
|
||||
('35', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)), WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1), 1, 1, '1062', '51', '56.20', '56.20'),
|
||||
('35', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)), WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1), 2, 1, '35074', '687', '53.12', '89.69'),
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`waste_addSales`()
|
||||
BEGIN
|
||||
DECLARE vDateFrom DATE DEFAULT util.VN_CURDATE() - INTERVAL WEEKDAY(CURDATE()) DAY;
|
||||
DECLARE vDateFrom DATE DEFAULT util.VN_CURDATE() - INTERVAL WEEKDAY(util.VN_CURDATE()) DAY;
|
||||
DECLARE vDateTo DATE DEFAULT vDateFrom + INTERVAL 6 DAY;
|
||||
|
||||
CALL cache.last_buy_refresh(FALSE);
|
||||
|
|
@ -12,16 +12,16 @@ BEGIN
|
|||
it.workerFk,
|
||||
it.id,
|
||||
s.itemFk,
|
||||
SUM(s.quantity),
|
||||
SUM((b.buyingValue + b.freightValue + b.comissionValue + b.packageValue) * s.quantity) `value`,
|
||||
SUM (
|
||||
SUM((b.buyingValue + b.freightValue + b.comissionValue + b.packageValue) * s.quantity),
|
||||
SUM(IF(aw.`type`, s.quantity, 0)),
|
||||
SUM(
|
||||
IF(
|
||||
aw.`type` = 'internal',
|
||||
(b.buyingValue + b.freightValue + b.comissionValue + b.packageValue) * s.quantity,
|
||||
0
|
||||
)
|
||||
) internalWaste,
|
||||
SUM (
|
||||
),
|
||||
SUM(
|
||||
IF(
|
||||
aw.`type` = 'external',
|
||||
(b.buyingValue + b.freightValue + b.comissionValue + b.packageValue) * s.quantity,
|
||||
|
|
@ -30,7 +30,7 @@ BEGIN
|
|||
0
|
||||
)
|
||||
)
|
||||
) externalWaste
|
||||
)
|
||||
FROM vn.sale s
|
||||
JOIN vn.item i ON i.id = s.itemFk
|
||||
JOIN vn.itemType it ON it.id = i.typeFk
|
||||
|
|
|
|||
|
|
@ -1,139 +0,0 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`supplier_statement`(
|
||||
vSupplierFk INT,
|
||||
vCurrencyFk INT,
|
||||
vCompanyFk INT,
|
||||
vOrderBy VARCHAR(15),
|
||||
vIsConciliated BOOL
|
||||
)
|
||||
BEGIN
|
||||
/**
|
||||
* Crea un estado de cuenta de proveedores calculando
|
||||
* los saldos en euros y en la moneda especificada.
|
||||
*
|
||||
* @param vSupplierFk Id del proveedor
|
||||
* @param vCurrencyFk Id de la moneda
|
||||
* @param vCompanyFk Id de la empresa
|
||||
* @param vOrderBy Criterio de ordenación
|
||||
* @param vIsConciliated Indica si está conciliado o no
|
||||
* @return tmp.supplierStatement
|
||||
*/
|
||||
SET @euroBalance:= 0;
|
||||
SET @currencyBalance:= 0;
|
||||
|
||||
CREATE OR REPLACE TEMPORARY TABLE tmp.supplierStatement
|
||||
ENGINE = MEMORY
|
||||
SELECT *,
|
||||
@euroBalance:= ROUND(
|
||||
@euroBalance + IFNULL(paymentEuros, 0) -
|
||||
IFNULL(invoiceEuros, 0), 2
|
||||
) euroBalance,
|
||||
@currencyBalance:= ROUND(
|
||||
@currencyBalance + IFNULL(paymentCurrency, 0) -
|
||||
IFNULL(invoiceCurrency, 0), 2
|
||||
) currencyBalance
|
||||
FROM (
|
||||
SELECT * FROM
|
||||
(
|
||||
SELECT NULL bankFk,
|
||||
ii.companyFk,
|
||||
ii.serial,
|
||||
ii.id,
|
||||
CASE
|
||||
WHEN vOrderBy = 'issued' THEN ii.issued
|
||||
WHEN vOrderBy = 'bookEntried' THEN ii.bookEntried
|
||||
WHEN vOrderBy = 'booked' THEN ii.booked
|
||||
WHEN vOrderBy = 'dueDate' THEN iid.dueDated
|
||||
END dated,
|
||||
CONCAT('S/Fra ', ii.supplierRef) sref,
|
||||
IF(ii.currencyFk > 1,
|
||||
ROUND(SUM(iid.foreignValue) / SUM(iid.amount), 3),
|
||||
NULL
|
||||
) changeValue,
|
||||
CAST(SUM(iid.amount) AS DECIMAL(10,2)) invoiceEuros,
|
||||
CAST(SUM(iid.foreignValue) AS DECIMAL(10,2)) invoiceCurrency,
|
||||
NULL paymentEuros,
|
||||
NULL paymentCurrency,
|
||||
ii.currencyFk,
|
||||
ii.isBooked,
|
||||
c.code,
|
||||
'invoiceIn' statementType
|
||||
FROM invoiceIn ii
|
||||
JOIN invoiceInDueDay iid ON iid.invoiceInFk = ii.id
|
||||
JOIN currency c ON c.id = ii.currencyFk
|
||||
WHERE ii.issued > '2014-12-31'
|
||||
AND ii.supplierFk = vSupplierFk
|
||||
AND vCurrencyFk IN (ii.currencyFk, 0)
|
||||
AND vCompanyFk IN (ii.companyFk, 0)
|
||||
AND (vIsConciliated = ii.isBooked OR NOT vIsConciliated)
|
||||
GROUP BY iid.id
|
||||
UNION ALL
|
||||
SELECT p.bankFk,
|
||||
p.companyFk,
|
||||
NULL,
|
||||
p.id,
|
||||
CASE
|
||||
WHEN vOrderBy = 'issued' THEN p.received
|
||||
WHEN vOrderBy = 'bookEntried' THEN p.received
|
||||
WHEN vOrderBy = 'booked' THEN p.received
|
||||
WHEN vOrderBy = 'dueDate' THEN p.dueDated
|
||||
END,
|
||||
CONCAT(IFNULL(pm.name, ''),
|
||||
IF(pn.concept <> '',
|
||||
CONCAT(' : ', pn.concept),
|
||||
'')
|
||||
),
|
||||
IF(p.currencyFk > 1, p.divisa / p.amount, NULL),
|
||||
NULL,
|
||||
NULL,
|
||||
p.amount,
|
||||
p.divisa,
|
||||
p.currencyFk,
|
||||
p.isConciliated,
|
||||
c.code,
|
||||
'payment'
|
||||
FROM payment p
|
||||
LEFT JOIN currency c ON c.id = p.currencyFk
|
||||
LEFT JOIN accounting a ON a.id = p.bankFk
|
||||
LEFT JOIN payMethod pm ON pm.id = p.payMethodFk
|
||||
LEFT JOIN promissoryNote pn ON pn.paymentFk = p.id
|
||||
WHERE p.received > '2014-12-31'
|
||||
AND p.supplierFk = vSupplierFk
|
||||
AND vCurrencyFk IN (p.currencyFk, 0)
|
||||
AND vCompanyFk IN (p.companyFk, 0)
|
||||
AND (vIsConciliated = p.isConciliated OR NOT vIsConciliated)
|
||||
UNION ALL
|
||||
SELECT NULL,
|
||||
companyFk,
|
||||
NULL,
|
||||
se.id,
|
||||
CASE
|
||||
WHEN vOrderBy = 'issued' THEN se.dated
|
||||
WHEN vOrderBy = 'bookEntried' THEN se.dated
|
||||
WHEN vOrderBy = 'booked' THEN se.dated
|
||||
WHEN vOrderBy = 'dueDate' THEN se.dueDated
|
||||
END,
|
||||
se.description,
|
||||
1,
|
||||
amount,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
currencyFk,
|
||||
isConciliated,
|
||||
c.`code`,
|
||||
'expense'
|
||||
FROM supplierExpense se
|
||||
JOIN currency c ON c.id = se.currencyFk
|
||||
WHERE se.supplierFk = vSupplierFk
|
||||
AND vCurrencyFk IN (se.currencyFk,0)
|
||||
AND vCompanyFk IN (se.companyFk,0)
|
||||
AND (vIsConciliated = se.isConciliated OR NOT vIsConciliated)
|
||||
) sub
|
||||
ORDER BY (dated IS NULL AND NOT isBooked),
|
||||
dated,
|
||||
IF(vOrderBy = 'dueDate', id, NULL)
|
||||
LIMIT 10000000000000000000
|
||||
) t;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
-- Place your SQL code here
|
||||
|
||||
ALTER TABLE vn.packingSite DROP COLUMN IF EXISTS hasNewLabelMrwMethod;
|
||||
|
||||
ALTER TABLE vn.productionConfig ADD IF NOT EXISTS hasNewLabelMrwMethod BOOL DEFAULT TRUE NOT NULL
|
||||
COMMENT 'column to activate the new mrw integration';
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
ALTER TABLE bs.waste CHANGE saleQuantity saleWasteQuantity decimal(10,2) DEFAULT NULL NULL AFTER saleTotal;
|
||||
ALTER TABLE bs.waste MODIFY COLUMN saleTotal decimal(10,2) DEFAULT NULL NULL COMMENT 'Coste';
|
||||
|
|
@ -119,6 +119,7 @@ module.exports = Self => {
|
|||
}
|
||||
|
||||
let correctings;
|
||||
|
||||
let correcteds;
|
||||
if (args.correctedFk) {
|
||||
correctings = await models.InvoiceInCorrection.find({
|
||||
|
|
@ -154,6 +155,7 @@ module.exports = Self => {
|
|||
case 'awbCode':
|
||||
return {'sub.code': value};
|
||||
case 'correctingFk':
|
||||
if (!correcteds.length && !args.correctingFk) return;
|
||||
return args.correctingFk
|
||||
? {'ii.id': {inq: correcteds.map(x => x.correctingFk)}}
|
||||
: {'ii.id': {nin: correcteds.map(x => x.correctingFk)}};
|
||||
|
|
|
|||
Loading…
Reference in New Issue