details: https://code.openbravo.com/erp/devel/pi/rev/90498bc4ff7c changeset: 15559:90498bc4ff7c user: Martin Taal <martin.taal <at> openbravo.com> date: Wed Feb 22 09:35:39 2012 +0100 summary: Related to issue 19689: It is not possible to change Role twice in a row Removed delayed call of start application Upgraded lab js, removed not-needed call to set defaults, appendTo is not supported anymore by lab js
details: https://code.openbravo.com/erp/devel/pi/rev/aeb1f4a8bfed changeset: 15560:aeb1f4a8bfed user: Martin Taal <martin.taal <at> openbravo.com> date: Wed Feb 22 09:49:00 2012 +0100 summary: Related to issue 18557: Filter Expression: comparing to other field (column) values Hide the error message if a new filter action takes place details: https://code.openbravo.com/erp/devel/pi/rev/3fc7ae15ab4f changeset: 15561:3fc7ae15ab4f user: Martin Taal <martin.taal <at> openbravo.com> date: Wed Feb 22 09:49:56 2012 +0100 summary: Merged heads details: https://code.openbravo.com/erp/devel/pi/rev/6289860471ca changeset: 15562:6289860471ca user: Martin Taal <martin.taal <at> openbravo.com> date: Wed Feb 22 09:54:57 2012 +0100 summary: Related to issue 18557: Filter Expression: comparing to other field (column) values Hide message if grid is filtered diffstat: modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 12 ++ modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 5 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js | 8 +- modules/org.openbravo.client.kernel/web/org.openbravo.client.kernel/js/LAB.min.js | 4 +- src-db/database/model/functions/AD_PARENT_MENU_ELEMENT.xml | 4 +- src-db/database/model/functions/C_VALIDCOMBINATION_CLONE.xml | 38 ++++---- src-db/database/model/functions/M_INOUT_POST.xml | 41 ---------- src-db/database/model/postscript-PostgreSql.sql | 2 +- src/index.jsp | 9 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql | 22 ++-- src/org/openbravo/erpCommon/obps/licenseRestrictions | 2 +- 11 files changed, 59 insertions(+), 88 deletions(-) diffs (truncated from 301 to 300 lines): diff -r 8e3bca6e8153 -r 6289860471ca modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Mon Feb 20 23:53:10 2012 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Wed Feb 22 09:54:57 2012 +0100 @@ -299,6 +299,18 @@ return ret; }, + clearFilter: function() { + // hide the messagebar + this.view.messageBar.hide(); + this.Super('clearFilter', arguments); + }, + + filterEditorSubmit: function() { + // hide the messagebar + this.view.messageBar.hide(); + this.Super('filterEditorSubmit', arguments); + }, + // destroy the context menu also // see why this needs to be done in the // documentation of canvas.contextMenu in Canvas.js diff -r 8e3bca6e8153 -r 6289860471ca modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js Mon Feb 20 23:53:10 2012 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js Wed Feb 22 09:54:57 2012 +0100 @@ -96,6 +96,11 @@ this.orderByClause = this.gridProperties.orderByClause; + this.checkboxFieldDefaults = isc.addProperties(this.checkboxFieldDefaults, { + canFilter: true, + filterEditorType: 'StaticTextItem' + }); + this.Super('initWidget', arguments); }, diff -r 8e3bca6e8153 -r 6289860471ca modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js Mon Feb 20 23:53:10 2012 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js Wed Feb 22 09:54:57 2012 +0100 @@ -85,7 +85,6 @@ // obuiapp_process definition if (this.newDefinition) { - me.setDisabled(true); // To avoid button could be clicked twice callbackFunction = function () { standardWindow.openProcess({ processId: me.processId, @@ -94,10 +93,13 @@ actionHandler: me.command, buttons: me.labelValue }); - me.setDisabled(false); // Activate again the button + me.opening = false; // Activate again the button }; - theView.setContextInfo(sessionProperties, callbackFunction, true); + if (!me.opening) { + me.opening = true; // To avoid button could be clicked twice + theView.setContextInfo(sessionProperties, callbackFunction, true); + } return; } diff -r 8e3bca6e8153 -r 6289860471ca modules/org.openbravo.client.kernel/web/org.openbravo.client.kernel/js/LAB.min.js --- a/modules/org.openbravo.client.kernel/web/org.openbravo.client.kernel/js/LAB.min.js Mon Feb 20 23:53:10 2012 +0100 +++ b/modules/org.openbravo.client.kernel/web/org.openbravo.client.kernel/js/LAB.min.js Wed Feb 22 09:54:57 2012 +0100 @@ -1,5 +1,5 @@ /*! LAB.js (LABjs :: Loading And Blocking JavaScript) - v1.2.0 (c) Kyle Simpson + v2.0.3 (c) Kyle Simpson MIT License */ -(function(p){var q="string",w="head",L="body",M="script",u="readyState",j="preloaddone",x="loadtrigger",N="srcuri",E="preload",Z="complete",y="done",z="which",O="preserve",F="onreadystatechange",ba="onload",P="hasOwnProperty",bb="script/cache",Q="[object ",bw=Q+"Function]",bx=Q+"Array]",e=null,h=true,i=false,k=p.document,bc=p.location,bd=p.ActiveXObject,A=p.setTimeout,be=p.clearTimeout,R=function(a){return k.getElementsByTagName(a)},S=Object.prototype.toString,G=function(){},r={},T={},bf=/^[^?#]*\//.exec(bc.href)[0],bg=/^\w+\:\/\/\/?[^\/]+/.exec(bf)[0],by=R(M),bh=p.opera&&S.call(p.opera)==Q+"Opera]",bi=("MozAppearance"in k.documentElement.style),bj=(k.createElement(M).async===true),v={cache:!(bi||bh),order:bi||bh||bj,xhr:h,dupe:h,base:"",which:w};v[O]=i;v[E]=h;r[w]=k.head||R(w);r[L]=R(L);function B(a){return S.call(a)===bw}function U(a,b){var c=/^\w+\:\/\//,d;if(typeof a!=q)a="";if(typeof b!=q)b="";d=((/^\/\//.test(a))?bc.protocol:"")+a;d=(c.test(d)?"":b)+d;return((c.test(d)?"":(d.charAt(0)==="/"?bg:bf))+d)}function bz(a){return(U(a).indexOf(bg)===0)}function bA(a){var b,c=-1;while(b=by[++c]){if(typeof b.src==q&&a===U(b.src)&&b.type!==bb)return h}return i}function H(t,l){t=!(!t);if(l==e)l=v;var bk=i,C=t&&l[E],bl=C&&l.cache,I=C&&l.order,bm=C&&l.xhr,bB=l[O],bC=l.which,bD=l.base,bn=G,J=i,D,s=h,m={},K=[],V=e;C=bl||bm||I;function bo(a,b){if((a[u]&&a[u]!==Z&&a[u]!=="loaded")||b[y]){return i}a[ba]=a[F]=e;return h}function W(a,b,c){c=!(!c);if(!c&&!(bo(a,b)))return;b[y]=h;for(var d in m){if(m[P](d)&&!(m[d][y]))return}bk=h;bn()}function bp(a){if(B(a[x])){a[x]();a[x]=e}}function bE(a,b){if(!bo(a,b))return;b[j]=h;A(function(){r[b[z]].removeChild(a);bp(b)},0)}function bF(a,b){if(a[u]===4){a[F]=G;b[j]=h;A(function(){bp(b)},0)}}function X(b,c,d,g,f,n){var o=b[z];A(function(){if("item"in r[o]){if(!r[o][0]){A(arguments.callee,25);return}r[o]=r[o][0]}var a=k.createElement(M);if(typeof d==q)a.type=d;if(typeof g==q)a.charset=g;if(B(f)){a[ba]=a[F]=function(){f(a,b)};a.src=c;if(bj){a.async=i}}r[o].insertBefore(a,(o===w?r[o].firstChild:e));if(typeof n==q){a.text=n;W(a,b,h)}},0)}function bq(a,b,c,d){T[a[N]]=h;X(a,b,c,d,W)}function br(a,b,c,d){var g=arguments;if(s&&a[j]==e){a[j]=i;X(a,b,bb,d,bE)}else if(!s&&a[j]!=e&&!a[j]){a[x]=function(){br.apply(e,g)}}else if(!s){bq.apply(e,g)}}function bs(a,b,c,d){var g=arguments,f;if(s&&a[j]==e){a[j]=i;f=a.xhr=(bd?new bd("Microsoft.XMLHTTP"):new p.XMLHttpRequest());f[F]=function(){bF(f,a)};f.open("GET",b);f.send("")}else if(!s&&a[j]!=e&&!a[j]){a[x]=function(){bs.apply(e,g)}}else if(!s){T[a[N]]=h;X(a,b,c,d,e,a.xhr.responseText);a.xhr=e}}function bt(a){if(typeof a=="undefined"||!a)return;if(a.allowDup==e)a.allowDup=l.dupe;var b=a.src,c=a.type,d=a.charset,g=a.allowDup,f=U(b,bD),n,o=bz(f);if(typeof d!=q)d=e;g=!(!g);if(!g&&((T[f]!=e)||(s&&m[f])||bA(f))){if(m[f]!=e&&m[f][j]&&!m[f][y]&&o){W(e,m[f],h)}return}if(m[f]==e)m[f]={};n=m[f];if(n[z]==e)n[z]=bC;n[y]=i;n[N]=f;J=h;if(!I&&bm&&o)bs(n,f,c,d);else if(!I&&bl)br(n,f,c,d);else bq(n,f,c,d)}function Y(a){if(t&&!I)K.push(a);if(!t||C)a()}function bu(a){var b=[],c;for(c=-1;++c<a.length;){if(S.call(a[c])===bx)b=b.concat(bu(a[c]));else b[b.length]=a[c]}return b}D={script:function(){be(V);var a=bu(arguments),b=D,c;if(bB){for(c=-1;++c<a.length;){if(B(a[c]))a[c]=a[c]();if(c===0){Y(function(){bt((typeof a[0]==q)?{src:a[0]}:a[0])})}else b=b.script(a[c]);b=b.wait()}}else{for(c=-1;++c<a.length;){if(B(a[c]))a[c]=a[c]()}Y(function(){for(c=-1;++c<a.length;){bt((typeof a[c]==q)?{src:a[c]}:a[c])}})}V=A(function(){s=i},5);return b},wait:function(a){be(V);s=i;if(!B(a))a=G;var b=H(t||J,l),c=b.trigger,d=function(){try{a()}catch(err){}c()};delete b.trigger;var g=function(){if(J&&!bk)bn=d;else d()};if(t&&!J)K.push(g);else Y(g);return b}};if(t){D.trigger=function(){var a,b=-1;while(a=K[++b])a();K=[]}}else D.trigger=G;return D}function bv(a){var b,c={},d={"UseCachePreload":"cache","UseLocalXHR":"xhr","UsePreloading":E,"AlwaysPreserveOrder":O,"AllowDuplicates":"dupe"},g={"AppendTo":z,"BasePath":"base"};for(b in d)g[b]=d[b];c.order=!(!v.order);for(b in g){if(g[P](b)&&v[g[b]]!=e)c[g[b]]=(a[b]!=e)?a[b]:v[g[b]]}for(b in d){if(d[P](b))c[d[b]]=!(!c[d[b]])}if(!c[E])c.cache=c.order=c.xhr=i;c.which=(c.which===w||c.which===L)?c.which:w;return c}p.$LAB={setGlobalDefaults:function(a){v=bv(a)},setOptions:function(a){return H(i,bv(a))},script:function(){return H().script.apply(e,arguments)},wait:function(){return H().wait.apply(e,arguments)}};(function(a,b,c){if(k[u]==e&&k[a]){k[u]="loading";k[a](b,c=function(){k.removeEventListener(b,c,i);k[u]=Z},i)}})("addEventListener","DOMContentLoaded")})(window); \ No newline at end of file +(function(o){var K=o.$LAB,y="UseLocalXHR",z="AlwaysPreserveOrder",u="AllowDuplicates",A="CacheBust",B="BasePath",C=/^[^?#]*\//.exec(location.href)[0],D=/^\w+\:\/\/\/?[^\/]+/.exec(C)[0],i=document.head||document.getElementsByTagName("head"),L=(o.opera&&Object.prototype.toString.call(o.opera)=="[object Opera]")||("MozAppearance"in document.documentElement.style),q=document.createElement("script"),E=typeof q.preload=="boolean",r=E||(q.readyState&&q.readyState=="uninitialized"),F=!r&&q.async===true,M=!r&&!F&&!L;function G(a){return Object.prototype.toString.call(a)=="[object Function]"}function H(a){return Object.prototype.toString.call(a)=="[object Array]"}function N(a,c){var b=/^\w+\:\/\//;if(/^\/\/\/?/.test(a)){a=location.protocol+a}else if(!b.test(a)&&a.charAt(0)!="/"){a=(c||"")+a}return b.test(a)?a:((a.charAt(0)=="/"?D:C)+a)}function s(a,c){for(var b in a){if(a.hasOwnProperty(b)){c[b]=a[b]}}return c}function O(a){var c=false;for(var b=0;b<a.scripts.length;b++){if(a.scripts[b].ready&&a.scripts[b].exec_trigger){c=true;a.scripts[b].exec_trigger();a.scripts[b].exec_trigger=null}}return c}function t(a,c,b,d){a.onload=a.onreadystatechange=function(){if((a.readyState&&a.readyState!="complete"&&a.readyState!="loaded")||c[b])return;a.onload=a.onreadystatechange=null;d()}}function I(a){a.ready=a.finished=true;for(var c=0;c<a.finished_listeners.length;c++){a.finished_listeners[c]()}a.ready_listeners=[];a.finished_listeners=[]}function P(d,f,e,g,h){setTimeout(function(){var a,c=f.real_src,b;if("item"in i){if(!i[0]){setTimeout(arguments.callee,25);return}i=i[0]}a=document.createElement("script");if(f.type)a.type=f.type;if(f.charset)a.charset=f.charset;if(h){if(r){e.elem=a;if(E){a.preload=true;a.onpreload=g}else{a.onreadystatechange=function(){if(a.readyState=="loaded")g()}}a.src=c}else if(h&&c.indexOf(D)==0&&d[y]){b=new XMLHttpRequest();b.onreadystatechange=function(){if(b.readyState==4){b.onreadystatechange=function(){};e.text=b.responseText+"\n//@ sourceURL="+c;g()}};b.open("GET",c);b.send()}else{a.type="text/cache-script";t(a,e,"ready",function(){i.removeChild(a);g()});a.src=c;i.insertBefore(a,i.firstChild)}}else if(F){a.async=false;t(a,e,"finished",g);a.src=c;i.insertBefore(a,i.firstChild)}else{t(a,e,"finished",g);a.src=c;i.insertBefore(a,i.firstChild)}},0)}function J(){var l={},Q=r||M,n=[],p={},m;l[y]=true;l[z]=false;l[u]=false;l[A]=false;l[B]="";function R(a,c,b){var d;function f(){if(d!=null){d=null;I(b)}}if(p[c.src].finished)return;if(!a[u])p[c.src].finished=true;d=b.elem||document.createElement("script");if(c.type)d.type=c.type;if(c.charset)d.charset=c.charset;t(d,b,"finished",f);if(b.elem){b.elem=null}else if(b.text){d.onload=d.onreadystatechange=null;d.text=b.text}else{d.src=c.real_src}i.insertBefore(d,i.firstChild);if(b.text){f()}}function S(c,b,d,f){var e,g,h=function(){b.ready_cb(b,function(){R(c,b,e)})},j=function(){b.finished_cb(b,d)};b.src=N(b.src,c[B]);b.real_src=b.src+(c[A]?((/\?.*$/.test(b.src)?"&_":"?_")+~~(Math.random()*1E9)+"="):"");if(!p[b.src])p[b.src]={items:[],finished:false};g=p[b.src].items;if(c[u]||g.length==0){e=g[g.length]={ready:false,finished:false,ready_listeners:[h],finished_listeners:[j]};P(c,b,e,((f)?function(){e.ready=true;for(var a=0;a<e.ready_listeners.length;a++){e.ready_listeners[a]()}e.ready_listeners=[]}:function(){I(e)}),f)}else{e=g[0];if(e.finished){j()}else{e.finished_listeners.push(j)}}}function v(){var e,g=s(l,{}),h=[],j=0,w=false,k;function T(a,c){a.ready=true;a.exec_trigger=c;x()}function U(a,c){a.ready=a.finished=true;a.exec_trigger=null;for(var b=0;b<c.scripts.length;b++){if(!c.scripts[b].finished)return}c.finished=true;x()}function x(){while(j<h.length){if(G(h[j])){try{h[j++]()}catch(err){}continue}else if(!h[j].finished){if(O(h[j]))continue;break}j++}if(j==h.length){w=false;k=false}}function V(){if(!k||!k.scripts){h.push(k={scripts:[],finished:true})}}e={script:function(){for(var f=0;f<arguments.length;f++){(function(a,c){var b;if(!H(a)){c=[a]}for(var d=0;d<c.length;d++){V();a=c[d];if(G(a))a=a();if(!a)continue;if(H(a)){b=[].slice.call(a);b.unshift(d,1);[].splice.apply(c,b);d--;continue}if(typeof a=="string")a={src:a};a=s(a,{ready:false,ready_cb:T,finished:false,finished_cb:U});k.finished=false;k.scripts.push(a);S(g,a,k,(Q&&w));w=true;if(g[z])e.wait()}})(arguments[f],arguments[f])}return e},wait:function(){if(arguments.length>0){for(var a=0;a<arguments.length;a++){h.push(arguments[a])}k=h[h.length-1]}else k=false;x();return e}};return{script:e.script,wait:e.wait,setOptions:function(a){s(a,g);return e}}}m={setGlobalDefaults:function(a){s(a,l);return m},setOptions:function(){return v().setOptions.apply(null,arguments)},script:function(){return v().script.apply(null,arguments)},wait:function(){return v().wait.apply(null,arguments)},queueScript:function(){n[n.length]={type:"script",args:[].slice.call(arguments)};return m},queueWait:function(){n[n.length]={type:"wait",args:[].slice.call(arguments)};return m},runQueue:function(){var a=m,c=n.length,b=c,d;for(;--b>=0;){d=n.shift();a=a[d.type].apply(null,d.args)}return a},noConflict:function(){o.$LAB=K;return m},sandbox:function(){return J()}};return m}o.$LAB=J();(function(a,c,b){if(document.readyState==null&&document[a]){document.readyState="loading";document[a](c,b=function(){document.removeEventListener(c,b,false);document.readyState="complete"},false)}})("addEventListener","DOMContentLoaded")})(this); \ No newline at end of file diff -r 8e3bca6e8153 -r 6289860471ca src-db/database/model/functions/AD_PARENT_MENU_ELEMENT.xml --- a/src-db/database/model/functions/AD_PARENT_MENU_ELEMENT.xml Mon Feb 20 23:53:10 2012 +0100 +++ b/src-db/database/model/functions/AD_PARENT_MENU_ELEMENT.xml Wed Feb 22 09:54:57 2012 +0100 @@ -30,8 +30,8 @@ * Title: Return 'Org Level' if orgID is a leaf of the org tree * where parentOrgID is the root. Else return -1 ************************************************************************/ - v_treeID varchar2(32) ; - v_Parent varchar(32) ; --OBTG:varchar2-- + v_treeID VARCHAR(32) ; + v_Parent VARCHAR(32) ; v_Name VARCHAR2(1000) ; BEGIN SELECT MAX(AD_TREE_MENU_ID) diff -r 8e3bca6e8153 -r 6289860471ca src-db/database/model/functions/C_VALIDCOMBINATION_CLONE.xml --- a/src-db/database/model/functions/C_VALIDCOMBINATION_CLONE.xml Mon Feb 20 23:53:10 2012 +0100 +++ b/src-db/database/model/functions/C_VALIDCOMBINATION_CLONE.xml Wed Feb 22 09:54:57 2012 +0100 @@ -35,27 +35,27 @@ * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ - v_Node_ID VARCHAR(32) :=null; --OBTG:varchar2-- - v_AD_TREE_ID VARCHAR(32) :=null; --OBTG:varchar2-- - v_PARENT_ID VARCHAR(32) :=null; --OBTG:varchar2-- + v_Node_ID VARCHAR(32) :=null; + v_AD_TREE_ID VARCHAR(32) :=null; + v_PARENT_ID VARCHAR(32) :=null; v_SeqNo NUMBER(38); - v_Next_Sequence_No VARCHAR(32) :=null; --OBTG:varchar2-- - v_Account_No VARCHAR(32) :=null; --OBTG:varchar2-- - v_Acct_No_For_SubAccount VARCHAR(32) :=null; --OBTG:varchar2-- - v_Subacct_No VARCHAR(32) :=null; --OBTG:varchar2-- - v_New_SubAccount_No VARCHAR(32) :=null; --OBTG:varchar2-- - v_Default_Account_No VARCHAR(32) :=null; --OBTG:varchar2-- - v_Seq_No_For_Subaccount_No VARCHAR(32) :=null; --OBTG:varchar2-- - v_Default_Account_Name VARCHAR(60) :=null; --OBTG:varchar2-- - v_Default_Account_Desc CHARACTER VARYING(255); --OBTG:varchar2-- - v_Default_Account_Client_ID VARCHAR(32); --OBTG:varchar2-- - v_Org_ID VARCHAR(32); --OBTG:varchar2-- - v_Account_ID VARCHAR(32); --OBTG:varchar2-- - v_seq_name CHARACTER VARYING(255); --OBTG:varchar2-- - v_C_AcctSchema_ID VARCHAR(32) :=null; --OBTG:varchar2-- + v_Next_Sequence_No VARCHAR(32) :=null; + v_Account_No VARCHAR(32) :=null; + v_Acct_No_For_SubAccount VARCHAR(32) :=null; + v_Subacct_No VARCHAR(32) :=null; + v_New_SubAccount_No VARCHAR(32) :=null; + v_Default_Account_No VARCHAR(32) :=null; + v_Seq_No_For_Subaccount_No VARCHAR(32) :=null; + v_Default_Account_Name VARCHAR(60) :=null; + v_Default_Account_Desc CHARACTER VARYING(255); + v_Default_Account_Client_ID VARCHAR(32); + v_Org_ID VARCHAR(32); + v_Account_ID VARCHAR(32); + v_seq_name CHARACTER VARYING(255); + v_C_AcctSchema_ID VARCHAR(32) :=null; v_UpdateSequence CHAR; - tmp_Subaccout_no VARCHAR(32) :=null; --OBTG:varchar2-- - v_C_ElementValue_ID VARCHAR(32) :=null; --OBTG:varchar2-- + tmp_Subaccout_no VARCHAR(32) :=null; + v_C_ElementValue_ID VARCHAR(32) :=null; v_Exist NUMBER; BEGIN diff -r 8e3bca6e8153 -r 6289860471ca src-db/database/model/functions/M_INOUT_POST.xml --- a/src-db/database/model/functions/M_INOUT_POST.xml Mon Feb 20 23:53:10 2012 +0100 +++ b/src-db/database/model/functions/M_INOUT_POST.xml Wed Feb 22 09:54:57 2012 +0100 @@ -516,47 +516,6 @@ END IF; END IF; -- Close Shipment - --Entry in Match Invoices - FOR Cur_MILines IN - (SELECT sl.AD_Client_ID, - sl.AD_Org_ID, - il.C_InvoiceLine_ID, - sl.M_InOutLine_ID, - sl.M_Product_ID, - sl.M_AttributeSetInstance_ID, - sl.MovementQty, - il.QTYINVOICED, - i.DateAcct, - il.IsDescription - FROM M_INOUTLINE sl, - C_INVOICE i, - C_INVOICELINE il - WHERE sl.M_InOutLine_ID=il.M_InOutLine_ID - AND sl.M_InOut_ID=Cur_InOut.M_InOut_ID - AND i.C_INVOICE_ID = il.C_INVOICE_ID - ) - LOOP - --Ad_Sequence_Next('M_MatchInv', Cur_MILines.AD_Org_ID, v_MatchInv_ID) ; - -- The min qty. Modified by Ismael Ciordia - v_Qty:=Cur_MILines.MovementQty; - -- v_ResultStr:='InsertMatchPO ' || v_MatchPO_ID; - INSERT - INTO M_MATCHINV - ( - M_MATCHINV_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE, - CREATED, CREATEDBY, UPDATED, UPDATEDBY, - M_INOUTLINE_ID, C_INVOICELINE_ID, M_PRODUCT_ID, DATETRX, - QTY, PROCESSING, PROCESSED, POSTED - ) - VALUES - ( - GET_UUID(), Cur_MILines.AD_Client_ID, Cur_MILines.AD_Org_ID, 'Y', - now(), v_User, now(), v_User, - Cur_MILines.M_InOutLine_ID, Cur_MILines.C_InvoiceLine_ID, Cur_MILines.M_Product_ID, Cur_MILines.DateAcct, - v_Qty, 'N', 'Y', 'N' - ) - ; - END LOOP; v_ResultStr:='CloseShipment'; UPDATE M_INOUT SET Processed='Y', diff -r 8e3bca6e8153 -r 6289860471ca src-db/database/model/postscript-PostgreSql.sql --- a/src-db/database/model/postscript-PostgreSql.sql Mon Feb 20 23:53:10 2012 +0100 +++ b/src-db/database/model/postscript-PostgreSql.sql Wed Feb 22 09:54:57 2012 +0100 @@ -514,7 +514,7 @@ and activation_key is not null; if v_isObps = 0 then - RAISE EXCEPTION '%', '@OBPSNeededForAudit@' ; --OBTG:-20000-- + RAISE EXCEPTION '%', '@OBPSNeededForAudit@' ; end if; for cur_triggers in (select * diff -r 8e3bca6e8153 -r 6289860471ca src/index.jsp --- a/src/index.jsp Mon Feb 20 23:53:10 2012 +0100 +++ b/src/index.jsp Wed Feb 22 09:54:57 2012 +0100 @@ -136,17 +136,10 @@ </div> <!-- load the rest --> <script type="text/javascript"> -$LAB.setGlobalDefaults({AppendTo: 'body'}); - var isomorphicDir='./web/org.openbravo.userinterface.smartclient/isomorphic/'; // starts the application is called as the last statement in the StaticResources part -function OBStartApplication(delayed) { - // call delayed to take it out of the loading call stack of lab.js - if (!delayed) { - setTimeout('OBStartApplication(true)', 100); - return; - } +function OBStartApplication() { OB.Layout.initialize(); OB.Layout.draw(); OB.Layout.ViewManager.createAddStartTab(); diff -r 8e3bca6e8153 -r 6289860471ca src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql --- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql Mon Feb 20 23:53:10 2012 +0100 +++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql Wed Feb 22 09:54:57 2012 +0100 @@ -296,10 +296,10 @@ <Sql> <![CDATA[ SELECT i.C_Invoice_ID, Ad_Column_Identifier(TO_CHAR('C_Invoice'), TO_CHAR(i.C_Invoice_ID), TO_CHAR(?)) AS NAME, - l.QtyInvoiced-SUM(COALESCE(mi.Qty,0)) AS QTY, l.C_UOM_ID,uom.UOMSymbol, + l.QtyInvoiced-SUM(COALESCE(mi.MOVEMENTQTY,0)) AS QTY, l.C_UOM_ID,uom.UOMSymbol, l.M_Product_ID,p.NAME AS RELATION_NAME, l.C_InvoiceLine_ID,l.Line, l.C_OrderLine_ID, l.C_InvoiceLine_ID AS ID, l.DESCRIPTION AS DESCRIPTION - FROM C_INVOICELINE l left join M_MATCHINV mi on l.C_InvoiceLine_ID=mi.C_InvoiceLine_ID, + FROM C_INVOICELINE l left join M_INOUTLINE mi on l.M_INOUTLINE_ID = mi.M_INOUTLINE_ID, C_INVOICE i, C_UOM uom, M_PRODUCT p WHERE i.C_INVOICE_ID = l.C_INVOICE_ID AND i.AD_Client_ID IN ('1') @@ -309,7 +309,7 @@ AND l.C_Invoice_ID = ? GROUP BY i.C_Invoice_ID, i.DocumentNo, DateInvoiced, GrandTotal, l.QtyInvoiced, l.C_UOM_ID,uom.UOMSymbol,l.M_Product_ID,p.NAME, l.C_InvoiceLine_ID,l.Line,l.C_OrderLine_ID, l.DESCRIPTION - HAVING (l.QtyInvoiced-SUM(COALESCE(mi.Qty,0))) <> 0 + HAVING (l.QtyInvoiced-SUM(COALESCE(mi.MOVEMENTQTY,0))) <> 0 ORDER BY NAME, l.Line ]]> </Sql> @@ -353,11 +353,11 @@ WHERE i.AD_Client_ID IN ('1') AND i.AD_Org_ID IN ('1') AND i.C_BPartner_ID = ? - AND EXISTS (SELECT 1 - FROM C_INVOICELINE l left join M_MATCHINV mi on l.C_InvoiceLine_ID=mi.C_InvoiceLine_ID - WHERE l.C_INVOICE_ID = i.C_INVOICE_ID - GROUP BY l.QtyInvoiced, l.C_InvoiceLine_ID - HAVING (l.QtyInvoiced-SUM(COALESCE(mi.Qty,0))) <> 0 ) + AND EXISTS (SELECT 1 + FROM C_INVOICELINE l LEFT JOIN M_INOUTLINE MI ON l.M_INOUTLINE_ID = MI.M_INOUTLINE_ID + WHERE l.C_INVOICE_ID = i.C_INVOICE_ID + GROUP BY l.C_InvoiceLine_ID ,l.QtyInvoiced + HAVING (l.QtyInvoiced-SUM(COALESCE(mi.MOVEMENTQTY,0))) <> 0 ) ORDER BY NAME ]]> </Sql> @@ -435,13 +435,13 @@ <SqlMethodComment></SqlMethodComment> <Sql> <![CDATA[ - SELECT l.QtyInvoiced-SUM(COALESCE(mi.Qty,0)) AS ID, l.C_UOM_ID,uom.UOMSymbol, + SELECT l.QtyInvoiced-SUM(COALESCE(mi.MOVEMENTQTY,0)) AS ID, l.C_UOM_ID,uom.UOMSymbol, l.M_Product_ID,p.NAME, l.C_InvoiceLine_ID,l.Line, l.C_OrderLine_ID, COALESCE(uom1.BREAKDOWN, 'N') AS BREAKDOWN, MAX(mu.C_UOM_ID) AS C_UOM_ID_Conversion, MAX(uom1.STDPRECISION) AS STDPRECISION, l.QUANTITYORDER, l.M_Product_UOM_ID, l.M_ATTRIBUTESETINSTANCE_ID, l.ad_org_id, l.DESCRIPTION AS DESCRIPTION FROM C_INVOICELINE l left join M_Product_UOM mu on l.M_Product_UOM_ID = mu.M_Product_UOM_ID left join C_UOM uom1 on mu.C_UOM_ID = uom1.C_UOM_ID - left join M_MATCHINV mi on l.C_InvoiceLine_ID=mi.C_InvoiceLine_ID, + left join M_INOUTLINE mi on l.M_INOUTLINE_ID=mi.M_INOUTLINE_ID, C_UOM uom, M_PRODUCT p, C_INVOICE i WHERE l.C_UOM_ID=uom.C_UOM_ID AND i.c_invoice_id = l.c_invoice_id @@ -450,7 +450,7 @@ GROUP BY l.QtyInvoiced, l.C_UOM_ID,uom.UOMSymbol,l.M_Product_ID,p.NAME, l.C_InvoiceLine_ID,l.Line,l.C_OrderLine_ID, uom1.BREAKDOWN, l.QUANTITYORDER, l.M_Product_UOM_ID, l.M_ATTRIBUTESETINSTANCE_ID, l.ad_org_id, l.DESCRIPTION - HAVING l.QtyInvoiced-SUM(COALESCE(mi.Qty,0))<>0 + HAVING l.QtyInvoiced-SUM(COALESCE(mi.MOVEMENTQTY,0))<>0 ORDER BY l.Line ]]> </Sql> diff -r 8e3bca6e8153 -r 6289860471ca src/org/openbravo/erpCommon/obps/licenseRestrictions --- a/src/org/openbravo/erpCommon/obps/licenseRestrictions Mon Feb 20 23:53:10 2012 +0100 +++ b/src/org/openbravo/erpCommon/obps/licenseRestrictions Wed Feb 22 09:54:57 2012 +0100 @@ -1,1 +1,1 @@ -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 \ No newline at end of file +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 ------------------------------------------------------------------------------ Virtualization & Cloud Management Using Capacity Planning Cloud computing makes use of virtualization - but cloud computing also focuses on allowing computing to be delivered as a service. http://www.accelacomm.com/jaw/sfnl/114/51521223/ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
