From 539261d89fa1a0402023c1c6c3c43dfd0254fca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Carlos=20Toledano=20G=C3=B3mez?= Date: Tue, 30 Nov 2021 10:23:25 -0500 Subject: [PATCH] Fixes issue NOE-5142: Update product name validation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Development rules: A new flag “Use translation product name” is added in the ‘Organization’ window, ‘Portuguese Configuration’ section. The new flag will indicate where the validation is done. In case the flag mentioned above is marked for a selected SAF-T informer organization, the value informed as product name in SAF-T/e-Fatura file will be the Portuguese translation one. If not existing, will inform the header product name. --- .../database/model/modifiedTables/AD_ORG.xml | 5 ++ src-db/database/sourcedata/AD_COLUMN.xml | 46 +++++++++++- src-db/database/sourcedata/AD_ELEMENT.xml | 14 ++++ src-db/database/sourcedata/AD_FIELD.xml | 31 ++++++++ .../handler/SaftProductFieldsHandler.java | 40 +++++----- .../handler/SaftProductTrlFieldsHandler.java | 73 +++++++++++++++++++ 6 files changed, 185 insertions(+), 24 deletions(-) create mode 100644 src/com/practicsbs/saftpt/handler/SaftProductTrlFieldsHandler.java diff --git a/src-db/database/model/modifiedTables/AD_ORG.xml b/src-db/database/model/modifiedTables/AD_ORG.xml index 18cfc3b..ba3d3fa 100644 --- a/src-db/database/model/modifiedTables/AD_ORG.xml +++ b/src-db/database/model/modifiedTables/AD_ORG.xml @@ -13,7 +13,12 @@ + + + + + diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml index 2641895..a4ef597 100644 --- a/src-db/database/sourcedata/AD_COLUMN.xml +++ b/src-db/database/sourcedata/AD_COLUMN.xml @@ -4315,7 +4315,7 @@ - + @@ -4668,7 +4668,7 @@ - + @@ -4837,6 +4837,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5015,7 +5055,7 @@ - + diff --git a/src-db/database/sourcedata/AD_ELEMENT.xml b/src-db/database/sourcedata/AD_ELEMENT.xml index 1be55c3..b82a6d1 100644 --- a/src-db/database/sourcedata/AD_ELEMENT.xml +++ b/src-db/database/sourcedata/AD_ELEMENT.xml @@ -354,6 +354,20 @@ + + + + + + + + + + + + + + diff --git a/src-db/database/sourcedata/AD_FIELD.xml b/src-db/database/sourcedata/AD_FIELD.xml index e73da8a..54f7a72 100644 --- a/src-db/database/sourcedata/AD_FIELD.xml +++ b/src-db/database/sourcedata/AD_FIELD.xml @@ -3020,6 +3020,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/com/practicsbs/saftpt/handler/SaftProductFieldsHandler.java b/src/com/practicsbs/saftpt/handler/SaftProductFieldsHandler.java index 79fb0ab..6c4ba9b 100644 --- a/src/com/practicsbs/saftpt/handler/SaftProductFieldsHandler.java +++ b/src/com/practicsbs/saftpt/handler/SaftProductFieldsHandler.java @@ -2,15 +2,15 @@ package com.practicsbs.saftpt.handler; import javax.enterprise.event.Observes; -import org.hibernate.criterion.Restrictions; import org.openbravo.base.exception.OBException; import org.openbravo.base.model.Entity; import org.openbravo.base.model.ModelProvider; import org.openbravo.base.model.Property; +import org.openbravo.base.structure.BaseOBObject; import org.openbravo.client.kernel.event.EntityNewEvent; import org.openbravo.client.kernel.event.EntityUpdateEvent; -import org.openbravo.dal.service.OBCriteria; import org.openbravo.dal.service.OBDal; +import org.openbravo.dal.service.OBQuery; import org.openbravo.model.common.invoice.InvoiceLine; import org.openbravo.model.common.order.OrderLine; import org.openbravo.model.common.plm.Product; @@ -85,27 +85,25 @@ public class SaftProductFieldsHandler extends SaftFieldsHandler { return; } - // Check Invoice Lines: - OBCriteria invoiceLineCriteria = OBDal.getInstance() - .createCriteria(InvoiceLine.class); - invoiceLineCriteria.add(Restrictions.eq(InvoiceLine.PROPERTY_PRODUCT, prod)); - invoiceLineCriteria.add(Restrictions.isNotNull(InvoiceLine.PROPERTY_SAFTLINENUM)); - invoiceLineCriteria.setMaxResults(1); - invoiceLineCriteria.setFilterOnReadableOrganization(false); - - if (invoiceLineCriteria.count() != 0) { + if (checkLines(InvoiceLine.class, prod) || checkLines(OrderLine.class, prod)) { throw new OBException(SaftUtility.getMessageFromBD("SAFT_ChangeProductDescription")); } + } - // Check Order Lines: - OBCriteria orderLineCriteria = OBDal.getInstance().createCriteria(OrderLine.class); - orderLineCriteria.add(Restrictions.eq(OrderLine.PROPERTY_PRODUCT, prod)); - orderLineCriteria.add(Restrictions.isNotNull(OrderLine.PROPERTY_SAFTLINENUM)); - orderLineCriteria.setFilterOnReadableOrganization(false); - orderLineCriteria.setMaxResults(1); - - if (orderLineCriteria.count() != 0) { - throw new OBException(SaftUtility.getMessageFromBD("SAFT_ChangeProductDescription")); - } + private boolean checkLines(Class obDalType, final Product prod) { + // @formatter:off + String hql = " as l " + + " join l.organization o " + + " where l.product.id = :productId " + + " and l.saftLinenum is not NULL " + + " and (o.saftUsetranslation = false " + + " or not exists (select 1 from ProductTrl pt where pt.product.id = :productId and pt.language.language = 'pt_PT') " + + " ) "; + // @formatter:on + OBQuery query = OBDal.getInstance().createQuery(obDalType, hql); + query.setNamedParameter("productId", prod.getId()); + query.setFilterOnReadableOrganization(false); + query.setMaxResult(1); + return query.uniqueResult() != null; } } diff --git a/src/com/practicsbs/saftpt/handler/SaftProductTrlFieldsHandler.java b/src/com/practicsbs/saftpt/handler/SaftProductTrlFieldsHandler.java new file mode 100644 index 0000000..77b0513 --- /dev/null +++ b/src/com/practicsbs/saftpt/handler/SaftProductTrlFieldsHandler.java @@ -0,0 +1,73 @@ +package com.practicsbs.saftpt.handler; + +import javax.enterprise.event.Observes; + +import org.openbravo.base.exception.OBException; +import org.openbravo.base.model.Entity; +import org.openbravo.base.model.ModelProvider; +import org.openbravo.base.model.Property; +import org.openbravo.base.structure.BaseOBObject; +import org.openbravo.client.kernel.event.EntityUpdateEvent; +import org.openbravo.dal.service.OBDal; +import org.openbravo.dal.service.OBQuery; +import org.openbravo.model.common.invoice.InvoiceLine; +import org.openbravo.model.common.order.OrderLine; +import org.openbravo.model.common.plm.Product; +import org.openbravo.model.common.plm.ProductTrl; + +import com.practicsbs.saftpt.SaftUtility; + +public class SaftProductTrlFieldsHandler extends SaftFieldsHandler { + + private static Entity[] entities = { + ModelProvider.getInstance().getEntity(ProductTrl.ENTITY_NAME) }; + + @Override + protected Entity[] getObservedEntities() { + return entities; + } + + public void onUpdate(@Observes EntityUpdateEvent event) { + if (!isValidEvent(event)) { + return; + } + ProductTrl prodTrl = (ProductTrl) event.getTargetInstance(); + + if (!isPortugueseConfigurationEnabled(prodTrl.getProduct())) { + return; + } + + validateChangeProductTrlDescription(event, prodTrl); + } + + private void validateChangeProductTrlDescription(EntityUpdateEvent event, ProductTrl prodTrl) { + + Entity targetEntity = event.getTargetInstance().getEntity(); + + Property propName = targetEntity.getProperty(ProductTrl.PROPERTY_NAME); + String oldName = (String) event.getPreviousState(propName); + Product prod = prodTrl.getProduct(); + + if (!oldName.equalsIgnoreCase(prodTrl.getName()) + && prodTrl.getLanguage().getLanguage().equals("pt_PT") + && (checkLines(InvoiceLine.class, prod) || checkLines(OrderLine.class, prod))) { + throw new OBException(SaftUtility.getMessageFromBD("SAFT_ChangeProductDescription")); + } + } + + private boolean checkLines(Class obDalType, final Product prod) { + // @formatter:off + String hql = " as l " + + " join l.organization o " + + " where l.product.id = :productId " + + " and l.saftLinenum is not null " + + " and o.saftUsetranslation = true "; + + // @formatter:on + OBQuery query = OBDal.getInstance().createQuery(obDalType, hql); + query.setNamedParameter("productId", prod.getId()); + query.setFilterOnReadableOrganization(false); + query.setMaxResult(1); + return query.uniqueResult() != null; + } +} -- 2.30.2