summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorsbh (Open ERP) <sbh@tinyerp.com>2010-07-07 17:15:16 +0530
committersbh (Open ERP) <sbh@tinyerp.com>2010-07-07 17:15:16 +0530
commit5ce40c34eb65fda29f7d1daa516f3ffa07bb06f3 (patch)
treeb4355b4c90c0eb1a3b31476b2f9ea61178e33d83 /addons
parent7ce06c4e893440bc423e31c674ab69be99f77478 (diff)
[Fix] Move the field in procurement
bzr revid: sbh@tinyerp.com-20100707114516-cgauhh9srch1i46e
Diffstat (limited to 'addons')
-rw-r--r--addons/mrp/mrp.py28
-rw-r--r--addons/procurement/procurement.py29
2 files changed, 29 insertions, 28 deletions
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index dfc1dc1ebd7..f3731bb59bb 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -27,34 +27,6 @@ import ir
import netsvc
import time
-class mrp_property_group(osv.osv):
- """
- Group of mrp properties.
- """
- _name = 'mrp.property.group'
- _description = 'Property Group'
- _columns = {
- 'name': fields.char('Property Group', size=64, required=True),
- 'description': fields.text('Description'),
- }
-mrp_property_group()
-
-class mrp_property(osv.osv):
- """
- Properties of mrp.
- """
- _name = 'mrp.property'
- _description = 'Property'
- _columns = {
- 'name': fields.char('Name', size=64, required=True),
- 'composition': fields.selection([('min','min'),('max','max'),('plus','plus')], 'Properties composition', required=True, help="Not used in computations, for information purpose only."),
- 'group_id': fields.many2one('mrp.property.group', 'Property Group', required=True),
- 'description': fields.text('Description'),
- }
- _defaults = {
- 'composition': lambda *a: 'min',
- }
-mrp_property()
#----------------------------------------------------------
# Work Centers
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index e88fab424bb..beefd9dc461 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -31,6 +31,35 @@ import time
# Produce, Buy or Find products and place a move
# then wizard for picking lists & move
#
+
+class mrp_property_group(osv.osv):
+ """
+ Group of mrp properties.
+ """
+ _name = 'mrp.property.group'
+ _description = 'Property Group'
+ _columns = {
+ 'name': fields.char('Property Group', size=64, required=True),
+ 'description': fields.text('Description'),
+ }
+mrp_property_group()
+
+class mrp_property(osv.osv):
+ """
+ Properties of mrp.
+ """
+ _name = 'mrp.property'
+ _description = 'Property'
+ _columns = {
+ 'name': fields.char('Name', size=64, required=True),
+ 'composition': fields.selection([('min','min'),('max','max'),('plus','plus')], 'Properties composition', required=True, help="Not used in computations, for information purpose only."),
+ 'group_id': fields.many2one('mrp.property.group', 'Property Group', required=True),
+ 'description': fields.text('Description'),
+ }
+ _defaults = {
+ 'composition': lambda *a: 'min',
+ }
+mrp_property()
class procurement_order(osv.osv):
"""
Procurement Orders