Compare commits
14 Commits
fix_ticket
...
dev
Author | SHA1 | Date |
---|---|---|
|
728e6e921a | |
|
f316349ac2 | |
|
7ec29d1972 | |
|
40492d6489 | |
|
0f0504e590 | |
|
6118154ef9 | |
|
dc989cb075 | |
|
2386874a96 | |
|
06c123d7f2 | |
|
a8c03548d9 | |
|
5488a229c1 | |
|
a73199e70b | |
|
2e04a38c66 | |
|
02f51a244d |
|
@ -4,5 +4,9 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`zone_beforeInsert`
|
|||
FOR EACH ROW
|
||||
BEGIN
|
||||
SET NEW.editorFk = account.myUser_getId();
|
||||
|
||||
IF NEW.priceOptimum = 0 THEN
|
||||
SET NEW.priceOptimum = NEW.price;
|
||||
END IF;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
|
@ -4,5 +4,9 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`zone_beforeUpdate`
|
|||
FOR EACH ROW
|
||||
BEGIN
|
||||
SET NEW.editorFk = account.myUser_getId();
|
||||
|
||||
IF NEW.priceOptimum = 0 THEN
|
||||
CALL util.throw('The priceOptimum cannot be 0');
|
||||
END IF;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
UPDATE vn.zone
|
||||
SET priceOptimum = price
|
||||
WHERE priceOptimum = 0;
|
|
@ -98,6 +98,7 @@ module.exports = Self => {
|
|||
|
||||
for (let sale of sales) {
|
||||
const problems = saleProblems.get(sale.id);
|
||||
sale.claim = claimedSales.get(sale.id);
|
||||
if (problems) {
|
||||
for (const problem in problems)
|
||||
sale[problem] = problems[problem];
|
||||
|
|
|
@ -43,8 +43,8 @@ module.exports = Self => {
|
|||
const {code} = await models.State.findById(params.stateFk, {fields: ['code']}, myOptions);
|
||||
params.code = code;
|
||||
} else {
|
||||
const state = await models.State.findOne({where: {id: params.code}}, myOptions);
|
||||
params.stateFk = state.id;
|
||||
const {id} = await models.State.findOne({where: {code: params.code}}, myOptions);
|
||||
params.stateFk = id;
|
||||
}
|
||||
|
||||
if (!params.userFk) {
|
||||
|
|
|
@ -92,7 +92,7 @@
|
|||
</td>
|
||||
<td class="icon-field">
|
||||
<vn-icon
|
||||
ng-show="::ticket.isTaxDataChecked === 0"
|
||||
ng-show="::ticket.isTaxDataChecked !== 0"
|
||||
translate-attr="{title: 'No verified data'}"
|
||||
class="bright"
|
||||
icon="icon-no036">
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
</vn-td>
|
||||
<vn-td class="icon-field">
|
||||
<vn-icon
|
||||
ng-show="::ticket.isTaxDataChecked === 0"
|
||||
ng-show="::ticket.isTaxDataChecked !== 0"
|
||||
translate-attr="{title: 'No verified data'}"
|
||||
class="bright"
|
||||
icon="icon-no036">
|
||||
|
|
|
@ -67,6 +67,11 @@ module.exports = Self => {
|
|||
type: 'number',
|
||||
description: 'The freighter supplier id'
|
||||
},
|
||||
{
|
||||
arg: 'entrySupplierFk',
|
||||
type: 'number',
|
||||
description: 'The supplier of the entry(not freighter) id'
|
||||
},
|
||||
],
|
||||
returns: {
|
||||
type: ['Object'],
|
||||
|
@ -94,6 +99,8 @@ module.exports = Self => {
|
|||
return {'t.landed': {lte: value}};
|
||||
case 'continent':
|
||||
return {'cnt.code': value};
|
||||
case 'entrySupplierFk':
|
||||
return {'e.supplierFk': value};
|
||||
case 'id':
|
||||
case 'agencyModeFk':
|
||||
case 'warehouseOutFk':
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "salix-back",
|
||||
"version": "25.08.0",
|
||||
"version": "25.10.0",
|
||||
"author": "Verdnatura Levante SL",
|
||||
"description": "Salix backend",
|
||||
"license": "GPL-3.0",
|
||||
|
|
Loading…
Reference in New Issue