Odoo Addons (MOVED TO GITHUB)

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

  1. trunk-partner_reference_terms-ypa
  2. Merge into trunk
Proposed by Richard Mathot (Odoo, formerly OpenERP)
Status: Merged
Approved by: Richard Mathot (Odoo, formerly OpenERP)
Approved revision: no longer in the source branch.
Merged at revision: 9328
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-partner_reference_terms-ypa
Merge into: lp:openobject-addons
Diff against target: 38 lines (+3/-3)
3 files modified
account/account_invoice.py (+1/-1)
account/account_invoice_view.xml (+1/-1)
sale/sale.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-partner_reference_terms-ypa
Reviewer Review Type Date Requested Status
Richard Mathot (Odoo, formerly OpenERP) (community) lgtm Approve
Review via email: mp+215623@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Richard Mathot (Odoo, formerly OpenERP) (rim-openerp) :
review: Approve (lgtm)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/account_invoice.py'
2--- account/account_invoice.py 2014-04-04 15:11:12 +0000
3+++ account/account_invoice.py 2014-04-14 09:08:35 +0000
4@@ -226,7 +226,7 @@
5 },
6 }
7 _columns = {
8- 'name': fields.char('Description', size=64, select=True, readonly=True, states={'draft':[('readonly',False)]}),
9+ 'name': fields.char('Reference/Description', size=64, select=True, readonly=True, states={'draft':[('readonly',False)]}),
10 'origin': fields.char('Source Document', size=64, help="Reference of the document that produced this invoice.", readonly=True, states={'draft':[('readonly',False)]}),
11 '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)]}),
12 'type': fields.selection([
13
14=== modified file 'account/account_invoice_view.xml'
15--- account/account_invoice_view.xml 2014-03-11 14:52:05 +0000
16+++ account/account_invoice_view.xml 2014-04-14 09:08:35 +0000
17@@ -404,7 +404,7 @@
18 </group>
19 <group>
20 <field name="origin" groups="base.group_user"/>
21- <field name="name" string="Customer Reference"/>
22+ <field name="name"/>
23 <field name="move_id" groups="account.group_account_user"/>
24 </group>
25 </group>
26
27=== modified file 'sale/sale.py'
28--- sale/sale.py 2014-04-11 09:40:18 +0000
29+++ sale/sale.py 2014-04-14 09:08:35 +0000
30@@ -167,7 +167,7 @@
31 'name': fields.char('Order Reference', size=64, required=True,
32 readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, select=True),
33 'origin': fields.char('Source Document', size=64, help="Reference of the document that generated this sales order request."),
34- 'client_order_ref': fields.char('Customer Reference', size=64),
35+ 'client_order_ref': fields.char('Reference/Description', size=64),
36 'state': fields.selection([
37 ('draft', 'Draft Quotation'),
38 ('sent', 'Quotation Sent'),

Subscribers

People subscribed via source and target branches

to all changes: