details: https://code.openbravo.com/erp/devel/main/rev/01f423b301ba changeset: 15181:01f423b301ba user: David Baz Fayos <david.baz <at> openbravo.com> date: Mon Jan 23 23:48:56 2012 +0100 summary: Fixed issue 19546: 'Smtp Server Account' is not mandatory anymore
details: https://code.openbravo.com/erp/devel/main/rev/02063eeed513 changeset: 15182:02063eeed513 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Tue Jan 24 09:08:41 2012 +0100 summary: Fixes issue 19388: Wrong product selector in Work Requirement window. Now the data is filtered by e.stocked = false so the products in the warehouse are not visible. Apart from that, the default value for filter 'stocked' is no details: https://code.openbravo.com/erp/devel/main/rev/575f08555346 changeset: 15183:575f08555346 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Jan 24 13:33:58 2012 +0100 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/ab84b5bf2f33 changeset: 15184:ab84b5bf2f33 user: Adrián Romero <adrianromero <at> openbravo.com> date: Tue Jan 24 12:03:01 2012 +0100 summary: Improving SimpleCallout. Now it is posible to invoke a SimpleCallout functionality from another SimpleCallout details: https://code.openbravo.com/erp/devel/main/rev/a44439184a15 changeset: 15185:a44439184a15 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jan 24 15:22:56 2012 +0100 summary: fixed bug 19359: Parent id shown as part of some identifiers details: https://code.openbravo.com/erp/devel/main/rev/8865bff7d417 changeset: 15186:8865bff7d417 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Tue Jan 24 16:20:40 2012 +0100 summary: Fixes issue 19260: You can use credit generated from other organization. with this change the credit generated for BP is only available in the first organization that it is a legal entity (first legal entity father) or her sons. details: https://code.openbravo.com/erp/devel/main/rev/91a0972e4ee7 changeset: 15187:91a0972e4ee7 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Tue Jan 24 16:29:50 2012 +0100 summary: Backed out changeset 8865bff7d417 details: https://code.openbravo.com/erp/devel/main/rev/331403eece14 changeset: 15188:331403eece14 user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Tue Jan 24 17:41:26 2012 +0100 summary: Fixed issue 19534.Set greatest of invoiced or delivered qty. details: https://code.openbravo.com/erp/devel/main/rev/8f2bc6078c77 changeset: 15189:8f2bc6078c77 user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Tue Jan 24 17:42:28 2012 +0100 summary: Fixed issue 19534.Properly update grand total difference on psds after close. details: https://code.openbravo.com/erp/devel/main/rev/46213d1d7e7b changeset: 15190:46213d1d7e7b user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Mon Jan 23 16:39:57 2012 +0100 summary: Fixes issue 19385: Payment Report does not work well with Credit Payments. details: https://code.openbravo.com/erp/devel/main/rev/f37e4bad23ee changeset: 15191:f37e4bad23ee user: Adrián Romero <adrianromero <at> openbravo.com> date: Tue Jan 24 18:13:30 2012 +0100 summary: Improving SimpleCallout. Rolling back the final clause for the vars field details: https://code.openbravo.com/erp/devel/main/rev/4f04bb194fbe changeset: 15192:4f04bb194fbe user: Guillermo Álvarez de Eulate <guillermo.alvarez <at> openbravo.com> date: Thu Jan 19 11:38:26 2012 +0100 summary: Fixed issue 19264: The notes behavior has been corrected details: https://code.openbravo.com/erp/devel/main/rev/7246b6950ddd changeset: 15193:7246b6950ddd user: Guillermo Álvarez de Eulate <guillermo.alvarez <at> openbravo.com> date: Thu Jan 19 10:42:26 2012 +0100 summary: Fixed Issue 0018064: Loading text is shown while linked items are being loaded details: https://code.openbravo.com/erp/devel/main/rev/e66cf6210386 changeset: 15194:e66cf6210386 user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Jan 25 17:54:00 2012 +0100 summary: CI: update AD_MODULE to version 15193 diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml | 110 +++++---- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml | 11 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-linked-items.js | 35 +++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-notes.js | 14 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java | 37 +++- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 24 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 18 +- src-db/database/model/functions/C_ORDER_POST1.xml | 37 +- src-db/database/sourcedata/AD_COLUMN.xml | 2 +- src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 2 +- src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 2 +- src/org/openbravo/base/model/Entity.java | 15 +- src/org/openbravo/erpCommon/ad_callouts/SimpleCallout.java | 20 +- 52 files changed, 284 insertions(+), 165 deletions(-) diffs (truncated from 1420 to 300 lines): diff -r 67671c4afeb6 -r e66cf6210386 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml Mon Jan 23 20:16:27 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml Wed Jan 25 17:54:00 2012 +0100 @@ -38,11 +38,7 @@ v_bpartner_id c_order.c_bpartner_id%TYPE; v_docSubType c_doctype.docsubtypeso%TYPE; v_PaymentPriority VARCHAR(32); - -v_Outstandingamt NUMBER; -v_Paidamt NUMBER; -v_Amount NUMBER; -v_FinPaymentScheduleId VARCHAR2(32); +v_count NUMBER; TYPE RECORD IS REF CURSOR; Cur_Params RECORD; @@ -80,13 +76,25 @@ FROM c_order WHERE c_order_id = p_record_id; - SELECT docsubtypeso - INTO v_docSubType + SELECT COALESCE(docsubtypeso, '---') INTO v_docSubType FROM c_doctype WHERE c_doctype_id = v_C_Doctype_ID; - IF(v_docSubType is null or v_docSubType not in ('OB', 'ON')) THEN - IF (p_docaction = 'CO') THEN + SELECT count(*) INTO v_count + FROM fin_payment_schedule + WHERE c_order_id = p_record_id + -- Migrated orders with related debt-payments have an additional fin_payment_schedule with the paid amount. + -- These additional fin_payment_schedules do not have fin_payment_scheduledetail records. + AND EXISTS (SELECT 1 FROM fin_payment_scheduledetail + WHERE fin_payment_schedule_order = fin_payment_schedule.fin_payment_schedule_id); + IF (v_count > 1) THEN + RAISE_APPLICATION_ERROR(-20000, '@APRM_Multiple_Payment_Schedules@'); + END IF; + + IF(v_docSubType in ('OB', 'ON')) THEN + RETURN; + END IF; + IF (p_docaction = 'CO') THEN -- Checking Payment Method ID is available IF(v_paymentmethod_id IS NULL) THEN RAISE_APPLICATION_ERROR(-20000, '@APRM_PAYMENTMETHOD_MISSING@'); @@ -171,7 +179,6 @@ ELSIF (p_docaction = 'RE') THEN -- check there is not any paid payment DECLARE - v_count NUMBER; Cur_PaymentScheduleDetail RECORD; BEGIN SELECT count(*) INTO v_count @@ -204,53 +211,60 @@ END; ELSIF (p_docaction = 'CL') THEN DECLARE - v_OldGrandTotal NUMBER; + v_difference NUMBER; + v_FinPaymentScheduleId VARCHAR2(32); + v_FinPaymentScheduleDetailId VARCHAR2(32); + v_psd_amt NUMBER; BEGIN - SELECT sum(amount) INTO v_OldGrandTotal + SELECT v_grandtotal - sum(amount) INTO v_difference FROM fin_payment_schedule WHERE c_order_id = p_record_id; - --IF (v_difference <> 0) THEN - -- UPDATE fin_payment_schedule - -- SET amount = amount - v_difference, - -- outstandingamt = outstandingamt - v_difference, - -- updated = TO_DATE(NOW()), - -- updatedby = p_user - -- WHERE c_order_id = p_record_id - -- AND outstandingamt > v_difference; - --END IF; - --This part of code Update the tables fin_payment_schedule and fin_payment_scheduledetail when one order is closed and the pyment is not - --the same of the expected amount when the order is closed - SELECT co.grandtotal,fps.outstandingamt,fps.paidamt,fps.amount,fps.fin_payment_schedule_id - INTO v_GrandTotal,v_Outstandingamt,v_Paidamt,v_Amount,v_FinPaymentScheduleId - FROM c_order co LEFT JOIN c_orderline col ON co.c_order_id=col.c_order_id - LEFT JOIN fin_payment_schedule fps ON fps.c_order_id = col.c_order_id - WHERE co.C_Order_ID=p_record_id - GROUP BY co.c_order_id,co.grandtotal,fps.outstandingamt,fps.paidamt,fps.amount,fps.fin_payment_schedule_id; - IF (v_OldGrandTotal <> v_GrandTotal) THEN - IF (v_Paidamt < v_OldGrandTotal) THEN - UPDATE fin_payment_scheduledetail set amount = v_GrandTotal - v_Paidamt where fin_payment_detail_id IS NULL - AND fin_payment_schedule_order = v_FinPaymentScheduleId; - ELSE - INSERT INTO fin_payment_scheduledetail ( - fin_payment_scheduledetail_id,ad_client_id,ad_org_id,created,createdby,updated,updatedby, - fin_payment_detail_id,fin_payment_schedule_order,fin_payment_schedule_invoice,amount, - isactive,writeoffamt,iscanceled,c_bpartner_id, c_activity_id,m_product_id,c_campaign_id, - c_project_id,c_salesregion_id - ) - VALUES( - get_uuid(),v_Client_ID,v_Org_ID,now(),p_user,now(),p_user, - null,v_FinPaymentScheduleId,null,v_GrandTotal-v_OldGrandTotal, - 'Y',0 ,'N',v_bpartner_id, null,null,null, - null,null - ); + SELECT ps.fin_payment_schedule_id INTO v_finpaymentscheduleid + FROM fin_payment_schedule ps + WHERE ps.c_order_id=p_record_id + AND EXISTS (SELECT 1 FROM fin_payment_scheduledetail WHERE fin_payment_schedule_order = ps.fin_payment_schedule_id); + + IF (v_difference <> 0) THEN + --Get fin_payment_scheduledetail not related to payments nor invoices. + SELECT fin_payment_scheduledetail_id, amount + INTO v_finpaymentscheduledetailid, v_psd_amt + FROM fin_payment_scheduledetail + WHERE fin_payment_schedule_order = v_finpaymentscheduleid + AND fin_payment_schedule_invoice IS NULL + AND fin_payment_detail_id IS NULL; + IF (v_finpaymentscheduledetailid IS NOT NULL) THEN + --If exists a psd not related to any invoice nor invoice update its amount with the difference. + IF (v_psd_amt * -1 = v_difference) THEN + -- If amounts are equal we delete the psd + DELETE FROM fin_payment_scheduledetail + WHERE fin_payment_scheduledetail_id = v_finpaymentscheduledetailid; + ELSE + UPDATE fin_payment_scheduledetail + SET amount = amount + v_difference + WHERE fin_payment_scheduledetail_id = v_finpaymentscheduledetailid; + END IF; + ELSE + -- If not exists a psd to update create one with the difference + INSERT INTO fin_payment_scheduledetail ( + fin_payment_scheduledetail_id, ad_client_id, ad_org_id, isactive, + created, createdby, updated, updatedby, + fin_payment_detail_id, fin_payment_schedule_order, fin_payment_schedule_invoice, + amount, writeoffamt, iscanceled + ) VALUES ( + get_uuid(), v_Client_ID, v_Org_ID,'Y', + now(), p_user, now(), p_user, + null, v_FinPaymentScheduleId, null, + v_difference, 0 ,'N' + ); END IF; - UPDATE fin_payment_schedule SET amount = v_GrandTotal,outstandingamt = v_GrandTotal-v_Paidamt + UPDATE fin_payment_schedule + SET amount = amount + v_difference, + outstandingamt = outstandingamt + v_difference WHERE fin_payment_schedule_id = v_FinPaymentScheduleId; END IF; END; END IF; - END IF; EXCEPTION WHEN OTHERS THEN DBMS_OUTPUT.PUT_LINE('APRM_GENERATE_PAYMENT_SCHEDULE exception: '|| v_ResultStr); diff -r 67671c4afeb6 -r e66cf6210386 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Mon Jan 23 20:16:27 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Wed Jan 25 17:54:00 2012 +0100 @@ -66,6 +66,17 @@ <!--19D77522B7A4470FBA505D39A6AA051C--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--19D77522B7A4470FBA505D39A6AA051C--></AD_MESSAGE> +<!--1E8BFED210524080A7F8FE17D6C4DED1--><AD_MESSAGE> +<!--1E8BFED210524080A7F8FE17D6C4DED1--> <AD_MESSAGE_ID><![CDATA[1E8BFED210524080A7F8FE17D6C4DED1]]></AD_MESSAGE_ID> +<!--1E8BFED210524080A7F8FE17D6C4DED1--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--1E8BFED210524080A7F8FE17D6C4DED1--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--1E8BFED210524080A7F8FE17D6C4DED1--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--1E8BFED210524080A7F8FE17D6C4DED1--> <VALUE><![CDATA[APRM_Multiple_Payment_Schedules]]></VALUE> +<!--1E8BFED210524080A7F8FE17D6C4DED1--> <MSGTEXT><![CDATA[The order has more than one Payment Plan record with related Payment Plan details. Please contact your System Administrator to fix it.]]></MSGTEXT> +<!--1E8BFED210524080A7F8FE17D6C4DED1--> <MSGTYPE><![CDATA[E]]></MSGTYPE> +<!--1E8BFED210524080A7F8FE17D6C4DED1--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--1E8BFED210524080A7F8FE17D6C4DED1--></AD_MESSAGE> + <!--1EB0D3A668784AF8A9133F066EDE6C44--><AD_MESSAGE> <!--1EB0D3A668784AF8A9133F066EDE6C44--> <AD_MESSAGE_ID><![CDATA[1EB0D3A668784AF8A9133F066EDE6C44]]></AD_MESSAGE_ID> <!--1EB0D3A668784AF8A9133F066EDE6C44--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 67671c4afeb6 -r e66cf6210386 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon Jan 23 20:16:27 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Jan 25 17:54:00 2012 +0100 @@ -6,7 +6,7 @@ <!--A918E3331C404B889D69AA9BFAFB23AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--A918E3331C404B889D69AA9BFAFB23AC--> <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME> -<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.15168]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.15193]]></VERSION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements. If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP> diff -r 67671c4afeb6 -r e66cf6210386 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Jan 23 20:16:27 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Jan 25 17:54:00 2012 +0100 @@ -7,7 +7,7 @@ <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID> -<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.15168]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.15193]]></STARTVERSION> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--B97FC854C6DD41E692161585645A900F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--B97FC854C6DD41E692161585645A900F--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--B97FC854C6DD41E692161585645A900F--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.15168]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.15193]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 67671c4afeb6 -r e66cf6210386 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Mon Jan 23 20:16:27 2012 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Wed Jan 25 17:54:00 2012 +0100 @@ -6,7 +6,7 @@ <!--C70732EA90A14EC0916078B85CC33D2D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--C70732EA90A14EC0916078B85CC33D2D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--C70732EA90A14EC0916078B85CC33D2D--> <NAME><![CDATA[JBoss Weld]]></NAME> -<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.15168]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.15193]]></VERSION> <!--C70732EA90A14EC0916078B85CC33D2D--> <DESCRIPTION><![CDATA[JBoss Weld]]></DESCRIPTION> <!--C70732EA90A14EC0916078B85CC33D2D--> <HELP><![CDATA[Provides the JBoss Weld framework: Java Contexts and Dependency Injection for the Java EE platform (CDI). For more information see http://seamframework.org/Weld]]></HELP> <!--C70732EA90A14EC0916078B85CC33D2D--> <URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL> diff -r 67671c4afeb6 -r e66cf6210386 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Jan 23 20:16:27 2012 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Jan 25 17:54:00 2012 +0100 @@ -7,7 +7,7 @@ <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.15168]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.15193]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 67671c4afeb6 -r e66cf6210386 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Mon Jan 23 20:16:27 2012 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Wed Jan 25 17:54:00 2012 +0100 @@ -6,7 +6,7 @@ <!--9BA0836A3CD74EE4AB48753A47211BCC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <NAME><![CDATA[User Interface Application]]></NAME> -<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.15168]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.15193]]></VERSION> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <DESCRIPTION><![CDATA[Provides the main application components for the openbravo user interface]]></DESCRIPTION> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <HELP><![CDATA[Provides the main application components for the openbravo user interface. The main layout incorporates a navigation bar and a main view area.]]></HELP> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL> diff -r 67671c4afeb6 -r e66cf6210386 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Jan 23 20:16:27 2012 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Jan 25 17:54:00 2012 +0100 @@ -7,7 +7,7 @@ <!--15D7CE8D95D043189162DBABA54A1F61--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID> -<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.15168]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.15193]]></STARTVERSION> <!--15D7CE8D95D043189162DBABA54A1F61--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--60A170212F36499D83B8AD38D01F46B3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--60A170212F36499D83B8AD38D01F46B3--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--60A170212F36499D83B8AD38D01F46B3--> <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID> -<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.15168]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.15193]]></STARTVERSION> <!--60A170212F36499D83B8AD38D01F46B3--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME> <!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -35,7 +35,7 @@ <!--824D60CB352E4099B1D8C903CA139DAE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--824D60CB352E4099B1D8C903CA139DAE--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--824D60CB352E4099B1D8C903CA139DAE--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.15168]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.15193]]></STARTVERSION> <!--824D60CB352E4099B1D8C903CA139DAE--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--824D60CB352E4099B1D8C903CA139DAE--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--824D60CB352E4099B1D8C903CA139DAE--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -49,7 +49,7 @@ <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID> -<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.15168]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.15193]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 67671c4afeb6 -r e66cf6210386 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-linked-items.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-linked-items.js Mon Jan 23 20:16:27 2012 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-linked-items.js Wed Jan 25 17:54:00 2012 +0100 @@ -165,7 +165,8 @@ useSimpleHttp: true, actionURL: actionURL }; - + this.linkedItemCategoryListGrid.setData([]); + this.linkedItemCategoryListGrid.showLoadingMessage(); isc.RPCManager.sendRequest(reqObj); }, @@ -215,6 +216,8 @@ useSimpleHttp: true, actionURL: actionURL }; + this.linkedItemListGrid.setData([]); ------------------------------------------------------------------------------ Keep Your Developer Skills Current with LearnDevNow! 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-d2d _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
