savoirfairelinux-openerp team mailing list archive

["elhadji.dem@xxxxxxxxxxxxxxxxxxxx" <elhadji.dem@xxxxxxxxxxxxxxxxxxxx>]

elhadji.dem@xxxxxxxxxxxxxxxxxxxx has proposed merging lp:~savoirfairelinux-openerp/openerp-travel/motor_vehicle 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/motor_vehicle/+merge/196951

[IMP] adds motor_vehicle module
-- 
https://code.launchpad.net/~savoirfairelinux-openerp/openerp-travel/motor_vehicle/+merge/196951
Your team Savoir-faire Linux' OpenERP is subscribed to branch lp:~savoirfairelinux-openerp/openerp-travel/travel.

=== added directory 'motor_vehicle'
=== added file 'motor_vehicle/__init__.py'
--- motor_vehicle/__init__.py	1970-01-01 00:00:00 +0000
+++ motor_vehicle/__init__.py	2013-11-27 17:35:53 +0000
@@ -0,0 +1,25 @@
+# -*- 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 motor_vehicle
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'motor_vehicle/__openerp__.py'
--- motor_vehicle/__openerp__.py	1970-01-01 00:00:00 +0000
+++ motor_vehicle/__openerp__.py	2013-11-27 17:35:53 +0000
@@ -0,0 +1,49 @@
+# -*- 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': 'Motor Vehicle Management',
+    'version': '0.1',
+    'author': 'Savoir-faire Linux',
+    'maintainer': 'Savoir-faire Linux',
+    'website': 'http://www.savoirfairelinux.com',
+    'category': 'Customer Relationship Management',
+    'summary': 'Motor vehicle',
+    'description': """
+Motor Vehicle Management
+========================
+This module adds type of motor vehicle.
+
+Contributors
+------------
+* EL HADJI DEM (elhadji.dem@xxxxxxxxxxxxxxxxxxxx)
+""",
+    'depends': [],
+    'external_dependencies': {},
+    'data': [],
+    'demo': [],
+    'test': [],
+    'installable': True,
+    'active': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'motor_vehicle/i18n'
=== added file 'motor_vehicle/i18n/fr.po'
--- motor_vehicle/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ motor_vehicle/i18n/fr.po	2013-11-27 17:35:53 +0000
@@ -0,0 +1,39 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* motor_vehicle
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-11-27 17:21+0000\n"
+"PO-Revision-Date: 2013-11-27 12:26-0500\n"
+"Last-Translator: \n"
+"Language-Team: Savoir-faire Linux\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 1.5.4\n"
+"Language: fr\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+#. module: motor_vehicle
+#: model:ir.model,name:motor_vehicle.model_travel_car_rental
+msgid "Car Rentals for travel"
+msgstr "Location d'autos pour déplacement"
+
+#. module: motor_vehicle
+#: field:motor.vehicle,name:0
+msgid "Name"
+msgstr "Nom"
+
+#. module: motor_vehicle
+#: model:ir.model,name:motor_vehicle.model_motor_vehicle
+msgid "Motor vehicle"
+msgstr "Véhicule"
+
+#. module: motor_vehicle
+#: help:motor.vehicle,name:0
+msgid "Name of motor vehicle."
+msgstr "Nom du véhicule."

=== added file 'motor_vehicle/i18n/motor_vehicle.pot'
--- motor_vehicle/i18n/motor_vehicle.pot	1970-01-01 00:00:00 +0000
+++ motor_vehicle/i18n/motor_vehicle.pot	2013-11-27 17:35:53 +0000
@@ -0,0 +1,37 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* motor_vehicle
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-11-27 17:21+0000\n"
+"PO-Revision-Date: 2013-11-27 17:21+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: motor_vehicle
+#: model:ir.model,name:motor_vehicle.model_travel_car_rental
+msgid "Car Rentals for travel"
+msgstr ""
+
+#. module: motor_vehicle
+#: field:motor.vehicle,name:0
+msgid "Name"
+msgstr ""
+
+#. module: motor_vehicle
+#: model:ir.model,name:motor_vehicle.model_motor_vehicle
+msgid "Motor vehicle"
+msgstr ""
+
+#. module: motor_vehicle
+#: help:motor.vehicle,name:0
+msgid "Name of motor vehicle."
+msgstr ""
+

=== added file 'motor_vehicle/motor_vehicle.py'
--- motor_vehicle/motor_vehicle.py	1970-01-01 00:00:00 +0000
+++ motor_vehicle/motor_vehicle.py	2013-11-27 17:35:53 +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 motor_vehicle(orm.Model):
+    _description = 'Motor vehicle'
+    _name = 'motor.vehicle'
+    _columns = {
+        'name': fields.char('Name', size=256, required=True, select=True,
+                            help='Name of motor vehicle.'),
+    }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'travel_car_rental/__openerp__.py'
--- travel_car_rental/__openerp__.py	2013-11-26 23:43:23 +0000
+++ travel_car_rental/__openerp__.py	2013-11-27 17:35:53 +0000
@@ -36,7 +36,7 @@
 ------------
 * Sandy Carter (sandy.carter@xxxxxxxxxxxxxxxxxxxx)
 """,
-    'depends': ['travel', 'city'],
+    'depends': ['travel', 'city', 'motor_vehicle', ],
     'external_dependencies': {},
     'data': ['travel_passenger_view.xml',
              'travel_car_rental_view.xml'

=== modified file 'travel_car_rental/travel_car_rental.py'
--- travel_car_rental/travel_car_rental.py	2013-11-20 17:12:45 +0000
+++ travel_car_rental/travel_car_rental.py	2013-11-27 17:35:53 +0000
@@ -33,7 +33,7 @@
     _columns = {
         'pickup_loc': fields.char('Pick-up Location', size=255, help="Location of car pick-up."),
         'dropoff_loc': fields.char('Drop-off Location', size=255, help="Location of car drop-off."),
-        'type': fields.char('Vehicle type', size=255, help="Make and model of the car."),
+        'type': fields.many2one('motor.vehicle', 'Vehicle type', help="Make and model of the car."),
         'start': fields.datetime('Start', required=True,
                                  help='Start date and time of car rental.'),
         'end': fields.datetime('End', required=True,