Merge branch 'dev' into 3026-send_invoice
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Joan Sanchez 2021-07-20 07:53:56 +00:00
commit 266ffde86b
2 changed files with 3 additions and 4 deletions

View File

@ -71,7 +71,7 @@ module.exports = Self => {
const models = Self.app.models;
const originalTaxes = await models.ItemTaxCountry.find({
where: {itemFk: originalId},
fields: ['botanical', 'countryFk', 'taxClassFk']
fields: ['countryFk', 'taxClassFk']
}, options);
const promises = [];
@ -99,7 +99,7 @@ module.exports = Self => {
const models = Self.app.models;
const botanical = await models.ItemBotanical.findOne({
where: {itemFk: originalId},
fields: ['botanical', 'genusFk', 'specieFk']
fields: ['genusFk', 'specieFk']
}, options);
if (botanical) {

View File

@ -3,8 +3,7 @@
"base": "Loggable",
"log": {
"model": "ItemLog",
"relation": "item",
"showField": "botanical"
"relation": "item"
},
"options": {
"mysql": {