Merge lp:~serpentcs/hotel-management-system/hotel-7.0 into lp:hotel-management-system

[Vanooteghem]

Unmerged revisions

67. By Dhwani ( Serpent Consulting Services) on 2014-09-09

[IMP]: Improved the room category code

66. By Serpent Consulting Services on 2014-08-22

FIX : Corrected wrong domain on Hotel View(Courtesy :Andreas Andreou <email address hidden> )

65. By Dhwani ( Serpent Consulting Services) on 2014-08-07

[IMP]: Improved the code for folio

64. By Serpent Consulting Services on 2014-07-21

[ADD] FR translations added. Courtesy to Richmond FIKO <email address hidden>

63. By Dhwani ( Serpent Consulting Services) on 2014-05-27

[FIX]: Fixed the issue of room price while change the pricelist

62. By Dhwani ( Serpent Consulting Services) on 2014-04-18

[IMP]: Imprvoed the reservation code.

61. By Dhwani ( Serpent Consulting Services) on 2014-04-05

[IMP]: Improved the code

60. By Dhwani ( Serpent Consulting Services) on 2014-04-04

[IMP]: Standardized the modules as per v7

59. By Serpent Consulting Services on 2014-02-19

Some optimizations and py standards corrected

58. By Serpent Consulting Services on 2014-02-19

Company name updated

=== added directory 'board_frontdesk/Doc'
=== added file 'board_frontdesk/Doc/ChangeLog.txt'
--- board_frontdesk/Doc/ChangeLog.txt	1970-01-01 00:00:00 +0000
+++ board_frontdesk/Doc/ChangeLog.txt	2014-09-28 13:18:16 +0000
@@ -0,0 +1,8 @@
+============================================================================================================================
+ Version Change Log (board_frontdesk)
+============================================================================================================================
+0.03 on 2014-01-07 by Krunal Soni
+    * Added Accurate licensing terms and Copyright(C) on top inside license info in each py file.
+
+0.02 on 2013-11-13 by Sudhir Arya
+    * Standardized the module as per v7 standards.

=== modified file 'board_frontdesk/__init__.py'
--- board_frontdesk/__init__.py	2012-05-18 07:39:13 +0000
+++ board_frontdesk/__init__.py	2014-09-28 13:18:16 +0000
@@ -1,20 +1,23 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2012-Today Serpent Consulting Services Pvt. Ltd. (<http://www.serpentcs.com>)
+#    Copyright (C) 2004 OpenERP SA (<http://www.openerp.com>)
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
\ No newline at end of file
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== modified file 'board_frontdesk/__openerp__.py'
--- board_frontdesk/__openerp__.py	2012-05-22 14:06:57 +0000
+++ board_frontdesk/__openerp__.py	2014-09-28 13:18:16 +0000
@@ -1,42 +1,43 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2012-Today Serpent Consulting Services Pvt. Ltd. (<http://www.serpentcs.com>)
+#    Copyright (C) 2004 OpenERP SA (<http://www.openerp.com>)
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
 #
 ##############################################################################
 {
     "name":"Board for Hotel FrontDesk",
-    "version":"1.0",
-    "author":"Tiny",
+    "version" : "0.03",
+    "author":"Serpent Consulting Services Pvt. Ltd.", "OpenERP SA"
     "category":"Board/Hotel FrontDesk",
+    "website": ["http://www.serpentcs.com", "http://www.openerp.com"],
     "depends":[
         "board",
-        "report_hotel_reservation",
-        
-        
+        "hotel_reservation",
     ],
-    "demo_xml":[],
-    "update_xml":["board_frontdesk_view.xml"],
     "description": """
 This module implements a dashboard for hotel FrontDesk that includes:
     * Calendar view of Today's Check-In and Check-Out
     * Calendar view of Weekly Check-In and Check-Out
     * Calendar view of Monthly Check-In and Check-Out
     """,
-    "active":False,
-    "installable":True,
-}
\ No newline at end of file
+    "data":["board_frontdesk_view.xml"],
+    "auto_install": False,
+    "installable": True
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== modified file 'board_frontdesk/board_frontdesk_view.xml'
--- board_frontdesk/board_frontdesk_view.xml	2012-05-22 14:06:57 +0000
+++ board_frontdesk/board_frontdesk_view.xml	2014-09-28 13:18:16 +0000
@@ -1,51 +1,42 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
-
-<!--		<record model="board.note.type" id="note_frontdesk_type">-->
-<!--			<field name="name">FrontDesk</field>-->
-<!--		</record>-->
-	
-		<record model="ir.actions.act_window" id="action_view_frontdesk_cal">
-			<field name="name">FrontDesk</field>
-			<field name="res_model">hotel.reservation</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">calendar,form</field>
-			<field name="view_id" ref="hotel_reservation.hotel_calendar_view" />
-		</record>
-	
-		<record model="ir.ui.view" id="board_frontdesk_form">
-			<field name="name">board.frontdesk.form</field>
-			<field name="model">board.board</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="FrontDesk board">
-					<hpaned>
-						<child1>
-							<action
-								string="Reservation"
-								name="%(action_view_frontdesk_cal)d"
-								/>
-						</child1>
-					</hpaned>
-				</form>
-			</field>
-		</record>
-		
-		<record model="ir.actions.act_window" id="open_board_frontdesk">
-			<field name="name">FrontDesk Dashboard</field>
-			<field name="res_model">board.board</field>
-			<field name="view_type">form</field>
-			<field name="usage">menu</field>
-			<field name="view_id" ref="board_frontdesk_form"/>
-		</record>
-		
-		<menuitem
-			name="Hotel FrontDesk Board"
-			action="open_board_frontdesk"
-			sequence="1"
-			id="menu_board_frontdesk" icon="terp-graph"
-			parent="base.menu_dashboard_admin"/>
-			
-	</data>
-</openerp>
+    <data>
+
+        <record model="ir.actions.act_window" id="action_view_frontdesk_cal">
+            <field name="name">FrontDesk</field>
+            <field name="res_model">hotel.reservation</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar</field>
+            <field name="view_id" ref="hotel_reservation.hotel_calendar_view"/>
+        </record>
+
+        <record model="ir.ui.view" id="board_frontdesk_form">
+            <field name="name">board.frontdesk.form</field>
+            <field name="model">board.board</field>
+            <field name="arch" type="xml">
+                <form string="FrontDesk board" version="7.0">
+                    <board style="2-1">
+                        <column>
+                            <action string="Reservation" name="%(action_view_frontdesk_cal)d"/>
+                        </column>
+                    </board>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="open_board_frontdesk">
+            <field name="name">FrontDesk Dashboard</field>
+            <field name="res_model">board.board</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="board_frontdesk_form"/>
+        </record>
+
+        <menuitem id="menu_board_frontdesk"
+            name="Hotel FrontDesk Board"
+            action="open_board_frontdesk"
+            sequence="46"
+            parent="base.menu_reporting_dashboard"/>
+
+    </data>
+</openerp>
\ No newline at end of file

=== modified file 'board_frontdesk/i18n/board_frontdesk.pot' (properties changed: +x to -x)
=== added file 'board_frontdesk/i18n/fr.po'
--- board_frontdesk/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ board_frontdesk/i18n/fr.po	2014-09-28 13:18:16 +0000
@@ -0,0 +1,76 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* board_frontdesk
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2009-11-26 06:18:01+0000\n"
+"PO-Revision-Date: 2014-07-18 17:17-0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+"Language: fr\n"
+"X-Generator: Poedit 1.6.6\n"
+
+#. module: board_frontdesk
+#: model:ir.ui.menu,name:board_frontdesk.menu_board_frontdesk
+msgid "Hotel FrontDesk Board"
+msgstr "Réception Hôtel"
+
+#. module: board_frontdesk
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalide pour cette vue!"
+
+#. module: board_frontdesk
+#: model:ir.actions.act_window,name:board_frontdesk.open_board_frontdesk
+msgid "FrontDesk Dashboard"
+msgstr "Tableau de bord Accueil"
+
+#. module: board_frontdesk
+#: model:ir.module.module,description:board_frontdesk.module_meta_information
+msgid ""
+"\n"
+"This module implements a dashboard for hotel FrontDesk that includes:\n"
+"    * Calendar view of Today's Check-In and Check-Out\n"
+"    * Calendar view of Weekly Check-In and Check-Out\n"
+"    * Calendar view of Monthly Check-In and Check-Out\n"
+"    "
+msgstr ""
+"\n"
+"Ce module intègre un tableau de bord pour la Réception de l'hôtel composé "
+"de:\n"
+"    * Un calendrier des Arrivés et Départs quotidiens\n"
+"    * Un calendrier des Arrivés et Départs hebdomadaires\n"
+"    * Un calendrier des Arrivés et Départs mensuels\n"
+"    "
+
+#. module: board_frontdesk
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom du modèle incorrect dans \"action definition\""
+
+#. module: board_frontdesk
+#: model:ir.actions.act_window,name:board_frontdesk.action_view_frontdesk_cal
+msgid "FrontDesk"
+msgstr "Accueil"
+
+#. module: board_frontdesk
+#: view:board.board:0
+msgid "Reservation"
+msgstr "Réservation"
+
+#. module: board_frontdesk
+#: model:ir.module.module,shortdesc:board_frontdesk.module_meta_information
+msgid "Board for Hotel FrontDesk"
+msgstr "Tableau Réception"
+
+#. module: board_frontdesk
+#: view:board.board:0
+msgid "FrontDesk board"
+msgstr "Tableau Réception"

=== modified file 'board_frontdesk/i18n/fr_BE.po' (properties changed: +x to -x)
=== added directory 'hotel/Doc'
=== added file 'hotel/Doc/ChangeLog.txt'
--- hotel/Doc/ChangeLog.txt	1970-01-01 00:00:00 +0000
+++ hotel/Doc/ChangeLog.txt	2014-09-28 13:18:16 +0000
@@ -0,0 +1,23 @@
+============================================================================================================================
+ Version Change Log (hotel)
+============================================================================================================================
+0.07 on 2014-04-04 by Dhwani
+    * Standardized the module as per v7 standards.
+
+0.06 on 2014-01-11 by Krunal Soni
+    * Checked code quality and improved report format.
+
+0.05 on 2014-01-07 by Krunal Soni
+    * Added Accurate licensing terms and Copyright(C) on top inside license info in each py file.
+
+0.04 on 2013-11-19 by Sudhir Arya
+    * Fixed onchanage errors, bugs in generate folio and enhanced the code.
+
+0.03 on 2013-11-18 by Sudhir Arya
+    * Added access rights to some objects.
+
+0.02 on 2013-11-13 by Sudhir Arya
+    * Standardized the module as per v7 standards.
+
+1.01 --> Oct 1,2013 : Anil Kesariya
+	* Added Access control for manager user Improved labels and Fixed the error.
\ No newline at end of file

=== modified file 'hotel/__init__.py'
--- hotel/__init__.py	2012-05-22 14:06:57 +0000
+++ hotel/__init__.py	2014-09-28 13:18:16 +0000
@@ -1,25 +1,27 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2012-Today Serpent Consulting Services Pvt. Ltd. (<http://www.serpentcs.com>)
+#    Copyright (C) 2004 OpenERP SA (<http://www.openerp.com>)
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
 #
 ##############################################################################
-import hotel
-import wizard
-import report
+
+from . import hotel
+from . import wizard
+from . import report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'hotel/__openerp__.py'
--- hotel/__openerp__.py	2012-11-24 23:33:44 +0000
+++ hotel/__openerp__.py	2014-09-28 13:18:16 +0000
@@ -1,28 +1,35 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2012-Today Serpent Consulting Services Pvt. Ltd. (<http://www.serpentcs.com>)
+#    Copyright (C) 2004 OpenERP SA (<http://www.openerp.com>)
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
 #
 ##############################################################################
 
 {
+<<<<<<< TREE
     "name" : "Hotel Management Base",
     "version" : "1.0",
     "author" : "Tiny",
+=======
+    "name" : "Hotel Management",
+    "version" : "0.07",
+    "author": ["Serpent Consulting Services Pvt. Ltd.", "OpenERP SA" ],
+>>>>>>> MERGE-SOURCE
     "category" : "Generic Modules/Hotel Management",
     "description": """
 Module for Hotel/Resort/Rooms/Property management. You can manage:
@@ -35,6 +42,7 @@
 
 Different reports are also provided, mainly for hotel statistics.
     """,
+<<<<<<< TREE
     "depends" : ["sale"],
     "init_xml" : [],
     "demo_xml" : [
@@ -52,6 +60,26 @@
     "active": False,
     "installable": True,
     'application': True,
+=======
+    "website": ["http://www.serpentcs.com", "http://www.openerp.com"],
+    "depends" : ["sale_stock"],
+    "demo" : [
+    ],
+    "data": [
+        "security/hotel_security.xml",
+        "security/ir.model.access.csv",
+        "hotel_sequence.xml",
+        "hotel_folio_workflow.xml",
+#        "hotel_scheduler.xml",
+        "report/hotel_report.xml",
+        "hotel_view.xml",
+        "hotel_data.xml",
+        "wizard/hotel_wizard.xml",
+    ],
+    'css': ["static/src/css/room_kanban.css"],
+    "auto_install": False,
+    "installable": True
+>>>>>>> MERGE-SOURCE
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'hotel/data/hotel-color.png' (properties changed: -x to +x)
=== modified file 'hotel/data/hotel-grey.png' (properties changed: -x to +x)
=== modified file 'hotel/hotel.py'
--- hotel/hotel.py	2012-05-25 11:25:10 +0000
+++ hotel/hotel.py	2014-09-28 13:18:16 +0000
@@ -1,172 +1,164 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2012-Today Serpent Consulting Services Pvt. Ltd. (<http://www.serpentcs.com>)
+#    Copyright (C) 2004 OpenERP SA (<http://www.openerp.com>)
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
 #
 ##############################################################################
-from osv import fields, osv
+
+from openerp.osv import fields, osv
 import time
-import netsvc
-#import ir
-from mx import DateTime
+from openerp import netsvc
 import datetime
-from tools import config
+from openerp.tools.translate import _
+from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
 
-class hotel_floor(osv.osv):
+class hotel_floor(osv.Model):
     _name = "hotel.floor"
     _description = "Floor"
     _columns = { 
         'name': fields.char('Floor Name', size=64, required=True, select=True),
-        'sequence' : fields.integer('Sequence', size=64),
-        }    
-hotel_floor()
+        'sequence': fields.integer('Sequence', size=64),
+    }
 
-class product_category(osv.osv):
+class product_category(osv.Model):
     _inherit = "product.category"
     _columns = {
-        'isroomtype':fields.boolean('Is Room Type'),
-        'isamenitype':fields.boolean('Is amenities Type'),
-        'isservicetype':fields.boolean('Is Service Type'),
+        'isroomtype': fields.boolean('Is Room Type'),
+        'isamenitype': fields.boolean('Is amenities Type'),
+        'isservicetype': fields.boolean('Is Service Type'),
     }
-product_category()
 
-class hotel_room_type(osv.osv):
-    _name = "hotel.room_type"
-    _inherits = {'product.category':'cat_id'}
+class hotel_room_type(osv.Model):
+    _name = "hotel.room.type"
+    _inherits = {'product.category': 'cat_id'}
     _description = "Room Type"
-    _columns = { 
-        'cat_id':fields.many2one('product.category', 'category', required=True, select=True, ondelete='cascade'),
-   
+    _columns = {
+        'cat_id': fields.many2one('product.category', 'category', required=True, select=True, ondelete='cascade'),
     }
     _defaults = {
-        'isroomtype': lambda * a: 1,
-    }    
-hotel_room_type()
-
-
-class product_product(osv.osv):
+        'isroomtype': 1,
+    }
+
+class product_product(osv.Model):
     _inherit = "product.product"
     _columns = {
-        'isroom':fields.boolean('Is Room'),
-        'iscategid':fields.boolean('Is categ id'),
-        'isservice':fields.boolean('Is Service id'),
-                
+        'isroom': fields.boolean('Is Room'),
+        'iscategid': fields.boolean('Is categ id'),
+        'isservice': fields.boolean('Is Service id'),
     }
-product_product()
 
-class hotel_room_amenities_type(osv.osv):
-    _name = 'hotel.room_amenities_type'
+class hotel_room_amenities_type(osv.Model):
+    _name = 'hotel.room.amenities.type'
     _description = 'amenities Type'
     _inherits = {'product.category':'cat_id'}
     _columns = {
-        'cat_id':fields.many2one('product.category', 'category', required=True, ondelete='cascade'),
-       }
+        'cat_id': fields.many2one('product.category', 'category', required=True, ondelete='cascade'),
+    }
     _defaults = {
-        'isamenitype': lambda * a: 1,
-        
+        'isamenitype': 1,
     }
 
-hotel_room_amenities_type()
-
-class hotel_room_amenities(osv.osv):
-    _name = 'hotel.room_amenities'
+class hotel_room_amenities(osv.Model):
+    _name = 'hotel.room.amenities'
     _description = 'Room amenities'
     _inherits = {'product.product':'room_categ_id'}
     _columns = {
-         'room_categ_id':fields.many2one('product.product', 'Product Category', required=True, ondelete='cascade'),
-         'rcateg_id':fields.many2one('hotel.room_amenities_type', 'Amenity Catagory'),
-         'amenity_rate':fields.integer('Amenity Rate'),
-        }
+        'room_categ_id': fields.many2one('product.product', 'Product Category', required=True, ondelete='cascade'),
+        'rcateg_id': fields.many2one('hotel.room.amenities.type', 'Amenity Catagory'),
+    }
     _defaults = {
-        'iscategid': lambda * a: 1,
-        }
-        
-hotel_room_amenities()
+        'iscategid': 1,
+    }
 
-class hotel_room(osv.osv):
-  
+class hotel_room(osv.Model):
     _name = 'hotel.room'
-    _inherits = {'product.product':'product_id'}
+    _inherits = {'product.product': 'product_id'}
     _description = 'Hotel Room'
     _columns = {
-
         'product_id': fields.many2one('product.product', 'Product_id', required=True, ondelete='cascade'),
-        'floor_id':fields.many2one('hotel.floor', 'Floor No'),
-        'max_adult':fields.integer('Max Adult'),
-        'max_child':fields.integer('Max Child'),
-        'avail_status':fields.selection([('assigned', 'Assigned'), (' unassigned', 'Unassigned')], 'Room Status'),
-        'room_amenities':fields.many2many('hotel.room_amenities', 'temp_tab', 'room_amenities', 'rcateg_id', 'Room Amenities'),
-        }
+        'floor_id': fields.many2one('hotel.floor', 'Floor No', help='At which floor the room is located.'),
+        'max_adult': fields.integer('Max Adult'),
+        'max_child': fields.integer('Max Child'),
+        'room_amenities': fields.many2many('hotel.room.amenities', 'temp_tab', 'room_amenities', 'rcateg_id', 'Room Amenities', help='List of room amenities. '),
+        'status': fields.selection([('available', 'Available'), ('occupied', 'Occupied')], 'Status'),
+#        'room_reservation_line_ids': fields.one2many('hotel.room.reservation.line','room_id','Room Reservation Line'),
+        'room_rent_ids': fields.one2many('room.rent', 'rent_id', 'Room Rent'),
+    }
     _defaults = {
-        'isroom': lambda * a: 1,
-        'rental': lambda * a: 1,
-        }
-
-hotel_room()
-
-class hotel_folio(osv.osv):
-    
-    def _incoterm_get(self, cr, uid, context={}):
-        return  self.pool.get('sale.order')._incoterm_get(cr, uid, context={})
-    
-    def copy(self, cr, uid, id, default=None, context={}):
-        return  self.pool.get('sale.order').copy(cr, uid, id, default=None, context={})
-    
+        'isroom': 1,
+        'rental': 1,
+        'status': 'available',
+    }
+    
+    def set_room_status_occupied(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'status': 'occupied'}, context=context)
+
+    def set_room_status_available(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'status': 'available'}, context=context)
+
+class room_rent(osv.Model):
+    _name = 'room.rent'
+    _columns = {
+        'rent_id': fields.many2one('hotel.room', 'Room Rent'),
+        'price': fields.float('Price (Per night)'),
+        'mon': fields.boolean('Monday'),
+        'tue': fields.boolean('Tuesday'),
+        'wed': fields.boolean('Wednesday'),
+        'thu': fields.boolean('Thursday'),
+        'fri': fields.boolean('Friday'),
+        'sat': fields.boolean('Saturday'),
+        'sun': fields.boolean('Sunday'),
+    }
+
+class hotel_folio(osv.Model):
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        return self.pool.get('sale.order').copy(cr, uid, id, default=None, context=None)
+
     def _invoiced(self, cursor, user, ids, name, arg, context=None):
-        return  self.pool.get('sale.order')._invoiced(cursor, user, ids, name, arg, context=None)
+        return self.pool.get('sale.order')._invoiced(cursor, user, ids, name, arg, context=None)
 
     def _invoiced_search(self, cursor, user, obj, name, args):
-        return  self.pool.get('sale.order')._invoiced_search(cursor, user, obj, name, args)
-    
-    def _amount_untaxed(self, cr, uid, ids, field_name, arg, context):
-        return self.pool.get('sale.order')._amount_untaxed(cr, uid, ids, field_name, arg, context)
-    
-    def _amount_tax(self, cr, uid, ids, field_name, arg, context):
-        return self.pool.get('sale.order')._amount_tax(cr, uid, ids, field_name, arg, context)
-    
-    def _amount_total(self, cr, uid, ids, field_name, arg, context):
-        return self.pool.get('sale.order')._amount_total(cr, uid, ids, field_name, arg, context)
-    
+        return self.pool.get('sale.order')._invoiced_search(cursor, user, obj, name, args)
+
     _name = 'hotel.folio'
