savoirfairelinux-openerp team mailing list archive
-
savoirfairelinux-openerp team
-
Mailing list archive
-
Message #00870
lp:~savoirfairelinux-openerp/partner-contact-management/improvement_after_integration_new_partner_firstname into lp:~savoirfairelinux-openerp/partner-contact-management/base_contact_by_functions
elhadji.dem@xxxxxxxxxxxxxxxxxxxx has proposed merging lp:~savoirfairelinux-openerp/partner-contact-management/improvement_after_integration_new_partner_firstname into lp:~savoirfairelinux-openerp/partner-contact-management/base_contact_by_functions.
Requested reviews:
Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter)
For more details, see:
https://code.launchpad.net/~savoirfairelinux-openerp/partner-contact-management/improvement_after_integration_new_partner_firstname/+merge/203350
- Update user_firstname module: display in tree view, full_name instead of name, add full_name in search view for users. - Update parter_supplier_information: add a view.
- Redefine res_bank_account: update view.
- Replace function field in partner view; hide company if partner is a contact in base_contact_by_functions.
- Update user_firstname: display firstname before name field.
--
https://code.launchpad.net/~savoirfairelinux-openerp/partner-contact-management/improvement_after_integration_new_partner_firstname/+merge/203350
Your team Savoir-faire Linux' OpenERP is subscribed to branch lp:~savoirfairelinux-openerp/partner-contact-management/base_contact_by_functions.
=== modified file 'base_contact_by_functions/res_partner_view.xml'
--- base_contact_by_functions/res_partner_view.xml 2014-01-10 19:32:17 +0000
+++ base_contact_by_functions/res_partner_view.xml 2014-01-27 15:23:59 +0000
@@ -8,7 +8,7 @@
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<label for="is_company" position="replace">
- <label for="is_company" string="Is an Organism?"/>
+ <label for="is_company" string="Is an Organism?"/>)
</label>
<field name="use_parent_address" position="replace">
<field name="use_parent_address"
@@ -80,15 +80,12 @@
<div class="oe_kanban_partner_categories"/>
<div class="oe_kanban_partner_links"/>
<ul>
- <li t-if="record.parent_id.raw_value and !record.function_id.raw_value">
- <field name="parent_id"/>
- </li>
<li t-if="!record.parent_id.raw_value and record.function_id.raw_value">
<field name="function_id"/>
</li>
<li t-if="record.parent_id.raw_value and record.function_id.raw_value">
<field name="function_id"/>
- à
+ ,
<field name="parent_id"/>
</li>
<li t-if="record.city.raw_value and !record.country.raw_value">
@@ -113,84 +110,80 @@
</t>
</templates>
</kanban>
- <form string="Contact" version="7.0">
- <sheet>
- <field name="image" widget='image' class="oe_avatar oe_left"
- options='{"preview_image": "image_medium"}'/>
- <div class="oe_title">
- <label for="name" class="oe_edit_only"/>
- <h1>
- <field name="name" style="width: 70%%"/>
- </h1>
- </div>
- <group>
- <!-- inherited part -->
- <field name="category_id" widget="many2many_tags"
- placeholder="Tags..." style="width: 70%%"/>
- <field name="parent_id"
- placeholder="Organism"
- domain="[('is_company','=',True)]"
- string="Parent Organism"/>
- <!-- inherited part end -->
- <field name="function_id" placeholder="e.g. Sales Director"/>
- <group colspan="4">
- <field name="start_date" />
- <field name="end_date"/>
- <field name="naming"/>
- </group>
- <field name="email"/>
- <field name="phone"/>
- <field name="mobile"/>
- </group>
- <div>
- <field name="use_parent_address"/>
- <label for="use_parent_address" string="Use organism address"/>
- </div>
- <group>
- <label for="type"/>
- <div name="div_type">
- <field class="oe_inline" name="type"/>
- </div>
- <label for="street" string="Address"
- attrs="{'invisible': [('use_parent_address','=', True)]}"/>
- <div attrs="{'invisible': [('use_parent_address','=', True)]}"
- name="div_address">
- <field name="street" placeholder="Street..."/>
- <field name="street2"/>
- <div class="address_format">
- <field name="city" placeholder="City" style="width: 40%%"/>
- <field name="state_id" class="oe_no_button"
- placeholder="State" style="width: 37%%"
- options='{"no_open": True}' on_change="onchange_state(state_id)"/>
- <field name="zip" placeholder="ZIP" style="width: 20%%"/>
- </div>
- <field name="country_id" placeholder="Country"
- class="oe_no_button" options='{"no_open": True}'/>
- </div>
- </group>
- <field name="supplier" invisible="True"/>
- <group string="Bank Accounts">
- <field name="bank_ids" nolabel="1">
- <tree string="Bank Details">
- <field name="state" invisible="1"/>
- <field name="sequence" invisible="1"/>
- <field name="acc_number"/>
- <field name="bank_name"/>
- <field name="owner_name"/>
- </tree>
- </field>
- </group>
- </sheet>
- </form>
+ <form string="Contact" version="7.0">
+ <sheet>
+ <field name="image" widget='image' class="oe_avatar oe_left"
+ options='{"preview_image": "image_medium"}'/>
+ <div class="oe_title">
+ <label for="name" class="oe_edit_only"/>
+ <h1>
+ <field name="name" style="width: 70%%"/>
+ </h1>
+ </div>
+ <group>
+ <!-- inherited part -->
+ <field name="category_id" widget="many2many_tags"
+ placeholder="Tags..." style="width: 70%%" string="Tag"/>
+ <field name="parent_id"
+ placeholder="Organism"
+ domain="[('is_company','=',True)]"
+ string="Parent Organism"/>
+ <!-- inherited part end -->
+ <field name="function_id" placeholder="e.g. Sales Director"/>
+ <group colspan="4">
+ <field name="start_date" />
+ <field name="end_date"/>
+ <field name="naming"/>
+ </group>
+ <field name="email"/>
+ <field name="phone"/>
+ <field name="mobile"/>
+ </group>
+ <div>
+ <field name="use_parent_address"/>
+ <label for="use_parent_address" string="Use organism address"/>
+ </div>
+ <group>
+ <label for="type"/>
+ <div name="div_type">
+ <field class="oe_inline" name="type"/>
+ </div>
+ <label for="street" string="Address"
+ attrs="{'invisible': [('use_parent_address','=', True)]}"/>
+ <div attrs="{'invisible': [('use_parent_address','=', True)]}"
+ name="div_address">
+ <field name="street" placeholder="Street..."/>
+ <field name="street2"/>
+ <div class="address_format">
+ <field name="city" placeholder="City" style="width: 40%%"/>
+ <field name="state_id" class="oe_no_button"
+ placeholder="State" style="width: 37%%"
+ options='{"no_open": True}' on_change="onchange_state(state_id)"/>
+ <field name="zip" placeholder="ZIP" style="width: 20%%"/>
+ </div>
+ <field name="country_id" placeholder="Country"
+ class="oe_no_button" options='{"no_open": True}'/>
+ </div>
+ </group>
+ <field name="supplier" invisible="True"/>
+ <group string="Bank Accounts">
+ <field name="bank_ids" nolabel="1">
+ <tree string="Bank Details">
+ <field name="state" invisible="1"/>
+ <field name="sequence" invisible="1"/>
+ <field name="acc_number"/>
+ <field name="bank_name"/>
+ <field name="owner_name"/>
+ </tree>
+ </field>
+ </group>
+ </sheet>
+ </form>
</field>
</page>
</notebook>
<!--Replace function by function_id defined by organism-->
- <field name="function" position="replace">
- <field name="function"
- attrs="{'invisible': [('is_company','=', True)]}"
- string="Function"/>
- </field>
+ <field name="function" position="replace"/>
</field>
</record>
@@ -311,7 +304,7 @@
</t>
<t t-if="record.parent_id.raw_value and record.function_id.raw_value">
<field name="function_id"/>
- à
+ ,
<field name="parent_id"/>
</t>
</i>
@@ -343,7 +336,8 @@
have the same form for contact and other postions
<field name="parent_id" position="replace">
<field name="parent_id" placeholder="Organism"
- domain="[('is_company','=',True)]"/>
+ domain="[('is_company','=',True)]"
+ attrs="{'invisible': [('is_company','=', False)]}"/>
</field>
<xpath expr="//field[@name='child_ids']/form//field[@name='supplier']"
position="after">
@@ -423,7 +417,7 @@
</li>
<li t-if="record.parent_id.raw_value and record.function_id.raw_value">
<field name="function_id"/>
- à
+ ,
<field name="parent_id"/>
</li>
<li t-if="record.city.raw_value and !record.country.raw_value">
=== modified file 'partner_firstname/partner_view.xml'
--- partner_firstname/partner_view.xml 2014-01-22 20:01:37 +0000
+++ partner_firstname/partner_view.xml 2014-01-27 15:23:59 +0000
@@ -19,13 +19,12 @@
</field>
<!-- Add first name and name in inner contact form of child_ids -->
- <xpath expr="//form[@string='Contact']/sheet/div/h1/field[@name='name']" position="replace"/>
- <xpath expr="//form[@string='Contact']/sheet/div/label" position="after">
+ <xpath expr="//form[@string='Contact']/sheet/div/h1/field[@name='name']" position="before">
<group>
<field name="firstname"/>
- <field name="name"/>
</group>
</xpath>
+ <xpath expr="//form[@string='Contact']/sheet/div/label" position="replace"/>
<label for="name" position="attributes">
<attribute name="invisible">1</attribute>
=== modified file 'partner_member_observer/i18n/fr.po'
--- partner_member_observer/i18n/fr.po 2014-01-03 16:57:29 +0000
+++ partner_member_observer/i18n/fr.po 2014-01-27 15:23:59 +0000
@@ -34,7 +34,7 @@
#. module: partner_member_observer
#: field:res.partner,member_states:0
msgid "Member state"
-msgstr "État membre"
+msgstr "Etat membre"
#. module: partner_member_observer
#: field:res.partner,observer_state:0
=== modified file 'partner_supplier_information/__openerp__.py'
--- partner_supplier_information/__openerp__.py 2014-01-03 15:07:50 +0000
+++ partner_supplier_information/__openerp__.py 2014-01-27 15:23:59 +0000
@@ -31,18 +31,30 @@
Partner Supplier Informations
=============================
-This module adds some fields for supplier
+This module adds some fields for supplier:
+
+* Legal form
+* NGO: If partner is a Non-governmental organization (NGO)
+* Confirmed supplier
+* Registration number
+* Registration date
+* Registration location
+* Matriculation Number
Contributors
------------
-* EL HADJI DEM (elhadji.dem@xxxxxxxxxxxxxxxxxxxx)
+* El Hadji Dem (elhadji.dem@xxxxxxxxxxxxxxxxxxxx)
""",
'depends': [
- 'base',
- ],
- 'external_dependencies': {},
- 'data': [],
+ 'account',
+ ],
+ 'external_dependencies': {
+ 'python': [],
+ },
+ 'data': [
+ 'res_partner_view.xml',
+ ],
'demo': [],
'test': [],
'installable': True,
=== modified file 'partner_supplier_information/res_partner.py'
--- partner_supplier_information/res_partner.py 2014-01-03 15:07:50 +0000
+++ partner_supplier_information/res_partner.py 2014-01-27 15:23:59 +0000
@@ -35,7 +35,7 @@
'rcs_date': fields.date('Registration date', help="Registration date."),
'rcs_registration_location': fields.char('Registration location', size=256,
help="Registration location."),
- 'immatriculation_number': fields.char('Immatriculation number', size=256, help="Immatriculation number."),
+ 'matriculation_number': fields.char('Matriculation number', size=256, help="Matriculation number."),
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== added file 'partner_supplier_information/res_partner_view.xml'
--- partner_supplier_information/res_partner_view.xml 1970-01-01 00:00:00 +0000
+++ partner_supplier_information/res_partner_view.xml 2014-01-27 15:23:59 +0000
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+ <data>
+ <!--Add legal form, ong,acronym,confirmed supplier,
+ rcs number,rcs date, rcs and SIRET number fields in form view-->
+ <record id="view_partner_property_supplier_info_form" model="ir.ui.view">
+ <field name="name">res.partner.property.supplier.info.form.inherit</field>
+ <field name="model">res.partner</field>
+ <field name="inherit_id" ref="account.view_partner_property_form"/>
+ <field name="arch" type="xml">
+ <xpath expr="//page[@string='Accounting']/group[1]/group[2]"
+ position="after">
+ <group string="Supplier informations" col="4" colspan="4"
+ attrs="{'invisible': [('supplier', '=', False)]}">
+ <field name="legal_form"/>
+ <field name="ong"/>
+ <field name="acronym"/>
+ <field name="confirmed_supplier"/>
+ </group>
+ <group string="Information" col="4" colspan="4"
+ attrs="{'invisible': [('confirmed_supplier', '=', False)]}">
+ <field name="rcs_registration_number"/>
+ <field name="rcs_date"/>
+ <field name="rcs_registration_location"/>
+ </group>
+ </xpath>
+
+ <!--add matriculation number in form view-->
+ <field name="last_reconciliation_date"
+ position="after">
+ <field name="matriculation_number"
+ attrs="{'invisible': [('confirmed_supplier', '=', False)]}"/>
+ </field>
+ </field>
+ </record>
+ </data>
+</openerp>
=== modified file 'res_bank_account/__init__.py'
--- res_bank_account/__init__.py 2014-01-03 15:07:50 +0000
+++ res_bank_account/__init__.py 2014-01-27 15:23:59 +0000
@@ -20,6 +20,6 @@
#
##############################################################################
-import res_bank
+from . import res_bank
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'res_bank_account/__openerp__.py'
--- res_bank_account/__openerp__.py 2014-01-03 15:07:50 +0000
+++ res_bank_account/__openerp__.py 2014-01-27 15:23:59 +0000
@@ -34,13 +34,16 @@
Contributors
------------
-* EL HADJI DEM (elhadji.dem@xxxxxxxxxxxxxxxxxxxx)
+* El Hadji Dem (elhadji.dem@xxxxxxxxxxxxxxxxxxxx)
""",
'depends': [
+ 'account',
'base',
],
'external_dependencies': {},
- 'data': ['res_bank_view.xml', ],
+ 'data': [
+ 'res_bank_view.xml',
+ ],
'demo': [],
'test': [],
'installable': True,
=== modified file 'res_bank_account/res_bank_view.xml'
--- res_bank_account/res_bank_view.xml 2014-01-03 15:07:50 +0000
+++ res_bank_account/res_bank_view.xml 2014-01-27 15:23:59 +0000
@@ -34,5 +34,28 @@
</field>
</field>
</record>
+
+ <!--redefine bank_ids tree-->
+ <record id="view_partner_property_bank_form" model="ir.ui.view">
+ <field name="name">res.partner.property.bank.inherit.bank.form</field>
+ <field name="model">res.partner</field>
+ <field name="inherit_id" ref="account.view_partner_property_form"/>
+ <field name="arch" type="xml">
+ <!--redefine bank_ids tree-->
+ <field name="bank_ids" position="replace">
+ <field name="bank_ids"
+ context="{'default_partner_id': active_id, 'form_view_ref': 'base.view_partner_bank_form'}">
+ <tree string="Bank Details">
+ <field name="active"/>
+ <field name="state" invisible="1"/>
+ <field name="sequence" invisible="1"/>
+ <field name="acc_number"/>
+ <field name="bank_name"/>
+ <field name="owner_name"/>
+ </tree>
+ </field>
+ </field>
+ </field>
+ </record>
</data>
</openerp>
=== modified file 'user_firstname/__init__.py'
--- user_firstname/__init__.py 2014-01-03 20:42:34 +0000
+++ user_firstname/__init__.py 2014-01-27 15:23:59 +0000
@@ -2,7 +2,7 @@
##############################################################################
#
# OpenERP, Open Source Management Solution
-# This module copyright (C) 2013 Savoir-faire Linux
+# This module copyright (C) 2013, 2014 Savoir-faire Linux
# (<http://www.savoirfairelinux.com>).
#
# This program is free software: you can redistribute it and/or modify
=== modified file 'user_firstname/__openerp__.py'
--- user_firstname/__openerp__.py 2014-01-03 16:57:29 +0000
+++ user_firstname/__openerp__.py 2014-01-27 15:23:59 +0000
@@ -23,10 +23,8 @@
{
'name': 'User First Name, Last Name',
'version': '0.1',
- 'author': 'Savoir-faire Linux',
- 'maintainer': 'Savoir-faire Linux',
- 'website': 'http://www.savoirfairelinux.com',
- 'category': 'MISC',
+ 'category': 'Customer Relationship Management',
+ 'summary': 'User First Name, Last Name',
'description': """
User First Name, Last Name
==========================
@@ -36,15 +34,20 @@
Contributors
------------
-* EL HADJI DEM (elhadji.dem@xxxxxxxxxxxxxxxxxxxx)
+* El Hadji Dem (elhadji.dem@xxxxxxxxxxxxxxxxxxxx)
""",
+ 'author': 'Savoir-faire Linux',
+ 'website': 'www.savoirfairelinux.com',
+ 'license': 'AGPL-3',
'depends': [
- 'base',
- ],
- 'external_dependencies': {},
- 'data': [],
- 'demo': [],
+ 'partner_firstname',
+ ],
+ 'data': [
+ 'res_user_view.xml',
+ ],
'test': [],
+ 'demo': [
+ ],
'installable': True,
'active': False,
}
=== added file 'user_firstname/res_user_view.xml'
--- user_firstname/res_user_view.xml 1970-01-01 00:00:00 +0000
+++ user_firstname/res_user_view.xml 2014-01-27 15:23:59 +0000
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+ <data>
+ <record id="view_users_firstname_form" model="ir.ui.view">
+ <field name="name">res.users.form.firstname.inherit44</field>
+ <field name="model">res.users</field>
+ <field name="inherit_id" ref="base.view_users_form"/>
+ <field name="arch" type="xml">
+ <label for="name" position="replace"/>
+ <field name="name" position="replace">
+ <field name="firstname" placeholder="e.g. Firstname"/>
+ <field name="name" placeholder="e.g. Lastname"/>
+ </field>
+ </field>
+ </record>
+
+ <record id="view_users_firstname_tree" model="ir.ui.view">
+ <field name="name">res.users.firstname.tree</field>
+ <field name="model">res.users</field>
+ <field name="inherit_id" ref="base.view_users_tree"/>
+ <field name="arch" type="xml">
+ <field name="name" position="replace">
+ <field name="full_name"/>
+ </field>
+ </field>
+ </record>
+ <!--search in full name-->
+ <record id="view_users_firstname_search" model="ir.ui.view">
+ <field name="name">res.users.search</field>
+ <field name="model">res.users</field>
+ <field name="inherit_id" ref="base.view_users_search"/>
+ <field name="arch" type="xml">
+ <field name="name" position="replace">
+ <field name="name"
+ filter_domain="['|', ('full_name','ilike',self), ('login','ilike',self)]"
+ string="User"/>
+ </field>
+ </field>
+ </record>
+
+ </data>
+</openerp>
Follow ups
