Merge lp:~openerp-dev/openobject-addons/trunk-acl-all into lp:openobject-addons

[Thibault Delavallée (OpenERP)]

Unmerged revisions

7845. By Turkesh Patel (openERP) on 2012-12-13

[MRG] merge with lp:openobject-addons

7844. By Turkesh Patel (openERP) on 2012-11-30

[IMP] improvement in event and account_budget.

7843. By Turkesh Patel (openERP) on 2012-11-30

[IMP] lunch: improved access rights.

7842. By Turkesh Patel (openERP) on 2012-11-30

[MRG] merge lp:~openerp-dev/openobject-addons/trunk-acl-all-security-aja

7841. By Turkesh Patel (openERP) on 2012-11-30

[IMP] Inproved applied groups and access rights.

7840. By Turkesh Patel (openERP) on 2012-11-30

[MRG] merge with lp:openobject-addons

7839. By Turkesh Patel (openERP) on 2012-11-29

[IMP] improve acl and applied groups.

7838. By Turkesh Patel (openERP) on 2012-11-28

[MRG] merge with lp:openobject-addons

7837. By Jigar A. on 2012-10-31

[MERGE] Stock user can cancel physical inventory., Account user(Accountant) can make asset entries., POS user can nto delete the pos order

7836. By Jigar A. on 2012-10-29

[MERGE] Mail Followers All Access lp:~openerp-dev/openobject-addons/trunk-acl-hr-security-aja

=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml	2013-10-27 12:31:04 +0000
+++ account/account_invoice_view.xml	2014-01-15 16:13:35 +0000
@@ -144,11 +144,19 @@
             <field name="arch" type="xml">
                 <form string="Supplier Invoice" version="7.0">
                 <header>
+<<<<<<< TREE
                         <button name="invoice_open" states="draft,proforma2" string="Validate" class="oe_highlight" groups="account.group_account_invoice"/>
                         <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid' groups="account.group_account_invoice"/>
                         <button name="invoice_cancel" states="draft,proforma2" string="Cancel Invoice" groups="account.group_account_invoice"/>
                         <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" groups="account.group_account_invoice"/>
                         <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
+=======
+                    <button name="invoice_open" states="draft,proforma2" string="Validate" class="oe_highlight" groups="account.group_account_invoice"/>
+                    <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid' groups="account.group_account_invoice"/>
+                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
+                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" groups="account.group_account_invoice"/>
+                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
+>>>>>>> MERGE-SOURCE
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                 </header>
                 <sheet string="Supplier Invoice">
@@ -297,12 +305,18 @@
                     <button name="invoice_print" string="Print" type="object" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight" groups="base.group_user"/>
                     <button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}" groups="base.group_user"/>
                     <button name="invoice_print" string="Print Invoice" type="object" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}" groups="base.group_user"/>
-                    <button name="invoice_open" states="draft" string="Validate" class="oe_highlight" groups="base.group_user"/>
-                    <button name="invoice_open" states="proforma2" string="Validate" groups="base.group_user"/>
+                    <button name="invoice_open" states="draft" string="Validate" groups="account.group_account_invoice" class="oe_highlight"/>
+                    <button name="invoice_open" states="proforma2" string="Validate" groups="account.group_account_invoice"/>
                     <button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/>
+<<<<<<< TREE
                     <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='open,proforma2,paid' groups="base.group_user"/>
                     <button name="invoice_cancel" states="draft,proforma2,open" string="Cancel Invoice" groups="base.group_no_one"/>
                     <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" groups="base.group_user"/>
+=======
+                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='open,proforma2,paid' groups="account.group_account_invoice"/>
+                    <button name="invoice_cancel" states="draft,proforma2,open" string="Cancel" groups="base.group_no_one"/>
+                    <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object"/>
+>>>>>>> MERGE-SOURCE
                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
                     <!--button name="%(account_invoices)d" string="Print Invoice" type="action" states="open,paid,proforma,sale,proforma2"/-->
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
@@ -411,7 +425,7 @@
                             <field name="tax_line">
                                 <tree editable="bottom" string="Taxes">
                                     <field name="name"/>
-                                    <field name="account_id" groups="account.group_account_user"/>
+                                    <field name="account_id" groups="account.group_account_invoice"/>
                                     <field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
                                     <field name="amount" on_change="amount_change(amount,parent.currency_id,parent.company_id,parent.date_invoice)"/>
                                     <field invisible="True" name="base_amount"/>
@@ -627,6 +641,11 @@
         </record>
         <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables"/>
 
+<<<<<<< TREE
+=======
+        <act_window context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner" groups="account.group_account_invoice"/>
+
+>>>>>>> MERGE-SOURCE
         <act_window
            id="act_account_journal_2_account_invoice_opened"
            name="Unpaid Invoices"

=== modified file 'account/account_menuitem.xml'
--- account/account_menuitem.xml	2012-12-19 06:56:45 +0000
+++ account/account_menuitem.xml	2014-01-15 16:13:35 +0000
@@ -19,7 +19,7 @@
         <menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
         <menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
         <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" groups="account.group_account_user" sequence="6"/>
-        <menuitem id="menu_finance_reporting" name="Accounting" parent="base.menu_reporting" sequence="35"/>
+        <menuitem id="menu_finance_reporting" name="Accounting" parent="base.menu_reporting" sequence="35" groups="group_account_user"/>
         <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting" groups="group_account_user"/>
         <menuitem id="menu_finance_reports" name="Reporting" parent="menu_finance" sequence="14" groups="group_account_user,group_account_manager"/>
         <menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reports"/>

=== modified file 'account/account_view.xml'
--- account/account_view.xml	2013-12-30 07:24:52 +0000
+++ account/account_view.xml	2014-01-15 16:13:35 +0000
@@ -344,6 +344,7 @@
             id="action_move_line_select"
             name="Journal Items"
             context="{'search_default_account_id': [active_id]}"
+            groups="account.group_account_user"
             res_model="account.move.line"
             src_model="account.account"/>
 
@@ -476,6 +477,7 @@
         <act_window
            id="act_account_journal_2_account_bank_statement"
            name="Bank statements"
+           groups="account.group_account_user"
            context="{'search_default_journal_id': active_id, 'default_journal_id': active_id}"
            res_model="account.bank.statement"
            src_model="account.journal"/>
@@ -483,6 +485,7 @@
         <act_window
            id="act_account_journal_2_account_move_line"
            name="Journal Items"
+           groups="account.group_account_user"
            context="{'search_default_journal_id': active_id, 'default_journal_id': active_id}"
            res_model="account.move.line"
            src_model="account.journal"/>
@@ -1784,6 +1787,27 @@
             </field>
         </record>
 
+<<<<<<< TREE
+=======
+        <!-- res.partner links -->
+        <act_window
+            context="{'search_default_unreconciled':True, 'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
+            domain="[('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]"
+            id="act_account_partner_account_move_all"
+            name="Receivables &amp; Payables"
+            res_model="account.move.line"
+            groups="account.group_account_user"
+            src_model="res.partner"/>
+
+        <act_window 
+            context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
+            id="act_account_partner_account_move"
+            name="Journal Items"
+            res_model="account.move.line"
+            src_model="res.partner"
+            groups="account.group_account_user"/>
+
+>>>>>>> MERGE-SOURCE
         <!-- Account Templates -->
         <menuitem
             id="account_template_folder"

=== modified file 'account/partner_view.xml'
--- account/partner_view.xml	2013-10-27 12:31:04 +0000
+++ account/partner_view.xml	2014-01-15 16:13:35 +0000
@@ -96,8 +96,13 @@
             <field name="priority">2</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
+<<<<<<< TREE
                 <page name="sales_purchases" position="after" version="7.0">
                 <page string="Accounting" col="4" name="accounting" attrs="{'invisible': [('is_company','=',False),('parent_id','!=',False)]}">
+=======
+                <page string="History" position="before" version="7.0">
+                <page string="Accounting" col="4" groups="account.group_account_invoice">
+>>>>>>> MERGE-SOURCE
                     <group>
                         <group>
                             <field name="property_account_position" widget="selection"/>
@@ -135,5 +140,21 @@
                 </page>
             </field>
         </record>
+<<<<<<< TREE
+=======
+
+        <!--  Partners info tab view-->
+
+        <act_window
+            id="action_analytic_open"
+            name="Contracts/Analytic Accounts"
+            res_model="account.analytic.account"
+            context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
+            src_model="res.partner"
+            view_type="form"
+            groups="analytic.group_analytic_accounting"
+            view_mode="tree,form"/>
+
+>>>>>>> MERGE-SOURCE
     </data>
 </openerp>

=== modified file 'account/security/ir.model.access.csv'
--- account/security/ir.model.access.csv	2013-10-27 12:31:04 +0000
+++ account/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -26,7 +26,8 @@
 access_account_analytic_account,account.analytic.account,analytic.model_account_analytic_account,base.group_user,1,0,0,0
 access_account_analytic_journal,account.analytic.journal,model_account_analytic_journal,account.group_account_user,1,0,0,0
 access_account_analytic_journal_user,account.analytic.journal,model_account_analytic_journal,base.group_user,1,1,1,0
-access_account_invoice_uinvoice,account.invoice,model_account_invoice,account.group_account_invoice,1,1,1,1
+access_account_invoice_uinvoice,account.invoice,model_account_invoice,account.group_account_invoice,1,1,1,0
+access_account_invoice_uinvoice_user,account.invoice user,model_account_invoice,account.group_account_user,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_move_uinvoice,account.move,model_account_move,account.group_account_invoice,1,1,1,1
@@ -37,10 +38,12 @@
 access_account_payment_term_line_manager,account.payment.term.line,model_account_payment_term_line,account.group_account_manager,1,1,1,1
 access_account_tax_manager,account.tax,model_account_tax,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_accountant,account.journal.accountant,model_account_journal,account.group_account_user,1,1,1,0
 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_user,1,1,1,1
 access_account_period_invoice,account.period invoice,model_account_period,account.group_account_invoice,1,0,0,0
-access_account_invoice_group_invoice,account.invoice group invoice,model_account_invoice,account.group_account_invoice,1,1,1,1
+access_account_invoice_group_invoice,account.invoice group invoice,model_account_invoice,account.group_account_invoice,1,1,1,0
+access_account_invoice_group_user,account.invoice group user,model_account_invoice,account.group_account_user,1,1,1,1
 access_account_analytic_journal_manager,account.analytic.journal,model_account_analytic_journal,account.group_account_manager,1,1,1,1
 access_account_fiscalyear,account.fiscalyear,model_account_fiscalyear,account.group_account_manager,1,1,1,1
 access_account_fiscalyear_invoice,account.fiscalyear.invoice,model_account_fiscalyear,account.group_account_invoice,1,0,0,0
@@ -69,13 +72,13 @@
 access_report_invoice_created,report.invoice.created,model_report_invoice_created,account.group_account_manager,1,1,1,1
 access_report_account_type_sales,report.account_type.sales,model_report_account_type_sales,account.group_account_manager,1,1,1,1
 access_report_account_sales,report.account.sales,model_report_account_sales,account.group_account_manager,1,1,1,1
-access_account_invoice_report,account.invoice.report,model_account_invoice_report,account.group_account_manager,1,1,1,1
+access_account_invoice_report,account.invoice.report,model_account_invoice_report,account.group_account_manager,1,1,1,0
 access_res_partner_group_account_manager,res_partner group_account_manager,model_res_partner,account.group_account_manager,1,0,0,0
 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_move_line_manager,account.move.line manager,model_account_move_line,account.group_account_manager,1,0,0,0
 access_account_move_manager,account.move manager,model_account_move,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_account_entries_report_manager,account.entries.report,model_account_entries_report,account.group_account_manager,1,1,1,0
 access_account_entries_report_invoice,account.entries.report,model_account_entries_report,account.group_account_invoice,1,0,0,0
 access_account_entries_report_employee,account.entries.report employee,model_account_entries_report,base.group_user,1,0,0,0
 access_analytic_entries_report_manager,analytic.entries.report,model_analytic_entries_report,account.group_account_manager,1,0,0,0

=== added file 'account_analytic_analysis/account_analytic_analysis_menu.xml.OTHER'
--- account_analytic_analysis/account_analytic_analysis_menu.xml.OTHER	1970-01-01 00:00:00 +0000
+++ account_analytic_analysis/account_analytic_analysis_menu.xml.OTHER	2014-01-15 16:13:35 +0000
@@ -0,0 +1,103 @@
+<openerp>
+    <data>
+        <menuitem id="base.menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="5" groups="account.group_account_invoice"/>
+
+        <record id="action_hr_tree_invoiced_all" model="ir.actions.act_window">
+            <field name="name">Time &amp; Materials to Invoice</field>
+            <field name="res_model">account.analytic.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('invoice_id','=',False)]</field>
+            <field name="context">{'search_default_to_invoice': 1, 'search_default_sales': 1}</field>
+            <field name="search_view_id" ref="account.view_account_analytic_line_filter"/>
+            <field name="help" type="html">
+              <p>
+                You will find here timesheets and purchases you did for
+                contracts that can be reinvoiced to the customer.  If you want
+                to record new activities to invoice, you should use the timesheet
+                menu instead.
+              </p>
+            </field>
+        </record>
+        <menuitem action="action_hr_tree_invoiced_all" id="menu_action_hr_tree_invoiced_all" parent="base.menu_invoiced" sequence="5"/>
+
+        <record id="view_account_analytic_account_overdue_search" model="ir.ui.view">
+            <field name="name">account.analytic.account.search</field>
+            <field name="model">account.analytic.account</field>
+            <field name="arch" type="xml">
+                <search string="Analytic Account">
+                    <field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/>
+                    <field name="date"/>
+                    <filter icon="terp-camera_test" name="open" string="Open" domain="[('state','in',('open','draft'))]" help="Contracts in progress"/>
+                    <filter icon="terp-gtk-media-pause" name="pending" string="Pending" domain="[('state','=','pending')]" help="Pending contracts to renew with your customer"/>
+                    <filter icon="terp-go-today" string="To Renew" domain="['|', '&amp;', ('date', '!=', False), ('date', '&lt;=', time.strftime('%%Y-%%m-%%d')), ('is_overdue_quantity', '=', True)]" name="renew"
+                        help="The contracts to be renewed because the deadline is passed or the working hours are higher than the allocated hours" />
+                    <separator/>
+                    <filter string="Customer Contracts" help="A contract in OpenERP is an analytic account having a partner set on it." name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" />
+                    <separator/>
+                    <filter string="Contracts not assigned" help="Contracts that are not assigned to an account manager." domain="[('manager_id', '=', False)]" icon="terp-personal-" />
+                    <field name="partner_id"/>
+                    <field name="manager_id"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Status" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Account Manager" domain="[]" context="{'group_by':'manager_id'}"/>
+                        <filter string="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Parent" domain="[]" context="{'group_by':'parent_id'}"/>
+                        <filter string="Start Date" domain="[]" context="{'group_by' : 'date_start'}" />
+                        <filter string="End Date" domain="[]" context="{'group_by' : 'date'}" />
+                    </group>
+                </search>
+            </field>
+        </record>
+
+
+        <record id="action_account_analytic_overdue" model="ir.actions.act_window">
+            <field name="name">Contracts to Renew</field>
+            <field name="res_model">account.analytic.account</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_manager_id':uid, 'search_default_pending':1, 'search_default_renew':1}</field>
+            <field name="domain">[('type','=','contract')]</field>
+            <field name="search_view_id" ref="view_account_analytic_account_overdue_search"/>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to define a new contract.
+              </p><p>
+                You will find here the contracts to be renewed because the
+                end date is passed or the working effort is higher than the
+                maximum authorized one.
+              </p><p>
+                OpenERP automatically sets contracts to be renewed in a pending
+                state. After the negociation, the salesman should close or renew
+                pending contracts.
+              </p>
+            </field>
+        </record>
+        <menuitem action="action_account_analytic_overdue" id="menu_action_account_analytic_overdue" sequence="50" parent="base.menu_invoiced"/>
+
+        <record id="action_account_analytic_overdue_all" model="ir.actions.act_window">
+            <field name="name">Contracts</field>
+            <field name="res_model">account.analytic.account</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'default_type':'contract', 'search_default_open':1, 'search_default_pending':1, 'default_manager_id':uid}</field>
+            <field name="domain">[('type','=','contract')]</field>
+            <field name="search_view_id" ref="view_account_analytic_account_overdue_search"/>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click to create a new contract.
+                </p><p>
+                    Use contracts to follow tasks, issues, timesheets or invoicing based on
+                    work done, expenses and/or sales orders. OpenERP will automatically manage
+                    the alerts for the renewal of the contracts to the right salesperson.
+                </p>
+            </field>
+        </record>
+        <menuitem id="base.menu_sales" name="Sales"
+            parent="base.menu_base_partner"
+            sequence="1"/>
+        <menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="7" parent="base.menu_sales"/>
+
+
+    </data>
+</openerp>

=== modified file 'account_analytic_analysis/account_analytic_analysis_view.xml'
--- account_analytic_analysis/account_analytic_analysis_view.xml	2013-10-27 12:31:04 +0000
+++ account_analytic_analysis/account_analytic_analysis_view.xml	2014-01-15 16:13:35 +0000
@@ -334,7 +334,11 @@
                 </p>
             </field>
         </record>
+<<<<<<< TREE
         <menuitem action="template_of_contract_action" id="menu_template_of_contract_action" parent="base.menu_base_config"/>
 
+=======
+        <menuitem action="template_of_contract_action" id="menu_template_of_contract_action" parent="base.menu_base_config" groups="base.group_sale_manager"/>
+>>>>>>> MERGE-SOURCE
     </data>
 </openerp>

=== modified file 'account_analytic_default/security/ir.model.access.csv'
--- account_analytic_default/security/ir.model.access.csv	2011-12-19 16:54:40 +0000
+++ account_analytic_default/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -2,3 +2,4 @@
 access_account_analytic_default,account.analytic.default,model_account_analytic_default,account.group_account_user,1,0,0,0
 access_account_analytic_default_invoice,account.analytic.default invoice,model_account_analytic_default,account.group_account_invoice,1,1,1,1
 access_account_analytic_default_salesman,account.analytic.default.salesman,model_account_analytic_default,base.group_sale_salesman,1,1,1,1
