Merge lp:~borjals/openobject-addons/extra-5.0-bugfix-603100 into lp:openobject-addons/extra-5.0

[Borja López Soilán (NeoPolus)]

Complete rewrite of the purchase_tax_include module to address multiple bugs.

- Solved "column 'amount_tax' of relation 'purchase_order' does not exist"
  error when saving a purchase order (bug 603100).
  The previous fields redefinitions where incompatible with the purchase
  module from the 5.0 addons since Dec 2008.

- Now correct 'amount_untaxed' and 'amount_total' are shown on the
  purchase order totals.

- Now 'price_subtotal_incl' column is properly displayed on the
  purchase order lines list of the purchase form.

- When the order is invoiced, the created invoice did not use the
  price type of the order, so the amounts didn't match; fixed.

- When a picking is invoiced, the created invoice did not use the
  price type of the original orders; fixed.

[Borja López Soilán (NeoPolus) (borjals)]

Ok, this has been waiting for a month and only Numérigraphe (thanks!) reviewed the merge proposal (on trunk). As in its current state purchase_tax_include is not usable at all, I think I'll just merge it tomorrow.

=== modified file 'purchase_tax_include/__init__.py'
--- purchase_tax_include/__init__.py	2008-11-03 19:56:05 +0000
+++ purchase_tax_include/__init__.py	2010-07-09 15:01:37 +0000
@@ -1,25 +1,29 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#
-#    OpenERP, Open Source Management Solution	
-#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
 #    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 General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#    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/>.     
 #
 ##############################################################################
 
+__authors__ = [
+    "OpenERP S.A.",
+    "Borja López Soilán (Pexego) <[e-mail]>"
+]
+
 import purchase_tax_incl
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
 
 
=== modified file 'purchase_tax_include/__terp__.py'
--- purchase_tax_include/__terp__.py	2009-02-17 12:57:51 +0000
+++ purchase_tax_include/__terp__.py	2010-07-09 15:01:37 +0000
@@ -1,27 +1,26 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#
-#    OpenERP, Open Source Management Solution	
-#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
 #    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 General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#    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" : "Purchases with taxes included",
-    "version" : "1.0",
+    "version" : "2.0",
     "depends" : ["purchase","account_tax_include"],
     "author" : "Tiny",
     "website" : "http://www.openerp.com",
 
=== added directory 'purchase_tax_include/i18n'
=== added file 'purchase_tax_include/i18n/es_ES.po'
--- purchase_tax_include/i18n/es_ES.po	1970-01-01 00:00:00 +0000
+++ purchase_tax_include/i18n/es_ES.po	2010-07-09 15:01:37 +0000
@@ -0,0 +1,89 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* purchase_tax_include
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2010-07-09 11:24:53+0000\n"
+"PO-Revision-Date: 2010-07-09 13:32+0100\n"
+"Last-Translator: Borja López Soilán (Pexego) <[e-mail]>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+
+#. module: purchase_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML inválido para la definición de la vista!"
+
+#. module: purchase_tax_include
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter especial!"
+
+#. module: purchase_tax_include
+#: code:addons/purchase_tax_include/purchase_tax_incl.py:0
+#, python-format
+msgid "You can't mix tax included and tax excluded purchases in one invoice!"
+msgstr "¡No puede mezclar compras con impuestos incluidos y excluidos en una factura!"
+
+#. module: purchase_tax_include
+#: field:purchase.order,price_type:0
+msgid "Price method"
+msgstr "Método de precio"
+
+#. module: purchase_tax_include
+#: model:ir.module.module,shortdesc:purchase_tax_include.module_meta_information
+msgid "Purchases with taxes included"
+msgstr "Compras con impuestos incluidos"
+
+#. module: purchase_tax_include
+#: selection:purchase.order,price_type:0
+msgid "Tax included"
+msgstr "Impuestos incluidos"
+
+#. module: purchase_tax_include
+#: model:ir.model,name:purchase_tax_include.model_purchase_order
+msgid "Purchase order"
+msgstr "Pedido de compra"
+
+#. module: purchase_tax_include
+#: code:addons/purchase_tax_include/purchase_tax_incl.py:0
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: purchase_tax_include
+#: selection:purchase.order,price_type:0
+msgid "Tax excluded"
+msgstr "Impuestos excluidos"
+
+#. module: purchase_tax_include
+#: model:ir.model,name:purchase_tax_include.model_purchase_order_line
+msgid "Purchase Order lines"
+msgstr "Líneas del pedido de compra"
+
+#. module: purchase_tax_include
+#: model:ir.module.module,description:purchase_tax_include.module_meta_information
+msgid "This module allows you to use purchase order with prices including or excluding taxes."
+msgstr "Este módulo le permite usar órdenes de compra con precios con impuestos incluídos o excluidos."
+
+#. module: purchase_tax_include
+#: model:ir.model,name:purchase_tax_include.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: purchase_tax_include
+#: field:purchase.order.line,price_subtotal:0
+msgid "Subtotal w/o tax"
+msgstr "Subtotal sin imp."
+
+#. module: purchase_tax_include
+#: field:purchase.order.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
 
=== added file 'purchase_tax_include/i18n/fr_BE.po'
--- purchase_tax_include/i18n/fr_BE.po	1970-01-01 00:00:00 +0000
+++ purchase_tax_include/i18n/fr_BE.po	2010-07-09 15:01:37 +0000
@@ -0,0 +1,52 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* purchase_tax_include
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2009-11-25 14:07:16+0000\n"
+"PO-Revision-Date: 2009-11-25 14:07:16+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: purchase_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: purchase_tax_include
+#: field:purchase.order,price_type:0
+msgid "Price method"
+msgstr ""
+
+#. module: purchase_tax_include
+#: model:ir.module.module,shortdesc:purchase_tax_include.module_meta_information
+msgid "Purchases with taxes included"
+msgstr ""
+
+#. module: purchase_tax_include
+#: selection:purchase.order,price_type:0
+msgid "Tax included"
+msgstr ""
+
+#. module: purchase_tax_include
+#: selection:purchase.order,price_type:0
+msgid "Tax excluded"
+msgstr ""
+
+#. module: purchase_tax_include
+#: model:ir.module.module,description:purchase_tax_include.module_meta_information
+msgid "This module allows you to use purchase order with prices including or excluding taxes."
+msgstr ""
+
+#. module: purchase_tax_include
+#: field:purchase.order.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr ""
+
 
=== added file 'purchase_tax_include/i18n/purchase_tax_include.pot'
--- purchase_tax_include/i18n/purchase_tax_include.pot	1970-01-01 00:00:00 +0000
+++ purchase_tax_include/i18n/purchase_tax_include.pot	2010-07-09 15:01:37 +0000
@@ -0,0 +1,89 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* purchase_tax_include
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2010-07-09 11:22:17+0000\n"
+"PO-Revision-Date: 2010-07-09 11:22:17+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: purchase_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: purchase_tax_include
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: purchase_tax_include
+#: code:addons/purchase_tax_include/purchase_tax_incl.py:0
+#, python-format
+msgid "You can't mix tax included and tax excluded purchases in one invoice!"
+msgstr ""
+
+#. module: purchase_tax_include
+#: field:purchase.order,price_type:0
+msgid "Price method"
+msgstr ""
+
+#. module: purchase_tax_include
+#: model:ir.module.module,shortdesc:purchase_tax_include.module_meta_information
+msgid "Purchases with taxes included"
+msgstr ""
+
+#. module: purchase_tax_include
+#: selection:purchase.order,price_type:0
+msgid "Tax included"
+msgstr ""
+
+#. module: purchase_tax_include
+#: model:ir.model,name:purchase_tax_include.model_purchase_order
+msgid "Purchase order"
+msgstr ""
+
+#. module: purchase_tax_include
+#: code:addons/purchase_tax_include/purchase_tax_incl.py:0
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: purchase_tax_include
+#: selection:purchase.order,price_type:0
+msgid "Tax excluded"
+msgstr ""
+
+#. module: purchase_tax_include
+#: model:ir.model,name:purchase_tax_include.model_purchase_order_line
+msgid "Purchase Order lines"
+msgstr ""
+
+#. module: purchase_tax_include
+#: model:ir.module.module,description:purchase_tax_include.module_meta_information
+msgid "This module allows you to use purchase order with prices including or excluding taxes."
+msgstr ""
+
+#. module: purchase_tax_include
+#: model:ir.model,name:purchase_tax_include.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: purchase_tax_include
+#: field:purchase.order.line,price_subtotal:0
+msgid "Subtotal w/o tax"
+msgstr ""
+
+#. module: purchase_tax_include
+#: field:purchase.order.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr ""
+
 
=== modified file 'purchase_tax_include/purchase_tax_incl.py'
--- purchase_tax_include/purchase_tax_incl.py	2008-11-03 19:56:05 +0000
+++ purchase_tax_include/purchase_tax_incl.py	2010-07-09 15:01:37 +0000
@@ -1,99 +1,262 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#
-#    OpenERP, Open Source Management Solution	
-#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
 #    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 General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#    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 time
-import netsvc
+__authors__ = [ 
+    "OpenERP S.A.",
+    "Borja López Soilán (Pexego) <[e-mail]>"
+]
+
 from osv import fields, osv
-import ir
+from tools import config
 
 class purchase_order(osv.osv):
+    """
+    Extends the purchase order to allow using "tax included" prices.
+    """
     _inherit = "purchase.order"
-    def _amount_tax(self, cr, uid, ids, field_name, arg, context):
+
+    def _amount_all(self, cr, uid, ids, field_name, arg, context):
+        """
+        Overwrites/extends the amounts calculation to allow tax included prices.
+        """
         res = {}
         cur_obj=self.pool.get('res.currency')
         for order in self.browse(cr, uid, ids):
-            val = 0.0
-            cur=order.pricelist_id.currency_id
-            for line in order.order_line:
-                if order.price_type=='tax_included':
-                    ttt = self.pool.get('account.tax').compute_inv(cr, uid, line.taxes_id, line.price_unit, line.product_qty, order.partner_address_id.id, line.product_id, order.partner_id)
-                else:
-                    ttt = self.pool.get('account.tax').compute(cr, uid, line.taxes_id, line.price_unit, line.product_qty, order.partner_address_id.id, line.product_id, order.partner_id)
-                for c in ttt:
-                    val += cur_obj.round(cr, uid, cur, c['amount'])
-            res[order.id]=cur_obj.round(cr, uid, cur, val)
+            if order.price_type == 'tax_included':
+                #
+                # Use the tax included calculation
+                #
+                res[order.id] = {
+                    'amount_untaxed': 0.0,
+                    'amount_tax': 0.0,
+                    'amount_total': 0.0,
+                }
+                val = val1 = 0.0
+                cur=order.pricelist_id.currency_id
+                for line in order.order_line:
+                    for c in self.pool.get('account.tax').compute_inv(cr, uid, line.taxes_id, line.price_unit, line.product_qty, order.partner_address_id.id, line.product_id, order.partner_id):
+                        val+= c['amount']
+                    val1 += line.price_subtotal
+                res[order.id]['amount_tax']=cur_obj.round(cr, uid, cur, val)
+                res[order.id]['amount_untaxed']=cur_obj.round(cr, uid, cur, val1)
+                res[order.id]['amount_total']=res[order.id]['amount_untaxed'] + res[order.id]['amount_tax']
+            else:
+                #
+                # Use the default calculation
+                #
+                res = super(purchase_order, self)._amount_all(cr, uid, ids, field_name, arg, context)
         return res
+
+
+    def _get_order(self, cr, uid, ids, context={}):
+        """
+        Returns the orders that must be updated when some order lines change.
+        """
+        result = {}
+        for line in self.pool.get('purchase.order.line').browse(cr, uid, ids, context=context):
+            result[line.order_id.id] = True
+        return result.keys()
+
     _columns = {
         'price_type': fields.selection([
             ('tax_included','Tax included'),
             ('tax_excluded','Tax excluded')
         ], 'Price method', required=True),
-        'amount_tax': fields.function(_amount_tax, method=True, string='Taxes'),
+        'amount_untaxed': fields.function(_amount_all, method=True, digits=(16, int(config['price_accuracy'])), string='Untaxed Amount',
+            store={
+                'purchase.order': (lambda self, cr, uid, ids, c={}: ids, ['price_type'], 20),
+                'purchase.order.line': (_get_order, None, 10),
+            }, multi="sums"),
+        'amount_tax': fields.function(_amount_all, method=True, digits=(16, int(config['price_accuracy'])), string='Taxes',
+            store={
+                'purchase.order': (lambda self, cr, uid, ids, c={}: ids, ['price_type'], 20),
+                'purchase.order.line': (_get_order, None, 10),
+            }, multi="sums"),
+        'amount_total': fields.function(_amount_all, method=True, digits=(16, int(config['price_accuracy'])), string='Total',
+            store={
+                'purchase.order': (lambda self, cr, uid, ids, c={}: ids, ['price_type'], 20),
+                'purchase.order.line': (_get_order, None, 10),
+            }, multi="sums"),
     }
+
     _defaults = {
         'price_type': lambda *a: 'tax_excluded',
     }
+
     def _inv_get(self, cr, uid, order, context={}):
+        """
+        Returns the columns as a dictionary.
+        """
         return {
             'price_type': order.price_type
         }
+
+
+    def action_invoice_create(self, cr, uid, ids, *args):
+        """
+        Extend the invoice creation action to set the price type if needed.
+        """
+        #
+        # Count how many orders have tax included prices.
+        #
+        tax_included_count = 0
+        orders = self.browse(cr, uid, ids)
+        for order in orders:
+            if order.price_type == 'tax_included':
+                tax_included_count += 1
+
+        if tax_included_count:
+            if len(orders) == tax_included_count:
+                #
+                # Every order has tax include prices, we must create the invoice
+                # and (afterwards) set the price type and recalculate.
+                #
+                invoice_id = super(purchase_order, self).action_invoice_create(cr, uid, ids, args)
+                self.pool.get('account.invoice').write(cr, uid, [invoice_id], { 'price_type': 'tax_included' })
+                self.pool.get('account.invoice').button_compute(cr, uid, [invoice_id], {'type': 'in_invoice'}, set_total=True)
+            else:
+                # We have no current way of creating an invoice mixing
+                # tax included and tax excluded prices, so we just fail:
+                raise osv.except_osv(_('Error!'), _("You can't mix tax included and tax excluded purchases in one invoice!"))
+        else:
+            # All the invoices are 'tax excluded', that's the default value
+            # so we just let the default method create the invoice.
+            invoice_id = super(purchase_order, self).action_invoice_create(cr, uid, ids, args)
+
+        return invoice_id
+
+
 purchase_order()
 
 class purchase_order_line(osv.osv):
+    """
+    Extends the purchase order lines to alter the calculation when
+    tax includes prices are used.
+    """
     _inherit = 'purchase.order.line'
+
     def _amount_line(self, cr, uid, ids, name, arg, context):
-        res = {}
-        cur_obj=self.pool.get('res.currency')
-        tax_obj = self.pool.get('account.tax')
-        res = super(purchase_order_line, self)._amount_line(cr, uid, ids, name, arg, context)
-        res2 = res.copy()
-        for line in self.browse(cr, uid, ids):
-            if line.order_id.price_type == 'tax_included':
-                if line.product_id:
-                    for tax in tax_obj.compute_inv(cr, uid, line.product_id.supplier_taxes_id, res[line.id]/line.product_qty, line.product_qty):
-                        res[line.id] = res[line.id] - tax['amount']
-                else:
-                    for tax in tax_obj.compute_inv(cr, uid, line.taxes_id, res[line.id]/line.product_qty, line.product_qty):
-                        res[line.id] = res[line.id] - tax['amount']
-            if name == 'price_subtotal_incl' and line.order_id.price_type == 'tax_included':
-                if line.product_id:
-                    prod_taxe_ids = [ t.id for t in line.product_id.supplier_taxes_id ]
-                    prod_taxe_ids.sort()
-                    line_taxe_ids = [ t.id for t in line.taxes_id ]
-                    line_taxe_ids.sort()
-                if line.product_id and prod_taxe_ids == line_taxe_ids:
-                    res[line.id] = res2[line.id]
-                elif not line.product_id:
-                    res[line.id] = res2[line.id]
-                else:
-                    for tax in tax_obj.compute(cr, uid, line.taxes_id, res[line.id]/line.product_qty, line.product_qty):
-                        res[line.id] = res[line.id] + tax['amount']
-            cur = line.order_id.pricelist_id.currency_id
-            res[line.id] = cur_obj.round(cr, uid, cur, res[line.id])
-        return res
+        """
+        Calculate the subtotal for the line without taxes.
+        """
+        # Use the original method to calculate the amounts:
+        res = super(purchase_order_line, self)._amount_line(cr, uid, ids, 'price_subtotal', arg, context)
+        # Check if we are using 'tax_included' prices:
+        if ids and self.browse(cr, uid, ids[0]).order_id.price_type == 'tax_included':
+            #
+            # Tax included => Remove the taxes from the line amounts.
+            #
+            cur_facade=self.pool.get('res.currency')
+            tax_facade = self.pool.get('account.tax')
+            for line in self.browse(cr, uid, ids):
+                for tax in tax_facade.compute_inv(cr, uid, line.taxes_id, res[line.id]/line.product_qty, line.product_qty):
+                    res[line.id] = res[line.id] - tax['amount']
+                cur = line.order_id.pricelist_id.currency_id
+                res[line.id] = cur_facade.round(cr, uid, cur, res[line.id])
+        return res
+    
+    def _amount_line_incl(self, cr, uid, ids, name, arg, context):
+        """
+        Calculate the subtotal for the line with taxes.
+        """
+        # Use the original method to calculate the amounts:
+        res = super(purchase_order_line, self)._amount_line(cr, uid, ids, 'price_subtotal', arg, context)
+        # Check if we *aren't* using 'tax_included' prices on the subtotal:
+        if ids and self.browse(cr, uid, ids[0]).order_id.price_type != 'tax_included':
+            #
+            # Tax excluded on the subtotal => Add taxes here from the line amounts.
+            #
+            cur_facade=self.pool.get('res.currency')
+            tax_facade = self.pool.get('account.tax')
+            for line in self.browse(cr, uid, ids):
+                for tax in tax_facade.compute(cr, uid, line.taxes_id, res[line.id]/line.product_qty, line.product_qty):
+                    res[line.id] = res[line.id] + tax['amount']
+                cur = line.order_id.pricelist_id.currency_id
+                res[line.id] = cur_facade.round(cr, uid, cur, res[line.id])
+        return res
+
+
     _columns = {
-        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal w/o tax'),
-        'price_subtotal_incl': fields.function(_amount_line, method=True, string='Subtotal'),
+        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal w/o tax', digits=(16, int(config['price_accuracy']))),
+        'price_subtotal_incl': fields.function(_amount_line_incl, method=True, string='Subtotal', digits=(16, int(config['price_accuracy']))),
     }
 purchase_order_line()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+class stock_picking(osv.osv):
