diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index ff6321e599f..f31f10c4060 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -363,7 +363,12 @@ the rule to mark CC(mail to any other person defined in actions)."),
'user' : self.pool.get('res.users').browse(cr, uid, uid, context=context),
'obj' : obj,
})
- self.email_send(cr, uid, obj, emails, action.act_mail_body, emailfrom=email_from)
+ def to_email(text):
+ return re.findall(r'([^ ,<@]+@[^> ,]+)', text or '')
+ emails = to_email(','.join(filter(None, emails)))
+ email_froms = to_email(email_from)
+ if email_froms:
+ self.email_send(cr, uid, obj, emails, action.act_mail_body, emailfrom=email_froms[0])
return True
def _action(self, cr, uid, ids, objects, scrit=None, context=None):
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index 1a1b48e75ee..350c9f70092 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -122,10 +122,14 @@ class mailgate_thread(osv.osv):
obj = self.pool.get('mailgate.message')
for case in cases:
+ partner_id = hasattr(case, 'partner_id') and (case.partner_id and case.partner_id.id or False) or False
+ if not partner_id and case._name == 'res.partner':
+ partner_id = case.id
data = {
'name': keyword,
'user_id': uid,
'model' : case._name,
+ 'partner_id': partner_id,
'res_id': case.id,
'date': time.strftime('%Y-%m-%d %H:%M:%S'),
'message_id': message_id,
@@ -153,7 +157,7 @@ class mailgate_thread(osv.osv):
case.user_id.address_id.email),
'email_cc': email_cc,
'email_bcc': email_bcc,
- 'partner_id': hasattr(case, 'partner_id') and (case.partner_id and case.partner_id.id or False) or False,
+ 'partner_id': partner_id,
'references': references,
'message_id': message_id,
'attachment_ids': [(6, 0, attachments)]
@@ -255,11 +259,16 @@ class mailgate_tool(osv.osv_memory):
msg_pool = self.pool.get('mailgate.message')
for res_id in res_ids:
+ case = self.pool.get(model).browse(cr, uid, res_id, context=context)
+ partner_id = hasattr(case, 'partner_id') and (case.partner_id and case.partner_id.id or False) or False
+ if not partner_id and model == 'res.partner':
+ partner_id = res_id
msg_data = {
'name': msg.get('subject', 'No subject'),
'date': msg.get('date'),
'description': msg.get('body', msg.get('from')),
'history': True,
+ 'partner_id': partner_id,
'res_model': model,
'email_cc': msg.get('cc'),
'email_from': msg.get('from'),
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index def60b7d458..8b616c3d7ac 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -467,9 +467,8 @@ class mrp_production(osv.osv):
'state': fields.selection([('draft','Draft'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'State', readonly=True,
help='When the production order is created the state is set to \'Draft\'.\n If the order is confirmed the state is set to \'Waiting Goods\'.\n If any exceptions are there, the state is set to \'Picking Exception\'.\
\nIf the stock is available then the state is set to \'Ready to Produce\'.\n When the production gets started then the state is set to \'In Production\'.\n When the production is over, the state is set to \'Done\'.'),
- 'hour_total': fields.function(_production_calc, method=True, type='float', string='Total Hours', multi='workorder'),
- 'cycle_total': fields.function(_production_calc, method=True, type='float', string='Total Cycles', multi='workorder'),
-
+ 'hour_total': fields.function(_production_calc, method=True, type='float', string='Total Hours', multi='workorder', store=True),
+ 'cycle_total': fields.function(_production_calc, method=True, type='float', string='Total Cycles', multi='workorder', store=True),
'company_id': fields.many2one('res.company','Company',required=True),
}
_defaults = {
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 6b59287f3ce..4186a6e8722 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -615,7 +615,7 @@
= 2
- move_lines[0].product_id.id <> move_lines[1].product_id.id
- move_lines[0].product_id.id in (ref('product_product_beers0'), ref('product_product_beerspack0'))
- move_lines[1].product_id.id in (ref('product_product_beers0'), ref('product_product_beerspack0'))
diff --git a/addons/mrp/test/mrp_phantom_bom.yml b/addons/mrp/test/mrp_phantom_bom.yml
index 71a04fc79d7..46b1d19244a 100644
--- a/addons/mrp/test/mrp_phantom_bom.yml
+++ b/addons/mrp/test/mrp_phantom_bom.yml
@@ -200,7 +200,7 @@
-
!python {model: procurement.order}: |
from tools.translate import _
- proc_ids = self.search(cr, uid, [('state','=','confirmed')])
+ proc_ids = self.search(cr, uid, [('product_id','in',[ref('product_product_orange0'),ref('product_product_sugar0'),ref('product_product_water0')])])
assert proc_ids, _('No Procurements!')
-
The scheduler runs.
diff --git a/addons/mrp/test/mrp_production_order.yml b/addons/mrp/test/mrp_production_order.yml
index 476d79f7fab..94613a3ac93 100644
--- a/addons/mrp/test/mrp_production_order.yml
+++ b/addons/mrp/test/mrp_production_order.yml
@@ -5,113 +5,61 @@
-
I am creating one manufacturing order.
-
- !record {model: mrp.production, id: mrp_production_mo0}:
- bom_id: mrp.mrp_bom_9
- routing_id: mrp.mrp_routing_0
+ !record {model: mrp.production, id: mrp_production_mo1}:
company_id: base.main_company
date_planned: '2010-05-06 14:55:52'
location_dest_id: stock.stock_location_stock
location_src_id: stock.stock_location_stock
- name: MO/00004
product_id: product.product_product_pc1
product_qty: 5.0
product_uom: product.product_uom_unit
product_uos_qty: 0.0
--
- I create a record for Workcenter line.
--
- !record {model: mrp.production.workcenter.line, id: mrp_production_workcenter_line_assemblyline0}:
- cycle: 5.0
- hour: 10.0
- name: Assembly Line 1
- production_id: mrp_production_mo0
- sequence: 0.0
- workcenter_id: mrp.mrp_workcenter_0
--
- I create second record for Workcenter line.
--
- !record {model: mrp.production.product.line, id: mrp_production_product_line_regularprocessorconfig0}:
- name: Regular processor config
- product_id: product.product_product_cpu_gen
- product_qty: 5.0
- product_uom: product.product_uom_unit
- product_uos_qty: 0.0
- production_id: mrp_production_mo0
--
- I create third record for Workcenter line.
--
- !record {model: mrp.production.product.line, id: mrp_production_product_line_hddseagategb0}:
- name: HDD Seagate 7200.8 80GB
- product_id: product.product_product_hdd1
- product_qty: 5.0
- product_uom: product.product_uom_unit
- product_uos_qty: 0.0
- production_id: mrp_production_mo0
--
- I create fourth record for Workcenter line.
--
- !record {model: mrp.production.product.line, id: mrp_production_product_line_atxmidsizetower0}:
- name: ATX Mid-size Tower
- product_id: product.product_product_tow1
- product_qty: 5.0
- product_uom: product.product_uom_unit
- product_uos_qty: 0.0
- production_id: mrp_production_mo0
--
- I create a record for production line.
--
- !record {model: mrp.production.product.line, id: mrp_production_product_line_mouse0}:
- name: Mouse
- product_id: product.product_product_25
- product_qty: 5.0
- product_uom: product.product_uom_unit
- product_uos_qty: 0.0
- production_id: mrp_production_mo0
--
- I create second record for production line.
--
- !record {model: mrp.production.product.line, id: mrp_production_product_line_keyboard0}:
- name: Keyboard
- product_id: product.product_product_24
- product_qty: 5.0
- product_uom: product.product_uom_unit
- product_uos_qty: 0.0
- production_id: mrp_production_mo0
+-
+ I compute the data.
+-
+ !python {model: mrp.production}: |
+ self.action_compute(cr, uid, [ref("mrp_production_mo1")], {"lang": "en_US", "tz":
+ False, "search_default_current": 1, "active_model": "ir.ui.menu", "active_ids":
+ [ref("mrp.menu_mrp_production_action")], "active_id": ref("mrp.menu_mrp_production_action"),
+ })
-
I confirm the order.
-
- !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_mo0}
+ !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_mo1}
-
I am checking Procurement orders.
-
!python {model: procurement.order}: |
from tools.translate import _
- proc_ids = self.search(cr, uid, [('state','=','confirmed')])
+ production_obj = self.pool.get('mrp.production')
+ production = production_obj.browse(cr, uid, ref('mrp_production_mo1'))
+ product_ids = map(lambda x:x.product_id.id, production.move_lines)
+ proc_ids = self.search(cr, uid, [('product_id','in',product_ids)])
assert proc_ids, _('No Procurements!')
-
The scheduler runs.
-
!function {model: procurement.order, name: run_scheduler}:
- model: procurement.order
- search: "[('state','=','confirmed')]"
+ search: "[]"
-
I am checking Internal picking.
-
!python {model: stock.picking}: |
from tools.translate import _
- pick_ids = self.search(cr, uid, [('state','!=','done'),('type','=','internal')])
+ pick_ids = self.search(cr, uid, [('type','=','internal')])
assert pick_ids, _('No Internal Pickings!')
-
I see that there is a manufacturing order for the sub product of PC1 with ready state.
-
!python {model: mrp.production}: |
from tools.translate import _
- order_ids = self.search(cr, uid, [('state','=','confirmed')])
- assert order_ids, _('No manufacturing order!')
+ order_ids = self.search(cr, uid, [('state','=','ready')])
+ assert order_ids, _('No manufacturing order in Ready state!')
-
I start producing that product first. So I marked it as started.
-
- !workflow {model: mrp.production, action: button_produce, ref: mrp_production_mo0}
+ !workflow {model: mrp.production, action: button_produce, ref: mrp_production_mo1}
-
I create record for producing products with quantity 5.00.
-
@@ -124,19 +72,25 @@
!python {model: mrp.product.produce}: |
prod_obj = self.pool.get('mrp.production')
prod_ids = prod_obj.search(cr, uid, [('state','=','confirmed')])
- self.do_produce(cr, uid, [1], context={'active_ids': prod_ids})
+ self.do_produce(cr, uid, [ref('mrp_product_produce0')], context={'active_ids': prod_ids})
-
Now the manufacturing order for subproduct CPU_GEN is done and manufacturing
order for PC1 is in ready state.
-
!python {model: mrp.production}: |
from tools.translate import _
- prod_ids = self.search(cr, uid, [('state','!=','done')])
+ prod_ids = self.search(cr, uid, [('state','=','done')])
assert prod_ids, _('Manufacturing order is yet not done!')
-
I start producing the product PC1.
-
- !workflow {model: mrp.production, action: button_produce, ref: mrp_production_mo0}
+ !workflow {model: mrp.production, action: button_produce, ref: mrp_production_mo1}
+-
+ I create record for producing products with quantity 5.00.
+-
+ !record {model: mrp.product.produce, id: mrp_product_produce1}:
+ product_qty: 5.00
+ mode: 'consume_produce'
-
Finally my production order is done.
-
@@ -144,4 +98,4 @@
from tools.translate import _
prod_obj = self.pool.get('mrp.production')
prod_ids = prod_obj.search(cr, uid, [('product_id.default_code','=','PC1')])
- self.do_produce(cr, uid, [1], context={'active_ids': prod_ids})
+ self.do_produce(cr, uid, [ref('mrp_product_produce1')], context={'active_ids': prod_ids})
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index d0a669590e2..ab936e78daf 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -75,7 +75,7 @@ class mrp_production_workcenter_line(osv.osv):
_order = "sequence, date_planned"
_columns = {
- 'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pause'),('cancel','Canceled'),('done','Finished')],'State', readonly=True,
+ 'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pause'),('cancel','Cancelled'),('done','Finished')],'State', readonly=True,
help="* When a work order is created it is set in 'Draft' state.\n" \
"* When user sets work order in start mode that time it will be set in 'In Progress' state.\n" \
"* When work order is in running mode, during that time if user wants to stop or to make changes in order then can set in 'Pause' state.\n" \
@@ -93,7 +93,7 @@ class mrp_production_workcenter_line(osv.osv):
string='Production State', readonly=True),
'product':fields.related('production_id','product_id',type='many2one',relation='product.product',string='Product',
readonly=True),
- 'qty':fields.related('production_id','product_qty',type='float',string='Qty',readonly=True),
+ 'qty':fields.related('production_id','product_qty',type='float',string='Qty',readonly=True, store=True),
'uom':fields.related('production_id','product_uom',type='many2one',relation='product.uom',string='UOM',readonly=True),
}
@@ -263,7 +263,7 @@ class mrp_production(osv.osv):
dt = dt_end
if context.get('__last_update'):
del context['__last_update']
- if (wc.date_planned
+ title="&title.label;" onload="myPrefObserver.createContactAddress();" height="480" width="764">
@@ -23,9 +23,10 @@