+access_account_analytic_default_user,account.analytic.default.user,model_account_analytic_default,,1,0,0,0
\ No newline at end of file

=== modified file 'account_asset/account_asset_view.xml'
--- account_asset/account_asset_view.xml	2013-10-27 12:31:04 +0000
+++ account_asset/account_asset_view.xml	2014-01-15 16:13:35 +0000
@@ -77,9 +77,9 @@
         <field name="arch" type="xml">
             <form string="Asset" version="7.0">
                 <header>
-                    <button name="validate" states="draft" string="Confirm Asset" type="object" class="oe_highlight"/>
-                    <button name="set_to_close" states="open" string="Set to Close" type="object" class="oe_highlight"/>
-                    <button name="set_to_draft" states="open" string="Set to Draft" type="object" />
+                    <button name="validate" states="draft" string="Confirm Asset" type="object" class="oe_highlight" groups="account.group_account_manager"/>
+                    <button name="set_to_close" states="open" string="Set to Close" type="object" class="oe_highlight" groups="account.group_account_manager"/>
+                    <button name="set_to_draft" states="open" string="Set to Draft" type="object" groups="account.group_account_manager"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
                 </header>
                 <sheet>

=== modified file 'account_asset/security/ir.model.access.csv'
--- account_asset/security/ir.model.access.csv	2013-10-27 12:31:04 +0000
+++ account_asset/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -1,11 +1,10 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_account_asset_category,account.asset.category,model_account_asset_category,account.group_account_user,1,0,0,0
-access_account_asset_asset,account.asset.asset,model_account_asset_asset,account.group_account_user,1,0,0,0
+access_account_asset_asset,account.asset.asset,model_account_asset_asset,account.group_account_user,1,1,1,1
 access_account_asset_history,account.asset.history,model_account_asset_history,account.group_account_user,1,0,0,0
 access_account_asset_category_manager,account.asset.category,model_account_asset_category,account.group_account_manager,1,1,1,1
-access_account_asset_asset_manager,account.asset.asset,model_account_asset_asset,account.group_account_manager,1,1,1,1
 access_account_asset_history_manager,account.asset.history,model_account_asset_history,account.group_account_manager,1,1,1,1
-access_account_asset_depreciation_line,account.asset.depreciation.line,model_account_asset_depreciation_line,account.group_account_user,1,0,0,0
+access_account_asset_depreciation_line,account.asset.depreciation.line,model_account_asset_depreciation_line,account.group_account_user,1,1,0,0
 access_account_asset_depreciation_line_manager,account.asset.depreciation.line,model_account_asset_depreciation_line,account.group_account_manager,1,1,1,1
 access_asset_asset_report,asset.asset.report,model_asset_asset_report,account.group_account_user,1,0,0,0
-access_asset_asset_report_manager,asset.asset.report,model_asset_asset_report,account.group_account_manager,1,1,1,1
+access_asset_asset_report_manager,asset.asset.report,model_asset_asset_report,account.group_account_manager,1,1,1,0

=== modified file 'account_budget/account_budget_view.xml'
--- account_budget/account_budget_view.xml	2013-10-27 12:31:04 +0000
+++ account_budget/account_budget_view.xml	2014-01-15 16:13:35 +0000
@@ -141,7 +141,7 @@
                                     <form string="Budget Lines" version="7.0">
                                         <group>
                                             <group>
-                                                <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+                                                <field name="analytic_account_id"/>
                                                 <field name="general_budget_id"/>
                                                 <field name="planned_amount"/>
                                             </group>
@@ -292,6 +292,7 @@
             context="{'search_default_analytic_account_id': [active_id], 'default_analytic_account_id': active_id}"
             res_model="crossovered.budget.lines"
             src_model="account.analytic.account"
+            groups="account.group_account_user"
             id="act_account_analytic_account_cb_lines"/>
 
 

=== modified file 'account_budget/security/ir.model.access.csv'
--- account_budget/security/ir.model.access.csv	2012-11-29 22:26:45 +0000
+++ account_budget/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -1,6 +1,7 @@
 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,0,0,0
 access_account_budget_post,account.budget.post,model_account_budget_post,account.group_account_manager,1,0,0,0
+access_account_budget_post_user,account.budget.post user,model_account_budget_post,base.group_user,1,0,0,0
 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_crossovered_budget_lines_accountant,crossovered.budget.lines accountant,model_crossovered_budget_lines,account.group_account_user,1,1,1,1

=== modified file 'account_followup/security/ir.model.access.csv'
--- account_followup/security/ir.model.access.csv	2013-10-27 12:31:04 +0000
+++ account_followup/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_account_followup_followup_line,account_followup.followup.line,model_account_followup_followup_line,account.group_account_invoice,1,0,0,0
 access_account_followup_followup_line_manager,account_followup.followup.line.manager,model_account_followup_followup_line,account.group_account_manager,1,1,1,1
@@ -5,3 +6,13 @@
 access_account_followup_followup_manager,account_followup.followup.manager,model_account_followup_followup,account.group_account_manager,1,1,1,1
 access_account_followup_stat_invoice,account_followup.stat.invoice,model_account_followup_stat,account.group_account_invoice,1,1,0,0
 access_account_followup_stat_by_partner_manager,account_followup.stat.by.partner,model_account_followup_stat_by_partner,account.group_account_user,1,1,0,0
+=======
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_followup_followup_line,account_followup.followup.line,model_account_followup_followup_line,account.group_account_invoice,1,0,0,0
+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_accountant,account_followup.followup user,model_account_followup_followup,account.group_account_user,1,0,0,0
+access_account_followup_followup_manager,account_followup.followup.manager,model_account_followup_followup,account.group_account_manager,1,1,1,1
+access_account_followup_stat_invoice,account_followup.stat.invoice,model_account_followup_stat,account.group_account_invoice,1,1,1,1
+access_account_followup_stat_by_partner_manager,account_followup.stat.by.partner,model_account_followup_stat_by_partner,account.group_account_manager,1,1,1,1
+access_account_followup_stat_by_partner_user,account_followup.stat.by.partner,model_account_followup_stat_by_partner,account.group_account_user,1,1,1,0
+>>>>>>> MERGE-SOURCE

=== modified file 'account_payment/security/ir.model.access.csv'
--- account_payment/security/ir.model.access.csv	2011-12-19 16:54:40 +0000
+++ account_payment/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -1,6 +1,7 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_payment_mode,payment.mode,model_payment_mode,group_account_payment,1,1,1,1
-access_payment_order,payment.order,model_payment_order,group_account_payment,1,1,1,1
+access_payment_order,payment.order,model_payment_order,group_account_payment,1,1,1,0
+access_payment_order_user,payment.order user,model_payment_order,account.group_account_user,1,1,1,1
 access_payment_line,payment.line,model_payment_line,group_account_payment,1,1,1,1
 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

=== modified file 'account_voucher/account_voucher_view.xml'
--- account_voucher/account_voucher_view.xml	2013-10-27 12:31:04 +0000
+++ account_voucher/account_voucher_view.xml	2014-01-15 16:13:35 +0000
@@ -180,6 +180,7 @@
             id="act_journal_voucher_open"
             name="Voucher Entries"
             context="{'search_default_journal_id': active_id, 'type':type, 'default_journal_id': active_id}"
+            groups="account.group_account_user"
             res_model="account.voucher"
             src_model="account.journal"/>
 

=== modified file 'account_voucher/security/ir.model.access.csv'
--- account_voucher/security/ir.model.access.csv	2011-12-19 16:54:40 +0000
+++ account_voucher/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -1,7 +1,8 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 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,0,0,0
-access_account_voucher_invoice,account.voucher invoice,model_account_voucher,account.group_account_invoice,1,1,1,1
+access_account_voucher_invoice,account.voucher invoice,model_account_voucher,account.group_account_invoice,1,1,1,0
+access_account_voucher_user,account.voucher user,model_account_voucher,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
-access_sale_receipt_report_manager,account.sale.receipt.report,model_sale_receipt_report,account.group_account_manager,1,1,1,1
+access_sale_receipt_report_manager,account.sale.receipt.report,model_sale_receipt_report,account.group_account_manager,1,1,1,0
 access_sale_receipt_report_user,account.sale.receipt.report,model_sale_receipt_report,account.group_account_user,1,0,0,0

=== modified file 'account_voucher/voucher_payment_receipt_view.xml'
--- account_voucher/voucher_payment_receipt_view.xml	2013-10-27 12:31:04 +0000
+++ account_voucher/voucher_payment_receipt_view.xml	2014-01-15 16:13:35 +0000
@@ -453,7 +453,7 @@
                                         on_change="onchange_move_line_id(move_line_id)"
                                         domain="[('account_id.type','in',('receivable','payable')), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
                                         required="1"
-                                        groups="account.group_account_user"/>
+                                        groups="account.group_account_invoice"/>
                                     <field name="account_id"  groups="base.group_no_one" domain="[('type','=','receivable')]"/>
                                     <field name="date_original" readonly="1"/>
                                     <field name="date_due" readonly="1"/>

=== modified file 'account_voucher/voucher_sales_purchase_view.xml'
--- account_voucher/voucher_sales_purchase_view.xml	2013-10-27 12:31:04 +0000
+++ account_voucher/voucher_sales_purchase_view.xml	2014-01-15 16:13:35 +0000
@@ -89,7 +89,7 @@
                         <page string="Sales Information">
                             <field name="line_cr_ids" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
                                 <tree string="Sales Lines" editable="bottom">
-                                    <field name="account_id" domain="[('user_type.report_type','=','income'),('type','!=','view')]" widget="selection"/>
+                                    <field name="account_id" domain="[('user_type.report_type','=','income'),('type','!=','view')]" widget="selection" groups="account.group_account_invoice"/>
                                     <field name="name"/>
                                     <field name="amount" sum="Total"/>
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>

=== modified file 'association/profile_association.xml'
--- association/profile_association.xml	2012-11-29 22:26:45 +0000
+++ association/profile_association.xml	2014-01-15 16:13:35 +0000
@@ -7,6 +7,7 @@
             id="base.menu_association"
             groups="base.group_user"
             sequence="45"/>
+        <menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="30" groups="base.group_partner_manager"/>
         <menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="30"/>
         <menuitem name="Association" id="base.menu_report_association" parent="base.menu_reporting" sequence="23"/>
 

=== modified file 'calendar/security/ir.model.access.csv'
--- calendar/security/ir.model.access.csv	2014-01-10 17:09:12 +0000
+++ calendar/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -4,13 +4,22 @@
 access_calendar_attendee_survey_user,calendar.attendee,model_calendar_attendee,base.group_survey_user,1,0,0,0
 access_crm_meeting_manager,crm.meeting.manager,model_crm_meeting,base.group_sale_manager,1,1,1,1
 access_crm_meeting,crm.meeting,model_crm_meeting,base.group_sale_salesman,1,1,1,0
+<<<<<<< TREE
 access_crm_meeting_all,crm.meeting_all,model_crm_meeting,base.group_user,1,1,1,1
 access_crm_meeting_partner_manager,crm.meeting.partner.manager,model_crm_meeting,base.group_partner_manager,1,1,1,1
 access_crm_meeting_type_all,crm.meeting.type.all,model_crm_meeting_type,,1,0,0,0
+=======
+access_crm_meeting_all,crm.meeting_allll,model_crm_meeting,base.group_user,1,0,0,0
+access_crm_meeting_partner_manager,crm.meeting.partner.manager,model_crm_meeting,base.group_partner_manager,1,1,1,0
+>>>>>>> MERGE-SOURCE
 access_crm_meeting_type_sale_manager,crm.meeting.type.manager,model_crm_meeting_type,base.group_sale_manager,1,1,1,0
 access_crm_meeting_type_sale_user,crm.meeting.type.user,model_crm_meeting_type,base.group_user,1,0,0,0
 access_crm_meeting_type_sale_user,crm.meeting.type.salesman,model_crm_meeting_type,base.group_sale_salesman,1,0,0,0
 access_crm_meeting_type_manager,crm.meeting.type.manager,model_crm_meeting_type,base.group_system,1,1,1,1
+<<<<<<< TREE
 access_calendar_alarm_manager,access_calendar_alarm_manager,model_calendar_alarm_manager,,1,1,1,1
 access_calendar_contacts_all,access_calendar_contacts_all,model_calendar_contacts,,1,1,1,1
 access_calendar_contacts,access_calendar_contacts,model_calendar_contacts,base.group_system,1,1,1,1
+=======
+access_crm_meeting_type_user,crm.meeting.type.user,model_crm_meeting_type,base.group_user,1,1,1,0
+>>>>>>> MERGE-SOURCE

=== modified file 'crm/res_partner_view.xml'
--- crm/res_partner_view.xml	2013-12-19 14:47:39 +0000
+++ crm/res_partner_view.xml	2014-01-15 16:13:35 +0000
@@ -85,6 +85,7 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
+<<<<<<< TREE
                 <data>
                     <field name="user_id" position="after">
                         <field name="section_id" completion="1" groups="base.group_multi_salesteams"/>
@@ -103,6 +104,19 @@
                             context="{'search_default_partner_id': active_id, 'default_duration': 1.0}" />
                     </xpath>
                 </data>
+=======
+                <xpath expr="//div[@name='buttons']" position="inside">
+                    <button type="action"
+                        string="Meetings"
+                        name="%(base_calendar.action_crm_meeting)d"
+                        context="{'search_default_partner_ids': active_id, 'default_partner_ids' : [active_id]}" groups="base.group_sale_salesman"/>
+                    <button type="action" string="Calls" 
+                        name="%(crm.crm_case_categ_phone_incoming0)d" 
+                        context="{'search_default_partner_id': active_id, 'default_duration': 1.0}" groups="base.group_sale_salesman"/>
+                    <button type="action" string="Opportunities" attrs="{'invisible': [('customer', '=', False)]}"
+                        name="%(crm.crm_case_category_act_oppor11)d" context="{'search_default_partner_id': active_id}" groups="base.group_sale_salesman"/>
+                </xpath>
+>>>>>>> MERGE-SOURCE
             </field>
         </record>
 

=== modified file 'crm/security/ir.model.access.csv'
--- crm/security/ir.model.access.csv	2013-11-27 15:32:57 +0000
+++ crm/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -19,7 +19,7 @@
 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_phonecall_report_manager,crm.phonecall.report,model_crm_phonecall_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,0
 access_res_partner_manager,res.partner.crm.manager,base.model_res_partner,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
 access_calendar_attendee_crm_user,calendar.attendee.crm.user,model_calendar_attendee,base.group_sale_salesman,1,1,1,0
@@ -28,10 +28,16 @@
 access_res_partner_category,res.partner.category.crm.user,base.model_res_partner_category,base.group_sale_salesman,1,1,1,0
 mail_mailgate_thread,mail.thread,mail.model_mail_thread,base.group_sale_salesman,1,1,1,1
 access_crm_case_categ_manager,crm.case.categ manager,model_crm_case_categ,base.group_sale_manager,1,1,1,1
+<<<<<<< TREE
 access_base_action_rule_manager,base.action.rule manager,base_action_rule.model_base_action_rule,base.group_sale_manager,1,1,1,1
 access_crm_lead_report_user,crm.lead.report user,model_crm_lead_report,base.group_sale_salesman,1,1,1,1
+=======
+access_base_action_rule_manager,base.action.rule manager,model_base_action_rule,base.group_sale_manager,1,1,1,1
+access_crm_lead_report_user,crm.lead.report user,model_crm_lead_report,base.group_sale_salesman,1,1,1,0
+>>>>>>> MERGE-SOURCE
 access_res_partner_bank_type_crm_user,res.partner.bank.type.crm.user,base.model_res_partner_bank_type,base.group_sale_salesman,1,0,0,0
 access_crm_lead_partner_manager,crm.lead.partner.manager,model_crm_lead,base.group_partner_manager,1,0,0,0
-access_crm_phonecall_partner_manager,crm.phonecall.partner.manager,model_crm_phonecall,base.group_partner_manager,1,1,1,1
+access_crm_phonecall_partner_manager,crm.phonecall.partner.manager,model_crm_phonecall,base.group_partner_manager,1,1,1,0
+access_crm_phonecall_sale_manager,crm.phonecall.sale.manager,model_crm_phonecall,base.group_sale_manager,1,1,1,1
 access_crm_payment_mode_user,crm.payment.mode,model_crm_payment_mode,base.group_sale_salesman,1,0,0,0
 access_crm_payment_mode,crm.payment.mode,model_crm_payment_mode,base.group_sale_manager,1,1,1,1

=== modified file 'crm_claim/__openerp__.py'
--- crm_claim/__openerp__.py	2013-10-27 12:31:04 +0000
+++ crm_claim/__openerp__.py	2014-01-15 16:13:35 +0000
@@ -40,6 +40,7 @@
         'crm_claim_view.xml',
         'crm_claim_menu.xml',
         'security/ir.model.access.csv',
+        'security/crm_claim_security.xml',
         'report/crm_claim_report_view.xml',
         'crm_claim_data.xml',
         'res_partner_view.xml',

=== modified file 'crm_claim/crm_claim_view.xml'
--- crm_claim/crm_claim_view.xml	2013-10-27 12:31:04 +0000
+++ crm_claim/crm_claim_view.xml	2014-01-15 16:13:35 +0000
@@ -203,5 +203,39 @@
                 </search>
             </field>
         </record>
+<<<<<<< TREE
+=======
+
+        <record id="view_claim_partner_info_form1" model="ir.ui.view">
+            <field name="name">res.partner.claim.info.form</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="priority">20</field>
+            <field name="arch" type="xml">
+                <xpath expr="//page[@name='page_history']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                </xpath>
+                <xpath expr="//page[@name='page_history']" position="inside">
+                    <group name="grp_claim" string="Claim" groups="crm_claim.group_claim_user">
+                        <field name="claims_ids" colspan="4" nolabel="1">
+                            <tree string="Partners Claim" editable="bottom">
+                                <field name="name"/>
+                            </tree>
+                        </field>
+                    </group>
+                </xpath>
+            </field>
+        </record>
+
+        <act_window
+            context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
+            id="act_claim_partner"
+            name="Claims"
+            groups="base.group_sale_manager"
+            view_mode="tree,form"
+            res_model="crm.claim"
+            src_model="res.partner"/>
+
+>>>>>>> MERGE-SOURCE
      </data>
 </openerp>

