Merge lp:~jgrandguillaume-c2c/account-financial-tools/account-constraints-adding into lp:~account-core-editors/account-financial-tools/6.1

[Joël Grand-Guillaume @ camptocamp]

Remove the possibility to modify or delete a move line related to an
  invoice or a bank statement, no matter what the status of the move
  (draft, validated or posted). This is usefule in standard context but
  moreover if you're using : account_default_draft_move. This way you ensure
  user cannot make mistake even in draft, he must pass through the
  parent object to make his modification.

I had to use monkey patching here cause a method hasn't the context in args :(

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

I can't fix the various typos in this MP, so I'm resubmitting it using a branch owned by the camptocamp account.

review: Disapprove (resubmitting from elsewhere with fixes)

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

The new MP is at https://code.launchpad.net/~camptocamp/account-financial-tools/account-constraints-adding/+merge/144241

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

> The new MP is at https://code.launchpad.net/~camptocamp/account-financial-
> tools/account-constraints-adding/+merge/144241

I changed the status of the proposal to 'Rejected' to reflect that.

Unmerged revisions

=== modified file 'account_constraints/__openerp__.py'
--- account_constraints/__openerp__.py	2013-01-16 09:16:56 +0000
+++ account_constraints/__openerp__.py	2013-01-21 15:52:21 +0000
@@ -67,6 +67,14 @@
 * Forbid to remove the reconcile on opening entries. We introduce a new
   boolean field to distinguish the reconciliations made by the closing process
   from others.
+  
+* Remove the possibility to modify or delete a move line related to an
+  invoice or a bank statement, no matter what the status of the move
+  (draft, validated or posted). This is usefule in standard context but
+  moreover if you're using : account_default_draft_move. This way you ensure
+  user cannot make mistake even in draft, he must pass through the 
+  parent object to make his modification.
+
     """,
     'website': 'http://www.camptocamp.com',
     'init_xml': [],

=== modified file 'account_constraints/account_constraints.py'
--- account_constraints/account_constraints.py	2013-01-16 09:28:38 +0000
+++ account_constraints/account_constraints.py	2013-01-21 15:52:21 +0000
@@ -20,6 +20,46 @@
 
 from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
+from openerp.addons.account_invoice import account_invoice as original_invoice_model
+
+def action_cancel(self, cr, uid, ids, *args):
+    """
+    Override the whole function in order to pass the context in it as we need it
+    in the move to know if this is allowed or not. The trouble was in the original 
+    method, there was context = {} that just scratch the whole context content...
+    I marked chages with # --- start changes / end changes
+    """
+    # ---- Start of changes
+    # context = {} # TODO: Use context from arguments
+    context = args[-1] if args and isinstance(args[-1], dict) else {}
+    # ---- End of changes
+    account_move_obj = self.pool.get('account.move')
+    invoices = self.read(cr, uid, ids, ['move_id', 'payment_ids'])
+    move_ids = [] # ones that we will need to remove
+    for i in invoices:
+        if i['move_id']:
+            move_ids.append(i['move_id'][0])
+        if i['payment_ids']:
+            account_move_line_obj = self.pool.get('account.move.line')
+            pay_ids = account_move_line_obj.browse(cr, uid, i['payment_ids'])
+            for move_line in pay_ids:
+                if move_line.reconcile_partial_id and move_line.reconcile_partial_id.line_partial_ids:
+                    raise osv.except_osv(_('Error !'), _('You can not cancel an invoice which is partially paid! You need to unreconcile related payment entries first!'))
+
+    # First, set the invoices as cancelled and detach the move ids
+    self.write(cr, uid, ids, {'state':'cancel', 'move_id':False})
+    if move_ids:
+        # second, invalidate the move(s)
+        account_move_obj.button_cancel(cr, uid, move_ids, context=context)
+        # delete the move this invoice was pointing to
+        # Note that the corresponding move_lines and move_reconciles
+        # will be automatically deleted too
+        account_move_obj.unlink(cr, uid, move_ids, context=context)
+    self._log_event(cr, uid, ids, -1.0, 'Cancel Invoice')
+    return True
+
+# Monkey patch the original method in order to parse the context !
+original_invoice_model.action_cancel = action_cancel
 
 
 class AccountAccount(orm.Model):
@@ -91,6 +131,53 @@
 class AccountMoveLine(orm.Model):
     _inherit = "account.move.line"
 
+    def _check_invoice_related_move(self, cr, uid, ids, context=None):
+        for line in self.browse(cr, uid, ids, context=context):
+            if line.invoice:
+                err_msg = _('Invoice name (id): %s (%s)') % (line.invoice.name, str(line.invoice.id))
+                raise osv.except_osv(
+                    _('Error!'), 
+                    _('You cannot do this on an entry generated by an invoice. You must '
+                    'change the related invoice directly.\n%s.') % err_msg)
+        return True
+
+    def _check_statement_related_move(self, cr, uid, ids, context=None):
+        for line in self.browse(cr, uid, ids, context=context):
+            if line.statement_id:
+                err_msg = _('Bank statement name (id): %s (%s)') % (line.statement_id.name, str(line.statement_id.id))
+                raise osv.except_osv(
+                    _('Error!'), 
+                    _('You cannot do this on an entry generated by a bank statement. '
+                    'You must change the related bank statement directly.\n%s.') % err_msg)
+        return True
+
+    def unlink(self, cr, uid, ids, context=None, check=True):
+        """ Add the verification of:
+            - Is the move related to an invoice
+            - Is the move related to a bank statement
+            In that case, we forbid the move to be deleted even if draft. We should
+            never delete directly a move line related or generated by another object.
+            This is mandatory if you use the all move in draft (module: account_default_draft_move)
+            """
+        if not context.get('from_parent_object', False):
+            self._check_invoice_related_move(cr, uid, ids, context=context)
+            self._check_statement_related_move(cr, uid, ids, context=context)
+        return super(AccountMoveLine, self).unlink(cr, uid, ids, context=context, check=check)
+
+    def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
+        """ Add the verification of:
+            - Is the move related to an invoice
+            - Is the move related to a bank statement
+            In that case, we forbid the move to be modified even if draft. We should
+            never update directly a move line related or generated by another object.
+            This is mandatory if you use the all move in draft (module: account_default_draft_move)
+            """
+        if not context.get('from_parent_object', False):
+            self._check_invoice_related_move(cr, uid, ids, context=context)
+            self._check_statement_related_move(cr, uid, ids, context=context)
+        return super(AccountMoveLine, self).write(cr, uid, ids, vals, 
+            context=context, check=check, update_check=update_check)
+
     def _remove_move_reconcile(self, cr, uid, move_ids=None,
                                opening_reconciliation=False, context=None):
         """Redefine the whole method to add the kwarg opening_reconciliation."""
@@ -238,11 +325,27 @@
 class Invoice(orm.Model):
     _inherit = 'account.invoice'
 
+    def action_move_create(self, cr, uid, ids, context=None):
+        """Override the method to add the key 'from_parent_object' in
+        the context."""
+        if context is None:
+            context = {}
+        context['from_parent_object'] = True
+        return super(Invoice,self).action_move_create(cr, uid, ids, context=context)
+
     # Forbid to cancel an invoice if the related move lines have already been
     # used in a payment order. The risk is that importing the payment line
     # in the bank statement will result in a crash cause no more move will
-    # be found in the payment line
+    # be found in the payment line + Override the method to add the key 'from_parent_object' in
+    # the context.
     def action_cancel(self, cr, uid, ids, *args):
+        """
+        As the signature of the original function isn't good, we
+        append context at the end of *args.
+        """
+        # Hack to take the last args...
+        context = args[-1] if args and isinstance(args[-1], dict) else {}
+        context['from_parent_object'] = True
         payment_line_obj = self.pool.get('payment.line')
         for inv in self.browse(cr, uid, ids, *args):
             pl_line_ids = False
@@ -259,4 +362,29 @@
                       "imported in a payment order. Remove it from the "
                       "following payment order : %s." % payment_order_name)
                 )
+        args = list(args)
+        args.append(context)
         return super(Invoice, self).action_cancel(cr, uid, ids, *args)
+
+
+class AccountBankStatement(orm.Model):
+    _inherit = "account.bank.statement"
+
+    def button_cancel(self, cr, uid, ids, context=None):
+        """Override the method to add the key 'from_parent_object' in
+        the context. This is to allow to delete move line related to bank statement
+        through the buton cancel."""
+        if context is None:
+            context = {}
+        context['from_parent_object'] = True
+        return super(AccountBankStatement, self).button_cancel(cr, uid, ids, context=context)
+
+    def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id, st_line_number, context=None):
+        """Add the from_parent_object key in context in order to be able to post the move."""
+        if context is None:
+            context = {}
+        context['from_parent_object'] = True
+        return super(AccountBankStatement, self).create_move_from_st_line(cr, uid, 
+            st_line_id, company_currency_id, st_line_number, context=context)
+
+