[MERGE]

bzr revid: uco@tinyerp.com-20100809123622-hpw9djl5wtu80ccp
bzr revid: uco@tinyerp.com-20100810043605-rnht1jq7lx1pazah

addons/account/account.py

@@ -19,7 +19,7 @@
 #
 ##############################################################################
 import time
-from datetime import datetime
+from datetime import datetime, timedelta
 from dateutil.relativedelta import relativedelta
 from operator import itemgetter
 
@@ -79,9 +79,19 @@ class account_payment_term(osv.osv):
             elif line.value == 'balance':
                 amt = round(amount, prec)
             if amt:
-                next_date = datetime.strptime(date_ref, '%Y-%m-%d') + relativedelta(days=line.days)
+                next_date = (datetime.strptime(date_ref, '%Y-%m-%d') + relativedelta(days=line.days))
                 if line.days2 < 0:
-                    next_date += relativedelta(day=line.days2)
+                    nyear = next_date.strftime("%Y")
+                    nmonth = str(int(next_date.strftime("%m"))% 12+1)
+                    nday = "1"
+
+                    ndate = "%s-%s-%s" % (nyear, nmonth, nday)
+                    nseconds = time.mktime(time.strptime(ndate, '%Y-%m-%d'))
+                    next_month = datetime.fromtimestamp(nseconds)
+
+                    delta = timedelta(seconds=1)
+                    next_date = next_month - delta
+                    next_date = next_date + relativedelta(days=line.days2)
                 if line.days2 > 0:
                     next_date += relativedelta(day=line.days2, months=1)
                 result.append( (next_date.strftime('%Y-%m-%d'), amt) )
@@ -1236,7 +1246,7 @@ class account_move(osv.osv):
         return amount
 
     def _centralise(self, cr, uid, move, mode, context=None):
-        assert(mode in ('debit', 'credit'), 'Invalid Mode') #to prevent sql injection
+        assert mode in ('debit', 'credit'), 'Invalid Mode' #to prevent sql injection
         if context is None:
             context = {}
 

addons/account/account_menuitem.xml

@@ -3,22 +3,22 @@
     <data>
 
         <menuitem icon="terp-account" id="menu_finance" name="Accounting" sequence="13"/>
-        <menuitem id="menu_finance_receivables" name="Receivables" parent="menu_finance" sequence="1"/>
-        <menuitem id="menu_finance_payables" name="Payables" parent="menu_finance" sequence="2"/>
+        <menuitem id="menu_finance_receivables" name="Receivables" parent="menu_finance" sequence="1" groups="group_account_user,group_account_manager,base.group_system"/>
+        <menuitem id="menu_finance_payables" name="Payables" parent="menu_finance" sequence="2" groups="group_account_user,group_account_manager,base.group_system"/>
         <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="3"/>
 <!--        <menuitem id="menu_accounting" name="Accounting" parent="menu_finance" sequence="5"/>-->
-        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user"/>
+        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user,group_account_manager,base.group_system"/>
         <menuitem id="periodical_processing_journal_entries_validation" name="Entries to Review" parent="menu_finance_periodical_processing"/>
         <menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
 <!--            <menuitem id="periodical_processing_recurrent_entries" name="Recurrent Entries" parent="menu_finance_periodical_processing"/>-->
         <menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
 <!--            <menuitem id="periodical_processing_end_of_period" name="End of Period" parent="menu_finance_periodical_processing"/>-->
-        <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" sequence="5"/>
-        <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12"/>
+        <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" sequence="5" groups="base.group_system"/>
+        <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12" groups="base.group_system"/>
         <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting"/>
         <menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/>
         <menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
-        <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="13"/>
+        <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="13" groups="base.group_system"/>
         <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
         <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration"/>
         <menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts"/>
@@ -35,7 +35,7 @@
 <!--        <menuitem id="menu_finance_legal_statement1" name="Legal Statements" parent="account.menu_finance_reporting" sequence="200"/>-->
 
         <menuitem id="menu_finance_entries" name="Accounting" parent="menu_finance" sequence="4"
-        groups="group_account_user"/>
+        groups="group_account_user,group_account_manager,base.group_system"/>
         <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15"/>
 
 <!--        <menuitem id="menu_finance_periodical_processing11" name="Periodical Processing" parent="account.menu_finance"-->
@@ -43,15 +43,15 @@
 <!--            groups="group_account_user"/>-->
         <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing"/>
 
-        <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300"/>
+        <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300" groups="account.group_account_manager"/>
 
-        <menuitem 
-        parent="account.menu_finance_legal_statement" 
+        <menuitem
+        parent="account.menu_finance_legal_statement"
         id="final_accounting_reports"
         name="Accounting Reports"/>
 
-        <menuitem 
-        parent="account.menu_finance_legal_statement" 
+        <menuitem
+        parent="account.menu_finance_legal_statement"
         id="menu_journals_report"
         name="Journals"/>
 

addons/account/account_view.xml

@@ -665,7 +665,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_account_type_form" groups="base.group_extended" id="menu_action_account_type_form" parent="menu_low_level"/>
+        <menuitem action="action_account_type_form" groups="base.group_extended,base.group_system" id="menu_action_account_type_form" parent="menu_low_level"/>
         <!--
     Entries
     -->

addons/account/invoice.py

@@ -462,7 +462,7 @@ class account_invoice(osv.osv):
             date_invoice = time.strftime('%Y-%m-%d')
 
         pterm_list = pt_obj.compute(cr, uid, payment_term_id, value=1, date_ref=date_invoice)
-
+    
         if pterm_list:
             pterm_list = [line[0] for line in pterm_list]
             pterm_list.sort()

addons/account/project/project_view.xml

@@ -307,7 +307,13 @@
             <field name="model">account.analytic.journal</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="analytic Journals">
+                <search string="Analytic Journals">
+                	<group>
+                		<field name="name"/>
+                    	<field name="code"/>
+                    	<field name="type"/>
+                	</group>
+                	<newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Type" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'type'}"/>
                     </group>
@@ -334,6 +340,7 @@
             <field name="res_model">account.analytic.journal</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,search</field>
+            <field name="search_view_id" ref="view_analytic_journal_search" />
         </record>
         <menuitem action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic_accounting"/>
 

addons/account/report/account_aged_partner_balance.py

@@ -49,18 +49,17 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
 		self.query = data['form'].get('query_line', '')
 		self.direction_selection = data['form'].get('direction_selection', 'past')
 		self.date_from = data['form'].get('date_from', time.strftime('%Y-%m-%d'))
+		if (data['form']['result_selection'] == 'customer' ):
+			self.ACCOUNT_TYPE = ['receivable']
+		elif (data['form']['result_selection'] == 'supplier'):
+			self.ACCOUNT_TYPE = ['payable']
+		else:
+			self.ACCOUNT_TYPE = ['payable','receivable']
 		return super(aged_trial_report, self).set_context(objects, data, ids, report_type=report_type)
 
 	def _get_lines(self, form):
 		res = []
 		account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
-		if (form['result_selection'] == 'customer' ):
-			self.ACCOUNT_TYPE = ['receivable']
-		elif (form['result_selection'] == 'supplier'):
-			self.ACCOUNT_TYPE = ['payable']
-		else:
-			self.ACCOUNT_TYPE = ['payable','receivable']
-
 		self.cr.execute('SELECT DISTINCT res_partner.id AS id,\
 					res_partner.name AS name \
 				FROM res_partner,account_move_line AS l, account_account\
@@ -129,8 +128,8 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
 
 		# Use one query per period and store results in history (a list variable)
 		# Each history will contain : history[1] = {'<partner_id>': <partner_debit-credit>}
-                history = []
-                for i in range(5):
+		history = []
+		for i in range(5):
 			self.cr.execute('SELECT partner_id, SUM(debit-credit)\
 					FROM account_move_line AS l, account_account\
 					WHERE (l.account_id = account_account.id)\

addons/account/report/account_balance.py

@@ -67,7 +67,7 @@ class account_balance(report_sxw.rml_parse, common_report_header):
             return self.pool.get('account.account').browse(self.cr, self.uid, data['form']['id']).company_id.name
         return super(account_balance ,self)._get_account(data)
 
-    def lines(self, form, ids=[], done=None, level=1):
+    def lines(self, form, ids=[], done=None):#, level=1):
         obj_account = self.pool.get('account.account')
         if not ids:
             ids = self.ids
@@ -94,7 +94,7 @@ class account_balance(report_sxw.rml_parse, common_report_header):
         child_ids = obj_account._get_children_and_consol(self.cr, self.uid, ids, ctx)
         if child_ids:
             ids = child_ids
-        accounts = obj_account.read(self.cr, self.uid, ids, ['type','code','name','debit','credit','balance','parent_id'], ctx)
+        accounts = obj_account.read(self.cr, self.uid, ids, ['type','code','name','debit','credit','balance','parent_id','level'], ctx)
         for account in accounts:
             if account['id'] in done:
                 continue
@@ -104,7 +104,7 @@ class account_balance(report_sxw.rml_parse, common_report_header):
                     'type': account['type'],
                     'code': account['code'],
                     'name': account['name'],
-                    'level': level,
+                    'level': account['level'],
                     'debit': account['debit'],
                     'credit': account['credit'],
                     'balance': account['balance'],
@@ -124,12 +124,12 @@ class account_balance(report_sxw.rml_parse, common_report_header):
 #                    return False
 #                if not _check_rec(account) :
 #                    continue
-            if account['parent_id']:
+#            if account['parent_id']:
 #                acc = obj_account.read(self.cr, self.uid, [ account['parent_id'][0] ] ,['name'], ctx)
-                for r in result_acc:
-                    if r['id'] == account['parent_id'][0]:
-                        res['level'] = r['level'] + 1
-                        break
+#                for r in result_acc:
+#                    if r['id'] == account['parent_id'][0]:
+#                        res['level'] = r['level'] + 1
+#                        break
             if form['display_account'] == 'bal_movement':
                 if res['credit'] > 0 or res['debit'] > 0 or res['balance'] > 0 :
                     result_acc.append(res)

addons/account/report/voucher_print.rml

@@ -170,7 +170,7 @@
           <para style="P12">Dated :</para>
         </td>
         <td>
-          <para style="P13">[[ time.strftime('%d %B,%Y', time.strptime(voucher.date , '%Y-%m-%d')) or '' ]]</para>
+          <para style="P13">[[ formatLang(voucher.date, date=True) or '' ]]</para>
         </td>
       </tr>
       <tr>

addons/account/security/account_security.xml

@@ -2,20 +2,20 @@
 <openerp><data>
 
     <record id="group_account_invoice" model="res.groups">
-        <field name="name">Finance / Invoice</field>
+        <field name="name">Accounting / Invoice</field>
     </record>
 
     <record id="group_account_user" model="res.groups">
-        <field name="name">Finance / Accountant</field>
+        <field name="name">Accounting / Accountant</field>
     </record>
 
     <record id="group_account_manager" model="res.groups">
-        <field name="name">Finance / Manager</field>
+        <field name="name">Accounting / Manager</field>
     </record>
 
-    <record id="menu_finance_configuration" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
-    </record>
+<!--    <record id="menu_finance_configuration" model="ir.ui.menu">-->
+<!--        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>-->
+<!--    </record>-->
 
     <record id="menu_finance_reporting" model="ir.ui.menu">
         <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>

addons/account/security/ir.model.access.csv

@@ -24,13 +24,13 @@
 "access_account_subscription_line","account.subscription.line","model_account_subscription_line","account.group_account_user",1,1,1,1
 "access_account_tax_template","account.tax.template","model_account_tax_template","account.group_account_manager",1,1,1,1
 "access_account_account_template","account.account.template","model_account_account_template","account.group_account_manager",1,1,1,1
-"access_account_tax_code_template","account.tax.code.template","model_account_tax_code_template","account.group_account_manager",1,1,1,1
+"access_account_tax_code_template","account.tax.code.template","model_account_tax_code_template","account.group_account_manager",1,0,0,0
 "access_account_chart_template","account.chart.template","model_account_chart_template","account.group_account_manager",1,1,1,1
 "access_account_tax_template","account.tax.template","model_account_tax_template","account.group_account_manager",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","account.bank.statement","model_account_bank_statement","account.group_account_user",1,0,0,0
 "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
-"access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_account_user",1,1,1,1
+"access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_account_user",1,0,0,0
 "access_account_analytic_line","account.analytic.line","model_account_analytic_line","account.group_account_user",1,1,1,1
 "access_report_hr_timesheet_invoice_journal","report.hr.timesheet.invoice.journal","model_report_hr_timesheet_invoice_journal","account.group_account_manager",1,0,0,0
 "access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","base.group_user",1,0,0,0
@@ -38,8 +38,8 @@
 "access_account_invoice_uinvoice","account.invoice","model_account_invoice","account.group_account_invoice",1,1,1,1
 "access_account_invoice_line_uinvoice","account.invoice.line","model_account_invoice_line","account.group_account_invoice",1,1,1,1
 "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_analytic_line_uinvoice","account.analytic.line","model_account_analytic_line","account.group_account_manager",1,0,0,0
+"access_account_move_uinvoice","account.move","model_account_move","account.group_account_invoice",1,0,0,0
 "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
@@ -52,9 +52,9 @@
 "access_account_journal_column_manager","account.journal.column","model_account_journal_column","account.group_account_manager",1,1,1,1
 "access_account_journal_manager","account.journal","model_account_journal","account.group_account_manager",1,1,1,1
 "access_account_journal_invoice","account.journal invoice","model_account_journal","account.group_account_invoice",1,0,0,0
-"access_account_period_manager","account.period","model_account_period","account.group_account_manager",1,1,1,1
+"access_account_period_manager","account.period","model_account_period","account.group_account_manager",1,0,0,0
 "access_account_period_invoice","account.period invoice","model_account_period","account.group_account_invoice",1,0,0,0
-"access_account_tax_code_manager","account.tax.code","model_account_tax_code","account.group_account_manager",1,1,1,1
+"access_account_tax_code_manager","account.tax.code","model_account_tax_code","account.group_account_manager",1,0,0,0
 "access_account_tax_manager","account.tax","model_account_tax","account.group_account_manager",1,1,1,1
 "access_account_invoice_group_invoice","account.invoice group invoice","model_account_invoice","account.group_account_invoice",1,1,1,1
 "access_account_analytic_account_manager","account.analytic.account","analytic.model_account_analytic_account","account.group_account_manager",1,1,1,1
@@ -82,15 +82,76 @@
 "access_account_fiscal_position_account_template","account.fiscal.position.account.template","model_account_fiscal_position_account_template","account.group_account_manager",1,1,1,1
 "access_account_sequence_fiscal_year","account.sequence.fiscalyear","model_account_sequence_fiscalyear","account.group_account_user",1,1,1,1
 "access_account_sequence_fiscal_year_user","account.sequence.fiscalyear user","model_account_sequence_fiscalyear","base.group_user",1,0,0,0
-"access_report_account_receivable","report.account.receivable","model_report_account_receivable","account.group_account_manager",1,0,0,0
+"access_report_account_receivable","report.account.receivable","model_report_account_receivable","account.group_account_manager",1,1,1,1
 "access_temp_range","temp.range","model_temp_range","account.group_account_manager",1,0,0,0
 "access_report_aged_receivable","report.aged.receivable","model_report_aged_receivable","account.group_account_manager",1,0,0,0
 "access_report_invoice_created","report.invoice.created","model_report_invoice_created","account.group_account_manager",1,0,0,0
 "access_report_account_type_sales","report.account_type.sales","model_report_account_type_sales","account.group_account_manager",1,0,0,0
 "access_report_account_sales","report.account.sales","model_report_account_sales","account.group_account_manager",1,0,0,0
-"access_account_invoice_report","account.invoice.report","model_account_invoice_report","account.group_account_manager",1,0,0,0
+"access_account_invoice_report","account.invoice.report","model_account_invoice_report","account.group_account_manager",1,1,1,1
 "access_account_account_report_manager","account.account.report","model_account_account_report","account.group_account_manager",1,0,0,0
-"access_account_entries_report_manager","account.entries.report","model_account_entries_report","account.group_account_manager",1,0,0,0
+"access_res_partner_group_account_manager","res_partner group_account_manager","model_res_partner","account.group_account_manager",1,1,1,1
+"access_account_invoice_accountant","account.invoice accountant","model_account_invoice","account.group_account_user",1,0,0,0
+"access_account_tax_code_accountant","account.tax.code accountant","model_account_tax_code","account.group_account_user",1,1,1,1
+"access_account_analytic_chart","account.analytic.chart","model_account_analytic_chart","account.group_account_user",1,1,1,1
+"access_account_move_line_manager","account.move.line manager","model_account_move_line","account.group_account_manager",1,1,1,1
+"access_account_move_manager","account.move manager","model_account_move","account.group_account_manager",1,0,0,0
+"access_account_invoice_manager","account.invoice manager","model_account_invoice","account.group_account_manager",1,0,0,0
+"access_account_bank_statement_manager","account.bank.statement manager","model_account_bank_statement","account.group_account_manager",1,0,0,0
+"access_account_analytic_chart_manager","account.analytic.chart manager","model_account_analytic_chart","account.group_account_manager",1,0,0,0
+"access_account_entries_report_manager","account.entries.report","model_account_entries_report","account.group_account_manager",1,1,1,1
 "access_analytic_entries_report_manager","analytic.entries.report","model_analytic_entries_report","account.group_account_manager",1,0,0,0
 "access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_manager",1,1,1,1
 "access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_user",1,0,0,0
+"access_account_move_line_system","account.move.line system","model_account_move_line","base.group_system",1,0,0,0
+"access_account_invoice_system","account.invoice system","model_account_invoice","base.group_system",1,0,0,0
+"access_account_bank_statement_system","account.bank.statement system","model_account_bank_statement","base.group_system",1,0,0,0
+"access_account_move_system","account.move system","model_account_move","base.group_system",1,0,0,0
+"access_account_analytic_line_system","account.analytic.line system","model_account_analytic_line","base.group_system",1,0,0,0
+"access_account_analytic_system","account.analytic.chart system","model_account_analytic_chart","base.group_system",1,0,0,0
+"access_account_tax_code_system","account.tax.code system","model_account_tax_code","base.group_system",1,1,1,1
+"access_account_journal_system","account.journal system","model_account_journal","base.group_system",1,1,1,1
+"access_account_chart_system","account.chart system","model_account_chart","base.group_system",1,0,0,0
+"access_account_period_system","account.period system","model_account_period","base.group_system",1,1,1,1
+"access_account_chart_accountant","account.chart accountant","model_account_chart","group_account_user",1,0,0,0
+"access_account_journal_view_system","account.journal.view system","model_account_journal_view","base.group_system",1,1,1,1
+"access_account_account_type_system","account.account.type system","model_account_account_type","base.group_system",1,1,1,1
+"access_account_analytic_journal_system","account.analytic.journal system","model_account_analytic_journal","base.group_system",1,1,1,1
+"access_account_fiscalyear_system","account.fiscalyear system","model_account_fiscalyear","base.group_system",1,1,1,1
+"access_account_tax_system","account.tax system","model_account_tax","base.group_system",1,1,1,1
+"access_account_model_system","account.model system","model_account_model","base.group_system",1,1,1,1
+"access_account_subscription_system","account.subscription system","model_account_subscription","base.group_system",1,1,1,1
+"access_account_journal_column_system","account.journal.column system","model_account_journal_column","base.group_system",1,1,1,1
+"access_account_invoice_report_system","account.invoice.report system","model_account_invoice_report","base.group_system",1,0,0,0
+"access_account_entries_report_system","account.entries.report system","model_account_entries_report","base.group_system",1,0,0,0
+"access_analytic_entries_report_system","analytic.entries.report system","model_analytic_entries_report","base.group_system",1,0,0,0
+"access_account_journal_period_system","account.journal.period system","model_account_journal_period","base.group_system",1,0,0,0
+"access_account_invoice_tax_system","account.invoice.tax system","model_account_invoice_tax","base.group_system",1,0,0,0
+"access_account_tax_code_template_system","account.tax.code.template system","model_account_tax_code_template","base.group_system",1,1,1,1
+"access_account_sequence_fiscal_year_system","account.sequence.fiscalyear system","model_account_sequence_fiscalyear","base.group_system",1,1,1,1
+"access_account_fiscal_position_system","account.fiscal.position system","model_account_fiscal_position","base.group_system",1,1,1,1
+"access_account_move_reconcile_system","account.move.reconcile system","model_account_move_reconcile","base.group_system",1,0,0,0
+"access_account_account_system","account.account system","model_account_account","base.group_system",1,1,1,1
+"access_account_analytic_system","account.analytic.account system","analytic.model_account_analytic_account","base.group_system",1,1,1,1
+"access_account_model_line_system","account.model.line system","model_account_model_line","base.group_system",1,1,1,1
+"access_account_subscription_line_system","account.subscription.line system","model_account_subscription_line","base.group_system",1,1,1,1
+"access_account_payment_term_system","account.payment.term system","model_account_payment_term","base.group_system",1,1,1,1
+"access_account_payment_term_line_system","account.payment.term.line system","model_account_payment_term_line","base.group_system",1,1,1,1
+"access_report_account_receivable_system","report.account.receivable system","model_report_account_receivable","base.group_system",1,1,1,1
+"access_account_fiscal_position_tax_system","account.fiscal.position.tax system","model_account_fiscal_position_tax","base.group_system",1,1,1,1
+"access_account_fiscal_position_account_template_system","account.fiscal.position.account.template system","model_account_fiscal_position_account_template","base.group_system",1,1,1,1
+"access_account_journal_view_invoice","account.journal.view invoice","model_account_journal_view","account.group_account_invoice",1,1,1,1
+"access_account_fiscal_position_account_system","account.fiscal.position.account system","model_account_fiscal_position_account","base.group_system",1,1,1,1
+"access_account_journal_column_invoice","account.journal.column invoice","model_account_journal_column","account.group_account_invoice",1,1,1,1
+"access_account_invoice_tax_manager","account.invoice.tax manager","model_account_invoice_tax","account.group_account_manager",1,0,0,0
+"access_account_invoice_tax_accountant","account.invoice.tax accountant","model_account_invoice_tax","account.group_account_user",1,0,0,0
+"access_account_move_reconcile_manager","account.move.reconcile manager","model_account_move_reconcile","account.group_account_manager",1,0,0,0
+"access_account_analytic_line_invoice","account.analytic.line invoice","model_account_analytic_line","account.group_account_invoice",1,1,1,1
+"access_account_invoice_line_accountant","account.invoice.line accountant","model_account_invoice_line","account.group_account_user",1,0,0,0
+"access_res_partner_address_accountant","res.partner.address accountant","base.model_res_partner_address","account.group_account_user",1,0,0,0
+"access_account_invoice_line_manager","account.invoice.line manager","model_account_invoice_line","account.group_account_manager",1,0,0,0
+"access_analytic_report_manager","analytic.report manager","model_analytic_report","account.group_account_manager",1,1,1,1
+"access_account_account_invoice","account.account invoice","model_account_account","account.group_account_invoice",1,1,1,1
+"access_res_partner_address_invoice","res.partner.address invoice","base.model_res_partner_address","account.group_account_invoice",1,1,1,1
+"access_account_invoice_line_system","account.invoice.line system","model_account_invoice_line","base.group_system",1,0,0,0
+"access_account_analytic_accountant","account.analytic.account accountant","analytic.model_account_analytic_account","account.group_account_user",1,1,1,1

addons/account/wizard/account_statement_from_invoice.py

@@ -92,7 +92,7 @@ class account_statement_from_invoice_lines(osv.osv_memory):
                 'ref': line.ref,
                 'reconcile_id': reconcile_id,
                 'date': time.strftime('%Y-%m-%d'), #time.strftime('%Y-%m-%d'), #line.date_maturity or,
-                }, context=context)
+            }, context=context)
         return {}
 
 account_statement_from_invoice_lines()
@@ -107,10 +107,10 @@ class account_statement_from_invoice(osv.osv_memory):
         'date': fields.date('Date payment',required=True),
         'journal_ids': fields.many2many('account.journal', 'account_journal_relation', 'account_id', 'journal_id', 'Journal'),
         'line_ids': fields.many2many('account.move.line', 'account_move_line_relation', 'move_id', 'line_id', 'Invoices'),
-        }
+    }
     _defaults = {
         'date':lambda *a: time.strftime('%Y-%m-%d'),
-        }
+    }
 
     def search_invoices(self, cr, uid, ids, context=None):
 
@@ -167,4 +167,4 @@ class account_statement_from_invoice(osv.osv_memory):
         }
 
 account_statement_from_invoice()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/wizard/account_statement_from_invoice_view.xml

@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    	<record id="view_account_statement_from_invoice" model="ir.ui.view">
+        <record id="view_account_statement_from_invoice" model="ir.ui.view">
             <field name="name">account.statement.from.invoice.form</field>
             <field name="model">account.statement.from.invoice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import Invoices in Statement">
-                	<group colspan="4" >
-						<field name="date"/>
-						<newline/>
-	                	<field name="journal_ids"  domain="[('type','in',['sale','purchase','cash'])]"/>
-                	</group>
+                    <group colspan="4" >
+                        <field name="date"/>
+                        <newline/>
+                        <field name="journal_ids"  domain="[('type','in',['sale','purchase','cash'])]"/>
+                    </group>
                     <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="terp-gtk-go-back-rtl" string="Go" name="search_invoices" type="object"/>
+                        <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Go" name="search_invoices" type="object"/>
                    </group>
                </form>
             </field>
         </record>
 
-		<record id="action_view_account_statement_from_invoice" model="ir.actions.act_window">
-        	<field name="name">Import Invoices in Statement</field>
+        <record id="action_view_account_statement_from_invoice" model="ir.actions.act_window">
+            <field name="name">Import Invoices in Statement</field>
             <field name="res_model">account.statement.from.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           	<field name="view_id" ref="view_account_statement_from_invoice"/>
-           	<field name="target">new</field>
+               <field name="view_id" ref="view_account_statement_from_invoice"/>
+               <field name="target">new</field>
         </record>
 
         <record id="view_account_statement_from_invoice_lines" model="ir.ui.view">
@@ -36,27 +36,26 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import Entries">
-                	<group colspan="4" >
-	                	<field name="line_ids" />
-                	</group>
+                    <group colspan="4" expand="1">
+                        <separator string="Payable and Receivables" colspan="4"/>
+                        <field name="line_ids" colspan="4" nolabel="1"/>
+                    </group>
                     <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-execute" string="Ok" name="populate_statement" type="object"/>
+                           <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-execute" string="Ok" name="populate_statement" type="object"/>
                    </group>
                </form>
             </field>
         </record>
-		<record id="action_view_account_statement_from_invoice_lines" model="ir.actions.act_window">
-        	<field name="name">Import Entries</field>
+        <record id="action_view_account_statement_from_invoice_lines" model="ir.actions.act_window">
+            <field name="name">Import Entries</field>
             <field name="res_model">account.statement.from.invoice.lines</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           	<field name="view_id" ref="view_account_statement_from_invoice_lines"/>
-           	<field name="target">new</field>
-           	<field name="context">{'statement_id': active_id}</field>
+               <field name="view_id" ref="view_account_statement_from_invoice_lines"/>
+               <field name="target">new</field>
+               <field name="context">{'statement_id': active_id}</field>
         </record>
-
-
-	</data>
+    </data>
 </openerp>

addons/account_analytic_analysis/security/ir.model.access.csv

@@ -1,3 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_account_analytic_analysis_summary_user,account_analytic_analysis.summary.user,model_account_analytic_analysis_summary_user,account.group_account_manager,1,0,0,0
 access_account_analytic_analysis_summary_month,account_analytic_analysis.summary.month,model_account_analytic_analysis_summary_month,account.group_account_manager,1,0,0,0
+access_account_analytic_account_user,account.analytic.account.user,model_account_analytic_account,base.group_user,1,0,0,0
+access_account_analytic_account_system,account.analytic.account.system,model_account_analytic_account,base.group_system,1,0,0,0

addons/account_analytic_default/security/ir.model.access.csv

@@ -1,3 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_account_analytic_default,account.analytic.default,model_account_analytic_default,account.group_account_user,1,0,0,0
 access_account_analytic_default_manager,account.analytic.default.manager,model_account_analytic_default,account.group_account_manager,1,1,1,1
+access_account_analytic_default_invoice,account.analytic.default invoice,model_account_analytic_default,account.group_account_invoice,1,1,1,1

addons/account_analytic_plans/security/ir.model.access.csv

@@ -6,3 +6,5 @@
 "access_account_analytic_plan_line_invoice","account.analytic.plan.line.invoice","model_account_analytic_plan_line","account.group_account_user",1,1,1,1
 "access_account_analytic_plan_instance_manager","account.analytic.plan.instance manager","model_account_analytic_plan_instance","account.group_account_manager",1,1,1,1
 "access_account_analytic_plan_instance_line_manager","account.analytic.plan.instance.line manager","model_account_analytic_plan_instance_line","account.group_account_manager",1,1,1,1
+"access_account_analytic_plan_system","account.analytic.plan system","model_account_analytic_plan","base.group_system",1,1,1,1
+"access_account_analytic_plan_line_system","account.analytic.plan.line system","model_account_analytic_plan_line","base.group_system",1,1,1,1

addons/account_budget/security/ir.model.access.csv

@@ -1,5 +1,11 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crossovered_budget","crossovered.budget","model_crossovered_budget","account.group_account_manager",1,1,1,1
+"access_crossovered_budget","crossovered.budget","model_crossovered_budget","account.group_account_manager",1,0,0,0
 "access_crossovered_budget_lines","crossovered.budget.lines","model_crossovered_budget_lines","account.group_account_manager",1,1,1,1
-"access_account_budget_post","account.budget.post","model_account_budget_post","account.group_account_manager",1,1,1,1
+"access_account_budget_post","account.budget.post","model_account_budget_post","account.group_account_manager",1,0,0,0
 "access_account_budget_post_dotation","account.budget.post.dotation","model_account_budget_post_dotation","account.group_account_manager",1,1,1,1
+"access_account_budget_post_accountant","account.budget.post accountant","model_account_budget_post","account.group_account_user",1,1,1,1
+"access_crossovered_budget_accountant","crossovered.budget accountant","model_crossovered_budget","account.group_account_user",1,1,1,1
+"access_account_budget_post_system","account.budget.post system","model_account_budget_post","base.group_system",1,0,0,0
+"access_crossovered_budget_system","crossovered.budget system","model_crossovered_budget","base.group_system",1,0,0,0
+"access_crossovered_budget_lines_system","crossovered.budget.lines system","model_crossovered_budget_lines","base.group_system",1,1,1,1
+"access_crossovered_budget_lines_accountant","crossovered.budget.lines accountant","model_crossovered_budget_lines","account.group_account_user",1,1,1,1

addons/account_coda/security/ir.model.access.csv

@@ -3,3 +3,4 @@
 "access_account_coda_manager","account.coda","model_account_coda","account.group_account_manager",1,1,1,1
 "access_account_coda_import_manager","account.coda.import","model_account_coda_import","account.group_account_manager",1,1,1,1
 "access_account_coda_import_user","account.coda","model_account_coda","account.group_account_user",1,0,0,0
+"access_account_coda_system","account.coda system","model_account_coda","base.group_system",1,0,0,0

addons/account_followup/account_followup_view.xml

@@ -85,7 +85,7 @@
             <field name="search_view_id" ref="view_account_followup_filter"/>
             <field name="view_type">form</field>
         </record>
-        <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account.menu_finance_configuration"/>
+        <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account.menu_finance_configuration" groups="base.group_system"/>
 
         <report auto="False" id="account_followup_followup_report" menu="False" model="account_followup.followup" name="account_followup.followup.print" rml="account_followup/report/rappel.rml" string="Followup Report"/>
 

addons/account_followup/report/report_followup_print.py

@@ -50,7 +50,7 @@ class report_rappel(report_sxw.rml_parse):
         res_partner = pooler.get_pool(self.cr.dbname).get('res.partner')
         res_partner_address = pooler.get_pool(self.cr.dbname).get('res.partner.address')
         adr = res_partner.address_get(self.cr, self.uid, [partner.id], [type])[type]
-        return adr and res_partner_address.read(self.cr, self.uid, [adr]) or False
+        return adr and res_partner_address.read(self.cr, self.uid, [adr]) or [{}]
 
     def _lines_get(self, partner):
         moveline_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
@@ -95,4 +95,4 @@ report_sxw.report_sxw('report.account_followup.followup.print',
         'res.partner', 'addons/account_followup/report/rappel.rml',
         parser=report_rappel)
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_followup/security/ir.model.access.csv

@@ -1,7 +1,9 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_account_followup_stat","account_followup.stat","model_account_followup_stat","account.group_account_user",1,0,0,0
-"access_account_followup_followup","account_followup.followup","model_account_followup_followup","account.group_account_user",1,0,0,0
+"access_account_followup_followup","account_followup.followup","model_account_followup_followup","base.group_system",1,1,1,1
 "access_account_followup_followup_line","account_followup.followup.line","model_account_followup_followup_line","account.group_account_user",1,0,0,0
 "access_account_followup_stat_manager","account_followup.stat.manager","model_account_followup_stat","account.group_account_manager",1,1,1,1