=== added file 'crm_claim/security/crm_claim_security.xml'
--- crm_claim/security/crm_claim_security.xml	1970-01-01 00:00:00 +0000
+++ crm_claim/security/crm_claim_security.xml	2014-01-15 16:13:35 +0000
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="0">
+    <record id="crm_claim_rule_claim" model="ir.rule">
+        <field name="name">Claim</field>
+        <field ref="model_crm_claim" name="model_id"/>
+        <field name="domain_force">['|',('user_id','=',user.id),('user_id','=',False)]</field>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
+    </record>
+</data>
+</openerp>
\ No newline at end of file

=== modified file 'crm_claim/security/ir.model.access.csv'
--- crm_claim/security/ir.model.access.csv	2012-06-01 09:23:52 +0000
+++ crm_claim/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -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,base.group_sale_manager,1,1,1,1
+access_crm_claim,crm.claim.user,model_crm_claim,base.group_user,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_stage_user,crm.claim.stage.user,model_crm_claim_stage,base.group_sale_salesman,1,1,1,1
 access_crm_claim_report_manager,crm.claim.report.manager,model_crm_claim_report,base.group_sale_manager,1,1,1,1

=== modified file 'crm_helpdesk/__openerp__.py'
--- crm_helpdesk/__openerp__.py	2012-11-29 22:26:45 +0000
+++ crm_helpdesk/__openerp__.py	2014-01-15 16:13:35 +0000
@@ -40,6 +40,7 @@
         'crm_helpdesk_view.xml',
         'crm_helpdesk_menu.xml',
         'security/ir.model.access.csv',
+        'security/crm_helpdesk_security.xml',
         'report/crm_helpdesk_report_view.xml',
         'crm_helpdesk_data.xml',
     ],

=== added file 'crm_helpdesk/security/crm_helpdesk_security.xml'
--- crm_helpdesk/security/crm_helpdesk_security.xml	1970-01-01 00:00:00 +0000
+++ crm_helpdesk/security/crm_helpdesk_security.xml	2014-01-15 16:13:35 +0000
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="0">
+    <record id="crm_helpdesk_rule_support" model="ir.rule">
+        <field name="name">Helpdesk and Support</field>
+        <field ref="model_crm_helpdesk" name="model_id"/>
+        <field name="domain_force">['|',('user_id','=',user.id),('user_id','=',False)]</field>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
+    </record>
+</data>
+</openerp>
\ No newline at end of file

=== modified file 'crm_partner_assign/res_partner_view.xml'
--- crm_partner_assign/res_partner_view.xml	2013-10-27 12:31:04 +0000
+++ crm_partner_assign/res_partner_view.xml	2014-01-15 16:13:35 +0000
@@ -104,6 +104,7 @@
         <field name="inherit_id" ref="base.view_partner_form"/>
         <field name="arch" type="xml">
             <xpath expr="//notebook[last()]" position="inside">
+<<<<<<< TREE
                 <page string="Geo Localization">
                     <group>
                         <group>
@@ -118,6 +119,20 @@
                             <field name="date_review_next"/>
                             <field name="date_partnership"/>
                         </group>
+=======
+                <page string="Geo Localization" groups="base.group_sale_salesman">
+                    <group colspan="2" col="2">
+                        <separator string="Partner Activation" colspan="2"/>
+                        <field name="grade_id" widget="selection"/>
+                        <field name="activation" widget="selection"/>
+                        <field name="partner_weight"/>
+                    </group>
+                    <group colspan="2" col="2">
+                        <separator string="Partner Review" colspan="2"/>
+                        <field name="date_review"/>
+                        <field name="date_review_next"/>
+                        <field name="date_partnership"/>
+>>>>>>> MERGE-SOURCE
                     </group>
                     <group colspan="2" col="2">
                         <separator string="Geo Localization" colspan="2"/>

=== modified file 'crm_partner_assign/security/ir.model.access.csv'
--- crm_partner_assign/security/ir.model.access.csv	2013-10-27 12:31:04 +0000
+++ crm_partner_assign/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -4,5 +4,6 @@
 access_crm_partner_report,crm.partner.report.assign.all,model_crm_partner_report_assign,base.group_sale_salesman,1,0,0,0
 access_res_partner_grade,res.partner.grade,model_res_partner_grade,base.group_sale_salesman,1,1,1,0
 access_res_partner_grade_manager,res.partner.grade.manager,model_res_partner_grade,base.group_sale_manager,1,1,1,1
+access_res_partner_grade_employee,res.partner.grade.employee,model_res_partner_grade,base.group_user,1,0,0,0
 "access_partner_activation_manager","res.partner.activation.manager","model_res_partner_activation","base.group_partner_manager",1,1,1,1
 partner_access_crm_lead,crm.lead,model_crm_lead,portal.group_portal,1,1,0,0
\ No newline at end of file

=== modified file 'crm_profiling/crm_profiling_view.xml'
--- crm_profiling/crm_profiling_view.xml	2012-11-29 22:26:45 +0000
+++ crm_profiling/crm_profiling_view.xml	2014-01-15 16:13:35 +0000
@@ -124,7 +124,7 @@
         <field name="inherit_id" ref="base.view_partner_form"/>
         <field name="arch" type="xml">
             <notebook position="inside">
-                <page string="Profiling" groups="base.group_user">
+                <page string="Profiling" groups="base.group_sale_salesman">
                   <button string="Use a questionnaire"
                       name="%(action_open_questionnaire)d" type="action" colspan="1"
                       icon="gtk-justify-fill" />

=== modified file 'crm_profiling/security/ir.model.access.csv'
--- crm_profiling/security/ir.model.access.csv	2012-11-29 22:26:45 +0000
+++ crm_profiling/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -6,3 +6,4 @@
 access_crm_profiling_question_manager,crm_profiling.question.manager,model_crm_profiling_question,base.group_sale_manager,1,1,1,1
 access_crm_profiling_questionnarie_salesman,crm_profiling.questionnarie.salesman,model_crm_profiling_questionnaire,base.group_sale_salesman,1,1,1,0
 access_crm_profiling_questionnarie_manager,crm_profiling.questionnarie.manager,model_crm_profiling_questionnaire,base.group_sale_manager,1,1,1,1
+access_crm_profiling_partner_manager,crm_profiling.answer.manager,model_crm_profiling_answer,base.group_partner_manager,1,0,0,0

=== modified file 'delivery/security/ir.model.access.csv'
--- delivery/security/ir.model.access.csv	2011-12-19 16:54:40 +0000
+++ delivery/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -3,6 +3,8 @@
 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_carrier_stock_manager,delivery.carrier,model_delivery_carrier,stock.group_stock_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_stock_manager,delivery.grid,model_delivery_grid,stock.group_stock_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

=== added file 'document/board_document_view.xml.OTHER'
--- document/board_document_view.xml.OTHER	1970-01-01 00:00:00 +0000
+++ document/board_document_view.xml.OTHER	2014-01-15 16:13:35 +0000
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+ <openerp>
+     <data>
+        <record model="ir.ui.view" id="board_document_manager_form">
+            <field name="name">board.document.manager.form</field>
+             <field name="model">board.board</field>
+             <field name="arch" type="xml">
+                <form string="Document board" version="7.0">
+                     <board style="2-1" >
+                        <column>
+                             <action string="Files by Month"
+                                name="%(document.action_view_files_by_month_graph)d"
+                                view_mode="graph,tree"/>
+                        </column>
+                        <column>
+                            <action string="Files by user"
+                                name="%(document.action_view_files_by_user_graph)d"
+                                view_mode="graph,tree"/>
+                        </column>
+                     </board>
+                 </form>
+             </field>
+         </record>
+
+
+        <record model="ir.actions.act_window" id="open_board_document_manager">
+            <field name="name">Knowledge</field>
+             <field name="res_model">board.board</field>
+             <field name="view_type">form</field>
+             <field name="view_mode">form</field>
+            <field name="view_id" ref="board_document_manager_form"/>
+         </record>
+        
+         <menuitem id="menu_reports_document"
+                   parent="base.menu_reporting_dashboard"
+                   sequence="55"
+                   groups="base.group_system"
+                   action="open_board_document_manager"
+                   icon="terp-graph"/>
+
+     </data>
+ </openerp>

=== modified file 'document/security/ir.model.access.csv'
--- document/security/ir.model.access.csv	2013-11-08 21:54:08 +0000
+++ document/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -6,8 +6,16 @@
 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_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
+<<<<<<< TREE
 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_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,0
+access_ir_attachment_group_system,ir.attachment system,base.model_ir_attachment,base.group_system,1,1,1,1
+>>>>>>> MERGE-SOURCE
 access_res_partner_group_user,res.partner user,base.model_res_partner,base.group_document_user,1,1,1,0
 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,base.group_system,1,1,1,1

=== modified file 'document_page/document_page_view.xml'
--- document_page/document_page_view.xml	2013-10-27 12:31:04 +0000
+++ document_page/document_page_view.xml	2014-01-15 16:13:35 +0000
@@ -105,7 +105,7 @@
             <field name="view_id" ref="view_wiki_tree"/>
             <field name="search_view_id" ref="view_wiki_filter"/>
         </record>
-        <menuitem id="menu_category" parent="menu_wiki" name="Categories" action="action_category" sequence="20"/>
+        <menuitem id="menu_category" parent="menu_wiki" name="Categories" action="action_category" sequence="20" groups="base.group_system"/>
 
         <!-- History Tree view -->
         <record model="ir.ui.view" id="view_wiki_history_tree">
@@ -141,7 +141,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem id="menu_page_history" parent="menu_wiki" name="Pages history" action="action_history" sequence="30" groups="base.group_no_one"/>
+        <menuitem id="menu_page_history" parent="menu_wiki" name="Pages history" action="action_history" sequence="30" groups="base.group_document_user"/>
         <act_window
             id="action_related_page_history"
             context="{'search_default_page_id': [active_id], 'default_page_id': active_id}"

=== modified file 'document_page/security/ir.model.access.csv'
--- document_page/security/ir.model.access.csv	2012-11-29 22:26:45 +0000
+++ document_page/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -1,4 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 document_page_all,document.page,model_document_page,,1,0,0,0
-document_page,document.page,model_document_page,base.group_user,1,1,1,1
+document_page,document.page,model_document_page,base.group_user,1,1,1,0
+document_page_document_user,document.page,model_document_page,base.group_document_user,1,1,1,0
+document_page_system,document.page,model_document_page,base.group_system,1,1,1,1
 document_page_history,document.page.history,model_document_page_history,base.group_user,1,0,1,0

=== modified file 'event/board_association_view.xml'
--- event/board_association_view.xml	2012-11-29 22:26:45 +0000
+++ event/board_association_view.xml	2014-01-15 16:13:35 +0000
@@ -70,6 +70,7 @@
         <menuitem id="menu_board_associations_manager"
                   parent="base.menu_reporting_dashboard"
                   action="open_board_associations_manager"
+                  groups="event.group_event_user"
                   sequence="40"
                   icon="terp-graph"/>
     </data>

=== modified file 'event/event_view.xml'
--- event/event_view.xml	2013-10-27 12:31:04 +0000
+++ event/event_view.xml	2014-01-15 16:13:35 +0000
@@ -13,7 +13,7 @@
         <!-- Top menu item -->
         <menuitem name="Events"
             id="event_main_menu"
-            groups="base.group_user"
+            groups="event.group_event_user"
             sequence="115"/>
         <menuitem name="Events Organization" id="base.menu_event_main" parent="event_main_menu"/>
 
@@ -53,7 +53,7 @@
             <field name="view_type">form</field>
         </record>
         <menuitem name="Configuration" id="base.menu_marketing_config_root" parent="event_main_menu" sequence="30"/>
-        <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_marketing_config_root" groups="base.group_no_one"/>
+        <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_marketing_config_root" groups="event.group_event_manager"/>
 
         <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
@@ -63,10 +63,10 @@
             <field name="arch" type="xml">
                 <form string="Events" version="7.0">
                     <header>
-                        <button string="Confirm Event" name="button_confirm" states="draft" type="object" class="oe_highlight" groups="base.group_user"/>
-                        <button string="Finish Event" name="button_done" states="confirm" type="object" class="oe_highlight" groups="base.group_user"/>
-                        <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" groups="base.group_user"/>
-                        <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" groups="base.group_user"/>
+                        <button string="Confirm Event" name="button_confirm" states="draft" type="object" class="oe_highlight" groups="event.group_event_manager"/>
+                        <button string="Finish Event" name="button_done" states="confirm" type="object" class="oe_highlight" groups="event.group_event_manager"/>
+                        <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" groups="event.group_event_manager"/>
+                        <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" groups="event.group_event_manager"/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
                     </header>
                     <sheet>
@@ -332,7 +332,7 @@
             context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
             view_type="form"/>
 
-        <menuitem name="Events" id="menu_event_event" action="action_event_view" parent="base.menu_event_main" />
+        <menuitem name="Events" id="menu_event_event" action="action_event_view" parent="base.menu_event_main" groups="group_event_user"/>
 
         <!-- EVENTS/REGISTRATIONS/EVENTS  -->
 
@@ -365,7 +365,7 @@
             <field name="arch" type="xml">
                 <form string="Event Registration" version="7.0">
                     <header>
-                        <button name="registration_open" string="Confirm" states="draft" type="object" class="oe_highlight"/>
+                        <button name="registration_open" string="Confirm" states="draft" type="object" class="oe_highlight" groups="event.group_event_manager"/>
                         <button name="button_reg_close" string="Attended" states="open" type="object" class="oe_highlight"/>
                         <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" />
                         <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>

=== modified file 'event/res_partner_view.xml'
--- event/res_partner_view.xml	2013-10-27 12:31:04 +0000
+++ event/res_partner_view.xml	2014-01-15 16:13:35 +0000
@@ -11,6 +11,35 @@
                 <field name="supplier" position="after">
                     <field name="speaker"/>
                 </field>
+<<<<<<< TREE
+=======
+                <xpath expr="//page[@name='page_history']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                </xpath>
+                <xpath expr="//page[@name='page_history']" position="inside">
+                    <group name="grp_event" string="Event" groups="event.group_event_user">
+                        <field name="event_ids" colspan="4" nolabel="1">
+                            <tree string="Events">
+                                <field name="name" string="Event"/>
+                                <field name="main_speaker_id"/>
+                            </tree>
+                        </field>
+                    </group>
+                    <group name="grp_registration" string="Registration" groups="event.group_event_user">
+                        <field name="event_registration_ids" colspan="4" nolabel="1">
+                            <tree string="Events Registration">
+                                <field name="event_begin_date" string="Date"/>
+                                <field name="event_id" />
+                                <field name="nb_register"/>
+                                <field name="state"/>
+                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                                <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
+                                <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                            </tree>
+                        </field>
+                    </group>
+                </xpath>
+>>>>>>> MERGE-SOURCE
             </field>
         </record>
 

=== modified file 'event/security/ir.model.access.csv'
--- event/security/ir.model.access.csv	2013-10-27 12:31:04 +0000
+++ event/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -1,7 +1,7 @@
 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_user,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_user,1,1,1,1
+access_event_event,event.event,model_event_event,event.group_event_manager,1,1,1,1
 access_event_registration,event.registration,model_event_registration,event.group_event_user,1,1,1,1
 access_report_event_registration,report.event.registration,model_report_event_registration,event.group_event_user,1,1,1,1
 access_event_event_portal,event.event,model_event_event,,1,0,0,0

=== modified file 'event_moodle/security/ir.model.access.csv'
--- event_moodle/security/ir.model.access.csv	2012-02-28 09:06:31 +0000
+++ event_moodle/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -1,3 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_event_moodle,event.moodle.admin,model_event_moodle_config_wiz,event.group_event_manager,1,1,1,1
-access_event_moodle_user,event.moodle.usr,model_event_moodle_config_wiz,event.group_event_user,0,0,0,0
+access_event_moodle_user,event.moodle.usr,model_event_moodle_config_wiz,event.group_event_user,1,0,0,0

=== modified file 'event_moodle/wizard_moodle.xml'
--- event_moodle/wizard_moodle.xml	2012-12-08 16:28:20 +0000
+++ event_moodle/wizard_moodle.xml	2014-01-15 16:13:35 +0000
@@ -44,7 +44,7 @@
             <field name="state">open</field>
         </record>
 
-        <menuitem name="Moodle Configuration" parent="base.menu_marketing_config_root" id="wizard_moodle" action="configure_moodle"/>
+        <menuitem name="Moodle Configuration" parent="base.menu_marketing_config_root" groups="base.group_system" id="wizard_moodle" action="configure_moodle"/>
 
     </data>
 </openerp>

=== modified file 'google_drive/security/ir.model.access.csv'
--- google_drive/security/ir.model.access.csv	2013-10-27 12:31:04 +0000
+++ google_drive/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -1,3 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+<<<<<<< TREE
 access_google_drive_all,google.drive.config,model_google_drive_config,,1,0,0,0
-access_google_drive,google.drive.config,model_google_drive_config,base.group_system,1,1,1,1
\ No newline at end of file
+access_google_drive,google.drive.config,model_google_drive_config,base.group_system,1,1,1,1=======
+access_google_docs_user,google.docs.config,model_google_docs_config,,1,0,0,0
+access_google_docs,google.docs.config,model_google_docs_config,base.group_system,1,1,1,1>>>>>>> MERGE-SOURCE

=== modified file 'hr/board_hr_view.xml'
--- hr/board_hr_view.xml	2012-11-29 22:26:45 +0000
+++ hr/board_hr_view.xml	2014-01-15 16:13:35 +0000
@@ -40,9 +40,11 @@
     <menuitem id="menu_hr_dashboard" 
               parent="base.menu_reporting_dashboard" 
               action="open_board_hr" 
+              groups="base.group_user"
               sequence="50"/>
     <menuitem id="menu_hr_reporting" 
               parent="base.menu_reporting" 
