details: /erp/devel/pi/rev/ce2e7f56de1d
changeset: 12234:ce2e7f56de1d
user: Thirumalai Kandasami <thirumalai <at> qualian.in>
date: Wed May 18 18:42:07 2011 +0530
summary: Fixed Issue 16574:Toolbar cancel message modification
details: /erp/devel/pi/rev/d7fafabe9005
changeset: 12235:d7fafabe9005
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed May 18 17:19:41 2011 +0200
summary: fixed bug 17238: Cannot add year to a fiscal calendar
diffstat:
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
| 11 ++++++++++
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
| 2 +-
src-db/database/sourcedata/AD_COLUMN.xml
| 2 +-
3 files changed, 13 insertions(+), 2 deletions(-)
diffs (45 lines):
diff -r 3a776952d8dc -r d7fafabe9005
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Wed May 18 17:11:39 2011 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Wed May 18 17:19:41 2011 +0200
@@ -706,6 +706,17 @@
<!--EE57AA334D6846718FBA9E042EA4F5EF-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--EE57AA334D6846718FBA9E042EA4F5EF--></AD_MESSAGE>
+<!--EF03C1B05A0548288B31E1B624730A6D--><AD_MESSAGE>
+<!--EF03C1B05A0548288B31E1B624730A6D-->
<AD_MESSAGE_ID><![CDATA[EF03C1B05A0548288B31E1B624730A6D]]></AD_MESSAGE_ID>
+<!--EF03C1B05A0548288B31E1B624730A6D-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EF03C1B05A0548288B31E1B624730A6D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EF03C1B05A0548288B31E1B624730A6D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EF03C1B05A0548288B31E1B624730A6D-->
<VALUE><![CDATA[OBUIAPP_CancelEdit]]></VALUE>
+<!--EF03C1B05A0548288B31E1B624730A6D--> <MSGTEXT><![CDATA[Cancel changes and
return to last saved state]]></MSGTEXT>
+<!--EF03C1B05A0548288B31E1B624730A6D--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--EF03C1B05A0548288B31E1B624730A6D-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--EF03C1B05A0548288B31E1B624730A6D--></AD_MESSAGE>
+
<!--FBA2F11416C4413F8E2D554119461964--><AD_MESSAGE>
<!--FBA2F11416C4413F8E2D554119461964-->
<AD_MESSAGE_ID><![CDATA[FBA2F11416C4413F8E2D554119461964]]></AD_MESSAGE_ID>
<!--FBA2F11416C4413F8E2D554119461964-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 3a776952d8dc -r d7fafabe9005
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
Wed May 18 17:11:39 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
Wed May 18 17:19:41 2011 +0200
@@ -185,7 +185,7 @@
},
disabled: true,
buttonType: 'undo',
- prompt: OB.I18N.getLabel('OBUIAPP_ConfirmCancelEdit'),
+ prompt: OB.I18N.getLabel('OBUIAPP_CancelEdit'),
updateState: function(){
var view = this.view, form = view.viewForm, grid = view.viewGrid,
hasErrors = false, editRow, i;
if (view.isShowingForm) {
diff -r 3a776952d8dc -r d7fafabe9005 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Wed May 18 17:11:39 2011 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Wed May 18 17:19:41 2011 +0200
@@ -15768,7 +15768,7 @@
<!--1033--> <AD_TABLE_ID><![CDATA[177]]></AD_TABLE_ID>
<!--1033--> <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
<!--1033--> <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
-<!--1033--> <DEFAULTVALUE><![CDATA[0]]></DEFAULTVALUE>
+<!--1033--> <DEFAULTVALUE><![CDATA[@AD_Org_ID@]]></DEFAULTVALUE>
<!--1033--> <ISKEY><![CDATA[N]]></ISKEY>
<!--1033--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--1033--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
------------------------------------------------------------------------------
What Every C/C++ and Fortran developer Should Know!
Read this article and learn how Intel has extended the reach of its
next-generation tools to help Windows* and Linux* C/C++ and Fortran
developers boost performance applications - including clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