+    """
+    Extends the stock pickings to manage the creation of invoices with
+    tax included prices when the original order had tax included prices.
+    """
+    _inherit = 'stock.picking'
+    _description = "Picking list"
+
+    def action_invoice_create(self, cr, uid, ids, journal_id=False,
+                                group=False, type='out_invoice', context=None):
+        """
+        Extend the invoice creation action to set the price type if needed.
+        """
+        #
+        # Count how many pickings have tax included prices.
+        #
+        tax_included_count = 0
+        lines_count = 0
+        pickings = self.browse(cr, uid, ids, context=context)
+        for picking in pickings:
+            #
+            # We must find the orders associated with this picking and check
+            # if they have tax included prices.
+            # As picking lines may come from different orders (even if it is
+            # not the usual), we must check it line by line.
+            #
+            for move in picking.move_lines:
+                if move.purchase_line_id and move.purchase_line_id.order_id:
+                    lines_count += 1
+                    if move.purchase_line_id.order_id.price_type == 'tax_included':
+                        tax_included_count += 1
+        
+        if tax_included_count:
+            if lines_count == tax_included_count:
+                #
+                # Every order has tax include prices, we must create the invoice
+                # and (afterwards) set the price type and recalculate.
+                #
+                invoices_map = super(stock_picking, self).action_invoice_create(cr,
+                                               uid, ids, journal_id=journal_id,
+                                               group=group, type=type,
+                                               context=context)
+                invoice_ids = list(set(invoices_map.values()))
+                self.pool.get('account.invoice').write(cr, uid, invoice_ids, { 'price_type': 'tax_included' })
+                self.pool.get('account.invoice').button_compute(cr, uid, invoice_ids, {'type': 'in_invoice'}, set_total=True)
+            else:
+                # We have no current way of creating an invoice mixing
+                # tax included and tax excluded prices, so we just fail:
+                raise osv.except_osv(_('Error!'), _("You can't mix tax included and tax excluded purchases in one invoice!"))
+        else:
+            # All the invoices are 'tax excluded', that's the default value
+            # so we just let the default method create the invoice.
+            invoices_map = super(stock_picking, self).action_invoice_create(cr,
+                                            uid, ids, journal_id=journal_id,
+                                            group=group, type=type,
+                                            context=context)
+        return invoices_map
+
+stock_picking()
 
 
=== modified file 'purchase_tax_include/purchase_tax_incl.xml'
--- purchase_tax_include/purchase_tax_incl.xml	2008-09-12 22:59:35 +0000
+++ purchase_tax_include/purchase_tax_incl.xml	2010-07-09 15:01:37 +0000
@@ -1,31 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data>
-
-	<record model="ir.ui.view" id="account_tax_view_price">
-		<field name="name">purchase.order.exlcuded.view.form</field>
-		<field name="type">form</field>
-		<field name="model">purchase.order</field>
-		<field name="inherit_id" ref="purchase.purchase_order_form" />
-		<field name="arch" type="xml">
-			<field name="origin" position="after">
-				<field name="price_type"/>
-			</field>
-		</field>
-	</record>
-
-	<record model="ir.ui.view" id="account_tax_view_price_subtotal_incl">
-		<field name="name">purchase.order.line.tree</field>
-		<field name="type">tree</field>
-		<field name="model">purchase.order.line</field>
-		<field name="inherit_id" ref="purchase.purchase_order_line_tree" />
-		<field name="arch" type="xml">
-			<field name="price_subtotal" position="after">
-				<field name="price_subtotal_incl"/>
-			</field>
-		</field>
-	</record>
-
-</data>
+    <data>
+
+        <record model="ir.ui.view" id="account_tax_view_price">
+            <field name="name">purchase.order.form.add_price_type</field>
+            <field name="type">form</field>
+            <field name="model">purchase.order</field>
+            <field name="inherit_id" ref="purchase.purchase_order_form" />
+            <field name="arch" type="xml">
+                <field name="shipped" position="after">
+                    <field name="price_type"/>
+                </field>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="account_tax_view_price_subtotal_incl">
+            <field name="name">purchase.order.line.tree.add_price_subtotal_incl</field>
+            <field name="type">tree</field>
+            <field name="model">purchase.order.line</field>
+            <field name="inherit_id" ref="purchase.purchase_order_line_tree" />
+            <field name="arch" type="xml">
+                <field name="price_subtotal" position="after">
+                    <field name="price_subtotal_incl"/>
+                </field>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="account_tax_view_price_subtotal_incl">
+            <field name="name">purchase.order.form.add_price_subtotal_incl_to_lines</field>
+            <field name="type">form</field>
+            <field name="model">purchase.order</field>
+            <field name="inherit_id" ref="purchase.purchase_order_form" />
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='order_line']/tree/field[@name='price_subtotal']" position="after">
+                    <field name="price_subtotal_incl"/>
+                </xpath>
+            </field>
+        </record>
+        
+    </data>
 </openerp>