# HG changeset patch # User Víctor Martínez Romanos # Date 1356619947 -3600 # Node ID fcf74b385c47e6f004630a3beb98721cc06a7653 # Parent a9605441d9c9ffcf76eaef82dfec97efeb20cbd5 Fixed issue 22499: Billing Contact for Business Partner Added Billing Contact and Default Billing Contact to Business Partner | Contact A callout controls only one contact is set as default billing contact per business partner In Sales/Purchase Invoice window, we only show billing contact = 'Y'. By default is set to the default billing contact (if any) The sending email process automatically sets the To field with the list of billing contacts for each business partner 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 @@ + + + + + + + + @@ -206,6 +214,8 @@ + + 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 @@ -1054,6 +1054,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 @@ -55655,7 +55655,7 @@ - + @@ -307329,6 +307329,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -310084,6 +310121,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 @@ -21137,6 +21137,20 @@ + + + + + + + + + + + + + + @@ -29462,6 +29476,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 @@ -220573,6 +220573,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -256641,6 +256670,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 @@ -20712,6 +20712,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 @@ -4136,6 +4136,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-db/database/sourcedata/AD_VAL_RULE.xml b/src-db/database/sourcedata/AD_VAL_RULE.xml --- a/src-db/database/sourcedata/AD_VAL_RULE.xml +++ b/src-db/database/sourcedata/AD_VAL_RULE.xml @@ -1569,6 +1569,17 @@ + + + + + + + + + + + diff --git a/src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java b/src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java --- a/src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java +++ b/src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java @@ -255,41 +255,37 @@ resultado.append("null"); resultado.append("\n),"); - try { - ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "AD_User_ID", - "", "AD_User C_BPartner User/Contacts", Utility.getContext(this, vars, - "#AccessibleOrgTree", strWindowId), Utility.getContext(this, vars, "#User_Client", - strWindowId), 0); - Utility.fillSQLParameters(this, vars, null, comboTableData, strWindowId, ""); - tdv = comboTableData.select(false); - comboTableData = null; - } catch (Exception ex) { - throw new ServletException(ex); - } - + final BpartnerMiscData[] billingContactData = BpartnerMiscData.selectBillingContact(this, + strBPartner, "Y"); resultado.append("new Array(\"inpadUserId\", "); - if (tdv != null && tdv.length > 0) { + if (billingContactData != null && billingContactData.length > 0) { resultado.append("new Array("); if (strContact.isEmpty()) { - resultado.append("new Array(\"" + tdv[0].getField("id") + "\", \"" - + FormatUtilities.replaceJS(tdv[0].getField("name")) + "\", \"" + "true" + "\")"); - if (tdv.length > 1) { + resultado.append("new Array(\"" + billingContactData[0].getField("id") + "\", \"" + + FormatUtilities.replaceJS(billingContactData[0].getField("name")) + "\", \"" + + (billingContactData.length == 1 ? "true" : "false") + "\")"); + if (billingContactData.length > 1) { resultado.append(",\n"); } - for (int i = 1; i < tdv.length; i++) { - resultado.append("new Array(\"" + tdv[i].getField("id") + "\", \"" - + FormatUtilities.replaceJS(tdv[i].getField("name")) + "\", \"" + "false" + "\")"); - if (i < tdv.length - 1) { + for (int i = 1; i < billingContactData.length; i++) { + resultado.append("new Array(\"" + billingContactData[i].getField("id") + "\", \"" + + FormatUtilities.replaceJS(billingContactData[i].getField("name")) + "\", \"" + + (billingContactData.length == i ? "false" : "true") + "\")"); + if (i < billingContactData.length - 1) { resultado.append(",\n"); } } } else { - for (int i = 0; i < tdv.length; i++) { - resultado.append("new Array(\"" + tdv[i].getField("id") + "\", \"" - + FormatUtilities.replaceJS(tdv[i].getField("name")) + "\", \"" - + (tdv[i].getField("id").equalsIgnoreCase(strContact) ? "true" : "false") + "\")"); - if (i < tdv.length - 1) { + for (int i = 0; i < billingContactData.length; i++) { + resultado.append("new Array(\"" + + billingContactData[i].getField("id") + + "\", \"" + + FormatUtilities.replaceJS(billingContactData[i].getField("name")) + + "\", \"" + + (billingContactData[i].getField("id").equalsIgnoreCase(strContact) ? "true" + : "false") + "\")"); + if (i < billingContactData.length - 1) { resultado.append(",\n"); } } 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(); + } +} diff --git a/src/org/openbravo/erpCommon/businessUtility/BpartnerMisc_data.xsql b/src/org/openbravo/erpCommon/businessUtility/BpartnerMisc_data.xsql --- a/src/org/openbravo/erpCommon/businessUtility/BpartnerMisc_data.xsql +++ b/src/org/openbravo/erpCommon/businessUtility/BpartnerMisc_data.xsql @@ -12,7 +12,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2001-2010 Openbravo SLU + * All portions are Copyright (C) 2001-2012 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -35,7 +35,8 @@ p.InvoiceRule,p.DeliveryRule,DeliveryViaRule, COALESCE(p.SO_CreditLimit-p.SO_CreditUsed,-1) AS CreditAvailable, p.PO_PriceList_ID, p.PaymentRulePO, p.PO_PaymentTerm_ID, p.salesrep_Id, - p.fin_paymentmethod_id, p.po_paymentmethod_id + p.fin_paymentmethod_id, p.po_paymentmethod_id, + '' as id, '' as name FROM C_BPartner p WHERE p.C_BPartner_ID=? ]]> @@ -57,5 +58,20 @@ + + + + + + + + diff --git a/src/org/openbravo/erpCommon/utility/reporting/printing/Poc_data.xsql b/src/org/openbravo/erpCommon/utility/reporting/printing/Poc_data.xsql --- a/src/org/openbravo/erpCommon/utility/reporting/printing/Poc_data.xsql +++ b/src/org/openbravo/erpCommon/utility/reporting/printing/Poc_data.xsql @@ -195,6 +195,25 @@ + + + + + coalesce(?, '') + and c_invoice.c_invoice_id = ? + ]]> + + + + diff --git a/src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java b/src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java --- a/src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java +++ b/src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java @@ -79,6 +79,7 @@ private PocData[] pocData; private boolean multiReports = false; private boolean archivedReports = false; + private static final String EMAIL_SEPARATOR = ", "; @Override public void init(ServletConfig config) { @@ -629,7 +630,36 @@ case SALESORDER: return PocData.getContactDetailsForOrders(this, strDocumentId); case SALESINVOICE: - return PocData.getContactDetailsForInvoices(this, strDocumentId); + PocData[] data = PocData.getContactDetailsForInvoices(this, strDocumentId); + if (data != null && data.length > 0) { + for (final PocData d : data) { + final PocData[] ccData = PocData.getCCContactDetailsForInvoices(this, d.contactUserId, + d.documentId); + + final StringBuffer ccEmail = new StringBuffer(d.contactEmail); + for (final PocData ccd : ccData) { + ccEmail.append(EMAIL_SEPARATOR); + ccEmail.append(ccd.contactEmail); + } + d.contactEmail = ccEmail.toString(); + if (d.contactEmail != null && d.contactEmail.length() >= EMAIL_SEPARATOR.length() + && d.contactEmail.startsWith(EMAIL_SEPARATOR)) { + d.contactEmail = d.contactEmail.substring(EMAIL_SEPARATOR.length()); + } + + final StringBuffer ccName = new StringBuffer(d.contactName); + for (final PocData ccd : ccData) { + ccName.append(EMAIL_SEPARATOR); + ccName.append(ccd.contactName); + } + d.contactName = ccName.toString(); + if (d.contactName != null && d.contactName.length() >= EMAIL_SEPARATOR.length() + && d.contactName.startsWith(EMAIL_SEPARATOR)) { + d.contactName = d.contactName.substring(EMAIL_SEPARATOR.length()); + } + } + } + return data; case SHIPMENT: return PocData.getContactDetailsForShipments(this, strDocumentId); case PURCHASEORDER: