Yannick Vaucher @ Camptocamp has proposed merging
lp:~camptocamp/sale-financial/7.0-port-sale_floor_price into lp:sale-financial.
Requested reviews:
Sale Core Editors (sale-core-editors)
For more details, see:
https://code.launchpad.net/~camptocamp/sale-financial/7.0-port-sale_floor_price/+merge/214059
Portage of sale_floor_price
Requires sale_line_watcher ported in
https://code.launchpad.net/~camptocamp/sale-financial/7.0-port-sale_line_watcher/+merge/214058
--
https://code.launchpad.net/~camptocamp/sale-financial/7.0-port-sale_floor_price/+merge/214059
Your team Sale Core Editors is requested to review the proposed merge of
lp:~camptocamp/sale-financial/7.0-port-sale_floor_price into lp:sale-financial.
=== modified file 'sale_floor_price/__init__.py'
--- sale_floor_price/__init__.py 2012-05-29 07:06:32 +
+++ sale_floor_price/__init__.py 2014-04-03 15:33:01 +
@@ -1,27 +1,25 @@
# -*- coding: utf-8 -*-
##
#
-#Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
-#All Right Reserved
-#
-#Author : Joel Grand-Guillaume (Camptocamp)
+#Author: Joël Grand-Guillaume
+#Copyright 2012 Camptocamp SA
#
#This program is free software: you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation, either version 3 of the License, or
-#(at your option) any later version.
+#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 General Public License for more details.
+#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/.
#
##
-import product
-import floor_sale
+from . import product
+from . import floor_sale
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'sale_floor_price/__openerp__.py'
--- sale_floor_price/__openerp__.py 2013-11-14 08:16:22 +
+++ sale_floor_price/__openerp__.py 2014-04-03 15:33:01 +
@@ -23,16 +23,18 @@
'author' : 'Camptocamp',
'maintainer': 'Camptocamp',
'category': 'Tool',
- 'complexity': normal, # easy, normal, expert
+ 'complexity': normal,
'depends' : ['stock','product','sale', 'sale_line_watcher'],
- 'description': Set a minimal price on product and raise a warning if sale price is too low,
+ 'description':
+Floor price on product
+==
+
+Set a minimal price on product and raise a warning if sale price is too low
+,
'website': 'http://www.camptocamp.com',
- 'init_xml': [],
- 'update_xml': ['product_view.xml'],
- 'demo_xml': [],
- 'tests': [],
- 'installable': False,
+ 'data': ['product_view.xml'],
+ 'test': [],
+ 'installable': True,
'auto_install': False,
'license': 'AGPL-3',
'application': True}
-
=== modified file 'sale_floor_price/floor_sale.py'
--- sale_floor_price/floor_sale.py 2012-06-06 13:14:12 +
+++ sale_floor_price/floor_sale.py 2014-04-03 15:33:01 +
@@ -1,20 +1,18 @@
# -*- coding: utf-8 -*-
##
#
-#Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
-#All Right Reserved
-#
-#Author : Joel Grand-Guillaume (Camptocamp)
+#Author: Joël Grand-Guillaume
+#Copyright 2012 Camptocamp SA
#
#This program is free software: you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation, either version 3 of the License, or
-#(at your option) any later version.
+#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 General Public License for more details.
+#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/.
@@ -24,12 +22,14 @@
from osv.orm import Model
from tools.translate import _
+
class SaleOrderLine(Model):
_inherit = 'sale.order.line'
def _reach_floor_price(self, cr,
