Amit Bhavsar (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-usability-tooltip_onbutton-amb into
lp:~openerp-dev/openobject-addons/trunk-usability.
Requested reviews:
Raphael Collet (OpenERP) (rco-openerp)
Amit (Open ERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-tooltip_onbutton-amb/+merge/68356
Hello Sir,
As per your Suggestion , i have done all required changes in
all files.
warmly regards,
amit bhavsar(amb)
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-tooltip_onbutton-amb/+merge/68356
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-usability.
=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml 2011-07-05 06:53:36 +0000
+++ crm/crm_lead_view.xml 2011-07-19 10:27:24 +0000
@@ -309,7 +309,7 @@
<search string="Search Leads">
<filter icon="terp-check"
string="Current"
- name="current" help="Draft and Open Leads"
+ name="current" help="draft, open and pending documents"
domain="[('state','in',('draft','open'))]"/>
<filter icon="terp-camera_test"
string="Open"
=== modified file 'crm/crm_opportunity_view.xml'
--- crm/crm_opportunity_view.xml 2011-07-05 06:53:36 +0000
+++ crm/crm_opportunity_view.xml 2011-07-19 10:27:24 +0000
@@ -281,7 +281,7 @@
<field name="arch" type="xml">
<search string="Search Opportunities">
<filter icon="terp-check"
- string="Current" help="Draft and Open Opportunities"
+ string="Current" help="draft, open and pending documents"
name="current"
domain="[('state','in',('draft','open'))]"/>
<filter icon="terp-camera_test"
=== modified file 'crm/crm_phonecall_view.xml'
--- crm/crm_phonecall_view.xml 2011-05-16 12:48:54 +0000
+++ crm/crm_phonecall_view.xml 2011-07-19 10:27:24 +0000
@@ -183,7 +183,12 @@
<search string="Search Phonecalls">
<filter icon="terp-check" string="Current"
name="current"
+<<<<<<< TREE
domain="[('state','in', ('open','pending'))]"/>
+=======
+ domain="[('state','in', ('draft','open','pending'))]"
+ help="draft, open and pending documents" />
+>>>>>>> MERGE-SOURCE
<filter icon="terp-go-today" string="Today"
domain="[('date','<', time.strftime('%%Y-%%m-%%d 23:59:59')),
('date','>=',time.strftime('%%Y-%%m-%%d 00:00:00'))]"
=== modified file 'hr_contract/hr_contract_view.xml'
--- hr_contract/hr_contract_view.xml 2011-07-11 21:57:10 +0000
+++ hr_contract/hr_contract_view.xml 2011-07-19 10:27:24 +0000
@@ -39,9 +39,15 @@
<field name="arch" type="xml">
<search string="Search Contract">
<group col='15' colspan='4'>
+<<<<<<< TREE
<filter string="Current" icon="terp-check" name="current" domain="['|',('date_end','>=', time.strftime('%%Y-%%m-%%d')),('date_end','=',False)]" help="Contracts in progress"/>
<filter string="Overpassed" icon="terp-emblem-important" domain="[('date_end','<', time.strftime('%%Y-%%m-%%d'))]" help="Contracts whose end date already passed"/>
<separator orientation="vertical"/>
+=======
+ <filter string="Current" icon="terp-check" name="current" domain="['|',('date_end','>=', time.strftime('%%Y-%%m-%%d')),('date_end','=',False)]" help="Contracts in progress"/>
+ <filter string="Overpassed" icon="terp-emblem-important" domain="[('date_end','<', time.strftime('%%Y-%%m-%%d'))]" help="Contracts whose end date already passed"/>
+ <separator orientation="vertical"/>
+>>>>>>> MERGE-SOURCE
<field name="name"/>
<field name="employee_id"/>
<field name="working_hours"/>
=== modified file 'procurement/procurement_view.xml'
--- procurement/procurement_view.xml 2011-03-14 10:27:42 +0000
+++ procurement/procurement_view.xml 2011-07-19 10:27:24 +0000
@@ -101,7 +101,7 @@
<field name="arch" type="xml">
<search string="Search Procurement">
<group col='10' colspan='4'>
- <filter icon="terp-check" string="Current" domain="[('state','in',('draft','confirmed'))]" name="current" help="Procurement Orders in draft or open state."/>
+ <filter icon="terp-check" string="Current" domain="[('state','in',('draft','confirmed'))]" name="current" help="Procurement Orders in draft or open state"/>
<filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
domain="['&', ('date_planned::date','<', current_date), ('state', 'in', ('draft', 'confirmed'))]"
help="Procurement started late" />
=== modified file 'project/project_view.xml'
--- project/project_view.xml 2011-07-08 09:22:32 +0000
+++ project/project_view.xml 2011-07-19 10:27:24 +0000
@@ -397,7 +397,7 @@
<field name="arch" type="xml">
<search string="Task Edition">
<group col="20" colspan="4">
- <filter string="Current" domain="[('state','in',('open','draft'))]" name="current" help="Draft and In Progress tasks" icon="terp-check"/>
+ <filter string="Current" domain="[('state','in',('open','draft'))]" name="current" help="draft, open and pending documents" icon="terp-check"/>
<filter string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
<filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
<separator orientation="vertical"/>
=== modified file 'project_long_term/project_long_term_view.xml'
--- project_long_term/project_long_term_view.xml 2011-01-14 09:34:28 +0000
+++ project_long_term/project_long_term_view.xml 2011-07-19 10:27:24 +0000
@@ -267,7 +267,7 @@
<field name="arch" type="xml">
<search string="Project Phases">
<group colspan="4" col="20">
- <filter string="Current" domain="[('state','in',('open','draft'))]" name="current" help="Draft and In Progress Phases" icon="terp-check"/>
+ <filter string="Current" domain="[('state','in',('open','draft'))]" name="current" help="draft, open and pending documents" icon="terp-check"/>
<filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="In Progress Phases" icon="terp-camera_test"/>
<filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/>
<separator orientation="vertical"/>
=== modified file 'project_scrum/project_scrum_view.xml'
--- project_scrum/project_scrum_view.xml 2011-04-07 10:49:20 +0000
+++ project_scrum/project_scrum_view.xml 2011-07-19 10:27:24 +0000
@@ -135,7 +135,7 @@
string="Current"
name="current"
domain="['|','&',('sprint_id.date_start','<=',time.strftime('%%Y-%%m-%%d')), ('sprint_id.date_stop','>=',time.strftime('%%Y-%%m-%%d')), ('state','in',['draft','open','pending'])]"
- help="Draft, Open and Pending Backlogs"/>
+ help="Draft, Open and Pending documents"/>
<separator orientation="vertical"/>
<filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Backlogs"/>
<filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Backlogs"/>
_______________________________________________
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
