openerp-community team mailing list archive
-
openerp-community team
-
Mailing list archive
-
Message #00168
lp:~phong-nguyen-thanh/openobject-addons/addons-extra-trunk-hotel into lp:openobject-addons/extra-trunk
Phong Nguyen has proposed merging lp:~phong-nguyen-thanh/openobject-addons/addons-extra-trunk-hotel into lp:openobject-addons/extra-trunk.
Requested reviews:
luis tobar (ltobar)
Update modules related to hotel management to work with OpenERP 6.0
--
https://code.launchpad.net/~phong-nguyen-thanh/openobject-addons/addons-extra-trunk-hotel/+merge/43466
Your team OpenERP Community is subscribed to branch lp:~phong-nguyen-thanh/openobject-addons/addons-extra-trunk-hotel.
=== renamed file 'hotel/__terp__.py' => 'hotel/__openerp__.py'
=== modified file 'hotel/hotel_view.xml'
--- hotel/hotel_view.xml 2009-05-06 05:12:56 +0000
+++ hotel/hotel_view.xml 2010-12-12 11:53:10 +0000
@@ -672,4 +672,4 @@
parent="menu_open_hotel_service_type_form_tree"/>
</data>
-</openerp>
\ No newline at end of file
+</openerp>
=== modified file 'hotel/hotel_wizard.xml'
--- hotel/hotel_wizard.xml 2009-04-27 13:38:52 +0000
+++ hotel/hotel_wizard.xml 2010-12-12 11:53:10 +0000
@@ -8,12 +8,13 @@
name="hotel.folio.total_folio"
menu="False"
id="wizard_hotel_total"/>
-
+
<menuitem
- name="Hotel Management/Reports/Hotel Folio Report"
+ name="Hotel Folio Report"
action="wizard_hotel_total"
type="wizard"
id="wizard_hotel_menu"
+ parent="hotel_report_menu"
sequence="31"/>
</data>
-</openerp>
\ No newline at end of file
+</openerp>
=== renamed file 'hotel_housekeeping/__terp__.py' => 'hotel_housekeeping/__openerp__.py'
=== modified file 'hotel_housekeeping/hotel_housekeeping_view.xml'
--- hotel_housekeeping/hotel_housekeeping_view.xml 2009-05-06 05:12:56 +0000
+++ hotel_housekeeping/hotel_housekeeping_view.xml 2010-12-12 11:53:10 +0000
@@ -80,9 +80,10 @@
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_hotel_housekeeping_tree"/>
</record>
- <menuitem name="Hotel Management/Housekeeping"
+ <menuitem name="Housekeeping"
id="menu_open_hotel_housekeeping_form_tree"
action="open_hotel_housekeeping_form_tree"
+ parent="hotel.hotel_management_menu"
sequence="4" />
<!--
@@ -178,4 +179,4 @@
action="action_h_activity_form"
parent="menu_action_hotel_housekeeping_activity_type_view_form"/>
</data>
-</openerp>
\ No newline at end of file
+</openerp>
=== modified file 'hotel_housekeeping/hotel_housekeeping_wizard.xml'
--- hotel_housekeeping/hotel_housekeeping_wizard.xml 2009-04-27 13:38:52 +0000
+++ hotel_housekeeping/hotel_housekeeping_wizard.xml 2010-12-12 11:53:10 +0000
@@ -10,11 +10,12 @@
id="wizard_hotel_housekeeping_activity_report"/>
<menuitem
- name="Hotel Management/Reports/Activity Report"
+ name="Activity Report"
action="wizard_hotel_housekeeping_activity_report"
type="wizard"
menu="False"
id="wizard_activity_menu"
+ parent="hotel.hotel_report_menu"
sequence="29"/>
</data>
-</openerp>
\ No newline at end of file
+</openerp>
=== renamed file 'hotel_reservation/__terp__.py' => 'hotel_reservation/__openerp__.py'
=== modified file 'hotel_reservation/hotel_reservation.py'
--- hotel_reservation/hotel_reservation.py 2010-03-24 16:55:59 +0000
+++ hotel_reservation/hotel_reservation.py 2010-12-12 11:53:10 +0000
@@ -124,7 +124,7 @@
})],
'service_lines':reservation['folio_id']
})
- cr.execute('insert into hotel_folio_reservation_rel (order_id,invoice_id) values (%d,%d)', (reservation.id, folio))
+ cr.execute('insert into hotel_folio_reservation_rel (order_id,invoice_id) values (%s,%s)', (reservation.id, folio))
self.write(cr, uid, ids, {'state':'done'})
return True
hotel_reservation()
=== modified file 'hotel_reservation/hotel_reservation_view.xml'
--- hotel_reservation/hotel_reservation_view.xml 2009-05-06 05:12:56 +0000
+++ hotel_reservation/hotel_reservation_view.xml 2010-12-12 11:53:10 +0000
@@ -93,9 +93,10 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
- <menuitem name="Hotel Management/All Reservation"
+ <menuitem name="All Reservations"
id="menu_action_hotel_reservation_tree_all"
action="action_hotel_reservation_tree_all"
+ parent="hotel.hotel_management_menu"
sequence="3"/>
<menuitem name="New Reservation"
id="menu_open_hotel_reservation_form_tree"
@@ -111,9 +112,10 @@
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','draft')]</field>
</record>
- <menuitem name="Hotel Management/All Reservation/"
+ <menuitem name="All Draft Reservations"
id="menu_action_hotel_reservation_tree_draft"
action="action_hotel_reservation_tree_draft"
+ parent="menu_action_hotel_reservation_tree_all"
sequence="17"/>
<record model="ir.actions.act_window" id="action_hotel_reservation_tree_confirm">
@@ -124,9 +126,10 @@
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','confirm')]</field>
</record>
- <menuitem name="Hotel Management/All Reservation/"
+ <menuitem name="All Confirm Reservations"
id="menu_action_hotel_reservation_tree_confirm"
action="action_hotel_reservation_tree_confirm"
+ parent="menu_action_hotel_reservation_tree_all"
sequence="18"/>
<record model="ir.actions.act_window" id="action_hotel_reservation_tree_done">
@@ -137,9 +140,10 @@
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','done')]</field>
</record>
- <menuitem name="Hotel Management/All Reservation/"
+ <menuitem name="All Done Reservations"
id="menu_action_hotel_reservation_tree_done"
action="action_hotel_reservation_tree_done"
+ parent="menu_action_hotel_reservation_tree_all"
sequence="19"/>
<record model="ir.ui.view" id="hotel_calendar_view">
@@ -157,4 +161,4 @@
</data>
-</openerp>
\ No newline at end of file
+</openerp>
=== modified file 'hotel_reservation/hotel_reservation_wizard.xml'
--- hotel_reservation/hotel_reservation_wizard.xml 2009-04-27 13:38:52 +0000
+++ hotel_reservation/hotel_reservation_wizard.xml 2010-12-12 11:53:10 +0000
@@ -16,11 +16,12 @@
id="wizard_hotel_reservation_report_reservation"/>
<menuitem
- name="Hotel Management/Reports/Hotel Reservation Report"
+ name="Hotel Reservation Report"
action="wizard_hotel_reservation_report_reservation"
type="wizard"
menu="False"
+ parent="hotel.hotel_report_menu"
id="wizard_res_menu"
sequence="28"/>
</data>
-</openerp>
\ No newline at end of file
+</openerp>
=== renamed file 'hotel_restaurant/__terp__.py' => 'hotel_restaurant/__openerp__.py'
=== modified file 'hotel_restaurant/hotel_restaurant_view.xml'
--- hotel_restaurant/hotel_restaurant_view.xml 2010-03-25 14:16:13 +0000
+++ hotel_restaurant/hotel_restaurant_view.xml 2010-12-12 11:53:10 +0000
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<openerp>
<data>
- <menuitem id="hotel_restaurant_menu" name="Hotel Management/Restaurant" sequence="3"/>
+ <menuitem id="hotel_restaurant_menu" name="Restaurant" parent="hotel.hotel_management_menu" sequence="3"/>
<!-- ==============================
Table Master
============================== -->
@@ -427,4 +427,4 @@
</data>
-</openerp>
\ No newline at end of file
+</openerp>
=== modified file 'hotel_restaurant/hotel_restaurant_wizard.xml'
--- hotel_restaurant/hotel_restaurant_wizard.xml 2009-04-27 13:38:52 +0000
+++ hotel_restaurant/hotel_restaurant_wizard.xml 2010-12-12 11:53:10 +0000
@@ -14,10 +14,11 @@
id="wizard_hotel_table_res"/>
<menuitem
- name="Hotel Management/Reports/Table Reservation List"
+ name="Table Reservation List"
action="wizard_hotel_table_res"
type="wizard"
+ parent="hotel.hotel_report_menu"
id="wizard_list_menu"
sequence="30"/>
</data>
-</openerp>
\ No newline at end of file
+</openerp>
=== renamed file 'profile_hotel/__terp__.py' => 'profile_hotel/__openerp__.py'
=== renamed file 'report_hotel_reservation/__terp__.py' => 'report_hotel_reservation/__openerp__.py'
=== modified file 'report_hotel_reservation/report_hotel_reservation_view.xml'
--- report_hotel_reservation/report_hotel_reservation_view.xml 2010-07-06 05:10:58 +0000
+++ report_hotel_reservation/report_hotel_reservation_view.xml 2010-12-12 11:53:10 +0000
@@ -70,7 +70,8 @@
<field name="view_mode">graph,tree</field>
<field name = "view_id" ref="view_hotel_reservation_status_graph_bar"/>
</record>
- <menuitem name = "Hotel Management/Reports/This Month"
+ <menuitem name = "This Month"
+ parent="hotel.hotel_report_menu"
id = "menu_hotel_reservation_this_month"/>
<menuitem name="States By Reservation"
=== renamed file 'report_hotel_restaurant/__terp__.py' => 'report_hotel_restaurant/__openerp__.py'
=== modified file 'report_hotel_restaurant/report_hotel_restaurant_view.xml'
--- report_hotel_restaurant/report_hotel_restaurant_view.xml 2010-07-06 05:10:58 +0000
+++ report_hotel_restaurant/report_hotel_restaurant_view.xml 2010-12-12 11:53:10 +0000
@@ -62,7 +62,8 @@
<field name="view_mode">graph,tree</field>
</record>
- <menuitem name = "Hotel Management/Reports/This Month"
+ <menuitem name = "This Month"
+ parent="hotel.hotel_report_menu"
id = "menu_hotel_restaurant_this_month"/>
<record model="ir.actions.act_window" id="action_report_hotel_restaurant_status_tree_graph_bar">
Follow ups
