diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 31b6c73d179..5c1acf39e1c 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -610,6 +610,7 @@
             <field name="res_model">account.tax</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_tax_tree"/>
+            <field name="domain">[('parent_id','=',False)]</field>
         </record>
         <menuitem action="action_tax_form" id="menu_action_tax_form" parent="next_id_27"/>
 
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index 525fa46607a..e9e0d6826f5 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -89,14 +89,9 @@
         <wizard id="wizard_print_journal" menu="False" model="account.journal.period" name="account.print.journal.report" string="Print Journal" />
 		<menuitem icon="STOCK_PRINT" action="wizard_print_journal" id="menu_print_journal" parent="account.menu_generic_report" type="wizard" />
 
-
         <wizard id="wizard_central_journal" menu="False" model="account.journal.period" name="account.central.journal.report" string="Print Central journal" />
 		<menuitem icon="STOCK_PRINT" action="wizard_central_journal" id="menu_central_journal" parent="account.menu_generic_report" type="wizard" />
 
-        <wizard id="wizard_central_journal" menu="False" model="account.journal.period" name="account.central.journal.report" string="Central Journal" />
-		<menuitem icon="STOCK_PRINT" action="wizard_central_journal" id="menu_cetral_journal" parent="account.menu_generic_report" type="wizard" />
-
-
         <wizard id="wizard_general_journal" menu="False" model="account.journal.period" name="account.general.journal.report" string="Print General journal" />
 		<menuitem icon="STOCK_PRINT" action="wizard_general_journal" id="menu_general_journal" parent="account.menu_generic_report" type="wizard" />
 
diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py
index c27f3fcee24..e00a594f95f 100755
--- a/addons/account/report/general_ledger.py
+++ b/addons/account/report/general_ledger.py
@@ -167,31 +167,34 @@ class general_ledger(rml_parse.rml_parse):
 	
 		
 		## We will now compute solde initiaux
-		for move in res:
-			
-			SOLDEINIT = "SELECT sum(l.debit) AS sum_debit, sum(l.credit) AS sum_credit FROM account_move_line l WHERE l.account_id = " + str(move.id) +  " AND l.date <= '" + self.borne_date['max_date'] + "'" +  " AND l.date >= '" + self.borne_date['min_date'] + "'"
-			self.cr.execute(SOLDEINIT)
-			resultat = self.cr.dictfetchall() 
-			
-			if resultat[0] :
+		if not len(res):
+			return[account]
+		else:
+			for move in res:
 				
-				if resultat[0]['sum_debit'] == None:
-					sum_debit = 0
-				else:
-					
-					sum_debit = resultat[0]['sum_debit']
-				if resultat[0]['sum_credit'] == None:
-					sum_credit = 0
-				else:
-					sum_credit = resultat[0]['sum_credit']
-					
-				move.init_credit = sum_credit
-				move.init_debit = sum_debit
+				SOLDEINIT = "SELECT sum(l.debit) AS sum_debit, sum(l.credit) AS sum_credit FROM account_move_line l WHERE l.account_id = " + str(move.id) +  " AND l.date <= '" + self.borne_date['max_date'] + "'" +  " AND l.date >= '" + self.borne_date['min_date'] + "'"
+				self.cr.execute(SOLDEINIT)
+				resultat = self.cr.dictfetchall() 
 				
-			else:
-				move.init_credit = 0
-				move.init_debit = 0
-	
+				if resultat[0] :
+					
+					if resultat[0]['sum_debit'] == None:
+						sum_debit = 0
+					else:
+						
+						sum_debit = resultat[0]['sum_debit']
+					if resultat[0]['sum_credit'] == None:
+						sum_credit = 0
+					else:
+						sum_credit = resultat[0]['sum_credit']
+						
+					move.init_credit = sum_credit
+					move.init_debit = sum_debit
+					
+				else:
+					move.init_credit = 0
+					move.init_debit = 0
+		
 		##
 		
 		return res
diff --git a/addons/account/report/general_ledger_landscape.py b/addons/account/report/general_ledger_landscape.py
index 3410d1ffc11..8fb70864e00 100755
--- a/addons/account/report/general_ledger_landscape.py
+++ b/addons/account/report/general_ledger_landscape.py
@@ -162,6 +162,7 @@ class general_ledger_landscape(rml_parse.rml_parse):
 			else :
 				borne_max = date_max
 		elif form['state'] == 'none':
+			
 			sql = """
 					SELECT min(date) as start_date,max(date) as stop_date FROM account_move_line """
 			self.cr.execute(sql)
@@ -179,7 +180,7 @@ class general_ledger_landscape(rml_parse.rml_parse):
 
 	def get_children_accounts(self, account, form):
 
-
+		
 		self.child_ids = self.pool.get('account.account').search(self.cr, self.uid,
 			[('parent_id', 'child_of', self.ids)])
 #
@@ -223,7 +224,10 @@ class general_ledger_landscape(rml_parse.rml_parse):
 					context=ctx)) <> 0 :
 					res.append(child_account)
 		##
-		if form['soldeinit']:
+		if not len(res):
+			
+			return [account]
+		else:
 			## We will now compute solde initiaux
 			for move in res:
 				SOLDEINIT = "SELECT sum(l.debit) AS sum_debit, sum(l.credit) AS sum_credit FROM account_move_line l WHERE l.account_id = " + str(move.id) +  " AND l.date < '" + self.borne_date['max_date'] + "'" +  " AND l.date > '" + self.borne_date['min_date'] + "'"
@@ -246,7 +250,7 @@ class general_ledger_landscape(rml_parse.rml_parse):
 					move.init_credit = 0
 					move.init_debit = 0
 
-		##
+		
 		return res
 
 	def lines(self, account, form):
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index 9dbdcb18b55..d231315c175 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -13,6 +13,7 @@
 "access_account_journal_period_manager","account.journal.period manager","model_account_journal_period","account.group_account_manager",1,1,1,1
 "access_account_journal_period","account.journal.period","model_account_journal_period","account.group_account_user",1,1,1,1
 "access_account_move","account.move","model_account_move","account.group_account_user",1,1,1,1
+"access_account_move_line","account.move.line","model_account_move_line","account.group_account_user",1,1,1,1
 "access_account_move_reconcile","account.move.reconcile","model_account_move_reconcile","account.group_account_user",1,1,1,1
 "access_account_tax_code","account.tax.code","model_account_tax_code",,1,0,0,0
 "access_account_tax","account.tax","model_account_tax",,1,0,0,0
@@ -27,7 +28,6 @@
 "access_account_tax_template","account.tax.template","model_account_tax_template","account.group_account_manager",1,1,1,1
 "access_wizard_multi_charts_accounts","wizard.multi.charts.accounts","model_wizard_multi_charts_accounts","account.group_account_manager",1,1,1,1
 "access_account_bank_accounts_wizard","account.bank.accounts.wizard","model_account_bank_accounts_wizard","account.group_account_manager",1,1,1,1
-"access_account_move_line","account.move.line invoice","model_account_move_line","account.group_account_invoice",1,1,1,1
 "access_account_bank_statement","account.bank.statement","model_account_bank_statement","account.group_account_user",1,1,1,1
 "access_account_bank_statement_reconcile","account.bank.statement.reconcile","model_account_bank_statement_reconcile","account.group_account_user",1,1,1,1
 "access_account_bank_statement_reconcile_line","account.bank.statement.reconcile.line","model_account_bank_statement_reconcile_line","account.group_account_user",1,1,1,1
@@ -41,6 +41,7 @@
 "access_account_invoice_tax_uinvoice","account.invoice.tax","model_account_invoice_tax","account.group_account_invoice",1,1,1,1
 "access_account_analytic_line_uinvoice","account.analytic.line","model_account_analytic_line","account.group_account_user",1,1,1,1
 "access_account_move_uinvoice","account.move","model_account_move","account.group_account_invoice",1,1,1,1
+"access_account_move_line_uinvoice","account.move.line invoice","model_account_move_line","account.group_account_invoice",1,1,1,1
 "access_account_move_reconcile_uinvoice","account.move.reconcile","model_account_move_reconcile","account.group_account_invoice",1,1,1,1
 "access_account_journal_period_uinvoice","account.journal.period","model_account_journal_period","account.group_account_invoice",1,1,1,1
 "access_account_payment_term_manager","account.payment.term","model_account_payment_term","account.group_account_manager",1,1,1,1
@@ -66,16 +67,14 @@
 "access_res_currency_rate_account_manager","res.currency.rate account manager","base.model_res_currency_rate","group_account_manager",1,1,1,1
 "access_account_config_wizard_account_manager","account.config.wizard account manager","model_account_config_wizard","group_account_manager",1,1,1,1
 "access_account_config_wizard_system_manager","account.config.wizard system manager","model_account_config_wizard","base.group_system",1,1,1,1
-"access_account_invoice_partner_manager","account.invoice partner manager","model_account_invoice","base.group_partner_manager",1,0,0,0
-"access_account_invoice_line_partner_manager","account.invoice.line partner manager","model_account_invoice_line","base.group_partner_manager",1,0,0,0
-"access_account_invoice_tax_partner_manager","account.invoice.tax partner manager","model_account_invoice_tax","base.group_partner_manager",1,0,0,0
+"access_account_invoice_user","account.invoice user","model_account_invoice","base.group_user",1,0,0,0
+"access_account_invoice_user","account.invoice.line user","model_account_invoice_line","base.group_user",1,0,0,0
+"access_account_invoice_user","account.invoice.tax user","model_account_invoice_tax","base.group_user",1,0,0,0
 "access_account_payment_term_partner_manager","account.payment.term partner manager","model_account_payment_term","base.group_user",1,0,0,0
 "access_account_payment_term_line_partner_manager","account.payment.term.line partner manager","model_account_payment_term_line","base.group_user",1,0,0,0
 "access_account_account_product_manager","account.account product manager","model_account_account","product.group_product_manager",1,0,0,0
 "access_account_journal_product_manager","account.journal product manager","model_account_journal","product.group_product_manager",1,0,0,0
 "access_account_fiscal_position_product_manager","account.fiscal.position account.manager","model_account_fiscal_position","account.group_account_manager",1,1,1,1
-"access_account_fiscal_position","account.fiscal.position all","model_account_fiscal_position","base.group_user",1,0,0,0
-"access_account_fiscal_position_tax_product_manager","account.fiscal.position.tax account.manager","model_account_fiscal_position_tax","account.group_account_manager",1,1,1,1
-"access_account_fiscal_position_tax","account.fiscal.position.tax all","model_account_fiscal_position_tax","base.group_user",1,0,0,0
 "access_account_fiscal_position_account_product_manager","account.fiscal.position account.manager","model_account_fiscal_position_account","account.group_account_manager",1,1,1,1
+"access_account_fiscal_position","account.fiscal.position all","model_account_fiscal_position","base.group_user",1,0,0,0
 "access_account_fiscal_position_account","account.fiscal.position all","model_account_fiscal_position_account","base.group_user",1,0,0,0
diff --git a/addons/account/wizard/wizard_account_balance_report.py b/addons/account/wizard/wizard_account_balance_report.py
index af23f0581ca..8e3b2a142c9 100644
--- a/addons/account/wizard/wizard_account_balance_report.py
+++ b/addons/account/wizard/wizard_account_balance_report.py
@@ -35,7 +35,7 @@ period_form = '''<?xml version="1.0"?>
     <field name="company_id"/>
     <field name="display_account" required = "True"/>
     <newline/>
-    <field name="fiscalyear" attrs="{'readonly':[('state','=','bydate')]}"/>
+    <field name="fiscalyear"/>
     <label colspan="2" string="(Keep empty for all open fiscal years)" align="0.0"/>
     <newline/>
     <separator string="Filters" colspan="4"/>
@@ -99,15 +99,7 @@ class wizard_report(wizard.interface):
         return data['form']
 
     def _check_state(self, cr, uid, data, context):
-        my_ids=data['ids']
-        if data['model']!='account.account':
-            my_ids=[data['form']['Account_list']]
-        child_ids = pooler.get_pool(cr.dbname).get('account.account').search(cr, uid,[('parent_id', 'child_of',my_ids )])
-        for child in child_ids :
-            child_account = pooler.get_pool(cr.dbname).get('account.account').browse(cr, uid, child)
-            res = pooler.get_pool(cr.dbname).get('account.move.line').search(cr, uid,[('account_id','=',child_account.id)])
-        if not len(res):
-            raise  wizard.except_wizard('UserError',"Make sure the account you select has children accounts.")
+
         if data['form']['state'] == 'bydate':
            self._check_date(cr, uid, data, context)
            data['form']['fiscalyear'] = 0
diff --git a/addons/account/wizard/wizard_general_ledger_report.py b/addons/account/wizard/wizard_general_ledger_report.py
index 0aa23c79ccb..2ba3b2b0a1f 100644
--- a/addons/account/wizard/wizard_general_ledger_report.py
+++ b/addons/account/wizard/wizard_general_ledger_report.py
@@ -68,7 +68,7 @@ period_form = '''<?xml version="1.0"?>
 <form string="Select Date-Period">
     <field name="company_id" colspan="4"/>
     <newline/>
-    <field name="fiscalyear" attrs="{'readonly':[('state','=','bydate')]}"/>
+    <field name="fiscalyear"/>
     <label colspan="2" string="(Keep empty for all open fiscal years)" align="0.0"/>
     <newline/>
 
@@ -131,6 +131,7 @@ def _check(self, cr, uid, data, context):
         return 'report'
 
 def _check_date(self, cr, uid, data, context):
+    
     sql = """
         SELECT f.id, f.date_start, f.date_stop FROM account_fiscalyear f  Where '%s' between f.date_start and f.date_stop """%(data['form']['date_from'])
     cr.execute(sql)
@@ -145,25 +146,13 @@ def _check_date(self, cr, uid, data, context):
         raise wizard.except_wizard('UserError','Date not in a defined fiscal year')
     
 def _check_state(self, cr, uid, data, context):
-        
-        my_ids=data['ids']
-        if data['model']!='account.account':
-            my_ids=[data['form']['Account_list']]
-
-        child_ids = pooler.get_pool(cr.dbname).get('account.account').search(cr, uid,[('parent_id', 'child_of',my_ids )])
-        
-        for child in child_ids :
-            child_account = pooler.get_pool(cr.dbname).get('account.account').browse(cr, uid, child)
-            res = pooler.get_pool(cr.dbname).get('account.move.line').search(cr, uid,[('account_id','=',child_account.id)])
-           
-        if not len(res):
-            raise  wizard.except_wizard('UserError',"Make sure the account you select has children accounts.")
 
         if data['form']['state'] == 'bydate':
-           data['form']['fiscalyear'] = False
+           _check_date(self, cr, uid, data, context)
+           data['form']['fiscalyear'] = 0
         else :
-           self._check_date(cr, uid, data, context)
-           data['form']['fiscalyear'] = True
+           
+           data['form']['fiscalyear'] = 1
         return data['form']
 
 
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index ebe0d4638bb..77eedf9f8f6 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -8,7 +8,7 @@
             <field name="name">My managed accounts</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
+            <field name="view_mode">tree,form,graph</field>
             <field name="domain">[('user_id','=',uid)]</field>
         </record>
 
@@ -18,7 +18,7 @@
             <field name="name">Uninvoiced entries of my accounts</field>
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,graph</field>
             <field name="domain">[('invoice_id','=',False),('to_invoice','!=',False),('account_id.user_id','=',uid)]</field>
         </record>
 
@@ -28,7 +28,7 @@
             <field name="name">My Open Managed Accounts</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
+            <field name="view_mode">tree,form,graph</field>
             <field name="domain">[('user_id','=',uid),('state','=','open')]</field>
         </record>
 
@@ -38,7 +38,7 @@
             <field name="name">My Pending Managed Accounts</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
+            <field name="view_mode">tree,form,graph</field>
             <field name="domain">[('user_id','=',uid),('state','=','pending')]</field>
         </record>
 
@@ -48,7 +48,7 @@
             <field name="name">Overpassed accounts</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
+            <field name="view_mode">tree,form,graph</field>
             <field name="domain">[('date','&lt;=',time.strftime('%Y-%m-%d')),('state','=','open')]</field>
         </record>
 
@@ -58,7 +58,7 @@
             <field name="name">All Analytic Accounts</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
+            <field name="view_mode">tree,form,graph</field>
             <field name="view_id" ref="account.view_account_analytic_account_list"/>
             <field name="domain">[]</field>
         </record>
@@ -69,7 +69,7 @@
             <field name="name">Draft Analytic Accounts</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
+            <field name="view_mode">tree,form,graph</field>
             <field name="view_id" ref="account.view_account_analytic_account_list"/>
             <field name="domain">[('state','=','draft')]</field>
         </record>
@@ -80,7 +80,7 @@
             <field name="name">Open Analytic Accounts</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
+            <field name="view_mode">tree,form,graph</field>
             <field name="view_id" ref="account.view_account_analytic_account_list"/>
             <field name="domain">[('state','=','open')]</field>
         </record>
@@ -91,7 +91,7 @@
             <field name="name">Pending Analytic Accounts</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
+            <field name="view_mode">tree,form,graph</field>
             <field name="view_id" ref="account.view_account_analytic_account_list"/>
             <field name="domain">[('state','=','pending')]</field>
         </record>
@@ -102,7 +102,7 @@
             <field name="name">Simplified View Analytic Accounts</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
+            <field name="view_mode">tree,form,graph</field>
             <field name="view_id" ref="view_account_analytic_simplified"/>
             <field name="domain">[]</field>
         </record>
diff --git a/addons/event/__terp__.py b/addons/event/__terp__.py
index 9fd8dec7f09..705108fd7cb 100644
--- a/addons/event/__terp__.py
+++ b/addons/event/__terp__.py
@@ -24,8 +24,11 @@
     "demo_xml" : ["event_demo.xml"],
     "init_xml" : ["event_data.xml"],
     "update_xml" : [
+        "event_wizard.xml",
+        "event_view.xml",
+        "event_sequence.xml",
+        "security/event_security.xml",
         "security/ir.model.access.csv",
-        "event_wizard.xml","event_view.xml","event_sequence.xml"
     ],
     "active" : False,
     "installable" : True,
diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
new file mode 100644
index 00000000000..db731e1ccd3
--- /dev/null
+++ b/addons/event/security/event_security.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<openerp>
+	<data>
+		<record id="menu_event_config" model="ir.ui.menu">
+			<field name="groups_id" eval="[(6,0,[ref('crm.group_crm_manager')])]"/>
+		</record>
+
+		<record id="menu_report_event" model="ir.ui.menu">
+			<field name="groups_id" eval="[(6,0,[ref('crm.group_crm_manager')])]"/>
+		</record>
+	</data>
+</openerp>
+
diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv
index 126c78ea6ad..e38e82ef27c 100644
--- a/addons/event/security/ir.model.access.csv
+++ b/addons/event/security/ir.model.access.csv
@@ -1,5 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_event_type","event.type","model_event_type","crm.group_crm_user",1,1,1,1
+"access_event_type","event.type","model_event_type","crm.group_crm_user",1,0,0,0
+"access_event_type_manager","event.type manager","model_event_type","crm.group_crm_manager",1,1,1,1
 "access_event_event","event.event","model_event_event","crm.group_crm_user",1,1,1,1
 "access_event_registration","event.registration","model_event_registration","crm.group_crm_user",1,1,1,1
 "access_report_event_registration","report.event.registration","model_report_event_registration","crm.group_crm_user",1,0,0,0
