From a08e3b5b10102adb3c8692a5870352c3bcaa2494 Mon Sep 17 00:00:00 2001
From: "Alexandre Fayolle @ camptocamp" <alexandre.fayolle@camptocamp.com>
Date: Tue, 15 May 2012 14:42:21 +0200
Subject: [PATCH] [IMP] product_cost_incl_bom, product_get_cost_field,
 sale_markup: extracted code to new modules

          extracted the bits about the computation of product cost with BoM from sale_markup to product_cost_incl_bom
(lp:c2c-addons/6.1  rev 40.1.13)
---
 product_cost_incl_bom/__openerp__.py          |   7 +-
 .../product_cost_incl_bom.py                  |  91 ++++----
 product_get_cost_field/__init__.py            |   2 +-
 product_get_cost_field/__openerp__.py         |  18 +-
 .../product_get_cost_field.py                 |  21 +-
 product_get_cost_field/product_view.xml       |  10 +-
 product_historical_margin/__init__.py         |  24 ---
 product_historical_margin/__openerp__.py      |  65 ------
 .../account_invoice_view.xml                  |  81 -------
 product_historical_margin/invoice.py          | 204 ------------------
 .../product_historical_margin.py              | 114 ----------
 product_historical_margin/product_view.xml    |  51 -----
 product_historical_margin/wizard/__init__.py  |  22 --
 .../wizard/historical_margin.py               |  90 --------
 .../wizard/historical_margin_view.xml         |  50 -----
 product_historical_margin_report/__init__.py  |  22 --
 .../__openerp__.py                            |  42 ----
 .../product_historical_margin_report.py       | 169 ---------------
 .../product_historical_margin_report_view.xml |  48 -----
 product_standard_margin/__init__.py           |  22 --
 product_standard_margin/__openerp__.py        |  58 -----
 product_standard_margin/product_std_margin.py | 106 ---------
 .../product_std_margin_view.xml               |  21 --
 23 files changed, 75 insertions(+), 1263 deletions(-)
 delete mode 100644 product_historical_margin/__init__.py
 delete mode 100644 product_historical_margin/__openerp__.py
 delete mode 100644 product_historical_margin/account_invoice_view.xml
 delete mode 100644 product_historical_margin/invoice.py
 delete mode 100644 product_historical_margin/product_historical_margin.py
 delete mode 100644 product_historical_margin/product_view.xml
 delete mode 100644 product_historical_margin/wizard/__init__.py
 delete mode 100644 product_historical_margin/wizard/historical_margin.py
 delete mode 100644 product_historical_margin/wizard/historical_margin_view.xml
 delete mode 100644 product_historical_margin_report/__init__.py
 delete mode 100644 product_historical_margin_report/__openerp__.py
 delete mode 100644 product_historical_margin_report/product_historical_margin_report.py
 delete mode 100644 product_historical_margin_report/product_historical_margin_report_view.xml
 delete mode 100644 product_standard_margin/__init__.py
 delete mode 100644 product_standard_margin/__openerp__.py
 delete mode 100644 product_standard_margin/product_std_margin.py
 delete mode 100644 product_standard_margin/product_std_margin_view.xml

diff --git a/product_cost_incl_bom/__openerp__.py b/product_cost_incl_bom/__openerp__.py
index 135eef3c..19f2840a 100644
--- a/product_cost_incl_bom/__openerp__.py
+++ b/product_cost_incl_bom/__openerp__.py
@@ -22,14 +22,11 @@
  'version' : '0.1',
  'author' : 'Camptocamp',
  'maintainer': 'Camptocamp',
- 'category': 'Products',
+ 'category': 'Hidden',
  'complexity': "normal",  # easy, normal, expert
  'depends' : ['product_get_cost_field', 
               'mrp'],
