details:   /erp/devel/int/rev/98c3de1bf8b5
changeset: 6788:98c3de1bf8b5
user:      Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date:      Wed Mar 24 12:44:01 2010 +0530
summary:   Fixes Issue 12547: Goods receipt/goods shipment windows: Document 
type fields is not updated.

details:   /erp/devel/int/rev/5abe3a478c15
changeset: 6789:5abe3a478c15
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Wed Mar 24 09:11:14 2010 +0100
summary:   fixed bug 12713: It is not possible the change the order of menu 
entries

details:   /erp/devel/int/rev/f7108cede543
changeset: 6790:f7108cede543
user:      Antonio Moreno <antonio.moreno <at> openbravo.com>
date:      Wed Mar 24 10:15:00 2010 +0100
summary:   Related to issue 11971. Improved the log: now a diff of the two 
versions of the function or trigger will be shown, so that the developer knows 
more precisely what he needs to fix.

details:   /erp/devel/int/rev/5ff20b98e8d7
changeset: 6791:5ff20b98e8d7
user:      Balamurugan Ramadoss <balamurugan.ramadoss <at> openbravo.com>
date:      Wed Mar 24 16:10:19 2010 +0530
summary:   Fixes Issue 12589: Remove AD_ORG_ID from the constraint

diffstat:

 src-db/database/lib/dbsourcemanager.jar                        |    0 
 src-db/database/model/tables/C_BP_VENDOR_ACCT.xml              |    1 -
 src-db/database/sourcedata/AD_COLUMN.xml                       |    2 +-
 src/org/openbravo/erpCommon/utility/WindowTreeChecks_data.xsql |   14 +++++----
 src/org/openbravo/erpCommon/utility/WindowTree_data.xsql       |   10 +++++-
 5 files changed, 17 insertions(+), 10 deletions(-)

diffs (85 lines):

diff -r 14059ea054bb -r 5ff20b98e8d7 src-db/database/lib/dbsourcemanager.jar
Binary file src-db/database/lib/dbsourcemanager.jar has changed
diff -r 14059ea054bb -r 5ff20b98e8d7 
src-db/database/model/tables/C_BP_VENDOR_ACCT.xml
--- a/src-db/database/model/tables/C_BP_VENDOR_ACCT.xml Tue Mar 23 17:15:36 
2010 +0100
+++ b/src-db/database/model/tables/C_BP_VENDOR_ACCT.xml Wed Mar 24 16:10:19 
2010 +0530
@@ -81,7 +81,6 @@
       <unique name="C_BP_VENDOR_ACCT_ACCTSCHEMA_UN">
         <unique-column name="C_ACCTSCHEMA_ID"/>
         <unique-column name="C_BPARTNER_ID"/>
-        <unique-column name="AD_ORG_ID"/>
         <unique-column name="STATUS"/>
       </unique>
       <check name="C_BP_VENDOR_ACC_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 
'N')]]></check>
diff -r 14059ea054bb -r 5ff20b98e8d7 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml  Tue Mar 23 17:15:36 2010 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml  Wed Mar 24 16:10:19 2010 +0530
@@ -58812,7 +58812,7 @@
 <!--3792-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--3792-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--3792-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--3792-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--3792-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
 <!--3792-->  <READONLYLOGIC><![cda...@processed@='Y']]></READONLYLOGIC>
 <!--3792-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--3792-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
diff -r 14059ea054bb -r 5ff20b98e8d7 
src/org/openbravo/erpCommon/utility/WindowTreeChecks_data.xsql
--- a/src/org/openbravo/erpCommon/utility/WindowTreeChecks_data.xsql    Tue Mar 
23 17:15:36 2010 +0100
+++ b/src/org/openbravo/erpCommon/utility/WindowTreeChecks_data.xsql    Wed Mar 
24 16:10:19 2010 +0530
@@ -12,7 +12,7 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2001-2009 Openbravo SLU 
+ * All portions are Copyright (C) 2001-2010 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -52,13 +52,15 @@
         <Parameter name="node"/>        
    </SqlMethod>
    
-      <SqlMethod name="isMenuItemInDev" type="preparedStatement" 
return="boolean">
+    <SqlMethod name="isMenuItemInDev" type="preparedStatement" 
return="boolean">
       <Sql>
         SELECT COUNT(*)
-          FROM AD_MENU M, AD_MODULE O
-         WHERE AD_MENU_ID = ?
-           AND O.AD_MODULE_ID = M.AD_MODULE_ID
-           AND O.ISINDEVELOPMENT='Y'
+          FROM AD_MENU M, AD_MODULE O, AD_MODULE t
+         WHERE (AD_MENU_ID = ?
+                AND O.AD_MODULE_ID = M.AD_MODULE_ID
+                AND O.ISINDEVELOPMENT='Y')
+            OR (t.type='T'
+                AND t.isindevelopment='Y')
       </Sql>
       <Parameter name="nodeId"/>  
    </SqlMethod>
diff -r 14059ea054bb -r 5ff20b98e8d7 
src/org/openbravo/erpCommon/utility/WindowTree_data.xsql
--- a/src/org/openbravo/erpCommon/utility/WindowTree_data.xsql  Tue Mar 23 
17:15:36 2010 +0100
+++ b/src/org/openbravo/erpCommon/utility/WindowTree_data.xsql  Wed Mar 24 
16:10:19 2010 +0530
@@ -28,7 +28,10 @@
       <SqlMethodComment></SqlMethodComment>
       <Sql>
         SELECT tn.Node_ID,tn.Parent_ID,tn.SeqNo,tb.IsActive, m.AD_Menu_ID AS 
ID, m.Name,m.Description,m.IsSummary,
-        m.Action, m.AD_Window_ID, m.AD_Process_ID, m.AD_Form_ID, 
m.AD_Workflow_ID, m.AD_Task_ID, Mo.ISINDEVELOPMENT, 
+        m.Action, m.AD_Window_ID, m.AD_Process_ID, m.AD_Form_ID, 
m.AD_Workflow_ID, m.AD_Task_ID, 
+        (case when (select count(*) from ad_module where type='T' and 
isindevelopment='Y')=0 
+               then Mo.ISINDEVELOPMENT 
+               else 'Y' end) as isInDevelopment, 
         '' as IsReady, '' as AD_OrgType_ID
         FROM AD_TreeNode tn left join AD_TreeBar tb on 
tn.AD_Tree_ID=tb.AD_Tree_ID 
                                                   AND tn.Node_ID=tb.Node_ID 
@@ -51,7 +54,10 @@
       <Sql>
         SELECT tn.Node_ID,tn.Parent_ID,tn.SeqNo,tb.IsActive, m.AD_Menu_ID AS 
ID, 
                COALESCE (t.Name, m.Name) as name,t.Description,m.IsSummary,
-        m.Action, m.AD_Window_ID, m.AD_Process_ID, m.AD_Form_ID, 
m.AD_Workflow_ID, m.AD_Task_ID, Mo.ISINDEVELOPMENT
+        m.Action, m.AD_Window_ID, m.AD_Process_ID, m.AD_Form_ID, 
m.AD_Workflow_ID, m.AD_Task_ID,
+        (case when (select count(*) from ad_module where type='T' and 
isindevelopment='Y')=0 
+               then Mo.ISINDEVELOPMENT 
+               else 'Y' end) as isInDevelopment
         FROM AD_TreeNode tn left join AD_TreeBar tb on 
tn.AD_Tree_ID=tb.AD_Tree_ID  
                                                       AND tn.Node_ID=tb.Node_ID
                                                       AND tb.AD_User_ID  = ? , 

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to