Merge lp:~akretion-team/sale-wkfl/7.0-add-sale_group into lp:~sale-core-editors/sale-wkfl/7.0

[Raphaël Valyi - http://www.akretion.com]

Adds the very simple sale_group module that adds a group_id on sale.order.line
groups belong to an account.analytic.account and hence to a project.

This module could have been added to sale_report project instead, but in fact, I will next push another module (sale_import_lines) that depends on this one and that makes much more sense in this project, so it's better not mixing project dependencies.

[Sébastien BEAU - http://www.akretion.com (sebastien.beau)]

Hi Raph,
Can you just update the __openerp__.py file with the OpenERP V7 still (removing xml_demo, xml_update... with data...)

Otherwise it's good for me

Thanks

[lp:~akretion-team/sale-wkfl/7.0-add-sale_group]

34. By Raphaël Valyi - http://www.akretion.com on 2014-01-10

[REF] udate_xml -> data in __openerp__.py

35. By Raphaël Valyi - http://www.akretion.com on 2014-01-10

[REF] relative import style

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Can you add the .pot alongside the existing .po file please? Apart that, LGTM
Thanks

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

As stated by Guewen, pot file is missing

review: Needs Fixing

[lp:~akretion-team/sale-wkfl/7.0-add-sale_group]

36. By Raphaël Valyi - http://www.akretion.com on 2014-05-02

[FIX] fixed typo in __openerp__.py

37. By Raphaël Valyi - http://www.akretion.com on 2014-05-02

[ADD] added missing translation .pot

[Raphaël Valyi - http://www.akretion.com (rvalyi)]

.pot added, is that OK for you now?
as a reminder, once we do this merge, we will also be able to proceed with that other one:
https://code.launchpad.net/~akretion-team/sale-wkfl/7.0-add-sale_import_lines/+merge/201021

[Leonardo Pistone (lepistone)]

Raphaël,

__openerp__.py:

- The description could be expanded a bit, maybe mentioning the reverse dependency on sale_import_lines.
- Description: "groups that belongs". That sentence could be rewritten, in fact :)
- we don't need init_xml, demo_xml.
- category is empty.

Apart from these small things, if eveything passes pep8 (can you check please? ) it LGTM, thanks.

review: Needs Fixing

[Pedro Manuel Baeza (pedro.baeza)]

This project is now hosted on https://github.com/OCA/sale-workflow. 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

37. By Raphaël Valyi - http://www.akretion.com on 2014-05-02

[ADD] added missing translation .pot

36. By Raphaël Valyi - http://www.akretion.com on 2014-05-02

[FIX] fixed typo in __openerp__.py

35. By Raphaël Valyi - http://www.akretion.com on 2014-01-10

[REF] relative import style

34. By Raphaël Valyi - http://www.akretion.com on 2014-01-10

[REF] udate_xml -> data in __openerp__.py

33. By Raphaël Valyi - http://www.akretion.com on 2014-01-09

[REF] PEP8

32. By Raphaël Valyi - http://www.akretion.com on 2014-01-08

[REF] sale_group now depends only on sale module (not base_project_costing anymore) and the group os related to the analytic account, not the project

31. By Florian da Costa on 2013-06-10

[ADD] Brazilian Portuguese translation

30. By Akretion Bot <email address hidden> on 2012-08-14

[IMP] cosmetic changes

29. By Akretion Bot <email address hidden> on 2012-08-14

[IMP] proper ordering

28. By Akretion Bot <email address hidden> on 2012-08-07

[FIX]

=== added directory 'sale_group'
=== added file 'sale_group/__init__.py'
--- sale_group/__init__.py	1970-01-01 00:00:00 +0000
+++ sale_group/__init__.py	2014-05-02 16:03:40 +0000
@@ -0,0 +1,1 @@
+from . import sale

=== added file 'sale_group/__openerp__.py'
--- sale_group/__openerp__.py	1970-01-01 00:00:00 +0000
+++ sale_group/__openerp__.py	2014-05-02 16:03:40 +0000
@@ -0,0 +1,17 @@
+{
+    "name": "Sale Order Line Group",
+    "version": "1.0",
+    "author": "Akretion",
+    "website": "http://www.openerp.com",
+    "category": "",
+    "depends": ["sale"],
+    "description": "Simple module allowing you to order your sale order lines with groups that belongs to the order analytic account, that is that indirectly belongs to sale order project.",
+    "init_xml": [],
+    "demo_xml": [],
+    "test": [],
+    "data": ["sale_view.xml",],
+    'images': [],
+    'installable': True,
+    'active': False,
+    'certificate': None,
+}

=== added directory 'sale_group/i18n'
=== added file 'sale_group/i18n/pt_BR.po'
--- sale_group/i18n/pt_BR.po	1970-01-01 00:00:00 +0000
+++ sale_group/i18n/pt_BR.po	2014-05-02 16:03:40 +0000
@@ -0,0 +1,42 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_group
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-06-10 18:21+0000\n"
+"PO-Revision-Date: 2013-06-10 18:21+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: sale_group
+#: field:sale.order.line.group,project_id:0
+msgid "Project name"
+msgstr "Nome do Projeto"
+
+#. module: sale_group
+#: field:sale.order.line.group,name:0
+msgid "Group Name"
+msgstr "Nome du Grupo"
+
+#. module: sale_group
+#: model:ir.model,name:sale_group.model_sale_order_line_group
+msgid "sale.order.line.group"
+msgstr "sale.order.line.group"
+
+#. module: sale_group
+#: field:sale.order.line,group_id:0
+msgid "Group"
+msgstr "Grupo"
+
+#. module: sale_group
+#: model:ir.model,name:sale_group.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Linha de Pedido de Vendas"
+

=== added file 'sale_group/i18n/sale_group.pot'
--- sale_group/i18n/sale_group.pot	1970-01-01 00:00:00 +0000
+++ sale_group/i18n/sale_group.pot	2014-05-02 16:03:40 +0000
@@ -0,0 +1,43 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_group
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-05-02 15:57+0000\n"
+"PO-Revision-Date: 2014-05-02 15:57+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: sale_group
+#: field:sale.order.line.group,analytic_account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: sale_group
+#: field:sale.order.line.group,name:0
+msgid "Group Name"
+msgstr ""
+
+#. module: sale_group
+#: model:ir.model,name:sale_group.model_sale_order_line_group
+msgid "sale.order.line.group"
+msgstr ""
+
+#. module: sale_group
+#: field:sale.order.line,group_id:0
+msgid "Group"
+msgstr ""
+
+#. module: sale_group
+#: model:ir.model,name:sale_group.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+

=== added file 'sale_group/sale.py'
--- sale_group/sale.py	1970-01-01 00:00:00 +0000
+++ sale_group/sale.py	2014-05-02 16:03:40 +0000
@@ -0,0 +1,46 @@
+# -*- encoding: utf-8 -*-
+###############################################################################
+#                                                                             #
+# Copyright (C) 2013  Raphaël Valyi - Akretion                                #
+#                                                                             #
+#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 osv import orm, fields
+
+class sale_order_line(orm.Model):
+    _inherit = "sale.order.line"
+
+    _columns = {
+        'group_id': fields.many2one('sale.order.line.group', 'Group'),
+    }
+
+    _order = 'sequence, group_id, id'
+
+
+class sale_order_line_group(orm.Model):
+    _name = "sale.order.line.group"
+
+    _columns = {
+        'name': fields.char("Group Name", size=64, required=True),
+        'analytic_account_id': fields.many2one('account.analytic.account',
+                                               'Analytic Account',
+                                               required=True),
+    }
+
+    _defaults = {
+        'analytic_account_id': lambda self, cr, uid,
+                               c: c.get('analytic_account_id')
+    }

=== added file 'sale_group/sale_view.xml'
--- sale_group/sale_view.xml	1970-01-01 00:00:00 +0000
+++ sale_group/sale_view.xml	2014-05-02 16:03:40 +0000
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="view_sale_order_line_form">
+            <field name="name">sale.order.line.form</field>
+            <field name="model">sale.order</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="sale.view_order_form"/>
+            <field name="arch" type="xml">
+              <xpath expr="//field[@name='order_line']/tree/field[@name='product_id']" position="before">
+                <field name="group_id" context="{'analytic_account_id': parent.project_id}" domain="[('analytic_account_id', '=', parent.project_id)]" groups="sale.group_analytic_accounting"/>
+              </xpath>
+
+              <xpath expr="//field[@name='order_line']/form/label[@for='name']" position="before">
+                <group>
+                  <group>
+                    <field name="group_id" context="{'analytic_account_id': parent.project_id}" domain="[('analytic_account_id', '=', parent.project_id)]" groups="sale.group_analytic_accounting"/>
+                  </group>
+                </group>
+              </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>