OpenERP Canada

Merge lp:~savoirfairelinux-openerp/openerp-canada/openerp-canada_res_partner_attributes_add_NAS into lp:openerp-canada

  1. openerp-canada_res_partner_attributes_add_NAS
  2. Merge into 7.0
Proposed by Marc Cassuto (SFL)
Status: Rejected
Rejected by: Maxime Chambreuil (http://www.savoirfairelinux.com)
Proposed branch: lp:~savoirfairelinux-openerp/openerp-canada/openerp-canada_res_partner_attributes_add_NAS
Merge into: lp:openerp-canada
Diff against target: 208 lines (+175/-0)
6 files modified
res_partner_attributes_add_NAS/__init__.py (+25/-0)
res_partner_attributes_add_NAS/__openerp__.py (+39/-0)
res_partner_attributes_add_NAS/i18n/fr.po (+32/-0)
res_partner_attributes_add_NAS/i18n/res_partner_attributes_add_NAS.pot (+32/-0)
res_partner_attributes_add_NAS/res_partner_attributes_add_NAS.py (+32/-0)
res_partner_attributes_add_NAS/res_partner_attributes_add_NAS_view.xml (+15/-0)
To merge this branch: bzr merge lp:~savoirfairelinux-openerp/openerp-canada/openerp-canada_res_partner_attributes_add_NAS
Reviewer Review Type Date Requested Status
Maxime Chambreuil (http://www.savoirfairelinux.com) Disapprove
Review via email: mp+174489@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903) wrote :

res_partner_attributes_add_NAS is already provided by https://code.launchpad.net/~savoirfairelinux-openerp/openerp-canada/openerp-canada_res_partner_attributes_add_NE/+merge/174490

review: Disapprove

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added directory 'res_partner_attributes_add_NAS'
=== added file 'res_partner_attributes_add_NAS/__init__.py'
--- res_partner_attributes_add_NAS/__init__.py 1970-01-01 00:00:00 +0000
+++ res_partner_attributes_add_NAS/__init__.py 2013-07-12 19:31:37 +0000
@@ -0,0 +1,25 @@
1# -*- encoding: utf-8 -*-
2##############################################################################
3#
4# OpenERP, Open Source Management Solution
5# Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
6#
7# This program is free software: you can redistribute it and/or modify
8# it under the terms of the GNU Affero General Public License as
9# published by the Free Software Foundation, either version 3 of the
10# License, or (at your option) any later version.
11#
12# This program is distributed in the hope that it will be useful,
13# but WITHOUT ANY WARRANTY; without even the implied warranty of
14# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15# GNU Affero General Public License for more details.
16#
17# You should have received a copy of the GNU Affero General Public License
18# along with this program. If not, see <http://www.gnu.org/licenses/>.
19#
20##############################################################################
21
22import res_partner_attributes_add_NAS
23
24
25# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
026
=== added file 'res_partner_attributes_add_NAS/__openerp__.py'
--- res_partner_attributes_add_NAS/__openerp__.py 1970-01-01 00:00:00 +0000
+++ res_partner_attributes_add_NAS/__openerp__.py 2013-07-12 19:31:37 +0000
@@ -0,0 +1,39 @@
1# -*- encoding: utf-8 -*-
2##############################################################################
3#
4# OpenERP, Open Source Management Solution
5# Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
6#
7# This program is free software: you can redistribute it and/or modify
8# it under the terms of the GNU Affero General Public License as
9# published by the Free Software Foundation, either version 3 of the
10# License, or (at your option) any later version.
11#
12# This program is distributed in the hope that it will be useful,
13# but WITHOUT ANY WARRANTY; without even the implied warranty of
14# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15# GNU Affero General Public License for more details.
16#
17# You should have received a copy of the GNU Affero General Public License
18# along with this program. If not, see <http://www.gnu.org/licenses/>.
19#
20##############################################################################
21
22{
23 'name' : 'Quebec Social Insurance Number (NAS)',
24 'version' : '1.0',
25 "author" : "Savoir-faire Linux (mcassuto@savoirfairelinux.com)",
26 "website" : "http://www.savoirfairelinux.com",
27 'license': 'AGPL-3',
28 'category' : 'Localisation/Canada',
29 'depends' : ['base'],
30 'description': """
31Add the Social Insurance Number (NAS) to the partner form.
32""",
33 'auto_install': False,
34 'installable': True,
35 'data' : ['res_partner_attributes_add_NAS_view.xml']
36}
37
38
39# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
040
=== added directory 'res_partner_attributes_add_NAS/i18n'
=== added file 'res_partner_attributes_add_NAS/i18n/fr.mo'
1Binary files res_partner_attributes_add_NAS/i18n/fr.mo 1970-01-01 00:00:00 +0000 and res_partner_attributes_add_NAS/i18n/fr.mo 2013-07-12 19:31:37 +0000 differ41Binary files res_partner_attributes_add_NAS/i18n/fr.mo 1970-01-01 00:00:00 +0000 and res_partner_attributes_add_NAS/i18n/fr.mo 2013-07-12 19:31:37 +0000 differ
=== added file 'res_partner_attributes_add_NAS/i18n/fr.po'
--- res_partner_attributes_add_NAS/i18n/fr.po 1970-01-01 00:00:00 +0000
+++ res_partner_attributes_add_NAS/i18n/fr.po 2013-07-12 19:31:37 +0000
@@ -0,0 +1,32 @@
1# Translation of OpenERP Server.
2# This file contains the translation of the following modules:
3# * res_partner_attributes_add_NAS
4#
5msgid ""
6msgstr ""
7"Project-Id-Version: OpenERP Server 7.0\n"
8"Report-Msgid-Bugs-To: \n"
9"POT-Creation-Date: 2013-07-11 14:53+0000\n"
10"PO-Revision-Date: 2013-07-11 10:55-0500\n"
11"Last-Translator: Marc Cassuto <marc.cassuto@savoirfairelinux.com>\n"
12"Language-Team: \n"
13"MIME-Version: 1.0\n"
14"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Transfer-Encoding: 8bit\n"
16"Plural-Forms: \n"
17
18#. module: res_partner_attributes_add_NAS
19#: field:res.partner,nas:0
20msgid "NAS"
21msgstr "NAS"
22
23#. module: res_partner_attributes_add_NAS
24#: help:res.partner,nas:0
25msgid "Social Insurance Number (9 digits)"
26msgstr "Numéro d'Assurance Sociale (9 chiffres)"
27
28#. module: res_partner_attributes_add_NAS
29#: model:ir.model,name:res_partner_attributes_add_NAS.model_res_partner
30msgid "Partner"
31msgstr "Partenaire"
32
033
=== added file 'res_partner_attributes_add_NAS/i18n/res_partner_attributes_add_NAS.pot'
--- res_partner_attributes_add_NAS/i18n/res_partner_attributes_add_NAS.pot 1970-01-01 00:00:00 +0000
+++ res_partner_attributes_add_NAS/i18n/res_partner_attributes_add_NAS.pot 2013-07-12 19:31:37 +0000
@@ -0,0 +1,32 @@
1# Translation of OpenERP Server.
2# This file contains the translation of the following modules:
3# * res_partner_attributes_add_NAS
4#
5msgid ""
6msgstr ""
7"Project-Id-Version: OpenERP Server 7.0\n"
8"Report-Msgid-Bugs-To: \n"
9"POT-Creation-Date: 2013-07-11 14:53+0000\n"
10"PO-Revision-Date: 2013-07-11 14:53+0000\n"
11"Last-Translator: <>\n"
12"Language-Team: \n"
13"MIME-Version: 1.0\n"
14"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Transfer-Encoding: \n"
16"Plural-Forms: \n"
17
18#. module: res_partner_attributes_add_NAS
19#: field:res.partner,nas:0
20msgid "NAS"
21msgstr ""
22
23#. module: res_partner_attributes_add_NAS
24#: help:res.partner,nas:0
25msgid "Social Insurance Number (9 digits)"
26msgstr ""
27
28#. module: res_partner_attributes_add_NAS
29#: model:ir.model,name:res_partner_attributes_add_NAS.model_res_partner
30msgid "Partner"
31msgstr ""
32
033
=== added file 'res_partner_attributes_add_NAS/res_partner_attributes_add_NAS.py'
--- res_partner_attributes_add_NAS/res_partner_attributes_add_NAS.py 1970-01-01 00:00:00 +0000
+++ res_partner_attributes_add_NAS/res_partner_attributes_add_NAS.py 2013-07-12 19:31:37 +0000
@@ -0,0 +1,32 @@
1# -*- encoding: utf-8 -*-
2##############################################################################
3#
4# OpenERP, Open Source Management Solution
5# Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
6#
7# This program is free software: you can redistribute it and/or modify
8# it under the terms of the GNU Affero General Public License as
9# published by the Free Software Foundation, either version 3 of the
10# License, or (at your option) any later version.
11#
12# This program is distributed in the hope that it will be useful,
13# but WITHOUT ANY WARRANTY; without even the implied warranty of
14# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15# GNU Affero General Public License for more details.
16#
17# You should have received a copy of the GNU Affero General Public License
18# along with this program. If not, see <http://www.gnu.org/licenses/>.
19#
20##############################################################################
21
22from openerp.osv import fields, orm
23from openerp.tools.translate import _
24
25class res_partner(orm.Model):
26 _name = 'res.partner'
27 _inherit = 'res.partner'
28 _columns = {
29 'nas' : fields.float('NAS', digits=(9,0),help="Social Insurance Number (9 digits)"),
30 }
31
32# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
033
=== added file 'res_partner_attributes_add_NAS/res_partner_attributes_add_NAS_view.xml'
--- res_partner_attributes_add_NAS/res_partner_attributes_add_NAS_view.xml 1970-01-01 00:00:00 +0000
+++ res_partner_attributes_add_NAS/res_partner_attributes_add_NAS_view.xml 2013-07-12 19:31:37 +0000
@@ -0,0 +1,15 @@
1<?xml version="1.0" encoding="utf-8"?>
2<openerp>
3 <data>
4 <record model="ir.ui.view" id="res_partner_attributes_add_NAS_form_view">
5 <field name="name">res_partner_attributes_add_NAS</field>
6 <field name="model">res.partner</field>
7 <field name="inherit_id" ref="base.view_partner_form"/>
8 <field name="arch" type="xml">
9 <field name="website" position="after">
10 <field name="nas" attrs="{'invisible': [('is_company','=', True)]}"/>
11 </field>
12 </field>
13 </record>
14 </data>
15</openerp>

Subscribers

People subscribed via source and target branches