Merge lp:~therp-nl/ocb-addons/7.0-fix_conflict_rev_9651 into lp:ocb-addons

[Holger Brunn (Therp)]

This branch fixes conflicts with commit
http://bazaar.launchpad.net/~openerp/openobject-addons/7.0/revision/9651

The conflicts were introduced by
http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9628

There's a runbot instance on
http://conflict-rev-9651-25732.runbot.openerp.com/?

What the code does now: I preserved Christophe Chauvet's code (the ocb part) for using reordering rules if applicable, but if not, I use Christophe Simonis' code (the upstream part) looking for warehouses in the location hierarchy.

This way, it seems we get the best of both proposals.

I'm btw just as unhappy as you about the signature of _get_warehouse, but I think we shouldn't change API signatures, even if newly introduced.

Please review fast as this conflict stalls the merge process for ocb-addons.

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks for picking this up! BTW it's not Christophe Chauvet's code but an OPW branch by Rifakat that you backported yourself ;-) Christophe only committed the change.

review: Approve

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

LGTM

Thanks for keeping an eye on this (and for the heads up)

review: Approve (code review, no test)

[lp:~therp-nl/ocb-addons/7.0-fix_conflict_rev_9651]

9729. By Guewen Baconnier @ Camptocamp on 2013-12-02

[FIX] make the fields required for all type='contract' and type='template'

9730. By Lorenzo Battistini on 2013-12-02

[FIX] These changes set the correct account type to view accounts

9731. By Stefan Rijnhart (Opener) on 2013-12-02

[RVT] Reverting OCB-specific email setting defaults linked to lp:1163832

9732. By Pedro Manuel Baeza on 2013-12-02

[FIX] mrp: mrp.bom multi-company rule

[Pedro Manuel Baeza (pedro.baeza)]

Seems OK, but a little ugly, as Holger have said. We'll wait for better times on trunk...

Regards.

review: Approve (code review)

[lp:~therp-nl/ocb-addons/7.0-fix_conflict_rev_9651]

9733. By kbh at tinyerp on 2013-12-13

[FIX]sale_stock:property_ids added

9734. By Holger Brunn (Therp) on 2013-12-20

[MERGE] Resolve conflict in purchase and purchase_requirement between
    ocb-addons and openobject-addons.

9749. By Martin Trigaux (OpenERP) on 2013-11-29

[FIX] purchase: revert revision 7677 to set a default unit of measure to 'Unit'
This allows to field a purchase.order without showing the units of measure if not product is selected
Revision 7677 was integrated to fix lp:958897 (no change of uom when selecting a product whose uom is in the category 'Units'). This fix did not solve it properly (only for initial value) and introduced another problem. A better fix will be done on the onchange product.

9750. By Denis Ledoux (OpenERP) on 2013-11-29

[FIX] {account, sale_stock}: res_config: set_default as SUPERUSER_ID. check user group to avoid passthrough access rights security

9751. By Launchpad Translations on behalf of openerp on 2013-11-30

Launchpad automatic translations update.

9752. By Launchpad Translations on behalf of openerp on 2013-12-01

Launchpad automatic translations update.

9753. By Launchpad Translations on behalf of openerp on 2013-12-02

Launchpad automatic translations update.

9754. By Launchpad Translations on behalf of openerp on 2013-12-03

Launchpad automatic translations update.

9755. By Denis Ledoux (OpenERP) on 2013-12-03

[FIX]portal_sale: add the lang to the email templates (sale.order and account.invoice), for the email to be translated in the customer language (as this is the case for regular email templates from sale and account modules-

9756. By Launchpad Translations on behalf of openerp on 2013-12-04

Launchpad automatic translations update.

9757. By Denis Ledoux (OpenERP) on 2013-12-04

[FIX] sale_crm: wizard crm_make_sale crash if partner_id not sent on the opp.

Because defaults get function of partner_id of wizard read the partner_id of the opp and return the first item of the tuple, but if there isnt a partner on the opp, the read return a false for this field, not a tuple.
No return the first item of the tuple if the partner_id is set, else False

9758. By Launchpad Translations on behalf of openerp on 2013-12-05

Launchpad automatic translations update.

9759. By Launchpad Translations on behalf of openerp on 2013-12-06

Launchpad automatic translations update.

9760. By Denis Ledoux (OpenERP) on 2013-12-06

[FIX] sale_stock,stock: change model to stock.picking.out of deliveries to invoice view in sales

Deliveries to invoice in sales menu should display delivery order only (no incoming shipment). This was already the case thanks to the domain [('type','=','out')], but since the refactor of the module stock, and the division of stock.picking to stock.picking.in and stock.picking.out, the model of this view should be stock.picking.out instead of stock.picking (for instance, to get the actions binding (ir.values) of stock.picking.out model).
+ typo fix in action binding

9761. By Denis Ledoux (OpenERP) on 2013-12-06

[FIX] purchase: warning uom category different only if the changed field is product_uom itself.

Changing product_id with a different unit category does not trigger the uom category change warning

9762. By Martin Trigaux (OpenERP) on 2013-12-06

[MERGE] [FIX] account: performance improvement on account.analytic.lines
don't create new analytic lines at move creation, will do it once the move is balanced
don't remove analytic lines (to avoid duplicates) at the begining of the validation of a move, will do it once we create the new correct analytic lines (opw 597719)

9763. By Martin Trigaux (OpenERP) on 2013-12-06

[FIX] account: correct name_search on account to be validated even at negation
added test checking every combinaison of name_search

9764. By Launchpad Translations on behalf of openerp on 2013-12-07

Launchpad automatic translations update.

9765. By Launchpad Translations on behalf of openerp on 2013-12-08

Launchpad automatic translations update.

9766. By Thibault Delavallée (OpenERP) on 2013-12-09

[MERGE] [FIX] mail: fixed message_follower_ids function field.

The set method of the field, set_followers, is now using message_subscribe and message_unsubscribe to have only one access point to adding or removing followers. Previously to this fix it was directly creating entries in the mail_followers table, neglecting the calculation of subtypes and default subtypes.

9767. By Denis Ledoux (OpenERP) on 2013-12-09

[FIX] point_of_sale: ignore TOTAlY returns

Returns were partially ignored when typing keystrokes, thanks to a return; when event which equaled 13, but the default behaviour (press on the focused input/button) was not prevented. This is now the case thanks to preventDefault. For instance, just after a discount set, the focused input was pressed and the associated value was added when scanning a new product with the scanner. Therefore, if we entered a discount of 30%, scanning a new product added '0', the last pushed button, to the discount, and then added the product.

9768. By Xavier ALT on 2013-12-10

[FIX] crm: use email widget for email_from field in Opportunities form view

9769. By Denis Ledoux (OpenERP) on 2013-12-10

[FIX] stock: incoming shipment supplier quick create was creating a customer instead of a supplier

9770. By Denis Ledoux (OpenERP) on 2013-12-10

[FIX] purchase: set readonly on warehouse_id related field in stock.picking.in

9771. By Christophe Simonis (OpenERP) on 2013-12-10

[MERGE] annoucement bar

9772. By Denis Ledoux (OpenERP) on 2013-12-10

[FIX] point_of_sale: fix default destination(or source, for returns) location for pos order moves

For instance, the source location of moves of returned products was output instead of partners locations / customers

9773. By Launchpad Translations on behalf of openerp on 2013-12-11

Launchpad automatic translations update.

9774. By Denis Ledoux (OpenERP) on 2013-12-11

[FIX] mrp: cost structure report, do not display twice main supplier

9775. By Launchpad Translations on behalf of openerp on 2013-12-12

Launchpad automatic translations update.

9776. By Launchpad Translations on behalf of openerp on 2013-12-13

Launchpad automatic translations update.

9777. By Launchpad Translations on behalf of openerp on 2013-12-15

Launchpad automatic translations update.

9778. By Launchpad Translations on behalf of openerp on 2013-12-16

Launchpad automatic translations update.

9779. By Denis Ledoux (OpenERP) on 2013-12-16

[FIX] account_analytic_analysis: is_overdue_quantity was not updated when quantity max was changed

is_overdue_quantity is a stored function field which was updated only when analytic lines where updated. Or, when the quantity_max field is updated, this field should be recomputed and restored. This is now the case

9780. By Xavier ALT on 2013-12-16

[FIX] document: duplicate directory detection should work even when a record rule prevent user from seeing duplicates

9781. By Olivier Dony (Odoo) on 2013-12-16

[FIX] base_action_rule: upon update/create of an automated action in multiprocess mode, force registry reload

Short of signaling the other workers, the (new) automated
rule may be randomly ignored, depending on which worker
handles the request (until the workers all reload
their registries).

9782. By Launchpad Translations on behalf of openerp on 2013-12-17

Launchpad automatic translations update.

9783. By Olivier Dony (Odoo) on 2013-12-17

[FIX] project_mrp: local copy of the "Procurement" process node to avoid errors during updates when sale_stock is not installed

The various attempts to fix this error without duplicating the node
have all caused other errors. Having a duplicate process node has
no consequence on business operations, so it is an acceptable
workaround until the node can be moved to the sale module.

9784. By Denis Ledoux (OpenERP) on 2013-12-17

[FIX]sale_crm: quotation/sale order default section_id based on res_users default_section_id

9785. By Launchpad Translations on behalf of openerp on 2013-12-18

Launchpad automatic translations update.

9786. By Martin Trigaux (OpenERP) on 2013-12-18

[MERGE] [IMP] account_payment: remove widget=selection (was forcing the preloading of every partner for an invisible field)

9787. By Xavier ALT on 2013-12-19

[FIX] hr_holidays, hr_timesheet: fix XMLSyntaxError when company name contain an ampersand '&' sign

9788. By Xavier ALT on 2013-12-19

[FIX] l10n_be: fix no value in 'Code (Tax Code)' column on 'Print VAT Intra' preview report

9789. By Xavier ALT on 2013-12-19

[FIX] project: fix error on ``schedule_tasks`` when there is no resource available on project

9790. By Launchpad Translations on behalf of openerp on 2013-12-20

Launchpad automatic translations update.

9791. By Xavier ALT on 2013-12-20

[FIX] document: on report.document.user view, use correct field type for ``user_id`` field.

9792. By Xavier ALT on 2013-12-20

[FIX] purchase: remove duplicate 'Warehouse' and 'Reference UOM' groupby filter in Purchase Analysis search view

9793. By Xavier ALT on 2013-12-20

[FIX] project: fix task progress not correctly updated when reopening a task

=== modified file 'procurement/schedulers.py'
--- procurement/schedulers.py	2013-11-12 13:06:12 +0000
+++ procurement/schedulers.py	2013-11-29 11:11:54 +0000
@@ -197,7 +197,6 @@
                 'company_id': orderpoint.company_id.id,
                 'product_uom': orderpoint.product_uom.id,
                 'location_id': orderpoint.location_id.id,
-                'warehouse_id': orderpoint.warehouse_id.id,
                 'procure_method': 'make_to_order',
                 'origin': orderpoint.name}
         

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2013-11-27 08:46:25 +0000
+++ purchase/purchase.py	2013-11-29 11:11:54 +0000
@@ -1117,6 +1117,45 @@
         seller_delay = int(procurement.product_id.seller_delay)
         return schedule_date - relativedelta(days=seller_delay)
 
+    def _get_warehouse(self, procurement, user_company):
+        """
+            Return the warehouse containing the procurment stock location (or one of it ancestors)
+            If none match, returns then first warehouse of the company
+        """
+        # TODO refactor the domain once we implement the "parent_of" domain operator
+        # NOTE This method has been copied in the `purchase_requisition` module to ensure
+        #      retro-compatibility. This code duplication will be deleted in next stable version.
+        #      Do not forget to update both version in case of modification.
+        Orderpoint = self.pool['stock.warehouse.orderpoint']
+        ids = Orderpoint.search(
+                procurement._cr, procurement._uid,
+                [('procurement_id','=', procurement.id)],
+                context=procurement._context)
+        if ids:
+            return Orderpoint.browse(
+                    procurement._cr, procurement._uid, ids[0],
+                    context=procurement._context).warehouse_id.id
+
+        company_id = (procurement.company_id or user_company).id
+        domains = [
+            [
+                '&', ('company_id', '=', company_id),
+                '|', '&', ('lot_stock_id.parent_left', '<', procurement.location_id.parent_left),
+                          ('lot_stock_id.parent_right', '>', procurement.location_id.parent_right),
+                     ('lot_stock_id', '=', procurement.location_id.id)
+            ],
+            [('company_id', '=', company_id)]
+        ]
+
+        cr, uid = procurement._cr, procurement._uid
+        context = procurement._context
+        Warehouse = self.pool['stock.warehouse']
+        for domain in domains:
+            ids = Warehouse.search(cr, uid, domain, context=context)
+            if ids:
+                return ids[0]
+        return False
+
     def make_po(self, cr, uid, ids, context=None):
         """ Make purchase order from procurement
         @return: New created Purchase Orders procurement wise
@@ -1131,8 +1170,6 @@
         prod_obj = self.pool.get('product.product')
         acc_pos_obj = self.pool.get('account.fiscal.position')
         seq_obj = self.pool.get('ir.sequence')
-        warehouse_obj = self.pool.get('stock.warehouse')
-        orderpoint_obj = self.pool.get('stock.warehouse.orderpoint')
         for procurement in self.browse(cr, uid, ids, context=context):
             res_id = procurement.move_id.id
             partner = procurement.product_id.seller_id # Taken Main Supplier of Product of Procurement.
@@ -1140,12 +1177,6 @@
             partner_id = partner.id
             address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery']
             pricelist_id = partner.property_product_pricelist_purchase.id
-            order_point_ids = orderpoint_obj.search(cr, uid, [('procurement_id','=', procurement.id)], context=context)
-            if order_point_ids:
-                warehouse_id = orderpoint_obj.browse(cr, uid, order_point_ids[0], context=context).warehouse_id.id
-            else:
-                warehouse_ids = warehouse_obj.search(cr, uid, [('lot_input_id', '=', procurement.location_id.id)], context=context)
-                warehouse_id = warehouse_ids and warehouse_ids[0] or False
             uom_id = procurement.product_id.uom_po_id.id
 
             qty = uom_obj._compute_qty(cr, uid, procurement.product_uom.id, procurement.product_qty, uom_id)
@@ -1184,7 +1215,7 @@
                 'origin': procurement.origin,
                 'partner_id': partner_id,
                 'location_id': procurement.location_id.id,
-                'warehouse_id': warehouse_id,
+                'warehouse_id': self._get_warehouse(procurement, company),
                 'pricelist_id': pricelist_id,
                 'date_order': purchase_date.strftime(DEFAULT_SERVER_DATETIME_FORMAT),
                 'company_id': procurement.company_id.id,

=== modified file 'purchase_requisition/purchase_requisition.py'
--- purchase_requisition/purchase_requisition.py	2013-09-05 10:09:56 +0000
+++ purchase_requisition/purchase_requisition.py	2013-11-29 11:11:54 +0000
@@ -262,40 +262,79 @@
 product_product()
 
 class procurement_order(osv.osv):
-
     _inherit = 'procurement.order'
     _columns = {
-        'requisition_id' : fields.many2one('purchase.requisition','Latest Requisition')
+        'requisition_id': fields.many2one('purchase.requisition', 'Latest Requisition')
     }
+
+    def _get_warehouse(self, procurement, user_company):
+        """
+            Return the warehouse containing the procurment stock location (or one of it ancestors)
+            If none match, returns then first warehouse of the company
+        """
+        # NOTE This method is a copy of the one on the procurement.order defined in purchase
+        #      module. It's been copied to ensure it been always available, even if module
+        #      purchase is not up to date.
+        #      Do not forget to update both version in case of modification.
+        Orderpoint = self.pool['stock.warehouse.orderpoint']
+        ids = Orderpoint.search(
+                procurement._cr, procurement._uid,
+                [('procurement_id','=', procurement.id)],
+                context=procurement._context)
+        if ids:
+            return Orderpoint.browse(
+                    procurement._cr, procurement._uid, ids[0],
+                    context=procurement._context).warehouse_id.id
+
+        company_id = (procurement.company_id or user_company).id
+        domains = [
+            [
+                '&', ('company_id', '=', company_id),
+                '|', '&', ('lot_stock_id.parent_left', '<', procurement.location_id.parent_left),
+                          ('lot_stock_id.parent_right', '>', procurement.location_id.parent_right),
+                     ('lot_stock_id', '=', procurement.location_id.id)
+            ],
+            [('company_id', '=', company_id)]
+        ]
+
+        cr, uid = procurement._cr, procurement._uid
+        context = procurement._context
+        Warehouse = self.pool['stock.warehouse']
+        for domain in domains:
+            ids = Warehouse.search(cr, uid, domain, context=context)
+            if ids:
+                return ids[0]
+        return False
+
     def make_po(self, cr, uid, ids, context=None):
         res = {}
         requisition_obj = self.pool.get('purchase.requisition')
-        warehouse_obj = self.pool.get('stock.warehouse')
-        orderpoint_obj = self.pool.get('stock.warehouse.orderpoint')
-        procurement = self.browse(cr, uid, ids, context=context)[0]
-        if procurement.product_id.purchase_requisition:
-             order_point_ids = orderpoint_obj.search(cr, uid, [('procurement_id','=', procurement.id)], context=context)
-             if order_point_ids:
-                warehouse_id = orderpoint_obj.browse(cr, uid, order_point_ids[0], context=context).warehouse_id.id
-             else:
-                 warehouse_ids = warehouse_obj.search(cr, uid, [('lot_input_id', '=', procurement.location_id.id)], context=context)
-                 warehouse_id = warehouse_ids and warehouse_ids[0] or False
-             res[procurement.id] = requisition_obj.create(cr, uid, 
-                   {
+        non_requisition = []
+        for procurement in self.browse(cr, uid, ids, context=context):
+            if procurement.product_id.purchase_requisition:
+                user_company = self.pool['res.users'].browse(cr, uid, uid, context=context).company_id
+                req = res[procurement.id] = requisition_obj.create(cr, uid, {
                     'origin': procurement.origin,
                     'date_end': procurement.date_planned,
-                    'warehouse_id': warehouse_id,
-                    'company_id':procurement.company_id.id,
-                    'line_ids': [(0,0,{
+                    'warehouse_id': self._get_warehouse(procurement, user_company),
+                    'company_id': procurement.company_id.id,
+                    'line_ids': [(0, 0, {
                         'product_id': procurement.product_id.id,
                         'product_uom_id': procurement.product_uom.id,
                         'product_qty': procurement.product_qty
-
-                   })],
-                })
-             self.write(cr,uid,[procurement.id],{'state': 'running','requisition_id': res[procurement.id]},context=context)
-             return {}
-        return super(procurement_order, self).make_po(cr, uid, ids, context=context)
+                    })],
+                })
+                procurement.write({
+                    'state': 'running',
+                    'requisition_id': req
+                })
+            else:
+                non_requisition.append(procurement.id)
+
+        if non_requisition:
+            res.update(super(procurement_order, self).make_po(cr, uid, non_requisition, context=context))
+
+        return res
 
 procurement_order()