+              groups="base.group_hr_user"
               name="Human Resources" 
               sequence="40" />
 </data>

=== modified file 'hr/hr_view.xml'
--- hr/hr_view.xml	2013-12-12 09:32:34 +0000
+++ hr/hr_view.xml	2014-01-15 16:13:35 +0000
@@ -10,7 +10,7 @@
         <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="base.group_hr_manager" sequence="50"/>
         <menuitem id="menu_hr_reporting_timesheet" name="Reports"
-            parent="menu_hr_reporting" sequence="6"/>
+            parent="menu_hr_reporting" groups="base.group_hr_user" sequence="6"/>
 
         <!--Employee form view -->
         <record id="view_employee_form" model="ir.ui.view">

=== modified file 'hr/security/ir.model.access.csv'
--- hr/security/ir.model.access.csv	2012-11-29 22:26:45 +0000
+++ hr/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -8,3 +8,5 @@
 access_hr_department_employee,hr.department.employee,model_hr_department,base.group_user,1,0,0,0
 access_hr_job_user,hr.job user,model_hr_job,base.group_hr_user,1,1,1,1
 access_ir_property_hr_user,ir_property hr_user,base.model_ir_property,base.group_hr_user,1,1,1,0
+access_mail_alias_hr_manager,mail.alias,mail.model_mail_alias,base.group_hr_manager,1,1,1,1
+

=== modified file 'hr_contract/security/ir.model.access.csv'
--- hr_contract/security/ir.model.access.csv	2011-12-19 16:54:40 +0000
+++ hr_contract/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -3,3 +3,4 @@
 access_hr_resource_calendar_user,hr.employee.resource.calendar.user,resource.model_resource_calendar,base.group_hr_user,1,1,1,1
 access_hr_contract_type_manager,hr.contract.type.manager,model_hr_contract_type,base.group_hr_manager,1,1,1,1
 access_hr_contract_manager,hr.contract.manager,model_hr_contract,base.group_hr_manager,1,1,1,1
+access_hr_contract_officer,hr.contract.officer,model_hr_contract,base.group_hr_user,1,0,0,0

=== modified file 'hr_evaluation/hr_evaluation_view.xml'
--- hr_evaluation/hr_evaluation_view.xml	2013-12-12 09:32:34 +0000
+++ hr_evaluation/hr_evaluation_view.xml	2014-01-15 16:13:35 +0000
@@ -145,7 +145,7 @@
                 </group>
             </xpath>
             <xpath expr="//div[@name='button_box']" position="inside">
-                <button name="%(act_hr_employee_2_hr__evaluation_interview)d" string="Appraisal Interviews" type="action"/>
+                <button name="%(act_hr_employee_2_hr__evaluation_interview)d" string="Appraisal Interviews" type="action" groups="base.group_hr_user"/>
             </xpath>
             </field>
         </record>

=== modified file 'hr_evaluation/security/ir.model.access.csv'
--- hr_evaluation/security/ir.model.access.csv	2014-01-06 08:20:30 +0000
+++ hr_evaluation/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -5,7 +5,7 @@
 access_hr_evaluation_plan_phase_user,hr_evaluation.plan.phase.user,model_hr_evaluation_plan_phase,base.group_hr_user,1,1,1,1
 access_hr_evaluation_interview_user,hr.evaluation.interview.user,model_hr_evaluation_interview,base.group_hr_user,1,1,1,1
 access_hr_evaluation_interview_employee,hr.evaluation.interview.employee,model_hr_evaluation_interview,base.group_user,1,1,1,0
-access_hr_evaluation_report,hr.evaluation.report,model_hr_evaluation_report,base.group_hr_manager,1,1,1,1
+access_hr_evaluation_report,hr.evaluation.report,model_hr_evaluation_report,base.group_hr_manager,1,1,1,0
 access_survey_type_hr_manager,survey.type,survey.model_survey_type,base.group_hr_manager,1,1,1,1
 access_survey_hr_manager,survey.hr.manager,survey.model_survey,base.group_hr_manager,1,1,1,1
 access_survey_history_manager,survey.history,survey.model_survey_history,base.group_hr_manager,1,1,1,1

=== modified file 'hr_expense/security/ir.model.access.csv'
--- hr_expense/security/ir.model.access.csv	2012-11-29 22:26:45 +0000
+++ hr_expense/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -3,7 +3,7 @@
 access_hr_expense_expense_employee,hr.expense.expense.employee,model_hr_expense_expense,base.group_user,1,1,1,1
 access_hr_expense_line_user,hr.expense.line.user,model_hr_expense_line,base.group_hr_user,1,1,1,1
 access_hr_expense_line_employee,hr.expense.line.employee,model_hr_expense_line,base.group_user,1,1,1,1
-access_hr_expense_report_manager,hr.expense.report.manager,model_hr_expense_report,base.group_hr_manager,1,1,1,1
+access_hr_expense_report_manager,hr.expense.report.manager,model_hr_expense_report,base.group_hr_manager,1,1,1,0
 access_product_product_hr_expense_user,product.product.hr.expense.user,product.model_product_product,base.group_hr_user,1,1,1,1
 access_product_template_hr_expense_user,product.template.hr.expense.user,product.model_product_template,base.group_hr_user,1,1,1,1
 access_product_uom_hr_expense_user,product.uom.hr.expense.user,product.model_product_uom,base.group_hr_user,1,1,1,1

=== modified file 'hr_payroll/security/ir.model.access.csv'
--- hr_payroll/security/ir.model.access.csv	2012-11-29 22:26:45 +0000
+++ hr_payroll/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -6,6 +6,10 @@
 access_hr_payslip_line,hr.payslip.line,model_hr_payslip_line,base.group_hr_user,1,1,1,1
 access_hr_payslip_input_user,hr.payslip.input.user,model_hr_payslip_input,base.group_hr_user,1,1,1,1
 access_hr_payslip_worked_days ,hr.payslip.worked_days,model_hr_payslip_worked_days,base.group_hr_manager,1,1,1,1
+access_hr_payslip_worked_days_officer,hr.payslip.worked_days.officer,model_hr_payslip_worked_days,base.group_hr_user,1,1,1,0
+access_hr_payslip_run_user,hr.payslip.run user,model_hr_payslip_run,base.group_hr_user,1,0,0,0
 access_hr_payslip_run,hr.payslip.run,model_hr_payslip_run,base.group_hr_manager,1,1,1,1
 access_hr_rule_input,hr.rule.input,model_hr_rule_input,base.group_hr_manager,1,1,1,1
+access_hr_rule_input_officer,hr.rule.input.officer,model_hr_rule_input,base.group_hr_user,1,0,0,0
 access_hr_salary_rule_user,hr.salary.rule.user,model_hr_salary_rule,base.group_hr_user,1,1,1,1
+access_resource_calendar_attendance_officer,resource.calendar.attendance.officer,resource.model_resource_calendar_attendance,base.group_hr_user,1,0,0,0

=== modified file 'hr_recruitment/board_hr_recruitment_statistical_view.xml'
--- hr_recruitment/board_hr_recruitment_statistical_view.xml	2013-10-27 12:31:04 +0000
+++ hr_recruitment/board_hr_recruitment_statistical_view.xml	2014-01-15 16:13:35 +0000
@@ -32,7 +32,7 @@
         <field name="inherit_id" ref="hr.board_hr_form"/>
         <field name="arch" type="xml">
             <xpath expr="/form/board/column[1]" position="inside">
-                <action name="%(action_applicants_status)d" string="Applications to be Processed"/>
+                <action name="%(action_applicants_status)d" string="Applications To be Processed" groups="base.group_hr_user"/>
             </xpath>
         </field>
     </record>

=== modified file 'hr_recruitment/security/ir.model.access.csv'
--- hr_recruitment/security/ir.model.access.csv	2013-12-19 16:06:20 +0000
+++ hr_recruitment/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -1,6 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_hr_applicant_user,hr.applicant.user,model_hr_applicant,base.group_hr_user,1,1,1,1
-access_hr_recruitment_report,hr.recruitment.report,model_hr_recruitment_report,base.group_hr_manager,1,1,1,1
+access_hr_recruitment_report,hr.recruitment.report,model_hr_recruitment_report,base.group_hr_manager,1,1,1,0
 access_hr_recruitment_stage_user,hr.recruitment.stage.user,model_hr_recruitment_stage,base.group_hr_user,1,1,1,1
 access_hr_recruitment_degree,hr.recruitment.degree,model_hr_recruitment_degree,base.group_hr_user,1,1,1,1
 access_res_partner_hr_user,res.partner.user,base.model_res_partner,base.group_hr_user,1,1,1,1

=== modified file 'hr_timesheet_sheet/security/ir.model.access.csv'
--- hr_timesheet_sheet/security/ir.model.access.csv	2013-10-27 12:31:04 +0000
+++ hr_timesheet_sheet/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -3,7 +3,15 @@
 access_hr_timesheet_sheet_sheet_system_employee,hr_timesheet_sheet.sheet.system.employee,model_hr_timesheet_sheet_sheet,base.group_user,1,1,1,0
 access_hr_timesheet_sheet_sheet_day,hr_timesheet_sheet.sheet.day,model_hr_timesheet_sheet_sheet_day,base.group_hr_user,1,1,1,1
 access_hr_timesheet_sheet_sheet_account,hr_timesheet_sheet.sheet.account,model_hr_timesheet_sheet_sheet_account,base.group_hr_user,1,1,1,1
+<<<<<<< TREE
 access_hr_timesheet_report,hr.timesheet.report,model_hr_timesheet_report,base.group_hr_manager,1,1,0,0
+=======
+access_hr_timesheet_report,hr.timesheet.report,model_hr_timesheet_report,base.group_hr_manager,1,1,1,0
+>>>>>>> MERGE-SOURCE
 access_hr_analytic_timesheet_system_user,hr.analytic.timesheet.system.user,model_hr_analytic_timesheet,base.group_user,1,0,0,0
 access_hr_timesheet_sheet_sheet_day,hr.timesheet.sheet.sheet.day.user,model_hr_timesheet_sheet_sheet_day,base.group_user,1,1,1,0
+<<<<<<< TREE
 access_timesheet_report,timesheet.report,model_timesheet_report,base.group_hr_manager,1,1,0,0
+=======
+access_timesheet_report,timesheet.report,model_timesheet_report,base.group_hr_manager,1,1,1,0
+>>>>>>> MERGE-SOURCE

=== modified file 'knowledge/knowledge_view.xml'
--- knowledge/knowledge_view.xml	2012-11-29 22:26:45 +0000
+++ knowledge/knowledge_view.xml	2014-01-15 16:13:35 +0000
@@ -9,7 +9,7 @@
             sequence="116"/>
 
         <menuitem name="Configuration" id="knowledge.menu_document_configuration"
-            parent="knowledge.menu_document" sequence="50"/>
+            parent="knowledge.menu_document" sequence="50" groups="base.group_system"/>
 
         <menuitem name="Collaborative Content" id="knowledge.menu_document2"
            parent="knowledge.menu_document"/>

=== modified file 'knowledge/security/ir.model.access.csv'
--- knowledge/security/ir.model.access.csv	2011-12-19 16:54:40 +0000
+++ knowledge/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -1,3 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_ir_attachment_sale_manager,ir_attachment manager,base.model_ir_attachment,base.group_sale_manager,1,1,1,1
-access_ir_attachment_partner_manager,ir_attachment_partner manager,base.model_ir_attachment,base.group_partner_manager,1,1,1,1
+access_ir_attachment_partner_manager,ir_attachment_partner manager,base.model_ir_attachment,base.group_partner_manager,1,1,1,0

=== modified file 'l10n_in_hr_payroll/security/ir.model.access.csv'
--- l10n_in_hr_payroll/security/ir.model.access.csv	2012-08-24 10:54:41 +0000
+++ l10n_in_hr_payroll/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -1,5 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_payroll_advice_user","hr.payroll.advice","model_hr_payroll_advice","base.group_hr_user",1,1,1,1
 "access_hr_payroll_advice_line_user","hr.payroll.advice.line","model_hr_payroll_advice_line","base.group_hr_user",1,1,1,1
-"access_hr_payroll_advice_report_user","payment.advice.report","model_payment_advice_report","base.group_hr_manager",1,1,1,1
-"access_hr_payroll_payslip_report_user","payslip.report","model_payslip_report","base.group_hr_manager",1,1,1,1
+"access_hr_payroll_advice_report_user","payment.advice.report","model_payment_advice_report","base.group_hr_manager",1,1,1,0
+"access_hr_payroll_payslip_report_user","payslip.report","model_payslip_report","base.group_hr_manager",1,1,1,0

=== modified file 'lunch/security/ir.model.access.csv'
--- lunch/security/ir.model.access.csv	2012-12-04 10:31:46 +0000
+++ lunch/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -1,16 +1,15 @@
-id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
-order_manager,"Order user",model_lunch_order,group_lunch_manager,1,1,1,1
-order_line_manager,"Order Line user",model_lunch_order_line,group_lunch_manager,1,1,1,1
-cashmove_manager,"Cashmove user",model_lunch_cashmove,group_lunch_manager,1,1,1,1
-product_manager,"Product user",model_lunch_product,group_lunch_manager,1,1,1,1
-product_category_manager,"Product category user",model_lunch_product_category,group_lunch_manager,1,1,1,1
-alert_manager,"Alert user",model_lunch_alert,group_lunch_manager,1,1,1,1
-order_user,"Order user",model_lunch_order,group_lunch_user,1,1,1,0
-order_line_user,"Order Line user",model_lunch_order_line,group_lunch_user,1,1,1,1
-cashmove_user,"Cashmove user",model_lunch_cashmove,group_lunch_user,1,0,0,0
-product_user,"Product user",model_lunch_product,group_lunch_user,1,0,0,0
-product_category_user,"Product category user",model_lunch_product_category,group_lunch_user,1,0,0,0
-alert_user,"Alert user",model_lunch_alert,group_lunch_user,1,0,0,0
-access_report_order_line,access_report_order_line,model_report_lunch_order_line,,1,1,1,1
-access_lunch_validation,access_lunch_validation,model_lunch_validation,,1,1,1,1
-access_lunch_cancel,access_lunch_cancel,model_lunch_cancel,,1,1,1,1
+id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
+access_lunch_order_user,lunch_Order user,model_lunch_order,group_lunch_user,1,1,1,0
+access_lunch_order_manager,lunch_Order manager,model_lunch_order_line,group_lunch_manager,1,1,1,1
+access_lunch_order_line_user,lunch_order_line user,model_lunch_order_line,group_lunch_user,1,1,1,1
+access_lunch_cashmove_user,"Cashmove user",model_lunch_cashmove,group_lunch_user,1,0,0,0
+access_lunch_cashmove_manager,"Cashmove manager",model_lunch_cashmove,group_lunch_manager,1,1,1,1
+access_lunch_product_user,"Product user",model_lunch_product,group_lunch_user,1,0,0,0
+access_lunch_product_manager,"Product manager",model_lunch_product,group_lunch_manager,1,1,1,1
+access_lunch_product_category_user,"Product category user",model_lunch_product_category,group_lunch_user,1,0,0,0
+access_lunch_product_category_manager,"Product category manager",model_lunch_product_category,group_lunch_manager,1,1,1,1
+accees_lunch_alert_user,"Alert user",model_lunch_alert,group_lunch_user,1,0,0,0
+access_lunch_alert_manager,"Alert manager",model_lunch_alert,group_lunch_manager,1,1,1,1
+access_report_order_line,access_report_order_line,model_report_lunch_order_line,,1,1,1,1
+access_lunch_validation,access_lunch_validation,model_lunch_validation,,1,1,1,1
+access_lunch_cancel,access_lunch_cancel,model_lunch_cancel,,1,1,1,1

=== modified file 'mail/security/ir.model.access.csv'
--- mail/security/ir.model.access.csv	2013-10-27 12:31:04 +0000
+++ mail/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -1,11 +1,21 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+<<<<<<< TREE
 access_mail_message_all,mail.message.all,model_mail_message,,1,0,0,0
 access_mail_message_user,mail.message.user,model_mail_message,base.group_user,1,1,1,1
 access_mail_mail_all,mail.mail.all,model_mail_mail,,1,0,0,0
 access_mail_mail_user,mail.mail.user,model_mail_mail,base.group_user,1,1,1,0
+=======
+access_mail_message_group_user,mail.message.group.user,model_mail_message,base.group_user,1,1,1,1
+access_mail_mail_all,mail.mail.all,model_mail_mail,,0,0,1,0
+access_mail_mail_user,mail.mail,model_mail_mail,base.group_user,1,1,1,0
+>>>>>>> MERGE-SOURCE
 access_mail_mail_system,mail.mail.system,model_mail_mail,base.group_system,1,1,1,1
+<<<<<<< TREE
 access_mail_followers_all,mail.followers.all,model_mail_followers,,1,0,0,0
 access_mail_followers_user,mail.followers.user,model_mail_followers,base.group_user,1,1,0,0
+=======
+access_mail_followers_all,mail.followers.all,model_mail_followers,,1,1,1,1
+>>>>>>> MERGE-SOURCE
 access_mail_followers_system,mail.followers.system,model_mail_followers,base.group_system,1,1,1,1
 access_mail_notification_all,mail.notification.all,model_mail_notification,,1,0,0,0
 access_mail_notification_user,mail.notification.user,model_mail_notification,base.group_user,1,1,1,0

=== modified file 'marketing_campaign/marketing_campaign_view.xml'
--- marketing_campaign/marketing_campaign_view.xml	2013-10-27 12:31:04 +0000
+++ marketing_campaign/marketing_campaign_view.xml	2014-01-15 16:13:35 +0000
@@ -396,7 +396,7 @@
                     <group>
                         <field name="campaign_id"/>
                         <field name="segment_id"/>
-                        <field name="activity_id" context="{'segment_id':segment_id}"/>
+                        <field name="activity_id" context="{'default_campaign_id':campaign_id, 'segment_id':segment_id}"/>
                         <field name="date"/>
                     </group>
                     <group>

=== modified file 'marketing_campaign/report/campaign_analysis_view.xml'
--- marketing_campaign/report/campaign_analysis_view.xml	2012-11-29 22:26:45 +0000
+++ marketing_campaign/report/campaign_analysis_view.xml	2014-01-15 16:13:35 +0000
@@ -62,7 +62,7 @@
         <field name="search_view_id" ref="view_campaign_analysis_search"/>
     </record>
 
-    <menuitem name="Marketing" id="base.menu_report_marketing" parent="base.menu_reporting" sequence="45"/>
+    <menuitem name="Marketing" id="base.menu_report_marketing" parent="base.menu_reporting" sequence="45" groups="marketing.group_marketing_manager"/>
     <menuitem action="action_campaign_analysis_all" id="menu_action_campaign_analysis_all" parent="base.menu_report_marketing" sequence="2"/>
 
     </data>

=== added file 'marketing_campaign/res_partner_view.xml.OTHER'
--- marketing_campaign/res_partner_view.xml.OTHER	1970-01-01 00:00:00 +0000
+++ marketing_campaign/res_partner_view.xml.OTHER	2014-01-15 16:13:35 +0000
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+         <!--  Partners inherited form -->  
+        <record id="view_workitem_partner_info_form" model="ir.ui.view">
+            <field name="name">res.partner.workitem.info.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//page[@name='page_history']" position="attributes">
+                   <attribute name="invisible">False</attribute>
+                </xpath>
+                <xpath expr="//page[@name='page_history']" position="inside">
+                    <group name="grp_campaign" string="Campaign" groups="marketing.group_marketing_user">
+                        <field name="workitem_ids" colspan="4" nolabel="1"/>
+                    </group>
+                </xpath>
+            </field>
+       </record>
+   </data>
+</openerp>
+

=== modified file 'marketing_campaign/security/ir.model.access.csv'
--- marketing_campaign/security/ir.model.access.csv	2011-12-19 16:54:40 +0000
+++ marketing_campaign/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -16,6 +16,6 @@
 access_marketing_campaign_activity_campaign_manager,marketing.campaign.activity,model_marketing_campaign_activity,marketing.group_marketing_manager,1,1,1,1
 access_marketing_campaign_workitem_campaign_manager,marketing.campaign.workitem,model_marketing_campaign_workitem,marketing.group_marketing_manager,1,1,1,1
 access_marketing_campaign_transition_campaign_manager,marketing.campaign.transition,model_marketing_campaign_transition,marketing.group_marketing_manager,1,1,1,1
-access_marketing_campaign_analysis_campaign_manager,campaign.analysis,model_campaign_analysis,marketing.group_marketing_manager,1,1,1,1
+access_marketing_campaign_analysis_campaign_manager,campaign.analysis,model_campaign_analysis,marketing.group_marketing_manager,1,1,1,0
 access_email_template_manager,email.template,model_email_template,marketing.group_marketing_manager,1,1,1,1
 access_email_template_account_manager,ir.mail_server,base.model_ir_mail_server,marketing.group_marketing_manager,1,1,1,1

=== modified file 'membership/membership_view.xml'
--- membership/membership_view.xml	2013-10-27 12:31:04 +0000
+++ membership/membership_view.xml	2014-01-15 16:13:35 +0000
@@ -125,7 +125,7 @@
             <field name="act_window_id" ref="action_membership_products"/>
         </record>
 
-        <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="10"/>
+        <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="10" groups="base.group_partner_manager"/>
         <menuitem name="Members" id="menu_membership" sequence="0" parent="base.menu_association"/>
         <menuitem name="Configuration" id="base.menu_marketing_config_association"
             parent="base.menu_association" sequence="30"/>
@@ -229,7 +229,7 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
-                    <page string="Membership">
+                    <page string="Membership" groups="base.group_partner_manager">
                         <group>
                             <group>
                                 <field name="free_member"/>

=== modified file 'membership/wizard/membership_invoice_view.xml'
--- membership/wizard/membership_invoice_view.xml	2012-11-29 22:26:45 +0000
+++ membership/wizard/membership_invoice_view.xml	2014-01-15 16:13:35 +0000
@@ -35,6 +35,7 @@
             multi="True"
             key2="client_action_multi"
             view_mode="form"
+            groups="account.group_account_invoice"
             id="action_membership_invoice_view"/>
 
     </data>

=== modified file 'mrp/board_manufacturing_view.xml'
--- mrp/board_manufacturing_view.xml	2012-11-29 22:26:45 +0000
+++ mrp/board_manufacturing_view.xml	2014-01-15 16:13:35 +0000
@@ -31,7 +31,7 @@
                   id="menu_board_manufacturing"
                   parent="base.menu_reporting_dashboard"
                   sequence="30"
-                  groups="group_mrp_manager"/>
+                  groups="group_mrp_user"/>
 
     </data>
 </openerp>

=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml	2013-10-27 12:31:04 +0000
+++ mrp/mrp_view.xml	2014-01-15 16:13:35 +0000
@@ -130,18 +130,18 @@
         <menuitem name="Master Bill of Materials"
             id="menu_mrp_property"
             parent="menu_mrp_configuration"
-            groups="mrp.group_mrp_routings,product.group_mrp_properties"
+            groups="mrp.group_mrp_routings,product.group_mrp_properties,group_mrp_manager"
             sequence="20"/>
         <menuitem
             action="mrp_property_action"
             id="menu_mrp_property_action"
-            groups="product.group_mrp_properties"
+            groups="product.group_mrp_properties,group_mrp_manager"
             parent="menu_mrp_configuration"
             sequence="30"/>
         <menuitem
             action="mrp_property_group_action"
             parent="menu_mrp_configuration"
-            groups="base.group_no_one,product.group_mrp_properties"
+            groups="base.group_no_one,product.group_mrp_properties,group_mrp_manager"
             id="menu_mrp_property_group_action"
             sequence="35"/>
 
@@ -982,6 +982,30 @@
             </field>
         </record>
 
+<<<<<<< TREE
+=======
+        <act_window
+            context="{'search_default_product_id': [active_id]}"
+            id="act_product_manufacturing_open"
+            name="Manufacturing Orders"
+            view_id="mrp_production_tree_view"
+            groups="mrp.group_mrp_user"
+            res_model="mrp.production"
+            src_model="product.product"/>
+
+        <act_window
+            id="action_product_bom_structure"
+            name="Product BoM Structure"
+            domain="[('product_id', 'in', active_ids),('bom_id','=',False)]"
+            context="{'default_product_id': active_id}"
+            view_type="tree"
+            view_mode="tree"
+            view_id="mrp_bom_tree_view"
+            res_model="mrp.bom"
+            src_model="product.product"
+            groups="mrp.group_mrp_user"/>
+
+>>>>>>> MERGE-SOURCE
         <!-- Menu for Resource for MRP-->
 
         <record id="mrp_workcenter_action" model="ir.actions.act_window">
@@ -1041,9 +1065,13 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
+<<<<<<< TREE
                     <button string="Bill of Materials" name="%(product_open_bom)d" type="action" attrs="{'invisible':[('type', '=', 'service')]}"/>
                     <button string="BoM Structure" name="%(act_product_mrp_bom_open)d" type="action" groups="mrp.group_mrp_user" attrs="{'invisible':[('type', '=', 'service')]}"/>
                     <button string="Manufacturing Orders" name="%(act_product_mrp_production)d" type="action" groups="mrp.group_mrp_user" attrs="{'invisible':[('type', '=', 'service')]}"/>
+=======
+                    <button string="Bill of Materials" name="%(product_open_bom)d" type="action" groups="mrp.group_mrp_user"/>
+>>>>>>> MERGE-SOURCE
                 </xpath>
             </field>
         </record>

=== modified file 'mrp/security/ir.model.access.csv'
--- mrp/security/ir.model.access.csv	2013-10-27 12:31:04 +0000
+++ mrp/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -3,8 +3,9 @@
 access_mrp_routing,mrp.routing,model_mrp_routing,mrp.group_mrp_user,1,0,0,0
 access_mrp_routing_workcenter,mrp.routing.workcenter,model_mrp_routing_workcenter,mrp.group_mrp_user,1,0,0,0
 access_mrp_bom,mrp.bom,model_mrp_bom,group_mrp_user,1,0,0,0
-access_mrp_production,mrp.production user,model_mrp_production,mrp.group_mrp_user,1,1,1,1
+access_mrp_production,mrp.production user,model_mrp_production,mrp.group_mrp_user,1,1,1,0
 access_mrp_production_salesman,mrp.production salesman,model_mrp_production,base.group_sale_salesman,1,1,1,0
+access_mrp_production_user,mrp.production user,model_mrp_production,,1,0,0,0
 access_mrp_production_product_line_salesman,mrp.production.product.line salesman,model_mrp_production_product_line,base.group_sale_salesman,1,0,1,0
 access_mrp_production_workcenter_line_salesman,mrp.production.workcenter.line salesman,model_mrp_production_workcenter_line,base.group_sale_salesman,1,0,1,0
 access_mrp_property_group,mrp.property.group,procurement.model_mrp_property_group,mrp.group_mrp_manager,1,1,1,1
@@ -21,8 +22,8 @@
 access_stock_warehouse,stock.warehouse mrp_worker,stock.model_stock_warehouse,mrp.group_mrp_user,1,0,0,0
 access_account_analytic_journal_mrp_worker,account.analytic.journal mrp_worker,account.model_account_analytic_journal,mrp.group_mrp_user,1,0,0,0
 access_account_account,account.account mrp_worker,account.model_account_account,mrp.group_mrp_user,1,0,0,0
-access_purchase_order_mrp_worker,purchase.order mrp_worker,purchase.model_purchase_order,mrp.group_mrp_user,1,0,0,0
-access_purchase_order_line_mrp_worker,purchase.order.line mrp_worker,purchase.model_purchase_order_line,mrp.group_mrp_user,1,0,0,0
+access_purchase_order_mrp_worker,purchase.order mrp_worker,purchase.model_purchase_order,mrp.group_mrp_user,1,1,1,0
+access_purchase_order_line_mrp_worker,purchase.order.line mrp_worker,purchase.model_purchase_order_line,mrp.group_mrp_user,1,1,1,0
 access_hr_timesheet_group_mrp_worker,resource.calendar mrp_manager,resource.model_resource_calendar,mrp.group_mrp_manager,1,1,1,1
 access_procurement_user,procurement.order.user,model_procurement_order,base.group_user,1,1,1,1
 access_mrp_production_stock_worker,mrp.production stock_worker,model_mrp_production,stock.group_stock_user,1,0,0,0
@@ -36,7 +37,7 @@
 access_product_supplierinfo_user,product.supplierinfo user,product.model_product_supplierinfo,mrp.group_mrp_user,1,1,1,1
 access_stock_tracking,stock.tracking,stock.model_stock_tracking,mrp.group_mrp_user,1,1,1,0
 access_res_partner,res.partner,base.model_res_partner,mrp.group_mrp_user,1,0,0,0
-access_workcenter_user,mrp.production.workcenter.line.user,model_mrp_production_workcenter_line,mrp.group_mrp_user,1,1,1,1
+access_workcenter_user,mrp.production.workcenter.line.user,model_mrp_production_workcenter_line,mrp.group_mrp_user,1,1,1,0
 access_resource_calendar_leaves_user,mrp.resource.calendar.leaves.user,resource.model_resource_calendar_leaves,mrp.group_mrp_user,1,1,1,1
 access_resource_calendar_leaves_manager,mrp.resource.calendar.leaves.manager,resource.model_resource_calendar_leaves,mrp.group_mrp_manager,1,0,0,0
 access_resource_calendar_attendance_manager,mrp.resource.calendar.attendance.manager,resource.model_resource_calendar_attendance,mrp.group_mrp_manager,1,1,1,1
@@ -46,10 +47,9 @@
 access_account_sequence_fiscalyear_manager,account.sequence.fiscalyear,account.model_account_sequence_fiscalyear,mrp.group_mrp_manager,1,0,0,0
 access_product_supplierinfo_manager,product.supplierinfo user,product.model_product_supplierinfo,mrp.group_mrp_manager,1,0,0,0
 access_stock_tracking_manager,stock.tracking,stock.model_stock_tracking,mrp.group_mrp_manager,1,0,0,0
-access_mrp_production_manager,mrp.production manager,model_mrp_production,mrp.group_mrp_manager,1,0,0,0
+access_mrp_production_manager,mrp.production manager,model_mrp_production,mrp.group_mrp_manager,1,1,1,1
 access_procurement_manager,procurement.order,model_procurement_order,mrp.group_mrp_manager,1,0,0,0
-access_workcenter_manager,mrp.production.workcenter.line,model_mrp_production_workcenter_line,mrp.group_mrp_manager,1,0,0,0
-access_stock_move_mrp_manager,stock.move mrp_manager,stock.model_stock_move,mrp.group_mrp_manager,1,0,0,0
+access_workcenter_manager,mrp.production.workcenter.line,model_mrp_production_workcenter_line,mrp.group_mrp_manager,1,1,1,1
 access_mrp_production_product_line_manager,mrp.production.product.line manager,model_mrp_production_product_line,mrp.group_mrp_manager,1,0,0,0
 access_account_sequence_fiscalyear_system,account.sequence.fiscalyear.system,account.model_account_sequence_fiscalyear,mrp.group_mrp_manager,1,0,0,0
 access_stock_production_lot_user,stock.production.lot,stock.model_stock_production_lot,mrp.group_mrp_user,1,1,1,1
@@ -76,5 +76,5 @@
 access_product_pricelist_item_mrp_manager,product.pricelist.item mrp_manager,product.model_product_pricelist_item,mrp.group_mrp_manager,1,1,1,1
 access_resource_calendar_manufacturinguser,resource.calendar manufacturing.user,resource.model_resource_calendar,mrp.group_mrp_user,1,0,0,0
 access_account_journal_mrp_manager,account.journal mrp manager,account.model_account_journal,mrp.group_mrp_manager,1,0,0,0
-access_purchase_order_stock_user,purchase.order stock user,purchase.model_purchase_order,stock.group_stock_user,1,1,1,0
 access_mrp_bom_purchase_manager,mrp.bom,model_mrp_bom,purchase.group_purchase_manager,1,0,0,0
+access_account_analytic_line_user,account.analytic.line user,account.model_account_analytic_line,group_mrp_user,1,1,1,0

=== modified file 'mrp_operations/security/ir.model.access.csv'
--- mrp_operations/security/ir.model.access.csv	2011-12-19 16:54:40 +0000
+++ mrp_operations/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -3,8 +3,8 @@
 access_mrp_operations_operation_code_manager,operations.operation.code.manager,model_mrp_operations_operation_code,mrp.group_mrp_manager,1,0,0,0
 access_mrp_operations_operation,operations.operation,model_mrp_operations_operation,mrp.group_mrp_user,1,1,1,1
 access_mrp_operations_operation_manager,operations.operation.manager,model_mrp_operations_operation,mrp.group_mrp_manager,1,0,0,0
-access_mrp_production_user,mrp_production_user,model_mrp_production,mrp.group_mrp_user,1,1,1,1
-access_mrp_production_manager,mrp_production_manager,model_mrp_production,mrp.group_mrp_manager,1,0,0,0
-access_mrp_production_workcenter_line,mrp.production.workcenter.line,mrp.model_mrp_production_workcenter_line,mrp.group_mrp_user,1,1,1,1
-access_mrp_production_workcenter_line_manager,mrp.production.workcenter.line.manager,mrp.model_mrp_production_workcenter_line,mrp.group_mrp_manager,1,0,0,0
+access_mrp_production_user,mrp_production_user,model_mrp_production,mrp.group_mrp_user,1,1,1,0
+access_mrp_production_manager,mrp_production_manager,model_mrp_production,mrp.group_mrp_manager,1,1,1,1
+access_mrp_production_workcenter_line,mrp.production.workcenter.line,mrp.model_mrp_production_workcenter_line,mrp.group_mrp_user,1,1,1,0
+access_mrp_production_workcenter_line_manager,mrp.production.workcenter.line.manager,mrp.model_mrp_production_workcenter_line,mrp.group_mrp_manager,1,1,1,1
 access_mrp_workorder_manager,mrp.workorder.manager,model_mrp_workorder,mrp.group_mrp_manager,1,1,1,1

=== modified file 'mrp_repair/security/ir.model.access.csv'
--- mrp_repair/security/ir.model.access.csv	2011-12-19 16:54:40 +0000
+++ mrp_repair/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -1,12 +1,12 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_mrp_repair_user,MRP Repair user,model_mrp_repair,stock.group_stock_user,1,0,0,0
+access_mrp_repair_user,MRP Repair user,model_mrp_repair,stock.group_stock_user,1,1,1,0
 access_mrp_repair_manager,MRP Repair manager,model_mrp_repair,stock.group_stock_manager,1,1,1,1
 access_mrp_repair_line_user,MRP Repair Line user,model_mrp_repair_line,stock.group_stock_user,1,0,0,0
 access_mrp_repair_line_manager,MRP Repair Line manager,model_mrp_repair_line,stock.group_stock_manager,1,1,1,1
 access_mrp_repair_fee_user,MRP Repair Fee user,model_mrp_repair_fee,stock.group_stock_user,1,1,1,1
 access_mrp_repair_fee_manager,MRP Repair Fee manager,model_mrp_repair_fee,stock.group_stock_manager,1,0,0,0
-access_mrp_repair_user,MRP Repair user,model_mrp_repair,mrp.group_mrp_user,1,1,1,1
-access_mrp_repair_manager,MRP Repair manager,model_mrp_repair,mrp.group_mrp_manager,1,0,0,0
+access_mrp_repair_user,MRP Repair user,model_mrp_repair,mrp.group_mrp_user,1,1,1,0
+access_mrp_repair_manager,MRP Repair manager,model_mrp_repair,mrp.group_mrp_manager,1,1,1,1
 access_product_pricelist_manager,product.pricelist manager,product.model_product_pricelist,mrp.group_mrp_manager,1,0,0,0
 access_product_pricelist_user,product.pricelist user,product.model_product_pricelist,mrp.group_mrp_user,1,1,1,1
 access_stock_production_lot_user,stock.production.lot user,stock.model_stock_production_lot,mrp.group_mrp_user,1,1,1,1