-"access_account_followup_followup_manager","account_followup.followup.manager","model_account_followup_followup","account.group_account_manager",1,1,1,1
+"access_account_followup_followup_manager","account_followup.followup.manager","model_account_followup_followup","base.group_system",1,1,1,1
 "access_account_followup_followup_line_manager","account_followup.followup.line.manager","model_account_followup_followup_line","account.group_account_manager",1,1,1,1
+"access_account_followup_followup_line_system","account_followup.followup.line system","model_account_followup_followup_line","base.group_system",1,1,1,1
+"access_account_followup_followup_accountant","account_followup.followup user","model_account_followup_followup","account.group_account_user",1,0,0,0

addons/account_invoice_layout/account_invoice_layout_view.xml

@@ -84,7 +84,7 @@
         <field name="view_mode">tree,form</field>
     </record>
     <menuitem name="Notification Message" id="menu_finan_config_notify_message" parent="account.menu_finance_configuration"/>
-    <menuitem name="All Notification Messages" id="menu_notify_mesage_tree_form" action="notify_mesage_tree_form" parent="menu_finan_config_notify_message"/>
+    <menuitem name="All Notification Messages" id="menu_notify_mesage_tree_form" action="notify_mesage_tree_form" parent="menu_finan_config_notify_message" groups="base.group_system"/>
 
 
 

addons/account_invoice_layout/security/ir.model.access.csv

@@ -1,2 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_notify_message,notify.message,model_notify_message,account.group_account_invoice,1,1,1,1
+access_notify_message_system,notify.message system,model_notify_message,base.group_system,1,1,1,1

addons/account_payment/account_payment_view.xml

@@ -92,7 +92,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem id="next_id_44" name="Payment" parent="account.menu_finance_configuration"/>
+        <menuitem id="next_id_44" name="Payment" parent="account.menu_finance_configuration" groups="base.group_system"/>
 
         <menuitem action="action_payment_mode_form" id="menu_action_payment_mode_form" parent="next_id_44"/>
 

addons/account_payment/security/account_payment_security.xml

@@ -3,7 +3,7 @@
 <data noupdate="1">
 
     <record id="group_account_payment" model="res.groups">
-        <field name="name">Finance / Payments</field>
+        <field name="name">Accounting / Payments</field>
     </record>
 
 </data>

addons/account_payment/security/ir.model.access.csv

@@ -6,3 +6,8 @@
 "access_account_journal_payement","account.journal payment","account.model_account_journal","group_account_payment",1,0,0,0
 "access_account_invoice_payment","account.invoice payment","account.model_account_invoice","group_account_payment",1,0,0,0
 "access_account_move_line_payment","account.move.line payment","account.model_account_move_line","group_account_payment",1,0,0,0
+"access_payment_order_accountant","payment.order accountant","model_payment_order","account.group_account_user",1,1,1,1
+"access_payment_order_manager","payment.order manager","model_payment_order","account.group_account_manager",1,0,0,0
+"access_payment_order_system","payment.order system","model_payment_order","base.group_system",1,0,0,0
+"access_payment_mode_system","payment.mode system","model_payment_mode","base.group_system",1,1,1,1
+"access_payment_type_system","payment.type system","model_payment_type","base.group_system",1,1,1,1

addons/account_report/account_view.xml

@@ -90,9 +90,9 @@
             <field name="domain"/>
             <field name="view_id" ref="view_account_report_tree_simple"/>
         </record>
-        <menuitem 
-            parent="account.menu_finance_generic_reporting" 
-            id="menu_menu_finance_generic_reporting" 
+        <menuitem
+            parent="account.menu_finance_generic_reporting"
+            id="menu_menu_finance_generic_reporting"
             name="Reporting"/>
 
         <menuitem action="action_account_report_tree" id="menu_action_account_report_tree_define" parent="menu_menu_finance_generic_reporting" sequence="20"/>
@@ -120,7 +120,7 @@
             <field name="view_id" ref="view_account_report_tree"/>
             <field name="domain">[('parent_id','=',False)]</field>
         </record>
-        
+
         <menuitem action="action_account_report_tree_view" id="menu_action_account_report_tree_view" parent="menu_menu_finance_generic_reporting" sequence="5"/>
 
         <record id="action_account_report_tree_view_fiscal" model="ir.actions.act_window">

addons/account_report/security/ir.model.access.csv

@@ -1,3 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_account_report_report","account.report.report","model_account_report_report","account.group_account_manager",1,0,0,0
+"access_account_report_report_system","account.report.report system","model_account_report_report","base.group_system",1,0,0,0
 "access_account_report_history","account.report.history","model_account_report_history","account.group_account_manager",1,0,0,0
+"access_account_report_report","account.report.report","model_account_report_report","account.group_account_user",1,1,0,0
+"access_account_report_report_manager","account.report.report manager","model_account_report_report","account.group_account_manager",1,1,1,1

addons/account_reporting/security/ir.model.access.csv

@@ -1,3 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_color_rml,color.rml,model_color_rml,account.group_account_manager,1,1,1,1
-access_account_report_bs,account.report.bs,model_account_report_bs,account.group_account_manager,1,1,1,1
+access_account_report_bs,account.report.bs,model_account_report_bs,base.group_system,1,1,1,1

addons/account_voucher/security/ir.model.access.csv

@@ -1,5 +1,9 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_account_voucher_user","account.voucher","model_account_voucher","account.group_account_user",1,0,0,0
+"access_account_voucher_user","account.voucher","model_account_voucher","account.group_account_user",1,1,1,1
 "access_account_voucher_line_user","account.voucher.line","model_account_voucher_line","account.group_account_user",1,0,0,0
-"access_account_voucher_manager","account.voucher","model_account_voucher","account.group_account_manager",1,1,1,1
+"access_account_voucher_manager","account.voucher","model_account_voucher","account.group_account_manager",1,0,0,0
 "access_account_voucher_line_manager","account.voucher.line","model_account_voucher_line","account.group_account_manager",1,1,1,1
+"access_account_voucher_invoice","account.voucher invoice","model_account_voucher","account.group_account_invoice",1,1,1,1
+"access_account_voucher_system","account.voucher system","model_account_voucher","base.group_system",1,0,0,0
+"access_account_voucher_line_accountant","account.voucher.line accountant","model_account_voucher_line","account.group_account_user",1,1,1,1
+"access_account_voucher_line_invoice","account.voucher.line invoice","model_account_voucher_line","account.group_account_invoice",1,1,1,1

addons/analytic_user_function/security/ir.model.access.csv

@@ -2,5 +2,5 @@
 "access_analytic_user_funct_user","analytic user funct user","model_analytic_user_funct_grid","account.group_account_manager",1,0,0,0
 "access_analytic_user_funct_manager","analytic user funct manager","model_analytic_user_funct_grid","account.group_account_manager",1,1,1,1
 "access_analytic_user_funct_account_manager","analytic user funct account manager","model_analytic_user_funct_grid","account.group_account_manager",1,1,1,1
-"access_analytic_user_funct_grid_hr_user","analytic user funct grid hr user","model_analytic_user_funct_grid","hr.group_hr_user",1,0,0,0
-"access_analytic_user_funct_grid_hr_manager","analytic user funct grid hr manager","model_analytic_user_funct_grid","hr.group_hr_manager",1,1,1,1
+"access_analytic_user_funct_grid_hr_user","analytic user funct grid hr user","model_analytic_user_funct_grid","base.group_hr_user",1,0,0,0
+"access_analytic_user_funct_grid_hr_manager","analytic user funct grid hr manager","model_analytic_user_funct_grid","base.group_hr_manager",1,1,1,1

addons/auction/security/ir.model.access.csv

@@ -13,3 +13,12 @@
 "access_report_auction_adjudication","report.auction.adjudication","model_report_auction_adjudication","base.group_user",1,0,0,0
 "access_report_object_encoded","report.object.encoded","model_report_object_encoded","base.group_user",1,0,0,0
 "access_aie_category","aie.category","model_aie_category","base.group_user",1,0,0,0
+"access_auction_dates_system","auction.dates system","model_auction_dates","base.group_system",1,0,0,0
+"access_auction_lots_system","auction.lots system","model_auction_lots","base.group_system",1,0,0,0
+"access_auction_deposit_system","auction.deposit system","model_auction_deposit","base.group_system",1,0,0,0
+"access_auction_bid_system","auction.bid system","model_auction_bid","base.group_system",1,0,0,0
+"access_auction_artists_system","auction.artists system","model_auction_artists","base.group_system",1,1,1,1
+"access_auction_lot_category_system","auction.lot.category system","model_auction_lot_category","base.group_system",1,1,1,1
+"access_auction_lot_history_system","auction.lot.history system","model_auction_lot_history","base.group_system",1,0,0,0
+"access_auction_deposit_cost_system","auction.deposit.cost system","model_auction_deposit_cost","base.group_system",1,0,0,0
+"access_auction_bid_line_system","auction.bid.line system","model_auction_bid_line","base.group_system",1,0,0,0

addons/base_action_rule/base_action_rule_view.xml

@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <menuitem id="base.menu_base_action_rule" name="Automated Actions"
-            groups="base.group_extended"
+            groups="base.group_extended,base.group_system"
             parent="base.menu_base_config" sequence="3" />
 
         <!--

addons/base_calendar/base_calendar_view.xml

@@ -157,7 +157,7 @@
 
         <!-- Calenadar's menu -->
           <menuitem id="base.menu_calendar_configuration" name="Calendar"
-            parent="base.menu_base_config" sequence="6" />
+            parent="base.menu_base_config" sequence="6" groups="base.group_system" />
 
         <!-- Invitation menu -->
 
@@ -211,7 +211,7 @@
         <!--        Menu for Alarms-->
 
          <menuitem id="menu_crm_meeting_avail_alarm"
-            groups="base.group_extended"
+            groups="base.group_extended,base.group_system"
             action="base_calendar.action_res_alarm_view"
             parent="base.menu_calendar_configuration" />
 

addons/base_calendar/security/ir.model.access.csv

@@ -1,6 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_calendar_attendee","calendar.attendee","model_calendar_attendee","base.group_user",1,1,1,1
-"access_calendar_alarm","calendar.alarm","model_calendar_alarm","base.group_user",1,1,1,1
-"access_res_alarm","res.alarm","model_res_alarm","base.group_user",1,1,1,1
-"access_calendar_todo","calendar.todo","model_calendar_todo","base.group_user",1,1,1,1
-"access_calendar_event","calendar.event.user","model_calendar_event","base.group_user",1,1,1,1
+"access_calendar_attendee","calendar.attendee","model_calendar_attendee","base.group_system",1,1,1,1
+"access_calendar_alarm","calendar.alarm","model_calendar_alarm","base.group_system",1,1,1,1
+"access_res_alarm","res.alarm","model_res_alarm","base.group_system",1,1,1,1
+"access_calendar_todo","calendar.todo","model_calendar_todo","base.group_system",1,1,1,1
+"access_calendar_event","calendar.event.user","model_calendar_event","base.group_system",1,1,1,1

addons/base_contact/__openerp__.py

@@ -43,6 +43,7 @@
     'depends': ['base','process'],
     'init_xml': [],
     'update_xml': [
+        'security/base_contact_security.xml',
         'security/ir.model.access.csv',
         'base_contact_view.xml',
         'base_contact_installer_view.xml', 

addons/base_contact/security/base_contact_security.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="0">
+
+    <record id="base.group_sale_salesman" model="res.groups">
+        <field name="name">Sales / User</field>
+    </record>
+
+    <record id="base.group_sale_manager" model="res.groups">
+        <field name="name">Sales / Manager</field>
+    </record>
+</data>
+</openerp>

addons/base_contact/security/ir.model.access.csv

@@ -3,3 +3,4 @@
 "access_res_partner_job","res.partner.job","model_res_partner_job","base.group_partner_manager",1,1,1,1
 "access_res_partner_contact_all","res.partner.contact all","model_res_partner_contact",base.group_user,1,0,0,0
 "access_res_partner_job_all","res.partner.job all","model_res_partner_job",base.group_user,1,0,0,0
+"access_group_sale_salesman","res.partner.contact.sale.salesman","model_res_partner_contact",base.group_sale_salesman,1,1,1,0

addons/base_setup/installer.py

@@ -91,24 +91,23 @@ class base_setup_installer(osv.osv_memory):
         'crm': True,
         }
 
+    def _if_mrp(self, cr, uid, ids, context=None):
+        if self.pool.get('res.users').browse(cr, uid, uid, context=context)\
+               .view == 'simple':
+            return ['mrp_jit']
+        return None
+
+    def _if_knowledge(self, cr, uid, ids, context=None):
+        if self.pool.get('res.users').browse(cr, uid, uid, context=context)\
+               .view == 'simple':
+            return ['document_ftp']
+        return None
 
     def onchange_moduleselection(self, cr, uid, ids, *args):
-        progress = self._progress(cr, uid) - round((len(filter(lambda x: x==1, args)))*80/len(args))
-        if progress <= 10.0:
-            progress = 10.0
+        closed, total = self.get_current_progress(cr, uid)
+
+        progress = round(100. * closed / (total + len(filter(None, args))))
+        if progress < 10.:
+            progress = 10.
         return {'value':{'progress':progress}}
-
-    def modules_to_install(self, cr, uid, ids, context=None):
-        modules = super(base_setup_installer, self).modules_to_install(cr, uid, ids, context=context)
-        interface_id = self.pool.get('res.config.view').search(cr, uid, [])
-        interface = self.pool.get('res.config.view').read(cr, uid, interface_id)[0]
-        modules_selected = self.read(cr, uid, ids)[0]
-        added_modules = []
-        if interface.get('view', '') == 'simple' :
-            if modules_selected.get('mrp', False):
-                added_modules.append('mrp_jit')
-            if modules_selected.get('knowledge', False):
-                added_modules.append('document_ftp')
-        return modules | set(added_modules)
 base_setup_installer()
-

addons/board/__openerp__.py

@@ -26,7 +26,7 @@
     'description': """Base module for all dashboards.""",
     'author': 'OpenERP SA',
     'depends': ['base'],
-    'update_xml': ['security/ir.model.access.csv', 'wizard/board_menu_create_view.xml', 'board_view.xml'],
+    'update_xml': ['security/board_security.xml','security/ir.model.access.csv', 'wizard/board_menu_create_view.xml', 'board_view.xml'],
     'demo_xml': [],
     'installable': True,
     'active': False,

addons/board/security/board_security.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="0">
+
+    <record id="base.group_sale_salesman" model="res.groups">
+        <field name="name">Sales / User</field>
+    </record>
+
+</data>
+</openerp>

addons/board/security/ir.model.access.csv

@@ -3,3 +3,4 @@
 "access_board_board_line","board.board.line","model_board_board_line","base.group_user",1,1,1,1
 "access_board_note_type","board.note.type","model_board_note_type","base.group_user",1,1,1,1
 "access_board_note","board.note","model_board_note","base.group_user",1,1,1,1
+"access_board_board_sale_salesman","board.board.sale.salesman","model_board_board","base.group_sale_salesman",1,1,1,1

addons/crm/crm_lead_menu.xml

@@ -32,7 +32,7 @@
         parent="base.menu_base_partner" sequence="1" />
 
     <menuitem parent="base.menu_sales" name="Leads"
-        groups="base.group_extended"
+        groups="base.group_extended,base.group_system"
         id="menu_crm_case_categ0_act_leads"
         action="crm_case_category_act_leads_all" sequence="1" />
 

addons/crm/crm_lead_view.xml

@@ -14,7 +14,7 @@
     </record>
 
      <menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act" name="Stages"
-        groups="base.group_extended" sequence="0"
+        groups="base.group_extended,base.group_system" sequence="0"
         parent="base.menu_crm_config_lead" />
 
 
@@ -30,7 +30,7 @@
 
       <menuitem action="crm_lead_resource_act"
             id="menu_crm_lead_resource_act" name="Lead Sources"
-            groups="base.group_extended" sequence="2"
+            groups="base.group_extended,base.group_system" sequence="2"
             parent="base.menu_crm_config_lead" />
 
         <!-- CRM Lead Form View  -->

addons/crm/crm_meeting_menu.xml

@@ -86,7 +86,7 @@
 <!-- ALL MEETINGS -->
 
     <menuitem name="Meetings" id="menu_meeting_sale"
-        parent="base.menu_base_partner" sequence="3" />
+        parent="base.menu_base_partner" sequence="3"/>
 
     <menuitem name="Meetings" id="menu_crm_case_categ_meet"
         action="crm_case_categ_meet" parent="menu_meeting_sale"
@@ -112,7 +112,7 @@
     <menuitem id="menu_attendee_invitations"
             name="Meeting Invitations" parent="crm.menu_meeting_sale"
             sequence="10" action="action_view_attendee_form"
-            groups="base.group_extended" />
+            groups="base.group_extended,base.group_sale_salesman,base.group_sale_manager" />
 
 </data>
 </openerp>

addons/crm/crm_opportunity.py

@@ -64,7 +64,7 @@ class crm_opportunity(osv.osv):
         res = super(crm_opportunity, self).case_close(cr, uid, ids, args)
         stage_id = super(crm_opportunity, self).stage_next(cr, uid, ids, context={'force_domain': [('probability', '=', 100)]})
         if not stage_id:
-            raise osv.except_osv(_('Warning !'), _('There is no stage for won oppportunities defined for this Sale Team.'))
+            raise osv.except_osv(_('Warning !'), _('There is no stage for won opportunities defined for this Sale Team.'))
         value = self.onchange_stage_id(cr, uid, ids, stage_id, context={})['value']
         value.update({'date_closed': time.strftime('%Y-%m-%d %H:%M:%S'), 'stage_id': stage_id})
 
@@ -87,7 +87,7 @@ class crm_opportunity(osv.osv):
         res = super(crm_opportunity, self).case_close(cr, uid, ids, args)
         stage_id = super(crm_opportunity, self).stage_next(cr, uid, ids, context={'force_domain': [('probability', '=', 0)]})
         if not stage_id:
-            raise osv.except_osv(_('Warning !'), _('There is no stage for lost oppportunities defined for this Sale Team.'))
+            raise osv.except_osv(_('Warning !'), _('There is no stage for lost opportunities defined for this Sale Team.'))
         value = self.onchange_stage_id(cr, uid, ids, stage_id, context={})['value']
         value.update({'date_closed': time.strftime('%Y-%m-%d %H:%M:%S'), 'stage_id': stage_id})
 

addons/crm/crm_opportunity_menu.xml

@@ -30,8 +30,6 @@
           <field name="context">{'search_default_user_id':uid,'search_default_current':1, 'default_type': 'opportunity'}</field>
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
           <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
-          <field name="help">Opportunities allows you to track your best deals pipeline: history of the communication, expected revenues, stage of each opportunity, excepted closings, etc. Opportunities are usually connected with the email gateway: new emails may create opportunities and each opportunity automatically gets the history of the conversation with the customer.
-          Your teams will be able to plan meeting and phonecalls from opportunities, to convert opportunities into quotations, to manage documents related to the opportunity, to track all activities related to this customer, etc.</field>
      </record>
 
      <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor11">

addons/crm/crm_phonecall_menu.xml

@@ -57,7 +57,7 @@
     </record>
 
     <menuitem name="Phone Calls" id="menu_crm_case_phone"
-        groups="base.group_extended"
+        groups="base.group_extended,base.group_system"
         parent="base.menu_base_partner" sequence="4" />
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming0">

addons/crm/crm_view.xml

@@ -6,13 +6,13 @@
             parent="base.menu_base_config" sequence="1"/-->
 
         <menuitem id="base.menu_crm_config_lead" name="Leads &amp; Opportunities"
-            parent="base.menu_base_config" sequence="2" groups="base.group_extended"/>
+            parent="base.menu_base_config" sequence="2" groups="base.group_extended,base.group_system"/>
 
         <!--menuitem id="menu_crm_config_meeting" name="Meeting"
             parent="base.menu_base_config" sequence="4"/-->
 
         <menuitem id="menu_crm_config_phonecall" name="Phone Call"
-            parent="base.menu_base_config" sequence="5" groups="base.group_extended"/>
+            parent="base.menu_base_config" sequence="5" groups="base.group_extended,base.group_system"/>
 
         <menuitem id="base.next_id_64" name="Reporting"
             parent="base.menu_base_partner" sequence="11" />
@@ -87,11 +87,11 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_section_view_tree"/>
         </record>
-        
+
         <menuitem action="crm_case_section_act"
             id="menu_crm_case_section_act" sequence="4"
             parent="base.menu_crm_config_lead" />
-            
+
 
         <!-- CRM Stage Tree View -->
 
@@ -177,7 +177,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_categ_tree-view"/>
         </record>
-        
+
          <menuitem action="crm_case_categ-act"
             id="menu_crm_case_categ-act" name="Categories"
             parent="base.menu_crm_config_lead" sequence="1"/>
@@ -342,7 +342,7 @@
 
        <menuitem action="crm_segmentation_tree-act"
             id="menu_crm_segmentation-act"
-            groups="base.group_extended" sequence="2"
+            groups="base.group_extended,base.group_system" sequence="2"
             parent="base.menu_base_action_rule" />
 
         <record model="ir.ui.view" id="view_users_form_simple_modif_inherited1">
@@ -354,7 +354,7 @@
                 <page string="Current Activity" position="inside">
                     <field name="context_section_id" completion="1"
                         widget="selection"
-                        context="{'user_prefence':True}" 
+                        context="{'user_prefence':True}"
                         readonly="0"/>
                 </page>
             </field>
@@ -416,8 +416,8 @@
                     </field>
                 </field>
         </record>
-        
-        
+
+
         <!-- Custom Case Sections -->
         <record id="crm_case_section_custom_view_form" model="ir.ui.view">
             <field name="name">crm.case.section.custom.form</field>
@@ -463,9 +463,9 @@
                 </tree>
             </field>
         </record>
-        
+
         <!-- Custom crm case-->
-        
+
         <record id="crm_case_custom_tree_view" model="ir.ui.view">
             <field name="name">Custom Cases - Tree</field>
             <field name="model">crm.case.custom</field>
@@ -593,7 +593,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="crm_case_custom_calendar_view">
             <field name="name">Custom Cases - Calendar</field>
             <field name="model">crm.case.custom</field>
@@ -607,7 +607,7 @@
                 </calendar>
             </field>
         </record>
-      
+
       <!-- Custom Cases Search View -->
 
     <record id="crm_case_custom_search_view" model="ir.ui.view">

addons/crm/report/crm_lead_report_view.xml

@@ -231,10 +231,11 @@
        </record>
 
        <menuitem name="Leads Analysis" id="menu_report_crm_leads_tree"
-            groups="base.group_extended"
+            groups="base.group_extended,base.group_sale_manager"
            parent="base.next_id_64" action="action_report_crm_lead" sequence="3"/>
 
        <menuitem name="Opportunities Analysis" id="menu_report_crm_opportunities_tree"
+            groups="base.group_extended,base.group_sale_manager"
            parent="base.next_id_64" action="action_report_crm_opportunity" sequence="4"/>
 
     </data>

addons/crm/report/crm_phonecall_report_view.xml

@@ -189,7 +189,7 @@
         </record>
 
         <menuitem name="Phone Calls Analysis"
-            groups="base.group_extended"
+            groups="base.group_extended,base.group_sale_manager"
             action="action_report_crm_phonecall"
             id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" sequence="5"/>
 

addons/crm/security/crm_security.xml

@@ -2,20 +2,20 @@
 <openerp>
 <data noupdate="0">
 
-    <record id="group_crm_manager" model="res.groups">
-        <field name="name">CRM / Manager</field>
+    <record id="base.group_sale_manager" model="res.groups">
+        <field name="name">Sales / Manager</field>
     </record>
 
-    <record id="group_crm_user" model="res.groups">
-        <field name="name">CRM / User</field>
+    <record id="base.group_sale_salesman" model="res.groups">
+        <field name="name">Sales / User</field>
     </record>
 
     <record model='ir.ui.menu' id='base.menu_base_partner'>
-        <field name="groups_id" eval="[(4,ref('group_crm_manager')),(4,ref('group_crm_user'))]"/>
+        <field name="groups_id" eval="[(4,ref('base.group_sale_manager')),(4,ref('base.group_sale_salesman'))]"/>
     </record>
 
     <record model="ir.ui.menu" id="base.menu_base_config">
-        <field eval="[(4, ref('crm.group_crm_manager'))]" name="groups_id"/>
+        <field eval="[(4, ref('base.group_sale_manager'))]" name="groups_id"/>
     </record>
 
     </data>

addons/crm/security/ir.model.access.csv

@@ -1,45 +1,64 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crm_segmentation_user","crm.segmentation user","model_crm_segmentation","crm.group_crm_user",1,0,0,0
-"access_crm_segmentation_line_user","crm.segmentation.line user","model_crm_segmentation_line","crm.group_crm_user",1,0,0,0
-"access_crm_segmentation","crm.segmentation","model_crm_segmentation","crm.group_crm_manager",1,1,1,1
-"access_crm_segmentation_line","crm.segmentation.line","model_crm_segmentation_line","crm.group_crm_manager",1,1,1,1
-"access_crm_case_section","crm.case.section","model_crm_case_section","crm.group_crm_user",1,0,0,0
-"access_crm_case_categ","crm.case.categ","model_crm_case_categ","crm.group_crm_user",1,0,0,0
-"access_crm_meeting_manager","crm.meeting.manager","model_crm_meeting","crm.group_crm_manager",1,1,1,1
-"access_crm_lead_manager","crm.lead.manager","model_crm_lead","crm.group_crm_manager",1,1,1,1
-"access_crm_phonecall_manager","crm.phonecall.manager","model_crm_phonecall","crm.group_crm_manager",1,1,1,1
+"access_crm_segmentation_user","crm.segmentation user","model_crm_segmentation","base.group_sale_salesman",1,0,0,0
+"access_crm_segmentation_line_user","crm.segmentation.line user","model_crm_segmentation_line","base.group_sale_salesman",1,0,0,0
+"access_crm_segmentation","crm.segmentation","model_crm_segmentation","base.group_sale_manager",1,1,1,1
+"access_crm_segmentation_line","crm.segmentation.line","model_crm_segmentation_line","base.group_sale_manager",1,1,1,1
+"access_crm_case_section","crm.case.section","model_crm_case_section","base.group_sale_salesman",1,1,1,0
+"access_crm_case_categ","crm.case.categ","model_crm_case_categ","base.group_sale_salesman",1,1,1,0
+"access_crm_meeting_manager","crm.meeting.manager","model_crm_meeting","base.group_sale_manager",1,0,0,0
+"access_crm_lead_manager","crm.lead.manager","model_crm_lead","base.group_sale_manager",1,0,0,0
+"access_crm_phonecall_system","crm.phonecall.system","model_crm_phonecall","base.group_system",1,0,0,0
+"access_crm_phonecall_manager","crm.phonecall.manager","model_crm_phonecall","base.group_sale_manager",1,0,0,0
 "access_crm_case_categ","crm.case.categ","model_crm_case_categ","base.group_user",1,0,0,0
-"access_crm_meeting","crm.meeting","model_crm_meeting","crm.group_crm_user",1,1,1,1
+"access_crm_meeting","crm.meeting","model_crm_meeting","base.group_sale_salesman",1,1,1,0
 "access_crm_meeting_all","crm.meeting_allll","model_crm_meeting","base.group_user",1,0,0,0
-"access_crm_lead","crm.lead","model_crm_lead","crm.group_crm_user",1,1,1,1
+"access_crm_lead","crm.lead","model_crm_lead","base.group_sale_salesman",1,1,1,1
 "access_crm_lead.all","crm.lead.all","model_crm_lead","base.group_user",1,0,0,0
-"access_crm_phonecall","crm.phonecall","model_crm_phonecall","crm.group_crm_user",1,1,1,1
+"access_crm_phonecall","crm.phonecall","model_crm_phonecall","base.group_sale_salesman",1,1,1,0
 "access_crm_phonecall.all","crm.phonecall.all","model_crm_phonecall","base.group_user",1,0,0,0
-"access_crm_case_section_user","crm.case.section.user","model_crm_case_section","crm.group_crm_user",1,0,0,0
-"access_crm_case_section_manager","crm.case.section.manager","model_crm_case_section","crm.group_crm_manager",1,1,1,1
-"access_crm_case_categ_user","crm.case.categ.user","model_crm_case_categ","crm.group_crm_user",1,0,0,0
-"access_crm_case_categ_manager","crm.case.categ.manager","model_crm_case_categ","crm.group_crm_manager",1,1,1,1
+"access_crm_case_section_user","crm.case.section.user","model_crm_case_section","base.group_sale_salesman",1,1,1,0
+"access_crm_case_section_manager","crm.case.section.manager","model_crm_case_section","base.group_sale_manager",1,1,1,1
+"access_crm_case_categ","crm.case.categ","model_crm_case_categ","base.group_system",1,1,1,1
 "access_crm_case_stage","crm.case.stage","model_crm_case_stage","base.group_user",1,0,0,0