-    
     _description = 'hotel folio new'
-    
-    _inherits = {'sale.order':'order_id'}
-    
+    _inherits = {'sale.order': 'order_id'}
     _rec_name = 'order_id'
-    
+    _order = 'id desc'
     _columns = {
-          'order_id':fields.many2one('sale.order', 'order_id', required=True, ondelete='cascade'),
-          'checkin_date': fields.datetime('Check In', required=True, readonly=True, states={'draft':[('readonly', False)]}),
-          'checkout_date': fields.datetime('Check Out', required=True, readonly=True, states={'draft':[('readonly', False)]}),
-          'room_lines': fields.one2many('hotel_folio.line', 'folio_id'),
-          'service_lines': fields.one2many('hotel_service.line', 'folio_id'),
-          'hotel_policy':fields.selection([('prepaid', 'On Booking'), ('manual', 'On Check In'), ('picking', 'On Checkout')], 'Hotel Policy', required=True),
-          'duration':fields.float('Duration'),
+      'name': fields.char('Folio Number', size=24, readonly=True),
+      'order_id': fields.many2one('sale.order', 'Order', required=True, ondelete='cascade'),
+      'checkin_date': fields.datetime('Check In', required=True, readonly=True, states={'draft':[('readonly', False)]}),
+      'checkout_date': fields.datetime('Check Out', required=True, readonly=True, states={'draft':[('readonly', False)]}),
+      'room_lines': fields.one2many('hotel.folio.line', 'folio_id', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Hotel room reservation detail."),
+      'service_lines': fields.one2many('hotel.service.line', 'folio_id', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Hotel services detail provide to customer and it will include in main Invoice."),
+      'hotel_policy': fields.selection([('prepaid', 'On Booking'), ('manual', 'On Check In'), ('picking', 'On Checkout')], 'Hotel Policy', help="Hotel policy for payment that either the guest has to payment at booking time or check-in check-out time."),
+      'duration': fields.float('Duration in Days', readonly=True, help="Number of days which will automatically count from the check-in and check-out date. "),
     }
-    
     _defaults = {
-                 'hotel_policy':'manual'
-                 }
-    
+      'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'hotel.folio'),
+      'hotel_policy': 'manual'
+    }
     _sql_constraints = [
-                        ('check_in_out', 'CHECK (checkin_date<=checkout_date)', 'Check in Date Should be less than the Check Out Date!'),
-                       ]
-    
+        ('check_in_out', 'CHECK (checkin_date<=checkout_date)', 'Check in Date Should be less than the Check Out Date!'),
+    ]
+
     def _check_room_vacant(self, cr, uid, ids, context=None):
         folio = self.browse(cr, uid, ids[0], context=context)
         rooms = [] 
@@ -175,13 +167,22 @@
                 return False
             rooms.append(room.product_id)
         return True
-    
+
     _constraints = [
-            (_check_room_vacant, 'You can not allocate the same room twice!', ['room_lines'])
+        (_check_room_vacant, 'You cannot allocate the same room twice!', ['room_lines'])
     ]
-    
+
     def onchange_dates(self, cr, uid, ids, checkin_date=False, checkout_date=False, duration=False):
+        # This mathod gives the duration between check in checkout if customer will leave only for some hour it would be considers as
+        # a whole day. If customer will checkin checkout for more or equal hours , which configured in company as additional hours than
+        # it would be consider as full day
         value = {}
+        company_obj = self.pool.get('res.company')
+        configured_addition_hours = 0
+        company_ids = company_obj.search(cr, uid, [])
+        if company_ids:
+            company = company_obj.browse(cr, uid, company_ids[0])
+            configured_addition_hours = company.additional_hours
         if not duration:
             duration = 0
             if checkin_date and checkout_date:
@@ -189,6 +190,10 @@
                 chkout_dt = datetime.datetime.strptime(checkout_date, '%Y-%m-%d %H:%M:%S') 
                 dur = chkout_dt - chkin_dt
                 duration = dur.days
+                if configured_addition_hours > 0:
+                    additional_hours = abs((dur.seconds / 60) / 60)
+                    if additional_hours >= configured_addition_hours:
+                        duration += 1
             value.update({'value':{'duration':duration}})
         else:
             if checkin_date:
@@ -197,76 +202,77 @@
                 checkout_date = datetime.datetime.strftime(chkout_dt, '%Y-%m-%d %H:%M:%S')
                 value.update({'value':{'checkout_date':checkout_date}})
         return value
-    
+
     def create(self, cr, uid, vals, context=None, check=True):
         tmp_room_lines = vals.get('room_lines', [])
-        tmp_service_lines = vals.get('service_lines', [])
         vals['order_policy'] = vals.get('hotel_policy', 'manual')
-        if not vals.has_key("folio_id"):
-            vals.update({'room_lines':[], 'service_lines':[]})
-            folio_id = super(hotel_folio, self).create(cr, uid, vals, context)
-            for line in tmp_room_lines:
-                line[2].update({'folio_id':folio_id})
-            for line in tmp_service_lines:
-                line[2].update({'folio_id':folio_id})
-            vals.update({'room_lines':tmp_room_lines, 'service_lines':tmp_service_lines})
-            super(hotel_folio, self).write(cr, uid, [folio_id], vals, context)
+        if not 'service_lines' and 'folio_id' in vals:
+#          if not 'folio_id' in vals:
+            vals.update({'room_lines':[]})
+            folio_id = super(hotel_folio, self).create(cr, uid, vals, context=context)
+            for line in (tmp_room_lines):
+                line[2].update({'folio_id':folio_id})
+            vals.update({'room_lines':tmp_room_lines})
+            super(hotel_folio, self).write(cr, uid, [folio_id], vals, context=context)
         else:
-            folio_id = super(hotel_folio, self).create(cr, uid, vals, context)
+            folio_id = super(hotel_folio, self).create(cr, uid, vals, context=context)
         return folio_id
-    
-   
+
     def onchange_shop_id(self, cr, uid, ids, shop_id):
-        return  self.pool.get('sale.order').onchange_shop_id(cr, uid, ids, shop_id)
-    
-    def onchange_partner_id(self, cr, uid, ids, part):
-        return  self.pool.get('sale.order').onchange_partner_id(cr, uid, ids, part)
-    
-    def button_dummy(self, cr, uid, ids, context={}):
-        return  self.pool.get('sale.order').button_dummy(cr, uid, ids, context={})
-    
+        order_ids = [folio.order_id.id for folio in self.browse(cr, uid, ids)]
+        return self.pool.get('sale.order').onchange_shop_id(cr, uid, order_ids, shop_id)
+
+    def onchange_partner_id(self, cr, uid, ids, part, context=None):
+        order_ids = [folio.order_id.id for folio in self.browse(cr, uid, ids, context=context)]
+        return self.pool.get('sale.order').onchange_partner_id(cr, uid, order_ids, part, context=None)
+
+    def button_dummy(self, cr, uid, ids, context=None):
+        order_ids = [folio.order_id.id for folio in self.browse(cr, uid, ids)]
+        return self.pool.get('sale.order').button_dummy(cr, uid, order_ids, context={})
+
     def action_invoice_create(self, cr, uid, ids, grouped=False, states=['confirmed', 'done']):
-        i = self.pool.get('sale.order').action_invoice_create(cr, uid, ids, grouped=False, states=['confirmed', 'done'])
-        for line in self.browse(cr, uid, ids, context={}):
-            self.write(cr, uid, [line.id], {'invoiced':True})
-            if grouped:
-               self.write(cr, uid, [line.id], {'state' : 'progress'})
-            else:
-               self.write(cr, uid, [line.id], {'state' : 'progress'})
-        return i 
+        order_ids = [folio.order_id.id for folio in self.browse(cr, uid, ids)]
+        invoice_id = self.pool.get('sale.order').action_invoice_create(cr, uid, order_ids, grouped=False, states=['confirmed', 'done'])
+        for line in self.browse(cr, uid, ids):
+            values = {  
+                'invoiced': True,
+                'state': 'progress' if grouped else 'progress',
+            }
+            line.write(values)
+        return invoice_id
 
-   
-    def action_invoice_cancel(self, cr, uid, ids, context={}):
-        res = self.pool.get('sale.order').action_invoice_cancel(cr, uid, ids, context={})
-        for sale in self.browse(cr, uid, ids):
+    def action_invoice_cancel(self, cr, uid, ids, context=None):
+        order_ids = [folio.order_id.id for folio in self.browse(cr, uid, ids)]
+        res = self.pool.get('sale.order').action_invoice_cancel(cr, uid, order_ids, context=context)
+        for sale in self.browse(cr, uid, ids, context=context):
             for line in sale.order_line:
-                self.pool.get('sale.order.line').write(cr, uid, [line.id], {'invoiced': invoiced})
-        self.write(cr, uid, ids, {'state':'invoice_except', 'invoice_id':False})
-        return res  
-    def action_cancel(self, cr, uid, ids, context={}):
-        c = self.pool.get('sale.order').action_cancel(cr, uid, ids, context={})
-        ok = True
-        for sale in self.browse(cr, uid, ids):
-            for r in self.read(cr, uid, ids, ['picking_ids']):
-                for pick in r['picking_ids']:
-                    wf_service = netsvc.LocalService("workflow")
-                    wf_service.trg_validate(uid, 'stock.picking', pick, 'button_cancel', cr)
-            for r in self.read(cr, uid, ids, ['invoice_ids']):
-                for inv in r['invoice_ids']:
-                    wf_service = netsvc.LocalService("workflow")
-                    wf_service.trg_validate(uid, 'account.invoice', inv, 'invoice_cancel', cr)
-            
-        self.write(cr, uid, ids, {'state':'cancel'})
-        return c
-    
+                line.write({'invoiced': 'invoiced'})
+        self.write(cr, uid, ids, {'state':'invoice_except'}, context=context)
+        return res
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        order_ids = [folio.order_id.id for folio in self.browse(cr, uid, ids, context=context)]
+        rv = self.pool.get('sale.order').action_cancel(cr, uid, order_ids, context=context)
+        wf_service = netsvc.LocalService("workflow")
+        for sale in self.browse(cr, uid, ids, context=context):
+            for pick in sale.picking_ids:
+                wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_cancel', cr)
+            for invoice in sale.invoice_ids:
+                wf_service.trg_validate(uid, 'account.invoice', invoice.id, 'invoice_cancel', cr)
+                sale.write({'state':'cancel'})
+        return rv
+
     def action_wait(self, cr, uid, ids, *args):
-        res = self.pool.get('sale.order').action_wait(cr, uid, ids, *args)
-        for o in self.browse(cr, uid, ids):
-            if (o.order_policy == 'manual') and (not o.invoice_ids):
-                self.write(cr, uid, [o.id], {'state': 'manual'})
-            else:
-                self.write(cr, uid, [o.id], {'state': 'progress'})
-        return res
+       sale_order_obj = self.pool.get('sale.order')
+       res = False
+       for o in self.browse(cr, uid, ids):
+           res = sale_order_obj.action_wait(cr, uid, [o.order_id.id], *args)
+           if (o.order_policy == 'manual') and (not o.invoice_ids):
+               self.write(cr, uid, [o.id], {'state': 'manual'})
+           else:
+               self.write(cr, uid, [o.id], {'state': 'progress'})
+       return res
+
     def test_state(self, cr, uid, ids, mode, *args):
         write_done_ids = []
         write_cancel_ids = []
@@ -275,221 +281,248 @@
             self.pool.get('sale.order.line').write(cr, uid, write_done_ids, {'state': 'done'})
         if write_cancel_ids:
             self.pool.get('sale.order.line').write(cr, uid, write_cancel_ids, {'state': 'cancel'})
-        return res 
+        return res
+
     def procurement_lines_get(self, cr, uid, ids, *args):
-        res = self.pool.get('sale.order').procurement_lines_get(cr, uid, ids, *args)
-        return  res
-    def action_ship_create(self, cr, uid, ids, *args):
-        res = self.pool.get('sale.order').action_ship_create(cr, uid, ids, *args)
+        order_ids = [folio.order_id.id for folio in self.browse(cr, uid, ids)]
+        return self.pool.get('sale.order').procurement_lines_get(cr, uid, order_ids, *args)
+
+    def action_ship_create(self, cr, uid, ids, context=None):
+        order_ids = [folio.order_id.id for folio in self.browse(cr, uid, ids)]
+        return self.pool.get('sale.order').action_ship_create(cr, uid, order_ids, context=None)
+
+    def action_ship_end(self, cr, uid, ids, context=None):
+        order_ids = [folio.order_id.id for folio in self.browse(cr, uid, ids)]
+        res = self.pool.get('sale.order').action_ship_end(cr, uid, order_ids, context=context)
+        for order in self.browse(cr, uid, ids, context=context):
+            order.write ({'shipped':True})
         return res
-    def action_ship_end(self, cr, uid, ids, context={}):
-        res = self.pool.get('sale.order').action_ship_end(cr, uid, ids, context={})
-        for order in self.browse(cr, uid, ids):
-            val = {'shipped':True}
-            self.write(cr, uid, [order.id], val)
-        return res 
-    def _log_event(self, cr, uid, ids, factor=0.7, name='Open Order'):
-        return  self.pool.get('sale.order')._log_event(cr, uid, ids, factor=0.7, name='Open Order')
+
     def has_stockable_products(self, cr, uid, ids, *args):
-        return  self.pool.get('sale.order').has_stockable_products(cr, uid, ids, *args)
+        order_ids = [folio.order_id.id for folio in self.browse(cr, uid, ids)]
+        return self.pool.get('sale.order').has_stockable_products(cr, uid, order_ids, *args)
+
     def action_cancel_draft(self, cr, uid, ids, *args):
-        d = self.pool.get('sale.order').action_cancel_draft(cr, uid, ids, *args)
-        self.write(cr, uid, ids, {'state':'draft', 'invoice_ids':[], 'shipped':0})
-        self.pool.get('sale.order.line').write(cr, uid, ids, {'invoiced':False, 'state':'draft', 'invoice_lines':[(6, 0, [])]})
-        return d
-  
-hotel_folio()
-
-class hotel_folio_line(osv.osv):
-    
-    def copy(self, cr, uid, id, default=None, context={}):
-        return  self.pool.get('sale.order.line').copy(cr, uid, id, default=None, context={})
-    def _amount_line_net(self, cr, uid, ids, field_name, arg, context):
-        return  self.pool.get('sale.order.line')._amount_line_net(cr, uid, ids, field_name, arg, context)
+        if not len(ids):
+            return False
+        cr.execute('select id from sale_order_line where order_id IN %s and state=%s', (tuple(ids), 'cancel'))
+        line_ids = map(lambda x: x[0], cr.fetchall())
+        self.write(cr, uid, ids, {'state': 'draft', 'invoice_ids': [], 'shipped': 0})
+        self.pool.get('sale.order.line').write(cr, uid, line_ids, {'invoiced': False, 'state': 'draft', 'invoice_lines': [(6, 0, [])]})
+        wf_service = netsvc.LocalService("workflow")
+        for inv_id in ids:
+            # Deleting the existing instance of workflow for SO
+            wf_service.trg_delete(uid, 'sale.order', inv_id, cr)
+            wf_service.trg_create(uid, 'sale.order', inv_id, cr)
+        for (id, name) in self.name_get(cr, uid, ids):
+            message = _("The sales order '%s' has been set in draft state.") % (name,)
+            self.log(cr, uid, id, message)
+        return True
+
+class hotel_folio_line(osv.Model):
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        return self.pool.get('sale.order.line').copy(cr, uid, id, default=None, context=context)
+
     def _amount_line(self, cr, uid, ids, field_name, arg, context):
-        return  self.pool.get('sale.order.line')._amount_line(cr, uid, ids, field_name, arg, context)
+        return self.pool.get('sale.order.line')._amount_line(cr, uid, ids, field_name, arg, context)
+
     def _number_packages(self, cr, uid, ids, field_name, arg, context):
-        return  self.pool.get('sale.order.line')._number_packages(cr, uid, ids, field_name, arg, context)
-    def _get_1st_packaging(self, cr, uid, context={}):
-        return  self.pool.get('sale.order.line')._get_1st_packaging(cr, uid, context={})
-    def _get_checkin_date(self, cr, uid, context={}):
+        return self.pool.get('sale.order.line')._number_packages(cr, uid, ids, field_name, arg, context)
+
+    def _get_checkin_date(self, cr, uid, context=None):
         if 'checkin_date' in context:
             return context['checkin_date']
         return time.strftime('%Y-%m-%d %H:%M:%S')
-    def _get_checkout_date(self, cr, uid, context={}):
+
+    def _get_checkout_date(self, cr, uid, context=None):
         if 'checkin_date' in context:
             return context['checkout_date']
         return time.strftime('%Y-%m-%d %H:%M:%S')
- 
-    _name = 'hotel_folio.line'
-    _description = 'hotel folio1 room line'
+
+    _name = 'hotel.folio.line'
+    _description = 'hotel folio room line'
     _inherits = {'sale.order.line':'order_line_id'}
     _columns = {
-          'order_line_id':fields.many2one('sale.order.line', 'order_line_id', required=True, ondelete='cascade'),
-          'folio_id':fields.many2one('hotel.folio', 'folio_id', ondelete='cascade'),
-          'checkin_date': fields.datetime('Check In', required=True),
-          'checkout_date': fields.datetime('Check Out', required=True),
+        'order_line_id': fields.many2one('sale.order.line', 'Order Line', required=True, ondelete='cascade'),
+        'folio_id': fields.many2one('hotel.folio', 'Folio', ondelete='cascade'),
+        'checkin_date': fields.datetime('Check In', required=True),
+        'checkout_date': fields.datetime('Check Out', required=True),
     }
     _defaults = {
-       'checkin_date':_get_checkin_date,
-       'checkout_date':_get_checkout_date,
-       
+        'checkin_date':_get_checkin_date,
+        'checkout_date':_get_checkout_date,
     }
-    
+
     def create(self, cr, uid, vals, context=None, check=True):
-        if not context:
-            context = {}
-        if vals.has_key("folio_id"):
-            folio = self.pool.get("hotel.folio").browse(cr, uid, [vals['folio_id']])[0]
+        if 'folio_id' in vals:
+            folio = self.pool.get("hotel.folio").browse(cr, uid, vals['folio_id'], context=context)
             vals.update({'order_id':folio.order_id.id})
-        roomline = super(osv.osv, self).create(cr, uid, vals, context)
-        return roomline
-    
+        return super(osv.Model, self).create(cr, uid, vals, context)
+
+    def unlink(self, cr, uid, ids, context=None):
+        sale_line_obj = self.pool.get('sale.order.line')
+        for line in self.browse(cr, uid, ids, context=context):
+            if line.order_line_id:
+                sale_line_obj.unlink(cr, uid, [line.order_line_id.id], context=context)
+        return super(hotel_folio_line, self).unlink(cr, uid, ids, context=None)
+
     def uos_change(self, cr, uid, ids, product_uos, product_uos_qty=0, product_id=None):
-        return  self.pool.get('sale.order.line').uos_change(cr, uid, ids, product_uos, product_uos_qty=0, product_id=None)
-    
+        line_ids = [folio.order_line_id.id for folio in self.browse(cr, uid, ids)]
+        return  self.pool.get('sale.order.line').uos_change(cr, uid, line_ids, product_uos, product_uos_qty=0, product_id=None)
+
     def product_id_change(self, cr, uid, ids, pricelist, product, qty=0,
             uom=False, qty_uos=0, uos=False, name='', partner_id=False,
             lang=False, update_tax=True, date_order=False):
