Merge branch '8.0' of https://github.com/OCA/stock-logistics-warehouse into 8.0-stock_available_immediately2

Conflicts: stock_available_immediately/__openerp__.py
2025-01-21 14:27:28 +02:00 · 2015-03-02 17:40:53 +01:00
parent 1a2ed69ab1 2270fd8816
commit 83a85c8ed9
21 changed files with 36 additions and 29 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,9 @@ python:
    - "2.7"

 env:
-  - VERSION="8.0" ODOO_REPO="odoo/odoo"
-  - VERSION="8.0" ODOO_REPO="OCA/OCB"
+  - VERSION="8.0" LINT_CHECK="1"
+  - VERSION="8.0" ODOO_REPO="odoo/odoo" LINT_CHECK="0"
+  - VERSION="8.0" ODOO_REPO="OCA/OCB" LINT_CHECK="0"

 virtualenv:
  system_site_packages: true
@@ -20,7 +21,6 @@ install:
  - git clone https://github.com/OCA/stock-logistics-barcode -b ${VERSION} $HOME/stock-logistics-barcode

 script:
-    - travis_run_flake8
    - travis_run_tests

 after_success:
--- a/unported/base_product_merge/openerp.py
+++ b/unported/base_product_merge/openerp.py
@@ -32,7 +32,7 @@
 {
    "name" : "Base Products Merge",
    "version" : "1.0",
-    "author" : "Camptocamp",
+    "author" : "Camptocamp,Odoo Community Association (OCA)",
    "category" : "Generic Modules/Base",
    "description":"""
 To merge 2 products, select them in the list view and execute the Action "Merge Products".
--- a/unported/configurable_stock_level/openerp.py
+++ b/unported/configurable_stock_level/openerp.py
@@ -20,7 +20,7 @@
 ##############################################################################
 {'name' : 'name',
 'version' : '0.1',
- 'author' : 'Camptocamp',
+ 'author' : "Camptocamp,Odoo Community Association (OCA)",
 'maintainer': 'Camptocamp',
 'category': 'Warehouse',
 'complexity': "normal",  # easy, normal, expert
--- a/unported/stock_available_mrp/openerp.py
+++ b/unported/stock_available_mrp/openerp.py
@@ -21,7 +21,7 @@
 {
    'name': 'Consider the production potential is available to promise',
    'version': '2.0',
-    'author': u'Numérigraphe',
+    "author": u"Numérigraphe,Odoo Community Association (OCA)",
    'category': 'Hidden',
    'depends': ['stock_available', 'mrp'],
    'data': [
--- a/unported/stock_available_sale/openerp.py
+++ b/unported/stock_available_sale/openerp.py
@@ -21,7 +21,7 @@
 {
    'name': 'Quotations in quantity available to promise',
    'version': '2.0',
-    'author': u'Numérigraphe SÀRL',
+    "author": u"Numérigraphe,Odoo Community Association (OCA)",
    'category': 'Hidden',
    'depends': [
        'stock_available',
--- a/unported/stock_inventory_existing_lines/openerp.py
+++ b/unported/stock_inventory_existing_lines/openerp.py
@@ -22,7 +22,7 @@
 {
    "name" : "Inventory Extended",
    "version" : "1.0",
-    "author" : "Julius Network Solutions",
+    "author" : "Julius Network Solutions,Odoo Community Association (OCA)",
    "description" : """
    
 Presentation:
--- a/unported/stock_inventory_extended/openerp.py
+++ b/unported/stock_inventory_extended/openerp.py
@@ -22,7 +22,7 @@
 {
    "name" : "Move Inventory Extended",
    "version" : "1.0",
-    "author" : "Julius Network Solutions",
+    "author" : "Julius Network Solutions,Odoo Community Association (OCA)",
    "description" : """

 Presentation:
--- a/unported/stock_inventory_with_location/openerp.py
+++ b/unported/stock_inventory_with_location/openerp.py
@@ -22,7 +22,7 @@
 {
    "name" : "Move Inventory Extended",
    "version" : "1.0",
-    "author" : "Julius Network Solutions",
+    "author" : "Julius Network Solutions,Odoo Community Association (OCA)",
    "description" : """

 Presentation:
--- a/unported/stock_lot_valuation/openerp.py
+++ b/unported/stock_lot_valuation/openerp.py
@@ -34,7 +34,7 @@ Set the 'Lot valuation' flag on product form (used for real time valuation).
 As for products, lots have 'cost' and 'costing method' fields. Also, a
 'Change Standard Price' wizard is available.
 """,
-    'author': 'Agile Business Group',
+    'author': "Agile Business Group,Odoo Community Association (OCA)",
    'website': 'http://www.agilebg.com',
    'license': 'AGPL-3',
    "depends": ['stock'],
--- a/unported/stock_move_location/openerp.py
+++ b/unported/stock_move_location/openerp.py
@@ -22,7 +22,7 @@
 {
    "name" : "Move Stock Location",
    "version" : "1.0",
-    "author" : "Julius Network Solutions",
+    "author" : "Julius Network Solutions,Odoo Community Association (OCA)",
    "description" : """

 Presentation:
--- a/unported/stock_optional_valuation/openerp.py
+++ b/unported/stock_optional_valuation/openerp.py
@@ -26,7 +26,7 @@
 You can choose which stock moves have to generate inventory valuation
 accounting entries, by specifying it in the location form.
 """,
-    'author': 'Agile Business Group',
+    'author': "Agile Business Group,Odoo Community Association (OCA)",
    'website': 'http://www.agilebg.com',
    'license': 'AGPL-3',
    "depends": ['stock'],
--- a/unported/stock_orderpoint_creator/openerp.py
+++ b/unported/stock_orderpoint_creator/openerp.py
@@ -21,7 +21,7 @@

 {'name': 'Configuration of order point in mass',
 'version': '1.0',
- 'author': 'Camptocamp',
+ 'author': "Camptocamp,Odoo Community Association (OCA)",
 'maintainer': 'Camptocamp',
 'category': 'Warehouse',
 'complexity': 'easy', #easy, normal, expert
--- a/unported/stock_reord_rule/openerp.py
+++ b/unported/stock_reord_rule/openerp.py
@@ -46,7 +46,7 @@ executed daily and will update the maximum quantity in the reordering rule

 This module doesn't need purchase module to work, but it's useful with that
 module.""",
-    'author': 'Sergio Corato',
+    'author': "Sergio Corato,Odoo Community Association (OCA)",
    'website': 'http://www.icstools.it',
    'depends': ['procurement',
                'sale',
--- a/stock_available/openerp.py
+++ b/stock_available/openerp.py
@@ -21,7 +21,7 @@
 {
    'name': 'Stock available to promise',
    'version': '2.0',
-    'author': u'Numérigraphe',
+    "author": u"Numérigraphe,Odoo Community Association (OCA)",
    'category': 'Warehouse',
    'depends': ['stock'],
    'license': 'AGPL-3',
--- a/stock_available_immediately/openerp.py
+++ b/stock_available_immediately/openerp.py
@@ -24,7 +24,7 @@
    "name": "Ignore planned receptions in quantity available to promise",
    "version": "2.0",
    "depends": ["stock_available"],
-    "author": "Camptocamp",
+    "author": "Camptocamp,Odoo Community Association (OCA)",
    "license": "AGPL-3",
    "category": "Hidden",
    'installable': True
--- a/stock_location_ownership/openerp.py
+++ b/stock_location_ownership/openerp.py
@@ -21,7 +21,7 @@

 {'name': 'Stock Location Ownership',
 'version': '0.1',
- 'author': 'Camptocamp',
+ 'author': "Camptocamp,Odoo Community Association (OCA)",
 'category': 'Warehouse',
 'license': 'AGPL-3',
 'complexity': 'normal',
--- a/stock_reserve/openerp.py
+++ b/stock_reserve/openerp.py
@@ -22,7 +22,7 @@
 {'name': 'Stock Reservation',
 'summary': 'Stock reservations on products',
 'version': '0.1',
- 'author': 'Camptocamp',
+ 'author': "Camptocamp,Odoo Community Association (OCA)",
 'category': 'Warehouse',
 'license': 'AGPL-3',
 'complexity': 'normal',
--- a/stock_reserve/model/stock_reserve.py
+++ b/stock_reserve/model/stock_reserve.py
@@ -122,10 +122,9 @@ class StockReservation(models.Model):
        The reservation is done using the default UOM of the product.
        A date until which the product is reserved can be specified.
        """
-        move_recs = self.move_id
-        move_recs.date_expected = fields.Datetime.now()
-        move_recs.action_confirm()
-        move_recs.force_assign()
+        self.date_expected = fields.Datetime.now()
+        self.move_id.action_confirm()
+        self.move_id.picking_id.action_assign()
        return True

    @api.multi
--- a/stock_reserve/test/stock_reserve.yml
+++ b/stock_reserve/test/stock_reserve.yml
@@ -62,6 +62,14 @@
 -
  !python {model: stock.reservation}: |
    self.reserve(cr, uid, [ref('reserv_sorbet2')], context=context)
+-
+  Then the reservation should be assigned and have reserved a quant
+-
+  !python {model: stock.reservation, id: reserv_sorbet2}: |
+    from nose.tools import *
+
+    assert_equal('assigned', self.state)
+    assert_equal(1, len(self.reserved_quant_ids))
 -
  I check Virtual stock of Sorbet after update reservation
 -
--- a/stock_reserve_sale/openerp.py
+++ b/stock_reserve_sale/openerp.py
@@ -21,7 +21,7 @@

 {'name': 'Stock Reserve Sales',
 'version': '0.1',
- 'author': 'Camptocamp',
+ 'author': "Camptocamp,Odoo Community Association (OCA)",
 'category': 'Warehouse',
 'license': 'AGPL-3',
 'complexity': 'normal',
--- a/stock_reserve_sale/model/sale.py
+++ b/stock_reserve_sale/model/sale.py
@@ -123,11 +123,11 @@ class SaleOrderLine(models.Model):
    def _is_stock_reservable(self):
        for line in self:
            reservable = False
-            if (not (line.state != 'draft'
-                     or line._get_procure_method() == 'make_to_order'
-                     or not line.product_id
-                     or line.product_id.type == 'service')
-                    and not line.reservation_ids):
+            if (not (line.state != 'draft' or
+                     line._get_procure_method() == 'make_to_order' or
+                     not line.product_id or
+                     line.product_id.type == 'service') and
+                    not line.reservation_ids):
                reservable = True
            line.is_stock_reservable = reservable