Merge lp:~openerp-dev/openobject-addons/trunk-home-action-rga into lp:openobject-addons
- trunk-home-action-rga
- Merge into trunk
Proposed by
Ravi Gadhia (OpenERP)
Status: | Needs review |
---|---|
Proposed branch: | lp:~openerp-dev/openobject-addons/trunk-home-action-rga |
Merge into: | lp:openobject-addons |
Diff against target: |
447 lines (+54/-35) 25 files modified
account/board_account_view.xml (+2/-1) account_accountant/account_accountant_data.xml (+1/-1) account_voucher/account_voucher_view.xml (+1/-1) crm/board_crm_view.xml (+2/-1) crm/crm_data.xml (+1/-1) event/board_association_view.xml (+2/-1) event/event_data.xml (+1/-1) fleet/fleet_board_view.xml (+2/-1) fleet/fleet_data.xml (+1/-1) hr/board_hr_view.xml (+2/-1) hr/res_config_view.xml (+1/-1) marketing_campaign/marketing_campaign_view.xml (+1/-1) mrp/board_manufacturing_view.xml (+2/-1) mrp/res_config_view.xml (+1/-1) point_of_sale/point_of_sale_data.xml (+1/-1) point_of_sale/static/src/js/models.js (+20/-3) point_of_sale/static/src/js/widgets.js (+1/-9) project/board_project_view.xml (+2/-1) project/res_config_view.xml (+1/-1) purchase/board_purchase_view.xml (+2/-1) purchase/res_config_view.xml (+1/-1) sale/board_sale_view.xml (+2/-1) sale/sale_data.xml (+1/-1) stock/board_warehouse_view.xml (+2/-1) stock/res_config_view.xml (+1/-1) |
To merge this branch: | bzr merge lp:~openerp-dev/openobject-addons/trunk-home-action-rga |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenERP Core Team | Pending | ||
Review via email: mp+191148@code.launchpad.net |
Commit message
Description of the change
Unmerged revisions
- 8860. By RGA(OpenERP)
-
Merge with trunk
- 8859. By RGA(OpenERP)
-
[IMP] Dispaly dialog only for explicitly generated error using .rejectother error can gracefully handel by framework rpc
- 8858. By RGA(OpenERP)
-
[IMP] POS: if user have no active session available display error and redirect to your session form view
- 8857. By RGA(OpenERP)
-
Merge with trunk
- 8856. By RGA(OpenERP)
-
Merge with trunk
- 8855. By RGA(OpenERP)
-
Merge with trunk
- 8854. By RGA(OpenERP)
-
[IMP] usability: imporve dashboard action name it's more convenient when want to choose as home action
- 8853. By RGA(OpenERP)
-
[IMP] usability: imporve client action name it's more convenient when want to choose as home action
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'account/board_account_view.xml' | |||
2 | --- account/board_account_view.xml 2012-11-29 22:26:45 +0000 | |||
3 | +++ account/board_account_view.xml 2013-11-11 12:15:46 +0000 | |||
4 | @@ -27,7 +27,7 @@ | |||
5 | 27 | </record> | 27 | </record> |
6 | 28 | 28 | ||
7 | 29 | <record id="open_board_account" model="ir.actions.act_window"> | 29 | <record id="open_board_account" model="ir.actions.act_window"> |
9 | 30 | <field name="name">Accounting</field> | 30 | <field name="name">Accounting Dashboard</field> |
10 | 31 | <field name="res_model">board.board</field> | 31 | <field name="res_model">board.board</field> |
11 | 32 | <field name="view_type">form</field> | 32 | <field name="view_type">form</field> |
12 | 33 | <field name="view_mode">form</field> | 33 | <field name="view_mode">form</field> |
13 | @@ -36,6 +36,7 @@ | |||
14 | 36 | </record> | 36 | </record> |
15 | 37 | 37 | ||
16 | 38 | <menuitem id="menu_board_account" | 38 | <menuitem id="menu_board_account" |
17 | 39 | name="Accounting" | ||
18 | 39 | action="open_board_account" | 40 | action="open_board_account" |
19 | 40 | icon="terp-graph" | 41 | icon="terp-graph" |
20 | 41 | parent="base.menu_reporting_dashboard" | 42 | parent="base.menu_reporting_dashboard" |
21 | 42 | 43 | ||
22 | === modified file 'account_accountant/account_accountant_data.xml' | |||
23 | --- account_accountant/account_accountant_data.xml 2012-11-29 22:26:45 +0000 | |||
24 | +++ account_accountant/account_accountant_data.xml 2013-11-11 12:15:46 +0000 | |||
25 | @@ -12,7 +12,7 @@ | |||
26 | 12 | <data noupdate="1"> | 12 | <data noupdate="1"> |
27 | 13 | <!-- After installation of the module, open the related menu --> | 13 | <!-- After installation of the module, open the related menu --> |
28 | 14 | <record id="action_client_account_menu" model="ir.actions.client"> | 14 | <record id="action_client_account_menu" model="ir.actions.client"> |
30 | 15 | <field name="name">Open Accounting Menu</field> | 15 | <field name="name">Accounting</field> |
31 | 16 | <field name="tag">reload</field> | 16 | <field name="tag">reload</field> |
32 | 17 | <field name="params" eval="{'menu_id': ref('account.menu_finance')}"/> | 17 | <field name="params" eval="{'menu_id': ref('account.menu_finance')}"/> |
33 | 18 | </record> | 18 | </record> |
34 | 19 | 19 | ||
35 | === modified file 'account_voucher/account_voucher_view.xml' | |||
36 | --- account_voucher/account_voucher_view.xml 2013-10-04 10:52:18 +0000 | |||
37 | +++ account_voucher/account_voucher_view.xml 2013-11-11 12:15:46 +0000 | |||
38 | @@ -271,7 +271,7 @@ | |||
39 | 271 | 271 | ||
40 | 272 | <!-- After installation of the module, open the related menu --> | 272 | <!-- After installation of the module, open the related menu --> |
41 | 273 | <record id="action_client_invoice_menu" model="ir.actions.client"> | 273 | <record id="action_client_invoice_menu" model="ir.actions.client"> |
43 | 274 | <field name="name">Open Invoicing Menu</field> | 274 | <field name="name">Invoicing</field> |
44 | 275 | <field name="tag">reload</field> | 275 | <field name="tag">reload</field> |
45 | 276 | <field name="params" eval="{'menu_id': ref('account.menu_finance')}"/> | 276 | <field name="params" eval="{'menu_id': ref('account.menu_finance')}"/> |
46 | 277 | </record> | 277 | </record> |
47 | 278 | 278 | ||
48 | === modified file 'crm/board_crm_view.xml' | |||
49 | --- crm/board_crm_view.xml 2013-07-16 15:15:13 +0000 | |||
50 | +++ crm/board_crm_view.xml 2013-11-11 12:15:46 +0000 | |||
51 | @@ -70,7 +70,7 @@ | |||
52 | 70 | </record> | 70 | </record> |
53 | 71 | 71 | ||
54 | 72 | <record model="ir.actions.act_window" id="open_board_statistical_dash"> | 72 | <record model="ir.actions.act_window" id="open_board_statistical_dash"> |
56 | 73 | <field name="name">CRM</field> | 73 | <field name="name">CRM Dashboard</field> |
57 | 74 | <field name="res_model">board.board</field> | 74 | <field name="res_model">board.board</field> |
58 | 75 | <field name="view_type">form</field> | 75 | <field name="view_type">form</field> |
59 | 76 | <field name="view_mode">form</field> | 76 | <field name="view_mode">form</field> |
60 | @@ -80,6 +80,7 @@ | |||
61 | 80 | 80 | ||
62 | 81 | <menuitem | 81 | <menuitem |
63 | 82 | id="menu_board_statistics_dash" | 82 | id="menu_board_statistics_dash" |
64 | 83 | name="CRM" | ||
65 | 83 | parent="base.menu_reporting_dashboard" | 84 | parent="base.menu_reporting_dashboard" |
66 | 84 | action="open_board_statistical_dash" | 85 | action="open_board_statistical_dash" |
67 | 85 | sequence="10" | 86 | sequence="10" |
68 | 86 | 87 | ||
69 | === modified file 'crm/crm_data.xml' | |||
70 | --- crm/crm_data.xml 2013-05-21 14:27:53 +0000 | |||
71 | +++ crm/crm_data.xml 2013-11-11 12:15:46 +0000 | |||
72 | @@ -4,7 +4,7 @@ | |||
73 | 4 | 4 | ||
74 | 5 | <!-- After installation of the module, open the related menu --> | 5 | <!-- After installation of the module, open the related menu --> |
75 | 6 | <record id="action_client_crm_menu" model="ir.actions.client"> | 6 | <record id="action_client_crm_menu" model="ir.actions.client"> |
77 | 7 | <field name="name">Open Sale Menu</field> | 7 | <field name="name">Sales</field> |
78 | 8 | <field name="tag">reload</field> | 8 | <field name="tag">reload</field> |
79 | 9 | <field name="params" eval="{'menu_id': ref('base.menu_base_partner')}"/> | 9 | <field name="params" eval="{'menu_id': ref('base.menu_base_partner')}"/> |
80 | 10 | </record> | 10 | </record> |
81 | 11 | 11 | ||
82 | === modified file 'event/board_association_view.xml' | |||
83 | --- event/board_association_view.xml 2012-11-29 22:26:45 +0000 | |||
84 | +++ event/board_association_view.xml 2013-11-11 12:15:46 +0000 | |||
85 | @@ -60,7 +60,7 @@ | |||
86 | 60 | </record> | 60 | </record> |
87 | 61 | 61 | ||
88 | 62 | <record model="ir.actions.act_window" id="open_board_associations_manager"> | 62 | <record model="ir.actions.act_window" id="open_board_associations_manager"> |
90 | 63 | <field name="name">Events</field> | 63 | <field name="name">Events Dashboard</field> |
91 | 64 | <field name="res_model">board.board</field> | 64 | <field name="res_model">board.board</field> |
92 | 65 | <field name="view_type">form</field> | 65 | <field name="view_type">form</field> |
93 | 66 | <field name="view_mode">form</field> | 66 | <field name="view_mode">form</field> |
94 | @@ -68,6 +68,7 @@ | |||
95 | 68 | </record> | 68 | </record> |
96 | 69 | 69 | ||
97 | 70 | <menuitem id="menu_board_associations_manager" | 70 | <menuitem id="menu_board_associations_manager" |
98 | 71 | name="Events" | ||
99 | 71 | parent="base.menu_reporting_dashboard" | 72 | parent="base.menu_reporting_dashboard" |
100 | 72 | action="open_board_associations_manager" | 73 | action="open_board_associations_manager" |
101 | 73 | sequence="40" | 74 | sequence="40" |
102 | 74 | 75 | ||
103 | === modified file 'event/event_data.xml' | |||
104 | --- event/event_data.xml 2012-12-05 05:37:32 +0000 | |||
105 | +++ event/event_data.xml 2013-11-11 12:15:46 +0000 | |||
106 | @@ -3,7 +3,7 @@ | |||
107 | 3 | <data noupdate="1"> | 3 | <data noupdate="1"> |
108 | 4 | <!-- After installation of the module, open the related menu --> | 4 | <!-- After installation of the module, open the related menu --> |
109 | 5 | <record id="action_client_event_menu" model="ir.actions.client"> | 5 | <record id="action_client_event_menu" model="ir.actions.client"> |
111 | 6 | <field name="name">Open Event Menu</field> | 6 | <field name="name">Event</field> |
112 | 7 | <field name="tag">reload</field> | 7 | <field name="tag">reload</field> |
113 | 8 | <field name="params" eval="{'menu_id': ref('event.event_main_menu')}"/> | 8 | <field name="params" eval="{'menu_id': ref('event.event_main_menu')}"/> |
114 | 9 | </record> | 9 | </record> |
115 | 10 | 10 | ||
116 | === modified file 'fleet/fleet_board_view.xml' | |||
117 | --- fleet/fleet_board_view.xml 2012-12-04 16:20:56 +0000 | |||
118 | +++ fleet/fleet_board_view.xml 2013-11-11 12:15:46 +0000 | |||
119 | @@ -110,7 +110,7 @@ | |||
120 | 110 | </record> | 110 | </record> |
121 | 111 | 111 | ||
122 | 112 | <record id="open_board_fleet" model="ir.actions.act_window"> | 112 | <record id="open_board_fleet" model="ir.actions.act_window"> |
124 | 113 | <field name="name">Fleet</field> | 113 | <field name="name">Fleet Dashboard</field> |
125 | 114 | <field name="res_model">board.board</field> | 114 | <field name="res_model">board.board</field> |
126 | 115 | <field name="view_type">form</field> | 115 | <field name="view_type">form</field> |
127 | 116 | <field name="view_mode">form</field> | 116 | <field name="view_mode">form</field> |
128 | @@ -133,6 +133,7 @@ | |||
129 | 133 | </record> | 133 | </record> |
130 | 134 | 134 | ||
131 | 135 | <menuitem id="menu_fleet_dashboard" | 135 | <menuitem id="menu_fleet_dashboard" |
132 | 136 | name="Fleet" | ||
133 | 136 | parent="base.menu_reporting_dashboard" | 137 | parent="base.menu_reporting_dashboard" |
134 | 137 | action="open_board_fleet" | 138 | action="open_board_fleet" |
135 | 138 | sequence="50" | 139 | sequence="50" |
136 | 139 | 140 | ||
137 | === modified file 'fleet/fleet_data.xml' | |||
138 | --- fleet/fleet_data.xml 2012-12-10 16:28:34 +0000 | |||
139 | +++ fleet/fleet_data.xml 2013-11-11 12:15:46 +0000 | |||
140 | @@ -18,7 +18,7 @@ | |||
141 | 18 | 18 | ||
142 | 19 | <!-- After installation of the module, open the related menu --> | 19 | <!-- After installation of the module, open the related menu --> |
143 | 20 | <record id="action_fleet_menu" model="ir.actions.client"> | 20 | <record id="action_fleet_menu" model="ir.actions.client"> |
145 | 21 | <field name="name">Open Fleet Menu</field> | 21 | <field name="name">Fleet</field> |
146 | 22 | <field name="tag">reload</field> | 22 | <field name="tag">reload</field> |
147 | 23 | <field name="params" eval="{'menu_id': ref('fleet.menu_root')}"/> | 23 | <field name="params" eval="{'menu_id': ref('fleet.menu_root')}"/> |
148 | 24 | </record> | 24 | </record> |
149 | 25 | 25 | ||
150 | === modified file 'hr/board_hr_view.xml' | |||
151 | --- hr/board_hr_view.xml 2012-11-29 22:26:45 +0000 | |||
152 | +++ hr/board_hr_view.xml 2013-11-11 12:15:46 +0000 | |||
153 | @@ -16,7 +16,7 @@ | |||
154 | 16 | </record> | 16 | </record> |
155 | 17 | 17 | ||
156 | 18 | <record id="open_board_hr" model="ir.actions.act_window"> | 18 | <record id="open_board_hr" model="ir.actions.act_window"> |
158 | 19 | <field name="name">Human Resources</field> | 19 | <field name="name">Human Resources Dashboard</field> |
159 | 20 | <field name="res_model">board.board</field> | 20 | <field name="res_model">board.board</field> |
160 | 21 | <field name="view_type">form</field> | 21 | <field name="view_type">form</field> |
161 | 22 | <field name="view_mode">form</field> | 22 | <field name="view_mode">form</field> |
162 | @@ -38,6 +38,7 @@ | |||
163 | 38 | </field> | 38 | </field> |
164 | 39 | </record> | 39 | </record> |
165 | 40 | <menuitem id="menu_hr_dashboard" | 40 | <menuitem id="menu_hr_dashboard" |
166 | 41 | name="Human Resources" | ||
167 | 41 | parent="base.menu_reporting_dashboard" | 42 | parent="base.menu_reporting_dashboard" |
168 | 42 | action="open_board_hr" | 43 | action="open_board_hr" |
169 | 43 | sequence="50"/> | 44 | sequence="50"/> |
170 | 44 | 45 | ||
171 | === modified file 'hr/res_config_view.xml' | |||
172 | --- hr/res_config_view.xml 2012-11-29 22:26:45 +0000 | |||
173 | +++ hr/res_config_view.xml 2013-11-11 12:15:46 +0000 | |||
174 | @@ -3,7 +3,7 @@ | |||
175 | 3 | <data noupdate="1"> | 3 | <data noupdate="1"> |
176 | 4 | <!-- After installation of the module, open the related menu --> | 4 | <!-- After installation of the module, open the related menu --> |
177 | 5 | <record id="action_client_hr_menu" model="ir.actions.client"> | 5 | <record id="action_client_hr_menu" model="ir.actions.client"> |
179 | 6 | <field name="name">Open HR Menu</field> | 6 | <field name="name">Human Resources</field> |
180 | 7 | <field name="tag">reload</field> | 7 | <field name="tag">reload</field> |
181 | 8 | <field name="params" eval="{'menu_id': ref('menu_hr_root')}"/> | 8 | <field name="params" eval="{'menu_id': ref('menu_hr_root')}"/> |
182 | 9 | </record> | 9 | </record> |
183 | 10 | 10 | ||
184 | === modified file 'marketing_campaign/marketing_campaign_view.xml' | |||
185 | --- marketing_campaign/marketing_campaign_view.xml 2013-09-04 14:10:53 +0000 | |||
186 | +++ marketing_campaign/marketing_campaign_view.xml 2013-11-11 12:15:46 +0000 | |||
187 | @@ -3,7 +3,7 @@ | |||
188 | 3 | <data noupdate="1"> | 3 | <data noupdate="1"> |
189 | 4 | 4 | ||
190 | 5 | <record id="action_client_marketing_menu" model="ir.actions.client"> | 5 | <record id="action_client_marketing_menu" model="ir.actions.client"> |
192 | 6 | <field name="name">Open Marketing Menu</field> | 6 | <field name="name">Marketing</field> |
193 | 7 | <field name="tag">reload</field> | 7 | <field name="tag">reload</field> |
194 | 8 | <field name="params" eval="{'menu_id': ref('base.marketing_menu')}"/> | 8 | <field name="params" eval="{'menu_id': ref('base.marketing_menu')}"/> |
195 | 9 | </record> | 9 | </record> |
196 | 10 | 10 | ||
197 | === modified file 'mrp/board_manufacturing_view.xml' | |||
198 | --- mrp/board_manufacturing_view.xml 2012-11-29 22:26:45 +0000 | |||
199 | +++ mrp/board_manufacturing_view.xml 2013-11-11 12:15:46 +0000 | |||
200 | @@ -19,7 +19,7 @@ | |||
201 | 19 | </record> | 19 | </record> |
202 | 20 | 20 | ||
203 | 21 | <record id="open_board_manufacturing" model="ir.actions.act_window"> | 21 | <record id="open_board_manufacturing" model="ir.actions.act_window"> |
205 | 22 | <field name="name">Manufacturing</field> | 22 | <field name="name">Manufacturing Dashboard</field> |
206 | 23 | <field name="res_model">board.board</field> | 23 | <field name="res_model">board.board</field> |
207 | 24 | <field name="view_type">form</field> | 24 | <field name="view_type">form</field> |
208 | 25 | <field name="view_mode">form</field> | 25 | <field name="view_mode">form</field> |
209 | @@ -27,6 +27,7 @@ | |||
210 | 27 | </record> | 27 | </record> |
211 | 28 | 28 | ||
212 | 29 | <menuitem action="open_board_manufacturing" | 29 | <menuitem action="open_board_manufacturing" |
213 | 30 | name="Manufacturing" | ||
214 | 30 | icon="terp-graph" | 31 | icon="terp-graph" |
215 | 31 | id="menu_board_manufacturing" | 32 | id="menu_board_manufacturing" |
216 | 32 | parent="base.menu_reporting_dashboard" | 33 | parent="base.menu_reporting_dashboard" |
217 | 33 | 34 | ||
218 | === modified file 'mrp/res_config_view.xml' | |||
219 | --- mrp/res_config_view.xml 2012-11-29 22:26:45 +0000 | |||
220 | +++ mrp/res_config_view.xml 2013-11-11 12:15:46 +0000 | |||
221 | @@ -3,7 +3,7 @@ | |||
222 | 3 | <data noupdate="1"> | 3 | <data noupdate="1"> |
223 | 4 | <!-- After installation of the module, open the related menu --> | 4 | <!-- After installation of the module, open the related menu --> |
224 | 5 | <record id="action_client_mrp_menu" model="ir.actions.client"> | 5 | <record id="action_client_mrp_menu" model="ir.actions.client"> |
226 | 6 | <field name="name">Open MRP Menu</field> | 6 | <field name="name">MRP</field> |
227 | 7 | <field name="tag">reload</field> | 7 | <field name="tag">reload</field> |
228 | 8 | <field name="params" eval="{'menu_id': ref('base.menu_mrp_root')}"/> | 8 | <field name="params" eval="{'menu_id': ref('base.menu_mrp_root')}"/> |
229 | 9 | </record> | 9 | </record> |
230 | 10 | 10 | ||
231 | === modified file 'point_of_sale/point_of_sale_data.xml' | |||
232 | --- point_of_sale/point_of_sale_data.xml 2013-04-09 10:09:17 +0000 | |||
233 | +++ point_of_sale/point_of_sale_data.xml 2013-11-11 12:15:46 +0000 | |||
234 | @@ -5,7 +5,7 @@ | |||
235 | 5 | 5 | ||
236 | 6 | <!-- After installation of the module, open the related menu --> | 6 | <!-- After installation of the module, open the related menu --> |
237 | 7 | <record id="action_client_pos_menu" model="ir.actions.client"> | 7 | <record id="action_client_pos_menu" model="ir.actions.client"> |
239 | 8 | <field name="name">Open POS Menu</field> | 8 | <field name="name">Point Of Sale</field> |
240 | 9 | <field name="tag">reload</field> | 9 | <field name="tag">reload</field> |
241 | 10 | <field name="params" eval="{'menu_id': ref('menu_point_root')}"/> | 10 | <field name="params" eval="{'menu_id': ref('menu_point_root')}"/> |
242 | 11 | </record> | 11 | </record> |
243 | 12 | 12 | ||
244 | === modified file 'point_of_sale/static/src/js/models.js' | |||
245 | --- point_of_sale/static/src/js/models.js 2013-09-23 17:13:10 +0000 | |||
246 | +++ point_of_sale/static/src/js/models.js 2013-11-11 12:15:46 +0000 | |||
247 | @@ -1,5 +1,6 @@ | |||
248 | 1 | function openerp_pos_models(instance, module){ //module is instance.point_of_sale | 1 | function openerp_pos_models(instance, module){ //module is instance.point_of_sale |
249 | 2 | var QWeb = instance.web.qweb; | 2 | var QWeb = instance.web.qweb; |
250 | 3 | var _t = instance.web._t; | ||
251 | 3 | 4 | ||
252 | 4 | var round_di = instance.web.round_decimals; | 5 | var round_di = instance.web.round_decimals; |
253 | 5 | var round_pr = instance.web.round_precision | 6 | var round_pr = instance.web.round_precision |
254 | @@ -68,10 +69,23 @@ | |||
255 | 68 | .done(function(){ | 69 | .done(function(){ |
256 | 69 | //self.log_loaded_data(); //Uncomment if you want to log the data to the console for easier debugging | 70 | //self.log_loaded_data(); //Uncomment if you want to log the data to the console for easier debugging |
257 | 70 | self.ready.resolve(); | 71 | self.ready.resolve(); |
259 | 71 | }).fail(function(){ | 72 | }).fail(function(error){ |
260 | 72 | //we failed to load some backend data, or the backend was badly configured. | 73 | //we failed to load some backend data, or the backend was badly configured. |
263 | 73 | //the error messages will be displayed in PosWidget | 74 | //the error messages will be displayed in openerp dialog box. |
264 | 74 | self.ready.reject(); | 75 | //display error dialog only for explicitly reject deferred using .reject('error') |
265 | 76 | //if any internal server error occured than server will send error object and handle by framework rpc handler. | ||
266 | 77 | instance.web.unblockUI(); | ||
267 | 78 | if(_.isString(error)){ | ||
268 | 79 | var dialog = new instance.web.Dialog(this, { | ||
269 | 80 | title: _t("Error"), | ||
270 | 81 | width: 850, | ||
271 | 82 | buttons: [ | ||
272 | 83 | {text: "OK", click: function() { self.ready.reject();}}, | ||
273 | 84 | ] | ||
274 | 85 | }).open(); | ||
275 | 86 | $("<div />").text(error).appendTo(dialog.$el); | ||
276 | 87 | dialog.on("closing", this, function(){self.ready.reject();}); | ||
277 | 88 | } | ||
278 | 75 | }); | 89 | }); |
279 | 76 | }, | 90 | }, |
280 | 77 | 91 | ||
281 | @@ -145,6 +159,9 @@ | |||
282 | 145 | [['state', '=', 'opened'], ['user_id', '=', self.session.uid]] | 159 | [['state', '=', 'opened'], ['user_id', '=', self.session.uid]] |
283 | 146 | ); | 160 | ); |
284 | 147 | }).then(function(sessions){ | 161 | }).then(function(sessions){ |
285 | 162 | if(_.isEmpty(sessions)){ | ||
286 | 163 | return (new $.Deferred()).reject(_t("There is no active session available for this user.")); | ||
287 | 164 | } | ||
288 | 148 | self.set('pos_session', sessions[0]); | 165 | self.set('pos_session', sessions[0]); |
289 | 149 | 166 | ||
290 | 150 | return self.fetch( | 167 | return self.fetch( |
291 | 151 | 168 | ||
292 | === modified file 'point_of_sale/static/src/js/widgets.js' | |||
293 | --- point_of_sale/static/src/js/widgets.js 2013-10-09 13:29:44 +0000 | |||
294 | +++ point_of_sale/static/src/js/widgets.js 2013-11-11 12:15:46 +0000 | |||
295 | @@ -889,15 +889,7 @@ | |||
296 | 889 | self.pos.flush(); | 889 | self.pos.flush(); |
297 | 890 | 890 | ||
298 | 891 | }).fail(function(){ // error when loading models data from the backend | 891 | }).fail(function(){ // error when loading models data from the backend |
308 | 892 | instance.web.unblockUI(); | 892 | self.close(); |
300 | 893 | return new instance.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_pos_session_opening']], ['res_id']) | ||
301 | 894 | .pipe( _.bind(function(res){ | ||
302 | 895 | return instance.session.rpc('/web/action/load', {'action_id': res[0]['res_id']}) | ||
303 | 896 | .pipe(_.bind(function(result){ | ||
304 | 897 | var action = result.result; | ||
305 | 898 | this.do_action(action); | ||
306 | 899 | }, this)); | ||
307 | 900 | }, self)); | ||
309 | 901 | }); | 893 | }); |
310 | 902 | }, | 894 | }, |
311 | 903 | 895 | ||
312 | 904 | 896 | ||
313 | === modified file 'project/board_project_view.xml' | |||
314 | --- project/board_project_view.xml 2013-07-19 10:01:19 +0000 | |||
315 | +++ project/board_project_view.xml 2013-11-11 12:15:46 +0000 | |||
316 | @@ -47,7 +47,7 @@ | |||
317 | 47 | </record> | 47 | </record> |
318 | 48 | 48 | ||
319 | 49 | <record id="open_board_project" model="ir.actions.act_window"> | 49 | <record id="open_board_project" model="ir.actions.act_window"> |
321 | 50 | <field name="name">Project</field> | 50 | <field name="name">Project Dashboard</field> |
322 | 51 | <field name="res_model">board.board</field> | 51 | <field name="res_model">board.board</field> |
323 | 52 | <field name="view_type">form</field> | 52 | <field name="view_type">form</field> |
324 | 53 | <field name="view_mode">form</field> | 53 | <field name="view_mode">form</field> |
325 | @@ -56,6 +56,7 @@ | |||
326 | 56 | </record> | 56 | </record> |
327 | 57 | 57 | ||
328 | 58 | <menuitem id="menu_project_dashboard" | 58 | <menuitem id="menu_project_dashboard" |
329 | 59 | name="Project" | ||
330 | 59 | sequence="35" | 60 | sequence="35" |
331 | 60 | parent="base.menu_reporting_dashboard" | 61 | parent="base.menu_reporting_dashboard" |
332 | 61 | action="open_board_project"/> | 62 | action="open_board_project"/> |
333 | 62 | 63 | ||
334 | === modified file 'project/res_config_view.xml' | |||
335 | --- project/res_config_view.xml 2012-11-29 22:26:45 +0000 | |||
336 | +++ project/res_config_view.xml 2013-11-11 12:15:46 +0000 | |||
337 | @@ -3,7 +3,7 @@ | |||
338 | 3 | <data noupdate="1"> | 3 | <data noupdate="1"> |
339 | 4 | <!-- After installation of the module, open the related menu --> | 4 | <!-- After installation of the module, open the related menu --> |
340 | 5 | <record id="action_client_project_menu" model="ir.actions.client"> | 5 | <record id="action_client_project_menu" model="ir.actions.client"> |
342 | 6 | <field name="name">Open Project Menu</field> | 6 | <field name="name">Project</field> |
343 | 7 | <field name="tag">reload</field> | 7 | <field name="tag">reload</field> |
344 | 8 | <field name="params" eval="{'menu_id': ref('base.menu_main_pm')}"/> | 8 | <field name="params" eval="{'menu_id': ref('base.menu_main_pm')}"/> |
345 | 9 | </record> | 9 | </record> |
346 | 10 | 10 | ||
347 | === modified file 'purchase/board_purchase_view.xml' | |||
348 | --- purchase/board_purchase_view.xml 2012-11-29 22:26:45 +0000 | |||
349 | +++ purchase/board_purchase_view.xml 2013-11-11 12:15:46 +0000 | |||
350 | @@ -73,7 +73,7 @@ | |||
351 | 73 | </record> | 73 | </record> |
352 | 74 | 74 | ||
353 | 75 | <record id="open_board_purchase" model="ir.actions.act_window"> | 75 | <record id="open_board_purchase" model="ir.actions.act_window"> |
355 | 76 | <field name="name">Purchases</field> | 76 | <field name="name">Purchases Dashboard</field> |
356 | 77 | <field name="res_model">board.board</field> | 77 | <field name="res_model">board.board</field> |
357 | 78 | <field name="view_type">form</field> | 78 | <field name="view_type">form</field> |
358 | 79 | <field name="view_mode">form</field> | 79 | <field name="view_mode">form</field> |
359 | @@ -82,6 +82,7 @@ | |||
360 | 82 | </record> | 82 | </record> |
361 | 83 | 83 | ||
362 | 84 | <menuitem action="open_board_purchase" | 84 | <menuitem action="open_board_purchase" |
363 | 85 | name="Purchases" | ||
364 | 85 | icon="terp-graph" | 86 | icon="terp-graph" |
365 | 86 | id="menu_board_purchase" | 87 | id="menu_board_purchase" |
366 | 87 | parent="base.menu_reporting_dashboard" | 88 | parent="base.menu_reporting_dashboard" |
367 | 88 | 89 | ||
368 | === modified file 'purchase/res_config_view.xml' | |||
369 | --- purchase/res_config_view.xml 2013-04-18 10:23:37 +0000 | |||
370 | +++ purchase/res_config_view.xml 2013-11-11 12:15:46 +0000 | |||
371 | @@ -3,7 +3,7 @@ | |||
372 | 3 | <data noupdate="1"> | 3 | <data noupdate="1"> |
373 | 4 | <!-- After installation of the module, open the related menu --> | 4 | <!-- After installation of the module, open the related menu --> |
374 | 5 | <record id="action_client_purchase_menu" model="ir.actions.client"> | 5 | <record id="action_client_purchase_menu" model="ir.actions.client"> |
376 | 6 | <field name="name">Open Purchase Menu</field> | 6 | <field name="name">Purchases</field> |
377 | 7 | <field name="tag">reload</field> | 7 | <field name="tag">reload</field> |
378 | 8 | <field name="params" eval="{'menu_id': ref('base.menu_purchase_root')}"/> | 8 | <field name="params" eval="{'menu_id': ref('base.menu_purchase_root')}"/> |
379 | 9 | </record> | 9 | </record> |
380 | 10 | 10 | ||
381 | === modified file 'sale/board_sale_view.xml' | |||
382 | --- sale/board_sale_view.xml 2012-11-29 22:26:45 +0000 | |||
383 | +++ sale/board_sale_view.xml 2013-11-11 12:15:46 +0000 | |||
384 | @@ -62,7 +62,7 @@ | |||
385 | 62 | </record> | 62 | </record> |
386 | 63 | 63 | ||
387 | 64 | <record id="open_board_sales" model="ir.actions.act_window"> | 64 | <record id="open_board_sales" model="ir.actions.act_window"> |
389 | 65 | <field name="name">Sales</field> | 65 | <field name="name">Sales Dashboard</field> |
390 | 66 | <field name="res_model">board.board</field> | 66 | <field name="res_model">board.board</field> |
391 | 67 | <field name="view_type">form</field> | 67 | <field name="view_type">form</field> |
392 | 68 | <field name="view_mode">form</field> | 68 | <field name="view_mode">form</field> |
393 | @@ -71,6 +71,7 @@ | |||
394 | 71 | 71 | ||
395 | 72 | <menuitem id="menu_dashboard_sales" | 72 | <menuitem id="menu_dashboard_sales" |
396 | 73 | sequence="15" | 73 | sequence="15" |
397 | 74 | name="Sales" | ||
398 | 74 | parent="base.menu_reporting_dashboard" | 75 | parent="base.menu_reporting_dashboard" |
399 | 75 | action="open_board_sales" | 76 | action="open_board_sales" |
400 | 76 | groups="base.group_sale_salesman"/> | 77 | groups="base.group_sale_salesman"/> |
401 | 77 | 78 | ||
402 | === modified file 'sale/sale_data.xml' | |||
403 | --- sale/sale_data.xml 2013-03-18 07:15:19 +0000 | |||
404 | +++ sale/sale_data.xml 2013-11-11 12:15:46 +0000 | |||
405 | @@ -4,7 +4,7 @@ | |||
406 | 4 | 4 | ||
407 | 5 | <!-- After installation of the module, open the related menu --> | 5 | <!-- After installation of the module, open the related menu --> |
408 | 6 | <record id="action_client_sale_menu" model="ir.actions.client"> | 6 | <record id="action_client_sale_menu" model="ir.actions.client"> |
410 | 7 | <field name="name">Open Sale Menu</field> | 7 | <field name="name">Sales</field> |
411 | 8 | <field name="tag">reload</field> | 8 | <field name="tag">reload</field> |
412 | 9 | <field name="params" eval="{'menu_id': ref('base.menu_base_partner')}"/> | 9 | <field name="params" eval="{'menu_id': ref('base.menu_base_partner')}"/> |
413 | 10 | </record> | 10 | </record> |
414 | 11 | 11 | ||
415 | === modified file 'stock/board_warehouse_view.xml' | |||
416 | --- stock/board_warehouse_view.xml 2012-12-05 12:13:11 +0000 | |||
417 | +++ stock/board_warehouse_view.xml 2013-11-11 12:15:46 +0000 | |||
418 | @@ -50,7 +50,7 @@ | |||
419 | 50 | </record> | 50 | </record> |
420 | 51 | 51 | ||
421 | 52 | <record id="open_board_warehouse" model="ir.actions.act_window"> | 52 | <record id="open_board_warehouse" model="ir.actions.act_window"> |
423 | 53 | <field name="name">Warehouse</field> | 53 | <field name="name">Warehouse Dashboard</field> |
424 | 54 | <field name="res_model">board.board</field> | 54 | <field name="res_model">board.board</field> |
425 | 55 | <field name="view_type">form</field> | 55 | <field name="view_type">form</field> |
426 | 56 | <field name="view_mode">form</field> | 56 | <field name="view_mode">form</field> |
427 | @@ -58,6 +58,7 @@ | |||
428 | 58 | </record> | 58 | </record> |
429 | 59 | 59 | ||
430 | 60 | <menuitem id="menu_board_warehouse" | 60 | <menuitem id="menu_board_warehouse" |
431 | 61 | name="Warehouse" | ||
432 | 61 | parent="base.menu_reporting_dashboard" | 62 | parent="base.menu_reporting_dashboard" |
433 | 62 | action="open_board_warehouse" | 63 | action="open_board_warehouse" |
434 | 63 | sequence="25" | 64 | sequence="25" |
435 | 64 | 65 | ||
436 | === modified file 'stock/res_config_view.xml' | |||
437 | --- stock/res_config_view.xml 2013-02-20 08:27:07 +0000 | |||
438 | +++ stock/res_config_view.xml 2013-11-11 12:15:46 +0000 | |||
439 | @@ -4,7 +4,7 @@ | |||
440 | 4 | 4 | ||
441 | 5 | <!-- After installation of the module, open the related menu --> | 5 | <!-- After installation of the module, open the related menu --> |
442 | 6 | <record id="action_client_warehouse_menu" model="ir.actions.client"> | 6 | <record id="action_client_warehouse_menu" model="ir.actions.client"> |
444 | 7 | <field name="name">Open Warehouse Menu</field> | 7 | <field name="name">Warehouse</field> |
445 | 8 | <field name="tag">reload</field> | 8 | <field name="tag">reload</field> |
446 | 9 | <field name="params" eval="{'menu_id': ref('menu_stock_root')}"/> | 9 | <field name="params" eval="{'menu_id': ref('menu_stock_root')}"/> |
447 | 10 | </record> | 10 | </record> |