odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

fix 

bzr revid: fp@tinyerp.com-20100928224926-pqpnmqniv3y00fgl
This commit is contained in:
Fabien Pinckaers 2010-09-29 00:49:26 +02:00
parent 6b5e144332
commit 75e21167db
6 changed files with 51 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/crm/crm_lead_menu.xml
View File

@ -10,7 +10,7 @@
<field name="view_id" ref="crm_case_tree_view_leads"/>
<field name="context">{"search_default_user_id":uid,'search_default_current':1}</field>
<field name="search_view_id" ref="crm.view_crm_case_leads_filter"/>
<field name="context">{'search_default_current':1, 'default_type': 'lead'}</field>
<field name="context">{'search_default_current':1, 'default_type': 'lead', 'search_default_section_id':section_id}</field>
<field name="help">A lead is a first, unqualified, contact with a new prospect. Use leads when you import a database of prospects or integrate your website's contact form with OpenERP. After having been qualified, the lead can be converted to a partner and a business opportunity for a further detailed tracking of the related activities.</field>
</record>

2
addons/crm/crm_opportunity_menu.xml
View File

@ -28,7 +28,7 @@
<field name="res_model">crm.lead</field>
<field name="view_mode">tree,form,graph,calendar</field>
<field name="domain">[('type','=','opportunity')]</field>
<field name="context">{'search_default_user_id':uid,'search_default_current':1, 'default_type': 'opportunity'}</field>
<field name="context">{'search_default_user_id':uid,'search_default_current':1, 'search_default_section_id':section_id,'default_type': 'opportunity'}</field>
<field name="view_id" ref="crm_case_tree_view_oppor"/>
<field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
<field name="help">Opportunities allows you to track your best deals pipeline: history of

4
addons/crm/crm_phonecall_menu.xml
View File

@ -32,7 +32,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,calendar</field>
<field name="view_id" ref="crm_case_phone_tree_view"/>
<field name="context">{"search_default_user_id":uid}</field>
<field name="context">{"search_default_user_id":uid, 'search_default_section_id':section_id}</field>
<field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
</record>
@ -106,7 +106,7 @@
<field name="view_mode">tree,calendar</field>
<field name="view_id" ref="crm_case_phone_tree_view"/>
<field name="domain" eval="'[(\'categ_id\',\'=\','+str(ref('categ_phone2'))+')]'"/>
<field name="context" eval="'{\'default_state\':\'open\', \'search_default_current\':1, \'default_categ_id\': ' + str(ref('categ_phone2')) +'}'"/>
<field name="context" eval="'{\'search_default_section_id\':section_id, \'default_state\':\'open\', \'search_default_current\':1, \'default_categ_id\': ' + str(ref('categ_phone2')) +'}'"/>
<field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
<field name="help">The Outbound menu open a search view in editable mode, so you can easily modify or plan a new call. Actions buttons allows you to to make you call status evolved for a better follow up of your planned calls. During calls, convert your lead into an opportunity, plan a meeting or canceled it.</field>
</record>

5
addons/hr_attendance/hr_attendance_view.xml
View File

@ -78,7 +78,10 @@
</record>
<menuitem id="menu_hr_time_tracking" name="Time Tracking" parent="hr.menu_hr_root" sequence="3"/>
<menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_time_tracking" groups="base.group_hr_manager,base.group_hr_user,base.group_hr_attendance,base.group_system,base.group_user" sequence="3"/>
<menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root" sequence="4"/>
<menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_attendance" groups="base.group_hr_user" sequence="3"/>
<record id="edit_attendance_reason" model="ir.ui.view">
<field name="name">hr.action.reason.form</field>

2
addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
View File

@ -47,7 +47,7 @@
</record>
<menuitem action="action_hr_attendance_sigh_in_out" id="menu_hr_attendance_sigh_in_out"
parent="menu_hr_time_tracking" sequence="4" groups="base.group_hr_manager,base.group_hr_user,base.group_hr_attendance"/>
parent="menu_hr_attendance" sequence="4" groups="base.group_hr_manager,base.group_hr_user,base.group_hr_attendance"/>
<record id="view_hr_attendance_so_ask" model="ir.ui.view">
<field name="name">hr.sign.in.out.ask.form</field>

84
addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
View File

@ -1,47 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="view_hr_timesheet_sign_in_message" model="ir.ui.view">
<record id="view_hr_timesheet_sign_in_message" model="ir.ui.view">
<field name="name">hr.sign.in.project.message.form</field>
<field name="model">hr.sign.in.project</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Sign In/Out By Project">
<group colspan="4" >
<separator string="This Wizard will make Sign In/Out By Project" colspan="4"/>
</group>
<group colspan="4" >
<separator string="This Wizard will make Sign In/Out By Project" colspan="4"/>
</group>
<group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-ok" string="Sign in / Sign out" name="check_state" type="object"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-ok" string="Sign in / Sign out" name="check_state" type="object"/>
</group>
</form>
</field>
</record>
<record id="view_hr_timesheet_sign_in" model="ir.ui.view">
<record id="view_hr_timesheet_sign_in" model="ir.ui.view">
<field name="name">hr.sign.in.project.form</field>
<field name="model">hr.sign.in.project</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Sign In/Out By Project">
<group colspan="4" >
<separator string="Sign in" colspan="4"/>
<field name="name" readonly="True" />
<field name="state" readonly="True" />
<field name="server_date"/>
<label string="(local time on the server side)" colspan="2"/>
<field name="date"/>
<label string="(Keep empty for current time)" colspan="2"/>
</group>
<group colspan="4" >
<separator string="Sign in" colspan="4"/>
<field name="name" readonly="True" />
<field name="state" readonly="True" />
<field name="server_date"/>
<label string="(local time on the server side)" colspan="2"/>
<field name="date"/>
<label string="(Keep empty for current time)" colspan="2"/>
</group>
<group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-ok" string="Start Working" name="sign_in_result" type="object"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-ok" string="Start Working" name="sign_in_result" type="object"/>
</group>
</form>
</field>
</record>
<record id="action_hr_timesheet_sign_in" model="ir.actions.act_window">
<record id="action_hr_timesheet_sign_in" model="ir.actions.act_window">
<field name="name">Sign in / Sign out by project</field>
<field name="res_model">hr.sign.in.project</field>
<field name="view_type">form</field>
@ -52,41 +52,41 @@
</record>
<menuitem action="action_hr_timesheet_sign_in"
id="menu_hr_timesheet_sign_in"
groups="base.group_extended"
parent="hr_attendance.menu_hr_time_tracking"
sequence="5" />
id="menu_hr_timesheet_sign_in"
groups="base.group_extended"
parent="hr_attendance.menu_hr_attendance"
sequence="5" />
<record id="view_hr_timesheet_sign_out" model="ir.ui.view">
<record id="view_hr_timesheet_sign_out" model="ir.ui.view">
<field name="name">hr.sign.out.project.form</field>
<field name="model">hr.sign.out.project</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Sign In/Out By Project">
<group colspan="4" >
<separator string="General Information" colspan="4" />
<field name="name" readonly="True" />
<field name="state" readonly="True" />
<field name="date_start"/>
<field name="server_date"/>
<separator string="Work done in the last period" colspan="4" />
<field name="account_id" colspan="2"/>
<field name="info" colspan="2"/>
<field name="date"/>
<label string="(Keep empty for current_time)" colspan="2"/>
<field name="analytic_amount"/>
</group>
<separator string="" colspan="4" />
<group colspan="4" >
<separator string="General Information" colspan="4" />
<field name="name" readonly="True" />
<field name="state" readonly="True" />
<field name="date_start"/>
<field name="server_date"/>
<separator string="Work done in the last period" colspan="4" />
<field name="account_id" colspan="2"/>
<field name="info" colspan="2"/>
<field name="date"/>
<label string="(Keep empty for current_time)" colspan="2"/>
<field name="analytic_amount"/>
</group>
<separator string="" colspan="4" />
<group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-ok" string="Change Work" name="sign_out_result" type="object"/>
<button icon="gtk-ok" string="Stop Working" name="sign_out_result_end" type="object"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-ok" string="Change Work" name="sign_out_result" type="object"/>
<button icon="gtk-ok" string="Stop Working" name="sign_out_result_end" type="object"/>
</group>
</form>
</field>
</record>
<record id="action_hr_timesheet_sign_out" model="ir.actions.act_window">
<record id="action_hr_timesheet_sign_out" model="ir.actions.act_window">
<field name="name">Sign in / Sign out by project</field>
<field name="res_model">hr.sign.out.project</field>
<field name="view_type">form</field>