From 16b9db4b6f173e5f4e5dd6d09efcb6202dd621f2 Mon Sep 17 00:00:00 2001
From: qdp <qdp@tinyerp.com>
Date: Fri, 29 Aug 2008 13:37:52 +0200
Subject: [PATCH 1/2] *removed active field from account_move_line, part 2

bzr revid: qdp@tinyerp.com-20080829113752-fm2m0jwfwyqp2e3g
---
 addons/account/account_move_line.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index a2c61859582..5878253d82c 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -52,9 +52,9 @@ class account_move_line(osv.osv):
 
         if context.get('periods', False):
             ids = ','.join([str(x) for x in context['periods']])
-            return obj+".active AND "+obj+".state<>'draft' AND "+obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id in (%s) AND id in (%s)) %s" % (fiscalyear_clause, ids,where_move_state)
+            return obj+".state<>'draft' AND "+obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id in (%s) AND id in (%s)) %s" % (fiscalyear_clause, ids,where_move_state)
         else:
-            return obj+".active AND "+obj+".state<>'draft' AND "+obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id in (%s) %s)" % (fiscalyear_clause,where_move_state)
+            return obj+".state<>'draft' AND "+obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id in (%s) %s)" % (fiscalyear_clause,where_move_state)
 
     def default_get(self, cr, uid, fields, context={}):
         data = self._default_get(cr, uid, fields, context)
@@ -157,7 +157,7 @@ class account_move_line(osv.osv):
         for id in ids:
             cr.execute('SELECT date,account_id FROM account_move_line WHERE id=%d', (id,))
             dt, acc = cr.fetchone()
-            cr.execute('SELECT SUM(debit-credit) FROM account_move_line WHERE account_id=%d AND (date<%s OR (date=%s AND id<=%d)) and active', (acc,dt,dt,id))
+            cr.execute('SELECT SUM(debit-credit) FROM account_move_line WHERE account_id=%d AND (date<%s OR (date=%s AND id<=%d))', (acc,dt,dt,id))
             res[id] = cr.fetchone()[0]
         return res
 
@@ -295,7 +295,6 @@ class account_move_line(osv.osv):
         return dt
     _defaults = {
         'blocked': lambda *a: False,
-        'active': lambda *a: True,
         'centralisation': lambda *a: 'normal',
         'date': _get_date,
         'date_created': lambda *a: time.strftime('%Y-%m-%d'),

From 923473ccd0bea5783bf64687960ed989eefa364d Mon Sep 17 00:00:00 2001
From: Sofia <sahibsofia@gmail.com>
Date: Fri, 29 Aug 2008 17:18:18 +0530
Subject: [PATCH 2/2] Bug fix for menu visibility

bzr revid: sahibsofia@gmail.com-20080829114818-55ce8d089nr01ujp
---
 addons/board_crm_configuration/board_crm_demo.xml | 4 ++--
 addons/crm_vertical/crm_vertical_view.xml         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/board_crm_configuration/board_crm_demo.xml b/addons/board_crm_configuration/board_crm_demo.xml
index f6c4a233cd0..39bc1f289f5 100644
--- a/addons/board_crm_configuration/board_crm_demo.xml
+++ b/addons/board_crm_configuration/board_crm_demo.xml
@@ -6,13 +6,13 @@
 		 Administrator shortcut
 		 Demo user startup menu
 		 -->
-		<record model="ir.ui.view_sc" id="sc_crm_dash">
+<!-- 		<record model="ir.ui.view_sc" id="sc_crm_dash">
 			<field name="name">CRM Dashboard</field>
 			<field name="user_id" ref="base.user_demo"/>
 			<field name="resource">ir.ui.menu</field>
 			<field name="sequence">3</field>
 			<field name="res_id" ref="menu_board_crm"/>
-		</record>
+		</record> -->
 		<record model="res.users" id="base.user_admin">
 			<field name="action_id" ref="open_board_crm"/>
 		</record>
diff --git a/addons/crm_vertical/crm_vertical_view.xml b/addons/crm_vertical/crm_vertical_view.xml
index 3c5b0356b4b..32a47904ff6 100644
--- a/addons/crm_vertical/crm_vertical_view.xml
+++ b/addons/crm_vertical/crm_vertical_view.xml
@@ -15,7 +15,7 @@
 			<field eval="&quot;terp-sale&quot;" name="icon"/>
 			<field eval="False" name="parent_id"/>
 		</record>
-		<record id="crm_configuration.menu_crm_case_jobs" model="ir.ui.menu">
+		<record id="crm_configuration.menu_crm_case_job_req_main" model="ir.ui.menu">
 			<field eval="&quot;terp-hr&quot;" name="icon"/>
 			<field eval="False" name="parent_id"/>
 		</record>