-        return  self.pool.get('sale.order.line').product_id_change(cr, uid, ids, pricelist, product, qty=0,
+        line_ids = [folio.order_line_id.id for folio in self.browse(cr, uid, ids)]
+        return self.pool.get('sale.order.line').product_id_change(cr, uid, line_ids, pricelist, product, qty=0,
             uom=False, qty_uos=0, uos=False, name='', partner_id=partner_id,
             lang=False, update_tax=True, date_order=False)
-        
+
     def product_uom_change(self, cursor, user, ids, pricelist, product, qty=0,
             uom=False, qty_uos=0, uos=False, name='', partner_id=False,
             lang=False, update_tax=True, date_order=False):
-        return  self.pool.get('sale.order.line').product_uom_change(cursor, user, ids, pricelist, product, qty=0,
+        return self.product_id_change(cursor, user, ids, pricelist, product, qty=0,
             uom=False, qty_uos=0, uos=False, name='', partner_id=partner_id,
             lang=False, update_tax=True, date_order=False)
-        
-    def on_change_checkout(self, cr, uid, ids, checkin_date=time.strftime('%Y-%m-%d %H:%M:%S'), checkout_date=time.strftime('%Y-%m-%d %H:%M:%S'), context=None):
+
+    def on_change_checkout(self, cr, uid, ids, checkin_date=None, checkout_date=None, context=None):
+        if not checkin_date:
+            checkin_date = time.strftime('%Y-%m-%d %H:%M:%S')
+        if not checkout_date:
+            checkout_date = time.strftime('%Y-%m-%d %H:%M:%S')
         qty = 1
         if checkout_date < checkin_date:
-            raise osv.except_osv ('Error !', 'Checkout must be greater or equal checkin date')
+            raise osv.except_osv(_('Error !'), _('Checkout must be greater or equal checkin date'))
         if checkin_date:
             diffDate = datetime.datetime(*time.strptime(checkout_date, '%Y-%m-%d %H:%M:%S')[:5]) - datetime.datetime(*time.strptime(checkin_date, '%Y-%m-%d %H:%M:%S')[:5])
             qty = diffDate.days
             if qty == 0:
                 qty = 1
         return {'value':{'product_uom_qty':qty}}
-    
-    def button_confirm(self, cr, uid, ids, context={}):
-       
-        return  self.pool.get('sale.order.line').button_confirm(cr, uid, ids, context={})
-    def button_done(self, cr, uid, ids, context={}):
-        res = self.pool.get('sale.order.line').button_done(cr, uid, ids, context={})
+
+    def button_confirm(self, cr, uid, ids, context=None):
+        line_ids = [folio.order_line_id.id for folio in self.browse(cr, uid, ids)]
+        return self.pool.get('sale.order.line').button_confirm(cr, uid, line_ids, context=context)
+
+    def button_done(self, cr, uid, ids, context=None):
+        line_ids = [folio.order_line_id.id for folio in self.browse(cr, uid, ids)]
+        res = self.pool.get('sale.order.line').button_done(cr, uid, line_ids, context=context)
         wf_service = netsvc.LocalService("workflow")
         res = self.write(cr, uid, ids, {'state':'done'})
         for line in self.browse(cr, uid, ids, context):
-            wf_service.trg_write(uid, 'sale.order', line.order_id.id, cr)
+            wf_service.trg_write(uid, 'sale.order', line.order_line_id.order_id.id, cr)
         return res
 
-        
-    def uos_change(self, cr, uid, ids, product_uos, product_uos_qty=0, product_id=None):
-        return  self.pool.get('sale.order.line').uos_change(cr, uid, ids, product_uos, product_uos_qty=0, product_id=None)
-    def copy(self, cr, uid, id, default=None, context={}):
-        return  self.pool.get('sale.order.line').copy(cr, uid, id, default=None, context={})
-    
-        
-
-hotel_folio_line()
-
-class hotel_service_line(osv.osv):
-    
-    def copy(self, cr, uid, id, default=None, context={}):
-        return  self.pool.get('sale.order.line').copy(cr, uid, id, default=None, context={})
-    def _amount_line_net(self, cr, uid, ids, field_name, arg, context):
-        return  self.pool.get('sale.order.line')._amount_line_net(cr, uid, ids, field_name, arg, context)
+    def copy_data(self, cr, uid, id, default=None, context=None):
+        line_id = self.browse(cr, uid, id).order_line_id.id
+        return self.pool.get('sale.order.line').copy_data(cr, uid, line_id, default=None, context=context)
+
+class hotel_service_line(osv.Model):
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        line_id = self.browse(cr, uid, id).service_line_id.id
+        return self.pool.get('sale.order.line').copy(cr, uid, line_id, default=None, context=context)
+
     def _amount_line(self, cr, uid, ids, field_name, arg, context):
-        return  self.pool.get('sale.order.line')._amount_line(cr, uid, ids, field_name, arg, context)
+        line_ids = [folio.service_line_id.id for folio in self.browse(cr, uid, ids)]
+        return  self.pool.get('sale.order.line')._amount_line(cr, uid, line_ids, field_name, arg, context)
+
     def _number_packages(self, cr, uid, ids, field_name, arg, context):
-        return  self.pool.get('sale.order.line')._number_packages(cr, uid, ids, field_name, arg, context)
-    def _get_1st_packaging(self, cr, uid, context={}):
-        return  self.pool.get('sale.order.line')._get_1st_packaging(cr, uid, context={})
-   
- 
-    _name = 'hotel_service.line'
+        line_ids = [folio.service_line_id.id for folio in self.browse(cr, uid, ids)]
+        return self.pool.get('sale.order.line')._number_packages(cr, uid, line_ids, field_name, arg, context)
+
+    _name = 'hotel.service.line'
     _description = 'hotel Service line'
     _inherits = {'sale.order.line':'service_line_id'}
     _columns = {
-          'service_line_id':fields.many2one('sale.order.line', 'service_line_id', required=True, ondelete='cascade'),
-          'folio_id':fields.many2one('hotel.folio', 'folio_id', ondelete='cascade'),
-         
+        'service_line_id': fields.many2one('sale.order.line', 'Service Line', required=True, ondelete='cascade'),
+        'folio_id': fields.many2one('hotel.folio', 'Folio', ondelete='cascade'),
     }
 
     def create(self, cr, uid, vals, context=None, check=True):
-        if not context:
-            context = {}
-        if vals.has_key("folio_id"):
-            folio = self.pool.get("hotel.folio").browse(cr, uid, [vals['folio_id']])[0]
+        if 'folio_id' in vals:
+            folio = self.pool.get("hotel.folio").browse(cr, uid, vals['folio_id'], context=context)
             vals.update({'order_id':folio.order_id.id})
-        roomline = super(osv.osv, self).create(cr, uid, vals, context)
-        return roomline
-    
-    def uos_change(self, cr, uid, ids, product_uos, product_uos_qty=0, product_id=None):
-        return  self.pool.get('sale.order.line').uos_change(cr, uid, ids, product_uos, product_uos_qty=0, product_id=None)
-    
+        return super(osv.Model, self).create(cr, uid, vals, context=context)
+
+    def unlink(self, cr, uid, ids, context=None):
+        sale_line_obj = self.pool.get('sale.order.line')
+        for line in self.browse(cr, uid, ids, context=context):
+            if line.service_line_id:
+                sale_line_obj.unlink(cr, uid, [line.service_line_id.id], context=context)
+        return super(hotel_service_line, self).unlink(cr, uid, ids, context=None)
+
     def product_id_change(self, cr, uid, ids, pricelist, product, qty=0,
             uom=False, qty_uos=0, uos=False, name='', partner_id=False,
             lang=False, update_tax=True, date_order=False):
-        return  self.pool.get('sale.order.line').product_id_change(cr, uid, ids, pricelist, product, qty=0,
+        line_ids = [folio.service_line_id.id for folio in self.browse(cr, uid, ids)]
+        return self.pool.get('sale.order.line').product_id_change(cr, uid, line_ids, pricelist, product, qty=0,
             uom=False, qty_uos=0, uos=False, name='', partner_id=partner_id,
             lang=False, update_tax=True, date_order=False)
+
     def product_uom_change(self, cursor, user, ids, pricelist, product, qty=0,
             uom=False, qty_uos=0, uos=False, name='', partner_id=False,
             lang=False, update_tax=True, date_order=False):
-        return  self.pool.get('sale.order.line').product_uom_change(cursor, user, ids, pricelist, product, qty=0,
+        return self.product_id_change(cursor, user, ids, pricelist, product, qty=0,
             uom=False, qty_uos=0, uos=False, name='', partner_id=partner_id,
             lang=False, update_tax=True, date_order=False)
-    def on_change_checkout(self, cr, uid, ids, checkin_date=time.strftime('%Y-%m-%d %H:%M:%S'), checkout_date=time.strftime('%Y-%m-%d %H:%M:%S'), context=None):
+
+    def on_change_checkout(self, cr, uid, ids, checkin_date=None, checkout_date=None, context=None):
+        if not checkin_date:
+            checkin_date = time.strftime('%Y-%m-%d %H:%M:%S')
+        if not checkout_date:
+            checkout_date = time.strftime('%Y-%m-%d %H:%M:%S')
         qty = 1
         if checkout_date < checkin_date:
-            raise osv.except_osv ('Error !', 'Checkout must be greater or equal checkin date')
+            raise osv.except_osv(_('Error !'), _('Checkout must be greater or equal checkin date'))
         if checkin_date:
             diffDate = datetime.datetime(*time.strptime(checkout_date, '%Y-%m-%d %H:%M:%S')[:5]) - datetime.datetime(*time.strptime(checkin_date, '%Y-%m-%d %H:%M:%S')[:5])
             qty = diffDate.days
         return {'value':{'product_uom_qty':qty}}
-    
-    def button_confirm(self, cr, uid, ids, context={}):
-       
-        return  self.pool.get('sale.order.line').button_confirm(cr, uid, ids, context={})
-    def button_done(self, cr, uid, ids, context={}):
-        return  self.pool.get('sale.order.line').button_done(cr, uid, ids, context={})
+
+    def button_confirm(self, cr, uid, ids, context=None):
+        line_ids = [folio.service_line_id.id for folio in self.browse(cr, uid, ids)]
+        return self.pool.get('sale.order.line').button_confirm(cr, uid, line_ids, context=context)
+
+    def button_done(self, cr, uid, ids, context=None):
+        line_ids = [folio.service_line_id.id for folio in self.browse(cr, uid, ids)]
+        return self.pool.get('sale.order.line').button_done(cr, uid, line_ids, context=context)
+
     def uos_change(self, cr, uid, ids, product_uos, product_uos_qty=0, product_id=None):
-        return  self.pool.get('sale.order.line').uos_change(cr, uid, ids, product_uos, product_uos_qty=0, product_id=None)
-    def copy(self, cr, uid, id, default=None, context={}):
-        return  self.pool.get('sale.order.line').copy(cr, uid, id, default=None, context={})
-    
-        
-
-hotel_service_line()
-
-class hotel_service_type(osv.osv):
-    _name = "hotel.service_type"
+        line_ids = [folio.service_line_id.id for folio in self.browse(cr, uid, ids)]
+        return self.pool.get('sale.order.line').uos_change(cr, uid, line_ids, product_uos, product_uos_qty=0, product_id=None)
+
+    def copy_data(self, cr, uid, id, default=None, context=None):
+        line_id = self.browse(cr, uid, id).service_line_id.id
+        return self.pool.get('sale.order.line').copy_data(cr, uid, line_id, default=default, context=context)
+
+class hotel_service_type(osv.Model):
+    _name = "hotel.service.type"
     _inherits = {'product.category':'ser_id'}
     _description = "Service Type"
     _columns = { 
-        'ser_id':fields.many2one('product.category', 'category', required=True, select=True, ondelete='cascade'),
-        
+        'ser_id': fields.many2one('product.category', 'Category', required=True, select=True, ondelete='cascade'),
     }
     _defaults = {
-        'isservicetype': lambda * a: 1,
-    }    
-hotel_service_type()
+        'isservicetype': 1,
+    }
 
-class hotel_services(osv.osv):
-    
+class hotel_services(osv.Model):
     _name = 'hotel.services'
     _description = 'Hotel Services and its charges'
     _inherits = {'product.product':'service_id'}
     _columns = {
-        'service_id': fields.many2one('product.product', 'Service_id', required=True, ondelete='cascade'),
-       
-        }
+        'service_id': fields.many2one('product.product', 'Service id', required=True, ondelete='cascade'),
+    }
     _defaults = {
-        'isservice': lambda * a: 1,
-        }
-hotel_services()
+        'isservice': 1,
+    }
 
+class res_company(osv.Model):
+    _inherit = 'res.company'
+    _columns = {
+        'additional_hours': fields.integer('Additional Hours', help="Provide the min hours value for check in, checkout days, whatever the hours will be provided here based on that extra days will be calculated."),
+    }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'hotel/hotel_data.xml'
--- hotel/hotel_data.xml	2012-05-22 14:06:57 +0000
+++ hotel/hotel_data.xml	2014-09-28 13:18:16 +0000
@@ -1,9 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
 	<data noupdate="1">
 	
 	<!-- Floor	-->
-	
 		<record id="hotel_floor_ground0" model="hotel.floor">
 			<field eval="&quot;Ground&quot;" name="name"/>
 		</record>
@@ -21,74 +20,60 @@
 		</record>
 		
 	<!-- hotel_room_amenities_type	-->
-		
-
-		<record id="hotel_room_amenities_type_0" model="hotel.room_amenities_type">
+		<record id="hotel_room_amenities_type_0" model="hotel.room.amenities.type">
 			<field name="parent_id"  ref="null" />
 			<field name="name">All Aminities</field>
-
 		</record>
-		<record id="hotel_room_amenities_type_1" model="hotel.room_amenities_type">
+		<record id="hotel_room_amenities_type_1" model="hotel.room.amenities.type">
 			<field name="parent_id" model="product.category" search="[('isamenitype','=',True)]" ref="hotel_room_amenities_type_0"/>
 			<field name="name">Beds</field>
 		</record>
-		<record id="hotel_room_amenities_type_2" model="hotel.room_amenities_type">
+		<record id="hotel_room_amenities_type_2" model="hotel.room.amenities.type">
 			<field name="parent_id" model="product.category" search="[('isamenitype','=',True)]" ref="hotel_room_amenities_type_0"/>
 			<field name="name">Tables</field>
 		</record>
-	    <record id="hotel_room_amenities_type_3" model="hotel.room_amenities_type">
+	    <record id="hotel_room_amenities_type_3" model="hotel.room.amenities.type">
 			<field name="parent_id" model="product.category" search="[('isamenitype','=',True)]" ref="hotel_room_amenities_type_1"/>
 			<field name="name">Single Bed</field>
 		</record>
-		<record id="hotel_room_amenities_type_4" model="hotel.room_amenities_type">
+		<record id="hotel_room_amenities_type_4" model="hotel.room.amenities.type">
 			<field name="parent_id" model="product.category" search="[('isamenitype','=',True)]" ref="hotel_room_amenities_type_1"/>
 			<field name="name">Double Bed</field>
 		</record>
 		
 	<!-- hotel_room_type	-->
-		
-		<record id="hotel_room_type_0" model="hotel.room_type">
-			<field name="parent_id"  ref="null" />
+		<record id="hotel_room_type_0" model="hotel.room.type">
+			<field name="parent_id" ref="null" />
 			<field name="name">All Rooms</field>
 		</record>
-		<record id="hotel_room_type_1" model="hotel.room_type">
+		<record id="hotel_room_type_1" model="hotel.room.type">
 			<field name="parent_id" model="product.category" search="[('isroomtype','=',True)]" ref="hotel_room_type_0"/>
 			<field name="name">Single</field>
 		</record>
-		<record id="hotel_room_type_2" model="hotel.room_type">
+		<record id="hotel_room_type_2" model="hotel.room.type">
 			<field name="parent_id" model="product.category" search="[('isroomtype','=',True)]" ref="hotel_room_type_0"/>
 			<field name="name">Double</field>
 		</record>
-
-		
-		<record id="hotel_room_type_3" model="hotel.room_type">
+		<record id="hotel_room_type_3" model="hotel.room.type">
   			 <field name="parent_id" model="product.category" search="[('isroomtype','=',True)]" ref="hotel_room_type_0"/>
   			 <field name="name">No Room</field>
   		</record>
-
-		<record id="hotel_room_type_3" model="hotel.room_type">
-			<field name="parent_id" model="product.category" search="[('isroomtype','=',True)]" ref="hotel_room_type_0"/>
-			<field name="name">No Room</field>
-		</record>
-		<!-- hotel_service_type	-->
-		
-		<record id="hotel_service_type_0" model="hotel.service_type">
+  		
+	<!-- hotel_service_type	-->
+		<record id="hotel_service_type_0" model="hotel.service.type">
 			<field name="parent_id" ref="null" />
 			<field name="name">All Services</field>
 		</record>
-		<record id="hotel_service_type_1" model="hotel.service_type">
+		<record id="hotel_service_type_1" model="hotel.service.type">
 			<field name="parent_id" model="product.category" search="[('isservicetype','=',True)]" ref="hotel_service_type_0"/>
 			<field name="name">Fixed</field>
 		</record>
-		<record id="hotel_service_type_2" model="hotel.service_type">
+		<record id="hotel_service_type_2" model="hotel.service.type">
 			<field name="parent_id" model="product.category" search="[('isservicetype','=',True)]" ref="hotel_service_type_0"/>
 			<field name="name">Variable</field>
 		</record>
-		
-
 			
 	<!-- hotel_room	-->
-	
 		<record id="hotel_room_6" model="hotel.room">
 			<field name="name">No Room Available</field>
 			<field name="categ_id" model="product.category" search="[('isroomtype','=',True),('name','=','No Room')]" ref="hotel_room_type_3"/> 
@@ -99,7 +84,6 @@
 			<field name="categ_id" model="product.category" search="[('isroomtype','=',True),('name','=','Single')]" ref="hotel_room_type_1"/> 
 			<field name="list_price">100.00</field>
 		</record>
-		
 		<record id="hotel_room_1" model="hotel.room">
 			<field name="name">Single-102</field>
 			<field name="categ_id" model="product.category" search="[('isroomtype','=',True),('name','=','Single')]" ref="hotel_room_type_1"/> 
@@ -132,8 +116,6 @@
 		</record>
 
 		<!-- hotel_services	-->
-
-	
 		<record id="hotel_service_6" model="hotel.services">
 			<field name="name">Internet</field>
 			<field name="categ_id" model="product.category" search="[('isservicetype','=',True),('name','=','Fixed')]" ref="hotel_service_type_1"/> 
@@ -150,6 +132,5 @@
 			<field name="list_price">150.00</field>
 		</record>
 		
-	
 	</data>
 </openerp>
\ No newline at end of file

=== modified file 'hotel/hotel_folio_workflow.xml'
--- hotel/hotel_folio_workflow.xml	2012-05-22 14:06:57 +0000
+++ hotel/hotel_folio_workflow.xml	2014-09-28 13:18:16 +0000
@@ -1,22 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
 	<data>
 		<record model="workflow" id="wkf_hotel">
-		<field name="name">hotel.folio.basic</field>
-		<field name="osv">hotel.folio</field>
-		<field name="on_create">True</field>
+			<field name="name">hotel.folio.basic</field>
+			<field name="osv">hotel.folio</field>
+			<field name="on_create">True</field>
 		</record>
 	
 	#----------------------------------------------
 	# Activity
 	#----------------------------------------------
-	
 		<record model="workflow.activity" id="act_draft">
 			<field name="wkf_id" ref="wkf_hotel"/>
 			<field name="flow_start">True</field>
 			<field name="name">draft</field>
 		</record>
-						
 		<record model="workflow.activity" id="act_router">
 			<field name="wkf_id" ref="wkf_hotel"/>
 			<field name="name">router</field>
@@ -32,7 +30,6 @@
 			<field name="wkf_id" ref="wkf_hotel"/>
 			<field name="name">wait_ship</field>
 		</record>
-
 		<record model="workflow.activity" id="act_done">
 			<field name="wkf_id" ref="wkf_hotel"/>
 			<field name="name">done</field>
@@ -62,7 +59,6 @@
 			<field name="kind">stopall</field>
 			<field name="action">action_cancel()</field>
 		</record>
-
 		<record model="workflow.activity" id="act_invoice">
 			<field name="wkf_id" ref="wkf_hotel"/>
 			<field name="name">invoice</field>
@@ -88,7 +84,6 @@
 			<field name="kind">stopall</field>
 			<field name="action">action_cancel()</field>
 		</record>
-
 		<record model="workflow.activity" id="act_ship">
 			<field name="wkf_id" ref="wkf_hotel"/>
 			<field name="name">ship</field>
@@ -138,48 +133,39 @@
 			<field name="act_to" ref="act_invoice_end"/>
 			<field name="condition">(order_policy=='picking')</field>
 		</record>
-
-
 		<record model="workflow.transition" id="trans_router_wait_invoice">
 			<field name="act_from" ref="act_router"/>
 			<field name="act_to" ref="act_wait_invoice"/>
 		</record>
-
 		<record model="workflow.transition" id="trans_router_wait_ship">
 			<field name="act_from" ref="act_router"/>
 			<field name="act_to" ref="act_wait_ship"/>
 		</record>
-
 		<record model="workflow.transition" id="trans_wait_invoice_cancel2">
 			<field name="act_from" ref="act_wait_invoice"/>
 			<field name="act_to" ref="act_cancel2"/>
 			<field name="signal">cancel</field>
 		</record>
-		
 		<record model="workflow.transition" id="trans_wait_ship_cancel3">
 			<field name="act_from" ref="act_wait_ship"/>
 			<field name="act_to" ref="act_cancel3"/>
 			<field name="signal">cancel</field>
 		</record>
-
 		<record model="workflow.transition" id="trans_wait_ship_ship">
 			<field name="act_from" ref="act_wait_ship"/>
 			<field name="act_to" ref="act_ship"/>
 			<field name="condition">(order_policy!='prepaid') or invoiced</field>
 		</record>
-		
 		<record model="workflow.transition" id="trans_wait_invoice_invoice">
 			<field name="act_from" ref="act_wait_invoice"/>
 			<field name="act_to" ref="act_invoice"/>
 			<field name="condition">(order_policy=='prepaid') or ((order_policy=='postpaid') and shipped)</field>
 		</record>
-		
 		<record model="workflow.transition" id="trans_wait_invoice_invoice_manual">
 			<field name="act_from" ref="act_wait_invoice"/>
 			<field name="act_to" ref="act_invoice"/>
 			<field name="signal">manual_invoice</field>
 		</record>
-
 		<record model="workflow.transition" id="trans_invoice_invoice_end">
 			<field name="act_from" ref="act_invoice"/>
 			<field name="act_to" ref="act_invoice_end"/>
@@ -209,7 +195,6 @@
 			<field name="act_from" ref="act_ship_end"/>
 			<field name="act_to" ref="act_done"/>
 		</record>
-
 		<record model="workflow.transition" id="trans_ship_ship_end">
 			<field name="act_from" ref="act_ship"/>
 			<field name="act_to" ref="act_ship_end"/>

=== added file 'hotel/hotel_scheduler.xml'
--- hotel/hotel_scheduler.xml	1970-01-01 00:00:00 +0000
+++ hotel/hotel_scheduler.xml	2014-09-28 13:18:16 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding='UTF-8'?>
+<openerp>
+    <data>
+        
+        <record model="ir.cron" id="room_analytic_cron">
+            <field name="name">Room analysis</field>
+            <field name="interval_number">1</field>
+            <field name="interval_type">minutes</field>
+            <field name="numbercall">-1</field>
+            <field name="doall" eval="False"/>
+            <field name="model" eval="'hotel.room'"/>
+            <field name="function" eval="'cron_room_line'"/>
+            <field name="args" eval="'()'" />
+        </record>
+        
+    </data>
+</openerp>
\ No newline at end of file

=== added file 'hotel/hotel_sequence.xml'
--- hotel/hotel_sequence.xml	1970-01-01 00:00:00 +0000
+++ hotel/hotel_sequence.xml	2014-09-28 13:18:16 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data noupdate="1">
+
+    <!-- Sequences for hotel.folio -->
+        <record model="ir.sequence.type" id="seq_type_hotel_folio">
+            <field name="name">Hotel Folio</field>
+            <field name="code">hotel.folio</field>
+        </record>
+        <record model="ir.sequence" id="seq_hotel_folio">
+            <field name="name">Hotel Folio</field>
+            <field name="code">hotel.folio</field>
+            <field name="prefix">Folio/</field>
+            <field name="padding">5</field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file

=== modified file 'hotel/hotel_view.xml'
--- hotel/hotel_view.xml	2012-11-23 03:00:23 +0000
+++ hotel/hotel_view.xml	2014-09-28 13:18:16 +0000
@@ -1,8 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
-	<menuitem id="hotel_management_menu" name="Hotel Management" web_icon="data/hotel-grey.png"
+    <data>
+    <menuitem id="hotel_management_menu" name="Hotel Management" web_icon="data/hotel-grey.png"
                   web_icon_hover="data/hotel-color.png"/>
+<<<<<<< TREE
 	<menuitem id="hotel_configuration_menu" name="Configuration" sequence="20" parent ="hotel_management_menu"/>
 	<menuitem id="hotel_report_menu" name="Reports" sequence="6" parent ="hotel_management_menu"/>
 	
@@ -437,3 +438,854 @@
 	
 	</data>
 </openerp>
+=======
+    <menuitem id="hotel_configuration_menu" name="Configuration" sequence="20" parent ="hotel_management_menu"/>
+    <menuitem id="hotel_report_menu" name="Reports" sequence="6" parent="hotel_management_menu"/>
+    
+	<!-- ###############################################
+		 #############Company Configuration#############
+   	     ###############################################
+   -->
+    
+	<record id="res_company_inherit_config_hotel" model="ir.ui.view">
+		<field name="name">res.company.inherit.config.hotel</field>
+		<field name="model">res.company</field>
+		<field name="inherit_id" ref="base.view_company_form" />
+		<field name="arch" type="xml">
+			<xpath expr="//field[@name='currency_id']" position="after">
+				<field name="additional_hours"/>
+			</xpath>
+		</field>
+	</record>
+    <!--====================================================
+                                Floor
+        ==================================================== -->
+        
+    <record model="ir.ui.view" id="view_hotel_floor_form">
+        <field name="name">hotel.floor.form</field>
+        <field name="model">hotel.floor</field>
+        <field name="arch" type="xml">
+            <form string=" Hotel Floor" version="7.0">
+             <sheet>
+               <group>
+                <field name="name" colspan="1"/>
+                <field name="sequence" select="1"/>
+               </group>
+             </sheet>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_hotel_floor_tree">
+        <field name="name">hotel.floor.tree</field>
+        <field name="model">hotel.floor</field>
+        <field name="arch" type="xml">
+            <tree string=" Hotel Floors">
+               <field name="name" colspan="1"/>
+               <field name="sequence" select="1"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="open_hotel_floor_form_tree">
+        <field name="name">Floor Structure</field>
+        <field name="res_model">hotel.floor</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    <menuitem name="Floor"
+              id="menu_open_hotel_floor_form_tree" 
+              action="open_hotel_floor_form_tree"
+              sequence="21"
+              parent="hotel_configuration_menu"/>
+    
+    <!--==================================================================== 
+                                Amenities Type
+        ====================================================================-->
+
+    <record model="ir.ui.view" id="view_hotel_room_amenities_type_form">
+        <field name="name">hotel.room_amenities_type_form</field>
+        <field name="model">hotel.room.amenities.type</field>
+        <field name="arch" type="xml">
+            <form string="Hotel Room Amenities Type" version="7.0">
+              <sheet>
+               <group>
+                <field name="name"/>
+                <field name="parent_id" domain="[('isamenitype','=',True)]"/>
+               </group>
+              </sheet>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_hotel_room_amenities_type_list">
+        <field name="name">hotel.room_amenities_type_list</field>
+        <field name="model">hotel.room.amenities.type</field>
+        <field name="arch" type="xml">
+            <tree string="Hotel Room Amenities Type">
+                <field name="complete_name"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_hotel_room_amenities_type_view_form">
+        <field name="name">Hotel Room Amenities Type</field>
+        <field name="res_model">hotel.room.amenities.type</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    <menuitem  id="menu_amenity" name="Amenity" parent="hotel.hotel_configuration_menu" sequence="2"/>
+    <menuitem name="Amenity Types"
+              id="menu_action_hotel_room_amenities_type_view_form"
+              action="action_hotel_room_amenities_type_view_form"
+              sequence="3"
+              parent="hotel.menu_amenity"/> 
+    
+    <!--===============================================================
+                                Room Amenities
+        ===============================================================-->
+        
+    <record id="view_hotel_room_amenities_form" model="ir.ui.view" >
+        <field name="name">hotel.room.amenities.form</field>
+        <field name="model">hotel.room.amenities</field>
+        <field name="arch" type="xml">
+            <form string="Hotel Room Amenities" version="7.0">
+              <sheet>
+                <h1>
+                    <label string="Amenity" />
+                    <field name="name" select="1"/>
+                </h1>
+                <group>
+                    <field name="default_code" select="1"/>
+                </group>
+                <notebook>
+                    <page string="Information">
+                       <group colspan="4" col="4">
+                        <field name="type" select="2"/>
+                        <field name="product_manager" select="2"/>
+                        <!-- <field name="procure_method"/> -->
+                        <field name="state" select="2"/>
+                        <field name="categ_id" select="1" domain="[('isamenitype','=',True)]"/>
+                        <field name="uom_id"/>
+                        <field name="uom_po_id"/>
+                       </group>
+                       <newline/>
+                       <separator colspan='4' string="Supplier Taxes"/>
+                       <field name="supplier_taxes_id" colspan="4" nolabel='1' help='Define supplier taxes if there any on the Amenity. '/>
+                       <newline/>
+                       <separator colspan='4' string="Customer Taxes"/>
+                       <field name="taxes_id" colspan="4" nolabel='1' help='List of customer taxes applied on the Amenity. '/>
+                    </page>
+                    
+                    <page string="Procurement">
+                        <group colspan="4" col="4">
+                           <!--  <field name="supply_method"/> -->
+                            <field name="active" select="2"/>
+                            <field name="list_price"/>
+                            <field name="cost_method"/>
+                            <field name="sale_ok" select="2"/>
+                            <field name="standard_price"/>
+                            <field name="rental" select="2"/>
+                            <field name="uos_id" />
+                            <field name="uos_coeff" />
+                         </group>
+                        <newline />
+                        <group>
+                            <separator string="Suppliers" />
+                            <field name="seller_ids" colspan="4" nolabel="1" widget="one2many_list"/>
+                        </group>
+                    </page>
+                    <page string="Descriptions">
+                        <separator string="Description" />
+                        <field name="description" colspan="4" nolabel="1" />
+                        <separator string="Sale Description"/>
+                        <field name="description_sale" colspan="4" nolabel="1"/>
+                        <separator string="Purchase Description"/>
+                        <field name="description_purchase" colspan="4" nolabel="1"/>
+                    </page>
+                </notebook>
+               </sheet>
+            </form>
+        </field>
+    </record>
+       
+    <record model="ir.ui.view" id="view_hotel_room_amenities_search">
+        <field name="name">hotel.room_amenities_search</field>
+        <field name="model">hotel.room.amenities</field>
+        <field name="arch" type="xml">
+            <search string="Hotel Room Amenities">
+                <field name="name" />
+                <field name="categ_id" select="1"/>
+                <field name="list_price" string="Amenity rate"/>
+                <newline/>
+                <group expand="0" string="Group By...">
+                    <filter name="categ_id" string="Catagory" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
+                </group>
+            </search>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_hotel_room_amenities_list">
+        <field name="name">hotel.room_amenities_list</field>
+        <field name="model">hotel.room.amenities</field>
+        <field name="arch" type="xml">
+            <tree string="Hotel Room Amenities">
+                <field name="name" />
+                <field name="categ_id" select="1"/>
+                <field name="list_price" string="Amenity rate"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_hotel_room_amenities_view_form">
+        <field name="name">Hotel Room Amenities</field>
+        <field name="res_model">hotel.room.amenities</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="view_hotel_room_amenities_list"/>
+    </record>
+    <menuitem name="Amenities"
+              id="menu_action_hotel_room_amenities_view_form"
+              action="action_hotel_room_amenities_view_form"
+              sequence="2"
+              parent="hotel.menu_amenity"/> 
+        
+    <!--========================================================
+                                Room Type
+        ========================================================-->
+    <record model="ir.ui.view" id="view_hotel_room_type_form">
+        <field name="name">hotel.room_type.form</field>
+        <field name="model">hotel.room.type</field>
+        <field name="arch" type="xml">
+            <form string=" Hotel Room Type" version="7.0">
+              <sheet>
+               <group>
+                <field name="name" select="1"/>
+                <field name="parent_id" domain="[('isroomtype','=',True)]" select="1"/>
+               </group>
+              </sheet>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_hotel_room_type_tree">
+        <field name="name">hotel.room_type.tree</field>
+        <field name="model">hotel.room.type</field>
+        <field name="arch" type="xml">
+            <tree string=" Hotel Room Type">
+                <field name="complete_name"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="open_hotel_room_type_form_tree">
+        <field name="name">Room Type</field>
+        <field name="res_model">hotel.room.type</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    <menuitem  id="menu_hotel_room" name="Room" parent="hotel.hotel_configuration_menu" sequence="2"/>
+    <menuitem name="Room Types"
+              id="menu_open_hotel_room_type_form_tree" 
+              action="open_hotel_room_type_form_tree"
+              sequence="6"
+              parent="hotel.menu_hotel_room"/>
+                
+    <!--===================================================
+                                Rooms
+        =================================================== -->
+
+    <record model="ir.ui.view" id="view_hotel_room_form">
+        <field name="name">hotel.room.form</field>
+        <field name="model">hotel.room</field>
+        <field name="arch" type="xml">
+            <form string="Hotel Room" version="7.0">
+            <header>
+                <field name="state" string="Room Status" widget='statusbar'/>
+            </header>
+            <sheet>
+            <div class="oe_title">
+		       <label for="name" string="Name" />
+		       <h1>
+		           <field name="name" select="1"/>
+		       </h1>
+		       <label for="status" string="Status" />
+		       <h2>
+		           <field name="status" />
+		       </h2>
+			</div>
+			<notebook>
+			<page string="Information">
+                    <group colspan="4" col="4">
+                       <field name="floor_id" string = "Floor" />
+                       <field name="categ_id" select="1" domain="[('isroomtype','=',True)]"/>
+                       <field name="product_manager" select="2"/>
+                       <field name="uom_id" invisible="1"/>
+                     </group>
+                       <newline/>
+                       <separator colspan='4' string="Supplier Taxes"/>
+                       <field name="supplier_taxes_id" colspan="4" nolabel='1' help='List of supplier taxes if there any on the defined room. '/>
+                       <newline/>
+                       <separator colspan='4' string="Customer Taxes"/>
+                       <field name="taxes_id" colspan="4" nolabel='1' help='Customer taxes apply on the perticular room. '/>
+                   </page>
+                   <page string = "Room Amenities">
+                       <separator string=" Room Amenities"/>
+                       <field name="room_amenities" colspan="4" nolabel="1"/>
+                   </page>
+                   <page string="Procurement">
+                     <group colspan="4" col="4">
+                       <field name="active" select="2"/>
+                       <field name="list_price"/> -->
+                       <field name="rental" select="2"/>
+                       <field name="standard_price"/>
+                       <field name="cost_method"/>
+                       <field name="uos_id"/>
+                       <field name="uos_coeff" />
+                       <newline/>
+                       <separator string="Room Rent" />
+                         <field name="room_rent_ids" colspan="4" nolabel='1' >
+                           <form string="Room Rent" version="7.0">
+                               <group colspan="4" col="2">
+                              		<field name="price"/>
+                              	</group>
+                              	<group colspan="4" col="8">
+                                <field name="mon"/>
+                                <field name="tue"/>
+                                <field name="wed"/>
+                                <field name="thu"/>
+                                <field name="fri"/>
+                                <field name="sat"/>
+                                <field name="sun"/>
+                            </group>
+                           </form>
+                           <tree string="Room Rent" editable="bottom" >
+                              	<field name="price"/>
+                                <field name="mon"/>
+                                <field name="tue"/>
+                                <field name="wed"/>
+                                <field name="thu"/>
+                                <field name="fri"/>
+                                <field name="sat"/>
+                                <field name="sun"/>
+                           </tree>
+                       </field>
+                     </group>
+                     <newline/>
+                     <group>
+                       <separator string="Suppliers" />
+                       <field name="seller_ids" colspan="4" nolabel="1" widget="one2many_list"/>
+                     </group>
+                   </page>
+                   <page string="Descriptions">
+                       <separator string="Description" />
+                       <field name="description" colspan="4" nolabel="1" />
+                   </page>
+            </notebook>
+            </sheet>
+            </form>
+        </field>
+    </record>
+       
+    <record model="ir.ui.view" id="view_hotel_room_search">
+        <field name="name">hotel.room.search</field>
+        <field name="model">hotel.room</field>
+        <field name="arch" type="xml">
+            <search string="Hotel Room" >
+                <field name="name" />
+                <field name="categ_id" select="1"/>
+                <field name="list_price" string="Room rate"/>
+                <field name="state" string="Status"/>
+                <newline/>
+                <filter string="Available" domain="[('state','=', 'unassigned')]" help="Available Rooms" />
+                <group expand="0" string="Group By...">
+                    <filter name="state" string="state" domain="[]" context="{'group_by':'state'}" />
+                </group>
+            </search>
+        </field>
+    </record>
+
+	<record model="ir.ui.view" id="view_hotel_room_tree">
+		<field name="name">hotel.room.tree</field>
+		<field name="model">hotel.room</field>
+		<field name="arch" type="xml">
+			<tree string="Hotel Room" >
+				<field name="name" />
+				<field name="categ_id" select="1"/>
+				<field name="list_price" string="Room rate"/>
+				<field name="status"/>
+			</tree>
+		</field>
+	</record>
+
+	<record model="ir.ui.view" id="view_hotel_room_kanban">
+		<field name="name">hotel.room.kanban</field>
+		<field name="model">hotel.room</field>
+		<field name="arch" type="xml">
+			<kanban version="7.0" default_group_by="status" >
+				<field name="product_id" />
+				<field name="status" />
+				<field name="color" />
+				<templates>
+                   <t t-name="kanban-box">
+                       <!-- <div class="oe_kanban_vignette oe_semantic_html_override"> -->
+                     <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_global_click">
+                        <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
+                               <span class="oe_e">í</span>
+                               <ul class="oe_dropdown_menu">
+                                   <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit</a></li></t>
+                                   <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
+                                   <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+                               </ul>
+                        </div>
+                           <!-- <div class="oe_kanban_details"> -->
+                        <div class="oe_kanban_content">
+                           <div class="oe_kanban_project_list">
+                               <h4>
+                                   <a type="open">
+                                        <t t-if="record.code.raw_value" style="margin-right: 10px">[<field name="code" />] </t> <field name="name"/>
+                                   </a>
+                               </h4>
+                               <div name="tags"/>
+                               <ul>
+                                   <li>Status: <field name="status"></field></li>
+                                   <li>Rate: <field name="list_price"></field></li>
+                               </ul>   
+                           </div>
+                           <div class="oe_kanban_bottom_right">
+                                <a t-if="record.status.raw_value === 'available'" type="object" string="Available" name="set_room_status_occupied" class="oe_kanban_status oe_kanban_status_green "> </a>
+                                <a t-if="record.status.raw_value === 'occupied'" type="object" string="occupied" name="set_room_status_available" class="oe_kanban_status oe_kanban_status_red " > </a>
+                           </div>
+                        </div>
+                       </div>
+                   </t>
+                </templates>
+			</kanban>
+		</field>
+	</record>
+
+	<record model="ir.actions.act_window" id="action_hotel_room_form">
+		<field name="name">Hotel Room</field>
+		<field name="res_model">hotel.room</field>
+		<field name="view_type">form</field>
+		<field name="view_mode">kanban,tree,form</field>
+	</record>
+
+	<menuitem name="Rooms"
+			  id="menu_open_hotel_room_form" 
+			  action="action_hotel_room_form"
+			  sequence="5"
+			  parent="hotel.menu_hotel_room"/>
+
+	<!-- Services -->
+	<record model="ir.ui.view" id="view_hotel_service_type_form">
+		<field name="name">hotel.service_type.form</field>
+		<field name="model">hotel.service.type</field>
+		<field name="arch" type="xml">
+			<form string="Service Type" version="7.0">
+               <sheet>
+                <group>
+                 <field name="name" select="1"/>
+                 <field name="parent_id" domain="[('isservicetype','=',True)]" select="1"/>
+                </group>
+               </sheet>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_hotel_service_type_tree">
+        <field name="name">hotel.service_type.tree</field>
+        <field name="model">hotel.service.type</field>
+        <field name="arch" type="xml">
+            <tree string="Service Type">
+                <field name="complete_name"/>
+            </tree>
+        </field>
+    </record>
+     <record model="ir.actions.act_window" id="open_hotel_service_type_form_tree">
+         <field name="name">Service Type</field>
+         <field name="res_model">hotel.service.type</field>
+         <field name="view_type">form</field>
+         <field name="view_mode">tree,form</field>
+     </record>
+     <menuitem id="menu_hotel_service" name="Services" parent="hotel.hotel_configuration_menu" sequence="2"/>
+     <menuitem name="Service Types"
+               id="menu_open_hotel_service_type_form_tree" 
+               action="open_hotel_service_type_form_tree"
+               sequence="9"
+               parent="hotel.menu_hotel_service"/>
+
+     <record model="ir.ui.view" id="view_hotel_services_form">
+         <field name="name">.hotel.services.form</field>
+         <field name="model">hotel.services</field>
+         <field name="arch" type="xml">
+             <form string="Hotel Services" version="7.0">
+             <sheet>
+             <h1>
+                 <label string="Service" />
+                 <field name="name" select="1"/>
+             </h1>
+             <group>
+                 <field name="default_code" select="1" />
+             </group>
+             <notebook>
+                 <page string="Information">
+                   <group>
+                   <group colspan="4" col="4">
+                     <field name="type" select="2"/>
+                     <!-- <field name="procure_method"/> -->
+                     <field name="state" select="2"/>
+                     <field name="categ_id" domain="[('isservicetype','=',True)]" select="1"/>
+                     <field name="product_manager" select="2"/>
+                     <field name="uom_id"/>
+                     <field name="uom_po_id"/>
+                   </group>
+                   </group>
+                     <newline/>
+                     <separator colspan='4' string="Supplier Taxes"/>
+                     <field name="supplier_taxes_id" colspan="4" nolabel='1' help='List of supplier taxes related to the service provided by hotel.'/>
+                     <newline/>
+                     <separator colspan='4' string="Customer Taxes"/>
+                     <field name="taxes_id" colspan="4" nolabel='1' help='Customer taxes applied on the service.'/>
+                 </page>
+                 <page string="Procurement">
+                     <group colspan="4" col="4">
+                         <!-- <field name="supply_method"/> -->
+                         <field name="active" select="2"/>
+                         <field name="list_price"/>
+                         <field name="cost_method"/>
+                         <field name="sale_ok" select="2"/>
+                         <field name="standard_price"/>
+                         <field name="rental" select="2"/>
+                         <field name="uos_id" />
+                         <field name="uos_coeff" />
+                      </group>
+                     <newline />
+                     <group>
+                         <separator string="Suplliers" />
+                         <field name="seller_ids" colspan="4" nolabel="1" widget="one2many_list"/>
+                     </group>
+                 </page>
+                 <page string="Descriptions">
+                     <separator string="Description" />
+                     <field name="description" colspan="4" nolabel="1" />
+                     <separator string="Sale Description"/>
+                     <field name="description_sale" colspan="4" nolabel="1"/>
+                     <separator string="Purchase Description"/>
+                     <field name="description_purchase" colspan="4" nolabel="1"/>
+                 </page>
+             </notebook>
+             </sheet>
+             </form>
+         </field>
+     </record>
+
+     <record model="ir.ui.view" id="view_hotel_services_search">
+         <field name="name">hotel.services.search</field>
+         <field name="model">hotel.services</field>
+         <field name="arch" type="xml">
+             <search string="Hotel Services" >
+                 <field name="name" />
+                 <field name="categ_id" select="1"/>
+                 <field name="list_price" string="Service rate"/>
+                 <newline/>
+                 <group expand="0" string="Group By...">
+                     <filter name="categ_id" string="Catagory" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
+                 </group>
+             </search>
+         </field>
+     </record>
+
+     <record model="ir.ui.view" id="view_hotel_services_tree">
+         <field name="name">hotel.services.tree</field>
+         <field name="model">hotel.services</field>
+         <field name="arch" type="xml">
+             <tree string="Hotel Services" >
+                 <field name="name" />
+                 <field name="categ_id" select="1"/>
+                 <field name="list_price" string="Service rate"/>
+             </tree>
+         </field>
+     </record>
+     <record model="ir.actions.act_window" id="action_hotel_services_form">
+         <field name="name">Hotel Services</field>
+         <field name="res_model">hotel.services</field>
+         <field name="view_type">form</field>
+         <field name="view_mode">tree,form</field>
+     </record>
+
+     <menuitem name="Services"
+               id="menu_open_hotel_services_form" 
+               action="action_hotel_services_form"
+               sequence="8"
+               parent="hotel.menu_hotel_service"/>
+
+    <!--========================================================
+                                Hotel Folio
+        ========================================================-->
+     <record model="ir.ui.view" id="view_hotel_folio1_form">
+         <field name="name">hotel.folio.form</field>
+         <field name="model">hotel.folio</field>
+         <field name="arch" type="xml">
+             <form string="Folio" version="7.0">
+              <header>
+                  <button name="order_confirm" string="Confirm Folio" states="draft" icon="gtk-apply" class="oe_highlight"/>
+                  <button name="invoice_recreate" string="Recreate Invoice" states="invoice_except" icon="gtk-redo"/>
+                  <button name="invoice_corrected" string="Invoice Corrected" states="invoice_except" icon="gtk-paste-v"/>
+                  <button name="ship_recreate" string="Recreate Procurement" states="shipping_except" icon="gtk-redo"/>
+                  <button name="ship_corrected" string="Procurement Corrected" states="shipping_except" icon="gtk-paste-v"/>
+                  <button name="manual_invoice" states="manual" string="Create Invoice" icon="gtk-new"/>
+                  <button name="ship_cancel" string="Cancel Folio" states="shipping_except" icon="gtk-cancel" class="oe_highlight" />
+                  <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-file"/>
+                  <button name="action_cancel" string="Cancel Folio" states="manual,progress" type="object" icon="gtk-cancel"/>
+                  <button name="cancel" string="Cancel Folio" states="draft" icon="gtk-cancel"/>
+                  <button name="invoice_cancel" string="Cancel Folio" states="invoice_except" icon="gtk-cancel"/>
+                  <field name="state" select="2" widget="statusbar" statusbar_visible="draft,sent,invoiced,done"/>
+              </header>
+               <sheet>
+                 <label string="Folio Number"/>
+                 <h1>
+                  <field name="name" colspan="4"/>
+                 </h1>
+                 <group colspan="4" col="4">
+                     <field name="date_order"/>
+                     <field name="invoiced"/> 
+                     <field name="shop_id" string="Branch"/>
+                 </group>
+                 <notebook colspan="4">
+                     <page string="Folio">
+                      <group colspan="4" col="4">
+                         <field name="partner_id" on_change="onchange_partner_id(partner_id)" required="1" string="Guest Name"/>
+                         <field name="partner_invoice_id" domain="[('parent_id','=',partner_id)]" />
+                         <field name="pricelist_id"  domain="[('type','=','sale')]" />
+                         <field name="project_id"/>
+                         <field name="partner_shipping_id" domain="[('parent_id','=',partner_id)]" invisible="1" />
+                      </group>
+                         <newline/>
+                         <group colspan="4" col="6">
+                             <field name="checkin_date" on_change="onchange_dates(checkin_date,checkout_date)" />
+                             <field name="checkout_date" on_change="onchange_dates(checkin_date,checkout_date)"/>
+                             <field name="duration" on_change="onchange_dates(checkin_date,False,duration)"/>
+                         </group>
+                         <separator string="Room Lines" colspan="4"/>
+                         <field name="room_lines"  colspan="4" string="Room Line" default_get="{'checkin_date': checkin_date,'checkout_date':checkout_date}" nolabel="1">
+                             <form string="Room Line"  version="7.0">
+                                 <notebook>
+                                     <page string="Folio Line">
+                                         <group>
+                                         <field name="checkin_date"/>
+                                         <field name="checkout_date" on_change="on_change_checkout(checkin_date,checkout_date)" />
+                                         <separator string="Automatic Declaration" colspan="4"/>
+                                         <field name="product_uom_qty"
+                                             on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order)"
+                                             context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
+                                             invisible="1"/>
+                                         <field name="product_uom"
+                                             on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order)"
+                                             string="Rent(UOM)"/>
+                                         <field name="product_id"
+                                             on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order)"
+                                             context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
+                                             colspan="4" select="1" domain="[('isroom','=',True)]" string="Room No"/>
+                                         </group>
+                                         <separator string="Manual Description"
+                                             colspan="4" />
+                                         <field name="name" colspan="4" select="2" placeholder="---Description---"/>
+                                         <group>
+                                         <field name="price_unit" select="2" string="Rent"/>
+                                         <field name="discount"/>
+                                         <newline/>
+                                         <field name="tax_id" colspan="4" nolabel="1"/>
+                                         <separator string="States" colspan="4"/>
+                                         <field name="state" select="2"/>
+                                         <field name="invoiced" select="2"/>
+                                         </group>
+                                     </page>
+                                     <page string="Extra Info">
+                                         <group>
+                                         <field name="product_uos_qty"/>
+                                         <field name="product_uos"  />
+                                         <field name="address_allotment_id" select="2"/>
+                                         </group>
+                                         <!-- <separator string="Properties" colspan="4"/> -->
+                                     </page>
+                                     <page string="History">
+                                         <separator string="Invoice Lines" colspan="4"/>
+                                         <field name="invoice_lines" colspan="4" nolabel="1"/>
+                                     </page>
+                                 </notebook>
+                             </form>
+                             <tree string = "Room Line">
+                                 <field name="name"/>
+                                 <field name="checkin_date"/>
+                                 <field name="checkout_date"/>
+                                 <field name="product_id" string="Room No"/>
+                                 <field name="product_uom" string="Rent(UOM)"/>
+                                 <field name="price_unit" string="Rent"/>
+                                 <field name="price_subtotal"/>
+                                 <field name="state"/>
+                             </tree>
+                         </field>
+                         <separator string="Service Lines" colspan="4"/>
+                         <field name="service_lines"  colspan="4" string = "Service Line" nolabel="1">
+                             <form string="Service Line"  version="7.0">
+                                 <notebook>
+                                     <page string="Service Line">
+                                         <separator string="Automatic Declaration" colspan="4"/>
+                                         <group>
+                                         <field name="product_uom_qty"
+                                             on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order)"
+                                             context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
+                                             select="1"/>
+                                         <field name="product_uom"
+                                             on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order)"
+                                             />
+                                         <field name="product_id"
+                                             on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order)"
+                                             context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
+                                             select="1" domain="[('isservice','=',True)]" />
+                                         </group>
+                                         <separator string="Manual Description"
+                                             colspan="4"/>
+                                         <field name="name" colspan="4" select="2" placeholder="---Description---"/>
+                                         <group>
+                                         <field name="price_unit" select="2"/>
+                                         <field name="discount"/>
+                                         </group>
+                                         <newline/>
+                                         <field name="tax_id" colspan="4"/>
+                                         <group>
+                                         <separator string="States" colspan="4"/>
+                                         <field name="state" select="2"/>
+                                         <field name="invoiced" select="2"/>
+                                         </group>
+                                     </page>
+                                     <page string="Extra Info">
+                                         <group>
+                                         <field name="product_uos_qty"/>
+                                         <field name="product_uos"  />
+                                         <field name="address_allotment_id" select="2"/>
+                                         </group>
+                                         <!-- <separator string="Properties" colspan="4"/> -->
+                                     </page>
+                                     <page string="History">
+                                         <separator string="Invoice Lines" colspan="4"/>
+                                         <field name="invoice_lines" colspan="4" nolabel="1"/>
+                                     </page>
+                                 </notebook>
+                             </form>
+                             <tree string="Service Line">
+                                 <field name="name"/>
+                                 <field name="product_id" />
+                                 <field name="product_uom_qty"/>
+                                 <field name="price_unit"/>
+                                 <field name="price_subtotal"/>
+                                 <field name="state"/>
+                             </tree>
+                         </field>
+                         <group colspan="2" class="oe_subtotal_footer oe_right">
+                             <field name="amount_untaxed" sum="Untaxed amount" widget='monetary' />
+                             <field name="amount_tax" widget='monetary'/>
+                                <div class="oe_subtotal_footer_separator oe_inline">
+                                 <label for="amount_total" />
+                                 <button name="button_dummy" string="Compute" states="draft" type="object" icon="terp-sale" class="oe_highlight"/>
+                                </div>
+                             <field name="amount_total" nolabel="1" sum="Total amount" widget='monetary'/>
+                         </group>
+                        <div class="oe_clear"/>
+                     </page>
+                     <page string="Other data">
+                       <group>
+                         <field name="user_id"/>
+                         <field name="order_policy" invisible="1"/>
+                         <field name="hotel_policy" attrs="{'readonly':[('state','not in',('draft'))]}"/>
+                         <field name="client_order_ref" />   
+                       </group>
+                     </page>
+                     <page string="History">
+                         <separator string="Related invoices" colspan="4"/>
+                         <field name="invoice_ids" colspan="4" nolabel="1"/>
+                     </page>
+                 </notebook>
+              </sheet>
+             </form>
+         </field>
+     </record>
+     <record model="ir.ui.view" id="view_hotel_folio1_tree">
+         <field name="name">hotel.folio.tree</field>
+         <field name="model">hotel.folio</field>
+         <field name="arch" type="xml">
+             <tree string="Hotel Folio" colors="blue:state == 'draft';gray:state == 'done'">
+                 <field name="checkin_date" />
+                 <field name="checkout_date" />
+                 <field name="name" select="1"/>
+                 <field name="partner_id"  select="1"/>
+                 <field name="date_order" select="1"/>
+                 <field name="state"/>
+                 <field name="amount_total" sum="Total amount"/>
+             </tree>
+         </field>
+     </record>
+
+     <record model="ir.ui.view" id="hotel_folio_calendar_view">
+         <field name="name">Hotel- Folios Calendar</field>
+         <field name="model">hotel.folio</field>
+         <field name="arch" type="xml">
+             <calendar string="Folios" date_start="checkin_date" color="user_id" date_stop="checkout_date">
+                 <field name="name"/>
+                 <field name="partner_id"/>
+                 <field name="duration"/>
+             </calendar>
+         </field>
+     </record>
+
+     <record model="ir.actions.act_window" id="open_hotel_folio1_form_tree_all">
+         <field name="name">Hotel Folio</field>
+         <field name="res_model">hotel.folio</field>
+         <field name="view_type">form</field>
+         <field name="view_mode">tree,form,calendar</field>
+     </record>
+
+     <menuitem  id="menu_all_folio" name="Folio" parent="hotel.hotel_management_menu" sequence="4"/>
+     <menuitem name="Generate Folio"
+               id="menu_open_hotel_folio1_form_tree_all"
+               action="open_hotel_folio1_form_tree_all"
+               sequence="5"
+               parent ="menu_all_folio"/>
+
+     <!-- Categories for Room, Amenities, Services -->
+     <record model="ir.actions.act_window" id="hotel_room_category_action">
+         <field name="name">Rooms by Category</field>
+         <field name="type">ir.actions.act_window</field>
+         <field name="res_model">product.category</field>
+         <field name="domain">[('parent_id','=',False),('isroomtype','=',True)]</field>
+         <field name="view_type">tree</field>
+         <field name="view_id" ref="product.product_category_tree_view"/>
+     </record>
+     <menuitem name="Room by Category" 
+               id="menu_hotel_room_category_action" 
+               action="hotel_room_category_action"
+               sequence="7"
+               parent="hotel.menu_hotel_room"/>
+
+     <record model="ir.actions.act_window" id="hotel_amenity_category_action">
+         <field name="name">Amenities by Category</field>
+         <field name="type">ir.actions.act_window</field>
+         <field name="res_model">product.category</field>
+         <field name="domain">[('parent_id','=',False),('isamenitype','=',True)]</field>
+         <field name="view_type">tree</field>
+         <field name="view_id" ref="product.product_category_tree_view"/>
+     </record>
+     <menuitem name="Amenities by Category" 
+               id="menu_hotel_amenity_category_action" 
+               action="hotel_amenity_category_action"
+               sequence="4"
+               parent="hotel.menu_amenity"/>
+
+     <record model="ir.actions.act_window" id="hotel_service_category_action">
+         <field name="name">Services by Category</field>
+         <field name="type">ir.actions.act_window</field>
+         <field name="res_model">product.category</field>
+         <field name="domain">[('parent_id','=',False),('isservicetype','=',True)]</field>
+         <field name="view_type">tree</field>
+         <field name="view_id" ref="product.product_category_tree_view"/>
+     </record>
+     <menuitem name="Services by Category" 
+               id="menu_hotel_service_category_action" 
+               action="hotel_service_category_action"
+               sequence="10"
+               parent="hotel.menu_hotel_service"/>
+     
+    </data>
+</openerp>>>>>>>> MERGE-SOURCE

=== added file 'hotel/i18n/fr.po'
--- hotel/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ hotel/i18n/fr.po	2014-09-28 13:18:16 +0000
@@ -0,0 +1,752 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* hotel
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2009-11-26 07:33:36+0000\n"
+"PO-Revision-Date: 2014-07-19 13:06-0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+"Language: fr\n"
+"X-Generator: Poedit 1.6.6\n"
+
+#. module: hotel
+#: model:ir.ui.menu,name:hotel.menu_open_hotel_folio1_form_tree
+msgid "Generate Folio"
+msgstr "Générer Classeur"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Recreate Procurement"
+msgstr "Recréer Approvisionnement"
+
+#. module: hotel
+#: field:hotel.folio,checkout_date:0 field:hotel_folio.line,checkout_date:0
+msgid "Check Out"
+msgstr "Départ"
+
+#. module: hotel
+#: model:ir.ui.menu,name:hotel.menu_action_hotel_room_amenities_view_form
+msgid "Amenities"
+msgstr "Commodités"
+
+#. module: hotel
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom du modèle invalide dans la définition de l'action"
+
+#. module: hotel
+#: field:hotel.floor,name:0
+msgid "Floor Name"
+msgstr "Nom de l'étage"
+
+#. module: hotel
+#: field:product.product,iscategid:0
+msgid "Is categ id"
+msgstr "Is categ id"
+
+#. module: hotel
+#: model:ir.model,name:hotel.model_hotel_room_amenities_type
+msgid "amenities Type"
+msgstr "Type de Commodités"
+
+#. module: hotel
+#: view:hotel.room_amenities:0
+msgid "Amenity rate"
+msgstr "Tarif Commodités"
+
+#. module: hotel
+#: field:product.category,isservicetype:0
+msgid "Is Service Type"
+msgstr "Es un Type de Service"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Set to Draft"
+msgstr "Mettre en brouillon"
+
+#. module: hotel
+#: rml:folio.total:0
+msgid "to"
+msgstr "A"
+
+#. module: hotel
+#: wizard_view:hotel.folio.total_folio,init:0
+msgid "Folio List"
+msgstr "Liste Classeur"
+
+#. module: hotel
+#: model:ir.ui.menu,name:hotel.menu_open_hotel_services_form
+msgid "Services"
+msgstr "Services"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Cancel Order"
+msgstr "Annuler commande"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Confirm Order"
+msgstr "Confirmer Commande"
+
+#. module: hotel
+#: model:product.category,name:hotel.hotel_room_amenities_type_0_product_category
+msgid "All Aminities"
+msgstr "Toutes les Commodités"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Notes"
+msgstr "Notes"
+
+#. module: hotel
+#: view:hotel.floor:0
+msgid " Hotel Floor"
+msgstr "Etage de l'hotel"
+
+#. module: hotel
+#: rml:folio.total:0
+msgid "Customer Name"
+msgstr "Nom Client"
+
+#. module: hotel
+#: field:product.product,isroom:0
+msgid "Is Room"
+msgstr "Es une Chambre"
+
+#. module: hotel
+#: model:product.category,name:hotel.hotel_service_type_1_product_category
+msgid "Fixed"
+msgstr "Fixe"
+
+#. module: hotel
+#: model:ir.model,name:hotel.model_hotel_service_line
+msgid "hotel Service line"
+msgstr "Prestations de l'Hotel"
+
+#. module: hotel
+#: model:ir.ui.menu,name:hotel.menu_open_hotel_folio1_form_tree_all
+msgid "All Folio"
+msgstr "Tous les Classeurs"
+
+#. module: hotel
+#: view:hotel.room:0 field:hotel.room,room_amenities:0
+msgid "Room Amenities"
+msgstr "Commodités de Chambre"
+
+#. module: hotel
+#: view:hotel.service_type:0
+#: model:ir.actions.act_window,name:hotel.open_hotel_service_type_form_tree
+#: model:ir.model,name:hotel.model_hotel_service_type
+msgid "Service Type"
+msgstr "Type de Service"
+
+#. module: hotel
+#: field:hotel_folio.line,order_line_id:0
+msgid "order_line_id"
+msgstr "order_line_id"
+
+#. module: hotel
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr "Erreur! Impossible de créer des Tables recurssives"
+
+#. module: hotel
+#: model:ir.model,name:hotel.model_hotel_folio
+msgid "hotel folio new"
+msgstr "Nouveau Classeur"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Extra Info"
+msgstr "Infos Supplémentaires"
+
+#. module: hotel
+#: model:ir.actions.act_window,name:hotel.hotel_room_category_action
+msgid "Rooms by Category"
+msgstr "Chambres par Catégories"
+
+#. module: hotel
+#: model:product.category,name:hotel.hotel_room_amenities_type_3_product_category
+msgid "Single Bed"
+msgstr "Lit Simple"
+
+#. module: hotel
+#: model:ir.ui.menu,name:hotel.menu_open_hotel_service_type_form_tree
+msgid "Service Types"
+msgstr "Types de Services"
+
+#. module: hotel
+#: model:product.category,name:hotel.hotel_room_amenities_type_2_product_category
+msgid "Tables"
+msgstr "Tables"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Folio"
+msgstr "Classeur"
+
+#. module: hotel
+#: rml:folio.total:0
+msgid "From"
+msgstr "De"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Recreate Invoice"
+msgstr "Recréer Facture"
+
+#. module: hotel
+#: field:product.category,isamenitype:0
+msgid "Is amenities Type"
+msgstr "Es un Type de Commodité"
+
+#. module: hotel
+#: view:hotel.room:0
+msgid " Room Amenities"
+msgstr "Commodités de Chambre"
+
+#. module: hotel
+#: field:hotel.folio,checkin_date:0 field:hotel_folio.line,checkin_date:0
+msgid "Check In"
+msgstr "Arrivé"
+
+#. module: hotel
+#: model:ir.actions.act_window,name:hotel.hotel_amenity_category_action
+#: model:ir.ui.menu,name:hotel.menu_hotel_amenity_category_action
+msgid "Amenities by Category"
+msgstr "Commodités par Catégorie"
+
+#. module: hotel
+#: field:hotel.services,service_id:0
+msgid "Service_id"
+msgstr "Service_id"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Invoice Lines"
+msgstr "Ligne de facture"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Untaxed amount"
+msgstr "Montant non taxé"
+
+#. module: hotel
+#: field:hotel.room_amenities_type,cat_id:0 field:hotel.room_type,cat_id:0
+#: field:hotel.service_type,ser_id:0
+msgid "category"
+msgstr "Catégorie"
+
+#. module: hotel
+#: view:hotel.room:0 field:hotel.room,avail_status:0
+msgid "Room Status"
+msgstr "Situation Chambre"
+
+#. module: hotel
+#: field:hotel.room_amenities,room_categ_id:0
+msgid "Product Category"
+msgstr "Catégorie de Produit"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Manual Description"
+msgstr "Description"
+
+#. module: hotel
+#: model:product.category,name:hotel.hotel_service_type_0_product_category
+msgid "All Services"
+msgstr "Tous les Services"
+
+#. module: hotel
+#: view:hotel.room:0
+#: model:ir.actions.act_window,name:hotel.action_hotel_room_form
+#: model:ir.model,name:hotel.model_hotel_room
+msgid "Hotel Room"
+msgstr "Chambres d'Hotel"
+
+#. module: hotel
+#: rml:folio.total:0
+msgid "Folio No."
+msgstr "Classeur No."
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Inventory Moves"
+msgstr "Mouvement Inventaire"
+
+#. module: hotel
+#: model:ir.ui.menu,name:hotel.hotel_configuration_menu
+msgid "Configuration"
+msgstr "Configuration"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Total amount"
+msgstr "Montant Total"
+
+#. module: hotel
+#: view:hotel.floor:0
+msgid " Hotel Floors"
+msgstr "Etages de l'Hotel"
+
+#. module: hotel
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalide pour cette vue!"
+
+#. module: hotel
+#: field:hotel.folio,order_id:0
+msgid "order_id"
+msgstr "order_id"
+
+#. module: hotel
+#: field:hotel.room_amenities,amenity_rate:0
+msgid "Amenity Rate"
+msgstr "Tarif Commodités"
+
+#. module: hotel
+#: view:hotel.room:0 view:hotel.room_amenities:0 view:hotel.services:0
+msgid "Procurement"
+msgstr "Approvisionnement"
+
+#. module: hotel
+#: field:hotel.floor,sequence:0
+msgid "Sequence"
+msgstr "Séquence"
+
+#. module: hotel
+#: model:ir.ui.menu,name:hotel.menu_action_hotel_room_amenities_type_view_form
+msgid "Amenity Types"
+msgstr "Type de Commodités"
+
+#. module: hotel
+#: model:ir.ui.menu,name:hotel.menu_hotel_room_category_action
+msgid "Room by Category"
+msgstr "Chambre par Catégorie"
+
+#. module: hotel
+#: field:hotel.room_amenities,rcateg_id:0
+msgid "Amenity Catagory"
+msgstr "Catégorie Commodité"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Other data"
+msgstr "Autres Info"
+
+#. module: hotel
+#: field:hotel.room,max_child:0
+msgid "Max Child"
+msgstr "Max Enfant"
+
+#. module: hotel
+#: view:hotel.room:0 view:hotel.room_amenities:0 view:hotel.services:0
+msgid "Descriptions"
+msgstr "Descriptions"
+
+#. module: hotel
+#: wizard_field:hotel.folio.total_folio,init,date_start:0
+msgid "Start Date"
+msgstr "Date Début"
+
+#. module: hotel
+#: model:ir.model,name:hotel.model_hotel_folio_line
+msgid "hotel folio1 room line"
+msgstr ""
+
+#. module: hotel
+#: field:product.category,isroomtype:0
+msgid "Is Room Type"
+msgstr "Es un type de Chambre"
+
+#. module: hotel
+#: rml:folio.total:0
+msgid "Total Collection"
+msgstr ""
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Automatic Declaration"
+msgstr "Déclaration Automatique"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Rent(UOM)"
+msgstr "Unités (UOM)"
+
+#. module: hotel
+#: model:ir.model,name:hotel.model_hotel_services
+msgid "Hotel Services and its charges"
+msgstr "Services and charges comprises"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Procurement Corrected"
+msgstr "Approvisionnement correct"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Room Line"
+msgstr "Chambre"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Room No"
+msgstr "Chambre No"
+
+#. module: hotel
+#: view:hotel.services:0
+msgid "Service rate"
+msgstr "Tarif Service"
+
+#. module: hotel
+#: model:ir.actions.act_window,name:hotel.open_hotel_folio1_form_tree
+#: model:ir.actions.act_window,name:hotel.open_hotel_folio1_form_tree_all
+msgid "Hotel Folio"
+msgstr "Classeur Hotel"
+
+#. module: hotel
+#: field:hotel.folio,room_lines:0 field:hotel.folio,service_lines:0
+msgid "unknown"
+msgstr "Inconnu"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Guest Name"
+msgstr "Client"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Service Line"
+msgstr "Services"
+
+#. module: hotel
+#: view:hotel.room_amenities_type:0
+#: model:ir.actions.act_window,name:hotel.action_hotel_room_amenities_type_view_form
+msgid "Hotel Room Amenities Type"
+msgstr "Type de Commodités de Chambre"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Folio Line"
+msgstr "Ligne Classeur"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Date"
+msgstr "Date"
+
+#. module: hotel
+#: view:hotel.folio:0 view:hotel.room:0 view:hotel.room_amenities:0
+#: view:hotel.services:0
+msgid "Properties"
+msgstr "Propriété"
+
+#. module: hotel
+#: view:hotel.room_amenities:0 view:hotel.services:0
+msgid "Purchase Description"
+msgstr "Description Achat"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Compute"
+msgstr "Calculer"
+
+#. module: hotel
+#: model:ir.model,name:hotel.model_hotel_room_amenities
+msgid "Room amenities"
+msgstr "Commodités de Chambre"
+
+#. module: hotel
+#: model:product.category,name:hotel.hotel_room_type_3_product_category
+msgid "No Room"
+msgstr "Pas de Chambre"
+
+#. module: hotel
+#: field:hotel_service.line,service_line_id:0
+msgid "service_line_id"
+msgstr "service_line_id"
+
+#. module: hotel
+#: model:product.category,name:hotel.hotel_room_amenities_type_1_product_category
+msgid "Beds"
+msgstr "Lits"
+
+#. module: hotel
+#: model:product.category,name:hotel.hotel_service_type_2_product_category
+msgid "Variable"
+msgstr "Variable"
+
+#. module: hotel
+#: field:hotel.room,floor_id:0
+msgid "Floor No"
+msgstr "Etage No"
+
+#. module: hotel
+#: view:hotel.services:0
+#: model:ir.actions.act_window,name:hotel.action_hotel_services_form
+msgid "Hotel Services"
+msgstr "Services de l'Hotel"
+
+#. module: hotel
+#: view:hotel.room_amenities:0
+#: model:ir.actions.act_window,name:hotel.action_hotel_room_amenities_view_form
+msgid "Hotel Room Amenities"
+msgstr "Commodités de Chambre"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "History"
+msgstr "Historique"
+
+#. module: hotel
+#: model:ir.actions.act_window,name:hotel.open_hotel_floor_form_tree
+msgid "Floor Structure"
+msgstr "Structure Etage"
+
+#. module: hotel
+#: rml:folio.total:0
+msgid "Net Total :-"
+msgstr "Net Total :-"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Related invoices"
+msgstr "Factures Associées"
+
+#. module: hotel
+#: selection:hotel.room,avail_status:0
+msgid "Assigned"
+msgstr "Assigné"
+
+#. module: hotel
+#: selection:hotel.room,avail_status:0
+msgid "Unassigned"
+msgstr "Non-assigné"
+
+#. module: hotel
+#: model:ir.module.module,shortdesc:hotel.module_meta_information
+#: model:ir.ui.menu,name:hotel.hotel_management_menu
+msgid "Hotel Management"
+msgstr "Hotel Management"
+
+#. module: hotel
+#: wizard_button:hotel.folio.total_folio,init,end:0
+msgid "Cancel"
+msgstr "Annulé"
+
+#. module: hotel
+#: view:hotel.room:0 view:hotel.room_amenities:0 view:hotel.services:0
+msgid "Information"
+msgstr "Information"
+
+#. module: hotel
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer par x_ et ne doit pas contenir de "
+"caractères spéciaux !"
+
+#. module: hotel
+#: field:hotel.room,product_id:0
+msgid "Product_id"
+msgstr "Product_id"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Hotel Folio1"
+msgstr "Hôtel Classeur 1"
+
+#. module: hotel
+#: view:hotel.room:0 model:ir.model,name:hotel.model_hotel_floor
+#: model:ir.ui.menu,name:hotel.menu_open_hotel_floor_form_tree
+msgid "Floor"
+msgstr "Etage"
+
+#. module: hotel
+#: model:product.category,name:hotel.hotel_room_type_0_product_category
+msgid "All Rooms"
+msgstr "Toutes les Chambres"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Create Invoice"
+msgstr "Créer Facture"
+
+#. module: hotel
+#: wizard_button:hotel.folio.total_folio,init,print_report:0
+msgid "Print Report"
+msgstr "Imprimer Etat"
+
+#. module: hotel
+#: model:ir.actions.report.xml,name:hotel.hotel_folio_details
+#: model:ir.actions.wizard,name:hotel.wizard_hotel_total
+msgid "Folio Total"
+msgstr "Total Classeur"
+
+#. module: hotel
+#: model:ir.actions.act_window,name:hotel.open_hotel_room_type_form_tree
+#: model:ir.model,name:hotel.model_hotel_room_type
+msgid "Room Type"
+msgstr "Type de Chambre"
+
+#. module: hotel
+#: view:hotel.room:0 view:hotel.room_amenities:0 view:hotel.services:0
+msgid "Description"
+msgstr "Description"
+
+#. module: hotel
+#: field:hotel_folio.line,folio_id:0 field:hotel_service.line,folio_id:0
+msgid "folio_id"
+msgstr "folio_id"
+
+#. module: hotel
+#: view:hotel.room_amenities:0 view:hotel.services:0
+msgid "Sale Description"
+msgstr "Description Vente"
+
+#. module: hotel
+#: model:product.category,name:hotel.hotel_room_amenities_type_4_product_category
+msgid "Double Bed"
+msgstr "Lit Double"
+
+#. module: hotel
+#: field:product.product,isservice:0
+msgid "Is Service id"
+msgstr "Es l'id du Service"
+
+#. module: hotel
+#: model:ir.ui.menu,name:hotel.menu_open_hotel_room_type_form_tree
+msgid "Room Types"
+msgstr "Type de Chambre"
+
+#. module: hotel
+#: rml:folio.total:0
+msgid "CheckOut"
+msgstr "Départ"
+
+#. module: hotel
+#: model:ir.actions.act_window,name:hotel.hotel_service_category_action
+#: model:ir.ui.menu,name:hotel.menu_hotel_service_category_action
+msgid "Services by Category"
+msgstr "Services par Catégorie"
+
+#. module: hotel
+#: model:ir.ui.menu,name:hotel.menu_open_hotel_room_form
+msgid "Rooms"
+msgstr "Chambres"
+
+#. module: hotel
+#: view:hotel.room:0
+msgid "Room rate"
+msgstr "Tarif Chambre"
+
+#. module: hotel
+#: wizard_field:hotel.folio.total_folio,init,date_end:0
+msgid "End Date"
+msgstr "Date Fin"
+
+#. module: hotel
+#: model:product.category,name:hotel.hotel_room_type_2_product_category
+msgid "Double"
+msgstr "Double"
+
+#. module: hotel
+#: rml:folio.total:0
+msgid "CheckIn"
+msgstr "Arrivée"
+
+#. module: hotel
+#: field:hotel.room,max_adult:0
+msgid "Max Adult"
+msgstr "Max Adulte"
+
+#. module: hotel
+#: model:ir.module.module,description:hotel.module_meta_information
+msgid ""
+"\n"
+"    Module for Hotel/Resort/Property management. You can manage:\n"
+"    * Configure Property\n"
+"    * Hotel Configuration\n"
+"    * Check In, Check out\n"
+"    * Manage Folio\n"
+"    * Payment\n"
+"\n"
+"    Different reports are also provided, mainly for hotel statistics.\n"
+"    "
+msgstr ""
+"\n"
+"    Module Hotel/Property management. Fonctionnalités:\n"
+"    * Configure Property\n"
+"    * Configuration Hotel\n"
+"    * Arrivées, Départs\n"
+"    * Classeurs de Factures\n"
+"    * Paiements\n"
+"\n"
+"    Plusieurs rapports sont disponibles pour les statistiques Hotel.\n"
+"    "
+
+#. module: hotel
+#: model:ir.ui.menu,name:hotel.hotel_report_menu
+msgid "Reports"
+msgstr "Rapports"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Related packings"
+msgstr "Package lié"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Folio No"
+msgstr "Classeur No"
+
+#. module: hotel
+#: view:hotel.room_type:0
+msgid " Hotel Room Type"
+msgstr "Type de Chambre d'Hotel"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Invoice Corrected"
+msgstr "Facture Corrigée"
+
+#. module: hotel
+#: model:ir.ui.menu,name:hotel.wizard_hotel_menu
+msgid "Hotel Folio Report"
+msgstr "Etat Classeur Facture"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "States"
+msgstr "Situations"
+
+#. module: hotel
+#: model:product.category,name:hotel.hotel_room_type_1_product_category
+msgid "Single"
+msgstr "Seul"
+
+#. module: hotel
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Erreur: Code EAN invalide"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Rent"
+msgstr "Louer"
+
+#. module: hotel
+#: rml:folio.total:0
+msgid "Total"
+msgstr "Total"

=== modified file 'hotel/i18n/fr_BE.po' (properties changed: +x to -x)
=== modified file 'hotel/i18n/hotel.pot' (properties changed: +x to -x)
--- hotel/i18n/hotel.pot	2012-05-22 14:06:57 +0000
+++ hotel/i18n/hotel.pot	2014-09-28 13:18:16 +0000
@@ -4,754 +4,975 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.6\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2009-11-26 07:33:36+0000\n"
-"PO-Revision-Date: 2009-11-26 07:33:36+0000\n"
-"Last-Translator: <>\n"
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-10-09 13:00+0000\n"
+"PO-Revision-Date: 2013-10-09 18:33+0530\n"
+"Last-Translator: Anil Kesariya <[e-mail]>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: \n"
 
 #. module: hotel
-#: model:ir.ui.menu,name:hotel.menu_open_hotel_folio1_form_tree
+#: model:ir.ui.menu,name:hotel.menu_open_hotel_folio1_form_tree_all
 msgid "Generate Folio"
-msgstr ""
+msgstr "Generate Folio"
+
+#. module: hotel
+#: help:hotel.folio,room_lines:0
+msgid "Hotel room reservation detail."
+msgstr "Hotel room reservation detail."
 
 #. module: hotel
 #: view:hotel.folio:0
 msgid "Recreate Procurement"
