Merge lp:~openerp-dev/openobject-addons/6.0-opw-4972-improved-ach into lp:openobject-addons/6.0

[Anup(SerpentCS)]

Hello Jay,

   I have improved the wizard and other functionalities.

Thanks.

[lp:~openerp-dev/openobject-addons/6.0-opw-4972-improved-ach]

4547. By Jay Vora (Serpent Consulting Services) on 2011-04-29

[FIX] Lunch : Corrected YAML test, thanks to buildbot

4548. By Jay Vora (Serpent Consulting Services) on 2011-04-29

[FIX] Users_ldap : Corrected YAML Warnings,Thanks to Buildbot

4549. By Jay Vora (Serpent Consulting Services) on 2011-04-29

[Merge] Merged Main branch

4550. By Olivier Dony (Odoo) on 2011-04-30

[MERGE] report_webkit: fixes (mainly UTF8 issues), courtesy of Nicolas Bessi, C2C

4551. By Launchpad Translations on behalf of openerp on 2011-04-30

Launchpad automatic translations update.

4552. By Launchpad Translations on behalf of openerp on 2011-05-01

Launchpad automatic translations update.

4553. By Launchpad Translations on behalf of openerp on 2011-05-02

Launchpad automatic translations update.

4554. By xrg on 2011-05-02

[MERGE] base_crypt: missing import and better check for active users

4555. By Jay Vora (Serpent Consulting Services) on 2011-05-02

[MERGE] Merged Dhruti's branch for the fix on decimal accuracy

4556. By Jay Vora (Serpent Consulting Services) on 2011-05-02

[MERGE] Merged Marco's branch for the fix of lp:718609

4557. By Launchpad Translations on behalf of openerp on 2011-05-03

Launchpad automatic translations update.

4558. By Launchpad Translations on behalf of openerp on 2011-05-04

Launchpad automatic translations update.

4559. By Launchpad Translations on behalf of openerp on 2011-05-05

Launchpad automatic translations update.

4560. By Launchpad Translations on behalf of openerp on 2011-05-06

Launchpad automatic translations update.

4561. By Jay Vora (Serpent Consulting Services) on 2011-05-06

[FIX] l10n_fr : Corrected Template definitions (Ref: Case 5481)

4562. By Jay Vora (Serpent Consulting Services) on 2011-05-06

[MERGE] Merged Anup's branch for the fix of task created from Procurement

4563. By Jay Vora (Serpent Consulting Services) on 2011-05-06

[MERGE] Merged Jagdish' branch for the fix of bug lp:767058

4564. By Jay Vora (Serpent Consulting Services) on 2011-05-06

[FIX] Account : default_get() corrected in order to be compatible with web client

4565. By Jay Vora (Serpent Consulting Services) on 2011-05-06

[FIX] Account : Corrected _sum() of account.tax.code()

4566. By Jay Vora (Serpent Consulting Services) on 2011-05-06

[MERGE] Merged Dhruti's branch for the fix of lp:741457

4567. By Jay Vora (Serpent Consulting Services) on 2011-05-07

[FIX] Fixed warnings and test failures suggested by Buildbot

4568. By Jay Vora (Serpent Consulting Services) on 2011-05-07

[Merge]

4569. By Launchpad Translations on behalf of openerp on 2011-05-08

Launchpad automatic translations update.

4570. By Launchpad Translations on behalf of openerp on 2011-05-09

Launchpad automatic translations update.

4571. By Jay Vora (Serpent Consulting Services) on 2011-05-09

[FIX] Account_voucher : Added missing context to onchange_date() of voucher

4572. By Olivier Dony (Odoo) on 2011-05-09

[I18N] all: updated translation templates

4573. By Launchpad Translations on behalf of openerp on 2011-05-10

Launchpad automatic translations update.

4574. By Launchpad Translations on behalf of openerp on 2011-05-11

Launchpad automatic translations update.

4575. By Olivier Laurent (Open ERP) on 2011-05-11

[FIX] document: when updating attachment file size, exclude attachments having NULL db_datas (otherwise len() raises an exception)

4576. By Jay Vora (Serpent Consulting Services) on 2011-05-11

[MERGE] Merged Amit Dodiya's branch for the fix of account_followup rules issue

4577. By Launchpad Translations on behalf of openerp on 2011-05-12

Launchpad automatic translations update.

4578. By Jay Vora (Serpent Consulting Services) on 2011-05-12

[MERGE] Merged the branch for the fix of lp:763439

4579. By Anup(SerpentCS) on 2011-05-12

[FIX] account : Move lines take the Journal and Period from the Move itself(Maintenance Case 5598)

4580. By Launchpad Translations on behalf of openerp on 2011-05-13

Launchpad automatic translations update.

