Hotel Management System

Merge lp:~hotel-core-editors/hotel-management-system/trunk-REFTOWORKONV70 into lp:hotel-management-system

  1. trunk-REFTOWORKONV70
  2. Merge into trunk
Proposed by Nhomar - Vauxoo
Status: Merged
Merged at revision: 9
Proposed branch: lp:~hotel-core-editors/hotel-management-system/trunk-REFTOWORKONV70
Merge into: lp:hotel-management-system
Diff against target: 569 lines (+45/-349)
3 files modified
hotel/__openerp__.py (+14/-13)
hotel/hotel_view.xml (+22/-330)
hotel_reservation/__openerp__.py (+9/-6)
To merge this branch: bzr merge lp:~hotel-core-editors/hotel-management-system/trunk-REFTOWORKONV70
Reviewer Review Type Date Requested Status
Alexandre Fayolle - camptocamp code review, no test Needs Fixing
Review via email: mp+136031@code.launchpad.net

Description of the change

Hotel module is installing.

We remove old views, planning have a Kanban for rooms to take approach of the new web_api out of the box.

Add icon.

Become an App.

Just fixed hotel module.

To post a comment you must log in.
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

There is some indentation issues on lines 196-203, otherwise it seems good to me.

Revision history for this message
Nhomar - Vauxoo (nhomar) wrote :

The identation issue is due to change tab by spaces on identation, do you think i should fix this?

Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

line 551 s/Group Reservartion/Group Reservation/

review: Needs Fixing (code review, no test)
Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

> line 551 s/Group Reservartion/Group Reservation/

Additionnaly, in v7, init_xml and update_xml are deprecated. You should use data for these in __openerp__.py

'demo_xml' should be renamed 'demo' (or removed altogether if there are no demo).

Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

> The identation issue is due to change tab by spaces on identation, do you
> think i should fix this?

don't worry about that.

Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

Nhomar, can we merge this one?

Revision history for this message
Nhomar - Vauxoo (nhomar) wrote :

Yes dude

Written from my android
On Apr 2, 2013 4:40 AM, "Guewen Baconnier @ Camptocamp" <
<email address hidden>> wrote:

> Nhomar, can we merge this one?
> --
>
> https://code.launchpad.net/~hotel-core-editors/hotel-management-system/trunk-REFTOWORKONV70/+merge/136031
> Your team Hotel Editors is subscribed to branch lp:hotel-management-system.
>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hotel/__openerp__.py'
2--- hotel/__openerp__.py 2012-05-23 07:17:58 +0000
3+++ hotel/__openerp__.py 2012-11-24 23:36:19 +0000
4@@ -20,26 +20,26 @@
5 ##############################################################################
6
7 {
8- "name" : "Hotel Management",
9+ "name" : "Hotel Management Base",
10 "version" : "1.0",
11 "author" : "Tiny",
12 "category" : "Generic Modules/Hotel Management",
13 "description": """
14- Module for Hotel/Resort/Property management. You can manage:
15- * Configure Property
16- * Hotel Configuration
17- * Check In, Check out
18- * Manage Folio
19- * Payment
20-
21- Different reports are also provided, mainly for hotel statistics.
22+Module for Hotel/Resort/Rooms/Property management. You can manage:
23+
24+* Configure Property
25+* Hotel Configuration
26+* Check In, Check out
27+* Manage Folio
28+* Payment
29+
30+Different reports are also provided, mainly for hotel statistics.
31 """,
32- "depends" : ["base","product","sale"],
33+ "depends" : ["sale"],
34 "init_xml" : [],
35 "demo_xml" : [
36 ],
37 "update_xml" : [
38-
39 "hotel_view.xml",
40 "hotel_data.xml",
41 "hotel_folio_workflow.xml",
42@@ -50,7 +50,8 @@
43
44 ],
45 "active": False,
46- "installable": True
47+ "installable": True,
48+ 'application': True,
49 }
50
51-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
52\ No newline at end of file
53+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
54
55=== modified file 'hotel/hotel_view.xml'
56--- hotel/hotel_view.xml 2012-05-25 11:25:10 +0000
57+++ hotel/hotel_view.xml 2012-11-24 23:36:19 +0000
58@@ -14,7 +14,6 @@
59 <record model="ir.ui.view" id="view_hotel_floor_form">
60 <field name="name">hotel.floor.form</field>
61 <field name="model">hotel.floor</field>
62- <field name="type">form</field>
63 <field name="arch" type="xml">
64 <form string=" Hotel Floor">
65 <field name="name" colspan="1"/>
66@@ -25,7 +24,6 @@
67 <record model="ir.ui.view" id="view_hotel_floor_tree">
68 <field name="name">hotel.floor.tree</field>
69 <field name="model">hotel.floor</field>
70- <field name="type">tree</field>
71 <field name="arch" type="xml">
72 <tree string=" Hotel Floors">
73 <field name="name" colspan="1"/>
74@@ -52,7 +50,6 @@
75 <record model="ir.ui.view" id="view_hotel_room_amenities_type_form">
76 <field name="name">hotel.room_amenities_type_form</field>
77 <field name="model">hotel.room_amenities_type</field>
78- <field name="type">form</field>
79 <field name="arch" type="xml">
80 <form string="Hotel Room Amenities Type">
81 <field name="name"/>
82@@ -63,7 +60,6 @@
83 <record model="ir.ui.view" id="view_hotel_room_amenities_type_list">
84 <field name="name">hotel.room_amenities_type_list</field>
85 <field name="model">hotel.room_amenities_type</field>
86- <field name="type">tree</field>
87 <field name="arch" type="xml">
88 <tree string="Hotel Room Amenities Type">
89 <field name="complete_name"/>
90@@ -88,70 +84,14 @@
91
92 <!--===============================================================
93 Room Amenities
94- ===============================================================-->
95-
96- <record model="ir.ui.view" id="view_hotel_room_amenities_form">
97- <field name="name">hotel.room_amenities_form</field>
98- <field name="model">hotel.room_amenities</field>
99- <field name="type">form</field>
100- <field name="arch" type="xml">
101- <form string="Hotel Room Amenities">
102- <notebook>
103- <page string="Information">
104- <field name="name" select="1"/>
105- <field name="default_code" select="1"/>
106- <newline/>
107- <field name="categ_id" select="1" domain="[('isamenitype','=',True)]"/>
108- <field name="type" select="2"/>
109- <newline/>
110- <field name="procure_method"/>
111- <field name="state" select="2"/>
112- <field name="uom_id"/>
113- <field name="uom_po_id"/>
114- <field name="product_manager" select="2"/>
115- <newline/>
116- <separator colspan='4' string="Supplier Taxes"/>
117- <field name="supplier_taxes_id" colspan="4" nolabel='1'/>
118- <newline/>
119- <separator colspan='4' string="Customer Taxes"/>
120- <field name="taxes_id" colspan="4" nolabel='1'/>
121- </page>
122-
123- <page string="Procurement">
124- <field name="supply_method"/>
125- <field name="active" select="2"/>
126- <newline/>
127- <field name="list_price"/>
128- <field name="sale_ok" select="2"/>
129- <field name="standard_price"/>
130- <field name="purchase_ok" select="2"/>
131- <field name="cost_method"/>
132- <field name="rental" select="2"/>
133- <newline/>
134- <field name="uos_id" />
135- <field name="uos_coeff" />
136- <newline />
137- <field name="seller_ids" colspan="4" nolabel="1" widget="one2many_list"/>
138-
139- </page>
140- <page string="Descriptions">
141- <separator string="Description" />
142- <field name="description" colspan="4" nolabel="1" />
143- <separator string="Sale Description"/>
144- <field name="description_sale" colspan="4" nolabel="1"/>
145- <separator string="Purchase Description"/>
146- <field name="description_purchase" colspan="4" nolabel="1"/>
147- </page>
148-
149- </notebook>
150- </form>
151- </field>
152- </record>
153-
154+ ===============================================================-->
155+
156+
157+
158+
159 <record model="ir.ui.view" id="view_hotel_room_amenities_search">
160 <field name="name">hotel.room_amenities_search</field>
161 <field name="model">hotel.room_amenities</field>
162- <field name="type">search</field>
163 <field name="arch" type="xml">
164 <search string="Hotel Room Amenities">
165 <field name="name" />
166@@ -168,7 +108,6 @@
167 <record model="ir.ui.view" id="view_hotel_room_amenities_list">
168 <field name="name">hotel.room_amenities_list</field>
169 <field name="model">hotel.room_amenities</field>
170- <field name="type">tree</field>
171 <field name="arch" type="xml">
172 <tree string="Hotel Room Amenities">
173 <field name="name" />
174@@ -196,24 +135,22 @@
175 ========================================================-->
176 <record model="ir.ui.view" id="view_hotel_room_type_form">
177 <field name="name">hotel.room_type.form</field>
178- <field name="model">hotel.room_type</field>
179- <field name="type">form</field>
180- <field name="arch" type="xml">
181- <form string=" Hotel Room Type">
182- <field name="name" select="1"/>
183- <field name="parent_id" domain="[('isroomtype','=',True)]" select="1"/>
184- </form>
185- </field>
186- </record>
187- <record model="ir.ui.view" id="view_hotel_room_type_tree">
188- <field name="name">hotel.room_type.tree</field>
189- <field name="model">hotel.room_type</field>
190- <field name="type">tree</field>
191- <field name="arch" type="xml">
192- <tree string=" Hotel Room Type">
193- <field name="complete_name"/>
194- </tree>
195- </field>
196+ <field name="model">hotel.room_type</field>
197+ <field name="arch" type="xml">
198+ <form string=" Hotel Room Type">
199+ <field name="name" select="1"/>
200+ <field name="parent_id" domain="[('isroomtype','=',True)]" select="1"/>
201+ </form>
202+ </field>
203+ </record>
204+ <record model="ir.ui.view" id="view_hotel_room_type_tree">
205+ <field name="name">hotel.room_type.tree</field>
206+ <field name="model">hotel.room_type</field>
207+ <field name="arch" type="xml">
208+ <tree string=" Hotel Room Type">
209+ <field name="complete_name"/>
210+ </tree>
211+ </field>
212 </record>
213 <record model="ir.actions.act_window" id="open_hotel_room_type_form_tree">
214 <field name="name">Room Type</field>
215@@ -235,7 +172,6 @@
216 <record model="ir.ui.view" id="view_hotel_room_form">
217 <field name="name">hotel.room.form</field>
218 <field name="model">hotel.room</field>
219- <field name="type">form</field>
220 <field name="arch" type="xml">
221 <form string="Hotel Room">
222 <notebook>
223@@ -284,7 +220,6 @@
224 <record model="ir.ui.view" id="view_hotel_room_search">
225 <field name="name">hotel.room.search</field>
226 <field name="model">hotel.room</field>
227- <field name="type">search</field>
228 <field name="arch" type="xml">
229 <search string="Hotel Room" >
230 <field name="name" />
231@@ -301,7 +236,6 @@
232 <record model="ir.ui.view" id="view_hotel_room_tree">
233 <field name="name">hotel.room.tree</field>
234 <field name="model">hotel.room</field>
235- <field name="type">tree</field>
236 <field name="arch" type="xml">
237 <tree string="Hotel Room" >
238 <field name="name" />
239@@ -328,7 +262,6 @@
240 <record model="ir.ui.view" id="view_hotel_service_type_form">
241 <field name="name">hotel.service_type.form</field>
242 <field name="model">hotel.service_type</field>
243- <field name="type">form</field>
244 <field name="arch" type="xml">
245 <form string="Service Type">
246 <field name="name" select="1"/>
247@@ -339,7 +272,6 @@
248 <record model="ir.ui.view" id="view_hotel_service_type_tree">
249 <field name="name">hotel.service_type.tree</field>
250 <field name="model">hotel.service_type</field>
251- <field name="type">tree</field>
252 <field name="arch" type="xml">
253 <tree string="Service Type">
254 <field name="complete_name"/>
255@@ -359,67 +291,10 @@
256 sequence="9"
257 parent="hotel.menu_hotel_service"/>
258
259-
260- <record model="ir.ui.view" id="view_hotel_services_form">
261- <field name="name">.hotel.services.form</field>
262- <field name="model">hotel.services</field>
263- <field name="type">form</field>
264- <field name="arch" type="xml">
265- <form string="Hotel Services">
266- <notebook>
267- <page string="Information">
268- <field name="name" select="1"/>
269- <field name="default_code" select="1"/>
270- <newline/>
271- <field name="categ_id" domain="[('isservicetype','=',True)]" select="1"/>
272- <field name="type" select="2"/>
273- <newline/>
274- <field name="procure_method"/>
275- <field name="state" select="2"/>
276- <field name="uom_id"/>
277- <field name="uom_po_id"/>
278- <field name="product_manager" select="2"/>
279- <newline/>
280- <separator colspan='4' string="Supplier Taxes"/>
281- <field name="supplier_taxes_id" colspan="4" nolabel='1'/>
282- <newline/>
283- <separator colspan='4' string="Customer Taxes"/>
284- <field name="taxes_id" colspan="4" nolabel='1'/>
285- </page>
286- <page string="Procurement">
287- <field name="supply_method"/>
288- <field name="active" select="2"/>
289- <newline/>
290- <field name="list_price"/>
291- <field name="sale_ok" select="2"/>
292- <field name="standard_price"/>
293- <field name="purchase_ok" select="2"/>
294- <field name="cost_method"/>
295- <field name="rental" select="2"/>
296- <newline/>
297- <field name="uos_id" />
298- <field name="uos_coeff" />
299- <newline />
300- <field name="seller_ids" colspan="4" nolabel="1" widget="one2many_list"/>
301-
302- </page>
303- <page string="Descriptions">
304- <separator string="Description" />
305- <field name="description" colspan="4" nolabel="1" />
306- <separator string="Sale Description"/>
307- <field name="description_sale" colspan="4" nolabel="1"/>
308- <separator string="Purchase Description"/>
309- <field name="description_purchase" colspan="4" nolabel="1"/>
310- </page>
311- </notebook>
312- </form>
313- </field>
314- </record>
315-
316+
317 <record model="ir.ui.view" id="view_hotel_services_search">
318 <field name="name">hotel.services.search</field>
319 <field name="model">hotel.services</field>
320- <field name="type">search</field>
321 <field name="arch" type="xml">
322 <search string="Hotel Services" >
323 <field name="name" />
324@@ -436,7 +311,6 @@
325 <record model="ir.ui.view" id="view_hotel_services_tree">
326 <field name="name">hotel.services.tree</field>
327 <field name="model">hotel.services</field>
328- <field name="type">tree</field>
329 <field name="arch" type="xml">
330 <tree string="Hotel Services" >
331 <field name="name" />
332@@ -462,190 +336,9 @@
333 <!--========================================================
334 Hotel Folio
335 ========================================================-->
336-
337- <record model="ir.ui.view" id="view_hotel_folio1_form">
338- <field name="name">hotel.folio.form</field>
339- <field name="model">hotel.folio</field>
340- <field name="type">form</field>
341- <field name="arch" type="xml">
342- <form string="Folio">
343- <field name="name" colspan="1" string="Folio No"/>
344- <field name="date_order" string="Date"/>
345- <group colspan="3" col="2">
346- <field name="shop_id" string="Branch"/>
347- </group>
348- <group colspan="1" col="2">
349- <field name="shipped" string="Checked Out"/>
350- <field name="invoiced"/>
351- </group>
352- <notebook colspan="4">
353- <page string="Folio">
354- <field name="partner_id" on_change="onchange_partner_id(partner_id)" required="1" string="Guest Name" colspan="4"/>
355- <field name="partner_order_id" domain="[('partner_id','=',partner_id)]" string="Booking Contact"/>
356- <field name="partner_invoice_id" domain="[('partner_id','=',partner_id)]"/>
357- <field name="partner_shipping_id" domain="[('partner_id','=',partner_id)]" invisible="1"/>
358- <field name="pricelist_id" domain="[('type','=','sale')]"/>
359- <field name="project_id"/>
360- <group colspan="4" col="6">
361- <field name="checkin_date" on_change="onchange_dates(checkin_date,checkout_date)"/>
362- <field name="checkout_date" on_change="onchange_dates(checkin_date,checkout_date)"/>
363- <field name="duration" on_change="onchange_dates(checkin_date,False,duration)"/>
364- </group>
365- <field name="room_lines" colspan="4" default_get="{'checkin_date': checkin_date,'checkout_date':checkout_date}" nolabel="1">
366- <form string="Room Line" >
367- <notebook>
368- <page string="Folio Line">
369- <field name="checkin_date"/>
370- <field name="checkout_date" on_change="on_change_checkout(checkin_date,checkout_date)" />
371- <separator string="Automatic Declaration" colspan="4"/>
372- <field name="product_uom_qty"
373- on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)"
374- context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
375- invisible="1"/>
376- <field name="product_uom"
377- on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)"
378- string="Rent(UOM)"/>
379- <field name="product_id"
380- on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True, parent.date_order)"
381- context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
382- colspan="4" select="1" domain="[('isroom','=',True)]" string="Room No"/>
383- <separator string="Manual Description"
384- colspan="4"/>
385- <field name="name" colspan="4" select="2"/>
386- <field name="price_unit" select="2" string="Rent"/>
387- <field name="discount"/>
388- <newline/>
389- <field name="tax_id" colspan="4"/>
390- <separator string="States" colspan="4"/>
391- <field name="state" select="2"/>
392- <field name="invoiced" select="2"/>
393- </page>
394- <page string="Extra Info">
395- <field name="product_uos_qty" on_change="uos_change(product_uos, product_uos_qty, product_id)"/>
396- <field name="product_uos" />
397- <field name="product_packaging" />
398- <field name="address_allotment_id" select="2"/>
399- <separator string="Properties" colspan="4"/>
400- <field name="property_ids" colspan="4" nolabel="1"/>
401- </page>
402- <page string="Notes">
403- <field name="notes" colspan="4" nolabel="1"/>
404- </page>
405- <page string="History">
406- <separator string="Invoice Lines" colspan="4"/>
407- <field name="invoice_lines" colspan="4" nolabel="1"/>
408- <separator string="Inventory Moves" colspan="4"/>
409- <field name="move_ids" colspan="4" nolabel="1"/>
410- </page>
411- </notebook>
412- </form>
413- <tree string="Room Line" >
414- <field name="name"/>
415- <field name="checkin_date"/>
416- <field name="checkout_date"/>
417- <field name="product_id" string="Room No" />
418- <field name="product_uom" string="Rent(UOM)"/>
419- <field name="price_unit" string="Rent"/>
420- <field name="price_subtotal"/>
421- </tree>
422- </field>
423- <field name="service_lines" colspan="4" string = "Service Line" nolabel="1">
424- <form string="Service Line" >
425- <notebook>
426- <page string="Service Line">
427- <separator string="Automatic Declaration" colspan="4"/>
428- <field name="product_uom_qty"
429- on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)"
430- context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
431- select="1"/>
432- <field name="product_uom"
433- on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)"
434- />
435- <field name="product_id"
436- on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True, parent.date_order)"
437- context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
438- colspan="4" select="1" domain="[('isservice','=',True)]"/>
439- <separator string="Manual Description"
440- colspan="4"/>
441- <field name="name" colspan="4" select="2"/>
442- <field name="price_unit" select="2"/>
443- <field name="discount"/>
444- <newline/>
445- <field name="tax_id" colspan="4"/>
446- <separator string="States" colspan="4"/>
447- <field name="state" select="2"/>
448- <field name="invoiced" select="2"/>
449- </page>
450- <page string="Extra Info">
451- <field name="product_uos_qty" on_change="uos_change(product_uos, product_uos_qty, product_id)"/>
452- <field name="product_uos" />
453- <field name="product_packaging" />
454- <field name="address_allotment_id" select="2"/>
455- <separator string="Properties" colspan="4"/>
456- <field name="property_ids" colspan="4" nolabel="1"/>
457- </page>
458- <page string="Notes">
459- <field name="notes" colspan="4" nolabel="1"/>
460- </page>
461- <page string="History">
462- <separator string="Invoice Lines" colspan="4"/>
463- <field name="invoice_lines" colspan="4" nolabel="1"/>
464- <separator string="Inventory Moves" colspan="4"/>
465- <field name="move_ids" colspan="4" nolabel="1"/>
466- </page>
467- </notebook>
468- </form>
469- <tree string="Service Line">
470- <field name="name"/>
471- <field name="product_id" />
472- <field name="product_uom_qty"/>
473- <field name="price_unit"/>
474- <field name="price_subtotal"/>
475- </tree>
476- </field>
477- <newline/>
478- <group colspan="4" col="7">
479- <field name="amount_untaxed" sum="Untaxed amount"/>
480- <field name="amount_tax"/>
481- <field name="amount_total" sum="Total amount"/>
482- <button name="button_dummy" string="Compute" states="draft" type="object" icon="terp-sale"/>
483- </group>
484- <group colspan="4" col="13">
485- <field name="state" select="2"/>
486- <button name="order_confirm" string="Confirm Folio" states="draft" icon="gtk-apply"/>
487- <button name="invoice_recreate" string="Recreate Invoice" states="invoice_except" icon="gtk-redo"/>
488- <button name="invoice_corrected" string="Invoice Corrected" states="invoice_except" icon="gtk-paste-v"/>
489- <button name="ship_recreate" string="Recreate Procurement" states="shipping_except" icon="gtk-redo"/>
490- <button name="ship_corrected" string="Procurement Corrected" states="shipping_except" icon="gtk-paste-v"/>
491- <button name="manual_invoice" states="manual" string="Create Invoice" icon="gtk-new"/>
492- <button name="ship_cancel" string="Cancel Folio" states="shipping_except" icon="gtk-cancel"/>
493- <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-file"/>
494- <button name="action_cancel" string="Cancel Folio" states="manual,progress" type="object" icon="gtk-cancel"/>
495- <button name="cancel" string="Cancel Folio" states="draft" icon="gtk-cancel"/>
496- <button name="invoice_cancel" string="Cancel Folio" states="invoice_except" icon="gtk-cancel"/>
497- </group>
498- </page>
499- <page string="Other data">
500- <field name="user_id"/>
501- <field name="order_policy" invisible="1"/>
502- <field name="hotel_policy" attrs="{'readonly':[('state','!=','draft')]}"/>
503- <field name="client_order_ref" />
504- <separator string="Notes" colspan="4"/>
505- <field name="note" colspan="4" nolabel="1"/>
506- </page>
507- <page string="History">
508- <separator string="Related invoices" colspan="4"/>
509- <field name="invoice_ids" colspan="4" nolabel="1"/>
510- </page>
511- </notebook>
512- </form>
513- </field>
514- </record>
515 <record model="ir.ui.view" id="view_hotel_folio1_tree">
516 <field name="name">hotel.folio.tree</field>
517 <field name="model">hotel.folio</field>
518- <field name="type">tree</field>
519-
520 <field name="arch" type="xml">
521 <tree string="Hotel Folio1">
522
523@@ -662,7 +355,6 @@
524 <record model="ir.ui.view" id="hotel_folio_calendar_view">
525 <field name="name">Hotel- Folios Calendar</field>
526 <field name="model">hotel.folio</field>
527- <field name="type">calendar</field>
528 <field name="arch" type="xml">
529 <calendar string="Folios" date_start="checkin_date" color="user_id" date_stop="checkout_date">
530 <field name="name"/>
531
532=== added directory 'hotel/static'
533=== added directory 'hotel/static/src'
534=== added directory 'hotel/static/src/img'
535=== added file 'hotel/static/src/img/icon.png'
536Binary files hotel/static/src/img/icon.png 1970-01-01 00:00:00 +0000 and hotel/static/src/img/icon.png 2012-11-24 23:36:19 +0000 differ
537=== modified file 'hotel_reservation/__openerp__.py'
538--- hotel_reservation/__openerp__.py 2012-05-23 07:17:58 +0000
539+++ hotel_reservation/__openerp__.py 2012-11-24 23:36:19 +0000
540@@ -24,14 +24,17 @@
541 "author" : "Tiny",
542 "category" : "Generic Modules/Hotel Reservation",
543 "description": """
544- Module for Hotel/Resort/Property management. You can manage:
545- * Guest Reservation
546- * Group Reservartion
547- Different reports are also provided, mainly for hotel statistics.
548+Module for Hotel/Resort/Property management. You can manage:
549+
550+* Guest Reservation
551+* Group Reservartion
552+
553+Different reports are also provided, mainly for hotel statistics.
554 """,
555 "depends" : ["hotel"],
556 "init_xml" : [],
557- "demo_xml" : ['hotel_reservation_data.xml',
558+ "demo_xml" : [
559+ #'hotel_reservation_data.xml',
560 ],
561 "update_xml" : [
562 "hotel_reservation_view.xml",
563@@ -45,4 +48,4 @@
564 "installable": True
565 }
566
567-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
568\ No newline at end of file
569+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

Subscribers

People subscribed via source and target branches

to status/vote changes: