Merge lp:~unifield-team/unifield-addons/uf_1204_cancel_availability_button_2 into lp:unifield-addons

[jftempo]

=== modified file 'account/report/account_balance_sheet.py'
--- account/report/account_balance_sheet.py	2011-06-29 05:29:28 +0000
+++ account/report/account_balance_sheet.py	2012-07-19 14:40:35 +0000
@@ -215,4 +215,4 @@
     'addons/account/report/account_balance_sheet.rml',parser=report_balancesheet_horizontal,
     header='internal')
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account/report/account_general_journal.py'
--- account/report/account_general_journal.py	2011-01-14 00:11:01 +0000
+++ account/report/account_general_journal.py	2012-07-19 14:40:35 +0000
@@ -158,4 +158,4 @@
 
 report_sxw.report_sxw('report.account.general.journal', 'account.journal.period', 'addons/account/report/general_journal.rml', parser=journal_print, header='internal')
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'stock/partner_view.xml'
--- stock/partner_view.xml	2012-06-14 12:30:17 +0000
+++ stock/partner_view.xml	2012-07-19 14:40:35 +0000
@@ -9,6 +9,7 @@
       <field name="name">res.partner.stock.property.form.inherit</field>
       <field name="model">res.partner</field>
       <field name="type">form</field>
+      <field name="priority" eval="15"/>
       <field name="inherit_id" ref="base.view_partner_form"/>
       <field name="priority" eval="15" />
       <field name="arch" type="xml">

=== modified file 'stock/stock.py'
--- stock/stock.py	2012-07-06 12:59:15 +0000
+++ stock/stock.py	2012-07-19 14:40:35 +0000
@@ -363,7 +363,7 @@
     def _product_virtual_get(self, cr, uid, id, product_ids=False, context=None, states=['done']):
         return self._product_all_get(cr, uid, id, product_ids, context, ['confirmed', 'waiting', 'assigned', 'done'])
 
-    def _product_reserve(self, cr, uid, ids, product_id, product_qty, context=None, lock=False):
+    def _product_reserve(self, cr, uid, ids, product_id, product_qty, location_dest_id, context=None, lock=False):
         """
         Attempt to find a quantity ``product_qty`` (in the product's default uom or the uom passed in ``context``) of product ``product_id``
         in locations with id ``ids`` and their child locations. If ``lock`` is True, the stock.move lines
@@ -390,7 +390,9 @@
         if context is None:
             context = {}
         pool_uom = self.pool.get('product.uom')
-        for id in self.search(cr, uid, [('location_id', 'child_of', ids)]):
+        for id in self.search(cr, uid, [('location_id', 'child_of', ids)], order="parent_left"):
+            if id == location_dest_id:
+                continue
             if lock:
                 try:
                     # Must lock with a separate select query because FOR UPDATE can't be used with
@@ -456,13 +458,9 @@
             if amount > 0:
                 if amount > min(total, product_qty):
                     amount = min(product_qty, total)
-                result.append((amount, id))
-                product_qty -= amount
-                total -= amount
-                if product_qty <= 0.0:
-                    return result
-                if total <= 0.0:
-                    continue
+
+                return self._hook_proct_reserve(cr,uid,product_qty,result,amount, id, ids)
+
         return False
 
 stock_location()
@@ -2029,6 +2027,7 @@
         @return: No. of moves done
         """
         done = []
+        notdone = []
         count = 0
         pickings = {}
         if context is None:
@@ -2041,7 +2040,7 @@
                 continue
             if move.state in ('confirmed', 'waiting'):
                 # Important: we must pass lock=True to _product_reserve() to avoid race conditions and double reservations
-                res = self.pool.get('stock.location')._product_reserve(cr, uid, [move.location_id.id], move.product_id.id, move.product_qty, {'uom': move.product_uom.id}, lock=True)
+                res = self.pool.get('stock.location')._product_reserve(cr, uid, [move.location_id.id], move.product_id.id, move.product_qty, move.location_dest_id.id ,{'uom': move.product_uom.id}, lock=True)
                 if res:
                     #_product_available_test depends on the next status for correct functioning
                     #the test does not work correctly if the same product occurs multiple times
@@ -2053,13 +2052,8 @@
                     r = res.pop(0)
                     cr.execute('update stock_move set location_id=%s, product_qty=%s, product_uos_qty=%s where id=%s', (r[1], r[0], r[0] * move.product_id.uos_coeff, move.id))
 
-                    while res:
-                        r = res.pop(0)
-                        move_id = self.copy(cr, uid, move.id, {'product_qty': r[0],'product_uos_qty': r[0] * move.product_id.uos_coeff,'location_id': r[1]})
-                        done.append(move_id)
-        if done:
-            count += len(done)
-            self.write(cr, uid, done, {'state': 'assigned'})
+                    done, notdone = self._hook_copy_stock_move(cr, uid, res, move, done, notdone)
+        count = self._hook_write_state_stock_move(cr, uid, done, notdone, count)
 
         if count:
             for pick_id in pickings:

=== modified file 'stock/wizard/stock_partial_move.py'
--- stock/wizard/stock_partial_move.py	2012-05-15 16:56:55 +0000
+++ stock/wizard/stock_partial_move.py	2012-07-19 14:40:35 +0000
@@ -83,6 +83,9 @@
             return "product_moves_in"
         else:
             return "product_moves_out"
+
+    def _hook_move_state(self):
+        return ('done', 'cancel')
     
     def view_init(self, cr, uid, fields_list, context=None):
         res = super(stock_partial_move, self).view_init(cr, uid, fields_list, context=context)
@@ -91,7 +94,7 @@
         if context is None:
             context = {}
         for move in move_obj.browse(cr, uid, context.get('active_ids', []), context=context):
-            if move.state in ('done', 'cancel'):
+            if move.state in self._hook_move_state():
                 raise osv.except_osv(_('Invalid action !'), _('Cannot deliver products which are already delivered !'))
             
         return res

=== modified file 'stock/wizard/stock_partial_picking.py'
--- stock/wizard/stock_partial_picking.py	2012-05-15 16:56:55 +0000
+++ stock/wizard/stock_partial_picking.py	2012-07-19 14:40:35 +0000
@@ -64,13 +64,7 @@
         if not picking_ids:
             return res
 
-        result = []
-        for pick in pick_obj.browse(cr, uid, picking_ids, context=context):
-            pick_type = self.get_picking_type(cr, uid, pick, context=context)
-            for m in pick.move_lines:
-                if m.state in ('done', 'cancel'):
-                    continue
-                result.append(self.__create_partial_picking_memory(m, pick_type))
+        result = self._hook_default_get(cr, uid, picking_ids, context)
 
         if 'product_moves_in' in fields:
             res.update({'product_moves_in': result})

=== modified file 'stock/wizard/stock_partial_picking_view.xml'
--- stock/wizard/stock_partial_picking_view.xml	2011-01-14 00:11:01 +0000
+++ stock/wizard/stock_partial_picking_view.xml	2012-07-19 14:40:35 +0000
@@ -8,6 +8,6 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
+    </data>
 
-    </data>
 </openerp>