[MERGE]sync with trunk

bzr revid: sgo@tinyerp.com-20130311045638-npwv6lb6bc9i3m1y

diff --cc addons/point_of_sale/point_of_sale.py
Simple merge

diff --cc addons/point_of_sale/wizard/pos_return.py
Simple merge

diff --cc addons/sale/sale.py
index 04dc490,62aca05..e677ec3
--- 1/addons/sale/sale.py
--- 2/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@@ -231,8 -258,10 +231,9 @@@ class sale_order(osv.osv)
          'user_id': lambda obj, cr, uid, context: uid,
          'name': lambda obj, cr, uid, context: '/',
          'invoice_quantity': 'order',
 -        'shop_id': _get_default_shop,
          'partner_invoice_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['invoice'])['invoice'],
          'partner_shipping_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['delivery'])['delivery'],
+         'note': lambda self, cr, uid, context: self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.sale_note
      }
      _sql_constraints = [
          ('name_uniq', 'unique(name, company_id)', 'Order Reference must be unique per Company!'),

diff --cc addons/sale/sale_view.xml
Simple merge

diff --cc addons/sale_mrp/test/sale_mrp.yml
Simple merge

diff --cc addons/sale_stock/sale_stock.py
index 682c0e4,bd4eb2b..caafcb9
--- 1/addons/sale_stock/sale_stock.py
--- 2/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@@ -23,9 -23,16 +23,8 @@@ from datetime import datetime, timedelt
  from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP, float_compare
  from dateutil.relativedelta import relativedelta
  from openerp.osv import fields, osv
- from openerp import netsvc
  from openerp.tools.translate import _
  
 -class sale_shop(osv.osv):
 -    _inherit = "sale.shop"
 -    _columns = {
 -        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse'),
 -    }
 -
 -sale_shop()
 -
  class sale_order(osv.osv):
      _inherit = "sale.order"
      

diff --cc addons/sale_stock/test/picking_order_policy.yml
Simple merge

diff --cc addons/stock/product.py
Simple merge