- 'description': """
-  Compute product cost price by recursively summing parts cost prices according to product BOM. It takes into
-  account the BoM costing (cost per cycle and so...). If no BOM define for a product, the cost_price is always
-  equal to the standard_price field of the product, so we always have a value to base our reporting on.
+ 'description': """Compute product base price by recursively summing parts base prices according to product BOM
 """,
  'website': 'http://www.camptocamp.com/',
  'init_xml': [],
diff --git a/product_cost_incl_bom/product_cost_incl_bom.py b/product_cost_incl_bom/product_cost_incl_bom.py
index 0767f1f2..db72ec3b 100644
--- a/product_cost_incl_bom/product_cost_incl_bom.py
+++ b/product_cost_incl_bom/product_cost_incl_bom.py
@@ -26,15 +26,25 @@
 class Product(Model):
     _inherit = 'product.product'
 
+    ## def get_cost_field(self):
+    ##     """overriden from product_get_cost_field"""
+    ##     return self.standard_price # XXX or a string?
+
+
+
     def _compute_purchase_price(self, cursor, user, ids,
+                                pricelist=None,
                                 product_uom=None,
-                                bom_properties=None,
-                                context=None):
+                                bom_properties=None):
         '''
-        Compute the purchase price, taking into account sub products and routing
+        Compute the purchase price
+
+        As it explodes the sub product on 1 level
+
+        This is not implemented for BoM having sub BoM producing more than 1
+        product qty.
+        Rewrite _compute_purchase_price and remove mrp constraint to fix this.
         '''
-        if context is None:
-            context = {}
         if bom_properties is None:
             bom_properties =  []
         bom_obj = self.pool.get('mrp.bom')
@@ -48,51 +58,52 @@ def _compute_purchase_price(self, cursor, user, ids,
             # Workaround for first loading in V5 as some columns are not created
             #if not hasattr(pr, 'standard_price'): return False
             bom_id = bom_obj._bom_find(cursor, user, pr.id, product_uom=None, properties=bom_properties)
-            if not bom_id: # no BoM: use standard_price
+
+            if bom_id:
+                bom = bom_obj.browse(cursor, user, bom_id)
+
+                sub_products, routes = bom_obj._bom_explode(cursor, user, bom,
+                                                            factor=1,
+                                                            properties=bom_properties,
+                                                            addthis=True)
+
+                res[pr.id] = 0.0
+                for sub_prod_dict in sub_products:
+                    sub_product = self.browse(cursor, user, sub_product_dict['product_id'])
+                    std_price = sub_product.standard_price
+                    qty = uom_obj._compute_qty(cursor, user,
+                                               from_uom_id = sub_product_dict['product_uom'],
+                                               qty         = sub_product_dict['product_qty'],
+                                               to_uom_id   = sub_product.uom_po_id.id)
+
+                    res[pr.id] += std_price * qty
+                    # TODO alf use routes to compute cost of manufacturing (following is from product_extended)
+                    ## if bom.routing_id:
+                    ##     for wline in bom.routing_id.workcenter_lines:
+                    ##         wc = wline.workcenter_id
+                    ##         cycle = wline.cycle_nbr
+                    ##         hour = (wc.time_start + wc.time_stop + cycle * wc.time_cycle) *  (wc.time_efficiency or 1.0)
+                    ##         price += wc.costs_cycle * cycle + wc.costs_hour * hour
+                    ##         price = self.pool.get('product.uom')._compute_price(cr,uid,bom.product_uom.id,price,bom.product_id.uom_id.id)
+
+            else:
                 res[pr.id] = pr.standard_price
-                continue
-            bom = bom_obj.browse(cursor, user, bom_id)
-            sub_products, routes = bom_obj._bom_explode(cursor, user, bom,
-                                                        factor=1,
-                                                        properties=bom_properties,
-                                                        addthis=True)
-            price = 0.
-            for sub_product_dict in sub_products:
-                sub_product = self.browse(cursor, user, sub_product_dict['product_id'])
-                std_price = sub_product.standard_price
-                qty = uom_obj._compute_qty(cursor, user,
-                                           from_uom_id = sub_product_dict['product_uom'],
-                                           qty         = sub_product_dict['product_qty'],
-                                           to_uom_id   = sub_product.uom_po_id.id)
-                price += std_price * qty
-            if bom.routing_id:
-                for wline in bom.routing_id.workcenter_lines:
-                    wc = wline.workcenter_id
-                    cycle = wline.cycle_nbr
-                    hour = (wc.time_start + wc.time_stop + cycle * wc.time_cycle) *  (wc.time_efficiency or 1.0)
-                    price += wc.costs_cycle * cycle + wc.costs_hour * hour
-            price /= bom.product_qty
-            price = uom_obj._compute_price(cursor, user, bom.product_uom.id, price, bom.product_id.uom_id.id)
-            res[pr.id] = price
+
         return res
 
-    def get_cost_field(self, cr, uid, ids, context=None):
-        return self._cost_price(cr, uid, ids, '', [], context)
 
-    def _cost_price(self, cr, uid, ids, field_name, arg, context=None):
+    def _cost_price(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
+        pricelist = context.get('pricelist')
         product_uom = context.get('product_uom')
         bom_properties = context.get('properties')
-        res = self._compute_purchase_price(cr, uid, ids, product_uom, bom_properties)
-        return res
-
+        return  _compute_purchase_price(cr, uid, ids, pricelist, product_uom, bom_properties)
+    
     _columns = {
         'cost_price': fields.function(_cost_price,
-                                      method=True,
+                                      methode=True,
                                       string='Cost Price (incl. BoM)',
                                       digits_compute = dp.get_precision('Sale Price'),
-                                      help="The cost price is the standard price or, if the product has a bom, "
-                                      "the sum of all standard price of its components. it take also care of the "
-                                      "bom costing like cost per cylce.")
+                                      help="The cost is the standard price")
         }
diff --git a/product_get_cost_field/__init__.py b/product_get_cost_field/__init__.py
index 2a47e6e5..bf559d97 100644
--- a/product_get_cost_field/__init__.py
+++ b/product_get_cost_field/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    Author: Alexandre Fayolle, Joel Grand-Guillaume
+#    Author: Alexandre Fayolle
 #    Copyright 2012 Camptocamp SA
 #
 #    This program is free software: you can redistribute it and/or modify
diff --git a/product_get_cost_field/__openerp__.py b/product_get_cost_field/__openerp__.py
index 7ad540d8..7b38bb61 100644
--- a/product_get_cost_field/__openerp__.py
+++ b/product_get_cost_field/__openerp__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    Author:  Alexandre Fayolle, Joel Grand-Guillaume
+#    Author:  Alexandre Fayolle
 #    Copyright 2012 Camptocamp SA
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -22,23 +22,17 @@
  'version' : '0.1',
  'author' : 'Camptocamp',
  'maintainer': 'Camptocamp',
- 'category': 'Products',
+ 'category': 'Hidden',
  'complexity': "normal",  # easy, normal, expert
  'depends' : ['product',
               ],
- 'description': """
- Provides an overridable method on product which compute the cost_price field of a product. 
- By default it just return the value of standard_price field, but using the product_cost_incl_bom
- module, it will return the costing from the bom.
- 
- As it is a generic module, you can also setup your own way of computing the cost_price for your 
- product.
- 
- All our modules to compute margin are based on it, so you'll ba able to use them in your own way.
+ 'description': """Provides an overridable method on product which returns the name of
+ the field used to compute the product cost, allowing for customization
+ of product cost computation.
  """,
  'website': 'http://www.camptocamp.com/',
  'init_xml': [],
- 'update_xml': ['product_view.xml'],
+ 'update_xml': [],
  'demo_xml': [],
  'tests': [],
  'installable': True,
diff --git a/product_get_cost_field/product_get_cost_field.py b/product_get_cost_field/product_get_cost_field.py
index 9a12b8b7..1a0196e3 100644
--- a/product_get_cost_field/product_get_cost_field.py
+++ b/product_get_cost_field/product_get_cost_field.py
@@ -18,33 +18,30 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import logging
 
 from openerp.osv.orm import Model
 from openerp.osv import fields
 import decimal_precision as dp
 
-
 class Product(Model):
     _inherit = 'product.product'
 
-    def _cost_price(self, cr, uid, ids, field_name, arg, context=None):
-        if context is None:
-            context = {}
-        logger = logging.getLogger('product.get_cost_field')
-        logger.debug("get cost field _cost_price %s, %s, %s", field_name, arg, context)
+    ## def get_cost_field(self):
+    ##     """override in subclass if you need to setup a custom way of computing the standard price"""
+    ##     " XXX fonction statique qui renvoie le prix standard en fonction d'une liste d'id de product"
+    ##     return self.standard_price # XXX or a string?
+
+
+    def _cost_price(self, cr, uid, ids, context=None):
         res = {}
         for product in self.browse(cr, uid, ids):
             res[product.id] = product.standard_price
         return res
 
-    def get_cost_field(self, cr, uid, ids, context=None):
-        return self._cost_price(cr, uid, ids, '', [], context)
-
     _columns = {
         'cost_price': fields.function(_cost_price,
-                                      method=True,
+                                      methode=True,
                                       string='Cost Price',
                                       digits_compute = dp.get_precision('Sale Price'),
-                                      help="The cost price is the standard price unless you install the product_cost_incl_bom module.")
+                                      help="The cost is the standard price")
         }
diff --git a/product_get_cost_field/product_view.xml b/product_get_cost_field/product_view.xml
index 0a872ab1..bc57e478 100644
--- a/product_get_cost_field/product_view.xml
+++ b/product_get_cost_field/product_view.xml
@@ -8,19 +8,21 @@
       <field name="inherit_id" ref="product.product_normal_form_view" />
       <field name="arch" type="xml">
         <field name="list_price" position="after">
-          <field name="cost_price"/> <!-- FIXME groups setting! -->
+          <field name="cost_price"
+                 groups="sale.group_sale_manager"/>
         </field>
       </field>
     </record>
-
+    
     <record model="ir.ui.view" id="product_get_cost_field_tree">
       <field name="name">product.get_cost_field.view.tree</field>
       <field name="type">tree</field>
       <field name="model">product.product</field>
       <field name="inherit_id" ref="product.product_product_tree_view" />
       <field name="arch" type="xml">
-        <field name="standard_price" position="replace"> 
-          <field name="cost_price"/><!-- FIXME groups setting! -->
+        <field name="standard_price" position="after">
+          <field name="cost_price"
+                 groups="sale.group_sale_manager"/>
         </field>
       </field>
     </record>
diff --git a/product_historical_margin/__init__.py b/product_historical_margin/__init__.py
deleted file mode 100644
index a774388d..00000000
--- a/product_historical_margin/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Author: Alexandre Fayolle, Joel 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 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/>.
-#
-##############################################################################
-
-from . import product_historical_margin
-from . import invoice
-from . import wizard
diff --git a/product_historical_margin/__openerp__.py b/product_historical_margin/__openerp__.py
deleted file mode 100644
index 9fc328d6..00000000
--- a/product_historical_margin/__openerp__.py
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Author:  Alexandre Fayolle, Joel 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 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' : 'Product Historical Margin',
- 'version' : '0.2',
- 'author' : 'Camptocamp',
- 'maintainer': 'Camptocamp',
- 'category': 'Accounting & Finance',
- 'complexity': "normal",  # easy, normal, expert
- 'depends' : ['product_get_cost_field',
-              'product_standard_margin',
-              'account',
-              'sale',
-              ],
- 'description': """
- This module will store in the invoice line all the historical informations to allow you to compute
- your margin on product. We will always work in company currency and in invoice currency (to respect the OpenERP
- philosophy, as it is done in accounting entries for example). You now have the possibility to open a list 
- view of your products and having the margin computed for a given period of time. 
- 
- In the product form, you also will have a computed field that show you the info based on all invoice lines
- historic.
- 
- You can use this module in conjonction with the product_cost_incl_bom one to have the right margin 
- computed from BOM costing.
- 
- WARNING:
- 
- 1) The amount of the unit price in company currency in the invoice line is converted with the currency
- rate of the date of the creation/modification of the invoice line (not the invoice date). This choice 
- has been made mainly because the cost price of the product is known at the invoice creation, but we don't 
- have it at the date of the invoice (no historical values in the cost price...) !
- 
- 
- """,
- 'website': 'http://www.camptocamp.com/',
- 'init_xml': [],
- 'update_xml': ["account_invoice_view.xml",
-                "wizard/historical_margin_view.xml",
-                "product_view.xml",
-                ],
- 'demo_xml': [],
- 'tests': [],
- 'installable': True,
- 'auto_install': False,
- 'license': 'AGPL-3',
- 'application': False
- }
diff --git a/product_historical_margin/account_invoice_view.xml b/product_historical_margin/account_invoice_view.xml
deleted file mode 100644
index 6eb99e89..00000000
--- a/product_historical_margin/account_invoice_view.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-  <data>
-      
-       <record id="view_invoice_line_tree_from_product" model="ir.ui.view">
-              <field name="name">account.invoice.line.from.product.tree</field>
-              <field name="model">account.invoice.line</field>
-              <field name="type">tree</field>
-              <field name="priority">20</field>
-              <field name="arch" type="xml">
-                  <tree string="Invoice Line">
-                      <field name="invoice_type"/>
-                      <field name="partner_id"/>
-                      <field name="invoice_user_id"/>
-                      <field name="invoice_id"/>
-                      <field name="invoice_date"/>
-                      <field name="name" invisible="1"/>
-                      <field name="product_id"/>
-                      <field name="account_id" invisible="1"/>
-                      <field name="quantity"/>
-                      <field name="uos_id"/>
-                      <field name="price_unit" invisible="1"/>
-                      <field name="discount" invisible="1"/>
-                      <field name="price_subtotal" invisible="1"/>
-                      <field name="subtotal_cost_price" invisible="1"/>
-                      <field name="company_id" invisible="1"/>
-                      <field name="subtotal_company"/>
-                      <field name="subtotal_cost_price_company"/>
-                      <field name="margin_absolute"/>
-                      <field name="margin_relative" invisible="context.get('group_by',False)"/>
-                  </tree>
-              </field>
-          </record>
-          
-        
-      <record id="view_account_invoice_line_filter" model="ir.ui.view">
-          <field name="name">account.invoice.line.select</field>
-          <field name="model">account.invoice.line</field>
-          <field name="type">search</field>
-          <field name="arch" type="xml">
-              <search string="Search Invoice Line">
-                 <group>
-                     <filter icon="terp-go-year" string="Year" 
-                             name="year"
-                             domain="[('invoice_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('invoice_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                             help="year"/>
-                     <separator orientation="vertical"/>
-                     <filter icon="terp-go-month" string="Month"
-                             name="month"
-                             domain="[('invoice_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('invoice_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                             help="current month"/>
-                     <filter icon="terp-go-month" string="Month-1"
-                             domain="[('invoice_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('invoice_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                             help="last month"/>
-                     <separator orientation="vertical"/>
-                      <field name="product_id"/>
-                      <field name="invoice_type"/>
-                      <field name="partner_id"/>
-                      <field name="invoice_user_id"/>
-                      <field name="invoice_date"/>
-                      <field name="account_id"/>
-                      <field name="company_id"/>
-                  </group>
-                  <newline/>
-                  <group expand="1" string="Group By...">
-                      <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                      <filter string="Salesman" name='user' icon="terp-personal" context="{'group_by':'invoice_user_id'}"/>
-                      <separator orientation="vertical"/>
-                      <filter string="Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'account_id'}"/>
-                      <filter string="Invoice" icon="terp-folder-orange" domain="[]" context="{'group_by':'invoice_id'}"/>
-                      <separator orientation="vertical"/>
-                      <filter string="Invoice Type" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'invoice_type'}"/>
-                      <filter name="product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                  </group>
-             </search>
-          </field>
-      </record>
-
-  </data>
-</openerp>
-
diff --git a/product_historical_margin/invoice.py b/product_historical_margin/invoice.py
deleted file mode 100644
index e316b22e..00000000
--- a/product_historical_margin/invoice.py
+++ /dev/null
@@ -1,204 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Author: Alexandre Fayolle, Joel 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 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 logging
-from openerp.osv.orm import Model
-from osv import fields
-import decimal_precision as dp
-
-class account_invoice(Model):
-    _inherit = 'account.invoice'
-
-    def _refund_cleanup_lines(self, cr, uid, lines):
-        for line in lines:
-            del line['invoice_user_id']
-        return super(account_invoice, self)._refund_cleanup_lines(cr, uid, lines)
-
-
-class account_invoice_line(Model):
-    """
-    The goal on the invoice line model is only to store the minimum needed values to
-    allow analysis and computation of margin at product level.
-    Later, we'll be able to provide as well a view based on an invoice line SQL view,
-    so user will be allowed to play with filter and group by.
-    """
-    _inherit = 'account.invoice.line'
-
-    def _compute_line_values(self, cr, uid, ids, field_names,  arg, context=None):
-        """
-        Compute cost_price, cost_price in company currency and subtotal in company currency
-        that will be used for margin analysis. This method is called by the function fields.
-        
-        Those values will be stored, so we'll be able to use them in analysis.
-        
-        WARNING !! All subtotal in company currency will be with the right sign. For example,
-        if I have a customer refund, the sign will be - For all infos in invoice currency, we 
-        kept the standard logic => always positif.        
-        
-        :return dict of dict of the form : 
-            {INT Line ID : {
-                    float subtotal_cost_price_company,
-                    float subtotal_cost_price,
-                    float subtotal_company
-                    float margin_absolute
-                    }}
-        """
-        if context is None:
-            context = {}
-        res = {}
-        if not ids:
-            return res
-        logger = logging.getLogger('product_historical_margin')
-        user_obj = self.pool.get('res.users')
-        company_currency_id = user_obj.browse(cr, uid, uid).company_id.currency_id.id
-        currency_obj = self.pool.get('res.currency')
-        for line_id in ids:
-            res[line_id] = {
-                    'subtotal_cost_price_company': 0.0,
-                    'subtotal_cost_price': 0.0,
-                    'subtotal_company': 0.0,
-                    'margin_absolute': 0.0,
-                    'margin_relative': 0.0,
-                    }
-        for obj in self.browse(cr, uid, ids):
-            product = obj.product_id
-            if obj.invoice_id.currency_id is None:
-                currency_id = company_currency_id
-            else:
-                currency_id = obj.invoice_id.currency_id.id
-            if obj.invoice_type in ('out_refund','in_invoice'):
-                factor = -1.
-            else:
-                factor = 1.
-                
-            subtotal_cost_price_company = factor * product.cost_price * obj.quantity
-            # Convert price_subtotal from invoice currency to company currency
-            subtotal_company = factor * currency_obj.compute(cr, uid, currency_id,
-                                                                  company_currency_id,
-                                                                  obj.price_subtotal,
-                                                                  round=False,
-                                                                  context=context)
-            # Compute the subtotal_cost_price values from company currency in invoice currency
-            subtotal_cost_price = currency_obj.compute(cr, uid, company_currency_id,
-                                                                  currency_id,
-                                                                  subtotal_cost_price_company,
-                                                                  round=False,
-                                                                  context=context)
-            margin_absolute = subtotal_company - subtotal_cost_price_company
-            if subtotal_company == 0:
-                margin_relative = 999.
-            else:
-                margin_relative = (margin_absolute / subtotal_company) * 100
-            res[obj.id] = {
-                'subtotal_cost_price_company': subtotal_cost_price_company,
-                'subtotal_cost_price': subtotal_cost_price,
-                'subtotal_company': subtotal_company,
-                'margin_absolute': margin_absolute,
-                'margin_relative': margin_relative,
-            }
-            logger.debug("The following values has been computed for product ID %d: subtotal_cost_price=%f"
-                "subtotal_cost_price_company=%f, subtotal_company=%f", product.id, subtotal_cost_price, 
-                subtotal_cost_price_company, subtotal_company)
-        return res
-
-    def _recalc_margin(self, cr, uid, ids, context=None):
-        return ids
-
-    def _recalc_margin_parent(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        res=[]
-        for inv in self.browse(cr,uid,ids):
-            for line in inv.invoice_line:
-                res.append(line.id)
-        return res
-
-    _col_store = {'account.invoice.line': (_recalc_margin,
-                                           ['price_unit', 'product_id', 'discount','invoice_line_tax_id'],
-                                           20),
-                  'account.invoice':  (_recalc_margin_parent,
-                                       ['currency_id'],
-                                       20),
-                  }
-
-    _columns = {
-        'subtotal_cost_price_company': fields.function(_compute_line_values, method=True, readonly=True,type='float',
-                                              string='Cost',
-                                              multi='product_historical_margin',
-                                              store=_col_store,
-                                              digits_compute=dp.get_precision('Account'),
-                                              help="The cost subtotal of the line at the time of the creation of the invoice, "
-                                              "express in the company currency."),
-        'subtotal_cost_price': fields.function(_compute_line_values, method=True, readonly=True,type='float',
-                                              string='Cost in currency',
-                                              multi='product_historical_margin',
-                                              store=_col_store,
-                                              digits_compute=dp.get_precision('Account'),
-                                              help="The cost subtotal of the line at the time of the creation of the invoice, "
-                                              "express in the invoice currency."),
-        'subtotal_company': fields.function(_compute_line_values, method=True, readonly=True,type='float',
-                                              string='Net Sales',
-                                              multi='product_historical_margin',
-                                              store=_col_store,
-                                              digits_compute=dp.get_precision('Account'),
-                                              help="The subtotal (VAT excluded) of the line at the time of the creation of the invoice, " 
-                                              "express in the company currency (computed with the rate at invoice creation time, as we "
-                                              "don't have the cost price of the product at the date of the invoice)."),
-        'margin_absolute': fields.function(_compute_line_values, method=True, readonly=True,type='float',
-                                              string='Real Margin',
-                                              multi='product_historical_margin',
-                                              store=_col_store,
-                                              digits_compute=dp.get_precision('Account'),
-                                              help="The Real Margin [ net sale - cost ] of the line."),
-        'margin_relative': fields.function(_compute_line_values, method=True, readonly=True,type='float',
-                                              string='Real Margin (%)',
-                                              multi='product_historical_margin',
-                                              store=_col_store,
-                                              digits_compute=dp.get_precision('Account'),
-                                              help="The Real Margin % [ (Real Margin / net sale) * 100 ] of the line."
-                                              "If no real margin set, will display 999.0 (if not invoiced yet for example)."),
-        
-        # Those field are here to better report to the user from where the margin is computed
-        # this will allow him to understand why a margin is of that amount using the link
-        # from product to invoice lines
-        'invoice_state': fields.related('invoice_id', 'state', type='selection', 
-                                                selection=[
-                                                    ('draft','Draft'),
-                                                    ('proforma','Pro-forma'),
-                                                    ('proforma2','Pro-forma'),
-                                                    ('open','Open'),
-                                                    ('paid','Paid'),
-                                                    ('cancel','Cancelled')
-                                                    ],
-                                                readonly=True, string="Invoice state",
-                                                help='The parent invoice state'),
-        'invoice_type': fields.related('invoice_id', 'type', type='selection', store=True,
-                                                selection=[
-                                                    ('out_invoice','Customer Invoice'),
-                                                    ('in_invoice','Supplier Invoice'),
-                                                    ('out_refund','Customer Refund'),
-                                                    ('in_refund','Supplier Refund'),
-                                                    ],
-                                                readonly=True, string="Invoice type",
-                                                help='The parent invoice type'),
-        'invoice_user_id': fields.related('invoice_id','user_id',type='many2one',relation='res.users',string='Salesman', store=True),
-        'invoice_date': fields.related('invoice_id','date_invoice',type='date',string='Invoice Date'),
-                                                
-        }
diff --git a/product_historical_margin/product_historical_margin.py b/product_historical_margin/product_historical_margin.py
deleted file mode 100644
index 5ee90874..00000000
--- a/product_historical_margin/product_historical_margin.py
+++ /dev/null
@@ -1,114 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Author: Alexandre Fayolle, Joel 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 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 logging
-
-from openerp.osv.orm import Model
-from osv import fields
-
-import decimal_precision as dp
-
-# Don't Forget to remove supplier (in_invoice et in_refund) from the product margin computation
-# And remove out_refund from the computation
-# et ne prendre que les factures paid.
-class product_product(Model):
-    _inherit = 'product.product'
-    def _compute_margin(self, cr, uid, ids, field_names,  arg, context):
-        """
-        Compute the absolute and relativ margin based on price without tax, and
-        always in company currency. We exclude the (in_invoice, in_refund) from the
-        computation as we only want to see in the product form the margin made on 
-        our sales.
-        The base calculation is made from the informations stored in the invoice line
-        of paid and open invoices.
-        We return 999 as relativ margin if no sale price is define. We made that choice
-        to differenciate the 0.0 margin from null !
-        
-        :return dict of dict of the form : 
-            {INT Product ID : {
-                    float margin_absolute,
-                    float margin_relative
-                    }}
-        """
-        res = {}
-        tot_sale = {}
-        if context is None:
-            context = {}
-        if not ids:
-            return res
-        user_obj = self.pool.get('res.users')
-        logger = logging.getLogger('product_historical_margin')
-        company_id = user_obj.browse(cr, uid, uid).company_id.id
-        for product_id in ids:
-            res[product_id] = {'margin_absolute': 0, 'margin_relative': 0}
-            tot_sale[product_id] = 0
-        # get information about invoice lines relative to our products
-        # belonging to open or paid invoices in the considered period
-        query = '''SELECT product_id, type,
-                          SUM(subtotal_cost_price_company),
-                          SUM(subtotal_company)
-        FROM account_invoice_line AS line INNER JOIN account_invoice AS inv ON (inv.id = line.invoice_id)
-        WHERE %s inv.state IN ('open', 'paid')
-          AND type NOT IN ('in_invoice', 'in_refund')
-          AND product_id IN %%(product_ids)s
-          AND inv.company_id = %%(company_id)s
-        GROUP BY product_id, type
-        HAVING SUM(subtotal_cost_price_company) != 0
-          AND SUM(subtotal_company) != 0
-        '''
-        substs = context.copy()
-        substs['product_ids'] = tuple(res)
-        substs['company_id'] = company_id
-        date_clause = []
-        if 'from_date' in substs:
-            date_clause.append('inv.date_invoice >= %(from_date)s AND')
-        if 'to_date' in substs:
-            date_clause.append('inv.date_invoice <= %(to_date)s AND')
-        query %= ' '.join(date_clause)
-        cr.execute(query, substs)
-        for product_id, inv_type, cost, sale in cr.fetchall():
-            res[product_id]['margin_absolute'] += (sale - cost)
-            tot_sale[product_id] += sale
-        for product_id in tot_sale.keys():
-            if tot_sale[product_id] == 0:
-                logger.debug("Sale price for product ID %d is 0, cannot compute margin rate...", product_id)
-                res[product_id]['margin_relative'] = 999.
-            else:
-                res[product_id]['margin_relative'] = (res[product_id]['margin_absolute'] / tot_sale[product_id]) * 100
-        return res
-
-    _columns = {
-        'margin_absolute': fields.function(_compute_margin, method=True,
-                                        readonly=True, type='float',
-                                        string='Real Margin',
-                                        multi='product_historical_margin',
-                                        digits_compute=dp.get_precision('Sale Price'),
-                                        help="The Real Margin [ sale price - cost price ] of the product in absolute value "
-                                        "based on historical values computed from open and paid invoices."),
-        'margin_relative': fields.function(_compute_margin, method=True,
-                                        readonly=True, type='float',
-                                        string='Real Margin (%)',
-                                        multi='product_historical_margin',
-                                        digits_compute=dp.get_precision('Sale Price'),
-                                        help="The Real Margin [ Real Margin / sale price ] of the product in relative value "
-                                        "based on historical values computed from open and paid invoices."
-                                        "If no real margin set, will display 999.0 (if not invoiced yet for example)."),
-        }
-
diff --git a/product_historical_margin/product_view.xml b/product_historical_margin/product_view.xml
deleted file mode 100644
index 684e4274..00000000
--- a/product_historical_margin/product_view.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-  <data>
-      
-    <record id="view_product_historical_margin_form" model="ir.ui.view">
-      <field name="name">product_historical_margin.form</field>
-      <field name="model">product.product</field>
-      <field name="inherit_id" ref='product_standard_margin.sale_markup_product_form'/>
-      <field name="type">form</field>
-      <field name="arch" type="xml">
-        <field name="standard_margin_rate" position="after">
-            <field name="margin_absolute" />
-            <field name="margin_relative" />
-        </field>
-      </field>
-    </record>
-
-    <record id="view_product_historical_margin" model="ir.ui.view">
-      <field name="name">product.product.historical_margin.tree</field>
-      <field name="model">product.product</field>
-      <field name="type">tree</field>
-      <field name="arch" type="xml">
-        <tree string="Historical Margins">
-          <field name="default_code"/>
-          <field name="name"/>
-          <field name="categ_id" invisible="1"/>
-          <field name="variants" groups="product.group_product_variant"/>
-          <field name="type"/>
-          <field name="state" groups="base.group_extended"/>
-          <field name="price" invisible="not context.get('pricelist',False)"/>
-          <field name="margin_absolute"/>
-          <field name="margin_relative"/>
-          <field name="standard_margin_rate"/>
-          <field name="company_id" groups="base.group_multi_company" invisible="1"/>
-        </tree>
-      </field>
-    </record>
-    
-    <act_window
-       id="act_product_act_open_invoice_lines"
-       name="Margin Details"
-       domain="[('product_id','in',active_ids),('invoice_state','in',['open', 'paid']),('invoice_type','in',['out_refund','out_invoice'])]"
-       res_model="account.invoice.line"
-       src_model="product.product"
-       view_mode="tree,form"
-       view_id="view_invoice_line_tree_from_product"
-       context="{'search_default_product':1,'search_default_year':1}"
-       />
-
-  </data>
-</openerp>
diff --git a/product_historical_margin/wizard/__init__.py b/product_historical_margin/wizard/__init__.py
deleted file mode 100644
index 141ca82c..00000000
--- a/product_historical_margin/wizard/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Author: Alexandre Fayolle, Joel 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 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/>.
-#
-##############################################################################
-
-from . import historical_margin
diff --git a/product_historical_margin/wizard/historical_margin.py b/product_historical_margin/wizard/historical_margin.py
deleted file mode 100644
index ec3f70a4..00000000
--- a/product_historical_margin/wizard/historical_margin.py
+++ /dev/null
@@ -1,90 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Author: Alexandre Fayolle, Joel 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 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 time
-
-from openerp.osv.orm import TransientModel
-from openerp.osv import fields
-from openerp.tools.translate import _
-
-
-class historical_margin(TransientModel):
-    _name = 'historical.margin'
-    _description = 'Product historical margin'
-    
-    def _get_product_ids(self, cr, uid, context=None):
-        if context is None: context = {}
-        res = False
-        if (context.get('active_model', False) == 'product.product' and
-            context.get('active_ids', False)):
-            res = context['active_ids']
-        return res
-    
-    
-    _columns = {
-        'from_date': fields.date('From', help='Date of the first invoice to take into account. '
-                                 'The earliest existing invoice will be used if left empty'),
-        'to_date': fields.date('To', help='Date of the last invoice to take into account. '
-                               'The latest existing invoice will be used if left empty'),
-        'product_ids': fields.many2many('product.product', string='Products'),
-        }
-    _defaults = {
-        'from_date': time.strftime('%Y-01-01'),
-        'to_date': time.strftime('%Y-12-31'),
-        'product_ids': _get_product_ids,
-        }
-
-    def action_open_window(self, cr, uid, ids, context=None):
-        """
-        Open the historical margin view
-        """
-        
-        if context is None:
-            context = {}
-        wiz = self.read(cr, uid, ids, [], context)[0]
-        ctx = context.copy()
-        ctx['from_date']  = wiz.get('from_date')
-        ctx['to_date'] = wiz.get('to_date')
-        product_ids = wiz.get('product_ids')
-        data_pool = self.pool.get('ir.model.data')
-        filter_ids = data_pool.get_object_reference(cr, uid, 'product',
-                                                    'product_search_form_view')
-        product_view_id = data_pool.get_object_reference(cr, uid,
-                                                         'product_historical_margin',
-                                                         'view_product_historical_margin')
-        if filter_ids:
-            filter_id = filter_ids[1]
-        else:
-            filter_id = 0
-        if product_ids:
-            domain = [('id','in',product_ids)]
-        else:
-            domain = False
-        return {
-            'type': 'ir.actions.act_window',
-            'name': _('Historical Margins'),
-            'context': ctx,
-            'domain':domain,
-            'view_type': 'form',
-            'view_mode': 'tree',
-            'res_model': 'product.product',
-            'view_id': product_view_id[1],
-            'search_view_id': filter_id,
-            }
diff --git a/product_historical_margin/wizard/historical_margin_view.xml b/product_historical_margin/wizard/historical_margin_view.xml
deleted file mode 100644
index 22ff02ca..00000000
--- a/product_historical_margin/wizard/historical_margin_view.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<openerp>
-    <data>
-        <record id="view_historical_margin" model="ir.ui.view">
-            <field name="name">historical.margin.form</field>
-            <field name="model">historical.margin</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Historical Margin Properties">
-                    <group colspan="4">
-                        <field name="from_date" />
-                        <field name="to_date"/>
-                        <field name="product_ids" invisible="1"/>
-                    </group>
-                    <separator string="" colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="terp-gtk-go-back-rtl" string="Compute margins" name="action_open_window" type="object"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_product_margin_view" model="ir.actions.act_window">
-            <field name="name">Product Historical Margin</field>
-            <field name="res_model">historical.margin</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_historical_margin"/>
-            <field name="target">new</field>
-        </record>
-        
-        
-        <menuitem icon="STOCK_INDENT" action="action_product_margin_view"
-            id="menu_action_product_margin_tree"
-            parent="account.menu_finance_statistic_report_statement" />
-
-        
-        <!-- Remove it for right management <act_window name="Product Historical Margins"
-                    res_model="historical.margin"
-                    src_model="product.product"
-                    view_mode="form"
-                    target="new"
-                    key2="client_action_multi"
-                    id="historical_margin_act_window"/> -->
-
-
-    </data>
-</openerp>
diff --git a/product_historical_margin_report/__init__.py b/product_historical_margin_report/__init__.py
deleted file mode 100644
index 5bd18d2d..00000000
--- a/product_historical_margin_report/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Author: Joel 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 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/>.
-#
-##############################################################################
-from . import product_historical_margin_report
-
diff --git a/product_historical_margin_report/__openerp__.py b/product_historical_margin_report/__openerp__.py
deleted file mode 100644
index ac168907..00000000
--- a/product_historical_margin_report/__openerp__.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Author: Joel 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 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' : 'Product Historial Margin Report',
- 'version' : '1.0',
- 'author' : 'Camptocamp',
- 'maintainer': 'Camptocamp',
- 'category': 'Sales Management',
- 'complexity': "normal",  # easy, normal, expert
- 'depends' : ['product_historical_margin', 'account'],
- 'description': """
-  This module provide the margin infos in the invoice line analysis.
-  
-  """,
- 'website': 'http://www.camptocamp.com/',
- 'init_xml': [],
- 'update_xml': ['product_historical_margin_report_view.xml'],
- 'demo_xml': [],
- 'tests': [],
- 'installable': True,
- 'auto_install': False,
- 'license': 'AGPL-3',
- 'application': True}
-
-
diff --git a/product_historical_margin_report/product_historical_margin_report.py b/product_historical_margin_report/product_historical_margin_report.py
deleted file mode 100644
index 7889d7f5..00000000
--- a/product_historical_margin_report/product_historical_margin_report.py
+++ /dev/null
@@ -1,169 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Author: Joel 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 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 tools
-from osv import fields,osv
-
-# TODO: use another table name and provide another improved analysis with different 
-# graph view on margin
-class account_invoice_report(osv.osv):
-    _inherit = "account.invoice.report"
-    _columns = {
-        'subtotal_cost_price_company': fields.float('Total Cost', readonly=True),
-        'margin_absolute': fields.float('Real Margin', readonly=True),
-        
-        # TODO: The conversion is right here, just rename it in the view the field to be consistenet with 
-        # product historical margin
-        # 'subtotal_company': fields.float('Total Without Tax (company currency)', readonly=True),
-    }
-    
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'account_invoice_report')
-        cr.execute("""
-            create or replace view account_invoice_report as (
-                 select min(ail.id) as id,
-                    ai.date_invoice as date,
-                    to_char(ai.date_invoice, 'YYYY') as year,
-                    to_char(ai.date_invoice, 'MM') as month,
-                    to_char(ai.date_invoice, 'YYYY-MM-DD') as day,
-                    ail.product_id,
-                    ai.partner_id as partner_id,
-                    ai.payment_term as payment_term,
-                    ai.period_id as period_id,
-                    (case when u.uom_type not in ('reference') then
-                        (select name from product_uom where uom_type='reference' and active and category_id=u.category_id LIMIT 1)
-                    else
-                        u.name
-                    end) as uom_name,
-                    ai.currency_id as currency_id,
-                    ai.journal_id as journal_id,
-                    ai.fiscal_position as fiscal_position,
-                    ai.user_id as user_id,
-                    ai.company_id as company_id,
-                    count(ail.*) as nbr,
-                    ai.type as type,
-                    ai.state,
-                    pt.categ_id,
-                    ai.date_due as date_due,
-                    ai.address_contact_id as address_contact_id,
-                    ai.address_invoice_id as address_invoice_id,
-                    ai.account_id as account_id,
-                    ail.account_id as account_line_id,
-                    ai.partner_bank_id as partner_bank_id,
-                    sum(case when ai.type in ('out_refund','in_invoice') then
-                         -ail.quantity / u.factor
-                        else
-                         ail.quantity / u.factor
-                        end) as product_qty,
-
-                    sum(case when ai.type in ('out_refund','in_invoice') then
-                         -ail.price_subtotal
-                        else
-                          ail.price_subtotal
-                        end) / cr.rate as price_total,
-                    
-                    -- *** BEGIN CHG ***
-                    sum(ail.subtotal_cost_price_company) as subtotal_cost_price_company,
-                                            
-                    sum(ail.price_subtotal/cr.rate-ail.subtotal_cost_price_company) as margin_absolute,
-                    -- *** END CHG *** 
-                    
-                    (case when ai.type in ('out_refund','in_invoice') then
-                      sum(-ail.price_subtotal)
-                    else
-                      sum(ail.price_subtotal)
-                    end) / (CASE WHEN sum(ail.quantity/u.factor) <> 0
-                       THEN
-                         (case when ai.type in ('out_refund','in_invoice')
-                          then sum(-ail.quantity/u.factor)
-                          else sum(ail.quantity/u.factor) end)
-                       ELSE 1
-                       END)
-                     / cr.rate as price_average,
-
-                    cr.rate as currency_rate,
-                    sum((select extract(epoch from avg(date_trunc('day',aml.date_created)-date_trunc('day',l.create_date)))/(24*60*60)::decimal(16,2)
-                        from account_move_line as aml
-                        left join account_invoice as a ON (a.move_id=aml.move_id)
-                        left join account_invoice_line as l ON (a.id=l.invoice_id)
-                        where a.id=ai.id)) as delay_to_pay,
-                    sum((select extract(epoch from avg(date_trunc('day',a.date_due)-date_trunc('day',a.date_invoice)))/(24*60*60)::decimal(16,2)
-                        from account_move_line as aml
-                        left join account_invoice as a ON (a.move_id=aml.move_id)
-                        left join account_invoice_line as l ON (a.id=l.invoice_id)
-                        where a.id=ai.id)) as due_delay,
-                    (case when ai.type in ('out_refund','in_invoice') then
-                      -ai.residual
-                    else
-                      ai.residual
-                    end)/ (CASE WHEN
-                        (select count(l.id) from account_invoice_line as l
-                         left join account_invoice as a ON (a.id=l.invoice_id)
-                         where a.id=ai.id) <> 0
-                       THEN
-                        (select count(l.id) from account_invoice_line as l
-                         left join account_invoice as a ON (a.id=l.invoice_id)
-                         where a.id=ai.id)
-                       ELSE 1
-                       END) / cr.rate as residual
-                from account_invoice_line as ail
-                left join account_invoice as ai ON (ai.id=ail.invoice_id)
-                left join product_product pr on (pr.id=ail.product_id)
-                left join product_template pt on (pt.id=pr.product_tmpl_id)
-                left join product_uom u on (u.id=ail.uos_id),
-                res_currency_rate cr
-                where cr.id in (select id from res_currency_rate cr2  where (cr2.currency_id = ai.currency_id)
-                and ((ai.date_invoice is not null and cr.name <= ai.date_invoice) or (ai.date_invoice is null and cr.name <= NOW())) limit 1)
-                group by ail.product_id,
-                    ai.date_invoice,
-                    ai.id,
-                    cr.rate,
-                    to_char(ai.date_invoice, 'YYYY'),
-                    to_char(ai.date_invoice, 'MM'),
-                    to_char(ai.date_invoice, 'YYYY-MM-DD'),
-                    ai.partner_id,
-                    ai.payment_term,
-                    ai.period_id,
-                    u.name,
-                    ai.currency_id,
-                    ai.journal_id,
-                    ai.fiscal_position,
-                    ai.user_id,
-                    ai.company_id,
-                    ai.type,
-                    ai.state,
-                    pt.categ_id,
-                    ai.date_due,
-                    ai.address_contact_id,
-                    ai.address_invoice_id,
-                    ai.account_id,
-                    ail.account_id,
-                    ai.partner_bank_id,
-                    ai.residual,
-                    ai.amount_total,
-                    u.uom_type,
-                    u.category_id
-            )
-        """)
-
-account_invoice_report()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/product_historical_margin_report/product_historical_margin_report_view.xml b/product_historical_margin_report/product_historical_margin_report_view.xml
deleted file mode 100644
index af5e82cd..00000000
--- a/product_historical_margin_report/product_historical_margin_report_view.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-    <record id="view_account_invoice_report_tree" model="ir.ui.view">
-        <field name="name">account.invoice.report.tree</field>
-        <field name="model">account.invoice.report</field>
-        <field name="type">tree</field>
-        <field name="inherit_id" ref='account.view_account_invoice_report_tree'/>
-        <field name="arch" type="xml">
-            <field name="price_total" sum="Total Without Tax" position="after">
-                <field name="subtotal_cost_price_company" sum="Total Cost"/>
-                <field name="margin_absolute" sum="Real Margin"/>
-            </field>
-        </field>
-    </record>
-    
-    <record id="account.view_account_invoice_report_graph" model="ir.ui.view">
-         <field name="name">account.invoice.report.graph</field>
-         <field name="model">account.invoice.report</field>
-         <!-- <field name="inherit_id" ref='account.view_account_invoice_report_graph'/> -->
-         <field name="type">graph</field>
-         <field name="arch" type="xml">
-              <graph string="Invoices Analysis" type="bar">
-                  <!-- <field name="product_id" group="1"/>
-                   <field name="price_total" operator="1"/>
-                  <field name="margin_absolute" operator="+"/> -->
-                  <field name="price_total"/>
-                  <field name="margin_absolute" sum="Real Margin"/>
-                  <field name="subtotal_cost_price_company" sum="Total Cost"/>
-              </graph>
-         </field>
-    </record>
-    
-    <record id="view_account_invoice_report_search" model="ir.ui.view">
-        <field name="name">account.invoice.report.search</field>
-        <field name="model">account.invoice.report</field>
-        <field name="type">search</field>
-        <field name="inherit_id" ref='account.view_account_invoice_report_search'/>
-        <field name="arch" type="xml">
-              <field name="user_id" position="after">
-                   <field name="product_id"/>
-              </field>
-        </field>
-    </record>
-
-
-</data>
-</openerp>
diff --git a/product_standard_margin/__init__.py b/product_standard_margin/__init__.py
deleted file mode 100644
index 4a754ba5..00000000
--- a/product_standard_margin/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Author: Joel 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 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/>.
-#
-##############################################################################
-from . import product_std_margin
-
diff --git a/product_standard_margin/__openerp__.py b/product_standard_margin/__openerp__.py
deleted file mode 100644
index d42d8ed9..00000000
--- a/product_standard_margin/__openerp__.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Author: Joel 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 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' : 'Markup rate on product and sales',
- 'version' : '1.0',
- 'author' : 'Camptocamp',
- 'maintainer': 'Camptocamp',
- 'category': 'Sales Management',
- 'complexity': "normal",  # easy, normal, expert
- 'depends' : ['product_get_cost_field', 'account'],
- 'description': """
-  Add a field on the product form that compute the standard (or theorical) margin based on the
-  current values of sale and cost price present in the product form. We take care of taxe included
-  or excluded.
-  
-  It will just compute it as follow : (Sale Price without tax - Cost Price) / Sale Price without tax
-  
-  Remember that this module can be used in conjonction with product_cost_incl_bom to have the 
-  cost price computed from the BOM when a product has one.
-  
-  WARNING: 
-  
-  1) As this module will base his simple computation on sale and cost prices, it suppose
-  you have them both in the same currency (the price type must of the same currency for both of 
-  them). Remember this is the default OpenERP configuration (price type of all product price 
-  fields are set as the same as the company currency). We don't take care of it cause otherwise
-  we should have added a dependency on sale module.
-  
-  
-  """,
- 'website': 'http://www.camptocamp.com/',
- 'init_xml': [],
- 'update_xml': ['product_std_margin_view.xml'],
- 'demo_xml': [],
- 'tests': [],
- 'installable': True,
- 'auto_install': False,
- 'license': 'AGPL-3',
- 'application': True}
-
-
diff --git a/product_standard_margin/product_std_margin.py b/product_standard_margin/product_std_margin.py
deleted file mode 100644
index 43759d1f..00000000
--- a/product_standard_margin/product_std_margin.py
+++ /dev/null
@@ -1,106 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Copyright (c) 2012 Camptocamp SA (http://www.camptocamp.com)
-#    All Right Reserved
-#
-#    Author : Joel Grand-Guillaume
-#
-#    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/>.
-#
-##############################################################################
-
-from osv import fields
-from osv.orm import Model
-import decimal_precision as dp
-import logging
-
-class Product(Model):
-    _inherit = 'product.product'
-    
-    #TODO : compute the margin with default taxes
-    def _amount_tax_excluded(self, cr, uid, ids, context=None):
-        """
-        Compute the list price total without tax (in case you are in tax included).
-        This will use the default taxes defined on the product. 
-        :return dict of values:
-            {INT Product ID: 
-                float price without tax
-            }
-        """
-        res = {}
-        if context is None:
-            context = {}
-        tax_obj = self.pool.get('account.tax')
-        cur_obj = self.pool.get('res.currency')
-        for prod in self.browse(cr, uid, ids):
-            price = prod.list_price
-            taxes = tax_obj.compute_all(cr, uid, prod.taxes_id, price, 1, product=prod.id)
-            res[prod.id] = taxes['total']
-        return res
-        
-    def _compute_margin(self, cursor, user, ids, field_name, arg, context = None):
-        """
-        Calculate the margin based on product infos. Take care of the cost_field 
-        define in product_get_cost_field. So the margin will be computed based on this 
-        field.
-        
-        We don't take care of the product price type currency to remove the dependency on
-        the sale module. We consider the cost and sale price is in the company currency.
-        
-        We take care of the default product taxes, and base our computation on total without 
-        tax.
-        
-        :return dict of dict of the form : 
-            {INT Product ID : {
-                {'margin_absolute': float, 
-                 'margin_relative': float}
-            }}
-        """
-        logger = logging.getLogger('product_standard_margin')
-        if context is None:
-            context = {}
-        res = {}
-        if not ids:
-            return res
-        for product in ids:
-            res[product] = {'margin_absolute': 0, 'margin_relative': 0}
-        for product in self.browse(cursor, user, ids):
-            cost = product.cost_price
-            sale = self._amount_tax_excluded(cursor, user, [product.id], context=context)[product.id]
-            # sale = product.list_price
-            res[product.id]['standard_margin'] = sale - cost
-            if sale == 0:
-                logger.debug("Sale price for product ID %d is 0, cannot compute margin rate...", product.id)
-                res[product.id]['standard_margin_rate'] = 999.
-            else:
-                res[product.id]['standard_margin_rate'] = (sale - cost) / sale * 100
-        return res
-
-    _columns = {
-        'standard_margin' : fields.function(_compute_margin,
-                                              method=True,
-                                              string='Theorical Margin',
-                                              digits_compute=dp.get_precision('Sale Price'),
-                                              multi ='margin',
-                                              help='Theorical Margin is [ sale price (Wo Tax) - cost price ] of the product form (not based on historical values).'
-                                              'Take care of tax include and exclude. If no sale price, the margin will be negativ.'),
-        'standard_margin_rate' : fields.function(_compute_margin,
-                                        method=True,
-                                        string='Theorical Margin (%)',
-                                        digits_compute=dp.get_precision('Sale Price'),
-                                        multi='margin',
-                                        help='Markup rate is [ Theorical Margin / sale price (Wo Tax) ] of the product form (not based on historical values).'
-                                        'Take care of tax include and exclude.. If no sale price set, will display 999.0'),
-        }
diff --git a/product_standard_margin/product_std_margin_view.xml b/product_standard_margin/product_std_margin_view.xml
deleted file mode 100644
index 4ee497e4..00000000
--- a/product_standard_margin/product_std_margin_view.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-  <data>
-    <record model="ir.ui.view" id="sale_markup_product_form">
-      <field name="name">product.markup.view.form</field>
-      <field name="type">form</field>
-      <field name="model">product.product</field>
-      <field name="inherit_id" ref="product.product_normal_form_view" />
-      <field name="arch" type="xml">
-          <group colspan="2" col="2" groups="base.group_extended" position="after">
-              <group colspan="2" col="2" groups="base.group_extended">
-                  <separator string="Margin" colspan="2"/>
-                  <field name="standard_margin" />
-                  <field name="standard_margin_rate" />
-              </group>
-          </group>
-      </field>
-    </record>
-
-  </data>
-</openerp>