Merge lp:~openerp-dev/openobject-addons/trunk-improve-visibility-contract-analytic-bth into lp:openobject-addons

[Bhumi Thakkar (Open ERP)]

Hello,

   Improved analytic account:

=> Add button 'Time & Materials to Invoice' in contract form with groupby of analytic account.
=> Add filter on Partner in Accounting => Analytic Journal items
=> Costs&Revenues: Rename General Account column to Financial Account in listview.
=> If user is an accountant then user can generate accounting entries in hr expense.
=> In expense if no any expense line and try to submit manager then raise warning could not submit to manager without expense line.

Thanks.

[lp:~openerp-dev/openobject-addons/trunk-improve-visibility-contract-analytic-bth]

8710. By Bhumi Thakkar (Open ERP) on 2013-05-30

[IMP]can not to cannot in warning.

8711. By Bhumi Thakkar (Open ERP) on 2013-05-30

[IMP]Customer to Partner.

8712. By Bhumi Thakkar (Open ERP) on 2013-06-10

[MERGE]Merge lp:openobject-addons.

8713. By Bhumi Thakkar (Open ERP) on 2013-06-10

[MERGE]Merge lp:openobject-addons.

8714. By Bhumi Thakkar (Open ERP) on 2013-06-12

[REN]Rename account to analytic account in search view of reporting.

8715. By Bhumi Thakkar (Open ERP) on 2013-06-12

[MERGE]Merge lp:openobject-addons.

8716. By Bhumi Thakkar (Open ERP) on 2013-06-12

[REN]rename from account to analytic account in field name.

8717. By Bhumi Thakkar (Open ERP) on 2013-06-13

[MERGE]Merge lp:openobject-addons.

8718. By Bhumi Thakkar (Open ERP) on 2013-06-13

[IMP]Improved warning message.

8719. By Bhumi Thakkar (Open ERP) on 2013-06-13

[IMP]Search by product.

8720. By Amit Bhavsar (Open ERP) on 2013-06-17

[MERGE] merge with latest trunk

8721. By Bhumi Thakkar (Open ERP) on 2013-06-24

[MERGE]Merge lp;openobject-addons.

8722. By Bhumi Thakkar (Open ERP) on 2013-07-17

[MERGE]Merge lp:openobject-addons.

8723. By Bhumi Thakkar (Open ERP) on 2013-08-13

[MERGE]Merge lp:openobject-addons.

8724. By Bhumi Thakkar (Open ERP) on 2013-08-22

[MERGE]Merge lp:openobject-addons.

8725. By Bhumi Thakkar (Open ERP) on 2013-09-02

[MERGE]Merge trunk.

8726. By Bhumi Thakkar (Open ERP) on 2013-09-02

[IMP]Add partner field in list view and added domain for child of partner.

8727. By Bhumi Thakkar (Open ERP) on 2013-09-24

[MERGE]Merge trunk.

8728. By Chirag Dodiya(OpenERP) on 2013-09-25

[IMP] Improved search view such as when we search on parent analytic account will show child records

8729. By Chirag Dodiya(OpenERP) on 2013-09-25

[MERGE] Merge lp:openobject-addons

8730. By Bhumi Thakkar (Open ERP) on 2013-09-26

[IMP]Add partner_id into form.

8731. By Bhumi Thakkar (Open ERP) on 2013-11-11

[MERGE]Merge trunk.

Unmerged revisions

8731. By Bhumi Thakkar (Open ERP) on 2013-11-11

[MERGE]Merge trunk.

8730. By Bhumi Thakkar (Open ERP) on 2013-09-26

[IMP]Add partner_id into form.

8729. By Chirag Dodiya(OpenERP) on 2013-09-25

[MERGE] Merge lp:openobject-addons

8728. By Chirag Dodiya(OpenERP) on 2013-09-25

[IMP] Improved search view such as when we search on parent analytic account will show child records

8727. By Bhumi Thakkar (Open ERP) on 2013-09-24

[MERGE]Merge trunk.

8726. By Bhumi Thakkar (Open ERP) on 2013-09-02

[IMP]Add partner field in list view and added domain for child of partner.

8725. By Bhumi Thakkar (Open ERP) on 2013-09-02

[MERGE]Merge trunk.

8724. By Bhumi Thakkar (Open ERP) on 2013-08-22

[MERGE]Merge lp:openobject-addons.

8723. By Bhumi Thakkar (Open ERP) on 2013-08-13

[MERGE]Merge lp:openobject-addons.

8722. By Bhumi Thakkar (Open ERP) on 2013-07-17

[MERGE]Merge lp:openobject-addons.

=== modified file 'account/account_analytic_line.py'
--- account/account_analytic_line.py	2013-04-15 10:23:49 +0000
+++ account/account_analytic_line.py	2013-11-11 13:48:32 +0000
@@ -29,13 +29,14 @@
     _columns = {
         'product_uom_id': fields.many2one('product.uom', 'Unit of Measure'),
         'product_id': fields.many2one('product.product', 'Product'),
-        'general_account_id': fields.many2one('account.account', 'General Account', required=True, ondelete='restrict'),
+        'general_account_id': fields.many2one('account.account', 'Financial Account', required=True, ondelete='restrict'),
         'move_id': fields.many2one('account.move.line', 'Move Line', ondelete='cascade', select=True),
         'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='restrict', select=True),
         'code': fields.char('Code', size=8),
         'ref': fields.char('Ref.', size=64),
         'currency_id': fields.related('move_id', 'currency_id', type='many2one', relation='res.currency', string='Account Currency', store=True, help="The related account currency if not equal to the company one.", readonly=True),
         'amount_currency': fields.related('move_id', 'amount_currency', type='float', string='Amount Currency', store=True, help="The amount expressed in the related account currency if not equal to the company one.", readonly=True),
+        'partner_id': fields.related('account_id','partner_id',type='many2one',relation='res.partner',string='Partner',store=True),
     }
 
     _defaults = {

=== modified file 'account/project/project_view.xml'
--- account/project/project_view.xml	2013-09-04 14:11:22 +0000
+++ account/project/project_view.xml	2013-11-11 13:48:32 +0000
@@ -139,6 +139,7 @@
                             <field name="date"/>
                             <field name="ref"/>
                             <field name="company_id" groups="base.group_multi_company"/>
+                            <field name="partner_id"/>
                         </group>
                         <group string="Amount">
                             <field name="amount"/>
@@ -173,6 +174,7 @@
                     <field name="ref" invisible="context.get('to_invoice', False)"/>
                     <field name="name"/>
                     <field name="user_id"/>
+                    <field name="partner_id"/>
                     <field name="journal_id" invisible="context.get('to_invoice', False)"/>
                     <field name="amount" sum="Total" invisible="context.get('to_invoice', False)"/>
                     <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)" invisible="not context.get('to_invoice', False)"/>
@@ -189,21 +191,24 @@
             <field name="model">account.analytic.line</field>
             <field name="arch" type="xml">
                 <search string="Search Analytic Lines">
-                    <field name="name" string="Analytic Line"/>
+                    <field name="name" string="Description"/>
                     <field name="date"/>
+                    <field name="product_id" string="Product"/>
                     <filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" help="Analytic Journal Items related to a sale journal."/>
                     <filter name="purchases" string="Purchases" domain="[('journal_id.type','=','purchase')]" help="Analytic Journal Items related to a purchase journal."/>
                     <filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation'))]"/>
                     <separator/>
                     <filter string="My Entries" domain="[('user_id','=',uid)]"/>
-                    <field name="account_id"/>
+                    <field name="account_id" filter_domain="[('account_id','child_of',self)]"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="user_id"/>
                     <group string="Group By..." expand="0">
                         <filter string="Analytic Account" context="{'group_by':'account_id'}"/>
-                        <filter string="Fin. Account" context="{'group_by':'general_account_id'}"/>
+                        <filter string="Financial Account" context="{'group_by':'general_account_id'}"/>
                         <filter string="Journal" context="{'group_by':'journal_id'}" name="group_journal"/>
                         <separator/>
                         <filter string="Product" context="{'group_by':'product_id'}"/>
+                        <filter string="Partner" context="{'group_by':'partner_id'}"/>
                         <filter string="User" context="{'group_by':'user_id'}"/>
                         <separator/>
                         <filter string="Tasks Month" context="{'group_by':'date'}" name="group_date" help="Invoice Tasks by Month"/>

