savoirfairelinux-openerp team mailing list archive

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

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

[IMP] add partner_view in airport, airline and railwaystation module, add filter in travel module to show page=travel
-- 
https://code.launchpad.net/~savoirfairelinux-openerp/openerp-travel/airport_airline_railwaystation_travel/+merge/197106
Your team Savoir-faire Linux' OpenERP is subscribed to branch lp:~savoirfairelinux-openerp/openerp-travel/travel.

=== modified file 'airline/__openerp__.py'
--- airline/__openerp__.py	2013-11-26 23:43:23 +0000
+++ airline/__openerp__.py	2013-11-28 17:55:29 +0000
@@ -40,7 +40,8 @@
     'depends': ['crm', ],
     'external_dependencies': {},
     'data': [
-        'data/airline_data.xml'
+        #'data/airline_data.xml'
+        'res_partner_view.xml'
     ],
     'demo': [],
     'test': [],

=== added file 'airline/res_partner_view.xml'
--- airline/res_partner_view.xml	1970-01-01 00:00:00 +0000
+++ airline/res_partner_view.xml	2013-11-28 17:55:29 +0000
@@ -0,0 +1,18 @@
+<?xml version = "1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+    <record id="view_partner_airline_form" model="ir.ui.view">
+    <field name="name">res.partner.airline.form.inherit</field>
+    <field name="model">res.partner</field>
+    <field name="inherit_id" ref="travel.view_travel_form"/>
+    <field name="arch" type="xml">
+      <page string="Travel" position="inside">
+        <group>
+          <separator string="airline" colspan="2"/>
+          <field name="airline" />
+        </group>
+      </page>
+    </field>
+    </record>
+  </data>
+</openerp>

=== modified file 'airport/__openerp__.py'
--- airport/__openerp__.py	2013-11-26 23:43:23 +0000
+++ airport/__openerp__.py	2013-11-28 17:55:29 +0000
@@ -42,7 +42,8 @@
     'depends': ['crm', ],
     'external_dependencies': {},
     'data': [
-        'data/airport_data.xml',
+        #'data/airport_data.xml',
+        'res_partner_view.xml'
     ],
     'demo': [],
     'test': [],

=== added file 'airport/res_partner_view.xml'
--- airport/res_partner_view.xml	1970-01-01 00:00:00 +0000
+++ airport/res_partner_view.xml	2013-11-28 17:55:29 +0000
@@ -0,0 +1,19 @@
+<?xml version = "1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+    <record id="view_partner_airport_form" model="ir.ui.view">
+      <field name="name">res.partner.airport.form.inherit</field>
+      <field name="model">res.partner</field>
+      <field name="inherit_id" ref="travel.view_travel_form"/>
+      <field name="arch" type="xml">
+        <page string="Travel" position="inside">
+          <group>
+            <separator string="Airport" colspan="2"/>
+            <field name="airport" />
+            <field name="iata_code"  attrs="{'invisible': [('airport','=',False)]}"/>
+          </group>
+        </page>
+      </field>
+    </record>
+  </data>
+</openerp>

=== modified file 'railwaystation/__openerp__.py'
--- railwaystation/__openerp__.py	2013-11-26 23:43:23 +0000
+++ railwaystation/__openerp__.py	2013-11-28 17:55:29 +0000
@@ -39,7 +39,9 @@
     'website': 'http://www.savoirfairelinux.com',
     'license': 'AGPL-3',
     'depends': ['crm', 'travel', ],
-    'data': [],
+    'data': [
+        'res_partner_view.xml'
+    ],
     'demo': [],
     'test': [],
     'installable': True,

=== added file 'railwaystation/res_partner_view.xml'
--- railwaystation/res_partner_view.xml	1970-01-01 00:00:00 +0000
+++ railwaystation/res_partner_view.xml	2013-11-28 17:55:29 +0000
@@ -0,0 +1,18 @@
+<?xml version = "1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+    <record id="view_partner_railwaystation_form" model="ir.ui.view">
+      <field name="name">res.partner.railwaystation.form.inherit</field>
+      <field name="model">res.partner</field>
+      <field name="inherit_id" ref="travel.view_travel_form"/>
+      <field name="arch" type="xml">
+        <page string="Travel" position="inside">
+          <group>
+            <separator string="Railway station" colspan="2"/>
+            <field name="railwaystation" />
+          </group>
+        </page>
+      </field>
+    </record>
+  </data>
+</openerp>

=== modified file 'travel/partner_view.xml'
--- travel/partner_view.xml	2013-11-13 21:14:34 +0000
+++ travel/partner_view.xml	2013-11-28 17:55:29 +0000
@@ -7,7 +7,7 @@
       <field name="inherit_id" ref="base.view_partner_form"/>
       <field name="arch" type="xml">
         <notebook position="inside">
-          <page string="Travel" />
+          <page string="Travel" attrs="{'invisible': [('is_company','=',False), ('child_ids', '=', [])]}" autofocus="autofocus"/>
         </notebook>
       </field>
     </record>