Merge lp:~openerp-commiter/openobject-addons/trunk-accounting-view-imp-atp-customer-invoice-view-imp-pja into lp:~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp

Proposed by Jalpesh Patel(OpenERP)
Status: Merged
Merge reported by: Atul Patel(OpenERP)
Merged at revision: not available
Proposed branch: lp:~openerp-commiter/openobject-addons/trunk-accounting-view-imp-atp-customer-invoice-view-imp-pja
Merge into: lp:~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp
Diff against target: 31 lines (+4/-5)
2 files modified
account/account_invoice_view.xml (+3/-4)
account/wizard/account_move_journal.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-commiter/openobject-addons/trunk-accounting-view-imp-atp-customer-invoice-view-imp-pja
Reviewer Review Type Date Requested Status
Atul Patel(OpenERP) Pending
Review via email: mp+113939@code.launchpad.net

Description of the change

Hello,
     I improved customer invoice view and remove title "open journal items" from Journal item wizards form.
Thanks

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/account_invoice_view.xml'
2--- account/account_invoice_view.xml 2012-07-06 06:03:27 +0000
3+++ account/account_invoice_view.xml 2012-07-09 10:00:34 +0000
4@@ -308,11 +308,10 @@
5 <label string="Pro Forma Invoice " attrs="{'invisible': [('state','not in',('proforma','proforma2'))]}"/>
6 <label string="Invoice " attrs="{'invisible': [('state','in',('draft','proforma','proforma2'))]}"/>
7 <field name="number" readonly="1" class="oe_inline"/>
8+ <label string="-" class="oe_inline"/>
9+ <field name="name" placeholder="Project XYZ" class="oe_inline"/>
10 </h1>
11- <label string="Concerns" for="name" class="oe_edit_only"/>
12- <h2>
13- <field name="name" placeholder="Project XYZ"/>
14- </h2>
15+
16 <field name="type" invisible="1"/>
17 <group>
18 <group>
19
20=== modified file 'account/wizard/account_move_journal.py'
21--- account/wizard/account_move_journal.py 2012-06-29 09:32:56 +0000
22+++ account/wizard/account_move_journal.py 2012-07-09 10:00:34 +0000
23@@ -102,7 +102,7 @@
24 period = period_pool.browse(cr, uid, [period_id], ['name'])[0]['name']
25 period_string = _("Period: %s") % tools.ustr(period)
26
27- separator_string = _("Open Journal Items !")
28+ separator_string = _("")
29 open_string = _("Open")
30 view = """<?xml version="1.0" encoding="utf-8"?>
31 <form string="Standard entries" version="7.0">

Subscribers

People subscribed via source and target branches