savoirfairelinux-openerp team mailing list archive

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

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

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

=== modified file 'travel/i18n/fr.po'
--- travel/i18n/fr.po	2013-12-02 20:48:07 +0000
+++ travel/i18n/fr.po	2013-12-04 18:59:18 +0000
@@ -46,6 +46,7 @@
 msgstr "Administration"
 
 #. module: travel
+<<<<<<< TREE
 #: view:travel.passenger:0
 msgid "Update"
 msgstr "Mettre à jour"
@@ -60,6 +61,16 @@
 #: field:travel.travel,message_follower_ids:0
 msgid "Followers"
 msgstr "Abonnés"
+=======
+#: field:travel.passenger,department_id:0
+msgid "Department"
+msgstr "Unité d'administrative"
+
+#. module: travel
+#: selection:travel.travel,state:0
+msgid "Draft"
+msgstr "Nouveau"
+>>>>>>> MERGE-SOURCE
 
 #. module: travel
 #: selection:travel.travel,state:0
@@ -69,7 +80,7 @@
 #. module: travel
 #: selection:travel.travel,state:0
 msgid "Closed"
-msgstr "Terminée"
+msgstr "Terminé"
 
 #. module: travel
 #: field:travel.passenger,department_id:0

=== modified file 'travel/travel_passenger_view.xml'
--- travel/travel_passenger_view.xml	2013-11-29 20:07:16 +0000
+++ travel/travel_passenger_view.xml	2013-12-04 18:59:18 +0000
@@ -5,7 +5,6 @@
     <record model="ir.ui.view" id="travel_passenger_form_view">
       <field name="name">Travel Passenger Form View</field>
       <field name="model">travel.passenger</field>
-      <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Travel Passengers" version="7.0">
           <group name="General" col="4">

=== modified file 'travel/travel_view.xml'
--- travel/travel_view.xml	2013-11-29 20:29:32 +0000
+++ travel/travel_view.xml	2013-12-04 18:59:18 +0000
@@ -5,7 +5,6 @@
     <record model="ir.ui.view" id="travel_tree_view">
       <field name="name">Travel Tree View</field>
       <field name="model">travel.travel</field>
-      <field name="type">tree</field>
       <field name="arch" type="xml">
         <tree string="TravelsTree" version="7.0">
           <field name="name"/>

=== modified file 'travel_accommodation/travel_accommodation_view.xml'
--- travel_accommodation/travel_accommodation_view.xml	2013-11-21 22:06:09 +0000
+++ travel_accommodation/travel_accommodation_view.xml	2013-12-04 18:59:18 +0000
@@ -5,7 +5,6 @@
     <record model="ir.ui.view" id="travel_accommodation_form_view">
       <field name="name">Passenger Accommodation Form View</field>
       <field name="model">travel.accommodation</field>
-      <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Passenger Accommodation" version="7.0">
           <sheet string="Accommodation">

=== modified file 'travel_accommodation/travel_passenger_view.xml'
--- travel_accommodation/travel_passenger_view.xml	2013-11-27 23:46:08 +0000
+++ travel_accommodation/travel_passenger_view.xml	2013-12-04 18:59:18 +0000
@@ -7,13 +7,13 @@
       <field name="model">travel.passenger</field>
       <field name="inherit_id" ref="travel.travel_passenger_form_view"/>
       <field name="priority" eval="2.0"/>
-      <field name="type">form</field>
       <field name="arch" type="xml">
         <notebook name="Info" position="inside">
           <page string="Accommodation">
             <field name="accommodation_ids">
-              <tree name="PassengerAccommodationTree" version="7.0">
+               <tree name="PassengerAccommodationTree" version="7.0">
                 <field name="location"/>
+                <field name="departure"/>
                 <field name="arrival"/>
                 <field name="nights"/>
               </tree>

=== modified file 'travel_car_rental/i18n/fr.po'
--- travel_car_rental/i18n/fr.po	2013-12-02 21:56:17 +0000
+++ travel_car_rental/i18n/fr.po	2013-12-04 18:59:18 +0000
@@ -114,9 +114,25 @@
 msgstr "Locations d'auto pour le déplacement"
 
 #. module: travel_car_rental
+<<<<<<< TREE
 #: help:travel.car.rental,dropoff_loc:0
 msgid "Location of car drop-off."
 msgstr "Lieu de restitution de l'auto."
+=======
+#: view:travel.car.rental:0
+msgid "Location"
+msgstr "Localisation"
+
+#. module: travel_car_rental
+#: help:travel.car.rental,type:0
+msgid "Make and model of the car."
+msgstr "Marque et modèle de l'auto."
+
+#. module: travel_car_rental
+#: field:travel.car.rental,type:0
+msgid "Vehicle type"
+msgstr "Type de véhicule"
+>>>>>>> MERGE-SOURCE
 
 #. module: travel_car_rental
 #: help:travel.car.rental,driver:0

=== modified file 'travel_car_rental/travel_passenger_view.xml'
--- travel_car_rental/travel_passenger_view.xml	2013-11-28 19:08:44 +0000
+++ travel_car_rental/travel_passenger_view.xml	2013-12-04 18:59:18 +0000
@@ -7,7 +7,6 @@
       <field name="model">travel.passenger</field>
       <field name="inherit_id" ref="travel.travel_passenger_form_view"/>
       <field name="priority" eval="3.0"/>
-      <field name="type">form</field>
       <field name="arch" type="xml">
         <notebook name="Info" position="inside">
           <page string="Car Rental">

