details: https://code.openbravo.com/erp/devel/pi/rev/574bf828eb51 changeset: 15541:574bf828eb51 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Thu Feb 16 12:51:12 2012 +0100 summary: Fixes issue 19437: A nullpointerexception message in tree in Accounting Dimension. Now the icon 'Tree' has been hidden in tab's BP Dimesion and in Product Dimension because we have not implemented yet this functionality. In the future, if this functionality will be implemented, will be enough to activate it.
details: https://code.openbravo.com/erp/devel/pi/rev/d3b332e4c361 changeset: 15542:d3b332e4c361 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Thu Feb 16 13:21:57 2012 +0100 summary: issue 19771: Wrong conversion rate used in the Sales Dimensional Report. We find more reports with the same problem. details: https://code.openbravo.com/erp/devel/pi/rev/0952e740b89d changeset: 15543:0952e740b89d user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Fri Feb 17 11:17:15 2012 +0100 summary: Fixes issue 19376: Production: Amortization amount does not get populated in the cost tab of a machine. It was a parser error, so now if the variable has not got the value is not added to the array. details: https://code.openbravo.com/erp/devel/pi/rev/d5795a102734 changeset: 15544:d5795a102734 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Fri Feb 17 12:42:15 2012 +0100 summary: Fixes issue 19396: Process Plan Version "active" flag it does not take into account in Work Requirement Process. details: https://code.openbravo.com/erp/devel/pi/rev/15271104ea08 changeset: 15545:15271104ea08 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Sat Feb 18 14:51:00 2012 +0100 summary: issue 19771: Wrong conversion rate used in the Sales Dimensional Report. We find more reports with the same problem, and apart from that, we have put the column c_orderline.dateordered like deprecated details: https://code.openbravo.com/erp/devel/pi/rev/4a020fd924d0 changeset: 15546:4a020fd924d0 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Sat Feb 18 18:22:51 2012 +0100 summary: Fixes issue 19469: Duplicity in purchase invoice lines. With this patch, now the clients will be able to select one line from the orders if they have not got all the quantity invoiced yet in the same invoice details: https://code.openbravo.com/erp/devel/pi/rev/43eb2712e251 changeset: 15547:43eb2712e251 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Mon Feb 20 17:59:49 2012 +0100 summary: Fixes issue 19491,Fixes issue 16950: Report Pending Work Requirements does not Show the Products Name details: https://code.openbravo.com/erp/devel/pi/rev/2232348ae463 changeset: 15548:2232348ae463 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Mon Feb 20 18:53:50 2012 +0100 summary: Fixes issue 19460: Complete a descriptions in Payment in. Now it appears the G/L Item name and the Tax Payment name diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml | 14 ++- src-db/database/model/functions/MA_WORKREQUIREMENT_PROCESS.xml | 2 + src-db/database/sourcedata/AD_COLUMN.xml | 2 +- src-db/database/sourcedata/AD_TAB.xml | 4 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java | 8 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql | 42 ++++++++- src/org/openbravo/erpCommon/ad_callouts/SL_MachineCost.java | 38 ++++++-- src/org/openbravo/erpCommon/ad_reports/OrderEdition_data.xsql | 8 +- src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesJR_data.xsql | 9 +- src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoice_data.xsql | 6 +- src/org/openbravo/erpCommon/ad_reports/ReportPurchaseOrder.jrxml | 9 +- src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalyses_data.xsql | 6 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderInvoicedJasper.jrxml | 8 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderInvoiced_data.xsql | 8 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderJR.jrxml | 8 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderProvidedJR.jrxml | 8 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderProvided_data.xsql | 8 +- src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJR_data.xsql | 15 ++- src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementJR.jrxml | 6 +- src/org/openbravo/erpCommon/ad_reports/SimpleDimensionalComparative.jrxml | 4 +- src/org/openbravo/erpCommon/ad_reports/SimpleDimensionalNoComparative.jrxml | 2 +- src/org/openbravo/erpCommon/ad_reports/WeightDimensionalComparative.jrxml | 4 +- src/org/openbravo/erpCommon/ad_reports/WeightDimensionalNoComparative.jrxml | 2 +- 23 files changed, 143 insertions(+), 78 deletions(-) diffs (truncated from 735 to 300 lines): diff -r 265180c4a4e7 -r 2232348ae463 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml Mon Feb 20 18:42:44 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml Mon Feb 20 18:53:50 2012 +0100 @@ -29,6 +29,8 @@ p_message VARCHAR(2000); p_result NUMBER; +v_TaxPaymentName VARCHAR2(60); +v_GLItemName VARCHAR2(60); v_ResultStr VARCHAR2(2000):=''; v_FIN_PAYMENT_ID FIN_PAYMENT.FIN_PAYMENT_ID%TYPE; v_PaymentDocType_ID FIN_PAYMENT.C_DOCTYPE_ID%TYPE; @@ -80,10 +82,14 @@ -- Reading the TAX PAYMENT v_ResultStr:='ReadingTaxPayment'; - select dateto, ad_client_id, ad_org_id, generatepayment, C_BPARTNER_ID, processed, FIN_PAYMENT_ID, C_Currency_ID - into v_date, v_client_id, v_org_id, v_ispayment, v_bpartner_id, v_processed, v_FIN_PAYMENT_ID, v_Currency_id + select dateto, ad_client_id, ad_org_id, generatepayment, C_BPARTNER_ID, processed, FIN_PAYMENT_ID, C_Currency_ID,name + into v_date, v_client_id, v_org_id, v_ispayment, v_bpartner_id, v_processed, v_FIN_PAYMENT_ID, v_Currency_id,v_TaxPaymentName from c_taxpayment where c_taxpayment_id=p_record_id; + + SELECT NAME + INTO v_GLItemName + FROM C_GLITEM WHERE C_GLITEM_ID=p_GLItem; IF (v_ispayment = 'Y' AND v_processed = 'N') THEN v_ResultStr:='Generating FIN_PAYMENT'; @@ -128,7 +134,7 @@ WHEN p_isreceipt = 'Y' THEN 'RPR' ELSE 'PPM' END, - 'N', 'N', 'N', 'GL Item.: ', + 'N', 'N', 'N', 'GL Item: '|| v_GLItemName || 'n' || 'Tax Payment: '|| v_TaxPaymentName, v_Financial_Account_ID, v_PaymentDocType_ID, NULL, NULL, NULL, NULL, NULL, 'N', 'N', 'N'); v_FIN_PAYMENT_DETAIL_ID := GET_UUID(); @@ -171,7 +177,7 @@ now(), p_user, 'Y', v_currency_id, v_Financial_Account_ID, v_Line, v_FIN_PAYMENT_ID, v_date, NULL, CASE WHEN p_isreceipt='Y' THEN 'RDNC' ELSE 'PWNC' END, CASE WHEN p_isreceipt='N' THEN p_amount ELSE 0 END, CASE WHEN p_isreceipt='Y' THEN p_amount ELSE 0 END, 'Y', 'N', 'N', NULL, NULL, - NULL, NULL, NULL, CASE WHEN p_isreceipt='N' THEN 'BPW' ELSE 'BPD' END, v_date, 'GL Item: ' , + NULL, NULL, NULL, CASE WHEN p_isreceipt='N' THEN 'BPW' ELSE 'BPD' END, v_date, 'GL Item: '|| v_GLItemName || 'n' || 'Tax Payment: '|| v_TaxPaymentName, NULL); UPDATE FIN_PAYMENT SET STATUS = CASE WHEN p_isreceipt='Y' THEN 'RDNC' ELSE 'PWNC' END WHERE FIN_PAYMENT_ID = v_FIN_PAYMENT_ID; diff -r 265180c4a4e7 -r 2232348ae463 src-db/database/model/functions/MA_WORKREQUIREMENT_PROCESS.xml --- a/src-db/database/model/functions/MA_WORKREQUIREMENT_PROCESS.xml Mon Feb 20 18:42:44 2012 +0100 +++ b/src-db/database/model/functions/MA_WORKREQUIREMENT_PROCESS.xml Mon Feb 20 18:53:50 2012 +0100 @@ -139,6 +139,8 @@ AND p.MA_ProcessPlan_ID=v_ProcessPlan_ID AND p.DATEFROM<=v_LaunchDate AND p.DATETO>v_LaunchDate + AND s.ISACTIVE='Y' + AND p.ISACTIVE='Y' ) LOOP v_ResultStr:='InsertPhase'; diff -r 265180c4a4e7 -r 2232348ae463 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Mon Feb 20 18:42:44 2012 +0100 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Mon Feb 20 18:53:50 2012 +0100 @@ -30872,7 +30872,7 @@ <!--2216--> <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR> <!--2216--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> <!--2216--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> -<!--2216--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--2216--> <DEVELOPMENTSTATUS><![CDATA[DP]]></DEVELOPMENTSTATUS> <!--2216--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--2216--> <POSITION><![CDATA[13]]></POSITION> <!--2216--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> diff -r 265180c4a4e7 -r 2232348ae463 src-db/database/sourcedata/AD_TAB.xml --- a/src-db/database/sourcedata/AD_TAB.xml Mon Feb 20 18:42:44 2012 +0100 +++ b/src-db/database/sourcedata/AD_TAB.xml Mon Feb 20 18:53:50 2012 +0100 @@ -5758,7 +5758,7 @@ <!--515--> <ISINFOTAB><![CDATA[N]]></ISINFOTAB> <!--515--> <ISTRANSLATIONTAB><![CDATA[N]]></ISTRANSLATIONTAB> <!--515--> <ISREADONLY><![CDATA[N]]></ISREADONLY> -<!--515--> <HASTREE><![CDATA[Y]]></HASTREE> +<!--515--> <HASTREE><![CDATA[N]]></HASTREE> <!--515--> <PROCESSING><![CDATA[N]]></PROCESSING> <!--515--> <IMPORTFIELDS><![CDATA[N]]></IMPORTFIELDS> <!--515--> <ISSORTTAB><![CDATA[N]]></ISSORTTAB> @@ -5786,7 +5786,7 @@ <!--516--> <ISINFOTAB><![CDATA[N]]></ISINFOTAB> <!--516--> <ISTRANSLATIONTAB><![CDATA[N]]></ISTRANSLATIONTAB> <!--516--> <ISREADONLY><![CDATA[N]]></ISREADONLY> -<!--516--> <HASTREE><![CDATA[Y]]></HASTREE> +<!--516--> <HASTREE><![CDATA[N]]></HASTREE> <!--516--> <PROCESSING><![CDATA[N]]></PROCESSING> <!--516--> <IMPORTFIELDS><![CDATA[N]]></IMPORTFIELDS> <!--516--> <ISSORTTAB><![CDATA[N]]></ISSORTTAB> diff -r 265180c4a4e7 -r 2232348ae463 src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java --- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java Mon Feb 20 18:42:44 2012 +0100 +++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java Mon Feb 20 18:53:50 2012 +0100 @@ -450,6 +450,7 @@ CreateFromInvoiceData[] data = null; XmlDocument xmlDocument; String strPO = vars.getStringParameter("inpPurchaseOrder"); + String strPI = vars.getSessionValue(strWindowId + "|C_INVOICE_ID"); String strShipment = vars.getStringParameter("inpShipmentReciept"); final String isSOTrx = Utility.getContext(this, vars, "isSOTrx", strWindowId); if (vars.commandIn("FIND_PO")) @@ -472,7 +473,7 @@ Utility.getContext(this, vars, "#User_Client", strWindowId), Utility.getContext(this, vars, "#User_Org", strWindowId), strPO); else - data = CreateFromInvoiceData.selectFromPO(this, vars.getLanguage(), + data = CreateFromInvoiceData.selectFromPO(this, vars.getLanguage(), strPI, Utility.getContext(this, vars, "#User_Client", strWindowId), Utility.getContext(this, vars, "#User_Org", strWindowId), strPO); } else { @@ -481,7 +482,7 @@ Utility.getContext(this, vars, "#User_Client", strWindowId), Utility.getContext(this, vars, "#User_Org", strWindowId), strPO); else - data = CreateFromInvoiceData.selectFromPOTrl(this, vars.getLanguage(), + data = CreateFromInvoiceData.selectFromPOTrl(this, vars.getLanguage(), strPI, Utility.getContext(this, vars, "#User_Client", strWindowId), Utility.getContext(this, vars, "#User_Org", strWindowId), strPO); } @@ -1450,6 +1451,7 @@ final String strClaves = Utility.stringList(vars.getRequiredInParameter("inpcOrderId", IsIDFilter.instance)); final String isSOTrx = Utility.getContext(this, vars, "isSOTrx", strWindowId); + String strPI = vars.getSessionValue(strWindowId + "|C_INVOICE_ID"); String strPO = "", priceActual = "0", priceLimit = "0", priceList = "0", strPriceListVersion = "", priceStd = "0"; CreateFromInvoiceData[] data = null; CreateFromInvoiceData[] dataAux = null; @@ -1478,7 +1480,7 @@ if (isSOTrx.equals("Y")) data = CreateFromInvoiceData.selectFromPOUpdateSOTrx(conn, this, ids[k]); else - data = CreateFromInvoiceData.selectFromPOUpdate(conn, this, ids[k]); + data = CreateFromInvoiceData.selectFromPOUpdate(conn, this, strPI, ids[k]); } if (data != null) { for (int i = 0; i < data.length; i++) { diff -r 265180c4a4e7 -r 2232348ae463 src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql --- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql Mon Feb 20 18:42:44 2012 +0100 +++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql Mon Feb 20 18:53:50 2012 +0100 @@ -29,7 +29,11 @@ <![CDATA[ SELECT o.C_ORDER_ID as ID, Ad_Column_Identifier(to_char('C_Order'), to_char(o.c_order_id), to_char(?)) AS NAME, o.DocumentNo AS NAMEORDER, '' AS NAMESHIPMENT, - l.QtyOrdered-SUM(COALESCE(m.Qty,0)) AS QTY, l.C_UOM_ID,uom.UOMSymbol, l.M_Product_ID,p.NAME AS RELATION_NAME, + l.QtyOrdered-SUM(COALESCE(m.Qty,0))-COALESCE((SELECT SUM(COALESCE(CI.QtyINVOICED, 0)) + FROM C_ORDERLINE CO LEFT JOIN C_INVOICELINE CI ON CI.C_ORDERLINE_ID = CO.C_ORDERLINE_ID + WHERE CI.C_INVOICE_ID=? AND CO.C_ORDERLINE_ID = l.c_orderline_id + GROUP BY CI.C_orderline_id , CO.QtyORDERED),0) AS QTY, + l.C_UOM_ID,uom.UOMSymbol, l.M_Product_ID,p.NAME AS RELATION_NAME, l.C_OrderLine_ID,l.Line, l.ad_org_id, '' as STDPRECISION, '' as M_InOutLine_ID, '' AS PriceActual, '' AS PriceList, '' AS PriceLimit, '' AS Description, '' as PriceStd, '' AS QUANTITYORDER, '' AS M_Product_UOM_ID, '' AS M_ATTRIBUTESETINSTANCE_ID, '' AS M_Offer_ID, '' AS PricePrecision, @@ -45,6 +49,11 @@ AND l.C_UOM_ID=uom.C_UOM_ID AND l.M_Product_ID=p.M_Product_ID AND l.C_Order_ID = ? + AND NOT EXISTS (SELECT 1 + FROM C_ORDERLINE CO LEFT JOIN C_INVOICELINE CI ON CI.C_ORDERLINE_ID = CO.C_ORDERLINE_ID + WHERE CO.C_ORDERLINE_ID = l.c_orderline_id AND CI.C_INVOICE_ID=? + GROUP BY CI.C_orderline_id , CO.QtyORDERED + HAVING (SUM(COALESCE(CI.QtyINVOICED, 0))-COALESCE(CO.QtyORDERED,0)) = 0 ) GROUP BY o.C_ORDER_ID, o.DocumentNo, o.DateOrdered, o.GrandTotal, l.QtyOrdered,l.C_UOM_ID, uom.UOMSymbol,l.M_Product_ID,p.NAME,l.Line,l.C_OrderLine_ID, l.ad_org_id, l.taxbaseamt,l.CancelPriceAD HAVING (l.QtyOrdered-SUM(COALESCE(m.Qty,0))) <> 0 @@ -53,9 +62,11 @@ </Sql> <Field name="rownum" value="count"/> <Parameter name="language"/> + <Parameter name="piId"/> <Parameter name="adUserClient" type="replace" optional="true" after="o.AD_Client_ID IN (" text="'1'"/> <Parameter name="adOrgClient" type="replace" optional="true" after="o.AD_Org_ID IN (" text="'1'"/> <Parameter name="poId"/> + <Parameter name="piId"/> </SqlMethod> <SqlMethod name="selectFromPOCombo" type="preparedStatement" return="multiple"> <SqlMethodComment></SqlMethodComment> @@ -135,7 +146,12 @@ <Sql> <![CDATA[ SELECT o.C_ORDER_ID as ID, Ad_Column_Identifier(to_char('C_Order'), to_char(o.c_order_id), to_char(?)) AS NAME, o.DocumentNo AS NAMEORDER, - l.QtyOrdered-SUM(COALESCE(m.Qty,0)) AS QTY, l.C_UOM_ID, COALESCE(uomt.UOMSYMBOL, uom.UOMSymbol) AS UOMSymbol, + l.QtyOrdered-SUM(COALESCE(m.Qty,0))- + COALESCE((SELECT SUM(COALESCE(CI.QtyINVOICED, 0)) + FROM C_ORDERLINE CO LEFT JOIN C_INVOICELINE CI ON CI.C_ORDERLINE_ID = CO.C_ORDERLINE_ID + WHERE CI.C_INVOICE_ID=? AND CO.C_ORDERLINE_ID = l.c_orderline_id + GROUP BY CI.C_orderline_id , CO.QtyORDERED),0) AS QTY, + l.C_UOM_ID, COALESCE(uomt.UOMSYMBOL, uom.UOMSymbol) AS UOMSymbol, l.M_Product_ID,p.NAME AS RELATION_NAME, l.C_OrderLine_ID,l.Line, l.taxbaseamt FROM C_UOM uom left join C_UOM_TRL uomt on uom.C_UOM_ID = uomt.C_UOM_ID and uomt.AD_Language = ?, @@ -150,6 +166,11 @@ AND l.C_UOM_ID=uom.C_UOM_ID AND l.M_Product_ID=p.M_Product_ID AND l.C_Order_ID = ? + AND NOT EXISTS (SELECT 1 + FROM C_ORDERLINE CO LEFT JOIN C_INVOICELINE CI ON CI.C_ORDERLINE_ID = CO.C_ORDERLINE_ID + WHERE CO.C_ORDERLINE_ID = l.c_orderline_id AND CI.C_INVOICE_ID=? + GROUP BY CI.C_orderline_id , CO.QtyORDERED + HAVING (SUM(COALESCE(CI.QtyINVOICED, 0))-COALESCE(CO.QtyORDERED,0)) = 0 ) GROUP BY o.C_ORDER_ID, o.DocumentNo, o.DateOrdered, o.GrandTotal, l.QtyOrdered,l.C_UOM_ID, uom.UOMSymbol, uomt.UOMSYMBOL,l.M_Product_ID,p.NAME,l.Line,l.C_OrderLine_ID, l.taxbaseamt @@ -159,10 +180,12 @@ </Sql> <Field name="rownum" value="count"/> <Parameter name="adLanguage"/> + <Parameter name="piId"/> <Parameter name="adUserClient" type="replace" optional="true" after="o.AD_Client_ID IN (" text="'1'"/> <Parameter name="adOrgClient" type="replace" optional="true" after="o.AD_Org_ID IN (" text="'1'"/> <Parameter name="adLanguage"/> <Parameter name="poId"/> + <Parameter name="piId"/> </SqlMethod> <SqlMethod name="selectFromPOTrlSOTrx" type="preparedStatement" return="multiple"> <SqlMethodComment></SqlMethodComment> @@ -205,9 +228,16 @@ (CASE WHEN B.M_InOutLine_ID IS NULL THEN A.M_Product_UOM_ID ELSE B.M_Product_UOM_ID END) AS M_Product_UOM_ID, A.M_ATTRIBUTESETINSTANCE_ID, A.ad_org_id, A.taxbaseamt FROM c_currency cur,C_UOM uom, M_PRODUCT p, - (SELECT l.ad_org_id,l.C_CURRENCY_ID,l.C_UOM_ID, l.M_Product_ID, l.Line, l.Description, l.C_OrderLine_ID, (l.QtyOrdered-SUM(COALESCE(mp.Qty,0))) AS QTY, - l.quantityOrder*C_DIVIDE((l.QtyOrdered-SUM(COALESCE(mp.Qty,0))),l.QtyOrdered) as quantityOrder, l.M_Product_UOM_ID, l.M_ATTRIBUTESETINSTANCE_ID, - l.taxbaseamt + (SELECT l.ad_org_id,l.C_CURRENCY_ID,l.C_UOM_ID, l.M_Product_ID, l.Line, l.Description, l.C_OrderLine_ID, (l.QtyOrdered-SUM(COALESCE(mp.Qty,0))- + COALESCE((SELECT SUM(COALESCE(CI.QtyINVOICED, 0)) + FROM C_ORDERLINE CO LEFT JOIN C_INVOICELINE CI ON CI.C_ORDERLINE_ID = CO.C_ORDERLINE_ID + WHERE CI.C_INVOICE_ID=? AND CO.C_ORDERLINE_ID = l.c_orderline_id + GROUP BY CI.C_orderline_id , CO.QtyORDERED),0)) AS QTY, + l.quantityOrder*C_DIVIDE((l.QtyOrdered-SUM(COALESCE(mp.Qty,0))-COALESCE((SELECT SUM(COALESCE(CI.QtyINVOICED, 0)) + FROM C_ORDERLINE CO LEFT JOIN C_INVOICELINE CI ON CI.C_ORDERLINE_ID = CO.C_ORDERLINE_ID + WHERE CI.C_INVOICE_ID=? AND CO.C_ORDERLINE_ID = l.c_orderline_id + GROUP BY CI.C_orderline_id , CO.QtyORDERED),0)),l.QtyOrdered) as quantityOrder, + l.M_Product_UOM_ID, l.M_ATTRIBUTESETINSTANCE_ID, l.taxbaseamt FROM C_ORDERLINE l left join M_MATCHPO mp on l.C_OrderLine_ID=mp.C_OrderLine_ID and mp.C_InvoiceLine_ID IS NOT NULL GROUP BY l.ad_org_id,l.C_CURRENCY_ID,l.C_UOM_ID, l.M_Product_ID, l.Line, l.Description, l.C_OrderLine_ID, l.QtyOrdered, l.quantityOrder, l.M_Product_UOM_ID, @@ -227,6 +257,8 @@ ORDER BY A.Line ]]> </Sql> + <Parameter name="piId"/> + <Parameter name="piId"/> <Parameter name="cOrderlineId" optional="true" type="argument" after="AND A.M_Product_ID=p.M_Product_ID" text=" AND A.C_OrderLine_ID IN "/> </SqlMethod> <SqlMethod name="selectFromPOUpdateSOTrx" type="preparedStatement" connection="true" return="multiple"> diff -r 265180c4a4e7 -r 2232348ae463 src/org/openbravo/erpCommon/ad_callouts/SL_MachineCost.java --- a/src/org/openbravo/erpCommon/ad_callouts/SL_MachineCost.java Mon Feb 20 18:42:44 2012 +0100 +++ b/src/org/openbravo/erpCommon/ad_callouts/SL_MachineCost.java Mon Feb 20 18:53:50 2012 +0100 @@ -168,16 +168,34 @@ StringBuffer resultado = new StringBuffer(); resultado.append("var calloutName='SL_MachineCost';\n\n"); resultado.append("var respuesta = new Array("); - resultado.append("new Array(\"inppurchaseamt\", " + strPurchaseAmt + "),\n"); - resultado.append("new Array(\"inptoolsetamt\", " + strToolsetAmt + "),\n"); - resultado.append("new Array(\"inpyearvalue\", " + strYearValue + "),\n"); - resultado.append("new Array(\"inpamortization\", " + strAmortization + "), \n"); - resultado.append("new Array(\"inpdaysyear\", " + strDaysYear + "),\n"); - resultado.append("new Array(\"inpdayhours\", " + strDayHours + "),\n"); - resultado - .append("new Array(\"inpimproductivehoursyear\", " + strImproductiveHoursYear + "),\n"); - resultado.append("new Array(\"inpcostuomyear\", " + strCostUomYear + "),\n"); - resultado.append("new Array(\"inpcost\", " + strCost + ") \n"); + if (!"".equals(strPurchaseAmt) && strPurchaseAmt != null) { + resultado.append("new Array(\"inppurchaseamt\", " + strPurchaseAmt + "),\n"); + } + if (!"".equals(strToolsetAmt) && strToolsetAmt != null) { + resultado.append("new Array(\"inptoolsetamt\", " + strToolsetAmt + "),\n"); + } + if (!"".equals(strYearValue) && strYearValue != null) { + resultado.append("new Array(\"inpyearvalue\", " + strYearValue + "),\n"); + } + if (!"".equals(strAmortization) && strAmortization != null) { + resultado.append("new Array(\"inpamortization\", " + strAmortization + "), \n"); + } + if (!"".equals(strDaysYear) && strDaysYear != null) { + resultado.append("new Array(\"inpdaysyear\", " + strDaysYear + "),\n"); + } + if (!"".equals(strDayHours) && strDayHours != null) { + resultado.append("new Array(\"inpdayhours\", " + strDayHours + "),\n"); + } + if (!"".equals(strImproductiveHoursYear) && strImproductiveHoursYear != null) { + resultado.append("new Array(\"inpimproductivehoursyear\", " + strImproductiveHoursYear + + "),\n"); + } + if (!"".equals(strCostUomYear) && strCostUomYear != null) { + resultado.append("new Array(\"inpcostuomyear\", " + strCostUomYear + "),\n"); + } + if (!"".equals(strCost) && strCost != null) { + resultado.append("new Array(\"inpcost\", " + strCost + ") \n"); + } resultado.append(");\n"); xmlDocument.setParameter("array", resultado.toString()); response.setContentType("text/html; charset=UTF-8"); diff -r 265180c4a4e7 -r 2232348ae463 src/org/openbravo/erpCommon/ad_reports/OrderEdition_data.xsql --- a/src/org/openbravo/erpCommon/ad_reports/OrderEdition_data.xsql Mon Feb 20 18:42:44 2012 +0100 +++ b/src/org/openbravo/erpCommon/ad_reports/OrderEdition_data.xsql Mon Feb 20 18:53:50 2012 +0100 @@ -31,14 +31,14 @@ SELECT C_ORDER.DOCUMENTNO AS DOCUMENTNO, C_ORDER.DATEORDERED AS DATEORDERED, C_BPARTNER.NAME AS CLIENT_NAME, SUM(C_ORDERLINE.QTYORDERED) AS QUANTITYORDER, C_ORDERLINE.PRICEACTUAL AS PRICEACTUAL, ------------------------------------------------------------------------------ Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
