Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-bug-729539-ron into lp:openobject-addons

  1. trunk-bug-729539-ron
  2. Merge into trunk
Proposed by Rohan Nayani(Open ERP)
Status: Merged
Merged at revision: 4519
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-729539-ron
Merge into: lp:openobject-addons
Diff against target: 52 lines (+7/-5)
1 file modified
stock/wizard/stock_move.py (+7/-5)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-729539-ron
Reviewer Review Type Date Requested Status
OpenERP buildbot (community) Needs Fixing
Review via email: mp+52668@code.launchpad.net

Description of the change

* Bug #729539: split production lot in 'products to consume' Remove

To post a comment you must log in.
Revision history for this message
OpenERP buildbot (openerp-buildbot) wrote :

crm_partner_assign/test/test_crm_partner_assign.yml[warning]: AssertionError in Python code : SMTP not configured !
project_timesheet/test/worktask_entry_to_timesheetline_entry.yml[warning]: Assertion "After hr manager's work task" FAILED test: len(timesheet_ids) > 0 values: ! 0 > 0
~/addons/anonymization/anonymization.py:298[pywarn]: The behavior of this method will change in future versions. Use specific 'len(elem)' or 'elem is not None' test instead.
~/addons/anonymization/anonymization.py:300[pywarn]: The behavior of this method will change in future versions. Use specific 'len(elem)' or 'elem is not None' test instead.

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stock/wizard/stock_move.py'
2--- stock/wizard/stock_move.py 2011-01-14 00:11:01 +0000
3+++ stock/wizard/stock_move.py 2011-03-09 12:30:47 +0000
4@@ -21,6 +21,8 @@
5
6 from osv import fields, osv
7
8+import decimal_precision as dp
9+
10 class stock_move_track(osv.osv_memory):
11 _name = "stock.move.track"
12 _description = "Track moves"
13@@ -198,7 +200,7 @@
14 return res
15
16 _columns = {
17- 'qty': fields.integer('Quantity'),
18+ 'qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM')),
19 'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
20 'product_uom': fields.many2one('product.uom', 'UoM'),
21 'line_ids': fields.one2many('stock.move.split.lines', 'lot_id', 'Production Lots'),
22@@ -297,12 +299,12 @@
23 _description = "Exist Split lines"
24 _columns = {
25 'name': fields.char('Tracking serial', size=64),
26- 'quantity': fields.integer('Quantity'),
27+ 'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM')),
28 'lot_id': fields.many2one('stock.move.split', 'Lot'),
29 'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot'),
30 }
31 _defaults = {
32- 'quantity': lambda *x: 1,
33+ 'quantity': lambda *x: 1.00,
34 }
35
36 stock_move_split_lines_exist()
37@@ -312,13 +314,13 @@
38 _description = "Split lines"
39 _columns = {
40 'name': fields.char('Tracking serial', size=64),
41- 'quantity': fields.integer('Quantity'),
42+ 'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM')),
43 'use_exist' : fields.boolean('Existing Lot'),
44 'lot_id': fields.many2one('stock.move.split', 'Lot'),
45 'action': fields.selection([('split','Split'),('keepinone','Keep in one lot')],'Action'),
46 }
47 _defaults = {
48- 'quantity': lambda *x: 1,
49+ 'quantity': lambda *x: 1.00,
50 'action' : lambda *x: 'split',
51 }
52 stock_move_split_lines()

Subscribers

People subscribed via source and target branches

to all changes: