Merge lp:~savoirfairelinux-openerp/partner-contact-management/partner_category_description into lp:~partner-contact-core-editors/partner-contact-management/7.0

Proposed by Mathieu Benoit
Status: Needs review
Proposed branch: lp:~savoirfairelinux-openerp/partner-contact-management/partner_category_description
Merge into: lp:~partner-contact-core-editors/partner-contact-management/7.0
Diff against target: 212 lines (+172/-0)
6 files modified
partner_category_description/__init__.py (+21/-0)
partner_category_description/__openerp__.py (+49/-0)
partner_category_description/i18n/fr.po (+28/-0)
partner_category_description/i18n/partner_category_description.pot (+27/-0)
partner_category_description/res_partner.py (+29/-0)
partner_category_description/res_partner_view.xml (+18/-0)
To merge this branch: bzr merge lp:~savoirfairelinux-openerp/partner-contact-management/partner_category_description
Reviewer Review Type Date Requested Status
Lorenzo Battistini (community) Needs Resubmitting
Yannick Vaucher @ Camptocamp Needs Information
Sandy Carter (http://www.savoirfairelinux.com) Approve
Joao Alfredo Gama Batista code review, no tests Pending
Review via email: mp+213697@code.launchpad.net

This proposal supersedes a proposal from 2014-03-24.

Description of the change

Add field description to partner.category.

To post a comment you must log in.
Revision history for this message
Joao Alfredo Gama Batista (joao-gama) wrote : Posted in a previous version of this proposal

Hi Mathieu,

Thanks for your contribution.

Here's my review:

l.172 Please use orm instead of osv.
l.175 osv.Model -> orm.Model
l.192 It's not a good idea to override a view's external id. Please pick another name for the id.

review: Needs Fixing (code review, no tests)
Revision history for this message
Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter) :
review: Approve
Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote :

Was this proposed in openobject-server for trunk? It seams a good it to be able to give details about a category.

review: Needs Information
Revision history for this message
Lorenzo Battistini (elbati) wrote :

This project is now hosted on https://github.com/OCA/partner-contact. Please move your proposal there. This guide may help you https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub

review: Needs Resubmitting

Unmerged revisions

40. By Mathieu Benoit

[FIX] partner_category_description: replace osv to orm. Add new id to view_partner_category_form

39. By Mathieu Benoit

[FIX] partner_category_description: fix pep8

38. By Mathieu Benoit

[ADD] partner_category_description: add field description translatable

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added directory 'partner_category_description'
=== added file 'partner_category_description/__init__.py'
--- partner_category_description/__init__.py 1970-01-01 00:00:00 +0000
+++ partner_category_description/__init__.py 2014-04-01 18:02:54 +0000
@@ -0,0 +1,21 @@
1# -*- encoding: utf-8 -*-
2#
3# OpenERP, Open Source Management Solution
4# This module copyright (C) 2014 Savoir-faire Linux
5# (<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
21from . import res_partner
022
=== added file 'partner_category_description/__openerp__.py'
--- partner_category_description/__openerp__.py 1970-01-01 00:00:00 +0000
+++ partner_category_description/__openerp__.py 2014-04-01 18:02:54 +0000
@@ -0,0 +1,49 @@
1# -*- encoding: utf-8 -*-
2#
3# OpenERP, Open Source Management Solution
4# This module copyright (C) 2014 Savoir-faire Linux
5# (<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 'name': 'Partner Category Description',
23 'version': '0.1',
24 'author': 'Savoir-faire Linux',
25 'maintainer': 'Savoir-faire Linux',
26 'website': 'http://www.savoirfairelinux.com',
27 'license': 'AGPL-3',
28 'category': 'Partner',
29 'summary': 'Partner category description',
30 'description': """
31Partner Category Description module
32===================================
33This module adds a translatable description to the partner tags.
34
35.. image:: /partner_category_description/static/src/demo/view_partner_quantity_description.png
36
37Contributors
38------------
39* Mathieu Benoit (mathieu.benoit@savoirfairelinux.com)
40""",
41 'depends': [],
42 'external_dependencies': {
43 'python': [],
44 },
45 'data': [
46 'res_partner_view.xml'
47 ],
48 'installable': True,
49}
050
=== added directory 'partner_category_description/i18n'
=== added file 'partner_category_description/i18n/fr.po'
--- partner_category_description/i18n/fr.po 1970-01-01 00:00:00 +0000
+++ partner_category_description/i18n/fr.po 2014-04-01 18:02:54 +0000
@@ -0,0 +1,28 @@
1# Translation of OpenERP Server.
2# This file contains the translation of the following modules:
3# * partner_category_description
4#
5msgid ""
6msgstr ""
7"Project-Id-Version: OpenERP Server 7.0\n"
8"Report-Msgid-Bugs-To: \n"
9"POT-Creation-Date: 2014-03-17 22:26+0000\n"
10"PO-Revision-Date: 2014-03-17 18:31-0500\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: 8bit\n"
16"Plural-Forms: \n"
17"X-Generator: Poedit 1.6.4\n"
18"Language: fr\n"
19
20#. module: partner_category_description
21#: model:ir.model,name:partner_category_description.model_res_partner_category
22msgid "Partner Categories"
23msgstr "Cat├ęgories de partenaires"
24
25#. module: partner_category_description
26#: field:res.partner.category,description:0
27msgid "Description"
28msgstr "Description"
029
=== added file 'partner_category_description/i18n/partner_category_description.pot'
--- partner_category_description/i18n/partner_category_description.pot 1970-01-01 00:00:00 +0000
+++ partner_category_description/i18n/partner_category_description.pot 2014-04-01 18:02:54 +0000
@@ -0,0 +1,27 @@
1# Translation of OpenERP Server.
2# This file contains the translation of the following modules:
3# * partner_category_description
4#
5msgid ""
6msgstr ""
7"Project-Id-Version: OpenERP Server 7.0\n"
8"Report-Msgid-Bugs-To: \n"
9"POT-Creation-Date: 2014-03-17 22:26+0000\n"
10"PO-Revision-Date: 2014-03-17 18:30-0500\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: 8bit\n"
16"Plural-Forms: \n"
17"X-Generator: Poedit 1.6.4\n"
18
19#. module: partner_category_description
20#: model:ir.model,name:partner_category_description.model_res_partner_category
21msgid "Partner Categories"
22msgstr ""
23
24#. module: partner_category_description
25#: field:res.partner.category,description:0
26msgid "Description"
27msgstr ""
028
=== added file 'partner_category_description/res_partner.py'
--- partner_category_description/res_partner.py 1970-01-01 00:00:00 +0000
+++ partner_category_description/res_partner.py 2014-04-01 18:02:54 +0000
@@ -0,0 +1,29 @@
1# -*- encoding: utf-8 -*-
2#
3# OpenERP, Open Source Management Solution
4# This module copyright (C) 2014 Savoir-faire Linux
5# (<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
21from openerp.osv import orm, fields
22
23
24class res_partner_category(orm.Model):
25 _inherit = "res.partner.category"
26
27 _columns = {
28 'description': fields.text('Description', translate=True)
29 }
030
=== added file 'partner_category_description/res_partner_view.xml'
--- partner_category_description/res_partner_view.xml 1970-01-01 00:00:00 +0000
+++ partner_category_description/res_partner_view.xml 2014-04-01 18:02:54 +0000
@@ -0,0 +1,18 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!DOCTYPE openerp SYSTEM "openerp.dtd">
3<openerp>
4 <data>
5 <!-- Categories -->
6 <record id="view_partner_category_desc_form" model="ir.ui.view">
7 <field name="model">res.partner.category</field>
8 <field name="inherit_id" ref="base.view_partner_category_form"/>
9 <field name="arch" type="xml">
10 <group col="4" position="after">
11 <group>
12 <field name="description"/>
13 </group>
14 </group>
15 </field>
16 </record>
17 </data>
18</openerp>
0\ No newline at end of file19\ No newline at end of file
120
=== added directory 'partner_category_description/static'
=== added directory 'partner_category_description/static/src'
=== added directory 'partner_category_description/static/src/demo'
=== added file 'partner_category_description/static/src/demo/icon.png'
2Binary files partner_category_description/static/src/demo/icon.png 1970-01-01 00:00:00 +0000 and partner_category_description/static/src/demo/icon.png 2014-04-01 18:02:54 +0000 differ21Binary files partner_category_description/static/src/demo/icon.png 1970-01-01 00:00:00 +0000 and partner_category_description/static/src/demo/icon.png 2014-04-01 18:02:54 +0000 differ
=== added file 'partner_category_description/static/src/demo/view_partner_quantity_description.png'
3Binary files partner_category_description/static/src/demo/view_partner_quantity_description.png 1970-01-01 00:00:00 +0000 and partner_category_description/static/src/demo/view_partner_quantity_description.png 2014-04-01 18:02:54 +0000 differ22Binary files partner_category_description/static/src/demo/view_partner_quantity_description.png 1970-01-01 00:00:00 +0000 and partner_category_description/static/src/demo/view_partner_quantity_description.png 2014-04-01 18:02:54 +0000 differ