Mayur Maheshwari(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-statusbar-imp-mma into
lp:~openerp-dev/openobject-addons/trunk-statusbar.
Requested reviews:
Rucha (Open ERP) (rpa-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-statusbar-imp-mma/+merge/75519
Hello,
status-bar Improvement is Done as per pad specification
Thanks
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-statusbar-imp-mma/+merge/75519
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-statusbar.
=== modified file 'account_voucher/account_voucher.py'
--- account_voucher/account_voucher.py 2011-08-25 17:42:01 +0000
+++ account_voucher/account_voucher.py 2011-09-15 10:41:45 +0000
@@ -255,7 +255,7 @@
'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
'company_currency': fields.related('company_id','currency_id', type='many2one', relation='res.currency', string='Currency', readonly=True),
'state':fields.selection(
- [('draft','Draft'),
+ [('draft','New'),
('proforma','Pro-forma'),
('posted','Posted'),
('cancel','Cancelled')
=== modified file 'account_voucher/account_voucher_view.xml'
--- account_voucher/account_voucher_view.xml 2011-09-11 13:50:25 +0000
+++ account_voucher/account_voucher_view.xml 2011-09-15 10:41:45 +0000
@@ -102,7 +102,7 @@
</page>
</notebook>
<group col="10" colspan="4">
- <field name="state"/>
+ <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors="{'proforma':'Blue'}"/>
<button name="cancel_voucher" string="Cancel" states="draft,proforma" icon="gtk-cancel"/>
<button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
<button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
=== modified file 'account_voucher/voucher_payment_receipt_view.xml'
--- account_voucher/voucher_payment_receipt_view.xml 2011-08-25 15:25:45 +0000
+++ account_voucher/voucher_payment_receipt_view.xml 2011-09-15 10:41:45 +0000
@@ -280,7 +280,7 @@
</page>
</notebook>
<group col="10" colspan="4">
- <field name="state"/>
+ <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors="{'proforma':'Blue'}"/>
<button name="cancel_voucher" string="Cancel" states="draft,proforma" icon="gtk-cancel" invisible="context.get('line_type', False)"/>
<button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile this record ?"/>
<button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
@@ -455,7 +455,7 @@
</page>
</notebook>
<group col="10" colspan="4">
- <field name="state"/>
+ <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors="{'proforma':'Blue'}"/>
<button name="cancel_voucher" string="Cancel" states="draft,proforma" icon="gtk-cancel" invisible="context.get('line_type', False)"/>
<button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
<button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
=== modified file 'account_voucher/voucher_sales_purchase_view.xml'
--- account_voucher/voucher_sales_purchase_view.xml 2011-08-25 15:25:45 +0000
+++ account_voucher/voucher_sales_purchase_view.xml 2011-09-15 10:41:45 +0000
@@ -148,7 +148,7 @@
</page>
</notebook>
<group col="8" colspan="4">
- <field name="state"/>
+ <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors="{'proforma':'Blue'}"/>
<button name="cancel_voucher" string="Cancel" states="draft,proforma" icon="gtk-cancel"/>
<button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
<button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
@@ -268,7 +268,7 @@
</page>
</notebook>
<group col="10" colspan="4">
- <field name="state"/>
+ <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors="{'proforma':'Blue'}"/>
<button name="cancel_voucher" string="Cancel" states="draft,proforma" icon="gtk-cancel"/>
<button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
<group attrs="{'invisible':[('state','!=','posted')]}">
=== modified file 'crm/crm.py'
--- crm/crm.py 2011-09-13 13:28:43 +0000
+++ crm/crm.py 2011-09-15 10:41:45 +0000
@@ -29,8 +29,8 @@
MAX_LEVEL = 15
AVAILABLE_STATES = [
- ('draft', 'Draft'),
- ('open', 'Open'),
+ ('draft', 'New'),
+ ('open', 'In Progress'),
('cancel', 'Cancelled'),
('done', 'Closed'),
('pending', 'Pending'),
=== modified file 'crm_claim/crm_claim_view.xml'
--- crm_claim/crm_claim_view.xml 2011-09-09 14:18:44 +0000
+++ crm_claim/crm_claim_view.xml 2011-09-15 10:41:45 +0000
@@ -106,7 +106,7 @@
<field name="description" colspan="4" nolabel="1"/>
<separator colspan="4" string=""/>
<group col="8" colspan="4">
- <field name="state" select="1"/>
+ <field name="state" select="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors="{'pending':'Blue'}"/>
<button name="case_cancel" string="Cancel"
states="draft,open,pending" type="object"
icon="gtk-cancel" />
=== modified file 'crm_fundraising/crm_fundraising_view.xml'
--- crm_fundraising/crm_fundraising_view.xml 2011-09-09 14:18:44 +0000
+++ crm_fundraising/crm_fundraising_view.xml 2011-09-15 10:41:45 +0000
@@ -110,7 +110,7 @@
<field name="description" nolabel="1" colspan="4"/>
<separator colspan="4"/>
<group col="8" colspan="4">
- <field name="state"/>
+ <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors="{'pending':'Blue'}"/>
<button name="case_cancel" string="Cancel"
states="draft,open,pending" type="object"
icon="gtk-cancel" />
=== modified file 'crm_helpdesk/crm_helpdesk_view.xml'
--- crm_helpdesk/crm_helpdesk_view.xml 2011-09-09 14:18:44 +0000
+++ crm_helpdesk/crm_helpdesk_view.xml 2011-09-15 10:41:45 +0000
@@ -69,7 +69,7 @@
<field name="description" colspan="4" nolabel="1" />
<separator colspan="4"/>
<group col="8" colspan="4">
- <field name="state" select="1"/>
+ <field name="state" select="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors="{'pending':'Blue'}"/>
<button name="case_cancel"
states="draft,open,pending" string="Cancel"
type="object" icon="gtk-cancel" />
=== modified file 'hr_evaluation/hr_evaluation.py'
--- hr_evaluation/hr_evaluation.py 2011-08-22 17:16:59 +0000
+++ hr_evaluation/hr_evaluation.py 2011-09-15 10:41:45 +0000
@@ -158,7 +158,7 @@
'survey_request_ids': fields.one2many('hr.evaluation.interview','evaluation_id','Appraisal Forms'),
'plan_id': fields.many2one('hr_evaluation.plan', 'Plan', required=True),
'state': fields.selection([
- ('draft','Draft'),
+ ('draft','New'),
('wait','Plan In Progress'),
('progress','Waiting Appreciation'),
('done','Done'),
=== modified file 'hr_evaluation/hr_evaluation_view.xml'
--- hr_evaluation/hr_evaluation_view.xml 2011-09-12 12:31:52 +0000
+++ hr_evaluation/hr_evaluation_view.xml 2011-09-15 10:41:45 +0000
@@ -201,7 +201,7 @@
</notebook>
<newline/>
<group col="8" colspan="4">
- <field name="state"/>
+ <field name="state" widget="statusbar" statusbar_visible="draft,wait,progress,done" statusbar_colors="{'progress':'Blue'}"/>
<button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"
icon="gtk-cancel"/>
<button name="button_plan_in_progress" string="Start Evaluation" states="draft" type="object"
=== modified file 'idea/idea.py'
--- idea/idea.py 2011-07-01 23:41:24 +0000
+++ idea/idea.py 2011-09-15 10:41:45 +0000
@@ -185,7 +185,7 @@
'count_votes': fields.function(_vote_count, string="Count of votes", type="integer"),
'count_comments': fields.function(_comment_count, string="Count of comments", type="integer"),
'category_id': fields.many2one('idea.category', 'Category', required=True, readonly=True, states={'draft':[('readonly',False)]}),
- 'state': fields.selection([('draft', 'Draft'),
+ 'state': fields.selection([('draft', 'New'),
('open', 'Opened'),
('close', 'Accepted'),
('cancel', 'Refused')],
=== modified file 'idea/idea_view.xml'
--- idea/idea_view.xml 2011-09-11 13:50:25 +0000
+++ idea/idea_view.xml 2011-09-15 10:41:45 +0000
@@ -247,7 +247,7 @@
</page>
</notebook>
<group colspan="4" col="6">
- <field name="state"/>
+ <field name="state" widget="statusbar" statusbar_visible="draft,open,close"/>
<button name="idea_open" string="Open" states="draft" icon="gtk-go-forward"/>
<button name="idea_close" string="Accept" states="open" icon="gtk-jump-to"/>
<button name="idea_cancel" string="Refuse" states="open" icon="gtk-cancel"/>
=== modified file 'lunch/lunch.py'
--- lunch/lunch.py 2011-07-06 14:56:44 +0000
+++ lunch/lunch.py 2011-09-15 10:41:45 +0000
@@ -138,7 +138,7 @@
'cashmove': fields.many2one('lunch.cashmove', 'CashMove' , readonly=True),
'descript': fields.char('Description Order', readonly=True, size=250, \
states = {'draft':[('readonly', False)]}),
- 'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ], \
+ 'state': fields.selection([('draft', 'New'), ('confirmed', 'Confirmed'), ], \
'State', readonly=True, select=True),
'price': fields.function(_price_get, string="Price"),
'category': fields.many2one('lunch.category','Category'),
=== modified file 'lunch/lunch_view.xml'
--- lunch/lunch_view.xml 2011-09-11 13:50:25 +0000
+++ lunch/lunch_view.xml 2011-09-15 10:41:45 +0000
@@ -34,7 +34,7 @@
<newline/>
<separator string="" colspan="4"/>
<group colspan="4" col="4">
- <field name="state"/>
+ <field name="state" widget="statusbar" statusbar_visible="draft,confirmed"/>
<button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" icon="gtk-ok" attrs="{'invisible':[('state','=','confirmed')]}"/>
<button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action" icon="gtk-cancel"/>
</group>
=== modified file 'marketing_campaign/marketing_campaign.py'
--- marketing_campaign/marketing_campaign.py 2011-09-12 18:00:25 +0000
+++ marketing_campaign/marketing_campaign.py 2011-09-15 10:41:45 +0000
@@ -113,7 +113,7 @@
Test in Realtime - It creates and processes all the activities directly but does not send emails or produce reports.
With Manual Confirmation - the campaigns runs normally, but the user has to validate all workitem manually.
Normal - the campaign runs normally and automatically sends all emails and reports (be very careful with this mode, you're live!)"""),
- 'state': fields.selection([('draft', 'Draft'),
+ 'state': fields.selection([('draft', 'New'),
('running', 'Running'),
('done', 'Done'),
('cancelled', 'Cancelled'),],
@@ -267,7 +267,7 @@
'"No duplicates" prevents selecting records which have already entered the campaign previously.'\
'If the campaign has a "unique field" set, "no duplicates" will also prevent selecting records which have '\
'the same value for the unique field as other records that already entered the campaign.'),
- 'state': fields.selection([('draft', 'Draft'),
+ 'state': fields.selection([('draft', 'New'),
('running', 'Running'),
('done', 'Done'),
('cancelled', 'Cancelled')],
=== modified file 'marketing_campaign/marketing_campaign_view.xml'
--- marketing_campaign/marketing_campaign_view.xml 2011-09-12 12:31:52 +0000
+++ marketing_campaign/marketing_campaign_view.xml 2011-09-15 10:41:45 +0000
@@ -36,7 +36,7 @@
<field name="activity_ids" nolabel = "1" colspan="4" context="{'default_object_id': object_id, 'default_campaign_id': active_id}" />
<separator string="" colspan="4" />
<group col="10" colspan="4">
- <field name="state" readonly="1" />
+ <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
<button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
<button name="state_running_set" string="Run" states="draft,done,cancelled" icon="gtk-apply"/>
<button name="state_draft_set" string="Set to Draft" states="done,cancelled" icon="gtk-convert"/>
@@ -161,7 +161,7 @@
</group>
<separator string="" colspan="4"/>
<group col="6" colspan="4">
- <field name="state" readonly="1"/>
+ <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,running,done"/>
<button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
<button name="state_running_set" string="Run" states="draft" icon="gtk-apply"/>
<button name="state_done_set" string="Close" states="running" icon="terp-dialog-close"/>
@@ -382,7 +382,7 @@
</group>
<separator string="" colspan="4"/>
<group colspan="4" col="11">
- <field name="state" readonly="True"/>
+ <field name="state" readonly="True" widget="statusbar" statusbar_visible="todo,done" statusbar_colors="{'exception':'red'}"/>
<button string="Cancel" states="todo,exception" name="button_cancel" type="object" icon="terp-gtk-stop"/>
<button string="Reset" states="exception,cancelled" name="button_draft" type="object" icon="gtk-undo"/>
<button string="Process" states="todo" name="process" type="object" icon="terp-gtk-go-back-rtl"/>
=== modified file 'purchase_requisition/purchase_requisition.py'
--- purchase_requisition/purchase_requisition.py 2011-05-02 18:46:43 +0000
+++ purchase_requisition/purchase_requisition.py 2011-09-15 10:41:45 +0000
@@ -41,7 +41,7 @@
'purchase_ids' : fields.one2many('purchase.order','requisition_id','Purchase Orders',states={'done': [('readonly', True)]}),
'line_ids' : fields.one2many('purchase.requisition.line','requisition_id','Products to Purchase',states={'done': [('readonly', True)]}),
'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse'),
- 'state': fields.selection([('draft','Draft'),('in_progress','In Progress'),('cancel','Cancelled'),('done','Done')], 'State', required=True)
+ 'state': fields.selection([('draft','New'),('in_progress','In Progress'),('cancel','Cancelled'),('done','Done')], 'State', required=True)
}
_defaults = {
'date_start': time.strftime('%Y-%m-%d %H:%M:%S'),
=== modified file 'purchase_requisition/purchase_requisition_view.xml'
--- purchase_requisition/purchase_requisition_view.xml 2011-09-11 13:50:25 +0000
+++ purchase_requisition/purchase_requisition_view.xml 2011-09-15 10:41:45 +0000
@@ -60,9 +60,9 @@
</field>
<separator colspan="4"/>
<group col="8" colspan="4">
- <field name="state" select="1" readonly ="1"/>
+ <field name="state" select="1" readonly ="1" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors="{'in_progress':'Blue'}"/>
<button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
- <button name="tender_in_progress" states="draft" string="Confirm" type="object" icon="gtk-apply" />
+ <button name="tender_in_progress" states="draft" string="Start" type="object" icon="gtk-apply" />
<button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
<button name="tender_done" states="in_progress" string="Done" type="object" icon="gtk-jump-to" />
</group>
=== modified file 'stock/stock.py'
--- stock/stock.py 2011-09-13 13:45:51 +0000
+++ stock/stock.py 2011-09-15 10:41:45 +0000
@@ -622,8 +622,8 @@
'location_dest_id': fields.many2one('stock.location', 'Dest. Location',help="Location where the system will stock the finished products.", select=True),
'move_type': fields.selection([('direct', 'Partial Delivery'), ('one', 'All at once')], 'Delivery Method', required=True, help="It specifies goods to be delivered all at once or by direct delivery"),
'state': fields.selection([
- ('draft', 'Draft'),
- ('auto', 'Waiting'),
+ ('draft', 'New'),
+ ('auto', 'Waiting Another Operation'),
('confirmed', 'Waiting Availability'),
('assigned', 'Ready to Process'),
('done', 'Done'),
=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml 2011-09-11 13:50:25 +0000
+++ stock/stock_view.xml 2011-09-15 10:41:45 +0000
@@ -990,7 +990,7 @@
</form>
</field>
<group col="12" colspan="4">
- <field name="state" readonly="1"/>
+ <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors="{'auto':'Blue', 'confirmed':'Blue'}"/>
<button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
<button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
<button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
@@ -1210,7 +1210,7 @@
</form>
</field>
<group col="10" colspan="4">
- <field name="state" readonly="1"/>
+ <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors="{'auto':'Blue', 'confirmed':'Blue'}"/>
<button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
<button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
<button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
_______________________________________________
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
