Merge lp:~openerp-dev/openobject-addons/trunk-account-installer-wizard-pza into lp:openobject-addons

[Jitendra Prajapati(OpenERP)]

Hello,

 I have update the code as per your suggestion.
 => (_next override): if i test without that code, below test case does not work properly.

 Steps for test case:
   1 Create another company “Demo Company”.
   2 Create new user “Demo User” and set the company of user “Demo company”.
   3 Provide appropriate rights and login with this user.
   Go to Accounting -> Customers -> Customers menu and click on Create button to create a new customer. You will find a warning message above customer
   Now, To configure accounting chart and taxes click on link appear on message “Setup Accounting Information”. It will open "Configure Accounting Data" wizard after click on continue on this wizard next wizard("Set Your Accounting Options") for set accounting option will not pop up if we remove that code and it redirects to customer and also give that warning again.

Thanks.
Jitendra(JPR)

[Thibault Delavallée (OpenERP) (tde-openerp)]

Hello,

In account/installer.py: I don't see the point with the _next override. When removing this code, everything seems to work fine. Please confirm that this code is not necessary and remove it.

In account/partner.py:
- _check_coa_configured: simplifty code using return bool(prop_ids)

In account/partner_view.py:
- next_action does not seem necessary; introduce a key 'reload_page' replacing next action, and handle it in account/account.py, in _next.

In account/account.py:
- probably replace next_action by reload_page
- context.get returns None by default: no need to use if context.get(key, False) -> if context.get(key)
- instead of updating context, simply remove the key from context (context.pop(key))

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-account-installer-wizard-pza]

8979. By Jitendra Prajapati(OpenERP) on 2014-02-10

[MERGE]with lp:openobject-addons

8980. By Jitendra Prajapati(OpenERP) on 2014-02-12

[IMP]check context

8981. By Chirag Dodiya(OpenERP) on 2014-03-20

[MRG]Merge with lp:openobject-addons

8982. By Randhir Mayatra (OpenERP) on 2014-04-16

[IMP]add coa configuration links on product and product category

8983. By Randhir Mayatra (OpenERP) on 2014-04-23

[IMP]improve help string regarding coa in partner form

8984. By Randhir Mayatra (OpenERP) on 2014-04-23

[MERGE] merge with latest trunk

8985. By Randhir Mayatra (OpenERP) on 2014-05-02

[IMP] imrpoved message as per access right

8986. By Randhir Mayatra (OpenERP) on 2014-05-02

[MERGE] merge with latest trunk

8987. By Randhir Mayatra (OpenERP) on 2014-05-05

[IMP] improve help string

8988. By Randhir Mayatra (OpenERP) on 2014-05-07

[IMP] improve warning message as per the user access right

8989. By Randhir Mayatra (OpenERP) on 2014-05-07

[MERGE] merge with latest trunk

8990. By Randhir Mayatra (OpenERP) on 2014-05-07

[IMP] optimize code

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

Points to improve:
- _check_coa_configured => remove company_id from domain it will be handled by record rules.
- try to avoid searching by name of Finance manager.

review: Needs Fixing

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

Use store={} instead of simple function field.

You can take account_id references on different object to call base function method.

Regards,

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-account-installer-wizard-pza]

8991. By Randhir Mayatra (OpenERP) on 2014-05-12

[IMP] improved search methods

8992. By Randhir Mayatra (OpenERP) on 2014-05-12

[MERGE] merge with latest trunk

8993. By Randhir Mayatra (OpenERP) on 2014-05-13

[IMP] imorived company_id domain

8994. By Randhir Mayatra (OpenERP) on 2014-05-13

[MERGE] merge with latest trunk

8995. By Randhir Mayatra (OpenERP) on 2014-05-13

[IMP] update open_account_installer method

Unmerged revisions

8995. By Randhir Mayatra (OpenERP) on 2014-05-13

[IMP] update open_account_installer method

8994. By Randhir Mayatra (OpenERP) on 2014-05-13

[MERGE] merge with latest trunk

8993. By Randhir Mayatra (OpenERP) on 2014-05-13

[IMP] imorived company_id domain

8992. By Randhir Mayatra (OpenERP) on 2014-05-12

[MERGE] merge with latest trunk

8991. By Randhir Mayatra (OpenERP) on 2014-05-12

[IMP] improved search methods

8990. By Randhir Mayatra (OpenERP) on 2014-05-07

[IMP] optimize code

8989. By Randhir Mayatra (OpenERP) on 2014-05-07

[MERGE] merge with latest trunk

8988. By Randhir Mayatra (OpenERP) on 2014-05-07

[IMP] improve warning message as per the user access right

8987. By Randhir Mayatra (OpenERP) on 2014-05-05

[IMP] improve help string

8986. By Randhir Mayatra (OpenERP) on 2014-05-02

[MERGE] merge with latest trunk

=== modified file 'account/account.py'
--- account/account.py	2014-04-24 13:45:33 +0000
+++ account/account.py	2014-05-13 09:20:43 +0000
@@ -3366,6 +3366,17 @@
             obj_tax_temp.write(cr, uid, ref_tax_ids, {'amount': value/100.0, 'name': _('Purchase Tax %.2f%%') % value})
         return True
 
+    def _next(self, cr, uid, context=None):
+        if context is None:context = {}
+        res = super(wizard_multi_charts_accounts, self)._next(cr, uid, context=context)
+        if context.get('reload_page'):
+            res = {
+               'type': 'ir.actions.client',
+               'tag': 'reload',
+            }
+            context.pop('reload_page')
+        return res
+
     def execute(self, cr, uid, ids, context=None):
         '''
         This function is called at the confirmation of the wizard to generate the COA from the templates. It will read
 
=== modified file 'account/account_installer.xml'
--- account/account_installer.xml	2013-10-27 12:31:04 +0000
+++ account/account_installer.xml	2014-05-13 09:20:43 +0000
@@ -11,6 +11,8 @@
                 <footer position="replace">
                     <footer>
                       <button name="action_next" context="{'default_charts':charts}" type="object" string="Continue" class="oe_highlight"/>
+                      or
+                      <button string="Cancel" special="cancel" class="oe_link"/>
                     </footer>
                 </footer>
                 <separator string="title" position="replace">
 
=== modified file 'account/installer.py'
--- account/installer.py	2014-04-10 10:36:38 +0000
+++ account/installer.py	2014-05-13 09:20:43 +0000
@@ -135,6 +135,21 @@
             return {'value': {'date_stop': end_date.strftime('%Y-%m-%d')}}
         return {}
 
+    def _next(self, cr, uid, context=None):
+        if context is None:context = {}
+        ir_todo_obj = self.pool.get('ir.actions.todo')
+        ir_model_obj = self.pool.get('ir.model.data')
+        if context.get('reload_page'):
+            action_id = ir_model_obj.get_object_reference(cr, uid, 'account', 'account_configuration_installer_todo')[1]
+            state = ir_todo_obj.browse(cr, uid, action_id, context=context).state
+            if state == 'open':
+                ir_todo_obj.write(cr, uid, action_id, {'state':'done'}, context=context)
+            action_id = ir_model_obj.get_object_reference(cr, uid, 'account', context['reload_page'])[1]
+            state = ir_todo_obj.browse(cr, uid, action_id, context=context).state
+            if state == 'done':
+                ir_todo_obj.write(cr, uid, action_id, {'state':'open'}, context=context)
+        return super(account_installer, self)._next(cr, uid, context=context)
+
     def execute(self, cr, uid, ids, context=None):
         self.execute_simple(cr, uid, ids, context)
         return super(account_installer, self).execute(cr, uid, ids, context=context)
@@ -171,6 +186,26 @@
                           context=context)[0]['charts']
         _logger.debug('Installing chart of accounts %s', chart)
         return (modules | set([chart])) - set(['has_default_company', 'configurable'])
-
+    
+    def _open_account_configuration_installer(self, cr, uid, ids, context=None):
+        groups = self.pool.get('ir.model.data').get_object(cr, uid, 'account', 'group_account_manager')
+        user_ids = [user.id for user in groups.users]
+        if uid in user_ids:
+            view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'view_account_configuration_installer')[1]
+            result = {
+                'name': 'Configure Accounting Data',
+                'view_type': 'form',
+                'view_mode': 'form',
+                'view_id': view_id,
+                'res_model': 'account.installer',
+                'type': 'ir.actions.act_window',
+                'nodestroy': True,
+                'target': 'new',
+                'context': {'reload_page': 'action_wizard_multi_chart_todo'}
+            }
+            return result
+        else:
+            raise osv.except_osv(_('Access Right Error!'), _('Sorry, you are not allowed to create this kind of document. Please ask your Financial Manager.'))
+        return {'type': 'ir.actions.act_window_close'}
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/partner.py'
--- account/partner.py	2014-05-07 18:29:17 +0000
+++ account/partner.py	2014-05-13 09:20:43 +0000
@@ -21,7 +21,7 @@
 
 from operator import itemgetter
 import time
-
+from openerp.tools.translate import _
 from openerp.osv import fields, osv
 
 class account_fiscal_position(osv.osv):
@@ -205,6 +205,17 @@
     def mark_as_reconciled(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'last_reconciliation_date': time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
 
+    def _check_coa_configured(self, cr, uid, context=None):
+        company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
+        prop_ids = self.pool.get('ir.property').search(cr, uid, [('name', 'in', ('property_account_receivable', 'property_account_payable')), (('company_id', '=', company_id) or ('company_id', '=', False))], context=context)
+        return bool(prop_ids)
+
+    def _get_coa_configured(self, cr, uid, ids, field_names, arg, context=None):
+        return dict.fromkeys(ids, self._check_coa_configured(cr, uid, context=context))
+    
+    def open_account_configuration_installer(self, cr, uid, ids, context=None):
+        return self.pool.get('account.installer')._open_account_configuration_installer(cr, uid, ids, context=context)
+    
     _columns = {
         'credit': fields.function(_credit_debit_get,
             fnct_search=_credit_search, string='Total Receivable', multi='dc', help="Total amount this customer owes you."),
@@ -245,9 +256,14 @@
              help="This payment term will be used instead of the default one for purchase orders and supplier invoices"),
         'ref_companies': fields.one2many('res.company', 'partner_id',
             'Companies that refers to partner'),
-        'last_reconciliation_date': fields.datetime('Latest Full Reconciliation Date', help='Date on which the partner accounting entries were fully reconciled last time. It differs from the last date where a reconciliation has been made for this partner, as here we depict the fact that nothing more was to be reconciled at this date. This can be achieved in 2 different ways: either the last unreconciled debit/credit entry of this partner was reconciled, either the user pressed the button "Nothing more to reconcile" during the manual reconciliation process.')
+        'last_reconciliation_date': fields.datetime('Latest Full Reconciliation Date', help='Date on which the partner accounting entries were fully reconciled last time. It differs from the last date where a reconciliation has been made for this partner, as here we depict the fact that nothing more was to be reconciled at this date. This can be achieved in 2 different ways: either the last unreconciled debit/credit entry of this partner was reconciled, either the user pressed the button "Nothing more to reconcile" during the manual reconciliation process.'),
+        'is_coa_configured': fields.function(_get_coa_configured, type='boolean', string='COA Configured',),
     }
 
+    _defaults = {
+         'is_coa_configured': _check_coa_configured
+     }
+
     def _commercial_fields(self, cr, uid, context=None):
         return super(res_partner, self)._commercial_fields(cr, uid, context=context) + \
             ['debit_limit', 'property_account_payable', 'property_account_receivable', 'property_account_position',
 
=== modified file 'account/partner_view.xml'
--- account/partner_view.xml	2014-05-02 13:07:53 +0000
+++ account/partner_view.xml	2014-05-13 09:20:43 +0000
@@ -124,6 +124,7 @@
                             <field name="property_account_payable" groups="account.group_account_invoice"/>
                             <field name="property_supplier_payment_term" widget="selection"/>
                             <field name="debit"/>
+                            <field name="is_coa_configured" invisible="1"/>
                         </group>
                     </group>
                     <field name="bank_ids" context="{'default_partner_id': active_id, 'form_view_ref': 'base.view_partner_bank_form'}">
@@ -142,6 +143,13 @@
                     </div>
                 </page>
                 </page>
+                <sheet position="before">
+                    <div name="warning" class="oe_form_box_info oe_text_center" attrs="{'invisible':[('is_coa_configured','=',True)]}">
+                        <p>Accounting data do not seem well configured.</p>
+                        <p>Please click here to automatically set up your taxes and chart of accounts:
+                        <button type="object" name="open_account_configuration_installer" string="Setup Accounting Information" class="oe_link" special="nosave"/></p>
+                    </div>
+                </sheet>
             </field>
         </record>
     </data>
 
=== modified file 'account/product.py'
--- account/product.py	2013-11-29 16:56:44 +0000
+++ account/product.py	2014-05-13 09:20:43 +0000
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from openerp.osv import fields, osv
+from openerp.tools.translate import _
 
 class product_category(osv.osv):
     _inherit = "product.category"
@@ -60,6 +61,51 @@
             string="Expense Account",
             help="This account will be used for invoices instead of the default one to value expenses for the current product."),
     }
-
-
+class product_product(osv.osv):
+    _inherit = "product.product"
+    
+    def _check_coa_configured(self, cr, uid, context=None):
+        company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
+        prop_ids = self.pool.get('ir.property').search(cr, uid, [('name','in',('property_account_income', 'property_account_income_categ', 'property_account_expense', 'property_account_expense_categ')),(('company_id', '=', company_id) or ('company_id', '=', False))], context=context)
+        return bool(prop_ids)
+   
+    def _get_coa_configured(self, cr, uid, ids, field_names, arg, context=None):
+        return dict.fromkeys(ids, self._check_coa_configured(cr, uid, context=context)) 
+    
+    def open_account_configuration_installer(self, cr, uid, ids, context=None):
+        return self.pool.get('account.installer')._open_account_configuration_installer(cr, uid, ids, context=context)
+    
+    _columns = {
+        'is_coa_configured': fields.function(_get_coa_configured, type='boolean', string='COA Configured',
+            store={
+                'product.product': (lambda self, cr, uid, ids, c={}: ids, ['property_account_income', 'property_account_expense'], 50),
+            },),
+    }
+    _defaults = {
+        'is_coa_configured': _check_coa_configured,
+    }
+    
+class product_category(osv.osv):
+    _inherit = "product.category"
+    
+    def _check_coa_configured(self, cr, uid, context=None):
+        company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
+        prop_ids = self.pool.get('ir.property').search(cr, uid, [('name', 'in', ('property_account_income_categ', 'property_account_expense_categ')), (('company_id', '=', company_id) or ('company_id', '=', False))], context=context)
+        return bool(prop_ids) 
+    
+    def _get_coa_configured(self, cr, uid, ids, field_names, arg, context=None):
+        return dict.fromkeys(ids, self._check_coa_configured(cr, uid, context=context)) 
+    
+    def open_account_configuration_installer(self, cr, uid, ids, context=None):
+        return self.pool.get('account.installer')._open_account_configuration_installer(cr, uid, ids, context=context)
+    
+    _columns = {
+        'is_coa_configured': fields.function(_get_coa_configured, type='boolean', string='COA Configured',
+            store={
+                'product.category': (lambda self, cr, uid, ids, c={}: ids, ['property_account_income_categ', 'property_account_expense_categ'], 50),
+            }),
+    }
+    _defaults = {
+        'is_coa_configured': _check_coa_configured,
+    }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/product_view.xml'
--- account/product_view.xml	2014-01-22 09:58:26 +0000
+++ account/product_view.xml	2014-05-13 09:20:43 +0000
@@ -11,6 +11,7 @@
                     <page string="Accounting" groups="account.group_account_invoice">
                         <group name="properties">
                             <group>
+                                <field name="is_coa_configured" invisible="1"/>
                                 <field name="property_account_income" domain="[('type','=','other')]" groups="account.group_account_user"
                                     attrs="{'readonly': [('is_only_child', '=', False)]}"/>
                                 <field name="taxes_id" colspan="2" widget="many2many_tags"
@@ -25,6 +26,13 @@
                         </group>
                     </page>
                 </notebook>
+                <sheet position="before">
+                    <div name="warning" class="oe_form_box_info oe_text_center" attrs="{'invisible':[('is_coa_configured','=',True)]}">
+                        <p>Accounting data do not seem well configured.</p>
+                        <p>Please click here to automatically set up your taxes and chart of accounts:
+                        <button type="object" name="open_account_configuration_installer" string="Setup Accounting Information" class="oe_link" special="nosave"/></p>
+                    </div>
+                </sheet>
             </field>
         </record>
 
@@ -60,11 +68,19 @@
                 <data>
                     <xpath expr="//group[@name='parent']" position="inside">
                         <group name="account_property" string="Account Properties" colspan="2">
+                            <field name="is_coa_configured" invisible="1"/>
                             <field name="property_account_income_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                             <field name="property_account_expense_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                         </group>
                     </xpath>
                 </data>
+                <sheet position="before">
+                    <div name="warning" class="oe_form_box_info oe_text_center" attrs="{'invisible':[('is_coa_configured','=',True)]}">
+                        <p>Accounting data do not seem well configured.</p>
+                        <p>Please click here to automatically set up your taxes and chart of accounts:
+                        <button type="object" name="open_account_configuration_installer" string="Setup Accounting Information" class="oe_link" special="nosave"/></p>
+                    </div>
+                </sheet>
             </field>
         </record>