=== modified file 'travel_journey/travel_journey.py'
--- travel_journey/travel_journey.py	2013-12-02 23:03:59 +0000
+++ travel_journey/travel_journey.py	2013-12-04 18:59:18 +0000
@@ -63,8 +63,14 @@
         'comment': fields.text('Comments'),
         'passenger_id': fields.many2one('travel.passenger', 'Passenger', required=True,
                                         help='Passenger on this journey.'),
+<<<<<<< TREE
         'type': fields.selection(_get_type, 'Travel journey type',
                                  help='Travel journey type.'),
+=======
+        #'type': fields.many2one('travel.journey.type', 'Travel journey type',
+        #                        help='Travel journey type.'),
+        'type': fields.selection(_get_type, 'Travel journey type', help='Travel journey type.'),
+>>>>>>> MERGE-SOURCE
         'reservation': fields.char('Reservation Number', size=256,
                                    help="Number of the ticket reservation."),
         'cancellation': fields.text('Cancellation', help='Notes on cancellation.'),
@@ -75,8 +81,16 @@
         return ir_model_data.get_object_reference(cr, uid, 'travel_journey',
                                                   'travel_journey_class_directive',)[1]
 
+    def _get_default_product(self, cr, uid, context=None):
+        product_uom = self.pool.get('product.uom')
+        if context is None:
+            context = {}
+        product_id = product_uom.search(cr, uid, [('name', '=', 'kg')], limit=1)
+        return product_id and product_id[0] or False
+
     _defaults = {
-        'class_id': _default_class
+        'class_id': _default_class,
+        'baggage_weight_uom': _get_default_product,
     }
 
     def create(self, cr, uid, vals, context=None):

=== modified file 'travel_journey/travel_journey_view.xml'
--- travel_journey/travel_journey_view.xml	2013-11-29 23:13:35 +0000
+++ travel_journey/travel_journey_view.xml	2013-12-04 18:59:18 +0000
@@ -5,7 +5,6 @@
     <record model="ir.ui.view" id="travel_journey_form_view">
       <field name="name">Passenger Journey Form View</field>
       <field name="model">travel.journey</field>
-      <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Passenger Journeys" version="7.0">
           <sheet string="Journeys">
@@ -35,7 +34,8 @@
               </group>
               <separator string="Visa" colspan="4"/>
               <field name="visa"/>
-              <field name="visa_country"/>
+              <field name="visa_country"
+                     attrs="{'invisible': [('visa', '=', False)], 'required': [('visa', '=', True)]}"/>
 
               <separator string="Class and Baggage" colspan="4"/>
               <field name="class_id" colspan="4"/>
@@ -47,6 +47,7 @@
                   <field name="baggage_weight_uom"
                          nolabel='1'
                          class="oe_inline"
+                         attrs="{'required': True}"
                          domain="[('category_id.name', '=', 'Weight')]"/>
                 </div>
               </group>

=== modified file 'travel_journey/travel_passenger_view.xml'
--- travel_journey/travel_passenger_view.xml	2013-12-02 21:56:17 +0000
+++ travel_journey/travel_passenger_view.xml	2013-12-04 18:59:18 +0000
@@ -7,7 +7,6 @@
       <field name="model">travel.passenger</field>
       <field name="inherit_id" ref="travel.travel_passenger_form_view"/>
       <field name="priority" eval="1.0"/>
-      <field name="type">form</field>
       <field name="arch" type="xml">
         <notebook name="Info" position="inside">
           <page string="Journey">

=== modified file 'travel_journey_plane/i18n/fr.po'
--- travel_journey_plane/i18n/fr.po	2013-12-02 22:36:06 +0000
+++ travel_journey_plane/i18n/fr.po	2013-12-04 18:59:18 +0000
@@ -115,6 +115,12 @@
 msgstr "Annulation"
 
 #. module: travel_journey_plane
+<<<<<<< TREE
 #: help:travel.journey,terminal_to:0
 msgid "Terminal number at destination airport"
 msgstr "Numéro du terminal aéroportuaire à destination"
+=======
+#: view:travel.passenger:0
+msgid "Airport to"
+msgstr "Aéroport destination"
+>>>>>>> MERGE-SOURCE

=== modified file 'travel_service_rental/i18n/fr.po'
--- travel_service_rental/i18n/fr.po	2013-12-02 21:56:17 +0000
+++ travel_service_rental/i18n/fr.po	2013-12-04 18:59:18 +0000
@@ -67,7 +67,7 @@
 #. module: travel_service_rental
 #: view:travel.passenger:0
 msgid "Travel - Other services"
-msgstr "Autres Prestations "
+msgstr "Autre prestation "
 
 #. module: travel_service_rental
 #: model:ir.model,name:travel_service_rental.model_travel_passenger

=== modified file 'travel_service_rental/travel_passenger_view.xml'
--- travel_service_rental/travel_passenger_view.xml	2013-11-28 19:27:59 +0000
+++ travel_service_rental/travel_passenger_view.xml	2013-12-04 18:59:18 +0000
@@ -7,7 +7,6 @@
       <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">

=== modified file 'travel_service_rental/travel_service_rental_view.xml'
--- travel_service_rental/travel_service_rental_view.xml	2013-11-27 20:02:01 +0000
+++ travel_service_rental/travel_service_rental_view.xml	2013-12-04 18:59:18 +0000
@@ -5,14 +5,13 @@
     <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="city_id" domain="[('id', '=', location.city_id.id)]"/>
                 <field name="country_id"/>
               </group>
               <group string="Times" col="2" colspan="2">