-msgstr ""
-
-#. module: hotel
-#: field:hotel.folio,checkout_date:0
-#: field:hotel_folio.line,checkout_date:0
-msgid "Check Out"
-msgstr ""
+msgstr "Recreate Procurement"
+
+#. module: hotel
+#: view:hotel.services:0
+msgid "Service"
+msgstr "Service"
+
+#. module: hotel
+#: view:hotel.room:0
+#: model:ir.actions.act_window,name:hotel.action_hotel_room_form
+#: model:ir.model,name:hotel.model_hotel_room
+msgid "Hotel Room"
+msgstr "Hotel Room"
+
+#. module: hotel
+#: view:hotel.room:0
+#: view:hotel.room.amenities:0
+#: view:hotel.services:0
+msgid "Group By..."
+msgstr "Group By..."
 
 #. module: hotel
 #: model:ir.ui.menu,name:hotel.menu_action_hotel_room_amenities_view_form
 msgid "Amenities"
-msgstr ""
+msgstr "Amenities"
 
 #. module: hotel
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
+#: view:hotel.folio:0
+msgid "Branch"
+msgstr "Branch"
 
 #. module: hotel
 #: field:hotel.floor,name:0
 msgid "Floor Name"
-msgstr ""
+msgstr "Floor Name"
 
 #. module: hotel
 #: field:product.product,iscategid:0
 msgid "Is categ id"
-msgstr ""
+msgstr "Is categ id"
 
 #. module: hotel
 #: model:ir.model,name:hotel.model_hotel_room_amenities_type
 msgid "amenities Type"
-msgstr ""
+msgstr "amenities Type"
 
 #. module: hotel
-#: view:hotel.room_amenities:0
+#: view:hotel.room.amenities:0
 msgid "Amenity rate"
-msgstr ""
-
-#. module: hotel
-#: field:product.category,isservicetype:0
-msgid "Is Service Type"
-msgstr ""
+msgstr "Amenity rate"
+
+#. module: hotel
+#: field:room.rent,price:0
+msgid "Room rent"
+msgstr "Room rent"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Automatic Declaration"
+msgstr "Automatic Declaration"
 
 #. module: hotel
 #: view:hotel.folio:0
 msgid "Set to Draft"
-msgstr ""
-
-#. module: hotel
-#: rml:folio.total:0
-msgid "to"
-msgstr ""
-
-#. module: hotel
-#: wizard_view:hotel.folio.total_folio,init:0
-msgid "Folio List"
-msgstr ""
-
-#. module: hotel
+msgstr "Set to Draft"
+
+#. module: hotel
+#: model:ir.ui.menu,name:hotel.menu_hotel_service
 #: model:ir.ui.menu,name:hotel.menu_open_hotel_services_form
 msgid "Services"
-msgstr ""
-
-#. module: hotel
-#: view:hotel.folio:0
-msgid "Cancel Order"
-msgstr ""
-
-#. module: hotel
-#: view:hotel.folio:0
-msgid "Confirm Order"
-msgstr ""
+msgstr "Services"
+
+#. module: hotel
+#: view:hotel.room.amenities:0
+msgid "Define supplier taxes if there any on the Amenity. "
+msgstr "Define supplier taxes if there any on the Amenity. "
 
 #. module: hotel
 #: model:product.category,name:hotel.hotel_room_amenities_type_0_product_category
 msgid "All Aminities"
-msgstr ""
-
-#. module: hotel
-#: view:hotel.folio:0
-msgid "Notes"
-msgstr ""
+msgstr "All Aminities"
+
+#. module: hotel
+#: selection:hotel.folio,hotel_policy:0
+msgid "On Booking"
+msgstr "On Booking"
+
+#. module: hotel
+#: view:hotel.room:0
+#: view:hotel.room.amenities:0
+msgid "Suppliers"
+msgstr "Suppliers"
 
 #. module: hotel
 #: view:hotel.floor:0
 msgid " Hotel Floor"
-msgstr ""
-
-#. module: hotel
-#: rml:folio.total:0
+msgstr " Hotel Floor"
+
+#. module: hotel
+#: help:hotel.room,floor_id:0
+msgid "At which floor the room is located."
+msgstr "At which floor the room is located."
+
+#. module: hotel
+#: report:folio.total:0
 msgid "Customer Name"
-msgstr ""
+msgstr "Customer Name"
 
 #. module: hotel
 #: field:product.product,isroom:0
 msgid "Is Room"
-msgstr ""
+msgstr "Is Room"
 
 #. module: hotel
 #: model:product.category,name:hotel.hotel_service_type_1_product_category
 msgid "Fixed"
-msgstr ""
+msgstr "Fixed"
 
 #. module: hotel
 #: model:ir.model,name:hotel.model_hotel_service_line
 msgid "hotel Service line"
-msgstr ""
-
-#. module: hotel
-#: model:ir.ui.menu,name:hotel.menu_open_hotel_folio1_form_tree_all
-msgid "All Folio"
-msgstr ""
+msgstr "hotel Service line"
 
 #. module: hotel
 #: view:hotel.room:0
 #: field:hotel.room,room_amenities:0
 msgid "Room Amenities"
-msgstr ""
+msgstr "Room Amenities"
 
 #. module: hotel
-#: view:hotel.service_type:0
+#: view:hotel.service.type:0
 #: model:ir.actions.act_window,name:hotel.open_hotel_service_type_form_tree
 #: model:ir.model,name:hotel.model_hotel_service_type
 msgid "Service Type"
-msgstr ""
-
-#. module: hotel
-#: field:hotel_folio.line,order_line_id:0
+msgstr "Service Type"
+
+#. module: hotel
+#: field:hotel.folio,hotel_policy:0
+msgid "Hotel Policy"
+msgstr "Hotel Policy"
+
+#. module: hotel
+#: field:hotel.folio.line,order_line_id:0
 msgid "order_line_id"
-msgstr ""
-
-#. module: hotel
-#: constraint:product.category:0
-msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "order_line_id"
 
 #. module: hotel
 #: model:ir.model,name:hotel.model_hotel_folio
 msgid "hotel folio new"
-msgstr ""
+msgstr "hotel folio new"
 
 #. module: hotel
 #: view:hotel.folio:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Extra Info"
 
 #. module: hotel
 #: model:ir.actions.act_window,name:hotel.hotel_room_category_action
 msgid "Rooms by Category"
-msgstr ""
+msgstr "Rooms by Category"
+
+#. module: hotel
+#: view:hotel.room:0
+msgid "List of supplier taxes if there any on the defined room. "
+msgstr "List of supplier taxes if there any on the defined room. "
 
 #. module: hotel
 #: model:product.category,name:hotel.hotel_room_amenities_type_3_product_category
 msgid "Single Bed"
-msgstr ""
+msgstr "Single Bed"
 
 #. module: hotel
 #: model:ir.ui.menu,name:hotel.menu_open_hotel_service_type_form_tree
 msgid "Service Types"
-msgstr ""
+msgstr "Service Types"
 
 #. module: hotel
 #: model:product.category,name:hotel.hotel_room_amenities_type_2_product_category
 msgid "Tables"
-msgstr ""
+msgstr "Tables"
 
 #. module: hotel
 #: view:hotel.folio:0
+#: model:ir.ui.menu,name:hotel.menu_all_folio
 msgid "Folio"
-msgstr ""
-
-#. module: hotel
-#: rml:folio.total:0
-msgid "From"
-msgstr ""
+msgstr "Folio"
 
 #. module: hotel
 #: view:hotel.folio:0
 msgid "Recreate Invoice"
-msgstr ""
+msgstr "Recreate Invoice"
 
 #. module: hotel
 #: field:product.category,isamenitype:0
 msgid "Is amenities Type"
-msgstr ""
+msgstr "Is amenities Type"
 
 #. module: hotel
 #: view:hotel.room:0
 msgid " Room Amenities"
-msgstr ""
+msgstr " Room Amenities"
+
+#. module: hotel
+#: constraint:hotel.folio:0
+msgid "You can not allocate the same room twice!"
+msgstr "You can not allocate the same room twice!"
 
 #. module: hotel
 #: field:hotel.folio,checkin_date:0
