Merge lp:~openerp-dev/openobject-addons/trunk-partner_reference_terms-ypa into lp:openobject-addons

[Richard Mathot (Odoo, formerly OpenERP)]

[Richard Mathot (Odoo, formerly OpenERP) (rim-openerp)]

review: Approve (lgtm)

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2014-04-04 15:11:12 +0000
+++ account/account_invoice.py	2014-04-14 09:08:35 +0000
@@ -226,7 +226,7 @@
         },
     }
     _columns = {
-        'name': fields.char('Description', size=64, select=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'name': fields.char('Reference/Description', size=64, select=True, readonly=True, states={'draft':[('readonly',False)]}),
         'origin': fields.char('Source Document', size=64, help="Reference of the document that produced this invoice.", readonly=True, states={'draft':[('readonly',False)]}),
         'supplier_invoice_number': fields.char('Supplier Invoice Number', size=64, help="The reference of this invoice as provided by the supplier.", readonly=True, states={'draft':[('readonly',False)]}),
         'type': fields.selection([
 
=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml	2014-03-11 14:52:05 +0000
+++ account/account_invoice_view.xml	2014-04-14 09:08:35 +0000
@@ -404,7 +404,7 @@
                                 </group>
                                 <group>
                                     <field name="origin" groups="base.group_user"/>
-                                    <field name="name" string="Customer Reference"/>
+                                    <field name="name"/>
                                     <field name="move_id" groups="account.group_account_user"/>
                                 </group>
                             </group>
 
=== modified file 'sale/sale.py'
--- sale/sale.py	2014-04-11 09:40:18 +0000
+++ sale/sale.py	2014-04-14 09:08:35 +0000
@@ -167,7 +167,7 @@
         'name': fields.char('Order Reference', size=64, required=True,
             readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, select=True),
         'origin': fields.char('Source Document', size=64, help="Reference of the document that generated this sales order request."),
-        'client_order_ref': fields.char('Customer Reference', size=64),
+        'client_order_ref': fields.char('Reference/Description', size=64),
         'state': fields.selection([
             ('draft', 'Draft Quotation'),
             ('sent', 'Quotation Sent'),