Merge lp:~openerp-dev/openobject-addons/trunk-bug-1155793-nco into lp:openobject-addons

[Nimesh Contractor(Open ERP)]

Hello,

Set "Allows canceling entries" feature in setting -> accounting configuration.

When cancel journal entry, and account_cancel module is not install then it raise the message to set "Allow cancelling entries".

Thank You.

Unmerged revisions

8727. By Nimesh Contractor(Open ERP) on 2013-05-28

[FIX] set account cancel in accoting configration set the proper error message.

=== modified file 'account/account.py'
--- account/account.py	2013-04-29 15:14:10 +0000
+++ account/account.py	2013-05-28 07:02:38 +0000
@@ -1339,8 +1339,13 @@
         return self.post(cursor, user, ids, context=context)
 
     def button_cancel(self, cr, uid, ids, context=None):
+        module = self.pool.get('ir.module.module')
         for line in self.browse(cr, uid, ids, context=context):
             if not line.journal_id.update_posted:
+                module_account_cancel = module.search(cr, uid, [('name', '=', 'account_cancel'), ('state', '=', 'installed')])
+                if not module_account_cancel:  
+                    raise osv.except_osv(_('Error!'), _('You cannot modify a posted entry of this journal.\nGo to Settings -> Configuration -> Accounting -> Features -> Set Allow cancelling entries.'))
+
                 raise osv.except_osv(_('Error!'), _('You cannot modify a posted entry of this journal.\nFirst you should set the journal to allow cancelling entries.'))
         if ids:
             cr.execute('UPDATE account_move '\

=== modified file 'account/res_config.py'
--- account/res_config.py	2013-05-08 13:14:38 +0000
+++ account/res_config.py	2013-05-28 07:02:38 +0000
@@ -100,6 +100,8 @@
                     * serve as base for an easy plug-in of various automated payment mechanisms, and
                     * provide a more efficient way to manage invoice payments.
                 This installs the module account_payment."""),
+        'module_account_cancel': fields.boolean('Allow cancelling entries', 
+            help="""This allows you to cancel accounting entries"""),
         'module_account_voucher': fields.boolean('Manage customer payments',
             help="""This includes all the basic requirements of voucher entries for bank, cash, sales, purchase, expense, contra, etc.
                 This installs the module account_voucher."""),

=== modified file 'account/res_config_view.xml'
--- account/res_config_view.xml	2013-02-13 16:41:57 +0000
+++ account/res_config_view.xml	2013-05-28 07:02:38 +0000
@@ -141,6 +141,10 @@
                                 <field name="module_account_budget" class="oe_inline"/>
                                 <label for="module_account_budget"/>
                             </div>
+                            <div>
+                                <field name="module_account_cancel" class="oe_inline"/>
+                                <label for="module_account_cancel"/>
+                            </div>
                         </div>
                     </group>
                     <separator string="eInvoicing &amp; Payments"/>