-#: field:hotel_folio.line,checkin_date:0
+#: field:hotel.folio.line,checkin_date:0
 msgid "Check In"
-msgstr ""
+msgstr "Check In"
+
+#. module: hotel
+#: view:hotel.folio:0
+#: field:hotel.folio,name:0
+msgid "Folio Number"
+msgstr "Folio Number"
 
 #. module: hotel
 #: model:ir.actions.act_window,name:hotel.hotel_amenity_category_action
 #: model:ir.ui.menu,name:hotel.menu_hotel_amenity_category_action
 msgid "Amenities by Category"
-msgstr ""
+msgstr "Amenities by Category"
+
+#. module: hotel
+#: view:folio.report.wizard:0
+msgid "Print"
+msgstr "Print"
 
 #. module: hotel
 #: field:hotel.services,service_id:0
 msgid "Service_id"
-msgstr ""
+msgstr "Service_id"
+
+#. module: hotel
+#: field:hotel.room.amenities.type,cat_id:0
+#: field:hotel.room.type,cat_id:0
+#: field:hotel.service.type,ser_id:0
+msgid "category"
+msgstr "category"
 
 #. module: hotel
 #: view:hotel.folio:0
 msgid "Invoice Lines"
-msgstr ""
-
-#. module: hotel
-#: view:hotel.folio:0
-msgid "Untaxed amount"
-msgstr ""
-
-#. module: hotel
-#: field:hotel.room_amenities_type,cat_id:0
-#: field:hotel.room_type,cat_id:0
-#: field:hotel.service_type,ser_id:0
-msgid "category"
-msgstr ""
-
-#. module: hotel
-#: view:hotel.room:0
-#: field:hotel.room,avail_status:0
+msgstr "Invoice Lines"
+
+#. module: hotel
+#: model:ir.ui.menu,name:hotel.menu_hotel_room
+msgid "Room"
+msgstr "Room"
+
+#. module: hotel
+#: view:hotel.room:0
+#: selection:hotel.room,status:0
+msgid "Available"
+msgstr "Available"
+
+#. module: hotel
+#: report:folio.total:0
+msgid "\" To \""
+msgstr "\" To \""
+
+#. module: hotel
+#: view:hotel.room:0
 msgid "Room Status"
-msgstr ""
+msgstr "Room Status"
 
 #. module: hotel
-#: field:hotel.room_amenities,room_categ_id:0
+#: field:hotel.room.amenities,room_categ_id:0
+#: model:ir.model,name:hotel.model_product_category
 msgid "Product Category"
-msgstr ""
+msgstr "Product Category"
 
 #. module: hotel
 #: view:hotel.folio:0
 msgid "Manual Description"
-msgstr ""
+msgstr "Manual Description"
 
 #. module: hotel
 #: model:product.category,name:hotel.hotel_service_type_0_product_category
 msgid "All Services"
-msgstr ""
+msgstr "All Services"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "---Description---"
+msgstr "---Description---"
+
+#. module: hotel
+#: field:hotel.folio,checkout_date:0
+#: field:hotel.folio.line,checkout_date:0
+msgid "Check Out"
+msgstr "Check Out"
 
 #. module: hotel
 #: view:hotel.room:0
-#: model:ir.actions.act_window,name:hotel.action_hotel_room_form
-#: model:ir.model,name:hotel.model_hotel_room
-msgid "Hotel Room"
-msgstr ""
+msgid "state"
+msgstr "state"
 
 #. module: hotel
-#: rml:folio.total:0
+#: report:folio.total:0
 msgid "Folio No."
-msgstr ""
-
-#. module: hotel
-#: view:hotel.folio:0
-msgid "Inventory Moves"
-msgstr ""
+msgstr "Folio No."
 
 #. module: hotel
 #: model:ir.ui.menu,name:hotel.hotel_configuration_menu
 msgid "Configuration"
-msgstr ""
+msgstr "Configuration"
 
 #. module: hotel
 #: view:hotel.folio:0
 msgid "Total amount"
-msgstr ""
+msgstr "Total amount"
 
 #. module: hotel
 #: view:hotel.floor:0
 msgid " Hotel Floors"
-msgstr ""
-
-#. module: hotel
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr " Hotel Floors"
+
+#. module: hotel
+#: view:hotel.room:0
+msgid "Status"
+msgstr "Status"
+
+#. module: hotel
+#: field:res.company,additional_hours:0
+msgid "Additional Hours"
+msgstr "Additional Hours"
+
+#. module: hotel
+#: view:hotel.room:0
+#: field:hotel.room,room_rent_ids:0
+#: field:room.rent,rent_id:0
+msgid "Room Rent"
+msgstr "Room Rent"
+
+#. module: hotel
+#: report:folio.total:0
+msgid "From \""
+msgstr "From \""
 
 #. module: hotel
 #: field:hotel.folio,order_id:0
 msgid "order_id"
-msgstr ""
-
-#. module: hotel
-#: field:hotel.room_amenities,amenity_rate:0
-msgid "Amenity Rate"
-msgstr ""
-
-#. module: hotel
-#: view:hotel.room:0
-#: view:hotel.room_amenities:0
+msgstr "order_id"
+
+#. module: hotel
+#: view:hotel.room:0
+msgid "Customer taxes apply on the perticular room. "
+msgstr "Customer taxes apply on the perticular room. "
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Service Lines"
+msgstr "Service Lines"
+
+#. module: hotel
+#: view:hotel.room:0
+#: view:hotel.room.amenities:0
 #: view:hotel.services:0
 msgid "Procurement"
-msgstr ""
+msgstr "Procurement"
 
 #. module: hotel
 #: field:hotel.floor,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sequence"
 
 #. module: hotel
 #: model:ir.ui.menu,name:hotel.menu_action_hotel_room_amenities_type_view_form
 msgid "Amenity Types"
-msgstr ""
+msgstr "Amenity Types"
+
+#. module: hotel
+#: view:hotel.room:0
+msgid "Delete"
+msgstr "Delete"
 
 #. module: hotel
 #: model:ir.ui.menu,name:hotel.menu_hotel_room_category_action
 msgid "Room by Category"
-msgstr ""
-
-#. module: hotel
-#: field:hotel.room_amenities,rcateg_id:0
+msgstr "Room by Category"
+
+#. module: hotel
+#: field:hotel.folio,duration:0
+msgid "Duration in Days"
+msgstr "Duration in Days"
+
+#. module: hotel
+#: field:hotel.room.amenities,rcateg_id:0
 msgid "Amenity Catagory"
-msgstr ""
+msgstr "Amenity Catagory"
 
 #. module: hotel
 #: view:hotel.folio:0
 msgid "Other data"
-msgstr ""
+msgstr "Other data"
 
 #. module: hotel
 #: field:hotel.room,max_child:0
 msgid "Max Child"
-msgstr ""
+msgstr "Max Child"
+
+#. module: hotel
+#: help:hotel.folio,service_lines:0
+msgid "Hotel services detail provide to customer and it will include in main Invoice."
+msgstr "Hotel services detail provide to customer and it will include in main Invoice."
+
+#. module: hotel
+#: help:hotel.folio,duration:0
+msgid "Number of days which will automatically count from the check-in and check-out date. "
+msgstr "Number of days which will automatically count from the check-in and check-out date. "
+
+#. module: hotel
+#: selection:hotel.folio,hotel_policy:0
+msgid "On Check In"
+msgstr "On Check In"
 
 #. module: hotel
 #: view:hotel.room:0
-#: view:hotel.room_amenities:0
+#: view:hotel.room.amenities:0
 #: view:hotel.services:0
 msgid "Descriptions"
-msgstr ""
-
-#. module: hotel
-#: wizard_field:hotel.folio.total_folio,init,date_start:0
+msgstr "Descriptions"
+
+#. module: hotel
+#: view:hotel.services:0
+msgid "Customer taxes applied on the service. "
+msgstr "Customer taxes applied on the service. "
+
+#. module: hotel
+#: view:hotel.services:0
+msgid "List of supplier taxes related to the service provided by hotel. "
+msgstr "List of supplier taxes related to the service provided by hotel. "
+
+#. module: hotel
+#: field:folio.report.wizard,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Start Date"
+
+#. module: hotel
+#: selection:hotel.room,status:0
+msgid "Occupied"
+msgstr "Occupied"
 
 #. module: hotel
 #: model:ir.model,name:hotel.model_hotel_folio_line
 msgid "hotel folio1 room line"
-msgstr ""
+msgstr "hotel folio1 room line"
 
 #. module: hotel
 #: field:product.category,isroomtype:0
 msgid "Is Room Type"
-msgstr ""
+msgstr "Is Room Type"
 
 #. module: hotel
-#: rml:folio.total:0
+#: report:folio.total:0
 msgid "Total Collection"
-msgstr ""
+msgstr "Total Collection"
+
+#. module: hotel
+#: field:product.category,isservicetype:0
+msgid "Is Service Type"
+msgstr "Is Service Type"
 
 #. module: hotel
 #: view:hotel.folio:0
-msgid "Automatic Declaration"
-msgstr ""
+msgid "Room Lines"
+msgstr "Room Lines"
 
 #. module: hotel
 #: view:hotel.folio:0
 msgid "Rent(UOM)"
-msgstr ""
+msgstr "Rent(UOM)"
 
 #. module: hotel
 #: model:ir.model,name:hotel.model_hotel_services
 msgid "Hotel Services and its charges"
-msgstr ""
+msgstr "Hotel Services and its charges"
 
 #. module: hotel
 #: view:hotel.folio:0
 msgid "Procurement Corrected"
-msgstr ""
+msgstr "Procurement Corrected"
 
 #. module: hotel
 #: view:hotel.folio:0
 msgid "Room Line"
-msgstr ""
+msgstr "Room Line"
 
 #. module: hotel
 #: view:hotel.folio:0
 msgid "Room No"
-msgstr ""
+msgstr "Room No"
 
 #. module: hotel
 #: view:hotel.services:0
 msgid "Service rate"
-msgstr ""
-
-#. module: hotel
-#: model:ir.actions.act_window,name:hotel.open_hotel_folio1_form_tree
+msgstr "Service rate"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Folios"
+msgstr "Folios"
+
+#. module: hotel
+#: view:hotel.folio:0
 #: model:ir.actions.act_window,name:hotel.open_hotel_folio1_form_tree_all
 msgid "Hotel Folio"
-msgstr ""
+msgstr "Hotel Folio"
+
+#. module: hotel
+#: view:hotel.room:0
+msgid "í"
+msgstr "í"
+
+#. module: hotel
+#: help:hotel.room,room_amenities:0
+msgid "List of room amenities. "
+msgstr "List of room amenities. "
 
 #. module: hotel
 #: field:hotel.folio,room_lines:0
 #: field:hotel.folio,service_lines:0
 msgid "unknown"
-msgstr ""
+msgstr "unknown"
 
 #. module: hotel
 #: view:hotel.folio:0
 msgid "Guest Name"
-msgstr ""
+msgstr "Guest Name"
+
+#. module: hotel
+#: view:hotel.room:0
+#: view:hotel.room.amenities:0
+#: view:hotel.services:0
+msgid "Customer Taxes"
+msgstr "Customer Taxes"
 
 #. module: hotel
 #: view:hotel.folio:0
 msgid "Service Line"
-msgstr ""
+msgstr "Service Line"
 
 #. module: hotel
-#: view:hotel.room_amenities_type:0
+#: view:hotel.room.amenities.type:0
 #: model:ir.actions.act_window,name:hotel.action_hotel_room_amenities_type_view_form
 msgid "Hotel Room Amenities Type"
-msgstr ""
+msgstr "Hotel Room Amenities Type"
 
 #. module: hotel
 #: view:hotel.folio:0
 msgid "Folio Line"
-msgstr ""
-
-#. module: hotel
-#: view:hotel.folio:0
-msgid "Date"
-msgstr ""
-
-#. module: hotel
-#: view:hotel.folio:0
-#: view:hotel.room:0
-#: view:hotel.room_amenities:0
-#: view:hotel.services:0
-msgid "Properties"
-msgstr ""
-
-#. module: hotel
-#: view:hotel.room_amenities:0
+msgstr "Folio Line"
+
+#. module: hotel
+#: model:res.groups,name:hotel.group_hotel_user
+msgid "Hotel Management / User"
+msgstr "Hotel Management / User"
+
+#. module: hotel
+#: model:product.category,name:hotel.hotel_service_type_2_product_category
+msgid "Variable"
+msgstr "Variable"
+
+#. module: hotel
+#: help:hotel.folio,hotel_policy:0
+msgid "Hotel policy for payment that either the guest has to payment at booking time or check-in check-out time."
+msgstr "Hotel policy for payment that either the guest has to payment at booking time or check-in check-out time."
+
+#. module: hotel
+#: view:hotel.room.amenities:0
 #: view:hotel.services:0
 msgid "Purchase Description"
-msgstr ""
+msgstr "Purchase Description"
 
 #. module: hotel
 #: view:hotel.folio:0
 msgid "Compute"
-msgstr ""
+msgstr "Compute"
 
 #. module: hotel
 #: model:ir.model,name:hotel.model_hotel_room_amenities
 msgid "Room amenities"
-msgstr ""
+msgstr "Room amenities"
 
 #. module: hotel
 #: model:product.category,name:hotel.hotel_room_type_3_product_category
 msgid "No Room"
-msgstr ""
-
-#. module: hotel
-#: field:hotel_service.line,service_line_id:0
+msgstr "No Room"
+
+#. module: hotel
+#: model:ir.model,name:hotel.model_res_company
+msgid "Companies"
+msgstr "Companies"
+
+#. module: hotel
+#: field:hotel.service.line,service_line_id:0
 msgid "service_line_id"
-msgstr ""
+msgstr "service_line_id"
+
+#. module: hotel
+#: view:hotel.room:0
+msgid "Status:"
+msgstr "Status:"
+
+#. module: hotel
+#: model:ir.model,name:hotel.model_folio_report_wizard
+msgid "folio.report.wizard"
+msgstr "folio.report.wizard"
 
 #. module: hotel
 #: model:product.category,name:hotel.hotel_room_amenities_type_1_product_category
 msgid "Beds"
-msgstr ""
+msgstr "Beds"
 
 #. module: hotel
-#: model:product.category,name:hotel.hotel_service_type_2_product_category
-msgid "Variable"
-msgstr ""
+#: view:hotel.room:0
+msgid "Available Rooms"
+msgstr "Available Rooms"
 
 #. module: hotel
 #: field:hotel.room,floor_id:0
 msgid "Floor No"
-msgstr ""
+msgstr "Floor No"
 
 #. module: hotel
 #: view:hotel.services:0
 #: model:ir.actions.act_window,name:hotel.action_hotel_services_form
 msgid "Hotel Services"
-msgstr ""
+msgstr "Hotel Services"
 
 #. module: hotel
-#: view:hotel.room_amenities:0
+#: view:hotel.room.amenities:0
 #: model:ir.actions.act_window,name:hotel.action_hotel_room_amenities_view_form
 msgid "Hotel Room Amenities"
-msgstr ""
+msgstr "Hotel Room Amenities"
+
+#. module: hotel
+#: view:hotel.room:0
+msgid "Rate:"
+msgstr "Rate:"
 
 #. module: hotel
 #: view:hotel.folio:0
 msgid "History"
-msgstr ""
+msgstr "History"
+
+#. module: hotel
+#: view:hotel.room.amenities:0
+#: model:ir.ui.menu,name:hotel.menu_amenity
+msgid "Amenity"
+msgstr "Amenity"
 
 #. module: hotel
 #: model:ir.actions.act_window,name:hotel.open_hotel_floor_form_tree
 msgid "Floor Structure"
-msgstr ""
-
-#. module: hotel
-#: rml:folio.total:0
+msgstr "Floor Structure"
+
+#. module: hotel
+#: view:hotel.room.amenities:0
+msgid "List of customer taxes applied on the Amenity. "
+msgstr "List of customer taxes applied on the Amenity. "
+
+#. module: hotel
+#: report:folio.total:0
 msgid "Net Total :-"
-msgstr ""
+msgstr "Net Total :-"
 
 #. module: hotel
 #: view:hotel.folio:0
 msgid "Related invoices"
-msgstr ""
-
-#. module: hotel
-#: selection:hotel.room,avail_status:0
-msgid "Assigned"
-msgstr ""
-
-#. module: hotel
-#: selection:hotel.room,avail_status:0
-msgid "Unassigned"
-msgstr ""
-
-#. module: hotel
-#: model:ir.module.module,shortdesc:hotel.module_meta_information
+msgstr "Related invoices"
+
+#. module: hotel
 #: model:ir.ui.menu,name:hotel.hotel_management_menu
 msgid "Hotel Management"
-msgstr ""
+msgstr "Hotel Management"
 
 #. module: hotel
-#: wizard_button:hotel.folio.total_folio,init,end:0
+#: view:folio.report.wizard:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancel"
 
 #. module: hotel
 #: view:hotel.room:0
-#: view:hotel.room_amenities:0
+#: view:hotel.room.amenities:0
 #: view:hotel.services:0
 msgid "Information"
-msgstr ""
+msgstr "Information"
 
 #. module: hotel
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+#: view:hotel.room:0
+msgid "-->"
+msgstr "-->"
 
 #. module: hotel
 #: field:hotel.room,product_id:0
 msgid "Product_id"
-msgstr ""
-
-#. module: hotel
-#: view:hotel.folio:0
-msgid "Hotel Folio1"
-msgstr ""
+msgstr "Product_id"
 
 #. module: hotel
 #: view:hotel.room:0
 #: model:ir.model,name:hotel.model_hotel_floor
 #: model:ir.ui.menu,name:hotel.menu_open_hotel_floor_form_tree
 msgid "Floor"
-msgstr ""
+msgstr "Floor"
+
+#. module: hotel
+#: model:ir.model,name:hotel.model_room_rent
+msgid "room.rent"
+msgstr "room.rent"
 
 #. module: hotel
 #: model:product.category,name:hotel.hotel_room_type_0_product_category
 msgid "All Rooms"
-msgstr ""
+msgstr "All Rooms"
 
 #. module: hotel
 #: view:hotel.folio:0
 msgid "Create Invoice"
-msgstr ""
-
-#. module: hotel
-#: wizard_button:hotel.folio.total_folio,init,print_report:0
-msgid "Print Report"
-msgstr ""
+msgstr "Create Invoice"
 
 #. module: hotel
 #: model:ir.actions.report.xml,name:hotel.hotel_folio_details
-#: model:ir.actions.wizard,name:hotel.wizard_hotel_total
 msgid "Folio Total"
-msgstr ""
-
-#. module: hotel
-#: model:ir.actions.act_window,name:hotel.open_hotel_room_type_form_tree
-#: model:ir.model,name:hotel.model_hotel_room_type
-msgid "Room Type"
-msgstr ""
-
-#. module: hotel
-#: view:hotel.room:0
-#: view:hotel.room_amenities:0
+msgstr "Folio Total"
+
+#. module: hotel
+#: field:hotel.room,room_reservation_line_ids:0
+msgid "Room Reservation Line"
+msgstr "Room Reservation Line"
+
+#. module: hotel
+#: help:res.company,additional_hours:0
+msgid "Provide the min hours value for check in checkout days, whatever the hours will be provided here based on that extra days will be calculated."
+msgstr "Provide the min hours value for check in checkout days, whatever the hours will be provided here based on that extra days will be calculated."
+
+#. module: hotel
+#: view:hotel.room:0
+msgid "occupied"
+msgstr "occupied"
+
+#. module: hotel
+#: model:ir.actions.act_window,name:hotel.hotel_folio_wizard
+msgid "Hotel Folio Wizard"
+msgstr "Hotel Folio Wizard"
+
+#. module: hotel
+#: model:ir.model,name:hotel.model_product_product
+msgid "Product"
+msgstr "Product"
+
+#. module: hotel
+#: view:hotel.room:0
+#: view:hotel.room.amenities:0
 #: view:hotel.services:0
 msgid "Description"
-msgstr ""
-
-#. module: hotel
-#: field:hotel_folio.line,folio_id:0
-#: field:hotel_service.line,folio_id:0
+msgstr "Description"
+
+#. module: hotel
+#: sql_constraint:hotel.folio:0
+msgid "Check in Date Should be less than the Check Out Date!"
+msgstr "Check in Date Should be less than the Check Out Date!"
+
+#. module: hotel
+#: field:hotel.folio.line,folio_id:0
+#: field:hotel.service.line,folio_id:0
 msgid "folio_id"
-msgstr ""
+msgstr "folio_id"
 
 #. module: hotel
-#: view:hotel.room_amenities:0
+#: view:hotel.room.amenities:0
 #: view:hotel.services:0
 msgid "Sale Description"
-msgstr ""
+msgstr "Sale Description"
 
 #. module: hotel
 #: model:product.category,name:hotel.hotel_room_amenities_type_4_product_category
 msgid "Double Bed"
-msgstr ""
+msgstr "Double Bed"
 
 #. module: hotel
 #: field:product.product,isservice:0
 msgid "Is Service id"
-msgstr ""
+msgstr "Is Service id"
+
+#. module: hotel
+#: view:hotel.services:0
+msgid "Suplliers"
+msgstr "Suplliers"
 
 #. module: hotel
 #: model:ir.ui.menu,name:hotel.menu_open_hotel_room_type_form_tree
 msgid "Room Types"
