details: https://code.openbravo.com/erp/devel/main/rev/90094abfaff9 changeset: 13605:90094abfaff9 user: Xabier Merino <xabier.merino <at> openbravo.com> date: Fri Aug 26 09:39:52 2011 +0200 summary: Fixed issue 18349. M_Inventory_listcreate does not work properly
details: https://code.openbravo.com/erp/devel/main/rev/3823c5ec27a4 changeset: 13606:3823c5ec27a4 user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Fri Aug 26 15:00:34 2011 +0200 summary: Issue 18227: Move the destroy of dataSource to the form and grid To avoid problems of setting/resetting flags (when the datasource needs to be destroyed). This action is now in the OBFormView and OBViewGrid destroy method. details: https://code.openbravo.com/erp/devel/main/rev/cff2f670c700 changeset: 13607:cff2f670c700 user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Fri Aug 26 15:02:36 2011 +0200 summary: Issue 18227: dataSource/optionDataSource is now destroyed on form/grid destroy The destroy methos of OBViewGrid and OBViewForm takes care of destroying the datasources associated to items/fields details: https://code.openbravo.com/erp/devel/main/rev/882b86f4810f changeset: 13608:882b86f4810f user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Aug 26 19:40:40 2011 +0200 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/4aefc5f4d063 changeset: 13609:4aefc5f4d063 user: Jon Alegría <jon.alegria <at> openbravo.com> date: Mon Aug 29 10:04:30 2011 +0200 summary: Fixes issue 0018346: Is not possible to apply Discount=10% at sales order line as discount field is recalculated details: https://code.openbravo.com/erp/devel/main/rev/89f6f8bf73ef changeset: 13610:89f6f8bf73ef user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Mon Aug 29 10:36:20 2011 +0200 summary: Issue 18297: Added new preference property details: https://code.openbravo.com/erp/devel/main/rev/784b668c22c7 changeset: 13611:784b668c22c7 user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Mon Aug 29 10:37:35 2011 +0200 summary: Fixes issue 18297: Added new Preference to disable G button - Activated instances have the posibility to disable the G button in the login page details: https://code.openbravo.com/erp/devel/main/rev/fa7bf5fee56b changeset: 13612:fa7bf5fee56b user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Aug 29 10:49:56 2011 +0200 summary: Support for httpclient multipart requests details: https://code.openbravo.com/erp/devel/main/rev/8bc60787fdd0 changeset: 13613:8bc60787fdd0 user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Mon Aug 29 11:06:45 2011 +0200 summary: Fixes issue 18297: Changed the logic to display button - Show the button always unless the preference is set to N. This avoids the need to add a new preference by default details: https://code.openbravo.com/erp/devel/main/rev/197035979c96 changeset: 13614:197035979c96 user: Maite Elizari <maite.elizari <at> openbravo.com> date: Mon Aug 29 13:08:07 2011 +0200 summary: Fixes issue 0018372: Generate Average Cost shows DocumentNo when accounting date is MinDateCosting details: https://code.openbravo.com/erp/devel/main/rev/a3a20690578a changeset: 13615:a3a20690578a user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Tue Aug 30 08:53:29 2011 +0200 summary: Fixes int-gui-oracle - Build # 255. Related to issue 18297 details: https://code.openbravo.com/erp/devel/main/rev/2301ecb7a7e2 changeset: 13616:2301ecb7a7e2 user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Tue Aug 30 09:29:49 2011 +0200 summary: Fixed issue 18183. Zooming in an image will work even in readonly windows. The following changes have been made: - Moved the setting of the readonly property in the processFICresponse to _before_ the values for the columns have been set. - The Image formitem will never be disabled. This is done to allow click() events to be triggered. - Added updateState method to the selectorButton (the deleteButton already had it), and saved the selectorButton in the canvas object. - In the setValue() method, added a call to the updateState method of both buttons so that it takes into account the readOnly property in the form and the one in the formitem. details: https://code.openbravo.com/erp/devel/main/rev/11b37540120f changeset: 13617:11b37540120f user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Tue Aug 30 09:44:10 2011 +0200 summary: Fixed issue 18280.Added aprm_ispaymentconfirmed function. details: https://code.openbravo.com/erp/devel/main/rev/4cf7260180a6 changeset: 13618:4cf7260180a6 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Tue Aug 30 10:40:44 2011 +0200 summary: Fixes issue 18034: the lines quantity to count will be configurable per window details: https://code.openbravo.com/erp/devel/main/rev/41a04622702b changeset: 13619:41a04622702b user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Tue Aug 30 10:50:49 2011 +0200 summary: issue 18034: the lines quantity to count will be configurable per window details: https://code.openbravo.com/erp/devel/main/rev/ab1bb30e3d60 changeset: 13620:ab1bb30e3d60 user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Tue Aug 30 12:27:52 2011 +0200 summary: [APRM]Fix column position inconsistency. details: https://code.openbravo.com/erp/devel/main/rev/a94dffaa83dd changeset: 13621:a94dffaa83dd user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Tue Aug 30 12:29:57 2011 +0200 summary: Fixed issue 17948.Properly configure payment terms provided in F&B. details: https://code.openbravo.com/erp/devel/main/rev/395ce0ebf3e4 changeset: 13622:395ce0ebf3e4 user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Tue Aug 30 13:56:35 2011 +0200 summary: Fixes build int-gui-oracle - Build # 255. Related to issue 18297 - The hql fails in Oracle if you use a property clob = value, it works if you use like details: https://code.openbravo.com/erp/devel/main/rev/dfde2574ecaf changeset: 13623:dfde2574ecaf user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Aug 30 19:29:26 2011 +0200 summary: CI: update AD_MODULE to version 13622 diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml | 87 +++++++++ modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml | 4 +- 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/formitem/ob-formitem-image.js | 20 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-linked-items.js | 1 - modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 38 +++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 35 +++- 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.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.google/src-db/database/sourcedata/AD_REF_LIST.xml | 15 + modules/org.openbravo.service.integration.openid/lib/runtime/httpmime-4.1.jar | 0 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.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 36 --- 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 +- referencedata/sampledata/F_B_International_Group.xml | 91 +-------- src-db/database/model/functions/M_GENERATE_AVERAGE_COSTS.xml | 16 +- src-db/database/model/functions/M_INVENTORY_LISTCREATE.xml | 2 +- src-db/database/sourcedata/AD_COLUMN.xml | 4 +- src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_REF_LIST.xml | 12 + src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java | 30 +-- src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt_data.xsql | 24 ++ src/org/openbravo/erpCommon/security/Login.java | 15 +- 58 files changed, 346 insertions(+), 248 deletions(-) diffs (truncated from 1713 to 300 lines): diff -r cb4300e56cab -r dfde2574ecaf modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml Tue Aug 30 19:29:26 2011 +0200 @@ -0,0 +1,87 @@ +<?xml version="1.0"?> + <database name="FUNCTION APRM_ISPAYMENTCONFIRMED"> + <function name="APRM_ISPAYMENTCONFIRMED" type="VARCHAR"> + <parameter name="status" type="VARCHAR" mode="in"> + <default/> + </parameter> + <parameter name="fin_payment_scheduledetail_id" type="VARCHAR" mode="in"> + <default/> + </parameter> + <body><![CDATA[/************************************************************************* +* 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) 2011 Openbravo SLU +* All Rights Reserved. +* Contributor(s): ______________________________________. +************************************************************************/ + v_Sql VARCHAR2(2000); + v_count NUMBER; + v_module VARCHAR2(32); + v_dbprefix VARCHAR2(7); + v_isPaymentConfirmed CHAR(1) := 'N'; + TYPE RECORD IS REF CURSOR; + Cur_Dbprefix RECORD; + +BEGIN + -- Check if the status exists + SELECT count(*) INTO v_count FROM DUAL + WHERE EXISTS (SELECT 1 FROM ad_ref_list + WHERE ad_reference_id = '575BCB88A4694C27BC013DE9C73E6FE7' + AND value = status); + + IF (v_count = 0) THEN + RETURN 'N'; + END IF; + IF (status IN ('PPM', 'RPR', 'PWNC', 'RDNC', 'RPPC')) THEN + -- core final statuses + v_isPaymentConfirmed := 'Y'; + ELSIF (status IN ('RPAP', 'RPAE', 'RPVOID')) THEN + -- core intermediate statuses + v_isPaymentConfirmed := 'N'; + ELSE + -- statuses implemented by other module + SELECT ad_module_id INTO v_module + FROM ad_ref_list + WHERE ad_reference_id = '575BCB88A4694C27BC013DE9C73E6FE7' + AND value = status; + + -- if the module defines a merge can have several dbprefix + FOR Cur_Dbprefix IN ( + SELECT name AS dbprefix + FROM ad_module_dbprefix + WHERE ad_module_id = v_module + ORDER BY name) + LOOP + BEGIN + v_Sql := 'SELECT ' || Cur_Dbprefix.dbprefix || '_ispaymentconfirmed' || '(''' || status || ''', ''' || fin_payment_scheduledetail_id || ''') FROM DUAL'; + + EXECUTE IMMEDIATE v_Sql INTO v_isPaymentConfirmed; + IF (v_ispaymentconfirmed = 'Y') THEN + EXIT; + END IF; + EXCEPTION WHEN OTHERS THEN + DBMS_OUTPUT.PUT_LINE(Cur_Dbprefix.dbprefix || '_ispaymentconfirmed function not implemented'); + -- do nothing + END; + END LOOP; + END IF; + + RETURN v_isPaymentConfirmed; + +EXCEPTION +WHEN OTHERS THEN + DBMS_OUTPUT.PUT_LINE('aprm_ispaymentconfirmed exception'); + RAISE; +END APRM_ISPAYMENTCONFIRMED +]]></body> + </function> + </database> diff -r cb4300e56cab -r dfde2574ecaf modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Fri Aug 26 12:31:08 2011 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Tue Aug 30 19:29:26 2011 +0200 @@ -333,7 +333,7 @@ <!--18096D8809024E67A36E636EA0D9D0E7--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> <!--18096D8809024E67A36E636EA0D9D0E7--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--18096D8809024E67A36E636EA0D9D0E7--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> -<!--18096D8809024E67A36E636EA0D9D0E7--> <POSITION><![CDATA[18]]></POSITION> +<!--18096D8809024E67A36E636EA0D9D0E7--> <POSITION><![CDATA[25]]></POSITION> <!--18096D8809024E67A36E636EA0D9D0E7--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> <!--18096D8809024E67A36E636EA0D9D0E7--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> <!--18096D8809024E67A36E636EA0D9D0E7--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> @@ -6383,7 +6383,7 @@ <!--F362B84F4718449EAD840F1C25667B37--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> <!--F362B84F4718449EAD840F1C25667B37--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--F362B84F4718449EAD840F1C25667B37--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> -<!--F362B84F4718449EAD840F1C25667B37--> <POSITION><![CDATA[22]]></POSITION> +<!--F362B84F4718449EAD840F1C25667B37--> <POSITION><![CDATA[25]]></POSITION> <!--F362B84F4718449EAD840F1C25667B37--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> <!--F362B84F4718449EAD840F1C25667B37--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> <!--F362B84F4718449EAD840F1C25667B37--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> diff -r cb4300e56cab -r dfde2574ecaf modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Aug 26 12:31:08 2011 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Tue Aug 30 19:29:26 2011 +0200 @@ -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.13596]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.13622]]></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 cb4300e56cab -r dfde2574ecaf 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 Fri Aug 26 12:31:08 2011 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Aug 30 19:29:26 2011 +0200 @@ -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.13596]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.13622]]></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.13596]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.13622]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r cb4300e56cab -r dfde2574ecaf 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 Fri Aug 26 12:31:08 2011 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Tue Aug 30 19:29:26 2011 +0200 @@ -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.13596]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.13622]]></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 cb4300e56cab -r dfde2574ecaf 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 Fri Aug 26 12:31:08 2011 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Aug 30 19:29:26 2011 +0200 @@ -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.13596]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.13622]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r cb4300e56cab -r dfde2574ecaf 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 Fri Aug 26 12:31:08 2011 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Tue Aug 30 19:29:26 2011 +0200 @@ -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.13596]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.13622]]></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 cb4300e56cab -r dfde2574ecaf 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 Fri Aug 26 12:31:08 2011 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Aug 30 19:29:26 2011 +0200 @@ -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.13596]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.13622]]></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.13596]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.13622]]></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.13596]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.13622]]></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.13596]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.13622]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r cb4300e56cab -r dfde2574ecaf modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js Fri Aug 26 12:31:08 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js Tue Aug 30 19:29:26 2011 +0200 @@ -21,10 +21,6 @@ //This class is used for the small image shown within the OBImageItemSmallImageContainer isc.ClassFactory.defineClass('OBImageItemSmallImage', isc.Img); -isc.OBImageItemSmallImage.addProperties({ - showDisabled: false -}); - //== OBImageItemSmallImageContainer == //This class is used for the small image container box isc.ClassFactory.defineClass('OBImageItemSmallImageContainer', isc.HLayout); @@ -129,6 +125,13 @@ imageItem: this.imageItem }); selector.show(); + }, + updateState: function(value){ + if(value){ + this.setDisabled(false); + }else{ + this.setDisabled(true); + } } }); var deleteButton = isc.OBImageItemButton.create({ @@ -181,6 +184,7 @@ } this.deleteButton = deleteButton; + this.selectorButton = selectorButton; buttonLayout.addMember(selectorButton); buttonLayout.addMember(deleteButton); this.addMember(buttonLayout); @@ -212,6 +216,10 @@ this.canvasProperties.parentItem = this; this.Super('init', arguments); }, + //This formitem will never be disabled, so even if the form is readonly, click events will still be triggered + isDisabled: function() { + return false; + }, setValue: function(newValue){ if(!newValue || newValue === '') { this.canvas.setImage(''); @@ -244,7 +252,9 @@ } }); } - this.canvas.deleteButton.updateState(newValue); + //Buttons will not be shown if the form is readonly + this.canvas.deleteButton.updateState(newValue && !this.form.readOnly && !this.readOnly); + this.canvas.selectorButton.updateState(!this.form.readOnly && !this.readOnly); return this.Super('setValue', arguments); }, refreshImage: function(imageId){ diff -r cb4300e56cab -r dfde2574ecaf 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 Fri Aug 26 12:31:08 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-linked-items.js Tue Aug 30 19:29:26 2011 +0200 @@ -315,7 +315,6 @@ hLayout.addMember(this.linkedItemListGrid); this.messageLabel = isc.Label.create({ - ID: 'messageLabel', width: '100%', height: '100%', canFocus: true diff -r cb4300e56cab -r dfde2574ecaf modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js Fri Aug 26 12:31:08 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js Tue Aug 30 19:29:26 2011 +0200 @@ -585,6 +585,12 @@ delete this.inFicCall; return; } + + if (data._readOnly || this.view.readOnly) { + this.readOnly = true; + } else { ------------------------------------------------------------------------------ Special Offer -- Download ArcSight Logger for FREE! Finally, a world-class log management solution at an even better price-free! And you'll get a free "Love Thy Logs" t-shirt when you download Logger. Secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsisghtdev2dev _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
