details: https://code.openbravo.com/erp/devel/pi/rev/fa9695556f74 changeset: 15342:fa9695556f74 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Tue Jan 31 09:48:07 2012 +0100 summary: Fixes Issue 0019523: Waiting period in Periodic Qual. Control must be redefined
details: https://code.openbravo.com/erp/devel/pi/rev/6c718a7b08ef changeset: 15343:6c718a7b08ef user: Unai Martirena <unai.martirena <at> openbravo.com> date: Mon Jan 30 13:15:06 2012 +0100 summary: Fixes Issue 0019528: Service Project should be hidden by the conf. script details: https://code.openbravo.com/erp/devel/pi/rev/904bb8800753 changeset: 15344:904bb8800753 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Tue Jan 31 10:45:08 2012 +0100 summary: Fixes Issue 0019591: Amounts in xls are not exported as amounts. details: https://code.openbravo.com/erp/devel/pi/rev/33cb80a95949 changeset: 15345:33cb80a95949 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Feb 02 10:54:32 2012 +0100 summary: Fixes Issue 0019590: To void a good shipment, *R* is not added to description diffstat: modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml | 4 +- src-db/database/model/functions/M_INOUT_POST.xml | 20 ++++++++- src-db/database/sourcedata/AD_COLUMN.xml | 2 +- src-db/database/sourcedata/AD_ELEMENT.xml | 4 +- src-db/database/sourcedata/AD_FIELD.xml | 4 +- src-db/database/sourcedata/AD_MENU.xml | 6 +- 6 files changed, 27 insertions(+), 13 deletions(-) diffs (136 lines): diff -r b5951ec3a1ad -r 33cb80a95949 modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml --- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml Thu Feb 02 19:42:28 2012 +0100 +++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml Thu Feb 02 10:54:32 2012 +0100 @@ -345,7 +345,7 @@ <textElement textAlignment="Right"> <font size="8"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[($F{BASE_AMOUNT}== null ? " " : $F{BASE_AMOUNT}.toString())]]></textFieldExpression> + <textFieldExpression class="java.math.BigDecimal"><![CDATA[$F{BASE_AMOUNT}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> <reportElement key="textField-14" style="Report_Footer" x="1451" y="0" width="46" height="25"/> @@ -360,7 +360,7 @@ <textElement textAlignment="Right"> <font size="8"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$F{TRANS_AMOUNT}.toString() + " "]]></textFieldExpression> + <textFieldExpression class="java.math.BigDecimal"><![CDATA[$F{TRANS_AMOUNT}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> <reportElement key="textField-16" style="Report_Footer" x="1311" y="0" width="60" height="25"/> diff -r b5951ec3a1ad -r 33cb80a95949 src-db/database/model/functions/M_INOUT_POST.xml --- a/src-db/database/model/functions/M_INOUT_POST.xml Thu Feb 02 19:42:28 2012 +0100 +++ b/src-db/database/model/functions/M_INOUT_POST.xml Thu Feb 02 10:54:32 2012 +0100 @@ -632,7 +632,7 @@ v_RInOut_ID, Cur_InOut.C_Order_ID, Cur_InOut.IsSOTrx, Cur_InOut.AD_Client_ID, Cur_InOut.AD_Org_ID, 'Y', now(), v_User, now(), v_User, v_RDocumentNo, v_DoctypeReversed_ID, - '(*R*: ' || Cur_InOut.DocumentNo || ') ' || Cur_InOut.Description, 'N', Cur_InOut.MovementType, Cur_InOut.MovementDate, + '(*R*: ' || Cur_InOut.DocumentNo || ') ' || COALESCE(TO_CHAR(Cur_InOut.Description), ''), 'N', Cur_InOut.MovementType, Cur_InOut.MovementDate, Cur_InOut.DateAcct, Cur_InOut.C_BPartner_ID, Cur_InOut.C_BPartner_Location_ID, Cur_InOut.AD_User_ID, Cur_InOut.M_Warehouse_ID, Cur_InOut.POReference, Cur_InOut.DateOrdered, Cur_InOut.DeliveryRule, Cur_InOut.FreightCostRule, Cur_InOut.FreightAmt * -1, Cur_InOut.C_Project_ID, Cur_InOut.C_Activity_ID, @@ -669,7 +669,7 @@ Cur_InOut.AD_Client_ID, Cur_InOut.AD_Org_ID, 'Y', now(), v_User, now(), v_User, Cur_InOutLine.M_Product_ID, Cur_InOutLine.M_AttributeSetInstance_ID, Cur_InOutLine.C_UOM_ID, Cur_InOutLine.M_Locator_ID, Cur_InOutLine.MovementQty * -1, - '*R*: ' || Cur_InOutLine.Description, Cur_InOutLine.IsInvoiced, --MODIFIED BY F.IRIAZABAL + '*R*: ' || COALESCE(TO_CHAR(Cur_InOutLine.Description), ''), Cur_InOutLine.IsInvoiced, --MODIFIED BY F.IRIAZABAL Cur_InOutLine.QuantityOrder * -1, Cur_InOutLine.M_PRODUCT_UOM_ID, Cur_InOutLine.IsDescription ) ; @@ -692,7 +692,21 @@ Updated=now(), UpdatedBy=v_User WHERE M_INOUT.M_INOUT_ID=Cur_InOut.M_INOUT_ID; - + + FOR Cur_InOutLine IN + (SELECT * + FROM M_INOUTLINE + WHERE M_InOut_ID=Cur_InOut.M_InOut_ID + AND IsActive='Y' FOR UPDATE + ) + LOOP + UPDATE M_INOUTLINE + SET Description=COALESCE(TO_CHAR(Cur_InOutLine.Description), '') || ' : *R*', + Updated=now(), + UpdatedBy=v_User + WHERE M_INOUTLINE.M_INOUTLINE_ID=Cur_InOutLine.M_INOUTLINE_ID; + END LOOP; + -- Post Reversal v_ResultStr:='PostReversal'; M_INOUT_POST(NULL, v_RInOut_ID) ; diff -r b5951ec3a1ad -r 33cb80a95949 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Thu Feb 02 19:42:28 2012 +0100 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Thu Feb 02 10:54:32 2012 +0100 @@ -158110,7 +158110,7 @@ <!--802337--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--802337--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--802337--> <NAME><![CDATA[Waiting Period]]></NAME> -<!--802337--> <HELP><![CDATA[Delay in days from the beginning of the case to perform the test.]]></HELP> +<!--802337--> <HELP><![CDATA[Delay in hours from the beginning of the case to perform the test.]]></HELP> <!--802337--> <COLUMNNAME><![CDATA[Days]]></COLUMNNAME> <!--802337--> <AD_TABLE_ID><![CDATA[800140]]></AD_TABLE_ID> <!--802337--> <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID> diff -r b5951ec3a1ad -r 33cb80a95949 src-db/database/sourcedata/AD_ELEMENT.xml --- a/src-db/database/sourcedata/AD_ELEMENT.xml Thu Feb 02 19:42:28 2012 +0100 +++ b/src-db/database/sourcedata/AD_ELEMENT.xml Thu Feb 02 10:54:32 2012 +0100 @@ -15502,9 +15502,9 @@ <!--800495--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--800495--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--800495--> <COLUMNNAME><![CDATA[Days]]></COLUMNNAME> -<!--800495--> <NAME><![CDATA[Waiting Period]]></NAME> +<!--800495--> <NAME><![CDATA[Waiting Period (Hours)]]></NAME> <!--800495--> <PRINTNAME><![CDATA[Days]]></PRINTNAME> -<!--800495--> <HELP><![CDATA[Delay in days from the beginning of the case to perform the test.]]></HELP> +<!--800495--> <HELP><![CDATA[Delay in hours from the beginning of the case to perform the test.]]></HELP> <!--800495--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--800495--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> <!--800495--></AD_ELEMENT> diff -r b5951ec3a1ad -r 33cb80a95949 src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml Thu Feb 02 19:42:28 2012 +0100 +++ b/src-db/database/sourcedata/AD_FIELD.xml Thu Feb 02 10:54:32 2012 +0100 @@ -121689,8 +121689,8 @@ <!--802588--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--802588--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--802588--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--802588--> <NAME><![CDATA[Waiting Period]]></NAME> -<!--802588--> <HELP><![CDATA[Delay in days from the beginning of the case to perform the test.]]></HELP> +<!--802588--> <NAME><![CDATA[Waiting Period (Hours)]]></NAME> +<!--802588--> <HELP><![CDATA[Delay in hours from the beginning of the case to perform the test.]]></HELP> <!--802588--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> <!--802588--> <AD_TAB_ID><![CDATA[800160]]></AD_TAB_ID> <!--802588--> <AD_COLUMN_ID><![CDATA[802337]]></AD_COLUMN_ID> diff -r b5951ec3a1ad -r 33cb80a95949 src-db/database/sourcedata/AD_MENU.xml --- a/src-db/database/sourcedata/AD_MENU.xml Thu Feb 02 19:42:28 2012 +0100 +++ b/src-db/database/sourcedata/AD_MENU.xml Thu Feb 02 10:54:32 2012 +0100 @@ -1996,7 +1996,7 @@ <!--800007--> <AD_MENU_ID><![CDATA[800007]]></AD_MENU_ID> <!--800007--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--800007--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--800007--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--800007--> <ISACTIVE><![CDATA[N]]></ISACTIVE> <!--800007--> <NAME><![CDATA[Service Project]]></NAME> <!--800007--> <DESCRIPTION><![CDATA[Create and edit potential projects which your business partner's are bidding on. Create plans to purchase and proposals to your products if a business partner bid is won.]]></DESCRIPTION> <!--800007--> <ISSUMMARY><![CDATA[N]]></ISSUMMARY> @@ -2165,7 +2165,7 @@ <!--800032--> <AD_MENU_ID><![CDATA[800032]]></AD_MENU_ID> <!--800032--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--800032--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--800032--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--800032--> <ISACTIVE><![CDATA[N]]></ISACTIVE> <!--800032--> <NAME><![CDATA[Service Project Report]]></NAME> <!--800032--> <DESCRIPTION><![CDATA[Service Project Report]]></DESCRIPTION> <!--800032--> <ISSUMMARY><![CDATA[N]]></ISSUMMARY> @@ -2204,7 +2204,7 @@ <!--800037--> <AD_MENU_ID><![CDATA[800037]]></AD_MENU_ID> <!--800037--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--800037--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--800037--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--800037--> <ISACTIVE><![CDATA[N]]></ISACTIVE> <!--800037--> <NAME><![CDATA[Project Proposal Tracker]]></NAME> <!--800037--> <DESCRIPTION><![CDATA[View all proposals made to you during a Budget Project.]]></DESCRIPTION> <!--800037--> <ISSUMMARY><![CDATA[N]]></ISSUMMARY> ------------------------------------------------------------------------------ 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 Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
