Nimesh Contractor(Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-bounce-nco into lp:openobject-addons.
Requested reviews:
Atul Patel(OpenERP) (atp-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bounce-nco/+merge/129434
Hello sir,
I have remove the span and add group on buttons to fix the problem of
bouncing animation, white bar appears.
Thanks,
NCO.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bounce-nco/+merge/129434
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-bounce-nco.
=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml 2012-10-10 10:49:52 +0000
+++ account/account_invoice_view.xml 2012-10-12 13:38:24 +0000
@@ -143,13 +143,11 @@
<field name="arch" type="xml">
<form string="Supplier Invoice" version="7.0">
<header>
- <span groups="base.group_user">
- <button name="invoice_open" states="draft,proforma2" string="Validate" class="oe_highlight"/>
- <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid' />
- <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
- <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
- <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','<>','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
- </span>
+ <button name="invoice_open" states="draft,proforma2" string="Validate" class="oe_highlight" groups="base.group_user"/>
+ <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid' groups="base.group_user"/>
+ <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one,base.group_user"/>
+ <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" groups="base.group_user"/>
+ <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice,base.group_user" attrs="{'invisible':['|', ('state','<>','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
<field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
</header>
<sheet string="Supplier Invoice">
@@ -291,20 +289,18 @@
<field name="arch" type="xml">
<form string="Invoice" version="7.0">
<header>
- <span groups="base.group_user">
- <button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight"/>
- <button name="invoice_print" string="Print Invoice" type="object" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight"/>
- <button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}"/>
- <button name="invoice_print" string="Print Invoice" type="object" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}"/>
- <button name="invoice_open" states="draft" string="Validate" class="oe_highlight"/>
- <button name="invoice_open" states="proforma2" string="Validate"/>
- <button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/>
- <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='open,proforma2,paid'/>
- <button name="invoice_cancel" states="draft,proforma2,open" string="Cancel" groups="base.group_no_one"/>
- <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object"/>
- <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','<>','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
+ <button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight" groups="base.group_user"/>
+ <button name="invoice_print" string="Print Invoice" type="object" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight" groups="base.group_user"/>
+ <button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}" groups="base.group_user"/>
+ <button name="invoice_print" string="Print Invoice" type="object" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}" groups="base.group_user"/>
+ <button name="invoice_open" states="draft" string="Validate" class="oe_highlight" groups="base.group_user"/>
+ <button name="invoice_open" states="proforma2" string="Validate" groups="base.group_user"/>
+ <button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices,base.group_user"/>
+ <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='open,proforma2,paid' groups="base.group_user"/>
+ <button name="invoice_cancel" states="draft,proforma2,open" string="Cancel" groups="base.group_no_one,base.group_user"/>
+ <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" groups="base.group_user"/>
+ <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice,base.group_user" attrs="{'invisible':['|', ('state','<>','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
<!--button name="%(account_invoices)d" string="Print Invoice" type="action" states="open,paid,proforma,sale,proforma2"/-->
- </span>
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
</header>
<sheet string="Invoice">
=== modified file 'crm_claim/crm_claim_view.xml'
--- crm_claim/crm_claim_view.xml 2012-09-30 14:16:38 +0000
+++ crm_claim/crm_claim_view.xml 2012-10-12 13:38:24 +0000
@@ -102,22 +102,20 @@
<field name="arch" type="xml">
<form string="Claim" version="7.0">
<header>
- <span groups="base.group_user">
<button name="case_open" string="Open" type="object" class="oe_highlight"
- states="draft,pending" />
+ states="draft,pending" groups="base.group_user"/>
<button name="case_close" string="Done" type="object" class="oe_highlight"
- states="open,pending"/>
+ states="open,pending" groups="base.group_user"/>
<button name="case_refuse" string="Refuse" type="object" class="oe_highlight"
- states="draft,open,pending"/>
- <button name="stage_previous" string="Previous Stage" type="object"
+ states="draft,open,pending" groups="base.group_user"/>
+ <button name="stage_previous" string="Previous Stage" type="object" groups="base.group_user"
states="open,pending" icon="gtk-go-back" attrs="{'invisible': [('stage_id','=', False)]}"/>
- <button name="stage_next" string="Next Stage" type="object"
+ <button name="stage_next" string="Next Stage" type="object" groups="base.group_user"
states="open,pending" icon="gtk-go-forward" attrs="{'invisible': [('stage_id','=', False)]}"/>
- <button name="case_reset" string="Reset to Draft" type="object"
+ <button name="case_reset" string="Reset to Draft" type="object" groups="base.group_user"
states="cancel,done"/>
- <button name="case_cancel" string="Cancel" type="object"
+ <button name="case_cancel" string="Cancel" type="object" groups="base.group_user"
states="draft,open,pending"/>
- </span>
<field name="stage_id" widget="statusbar"
on_change="onchange_stage_id(stage_id)"/>
</header>
=== modified file 'event/event_view.xml'
--- event/event_view.xml 2012-10-09 15:00:45 +0000
+++ event/event_view.xml 2012-10-12 13:38:24 +0000
@@ -100,12 +100,10 @@
<field name="arch" type="xml">
<form string="Events" version="7.0">
<header>
- <span groups="base.group_user">
- <button string="Confirm Event" name="button_confirm" states="draft" type="object" class="oe_highlight"/>
- <button string="Event Ended" name="button_done" states="confirm" type="object" class="oe_highlight"/>
- <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" />
- <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object"/>
- </span>
+ <button string="Confirm Event" name="button_confirm" states="draft" type="object" class="oe_highlight" groups="base.group_user"/>
+ <button string="Event Ended" name="button_done" states="confirm" type="object" class="oe_highlight" groups="base.group_user"/>
+ <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" groups="base.group_user"/>
+ <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" groups="base.group_user"/>
<field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
</header>
<sheet>
=== modified file 'project/project_view.xml'
--- project/project_view.xml 2012-10-11 15:15:25 +0000
+++ project/project_view.xml 2012-10-12 13:38:24 +0000
@@ -377,7 +377,6 @@
<field name="arch" type="xml">
<form string="Project" version="7.0">
<header>
- <span groups="base.group_user">
<!--
<button name="do_open" string="Start Task" type="object"
states="draft,pending" class="oe_highlight"/>
@@ -385,12 +384,11 @@
states="cancel,done"/>
-->
<button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
- states="cancelled,done" context="{'button_reactivate':True}"/>
+ states="cancelled,done" context="{'button_reactivate':True}" groups="base.group_user"/>
<button name="action_close" string="Done" type="object"
- states="draft,open,pending"/>
+ states="draft,open,pending" groups="base.group_user"/>
<button name="do_cancel" string="Cancel" type="object"
- states="draft,open,pending"/>
- </span>
+ states="draft,open,pending" groups="base.group_user"/>
<field name="stage_id" widget="statusbar" clickable="True"/>
</header>
<sheet string="Task">
=== modified file 'project_issue/project_issue_view.xml'
--- project_issue/project_issue_view.xml 2012-10-08 10:00:32 +0000
+++ project_issue/project_issue_view.xml 2012-10-12 13:38:24 +0000
@@ -95,14 +95,12 @@
<field name="arch" type="xml">
<form string="Issue" version="7.0">
<header>
- <span groups="base.group_user">
- <button name="case_close" string="Done" type="object"
- states="open"/>
+ <button name="case_close" string="Done" type="object"
+ states="open" groups="base.group_user"/>
<button name="case_close" string="Done" type="object"
- states="draft,pending"/>
+ states="draft,pending" groups="base.group_user"/>
<button name="case_cancel" string="Cancel" type="object"
- states="draft,open,pending"/>
- </span>
+ states="draft,open,pending" groups="base.group_user"/>
<field name="stage_id" widget="statusbar" clickable="True"/>
</header>
<sheet string="Issue">
=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml 2012-10-10 20:49:22 +0000
+++ sale/sale_view.xml 2012-10-12 13:38:24 +0000
@@ -147,23 +147,21 @@
<field name="arch" type="xml">
<form string="Sales Order" version="7.0">
<header>
- <span groups="base.group_user">
- <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
- <button name="invoice_corrected" states="invoice_except" string="Ignore Exception"/>
- <button name="action_quotation_send" string="Send by Mail" type="object" states="draft" class="oe_highlight"/>
- <button name="action_quotation_send" string="Send by Mail" type="object" states="sent"/>
- <button name="print_quotation" string="Print" type="object" states="draft" class="oe_highlight"/>
- <button name="print_quotation" string="Print" type="object" states="sent"/>
- <button name="action_button_confirm" states="draft" string="Confirm" type="object"/>
- <button name="action_button_confirm" states="sent" string="Confirm" class="oe_highlight" type="object"/>
+ <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" groups="base.group_user"/>
+ <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" groups="base.group_user"/>
+ <button name="action_quotation_send" string="Send by Mail" type="object" states="draft" class="oe_highlight" groups="base.group_user"/>
+ <button name="action_quotation_send" string="Send by Mail" type="object" states="sent" groups="base.group_user"/>
+ <button name="print_quotation" string="Print" type="object" states="draft" class="oe_highlight" groups="base.group_user"/>
+ <button name="print_quotation" string="Print" type="object" states="sent" groups="base.group_user"/>
+ <button name="action_button_confirm" states="draft" string="Confirm" type="object" groups="base.group_user"/>
+ <button name="action_button_confirm" states="sent" string="Confirm" class="oe_highlight" type="object" groups="base.group_user"/>
<button name="action_view_invoice" string="View Invoice" type="object" class="oe_highlight"
- attrs="{'invisible': [('invoice_exists', '=', False)]}"/>
+ attrs="{'invisible': [('invoice_exists', '=', False)]}" groups="base.group_user"/>
<button name="%(action_view_sale_advance_payment_inv)d" string="Create Invoice"
- type="action" states="manual" class="oe_highlight"/>
- <button name="cancel" states="draft,sent" string="Cancel"/>
- <button name="action_cancel" states="manual,progress" string="Cancel" type="object"/>
- <button name="invoice_cancel" states="invoice_except" string="Cancel"/>
- </span>
+ type="action" states="manual" class="oe_highlight" groups="base.group_user"/>
+ <button name="cancel" states="draft,sent" string="Cancel" groups="base.group_user"/>
+ <button name="action_cancel" states="manual,progress" string="Cancel" type="object" groups="base.group_user"/>
+ <button name="invoice_cancel" states="invoice_except" string="Cancel" groups="base.group_user"/>
<field name="state" widget="statusbar" statusbar_visible="draft,sent,invoiced,done" statusbar_colors='{"invoice_except":"red","waiting_date":"blue"}'/>
</header>
<sheet>
@@ -474,11 +472,9 @@
<field name="arch" type="xml">
<form string="Sales Order Lines" version="7.0">
<header>
- <span groups="base.group_user">
- <button name="button_cancel" string="Cancel" type="object" states="confirmed,exception"/>
- <button name="%(action_view_sale_order_line_make_invoice)d" string="Create Invoice" type="action" attrs="{'invisible': ['|',('invoiced', '=', 1), ('state', 'not in', ('confirmed', 'draft'))]}" class="oe_highlight"/>
- <button name="button_done" string="Done" type="object" attrs="{'invisible': ['|',('invoiced', '=', 0), ('state', 'not in', ('confirmed', 'exception'))]}" class="oe_highlight"/>
- </span>
+ <button name="button_cancel" string="Cancel" type="object" states="confirmed,exception" groups="base.group_user"/>
+ <button name="%(action_view_sale_order_line_make_invoice)d" string="Create Invoice" type="action" attrs="{'invisible': ['|',('invoiced', '=', 1), ('state', 'not in', ('confirmed', 'draft'))]}" class="oe_highlight" groups="base.group_user"/>
+ <button name="button_done" string="Done" type="object" attrs="{'invisible': ['|',('invoiced', '=', 0), ('state', 'not in', ('confirmed', 'exception'))]}" class="oe_highlight" groups="base.group_user"/>
<field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
</header>
<sheet>
=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml 2012-10-10 19:47:10 +0000
+++ stock/stock_view.xml 2012-10-12 13:38:24 +0000
@@ -746,16 +746,14 @@
<field name="arch" type="xml">
<form string="Internal Picking List" version="7.0">
<header>
- <span groups="base.group_user">
- <button name="draft_force_assign" states="draft" string="Confirm" type="object" class="oe_highlight"/>
- <button name="draft_validate" states="draft" string="Confirm & Transfer" type="object" class="oe_highlight"/>
+ <button name="draft_force_assign" states="draft" string="Confirm" type="object" class="oe_highlight" groups="base.group_user"/>
+ <button name="draft_validate" states="draft" string="Confirm & Transfer" type="object" class="oe_highlight" groups="base.group_user"/>
<!-- <button name="action_assign" states="confirmed" string="Check Availability" type="object"/> -->
- <button name="force_assign" states="confirmed" string="Force Availability" type="object" class="oe_highlight"/>
- <button name="action_process" states="assigned" string="Confirm & Transfer" groups="stock.group_stock_user" type="object" class="oe_highlight"/>
- <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice/Refund" attrs="{'invisible': ['|','|',('state','<>','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" class="oe_highlight"/>
- <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action"/>
- <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel"/>
- </span>
+ <button name="force_assign" states="confirmed" string="Force Availability" type="object" class="oe_highlight" groups="base.group_user"/>
+ <button name="action_process" states="assigned" string="Confirm & Transfer" groups="stock.group_stock_user,base.group_user" type="object" class="oe_highlight"/>
+ <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice/Refund" attrs="{'invisible': ['|','|',('state','<>','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" type="action" class="oe_highlight" groups="base.group_user"/>
+ <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action" groups="base.group_user"/>
+ <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" groups="base.group_user"/>
<field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
</header>
<sheet>
@@ -1282,11 +1280,9 @@
<field name="arch" type="xml">
<form string="Stock Moves" version="7.0">
<header>
- <span groups="base.group_user">
- <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
- <button name="action_confirm" states="draft" string="Confirm" type="object"/>
- <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"/>
- </span>
+ <button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_user"/>
+ <button name="action_confirm" states="draft" string="Confirm" type="object" groups="base.group_user"/>
+ <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" groups="base.group_user"/>
<field name="state" widget="statusbar" statusbar_visible="draft,assigned,done"/>
</header>
<group>
_______________________________________________
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