4581. By Launchpad Translations on behalf of openerp on 2011-05-14

Launchpad automatic translations update.

4582. By Launchpad Translations on behalf of openerp on 2011-05-15

Launchpad automatic translations update.

4583. By Tristan Hill (credativ) on 2011-05-15

[MERGE] Merged Tristan Hill (credativ)'s branch for the fix of bug lp:733799

4584. By Launchpad Translations on behalf of openerp on 2011-05-16

Launchpad automatic translations update.

4585. By Jay Vora (Serpent Consulting Services) on 2011-05-16

[MERGE] Merged Rifakat's branch for the fix of onchange call

4586. By Jay Vora (Serpent Consulting Services) on 2011-05-16

[FIX] Purchase_requisition : Corrections and removed the unnecessary dependency of mrp

4587. By Launchpad Translations on behalf of openerp on 2011-05-17

Launchpad automatic translations update.

4588. By Jay Vora (Serpent Consulting Services) on 2011-05-17

[MERGE] Merged Valencia's branch for the fix of __compute method on account correctiosn when account is set to inActive

4589. By Jay Vora (Serpent Consulting Services) on 2011-05-17

[MERGE] Merged Dhruti's branch for the fix of the problem when base_contact disturbs the thunderbird

4590. By Launchpad Translations on behalf of openerp on 2011-05-18

Launchpad automatic translations update.

4591. By Jay Vora (Serpent Consulting Services) on 2011-05-18

[MERGE] Merged Anup's branch for the fix of invoice creation from repairs

4592. By Jay Vora (Serpent Consulting Services) on 2011-05-18

[REF] Stock : Improvements

4593. By Jay Vora (Serpent Consulting Services) on 2011-05-18

[MERGE] Merged Rifakat's branch which contains the fix of invoice progressbar which was showing wrong value by not considering the residual amount(It could have failed when the invoice is partially paid)

4594. By Launchpad Translations on behalf of openerp on 2011-05-19

Launchpad automatic translations update.

4595. By Launchpad Translations on behalf of openerp on 2011-05-20

Launchpad automatic translations update.

4596. By Jay Vora (Serpent Consulting Services) on 2011-05-20

Merged Tejas' branch for the fix of wrong reporting of product margin(Thanks to Rifakat for review)

4597. By Jay Vora (Serpent Consulting Services) on 2011-05-20

[MERGE] Merged Somesh' branch for the fix of domain correction for Sale Order's 'Invoice On' Policy

4598. By Jay Vora (Serpent Consulting Services) on 2011-05-20

[MERGE] Merged Amit Dodiya's branch for the fix of fields_view_get() failing on list view display of account.voucher

4599. By Anup(SerpentCS) on 2011-05-20

[MERGE] Merged RGO's branch for Query fix in Sale Manager Analysis Report(Case:5689)

4600. By Launchpad Translations on behalf of openerp on 2011-05-21

Launchpad automatic translations update.

4601. By Launchpad Translations on behalf of openerp on 2011-05-22

Launchpad automatic translations update.

4602. By Launchpad Translations on behalf of openerp on 2011-05-23

Launchpad automatic translations update.

4603. By Conexus.at on 2011-05-23

[ADD] l10n_at: added localization module for austria. Thanks Conexus.at

4604. By Rifakat Husen (OpenERP) on 2011-05-23

[FIX]: improvement for consume product wizard of manufacturing
* put check for active_id
*changed field track to boolean from dummy
* related useability improvements

Unmerged revisions

4604. By Rifakat Husen (OpenERP) on 2011-05-23

[FIX]: improvement for consume product wizard of manufacturing
* put check for active_id
*changed field track to boolean from dummy
* related useability improvements

=== modified file 'stock/stock.py'
--- stock/stock.py	2011-05-18 15:40:44 +0000
+++ stock/stock.py	2011-05-23 13:36:19 +0000
@@ -440,7 +440,7 @@
 
             total = 0.0
             results2 = 0.0
-            
+
             for r in results:
                 amount = pool_uom._compute_qty(cr, uid, r['product_uom'], r['product_qty'], context.get('uom', False))
                 results2 += amount
@@ -2257,7 +2257,7 @@
             new_move = self.copy(cr, uid, move.id, default_val)
 
             res += [new_move]
-            
+
             for (id, name) in product_obj.name_get(cr, uid, [move.product_id.id]):
                 self.log(cr, uid, move.id, "%s x %s %s" % (move.product_qty, name, _("were scrapped")))
 
@@ -2365,7 +2365,8 @@
                 }
                 if (not move.prodlot_id.id) and (move.product_id.track_production and location_id):
                     # IF product has checked track for production lot, move lines will be split by 1
