Merge lp:~initos.com/syleam-modules/7.0-pricelist-discount into lp:~syleam/syleam-modules/7.0

[Thomas Rehn]

This branch contains migrations of the 'pricelist_discount' and 'sale_pricelist_discount' modules to OpenERP v7.
The changes are mostly whitespace organization, the code is now PEP-8 compliant.

Unmerged revisions

3. By Thomas Rehn on 2013-12-19

migrated "pricelist_discount" and "sale_pricelist_discount" to version 7

=== added directory 'pricelist_discount'
=== added file 'pricelist_discount/.description'
--- pricelist_discount/.description	1970-01-01 00:00:00 +0000
+++ pricelist_discount/.description	2013-12-19 15:54:25 +0000
@@ -0,0 +1,1 @@
+Pricelist Discount

=== added file 'pricelist_discount/__init__.py'
--- pricelist_discount/__init__.py	1970-01-01 00:00:00 +0000
+++ pricelist_discount/__init__.py	2013-12-19 15:54:25 +0000
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    pricelist_discount module for OpenERP, Pricelist Discount
+#    Copyright (C) 2009 SYLEAM Info Services (<http://www.syleam.fr/>)
+#              Jean-Sébastien SUZANNE <[e-mail]>
+#    Copyright (C) 2012 SYLEAM Info Services (<http://www.syleam.fr/>)
+#              Benoît MOTTIN <[e-mail]>
+#              Sebastien LANGE <[e-mail]>
+#    Copyright (C) 2013 initOS GmbH & Co. KG <http://www.initos.com>
+#
+#    This file is a part of pricelist_discount
+#
+#    pricelist_discount 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.
+#
+#    pricelist_discount 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 . import product
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'pricelist_discount/__openerp__.py'
--- pricelist_discount/__openerp__.py	1970-01-01 00:00:00 +0000
+++ pricelist_discount/__openerp__.py	2013-12-19 15:54:25 +0000
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    pricelist_discount module for OpenERP, Pricelist Discount
+#    Copyright (C) 2009 SYLEAM Info Services (<http://www.syleam.fr/>)
+#              Jean-Sébastien SUZANNE <[e-mail]>
+#    Copyright (C) 2012 SYLEAM Info Services (<http://www.syleam.fr/>)
+#              Benoît MOTTIN <[e-mail]>
+#              Sebastien LANGE <[e-mail]>
+#
+#    This file is a part of pricelist_discount
+#
+#    pricelist_discount 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.
+#
+#    pricelist_discount 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/>.
+#
+##############################################################################
+
+{
+    'name': 'Pricelist Discount',
+    'version': '0.2',
+    'category': 'Sales Management',
+    'description': """Add discount in pricelist""",
+    'author': 'SYLEAM; initOS',
+    'depends': [
+            'base',
+            'product',
+        ],
+    'data': [
+        'product_view.xml',
+        ],
+    'demo': [],
+    'test': [],
+    'installable': True,
+    'active': False,
+    'license': 'AGPL-3',
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'pricelist_discount/i18n'
=== added file 'pricelist_discount/i18n/de.po'
--- pricelist_discount/i18n/de.po	1970-01-01 00:00:00 +0000
+++ pricelist_discount/i18n/de.po	2013-12-19 15:54:25 +0000
@@ -0,0 +1,37 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* pricelist_discount
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-12-19 15:30+0000\n"
+"PO-Revision-Date: 2013-12-19 15:30+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: pricelist_discount
+#: view:product.pricelist.item:0
+msgid "Others Informations"
+msgstr "Andere Informationen"
+
+#. module: pricelist_discount
+#: model:ir.model,name:pricelist_discount.model_product_pricelist
+msgid "Pricelist"
+msgstr "Preisliste"
+
+#. module: pricelist_discount
+#: model:ir.model,name:pricelist_discount.model_product_pricelist_item
+msgid "Pricelist item"
+msgstr "Preislisteneintrag"
+
+#. module: pricelist_discount
+#: field:product.pricelist.item,discount:0
+msgid "Discount (%)"
+msgstr "Rabatt (%)"
+

=== added file 'pricelist_discount/i18n/fr.po'
--- pricelist_discount/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ pricelist_discount/i18n/fr.po	2013-12-19 15:54:25 +0000
@@ -0,0 +1,37 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* pricelist_discount
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-12-19 15:30+0000\n"
+"PO-Revision-Date: 2012-08-31 11:24+0100\n"
+"Last-Translator: MOTTIN Benoît <[e-mail]>\n"
+"Language-Team: \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+
+#. module: pricelist_discount
+#: view:product.pricelist.item:0
+msgid "Others Informations"
+msgstr "Autres informations"
+
+#. module: pricelist_discount
+#: model:ir.model,name:pricelist_discount.model_product_pricelist
+msgid "Pricelist"
+msgstr "Liste de prix"
+
+#. module: pricelist_discount
+#: model:ir.model,name:pricelist_discount.model_product_pricelist_item
+msgid "Pricelist item"
+msgstr "Élément de la liste de prix"
+
+#. module: pricelist_discount
+#: field:product.pricelist.item,discount:0
+msgid "Discount (%)"
+msgstr "Remise (%)"

=== added file 'pricelist_discount/i18n/pricelist_discount.pot'
--- pricelist_discount/i18n/pricelist_discount.pot	1970-01-01 00:00:00 +0000
+++ pricelist_discount/i18n/pricelist_discount.pot	2013-12-19 15:54:25 +0000
@@ -0,0 +1,37 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* pricelist_discount
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-12-19 15:30+0000\n"
+"PO-Revision-Date: 2013-12-19 15:30+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: pricelist_discount
+#: view:product.pricelist.item:0
+msgid "Others Informations"
+msgstr ""
+
+#. module: pricelist_discount
+#: model:ir.model,name:pricelist_discount.model_product_pricelist
+msgid "Pricelist"
+msgstr ""
+
+#. module: pricelist_discount
+#: model:ir.model,name:pricelist_discount.model_product_pricelist_item
+msgid "Pricelist item"
+msgstr ""
+
+#. module: pricelist_discount
+#: field:product.pricelist.item,discount:0
+msgid "Discount (%)"
+msgstr ""
+

=== added file 'pricelist_discount/product.py'
--- pricelist_discount/product.py	1970-01-01 00:00:00 +0000
+++ pricelist_discount/product.py	2013-12-19 15:54:25 +0000
@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    pricelist_discount module for OpenERP, Pricelist Discount
+#    Copyright (C) 2009 SYLEAM Info Services (<http://www.syleam.fr/>)
+#              Jean-Sébastien SUZANNE <[e-mail]>
+#    Copyright (C) 2012 SYLEAM Info Services (<http://www.syleam.fr/>)
+#              Benoît MOTTIN <[e-mail]>
+#              Sebastien LANGE <[e-mail]>
+#    Copyright (C) 2013 initOS GmbH & Co. KG <http://www.initos.com>
+#
+#    This file is a part of pricelist_discount
+#
+#    pricelist_discount 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.
+#
+#    pricelist_discount 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 osv, fields
+
+
+class product_pricelist(osv.Model):
+    _inherit = "product.pricelist"
+
+    def price_get(self, cr, uid, ids, prod_id, qty, partner=None,
+                  context=None):
+        """
+        Add discount if set in result
+        """
+        context = context or {}
+        result = super(product_pricelist, self)\
+            .price_get(cr, uid, ids, prod_id, qty,
+                       partner=partner, context=context)
+        if 'discount' in context:
+            discount = self.pool.get('product.pricelist.item')\
+                           .browse(cr, uid, result['item_id'].values()[0],
+                                   context=context)\
+                           .discount or False
+            if discount:
+                result.update({'discount': discount})
+        return result
+
+
+class product_pricelist_item(osv.Model):
+    _inherit = 'product.pricelist.item'
+
+    _columns = {
+        'discount': fields.float('Discount (%)', digits=(16, 2)),
+    }
+
+    _defaults = {
+        'discount': 0.0,
+    }
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'pricelist_discount/product_view.xml'
--- pricelist_discount/product_view.xml	1970-01-01 00:00:00 +0000
+++ pricelist_discount/product_view.xml	2013-12-19 15:54:25 +0000
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        ##############################################################################
+        #
+        #    pricelist_discount module for OpenERP, Pricelist Discount
+        #    Copyright (C) 2012 SYLEAM Info Services ([http://www.syleam.fr/]) 
+        #              Benoît MOTTIN [[e-mail]]
+        #              Sebastien LANGE [[e-mail]]
+        #
+        #    This file is a part of pricelist_discount
+        #
+        #    pricelist_discount 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.
+        #
+        #    pricelist_discount 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/].
+        #
+        ##############################################################################
+
+        <record id="view_product_pricelist_item_form" model="ir.ui.view">
+            <field name="name">product.pricelist.item</field>
+            <field name="model">product.pricelist.item</field>
+            <field name="inherit_id" ref="product.product_pricelist_item_form_view" />
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='price_max_margin']" position="after">
+                    <group colspan="3">
+                        <separator colspan="4" string="Others Informations"/>
+                        <field name="discount"/>
+                    </group>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>

=== added directory 'sale_pricelist_discount'
=== added file 'sale_pricelist_discount/.description'
--- sale_pricelist_discount/.description	1970-01-01 00:00:00 +0000
+++ sale_pricelist_discount/.description	2013-12-19 15:54:25 +0000
@@ -0,0 +1,1 @@
+Sale pricelist discount

=== added file 'sale_pricelist_discount/__init__.py'
--- sale_pricelist_discount/__init__.py	1970-01-01 00:00:00 +0000
+++ sale_pricelist_discount/__init__.py	2013-12-19 15:54:25 +0000
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    sale_pricelist_discount module for OpenERP, Sale pricelist discount
+#    Copyright (C) 2009 SYLEAM Info Services (<http://www.syleam.fr/>)
+#              Jean-Sébastien SUZANNE <[e-mail]>
+#    Copyright (C) 2012 SYLEAM Info Services (<http://www.syleam.fr/>)
+#              Benoît MOTTIN <[e-mail]>
+#              Sebastien LANGE <[e-mail]>
+#    Copyright (C) 2013 initOS GmbH & Co. KG <http://www.initos.com>
+#
+#    This file is a part of sale_pricelist_discount
+#
+#    sale_pricelist_discount 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.
+#
+#    sale_pricelist_discount 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 . import sale
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'sale_pricelist_discount/__openerp__.py'
--- sale_pricelist_discount/__openerp__.py	1970-01-01 00:00:00 +0000
+++ sale_pricelist_discount/__openerp__.py	2013-12-19 15:54:25 +0000
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    sale_pricelist_discount module for OpenERP, Sale pricelist discount
+#    Copyright (C) 2009 SYLEAM Info Services (<http://www.syleam.fr/>)
+#              Jean-Sébastien SUZANNE <[e-mail]>
+#    Copyright (C) 2012 SYLEAM Info Services (<http://www.syleam.fr/>)
+#              Benoît MOTTIN <[e-mail]>
+#              Sebastien LANGE <[e-mail]>
+#    Copyright (C) 2013 initOS GmbH & Co. KG <http://www.initos.com>
+#
+#    This file is a part of sale_pricelist_discount
+#
+#    sale_pricelist_discount 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.
+#
+#    sale_pricelist_discount 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/>.
+#
+##############################################################################
+
+{
+    'name': 'Sale Pricelist Discount',
+    'version': '0.4',
+    'category': 'Sales Management',
+    'description': """
+        Get Discount in pricelist and put it in discount sale's field""",
+    'author': 'SYLEAM; initOS',
+    'depends': [
+            'base',
+            'sale',
+            'pricelist_discount',
+        ],
+    'data': [],
+    'demo': [],
+    'test': [],
+    'installable': True,
+    'active': False,
+    'license': 'AGPL-3',
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'sale_pricelist_discount/i18n'
=== added file 'sale_pricelist_discount/i18n/sale_pricelist_discount.pot'
--- sale_pricelist_discount/i18n/sale_pricelist_discount.pot	1970-01-01 00:00:00 +0000
+++ sale_pricelist_discount/i18n/sale_pricelist_discount.pot	2013-12-19 15:54:25 +0000
@@ -0,0 +1,21 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-12-19 15:30+0000\n"
+"PO-Revision-Date: 2013-12-19 15:30+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_pricelist_discount
+#: model:ir.model,name:sale_pricelist_discount.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+

=== added file 'sale_pricelist_discount/sale.py'
--- sale_pricelist_discount/sale.py	1970-01-01 00:00:00 +0000
+++ sale_pricelist_discount/sale.py	2013-12-19 15:54:25 +0000
@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    sale_pricelist_discount module for OpenERP, Sale pricelist discount
+#    Copyright (C) 2009 SYLEAM Info Services (<http://www.syleam.fr/>)
+#              Jean-Sébastien SUZANNE <[e-mail]>
+#    Copyright (C) 2012 SYLEAM Info Services (<http://www.syleam.fr/>)
+#              Benoît MOTTIN <[e-mail]>
+#              Sebastien LANGE <[e-mail]>
+#    Copyright (C) 2013 initOS GmbH & Co. KG <http://www.initos.com>
+#
+#    This file is a part of sale_pricelist_discount
+#
+#    sale_pricelist_discount 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.
+#
+#    sale_pricelist_discount 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 osv
+import time
+from tools import DEFAULT_SERVER_DATE_FORMAT
+
+
+class sale_order_line(osv.Model):
+    _inherit = 'sale.order.line'
+
+    def product_id_change(self, cr, uid, ids, pricelist, product, qty=0,
+                          uom=False, qty_uos=0, uos=False, name='',
+                          partner_id=False, lang=False, update_tax=True,
+                          date_order=False, packaging=False,
+                          fiscal_position=False, flag=False, context=None):
+        """
+        Get discount if exists
+        """
+        result = super(sale_order_line, self)\
+            .product_id_change(cr, uid, ids, pricelist, product, qty, uom,
+                               qty_uos, uos, name, partner_id, lang,
+                               update_tax, date_order, packaging,
+                               fiscal_position, flag, context=context)
+        if not product:
+            return result
+        if not date_order:
+            date_order = time.strftime(DEFAULT_SERVER_DATE_FORMAT)
+
+        # get discount
+        discount_params = {
+            'uom': uom or self.pool.get('product.product')
+                              .browse(cr, uid, product, context=context)
+                              .uom_id.id,
+            'date': date_order,
+            'discount': True,
+        }
+        price_dict = self.pool.get('product.pricelist')\
+                         .price_get(cr, uid, [pricelist], product, qty or 1.0,
+                                    partner_id, discount_params)
+        if price_dict.get('discount', False):
+            result['value']['discount'] = price_dict['discount']
+        return result
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: