verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 49 Releases Wiki Activity

Merge pull request '3027-itemBotanical_deprecated_column' (#695) from 3027-itemBotanical_deprecated_column into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #695
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
This commit is contained in:
Joan Sanchez 2021-07-20 07:53:38 +00:00
parent 63b502b368 4cbaf247ed
commit 6f400aa1f3
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/item/back/methods/item/clone.js
View File

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

3
modules/item/back/models/item-botanical.json
View File

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