-"access_crm_case_stage_manager","crm.case.stage","model_crm_case_stage","crm.group_crm_manager",1,1,1,1
-"access_crm_case_resource_type_user","crm_case_resource_type user","model_crm_case_resource_type","crm.group_crm_user",1,0,0,0
-"access_crm_case_resource_type_manager","crm_case_resource_type manager","model_crm_case_resource_type","crm.group_crm_manager",1,1,1,1
-"access_crm_lead_report_user","crm.lead.report.user","model_crm_lead_report","crm.group_crm_user",1,0,0,0
-"access_crm_phonecall_report_user","crm.phonecall.report.user","model_crm_phonecall_report","crm.group_crm_user",1,0,0,0
-"access_crm_lead_report_manager","crm.lead.report","model_crm_lead_report","crm.group_crm_manager",1,0,0,0
-"access_crm_phonecall_report_manager","crm.phonecall.report","model_crm_phonecall_report","crm.group_crm_manager",1,0,0,0
-"access_res_partner_manager","res.partner.crm.manager","base.model_res_partner","crm.group_crm_manager",1,0,1,0
-"access_res_partner_address_manager","res.partner.address.crm.user.manager","base.model_res_partner_address","crm.group_crm_manager",1,0,1,0
-"access_res_partner_category_manager","res.partner.category.crm.manager","base.model_res_partner_category","crm.group_crm_manager",1,0,0,0
-"mail_gateway_mailgate_message_manager","mail_gateway.mailgate.message.manager","mail_gateway.model_mailgate_message","crm.group_crm_manager",1,1,1,1
-"mail_gateway_mailgate_thread_manager","mail_gateway.mailgate.thread.manager","mail_gateway.model_mailgate_thread","crm.group_crm_manager",1,1,1,1
-"access_calendar_attendee_crm_user","calendar.attendee.crm.user","model_calendar_attendee","crm.group_crm_user",1,1,1,0
-"access_calendar_attendee_crm_manager","calendar.attendee.crm.manager","model_calendar_attendee","crm.group_crm_manager",1,1,1,1
-"access_res_partner","res.partner.crm.user","base.model_res_partner","crm.group_crm_user",1,0,0,0
-"access_res_partner_address","res.partner.address.crm.user","base.model_res_partner_address","crm.group_crm_user",1,0,0,0
-"access_res_partner_category","res.partner.category.crm.user","base.model_res_partner_category","crm.group_crm_user",1,0,0,0
-"mail_gateway_mailgate_message","mail_gateway.mailgate.message","mail_gateway.model_mailgate_message","crm.group_crm_user",1,1,1,1
-"mail_gateway_mailgate_thread","mail_gateway.mailgate.thread","mail_gateway.model_mailgate_thread","crm.group_crm_user",1,1,1,1
-"access_crm_case_section_custom_user","crm.case.section.custom.user","model_crm_case_section_custom","crm.group_crm_user",1,0,0,0
-"access_crm_case_section_custom_manager","crm.case.section.custom.manager","model_crm_case_section_custom","crm.group_crm_manager",1,1,1,1
-"access_crm_case_custom_user","crm.case.custom.user","model_crm_case_custom","crm.group_crm_user",1,1,1,1
-"access_crm_case_custom_manager","crm.case.custom.manager","model_crm_case_custom","crm.group_crm_manager",1,1,1,1
+"access_crm_case_stage_manager","crm.case.stage","model_crm_case_stage","base.group_sale_manager",1,1,1,1
+"access_crm_case_resource_type_user","crm_case_resource_type user","model_crm_case_resource_type","base.group_sale_salesman",1,1,1,0
+"access_crm_case_resource_type_manager","crm_case_resource_type manager","model_crm_case_resource_type","base.group_sale_manager",1,1,1,1
+"access_crm_phonecall_report_user","crm.phonecall.report.user","model_crm_phonecall_report","base.group_sale_salesman",1,0,0,0
+"access_crm_lead_report_manager","crm.lead.report","model_crm_lead_report","base.group_sale_manager",1,1,1,1
+"access_crm_phonecall_report_manager","crm.phonecall.report","model_crm_phonecall_report","base.group_sale_manager",1,1,1,1
+"access_res_partner_manager","res.partner.crm.manager","base.model_res_partner","base.group_sale_manager",1,0,0,0
+"access_res_partner_address_manager","res.partner.address.crm.user.manager","base.model_res_partner_address","base.group_sale_manager",1,0,0,0
+"access_res_partner_category_manager","res.partner.category.crm.manager","base.model_res_partner_category","base.group_sale_manager",1,0,0,0
+"mail_gateway_mailgate_message_manager","mail_gateway.mailgate.message.manager","mail_gateway.model_mailgate_message","base.group_sale_manager",1,0,0,0
+"mail_gateway_mailgate_thread_manager","mail_gateway.mailgate.thread.manager","mail_gateway.model_mailgate_thread","base.group_sale_manager",1,1,1,1
+"access_calendar_attendee_crm_user","calendar.attendee.crm.user","model_calendar_attendee","base.group_sale_salesman",1,1,1,0
+"access_calendar_attendee_crm_manager","calendar.attendee.crm.manager","model_calendar_attendee","base.group_sale_manager",1,1,1,1
+"access_res_partner","res.partner.crm.user","base.model_res_partner","base.group_sale_salesman",1,1,1,0
+"access_res_partner_address","res.partner.address.crm.user","base.model_res_partner_address","base.group_sale_salesman",1,1,1,0
+"access_res_partner_category","res.partner.category.crm.user","base.model_res_partner_category","base.group_sale_salesman",1,1,1,0
+"mail_gateway_mailgate_message","mail_gateway.mailgate.message","mail_gateway.model_mailgate_message","base.group_system",1,1,1,1
+"mail_gateway_mailgate_thread","mail_gateway.mailgate.thread","mail_gateway.model_mailgate_thread","base.group_sale_salesman",1,1,1,1
+"access_crm_case_section_custom_user","crm.case.section.custom.user","model_crm_case_section_custom","base.group_sale_salesman",1,0,0,0
+"access_crm_case_section_custom_manager","crm.case.section.custom.manager","model_crm_case_section_custom","base.group_sale_manager",1,1,1,1
+"access_crm_case_custom_user","crm.case.custom.user","model_crm_case_custom","base.group_sale_salesman",1,1,1,1
+"access_crm_case_custom_manager","crm.case.custom.manager","model_crm_case_custom","base.group_sale_manager",1,1,1,1
+"access_crm_lead_extended","crm.lead.extended","model_crm_lead","base.group_extended",1,1,1,1
+"access_crm_phonecall_extended","crm.phonecall.extended","model_crm_phonecall","base.group_extended",1,1,1,1
+"mail_gateway_mailgate_message_user","mail_gateway.mailgate.message.user","mail_gateway.model_mailgate_message","base.group_sale_salesman",1,1,1,1
+"access_base_res_bank_system","base.res.bank system","base.model_res_bank","base.group_system",1,1,1,1
+"access_crm_case_stage_system","crm.case.stage system","model_crm_case_stage","base.group_system",1,1,1,1
+"access_crm_case_categ_manager","crm.case.categ manager","model_crm_case_categ","base.group_sale_manager",1,1,1,0
+"access_crm_case_resource_type_system","crm.case.resource.type system","model_crm_case_resource_type","base.group_system",1,1,1,1
+"access_crm_case_section_system","crm.case.section system","model_crm_case_section","base.group_system",1,1,1,1
+"access_crm_lead_report_system","crm.lead.report system","model_crm_lead_report","base.group_system",1,1,1,1
+"access_base_res_country_system","base.res.country system","base.model_res_country","base.group_system",1,1,1,1
+"access_base_res_country_state_system","base.res.country.state system","base.model_res_country_state","base.group_system",1,1,1,1
+"access_base_action_rule_system","base.action.rule system","model_base_action_rule","base.group_system",1,1,1,1
+"access_crm_segmentation_system","crm.segmentation system","model_crm_segmentation","base.group_system",1,1,1,1
+"access_crm_segmentation_line_system","crm.segmentation.line system","model_crm_segmentation_line","base.group_system",1,1,1,1
+"access_base_calendar_res_alarm_system","base.calendar.res.alarm system","base_calendar.model_res_alarm","base.group_system",1,1,1,1
+"access_res_partner_address_system","res.partner.address system","base.model_res_partner_address","base.group_system",1,0,0,0
+"access_crm_lead_report_user","crm.lead.report user","model_crm_lead_report","base.group_sale_salesman",1,1,1,1
+"access_base_res_partner_canal_system","base.res.partner.canal system","base.model_res_partner_canal","base.group_system",1,1,1,1
+"access_res_partner_category_system","res.partner.category system","base.model_res_partner_category","base.group_system",1,1,1,1
+"access_res_partner_title_system","res.partner.title system","base.model_res_partner_title","base.group_system",1,1,1,1

addons/crm/test/test_crm_lead.yml

@@ -12,7 +12,7 @@
      context_lang: en_US
      context_section_id: crm.section_sales_department
      groups_id:
-       - crm.group_crm_user
+       - base.group_sale_salesman
      login: user_crm
      name: user_crm
      password: user_crm

addons/crm_claim/crm_claim_menu.xml

@@ -3,7 +3,7 @@
     <data>
 
         <menuitem id="base.menu_aftersale" name="After-Sale Services"
-            groups="base.group_extended"
+            groups="base.group_extended,base.group_system"
             parent="base.menu_base_partner" sequence="7" />
 
         <!-- Claims Menu -->

addons/crm_claim/crm_claim_view.xml

@@ -3,7 +3,7 @@
     <data>
 
         <menuitem id="menu_config_claim" name="Claim"
-            groups="base.group_extended"
+            groups="base.group_extended,base.group_system"
             parent="base.menu_base_config" sequence="6" />
 
         <!-- Claims categories  -->

addons/crm_claim/report/crm_claim_report_view.xml

@@ -212,7 +212,7 @@
         </record>
 
        <menuitem name="Claims Analysis" id="menu_report_crm_claim_tree"
-           groups="base.group_extended"
+           groups="base.group_extended,base.group_sale_manager"
            action="action_report_crm_claim" parent="base.next_id_64" sequence="6"/>
 
 

addons/crm_claim/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_crm_claim_manager","crm.claim.manager","model_crm_claim","crm.group_crm_manager",1,1,1,1
-"access_crm_claim_user","crm.claim.user","model_crm_claim","crm.group_crm_user",1,1,1,1
-"access_crm_claim_report_user","crm.claim.report.user","model_crm_claim_report","crm.group_crm_user",1,0,0,0
-"access_crm_claim_report_manager","crm.claim.report.manager","model_crm_claim_report","crm.group_crm_manager",1,0,0,0
+"access_crm_claim_manager","crm.claim.manager","model_crm_claim","base.group_sale_manager",1,0,0,0
+"access_crm_claim_user","crm.claim.user","model_crm_claim","base.group_sale_salesman",1,1,1,0
+"access_crm_claim_report_manager","crm.claim.report.manager","model_crm_claim_report","base.group_sale_manager",1,1,1,1
+"access_crm_claim_extended","crm.claim.extended","model_crm_claim","base.group_extended",1,1,1,1
+"access_crm_claim_system","crm.claim.system","model_crm_claim","base.group_system",1,0,0,0

addons/crm_fundraising/crm_fundraising_menu.xml

@@ -5,7 +5,7 @@
 <!-- MENU -->
 
     <menuitem id="base.menu_fundrising" name="Fund Raising"
-        groups="base.group_extended"
+        groups="base.group_extended,base.group_system"
         parent="base.menu_base_partner" sequence="8" />
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund_all1">

addons/crm_fundraising/crm_fundraising_view.xml

@@ -3,7 +3,7 @@
     <data>
            <!-- Fund Raising Configuration Menu -->
         <menuitem id="menu_config_fundrising" name="Fund Raising"
-        groups="base.group_extended"
+        groups="base.group_extended,base.group_system"
         parent="base.menu_base_config" sequence="8" />
 
         <!-- Fund Raising Categories Form View -->
@@ -18,7 +18,7 @@
         </record>
 
         <menuitem action="crm_fund_categ_action" name="Categories"
-            id="menu_crm_case_fundraising-act" groups="base.group_extended"
+            id="menu_crm_case_fundraising-act" groups="base.group_extended,base.group_system"
             parent="menu_config_fundrising" />
 
         <!-- Fund Stage Form View -->
@@ -33,7 +33,7 @@
         </record>
 
          <menuitem action="crm_fundraising_stage_act"
-            groups="base.group_extended" name="Stages"
+            groups="base.group_extended,base.group_system" name="Stages"
             id="menu_crm_fundraising_stage_act"
             parent="menu_config_fundrising" />
 
@@ -50,7 +50,7 @@
         </record>
 
        <menuitem action="crm_fundraising_resource_act"
-            groups="base.group_extended" name="Resource Type"
+            groups="base.group_extended,base.group_system" name="Resource Type"
             id="menu_crm_fundraising_resource_act"
             parent="menu_config_fundrising" />
 

addons/crm_fundraising/report/crm_fundraising_report_view.xml

@@ -200,7 +200,7 @@
 
         <menuitem name="Fundraising Analysis"
             action="action_report_crm_fundraising"
-            groups="base.group_extended"
+            groups="base.group_extended,base.group_sale_manager"
             id="menu_report_crm_fundraising_tree" parent="base.next_id_64" sequence="20"/>
 
     </data>

addons/crm_fundraising/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_crm_fundraising_manager","crm.fundraising.manager","model_crm_fundraising","crm.group_crm_manager",1,1,1,1
-"access_crm_fundraising_user","crm.fundraising.user","model_crm_fundraising","crm.group_crm_user",1,1,1,1
-"access_crm_fundraising_report_user","crm.fundraising.report.user","model_crm_fundraising_report","crm.group_crm_user",1,0,0,0
-"access_crm_fundraising_report_manager","crm.fundraising.report.manager","model_crm_fundraising_report","crm.group_crm_manager",1,0,0,0
+"access_crm_fundraising_manager","crm.fundraising.manager","model_crm_fundraising","base.group_sale_manager",1,0,0,0
+"access_crm_fundraising_user","crm.fundraising.user","model_crm_fundraising","base.group_sale_salesman",1,1,1,0
+"access_crm_fundraising_report_user","crm.fundraising.report.user","model_crm_fundraising_report","base.group_sale_salesman",1,0,0,0
+"access_crm_fundraising_report_manager","crm.fundraising.report.manager","model_crm_fundraising_report","base.group_sale_manager",1,1,1,1
+"access_crm_fundraising_system","crm.fundraising.system","model_crm_fundraising","base.group_system",1,0,0,0

addons/crm_helpdesk/crm_helpdesk_view.xml

@@ -3,7 +3,7 @@
     <data>
        <!-- Helpdesk Support Categories Configuration Menu-->
        <menuitem id="menu_config_helpdesk" name="Helpdesk"
-        groups="base.group_extended"
+        groups="base.group_extended,base.group_system"
         parent="base.menu_base_config" sequence="7" />
 
         <!-- Helpdesk Support Categories Form View -->

addons/crm_helpdesk/report/crm_helpdesk_report_view.xml

@@ -181,7 +181,7 @@
         </record>
 
         <menuitem name="Helpdesk Analysis" action="action_report_crm_helpdesk"
-            groups="base.group_extended"
+            groups="base.group_extended,base.group_sale_manager"
             id="menu_report_crm_helpdesks_tree" parent="base.next_id_64" sequence="7"/>
 
     </data>

addons/crm_helpdesk/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_crm_helpdesk_manager","crm.helpdesk.manager","model_crm_helpdesk","crm.group_crm_manager",1,1,1,1
-"access_crm_helpdesk_user","crm.helpdesk.user","model_crm_helpdesk","crm.group_crm_user",1,1,1,1
-"access_report_crm_helpdesk_user","report.crm.helpdesk.user","model_crm_helpdesk_report","crm.group_crm_user",1,1,1,1
-"access_report_crm_helpdesk_manager","report.crm.helpdesk.manager","model_crm_helpdesk_report","crm.group_crm_manager",1,1,1,1
+"access_crm_helpdesk_manager","crm.helpdesk.manager","model_crm_helpdesk","base.group_sale_manager",1,0,0,0
+"access_crm_helpdesk_user","crm.helpdesk.user","model_crm_helpdesk","base.group_sale_salesman",1,1,1,1
+"access_report_crm_helpdesk_manager","report.crm.helpdesk.manager","model_crm_helpdesk_report","base.group_sale_manager",1,1,1,1
+"access_crm_helpdesk_extended","crm.helpdesk.extended","model_crm_helpdesk","base.group_extended",1,1,1,1
+"access_crm_helpdesk_system","crm.helpdesk.system","model_crm_helpdesk","base.group_system",1,0,0,0

addons/crm_profiling/security/ir.model.access.csv

@@ -1,8 +1,8 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crm_profiling_question","crm_profiling.question","model_crm_profiling_question",,1,0,0,0
-"access_crm_profiling_questionnaire","crm_profiling.questionnaire","model_crm_profiling_questionnaire",,1,0,0,0
-"access_crm_profiling_answer_all","crm_profiling.answer all","model_crm_profiling_answer",,1,0,0,0
-"access_crm_profiling_answer","crm_profiling.answer","model_crm_profiling_answer","crm.group_crm_user",1,1,1,1
-"access_crm_profiling_question_manager","crm_profiling.question manager","model_crm_profiling_question","crm.group_crm_manager",1,1,1,1
-"access_crm_profiling_questionnaire_manager","crm_profiling.questionnaire manager","model_crm_profiling_questionnaire","crm.group_crm_manager",1,1,1,1
-"access_crm_profiling_answer_manager","crm_profiling.answer manager","model_crm_profiling_answer","crm.group_crm_manager",1,1,1,1
+"access_crm_profiling_question","crm_profiling.question","model_crm_profiling_question","base.group_system",1,1,1,1
+"access_crm_profiling_questionnaire_manager","crm_profiling.questionnaire manager","model_crm_profiling_questionnaire","base.group_system",1,1,1,1
+"access_crm_profiling_answer_system","crm_profiling.answer system","model_crm_profiling_answer","base.group_system",1,1,1,1
+"access_crm_profiling_answer_user","crm_profiling.answer user","model_crm_profiling_answer","base.group_sale_salesman",1,1,1,0
+"access_crm_profiling_answer_manager","crm_profiling.answer manager","model_crm_profiling_answer","base.group_sale_manager",1,0,0,0
+"access_crm_profiling_question_manager","crm_profiling.question manager","model_crm_profiling_question","base.group_sale_salesman",1,1,1,0
+"access_crm_profiling_question_user","crm_profiling.question user","model_crm_profiling_question","base.group_sale_manager",1,0,0,0

addons/delivery/delivery_view.xml

@@ -36,7 +36,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_delivery_carrier_form" id="menu_action_delivery_carrier_form" parent="menu_delivery"/>
+        <menuitem action="action_delivery_carrier_form" id="menu_action_delivery_carrier_form" parent="menu_delivery" groups="base.group_system"/>
 
         <!-- Delivery Grids -->
         <record id="view_delivery_grid_tree" model="ir.ui.view">

addons/delivery/security/ir.model.access.csv

@@ -1,9 +1,11 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_delivery_carrier","delivery.carrier","model_delivery_carrier","sale.group_sale_user",1,0,0,0
-"access_delivery_grid","delivery.grid","model_delivery_grid","sale.group_sale_user",1,0,0,0
-"access_delivery_grid_line","delivery.grid.line","model_delivery_grid_line","sale.group_sale_user",1,0,0,0
-"access_delivery_carrier_manager","delivery.carrier","model_delivery_carrier","sale.group_sale_manager",1,1,1,1
-"access_delivery_grid_manager","delivery.grid","model_delivery_grid","sale.group_sale_manager",1,1,1,1
-"access_delivery_grid_line_manager","delivery.grid.line","model_delivery_grid_line","sale.group_sale_manager",1,1,1,1
+"access_delivery_carrier","delivery.carrier","model_delivery_carrier","base.group_sale_salesman",1,0,0,0
+"access_delivery_grid","delivery.grid","model_delivery_grid","base.group_sale_salesman",1,0,0,0
+"access_delivery_grid_line","delivery.grid.line","model_delivery_grid_line","base.group_sale_salesman",1,0,0,0
+"access_delivery_carrier_manager","delivery.carrier","model_delivery_carrier","base.group_sale_manager",1,1,1,1
+"access_delivery_grid_manager","delivery.grid","model_delivery_grid","base.group_sale_manager",1,1,1,1
+"access_delivery_grid_line_manager","delivery.grid.line","model_delivery_grid_line","base.group_sale_manager",1,1,1,1
 "access_delivery_carrier_partner_manager","delivery.carrier partner_manager","model_delivery_carrier","base.group_partner_manager",1,0,0,0
