[MERGE] forward port branch 8.0 up to 7bdd4de

addons/anglo_saxon_dropshipping/__init__.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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/>.
+#
+##############################################################################
+import stock_dropshipping
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/anglo_saxon_dropshipping/__openerp__.py

@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 OpenERP S.A. (<http://www.openerp.com>).
+#
+#    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/>.
+#
+##############################################################################
+
+{
+    'name': 'Drop Shipping anglosaxon',
+    'version': '1.0',
+    'category': 'Warehouse Management',
+    'summary': 'Drop Shipping in anglo-saxon',
+    'description': """
+
+""",
+    'author': 'OpenERP SA',
+    'website': 'https://www.odoo.com/page/warehouse',
+    'depends': ['account_anglo_saxon', 'stock_dropshipping'],
+    'test': [
+    ],
+    'installable': True,
+    'auto_install': True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/anglo_saxon_dropshipping/stock_dropshipping.py

@@ -0,0 +1,15 @@
+# coding: utf-8
+
+from openerp.osv import osv
+
+class account_invoice_line(osv.osv):
+    _inherit = 'account.invoice.line'
+
+    def _anglo_saxon_sale_move_lines(self, cr, uid, i_line, res, context=None):
+        salelines = self.pool.get('sale.order.line').search(cr, uid, [('invoice_lines', 'in', [i_line.id])])
+        for sale_line in self.pool.get('sale.order.line').browse(cr, uid, salelines, context=context):
+            for proc in sale_line.procurement_ids:
+                if proc.purchase_line_id:
+                    #if the invoice line is related to sale order lines having one of its procurement_ids with a purchase_line_id set, it means that it is a confirmed dropship and in that case we mustn't create the cost of sale line (because the product won't enter the stock)
+                    return []
+        return super(account_invoice_line, self)._anglo_saxon_sale_move_lines(cr, uid, i_line, res, context=context)