=== modified file 'point_of_sale/point_of_sale_view.xml'
--- point_of_sale/point_of_sale_view.xml	2014-01-10 17:17:46 +0000
+++ point_of_sale/point_of_sale_view.xml	2014-01-15 16:13:35 +0000
@@ -63,10 +63,10 @@
                         </page>
                         <page string="Payments">
                             <field name="statement_ids" colspan="4" nolabel="1">
-                                <tree editable="bottom" string="Statement lines">
+                                <tree editable="bottom" string="Statement lines" create="false">
                                     <field name="journal_id"/>
-                                    <field name="statement_id"/>
-                                    <field name="amount"/>
+                                    <field name="statement_id" readonly="1"/>
+                                    <field name="amount" readonly="1"/>
                                 </tree>
                                 <form string="Statement lines" version="7.0">
                                     <group col="4">
@@ -83,10 +83,10 @@
                                 <field name="warehouse_id" widget="selection" groups="stock.group_locations"/>
                                 <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'point_of_sale.group_pos_user']}"/>
                                 <field name="pricelist_id" groups="product.group_sale_pricelist" domain="[('type','=','sale')]"/>
-                                <field name="picking_id" readonly="1"/>
+                                <field name="picking_id" readonly="1" groups="point_of_sale.group_pos_manager"/>
                                 <field name="pos_reference"/>
                             </group>
-                            <group string="Accounting Information">
+                            <group string="Accounting Information" groups="point_of_sale.group_pos_manager">
                                 <field name="sale_journal" domain="[('type','=','sale')]"/>
                                 <field name="invoice_id" readonly="1"
                                     attrs="{'invisible':[('state','&lt;&gt;','invoiced')]}"/>

=== modified file 'point_of_sale/security/ir.model.access.csv'
--- point_of_sale/security/ir.model.access.csv	2013-10-27 12:31:04 +0000
+++ point_of_sale/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -1,5 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_pos_order,pos.order,model_pos_order,group_pos_user,1,1,1,1
+access_pos_order,pos.order,model_pos_order,group_pos_user,1,1,1,0
 access_pos_order_line,pos.order.line,model_pos_order_line,group_pos_user,1,1,1,1
 access_pos_order_manager,pos.order manager,model_pos_order,group_pos_manager,1,0,0,0
 access_pos_order_line_manager,pos.order.line manager,model_pos_order_line,group_pos_manager,1,0,0,0
@@ -19,6 +19,7 @@
 access_account_bank_statement,account.bank.statement,account.model_account_bank_statement,group_pos_user,1,1,1,0
 access_account_bank_statement_manager,account.bank.statement manager,account.model_account_bank_statement,group_pos_manager,1,1,1,1
 access_account_bank_statement_line,account.bank.statement.line,account.model_account_bank_statement_line,group_pos_user,1,1,1,0
+access_pos_account_account_type,account.account.type manager,account.model_account_account_type,group_pos_manager,1,0,0,0
 access_account_invoice_pos,account.invoice pos user,account.model_account_invoice,group_pos_user,1,1,1,0
 access_account_invoice_pos_manager,account.invoice pos manager,account.model_account_invoice,group_pos_manager,1,0,0,0
 access_account_invoice_line_pos,account.invoice.line pos user,account.model_account_invoice_line,group_pos_user,1,1,1,0
@@ -57,7 +58,11 @@
 access_product_category_manager,product.category manager,product.model_product_category,group_pos_manager,1,1,1,1
 access_product_pricelist_manager,product.pricelist manager,product.model_product_pricelist,group_pos_manager,1,0,0,0
 access_product_category_pos_manager,pos.category manager,model_pos_category,group_pos_manager,1,1,1,1
+access_product_category_stock_manager,pos.category manager,model_pos_category,stock.group_stock_manager,1,1,1,1
 access_product_category_pos_user,pos.category user,model_pos_category,group_pos_user,1,0,0,0
 access_pos_session_user,pos.session user,model_pos_session,group_pos_user,1,1,1,0
 access_pos_config_user,pos.config user,model_pos_config,group_pos_user,1,1,1,0
 access_ir_sequence_manager,ir.sequence manager,base.model_ir_sequence,group_pos_manager,1,1,1,1
+access_product_category_pos_partner_manager,pos.category manager,model_pos_category,base.group_partner_manager,1,0,0,0
+access_pos_details_manager,pos.details manager,model_res_users,group_pos_manager,1,1,1,0
+access_account_analytic_default_pos_manager,account.analytic.default,account_analytic_default.model_account_analytic_default,group_pos_manager,1,1,1,1

=== added file 'portal_event/event_view.xml.OTHER'
--- portal_event/event_view.xml.OTHER	1970-01-01 00:00:00 +0000
+++ portal_event/event_view.xml.OTHER	2014-01-15 16:13:35 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- add visibility field to the event form view -->
+        <record id="view_event_form_portal" model="ir.ui.view">
+            <field name="name">portal.event.form</field>
+            <field name="model">event.event</field>
+            <field name="inherit_id" ref="event.view_event_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//page[last()]" position="after">
+                    <page string="Portal Settings" groups="event.group_event_manager">
+                        <group>
+                            <field name="visibility"/>
+                        </group>
+                    </page>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>

=== modified file 'procurement/procurement_view.xml'
--- procurement/procurement_view.xml	2013-10-27 12:31:04 +0000
+++ procurement/procurement_view.xml	2014-01-15 16:13:35 +0000
@@ -279,8 +279,8 @@
 
         <!-- Procurements are located in Warehouse menu hierarchy, MRP users should come to Stock application to use it.  -->
         <menuitem id="menu_stock_sched" name="Schedulers" parent="stock.menu_stock_root" sequence="4" groups="stock.group_stock_manager"/>
-            <menuitem action="action_compute_schedulers" id="menu_stock_proc_schedulers" parent="menu_stock_sched" sequence="20" groups="stock.group_stock_manager"/>
-            <menuitem action="procurement_exceptions" id="menu_stock_procurement_action" parent="menu_stock_sched" sequence="50" groups="stock.group_stock_manager"/>
+        <menuitem action="action_compute_schedulers" id="menu_stock_proc_schedulers" parent="menu_stock_sched" sequence="20" groups="stock.group_stock_manager"/>
+        <menuitem action="procurement_exceptions" id="menu_stock_procurement_action" parent="menu_stock_sched" sequence="50" groups="stock.group_stock_manager"/>
         <menuitem id="menu_stock_procurement" name="Automatic Procurements" parent="stock.menu_stock_configuration" sequence="5"/>
             <menuitem action="action_orderpoint_form" id="menu_stock_order_points" parent="stock.menu_stock_configuration" sequence="10"/>
 
@@ -323,7 +323,12 @@
                     <button string="⇒ Request Procurement" name="%(act_make_procurement)d" type="action" class="oe_link"/>
                 </xpath>
                 <xpath expr="//div[@name='buttons']" position="inside">
+<<<<<<< TREE
                     <button string="Orderpoints" name="%(product_open_orderpoint)d" type="action" attrs="{'invisible':[('type', '=', 'service')]}"/>
+=======
+                    <button string="Request Procurement" name="%(act_make_procurement)d" type="action" groups="stock.group_stock_user"/>
+                    <button string="Orderpoints" name="%(product_open_orderpoint)d" type="action" groups="stock.group_stock_user"/>
+>>>>>>> MERGE-SOURCE
                 </xpath>
                 <xpath expr="//field[@name='cost_method']" position="before">
                     <field name="procure_method" groups="base.group_user"/>

=== modified file 'product/product_view.xml'
--- product/product_view.xml	2013-10-27 12:31:04 +0000
+++ product/product_view.xml	2014-01-15 16:13:35 +0000
@@ -72,7 +72,7 @@
                                 <label for="sale_ok"/>
                             </div>
                         </div>
-                        <div class="oe_right oe_button_box" name="buttons">
+                        <div class="oe_right oe_button_box" name="buttons" groups="base.group_sale_manager">
                         </div>
                         <notebook>
                             <page string="Information">

=== modified file 'product_margin/wizard/product_margin_view.xml'
--- product_margin/wizard/product_margin_view.xml	2013-10-27 12:31:04 +0000
+++ product_margin/wizard/product_margin_view.xml	2014-01-15 16:13:35 +0000
@@ -26,6 +26,7 @@
             view_mode="form"
             target="new"
             key2="client_action_multi"
+            groups="base.group_sale_manager"
             id="product_margin_act_window"/>
 
     </data>

=== modified file 'project/board_project_view.xml'
--- project/board_project_view.xml	2013-10-27 12:31:04 +0000
+++ project/board_project_view.xml	2014-01-15 16:13:35 +0000
@@ -58,7 +58,9 @@
         <menuitem id="menu_project_dashboard"
                   sequence="35"
                   parent="base.menu_reporting_dashboard"
-                  action="open_board_project"/>
+                  action="open_board_project"
+                  groups="project.group_project_user"
+        />
 
     </data>
 </openerp>

=== modified file 'project/project_view.xml'
--- project/project_view.xml	2013-11-29 09:46:10 +0000
+++ project/project_view.xml	2014-01-15 16:13:35 +0000
@@ -5,10 +5,10 @@
         <!-- Top menu item -->
         <menuitem name="Project"
             id="base.menu_main_pm"
-            groups="group_project_manager,group_project_user"
+            groups="group_project_user"
             sequence="40"/>
 
-        <menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
+        <menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1" groups="group_project_user"/>
         <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
 
         <record id="view_task_search_form" model="ir.ui.view">
@@ -70,6 +70,7 @@
             <field name="arch" type="xml">
                 <form string="Project" version="7.0">
                 <header>
+<<<<<<< TREE
                     <button name="set_open" string="Re-open project" type="object" states="pending" class="oe_highlight" groups="base.group_user"/>
                     <button name="set_done" string="Close Project" type="object" states="open,pending" groups="base.group_user"/>
                     <button name="set_open" string="Re-open project" type="object" states="cancelled,close" groups="base.group_user"/>
@@ -78,6 +79,16 @@
                     <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}" class="oe_highlight" groups="base.group_user"/>
                     <button name="reset_project" string="Reset as Project" type="object" states="template" class="oe_highlight" groups="base.group_user"/>
                     <button name="set_cancel" string="Cancel Project" type="object" states="open,pending" groups="base.group_user"/>
+=======
+                    <button name="set_open" string="Re-open project" type="object" states="pending" class="oe_highlight" groups="project.group_project_manager"/>
+                    <button name="set_done" string="Close Project" type="object" states="open,pending" groups="project.group_project_manager"/>
+                    <button name="set_open" string="Re-open project" type="object" states="cancelled,close" groups="project.group_project_manager"/>
+                    <button name="set_pending" string="Pending" type="object" states="open" groups="project.group_project_manager"/>
+                    <button name="set_template" string="Set as Template" type="object" states="open" groups="project.group_project_manager"/>
+                    <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}" class="oe_highlight" groups="project.group_project_manager"/>
+                    <button name="reset_project" string="Reset as Project" type="object" states="template" class="oe_highlight" groups="project.group_project_manager"/>
+                    <button name="set_cancel" string="Cancel" type="object" states="open,pending" groups="project.group_project_manager"/>
+>>>>>>> MERGE-SOURCE
                     <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' readonly="1"/>
                 </header>
                 <sheet string="Project">
@@ -93,8 +104,14 @@
                         </div>
                     </div>
                     <div class="oe_right oe_button_box" name="buttons" groups="base.group_user">
+<<<<<<< TREE
                         <field name="tasks" widget="x2many_counter" string="Tasks" attrs="{'invisible':[('use_tasks','=', False)]}" options='{"views": [[false, "kanban"], [false, "tree"], [false, "form"], [false, "calendar"], [false, "gantt"], [false, "graph"]]}'/>
                         <button name="attachment_tree_view" string="Documents" type="object"/>
+=======
+                        <button name="%(act_project_project_2_project_task_all)d" string="Tasks"
+                            type="action" attrs="{'invisible':[('use_tasks','=', 0)]}" groups="project.group_project_manager"/>
+                        <button name="attachment_tree_view" string="Documents" type="object" groups="project.group_project_manager"/>
+>>>>>>> MERGE-SOURCE
                     </div>
                     <group>
                         <group>

=== modified file 'project/res_partner_view.xml'
--- project/res_partner_view.xml	2013-10-27 12:31:04 +0000
+++ project/res_partner_view.xml	2014-01-15 16:13:35 +0000
@@ -9,12 +9,31 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="priority" eval="50"/>
             <field name="arch" type="xml">
+<<<<<<< TREE
                 <xpath expr="//div[@name='buttons']" position="inside">
                     <button class="oe_inline" type="action"
                         name="%(action_view_task)d"
                         string="Tasks"
                         context="{'search_default_partner_id': active_id, 'default_partner_id': active_id}"
                         groups="project.group_project_user" />
+=======
+                <xpath expr="//page[@name='page_history']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                </xpath>
+                <xpath expr="//page[@name='page_history']" position="inside">
+                    <group name="grp_task" string="Tasks" groups="project.group_project_user">
+                        <field name="task_ids" colspan="4" nolabel="1">
+                            <tree string="Tasks" editable="bottom">
+                                <field name="name"/>
+                                <field name="user_id"/>
+                                <field name="date_deadline"/>
+                                <field name="state" invisible="1"/>
+                                <button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-media-play" help="For changing to open state" invisible="context.get('set_visible',False)"/>
+                                <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
+                            </tree>
+                        </field>
+                      </group>
+>>>>>>> MERGE-SOURCE
                 </xpath>
             </field>
        </record>

=== modified file 'project/security/ir.model.access.csv'
--- project/security/ir.model.access.csv	2013-10-27 12:31:04 +0000
+++ project/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -4,22 +4,27 @@
 access_account_analytic_account_user,account.analytic.account,analytic.model_account_analytic_account,project.group_project_user,1,0,0,0
 access_account_analytic_account,account.analytic.account,analytic.model_account_analytic_account,project.group_project_manager,1,1,1,1
 access_project_task_type_user,project.task.type user,model_project_task_type,project.group_project_user,1,1,1,1
-access_project_task,project.task,model_project_task,project.group_project_user,1,1,1,1
-access_project_task_work,project.task.work,model_project_task_work,project.group_project_user,1,1,1,1
-access_report_project_task_user,report.project.task.user,model_report_project_task_user,project.group_project_manager,1,1,1,1
+access_project_task,project.task,model_project_task,base.group_user,1,1,1,1
+access_project_task_work,project.task.work,model_project_task_work,base.group_user,1,1,1,1
+access_report_project_task_user,report.project.task.user,model_report_project_task_user,project.group_project_manager,1,1,1,0
 access_partner_task user,base.res.partner user,base.model_res_partner,project.group_project_user,1,0,0,0
 access_task_on_partner,project.task on partners,model_project_task,base.group_user,1,0,0,0
 access_project_on_partner,project.project on partners,model_project_project,base.group_user,1,0,0,0
-access_project_task_sale_user,project.task salesman,model_project_task,base.group_sale_salesman,1,1,1,1
+access_project_task_sale_user,project.task salesman,model_project_task,base.group_sale_salesman,1,0,0,0
 access_project_task_type_sale_user,project.task.type salesman,project.model_project_task_type,base.group_sale_salesman,1,1,1,1
 access_project_task_history_sale_user,project.task.history salesman,project.model_project_task_history,base.group_sale_salesman,1,1,1,1
+access_project_task_history_project_user,project.task.history.cumulative user,project.model_project_task_history_cumulative,project.group_project_user,1,0,0,0
 access_project_project_sale_user,project.project salesman,model_project_project,base.group_sale_salesman,1,0,0,0
 access_account_analytic_line_project,account.analytic.line project,analytic.model_account_analytic_line,project.group_project_manager,1,1,1,1
 access_project_task_history,project.task.history project,project.model_project_task_history,project.group_project_user,1,1,1,0
 access_project_task_history_cumulative,project.task.history project,project.model_project_task_history_cumulative,project.group_project_manager,1,0,0,0
 access_project_task_history_cumulative,project.task.history project,project.model_project_task_history_cumulative,project.group_project_user,1,0,0,0
 access_resource_calendar,project.resource_calendar manager,resource.model_resource_calendar,project.group_project_manager,1,0,0,0
+<<<<<<< TREE
 access_resource_calendar_leaves_user,resource.calendar.leaves user,resource.model_resource_calendar_leaves,project.group_project_user,1,1,1,1
+=======
+access_resource_calendar_attendance,project.resource_calendar_attendance manager,resource.model_resource_calendar_attendance,project.group_project_manager,1,1,1,1
+>>>>>>> MERGE-SOURCE
 access_project_category,project.project_category,model_project_category,,1,0,0,0
 access_project_category_manager,project.project_category,model_project_category,project.group_project_manager,1,1,1,1
 access_mail_alias,mail.alias,mail.model_mail_alias,project.group_project_manager,1,1,1,1

=== modified file 'project_gtd/security/ir.model.access.csv'
--- project_gtd/security/ir.model.access.csv	2011-12-19 16:54:40 +0000
+++ project_gtd/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -1,5 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_project_gtd_context_user,project.gtd.context project user,model_project_gtd_context,project.group_project_user,1,0,0,0
-access_project_gtd_timebox_user,project.gtd.timebox project user,model_project_gtd_timebox,project.group_project_user,1,0,0,0
 access_project_gtd_context_manager,project.gtd.context project manager,model_project_gtd_context,project.group_project_manager,1,1,1,1
+access_project_gtd_context_base_user,project.gtd.context base user,model_project_gtd_context,base.group_user,1,0,0,0
 access_project_gtd_timebox_manager,project.gtd.timebox project manager,model_project_gtd_timebox,project.group_project_manager,1,1,1,1
+access_project_gtd_timebox_base_user,project.gtd.timebox base user,model_project_gtd_timebox,base.group_user,1,0,0,0

=== modified file 'project_issue/security/ir.model.access.csv'
--- project_issue/security/ir.model.access.csv	2013-10-27 12:31:04 +0000
+++ project_issue/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -1,6 +1,12 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+<<<<<<< TREE
 access_project_issue_user,project.issue,model_project_issue,project.group_project_user,1,1,1,1
 access_project_issue_report_all,project.issue.report,model_project_issue_report,project.group_project_manager,1,1,1,1
