[MERGE] merge wiht MMA branch to get all his changes in project branch
bzr revid: psi@tinyerp.com-20120604125117-q6xge3w03gzyh99l
This commit is contained in:
Purnendu Singh (OpenERP)
@@ -66,7 +66,7 @@
|
||||
<field name="res_model">crm.lead</field>
|
||||
<field name="view_mode">kanban,tree,form,graph,calendar</field>
|
||||
<field name="domain">[('type','=','opportunity')]</field>
|
||||
<field name="context">{'search_default_new':1, 'search_default_open':1, 'stage_type': 'opportunity', 'default_type': 'opportunity'}</field>
|
||||
<field name="context">{'stage_type': 'opportunity', 'default_type': 'opportunity'}</field>
|
||||
<field name="view_id" eval="False"/>
|
||||
<field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
|
||||
<field name="help">With opportunities you can manage and keep track of your sales pipeline by creating specific customer- or prospect-related sales documents to follow up potential sales. Information such as expected revenue, opportunity stage, expected closing date, communication history and much more can be stored. Opportunities can be connected to the email gateway: new emails may create opportunities, each of them automatically gets the history of the conversation with the customer.
|
||||
|
||||
@@ -544,15 +544,12 @@
|
||||
<search string="Search Opportunities">
|
||||
<filter icon="terp-check"
|
||||
string="New" help="New Opportunities"
|
||||
name="new"
|
||||
domain="[('state','=','draft')]"/>
|
||||
<filter icon="terp-camera_test"
|
||||
string="Open" help="Open Opportunities"
|
||||
name="open"
|
||||
domain="[('state','=','open')]"/>
|
||||
<filter icon="terp-gtk-media-pause"
|
||||
string="Pending" help="Pending Opportunities"
|
||||
name="pending"
|
||||
domain="[('state','=','pending')]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="name" string="Opportunity / Customer"
|
||||
@@ -563,6 +560,8 @@
|
||||
domain="[('user_id','=', False)]"
|
||||
help="Unassigned Opportunities" />
|
||||
</field>
|
||||
<field name="country"/>
|
||||
<field name="partner_id"/>
|
||||
<field name="section_id"
|
||||
context="{'invisible_section': False, 'default_section_id': self}">
|
||||
<filter string="My Sales Team(s)" icon="terp-personal+"
|
||||
|
||||
@@ -39,6 +39,9 @@
|
||||
<field name="category_id" position="after">
|
||||
<field name="section_id" completion="1" widget="selection"/>
|
||||
</field>
|
||||
<xpath expr="//filter[@string='Company']" position="after">
|
||||
<field name="country_id"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
@@ -108,7 +108,7 @@
|
||||
<field name="department_id" widget="selection">
|
||||
</field>
|
||||
<field name="job_id" widget="selection"/>
|
||||
<field name="category_ids" select="1"/>
|
||||
<field name="category_ids"/>
|
||||
<field name="parent_id"/>
|
||||
<newline />
|
||||
<group expand="0" string="Group By...">
|
||||
|
||||
@@ -654,7 +654,7 @@
|
||||
<search string="Search Salary Rule">
|
||||
<group col="8" colspan="4">
|
||||
<field name="name"/>
|
||||
<field name="code" select="1"/>
|
||||
<field name="code"/>
|
||||
<field name="category_id"/>
|
||||
<field name="condition_range_min"/>
|
||||
</group>
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
<field name="res_model">hr.applicant</field>
|
||||
<field name="view_mode">kanban,tree,form,graph,calendar</field>
|
||||
<field name="view_id" eval="False"/>
|
||||
<field name="context">{'search_default_filter_inprogress':1,'search_default_filter_new':1}</field>
|
||||
<field name="search_view_id" ref="view_crm_case_jobs_filter"/>
|
||||
<field name="help">From this menu you can track applicants in the recruitment process and manage all operations: meetings, interviews, phone calls, etc. If you setup the email gateway, applicants and their attached CV are created automatically when an email is sent to jobs@yourcompany.com. If you install the document management modules, all documents (CV and motivation letters) are indexed automatically, so that you can easily search through their content.</field>
|
||||
</record>
|
||||
|
||||
@@ -181,11 +181,11 @@
|
||||
<field name="type">search</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Search Jobs">
|
||||
<filter icon="terp-document-new" string="New" name="filter_new"
|
||||
<filter icon="terp-document-new" string="New"
|
||||
domain="[('state','=','draft')]"
|
||||
help="All Initial Jobs"
|
||||
/>
|
||||
<filter icon="terp-camera_test" string="In Progress" name="filter_inprogress"
|
||||
<filter icon="terp-camera_test" string="In Progress"
|
||||
domain="[('state','=','open')]"
|
||||
help="Open Jobs"
|
||||
/>
|
||||
|
||||
@@ -253,7 +253,7 @@
|
||||
<field name="inherit_id" ref="hr_attendance.view_hr_attendance_filter" />
|
||||
<field name="arch" type="xml">
|
||||
<field name="action" position="after">
|
||||
<field name="sheet_id" select="1" />
|
||||
<field name="sheet_id"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
<field name="view_mode">kanban,tree,calendar</field>
|
||||
<field name="view_id" eval="False"/>
|
||||
<field name="domain" eval=""/>
|
||||
<field name="context">{"search_default_user_id": uid, "search_default_draft": 1,"search_default_todo": 1}</field>
|
||||
<field name="search_view_id" ref="view_project_issue_filter"/>
|
||||
<field name="help">Issues such as system bugs, customer complaints, and material breakdowns are collected here. You can define the stages assigned when solving the project issue (analysis, development, done). With the mailgateway module, issues can be integrated through an email address (example: support@mycompany.com)</field>
|
||||
</record>
|
||||
|
||||
@@ -164,8 +164,8 @@
|
||||
<field name="arch" type="xml">
|
||||
<search string="Issue Tracker Search">
|
||||
<group>
|
||||
<filter string="New" icon="terp-document-new" name="draft" domain="[('state','=','draft')]" help="New Issues"/>
|
||||
<filter string="To Do" name="todo" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
|
||||
<filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help="New Issues"/>
|
||||
<filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
|
||||
<filter string="Pending" domain="[('state','=','pending')]" help="Pending Issues" icon="terp-gtk-media-pause"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="name" string="Issue / Partner" filter_domain="['|', '|', ('partner_id','ilike',self), ('email_from','ilike',self), ('name','ilike',self)]"/>
|
||||
|
||||
@@ -69,7 +69,7 @@
|
||||
<separator orientation="vertical" />
|
||||
|
||||
<field name="project_id"/>
|
||||
<field name="user_id" select="1" widget="selection" filter_domain="[('user_id','ilike',self)]"/>
|
||||
<field name="user_id" widget="selection" filter_domain="[('user_id','ilike',self)]"/>
|
||||
<field name="partner_id"/>
|
||||
<field name="version_id" widget="selection" />
|
||||
<field name="creation_date"/>
|
||||
|
||||
@@ -324,7 +324,7 @@
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">purchase.order</field>
|
||||
<field name="view_mode">tree,form,graph,calendar</field>
|
||||
<field name="context">{'search_default_approved': 1,'search_default_create_uid':uid}</field>
|
||||
<field name="context">{'search_default_approved': 1}</field>
|
||||
<field name="search_view_id" ref="view_purchase_order_filter"/>
|
||||
<field name="help">Use this menu to search within your purchase orders by references, supplier, products, etc. For each purchase order, you can track the products received, and control the supplier invoices.</field>
|
||||
</record>
|
||||
|
||||
Reference in New Issue
Block a user