savoirfairelinux-openerp team mailing list archive
-
savoirfairelinux-openerp team
-
Mailing list archive
-
Message #00631
[Merge] lp:~savoirfairelinux-openerp/openerp-travel/amelioration into lp:~savoirfairelinux-openerp/openerp-travel/travel
elhadji.dem@xxxxxxxxxxxxxxxxxxxx has proposed merging lp:~savoirfairelinux-openerp/openerp-travel/amelioration into lp:~savoirfairelinux-openerp/openerp-travel/travel.
Requested reviews:
Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter)
For more details, see:
https://code.launchpad.net/~savoirfairelinux-openerp/openerp-travel/amelioration/+merge/196981
[IMP] replace travel_rental by travel_service_rental module, change pot file, add premium in travel_journey_data.xml
--
https://code.launchpad.net/~savoirfairelinux-openerp/openerp-travel/amelioration/+merge/196981
Your team Savoir-faire Linux' OpenERP is subscribed to branch lp:~savoirfairelinux-openerp/openerp-travel/travel.
=== modified file 'travel_journey/travel_journey_data.xml'
--- travel_journey/travel_journey_data.xml 2013-11-20 21:24:42 +0000
+++ travel_journey/travel_journey_data.xml 2013-11-27 20:55:27 +0000
@@ -13,5 +13,8 @@
<record id="travel_journey_class_business" model="travel.journey.class">
<field name="name">Business</field>
</record>
+ <record id="travel_journey_class_premium" model="travel.journey.class">
+ <field name="name">Premium</field>
+ </record>
</data>
</openerp>
=== removed directory 'travel_rental'
=== removed file 'travel_rental/__init__.py'
--- travel_rental/__init__.py 2013-11-20 17:12:45 +0000
+++ travel_rental/__init__.py 1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# This module copyright (C) 2013 Savoir-faire Linux
-# (<http://www.savoirfairelinux.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.
-#
-# 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/>.
-#
-##############################################################################
-
-import travel_rental
-import travel_passenger
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== removed file 'travel_rental/__openerp__.py'
--- travel_rental/__openerp__.py 2013-11-26 23:43:23 +0000
+++ travel_rental/__openerp__.py 1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# This module copyright (C) 2013 Savoir-faire Linux
-# (<http://www.savoirfairelinux.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.
-#
-# 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/>.
-#
-##############################################################################
-
-{
- 'name': 'Travel Rentals',
- 'version': '0.1',
- 'author': 'Savoir-faire Linux',
- 'maintainer': 'Savoir-faire Linux',
- 'website': 'http://www.savoirfairelinux.com',
- 'category': 'Customer Relationship Management',
- 'description': """
- Travel Rentals
-===============
-This module adds rental management for travels.
-
-Contributors
-------------
-* Sandy Carter (sandy.carter@xxxxxxxxxxxxxxxxxxxx)
-""",
- 'depends': ['travel', 'city'],
- 'external_dependencies': {},
- 'data': ['travel_passenger_view.xml',
- 'travel_rental_view.xml'
- ],
- 'demo': [],
- 'test': [],
- 'installable': True,
- 'active': False,
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== removed directory 'travel_rental/i18n'
=== removed file 'travel_rental/i18n/fr.po'
--- travel_rental/i18n/fr.po 2013-11-20 21:24:42 +0000
+++ travel_rental/i18n/fr.po 1970-01-01 00:00:00 +0000
@@ -1,127 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * travel_rental
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-20 18:06+0000\n"
-"PO-Revision-Date: 2013-11-20 14:17-0500\n"
-"Last-Translator: Sandy Carter <sandy.carter@xxxxxxxxxxxxxxxxxxxx>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"X-Generator: Poedit 1.5.7\n"
-
-#. module: travel_rental
-#: field:travel.rental,city_id:0
-msgid "City"
-msgstr "Ville"
-
-#. module: travel_rental
-#: field:travel.rental,capacity:0
-msgid "Capacity"
-msgstr "Capacité"
-
-#. module: travel_rental
-#: help:travel.rental,passenger_id:0
-msgid "Passenger of this rental."
-msgstr "Voyageurs de la location."
-
-#. module: travel_rental
-#: field:travel.rental,start:0
-msgid "Start"
-msgstr "Début"
-
-#. module: travel_rental
-#: view:travel.rental:0 field:travel.rental,location:0
-msgid "Location"
-msgstr "Lieu"
-
-#. module: travel_rental
-#: field:travel.rental,end:0
-msgid "End"
-msgstr "Fin"
-
-#. module: travel_rental
-#: model:ir.model,name:travel_rental.model_travel_rental
-msgid "Rentals for travel"
-msgstr "Locations pour le déplacement"
-
-#. module: travel_rental
-#: model:ir.model,name:travel_rental.model_travel_passenger
-msgid "Passenger on travel"
-msgstr "Voyageur en déplacement"
-
-#. module: travel_rental
-#: view:travel.passenger:0
-msgid "Rental"
-msgstr "Location"
-
-#. module: travel_rental
-#: help:travel.rental,location:0
-msgid "Location of rental supplier."
-msgstr "Lieu du fournisseur"
-
-#. module: travel_rental
-#: field:travel.rental,country_id:0
-msgid "Country"
-msgstr "Pays"
-
-#. module: travel_rental
-#: view:travel.rental:0 field:travel.rental,equipment:0
-msgid "Desired equipment"
-msgstr "Équipement souhaité"
-
-#. module: travel_rental
-#: view:travel.rental:0 field:travel.rental,services:0
-msgid "Desired services"
-msgstr "Services souhaités"
-
-#. module: travel_rental
-#: view:travel.rental:0
-msgid "Times"
-msgstr "Heures et dates"
-
-#. module: travel_rental
-#: help:travel.rental,capacity:0
-msgid "Maximum capacity of people in room."
-msgstr "Capacité maximale de la salle."
-
-#. module: travel_rental
-#: field:travel.passenger,rental_ids:0 view:travel.rental:0
-msgid "Rentals"
-msgstr "Locations"
-
-#. module: travel_rental
-#: help:travel.passenger,rental_ids:0
-msgid "List of rentals."
-msgstr "Liste de locations."
-
-#. module: travel_rental
-#: field:travel.rental,passenger_id:0
-msgid "Passenger"
-msgstr "Voyageur"
-
-#. module: travel_rental
-#: help:travel.rental,start:0
-msgid "Start date and time of rental."
-msgstr "Heure et date du début de la location."
-
-#. module: travel_rental
-#: help:travel.rental,city_id:0
-msgid "City of rental."
-msgstr "Ville de location."
-
-#. module: travel_rental
-#: help:travel.rental,end:0
-msgid "End date and time of rental."
-msgstr "Heure et date de la fin de la location."
-
-#. module: travel_rental
-#: help:travel.rental,country_id:0
-msgid "Country of rental."
-msgstr "Pays de location."
=== removed file 'travel_rental/i18n/travel_rental.pot'
--- travel_rental/i18n/travel_rental.pot 2013-11-20 19:26:15 +0000
+++ travel_rental/i18n/travel_rental.pot 1970-01-01 00:00:00 +0000
@@ -1,131 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * travel_rental
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-20 18:06+0000\n"
-"PO-Revision-Date: 2013-11-20 18: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: \n"
-"Plural-Forms: \n"
-
-#. module: travel_rental
-#: field:travel.rental,city_id:0
-msgid "City"
-msgstr ""
-
-#. module: travel_rental
-#: field:travel.rental,capacity:0
-msgid "Capacity"
-msgstr ""
-
-#. module: travel_rental
-#: help:travel.rental,passenger_id:0
-msgid "Passenger of this rental."
-msgstr ""
-
-#. module: travel_rental
-#: field:travel.rental,start:0
-msgid "Start"
-msgstr ""
-
-#. module: travel_rental
-#: view:travel.rental:0
-#: field:travel.rental,location:0
-msgid "Location"
-msgstr ""
-
-#. module: travel_rental
-#: field:travel.rental,end:0
-msgid "End"
-msgstr ""
-
-#. module: travel_rental
-#: model:ir.model,name:travel_rental.model_travel_rental
-msgid "Rentals for travel"
-msgstr ""
-
-#. module: travel_rental
-#: model:ir.model,name:travel_rental.model_travel_passenger
-msgid "Passenger on travel"
-msgstr ""
-
-#. module: travel_rental
-#: view:travel.passenger:0
-msgid "Rental"
-msgstr ""
-
-#. module: travel_rental
-#: help:travel.rental,location:0
-msgid "Location of rental supplier."
-msgstr ""
-
-#. module: travel_rental
-#: field:travel.rental,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: travel_rental
-#: view:travel.rental:0
-#: field:travel.rental,equipment:0
-msgid "Desired equipment"
-msgstr ""
-
-#. module: travel_rental
-#: view:travel.rental:0
-#: field:travel.rental,services:0
-msgid "Desired services"
-msgstr ""
-
-#. module: travel_rental
-#: view:travel.rental:0
-msgid "Times"
-msgstr ""
-
-#. module: travel_rental
-#: help:travel.rental,capacity:0
-msgid "Maximum capacity of people in room."
-msgstr ""
-
-#. module: travel_rental
-#: field:travel.passenger,rental_ids:0
-#: view:travel.rental:0
-msgid "Rentals"
-msgstr ""
-
-#. module: travel_rental
-#: help:travel.passenger,rental_ids:0
-msgid "List of rentals."
-msgstr ""
-
-#. module: travel_rental
-#: field:travel.rental,passenger_id:0
-msgid "Passenger"
-msgstr ""
-
-#. module: travel_rental
-#: help:travel.rental,start:0
-msgid "Start date and time of rental."
-msgstr ""
-
-#. module: travel_rental
-#: help:travel.rental,city_id:0
-msgid "City of rental."
-msgstr ""
-
-#. module: travel_rental
-#: help:travel.rental,end:0
-msgid "End date and time of rental."
-msgstr ""
-
-#. module: travel_rental
-#: help:travel.rental,country_id:0
-msgid "Country of rental."
-msgstr ""
-
=== removed file 'travel_rental/travel_passenger.py'
--- travel_rental/travel_passenger.py 2013-11-20 17:12:45 +0000
+++ travel_rental/travel_passenger.py 1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# This module copyright (C) 2013 Savoir-faire Linux
-# (<http://www.savoirfairelinux.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.
-#
-# 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 openerp.osv import fields, orm
-
-
-class travel_passenger(orm.Model):
- _inherit = 'travel.passenger'
- _columns = {
- 'rental_ids': fields.one2many('travel.rental', 'passenger_id',
- 'Rentals', help='List of rentals.'),
-
- }
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== removed file 'travel_rental/travel_passenger_view.xml'
--- travel_rental/travel_passenger_view.xml 2013-11-20 20:58:51 +0000
+++ travel_rental/travel_passenger_view.xml 1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-<?xml version = "1.0" encoding="utf-8"?>
-<openerp>
- <data>
- <!-- Views -->
- <record model="ir.ui.view" id="travel_passenger_rental_form_view">
- <field name="name">Travel Passenger Form View</field>
- <field name="model">travel.passenger</field>
- <field name="inherit_id" ref="travel.travel_passenger_form_view"/>
- <field name="priority" eval="4.0"/>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <notebook name="Info" position="inside">
- <page string="Rental">
- <field name="rental_ids">
- <tree name="PassengerRentalTree" version="7.0">
- <field name="location"/>
- <field name="city_id"/>
- <field name="start"/>
- <field name="end"/>
- <field name="capacity"/>
- </tree>
- </field>
- </page>
- </notebook>
- </field>
- </record>
- </data>
-</openerp>
=== removed file 'travel_rental/travel_rental.py'
--- travel_rental/travel_rental.py 2013-11-21 14:27:39 +0000
+++ travel_rental/travel_rental.py 1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# This module copyright (C) 2013 Savoir-faire Linux
-# (<http://www.savoirfairelinux.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.
-#
-# 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 openerp.osv import fields, orm
-from datetime import datetime
-
-import openerp.addons.decimal_precision as dp
-
-
-class travel_rental(orm.Model):
- _description = 'Rentals for travel'
- _name = 'travel.rental'
-
- _columns = {
- # TODO: hotel/other support
- 'location': fields.many2one('res.partner', 'Location', required=True,
- help='Location of rental supplier.'),
- 'country_id': fields.related('city_id', 'country_id', type='many2one',
- relation='res.country', string="Country",
- readonly=True, help='Country of rental.'),
- 'city_id': fields.many2one('res.country.city', 'City', required='True',
- help='City of rental.'),
- 'start': fields.datetime('Start', required=True,
- help='Start date and time of rental.'),
- 'end': fields.datetime('End', required=True,
- help='End date and time of rental.'),
- 'capacity': fields.integer('Capacity', help='Maximum capacity of people in room.'),
- 'equipment': fields.text('Desired equipment'),
- 'services': fields.text('Desired services'),
- 'passenger_id': fields.many2one('travel.passenger', 'Passenger', required=True,
- help='Passenger of this rental.'),
-
- }
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== removed file 'travel_rental/travel_rental_view.xml'
--- travel_rental/travel_rental_view.xml 2013-11-20 17:12:45 +0000
+++ travel_rental/travel_rental_view.xml 1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-<?xml version = "1.0" encoding="utf-8"?>
-<openerp>
- <data>
- <!-- Views -->
- <record model="ir.ui.view" id="travel_rental_form_view">
- <field name="name">Passenger Rental Form View</field>
- <field name="model">travel.rental</field>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <form string="Rentals" version="7.0">
- <sheet string="Rentals">
- <group col="4">
- <group string="Location" col="2" colspan="2">
- <field name="location"/>
- <field name="city_id"/>
- <field name="country_id"/>
- </group>
- <group string="Times" col="2" colspan="2">
- <field name="start"/>
- <field name="end"/>
- <field name="capacity"/>
- </group>
- <group string="Desired equipment" col="1" colspan="2">
- <field name="equipment" nolabel="1"/>
- </group>
- <group string="Desired services" col="1" colspan="2">
- <field name="services" nolabel="1"/>
- </group>
- </group>
- </sheet>
- </form>
- </field>
- </record>
- </data>
-</openerp>
=== added directory 'travel_service_rental'
=== added file 'travel_service_rental/__init__.py'
--- travel_service_rental/__init__.py 1970-01-01 00:00:00 +0000
+++ travel_service_rental/__init__.py 2013-11-27 20:55:27 +0000
@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# This module copyright (C) 2013 Savoir-faire Linux
+# (<http://www.savoirfairelinux.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.
+#
+# 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/>.
+#
+##############################################################################
+
+import travel_service_rental
+import travel_passenger
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== added file 'travel_service_rental/__openerp__.py'
--- travel_service_rental/__openerp__.py 1970-01-01 00:00:00 +0000
+++ travel_service_rental/__openerp__.py 2013-11-27 20:55:27 +0000
@@ -0,0 +1,51 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# This module copyright (C) 2013 Savoir-faire Linux
+# (<http://www.savoirfairelinux.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.
+#
+# 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/>.
+#
+##############################################################################
+
+{
+ 'name': 'Travel - Other services',
+ 'version': '0.1',
+ 'author': 'Savoir-faire Linux',
+ 'maintainer': 'Savoir-faire Linux',
+ 'website': 'http://www.savoirfairelinux.com',
+ 'category': 'Customer Relationship Management',
+ 'description': """
+Travel - Other services
+=======================
+This module adds service rental management for travels.
+
+Contributors
+------------
+* Sandy Carter (sandy.carter@xxxxxxxxxxxxxxxxxxxx)
+* EL HADJI DEM (elhadji.dem@xxxxxxxxxxxxxxxxxxxx)
+""",
+ 'depends': ['travel', 'city'],
+ 'external_dependencies': {},
+ 'data': ['travel_passenger_view.xml',
+ 'travel_service_rental_view.xml'
+ ],
+ 'demo': [],
+ 'test': [],
+ 'installable': True,
+ 'active': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== added directory 'travel_service_rental/i18n'
=== added file 'travel_service_rental/i18n/fr.po'
--- travel_service_rental/i18n/fr.po 1970-01-01 00:00:00 +0000
+++ travel_service_rental/i18n/fr.po 2013-11-27 20:55:27 +0000
@@ -0,0 +1,127 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * travel_service_rental
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-11-27 20:04+0000\n"
+"PO-Revision-Date: 2013-11-27 15:10-0500\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"
+"X-Generator: Poedit 1.5.4\n"
+
+#. module: travel_service_rental
+#: field:travel.service.rental,city_id:0
+msgid "City"
+msgstr "Ville"
+
+#. module: travel_service_rental
+#: field:travel.service.rental,capacity:0
+msgid "Capacity"
+msgstr "Capacité"
+
+#. module: travel_service_rental
+#: help:travel.service.rental,city_id:0
+msgid "City of rental."
+msgstr "Ville de location."
+
+#. module: travel_service_rental
+#: help:travel.service.rental,capacity:0
+msgid "Maximum capacity of people in room."
+msgstr "Capacité maximale de la salle."
+
+#. module: travel_service_rental
+#: view:travel.service.rental:0 field:travel.service.rental,location:0
+msgid "Location"
+msgstr "Location"
+
+#. module: travel_service_rental
+#: field:travel.service.rental,end:0
+msgid "End"
+msgstr "Fin"
+
+#. module: travel_service_rental
+#: model:ir.model,name:travel_service_rental.model_travel_rental
+msgid "Rentals for travel"
+msgstr "Locations pour le déplacement"
+
+#. module: travel_service_rental
+#: view:travel.passenger:0
+msgid "Travel - Other services"
+msgstr "Autres Prestations "
+
+#. module: travel_service_rental
+#: model:ir.model,name:travel_service_rental.model_travel_passenger
+msgid "Passenger on travel"
+msgstr "Voyageur en déplacement"
+
+#. module: travel_service_rental
+#: help:travel.service.rental,location:0
+msgid "Location of rental supplier."
+msgstr "Lieu du fournisseur"
+
+#. module: travel_service_rental
+#: field:travel.service.rental,country_id:0
+msgid "Country"
+msgstr "Pays"
+
+#. module: travel_service_rental
+#: view:travel.service.rental:0 field:travel.service.rental,equipment:0
+msgid "Desired equipment"
+msgstr "Équipement souhaité"
+
+#. module: travel_service_rental
+#: view:travel.service.rental:0 field:travel.service.rental,services:0
+msgid "Desired services"
+msgstr "Services souhaités"
+
+#. module: travel_service_rental
+#: view:travel.service.rental:0
+msgid "Times"
+msgstr "Heures et dates"
+
+#. module: travel_service_rental
+#: view:travel.service.rental:0
+msgid "Rentals"
+msgstr "Locations"
+
+#. module: travel_service_rental
+#: field:travel.service.rental,start:0
+msgid "Start"
+msgstr "Début"
+
+#. module: travel_service_rental
+#: field:travel.service.rental,passenger_id:0
+msgid "Passenger"
+msgstr "Voyageur"
+
+#. module: travel_service_rental
+#: help:travel.service.rental,start:0
+msgid "Start date and time of rental."
+msgstr "Heure et date du début de la location."
+
+#. module: travel_service_rental
+#: help:travel.service.rental,passenger_id:0
+msgid "Passenger of this rental."
+msgstr "Voyageurs de la location."
+
+#. module: travel_service_rental
+#: help:travel.service.rental,end:0
+msgid "End date and time of rental."
+msgstr "Heure et date de la fin de la location."
+
+#. module: travel_service_rental
+#: help:travel.service.rental,country_id:0
+msgid "Country of rental."
+msgstr "Pays de location."
+
+#. module: travel_service_rental
+#: model:ir.model,name:travel_service_rental.model_travel_service_rental
+msgid "Service rentals for travel"
+msgstr "Service de locations pour le déplacement"
=== added file 'travel_service_rental/i18n/travel_service_rental.pot'
--- travel_service_rental/i18n/travel_service_rental.pot 1970-01-01 00:00:00 +0000
+++ travel_service_rental/i18n/travel_service_rental.pot 2013-11-27 20:55:27 +0000
@@ -0,0 +1,127 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * travel_service_rental
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-11-27 20:02+0000\n"
+"PO-Revision-Date: 2013-11-27 15:02-0500\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"
+"X-Generator: Poedit 1.5.4\n"
+
+#. module: travel_service_rental
+#: field:travel.service.rental,city_id:0
+msgid "City"
+msgstr ""
+
+#. module: travel_service_rental
+#: field:travel.service.rental,capacity:0
+msgid "Capacity"
+msgstr ""
+
+#. module: travel_service_rental
+#: help:travel.service.rental,city_id:0
+msgid "City of rental."
+msgstr ""
+
+#. module: travel_service_rental
+#: help:travel.service.rental,capacity:0
+msgid "Maximum capacity of people in room."
+msgstr ""
+
+#. module: travel_service_rental
+#: view:travel.service.rental:0 field:travel.service.rental,location:0
+msgid "Location"
+msgstr ""
+
+#. module: travel_service_rental
+#: field:travel.service.rental,end:0
+msgid "End"
+msgstr ""
+
+#. module: travel_service_rental
+#: model:ir.model,name:travel_service_rental.model_travel_rental
+msgid "Rentals for travel"
+msgstr ""
+
+#. module: travel_service_rental
+#: view:travel.passenger:0
+msgid "Travel - Other services"
+msgstr ""
+
+#. module: travel_service_rental
+#: model:ir.model,name:travel_service_rental.model_travel_passenger
+msgid "Passenger on travel"
+msgstr ""
+
+#. module: travel_service_rental
+#: help:travel.service.rental,location:0
+msgid "Location of rental supplier."
+msgstr ""
+
+#. module: travel_service_rental
+#: field:travel.service.rental,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: travel_service_rental
+#: view:travel.service.rental:0 field:travel.service.rental,equipment:0
+msgid "Desired equipment"
+msgstr ""
+
+#. module: travel_service_rental
+#: view:travel.service.rental:0 field:travel.service.rental,services:0
+msgid "Desired services"
+msgstr ""
+
+#. module: travel_service_rental
+#: view:travel.service.rental:0
+msgid "Times"
+msgstr ""
+
+#. module: travel_service_rental
+#: view:travel.service.rental:0
+msgid "Rentals"
+msgstr ""
+
+#. module: travel_service_rental
+#: field:travel.service.rental,start:0
+msgid "Start"
+msgstr ""
+
+#. module: travel_service_rental
+#: field:travel.service.rental,passenger_id:0
+msgid "Passenger"
+msgstr ""
+
+#. module: travel_service_rental
+#: help:travel.service.rental,start:0
+msgid "Start date and time of rental."
+msgstr ""
+
+#. module: travel_service_rental
+#: help:travel.service.rental,passenger_id:0
+msgid "Passenger of this rental."
+msgstr ""
+
+#. module: travel_service_rental
+#: help:travel.service.rental,end:0
+msgid "End date and time of rental."
+msgstr ""
+
+#. module: travel_service_rental
+#: help:travel.service.rental,country_id:0
+msgid "Country of rental."
+msgstr ""
+
+#. module: travel_service_rental
+#: model:ir.model,name:travel_service_rental.model_travel_service_rental
+msgid "Service rentals for travel"
+msgstr ""
=== added file 'travel_service_rental/travel_passenger.py'
--- travel_service_rental/travel_passenger.py 1970-01-01 00:00:00 +0000
+++ travel_service_rental/travel_passenger.py 2013-11-27 20:55:27 +0000
@@ -0,0 +1,34 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# This module copyright (C) 2013 Savoir-faire Linux
+# (<http://www.savoirfairelinux.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.
+#
+# 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 openerp.osv import fields, orm
+
+
+class travel_passenger(orm.Model):
+ _inherit = 'travel.passenger'
+ _columns = {
+ 'rental_ids': fields.one2many('travel.service.rental', 'passenger_id',
+ 'Rentals', help='List of rentals.'),
+
+ }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== added file 'travel_service_rental/travel_passenger_view.xml'
--- travel_service_rental/travel_passenger_view.xml 1970-01-01 00:00:00 +0000
+++ travel_service_rental/travel_passenger_view.xml 2013-11-27 20:55:27 +0000
@@ -0,0 +1,28 @@
+<?xml version = "1.0" encoding="utf-8"?>
+<openerp>
+ <data>
+ <!-- Views -->
+ <record model="ir.ui.view" id="travel_passenger_rental_form_view">
+ <field name="name">Travel Passenger Form View</field>
+ <field name="model">travel.passenger</field>
+ <field name="inherit_id" ref="travel.travel_passenger_form_view"/>
+ <field name="priority" eval="4.0"/>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <notebook name="Info" position="inside">
+ <page string="Travel - Other services">
+ <field name="rental_ids">
+ <tree name="PassengerRentalTree" version="7.0">
+ <field name="location"/>
+ <field name="city_id"/>
+ <field name="start"/>
+ <field name="end"/>
+ <field name="capacity"/>
+ </tree>
+ </field>
+ </page>
+ </notebook>
+ </field>
+ </record>
+ </data>
+</openerp>
=== added file 'travel_service_rental/travel_service_rental.py'
--- travel_service_rental/travel_service_rental.py 1970-01-01 00:00:00 +0000
+++ travel_service_rental/travel_service_rental.py 2013-11-27 20:55:27 +0000
@@ -0,0 +1,54 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# This module copyright (C) 2013 Savoir-faire Linux
+# (<http://www.savoirfairelinux.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.
+#
+# 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 openerp.osv import fields, orm
+from datetime import datetime
+
+import openerp.addons.decimal_precision as dp
+
+
+class travel_service_rental(orm.Model):
+ _description = 'Service rentals for travel'
+ _name = 'travel.service.rental'
+
+ _columns = {
+ # TODO: hotel/other support
+ 'location': fields.many2one('res.partner', 'Location', required=True,
+ help='Location of rental supplier.'),
+ 'country_id': fields.related('city_id', 'country_id', type='many2one',
+ relation='res.country', string="Country",
+ readonly=True, help='Country of rental.'),
+ 'city_id': fields.many2one('res.country.city', 'City', required='True',
+ help='City of rental.'),
+ 'start': fields.datetime('Start', required=True,
+ help='Start date and time of rental.'),
+ 'end': fields.datetime('End', required=True,
+ help='End date and time of rental.'),
+ 'capacity': fields.integer('Capacity', help='Maximum capacity of people in room.'),
+ 'equipment': fields.text('Desired equipment'),
+ 'services': fields.text('Desired services'),
+ 'passenger_id': fields.many2one('travel.passenger', 'Passenger', required=True,
+ help='Passenger of this rental.'),
+
+ }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== added file 'travel_service_rental/travel_service_rental_view.xml'
--- travel_service_rental/travel_service_rental_view.xml 1970-01-01 00:00:00 +0000
+++ travel_service_rental/travel_service_rental_view.xml 2013-11-27 20:55:27 +0000
@@ -0,0 +1,35 @@
+<?xml version = "1.0" encoding="utf-8"?>
+<openerp>
+ <data>
+ <!-- Views -->
+ <record model="ir.ui.view" id="travel_rental_form_view">
+ <field name="name">Travel - Other services Form View</field>
+ <field name="model">travel.service.rental</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="Rentals" version="7.0">
+ <sheet string="Rentals">
+ <group col="4">
+ <group string="Location" col="2" colspan="2">
+ <field name="location"/>
+ <field name="city_id"/>
+ <field name="country_id"/>
+ </group>
+ <group string="Times" col="2" colspan="2">
+ <field name="start"/>
+ <field name="end"/>
+ <field name="capacity"/>
+ </group>
+ <group string="Desired equipment" col="1" colspan="2">
+ <field name="equipment" nolabel="1"/>
+ </group>
+ <group string="Desired services" col="1" colspan="2">
+ <field name="services" nolabel="1"/>
+ </group>
+ </group>
+ </sheet>
+ </form>
+ </field>
+ </record>
+ </data>
+</openerp>
Follow ups
