Merge lp:~openbig/bigconsulting/onchange_to_cal_saleprice into lp:bigconsulting

[gpa(OpenERP)]

Added on change to calculate value ofsale price W/o taxes

=== modified file 'product_price_information/__terp__.py'
--- product_price_information/__terp__.py	2010-05-17 14:50:10 +0000
+++ product_price_information/__terp__.py	2010-05-20 07:24:29 +0000
@@ -29,7 +29,7 @@
     and product view called from sale order line. Shop Price will display product price
     based on pricelist defined in shop selected in sale order. 
         """,
-    "depends": ['sale'],
+    "depends": ['sale','product_tax_include','sale_tax_include'],
     "demo_xml": [],
     "update_xml": ['product_price_info_view.xml' ],
     "license": "GPL-3",
 
=== modified file 'product_price_information/product_price_info.py'
--- product_price_information/product_price_info.py	2010-05-17 14:50:10 +0000
+++ product_price_information/product_price_info.py	2010-05-20 07:24:29 +0000
@@ -56,25 +56,88 @@
 class sale_order_line(osv.osv):
     _inherit = "sale.order.line"
 
-    def _compute_shop_price(self, cr, uid, ids, name, arg, context=None):
-        if not context:
-            context = {}
-        res = {}
-        pricelist_obj = self.pool.get('product.pricelist')
-        for so_line in self.browse(cr, uid, ids):
-           sale_order_id = so_line.order_id
-           shop_id = sale_order_id.shop_id
-           if shop_id.pricelist_id:
-               pricelist_id  = shop_id.pricelist_id.id
-               price_unit = pricelist_obj.price_get(cr, uid, [pricelist_id], so_line.product_id.id, so_line.product_uom_qty or 1.0, sale_order_id.partner_id, {'uom': so_line.product_uom.id})[pricelist_id]
-           else:
-               pricelist_id = sale_order_id.pricelist_id.id
-               price_unit = pricelist_obj.price_get(cr, uid, [pricelist_id], so_line.product_id.id, so_line.product_uom_qty or 1.0, sale_order_id.partner_id, {'uom': so_line.product_uom.id})[pricelist_id]
-           res[so_line.id] = price_unit
+    _columns = {
+        'sale_price_unit_tax': fields.float('Sale price W/O taxes'),
+    }
+    
+    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):
+        
+        tax_obj = self.pool.get('account.tax')
+        
+        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)
+        if product:
+            context = {'lang': lang, 'partner_id': partner_id, 'qty': qty}
+            product_obj = self.pool.get('product.product').browse(cr, uid, product, context=context)
+            result['value']['sale_price_unit_tax'] = product_obj.product_tmpl_id.price_unit_tax
+
+        return result
+    
+sale_order_line()
+
+class sale_order(osv.osv):
+    _name = "sale.order"
+    _inherit = "sale.order"
+    
+    def onchange_shop_id(self, cr, uid, ids, shop_id):
+        res = super(sale_order, self).onchange_shop_id(cr, uid, id, shop_id)
+        if 'value' in res and shop_id:
+            res['value']['price_type'] = self.pool.get('sale.shop').browse(cr, uid , shop_id).price_type
         return res
-
-    _columns = {
-        'shop_price': fields.function(_compute_shop_price, method=True, type='float', string='Shop Price', digits=(16, int(config['price_accuracy']))),
-    }
-
-sale_order_line()
 \ No newline at end of file
+    
+sale_order()
+
+
+class sale_shop(osv.osv):
+    _name = 'sale.shop'
+    _inherit = 'sale.shop'
+    _columns = {
+          'price_type': fields.selection([
+            ('tax_included','Tax included'),
+            ('tax_excluded','Tax excluded')
+        ], 'Price method', required=True),
+    }
+    _defaults = {
+        'price_type': lambda *a: 'tax_included',
+    }
+
+sale_shop()
+
+class sale_shop_price_method_policy(osv.osv_memory):
+    _name = 'sale.shop.price.method'
+    _columns = {
+        'name': fields.char('Name', size=64),
+        'price_type': fields.selection([
+            ('tax_included','Tax included'),
+            ('tax_excluded','Tax excluded')
+        ], 'Price method', required=True),
+    }
+    _defaults = {
+        'price_type': lambda *a: 'tax_included',
+    }
+    
+    def set_default(self, cr, uid, ids, context=None):
+        for o in self.browse(cr, uid, ids, context=context):
+            ir_values_obj = self.pool.get('ir.values')
+            print "o.price_type",o.price_type
+            ir_values_obj.set(cr, uid, 'default', False, 'price_type', ['sale.shop'], o.price_type)
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'ir.actions.configuration.wizard',
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+         } 
+        
+    def action_cancel(self,cr,uid,ids,conect=None):
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'ir.actions.configuration.wizard',
+                'type': 'ir.actions.act_window',
+                'target':'new',
+        }
+        
+sale_shop_price_method_policy()
 \ No newline at end of file
 
=== modified file 'product_price_information/product_price_info_view.xml'
--- product_price_information/product_price_info_view.xml	2010-05-17 14:50:10 +0000
+++ product_price_information/product_price_info_view.xml	2010-05-20 07:24:29 +0000
@@ -43,7 +43,8 @@
             	</xpath>
             </field> 	
         </record>
-     
+        
+        
 <!-- Adding shop price field on sale order line form below Unit Price -->
 
      	<record model="ir.ui.view" id="view_sale_order_line_tree_direct_delivery">
@@ -53,10 +54,64 @@
 			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<xpath expr="//field[@name='discount']" position="after">
-					<field name="shop_price"/>
+					<field name="sale_price_unit_tax"/>
 				</xpath>
 			</field>
 		</record>
+		
+		<record model="ir.ui.view" id="product_tax_include_tree">
+            <field name="name">product.tax.include.tree</field>
+            <field name="model">product.product</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="product.product_product_tree_view"/>
+            <field name="arch" type="xml">
+                <field name="lst_price" position="before">
+                    <field name="price_unit_tax"/>
+                </field>
+            </field>
+        </record>
+        
+        <record id="view_partner_property_form" model="ir.ui.view">
+            <field name="name">sale.shop.property.form.inherit</field>
+            <field name="model">sale.shop</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="sale.view_shop_form"/>
+            <field name="arch" type="xml">
+            <field name="project_id" position="after">
+                    <field name="price_type"/>
+                </field>
+            </field>
+        </record>
+        
+        <record id="view_config_price_policy" model="ir.ui.view">
+            <field name="name">Price Method for Sale Order Shop</field>
+            <field name="model">sale.shop.price.method</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Shop Configuration">
+                    <field name="price_type"/>
+                    <newline/>
+                    <group col="4" colspan="4">
+                        <button icon="gtk-cancel" name="action_cancel" type="object" special="cancel" string="Cancel"/>
+                        <button icon="gtk-ok" name="set_default" string="Set Default" type="object"/>
+                    </group>
+                </form>
+            </field>
+       </record>
+       
+       <record id="action_config_price_policy" model="ir.actions.act_window">
+            <field name="name">Price Method for Sale Order Shop</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.shop.price.method</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+       </record>
+       
+       <record id="config_wizard_step_shop_price_policy" model="ir.actions.todo">
+            <field name="name">Shop Price</field>
+            <field name="action_id" ref="action_config_price_policy"/>
+       </record>
    				
 	</data>
 </openerp>
 
=== added file 'product_tax_include/.license'
--- product_tax_include/.license	1970-01-01 00:00:00 +0000
+++ product_tax_include/.license	2010-05-20 07:24:29 +0000
@@ -0,0 +1,21 @@
+##############################################################################
+#
+#    product_tax_include module for OpenERP, Add new field for tax include in product
+#    Copyright (C) 2009 SYLEAM Info Services (<http://www.Syleam.fr/>) Sebastien LANGE
+#
+#    This file is a part of product_tax_include
+#
+#    product_tax_include 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.
+#
+#    product_tax_include 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.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
 
=== modified file 'product_tax_include/__init__.py' (properties changed: +x to -x)
--- product_tax_include/__init__.py	2010-05-19 08:34:42 +0000
+++ product_tax_include/__init__.py	2010-05-20 07:24:29 +0000
@@ -1,1 +1,28 @@
-import product
 \ No newline at end of file
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    product_tax_include module for OpenERP, Add new field for tax include in product
+#    Copyright (C) 2009 SYLEAM Info Services (<http://www.Syleam.fr/>) Sebastien LANGE
+#
+#    This file is a part of product_tax_include
+#
+#    product_tax_include 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.
+#
+#    product_tax_include 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.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import object
+import report
+import wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 \ No newline at end of file
 
=== modified file 'product_tax_include/__terp__.py' (properties changed: +x to -x)
--- product_tax_include/__terp__.py	2010-05-19 08:34:42 +0000
+++ product_tax_include/__terp__.py	2010-05-20 07:24:29 +0000
@@ -1,16 +1,17 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution    
-#    Copyright (C) 2009 Smile.fr. All Rights Reserved
-#    author: Raphaël Valyi, Amadou Diallo
-#
-#    This program is free software: you can redistribute it and/or modify
+#    product_tax_include module for OpenERP, Add new field for tax include in product
+#    Copyright (C) 2009 SYLEAM Info Services (<http://www.Syleam.fr/>) Sebastien LANGE
+#
+#    This file is a part of product_tax_include
+#
+#    product_tax_include 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.
 #
-#    This program is distributed in the hope that it will be useful,
+#    product_tax_include 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.
@@ -19,22 +20,32 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 {
-    "name" : "Product Tax Include",
-    "description":"""Product Tax Include
-Allows to compute the base sale untaxed amount given a taxed amount entry (change the list_price on on_change)
-and reciprocally.
-    """,
-    "version" : "0.1",
-    "author" : "Smile.fr",
-    "category" : "Custom",
-    "depends" : ["product", "account"],
-    "init_xml" : [],
-    "demo_xml" : [],
-    "update_xml" : ["product_view.xml"],
-    "active": False,
-    "installable": True
+    'name': 'Product Tax Include',
+    'version': '0.0.1',
+    'category': 'Generic Modules/Inventory Control',
+    'description': """Add new field for tax include in product
+
+ OpenERP version : 5.0
+ Creation : 2009-12-05
+ Last update : 2009-12-05
+""",
+    'author': 'SYLEAM Info Services',
+    'depends': [
+                "base",
+                "product",
+                "account_tax_include",
+    ],
+    'init_xml': [],
+    'update_xml': [
+        "view/company.xml",
+        "view/product.xml",
+        ],
+    'demo_xml': [],
+    'installable': True,
+    'active': False,
+    'license': 'GPL-3',
 }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
-#,"product_variant_configurator_wizard.xml"
 \ No newline at end of file
 
=== added directory 'product_tax_include/i18n'
=== added file 'product_tax_include/i18n/ca.po'
--- product_tax_include/i18n/ca.po	1970-01-01 00:00:00 +0000
+++ product_tax_include/i18n/ca.po	2010-05-20 07:24:29 +0000
@@ -0,0 +1,78 @@
+# Catalan translation for openobject-addons
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-12-05 14:38+0000\n"
+"PO-Revision-Date: 2009-12-07 06:02+0000\n"
+"Last-Translator: Jordi Esteve - http://www.zikzakmedia.com "
+"<[e-mail]>\n"
+"Language-Team: Catalan <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-04-09 04:01+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: product_tax_include
+#: model:ir.module.module,shortdesc:product_tax_include.module_meta_information
+msgid "Product Tax Include"
+msgstr "Productes amb impostos inclosos"
+
+#. module: product_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invàlid per a la definició de la vista!"
+
+#. module: product_tax_include
+#: help:product.template,price_unit_tax:0
+msgid ""
+"Price calculated with taxes included or excluded, depend of the "
+"configuration in company configuration"
+msgstr ""
+"Preu calculat amb impostos inclosos o exclosos, depenent de la configuració "
+"de la companyia."
+
+#. module: product_tax_include
+#: view:res.company:0
+msgid "Product"
+msgstr "Producte"
+
+#. module: product_tax_include
+#: field:product.template,price_unit_tax:0
+msgid "Sale price with taxes included or excluded"
+msgstr "Preu de venda amb impostos inclosos o exclosos"
+
+#. module: product_tax_include
+#: field:res.company,product_prices_tax_include:0
+msgid "Prices tax included"
+msgstr "Preus impostos inclosos"
+
+#. module: product_tax_include
+#: help:res.company,product_prices_tax_include:0
+msgid "Product prices have tax included."
+msgstr "Els preus del producte tenen els impostos inclosos."
+
+#. module: product_tax_include
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuració"
+
+#. module: product_tax_include
+#: model:ir.module.module,description:product_tax_include.module_meta_information
+msgid ""
+"Add new field for tax include in product\n"
+"\n"
+" OpenERP version : 5.0\n"
+" Creation : 2009-12-05\n"
+" Last update : 2009-12-05\n"
+msgstr ""
+"Afegeix un nou camp per als impostos inclosos en els preus del producte\n"
+"\n"
+" OpenERP versió : 5.0\n"
+" Creació : 05-12-2009\n"
+" Última actualització : 05-12-2009\n"
 
=== added file 'product_tax_include/i18n/es.po'
--- product_tax_include/i18n/es.po	1970-01-01 00:00:00 +0000
+++ product_tax_include/i18n/es.po	2010-05-20 07:24:29 +0000
@@ -0,0 +1,79 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-12-05 14:38+0000\n"
+"PO-Revision-Date: 2009-12-06 06:03+0000\n"
+"Last-Translator: Jordi Esteve - http://www.zikzakmedia.com "
+"<[e-mail]>\n"
+"Language-Team: Spanish <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-04-09 04:01+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: product_tax_include
+#: model:ir.module.module,shortdesc:product_tax_include.module_meta_information
+msgid "Product Tax Include"
+msgstr "Productos con impuestos incluidos"
+
+#. module: product_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: product_tax_include
+#: help:product.template,price_unit_tax:0
+msgid ""
+"Price calculated with taxes included or excluded, depend of the "
+"configuration in company configuration"
+msgstr ""
+"Precio calculado con impuestos incluidos o excluidos, dependiendo de la "
+"configuración de la compañía."
+
+#. module: product_tax_include
+#: view:res.company:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: product_tax_include
+#: field:product.template,price_unit_tax:0
+msgid "Sale price with taxes included or excluded"
+msgstr "Precio de venta con impuestos incluidos o excluidos"
+
+#. module: product_tax_include
+#: field:res.company,product_prices_tax_include:0
+msgid "Prices tax included"
+msgstr "Precios impuestos incluidos"
+
+#. module: product_tax_include
+#: help:res.company,product_prices_tax_include:0
+msgid "Product prices have tax included."
+msgstr "Los precios del producto tienen los impuestos incluidos."
+
+#. module: product_tax_include
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: product_tax_include
+#: model:ir.module.module,description:product_tax_include.module_meta_information
+msgid ""
+"Add new field for tax include in product\n"
+"\n"
+" OpenERP version : 5.0\n"
+" Creation : 2009-12-05\n"
+" Last update : 2009-12-05\n"
+msgstr ""
+"Añade un nuevo campo para los impuestos incluidos en los precios del "
+"producto\n"
+"\n"
+" OpenERP versión : 5.0\n"
+" Creación : 05-12-2009\n"
+" Última actualización : 05-12-2009\n"
 
=== added file 'product_tax_include/i18n/fr.po'
--- product_tax_include/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ product_tax_include/i18n/fr.po	2010-05-20 07:24:29 +0000
@@ -0,0 +1,71 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* product_tax_include
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2009-12-05 14:38+0000\n"
+"PO-Revision-Date: 2009-12-05 16:27+0000\n"
+"Last-Translator: Sebastien LANGE - http://www.Syleam.fr <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-04-09 04:01+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: product_tax_include
+#: model:ir.module.module,shortdesc:product_tax_include.module_meta_information
+msgid "Product Tax Include"
+msgstr ""
+
+#. module: product_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Formulaire XML invalide pour ce type de vue"
+
+#. module: product_tax_include
+#: help:product.template,price_unit_tax:0
+msgid ""
+"Price calculated with taxes included or excluded, depend of the "
+"configuration in company configuration"
+msgstr ""
+"Prix calculé avec taxes incluses ou excluses, dépend du paramétrage dans la "
+"société"
+
+#. module: product_tax_include
+#: view:res.company:0
+msgid "Product"
+msgstr "Produit"
+
+#. module: product_tax_include
+#: field:product.template,price_unit_tax:0
+msgid "Sale price with taxes included or excluded"
+msgstr "Prix de vente avec taxes incluses ou excluses"
+
+#. module: product_tax_include
+#: field:res.company,product_prices_tax_include:0
+msgid "Prices tax included"
+msgstr "Taxes incluses dans le prix"
+
+#. module: product_tax_include
+#: help:res.company,product_prices_tax_include:0
+msgid "Product prices have tax included."
+msgstr "Taxes incluses dans le prix du produit"
+
+#. module: product_tax_include
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuration"
+
+#. module: product_tax_include
+#: model:ir.module.module,description:product_tax_include.module_meta_information
+msgid ""
+"Add new field for tax include in product\n"
+"\n"
+" OpenERP version : 5.0\n"
+" Creation : 2009-12-05\n"
+" Last update : 2009-12-05\n"
+msgstr ""
 
=== added file 'product_tax_include/i18n/fr_FR.po'
--- product_tax_include/i18n/fr_FR.po	1970-01-01 00:00:00 +0000
+++ product_tax_include/i18n/fr_FR.po	2010-05-20 07:24:29 +0000
@@ -0,0 +1,66 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* product_tax_include
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2009-12-05 14:39:03+0000\n"
+"PO-Revision-Date: 2009-12-05 14:39:03+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: product_tax_include
+#: model:ir.module.module,shortdesc:product_tax_include.module_meta_information
+msgid "Product Tax Include"
+msgstr ""
+
+#. module: product_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Formulaire XML invalide pour ce type de vue"
+
+#. module: product_tax_include
+#: help:product.template,price_unit_tax:0
+msgid "Price calculated with taxes included or excluded, depend of the configuration in company configuration"
+msgstr "Prix calculé avec taxes incluses ou excluses, dépend du paramétrage dans la société"
+
+#. module: product_tax_include
+#: view:res.company:0
+msgid "Product"
+msgstr "Produit"
+
+#. module: product_tax_include
+#: field:product.template,price_unit_tax:0
+msgid "Sale price with taxes included or excluded"
+msgstr "Prix de vente avec taxes incluses ou excluses"
+
+#. module: product_tax_include
+#: field:res.company,product_prices_tax_include:0
+msgid "Prices tax included"
+msgstr "Taxes incluses dans le prix"
+
+#. module: product_tax_include
+#: help:res.company,product_prices_tax_include:0
+msgid "Product prices have tax included."
+msgstr "Taxes incluses dans le prix du produit"
+
+#. module: product_tax_include
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuration"
+
+#. module: product_tax_include
+#: model:ir.module.module,description:product_tax_include.module_meta_information
+msgid "Add new field for tax include in product\n"
+"\n"
+" OpenERP version : 5.0\n"
+" Creation : 2009-12-05\n"
+" Last update : 2009-12-05\n"
+""
+msgstr ""
 
=== added file 'product_tax_include/i18n/product_tax_include.pot'
--- product_tax_include/i18n/product_tax_include.pot	1970-01-01 00:00:00 +0000
+++ product_tax_include/i18n/product_tax_include.pot	2010-05-20 07:24:29 +0000
@@ -0,0 +1,67 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* product_tax_include
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2009-12-05 14:38:47+0000\n"
+"PO-Revision-Date: 2009-12-05 14:38:47+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: product_tax_include
+#: model:ir.module.module,shortdesc:product_tax_include.module_meta_information
+msgid "Product Tax Include"
+msgstr ""
+
+#. module: product_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: product_tax_include
+#: help:product.template,price_unit_tax:0
+msgid "Price calculated with taxes included or excluded, depend of the configuration in company configuration"
+msgstr ""
+
+#. module: product_tax_include
+#: view:res.company:0
+msgid "Product"
+msgstr ""
+
+#. module: product_tax_include
+#: field:product.template,price_unit_tax:0
+msgid "Sale price with taxes included or excluded"
+msgstr ""
+
+#. module: product_tax_include
+#: field:res.company,product_prices_tax_include:0
+msgid "Prices tax included"
+msgstr ""
+
+#. module: product_tax_include
+#: help:res.company,product_prices_tax_include:0
+msgid "Product prices have tax included."
+msgstr ""
+
+#. module: product_tax_include
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: product_tax_include
+#: model:ir.module.module,description:product_tax_include.module_meta_information
+msgid "Add new field for tax include in product\n"
+"\n"
+" OpenERP version : 5.0\n"
+" Creation : 2009-12-05\n"
+" Last update : 2009-12-05\n"
+""
+msgstr ""
+
 
=== added file 'product_tax_include/i18n/pt.po'
--- product_tax_include/i18n/pt.po	1970-01-01 00:00:00 +0000
+++ product_tax_include/i18n/pt.po	2010-05-20 07:24:29 +0000
@@ -0,0 +1,77 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-12-05 14:38+0000\n"
+"PO-Revision-Date: 2009-12-10 06:00+0000\n"
+"Last-Translator: Fabien (Open ERP) <[e-mail]>\n"
+"Language-Team: Portuguese <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-04-09 04:01+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: product_tax_include
+#: model:ir.module.module,shortdesc:product_tax_include.module_meta_information
+msgid "Product Tax Include"
+msgstr "Artigos Imposto incluido"
+
+#. module: product_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML inválido para a arquitectura da vista"
+
+#. module: product_tax_include
+#: help:product.template,price_unit_tax:0
+msgid ""
+"Price calculated with taxes included or excluded, depend of the "
+"configuration in company configuration"
+msgstr ""
+"Preço calculado com impostos incluídos ou excluídos, dependendo da "
+"configuração da companhia."
+
+#. module: product_tax_include
+#: view:res.company:0
+msgid "Product"
+msgstr "Artigo"
+
+#. module: product_tax_include
+#: field:product.template,price_unit_tax:0
+msgid "Sale price with taxes included or excluded"
+msgstr "Preço de venda com impostos incluídos ou excluídos"
+
+#. module: product_tax_include
+#: field:res.company,product_prices_tax_include:0
+msgid "Prices tax included"
+msgstr "Preço com impostos incluídos"
+
+#. module: product_tax_include
+#: help:res.company,product_prices_tax_include:0
+msgid "Product prices have tax included."
+msgstr "Os preços dos artigos têm imposto incluído."
+
+#. module: product_tax_include
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuração"
+
+#. module: product_tax_include
+#: model:ir.module.module,description:product_tax_include.module_meta_information
+msgid ""
+"Add new field for tax include in product\n"
+"\n"
+" OpenERP version : 5.0\n"
+" Creation : 2009-12-05\n"
+" Last update : 2009-12-05\n"
+msgstr ""
+"Adiciona um novo campoem artigos para impostos incluídos\n"
+"\n"
+" OpenERP versão : 5.0\n"
+" Criação : 2009-12-05\n"
+" Última actualização : 2009-12-05\n"
 
=== added directory 'product_tax_include/object'
=== added file 'product_tax_include/object/__init__.py'
--- product_tax_include/object/__init__.py	1970-01-01 00:00:00 +0000
+++ product_tax_include/object/__init__.py	2010-05-20 07:24:29 +0000
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    product_tax_include module for OpenERP, Add new field for tax include in product
+#    Copyright (C) 2009 SYLEAM Info Services (<http://www.Syleam.fr/>) Sebastien LANGE
+#
+#    This file is a part of product_tax_include
+#
+#    product_tax_include 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.
+#
+#    product_tax_include 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.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import product
+import company
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'product_tax_include/object/company.py'
--- product_tax_include/object/company.py	1970-01-01 00:00:00 +0000
+++ product_tax_include/object/company.py	2010-05-20 07:24:29 +0000
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    product_tax_include module for OpenERP, Add new field for tax include in product
+#    Copyright (C) 2009 SYLEAM Info Services (<http://www.Syleam.fr/>) Sebastien LANGE
+#
+#    This file is a part of product_tax_include
+#
+#    product_tax_include 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.
+#
+#    product_tax_include 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.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+from osv import osv
+from osv import fields
+
+class company(osv.osv):
+    _inherit = 'res.company'
+    _columns = {
+        'product_prices_tax_include': fields.boolean('Prices tax included',
+            help="Product prices have tax included."),
+    }
+    _defaults = {
+        'product_prices_tax_include': lambda *a: True,
+    }
+
+company()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'product_tax_include/object/product.py'
--- product_tax_include/object/product.py	1970-01-01 00:00:00 +0000
+++ product_tax_include/object/product.py	2010-05-20 07:24:29 +0000
@@ -0,0 +1,74 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    product_tax_include module for OpenERP, Add new field for tax include in product
+#    Copyright (C) 2009 SYLEAM Info Services (<http://www.Syleam.fr/>) Sebastien LANGE
+#
+#    This file is a part of product_tax_include
+#
+#    product_tax_include 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.
+#
+#    product_tax_include 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.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields
+from osv import osv
+from tools import config
+
+from tools.translate import _
+
+class product_template(osv.osv):
+    _inherit = 'product.template'
+
+    def _price_unit_tax(self, cr, uid, ids, field_name, arg, context=None):
+        """This method calcul the sale price with/without taxes included depending on company configuration"""
+        if not context: context = {}
+        res = {}
+        tax_obj = self.pool.get('account.tax')
+        users_obj = self.pool.get('res.users')
+        user = users_obj.browse(cr, uid, uid, context)
+        prices_tax_include = user.company_id.product_prices_tax_include
+        cur_obj = self.pool.get('res.currency')
+        cur = user.company_id.partner_id.property_product_pricelist.currency_id
+
+        for product in self.browse(cr, uid, ids):
+            val = 0.0
+            if prices_tax_include:
+                val = reduce(lambda x, y: x+cur_obj.round(cr, uid, cur, y['amount']),
+                    tax_obj.compute_inv(cr, uid, product.taxes_id,
+                        product.list_price, 1),
+                        val)
+                res[product.id] = cur_obj.round(cr, uid, cur, (product.list_price - val))
+            else:
+                val = reduce(lambda x, y: x+cur_obj.round(cr, uid, cur, y['amount']),
+                    tax_obj.compute(cr, uid, product.taxes_id,
+                        product.list_price, 1),
+                        val)
+                res[product.id] = cur_obj.round(cr, uid, cur, (product.list_price + val))
+        return res
+
+    _columns = {
+            'price_unit_tax' : fields.function(_price_unit_tax,
+                                method=True,
+                                string='price inc./exc. tax',
+                                store=False,
+                                type='float',
+                                digits=(16, int(config['price_accuracy'])),
+                                help="Price calculated with taxes included or excluded, depend of the configuration in company configuration"),
+    }
+
+product_template()
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== removed file 'product_tax_include/product.py'
--- product_tax_include/product.py	2010-05-19 08:34:42 +0000
+++ product_tax_include/product.py	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution    
-#    Copyright (C) 2004-2009 Smile.fr . All Rights Reserved
-#    @author Raphaël Valyi, Amadou Diallo
-#
-#    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.
-#
-#    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.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields,osv
-
-class product_product(osv.osv):
-    _inherit = "product.product"
-    
-    def list_price_change(self, cr, uid, ids, list_price=False, sale_tax_ids=False):
-        res = {}
-        if sale_tax_ids:
-            sale_tax_ids = sale_tax_ids[0][2] #unwrapp the tax ids
-            price = list_price
-            product_taxes = self.pool.get('account.tax').browse(cr, uid, sale_tax_ids, {})
-            for tax in self.pool.get('account.tax').compute(cr, uid, product_taxes, list_price, 1):
-                price += tax['amount']
-            res = {'value':{'list_price_tax_incl':price}}
-        return res
-    
-    def list_price_tax_incl_change(self, cr, uid, ids, list_price_tax_incl=False, sale_tax_ids=False):
-        res = {}
-        if sale_tax_ids:
-            sale_tax_ids = sale_tax_ids[0][2] #unwrapp the tax ids
-            price = list_price_tax_incl
-            product_taxes = self.pool.get('account.tax').browse(cr, uid, sale_tax_ids, {})
-            for tax in self.pool.get('account.tax').compute_inv(cr, uid, product_taxes, list_price_tax_incl, 1):
-                price -= tax['amount']
-            res = {'value':{'list_price':price}}
-        return res
-    
-    
-    _columns = {
-        'list_price_tax_incl': fields.float('Price Taxes Included'),
-    }
-product_product()
 \ No newline at end of file
 
=== removed file 'product_tax_include/product_view.xml'
--- product_tax_include/product_view.xml	2010-05-19 08:34:42 +0000
+++ product_tax_include/product_view.xml	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="view_normal_product_tax_incl_form" model="ir.ui.view">
-            <field name="name">view_normal_product_tax_incl_form</field>
-            <field name="model">product.product</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
-            <field name="arch" type="xml">
-                <field name="list_price" position="replace">
-                		<field name="list_price" on_change="list_price_change(list_price, taxes_id)"/>
-                		<field name="list_price_tax_incl" on_change="list_price_tax_incl_change(list_price_tax_incl, taxes_id)"/>
-                </field>
-            </field>
-        </record>
-        
-        <record id="view_normal__product_tax_incl_tree" model="ir.ui.view">
-            <field name="name">view_normal__product_tax_incl_tree</field>
-            <field name="model">product.product</field>
-            <field name="type">tree</field>
-            <field name="inherit_id" ref="product.product_product_tree_view"/>
-            <field name="arch" type="xml">
-                <field name="standard_price" position="before">
-                		<field name="list_price_tax_incl" />
-                </field>
-            </field>
-        </record>
-        
-     </data>
-</openerp>
 \ No newline at end of file
 
=== added directory 'product_tax_include/view'
=== added file 'product_tax_include/view/company.xml'
--- product_tax_include/view/company.xml	1970-01-01 00:00:00 +0000
+++ product_tax_include/view/company.xml	2010-05-20 07:24:29 +0000
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        ##############################################################################
+        #
+        #    product_tax_include module for OpenERP, Add new field for tax include in product
+        #    Copyright (C) 2009 SYLEAM Info Services ([http://www.Syleam.fr/]) Sebastien LANGE
+        #
+        #    This file is a part of product_tax_include
+        #
+        #    product_tax_include 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.
+        #
+        #    product_tax_include 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.
+        #
+        #    You should have received a copy of the GNU General Public License
+        #    along with this program.  If not, see [http://www.gnu.org/licenses/].
+        #
+        ##############################################################################
+
+        <record id="product_company" model="ir.ui.view">
+            <field name="name">res.company.product.config</field>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="arch" type="xml">
+                <page string="Configuration" position="inside">
+                    <separator string="Product" colspan="4"/>
+                    <field name="product_prices_tax_include"/>
+                    <newline/>
+                </page>
+            </field>
+        </record>
+
+    </data>
+</openerp>
 
=== added file 'product_tax_include/view/product.xml'
--- product_tax_include/view/product.xml	1970-01-01 00:00:00 +0000
+++ product_tax_include/view/product.xml	2010-05-20 07:24:29 +0000
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        ##############################################################################
+        #
+        #    product_tax_include module for OpenERP, Add new field for tax include in product
+        #    Copyright (C) 2009 SYLEAM Info Services ([http://www.Syleam.fr/]) Sebastien LANGE
+        #
+        #    This file is a part of product_tax_include
+        #
+        #    product_tax_include 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.
+        #
+        #    product_tax_include 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.
+        #
+        #    You should have received a copy of the GNU General Public License
+        #    along with this program.  If not, see [http://www.gnu.org/licenses/].
+        #
+        ##############################################################################
+
+        <record model="ir.ui.view" id="product_tax_include_form">
+            <field name="name">product.tax.include</field>
+            <field name="model">product.product</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <field name="price_margin" position="after">
+                    <field name="price_unit_tax"/>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>