-                    res += self.action_split(cr, uid, [move.id], quantity, split_by_qty=1, context=context)
+                    split_by_qty = context.get('product_qty',1)
+                    res += self.action_split(cr, uid, [move.id], quantity, split_by_qty=split_by_qty, context=context)
                 else:
                     current_move = self.copy(cr, uid, move.id, default_val)
                     res += [current_move]
@@ -2378,7 +2379,8 @@
                 quantity_rest = quantity
                 uos_qty_rest =  uos_qty
                 if (not move.prodlot_id.id) and (move.product_id.track_production and location_id):
-                    res += self.action_split(cr, uid, [move.id], quantity_rest, split_by_qty=1, context=context)
+                    split_by_qty = context.get('product_qty',1)
+                    res += self.action_split(cr, uid, [move.id], quantity_rest, split_by_qty=split_by_qty, context=context)
                 else:
                     res += [move.id]
                     update_val = {

=== modified file 'stock/wizard/stock_move.py'
--- stock/wizard/stock_move.py	2011-04-01 05:25:48 +0000
+++ stock/wizard/stock_move.py	2011-05-23 13:36:19 +0000
@@ -23,6 +23,8 @@
 
 import decimal_precision as dp
 
+from tools.translate import _
+
 class stock_move_track(osv.osv_memory):
     _name = "stock.move.track"
     _description = "Track moves"
@@ -60,7 +62,9 @@
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
         'product_qty': fields.float('Quantity', required=True),
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
-        'location_id': fields.many2one('stock.location', 'Location', required=True)
+        'location_id': fields.many2one('stock.location', 'Location', required=True),
+        'prod_lot_id': fields.many2one('stock.production.lot','Production Lot'),
+        'track': fields.boolean('Track')
     }
 
     def default_get(self, cr, uid, fields, context=None):
@@ -75,15 +79,20 @@
         if context is None:
             context = {}
         res = super(stock_move_consume, self).default_get(cr, uid, fields, context=context)
-        move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
-        if 'product_id' in fields:
-            res.update({'product_id': move.product_id.id})
-        if 'product_uom' in fields:
-            res.update({'product_uom': move.product_uom.id})
-        if 'product_qty' in fields:
-            res.update({'product_qty': move.product_qty})
-        if 'location_id' in fields:
-            res.update({'location_id': move.location_id.id})
+
+        if context.get('active_id'):
+            move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
+            if 'product_id' in fields:
+                res.update({'product_id': move.product_id.id})
+            if 'product_uom' in fields:
+                res.update({'product_uom': move.product_uom.id})
+            if 'product_qty' in fields:
+                res.update({'product_qty': move.product_qty})
+            if 'location_id' in fields:
+                res.update({'location_id': move.location_id.id})
+            if 'prod_lot_id' in fields:
+                res.update({'prod_lot_id': move.prodlot_id.id})
+            res.update({'track': move.product_id.track_production})
 
         return res
 
@@ -99,11 +108,22 @@
         if context is None:
             context = {}
         move_obj = self.pool.get('stock.move')
-        move_ids = context['active_ids']
-        for data in self.read(cr, uid, ids):
-            move_obj.action_consume(cr, uid, move_ids,
-                             data['product_qty'], data['location_id'],
+        data = self.browse(cr, uid, ids[0], context=context)
+
+        if context.get('active_id'):
+            stock_move = move_obj.browse(cr, uid, context['active_id'], context=context)
+
+            if stock_move.product_qty < data.product_qty:
+                raise osv.except_osv(_('User Error!'),_('Cannot consume more quantity of products than available!'))
+
+            if stock_move.prodlot_id != data.prod_lot_id:
+                move_obj.write(cr, uid, [stock_move.id], {'prodlot_id': data.prod_lot_id.id}, context=context)
+
+            context.update({'product_qty': data.product_qty})
+            move_obj.action_consume(cr, uid, [stock_move.id],
+                             data.product_qty, data.location_id.id,
                              context=context)
+
         return {'type': 'ir.actions.act_window_close'}
 
 stock_move_consume()

=== modified file 'stock/wizard/stock_move_view.xml'
--- stock/wizard/stock_move_view.xml	2011-01-14 00:11:01 +0000
+++ stock/wizard/stock_move_view.xml	2011-05-23 13:36:19 +0000
@@ -43,6 +43,8 @@
                     <field name="location_id" colspan="4" />
                     <field name="product_qty" colspan="2"/>
                     <field name="product_uom" nolabel="1" readonly="1"/>
+                    <field name="prod_lot_id" attrs="{'required':[('track','=',True)]}" domain="[('product_id','=',product_id)]"/>
+                    <field name="track" invisible="1"/>
                     <newline/>
                     <separator string="" colspan="4" />
                     <label string="" colspan="2" />