Turkesh Patel (openERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-red-button-crm-fix-tpa into
lp:~openerp-dev/openobject-addons/trunk-red-button.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-red-button-crm-fix-tpa/+merge/110309
[IMP] improved color of button based on business flow in following modules
--> sale
--> base_calendar
--> crm_fundraising
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-red-button-crm-fix-tpa/+merge/110309
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-red-button.
=== modified file 'base_calendar/base_calendar_view.xml'
--- base_calendar/base_calendar_view.xml 2012-06-09 14:13:14 +0000
+++ base_calendar/base_calendar_view.xml 2012-06-14 12:26:30 +0000
@@ -10,20 +10,10 @@
<field name="arch" type="xml">
<form string="Invitation details" version="7.0">
<header>
- <button name="do_tentative"
- states="needs-action,declined,accepted"
- string="Uncertain" type="object"/>
- <button name="do_accept" string="Accept"
- states="needs-action,tentative,declined"
- type="object" />
- <button
- name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
- string="Delegate" type="action"
- states="needs-action,tentative,declined,accepted"
- context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
- <button name="do_decline" string="Decline"
- states="needs-action,tentative,accepted"
- type="object" />
+ <button name="do_tentative" states="needs-action,declined,accepted" string="Uncertain" type="object" class="oe_form_button_active_flow"/>
+ <button name="do_accept" string="Accept" states="needs-action,tentative,declined" type="object" class="oe_form_button_active_flow"/>
+ <button name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d" string="Delegate" type="action" states="needs-action,tentative,declined,accepted" context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
+ <button name="do_decline" string="Decline" states="needs-action,tentative,accepted" type="object" class="oe_form_button_active_flow"/>
<field name="state" widget="statusbar"
statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/>
</header>
@@ -211,21 +201,9 @@
<field name="arch" type="xml">
<form string="Events" version="7.0">
<header>
- <button name="do_confirm"
- string="Confirm"
- states="tentative,cancelled"
- type="object"
- />
- <button name="do_tentative"
- states="confirmed,cancelled"
- string="Uncertain"
- type="object"
- />
- <button name="do_cancel"
- string="Cancel"
- states="tentative,confirmed"
- type="object"
- />
+ <button name="do_confirm" string="Confirm" states="tentative,cancelled" type="object" class="oe_form_button_active_flow"/>
+ <button name="do_tentative" states="confirmed,cancelled" string="Uncertain" type="object" class="oe_form_button_active_flow"/>
+ <button name="do_cancel" string="Cancel" states="tentative,confirmed" type="object" />
<field name="state" widget="statusbar"
statusbar_visible="tentative,confirmed" statusbar_colors='{"proforma":"blue"}'/>
</header>
=== modified file 'crm_fundraising/crm_fundraising_view.xml'
--- crm_fundraising/crm_fundraising_view.xml 2012-06-09 14:39:04 +0000
+++ crm_fundraising/crm_fundraising_view.xml 2012-06-14 12:26:30 +0000
@@ -63,11 +63,11 @@
<field name="arch" type="xml">
<form version="7.0">
<header>
- <button name="case_close" string="Done" states="open,pending" type="object" />
- <button name="case_open" string="Open" states="draft,pending" type="object" />
- <button name="case_pending" string="Pending" states="draft,open" type="object" />
- <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" groups="base.group_extended" />
- <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" />
+ <button name="case_close" string="Done" states="open,pending" type="object" class="oe_form_button_active_flow"/>
+ <button name="case_open" string="Open" states="draft,pending" type="object" class="oe_form_button_active_flow"/>
+ <button name="case_pending" string="Pending" states="draft,open" type="object" class="oe_form_button_active_flow"/>
+ <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" groups="base.group_extended" class="oe_form_button_return_flow"/>
+ <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" class="oe_form_button_return_flow"/>
<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" />
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
</header>
=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml 2012-06-14 05:15:05 +0000
+++ sale/sale_view.xml 2012-06-14 12:26:30 +0000
@@ -400,8 +400,8 @@
<form string="Sales Order Lines" version="7.0">
<header>
<button name="button_cancel" string="Cancel" type="object" icon="gtk-cancel" states="confirmed,exception"/>
- <button name="%(action_view_sale_order_line_make_invoice)d" string="Create Invoice" type="action" states="done" icon="gtk-go-forward" attrs="{'invisible': [('invoiced', '=', 1)]}"/>
- <button name="button_done" string="Done" type="object" states="confirmed,exception" icon="gtk-go-forward"/>
+ <button name="%(action_view_sale_order_line_make_invoice)d" string="Create Invoice" type="action" states="done" icon="gtk-go-forward" attrs="{'invisible': [('invoiced', '=', 1)]}" class="oe_form_button_active_flow"/>
+ <button name="button_done" string="Done" type="object" states="confirmed,exception" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
<field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
</header>
<label for="order_id" class="oe_form_readonly_hidden"/>
_______________________________________________
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
