Fix some bugs and remove duplicate patches

issue6931.diff

@@ -1,12 +0,0 @@
---- a/trytond/trytond/modules/stock/inventory.py	Mon Oct 30 15:09:23 2017 +0100
-+++ b/trytond/trytond/modules/stock/inventory.py	Sat Nov 11 00:52:34 2017 +0100
-@@ -227,8 +227,7 @@
- 
-             # Update existing lines
-             for line in inventory.lines:
--                if not (line.product.active and
--                        line.product.type == 'goods'):
-+                if not line.product.type == 'goods':
-                     Line.delete([line])
-                     continue
- 

issue7011.diff

@@ -1,12 +0,0 @@
-diff -r c5fad88f4be1 stock.py
---- a/trytond/trytond/modules/stock_consignment/stock.py	Mon Oct 30 15:55:27 2017 +0100
-+++ b/trytond/trytond/modules/stock_consignment/stock.py	Fri Dec 15 02:05:38 2017 +0100
-@@ -107,7 +107,7 @@
- 
-     def get_invoice_line_consignment(self):
-         if (self.from_location.type == 'supplier'
--                and self.to_location.type == 'storage'
-+                and self.to_location.type in ('storage', 'production')
-                 and self.from_location.consignment_party):
-             return self._get_supplier_invoice_line_consignment()
-         elif (self.from_location.type == 'storage'

series

@@ -66,10 +66,8 @@ stock_recompute_cost_price.diff # [stock] - Recompute cost price when cost_price
 support_dict_one2many_functional_fields.diff
 issue6836.diff # [sale] [sale_price_list] [purchase] - Recompute unit price when change taxes and price list is tax included
 issue6896.diff # [sale_credit_limit] - Use quantity sold and invoiced to compute credit amount
-issue6931.diff # [stock] - Complete Inventory discards inactive products on update
 issue6845-issue5613.diff # [commission] Missing agent type domain on sale and invoice + Remove old usage of out_credit_note
 
-issue7011.diff # [stock_consignment] stock_consignment should create invoices for moves that go to a production location
 issue7012.diff # [stock_consignment] Allow to create internal order points to provision supplier consignment locations
 issue33209.diff # [account_invoice] Forbid to create credit notes from nonposted invoices
 issue7129.diff # [account_payment] Slow to list Lines to Pay

stock_inventory_consumables.diff

@@ -1,7 +1,7 @@
-diff -r f5e02ae4fd6d inventory.py
---- a/trytond/trytond/modules/stock/inventory.py	Thu Mar 01 12:45:35 2018 +0100
-+++ b/trytond/trytond/modules/stock/inventory.py	Fri Mar 02 00:49:47 2018 +0100
-@@ -228,15 +228,13 @@
+diff -r d3533b14b811 inventory.py
+--- a/trytond/trytond/modules/stock/inventory.py	Thu Mar 01 23:07:13 2018 +0100
++++ b/trytond/trytond/modules/stock/inventory.py	Fri Mar 02 03:03:20 2018 +0100
+@@ -218,15 +218,13 @@
  
              # Index some data
              product2type = {}
@@ -19,7 +19,7 @@ diff -r f5e02ae4fd6d inventory.py
                      Line.delete([line])
                      continue
  
-@@ -254,8 +252,7 @@
+@@ -244,8 +242,7 @@
              # Create lines if needed
              for key, quantity in pbl.iteritems():
                  product_id = key[grouping.index('product') + 1]
@@ -29,11 +29,11 @@ diff -r f5e02ae4fd6d inventory.py
                      continue
                  if not quantity:
                      continue
-@@ -281,7 +278,6 @@
+@@ -265,7 +262,6 @@
      product = fields.Many2One('product.product', 'Product', required=True,
          domain=[
              ('type', '=', 'goods'),
 -            ('consumable', '=', False),
-             ], states=_states, depends=_depends)
+             ])
      uom = fields.Function(fields.Many2One('product.uom', 'UOM'), 'get_uom')
      unit_digits = fields.Function(fields.Integer('Unit Digits'),