# HG changeset patch # User Víctor Martínez Romanos # Date 1355215347 -3600 # Node ID 249513189e14e5fab0f2967cb28ebab6f0aa495e # Parent abfb4daeb91831dbb6796c3587f6857a8ed358f2 Fixed issue 22499: Billing Contact and Default Billing Contact Added Billing Contact and Default Billing Contact flags to Business Partner | Contact diff --git a/src-db/database/model/tables/AD_USER.xml b/src-db/database/model/tables/AD_USER.xml --- a/src-db/database/model/tables/AD_USER.xml +++ b/src-db/database/model/tables/AD_USER.xml @@ -153,6 +153,14 @@ + + + + + + + + @@ -207,5 +215,7 @@ + + diff --git a/src-db/database/sourcedata/AD_CALLOUT.xml b/src-db/database/sourcedata/AD_CALLOUT.xml --- a/src-db/database/sourcedata/AD_CALLOUT.xml +++ b/src-db/database/sourcedata/AD_CALLOUT.xml @@ -1036,6 +1036,15 @@ + + + + + + + + + diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml +++ b/src-db/database/sourcedata/AD_COLUMN.xml @@ -295960,6 +295960,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -298059,6 +298096,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src-db/database/sourcedata/AD_ELEMENT.xml b/src-db/database/sourcedata/AD_ELEMENT.xml --- a/src-db/database/sourcedata/AD_ELEMENT.xml +++ b/src-db/database/sourcedata/AD_ELEMENT.xml @@ -21071,6 +21071,20 @@ + + + + + + + + + + + + + + @@ -29070,6 +29084,20 @@ + + + + + + + + + + + + + + diff --git a/src-db/database/sourcedata/AD_FIELD.xml b/src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml +++ b/src-db/database/sourcedata/AD_FIELD.xml @@ -214764,6 +214764,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -244301,6 +244330,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src-db/database/sourcedata/AD_MESSAGE.xml b/src-db/database/sourcedata/AD_MESSAGE.xml --- a/src-db/database/sourcedata/AD_MESSAGE.xml +++ b/src-db/database/sourcedata/AD_MESSAGE.xml @@ -20261,6 +20261,17 @@ + + + + + + + + + + + diff --git a/src-db/database/sourcedata/AD_MODEL_OBJECT.xml b/src-db/database/sourcedata/AD_MODEL_OBJECT.xml --- a/src-db/database/sourcedata/AD_MODEL_OBJECT.xml +++ b/src-db/database/sourcedata/AD_MODEL_OBJECT.xml @@ -4088,6 +4088,18 @@ + + + + + + + + + + + + diff --git a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml --- a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml +++ b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml @@ -4160,6 +4160,16 @@ + + + + + + + + + + diff --git a/src/org/openbravo/erpCommon/ad_callouts/SE_IsDefaultBillingContact.java b/src/org/openbravo/erpCommon/ad_callouts/SE_IsDefaultBillingContact.java new file mode 100644 --- /dev/null +++ b/src/org/openbravo/erpCommon/ad_callouts/SE_IsDefaultBillingContact.java @@ -0,0 +1,90 @@ +/* + ************************************************************************* + * The contents of this file are subject to the Openbravo Public License + * Version 1.1 (the "License"), being the Mozilla Public License + * Version 1.1 with a permitted attribution clause; you may not use this + * file except in compliance with the License. You may obtain a copy of + * the License at http://www.openbravo.com/legal/license.html + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + * License for the specific language governing rights and limitations + * under the License. + * The Original Code is Openbravo ERP. + * The Initial Developer of the Original Code is Openbravo SLU + * All portions are Copyright (C) 2012 Openbravo SLU + * All Rights Reserved. + * Contributor(s): ______________________________________. + ************************************************************************ + */ +package org.openbravo.erpCommon.ad_callouts; + +import java.util.List; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; + +import org.openbravo.base.filter.IsIDFilter; +import org.openbravo.base.filter.RequestFilter; +import org.openbravo.base.filter.ValueListFilter; +import org.openbravo.dal.core.OBContext; +import org.openbravo.dal.service.OBDal; +import org.openbravo.dal.service.OBQuery; +import org.openbravo.erpCommon.utility.OBMessageUtils; +import org.openbravo.model.ad.access.User; + +public class SE_IsDefaultBillingContact extends SimpleCallout { + private static final long serialVersionUID = 1L; + private static final RequestFilter filterYesNo = new ValueListFilter("Y", "N"); + + public void init(ServletConfig config) { + super.init(config); + boolHist = false; + } + + @Override + protected void execute(CalloutInfo info) throws ServletException { + final String lastFieldChanged = info.getStringParameter("inpLastFieldChanged", null); + final String strValue = info.getStringParameter(lastFieldChanged, filterYesNo); + if ("inpisbillingcontact".equals(lastFieldChanged)) { + if ("N".equals(strValue)) { + info.addResult("inpisdefaultbillingcontact", "N"); + } + } else if ("inpisdefaultbillingcontact".equals(lastFieldChanged)) { + if ("Y".equals(strValue)) { + final String cbpartnerId = info.getStringParameter("inpcBpartnerId", IsIDFilter.instance); + final String adUserId = info.getStringParameter("inpadUserId", IsIDFilter.instance); + + OBContext.setAdminMode(); + try { + final List defaultBillingContacts = getDefaultBillingContacts(cbpartnerId, adUserId); + if (defaultBillingContacts != null && defaultBillingContacts.size() > 0) { + final String msg = String.format( + OBMessageUtils.messageBD("DuplicatedBillingContactDefaults"), + defaultBillingContacts.get(0).getIdentifier()); + info.addResult("ERROR", msg); + info.addResult(info.getLastFieldChanged(), "N"); + } + } finally { + OBContext.restorePreviousMode(); + } + } + } else { + log4j.error("SE_IsDefaultBillingContact doesn't work for column: " + lastFieldChanged); + } + } + + protected List getDefaultBillingContacts(final String cbpartnerId, + final String currentUserId) { + final StringBuffer hql = new StringBuffer(); + hql.append(" as u "); + hql.append(" where u.businessPartner.id = :c_bpartner_id "); + hql.append(" and u.id != :current_user_id"); + hql.append(" and u.isBillingContact = true "); + hql.append(" and u.isDefaultBillingContact = true "); + + final OBQuery query = OBDal.getInstance().createQuery(User.class, hql.toString()); + query.setNamedParameter("c_bpartner_id", cbpartnerId); + query.setNamedParameter("current_user_id", currentUserId); + return query.list(); + } +}