diff --git a/addons/idea/__terp__.py b/addons/idea/__terp__.py
index d31ea7441e4..6d98ef5a1e8 100644
--- a/addons/idea/__terp__.py
+++ b/addons/idea/__terp__.py
@@ -6,15 +6,16 @@
         "author" : "Tiny",
         "website" : "http://openerp.com",
         "category" : "Tools",
-        "description": """This module allows your user to easily and efficiently participate in the innovation of the enterprise. It allows everybody to express ideas about different subjects. Then, others userscan comment these ideas and vote for particular ideas. Each idea as a score based on the different votes. The managers can obtain an easy view on best ideas from all the users. Once installed, check the menu 'Ideas' in the 'Tools' main menu.""", 
+        "description": """This module allows your user to easily and efficiently participate in the innovation of the enterprise. It allows everybody to express ideas about different subjects. Then, others users can comment these ideas and vote for particular ideas. Each idea as a score based on the different votes. The managers can obtain an easy view on best ideas from all the users. Once installed, check the menu 'Ideas' in the 'Tools' main menu.""", 
         "depends" : ['base'],
         "init_xml" : [ ],
         "demo_xml" : [ ],
         "update_xml" : [
-            "security/ir.model.access.csv",
             'idea_view.xml',
-            'idea_workflow.xml'
-        ],
+            'idea_workflow.xml',
+            "security/idea_security.xml",
+            "security/ir.model.access.csv",
+            ],
         "installable": True
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/idea/security/idea_security.xml b/addons/idea/security/idea_security.xml
new file mode 100644
index 00000000000..522560a0bb5
--- /dev/null
+++ b/addons/idea/security/idea_security.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<openerp>
+	<data>
+		<record id="idea.menu_config" model="ir.ui.menu">
+			<field name="groups_id" eval="[(6,0,[ref('base.group_system')])]"/>
+		</record>
+
+		<record id="idea.menu_reporting" model="ir.ui.menu">
+			<field name="groups_id" eval="[(6,0,[ref('base.group_system')])]"/>
+		</record>
+	</data>
+</openerp>
+
diff --git a/addons/idea/security/ir.model.access b/addons/idea/security/ir.model.access
deleted file mode 100644
index f92071265ec..00000000000
--- a/addons/idea/security/ir.model.access
+++ /dev/null
@@ -1,6 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_idea_category,idea.category,model_idea_category,base.group_system,1,1,1,1
-access_idea_idea,idea.idea,model_idea_idea,base.group_user,1,1,1,1
-access_idea_comment,idea.comment,model_idea_comment,base.group_user,1,1,1,1
-access_idea_vote,idea.vote,model_idea_vote,base.group_user,1,1,1,1
-access_idea_vote_stat,idea.vote.stat,model_idea_vote_stat,base.group_user,1,1,1,1
diff --git a/addons/idea/security/ir.model.access.csv b/addons/idea/security/ir.model.access.csv
index 4b23bfa0540..4218f118772 100644
--- a/addons/idea/security/ir.model.access.csv
+++ b/addons/idea/security/ir.model.access.csv
@@ -1,6 +1,7 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_idea_category,idea.category,model_idea_category,base.group_user,1,0,0,0
-access_idea_idea,idea.idea,model_idea_idea,base.group_user,1,0,0,0
-access_idea_comment,idea.comment,model_idea_comment,base.group_user,1,0,0,0
-access_idea_vote,idea.vote,model_idea_vote,base.group_user,1,0,0,0
-access_idea_vote_stat,idea.vote.stat,model_idea_vote_stat,base.group_user,1,0,0,0
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_idea_category","idea.category","model_idea_category","base.group_user",1,0,0,0
+"access_idea_idea","idea.idea","model_idea_idea","base.group_user",1,1,1,1
+"access_idea_comment","idea.comment","model_idea_comment","base.group_user",1,1,1,1
+"access_idea_vote","idea.vote","model_idea_vote","base.group_user",1,1,1,1
+"access_idea_vote_stat","idea.vote.stat","model_idea_vote_stat","base.group_user",1,0,0,0
+"access_idea_category_system","idea.category system","model_idea_category","base.group_system",1,1,1,1
diff --git a/addons/product_margin/product_margin_view.xml b/addons/product_margin/product_margin_view.xml
index 34ce72e01c1..5b018115dc6 100644
--- a/addons/product_margin/product_margin_view.xml
+++ b/addons/product_margin/product_margin_view.xml
@@ -12,7 +12,7 @@
             <field name="name">product.margin.graph</field>
             <field name="model">product.product</field>
             <field name="type">graph</field>
-            <field name="sequence" eval="50"/>
+            <field name="priority" eval="50"/>
             <field name="arch" type="xml">
                 <graph string="Product Margins" type="bar">
                     <field name="name"/>
@@ -26,8 +26,7 @@
             <field name="name">product.margin.form.inherit</field>
             <field name="model">product.product</field>
             <field name="type">form</field>
-            <field name="priority">5</field>
-            <field name="sequence" eval="50"/>
+            <field name="priority">50</field>
             <field name="arch" type="xml">
                  <form string="Product Margins">
                     <group col="6" colspan="4">
@@ -46,7 +45,7 @@
                         <field name="sale_avg_price"/>
                         <field name="list_price" string="Catalog Price" readonly="1"/>
                         <field name="sale_num_invoiced" />
-                          <field name="sales_gap" />
+                        <field name="sales_gap" />
                         <field name="turnover" />
                         <field name="sale_expected" />
 
@@ -54,9 +53,9 @@
                         <field name="purchase_avg_price"/>
                         <field name="standard_price" string="Standard Price" readonly="1"/>
                         <field name="purchase_num_invoiced" />
-                       <field name="purchase_gap" />
-                       <field name="total_cost" />
-                       <field name="normal_cost" />
+                        <field name="purchase_gap" />
+                        <field name="total_cost" />
+                        <field name="normal_cost" />
 
                         <separator string="Margins" colspan="4"/>
                         <field name="total_margin"/>
@@ -74,7 +73,7 @@
             <field name="name">product.margin.tree</field>
             <field name="model">product.product</field>
             <field name="type">tree</field>
-            <field name="sequence" eval="50"/>
+            <field name="priority" eval="50"/>
             <field name="arch" type="xml">
                 <tree string="Product Margins">
                     <field name="name" select="1"/>
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 2fee59e9ad0..dd859f0f882 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -12,5 +12,12 @@
         <field name="name">Project / User</field>
     </record>
 
+	<record model="ir.ui.menu" id="menu_definitions">
+		<field name="groups_id" eval="[(6,0,[ref('group_project_manager'), ref('group_project_finance')])]"/>
+	</record>
+	<record model="ir.ui.menu" id="menu_open_view_project">
+		<field name="groups_id" eval="[(6,0,[ref('group_project_manager')])]"/>
+	</record>
+
 </data>
 </openerp>
diff --git a/addons/project/wizard/task_delegate.py b/addons/project/wizard/task_delegate.py
index a6c2ed3649f..a2f2c3361b0 100644
--- a/addons/project/wizard/task_delegate.py
+++ b/addons/project/wizard/task_delegate.py
@@ -66,6 +66,7 @@ class wizard_delegate(wizard.interface):
             'name': data['form']['name'],
             'user_id': data['form']['user_id'],
             'planned_hours': data['form']['planned_hours'],
+            'remaining_hours': data['form']['planned_hours'],
             'parent_id': data['id'],
             'state': 'open',
             'description': data['form']['include_info'] and task.description or '',
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 7e1d86575dd..223a94bdcf5 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -15,12 +15,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscriptions">
-                    <notebook>
+                    <group colspan="4">
+                        <field name="name" select="1"/>
+                        <field name="active" select="1"/>
+                        <field name="user_id" select="1"/>
+                        <field name="partner_id" select="1"/>
+                    </group>
+                    <notebook colspan="4">
                         <page string="Subsription Data">
-                            <field name="name" select="1"/>
-                            <field name="active" select="1"/>
-                            <field name="user_id" select="1"/>
-                            <field name="partner_id" select="1"/>
                             <newline/>
                             <field name="interval_number"/>
                             <field name="interval_type"/>