details: https://code.openbravo.com/erp/stable/2.50/rev/64d0b576207d changeset: 9739:64d0b576207d user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Mon Nov 14 09:23:11 2011 +0100 summary: Fixes issue 18614: Default PaymentTerm is not working.
details: https://code.openbravo.com/erp/stable/2.50/rev/8b69b4fea671 changeset: 9740:8b69b4fea671 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Tue Nov 15 10:47:14 2011 +0100 summary: Fixes issue 18789: Suggested Work Requirement with zero quantity should not become Work Requirement. diffstat: src-db/database/model/functions/MRP_WORKREQUIREMENT.xml | 1 + src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java | 7 +++ src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java | 20 +++++++-- src/org/openbravo/erpCommon/businessUtility/BpartnerMisc_data.xsql | 13 ++++++ 4 files changed, 36 insertions(+), 5 deletions(-) diffs (107 lines): diff -r 882fa1c6f142 -r 8b69b4fea671 src-db/database/model/functions/MRP_WORKREQUIREMENT.xml --- a/src-db/database/model/functions/MRP_WORKREQUIREMENT.xml Mon Nov 14 09:23:39 2011 +0100 +++ b/src-db/database/model/functions/MRP_WORKREQUIREMENT.xml Tue Nov 15 10:47:14 2011 +0100 @@ -77,6 +77,7 @@ AND MRP_RUN_PRODUCTION_ID = v_Record_ID AND INOUTTRXTYPE = 'WP' AND MA_WORKREQUIREMENT_ID IS NULL + AND MRP_RUN_PRODUCTIONLINE.QTY <> 0 ORDER BY PLANNEDDATE ) LOOP v_ResultStr:='Create Work Requirement'; diff -r 882fa1c6f142 -r 8b69b4fea671 src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java --- a/src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java Mon Nov 14 09:23:39 2011 +0100 +++ b/src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java Tue Nov 15 10:47:14 2011 +0100 @@ -131,6 +131,13 @@ resultado.append("new Array(\"inpfinPaymentmethodId\", \"" + strFinPaymentMethodId + "\"),"); String PaymentTerm = (strIsSOTrx.equals("Y") ? data[0].cPaymenttermId : data[0].poPaymenttermId); + if (PaymentTerm.equalsIgnoreCase("")) { + BpartnerMiscData[] paymentTerm = BpartnerMiscData.selectPaymentTerm(this, strOrgId, vars + .getClient()); + if (paymentTerm.length != 0) { + PaymentTerm = PaymentTerm.equals("") ? paymentTerm[0].cPaymenttermId : PaymentTerm; + } + } resultado.append("new Array(\"inpcPaymenttermId\", \"" + PaymentTerm + "\"),"); FieldProvider[] tdv = null; try { diff -r 882fa1c6f142 -r 8b69b4fea671 src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java --- a/src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java Mon Nov 14 09:23:39 2011 +0100 +++ b/src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java Tue Nov 15 10:47:14 2011 +0100 @@ -66,11 +66,12 @@ String strInvoiceRule = vars.getStringParameter("inpinvoicerule"); String strPriceList = vars.getStringParameter("inpmPricelistId"); String strDeliveryViaRule = vars.getStringParameter("inpdeliveryviarule"); + String strOrgId = vars.getStringParameter("inpadOrgId"); try { printPage(response, vars, strBPartner, strOrderType, strIsSOTrx, strWindowId, strLocation, strContact, strProjectId, strTabId, strDeliveryRule, strUserRep, strPaymentrule, - strPaymentterm, strInvoiceRule, strPriceList, strDeliveryViaRule); + strPaymentterm, strInvoiceRule, strPriceList, strDeliveryViaRule, strOrgId); } catch (ServletException ex) { pageErrorCallOut(response); } @@ -82,7 +83,8 @@ String strOrderType, String strIsSOTrx, String strWindowId, String strLocation, String strContact, String strProjectId, String strTabId, String strDeliveryRule0, String strUserRep0, String strPaymentrule0, String strPaymentterm0, String strInvoiceRule0, - String strPriceList0, String strDeliveryViaRule0) throws IOException, ServletException { + String strPriceList0, String strDeliveryViaRule0, String strOrgId) throws IOException, + ServletException { if (log4j.isDebugEnabled()) log4j.debug("Output: dataSheet"); @@ -100,8 +102,18 @@ strUserRep = strUserRep.equals("") ? strUserRep0 : strUserRep; strPaymentrule = (strIsSOTrx.equals("Y") ? data[0].paymentrule : data[0].paymentrulepo); strPaymentrule = strPaymentrule.equals("") ? strPaymentrule0 : strPaymentrule; + strPaymentterm = (strIsSOTrx.equals("Y") ? data[0].cPaymenttermId : data[0].poPaymenttermId); + if (strPaymentterm.equalsIgnoreCase("")) { + BpartnerMiscData[] paymentTerm = BpartnerMiscData.selectPaymentTerm(this, strOrgId, vars + .getClient()); + if (paymentTerm.length != 0) { + strPaymentterm = strPaymentterm.equals("") ? paymentTerm[0].cPaymenttermId + : strPaymentterm; + } + } strPaymentterm = strPaymentterm.equals("") ? strPaymentterm0 : strPaymentterm; + strInvoiceRule = data[0].invoicerule.equals("") ? strInvoiceRule0 : data[0].invoicerule; strFinPaymentMethodId = (strIsSOTrx.equals("Y") ? data[0].finPaymentmethodId : data[0].poPaymentmethodId); @@ -272,9 +284,7 @@ resultado.append("new Array(\"inpdeliveryviarule\", \"" + strDeliveryViaRule + "\"),"); resultado.append("new Array(\"inpisdiscountprinted\", \"" + SEOrderBPartnerData.getIsDicountPrinted(this, strBPartner) + "\"),"); - resultado.append("new Array(\"inpcPaymenttermId\", \"" - + (strPaymentterm.equals("") ? SEOrderBPartnerData.selectPaymentTerm(this, Utility - .getContext(this, vars, "#User_Client", strWindowId)) : strPaymentterm) + "\"),"); + resultado.append("new Array(\"inpcPaymenttermId\", \"" + strPaymentterm + "\"),"); resultado.append("new Array(\"inpdeliveryrule\", "); try { ComboTableData comboTableData = new ComboTableData(vars, this, "LIST", "", diff -r 882fa1c6f142 -r 8b69b4fea671 src/org/openbravo/erpCommon/businessUtility/BpartnerMisc_data.xsql --- a/src/org/openbravo/erpCommon/businessUtility/BpartnerMisc_data.xsql Mon Nov 14 09:23:39 2011 +0100 +++ b/src/org/openbravo/erpCommon/businessUtility/BpartnerMisc_data.xsql Tue Nov 15 10:47:14 2011 +0100 @@ -42,5 +42,18 @@ </Sql> <Parameter name="cBpartnerId"/> </SqlMethod> + <SqlMethod name="selectPaymentTerm" type="preparedStatement" return="multiple"> + <SqlMethodComment></SqlMethodComment> + <Sql> + <![CDATA[ + SELECT pt.C_PaymentTerm_ID + FROM C_PaymentTerm pt + WHERE AD_ISORGINCLUDED(?, pt.ad_org_id, ?) <> -1 + AND isdefault = 'Y' + ]]> + </Sql> + <Parameter name="adOrgId"/> + <Parameter name="adClientId"/> + </SqlMethod> </SqlClass> ------------------------------------------------------------------------------ RSA(R) Conference 2012 Save $700 by Nov 18 Register now http://p.sf.net/sfu/rsa-sfdev2dev1 _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
