Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp/openobject-addons/web-dashboard-addons into lp:openobject-addons

  1. web-dashboard-addons
  2. Merge into trunk
Proposed by Vaibhav Darji
Status: Rejected
Rejected by: qdp (OpenERP)
Proposed branch: lp:~openerp/openobject-addons/web-dashboard-addons
Merge into: lp:openobject-addons
Diff against target: 234 lines (+28/-13)
12 files modified
account/account_menuitem.xml (+2/-1)
auction/auction_view.xml (+2/-1)
event/event_view.xml (+4/-2)
hr/hr_view.xml (+2/-1)
knowledge/knowledge_view.xml (+3/-1)
mrp/mrp_view.xml (+2/-1)
point_of_sale/point_of_sale_view.xml (+2/-1)
project/project_view.xml (+2/-1)
purchase/purchase_view.xml (+2/-1)
sale/sale_view.xml (+2/-1)
stock/stock_view.xml (+3/-1)
survey/survey_view.xml (+2/-1)
To merge this branch: bzr merge lp:~openerp/openobject-addons/web-dashboard-addons
Reviewer Review Type Date Requested Status
qdp (OpenERP) Disapprove
Review via email: mp+41576@code.launchpad.net

Description of the change

Added Web dashboard icons.

To post a comment you must log in.
Revision history for this message
qdp (OpenERP) (qdp) wrote :

as discussed with vaibhav, it's already in the addons branch. so this branch is deprectated.

review: Disapprove

Unmerged revisions

3951. By Vaibhav Darji