+=======
+access_project_issue_user,project.issue,model_project_issue,project.group_project_user,1,1,1,0
+access_project_issue_report_all,project.issue.report,model_project_issue_report,project.group_project_manager,1,1,1,0
+access_crm_case_categ_id,crm.case.categ,crm.model_crm_case_categ,project.group_project_manager,1,1,1,1
+>>>>>>> MERGE-SOURCE
 access_project_issue_version_project,project_issue_version manager,model_project_issue_version,project.group_project_manager,1,1,1,1
 access_project_issue_version_project_user,project_issue_version user,model_project_issue_version,project.group_project_user,1,0,0,0
 access_resource_calendar_project_manager,resource.calendar.project.manager,resource.model_resource_calendar,project.group_project_manager,1,1,1,1

=== modified file 'project_long_term/security/ir.model.access.csv'
--- project_long_term/security/ir.model.access.csv	2013-10-27 12:31:04 +0000
+++ project_long_term/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -1,6 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_project_phase,project.phase,model_project_phase,project.group_project_user,1,1,1,0
-access_project_user_allocation,project.user.allocation,model_project_user_allocation,project.group_project_user,1,0,0,0
+access_project_user_allocation,project.user.allocation,model_project_user_allocation,project.group_project_user,1,1,1,1
 access_project_phase_manager,project.phase manager,model_project_phase,project.group_project_manager,1,1,1,1
 access_project_user_allocation_manager,project.user.allocation manager,model_project_user_allocation,project.group_project_manager,1,1,1,1
 access_resource_resource_user,user.user user,resource.model_resource_resource,project.group_project_user,1,0,0,0

=== modified file 'project_timesheet/security/ir.model.access.csv'
--- project_timesheet/security/ir.model.access.csv	2012-06-29 06:03:34 +0000
+++ project_timesheet/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -4,3 +4,11 @@
 access_hr_timesheet_sheet_sheet_user,hr.timesheet.sheet.sheet.user,hr_timesheet_sheet.model_hr_timesheet_sheet_sheet,project.group_project_user,1,1,1,0
 access_sale_order_manager,sale.order,sale.model_sale_order,project.group_project_manager,1,0,0,0
 access_sale_order_user,sale.order,sale.model_sale_order,project.group_project_user,1,0,0,0
+access_analytic_entries_report_manager,analytic.entries.report,account.model_analytic_entries_report,project.group_project_manager,1,0,0,0
+access_project_account_move_line_user,project.account_move_line user,account.model_account_move_line,project.group_project_user,1,0,0,0
+access_project_account_move_line_manager,project.account_move_line,account.model_account_move_line,project.group_project_manager,1,1,1,0
+access_project_account_invoice_tax_user,project.account_invoice_tax user,account.model_account_invoice_tax,project.group_project_user,1,0,0,0
+access_project_account_invoice_tax_manager,project.account_invoice_tax,account.model_account_invoice_tax,project.group_project_manager,1,1,1,0
+access_project_account_jouranl_manager,project.account_journal,account.model_account_journal,project.group_project_manager,1,1,1,0
+access_project_account_invoice_line_user,project.account_invoice_line user,account.model_account_invoice_line,project.group_project_user,1,1,1,0
+access_project_account_invoice_line_manager,project.account_invoice_line manager,account.model_account_invoice_line,project.group_project_manager,1,1,1,1

=== modified file 'project_timesheet/security/project_timesheet_security.xml'
--- project_timesheet/security/project_timesheet_security.xml	2012-06-25 12:30:34 +0000
+++ project_timesheet/security/project_timesheet_security.xml	2014-01-15 16:13:35 +0000
@@ -4,6 +4,9 @@
         <record model="res.groups" id="base.group_user">
             <field name="implied_ids" eval="[(4, ref('project.group_tasks_work_on_tasks'))]"/>
         </record>
+        <record model="ir.ui.menu" id="account.menu_action_analytic_entries_report">
+            <field name="groups_id" eval="[(6,0,[ref('project.group_project_manager')])]"/>
+        </record>
     </data>
 </openerp>
 

=== modified file 'purchase/partner_view.xml'
--- purchase/partner_view.xml	2013-10-27 12:31:04 +0000
+++ purchase/partner_view.xml	2014-01-15 16:13:35 +0000
@@ -80,7 +80,7 @@
                         groups="purchase.group_purchase_user"/>
                     <button name="%(purchase.act_res_partner_2_supplier_invoices)d" type="action"
                         attrs="{'invisible': [('supplier', '=', False)]}"
-                        string="Supplier Invoices"/>
+                        string="Supplier Invoices" groups="account.group_account_invoice"/>
                 </xpath>
             </field>
         </record>

=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml	2013-11-30 13:07:25 +0000
+++ purchase/purchase_view.xml	2014-01-15 16:13:35 +0000
@@ -94,7 +94,7 @@
 
     <!--Invoice control-->
     <menuitem id="menu_procurement_management_invoice" name="Invoice Control"
-        parent="base.menu_purchase_root" sequence="6"/>
+        parent="base.menu_purchase_root" sequence="6" groups="purchase.group_purchase_manager"/>
 
     <record id="action_invoice_pending" model="ir.actions.act_window">
         <field name="name">On Draft Invoices</field>

=== modified file 'purchase/security/ir.model.access.csv'
--- purchase/security/ir.model.access.csv	2012-11-29 22:26:45 +0000
+++ purchase/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -1,5 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_purchase_order,purchase.order,model_purchase_order,group_purchase_user,1,1,1,1
+access_purchase_order,purchase.order,model_purchase_order,group_purchase_user,1,1,1,0
 access_purchase_order_manager,purchase.order,model_purchase_order,group_purchase_manager,1,1,1,1
 access_purchase_order_line,purchase.order.line user,model_purchase_order_line,group_purchase_user,1,1,1,1
 access_purchase_order_line_manager,purchase.order.line manager,model_purchase_order_line,group_purchase_manager,1,0,0,0
@@ -7,8 +7,8 @@
 access_stock_warehouse_purchase_user,stock.warehouse,stock.model_stock_warehouse,group_purchase_user,1,0,0,0
 access_stock_picking_purchase_user,stock.picking,stock.model_stock_picking,group_purchase_user,1,1,1,1
 access_stock_move_purchase_user,stock.move,stock.model_stock_move,group_purchase_user,1,1,1,0
-access_purchase_order_stock_worker,purchase.order,model_purchase_order,stock.group_stock_user,1,0,0,0
-access_purchase_order_line_stock_worker,purchase.order.line,model_purchase_order_line,stock.group_stock_user,1,0,0,0
+access_purchase_order_stock_worker,purchase.order,model_purchase_order,stock.group_stock_user,1,1,0,0
+access_purchase_order_line_stock_worker,purchase.order.line,model_purchase_order_line,stock.group_stock_user,1,1,0,0
 access_account_tax_purchase_user,account.tax,account.model_account_tax,group_purchase_user,1,0,0,0
 access_report_purchase_order,purchase.report,model_purchase_report,group_purchase_manager,1,0,0,0
 access_report_purchase_order_user,purchase.report user,model_purchase_report,group_purchase_user,1,0,0,0
@@ -65,3 +65,4 @@
 access_stock_location_purchase_manager,stock.location purchase manager,stock.model_stock_location,purchase.group_purchase_manager,1,0,0,0
 access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,purchase.group_purchase_manager,1,0,0,0
 access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,group_purchase_user,1,0,0,0
+access_purchase_order_user,purchase.order,model_purchase_order,base.group_user,1,0,0,0

=== modified file 'purchase_requisition/purchase_requisition_view.xml'
--- purchase_requisition/purchase_requisition_view.xml	2013-10-27 12:31:04 +0000
+++ purchase_requisition/purchase_requisition_view.xml	2014-01-15 16:13:35 +0000
@@ -175,6 +175,7 @@
         id="menu_purchase_requisition_pro_mgt"
         sequence="10"
         parent="purchase.menu_procurement_management"
+        groups="purchase_requisition.group_purchase_requisition_user"
         action="action_purchase_requisition"/>
 
     <record model="ir.ui.view" id="product_normal_form_view_inherit">

=== modified file 'sale/board_sale_view.xml'
--- sale/board_sale_view.xml	2012-11-29 22:26:45 +0000
+++ sale/board_sale_view.xml	2014-01-15 16:13:35 +0000
@@ -73,7 +73,7 @@
                   sequence="15"
                   parent="base.menu_reporting_dashboard"
                   action="open_board_sales"
-                  groups="base.group_sale_salesman"/>
+                  groups="base.group_sale_manager"/>
 
     </data>
 </openerp>

=== modified file 'sale/edi/sale_order_action_data.xml'
--- sale/edi/sale_order_action_data.xml	2013-11-27 15:32:57 +0000
+++ sale/edi/sale_order_action_data.xml	2014-01-15 16:13:35 +0000
@@ -11,6 +11,10 @@
             <field name="search_view_id" ref="email_template.view_email_template_search"/>
             <field name="context" eval="{'search_default_model_id': ref('sale.model_sale_order')}"/>
         </record>
+<<<<<<< TREE
+=======
+        <menuitem id="base.menu_sales_configuration_misc" name="Miscellaneous" parent="base.menu_base_config" sequence="75" groups="base.group_sale_manager"/>
+>>>>>>> MERGE-SOURCE
     </data>
 
     <!-- Mail template is done in a NOUPDATE block

=== modified file 'sale/security/ir.model.access.csv'
--- sale/security/ir.model.access.csv	2013-10-27 12:31:04 +0000
+++ sale/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -1,5 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_sale_order,sale.order,model_sale_order,base.group_sale_salesman,1,1,1,0
+access_sale_order_base_user,sale.order,model_sale_order,base.group_user,1,0,0,0
 access_sale_order_line,sale.order.line,model_sale_order_line,base.group_sale_salesman,1,1,1,1
 access_sale_order_line_accountant,sale.order.line accountant,model_sale_order_line,account.group_account_user,1,1,0,0
 access_account_invoice_tax_salesman,account_invoice_tax salesman,account.model_account_invoice_tax,base.group_sale_salesman,1,1,1,0
@@ -11,7 +12,7 @@
 access_sale_order_manager,sale.order.manager,model_sale_order,base.group_sale_manager,1,1,1,1
 access_sale_order_accountant,sale.order.accountant,model_sale_order,account.group_account_user,1,1,0,0
 access_sale_report_salesman,sale.report,model_sale_report,base.group_sale_salesman,1,1,1,0
-access_sale_report_manager,sale.report,model_sale_report,base.group_sale_manager,1,1,1,1
+access_sale_report_manager,sale.report,model_sale_report,base.group_sale_manager,1,1,1,0
 access_ir_property_sales,ir.property.sales,base.model_ir_property,base.group_sale_salesman,1,1,1,1
 access_sale_account_journal,account.journal sale order.user,account.model_account_journal,base.group_sale_salesman,1,0,0,0
 access_res_partner_sale_user,res.partner.sale.user,base.model_res_partner,base.group_sale_salesman,1,0,0,0

=== modified file 'stock/report/report_stock_view.xml'
--- stock/report/report_stock_view.xml	2013-10-27 12:31:04 +0000
+++ stock/report/report_stock_view.xml	2014-01-15 16:13:35 +0000
@@ -3,6 +3,17 @@
     <data>
 
         <act_window
+<<<<<<< TREE
+=======
+            context="{'product_id': active_id}"
+            id="act_stock_product_location_open"
+            name="Stock by Location"
+            groups="stock.group_stock_user,base.group_sale_salesman"
+            res_model="stock.location"
+            src_model="product.product"/>
+
+        <act_window
+>>>>>>> MERGE-SOURCE
             domain="[('tracking_id', '=', active_id)]"
             id="act_stock_tracking_lot_2_stock_report_tracklots"
             name="Stock" res_model="stock.report.tracklots"

=== modified file 'stock/security/ir.model.access.csv'
--- stock/security/ir.model.access.csv	2013-10-27 12:31:04 +0000
+++ stock/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -8,19 +8,24 @@
 access_stock_location_user,stock.location.user,model_stock_location,base.group_user,1,0,0,0
 access_stock_journal_user,stock.journal.user,model_stock_journal,base.group_user,1,0,0,0
 access_stock_journal_manager,stock.journal.manager,model_stock_journal,stock.group_stock_manager,1,1,1,1
-access_stock_tracking_user,stock.tracking user,model_stock_tracking,stock.group_stock_user,1,1,1,1
-access_stock_tracking_manager,stock.tracking manager,model_stock_tracking,stock.group_stock_manager,1,0,0,0
+access_stock_tracking_user,stock.tracking user,model_stock_tracking,stock.group_stock_user,1,1,1,0
+access_stock_tracking_manager,stock.tracking manager,model_stock_tracking,stock.group_stock_manager,1,1,1,1
 access_stock_tracking_sales_user,stock.tracking sales.user,model_stock_tracking,base.group_sale_salesman,1,1,1,0
-access_stock_picking_user,stock.picking user,model_stock_picking,stock.group_stock_user,1,1,1,1
-access_stock_picking_in_user,stock.picking.in,model_stock_picking_in,stock.group_stock_user,1,1,1,1
-access_stock_picking_out_user,stock.picking.out,model_stock_picking_out,stock.group_stock_user,1,1,1,1
-access_stock_picking_manager,stock.picking manager,model_stock_picking,stock.group_stock_manager,1,1,0,0
-access_stock_picking_in_manager,stock.picking.in manager,model_stock_picking_in,stock.group_stock_manager,1,0,0,0
-access_stock_picking_out_manager,stock.picking.out manager,model_stock_picking_out,stock.group_stock_manager,1,0,0,0
-access_stock_production_lot_manager,stock.production.lot manager,model_stock_production_lot,stock.group_stock_manager,1,0,0,0
-access_stock_production_lot_user,stock.production.lot user,model_stock_production_lot,stock.group_stock_user,1,1,1,1
+access_stock_picking,stock.picking,model_stock_picking,base.group_user,1,0,0,0
+access_stock_picking_user,stock.picking user,model_stock_picking,stock.group_stock_user,1,1,1,0
+access_stock_picking_in_user,stock.picking.in,model_stock_picking_in,stock.group_stock_user,1,1,1,0
+access_stock_picking_out_user,stock.picking.out,model_stock_picking_out,stock.group_stock_user,1,1,1,0
+access_stock_picking_manager,stock.picking manager,model_stock_picking,stock.group_stock_manager,1,1,1,1
+access_stock_picking_in_manager,stock.picking.in manager,model_stock_picking_in,stock.group_stock_manager,1,1,1,1
+access_stock_picking_out_manager,stock.picking.out manager,model_stock_picking_out,stock.group_stock_manager,1,1,1,1
+access_stock_production_lot_manager,stock.production.lot manager,model_stock_production_lot,stock.group_stock_manager,1,1,1,1
+access_stock_production_lot_user,stock.production.lot user,model_stock_production_lot,stock.group_stock_user,1,1,1,0
 access_stock_production_lot_revision,stock.production.lot.revision,model_stock_production_lot_revision,stock.group_stock_user,1,1,1,1
+<<<<<<< TREE
 access_stock_move_manager,stock.move manager,model_stock_move,stock.group_stock_manager,1,1,1,1
+=======
+access_stock_move,stock.move,model_stock_move,base.group_user,1,0,0,0
+>>>>>>> MERGE-SOURCE
 access_stock_move_user,stock.move user,model_stock_move,stock.group_stock_user,1,1,1,0
 access_stock_inventory_user,stock.inventory user,model_stock_inventory,stock.group_stock_user,1,1,1,0
 access_stock_inventory_manager,stock.inventory manager,model_stock_inventory,stock.group_stock_manager,1,1,1,1
@@ -30,11 +35,11 @@
 access_stock_location_sale_manager,stock.location sale manager,model_stock_location,base.group_sale_manager,1,0,0,0
 access_stock_location_stock_manager,stock.location stock manager,model_stock_location,stock.group_stock_manager,1,0,0,0
 access_stock_lines_date_user,report.stock.lines.date user,model_report_stock_lines_date,stock.group_stock_user,1,0,0,0
-access_stock_lines_date_manager,report.stock.lines.date manager,model_report_stock_lines_date,stock.group_stock_manager,1,1,1,1
+access_stock_lines_date_manager,report.stock.lines.date manager,model_report_stock_lines_date,stock.group_stock_manager,1,1,1,0
 access_stock_report_tracklots,stock.report.tracklots,model_stock_report_tracklots,stock.group_stock_user,1,1,1,1
 access_report_stock_move_user,report.stock.move user,model_report_stock_move,stock.group_stock_user,1,0,0,0
-access_report_stock_move_manager,report.stock.move manager,model_report_stock_move,stock.group_stock_manager,1,1,1,1
-access_report_stock_inventory_user,report.stock.inventory user,model_report_stock_inventory,stock.group_stock_user,1,1,1,1
+access_report_stock_move_manager,report.stock.move manager,model_report_stock_move,stock.group_stock_manager,1,1,1,0
+access_report_stock_inventory_user,report.stock.inventory user,model_report_stock_inventory,stock.group_stock_user,1,1,1,0
 access_product_product_stock_user,product_product_stock_user,product.model_product_product,stock.group_stock_user,1,1,0,0
 access_product_template_stock_user,product.template stock user,product.model_product_template,stock.group_stock_user,1,1,0,0
 access_account_invoice_user,account.invoice stock user,account.model_account_invoice,stock.group_stock_user,1,1,1,0
@@ -42,6 +47,8 @@
 access_account_invoice_tax_user,account.invoice.tax stock user,account.model_account_invoice_tax,stock.group_stock_user,1,1,1,0
 access_account_journal_user,account.journal stock user,account.model_account_journal,stock.group_stock_user,1,0,0,0
 access_account_fiscalyear,account.fiscalyear stock user,account.model_account_fiscalyear,stock.group_stock_user,1,0,0,0
+access_account_account_move_line_stock_user,account.move.line stock user,account.model_account_move_line,stock.group_stock_user,1,0,0,0
+access_account_account_move_stock_user,account.move stock user,account.model_account_move,stock.group_stock_user,1,0,0,0
 access_product_pricelist_item_sale_manager,product.pricelist.item salemanager,product.model_product_pricelist_item,base.group_sale_manager,1,1,1,1
 access_product_uom_categ_stock_manager,product.uom.categ stock_manager,product.model_product_uom_categ,stock.group_stock_manager,1,1,1,1
 access_product_uom_stock_manager,product.uom stock_manager,product.model_product_uom,stock.group_stock_manager,1,1,1,1

=== modified file 'stock/stock_report.xml'
--- stock/stock_report.xml	2013-10-27 12:31:04 +0000
+++ stock/stock_report.xml	2014-01-15 16:13:35 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <report auto="False" id="report_product_history" model="product.product" name="stock.product.history" string="Stock Level Forecast"/>
+        <report auto="False" id="report_product_history" model="product.product" name="stock.product.history" string="Stock Level Forecast" groups="stock.group_stock_user"/>
         <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Picking Slip" rml="stock/report/picking.rml"/>
         <report id="report_picking_list_in" model="stock.picking.in" name="stock.picking.list.in" string="Receipt Slip" rml="stock/report/picking.rml"/>
         <report id="report_picking_list_out" model="stock.picking.out" name="stock.picking.list.out" string="Delivery Slip" rml="stock/report/picking.rml"/>

=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml	2013-12-18 15:57:15 +0000
+++ stock/stock_view.xml	2014-01-15 16:13:35 +0000
@@ -759,8 +759,13 @@
                 <header>
                     <button name="draft_force_assign" states="draft" string="Confirm" type="object" class="oe_highlight" groups="base.group_user"/>
                     <button name="draft_validate" states="draft" string="Confirm &amp; Transfer" type="object" class="oe_highlight" groups="base.group_user"/>
+<<<<<<< TREE
                     <button name="action_assign" states="confirmed" string="Check Availability" type="object" class="oe_highlight"/>
                     <button name="force_assign" states="confirmed" string="Force Availability" type="object" class="oe_highlight" groups="base.group_user"/>
+=======
+                    <!-- <button name="action_assign" states="confirmed" string="Check Availability" type="object"/> -->
+                    <button name="force_assign" states="confirmed" string="Force Availability" groups="stock.group_stock_user" type="object" class="oe_highlight"/>
+>>>>>>> MERGE-SOURCE
                     <button name="action_process" states="assigned" string="Confirm &amp; Transfer" groups="stock.group_stock_user" type="object" class="oe_highlight"/>
                     <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice/Refund"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" context="{'group_field_invisible': True}" type="action" class="oe_highlight" groups="base.group_user"/>
                     <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action" groups="base.group_user"/>
@@ -900,6 +905,7 @@
             <field name="model">stock.picking.out</field>
             <field name="inherit_id" ref="view_picking_form"/>
             <field name="arch" type="xml">
+<<<<<<< TREE
                 <field name="date_done" position="attributes" version="7.0">
                     <attribute name="string">Date of Delivery</attribute>
                 </field>
@@ -928,6 +934,36 @@
                         <field name="message_ids" widget="mail_thread"/>
                     </div>
                 </xpath>
+=======
+                <data>
+                    <xpath expr="/form/header//button[@name='%(act_stock_return_picking)d']" position="replace">
+                        <button name="%(report_picking_list_out)d" string="Print Delivery Slip" type="action" states="done" class="oe_highlight"/>
+                        <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" groups="stock.group_stock_user"/>
+                    </xpath>
+                    <xpath expr="/form/header//button[@name='draft_validate']" position="replace">
+                        <button name="draft_validate" states="draft" string="Confirm &amp; Deliver" type="object" class="oe_highlight"/>
+                        <button name="action_assign" states="confirmed" string="Check Availability" type="object" class="oe_highlight"/>
+                    </xpath>
+                    <xpath expr="/form/header//button[@name='action_process']" position="replace">
+                        <button name="action_process" states="assigned" string="Deliver" type="object" groups="stock.group_stock_user" class="oe_highlight"/>
+                    </xpath>
+                    <xpath expr="/form/header//field[@name='state']" position="replace">
+                        <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
+                    </xpath>
+                    <xpath expr="//field[@name='partner_id']" position="replace">
+                        <field name="partner_id" on_change="onchange_partner_in(partner_id)"  string="Customer"/>
+                    </xpath>
+                    <xpath expr="//field[@name='move_lines']" position="replace">
+                        <field name="move_lines" context="{'address_out_id': partner_id, 'picking_type': 'out', 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree'}"/>
+                    </xpath>
+                    <xpath expr="/form/sheet" position="after">
+                        <div class="oe_chatter">
+                            <field name="message_follower_ids" widget="mail_followers"/>
+                            <field name="message_ids" widget="mail_thread"/>
+                        </div>
+                    </xpath>
+                </data>
+>>>>>>> MERGE-SOURCE
             </field>
         </record>
         <record id="view_picking_out_search" model="ir.ui.view">
@@ -1031,6 +1067,7 @@
             <field name="model">stock.picking.in</field>
             <field name="inherit_id" ref="view_picking_form"/>
             <field name="arch" type="xml">
+<<<<<<< TREE
                 <field name="date_done" position="attributes" version="7.0">
                     <attribute name="string">Date of Reception</attribute>
                 </field>
@@ -1055,6 +1092,31 @@
                         <field name="message_ids" widget="mail_thread"/>
                     </div>
                 </xpath>
+=======
+                <data>
+                    <xpath expr="/form/header//button[@name='%(act_stock_return_picking)d']" position="replace">
+                        <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action"/>
+                    </xpath>
+                    <xpath expr="//button[@name='draft_validate']" position="replace">
+                        <button name="draft_validate" states="draft" string="Confirm &amp; Receive" type="object" class="oe_highlight"/>
+                    </xpath>
+                    <xpath expr="//button[@name='action_process']" position="replace">
+                        <button name="action_process" states="assigned" string="Receive" type="object" class="oe_highlight" groups="stock.group_stock_user"/>
+                    </xpath>
+                    <xpath expr="//field[@name='partner_id']" position="replace">
+                        <field name="partner_id" on_change="onchange_partner_in(partner_id)"  string="Supplier"/>
+                    </xpath>
+                    <xpath expr="//field[@name='move_lines']" position="replace">
+                        <field name="move_lines" context="{'address_in_id': partner_id, 'picking_type': 'in', 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree'}"/>
+                    </xpath>
+                    <xpath expr="/form/sheet" position="after">
+                        <div class="oe_chatter">
+                            <field name="message_follower_ids" widget="mail_followers"/>
+                            <field name="message_ids" widget="mail_thread"/>
+                        </div>
+                    </xpath>
+                </data>
+>>>>>>> MERGE-SOURCE
             </field>
         </record>
         <record id="view_picking_in_search" model="ir.ui.view">
@@ -1578,6 +1640,26 @@
             res_model="product.product"
             src_model="stock.location"/>
 
+<<<<<<< TREE
+=======
+        <act_window
+            context="{'search_default_done': 1,'search_default_product_id': [active_id], 'default_product_id': active_id}"
+            id="act_product_stock_move_open"
+            name="Inventory Move"
+            res_model="stock.move"
+            src_model="product.product"
+            groups="base.group_sale_manager,stock.group_stock_user"/>
+
+        <act_window
+            context="{'search_default_future': 1,'search_default_product_id': [active_id], 'default_product_id': active_id}"
+            domain="[('state','in',('waiting','confirmed','assigned'))]"
+            id="act_product_stock_move_futur_open"
+            name="Future Stock Moves"
+            res_model="stock.move"
+            src_model="product.product"
+            groups="base.group_sale_manager,stock.group_stock_user"/>
+
+>>>>>>> MERGE-SOURCE
         <record id="ir_act_product_location_open" model="ir.values">
             <field name="key2">tree_but_open</field>
             <field name="model">stock.location</field>

=== modified file 'subscription/security/ir.model.access.csv'
--- subscription/security/ir.model.access.csv	2012-03-07 05:47:59 +0000
+++ subscription/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -1,6 +1,7 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_subscription_document_fields,subscription.document.fields,model_subscription_document_fields,base.group_tool_manager,1,1,1,1
-access_subscription_subscription_user,subscription.subscription user,model_subscription_subscription,base.group_tool_user,1,1,1,1
+access_subscription_subscription_user,subscription.subscription user,model_subscription_subscription,base.group_tool_user,1,1,1,0
+access_subscription_subscription_manager,subscription.subscription manager,model_subscription_subscription,base.group_tool_manager,1,1,1,1
 access_subscription_subscription_history_user,subscription.subscription.history user,model_subscription_subscription_history,base.group_tool_user,1,1,1,1
 access_subscription_document_user,subscription.document user,model_subscription_document,base.group_tool_user,1,1,1,1
 access_res_partner_user,res.partner.user,base.model_res_partner,base.group_tool_user,1,1,1,1

=== modified file 'survey/security/ir.model.access.csv'
--- survey/security/ir.model.access.csv	2012-03-07 05:47:59 +0000
+++ survey/security/ir.model.access.csv	2014-01-15 16:13:35 +0000
@@ -1,20 +1,24 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_survey_type_manager,survey.type.manager,model_survey_type,base.group_tool_manager,1,1,1,1
 access_survey_request_manager,survey.request manager,model_survey_request,base.group_tool_manager,1,1,1,1
+access_survey_request_user,survey.request user,model_survey_request,base.group_tool_user,1,1,1,0
 access_survey_tbl_column_heading_manager,survey.tbl.column.heading manager,model_survey_tbl_column_heading,base.group_tool_manager,1,1,1,1
 access_survey_res_partner_user,survey.res.partner.user,base.model_res_partner,base.group_tool_user,1,1,1,1
-access_survey_user,survey.user,model_survey,base.group_tool_user,1,1,1,1
-access_survey_page_user,survey.page user,model_survey_page,base.group_tool_user,1,1,1,1
-access_survey_question_user,survey.question user,model_survey_question,base.group_tool_user,1,1,1,1
+access_survey_user,survey.user,model_survey,base.group_tool_user,1,1,0,0
+access_survey_manager,survey.manager,model_survey,base.group_tool_manager,1,1,1,1
+access_survey_page_user,survey.page user,model_survey_page,base.group_tool_user,1,0,0,0
+access_survey_page_manager,survey.page manager,model_survey_page,base.group_tool_manager,1,1,1,1
+access_survey_question_user,survey.question user,model_survey_question,base.group_tool_user,1,0,0,0
+access_survey_question_manager,survey.question manager,model_survey_question,base.group_tool_manager,1,1,1,1
 access_survey_answer_user,survey.answer user,model_survey_answer,base.group_tool_user,1,1,1,1
 access_survey_response_user,survey.response user,model_survey_response,base.group_tool_user,1,1,1,1
 access_survey_response_answer_user,survey.response.answer user,model_survey_response_answer,base.group_tool_user,1,1,1,1
 access_survey_history_user,survey.history.user,model_survey_history,base.group_tool_user,1,1,1,1
 access_survey_response_line_user,survey.response.line user,model_survey_response_line,base.group_tool_user,1,1,1,1
 access_survey_res_partner_user,survey.res.partner.user,base.model_res_partner,base.group_tool_user,1,1,1,1
-access_survey_survey_user,survey.survey.user,model_survey,base.group_survey_user,1,1,1,1
-access_survey_page_survey_user,survey.page.survey.user,model_survey_page,base.group_survey_user,1,1,1,1
-access_survey_question_survey_user,survey.question.survey.user,model_survey_question,base.group_survey_user,1,1,1,1
+access_survey_survey_user,survey.survey.user,model_survey,base.group_survey_user,1,1,0,0
+access_survey_page_survey_user,survey.page.survey.user,model_survey_page,base.group_survey_user,1,0,0,0
+access_survey_question_survey_user,survey.question.survey.user,model_survey_question,base.group_survey_user,1,0,0,0
 access_survey_answer_survey_user,survey.answer.survey.user,model_survey_answer,base.group_survey_user,1,1,1,1
 access_survey_response_survey_user,survey.response.survey.user,model_survey_response,base.group_survey_user,1,1,1,1
 access_survey_response_answer_survey_user,survey.response.answer.survey.user,model_survey_response_answer,base.group_survey_user,1,1,1,1

=== modified file 'survey/survey_view.xml'
--- survey/survey_view.xml	2013-11-27 15:32:57 +0000
+++ survey/survey_view.xml	2014-01-15 16:13:35 +0000
@@ -21,18 +21,24 @@
             <field name="arch" type="xml">
                 <form string="Survey" version="7.0">
                 <header>
+<<<<<<< TREE
                     <button name="survey_open" string="Open" states="cancel,close" type="object"/>
                     <button name="survey_close" string="Close" states="open" type="object" class="oe_highlight"/>
                     <button name="survey_cancel" string="Cancel Survey" states="open" type="object"/>
+=======
+                    <button name="survey_open" string="Open" states="cancel,close" type="object" groups="base.group_tool_manager"/>
+                    <button name="survey_close" string="Close" states="open" type="object" class="oe_highlight" groups="base.group_tool_manager"/>
+                    <button name="survey_cancel" string="Cancel" states="open" type="object" groups="base.group_tool_manager"/>
+>>>>>>> MERGE-SOURCE
                     <field name="state" widget="statusbar" statusbar_visible="open,close"/>
                 </header>
                 <sheet>
                     <div class="oe_button_box oe_right">
-                        <button name="test_survey" states="open,draft,close,cancel" string="Test Survey" type="object" icon="gtk-new" context="{'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
+                        <button name="test_survey" states="open,draft,close,cancel" string="Test Survey" type="object" icon="gtk-new" context="{'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}" groups="base.group_tool_manager"/>
                         <button name="fill_survey" states="open" string="Answer Survey" type="object" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
-                        <button name="action_print_survey" states="open,draft,close,cancel" string="Print Answer" type="object"/>
+                        <button name="action_print_survey" states="open,draft,close,cancel" string="Print Answer" type="object" groups="base.group_tool_manager"/>
                         <button name="edit_survey" states="open,draft,close,cancel"
-                            string="Edit Survey" type="object" context="{'active':True,'edit' : True,'survey_id': active_id}"/>
+                            string="Edit Survey" type="object" context="{'active':True,'edit' : True,'survey_id': active_id}" groups="base.group_tool_manager"/>
 
                     </div>
                     <div class="oe_title">
@@ -352,7 +358,7 @@
 
         <menuitem name="Surveys" id="menu_survey_form"
             action="action_survey_form1" parent="menu_surveys"
-            groups="base.group_tool_manager" sequence="1"/>
+            groups="base.group_survey_user,base.group_tool_user" sequence="1"/>
 
         <!--
             Survey Pages
@@ -564,7 +570,7 @@
 
         <menuitem name="Survey Pages" id="menu_survey_page_form1"
             action="action_survey_page_form" parent="menu_surveys"
-            groups="base.group_no_one"/>
+            groups="base.group_tool_manager"/>
 
         <record model="ir.ui.view" id="survey_page_wizard_test1">
             <field name="name">survey_page_wizard_test</field>
@@ -1183,7 +1189,7 @@
 
         <menuitem name="Survey Requests" id="menu_survey_type_form1"
             action="action_survey_request_tree" parent="menu_surveys"
-            groups="base.group_tool_manager" sequence="3"/>
+            groups="base.group_tool_user" sequence="3"/>
 
         <!--
             Survey Type

=== modified file 'survey/wizard/survey_send_invitation.xml'
--- survey/wizard/survey_send_invitation.xml	2013-10-27 12:31:04 +0000
+++ survey/wizard/survey_send_invitation.xml	2014-01-15 16:13:35 +0000
@@ -45,7 +45,7 @@
         <act_window id="action_act_view_survey_send_invitation"
             key2="client_action_multi" name="Send Invitations"
             res_model="survey.send.invitation" src_model="survey"
-            view_mode="form" target="new" view_type="form" />
+            view_mode="form" target="new" view_type="form" groups="base.group_tool_user"/>
 
         <!-- Survey send invitation Display Log Form View -->
 

=== modified file 'warning/warning_view.xml'
--- warning/warning_view.xml	2013-10-27 12:31:04 +0000
+++ warning/warning_view.xml	2014-01-15 16:13:35 +0000
@@ -9,25 +9,30 @@
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Warnings">
+<<<<<<< TREE
                         <group colspan="2" col="2">
                             <separator string="Warning on the Sales Order" colspan="4"/>
+=======
+                        <group colspan="2" col="2" groups="base.group_sale_salesman">
+                            <separator string="Warning on the Sale Order" colspan="4"/>
+>>>>>>> MERGE-SOURCE
                                 <field name="sale_warn" nolabel="1" />
                                 <field name="sale_warn_msg" colspan="3" nolabel="1" 
                                         attrs="{'required':[('sale_warn','!=','no-message')],'readonly':[('sale_warn','=','no-message')]}"/>
                         </group>
-                        <group colspan="2" col="2">
+                        <group colspan="2" col="2" groups="purchase.group_purchase_user">
                             <separator string="Warning on the Purchase Order" colspan="4"/>
                             <field name="purchase_warn" nolabel="1" />
                             <field name="purchase_warn_msg" colspan="3" nolabel="1" 
                                     attrs="{'required':[('purchase_warn','!=','no-message')],'readonly':[('purchase_warn','=','no-message')]}"/>
                           </group>
-                          <group colspan="2" col="2">
+                          <group colspan="2" col="2" groups="stock.group_stock_user">
                             <separator string="Warning on the Picking" colspan="4"/>
                             <field name="picking_warn" nolabel="1" />
                             <field name="picking_warn_msg" colspan="3" nolabel="1" 
                                     attrs="{'required':[('picking_warn','!=','no-message')],'readonly':[('picking_warn','=','no-message')]}"/>
                         </group>
-                        <group colspan="2" col="2">
+                        <group colspan="2" col="2" groups="account.group_account_user">
                             <separator string="Warning on the Invoice" colspan="4"/>
                             <field name="invoice_warn" nolabel="1" />
                             <field name="invoice_warn_msg" colspan="3" nolabel="1"