Merge pull request #122 from agaldona/8.0-invoice_line_move

[IMP] account_invoice_line_stock_move_info: set pickings invoiced, when an invoice is set as draft
odoomrp · Feb 10, 2016 · e11d1b5 · e11d1b5
2 parents 6c5274e + 8f10495
commit e11d1b5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/account_invoice_line_stock_move_info/__init__.py b/account_invoice_line_stock_move_info/__init__.py
diff --git a/account_invoice_line_stock_move_info/__openerp__.py b/account_invoice_line_stock_move_info/__openerp__.py
diff --git a/account_invoice_line_stock_move_info/models/__init__.py b/account_invoice_line_stock_move_info/models/__init__.py
diff --git a/account_invoice_line_stock_move_info/models/account_invoice.py b/account_invoice_line_stock_move_info/models/account_invoice.py
@@ -25,6 +25,14 @@ def action_cancel(self):
             {'invoice_state': '2binvoiced'})
         return res
 
+    @api.multi
+    def action_cancel_draft(self):
+        # go from canceled state to draft state
+        res = super(AccountInvoice, self).action_cancel_draft()
+        self.mapped('invoice_line.picking_id').write(
+            {'invoice_state': 'invoiced'})
+        return res
+
 
 class AccountInvoiceLine(models.Model):
     _inherit = 'account.invoice.line'

diff --git a/stock_planning_rule/models/stock_planning.py b/stock_planning_rule/models/stock_planning.py
@@ -68,11 +68,11 @@ def _get_required_increase_custom(self):
                     self.scheduled_to_date > self.custom_rule_max_qty):
                 self.required_increase = (
                     (self.scheduled_to_date - self.custom_rule_max_qty) *
-                    -1)
+                    (-1))
             else:
                 self.required_increase = (
                     (self.scheduled_to_date - self.custom_rule_min_qty) *
-                    -1)
+                    (-1))
 
     custom_stock_planning_rule = fields.Boolean(
         string='customize min. qty, and max. qty rules',