details: https://code.openbravo.com/erp/devel/pi/rev/9cd37b3b7a69 changeset: 25586:9cd37b3b7a69 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Mon Dec 22 10:17:32 2014 +0100 summary: Fixes bug 28461: Fix Backdated From field should be equal to Starting Date field
Fix Backdated From date column reference in Costing Rule has been changed from Date to DateTime. details: https://code.openbravo.com/erp/devel/pi/rev/d94b15f193e6 changeset: 25587:d94b15f193e6 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Mon Dec 22 17:21:27 2014 +0100 summary: Related to Issue 27831: Add copyright header to new file details: https://code.openbravo.com/erp/devel/pi/rev/01f0864830c8 changeset: 25588:01f0864830c8 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Mon Dec 22 18:30:10 2014 +0100 summary: Fixes Issue 28417: Warehouse in Return Material Receipt properly filtered. The warehouse selector in the Return Material Receipt window is not filtering any more by warehouses on hand. The filter expression on On Hand Warehouse selector has been modified to fix this problem. details: https://code.openbravo.com/erp/devel/pi/rev/57da281af0de changeset: 25589:57da281af0de user: Unai Martirena <unai.martirena <at> openbravo.com> date: Mon Dec 22 19:12:07 2014 +0100 summary: Fixes Issue 26511: Display correct error message while deleting the orderline. The problem on this issue is that the trigger is not able to delete the related reservation of the orderline and the given error is displayed. So in this case the error message displayed has been improved to warn the user that needs to remove the reservation manually before deleting the Sales Order Line. diffstat: modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/CreditToUseTransformer.java | 25 ++++++++- src-db/database/model/triggers/C_ORDERLINE_TRG.xml | 8 +-- src-db/database/sourcedata/AD_COLUMN.xml | 2 +- src-db/database/sourcedata/AD_MESSAGE.xml | 12 ++++ src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 2 +- 5 files changed, 37 insertions(+), 12 deletions(-) diffs (106 lines): diff -r 3e74f819198d -r 57da281af0de modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/CreditToUseTransformer.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/CreditToUseTransformer.java Mon Dec 22 12:06:48 2014 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/CreditToUseTransformer.java Mon Dec 22 19:12:07 2014 +0100 @@ -1,3 +1,22 @@ +/* + ************************************************************************* + * The contents of this file are subject to the Openbravo Public License + * Version 1.1 (the "License"), being the Mozilla Public License + * Version 1.1 with a permitted attribution clause; you may not use this + * file except in compliance with the License. You may obtain a copy of + * the License at http://www.openbravo.com/legal/license.html + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + * License for the specific language governing rights and limitations + * under the License. + * The Original Code is Openbravo ERP. + * The Initial Developer of the Original Code is Openbravo SLU + * All portions are Copyright (C) 2014 Openbravo SLU + * All Rights Reserved. + * Contributor(s): ______________________________________. + ************************************************************************ + */ + package org.openbravo.advpaymentmngt.hqlinjections; import java.util.Map; @@ -11,12 +30,12 @@ @Override public String transformHqlQuery(String hqlQuery, Map<String, String> requestParameters, Map<String, Object> queryNamedParameters) { - + String transformedHQL = hqlQuery.replace("@selectClause@", " "); transformedHQL = transformedHQL.replace("@joinClause@", " "); - transformedHQL = transformedHQL.replace("@whereClause@", + transformedHQL = transformedHQL.replace("@whereClause@", getWhereClause(requestParameters, queryNamedParameters)); - + return transformedHQL; } diff -r 3e74f819198d -r 57da281af0de src-db/database/model/triggers/C_ORDERLINE_TRG.xml --- a/src-db/database/model/triggers/C_ORDERLINE_TRG.xml Mon Dec 22 12:06:48 2014 +0100 +++ b/src-db/database/model/triggers/C_ORDERLINE_TRG.xml Mon Dec 22 19:12:07 2014 +0100 @@ -86,13 +86,7 @@ FROM m_reservation WHERE c_orderline_id = :OLD.c_orderline_id; IF (v_count > 0) THEN - SELECT m_reservation_id INTO v_reservation_id - FROM m_reservation - WHERE c_orderline_id = :OLD.c_orderline_id; - DELETE FROM m_reservation_stock - WHERE m_reservation_id = v_reservation_id; - DELETE FROM m_reservation - WHERE m_reservation_id = v_reservation_id; + RAISE_APPLICATION_ERROR(-20000, '@DeleteRelatedReservation@'); END IF; ELSE DELETE FROM m_reservation_stock diff -r 3e74f819198d -r 57da281af0de src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Mon Dec 22 12:06:48 2014 +0100 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Mon Dec 22 19:12:07 2014 +0100 @@ -286807,7 +286807,7 @@ <!--842AB447B9D1488EA42F3DACA71934F3--> <HELP><![CDATA[Starting date in the costing rule to fix backdated transactions]]></HELP> <!--842AB447B9D1488EA42F3DACA71934F3--> <COLUMNNAME><![CDATA[Fixbackdatedfrom]]></COLUMNNAME> <!--842AB447B9D1488EA42F3DACA71934F3--> <AD_TABLE_ID><![CDATA[3CF4E9CC4AD94D63BE9DF1822E5B4239]]></AD_TABLE_ID> -<!--842AB447B9D1488EA42F3DACA71934F3--> <AD_REFERENCE_ID><![CDATA[15]]></AD_REFERENCE_ID> +<!--842AB447B9D1488EA42F3DACA71934F3--> <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID> <!--842AB447B9D1488EA42F3DACA71934F3--> <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH> <!--842AB447B9D1488EA42F3DACA71934F3--> <ISKEY><![CDATA[N]]></ISKEY> <!--842AB447B9D1488EA42F3DACA71934F3--> <ISPARENT><![CDATA[N]]></ISPARENT> diff -r 3e74f819198d -r 57da281af0de src-db/database/sourcedata/AD_MESSAGE.xml --- a/src-db/database/sourcedata/AD_MESSAGE.xml Mon Dec 22 12:06:48 2014 +0100 +++ b/src-db/database/sourcedata/AD_MESSAGE.xml Mon Dec 22 19:12:07 2014 +0100 @@ -18103,6 +18103,18 @@ <!--34EFA62A7253493EB68EF2729587AF47--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> <!--34EFA62A7253493EB68EF2729587AF47--></AD_MESSAGE> +<!--351FC82B45B74D2E9473973D5E85766D--><AD_MESSAGE> +<!--351FC82B45B74D2E9473973D5E85766D--> <AD_MESSAGE_ID><![CDATA[351FC82B45B74D2E9473973D5E85766D]]></AD_MESSAGE_ID> +<!--351FC82B45B74D2E9473973D5E85766D--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--351FC82B45B74D2E9473973D5E85766D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--351FC82B45B74D2E9473973D5E85766D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--351FC82B45B74D2E9473973D5E85766D--> <VALUE><![CDATA[DeleteRelatedReservation]]></VALUE> +<!--351FC82B45B74D2E9473973D5E85766D--> <MSGTEXT><![CDATA[You cannot delete the sales order line because it has a related Reservation. Delete the Reservation first. See Linked Items.]]></MSGTEXT> +<!--351FC82B45B74D2E9473973D5E85766D--> <MSGTYPE><![CDATA[E]]></MSGTYPE> +<!--351FC82B45B74D2E9473973D5E85766D--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--351FC82B45B74D2E9473973D5E85766D--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> +<!--351FC82B45B74D2E9473973D5E85766D--></AD_MESSAGE> + <!--35B777D45FEA433281D73DBBECAB0E16--><AD_MESSAGE> <!--35B777D45FEA433281D73DBBECAB0E16--> <AD_MESSAGE_ID><![CDATA[35B777D45FEA433281D73DBBECAB0E16]]></AD_MESSAGE_ID> <!--35B777D45FEA433281D73DBBECAB0E16--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 3e74f819198d -r 57da281af0de src-db/database/sourcedata/OBUISEL_SELECTOR.xml --- a/src-db/database/sourcedata/OBUISEL_SELECTOR.xml Mon Dec 22 12:06:48 2014 +0100 +++ b/src-db/database/sourcedata/OBUISEL_SELECTOR.xml Mon Dec 22 19:12:07 2014 +0100 @@ -970,7 +970,7 @@ <!--F42A1DD1B941461EB3B9AD07A534D91E--> <NAME><![CDATA[On hand warehouse]]></NAME> <!--F42A1DD1B941461EB3B9AD07A534D91E--> <AD_REFERENCE_ID><![CDATA[263693E51C7847BF90C897ADB830E2BB]]></AD_REFERENCE_ID> <!--F42A1DD1B941461EB3B9AD07A534D91E--> <AD_TABLE_ID><![CDATA[190]]></AD_TABLE_ID> -<!--F42A1DD1B941461EB3B9AD07A534D91E--> <FILTER_EXPRESSION><![CDATA["( (" + OB.isSalesTransaction() + " = true and w.id in (select ow.warehouse.id from OrganizationWarehouse ow where ow.warehouse.id = w.id and ow.organization.id = \'" + OB.getParameters().get('inpadOrgId') + "\' )) or (" + OB.isSalesTransaction() + " = false))"]]></FILTER_EXPRESSION> +<!--F42A1DD1B941461EB3B9AD07A534D91E--> <FILTER_EXPRESSION><![CDATA["( (" + OB.isSalesTransaction() + " = true and w.id in (select ow.warehouse.id from OrganizationWarehouse ow where ow.warehouse.id = w.id and ow.organization.id = \'" + OB.getParameters().get('inpadOrgId') + "\' )) or ((" + OB.isSalesTransaction() + " = false or \'"+OB.getWindowId()+"\' in (\'123271B9AD60469BAE8A924841456B63\'))))"]]></FILTER_EXPRESSION> <!--F42A1DD1B941461EB3B9AD07A534D91E--> <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID> <!--F42A1DD1B941461EB3B9AD07A534D91E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--F42A1DD1B941461EB3B9AD07A534D91E--> <VALUEFIELD_ID><![CDATA[13CA3020FEB644D9AA51B4797181BB29]]></VALUEFIELD_ID> ------------------------------------------------------------------------------ Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
