details: https://code.openbravo.com/erp/devel/pi/rev/5cc3cf061007 changeset: 19181:5cc3cf061007 user: David Miguelez <david.miguelez <at> openbravo.com> date: Wed Jan 09 12:22:32 2013 +0100 summary: Changed License year and format changes.
details: https://code.openbravo.com/erp/devel/pi/rev/7c294fcd880f changeset: 19182:7c294fcd880f user: David Miguelez <david.miguelez <at> openbravo.com> date: Wed Jan 09 12:41:13 2013 +0100 summary: Fixes Issue 22751. Revert changes made when fixing Issue 19043 diffstat: src-db/database/model/functions/M_INOUT_POST.xml | 19 +-- src-db/database/model/triggers/M_INOUTLINE_TRG.xml | 15 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java | 83 ++++----- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql | 40 +---- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_ShipmentPO.html | 8 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql | 57 +------ src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending_data.xsql | 8 +- 7 files changed, 54 insertions(+), 176 deletions(-) diffs (truncated from 814 to 300 lines): diff -r bedb82b9459e -r 7c294fcd880f src-db/database/model/functions/M_INOUT_POST.xml --- a/src-db/database/model/functions/M_INOUT_POST.xml Wed Jan 09 14:56:52 2013 +0530 +++ b/src-db/database/model/functions/M_INOUT_POST.xml Wed Jan 09 12:41:13 2013 +0100 @@ -532,19 +532,13 @@ AND sl.M_Product_ID=ol.M_Product_ID -- AND sl.M_AttributeSetInstance_ID=ol.M_AttributeSetInstance_ID AND sl.M_InOut_ID=Cur_InOut.M_InOut_ID ) - LOOP - - SELECT count(*) INTO v_count - FROM M_MATCHPO - WHERE C_ORDERLINE_ID = Cur_SLines.C_OrderLine_ID - AND M_INOUTLINE_ID = Cur_SLines.M_InOutLine_ID; + LOOP v_Qty:=Cur_SLines.MovementQty; --IF (ABS(Cur_SLines.MovementQty) > ABS(Cur_SLines.QtyOrdered)) THEN -- v_Qty := Cur_SLines.QtyOrdered; --END IF; - IF (v_count = 0) THEN Ad_Sequence_Next('M_MatchPO', Cur_SLines.AD_Org_ID, v_MatchPO_ID) ; -- The min qty. Modified by Ismael Ciordia v_ResultStr:='InsertMatchPO ' || v_MatchPO_ID; @@ -564,18 +558,7 @@ v_Qty, 'N', 'Y', 'N' ) ; - ELSE - SELECT max(M_MATCHPO_ID) - INTO v_MatchPO_ID - FROM M_MATCHPO - WHERE C_ORDERLINE_ID = Cur_SLines.C_OrderLine_ID - AND M_INOUTLINE_ID = Cur_SLines.M_InOutLine_ID; - v_ResultStr:='UpdateMatchPO ' || v_MatchPO_ID; - UPDATE M_MATCHPO - SET DateTrx = now(), Qty =v_Qty, Processing = 'N', Processed = 'Y', Posted='N' - WHERE M_MATCHPO_ID = v_MatchPO_ID; - END IF; END LOOP; v_ResultStr:='MatchInv'; FOR Cur_ILines IN diff -r bedb82b9459e -r 7c294fcd880f src-db/database/model/triggers/M_INOUTLINE_TRG.xml --- a/src-db/database/model/triggers/M_INOUTLINE_TRG.xml Wed Jan 09 14:56:52 2013 +0530 +++ b/src-db/database/model/triggers/M_INOUTLINE_TRG.xml Wed Jan 09 12:41:13 2013 +0100 @@ -14,7 +14,6 @@ v_qtyold NUMBER; v_qtyorderold NUMBER; v_MatchInvCount NUMBER; - v_MatchPoCount NUMBER; v_STOCKED NUMBER; v_UOM_ID varchar2(32); v_AttrSetValueType M_Product.AttrSetValueType%TYPE; @@ -35,7 +34,7 @@ * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): Openbravo SLU - * Contributions are Copyright (C) 2001-2010 Openbravo S.L.U. + * Contributions are Copyright (C) 2001-2013 Openbravo S.L.U. ******************************************************************************/ BEGIN @@ -133,18 +132,6 @@ AND M_INOUTLINE_ID = :NEW.M_INOUTLINE_ID; END IF; - SELECT COUNT(*) INTO v_MatchPoCount - FROM M_MatchPo MO - WHERE MO.Qty = :OLD.MovementQty - AND MO.M_InOutLine_ID = :NEW.M_InOutLine_ID; - - IF (:OLD.MovementQty <> :NEW.MovementQty AND v_MatchPoCount = 1) THEN - UPDATE M_MatchPo - SET Qty = :NEW.MovementQty - WHERE Qty = :OLD.MovementQty - AND M_InOutLine_ID = :NEW.M_InOutLine_ID; - END IF; - END IF; diff -r bedb82b9459e -r 7c294fcd880f src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java --- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java Wed Jan 09 14:56:52 2013 +0530 +++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java Wed Jan 09 12:41:13 2013 +0100 @@ -11,7 +11,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-2012 Openbravo SLU + * All portions are Copyright (C) 2001-2013 Openbravo SLU * All Rights Reserved. * Contributor(s): Cheli Pineda__________________________. ************************************************************************ @@ -487,7 +487,7 @@ if (isSOTrx.equals("Y")) data = CreateFromInvoiceData.selectFromPOSOTrx(this, vars.getLanguage(), Utility.getContext(this, vars, "#User_Client", strWindowId), - Utility.getContext(this, vars, "#User_Org", strWindowId), strPO, strKey); + Utility.getContext(this, vars, "#User_Org", strWindowId), strPO); else data = CreateFromInvoiceData.selectFromPO(this, vars.getLanguage(), strKey, Utility.getContext(this, vars, "#User_Client", strWindowId), @@ -496,7 +496,7 @@ if (isSOTrx.equals("Y")) data = CreateFromInvoiceData.selectFromPOTrlSOTrx(this, vars.getLanguage(), Utility.getContext(this, vars, "#User_Client", strWindowId), - Utility.getContext(this, vars, "#User_Org", strWindowId), strPO, strKey); + Utility.getContext(this, vars, "#User_Org", strWindowId), strPO); else data = CreateFromInvoiceData.selectFromPOTrl(this, vars.getLanguage(), strKey, Utility.getContext(this, vars, "#User_Client", strWindowId), @@ -508,23 +508,23 @@ data = CreateFromInvoiceData.selectFromShipmentSOTrx(this, vars.getLanguage(), Utility.getContext(this, vars, "#User_Client", strWindowId), Utility.getContext(this, vars, "#User_Org", strWindowId), strShipment, - strIsTaxIncluded, strKey); + strIsTaxIncluded); else data = CreateFromInvoiceData.selectFromShipment(this, vars.getLanguage(), Utility.getContext(this, vars, "#User_Client", strWindowId), Utility.getContext(this, vars, "#User_Org", strWindowId), strShipment, - strIsTaxIncluded, strKey); + strIsTaxIncluded); } else { if (isSOTrx.equals("Y")) data = CreateFromInvoiceData.selectFromShipmentTrlSOTrx(this, vars.getLanguage(), Utility.getContext(this, vars, "#User_Client", strWindowId), Utility.getContext(this, vars, "#User_Org", strWindowId), strShipment, - strIsTaxIncluded, strKey); + strIsTaxIncluded); else data = CreateFromInvoiceData.selectFromShipmentTrl(this, vars.getLanguage(), Utility.getContext(this, vars, "#User_Client", strWindowId), Utility.getContext(this, vars, "#User_Org", strWindowId), strShipment, - strIsTaxIncluded, strKey); + strIsTaxIncluded); } } } @@ -560,20 +560,20 @@ xmlDocument.setData("reportShipmentReciept", "liststructure", CreateFromInvoiceData .selectFromShipmentSOTrxCombo(this, vars.getLanguage(), Utility.getContext(this, vars, "#User_Client", strWindowId), narturalOrgTreeList, - strBPartner, strIsTaxIncluded, strKey)); + strBPartner, strIsTaxIncluded)); xmlDocument.setData("reportPurchaseOrder", "liststructure", CreateFromInvoiceData .selectFromPOSOTrxCombo(this, vars.getLanguage(), Utility.getContext(this, vars, "#User_Client", strWindowId), narturalOrgTreeList, - strBPartner, strIsTaxIncluded, strKey)); + strBPartner, strIsTaxIncluded)); } else { xmlDocument.setData("reportShipmentReciept", "liststructure", CreateFromInvoiceData .selectFromShipmentCombo(this, vars.getLanguage(), Utility.getContext(this, vars, "#User_Client", strWindowId), narturalOrgTreeList, - strBPartner, strIsTaxIncluded, strKey)); + strBPartner, strIsTaxIncluded)); xmlDocument.setData("reportPurchaseOrder", "liststructure", CreateFromInvoiceData .selectFromPOCombo(this, vars.getLanguage(), Utility.getContext(this, vars, "#User_Client", strWindowId), narturalOrgTreeList, - strBPartner, strIsTaxIncluded, strKey)); + strBPartner, strIsTaxIncluded)); } } { @@ -637,21 +637,21 @@ if (isSOTrx.equals("Y")) { data = CreateFromShipmentData.selectFromPOSOTrx(this, vars.getLanguage(), Utility.getContext(this, vars, "#User_Client", strWindowId), - Utility.getContext(this, vars, "#User_Org", strWindowId), strPO, strKey); + Utility.getContext(this, vars, "#User_Org", strWindowId), strPO); } else { data = CreateFromShipmentData.selectFromPO(this, vars.getLanguage(), Utility.getContext(this, vars, "#User_Client", strWindowId), - Utility.getContext(this, vars, "#User_Org", strWindowId), strPO, strKey); + Utility.getContext(this, vars, "#User_Org", strWindowId), strPO); } } else { if (isSOTrx.equals("Y")) data = CreateFromShipmentData.selectFromPOTrlSOTrx(this, vars.getLanguage(), Utility.getContext(this, vars, "#User_Client", strWindowId), - Utility.getContext(this, vars, "#User_Org", strWindowId), strPO, strKey); + Utility.getContext(this, vars, "#User_Org", strWindowId), strPO); else data = CreateFromShipmentData.selectFromPOTrl(this, vars.getLanguage(), Utility.getContext(this, vars, "#User_Client", strWindowId), - Utility.getContext(this, vars, "#User_Org", strWindowId), strPO, strKey); + Utility.getContext(this, vars, "#User_Org", strWindowId), strPO); } } else { if (vars.getLanguage().equals("en_US")) { @@ -711,7 +711,7 @@ xmlDocument.setData("reportPurchaseOrder", "liststructure", CreateFromShipmentData .selectFromPOSOTrxCombo(this, vars.getLanguage(), Utility.getContext(this, vars, "#User_Client", strWindowId), narturalOrgTreeList, - strBPartner, strKey)); + strBPartner)); } else { xmlDocument.setData("reportInvoice", "liststructure", CreateFromShipmentData .selectFromInvoiceCombo(this, vars.getLanguage(), @@ -720,7 +720,7 @@ xmlDocument.setData("reportPurchaseOrder", "liststructure", CreateFromShipmentData .selectFromPOCombo(this, vars.getLanguage(), Utility.getContext(this, vars, "#User_Client", strWindowId), narturalOrgTreeList, - strBPartner, strKey)); + strBPartner)); } } @@ -782,22 +782,22 @@ // CreateFrom if (isSOTrx.equals("Y")) { strArray = Utility.arrayEntradaSimple("arrDatos", new CreateFromShipmentData[0]); - strArray2 = Utility.arrayEntradaSimple("arrDatos2", CreateFromShipmentData - .selectFromPOSOTrxCombo(this, vars.getLanguage(), + strArray2 = Utility.arrayEntradaSimple( + "arrDatos2", + CreateFromShipmentData.selectFromPOSOTrxCombo(this, vars.getLanguage(), Utility.getContext(this, vars, "#User_Client", strWindowId), - Utility.getContext(this, vars, "#AccessibleOrgTree", strWindowId), strBPartner, - null)); + Utility.getContext(this, vars, "#AccessibleOrgTree", strWindowId), strBPartner)); } else { strArray = Utility.arrayEntradaSimple( "arrDatos", CreateFromShipmentData.selectFromInvoiceCombo(this, vars.getLanguage(), Utility.getContext(this, vars, "#User_Client", strWindowId), Utility.getContext(this, vars, "#AccessibleOrgTree", strWindowId), strBPartner)); - strArray2 = Utility.arrayEntradaSimple("arrDatos2", CreateFromShipmentData - .selectFromPOCombo(this, vars.getLanguage(), + strArray2 = Utility.arrayEntradaSimple( + "arrDatos2", + CreateFromShipmentData.selectFromPOCombo(this, vars.getLanguage(), Utility.getContext(this, vars, "#User_Client", strWindowId), - Utility.getContext(this, vars, "#AccessibleOrgTree", strWindowId), strBPartner, - null)); + Utility.getContext(this, vars, "#AccessibleOrgTree", strWindowId), strBPartner)); } } else { // Loading the Combos in the Invoice's CreateFrom Invoice invoice = OBDal.getInstance().get(Invoice.class, strKey); @@ -808,23 +808,23 @@ .selectFromShipmentSOTrxCombo(this, vars.getLanguage(), Utility.getContext(this, vars, "#User_Client", strWindowId), Utility.getContext(this, vars, "#AccessibleOrgTree", strWindowId), strBPartner, - strIsTaxIncluded, strKey)); + strIsTaxIncluded)); strArray2 = Utility.arrayEntradaSimple("arrDatos2", CreateFromInvoiceData .selectFromPOSOTrxCombo(this, vars.getLanguage(), Utility.getContext(this, vars, "#User_Client", strWindowId), Utility.getContext(this, vars, "#AccessibleOrgTree", strWindowId), strBPartner, - strIsTaxIncluded, strKey)); + strIsTaxIncluded)); } else { strArray = Utility.arrayEntradaSimple("arrDatos", CreateFromInvoiceData .selectFromShipmentCombo(this, vars.getLanguage(), Utility.getContext(this, vars, "#User_Client", strWindowId), Utility.getContext(this, vars, "#AccessibleOrgTree", strWindowId), strBPartner, - strIsTaxIncluded, strKey)); + strIsTaxIncluded)); strArray2 = Utility.arrayEntradaSimple("arrDatos2", CreateFromInvoiceData .selectFromPOCombo(this, vars.getLanguage(), Utility.getContext(this, vars, "#User_Client", strWindowId), Utility.getContext(this, vars, "#AccessibleOrgTree", strWindowId), strBPartner, - strIsTaxIncluded, strKey)); + strIsTaxIncluded)); } } } @@ -1612,8 +1612,8 @@ data[i].quantityorder, data[i].mProductUomId, data[i].mAttributesetinstanceId, priceStd, lineNetAmt.toString(), priceGross, grossAmt.toString(), priceListGross.toString(), priceStdGross.toString(), isDeferred, planType, - periodNumber, startingPeriodId, - data[i].aAssetId, data[i].cProjectId, data[i].cCostcenterId, data[i].user1Id, data[i].user2Id); + periodNumber, startingPeriodId, data[i].aAssetId, data[i].cProjectId, + data[i].cCostcenterId, data[i].user1Id, data[i].user2Id); if (!data[i].mInoutlineId.isEmpty() && strType.equals("SHIPMENT")) { CreateFromInvoiceData.insertShipmentAcctDimension(conn, this, strSequence, @@ -1717,7 +1717,7 @@ strLineId = data[i].cOrderlineId; } - final String strMovementqty = vars.getRequiredStringParameter("inpmovementqty" + final String strMovementqty = vars.getRequiredNumericParameter("inpmovementqty" + strLineId); String strQuantityorder = ""; String strProductUomId = ""; @@ -1815,7 +1815,7 @@ CreateFromShipmentData.isInvoiced(conn, this, data[i].cInvoicelineId), (qtyIsNegative ? "-" + total : total), data[i].mProductUomId, strmAttributesetinstanceId, data[i].aAssetId, data[i].cProjectId, - data[i].cCostcenterId, data[i].user1Id, data[i].user2Id,data[i].cBpartnerId); + data[i].cCostcenterId, data[i].user1Id, data[i].user2Id, data[i].cBpartnerId); if (strType.equals("INVOICE") && !data[i].cInvoicelineId.isEmpty()) { CreateFromShipmentData.insertInvoiceAcctDimension(conn, this, strSequence, @@ -1846,7 +1846,7 @@ CreateFromShipmentData.isInvoiced(conn, this, data[i].cInvoicelineId), strQuantityorder, strProductUomId, strmAttributesetinstanceId, ------------------------------------------------------------------------------ Master Java SE, Java EE, Eclipse, Spring, Hibernate, JavaScript, jQuery and much more. Keep your Java skills current with LearnJavaNow - 200+ hours of step-by-step video tutorials by Java experts. SALE $49.99 this month only -- learn more at: http://p.sf.net/sfu/learnmore_122612 _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
