Somesh Khare has proposed merging
lp:~openerp-dev/openobject-addons/6.0-opw-18226-skh into
lp:openobject-addons/6.0.
Requested reviews:
Vo Minh Thu (OpenERP) (vmt-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-18226-skh/+merge/80868
Hello VMT,
back ported from the trunk revision: 5390
BUG: 807543 "re-open invoice assigned to useability/no one".
Kindly review this and notify if it requires any other changes.
Thanks,
Somesh Khare
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-18226-skh/+merge/80868
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.0-opw-18226-skh.
=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml 2011-01-20 14:02:14 +0000
+++ account/account_invoice_view.xml 2011-11-01 06:33:24 +0000
@@ -211,7 +211,7 @@
<field name="state"/>
<field name="residual"/>
<group col="6" colspan="4">
- <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
+ <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
<button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
<button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
@@ -305,7 +305,7 @@
<field name="state"/>
<field name="residual"/>
<group col="8" colspan="4" groups="base.group_user">
- <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
+ <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
<button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
<button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
=== modified file 'account_cancel/account_cancel_view.xml'
--- account_cancel/account_cancel_view.xml 2011-01-14 00:11:01 +0000
+++ account_cancel/account_cancel_view.xml 2011-11-01 06:33:24 +0000
@@ -12,5 +12,36 @@
</field>
</field>
</record>
+ <record id="invoice_form_cancel_inherit" model="ir.ui.view">
+ <field name="name">invoice.form.cancel.inherit</field>
+ <field name="model">account.invoice</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="account.invoice_form"/>
+ <field name="arch" type="xml">
+ <xpath expr="/form/notebook/page/group/group/button[@name='%(account.action_account_state_open)d']" position="replace">
+ <button name='%(account.action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="account.group_account_invoice"/>
+ </xpath>
+ <xpath expr="/form/notebook/page/group/group/button[@name='invoice_cancel']" position="replace">
+ <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="account.group_account_invoice"/>
+ </xpath>
+ </field>
+ </record>
+
+ <record id="invoice_supplier_cancel_form_inherit" model="ir.ui.view">
+ <field name="name">invoice.supplier.cancel.form.inherit</field>
+ <field name="model">account.invoice</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="account.invoice_supplier_form"/>
+ <field name="arch" type="xml">
+ <xpath expr="/form/notebook/page/group/group/button[@name='%(account.action_account_state_open)d']" position="replace">
+ <button name='%(account.action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="account.group_account_invoice"/>
+ </xpath>
+ <xpath expr="/form/notebook/page/group/group/button[@name='invoice_cancel']" position="replace">
+ <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="account.group_account_invoice"/>
+ </xpath>
+ </field>
+ </record>
+
+
</data>
</openerp>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