-msgstr ""
-
-#. module: hotel
-#: rml:folio.total:0
+msgstr "Room Types"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Untaxed amount"
+msgstr "Untaxed amount"
+
+#. module: hotel
+#: report:folio.total:0
 msgid "CheckOut"
-msgstr ""
+msgstr "CheckOut"
 
 #. module: hotel
 #: model:ir.actions.act_window,name:hotel.hotel_service_category_action
 #: model:ir.ui.menu,name:hotel.menu_hotel_service_category_action
 msgid "Services by Category"
-msgstr ""
+msgstr "Services by Category"
 
 #. module: hotel
-#: model:ir.ui.menu,name:hotel.menu_open_hotel_room_form
-msgid "Rooms"
-msgstr ""
+#: view:hotel.folio:0
+msgid "Cancel Folio"
+msgstr "Cancel Folio"
 
 #. module: hotel
 #: view:hotel.room:0
 msgid "Room rate"
-msgstr ""
+msgstr "Room rate"
 
 #. module: hotel
-#: wizard_field:hotel.folio.total_folio,init,date_end:0
+#: field:folio.report.wizard,date_end:0
 msgid "End Date"
-msgstr ""
+msgstr "End Date"
+
+#. module: hotel
+#: model:res.groups,name:hotel.group_hotel_manager
+msgid "Hotel Management/ Manager"
+msgstr "Hotel Management/ Manager"
+
+#. module: hotel
+#: view:hotel.room:0
+msgid "Name"
+msgstr "Name"
+
+#. module: hotel
+#: view:folio.report.wizard:0
+msgid "Folio Report"
+msgstr "Folio Report"
+
+#. module: hotel
+#: view:hotel.room:0
+msgid "Edit"
+msgstr "Edit"
 
 #. module: hotel
 #: model:product.category,name:hotel.hotel_room_type_2_product_category
 msgid "Double"
-msgstr ""
+msgstr "Double"
 
 #. module: hotel
-#: rml:folio.total:0
+#: report:folio.total:0
 msgid "CheckIn"
-msgstr ""
+msgstr "CheckIn"
 
 #. module: hotel
 #: field:hotel.room,max_adult:0
 msgid "Max Adult"
-msgstr ""
+msgstr "Max Adult"
 
 #. module: hotel
-#: model:ir.module.module,description:hotel.module_meta_information
-msgid "\n"
-"    Module for Hotel/Resort/Property management. You can manage:\n"
-"    * Configure Property\n"
-"    * Hotel Configuration\n"
-"    * Check In, Check out\n"
-"    * Manage Folio\n"
-"    * Payment\n"
-"\n"
-"    Different reports are also provided, mainly for hotel statistics.\n"
-"    "
-msgstr ""
+#: model:ir.actions.act_window,name:hotel.open_hotel_room_type_form_tree
+#: model:ir.model,name:hotel.model_hotel_room_type
+msgid "Room Type"
+msgstr "Room Type"
 
 #. module: hotel
 #: model:ir.ui.menu,name:hotel.hotel_report_menu
 msgid "Reports"
-msgstr ""
-
-#. module: hotel
-#: view:hotel.folio:0
-msgid "Related packings"
-msgstr ""
-
-#. module: hotel
-#: view:hotel.folio:0
-msgid "Folio No"
-msgstr ""
-
-#. module: hotel
-#: view:hotel.room_type:0
+msgstr "Reports"
+
+#. module: hotel
+#: view:hotel.room.amenities:0
+#: view:hotel.services:0
+msgid "Catagory"
+msgstr "Catagory"
+
+#. module: hotel
+#: field:room.rent,day:0
+msgid "Weekday"
+msgstr "Weekday"
+
+#. module: hotel
+#: model:ir.ui.menu,name:hotel.menu_open_hotel_room_form
+msgid "Rooms"
+msgstr "Rooms"
+
+#. module: hotel
+#: view:hotel.room.type:0
 msgid " Hotel Room Type"
-msgstr ""
+msgstr " Hotel Room Type"
 
 #. module: hotel
 #: view:hotel.folio:0
 msgid "Invoice Corrected"
-msgstr ""
+msgstr "Invoice Corrected"
+
+#. module: hotel
+#: selection:hotel.folio,hotel_policy:0
+msgid "On Checkout"
+msgstr "On Checkout"
 
 #. module: hotel
 #: model:ir.ui.menu,name:hotel.wizard_hotel_menu
 msgid "Hotel Folio Report"
-msgstr ""
+msgstr "Hotel Folio Report"
+
+#. module: hotel
+#: view:hotel.folio:0
+msgid "Confirm Folio"
+msgstr "Confirm Folio"
 
 #. module: hotel
 #: view:hotel.folio:0
 msgid "States"
-msgstr ""
+msgstr "States"
 
 #. module: hotel
 #: model:product.category,name:hotel.hotel_room_type_1_product_category
 msgid "Single"
-msgstr ""
+msgstr "Single"
 
 #. module: hotel
-#: constraint:product.product:0
-msgid "Error: Invalid ean code"
-msgstr ""
+#: field:hotel.room,status:0
+msgid "status"
+msgstr "status"
 
 #. module: hotel
 #: view:hotel.folio:0
 msgid "Rent"
-msgstr ""
+msgstr "Rent"
 
 #. module: hotel
-#: rml:folio.total:0
+#: report:folio.total:0
 msgid "Total"
-msgstr ""
+msgstr "Total"
+
+#. module: hotel
+#: view:hotel.room:0
+#: view:hotel.room.amenities:0
+#: view:hotel.services:0
+msgid "Supplier Taxes"
+msgstr "Supplier Taxes"
 

=== modified file 'hotel/report/__init__.py'
--- hotel/report/__init__.py	2012-05-22 14:06:57 +0000
+++ hotel/report/__init__.py	2014-09-28 13:18:16 +0000
@@ -1,24 +1,25 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2012-Today Serpent Consulting Services Pvt. Ltd. (<http://www.serpentcs.com>)
+#    Copyright (C) 2004 OpenERP SA (<http://www.openerp.com>)
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
 #
 ##############################################################################
 
-import hotel_report
+from . import hotel_report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== modified file 'hotel/report/hotel_report.py'
--- hotel/report/hotel_report.py	2012-05-23 07:17:58 +0000
+++ hotel/report/hotel_report.py	2014-09-28 13:18:16 +0000
@@ -1,53 +1,52 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2012-Today Serpent Consulting Services Pvt. Ltd. (<http://www.serpentcs.com>)
+#    Copyright (C) 2004 OpenERP SA (<http://www.openerp.com>)
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
 #
 ##############################################################################
 
 import time
-from report import report_sxw
-import datetime
-import pooler
+from openerp.report import report_sxw
+
 class folio_report(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
         super(folio_report, self).__init__(cr, uid, name, context)
         self.localcontext.update( {
             'time': time,
             'get_data': self.get_data,
-            'get_Total' : self.getTotal,
+            'get_Total': self.getTotal,
             'get_total': self.gettotal,
         })
         self.temp = 0.0
 
-    def get_data(self,date_start,date_end):
-        tids = self.pool.get('hotel.folio').search(self.cr,self.uid,[('checkin_date', '>=', date_start),('checkout_date', '<=', date_end)])
-        res = self.pool.get('hotel.folio').browse(self.cr,self.uid,tids)
+    def get_data(self, date_start, date_end):
+        folio_obj = self.pool.get('hotel.folio')
+        tids = folio_obj.search(self.cr, self.uid, [('checkin_date', '>=', date_start), ('checkout_date', '<=', date_end)])
+        res = folio_obj.browse(self.cr, self.uid, tids)
         return res
-    
-    def gettotal(self,total):
+
+    def gettotal(self, total):
         self.temp = self.temp + float(total)
         return total
-    
+
     def getTotal(self):
         return self.temp
-        
-report_sxw.report_sxw('report.folio.total', 'hotel.folio', 'addons/hotel/report/total_folio.rml',parser= folio_report)             
-
-
+
+report_sxw.report_sxw('report.folio.total', 'hotel.folio', 'addons/hotel/report/total_folio.rml', parser=folio_report)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:                 
\ No newline at end of file

=== modified file 'hotel/report/hotel_report.xml'
--- hotel/report/hotel_report.xml	2012-05-23 07:17:58 +0000
+++ hotel/report/hotel_report.xml	2014-09-28 13:18:16 +0000
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
 	<data>
+	    
 		<report id="hotel_folio_details"
 			string="Folio Total"
 			model="hotel.folio"

=== modified file 'hotel/report/total_folio.rml'
--- hotel/report/total_folio.rml	2012-05-22 14:06:57 +0000
+++ hotel/report/total_folio.rml	2014-09-28 13:18:16 +0000
@@ -13,6 +13,7 @@
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="black"/>
       <blockBackground colorName="#c0c0c0" start="0,0" stop="0,0"/>
       <blockBackground colorName="#c0c0c0" start="1,0" stop="1,0"/>
       <blockBackground colorName="#c0c0c0" start="2,0" stop="2,0"/>
@@ -22,6 +23,7 @@
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="black"/>
       <blockBackground colorName="#ffffff" start="0,0" stop="0,0"/>
       <blockBackground colorName="#c0c0c0" start="1,0" stop="1,0"/>
     </blockTableStyle>
@@ -52,9 +54,21 @@
     <para style="P2">
       <font color="white"> </font>
     </para>
-    <para style="P9">Total Collection</para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <para style="P9" alignment="CENTER"><b>Total Collection</b></para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
     <para style="P10">[[repeatIn(objects,'o')]]</para>
-    <para style="P12">From [[ data['form']['date_start'] ]] to [[ data['form']['date_end'] ]] </para>
+    <para style="P12"><b>From "</b>[[ formatLang(data['form']['date_start'],date=True) ]]<b>" To "</b>[[ formatLang(data['form']['date_end'],date=True) ]]<b>"</b></para>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
     <blockTable colWidths="90.0,129.0,98.0,96.0,69.0" style="Table1">
       <tr>
         <td>
@@ -74,27 +88,25 @@
         </td>
       </tr>
       <tr>
-        <td>
-          <para style="P6">[[ repeatIn(get_data(data['form']['date_start'],data['form']['date_end']) ,'o') ]]</para>
-          <para style="P4">[[o.order_id.name]]</para>
-        </td>
-        <td>
-          <para style="P4">[[o.partner_id.name]]</para>
-        </td>
-        <td>
-          <para style="P4">[[o.checkin_date]]</para>
-        </td>
-        <td>
-          <para style="P4">[[o.checkout_date]]</para>
-        </td>
-        <td>
-          <para style="P4">[[o.amount_total]]</para>
-          
-          <para style="P4">[[get_total(o.amount_total)]]</para>
+      	<para style="P6">[[ repeatIn(get_data(data['form']['date_start'],data['form']['date_end']) ,'o') ]]</para>
+        <td>
+          <para style="P4">[[o.name or '' ]]</para>
+        </td>
+        <td>
+          <para style="P4" alignment="LEFT">[[o.partner_id and o.partner_id.name or '']]</para>
+        </td>
+        <td>
+          <para style="P4">[[ formatLang(o.checkin_date, date=True) ]]</para>
+        </td>
+        <td>
+          <para style="P4">[[ formatLang(o.checkout_date, date=True) ]]</para>
+        </td>
+        <td>
+          <para style="P4" alignment="RIGHT">[[formatLang(get_total(o.amount_total), digits=get_digits(dp='Account')) ]]</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="316.0,96.0,69.0" style="Table2">
+    <blockTable colWidths="317.0,96.0,69.0" style="Table2">
       <tr>
         <td>
           <para style="P8">
@@ -105,7 +117,7 @@
           <para style="P7">Net Total :-</para>
         </td>
         <td>
-          <para style="P4">[[get_Total()]]</para>
+          <para style="P4" alignment="RIGHT">[[formatLang(get_Total(), digits=get_digits(dp='Account')) ]]</para>
         </td>
       </tr>
     </blockTable>

=== modified file 'hotel/security/ir.model.access.csv'
--- hotel/security/ir.model.access.csv	2012-05-22 14:06:57 +0000
+++ hotel/security/ir.model.access.csv	2014-09-28 13:18:16 +0000
@@ -1,13 +1,34 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hotel_floor_group","hotel.floor","model_hotel_floor","hotel.group_hotel_user",1,1,0,0
-"access_product_category","product.category","product.model_product_category","hotel.group_hotel_user",1,1,0,0
-"access_hotel_room_type","hotel.room_type","model_hotel_room_type","hotel.group_hotel_user",1,1,0,0
-"access_product_product","product.product","product.model_product_product","hotel.group_hotel_user",1,1,1,1
-"access_hotel_room_amenities_type","hotel.room_amenities_type","model_hotel_room_amenities_type","hotel.group_hotel_user",1,1,0,0
-"access_hotel_room_amenities","hotel.room_aminities","model_hotel_room_amenities","hotel.group_hotel_user",1,1,0,0
-"access_hotel_room","hotel.room","model_hotel_room","hotel.group_hotel_user",1,1,0,0
-"access_hotel_folio","hotel.folio","model_hotel_folio","hotel.group_hotel_user",1,1,1,1
-"access_hotel_folio_line","hotel_folio.line","model_hotel_folio_line","hotel.group_hotel_user",1,1,1,1
-"access_hotel_service_line","hotel_service.line","model_hotel_service_line","hotel.group_hotel_user",1,1,1,1
-"acess_hotel_service_type","hotel.service_type","model_hotel_service_type","hotel.group_hotel_user",1,1,0,0
-"access_hotel_services","hotel.sevices","model_hotel_services","hotel.group_hotel_user",1,1,0,0
+"access_hotel_floor_group","hotel.floor.user","model_hotel_floor","hotel.group_hotel_user",1,1,1,0
+"access_product_category","product.category.user","product.model_product_category","hotel.group_hotel_user",1,1,1,0
+"access_hotel_room_type","hotel.room_type.user","model_hotel_room_type","hotel.group_hotel_user",1,1,1,0
+"access_hotel_room_rent","hotel.room_rent.user","model_room_rent","hotel.group_hotel_user",1,1,1,0
+"access_product_product","product.product.user","product.model_product_product","hotel.group_hotel_user",1,1,1,0
+"access_hotel_room_amenities_type","hotel.room_amenities_type.user","model_hotel_room_amenities_type","hotel.group_hotel_user",1,1,1,0
+"access_hotel_room_amenities","hotel.room_aminities.user","model_hotel_room_amenities","hotel.group_hotel_user",1,1,1,0
+"access_hotel_room","hotel.room.user","model_hotel_room","hotel.group_hotel_user",1,1,1,0
+"access_hotel_folio","hotel.folio.user","model_hotel_folio","hotel.group_hotel_user",1,1,1,0
+"access_hotel_folio_line","hotel_folio.line.user","model_hotel_folio_line","hotel.group_hotel_user",1,1,1,0
+"access_hotel_service_line","hotel_service.line.user","model_hotel_service_line","hotel.group_hotel_user",1,1,1,0
+"acess_hotel_service_type","hotel.service_type.user","model_hotel_service_type","hotel.group_hotel_user",1,1,1,0
+"access_hotel_services","hotel.sevices.user","model_hotel_services","hotel.group_hotel_user",1,1,1,0
+"access_hotel_order_user","hotel.order.user","sale.model_sale_order","hotel.group_hotel_user",1,1,1,0
+"access_hotel_order_line_user","hotel.order.line.user","sale.model_sale_order_line","hotel.group_hotel_user",1,1,1,0
+"access_hotel_invoice_user","account.invoice.user","account.model_account_invoice","hotel.group_hotel_user",1,1,1,0
+
+"access_hotel_floor_group_manager","hotel.floor.manager","model_hotel_floor","hotel.group_hotel_manager",1,1,1,1
+"access_product_category_manager","product.category.manager","product.model_product_category","hotel.group_hotel_manager",1,1,1,1
+"access_hotel_room_type_manager","hotel.room_type.manager","model_hotel_room_type","hotel.group_hotel_manager",1,1,1,1
+"access_hotel_room_rent_manager","hotel.room_rent.manager","model_room_rent","hotel.group_hotel_manager",1,1,1,1
+"access_product_product_manager","product.product.manager","product.model_product_product","hotel.group_hotel_manager",1,1,1,1
+"access_hotel_room_amenities_type_manager","hotel.room_amenities_type.manager","model_hotel_room_amenities_type","hotel.group_hotel_manager",1,1,1,1
+"access_hotel_room_amenities_manager","hotel.room_aminities.manager","model_hotel_room_amenities","hotel.group_hotel_manager",1,1,1,1
+"access_hotel_room_manager","hotel.room.manager","model_hotel_room","hotel.group_hotel_manager",1,1,1,1
+"access_hotel_folio_manager","hotel.folio.manager","model_hotel_folio","hotel.group_hotel_manager",1,1,1,1
+"access_hotel_folio_line_manager","hotel_folio.line.manager","model_hotel_folio_line","hotel.group_hotel_manager",1,1,1,1
+"access_hotel_service_line_manager","hotel_service.line.manager","model_hotel_service_line","hotel.group_hotel_manager",1,1,1,1
+"acess_hotel_service_type_manager","hotel.service_type.manager","model_hotel_service_type","hotel.group_hotel_manager",1,1,1,1
+"access_hotel_services_manager","hotel.sevices.manager","model_hotel_services","hotel.group_hotel_manager",1,1,1,1
+"access_hotel_order_manager_manager","hotel.order.manager","sale.model_sale_order","hotel.group_hotel_manager",1,1,1,1
+"access_hotel_order_line_manager","hotel.order.line.manager","sale.model_sale_order_line","hotel.group_hotel_manager",1,1,1,0
+"access_hotel_invoice_manager","account.invoice.manager","account.model_account_invoice","hotel.group_hotel_manager",1,1,1,1
\ No newline at end of file

=== added directory 'hotel/static'
=== renamed directory 'hotel/static' => 'hotel/static.moved'
=== added directory 'hotel/static/src'
=== added directory 'hotel/static/src/css'
=== added file 'hotel/static/src/css/room_kanban.css'
--- hotel/static/src/css/room_kanban.css	1970-01-01 00:00:00 +0000
+++ hotel/static/src/css/room_kanban.css	2014-09-28 13:18:16 +0000
@@ -0,0 +1,4 @@
+.openerp .oe_kanban_view .oe_kanban_status {
+ position: relative;
+ top: -13px;
+}
\ No newline at end of file

=== modified file 'hotel/wizard/__init__.py'
--- hotel/wizard/__init__.py	2012-05-22 14:06:57 +0000
+++ hotel/wizard/__init__.py	2014-09-28 13:18:16 +0000
@@ -1,24 +1,25 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2012-Today Serpent Consulting Services Pvt. Ltd. (<http://www.serpentcs.com>)
+#    Copyright (C) 2004 OpenERP SA (<http://www.openerp.com>)
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
 #
 ##############################################################################
 
-import hotel_wizard
+from . import hotel_wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== modified file 'hotel/wizard/hotel_wizard.py'
--- hotel/wizard/hotel_wizard.py	2012-05-23 07:17:58 +0000
+++ hotel/wizard/hotel_wizard.py	2014-09-28 13:18:16 +0000
@@ -1,50 +1,45 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2012-Today Serpent Consulting Services Pvt. Ltd. (<http://www.serpentcs.com>)
+#    Copyright (C) 2004 OpenERP SA (<http://www.openerp.com>)
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from osv import osv,fields
-
-class folio_report_wizard(osv.osv_memory):
-    
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+################################################################################
+
+from openerp.osv import osv, fields
+
+class folio_report_wizard(osv.TransientModel):
     _name = 'folio.report.wizard'
-    
     _rec_name = 'date_start'
     _columns = {
-                'date_start':fields.datetime('Start Date'),
-                'date_end':fields.datetime('End Date')
-                }
-    
+        'date_start': fields.datetime('Start Date'),
+        'date_end': fields.datetime('End Date')
+    }
+
     def print_report(self, cr, uid, ids, context=None):
-        datas = {
-             'ids': ids,
-             'model': 'hotel.folio',
-             'form': self.read(cr, uid, ids)[0]
+        values = {
+            'ids': ids,
+            'model': 'hotel.folio',
+            'form': self.read(cr, uid, ids, context=context)[0]
         }
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'folio.total',
-            'datas': datas,
+            'datas': values,
         }
 
-        
-folio_report_wizard()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== modified file 'hotel/wizard/hotel_wizard.xml'
--- hotel/wizard/hotel_wizard.xml	2012-05-23 07:17:58 +0000
+++ hotel/wizard/hotel_wizard.xml	2014-09-28 13:18:16 +0000
@@ -1,37 +1,39 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
-
-		<record model="ir.ui.view" id="view_hotel_folio_wizard">
-			<field name="name">folio.report.wizard</field>
-			<field name="model">folio.report.wizard</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-			 	<form string="Folio Report">
-					<field name="date_start" required="1"/>
-					<field name="date_end" required="1"/>
-					<newline/>
-					<separator colspan='4'/>
-					<newline/>
-					<button icon="gtk-cancel" string="Cancel" special="cancel"/>
-					<button icon="gtk-print" name="print_report" string="Print" type="object"/>
-				</form>
-			</field>
-		</record>
-		
-		<record model="ir.actions.act_window" id="hotel_folio_wizard">
-			<field name="name">Hotel Folio Wizard</field>
-			<field name="res_model">folio.report.wizard</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="target">new</field>
-		</record>
-
-		<menuitem
-			name="Hotel Folio Report"