savoirfairelinux-openerp team mailing list archive
-
savoirfairelinux-openerp team
-
Mailing list archive
-
Message #00807
lp:~savoirfairelinux-openerp/partner-contact-management/supplier_information_bank_account into lp:~savoirfairelinux-openerp/partner-contact-management/base_contact_by_functions
elhadji.dem@xxxxxxxxxxxxxxxxxxxx has proposed merging lp:~savoirfairelinux-openerp/partner-contact-management/supplier_information_bank_account 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/supplier_information_bank_account/+merge/201678
[IMP] delete res_bank view from partner_supplier_information and add it in res_bank_account module; add dependency with account in res_bank_account
--
https://code.launchpad.net/~savoirfairelinux-openerp/partner-contact-management/supplier_information_bank_account/+merge/201678
Your team Savoir-faire Linux' OpenERP is subscribed to branch lp:~savoirfairelinux-openerp/partner-contact-management/base_contact_by_functions.
=== 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-14 21:26:08 +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/i18n/fr.po'
--- partner_supplier_information/i18n/fr.po 2014-01-03 15:07:50 +0000
+++ partner_supplier_information/i18n/fr.po 2014-01-14 21:26:08 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 7.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-03 07:28+0000\n"
-"PO-Revision-Date: 2014-01-03 02:30-0500\n"
+"POT-Creation-Date: 2014-01-09 18:21+0000\n"
+"PO-Revision-Date: 2014-01-09 13:23-0500\n"
"Last-Translator: EL Hadji DEM <elhadji.dem@xxxxxxxxxxxxxxxxxxxx>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,9 +17,24 @@
"X-Generator: Poedit 1.5.4\n"
#. module: partner_supplier_information
-#: help:res.partner,ong:0
-msgid "ONG."
-msgstr "ONG."
+#: help:res.partner,matriculation_number:0
+msgid "Matriculation number."
+msgstr "Numéro d'immatriculation."
+
+#. module: partner_supplier_information
+#: view:res.partner:0
+msgid "Information"
+msgstr "Information"
+
+#. module: partner_supplier_information
+#: field:res.partner,ngo:0
+msgid "NGO"
+msgstr "ONG"
+
+#. module: partner_supplier_information
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr "Coordonnées bancaires"
#. module: partner_supplier_information
#: field:res.partner,rcs_registration_number:0
@@ -47,16 +62,6 @@
msgstr "Lieu d'enregistrement."
#. module: partner_supplier_information
-#: field:res.partner,ong:0
-msgid "ONG"
-msgstr "ONG"
-
-#. module: partner_supplier_information
-#: help:res.partner,immatriculation_number:0
-msgid "Immatriculation number."
-msgstr "Numéro d'immatriculation."
-
-#. module: partner_supplier_information
#: field:res.partner,legal_form:0
msgid "Legal form"
msgstr "Forme juridique"
@@ -72,11 +77,6 @@
msgstr "Forme juridique."
#. module: partner_supplier_information
-#: field:res.partner,immatriculation_number:0
-msgid "Immatriculation number"
-msgstr "Numéro d'immatriculation"
-
-#. module: partner_supplier_information
#: field:res.partner,confirmed_supplier:0
msgid "Confirmed supplier"
msgstr "Fournisseur confirmé"
@@ -92,11 +92,26 @@
msgstr "Organisme"
#. module: partner_supplier_information
+#: help:res.partner,ngo:0
+msgid "Non-governmental organization."
+msgstr "Organisation non gouvernementale."
+
+#. module: partner_supplier_information
+#: field:res.partner,rcs_date:0
+msgid "Registration date"
+msgstr "Date d'enregistrement"
+
+#. module: partner_supplier_information
+#: field:res.partner,matriculation_number:0
+msgid "Matriculation number"
+msgstr "Numéro d'immatriculation"
+
+#. module: partner_supplier_information
#: help:res.partner,rcs_date:0
msgid "Registration date."
msgstr "Date d'enregistrement."
#. module: partner_supplier_information
-#: field:res.partner,rcs_date:0
-msgid "Registration date"
-msgstr "Date d'enregistrement"
+#: view:res.partner:0
+msgid "Supplier informations"
+msgstr "Informations fournisseur"
=== modified file 'partner_supplier_information/i18n/partner_supplier_information.pot'
--- partner_supplier_information/i18n/partner_supplier_information.pot 2014-01-03 15:07:50 +0000
+++ partner_supplier_information/i18n/partner_supplier_information.pot 2014-01-14 21:26:08 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 7.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-03 07:27+0000\n"
-"PO-Revision-Date: 2014-01-03 02:28-0500\n"
+"POT-Creation-Date: 2014-01-09 18:17+0000\n"
+"PO-Revision-Date: 2014-01-09 13:17-0500\n"
"Last-Translator: EL Hadji DEM <elhadji.dem@xxxxxxxxxxxxxxxxxxxx>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,8 +17,23 @@
"X-Generator: Poedit 1.5.4\n"
#. module: partner_supplier_information
-#: help:res.partner,ong:0
-msgid "ONG."
+#: help:res.partner,matriculation_number:0
+msgid "Matriculation number."
+msgstr ""
+
+#. module: partner_supplier_information
+#: view:res.partner:0
+msgid "Information"
+msgstr ""
+
+#. module: partner_supplier_information
+#: field:res.partner,ngo:0
+msgid "NGO"
+msgstr ""
+
+#. module: partner_supplier_information
+#: view:res.partner:0
+msgid "Bank Details"
msgstr ""
#. module: partner_supplier_information
@@ -47,16 +62,6 @@
msgstr ""
#. module: partner_supplier_information
-#: field:res.partner,ong:0
-msgid "ONG"
-msgstr ""
-
-#. module: partner_supplier_information
-#: help:res.partner,immatriculation_number:0
-msgid "Immatriculation number."
-msgstr ""
-
-#. module: partner_supplier_information
#: field:res.partner,legal_form:0
msgid "Legal form"
msgstr ""
@@ -72,11 +77,6 @@
msgstr ""
#. module: partner_supplier_information
-#: field:res.partner,immatriculation_number:0
-msgid "Immatriculation number"
-msgstr ""
-
-#. module: partner_supplier_information
#: field:res.partner,confirmed_supplier:0
msgid "Confirmed supplier"
msgstr ""
@@ -92,11 +92,26 @@
msgstr ""
#. module: partner_supplier_information
+#: help:res.partner,ngo:0
+msgid "Non-governmental organization."
+msgstr ""
+
+#. module: partner_supplier_information
+#: field:res.partner,rcs_date:0
+msgid "Registration date"
+msgstr ""
+
+#. module: partner_supplier_information
+#: field:res.partner,matriculation_number:0
+msgid "Matriculation number"
+msgstr ""
+
+#. module: partner_supplier_information
#: help:res.partner,rcs_date:0
msgid "Registration date."
msgstr ""
#. module: partner_supplier_information
-#: field:res.partner,rcs_date:0
-msgid "Registration date"
+#: view:res.partner:0
+msgid "Supplier informations"
msgstr ""
=== 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-14 21:26:08 +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-14 21:26:08 +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/__openerp__.py'
--- res_bank_account/__openerp__.py 2014-01-03 15:07:50 +0000
+++ res_bank_account/__openerp__.py 2014-01-14 21:26:08 +0000
@@ -37,6 +37,7 @@
* EL HADJI DEM (elhadji.dem@xxxxxxxxxxxxxxxxxxxx)
""",
'depends': [
+ 'account',
'base',
],
'external_dependencies': {},
=== 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-14 21:26:08 +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-14 21:26:08 +0000
@@ -20,5 +20,6 @@
#
##############################################################################
+import res_user
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'user_firstname/__openerp__.py'
--- user_firstname/__openerp__.py 2014-01-03 16:57:29 +0000
+++ user_firstname/__openerp__.py 2014-01-14 21:26:08 +0000
@@ -36,14 +36,19 @@
Contributors
------------
-* EL HADJI DEM (elhadji.dem@xxxxxxxxxxxxxxxxxxxx)
+* El Hadji Dem (elhadji.dem@xxxxxxxxxxxxxxxxxxxx)
""",
'depends': [
- 'base',
- ],
- 'external_dependencies': {},
- 'data': [],
- 'demo': [],
+ 'partner_firstname',
+ ],
+ 'external_dependencies': {
+ 'python': [],
+ },
+ 'data': [
+ 'res_user_view.xml',
+ ],
+ 'demo': [
+ ],
'test': [],
'installable': True,
'active': False,
=== modified file 'user_firstname/i18n/fr.po'
--- user_firstname/i18n/fr.po 2013-12-20 22:00:31 +0000
+++ user_firstname/i18n/fr.po 2014-01-14 21:26:08 +0000
@@ -6,9 +6,9 @@
msgstr ""
"Project-Id-Version: OpenERP Server 7.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-20 21:38+0000\n"
-"PO-Revision-Date: 2013-12-20 16:39-0500\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2014-01-14 17:46+0000\n"
+"PO-Revision-Date: 2014-01-14 12:46-0500\n"
+"Last-Translator: EL Hadji DEM <elhadji.dem@xxxxxxxxxxxxxxxxxxxx>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +19,7 @@
#. module: user_firstname
#: view:res.users:0
msgid "e.g. Lastname"
-msgstr "Nom"
+msgstr "ex: Nom"
#. module: user_firstname
#: model:ir.model,name:user_firstname.model_res_users
@@ -29,4 +29,4 @@
#. module: user_firstname
#: view:res.users:0
msgid "e.g. Firstname"
-msgstr "Prénom"
+msgstr "ex: Prénom"
=== modified file 'user_firstname/i18n/user_firstname.pot'
--- user_firstname/i18n/user_firstname.pot 2013-12-20 22:00:31 +0000
+++ user_firstname/i18n/user_firstname.pot 2014-01-14 21:26:08 +0000
@@ -6,9 +6,9 @@
msgstr ""
"Project-Id-Version: OpenERP Server 7.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-20 21:36+0000\n"
-"PO-Revision-Date: 2013-12-20 16:37-0500\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2014-01-14 17:45+0000\n"
+"PO-Revision-Date: 2014-01-14 12:46-0500\n"
+"Last-Translator: EL Hadji DEM <elhadji.dem@xxxxxxxxxxxxxxxxxxxx>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
=== added file 'user_firstname/res_user.py'
--- user_firstname/res_user.py 1970-01-01 00:00:00 +0000
+++ user_firstname/res_user.py 2014-01-14 21:26:08 +0000
@@ -0,0 +1,37 @@
+# -*- 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 orm, fields
+
+
+class res_user(orm.Model):
+ _inherit = 'res.users'
+
+ def create(self, cursor, uid, vals, context=None):
+ if 'install_mode' in context.keys():
+ return super(res_user, self).create(cursor, uid, vals, context=context)
+ names = (vals['firstname'], vals['lastname'])
+ vals['name'] = " ".join([s for s in names if s])
+ vals['display_name'] = vals['name']
+ return super(res_user, self).create(cursor, uid, vals, context=context)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== 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-14 21:26:08 +0000
@@ -0,0 +1,19 @@
+<?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">
+ <field name="name" position="replace">
+ <field name="name" invisible="1"/>
+ </field>
+ <field name="name" position="after">
+ <field name="firstname" placeholder="e.g. Firstname"/>
+ <field name="lastname" placeholder="e.g. Lastname"/>
+ </field>
+ </field>
+ </record>
+ </data>
+</openerp>
Follow ups
