[RTL] Merge from pi
authorDavid Baz Fayos <david.baz@openbravo.com>
Mon, 16 Apr 2012 16:10:21 +0200
changeset 16318 e348c955afdb
parent 16317 e1b92495cae8 (current diff)
parent 16095 f96fec27dd9a (diff)
child 16319 98ca96d22dcd
[RTL] Merge from pi
--- a/.hgsigs	Mon Apr 16 15:54:26 2012 +0200
+++ b/.hgsigs	Mon Apr 16 16:10:21 2012 +0200
@@ -62,4 +62,5 @@
 4f5fd4acb98e5fb7ef587debb5ffd20487e2bb32 0 iEYEABECAAYFAk9CRa4ACgkQCX/oGf+2qkPC4ACeJ5HQ20QAW0ULMU/+SUGJvz9YNEYAoJwLMrqwWkt3GuJFyp7TwpULPeKu
 cab708e2de98b574cc10f344845b7dff184080b6 0 iEYEABECAAYFAk9Pi+oACgkQCX/oGf+2qkP4kwCfT5nGx/E4gn7sZh+d7L5/9JpcplwAoJ5C4WwVNpNaO+tNEx8oMlqdu8mc
 1856e02fc5e0e515a31c939ebc0372303e692a0f 0 iEYEABECAAYFAk90jY0ACgkQCX/oGf+2qkOxtwCg6Cng1h29qYq7oA8b4mj3KPVMKgkAoLZP6fhub1DNQGEn8zjCEXIRt1Mi
+17bc2224a41a30d10472bd14581378201c1ca44b 0 iEYEABECAAYFAk+IHlMACgkQCX/oGf+2qkM3MACgoR2lLVuhzaAg2v0PAHTOsvCgEIoAoP5uBTyNv/CqYuf+XIwD6F9nxa+y
 ec66c54fad7f8821269266cd7de52b09a423cdae 0 iEYEABECAAYFAk99aVgACgkQCX/oGf+2qkOiDwCg+Ne5Dp5L0X34APNzA7rBeCmZVsQAoJ5AU9K9+Dhn7iuBHVyTisbUJ/oC
--- a/.hgtags	Mon Apr 16 15:54:26 2012 +0200
+++ b/.hgtags	Mon Apr 16 16:10:21 2012 +0200
@@ -74,3 +74,4 @@
 b625648e103ef1d0ae41eff56c9a1e33877e53f9 3.0MP8.2
 952c381e3ada4a4e3511782945d3aa66e09a697e 3.0MP9
 00280ab1ed3ab01d41ed048ccd01694af1223341 3.0MP10
+4a4cc349c6babb0d72149613cc3e4988427ee0ff 3.0MP10.1
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js	Mon Apr 16 15:54:26 2012 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js	Mon Apr 16 16:10:21 2012 +0200
@@ -316,6 +316,16 @@
       return;
     }
 
+    if (criterion.operator === 'isNull') {
+      this.setValue('#');
+      return;
+    }
+
+    if (criterion.operator === 'notNull') {
+      this.setValue('!#');
+      return;
+    }
+
     if (criterion.operator === 'equals') {
       this.setSingleDateValue(criterion.value);
       return;
@@ -331,6 +341,19 @@
   },
 
   getCriterion: function () {
+    var value = this.blurValue();
+    if (value === '#') {
+      return {
+        fieldName: this.name,
+        operator: 'isNull'
+      };
+    }
+    if (value === '!#') {
+      return {
+        fieldName: this.name,
+        operator: 'notNull'
+      };
+    }
     if (this.singleDateValue) {
       return {
         fieldName: this.name,
@@ -343,6 +366,10 @@
   },
 
   canEditCriterion: function (criterion) {
+
+    if (criterion.fieldName === this.name && (criterion.operator === 'isNull' || criterion.operator === 'notNull')) {
+      return true;
+    }
     if (this.singleDateMode && criterion.fieldName === this.name) {
       return true;
     }
--- a/src-db/database/sourcedata/AD_MENU.xml	Mon Apr 16 15:54:26 2012 +0200
+++ b/src-db/database/sourcedata/AD_MENU.xml	Mon Apr 16 16:10:21 2012 +0200
@@ -3995,7 +3995,7 @@
 <!--800282-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--800282-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--800282-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--800282-->  <NAME><![CDATA[Stock for open orders]]></NAME>
+<!--800282-->  <NAME><![CDATA[Stock for Open Orders]]></NAME>
 <!--800282-->  <DESCRIPTION><![CDATA[Show the lines of the pending orders with the actual stock of each product.]]></DESCRIPTION>
 <!--800282-->  <ISSUMMARY><![CDATA[N]]></ISSUMMARY>
 <!--800282-->  <ACTION><![CDATA[R]]></ACTION>
--- a/src-db/database/sourcedata/AD_PROCESS.xml	Mon Apr 16 15:54:26 2012 +0200
+++ b/src-db/database/sourcedata/AD_PROCESS.xml	Mon Apr 16 16:10:21 2012 +0200
@@ -4800,7 +4800,7 @@
 <!--800198-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--800198-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--800198-->  <VALUE><![CDATA[RV_ReportPendingProductionJr]]></VALUE>
-<!--800198-->  <NAME><![CDATA[Stock for open orders]]></NAME>
+<!--800198-->  <NAME><![CDATA[Stock for Open Orders]]></NAME>
 <!--800198-->  <DESCRIPTION><![CDATA[Show the lines of the pending orders with the actual stock of each product.]]></DESCRIPTION>
 <!--800198-->  <HELP><![CDATA[Show the lines of the pending orders with the actual stock of each product.]]></HELP>
 <!--800198-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>