-
@@ -377,7 +366,7 @@
-
+
@@ -447,7 +436,6 @@
-
diff --git a/addons/sale_crm/wizard/makesale.py b/addons/sale_crm/wizard/makesale.py
index c5ad6a92a72..dc5d9875554 100644
--- a/addons/sale_crm/wizard/makesale.py
+++ b/addons/sale_crm/wizard/makesale.py
@@ -107,8 +107,13 @@ class make_sale(wizard.interface):
'partner_shipping_id': partner_addr['delivery'],
'order_policy': 'manual',
'date_order': now(),
- 'fiscal_position': fpos
+ 'fiscal_position': fpos,
}
+
+ if partner_id:
+ partner = partner_obj.browse(cr, uid, partner_id, context=context)
+ vals['user_id'] = partner.user_id and partner.user_id.id or uid
+
if data['form']['analytic_account']:
vals['project_id'] = data['form']['analytic_account']
new_id = sale_obj.create(cr, uid, vals)
diff --git a/addons/sale_delivery_report/report/shipping.rml b/addons/sale_delivery_report/report/shipping.rml
index c827cced55a..f0fd5fa282a 100644
--- a/addons/sale_delivery_report/report/shipping.rml
+++ b/addons/sale_delivery_report/report/shipping.rml
@@ -201,7 +201,7 @@
[[line.product_id.code ]] [[ line.product_id and line.product_id.name or '']]
- [[ (line.prodlot_id and line.prodlot_id.name) or ' ' ]]
+ [[ (line.prodlot_id and (line.prodlot_id.name + '/' + line.prodlot_id.ref)) or ' ' ]]
|
[[ formatLang(line.product_qty) ]]
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 310e993146d..28fe9842361 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1190,10 +1190,17 @@ class stock_move(osv.osv):
return {'value': result}
- def onchange_product_id(self, cr, uid, ids, prod_id=False, loc_id=False, loc_dest_id=False):
+ def onchange_product_id(self, cr, uid, ids, prod_id=False, loc_id=False, loc_dest_id=False, address_id=False):
if not prod_id:
return {}
- product = self.pool.get('product.product').browse(cr, uid, [prod_id])[0]
+ lang = False
+ if address_id:
+ addr_rec = self.pool.get('res.partner.address').browse(cr, uid, address_id)
+ if addr_rec:
+ lang = addr_rec.partner_id and addr_rec.partner_id.lang or False
+ ctx = {'lang': lang}
+
+ product = self.pool.get('product.product').browse(cr, uid, [prod_id], context=ctx)[0]
uos_id = product.uos_id and product.uos_id.id or False
result = {
'name': product.partner_ref,
diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index 07e71261b82..db6fcadac92 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -148,7 +148,7 @@ class History(osv.osv):
_order = 'id DESC'
_columns={
'create_date':fields.datetime("Date",select=True),
- 'text_area':fields.text("Text area",select=True),
+ 'text_area':fields.text("Text area"),
'minor_edit':fields.boolean('This is a major edit ?',select=True),
'summary':fields.char('Summary',size=256, select=True),
'write_uid':fields.many2one('res.users',"Modify By", select=True),
|