=== modified file 'account/report/account_analytic_entries_report.py'
--- account/report/account_analytic_entries_report.py	2013-04-15 10:23:49 +0000
+++ account/report/account_analytic_entries_report.py	2013-11-11 13:48:32 +0000
@@ -38,8 +38,8 @@
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True),
-        'account_id': fields.many2one('account.analytic.account', 'Account', required=False),
-        'general_account_id': fields.many2one('account.account', 'General Account', required=True),
+        'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=False),
+        'general_account_id': fields.many2one('account.account', 'Financial Account', required=True),
         'journal_id': fields.many2one('account.analytic.journal', 'Journal', required=True),
         'move_id': fields.many2one('account.move.line', 'Move', required=True),
         'product_id': fields.many2one('product.product', 'Product', required=True),

=== modified file 'account/report/account_analytic_entries_report_view.xml'
--- account/report/account_analytic_entries_report_view.xml	2012-11-29 22:26:45 +0000
+++ account/report/account_analytic_entries_report_view.xml	2013-11-11 13:48:32 +0000
@@ -41,8 +41,8 @@
                 <group expand="0" string="Group By...">
                     <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
-                    <filter string="Account" name="Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
-                    <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
+                    <filter string="Analytic Account" name="Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
+                    <filter string="Financial Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
                     <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <filter string="Product Unit of Measure" icon="terp-mrp" context="{'group_by':'product_uom_id'}"/>

=== modified file 'account_analytic_analysis/account_analytic_analysis_view.xml'
--- account_analytic_analysis/account_analytic_analysis_view.xml	2013-09-04 14:10:53 +0000
+++ account_analytic_analysis/account_analytic_analysis_view.xml	2013-11-11 13:48:32 +0000
@@ -336,5 +336,20 @@
         </record>
         <menuitem action="template_of_contract_action" id="menu_template_of_contract_action" parent="base.menu_base_config"/>
 
+        <record id="account_analytic_analysis_form_form" model="ir.ui.view">
+            <field name="name">account.analytic.account.invoice.form.inherit</field>
+            <field name="model">account.analytic.account</field>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+            <field eval="20" name="priority"/>
+            <field name="arch" type="xml">
+                <xpath expr='//div[@name="buttons"]' position='inside'>
+                    <button string="Time &amp; Materials to Invoice"
+                        name="%(action_hr_tree_invoiced_all)d"
+                        type="action"
+                        context="{'search_default_account_id': [active_id], 'default_account_id': active_id}"/>
+                </xpath>
+            </field>
+        </record>
+
     </data>
 </openerp>

=== modified file 'hr_expense/hr_expense.py'
--- hr_expense/hr_expense.py	2013-09-10 12:48:03 +0000
+++ hr_expense/hr_expense.py	2013-11-11 13:48:32 +0000
@@ -141,6 +141,8 @@
 
     def expense_confirm(self, cr, uid, ids, context=None):
         for expense in self.browse(cr, uid, ids):
+            if not expense.line_ids:
+                raise osv.except_osv(_('Error!'),_('You cannot submit an expense that has no expense line to the manager.'))
             if expense.employee_id and expense.employee_id.parent_id.user_id:
                 self.message_subscribe_users(cr, uid, [expense.id], user_ids=[expense.employee_id.parent_id.user_id.id])
         return self.write(cr, uid, ids, {'state': 'confirm', 'date_confirm': time.strftime('%Y-%m-%d')}, context=context)

=== modified file 'hr_expense/hr_expense_view.xml'
--- hr_expense/hr_expense_view.xml	2013-09-04 14:11:22 +0000
+++ hr_expense/hr_expense_view.xml	2013-11-11 13:48:32 +0000
@@ -66,8 +66,8 @@
                     <button name="validate" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" />
                     <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user" />
-                    <button name="done" states="accepted" string="Generate Accounting Entries" type="workflow" groups="account.group_account_invoice" class="oe_highlight"/>
-                    <button name="action_view_move" states="done" string="Open Accounting Entries" type="object" groups="account.group_account_invoice"/>
+                    <button name="done" states="accepted" string="Generate Accounting Entries" type="workflow" groups="account.group_account_invoice,account.group_account_user" class="oe_highlight"/>
+                    <button name="action_view_move" states="done" string="Open Accounting Entries" type="object" groups="account.group_account_invoice,account.group_account_user"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted,done,paid" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                 </header>
                 <sheet>

=== modified file 'hr_expense/hr_expense_workflow.xml'
--- hr_expense/hr_expense_workflow.xml	2013-03-14 11:27:40 +0000
+++ hr_expense/hr_expense_workflow.xml	2013-11-11 13:48:32 +0000
@@ -84,7 +84,6 @@
             <field name="act_from" ref="act_accepted"/>
             <field name="act_to" ref="act_done"/>
             <field name="signal">done</field>
-            <field name="group_id" ref="base.group_hr_user"/>
         </record>
 
         <record id="t10" model="workflow.transition">

=== modified file 'hr_timesheet_invoice/report/hr_timesheet_invoice_report.py'
--- hr_timesheet_invoice/report/hr_timesheet_invoice_report.py	2013-04-15 10:23:49 +0000
+++ hr_timesheet_invoice/report/hr_timesheet_invoice_report.py	2013-11-11 13:48:32 +0000
@@ -35,7 +35,7 @@
         'cost': fields.float('Cost', readonly=True),
         'product_id': fields.many2one('product.product', 'Product',readonly=True),
         'account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
-        'general_account_id': fields.many2one('account.account', 'General Account', readonly=True),
+        'general_account_id': fields.many2one('account.account', 'Financial Account', readonly=True),
         'invoice_id': fields.many2one('account.invoice', 'Invoiced', readonly=True),
         'month': fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
                                   ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),

=== modified file 'hr_timesheet_sheet/report/hr_timesheet_report.py'
--- hr_timesheet_sheet/report/hr_timesheet_report.py	2013-04-15 10:23:49 +0000
+++ hr_timesheet_sheet/report/hr_timesheet_report.py	2013-11-11 13:48:32 +0000
@@ -38,7 +38,7 @@
         'name': fields.char('Description', size=64,readonly=True),
         'product_id' : fields.many2one('product.product', 'Product',readonly=True),
         'journal_id' : fields.many2one('account.analytic.journal', 'Journal',readonly=True),
-        'general_account_id' : fields.many2one('account.account', 'General Account', readonly=True),
+        'general_account_id' : fields.many2one('account.account', 'Financial Account', readonly=True),
         'user_id': fields.many2one('res.users', 'User',readonly=True),
         'account_id': fields.many2one('account.analytic.account', 'Analytic Account',readonly=True),
         'company_id': fields.many2one('res.company', 'Company',readonly=True),

=== modified file 'hr_timesheet_sheet/report/hr_timesheet_report_view.xml'
--- hr_timesheet_sheet/report/hr_timesheet_report_view.xml	2012-11-29 22:26:45 +0000
+++ hr_timesheet_sheet/report/hr_timesheet_report_view.xml	2013-11-11 13:48:32 +0000
@@ -49,7 +49,7 @@
                         <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                         <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
-                        <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
+                        <filter string="Financial Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
                         <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by day of date"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/>

=== modified file 'hr_timesheet_sheet/report/timesheet_report.py'
--- hr_timesheet_sheet/report/timesheet_report.py	2013-04-15 10:23:49 +0000
+++ hr_timesheet_sheet/report/timesheet_report.py	2013-11-11 13:48:32 +0000
@@ -35,7 +35,7 @@
         'date': fields.date('Date', readonly=True),
         'name': fields.char('Description', size=64,readonly=True),
         'product_id' : fields.many2one('product.product', 'Product'),
-        'general_account_id' : fields.many2one('account.account', 'General Account', readonly=True),
+        'general_account_id' : fields.many2one('account.account', 'Financial Account', readonly=True),
         'user_id': fields.many2one('res.users', 'User',readonly=True),
         'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing',readonly=True),
         'account_id': fields.many2one('account.analytic.account', 'Analytic Account',readonly=True),

=== modified file 'hr_timesheet_sheet/report/timesheet_report_view.xml'
--- hr_timesheet_sheet/report/timesheet_report_view.xml	2013-03-13 07:00:29 +0000
+++ hr_timesheet_sheet/report/timesheet_report_view.xml	2013-11-11 13:48:32 +0000
@@ -65,7 +65,7 @@
                         <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                         <filter string="Type of Invoicing" icon="terp-stock_symbol-selection" context="{'group_by':'to_invoice'}"/>
                         <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}"/>
-                        <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
+                        <filter string="Financial Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                         <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by day of date"/>