Compare commits

...

14 Commits

Author SHA1 Message Date
Alex Moreno 728e6e921a build: init version
gitea/salix/pipeline/head This commit looks good Details
2025-02-18 13:38:46 +01:00
Alex Moreno f316349ac2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2025-02-18 13:38:21 +01:00
Alex Moreno 7ec29d1972 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2025-02-18 13:38:10 +01:00
Alex Moreno 40492d6489 Merge pull request '8627-devToTest' (!3474) from 8627-devToTest into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3474
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2025-02-18 12:33:29 +00:00
Jon Elias 0f0504e590 Merge pull request '#8555: Added new filter field' (!3434) from 8555-AddNewField into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3434
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-02-18 11:46:12 +00:00
Jon Elias 6118154ef9 Merge branch 'dev' into 8555-AddNewField
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-18 11:44:01 +00:00
Alex Moreno dc989cb075 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8627-devToTest
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-18 10:35:00 +01:00
Alex Moreno 2386874a96 fix: refs #8627 add claim in getSales
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-18 10:28:00 +01:00
Alex Moreno 06c123d7f2 fix: refs #8627 ticket isTaxDataChecked 2025-02-18 10:15:28 +01:00
Alex Moreno a8c03548d9 fix: refs #8627 update stateFk assignment to use code instead of id
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-18 09:51:08 +01:00
Carlos Andrés 5488a229c1 Merge pull request 'fix: priceOptimum error' (!3471) from PriceOptimum-error into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3471
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-02-18 08:50:27 +00:00
Carlos Andrés a73199e70b fix: priceOptimum error
gitea/salix/pipeline/pr-master This commit looks good Details
2025-02-17 18:52:31 +01:00
Jon Elias 2e04a38c66 Merge branch 'dev' into 8555-AddNewField
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-11 11:24:17 +00:00
Jon Elias 02f51a244d feat: refs #8555 added new filter field
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-11 12:19:15 +01:00
9 changed files with 24 additions and 5 deletions

View File

@ -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 ;

View File

@ -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 ;

View File

@ -0,0 +1,3 @@
UPDATE vn.zone
SET priceOptimum = price
WHERE priceOptimum = 0;

View File

@ -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];

View File

@ -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) {

View File

@ -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">

View File

@ -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">

View File

@ -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':

View File

@ -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",