details: https://code.openbravo.com/erp/devel/main/rev/03d3a5bd427f changeset: 20686:03d3a5bd427f user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Thu Jul 04 17:38:00 2013 +0530 summary: Fixes Issue 24270: Error is not raised when processing 2 identical inventory lines
details: https://code.openbravo.com/erp/devel/main/rev/a6324be21ea8 changeset: 20687:a6324be21ea8 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Tue Jul 02 15:11:09 2013 +0530 summary: Fixes Issue 0024243: You cannot close a completed order. details: https://code.openbravo.com/erp/devel/main/rev/b23e5475b883 changeset: 20688:b23e5475b883 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Mon Jul 08 17:57:50 2013 +0200 summary: Fixes bug 24282 diffstat: src-db/database/model/triggers/C_ORDERLINETAX_TRG.xml | 9 ++++++--- src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 10 ++++------ src/org/openbravo/materialmgmt/InventoryCountProcess.java | 4 ++-- 3 files changed, 12 insertions(+), 11 deletions(-) diffs (72 lines): diff -r dda53450ca1d -r b23e5475b883 src-db/database/model/triggers/C_ORDERLINETAX_TRG.xml --- a/src-db/database/model/triggers/C_ORDERLINETAX_TRG.xml Wed Jul 10 12:15:48 2013 +0000 +++ b/src-db/database/model/triggers/C_ORDERLINETAX_TRG.xml Mon Jul 08 17:57:50 2013 +0200 @@ -33,6 +33,7 @@ v_Increment_Amount C_ORDERTAX.TAXAMT%TYPE ; v_Increment_Base C_ORDERTAX.TAXBASEAMT%TYPE ; v_Processed VARCHAR(60) ; +v_DocAction VARCHAR(60); BEGIN IF AD_isTriggerEnabled()='N' THEN RETURN; @@ -96,11 +97,13 @@ :NEW.UPDATEDBY, :NEW.TAXBASEAMT, :NEW.TAXAMT, v_LineNo); END IF; ELSE - SELECT PROCESSED - INTO v_Processed + SELECT PROCESSED, + DOCACTION + INTO v_Processed, + v_DocAction FROM C_ORDER WHERE C_ORDER_ID=v_C_ORDER_ID; - IF (v_Processed='Y') THEN + IF (v_Processed='Y' AND v_DocAction <> 'CL') THEN RAISE_APPLICATION_ERROR(-20000, '@20501@') ; END IF; UPDATE C_ORDERTAX SET TAXAMT = (CASE WHEN v_DocTaxAmount='D' THEN ROUND((TAXBASEAMT - :OLD.TAXBASEAMT) * v_Rate/100, v_Prec) ELSE (TAXAMT - :OLD.TAXAMT) END), TAXBASEAMT=TAXBASEAMT - :OLD.TAXBASEAMT diff -r dda53450ca1d -r b23e5475b883 src/org/openbravo/erpCommon/ad_forms/AcctServer.java --- a/src/org/openbravo/erpCommon/ad_forms/AcctServer.java Wed Jul 10 12:15:48 2013 +0000 +++ b/src/org/openbravo/erpCommon/ad_forms/AcctServer.java Mon Jul 08 17:57:50 2013 +0200 @@ -378,13 +378,11 @@ log4j.debug("AcctServer.run - AD_Client_ID: " + AD_Client_ID); AcctServerData[] data = null; - final Set<String> orgSet = OBContext.getOBContext().getOrganizationStructureProvider() - .getChildTree(AD_Org_ID, true); + final Set<String> orgSet = OBContext.getOBContext() + .getOrganizationStructureProvider(AD_Client_ID).getChildTree(AD_Org_ID, true); String strOrgs = Utility.getInStrSet(orgSet); - data = AcctServerData.select(connectionProvider, tableName, strDateColumn, AD_Client_ID, strOrgs, strDateFrom, strDateTo, 0, Integer.valueOf(batchSize).intValue()); - if (data != null && data.length > 0) { if (log4j.isDebugEnabled()) { log4j.debug("AcctServer - Run -Select inicial realizada N = " + data.length + " - Key: " @@ -2094,8 +2092,8 @@ AD_Client_ID); // if (log4j.isDebugEnabled()) // log4j.debug("AcctServer - AcctSchema length-" + (this.m_as).length); - final Set<String> orgSet = OBContext.getOBContext().getOrganizationStructureProvider() - .getChildTree(AD_Org_ID, true); + final Set<String> orgSet = OBContext.getOBContext() + .getOrganizationStructureProvider(AD_Client_ID).getChildTree(AD_Org_ID, true); String strorgs = Utility.getInStrSet(orgSet); String rownum = "0", oraLimit1 = null, oraLimit2 = null, pgLimit = null; diff -r dda53450ca1d -r b23e5475b883 src/org/openbravo/materialmgmt/InventoryCountProcess.java --- a/src/org/openbravo/materialmgmt/InventoryCountProcess.java Wed Jul 10 12:15:48 2013 +0000 +++ b/src/org/openbravo/materialmgmt/InventoryCountProcess.java Mon Jul 08 17:57:50 2013 +0200 @@ -248,8 +248,8 @@ + InventoryCountLine.PROPERTY_PRODUCT); where.append(" and coalesce(icl." + InventoryCountLine.PROPERTY_ATTRIBUTESETVALUE + ", '0') = coalesce(icl2." + InventoryCountLine.PROPERTY_ATTRIBUTESETVALUE + ", '0')"); - where.append(" and icl." + InventoryCountLine.PROPERTY_ORDERUOM + " = icl2." - + InventoryCountLine.PROPERTY_ORDERUOM); + where.append(" and coalesce(icl." + InventoryCountLine.PROPERTY_ORDERUOM + + ", '0') = coalesce(icl2." + InventoryCountLine.PROPERTY_ORDERUOM + ", '0')"); where.append(" and icl." + InventoryCountLine.PROPERTY_STORAGEBIN + " = icl2." + InventoryCountLine.PROPERTY_STORAGEBIN); where.append(" and icl." + InventoryCountLine.PROPERTY_LINENO + " <> icl2." ------------------------------------------------------------------------------ See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
