Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-bug-807543-ara into lp:openobject-addons

  1. trunk-bug-807543-ara
  2. Merge into trunk
Proposed by Ashvin Rathod (OpenERP)
Status: Merged
Merged at revision: 5390
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-807543-ara
Merge into: lp:openobject-addons
Diff against target: 62 lines (+33/-2)
2 files modified
account/account_invoice_view.xml (+2/-2)
account_cancel/account_cancel_view.xml (+31/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-807543-ara
Reviewer Review Type Date Requested Status
Mustufa Rangwala (Open ERP) (community) Approve
Ashvin Rathod (OpenERP) (community) Needs Resubmitting
qdp (OpenERP) Pending
Review via email: mp+69203@code.launchpad.net

Description of the change

Hello,

Fix: re-open invoice assigned to usability/no one

Thanks,
ara

To post a comment you must log in.
Revision history for this message
Mustufa Rangwala (Open ERP) (mra-tinyerp) wrote :

Improve id and name of your record in xml

review: Needs Fixing
Revision history for this message
Ashvin Rathod (OpenERP) (ara-tinyerp) wrote :

Hello,

I have improved name and id as per suggestion.

Thanks,
ara

review: Needs Resubmitting
Revision history for this message
Mustufa Rangwala (Open ERP) (mra-tinyerp) wrote :

Thanks ARA for fix and Aline for suggestion.

review: Approve

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 2011-07-19 09:06:02 +0000
3+++ account/account_invoice_view.xml 2011-07-26 11:32:36 +0000
4@@ -212,7 +212,7 @@
5 <field name="state"/>
6 <field name="residual"/>
7 <group col="6" colspan="4">
8- <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
9+ <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
10 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
11 <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
12 <button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
13@@ -306,7 +306,7 @@
14 <field name="state"/>
15 <field name="residual"/>
16 <group col="8" colspan="4" groups="base.group_user">
17- <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
18+ <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
19 <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
20
21 <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
22
23=== modified file 'account_cancel/account_cancel_view.xml'
24--- account_cancel/account_cancel_view.xml 2011-01-14 00:11:01 +0000
25+++ account_cancel/account_cancel_view.xml 2011-07-26 11:32:36 +0000
26@@ -12,5 +12,36 @@
27 </field>
28 </field>
29 </record>
30+
31+ <record id="invoice_form_cancel_inherit" model="ir.ui.view">
32+ <field name="name">invoice.form.cancel.inherit</field>
33+ <field name="model">account.invoice</field>
34+ <field name="type">form</field>
35+ <field name="inherit_id" ref="account.invoice_form"/>
36+ <field name="arch" type="xml">
37+ <xpath expr="/form/notebook/page/group/group/button[@name='%(account.action_account_state_open)d']" position="replace">
38+ <button name='%(account.action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="account.group_account_invoice"/>
39+ </xpath>
40+ <xpath expr="/form/notebook/page/group/group/button[@name='invoice_cancel']" position="replace">
41+ <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="account.group_account_invoice"/>
42+ </xpath>
43+ </field>
44+ </record>
45+
46+ <record id="invoice_supplier_cancel_form_inherit" model="ir.ui.view">
47+ <field name="name">invoice.supplier.cancel.form.inherit</field>
48+ <field name="model">account.invoice</field>
49+ <field name="type">form</field>
50+ <field name="inherit_id" ref="account.invoice_supplier_form"/>
51+ <field name="arch" type="xml">
52+ <xpath expr="/form/notebook/page/group/group/button[@name='%(account.action_account_state_open)d']" position="replace">
53+ <button name='%(account.action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="account.group_account_invoice"/>
54+ </xpath>
55+ <xpath expr="/form/notebook/page/group/group/button[@name='invoice_cancel']" position="replace">
56+ <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="account.group_account_invoice"/>
57+ </xpath>
58+ </field>
59+ </record>
60+
61 </data>
62 </openerp>

Subscribers

People subscribed via source and target branches

to all changes: