details: https://code.openbravo.com/erp/devel/pi/rev/f997917b8d11
changeset: 14204:f997917b8d11
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Mon Nov 07 11:00:56 2011 +0100
summary: Backed out changeset 69b54baf8a5a
diffstat:
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
| 72 +++++----
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
| 26 +++
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-toolbar.js
| 5 -
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
| 2 -
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js
| 4 -
5 files changed, 63 insertions(+), 46 deletions(-)
diffs (166 lines):
diff -r 69b54baf8a5a -r f997917b8d11
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
Wed Nov 02 17:53:42 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
Mon Nov 07 11:00:56 2011 +0100
@@ -6275,6 +6275,43 @@
<!--B01D6A5AF6F14FD6947BDEEF22C35CF8-->
<IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
<!--B01D6A5AF6F14FD6947BDEEF22C35CF8--></AD_COLUMN>
+<!--B44BDBCFCEC243179D78A333FA0497A5--><AD_COLUMN>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->
<AD_COLUMN_ID><![CDATA[B44BDBCFCEC243179D78A333FA0497A5]]></AD_COLUMN_ID>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B44BDBCFCEC243179D78A333FA0497A5--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B44BDBCFCEC243179D78A333FA0497A5--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B44BDBCFCEC243179D78A333FA0497A5--> <NAME><![CDATA[Modify]]></NAME>
+<!--B44BDBCFCEC243179D78A333FA0497A5--> <DESCRIPTION><![CDATA[Modify existing
transaction once created]]></DESCRIPTION>
+<!--B44BDBCFCEC243179D78A333FA0497A5--> <HELP><![CDATA[Process to modify
transactions GL Item type once they have been created]]></HELP>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->
<COLUMNNAME><![CDATA[EM_APRM_Modify]]></COLUMNNAME>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->
<AD_TABLE_ID><![CDATA[FF8080812FFEC82D012FFECCE3400030]]></AD_TABLE_ID>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->
<AD_REFERENCE_ID><![CDATA[28]]></AD_REFERENCE_ID>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->
<FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--B44BDBCFCEC243179D78A333FA0497A5--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--B44BDBCFCEC243179D78A333FA0497A5--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->
<ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--B44BDBCFCEC243179D78A333FA0497A5--> <SEQNO><![CDATA[410]]></SEQNO>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->
<AD_ELEMENT_ID><![CDATA[91DD92021CFA438DBBF2ABAFCB2089C5]]></AD_ELEMENT_ID>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->
<AD_PROCESS_ID><![CDATA[15C8708DFC464C2D91286E59624FDD18]]></AD_PROCESS_ID>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->
<ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--B44BDBCFCEC243179D78A333FA0497A5--> <POSITION><![CDATA[34]]></POSITION>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--B44BDBCFCEC243179D78A333FA0497A5--> <ISAUTOSAVE><![CDATA[N]]></ISAUTOSAVE>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->
<IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--B44BDBCFCEC243179D78A333FA0497A5--></AD_COLUMN>
+
+<!--B50241F11C4F404583CACB2A88CE875F--><AD_COLUMN>
+<!--B50241F11C4F404583CACB2A88CE875F-->
<AD_COLUMN_ID><![CDATA[B50241F11C4F404583CACB2A88CE875F]]></AD_COLUMN_ID>
<!--B50241F11C4F404583CACB2A88CE875F-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--B50241F11C4F404583CACB2A88CE875F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--B50241F11C4F404583CACB2A88CE875F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
@@ -7268,41 +7305,6 @@
<!--F860918881E54495981462670E8882BF-->
<IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
<!--F860918881E54495981462670E8882BF--></AD_COLUMN>
-<!--F860918881E54495981462670E8882BF--><AD_COLUMN>
-<!--F860918881E54495981462670E8882BF-->
<AD_COLUMN_ID><![CDATA[F860918881E54495981462670E8882BF]]></AD_COLUMN_ID>
-<!--F860918881E54495981462670E8882BF-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--F860918881E54495981462670E8882BF--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--F860918881E54495981462670E8882BF--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--F860918881E54495981462670E8882BF--> <NAME><![CDATA[Organization]]></NAME>
-<!--F860918881E54495981462670E8882BF--> <DESCRIPTION><![CDATA[Organizational
entity within client]]></DESCRIPTION>
-<!--F860918881E54495981462670E8882BF--> <HELP><![CDATA[An organization is a
unit of your client or legal entity - examples are store, department. You can
share data between organizations.]]></HELP>
-<!--F860918881E54495981462670E8882BF-->
<COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
-<!--F860918881E54495981462670E8882BF-->
<AD_TABLE_ID><![CDATA[FF808081331848750133184B38D20009]]></AD_TABLE_ID>
-<!--F860918881E54495981462670E8882BF-->
<AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
-<!--F860918881E54495981462670E8882BF-->
<FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
-<!--F860918881E54495981462670E8882BF-->
<DEFAULTVALUE><![CDATA[@AD_ORG_ID@]]></DEFAULTVALUE>
-<!--F860918881E54495981462670E8882BF--> <ISKEY><![CDATA[N]]></ISKEY>
-<!--F860918881E54495981462670E8882BF--> <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--F860918881E54495981462670E8882BF-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--F860918881E54495981462670E8882BF-->
<ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
-<!--F860918881E54495981462670E8882BF-->
<ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--F860918881E54495981462670E8882BF--> <SEQNO><![CDATA[70]]></SEQNO>
-<!--F860918881E54495981462670E8882BF-->
<ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--F860918881E54495981462670E8882BF-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--F860918881E54495981462670E8882BF-->
<ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--F860918881E54495981462670E8882BF-->
<AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
-<!--F860918881E54495981462670E8882BF-->
<ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
-<!--F860918881E54495981462670E8882BF-->
<ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--F860918881E54495981462670E8882BF-->
<ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--F860918881E54495981462670E8882BF-->
<DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--F860918881E54495981462670E8882BF-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--F860918881E54495981462670E8882BF--> <POSITION><![CDATA[7]]></POSITION>
-<!--F860918881E54495981462670E8882BF-->
<ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--F860918881E54495981462670E8882BF--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--F860918881E54495981462670E8882BF-->
<VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--F860918881E54495981462670E8882BF-->
<IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--F860918881E54495981462670E8882BF--></AD_COLUMN>
-
<!--FA5D73939D454F8E804DFACEE44D0C6E--><AD_COLUMN>
<!--FA5D73939D454F8E804DFACEE44D0C6E-->
<AD_COLUMN_ID><![CDATA[FA5D73939D454F8E804DFACEE44D0C6E]]></AD_COLUMN_ID>
<!--FA5D73939D454F8E804DFACEE44D0C6E-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 69b54baf8a5a -r f997917b8d11
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
Wed Nov 02 17:53:42 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
Mon Nov 07 11:00:56 2011 +0100
@@ -6621,6 +6621,32 @@
<!--8C679A6AD6294811B5936EE59035CE36-->
<ISSHOWNINSTATUSBAR><![CDATA[Y]]></ISSHOWNINSTATUSBAR>
<!--8C679A6AD6294811B5936EE59035CE36--></AD_FIELD>
+<!--8C8A4128A9384B3087CCD1759C603A0B--><AD_FIELD>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->
<AD_FIELD_ID><![CDATA[8C8A4128A9384B3087CCD1759C603A0B]]></AD_FIELD_ID>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8C8A4128A9384B3087CCD1759C603A0B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8C8A4128A9384B3087CCD1759C603A0B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8C8A4128A9384B3087CCD1759C603A0B--> <NAME><![CDATA[Product]]></NAME>
+<!--8C8A4128A9384B3087CCD1759C603A0B--> <DESCRIPTION><![CDATA[An item
produced by a process.]]></DESCRIPTION>
+<!--8C8A4128A9384B3087CCD1759C603A0B--> <HELP><![CDATA[Identifies an item
which is either purchased or sold in this organization.]]></HELP>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->
<AD_TAB_ID><![CDATA[FF8080812F213146012F2135BC25000E]]></AD_TAB_ID>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->
<AD_COLUMN_ID><![CDATA[BBA3DB68DBD844B29F1EEC9A04F112E8]]></AD_COLUMN_ID>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->
<ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->
<DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--8C8A4128A9384B3087CCD1759C603A0B--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--8C8A4128A9384B3087CCD1759C603A0B--> <SEQNO><![CDATA[30]]></SEQNO>
+<!--8C8A4128A9384B3087CCD1759C603A0B--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->
<ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->
<ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->
<SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->
<ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--8C8A4128A9384B3087CCD1759C603A0B--> <GRID_SEQNO><![CDATA[0]]></GRID_SEQNO>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->
<STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->
<STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->
<ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--8C8A4128A9384B3087CCD1759C603A0B--></AD_FIELD>
<!--8DAAD5774E07425B8B4A46FA3E4A5294--><AD_FIELD>
<!--8DAAD5774E07425B8B4A46FA3E4A5294-->
<AD_FIELD_ID><![CDATA[8DAAD5774E07425B8B4A46FA3E4A5294]]></AD_FIELD_ID>
diff -r 69b54baf8a5a -r f997917b8d11
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-toolbar.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-toolbar.js
Wed Nov 02 17:53:42 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-toolbar.js
Mon Nov 07 11:00:56 2011 +0100
@@ -149,11 +149,6 @@
popup.show();
}});
}
-
- data.push({title: OB.I18N.getLabel('OBUIAPP_RestoreDefaults'),
- doClick: function(standardWindow) {
- OB.Personalization.applyViewDefinition('',
standardWindow.getClass().originalView, standardWindow);
- }});
}
if (data.length === 0) {
diff -r 69b54baf8a5a -r f997917b8d11
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
Wed Nov 02 17:53:42 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
Mon Nov 07 11:00:56 2011 +0100
@@ -1111,8 +1111,6 @@
this.hideShowRightMembers(false);
}
- }
-
var noneOrMultipleRecordsSelected =
currentContext.viewGrid.getSelectedRecords().length !== 1 && !isNew;
if (currentContext.viewGrid.getSelectedRecords()) {
numOfSelRecords = currentContext.viewGrid.getSelectedRecords().length;
diff -r 69b54baf8a5a -r f997917b8d11
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js
---
a/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js
Wed Nov 02 17:53:42 2011 +0100
+++
b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js
Mon Nov 07 11:00:56 2011 +0100
@@ -677,10 +677,6 @@
// between accent or non-accent words
isc.DataSource.addProperties({
- // simple check...
- if (newCriterion === oldCriterion) {
- return 0;
- }
_fieldMatchesFilter: isc.DataSource.getPrototype().fieldMatchesFilter,
fieldMatchesFilter: function(fieldValue, filterValue, requestProperties) {
if (fieldValue && typeof fieldValue === 'string') {
------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