-"access_delivery_carrier_stock_worker","delivery.carrier stock_worker","model_delivery_carrier","stock.group_stock_user",1,0,0,0
+"access_delivery_carrier_stock_system","delivery.carrier stock_system","model_delivery_carrier","base.group_system",1,1,1,1
+"access_delivery_grid_system","delivery.grid.system","model_delivery_grid","base.group_system",1,1,1,1
+"access_delivery_grid_line_system","delivery.grid.line.system","model_delivery_grid_line","base.group_system",1,1,1,1

addons/document/board_document_view.xml

@@ -56,7 +56,7 @@
             id="menu_reports_document"
             parent="menu_reporting"
             sequence="0"
-            groups="document.group_document_manager"/>
+            groups="base.group_system"/>
 
 
          <menuitem

addons/document/document_view.xml

@@ -61,7 +61,7 @@
         name="Storage Media"
         action="action_document_storage_form"
         id="menu_document_storage_media"
-        groups="base.group_extended"
+        groups="base.group_extended,base.group_system"
         parent="menu_document_management_configuration"/>
 
     <record model="ir.ui.view" id="view_document_directory_form">
@@ -335,7 +335,6 @@
         <field name="name">Document</field>
         <field name="view_type">form</field>
         <field name="search_view_id" ref="view_attach_filter"/>
-        <field name="help">Documents give your access to all attached documents; it's a repository of all attached documents (mails, documents attached to a project, etc.)</field>
     </record>
     <menuitem name="Documents" id="menu_document_doc" parent="knowledge.menu_document" sequence="0"/>
     <menuitem

addons/document/security/document_security.xml

@@ -2,16 +2,16 @@
 <openerp>
 <data noupdate="0">
 
-    <record id="group_document_user" model="res.groups">
-        <field name="name">Document / User</field>
+    <record id="base.group_document_user" model="res.groups">
+        <field name="name">Knowledge / User</field>
     </record>
 
-    <record id="group_document_manager" model="res.groups">
-        <field name="name">Document / Manager</field>
-    </record>
+<!--    <record id="group_document_manager" model="res.groups">-->
+<!--        <field name="name">Document / Manager</field>-->
+<!--    </record>-->
 
     <record id="knowledge.menu_document_configuration" model="ir.ui.menu">
-        <field name="groups_id" eval="[(6,0,[ref('group_document_manager')])]"/>
+        <field name="groups_id" eval="[(6,0,[ref('base.group_system')])]"/>
     </record>
 
 

addons/document/security/ir.model.access.csv

@@ -1,22 +1,26 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_document_directory_all","document.directory all","model_document_directory",,1,0,0,0
-"access_document_directory_group_document_manager","document.directory document manager","model_document_directory","group_document_manager",1,1,1,1
+"access_document_directory_group_document_manager","document.directory document manager","model_document_directory","base.group_system",1,1,1,1
 "access_document_directory_group_system","document.directory group system","model_document_directory","base.group_system",1,1,1,1
 "access_document_directory_content_all","document.directory.content all","model_document_directory_content",,1,0,0,0
-"access_document_directory_content_group_document_manager","document.directory.content document manager","model_document_directory_content","group_document_manager",1,1,1,1
+"access_document_directory_content_group_document_manager","document.directory.content document manager","model_document_directory_content","base.group_system",1,1,1,1
 "access_document_directory_content_group_system","document.directory.content group system","model_document_directory_content","base.group_system",1,1,1,1
-"access_document_directory_content_type_group_document_manager","document.directory.content.type document manager","model_document_directory_content_type","group_document_manager",1,1,1,1
+"access_document_directory_content_type_group_document_manager","document.directory.content.type document manager","model_document_directory_content_type","base.group_system",1,1,1,1
 "access_document_directory_content_type_group_system","document.directory.content.type group system","model_document_directory_content_type","base.group_user",1,0,0,0
-"access_document_storage_group_document_manager","document.storage document manager","model_document_storage","group_document_manager",1,1,1,1
+"access_document_storage_group_document_manager","document.storage document manager","model_document_storage","base.group_system",1,1,1,1
 "access_document_storage_group_system","document.storage group system","model_document_storage","base.group_user",1,0,0,0
+"access_document_storage_group_user","document.storage group user","model_document_storage","base.group_document_user",1,1,1,1
+"access_ir_attachment_group_user","ir.attachment user","base.model_ir_attachment","base.group_document_user",1,1,1,1
+"access_ir_attachment_group_system","ir.attachment system","base.model_ir_attachment","base.group_system",1,0,0,0
+"access_res_partner_group_user","res.partner user","base.model_res_partner","base.group_document_user",1,1,1,1
 "access_document_directory_dctx_all","document.directory.dctx all","model_document_directory_dctx",,1,0,0,0
-"access_document_directory_dctx_group_document_manager","document.directory.dctx document manager","model_document_directory_dctx","group_document_manager",1,1,1,1
+"access_document_directory_dctx_group_document_manager","document.directory.dctx document manager","model_document_directory_dctx","base.group_system",1,1,1,1
 "access_document_directory_dctx_group_system","document.directory.dctx group system","model_document_directory_dctx","base.group_system",1,1,1,1
-"access_report_document_user_group_document_manager","report.document.user document manager","model_report_document_user","document.group_document_manager",1,0,0,0
+"access_report_document_user_group_document_manager","report.document.user document manager","model_report_document_user","base.group_system",1,0,0,0
 "access_report_document_user_group_system","report.document.user group system","model_report_document_user","base.group_system",1,0,0,0
-"access_report_files_partner_group_document_manager","report.files.partner document manager","model_report_files_partner","document.group_document_manager",1,0,0,0
+"access_report_files_partner_group_document_manager","report.files.partner document manager","model_report_files_partner","base.group_system",1,0,0,0
 "access_report_files_partner_group_system","report.files.partner group system","model_report_files_partner","base.group_system",1,0,0,0
-"access_report_document_file_group_document_manager","report.document.file document manager","model_report_document_file","document.group_document_manager",1,0,0,0
+"access_report_document_file_group_document_manager","report.document.file document manager","model_report_document_file","base.group_system",1,0,0,0
 "access_report_document_file_group_system","report.document.file group system","model_report_document_file","base.group_system",1,0,0,0
-"access_report_document_wall_group_document_manager","report.document.wall document manager","model_report_document_wall","document.group_document_manager",1,0,0,0
+"access_report_document_wall_group_document_manager","report.document.wall document manager","model_report_document_wall","base.group_system",1,0,0,0
 "access_report_document_wall_group_system","report.document.wall group system","model_report_document_wall","base.group_system",1,0,0,0

addons/email_template/security/email_template_security.xml

@@ -2,8 +2,8 @@
 <openerp>
     <data noupdate="0">
 
-        <record id="res_groups_email_template_admin" model="res.groups">
-            <field name="name">Marketing / Email Template</field>
+        <record id="base.res_groups_email_template_admin" model="res.groups">
+            <field name="name">Marketing / User</field>
         </record>
 
     </data>

addons/email_template/security/ir.model.access.csv

@@ -1,5 +1,8 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_email_template_engines","email_template.engines","model_email_template_engines","email_template.res_groups_email_template_admin",1,1,1,1
-"access_email_template_account","email_template.account","model_email_template_account","email_template.res_groups_email_template_admin",1,1,1,1
-"access_email_template","email.template","model_email_template","email_template.res_groups_email_template_admin",1,1,1,1
-"access_email_template_mailbox","email_template.mailbox","model_email_template_mailbox","email_template.res_groups_email_template_admin",1,1,1,1
+"access_email_template_engines","email_template.engines","model_email_template_engines","base.res_groups_email_template_admin",1,1,1,1
+"access_email_template_account","email_template.account","model_email_template_account","base.res_groups_email_template_admin",1,0,0,0
+"access_email_template","email.template","model_email_template","base.res_groups_email_template_admin",1,0,0,0
+"access_email_template_mailbox","email_template.mailbox","model_email_template_mailbox","base.res_groups_email_template_admin",1,1,1,1
+"access_email_template_account_system","email_template.account system","model_email_template_account","base.group_system",1,1,1,1
+"access_email_template_system","email.template system","model_email_template","base.group_system",1,1,1,1
+"access_email_template_mailbox_system","email_template.mailbox system","model_email_template_mailbox","base.group_system",1,0,0,0

addons/event/event_view.xml

@@ -35,8 +35,8 @@
             <field name="res_model">event.type</field>
             <field name="view_type">form</field>
         </record>
-        <menuitem name="Configuration" id="base.menu_event_config" parent="base.marketing_menu" sequence="30" groups="base.group_extended"/>
-        <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_event_config" groups="base.group_extended,crm.group_crm_manager"/>
+        <menuitem name="Configuration" id="base.menu_event_config" parent="base.marketing_menu" sequence="30" groups="base.group_extended,base.group_system"/>
+        <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_event_config" groups="base.group_extended,base.group_sale_manager,base.group_system"/>
 
     <!-- Events Organisation/CONFIGURATION/EVENTS -->
 

addons/event/report/report_event_registration_view.xml

@@ -124,7 +124,7 @@
        </record>
 
         <!--<menuitem parent="menu_report_event" action="action_event_registration" id="menu_report_event_registration"/>-->
-        <menuitem parent="base.menu_report_association" action="action_report_event_registration" id="menu_report_event_registration" sequence="3"/>
+        <menuitem parent="base.menu_report_association" action="action_report_event_registration" id="menu_report_event_registration" sequence="3" groups="base.group_system,base.group_marketing_manager"/>
  
     <!-- end...  -->
     </data>

addons/event/security/event_security.xml

@@ -3,12 +3,19 @@
 	<data>
 	
 	
-    <record id="group_event_manager" model="res.groups">
-        <field name="name">EVENT / Manager</field>
+    <record id="base.group_marketing_manager" model="res.groups">
+        <field name="name">Marketing / Manager</field>
+    </record>
+    <record id="base.res_groups_email_template_admin" model="res.groups">
+        <field name="name">Marketing / User</field>
     </record>
 
-    <record id="group_event_subscriber" model="res.groups">
-        <field name="name">EVENT / Subscriber</field>
+    <record id="base.group_sale_manager" model="res.groups">
+        <field name="name">Sales / Manager</field>
+    </record>
+
+    <record id="base.group_sale_salesman" model="res.groups">
+        <field name="name">Sales / User</field>
     </record>
   
 

addons/event/security/ir.model.access.csv

@@ -1,13 +1,20 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_event_type","event.type","model_event_type","event.group_event_subscriber",1,0,0,0
-"access_event_type_manager","event.type manager","model_event_type","event.group_event_manager",1,1,1,1
-"access_event_event","event.event","model_event_event","event.group_event_subscriber",1,1,1,0
-"access_event_registration","event.registration","model_event_registration","event.group_event_subscriber",1,1,1,0
-"access_report_event_registration","report.event.registration","model_report_event_registration","event.group_event_subscriber",1,0,0,0
-"access_event_event_manager","event.event manager","model_event_event","event.group_event_manager",1,1,1,1
-"access_event_registration_manager","event.registration manager","model_event_registration","event.group_event_manager",1,1,1,1
-"access_crm_case_section_manager","crm.case.section manager","crm.model_crm_case_section","event.group_event_manager",1,1,1,1
-"access_product_product","product.product.product manager","product.model_product_product","event.group_event_manager",1,1,1,1
-"access_report_event_registration","report.event.registration","model_report_event_registration","event.group_event_manager",1,1,1,1
-"access_event_registration_badge","event.registration.badge","model_event_registration_badge","event.group_event_subscriber",1,1,1,1
-"access_event_registration_badge","event.registration.badge","model_event_registration_badge","event.group_event_manager",1,1,1,1
+"access_event_type","event.type","model_event_type","base.res_groups_email_template_admin",1,0,0,0
+"access_event_type_manager","event.type manager","model_event_type","base.group_marketing_manager",1,1,1,1
+"access_event_event","event.event","model_event_event","base.res_groups_email_template_admin",1,1,1,0
+"access_event_registration","event.registration","model_event_registration","base.res_groups_email_template_admin",1,1,1,0
+"access_report_event_registration","report.event.registration","model_report_event_registration","base.res_groups_email_template_admin",1,1,1,1
+"access_event_event_manager","event.event manager","model_event_event","base.group_marketing_manager",1,0,0,0
+"access_event_registration_manager","event.registration manager","model_event_registration","base.group_marketing_manager",1,0,0,0
+"access_crm_case_section_manager","crm.case.section manager","crm.model_crm_case_section","base.group_marketing_manager",1,1,1,1
+"access_product_product","product.product.product manager","product.model_product_product","base.group_marketing_manager",1,1,1,1
+"access_report_event_registration","report.event.registration","model_report_event_registration","base.group_marketing_manager",1,1,1,1
+"access_event_registration_badge","event.registration.badge","model_event_registration_badge","base.res_groups_email_template_admin",1,1,1,1
+"access_event_registration_badge","event.registration.badge","model_event_registration_badge","base.group_marketing_manager",1,1,1,1
+"access_event_event_sale_salesman","event.event.sale","model_event_event","base.group_sale_salesman",1,0,0,0
+"access_event_event_system","event.event system","model_event_event","base.group_system",1,0,0,0
+"access_event_registration_system","event.registration system","model_event_registration","base.group_system",1,0,0,0
+"access_report_event_registration_system","report.event.registration system","model_report_event_registration","base.group_system",1,1,1,1
+"access_account_account_invoice_system","account.account.invoice","account.model_account_invoice","base.group_system",1,0,0,0
+"access_event_type_sytem","event.type system","model_event_type","base.group_system",1,1,1,1
+"access_account_account_invoice_manager","account.account.invoice","account.model_account_invoice","base.group_marketing_manager",1,0,0,0

addons/hr/hr.py

@@ -125,9 +125,7 @@ class hr_employee(osv.osv):
         'work_email': fields.related('address_id', 'email', type='char', size=240, string='Work E-mail', readonly=True),
         'work_location': fields.char('Office Location', size=32),
         'notes': fields.text('Notes'),
-        'parent_id': fields.many2one('hr.employee', 'Manager', select=True),
-#        'parent_id': fields.related('department_id', 'manager_id',  string='Manager', type='many2one'),
-#        'category_id': fields.many2one('hr.employee.category', 'Category'),
+        'parent_id': fields.related('department_id', 'manager_id', relation='hr.employee', string='Manager', type='many2one', store=True, select=True),
         'category_ids': fields.many2many('hr.employee.category', 'employee_category_rel','category_id','emp_id','Category'),
         'child_ids': fields.one2many('hr.employee', 'parent_id', 'Subordinates'),
         'resource_id': fields.many2one('resource.resource', 'Resource', ondelete='cascade'),
@@ -179,4 +177,4 @@ class hr_department(osv.osv):
 hr_department()
 
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/hr/hr_demo.xml

@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <!-- Employee Category -->
 
+        <record id="category_experience" model="hr.employee.category">
+            <field name="name">Experience</field>
+        </record>
+
+        <record id="category_ranking" model="hr.employee.category">
+            <field name="name">Ranking</field>
+        </record>
+
         <record id="category_ceo" model="hr.employee.category">
             <field name="name">CEO</field>
+            <field name="parent_id" ref="category_ranking"/>
         </record>
 
         <record id="category_cto" model="hr.employee.category">
@@ -14,7 +23,7 @@
         </record>
 
         <record id="category_managers" model="hr.employee.category">
-            <field name="name">Managers(Tech. Heads)</field>
+            <field name="name">Managers (Tech. Heads)</field>
             <field name="parent_id" ref="category_cto"/>
         </record>
 
@@ -23,19 +32,24 @@
             <field name="parent_id" ref="category_managers"/>
         </record>
 
-        <record id="category_sr_exec" model="hr.employee.category">
-            <field name="name">Sr. Executives(Team Leads)</field>
+        <record id="category_employee" model="hr.employee.category">
+            <field name="name">Employees</field>
             <field name="parent_id" ref="category_project_managers"/>
         </record>
 
+        <record id="category_sr_exec" model="hr.employee.category">
+            <field name="name">Sr. Executives (5 years)</field>
+            <field name="parent_id" ref="category_experience"/>
+        </record>
+
         <record id="category_jr_exec" model="hr.employee.category">
-            <field name="name">Jr. Executives(Developers)</field>
-            <field name="parent_id" ref="category_sr_exec"/>
+            <field name="name">Jr. Executives (6 months)</field>
+            <field name="parent_id" ref="category_experience"/>
         </record>
 
         <record id="category_trainee" model="hr.employee.category">
-            <field name="name">Trainee(Intership)</field>
-            <field name="parent_id" ref="category_jr_exec"/>
+            <field name="name">Trainee</field>
+            <field name="parent_id" ref="category_experience"/>
         </record>
 
 
