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

[Pooja Zankhariya(OpenERP)]

[IMP] account: when the account payable and account receivable are empty on a partner form view, display a message to warn and help the setup of a chart of accounts.

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

8965. By Pooja Zankhariya(OpenERP) on 2013-12-23

[MERGE]Merge with Trunk

8966. By Pooja Zankhariya(OpenERP) on 2013-12-26

[MERGE]Merge with Trunk

8967. By Pooja Zankhariya(OpenERP) on 2013-12-27

[IMP]Improved Code.

8968. By Pooja Zankhariya(OpenERP) on 2013-12-27

[IMP]Removed Group from div

8969. By Pooja Zankhariya(OpenERP) on 2014-01-06

[MERGE]Merge with Trun

8970. By Pooja Zankhariya(OpenERP) on 2014-01-13

[MERGE]Merge with Trunk

8971. By Pooja Zankhariya(OpenERP) on 2014-01-13

[MERGE]Merge with Trunk

8972. By Pooja Zankhariya(OpenERP) on 2014-01-17

[MERGE]Merge with Trunk

8973. By Pooja Zankhariya(OpenERP) on 2014-01-21

[MERGE]Merge with Trunk

8974. By Pooja Zankhariya(OpenERP) on 2014-01-28

[MERGE]Sync with Trunk

8975. By Pooja Zankhariya(OpenERP) on 2014-01-30

[MERGE]Sync with Trunk

8976. By Pooja Zankhariya(OpenERP) on 2014-01-31

[MERGE]Sync with Trunk

[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]

8977. By Jitendra Prajapati(OpenERP) on 2014-02-04

[MERGE]with lp:openobject-addons

8978. By Jitendra Prajapati(OpenERP) on 2014-02-05

[IMP]improve code:replace next_action by reload_page, remove the key from context using pop method and use if context.get(key, False) -> if context.get(key)

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

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-01-29 18:47:03 +0000
+++ account/account.py	2014-02-05 07:01:47 +0000
@@ -3412,6 +3412,16 @@
             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):
+        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-02-05 07:01:47 +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	2013-10-27 12:31:04 +0000
+++ account/installer.py	2014-02-05 07:01:47 +0000
@@ -135,6 +135,20 @@
             return {'value': {'date_stop': end_date.strftime('%Y-%m-%d')}}
         return {}
 
+    def _next(self, cr, uid, context=None):
+        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)
 
=== modified file 'account/partner.py'
--- account/partner.py	2013-11-27 15:32:57 +0000
+++ account/partner.py	2014-02-05 07:01:47 +0000
@@ -185,6 +185,14 @@
     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)], 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))
+
     _columns = {
         'credit': fields.function(_credit_debit_get,
             fnct_search=_credit_search, string='Total Receivable', multi='dc', help="Total amount this customer owes you."),
@@ -222,9 +230,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	2013-10-27 12:31:04 +0000
+++ account/partner_view.xml	2014-02-05 07:01:47 +0000
@@ -115,6 +115,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'}">
@@ -133,6 +134,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>It seems that accounting data is not well configured for your company to create new record here.</p>
+                        <p>You can configure your chart of accounts and taxes in 2 clicks from here:
+                        <button type="action" name="%(account.action_account_configuration_installer)d" context="{'reload_page': 'action_wizard_multi_chart_todo'}" string="Setup Accounting Information" class="oe_link" special="nosave"/></p>
+                    </div>
+                </sheet>
             </field>
         </record>
     </data>