← Back to team overview

savoirfairelinux-openerp team mailing list archive

[Merge] lp:~savoirfairelinux-openerp/openerp-program/add_program_partner_type into lp:~savoirfairelinux-openerp/openerp-program/program

 

David Cormier has proposed merging lp:~savoirfairelinux-openerp/openerp-program/add_program_partner_type into lp:~savoirfairelinux-openerp/openerp-program/program.

Requested reviews:
  Savoir-faire Linux' OpenERP (savoirfairelinux-openerp)

For more details, see:
https://code.launchpad.net/~savoirfairelinux-openerp/openerp-program/add_program_partner_type/+merge/214604
-- 
https://code.launchpad.net/~savoirfairelinux-openerp/openerp-program/add_program_partner_type/+merge/214604
Your team Savoir-faire Linux' OpenERP is requested to review the proposed merge of lp:~savoirfairelinux-openerp/openerp-program/add_program_partner_type into lp:~savoirfairelinux-openerp/openerp-program/program.
=== modified file 'program_team/__openerp__.py'
--- program_team/__openerp__.py	2014-02-17 16:01:28 +0000
+++ program_team/__openerp__.py	2014-04-07 20:06:54 +0000
@@ -46,6 +46,7 @@
     'data': [
         'security/ir.model.access.csv',
         'program_action_team_role_view.xml',
+        'program_action_team_partner_type_view.xml',
         'program_action_team_view.xml',
     ],
     'test': [],

=== modified file 'program_team/program_action_team_partner.py'
--- program_team/program_action_team_partner.py	2014-02-17 16:01:28 +0000
+++ program_team/program_action_team_partner.py	2014-04-07 20:06:54 +0000
@@ -44,6 +44,11 @@
             string='Role',
         ),
 
+        'type': fields.many2one(
+            'program.action.team.partner.type',
+            string="Type"
+        ),
+
         'contribution': fields.text(
             'Non-Financial Contribution',
             help=(
@@ -52,3 +57,21 @@
             ),
         ),
     }
+
+class program_action_team_partner_type(orm.Model):
+
+    _name = 'program.action.team.partner.type'
+
+    _columns = {
+        
+        'name': fields.char(
+            'Type',
+        ),
+
+        'active': fields.boolean(
+            'Active', 
+            default=True
+        ),
+        
+
+    }

=== added file 'program_team/program_action_team_partner_type_view.xml'
--- program_team/program_action_team_partner_type_view.xml	1970-01-01 00:00:00 +0000
+++ program_team/program_action_team_partner_type_view.xml	2014-04-07 20:06:54 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<openerp>
+  <data>
+    <record id="view_program_team_partner_type_form" model="ir.ui.view">
+      <field name="name">Program Team Partner Type Form</field>
+      <field name="model">program.action.team.partner.type</field>
+      <field name="arch" type="xml">
+        <form string="Partner Type">
+          <group colspan="1" col="1">
+            <field name="name" />
+            <field name="active" />
+          </group>
+        </form>
+      </field>
+    </record>
+  </data>
+</openerp>

=== modified file 'program_team/program_action_team_view.xml'
--- program_team/program_action_team_view.xml	2014-04-07 18:44:37 +0000
+++ program_team/program_action_team_view.xml	2014-04-07 20:06:54 +0000
@@ -29,6 +29,7 @@
                          context="{'default_is_company': True}" />
                   <field name="role" domain="[('partner', '=', True)]" />
                   <field name="contribution" />
+                  <field name="type" domain="[('active', '=', True)]" />
                 </tree>
               </field>
             </group>


Follow ups