@@ -44,12 +58,21 @@
         <record id="employee1" model="hr.employee">
             <field name="name">Fabien Pinckaers</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
-            <!--<field name="regime">45</field>-->
             <field name="user_id" ref="base.user_root"/>
-            <field name="category_id" ref="hr.category_ceo"/>
-            <!--<field name="holiday_max">25</field>-->
+            <field name="category_ids" eval="[(6, 0, [ref('category_sr_exec'),ref('category_ceo')])]"/>
         </record>
 
+        <record id="employee2" model="hr.employee">
+            <field name="name">Quentin Paolino</field>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
+            <field name="category_ids" eval="[(6, 0, [ref('category_jr_exec'),ref('category_managers')])]"/>
+        </record>
+
+        <record id="employee3" model="hr.employee">
+            <field name="name">Antoine Philippe</field>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
+            <field name="category_ids" eval="[(6, 0, [ref('category_trainee')])]"/>
+        </record>
 
     </data>
 </openerp>

addons/hr/hr_department_demo.xml

@@ -104,6 +104,14 @@
             <field name="department_id" ref="dep_it"/>
         </record>
 
+        <!-- assign department on employee -->
+        <record id="employee2" model="hr.employee">
+            <field name="department_id" ref="hr.dep_technical"/>
+        </record>
+
+        <record id="employee3" model="hr.employee">
+            <field name="department_id" ref="hr.dep_technical"/>
+        </record>
 
     </data>
 </openerp>

addons/hr/hr_department_view.xml

@@ -72,7 +72,6 @@
             <field name="res_model">hr.department</field>
             <field name="view_type">form</field>
             <field name="search_view_id" ref="view_department_filter"/>
-            <field name="help">Your Company's Departments Structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitements, etc.</field>
         </record>
 
        <menuitem action="open_module_tree_department" id="menu_department_def" parent="hr.menu_department_tree"/>

addons/hr/hr_view.xml

@@ -2,11 +2,11 @@
 <openerp>
     <data>
 
-        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"/>
+        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15" />
         <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
-        <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="group_hr_manager" sequence="50"/>
-        <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" groups="group_hr_manager" sequence="1"/>
-        <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" name="Employees" sequence="1"/>
+        <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_system" sequence="50"/>
+        <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="1"/>
+        <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" groups="base.group_system" name="Employees" sequence="1" />
 
         <!--
         ==========
@@ -59,11 +59,8 @@
                             </group>
                             <group col="2" colspan="2">
                             <separator string="Position" colspan="2"/>
-                            <field name="job_id" widget="selection"/>
+                            <field name="job_id" widget="selection" domain="[('state','!=','old')]"/>
                             <field name="department_id" widget="selection"/>
-                            <!--<separator string="Managers" colspan="2"/>
-                            <field name="parent_id" />
-                            <field name="coach_id" />-->
                             </group>
                         </page>
                         <page string="Categories">
@@ -126,7 +123,7 @@
             <field name="view_type">tree</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_employee_tree"/>
-            <field name="domain">[('parent_id','=',False)]</field>
+            <field name="domain">[('parent_id','=',False),('user_id','=',uid)]</field>
             <field name="search_view_id" ref="view_employee_filter"/>
         </record>
 
@@ -147,7 +144,6 @@
             <field name="domain">[]</field>
             <field name="view_id" ref="view_employee_tree"/>
             <field name="search_view_id" ref="view_employee_filter"/>
-            <field name="help">The employee directory contains all data related to your employees: from their photo up to their hourly estimated costs for the timesheets. Employees are managed by departments and can be linked to users to manage their access rights.</field>
         </record>
 
         <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main"/>
@@ -312,7 +308,7 @@
             <field eval="True" name="object"/>
         </record>
 
-        <menuitem action="open_view_categ_tree" groups="base.group_extended"
+        <menuitem action="open_view_categ_tree" groups="base.group_extended,base.group_system"
             id="menu_view_employee_category_tree" parent="hr.menu_view_employee_category_form"/>
 
         <record id="view_hr_job_form" model="ir.ui.view">
@@ -344,8 +340,8 @@
                     <group col="6" colspan="4">
 	                    <field name="state"/>
 	                    <button name="job_recruitement" string="In Recruitement" states="open" type="object" icon="gtk-go-forward"/>
-		                <button name="job_open" string="Open" states="old" type="object" icon="terp-camera_test"/>
-                        <button name="job_old" string="Old" states="open,recruit" type="object" icon="gtk-cancel"/>
+		            <button name="job_open" string="Open" states="old,recruit" type="object" icon="terp-camera_test"/>
+                            <button name="job_old" string="Old" states="open,recruit" type="object" icon="gtk-cancel"/>
                     </group>
                 </form>
             </field>
@@ -392,10 +388,9 @@
             <field name="res_model">hr.job</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="help">Job Positions are used to define the jobs, the requirements. You can attach a survey to a job position. This survey will be used in the recruitement process to evaluate the applicants for this job position.</field>
         </record>
 
-        <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root"/>
+        <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root" groups="base.group_hr_manager"/>
         <menuitem parent="base.menu_crm_case_job_req_main" id="menu_hr_job" action="action_hr_job" sequence="2"/>
 
     </data>

addons/hr/security/hr_security.xml

@@ -2,11 +2,11 @@
 <openerp>
 <data noupdate="1">
 
-    <record id="group_hr_manager" model="res.groups">
+    <record id="base.group_hr_manager" model="res.groups">
         <field name="name">Human Resources / Manager</field>
     </record>
 
-    <record id="group_hr_user" model="res.groups">
+    <record id="base.group_hr_user" model="res.groups">
         <field name="name">Human Resources / User</field>
     </record>
 

addons/hr/security/ir.model.access.csv

@@ -1,9 +1,17 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_employee_category","hr.employee.category","model_hr_employee_category","hr.group_hr_user",1,0,0,0
-"access_hr_employee","hr.employee","model_hr_employee","hr.group_hr_user",1,1,1,1
-"access_hr_employee_resource","resource.resource","resource.model_resource_resource","hr.group_hr_user",1,1,1,1
-"access_hr_department","hr.department","model_hr_department","hr.group_hr_user",1,0,0,0
-"access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","hr.group_hr_manager",1,1,1,1
-"access_hr_department_manager","hr.department.manager","model_hr_department","hr.group_hr_manager",1,1,1,1
-"access_hr_employee_marital_status","hr.employee.marital.status","model_hr_employee_marital_status","hr.group_hr_user",1,1,1,1
-"access_hr_job","hr.job","model_hr_job","hr.group_hr_user",1,0,0,0
+"access_hr_employee_category","hr.employee.category","model_hr_employee_category","base.group_hr_user",1,0,0,0
+"access_hr_employee","hr.employee","model_hr_employee","base.group_hr_user",1,1,1,1
+"access_hr_employee_resource","resource.resource","resource.model_resource_resource","base.group_hr_user",1,1,1,1
+"access_hr_department","hr.department","model_hr_department","base.group_hr_user",1,0,0,0
+"access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","base.group_hr_manager",1,0,0,0
+"access_hr_department_manager","hr.department.manager","model_hr_department","base.group_hr_manager",1,1,1,1
+"access_hr_employee_marital_status","hr.employee.marital.status","model_hr_employee_marital_status","base.group_system",1,1,1,1
+"access_hr_job","hr.job","model_hr_job","base.group_hr_user",1,0,0,0
+"access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","base.group_hr_manager",1,0,0,0
+"access_hr_employee_manager","hr.employee.manager","model_hr_employee","base.group_hr_manager",1,1,1,1
+"access_hr_employee_resource","resource.resource","resource.model_resource_resource","base.group_hr_manager",1,1,1,1
+"access_hr_department","hr.department","model_hr_department","base.group_hr_manager",1,1,1,1
+"access_hr_res_partner_address","res.partner.address","base.model_res_partner_address","base.group_hr_manager",1,1,1,1
+"access_hr_job","hr.job","model_hr_job","base.group_hr_manager",1,1,1,1
+"access_hr_employee","hr.employee","model_hr_employee_category","base.group_system",1,1,1,1
+

addons/hr_attendance/hr_attendance_view.xml

@@ -39,6 +39,7 @@
                     <field name="employee_id"/>
                     <field name="name"/>
                     <field name="action"/>
+                    <field name="day" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -71,11 +72,10 @@
             <field name="view_mode">tree,form</field>
             <field name="context">{"search_default_employee":1}</field>
             <field name="search_view_id" ref="view_hr_attendance_filter" />
-            <field name="help">Time Tracking functionality aims to manage employee's attendances on the basis of the actions (Sign in/Sign out) performed by them. You can also link this to an attndance machine using OpenERP's webservices features.</field>
         </record>
 
         <menuitem id="menu_hr_time_tracking" name="Time Tracking" parent="hr.menu_hr_root" sequence="3"/>
-        <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_time_tracking"       groups="hr.group_hr_manager" sequence="3"/>
+        <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_time_tracking" groups="base.group_hr_manager,base.group_hr_user,group_hr_attendance" sequence="3"/>
 
         <record id="edit_attendance_reason" model="ir.ui.view">
             <field name="name">hr.action.reason.form</field>
@@ -110,7 +110,7 @@
             <field name="view_id" ref="view_attendance_reason"/>
         </record>
 
-        <menuitem sequence="9" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
+        <menuitem sequence="9" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves" />
         <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_open_view_attendance_reason_config"/>
 
         <record id="hr_attendance_employee" model="ir.ui.view">

addons/hr_attendance/security/ir.model.access.csv

@@ -1,6 +1,11 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_action_reason_employee","hr action reason employee","model_hr_action_reason","hr_attendance.group_hr_attendance",1,0,0,0
-"access_hr_action_reason_employee","hr action reason employee","model_hr_action_reason","hr.group_hr_manager",1,1,1,1
-"access_hr_attendance_employee","hr attendance employee","model_hr_attendance","hr_attendance.group_hr_attendance",1,1,1,1
-"access_hr_employee_attendance","hr employee attendance sign in out","hr.model_hr_employee","hr_attendance.group_hr_attendance",1,0,0,0
-"access_hr_attendance_resource","hr resource attendance sign in out","resource.model_resource_resource","hr_attendance.group_hr_attendance",1,0,0,0
+"access_hr_action_reason_employee","hr action reason employee","model_hr_action_reason","group_hr_attendance",1,0,0,0
+"access_hr_action_reason_employee","hr action reason employee","model_hr_action_reason","base.group_hr_manager",1,1,1,1
+"access_hr_action_reason_employee_user","hr action reason employee user","model_hr_attendance","base.group_hr_user",1,1,1,1
+"access_hr_action_reason_employee_manager","hr action reason employee manager","model_hr_attendance","base.group_hr_manager",1,1,1,1
+"access_hr_attendance_employee","hr attendance employee","model_hr_attendance","group_hr_attendance",1,1,1,1
+"access_hr_employee_attendance","hr employee attendance sign in out","hr.model_hr_employee","group_hr_attendance",1,1,1,1
+"access_hr_attendance_resource","hr resource attendance sign in out","resource.model_resource_resource","group_hr_attendance",1,1,1,1
+"access_hr_job_attendance","hr_job_attendance","hr.model_hr_job","group_hr_attendance",1,0,0,0
+"access_hr_department_attendance","hr.department attendance","hr.model_hr_department","group_hr_attendance",1,0,0,0
+"access_hr_action_reason","hr.action.reason","model_hr_action_reason","base.group_system",1,1,1,1

addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml

@@ -47,7 +47,7 @@
         </record>
 
         <menuitem action="action_hr_attendance_sigh_in_out" id="menu_hr_attendance_sigh_in_out"
-            parent="menu_hr_time_tracking" sequence="4"/>
+            parent="menu_hr_time_tracking" sequence="4" groups="base.group_hr_manager,base.group_hr_user,group_hr_attendance"/>
 
        <record id="view_hr_attendance_so_ask" model="ir.ui.view">
             <field name="name">hr.sign.in.out.ask.form</field>

addons/hr_contract/hr_contract_view.xml

@@ -57,7 +57,7 @@
             <field name="search_view_id" ref="hr_contract_wage_type_view_search"/>
         </record>
 
-        <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_management" sequence="5"/>
+        <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_management" sequence="5" groups="base.group_system"/>
         <menuitem action="action_hr_contract_wage_type" id="hr_menu_contract_wage_type" parent="next_id_56"/>
 
         <record id="hr_contract_wage_type_period_view_form" model="ir.ui.view">

addons/hr_contract/security/hr_contract_security.xml

@@ -2,8 +2,8 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="group_hr_contract" model="res.groups">
-            <field name="name">Human Resources / Contracts</field>
+        <record id="base.group_hr_contract" model="res.groups">
+            <field name="name">Human Resources / Contract</field>
         </record>
 
     </data>

addons/hr_contract/security/ir.model.access.csv

@@ -1,15 +1,17 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_contract_wage_type_period_user","hr.contract.wage.type.period user","model_hr_contract_wage_type_period","hr.group_hr_user",1,0,0,0
-"access_hr_contract_wage_type_period","hr.contract.wage.type.period","model_hr_contract_wage_type_period","hr.group_hr_manager",1,1,1,1
-"access_hr_contract_wage_type_user","hr.contract.wage.type user","model_hr_contract_wage_type","hr.group_hr_user",1,0,0,0
-"access_hr_contract_wage_type","hr.contract.wage.type","model_hr_contract_wage_type","hr.group_hr_manager",1,1,1,1
-"access_hr_contract_wage_type_contract","hr.contract.wage.type contract","model_hr_contract_wage_type","group_hr_contract",1,1,1,1
-"access_hr_contract_wage_type_period_contract","hr.contract.wage.type.period contract","model_hr_contract_wage_type_period","group_hr_contract",1,1,1,1
-"access_hr_contract_user","hr.contract user","model_hr_contract","hr.group_hr_user",1,0,0,0
-"access_hr_contract","hr.contract","model_hr_contract","group_hr_contract",1,1,1,1
-"access_hr_employee_contract","hr.employee contract","hr.model_hr_employee","group_hr_contract",1,0,0,0
-"access_hr_resource_contract","hr.employee.resource contract","resource.model_resource_resource","group_hr_contract",1,0,0,0
-"access_hr_resource_calendar_contract","hr.employee.resource.calendar contract","resource.model_resource_calendar","group_hr_contract",1,0,0,0
-"access_hr_job_contract","hr.employee.job contract","hr.model_hr_job","group_hr_contract",1,0,0,0
-"access_hr_contract_type_user","hr.contract.type user","model_hr_contract_type","hr.group_hr_user",1,0,0,0
-"access_hr_contract_type","hr.contract.type","model_hr_contract_type","group_hr_contract",1,1,1,1
+"access_hr_contract_wage_type_period","hr.contract.wage.type.period","model_hr_contract_wage_type_period","base.group_hr_manager",1,1,1,1
+"access_hr_contract_wage_type","hr.contract.wage.type","model_hr_contract_wage_type","base.group_hr_manager",1,1,1,1
+"access_hr_contract_wage_type_contract","hr.contract.wage.type contract","model_hr_contract_wage_type","base.group_hr_contract",1,1,1,1
+"access_hr_contract_wage_type_period_contract","hr.contract.wage.type.period contract","model_hr_contract_wage_type_period","base.group_hr_contract",1,1,1,1
+"access_hr_contract","hr.contract","model_hr_contract","base.group_hr_contract",1,1,1,1
+"access_hr_employee_contract","hr.employee contract","hr.model_hr_employee","base.group_hr_contract",1,1,1,1
+"access_hr_resource_contract","hr.employee.resource contract","resource.model_resource_resource","base.group_hr_contract",1,1,1,1
+"access_hr_resource_calendar_contract","hr.employee.resource.calendar contract","resource.model_resource_calendar","base.group_hr_contract",1,1,1,1
+"access_hr_job_contract","hr.employee.job contract","hr.model_hr_job","base.group_hr_contract",1,1,1,1
+"access_hr_contract_type","hr.contract.type","model_hr_contract_type","base.group_hr_contract",1,1,1,1
+"access_hr_contract_wage_type","hr.contract.wage.type","model_hr_contract_wage_type","base.group_system",1,1,1,1
+"access_hr_contract_wage_type_period","hr.contract.wage.type.period","model_hr_contract_wage_type_period","base.group_system",1,1,1,1
+"access_hr_contract_type","hr.contract.type","model_hr_contract_type","base.group_system",1,1,1,1
+"access_hr_contract","hr.contract","model_hr_contract","base.group_system",1,1,1,1
+"access_hr_contract_type","hr.contract.type","model_hr_employee","base.group_system",1,1,1,1
+

addons/hr_evaluation/hr_evaluation_view.xml

@@ -62,8 +62,8 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="6"/>
-        <menuitem name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4"/>
+        <menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="6" groups="base.group_hr_manager"/>
+        <menuitem name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4" groups="base.group_system"/>
         <menuitem parent="menu_eval_hr_config" id="menu_open_view_hr_evaluation_plan_tree"
             action="open_view_hr_evaluation_plan_tree"/>
 
@@ -173,7 +173,7 @@
                         </page>
                         <page string="Internal Notes">
                             <field name="note_action" colspan="4" nolabel="1"
-                                groups="hr.group_hr_manager"/>
+                                groups="base.group_hr_manager"/>
                         </page>
                         <page string="Public Notes">
                             <field name="note_summary" colspan="4" nolabel="1"/>
@@ -261,7 +261,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
             <field name="search_view_id" ref="hr_evaluation.evaluation_search"/>
-            <field name="help">Each employee can be assigned to an evaluation plan. These plans define the frequency and the way you manage your periodic personnal evalautions. You will be able to define steps and attach interview forms to each step. OpenERP manages all kind of evaluations: bottom-up, top-down, self evaluation and final evaluation by the manager.</field>
         </record>
 
         <menuitem name="Evaluation" parent="menu_eval_hr" id="menu_open_view_hr_evaluation_tree"
@@ -348,12 +347,11 @@
             <field name="domain">[('is_evaluation' ,'=', True)]</field>
             <field name="context">{"search_default_todo":1,"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_hr_evaluation_interview_search"/>
-            <field name="help">Interview Requests are generated automatically by OpenERP according to employees evaluation plan. Each user receives automatic emails and requests to perform evaluation of their collegues periodically.</field>
         </record>
 
-        <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests"
+        <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests" groups="base.group_hr_manager" 
             action="action_hr_evaluation_interview_tree"/>
-        <menuitem name="Evaluation Reminders" parent="menu_eval_hr" id="menu_eval_send_mail"
+        <menuitem name="Evaluation Reminders" parent="menu_eval_hr" id="menu_eval_send_mail" groups="base.group_hr_manager"
            action="action_hr_evaluation_send_mail" sequence="45"/>
 
       <!-- Evaluation Interviews Button on Employee Form -->

addons/hr_evaluation/security/ir.model.access.csv

@@ -1,8 +1,11 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_evaluation_evaluation","hr_evaluation.evaluation","model_hr_evaluation_evaluation","hr.group_hr_user",1,1,1,1
-"access_hr_evaluation_plan","hr_evaluation.plan","model_hr_evaluation_evaluation","hr.group_hr_user",1,0,0,0
-"access_hr_evaluation_plan_manager","hr_evaluation.plan","model_hr_evaluation_plan","hr.group_hr_manager",1,1,1,1
-"access_hr_evaluation_plan_phase","hr_evaluation.plan.phase","model_hr_evaluation_plan_phase","hr.group_hr_user",1,0,0,0
-"access_hr_evaluation_plan_phase_manager","hr_evaluation.plan.phase","model_hr_evaluation_plan_phase","hr.group_hr_manager",1,1,1,1
-"access_hr_evaluation_interview","hr.evaluation.interview","model_hr_evaluation_interview","hr.group_hr_user",1,1,1,1
-"access_hr_evaluation_report","hr.evaluation.report","model_hr_evaluation_report","hr.group_hr_manager",1,0,0,0
+"access_hr_evaluation_evaluation","hr_evaluation.evaluation","model_hr_evaluation_evaluation","base.group_hr_user",1,1,1,1
+"access_hr_evaluation_evaluation_manager","hr_evaluation.evaluation","model_hr_evaluation_evaluation","base.group_hr_manager",1,0,0,0
+"access_hr_evaluation_plan","hr_evaluation.plan","model_hr_evaluation_evaluation","base.group_hr_user",1,0,0,0
+"access_hr_evaluation_plan_manager","hr_evaluation.plan","model_hr_evaluation_plan","base.group_hr_manager",1,0,0,0
+"access_hr_evaluation_plan_phase","hr_evaluation.plan.phase","model_hr_evaluation_plan_phase","base.group_hr_user",1,0,0,0
+"access_hr_evaluation_plan_phase_manager","hr_evaluation.plan.phase","model_hr_evaluation_plan_phase","base.group_hr_manager",1,0,0,0
+"access_hr_evaluation_interview","hr.evaluation.interview","model_hr_evaluation_interview","base.group_hr_user",1,1,1,1
+"access_hr_evaluation_interview_manager","hr.evaluation.interview","model_hr_evaluation_interview","base.group_hr_manager",1,0,0,0
+"access_hr_evaluation_report","hr.evaluation.report","model_hr_evaluation_report","base.group_hr_manager",1,0,0,0
+"access_hr_evaluation_plan","hr_evaluation.plan","model_hr_evaluation_plan","base.group_system",1,1,1,1

addons/hr_expense/hr_expense_view.xml

@@ -29,6 +29,7 @@
                 <tree string="Expenses" colors="blue:state=='draft'">
                     <field name="date"/>
                     <field name="employee_id"/>
+                    <field name="user_id" invisible="1"/>
                     <field name="department_id" groups="base.group_extended"/>
                     <field name="ref"/>
                     <field name="name"/>
@@ -158,11 +159,10 @@
             <field name="view_type">form</field>
             <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_hr_expense_filter"/>
-            <field name="help">The OpenERP expenses management module allows you to track the full flow. Every month, the employees record their expenses. At the end of the month, their managers validates the expenses sheets which creates costs on projects/analytic accounts. The accountant validates the proposed entries and the employee can be reimbursed. You can also reinvoice the customer at the end of the flow.</field>
         </record>
 
-        <menuitem id="next_id_49" name="Expenses" sequence="4" parent="hr.menu_hr_root"/>
-        <menuitem action="expense_all" id="menu_expense_all" name="Expenses" parent="next_id_49" groups="hr.group_hr_manager"/>
+        <menuitem id="next_id_49" name="Expenses" sequence="4" parent="hr.menu_hr_root" groups="base.group_hr_user"/>
+        <menuitem action="expense_all" id="menu_expense_all" name="Expenses" parent="next_id_49" groups="base.group_hr_manager,base.group_hr_user"/>
 
         <record id="view_product_hr_expense_form" model="ir.ui.view">
             <field name="name">product.product.expense.form</field>

addons/hr_expense/report/hr_expense_report_view.xml

@@ -10,6 +10,7 @@
             <tree colors="blue:state in ('draft');black:state in ('confirm','accepted','invoiced','paid');gray:state in('cancelled')" string="Expenses Analysis">
                 <field name="date" invisible="1"/>
                 <field name="employee_id" invisible="1"/>
+                <field name="user_id" invisible="1"/>
                 <field name="year" invisible="1"/>
                 <field name="month" invisible="1"/>
                 <field name="day" invisible="1"/>
@@ -51,27 +52,27 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Expenses Analysis">
-            	<group>
-            		<filter icon="terp-go-year" string="  365 Days  "
-	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-	                    help="Expenses during last 7 year"/>
-	                <filter icon="terp-go-month" string="   30 Days   "
-	                    name="month"
-	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-	                    help="Expenses during last month"/>
-		            <filter icon="terp-go-week" string="    7 Days    " separator="1"
-	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" help="Expenses during last 7 days"/>
-	                <separator orientation="vertical"/>
+              <group>
+                <filter icon="terp-go-year" string="  365 Days  "
+                      domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
+                      help="Expenses during last 7 year"/>
+                  <filter icon="terp-go-month" string="   30 Days   "
+                      name="month"
+                      domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+                      help="Expenses during last month"/>
+                <filter icon="terp-go-week" string="    7 Days    " separator="1"
+                      domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" help="Expenses during last 7 days"/>
+                  <separator orientation="vertical"/>
                     <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft Expenses"/>
                     <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]"
-		                help = "Confirm Expenses"/>
+                    help = "Confirm Expenses"/>
                     <filter string="Accepted" icon="terp-camera_test" domain="[('state','=','accepted')]"
-	                    help = "Accepted Expenses"/>
+                      help = "Accepted Expenses"/>
                     <separator orientation="vertical"/>
                     <field name="employee_id"/>
                     <field name="department_id"/>
-				</group>
-				<newline/>
+        </group>
+        <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
                     <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>

addons/hr_expense/security/ir.model.access.csv

@@ -1,4 +1,8 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_expense_expense","hr.expense.expense","model_hr_expense_expense","hr.group_hr_user",1,1,1,1
-"access_hr_expense_line","hr.expense.line","model_hr_expense_line","hr.group_hr_user",1,1,1,1
-"access_hr_expense_report","hr.expense.report","model_hr_expense_report","hr.group_hr_user",1,0,0,0
+"access_hr_expense_expense","hr.expense.expense","model_hr_expense_expense","base.group_hr_user",1,1,1,1
+"access_hr_expense_line","hr.expense.line","model_hr_expense_line","base.group_hr_user",1,1,1,1
+"access_hr_expense_report","hr.expense.report","model_hr_expense_report","base.group_hr_manager",1,0,0,0
+"access_product_product_hr_expense","product.product.hr.expense","product.model_product_product","base.group_hr_user",1,0,0,0
+"access_product_template_hr_expense","product.template.hr.expense","product.model_product_template","base.group_hr_user",1,0,0,0
+"access_product_uom_hr_expense","product.uom.hr.expense","product.model_product_uom","base.group_hr_user",1,0,0,0
+"access_product_price_type","product.price.type","product.model_product_price_type","base.group_hr_user",1,1,1,1

addons/hr_holidays/hr_holidays_view.xml

@@ -137,6 +137,7 @@
                     <field name="name"/>
                     <field name="holiday_status_id"/>
                     <field name="manager_id" invisible="1"/>
+                    <field name="user_id" invisible="1"/>
                     <field name="type"/>
                     <field name="state"/>
                 </tree>
@@ -194,6 +195,7 @@
                     <field name="name" invisible="1"/>
                     <field name="holiday_status_id"/>
                     <field name="manager_id" invisible="1"/>
+                    <field name="user_id" invisible="1"/>
                     <field name="type" invisible="1"/>
                     <field name="state" invisible="1"/>
                 </tree>
@@ -215,6 +217,7 @@
                     <field name="name"/>
                     <field name="holiday_status_id"/>
                     <field name="manager_id" invisible="1"/>
+                    <field name="user_id" invisible="1"/>
                     <field name="type"/>
                     <field name="state"/>
                 </tree>
@@ -253,7 +256,6 @@
             <field name="domain">[('type','=','remove')]</field>
             <field name="context">{'search_default_user_id':uid}</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
-            <field name="help">Leaves requests can be recorded by employees and validated by their managers. Once a leave request is validated it appears automatically in the agenda of the employee. You can define several allowance types (paid holidays, sickness, etc) and manage allowances per type.</field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_open_ask_holidays_tree">
@@ -314,7 +316,7 @@
             parent="menu_open_ask_holidays"
             id="menu_open_company_allocation"
             action="open_company_allocation"
-            groups="hr.group_hr_manager"
+            groups="base.group_hr_manager"
             sequence="40"/>
 
         <!-- holidays status -->
@@ -355,7 +357,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
+        <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves" groups="base.group_system"/>
         <menuitem name="Leave Status"
             action="open_view_holiday_status"
             id="menu_open_view_holiday_status"

addons/hr_holidays/security/ir.model.access.csv

@@ -1,11 +1,10 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","hr.group_hr_user",1,0,0,0
-"access_hr_holidays_user","hr holidays user","model_hr_holidays","hr.group_hr_user",1,1,1,0
-"access_hr_holydays_status_manager","hr.holidays.status manager","model_hr_holidays_status","hr.group_hr_manager",1,1,1,1
-"access_hr_holidays_manager","hr holidays manager","model_hr_holidays","hr.group_hr_manager",1,1,1,1
-"access_hr_holidays_remain","hr holidays user","model_hr_holidays_remaining_leaves_user","hr.group_hr_user",1,0,0,0
-"access_hr_holidays_report","hr.holidays.report","model_hr_holidays_report","hr.group_hr_manager",1,1,1,1
-"access_hr_holidays_remaining_leaves_user","hr.hr.holidays.remaining.leaves.user","model_hr_holidays_remaining_leaves_user","hr.group_hr_manager",1,1,1,1
-"access_available_holidays_report","hr.available.holidays.report","model_available_holidays_report","hr.group_hr_manager",1,1,1,1
-"access_hr_holidays_report_user","hr.holidays.report","model_hr_holidays_report","hr.group_hr_user",1,0,0,0
-"access_available_holidays_report_user","hr.available.holidays.report","model_available_holidays_report","hr.group_hr_user",1,0,0,0
+"access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","base.group_hr_user",1,0,0,0
+"access_hr_holidays_user","hr holidays user","model_hr_holidays","base.group_hr_user",1,1,1,0
+"access_hr_holydays_status_manager","hr.holidays.status manager","model_hr_holidays_status","base.group_hr_manager",1,0,0,0
+"access_hr_holidays_manager","hr holidays manager","model_hr_holidays","base.group_hr_manager",1,0,0,0
+"access_hr_holidays_remain","hr holidays user","model_hr_holidays_remaining_leaves_user","base.group_hr_user",1,0,0,0
+"access_hr_holidays_report","hr.holidays.report","model_hr_holidays_report","base.group_hr_manager",1,0,0,0
+"access_hr_holidays_remaining_leaves_user","hr.hr.holidays.remaining.leaves.user","model_hr_holidays_remaining_leaves_user","base.group_hr_manager",1,0,0,0
+"access_available_holidays_report","hr.available.holidays.report","model_available_holidays_report","base.group_hr_manager",1,0,0,0
+"access_hr_holydays_status","hr.holidays.status","model_hr_holidays_status","base.group_system",1,1,1,1

addons/hr_holidays/test/test_hr_holiday.yml

@@ -8,8 +8,8 @@
     context_lang: en_US
     groups_id:
       - base.group_user
-      - hr.group_hr_manager
-      - hr.group_hr_user
+      - base.group_hr_manager
+      - base.group_hr_user
     login: user1
     name: user1
     password: user1

addons/hr_payroll/__openerp__.py

@@ -45,11 +45,13 @@
     'init_xml': [
     ],
     'update_xml': [
+        'security/hr_security.xml',
         'hr_payroll_view.xml',
         'hr_payroll_workflow.xml',
         'hr_payroll_sequence.xml',
         'hr_paroll_report.xml',
         'hr_payroll_data.xml',
+        'security/ir.model.access.csv',
         'wizard/hr_payroll_create_analytic.xml',
         'wizard/hr_payroll_employees_detail.xml',
         'wizard/hr_payroll_year_salary.xml',

addons/hr_payroll/hr_payroll_view.xml

@@ -3,7 +3,7 @@
     <data>
         <!-- Root Menus -->
         <menuitem id="menu_hr_root_payroll" parent="hr.menu_hr_root" name="Payroll"/>
-        <menuitem id="payroll_configure" parent="hr.menu_hr_configuration" name="Payroll"/>
+        <menuitem id="payroll_configure" parent="hr.menu_hr_configuration" name="Payroll" groups="base.group_system"/>
         <menuitem id="menu_hr_payroll_reporting" parent="hr.menu_hr_reporting" name="Payroll"/>
 
         <!-- Passport Views    -->
@@ -425,11 +425,13 @@
                 <tree colors="blue:state in ('draft');black:state in ('confirm','new','hr_check','accont_check');gray:state in('done','cancel')" string="Payslip">
                     <field name="number"/>
                     <field name="employee_id"/>
+                    <field name="register_id" invisible="1"/>
                     <field name="name"/>
                     <field name="date"/>
                     <field name="grows"/>
                     <field name="net"/>
                     <field name="state"/>
+                    <field name="company_id"/>
                 </tree>
             </field>
         </record>
@@ -529,10 +531,10 @@
                     </group>
                     <newline/>
                     <group col="8" colspan="4" expand="0" string="Group By...">
-                        <filter string="Register" icon="terp-folder-yellow" name="register_id" context="{'register_id':self}"/>
-                        <filter string="Employees" icon="terp-partner" name="employee_id" context="{'employee_id':self}"/>
-                        <filter string="Periods" name="period_id" icon="terp-go-month" context="{'period_id':self}"/>
-                        <filter string="Staes" name="state" icon="terp-stock_effects-object-colorize" context="{'state':self}"/>
+                        <filter string="Register" icon="terp-folder-yellow" name="register_id" context="{'group_by':'register_id'}"/>
+                        <filter string="Employees" icon="terp-partner" name="employee_id" context="{'group_by':'employee_id'}"/>
+                        <filter string="Companies" name="company_id" icon="terp-go-month" context="{'group_by':'company_id'}"/>
+                        <filter string="States" name="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>