Merge lp:~openerp-dev/openobject-addons/7.0-opw-590300-rmu into lp:openobject-addons/7.0

Proposed by Ravish(OpenERP) on 2013-03-22
Status: Merged
Approved by: Naresh(OpenERP) on 2013-04-04
Approved revision: no longer in the source branch.
Merged at revision: 9210
Proposed branch: lp:~openerp-dev/openobject-addons/7.0-opw-590300-rmu
Merge into: lp:openobject-addons/7.0
Diff against target: 161 lines (+34/-11)
10 files modified
account_analytic_analysis/account_analytic_analysis_view.xml (+1/-1)
account_budget/account_budget_view.xml (+1/-1)
crm_claim/crm_claim_menu.xml (+5/-1)
document_page/document_page_view.xml (+5/-1)
fleet/fleet_view.xml (+3/-0)
hr_expense/hr_expense_view.xml (+5/-0)
procurement/procurement_view.xml (+6/-2)
project_timesheet/project_timesheet_view.xml (+2/-3)
purchase/stock_view.xml (+1/-1)
resource/resource_view.xml (+5/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/7.0-opw-590300-rmu
Reviewer Review Type Date Requested Status
Naresh(OpenERP) (community) 2013-03-22 Approve on 2013-04-04
Review via email: mp+154906@code.launchpad.net

Description of the change

Hello,

I have added arrow for all specified form views.
-claim
-time and materials to invoice
-invoice tasks
-budgets
-incoming shipment
-procurement exception
-recording rules
-working time
-expense category
-vehicles odometer
-pages

Thank you..!!

To post a comment you must log in.
review: Approve
Olivier Dony (Odoo) (odo-openerp) wrote :

Thanks for the patch. When merging I'll remove the "oe_view_nocontent_create" class from cases where the user is not supposed to create new records, even if they could technically do it, for example:
 - in the procurement exception list
 - in the "Time & Materials to Invoice" list
etc.
The text is usually quite explicit about it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'account_analytic_analysis/account_analytic_analysis_view.xml'
--- account_analytic_analysis/account_analytic_analysis_view.xml 2013-03-14 16:13:27 +0000
+++ account_analytic_analysis/account_analytic_analysis_view.xml 2013-03-22 10:30:37 +0000
@@ -252,7 +252,7 @@
252 <field name="context">{'search_default_to_invoice': 1}</field>252 <field name="context">{'search_default_to_invoice': 1}</field>
253 <field name="search_view_id" ref="account.view_account_analytic_line_filter"/>253 <field name="search_view_id" ref="account.view_account_analytic_line_filter"/>
254 <field name="help" type="html">254 <field name="help" type="html">
255 <p>255 <p class="oe_view_nocontent_create">
256 You will find here timesheets and purchases you did for256 You will find here timesheets and purchases you did for
257 contracts that can be reinvoiced to the customer. If you want257 contracts that can be reinvoiced to the customer. If you want
258 to record new activities to invoice, you should use the timesheet258 to record new activities to invoice, you should use the timesheet
259259
=== modified file 'account_budget/account_budget_view.xml'
--- account_budget/account_budget_view.xml 2013-03-12 12:33:21 +0000
+++ account_budget/account_budget_view.xml 2013-03-22 10:30:37 +0000
@@ -203,7 +203,7 @@
203 <field name="view_id" ref="crossovered_budget_view_tree"/>203 <field name="view_id" ref="crossovered_budget_view_tree"/>
204 <field name="search_view_id" ref="view_crossovered_budget_search"/>204 <field name="search_view_id" ref="view_crossovered_budget_search"/>
205 <field name="help" type="html">205 <field name="help" type="html">
206 <p>206 <p class="oe_view_nocontent_create">
207 A budget is a forecast of your company's income and/or expenses207 A budget is a forecast of your company's income and/or expenses
208 expected for a period in the future. A budget is defined on some208 expected for a period in the future. A budget is defined on some
209 financial accounts and/or analytic accounts (that may represent209 financial accounts and/or analytic accounts (that may represent
210210
=== modified file 'crm_claim/crm_claim_menu.xml'
--- crm_claim/crm_claim_menu.xml 2012-11-29 22:26:45 +0000
+++ crm_claim/crm_claim_menu.xml 2013-03-22 10:30:37 +0000
@@ -15,7 +15,11 @@
15 <field name="view_id" ref="crm_case_claims_tree_view"/>15 <field name="view_id" ref="crm_case_claims_tree_view"/>
16 <field name="context">{"search_default_user_id":uid, "stage_type":'claim'}</field>16 <field name="context">{"search_default_user_id":uid, "stage_type":'claim'}</field>
17 <field name="search_view_id" ref="crm_claim.view_crm_case_claims_filter"/>17 <field name="search_view_id" ref="crm_claim.view_crm_case_claims_filter"/>
18 <field name="help">Record and track your customers' claims. Claims may be linked to a sales order or a lot. You can send emails with attachments and keep the full history for a claim (emails sent, intervention type and so on). Claims may automatically be linked to an email address using the mail gateway module.</field>18 <field name="help" type="html">
19 <p class="oe_view_nocontent_create">
20 Record and track your customers' claims. Claims may be linked to a sales order or a lot.You can send emails with attachments and keep the full history for a claim (emails sent, intervention type and so on).Claims may automatically be linked to an email address using the mail gateway module.
21 </p>
22 </field>
19 </record>23 </record>
2024
21 <record model="ir.actions.act_window.view" id="action_crm_tag_tree_claim0">25 <record model="ir.actions.act_window.view" id="action_crm_tag_tree_claim0">
2226
=== modified file 'document_page/document_page_view.xml'
--- document_page/document_page_view.xml 2013-01-08 10:54:10 +0000
+++ document_page/document_page_view.xml 2013-03-22 10:30:37 +0000
@@ -87,7 +87,11 @@
87 <field name="view_mode">tree,form</field>87 <field name="view_mode">tree,form</field>
88 <field name="view_id" ref="view_wiki_tree"/>88 <field name="view_id" ref="view_wiki_tree"/>
89 <field name="search_view_id" ref="view_wiki_filter"/>89 <field name="search_view_id" ref="view_wiki_filter"/>
90 <field name="help">Create web pages</field>90 <field name="help" type="html">
91 <p class="oe_view_nocontent_create">
92 Create web pages
93 </p>
94 </field>
91 </record>95 </record>
92 <menuitem id="menu_page" parent="menu_wiki" name="Pages" action="action_page" sequence="10"/>96 <menuitem id="menu_page" parent="menu_wiki" name="Pages" action="action_page" sequence="10"/>
93 <record id="action_category" model="ir.actions.act_window">97 <record id="action_category" model="ir.actions.act_window">
9498
=== modified file 'fleet/fleet_view.xml'
--- fleet/fleet_view.xml 2012-12-11 10:06:08 +0000
+++ fleet/fleet_view.xml 2013-03-22 10:30:37 +0000
@@ -591,6 +591,9 @@
591 <field name="view_mode">tree,graph</field>591 <field name="view_mode">tree,graph</field>
592 <field name="context">{"search_default_groupby_vehicle" : True}</field>592 <field name="context">{"search_default_groupby_vehicle" : True}</field>
593 <field name="help" type="html">593 <field name="help" type="html">
594 <p class="oe_view_nocontent_create">
595 Click to create a new odometer log.
596 </p>
594 <p>597 <p>
595 Here you can add various odometer entries for all vehicles.598 Here you can add various odometer entries for all vehicles.
596 You can also show odometer value for a particular vehicle using599 You can also show odometer value for a particular vehicle using
597600
=== modified file 'hr_expense/hr_expense_view.xml'
--- hr_expense/hr_expense_view.xml 2013-03-13 14:37:26 +0000
+++ hr_expense/hr_expense_view.xml 2013-03-22 10:30:37 +0000
@@ -211,6 +211,11 @@
211 <field name="context">{"default_hr_expense_ok":1}</field>211 <field name="context">{"default_hr_expense_ok":1}</field>
212 <field name="domain">[('hr_expense_ok','=',True)]</field>212 <field name="domain">[('hr_expense_ok','=',True)]</field>
213 <field name="search_view_id" ref="product.product_search_form_view"/>213 <field name="search_view_id" ref="product.product_search_form_view"/>
214 <field name="help" type="html">
215 <p class="oe_view_nocontent_create">
216 Click to create a new expenses category for expenses.
217 </p>
218 </field>
214 </record>219 </record>
215220
216 <menuitem id="menu_hr_product" name="Expense Categories" parent="hr.menu_hr_configuration" action="hr_expense_product"/>221 <menuitem id="menu_hr_product" name="Expense Categories" parent="hr.menu_hr_configuration" action="hr_expense_product"/>
217222
=== modified file 'procurement/procurement_view.xml'
--- procurement/procurement_view.xml 2013-02-25 13:38:04 +0000
+++ procurement/procurement_view.xml 2013-03-22 10:30:37 +0000
@@ -159,7 +159,7 @@
159 <field name="context">{'search_default_perm_exceptions':1}</field>159 <field name="context">{'search_default_perm_exceptions':1}</field>
160 <field name="search_view_id" ref="view_procurement_filter"/>160 <field name="search_view_id" ref="view_procurement_filter"/>
161 <field name="help" type="html">161 <field name="help" type="html">
162 <p>162 <p class="oe_view_nocontent_create">
163 Procurement Orders represent the need for a certain quantity of products, at a given time, in a given location. Sales Orders are one typical source of Procurement Orders (but these are distinct documents). Depending on the procurement parameters and the product configuration, the procurement engine will attempt to satisfy the need by reserving products from stock, ordering products from a supplier, or passing a manufacturing order, etc. A Procurement Exception occurs when the system cannot find a way to fulfill a procurement. Some exceptions will resolve themselves automatically, but others require manual intervention (those are identified by a specific error message).163 Procurement Orders represent the need for a certain quantity of products, at a given time, in a given location. Sales Orders are one typical source of Procurement Orders (but these are distinct documents). Depending on the procurement parameters and the product configuration, the procurement engine will attempt to satisfy the need by reserving products from stock, ordering products from a supplier, or passing a manufacturing order, etc. A Procurement Exception occurs when the system cannot find a way to fulfill a procurement. Some exceptions will resolve themselves automatically, but others require manual intervention (those are identified by a specific error message).
164 </p>164 </p>
165 </field>165 </field>
@@ -253,7 +253,11 @@
253 <field name="view_type">form</field>253 <field name="view_type">form</field>
254 <field name="view_id" ref="view_warehouse_orderpoint_tree"/>254 <field name="view_id" ref="view_warehouse_orderpoint_tree"/>
255 <field name="search_view_id" ref="warehouse_orderpoint_search" />255 <field name="search_view_id" ref="warehouse_orderpoint_search" />
256 <field name="help">You can define your minimum stock rules, so that OpenERP will automatically create draft manufacturing orders or purchase quotations according to the stock level. Once the virtual stock of a product (= stock on hand minus all confirmed orders and reservations) is below the minimum quantity, OpenERP will generate a procurement request to increase the stock up to the maximum quantity.</field>256 <field name="help" type="html">
257 <p class="oe_view_nocontent_create">
258 You can define your minimum stock rules, so that OpenERP will automatically create draft manufacturing orders or purchase quotations according to the stock level.Once the virtual stock of a product (= stock on hand minus all confirmed orders and reservations) is below the minimum quantity, OpenERP will generate a procurement request to increase the stock up to the maximum quantity.
259 </p>
260 </field>
257 </record>261 </record>
258262
259 <act_window263 <act_window
260264
=== modified file 'project_timesheet/project_timesheet_view.xml'
--- project_timesheet/project_timesheet_view.xml 2012-12-19 06:51:00 +0000
+++ project_timesheet/project_timesheet_view.xml 2013-03-22 10:30:37 +0000
@@ -86,9 +86,8 @@
86 <field name="context">{'search_default_to_invoice': 1}</field>86 <field name="context">{'search_default_to_invoice': 1}</field>
87 <field name="view_id" ref="view_account_analytic_line_tree_inherit_account_id"/>87 <field name="view_id" ref="view_account_analytic_line_tree_inherit_account_id"/>
88 <field name="help" type="html">88 <field name="help" type="html">
89 <p>89 <p class="oe_view_nocontent_create">
90 You will find here timesheets and purchases you did for contracts that can be reinvoiced to the customer.90 You will find here timesheets and purchases you did for contracts that can be reinvoiced to the customer.If you want to record new jobs to invoice, you should use the timesheet menu instead.
91 If you want to record new jobs to invoice, you should use the timesheet menu instead.
92 </p>91 </p>
93 </field>92 </field>
94 </record>93 </record>
9594
=== modified file 'purchase/stock_view.xml'
--- purchase/stock_view.xml 2012-11-29 22:26:45 +0000
+++ purchase/stock_view.xml 2013-03-22 10:30:37 +0000
@@ -65,7 +65,7 @@
65 <field name="context">{"default_type": "in", "contact_display": "partner_address", "search_default_done": 1, "search_default_to_invoice": 1}</field>65 <field name="context">{"default_type": "in", "contact_display": "partner_address", "search_default_done": 1, "search_default_to_invoice": 1}</field>
66 <field name="search_view_id" ref="stock.view_picking_in_search"/>66 <field name="search_view_id" ref="stock.view_picking_in_search"/>
67 <field name="help" type="html">67 <field name="help" type="html">
68 <p>68 <p class="oe_view_nocontent_create">
69 Here you can track all the product receptions of purchase69 Here you can track all the product receptions of purchase
70 orders where the invoicing is "Based on Incoming Shipments",70 orders where the invoicing is "Based on Incoming Shipments",
71 and for which you have not received a supplier invoice yet.71 and for which you have not received a supplier invoice yet.
7272
=== modified file 'resource/resource_view.xml'
--- resource/resource_view.xml 2012-12-21 16:48:08 +0000
+++ resource/resource_view.xml 2013-03-22 10:30:37 +0000
@@ -90,7 +90,11 @@
90 <field name="view_mode">tree,form</field>90 <field name="view_mode">tree,form</field>
91 <field name="view_id" eval="False"/>91 <field name="view_id" eval="False"/>
92 <field name="search_view_id" ref="view_resource_calendar_search"/>92 <field name="search_view_id" ref="view_resource_calendar_search"/>
93 <field name="help">Define working hours and time table that could be scheduled to your project members</field>93 <field name="help" type="html">
94 <p class="oe_view_nocontent_create">
95 Define working hours and time table that could be scheduled to your project members
96 </p>
97 </field>
94 </record>98 </record>
9599
96 <record id="view_resource_calendar_attendance_tree" model="ir.ui.view">100 <record id="view_resource_calendar_attendance_tree" model="ir.ui.view">