7152-devToTest_2414 #2228

Merged
alexm merged 636 commits from 7152-devToTest_2414 into test 2024-03-28 08:26:34 +00:00
2 changed files with 6 additions and 10 deletions
Showing only changes of commit e3899b2cf7 - Show all commits

View File

@ -86,19 +86,15 @@ module.exports = Self => {
await Self.updateTracking(ctx, saleFk, originalQuantity, code, isChecked, null, isScanned, myOptions);
try {
const buy = await models.Buy.findById(buyFk, myOptions);
if (buy.itemOriginalFk) await models.SaleBuy.create({saleFk, buyFk}, myOptions);
} catch (e) {}
if (tx) await tx.commit();
} catch (e) {
if (tx) await tx.rollback();
throw new UserError($t('The line could not be marked'));
}
const buy = await models.Buy.findOne({
where: {
id: buyFk,
itemOriginalFk: {neq: null}
}
});
if (buy) await models.SaleBuy.create({saleFk, buyFk});
};
};

View File

@ -1,5 +1,5 @@
const {models} = require('vn-loopback/server/server');
fdescribe('saleTracking mark()', () => {
describe('saleTracking mark()', () => {
const saleFk = 1;
const originalQuantity = 10;
const code = 'PREPARED';