[ADD] Web Dashboard icons.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/account_menuitem.xml'
2--- account/account_menuitem.xml 2010-11-19 06:46:03 +0000
3+++ account/account_menuitem.xml 2010-11-23 11:47:55 +0000
4@@ -3,7 +3,8 @@
5 <data>
6
7 <menuitem icon="terp-account" id="menu_finance" name="Accounting" sequence="13"
8- groups="group_account_user,group_account_manager,group_account_invoice"/>
9+ groups="group_account_user,group_account_manager,group_account_invoice"
10+ web_icon="image/accounting.png" web_icon_hover="image/accounting_hover.png"/>
11 <menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="1"/>
12 <menuitem id="menu_finance_payables" name="Suppliers" parent="menu_finance" sequence="2"/>
13 <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="3"
14
15=== added directory 'account/image'
16=== added file 'account/image/accounting.png'
17Binary files account/image/accounting.png 1970-01-01 00:00:00 +0000 and account/image/accounting.png 2010-11-23 11:47:55 +0000 differ
18=== added file 'account/image/accounting_hover.png'
19Binary files account/image/accounting_hover.png 1970-01-01 00:00:00 +0000 and account/image/accounting_hover.png 2010-11-23 11:47:55 +0000 differ
20=== modified file 'auction/auction_view.xml'
21--- auction/auction_view.xml 2010-11-04 11:47:48 +0000
22+++ auction/auction_view.xml 2010-11-23 11:47:55 +0000
23@@ -2,7 +2,8 @@
24 <openerp>
25 <data>
26 <menuitem name="Auction" id="auction_menu_root" icon="terp-purchase" sequence="26"
27- groups="group_auction_manager,group_auction_user"/>
28+ groups="group_auction_manager,group_auction_user"
29+ web_icon="image/auction.jpg" web_icon_hover="image/auction_hover.jpg"/>
30 <menuitem name="Configuration" parent="auction_menu_root" id="auction_config_menu" sequence="7" groups="group_auction_manager"/>
31 <menuitem name="Tools Bar Codes" id="auction_outils_menu" parent="auction_menu_root" sequence="5" />
32 <menuitem name="Deliveries Management" action="action_auction_taken" id="menu_wizard_emporte" parent="auction_outils_menu"/>
33
34=== added directory 'auction/image'
35=== added file 'auction/image/auction.jpg'
36Binary files auction/image/auction.jpg 1970-01-01 00:00:00 +0000 and auction/image/auction.jpg 2010-11-23 11:47:55 +0000 differ
37=== added file 'auction/image/auction_hover.jpg'
38Binary files auction/image/auction_hover.jpg 1970-01-01 00:00:00 +0000 and auction/image/auction_hover.jpg 2010-11-23 11:47:55 +0000 differ
39=== modified file 'event/event_view.xml'
40--- event/event_view.xml 2010-10-20 09:54:36 +0000
41+++ event/event_view.xml 2010-11-23 11:47:55 +0000
42@@ -2,8 +2,10 @@
43 <openerp>
44 <data>
45
46- <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
47- <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17"/>
48+ <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"
49+ web_icon="image/association.png" web_icon_hover="image/association_hover.png"/>
50+ <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17"
51+ web_icon="image/marketing.png" web_icon_hover="image/marketing_hover.png"/>
52
53 <menuitem name="Events Organisation" id="base.menu_event_main" parent="base.marketing_menu" />
54 <menuitem name="Events Organisation" id="base.menu_event_association" parent="base.menu_association" />
55
56=== added directory 'event/image'
57=== added file 'event/image/association.png'
58Binary files event/image/association.png 1970-01-01 00:00:00 +0000 and event/image/association.png 2010-11-23 11:47:55 +0000 differ
59=== added file 'event/image/association_hover.png'
60Binary files event/image/association_hover.png 1970-01-01 00:00:00 +0000 and event/image/association_hover.png 2010-11-23 11:47:55 +0000 differ
61=== added file 'event/image/marketing.png'
62Binary files event/image/marketing.png 1970-01-01 00:00:00 +0000 and event/image/marketing.png 2010-11-23 11:47:55 +0000 differ
63=== added file 'event/image/marketing_hover.png'
64Binary files event/image/marketing_hover.png 1970-01-01 00:00:00 +0000 and event/image/marketing_hover.png 2010-11-23 11:47:55 +0000 differ
65=== modified file 'hr/hr_view.xml'
66--- hr/hr_view.xml 2010-11-12 06:23:46 +0000
67+++ hr/hr_view.xml 2010-11-23 11:47:55 +0000
68@@ -3,7 +3,8 @@
69 <data>
70
71 <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"
72- groups="base.group_hr_manager,base.group_hr_user"/>
73+ groups="base.group_hr_manager,base.group_hr_user"
74+ web_icon="image/hr.png" web_icon_hover="image/hr_hover.png"/>
75 <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0" groups="base.group_hr_manager"/>
76 <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
77 <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="1"/>
78
79=== added file 'hr/image/hr.png'
80Binary files hr/image/hr.png 1970-01-01 00:00:00 +0000 and hr/image/hr.png 2010-11-23 11:47:55 +0000 differ
81=== added file 'hr/image/hr_hover.png'
82Binary files hr/image/hr_hover.png 1970-01-01 00:00:00 +0000 and hr/image/hr_hover.png 2010-11-23 11:47:55 +0000 differ
83=== added directory 'knowledge/image'
84=== added file 'knowledge/image/knowledge.png'
85Binary files knowledge/image/knowledge.png 1970-01-01 00:00:00 +0000 and knowledge/image/knowledge.png 2010-11-23 11:47:55 +0000 differ
86=== added file 'knowledge/image/knowledge_hover.png'
87Binary files knowledge/image/knowledge_hover.png 1970-01-01 00:00:00 +0000 and knowledge/image/knowledge_hover.png 2010-11-23 11:47:55 +0000 differ
88=== modified file 'knowledge/knowledge_view.xml'
89--- knowledge/knowledge_view.xml 2010-08-10 13:45:29 +0000
90+++ knowledge/knowledge_view.xml 2010-11-23 11:47:55 +0000
91@@ -1,6 +1,8 @@
92 <openerp>
93 <data>
94- <menuitem name="Knowledge" icon="terp-stock" id="knowledge.menu_document" sequence="19" groups="base.group_system,base.group_document_user"/>
95+ <menuitem name="Knowledge" icon="terp-stock" id="knowledge.menu_document" sequence="19"
96+ groups="base.group_system,base.group_document_user"
97+ web_icon="image/knowledge.png" web_icon_hover="image/knowledge_hover.png"/>
98 <menuitem name="Configuration" id="knowledge.menu_document_configuration" parent="knowledge.menu_document" sequence="50"/>
99
100 <menuitem id="knowledge.menu_document2" name="Collaborative Content"
101
102=== added directory 'mrp/image'
103=== added file 'mrp/image/manufacturing.png'
104Binary files mrp/image/manufacturing.png 1970-01-01 00:00:00 +0000 and mrp/image/manufacturing.png 2010-11-23 11:47:55 +0000 differ
105=== added file 'mrp/image/manufacturing_hover.png'
106Binary files mrp/image/manufacturing_hover.png 1970-01-01 00:00:00 +0000 and mrp/image/manufacturing_hover.png 2010-11-23 11:47:55 +0000 differ
107=== modified file 'mrp/mrp_view.xml'
108--- mrp/mrp_view.xml 2010-10-26 06:08:44 +0000
109+++ mrp/mrp_view.xml 2010-11-23 11:47:55 +0000
110@@ -3,7 +3,8 @@
111 <data>
112
113 <menuitem icon="terp-mrp" id="base.menu_mrp_root" parent="" name="Manufacturing"
114- groups="group_mrp_user,group_mrp_manager" sequence="8"/>
115+ groups="group_mrp_user,group_mrp_manager" sequence="8"
116+ web_icon="image/manufacturing.png" web_icon_hover="image/manufacturing_hover.png"/>
117
118 <menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
119
120
121=== added directory 'point_of_sale/image'
122=== added file 'point_of_sale/image/pos.png'
123Binary files point_of_sale/image/pos.png 1970-01-01 00:00:00 +0000 and point_of_sale/image/pos.png 2010-11-23 11:47:55 +0000 differ
124=== added file 'point_of_sale/image/pos_hover.png'
125Binary files point_of_sale/image/pos_hover.png 1970-01-01 00:00:00 +0000 and point_of_sale/image/pos_hover.png 2010-11-23 11:47:55 +0000 differ
126=== modified file 'point_of_sale/point_of_sale_view.xml'
127--- point_of_sale/point_of_sale_view.xml 2010-11-15 13:59:05 +0000
128+++ point_of_sale/point_of_sale_view.xml 2010-11-23 11:47:55 +0000
129@@ -3,7 +3,8 @@
130 <data>
131 <menuitem name="Point of Sale" id="menu_point_root" sequence="21"
132 icon="terp-partner"
133- groups="group_pos_manager,group_pos_user"/>
134+ groups="group_pos_manager,group_pos_user"
135+ web_icon="image/pos.png" web_icon_hover="image/pos_hover.png"/>
136
137 <record model="ir.ui.view" id="view_pos_pos_form">
138 <field name="name">pos.order</field>
139
140=== added directory 'project/image'
141=== added file 'project/image/project.png'
142Binary files project/image/project.png 1970-01-01 00:00:00 +0000 and project/image/project.png 2010-11-23 11:47:55 +0000 differ
143=== added file 'project/image/project_hover.png'
144Binary files project/image/project_hover.png 1970-01-01 00:00:00 +0000 and project/image/project_hover.png 2010-11-23 11:47:55 +0000 differ
145=== modified file 'project/project_view.xml'
146--- project/project_view.xml 2010-11-03 09:55:38 +0000
147+++ project/project_view.xml 2010-11-23 11:47:55 +0000
148@@ -5,7 +5,8 @@
149 <menuitem
150 icon="terp-project" id="base.menu_main_pm"
151 name="Project" sequence="10"
152- groups="group_project_manager,group_project_user"/>
153+ groups="group_project_manager,group_project_user"
154+ web_icon="image/project.png" web_icon_hover="image/project_hover.png"/>
155
156 <menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
157 <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
158
159=== added directory 'purchase/image'
160=== added file 'purchase/image/purchase.png'
161Binary files purchase/image/purchase.png 1970-01-01 00:00:00 +0000 and purchase/image/purchase.png 2010-11-23 11:47:55 +0000 differ
162=== added file 'purchase/image/purchase_hover.png'
163Binary files purchase/image/purchase_hover.png 1970-01-01 00:00:00 +0000 and purchase/image/purchase_hover.png 2010-11-23 11:47:55 +0000 differ
164=== modified file 'purchase/purchase_view.xml'
165--- purchase/purchase_view.xml 2010-11-08 13:04:35 +0000
166+++ purchase/purchase_view.xml 2010-11-23 11:47:55 +0000
167@@ -2,7 +2,8 @@
168 <openerp>
169 <data>
170 <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases" sequence="3"
171- groups="group_purchase_manager,group_purchase_user"/>
172+ groups="group_purchase_manager,group_purchase_user"
173+ web_icon="image/purchase.png" web_icon_hover="image/purchase_hover.png"/>
174 <menuitem id="menu_procurement_management" name="Purchase Management"
175 parent="base.menu_purchase_root" sequence="1" />
176
177
178=== added directory 'sale/image'
179=== added file 'sale/image/sale.png'
180Binary files sale/image/sale.png 1970-01-01 00:00:00 +0000 and sale/image/sale.png 2010-11-23 11:47:55 +0000 differ
181=== added file 'sale/image/sale_hover.png'
182Binary files sale/image/sale_hover.png 1970-01-01 00:00:00 +0000 and sale/image/sale_hover.png 2010-11-23 11:47:55 +0000 differ
183=== modified file 'sale/sale_view.xml'
184--- sale/sale_view.xml 2010-11-11 11:44:43 +0000
185+++ sale/sale_view.xml 2010-11-23 11:47:55 +0000
186@@ -2,7 +2,8 @@
187 <openerp>
188 <data>
189 <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0"
190- groups="base.group_sale_salesman,base.group_sale_manager"/>
191+ groups="base.group_sale_salesman,base.group_sale_manager"
192+ web_icon="image/sale.png" web_icon_hover="image/sale_hover.png"/>
193
194 <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
195
196
197=== added directory 'stock/image'
198=== added file 'stock/image/warehouse.png'
199Binary files stock/image/warehouse.png 1970-01-01 00:00:00 +0000 and stock/image/warehouse.png 2010-11-23 11:47:55 +0000 differ
200=== added file 'stock/image/warehouse_hover.png'
201Binary files stock/image/warehouse_hover.png 1970-01-01 00:00:00 +0000 and stock/image/warehouse_hover.png 2010-11-23 11:47:55 +0000 differ
202=== modified file 'stock/stock_view.xml'
203--- stock/stock_view.xml 2010-10-29 05:22:01 +0000
204+++ stock/stock_view.xml 2010-11-23 11:47:55 +0000
205@@ -2,7 +2,9 @@
206 <openerp>
207 <data>
208
209- <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse" groups="group_stock_manager,group_stock_user" sequence="5"/>
210+ <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse"
211+ groups="group_stock_manager,group_stock_user" sequence="5"
212+ web_icon="image/warehouse.png" web_icon_hover="image/warehouse_hover.png"/>
213 <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1" groups="base.group_extended"/>
214 <menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="2"/>
215 <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="6"/>
216
217=== added directory 'survey/image'
218=== added file 'survey/image/tools.png'
219Binary files survey/image/tools.png 1970-01-01 00:00:00 +0000 and survey/image/tools.png 2010-11-23 11:47:55 +0000 differ
220=== added file 'survey/image/tools_hover.png'
221Binary files survey/image/tools_hover.png 1970-01-01 00:00:00 +0000 and survey/image/tools_hover.png 2010-11-23 11:47:55 +0000 differ
222=== modified file 'survey/survey_view.xml'
223--- survey/survey_view.xml 2010-10-26 13:03:45 +0000
224+++ survey/survey_view.xml 2010-11-23 11:47:55 +0000
225@@ -2,7 +2,8 @@
226 <openerp>
227 <data>
228
229- <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="28"/>
230+ <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="28"
231+ web_icon="image/tools.png" web_icon_hover="image/tools_hover.png"/>
232 <menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools" sequence="2" groups="base.group_tool_user,base.group_tool_manager,group_survey_user"/>
233 <menuitem name="Define Surveys" id="menu_define_survey"
234 groups="base.group_tool_manager"

Subscribers

People subscribed via source and target branches

to all changes: