Merge lp:~ajite/openobject-addons/elico-7.0-add-purchase_landed_costs_extended into lp:~openerp-community/openobject-addons/elico-7.0

[Augustin Cisterne-Kaas - www.elico-corp.com]

Added a new module for landed costs to handle different currencies.
(SQL report is still in progress since it does not handle the multi currency)

Unmerged revisions

38. By Augustin Cisterne-Kaas - www.elico-corp.com on 2014-06-19

[ADD] Purchase landed costs extended

=== added directory 'cron_watcher'
=== added file 'cron_watcher/__init__.py'
--- cron_watcher/__init__.py	1970-01-01 00:00:00 +0000
+++ cron_watcher/__init__.py	2014-06-19 02:29:14 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2014 Elico Corp. All Rights Reserved.
+#    Augustin Cisterne-Kaas <[e-mail]>
+#
+#    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 cron

=== added file 'cron_watcher/__openerp__.py'
--- cron_watcher/__openerp__.py	1970-01-01 00:00:00 +0000
+++ cron_watcher/__openerp__.py	2014-06-19 02:29:14 +0000
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2014 Elico Corp. All Rights Reserved.
+#    Augustin Cisterne-Kaas <[e-mail]>
+#
+#    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': 'Cron Watcher',
+ 'version': '0.1',
+ 'category': 'Tools',
+ 'depends': ['base', 'mail'],
+ 'author': 'Elico Corp',
+ 'license': 'AGPL-3',
+ 'website': 'https://www.elico-corp.com',
+ 'description': """
+Sends notification to a group named "Cron Watcher" when a cron job has not run
+for X minutes.
+
+X can be defined in "Settings", "Scheduler Actions", "Cron Watcher",
+"Technical Data", "Arguments"
+    * 5 minutes = (5,)
+    * 10 minutes = (10,)
+    * etc...
+""",
+ 'data': ['cron_data.xml'],
+ 'installable': True,
+ 'application': False}

=== added file 'cron_watcher/cron.py'
--- cron_watcher/cron.py	1970-01-01 00:00:00 +0000
+++ cron_watcher/cron.py	2014-06-19 02:29:14 +0000
@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2014 Elico Corp. All Rights Reserved.
+#    Augustin Cisterne-Kaas <[e-mail]>
+#
+#    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 openerp.osv import orm
+import time
+from datetime import datetime
+from openerp.tools.translate import _
+
+
+class ir_cron(orm.Model):
+    _inherit = 'ir.cron'
+
+    def _scheduler_cron_watcher(self, cr, uid, interval,
+                                domain=None, context=None):
+        interval *= 60
+        m = self.pool.get('ir.model.data')
+        cron_ids = self.search(cr, uid, [], context=context)
+        date_format = "%Y-%m-%d %H:%M:%S"
+        current_date = time.strftime(date_format)
+        current_date = datetime.strptime(current_date, date_format)
+        message_pool = self.pool.get('mail.message')
+
+        group = m.get_object(
+            cr, uid, 'cron_watcher', 'res_groups_cron_watcher')
+        admin_user = m.get_object(
+            cr, uid, 'base', 'user_root')
+        partner_ids = [(4, user.partner_id.id) for user in group.users]
+        for cron in self.browse(cr, uid, cron_ids, context=context):
+            if not cron.nextcall:
+                continue
+            cron_date = datetime.strptime(cron.nextcall, date_format)
+            delay = (current_date - cron_date).total_seconds()
+            delay_minutes = round(int(delay) / 60)
+            email = {
+                'type': 'notification',
+                'author_id': admin_user.partner_id.id,
+                'partner_ids': partner_ids,
+                'notified_partner_ids': partner_ids,
+                'model': 'ir.cron',
+                'res_id': cron.id,
+                'subject': _('Cron Watcher Alert (%s)') % cron.name,
+                'body': _(
+                    'The cron job named "%s" has been delayed for\
+                    more than %s minutes') % (cron.name, delay_minutes)
+            }
+            if delay > interval:
+                message_pool.create(cr, uid, email, context=context)

=== added file 'cron_watcher/cron_data.xml'
--- cron_watcher/cron_data.xml	1970-01-01 00:00:00 +0000
+++ cron_watcher/cron_data.xml	2014-06-19 02:29:14 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <record forcecreate="True" id="ir_cron_watcher" model="ir.cron">
+            <field name="name">Cron Watcher</field>
+            <field eval="True" name="active"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="interval_number">1</field>
+            <field name="interval_type">hours</field>
+            <field name="numbercall">-1</field>
+            <field eval="False" name="doall"/>
+            <field eval="'ir.cron'" name="model"/>
+            <field eval="'_scheduler_cron_watcher'" name="function"/>
+            <field eval="'(15,)'" name="args"/>
+        </record>
+        <record forcecreate="True" id="res_groups_cron_watcher" model="res.groups">
+            <field name="name">Cron Watcher</field>
+            <field eval="True" name="active"/>
+            <field name="users" eval="[(4, ref('base.user_root'))]" />
+        </record>
+    </data>
+</openerp>
\ No newline at end of file

=== added directory 'purchase_landed_costs'
=== added file 'purchase_landed_costs/__init__.py'
--- purchase_landed_costs/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_landed_costs/__init__.py	2014-06-19 02:29:14 +0000
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-2013 Camptocamp (<http://www.camptocamp.com>)
+#    Authors: Ferdinand Gasauer, 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 . import product
+from . import purchase
+from . import stock
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'purchase_landed_costs/__openerp__.py'
--- purchase_landed_costs/__openerp__.py	1970-01-01 00:00:00 +0000
+++ purchase_landed_costs/__openerp__.py	2014-06-19 02:29:14 +0000
@@ -0,0 +1,117 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-2013 Camptocamp (<http://www.camptocamp.com>)
+#    Authors: Ferdinand Gasauer, 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/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Purchase Landed Costs',
+    'version': '1.0.1',
+    'category': 'Warehouse Management',
+    'description': """
+Purchase Landed Costs
+=====================
+
+This module adds the possibility to include estimated landed costs to the average price computation. To define those landed costs, 
+create products for every landed costs and affect them a distribution type. Don't forget to as well assign them a specific 
+financial account (the one which will record the real cost) in order to compare at the end of the year the estimation with real
+accounting entries (see stock valuation). The landed costs is defined in purchase orders. These costs will be distributed 
+according to the distribution type defined in landed cost:
+
+ * value - example custom fees 
+ * quantity - example freight 
+
+Note : Products used to define landed cost must have a default "Distribution Type" set (Value/Quantity). 
+
+For each landed cost position (=line) define in a PO, a draft invoice can be pre-created at PO validation (an option need to 
+be checked). Doing so will allow you to see those invoices using the view invoice button directly from the PO. You can define 
+landed cost relative to a whole PO or by PO line (or both) and the system will distribute them to each line according to the 
+chosen distribution type.
+
+Note that the landed cost is always expressed in company currency.
+
+Find all landed cost here : Reporting -> Purchase -> Landed costs
+
+Stock valuation:
+----------------
+As the average price is also used for the stock valuation and because the computation is based on estimation of landed cost 
+in the PO (done at incoming shipment reception), you will have a  difference with the actual accounting bookings of landed cost. 
+Stock valuation will have to be adjusted with a manual journal entry. In order to correct that amount, make a sum of 
+estimated landed cost (landed cost position) by account and compare with the real account chart value. You can access those 
+informations through this menu: Reporting -> Purchase -> Landed costs
+
+Warning:
+--------
+
+ * Average price will be computed based on the estimation made on the PO - not from real cost. This is due to the way OpenERP
+   compute average stock : it stores the updated value at every input, no history, so no way to redefine the value afterwards. 
+   i.e.
+    - incomming 01: 100 product A at 50.- AVG = 50.-, stock = 100
+    - incomming 02: 100 product A at 60.- AVG = 55.-, stock = 200
+    - delivery 01: 50 product A AVG = 55.-, stock = 150
+    - Receive the real landed cost of 10.- for incomming 01 
+  => cannot compute back because no historical price was store for every transaction. Moreover, in OpenERP I can even 
+  set another average price for a product using the update wizard.
+
+
+ * As the price type of OpenERP is not really well handled, we need to be sure that price type of cost price in product form
+   is the same as the company one. Otherwise, when computing the AVG price, it make the convertion in company currency
+   from the price type currency. This is not related to this module, but from the core of OpenERP.
+   If you use this module in multi-company and different currency between company, you'll have to not share the product 
+   between them, even if product are the same (bug: https://bugs.launchpad.net/ocb-addons/+bug/1238525).
+
+
+TODO/Ideas:
+-----------
+ * Manage multi-currencies landed costs in PO
+ * Have the shipped date in landed cost instead of PO date for a better analysis
+ * Compute a average purchase price per products while keep cost price as it is now
+
+
+""",
+    'author': 'Camptocamp',
+    'depends': ['purchase' ],
+    'website': 'http://www.camptocamp.com',
+    'data': ['security/ir.model.access.csv',
+             'security/landed_cost_security.xml',
+             'purchase_view.xml',
+             'purchase_landed_costs_data.yml',
+            ],
+    'test': [
+        'test/landed_costs_based_on_quantity.yml',
+        'test/landed_costs_based_on_value.yml',
+        'test/landed_costs_on_qty_by_line_and_order.yml',
+        'test/landed_costs_multicurrency_pricelist.yml',
+
+        # those 2 tests here fails because of the bug regarding the price_type
+        # (https://bugs.launchpad.net/ocb-addons/+bug/1238525) and average price
+        # computation in OpenERP. I'll keep them because
+        # The bug is happening when the company has a different currency that 
+        # the price_type of the standard_price field
+        # Unless you didn't have to do that, everything work fine.
+        # they should be sovled by a way or another.
+        'test/landed_costs_multicurrency_company.yml',
+        'test/landed_costs_multicurrency_pricetype.yml',
+    ],
+    'demo': [],
+    'installable': True,
+    'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'purchase_landed_costs/i18n'
=== added file 'purchase_landed_costs/i18n/fr.po'
--- purchase_landed_costs/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ purchase_landed_costs/i18n/fr.po	2014-06-19 02:29:14 +0000
@@ -0,0 +1,418 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* purchase_landed_costs
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-10-17 09:49+0000\n"
+"PO-Revision-Date: 2014-02-06 12:55+0000\n"
+"Last-Translator: Nicolas Bessi - Camptocamp <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: 2014-02-26 07:32+0000\n"
+"X-Generator: Launchpad (build 16935)\n"
+
+#. module: purchase_landed_costs
+#: model:ir.model,name:purchase_landed_costs.model_purchase_order_line
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_position_purchase_order_line_id
+#: field:landed.cost.position,purchase_order_line_id:0
+msgid "Purchase Order Line"
+msgstr "Ligne de commande d'achat"
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_position_amount_company_currency
+#: field:landed.cost.position,amount_company_currency:0
+msgid "Amount Company Currency"
+msgstr "Montant (Devise société)"
+
+#. module: purchase_landed_costs
+#: selection:product.template,landed_cost_type:0
+msgid "None"
+msgstr "Aucun"
+
+#. module: purchase_landed_costs
+#: view:landed.cost.position:0
+msgid "Group By..."
+msgstr "Grouper Par..."
+
+#. module: purchase_landed_costs
+#: help:product.template,landed_cost_type:0
+msgid ""
+"Used if this product is landed costs: If landed costs are defined for "
+"purchase orders or pickings, this indicates how the costs are distributed to "
+"the lines"
+msgstr ""
+"Utilisé si ce produit est un coût d'acquisition: Si des coûts d'acquisition "
+"sont définis sur les commandes d'achat ou les bons de livraison, ceci "
+"indique la répartion de ces coûts sur les lignes"
+
+#. module: purchase_landed_costs
+#: view:landed.cost.position:0
+msgid "Supplier"
+msgstr "Fournisseurs"
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_position_generate_invoice
+#: field:landed.cost.position,generate_invoice:0
+msgid "Generate Invoice"
+msgstr "Auto-Générer facture"
+
+#. module: purchase_landed_costs
+#: model:ir.model,name:purchase_landed_costs.model_landed_cost_position
+msgid "landed.cost.position"
+msgstr "landed.cost.position"
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_position_account_id
+#: field:landed.cost.position,account_id:0
+msgid "Fiscal Account"
+msgstr "Compte"
+
+#. module: purchase_landed_costs
+#: help:landed.cost.position,partner_id:0
+msgid "The supplier of this cost component."
+msgstr "Fournisseur lié à ce coût d'acquisition"
+
+#. module: purchase_landed_costs
+#: help:landed.cost.position,amount_total:0
+msgid ""
+"This field represent the total amount of this position regarding a whole "
+"order. By summing it, you'll have the total landed cost for the order (in "
+"his currency)"
+msgstr ""
+"Ce champs représente de montant total de ce poste par rapport à l'ensemble "
+"du bon de commande. En l'additionnant, vous obtiendrez le total des coûts "
+"d'acquisition pour ce bon de commande."
+
+#. module: purchase_landed_costs
+#: model:ir.model,name:purchase_landed_costs.model_product_product
+msgid "Product"
+msgstr "Article"
+
+#. module: purchase_landed_costs
+#: code:addons/purchase_landed_costs/product.py:66
+#, python-format
+msgid "Define expense account for this company: \"%s\" (id:%d)."
+msgstr "Détermine le compte de charge pour cette société: \"%s\" (id:%d)."
+
+#. module: purchase_landed_costs
+#: code:addons/purchase_landed_costs/purchase.py:493
+#, python-format
+msgid "Define purchase journal for this company: \"%s\" (id:%d)."
+msgstr "Détermine le journal d'achat pour cette société: \"%s\" (id:%d)."
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_purchase_order_landed_cost_line_ids
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_purchase_order_line_landed_costs
+#: view:landed.cost.position:0
+#: field:purchase.order,landed_cost_line_ids:0
+#: field:purchase.order.line,landed_costs:0
+msgid "Landed Costs"
+msgstr "Coûts d'acquisition"
+
+#. module: purchase_landed_costs
+#: help:landed.cost.position,amount_company_currency:0
+msgid ""
+"Landed cost for stock valuation (expressed in company currency). It will be "
+"added to the price of the supplier price."
+msgstr ""
+"Coût d'acquisition pour la valorisation des stocks (exprimés en devise de la "
+"société). S'ajoutera au coût de revient."
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_position_company_id
+#: field:landed.cost.position,company_id:0
+msgid "Company"
+msgstr "Société"
+
+#. module: purchase_landed_costs
+#: help:landed.cost.position,amount:0
+msgid "Landed cost expressed in PO currency used to fullfil landed cost."
+msgstr ""
+"Coûts d'acquisition exprimés dans la même devise que la commande fournisseur."
+
+#. module: purchase_landed_costs
+#: selection:landed.cost.distribution.type,apply_on:0
+msgid "Order"
+msgstr "Commande"
+
+#. module: purchase_landed_costs
+#: model:ir.model,name:purchase_landed_costs.model_landed_cost_distribution_type
+msgid "landed.cost.distribution.type"
+msgstr "landed.cost.distribution.type"
+
+#. module: purchase_landed_costs
+#: model:ir.actions.act_window,name:purchase_landed_costs.act_po_2_landed_costs
+msgid "Related Landed Costs"
+msgstr "Coûts d'acquisition liés"
+
+#. module: purchase_landed_costs
+#: help:landed.cost.distribution.type,apply_on:0
+msgid "Defines if this distribution type Applied on order or line level."
+msgstr "Defines if this distribution type Applied on order or line level."
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_position_date_po
+#: view:landed.cost.position:0
+#: field:landed.cost.position,date_po:0
+msgid "Date"
+msgstr "Date"
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_purchase_order_landed_cost_base_value
+#: field:purchase.order,landed_cost_base_value:0
+msgid "Landed Costs Base Value"
+msgstr "Coûts d'acquisition valeur de base"
+
+#. module: purchase_landed_costs
+#: selection:landed.cost.distribution.type,apply_on:0
+msgid "Line"
+msgstr "Ligne"
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_stock_move_price_unit_net
+#: field:stock.move,price_unit_net:0
+msgid "Purchase Price"
+msgstr "Prix d'achat"
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_purchase_order_landing_cost_lines
+#: field:purchase.order,landing_cost_lines:0
+msgid "Landing Cost Lines"
+msgstr "Lignes de coût d'acquisition"
+
+#. module: purchase_landed_costs
+#: view:landed.cost.position:0
+msgid "Purchase"
+msgstr "Achat"
+
+#. module: purchase_landed_costs
+#: view:landed.cost.position:0
+msgid "Account"
+msgstr "Compte"
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_distribution_type_name
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_position_distribution_type_id
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_product_template_landed_cost_type
+#: field:landed.cost.distribution.type,name:0
+#: view:landed.cost.position:0
+#: field:landed.cost.position,distribution_type_id:0
+#: field:product.template,landed_cost_type:0
+msgid "Distribution Type"
+msgstr "Type de Distribution"
+
+#. module: purchase_landed_costs
+#: view:landed.cost.position:0
+msgid "Total amount"
+msgstr "Montant Total"
+
+#. module: purchase_landed_costs
+#: model:ir.actions.act_window,help:purchase_landed_costs.action_landed_cost_report_all
+msgid ""
+"Landed cost Analysis allows you to easily check and analyse your estimated "
+"landed costs."
+msgstr ""
+"L'analyse des coûts d'acquisition permet de contrôler l'ensemble des "
+"estimations de coût d'acquisition des commandes d'achat."
+
+#. module: purchase_landed_costs
+#: selection:landed.cost.distribution.type,landed_cost_type:0
+#: selection:product.template,landed_cost_type:0
+msgid "Value"
+msgstr "Valeur"
+
+#. module: purchase_landed_costs
+#: view:landed.cost.position:0
+msgid "Purchase Line"
+msgstr "Ligne d'achat"
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_distribution_type_landed_cost_type
+#: field:landed.cost.distribution.type,landed_cost_type:0
+msgid "Product Landed Cost Type"
+msgstr "Type de Côut d'acquisition"
+
+#. module: purchase_landed_costs
+#: model:ir.model,name:purchase_landed_costs.model_purchase_order
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_position_purchase_order_id
+#: field:landed.cost.position,purchase_order_id:0
+msgid "Purchase Order"
+msgstr "Bon de commande"
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_purchase_order_line_landed_cost_line_ids
+#: field:purchase.order.line,landed_cost_line_ids:0
+msgid "Landed Costs Positions"
+msgstr "Poste de coûts d'acquisition"
+
+#. module: purchase_landed_costs
+#: code:addons/purchase_landed_costs/product.py:65
+#: code:addons/purchase_landed_costs/purchase.py:492
+#, python-format
+msgid "Error!"
+msgstr "Erreur!"
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_position_amount
+#: field:landed.cost.position,amount:0
+msgid "Amount"
+msgstr "Montant"
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_purchase_order_quantity_total
+#: field:purchase.order,quantity_total:0
+msgid "Total Quantity"
+msgstr "Quantité totale"
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_position_amount_total_comp_currency
+#: field:landed.cost.position,amount_total_comp_currency:0
+msgid "Amount Total Company Currency"
+msgstr "Montant Total (Devise société)"
+
+#. module: purchase_landed_costs
+#: model:ir.model,name:purchase_landed_costs.model_stock_partial_picking
+msgid "Partial Picking Processing Wizard"
+msgstr "Assistant de livraison partielle"
+
+#. module: purchase_landed_costs
+#: help:landed.cost.position,date_po:0
+msgid "Date of the related PO"
+msgstr "Date du bon de commande lié"
+
+#. module: purchase_landed_costs
+#: help:landed.cost.position,generate_invoice:0
+msgid ""
+"If ticked, this will generate a draft invoice at the PO confirmation for "
+"this landed cost position from the related partner. If not, no invoice will "
+"be generated, but the cost will be included for the average price "
+"computation."
+msgstr ""
+"Si coché, une facture brouillon (donc modifiable) sera pré-générée lors de "
+"la confirmation du bon de commande pour cette position de coût d'acquisition "
+"graĉe au fournisseur lié. Si non cochée, aucune facture ne sera pré-générée "
+"mais le coût de revient sera calculé en tenant compte des coûts d'acquisiton "
+"tout de même."
+
+#. module: purchase_landed_costs
+#: help:landed.cost.position,distribution_type_id:0
+msgid ""
+"Defines if the amount is to be calculated for each quantity or an absolute "
+"value"
+msgstr ""
+"Détermine si le montant du coût d'acquisition se calcule par quantité ou si "
+"il s'agit d'une simple valeur à ajouter"
+
+#. module: purchase_landed_costs
+#: model:ir.actions.act_window,name:purchase_landed_costs.action_landed_cost_report_all
+#: model:ir.ui.menu,name:purchase_landed_costs.menu_action_landed_cost_report_all
+msgid "Landed Costs Analysis"
+msgstr "Analyse des coûts d'acquisiton"
+
+#. module: purchase_landed_costs
+#: selection:landed.cost.distribution.type,landed_cost_type:0
+#: selection:product.template,landed_cost_type:0
+msgid "Quantity"
+msgstr "Quantité"
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_position_product_id
+#: view:landed.cost.position:0
+#: field:landed.cost.position,product_id:0
+msgid "Landed Cost Name"
+msgstr "Nom du coût d'acquisiton"
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_purchase_order_landed_cost_base_quantity
+#: field:purchase.order,landed_cost_base_quantity:0
+msgid "Landed Costs Base Quantity"
+msgstr "Quantité de base du coûts d'acquisiton"
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_purchase_order_line_landing_costs_order
+#: field:purchase.order.line,landing_costs_order:0
+msgid "Landing Costs from Order"
+msgstr "Coûts d'acquisiton de la commande"
+
+#. module: purchase_landed_costs
+#: model:ir.model,name:purchase_landed_costs.model_stock_move
+msgid "Stock Move"
+msgstr "Mouvement de stock"
+
+#. module: purchase_landed_costs
+#: model:ir.model,name:purchase_landed_costs.model_product_template
+msgid "Product Template"
+msgstr "Modèle d'article"
+
+#. module: purchase_landed_costs
+#: help:landed.cost.distribution.type,landed_cost_type:0
+msgid "Refer to the product landed cost type."
+msgstr "En référence au type de coût d'acquisition."
+
+#. module: purchase_landed_costs
+#: help:stock.move,price_unit_net:0
+msgid ""
+"This is the net purchase price, without landed cost as the price include "
+"landed price has been stored in price_unit field"
+msgstr ""
+"Il s'agit du prix d'achat net (sans coûts d'acquisiton). Le coût de revient "
+"(avec coûts d'acquisiton) est stocké dans le champs Prix Unitaire"
+
+#. module: purchase_landed_costs
+#: help:landed.cost.position,amount_total_comp_currency:0
+msgid ""
+"This field represent the total amount of this position regarding a whole "
+"order. By summing it, you'll have the total landed cost for the order (in "
+"company reference currency)."
+msgstr ""
+"Représente le montant total de ce poste au niveau de la commande (donc "
+"ignore ce poste au niveau des lignes de commande). Il est exprimé en devise "
+"de la société."
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_distribution_type_apply_on
+#: field:landed.cost.distribution.type,apply_on:0
+msgid "Applied on"
+msgstr "S'applique sur"
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_position_partner_id
+#: field:landed.cost.position,partner_id:0
+msgid "Partner"
+msgstr "Partenaire"
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_purchase_order_landed_cost
+#: field:purchase.order,landed_cost:0
+msgid "Landed Costs Total Untaxed"
+msgstr "Coûts d'acquisiton H.T total"
+
+#. module: purchase_landed_costs
+#: view:purchase.order:0
+msgid "Open All Landed costs"
+msgstr "Ouvrir tout les coûts d'acquisition"
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_purchase_order_line_landing_costs
+#: view:landed.cost.position:0
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,landing_costs:0
+msgid "Landing Costs"
+msgstr "Coûts d'acquisiton"
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_position_amount_total
+#: field:landed.cost.position,amount_total:0
+msgid "Amount Total"
+msgstr "Montant total"
+
+#. module: purchase_landed_costs
+#: view:landed.cost.position:0
+msgid "Purchase Orders"
+msgstr "Bons de commande"

=== added file 'purchase_landed_costs/i18n/purchase_landed_costs.pot'
--- purchase_landed_costs/i18n/purchase_landed_costs.pot	1970-01-01 00:00:00 +0000
+++ purchase_landed_costs/i18n/purchase_landed_costs.pot	2014-06-19 02:29:14 +0000
@@ -0,0 +1,374 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* purchase_landed_costs
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-10-17 09:49+0000\n"
+"PO-Revision-Date: 2013-10-17 09:49+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: purchase_landed_costs
+#: model:ir.model,name:purchase_landed_costs.model_purchase_order_line
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_position_purchase_order_line_id
+#: field:landed.cost.position,purchase_order_line_id:0
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_position_amount_company_currency
+#: field:landed.cost.position,amount_company_currency:0
+msgid "Amount Company Currency"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: selection:product.template,landed_cost_type:0
+msgid "None"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: view:landed.cost.position:0
+msgid "Group By..."
+msgstr ""
+
+#. module: purchase_landed_costs
+#: help:product.template,landed_cost_type:0
+msgid "Used if this product is landed costs: If landed costs are defined for purchase orders or pickings, this indicates how the costs are distributed to the lines"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: view:landed.cost.position:0
+msgid "Supplier"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_position_generate_invoice
+#: field:landed.cost.position,generate_invoice:0
+msgid "Generate Invoice"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.model,name:purchase_landed_costs.model_landed_cost_position
+msgid "landed.cost.position"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_position_account_id
+#: field:landed.cost.position,account_id:0
+msgid "Fiscal Account"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: help:landed.cost.position,partner_id:0
+msgid "The supplier of this cost component."
+msgstr ""
+
+#. module: purchase_landed_costs
+#: help:landed.cost.position,amount_total:0
+msgid "This field represent the total amount of this position regarding a whole order. By summing it, you'll have the total landed cost for the order (in his currency)"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.model,name:purchase_landed_costs.model_product_product
+msgid "Product"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: code:addons/purchase_landed_costs/product.py:66
+#, python-format
+msgid "Define expense account for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: purchase_landed_costs
+#: code:addons/purchase_landed_costs/purchase.py:493
+#, python-format
+msgid "Define purchase journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_purchase_order_landed_cost_line_ids
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_purchase_order_line_landed_costs
+#: view:landed.cost.position:0
+#: field:purchase.order,landed_cost_line_ids:0
+#: field:purchase.order.line,landed_costs:0
+msgid "Landed Costs"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: help:landed.cost.position,amount_company_currency:0
+msgid "Landed cost for stock valuation (expressed in company currency). It will be added to the price of the supplier price."
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_position_company_id
+#: field:landed.cost.position,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: help:landed.cost.position,amount:0
+msgid "Landed cost expressed in PO currency used to fullfil landed cost."
+msgstr ""
+
+#. module: purchase_landed_costs
+#: selection:landed.cost.distribution.type,apply_on:0
+msgid "Order"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.model,name:purchase_landed_costs.model_landed_cost_distribution_type
+msgid "landed.cost.distribution.type"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.actions.act_window,name:purchase_landed_costs.act_po_2_landed_costs
+msgid "Related Landed Costs"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: help:landed.cost.distribution.type,apply_on:0
+msgid "Defines if this distribution type Applied on order or line level."
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_position_date_po
+#: view:landed.cost.position:0
+#: field:landed.cost.position,date_po:0
+msgid "Date"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_purchase_order_landed_cost_base_value
+#: field:purchase.order,landed_cost_base_value:0
+msgid "Landed Costs Base Value"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: selection:landed.cost.distribution.type,apply_on:0
+msgid "Line"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_stock_move_price_unit_net
+#: field:stock.move,price_unit_net:0
+msgid "Purchase Price"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_purchase_order_landing_cost_lines
+#: field:purchase.order,landing_cost_lines:0
+msgid "Landing Cost Lines"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: view:landed.cost.position:0
+msgid "Purchase"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: view:landed.cost.position:0
+msgid "Account"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_distribution_type_name
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_position_distribution_type_id
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_product_template_landed_cost_type
+#: field:landed.cost.distribution.type,name:0
+#: view:landed.cost.position:0
+#: field:landed.cost.position,distribution_type_id:0
+#: field:product.template,landed_cost_type:0
+msgid "Distribution Type"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: view:landed.cost.position:0
+msgid "Total amount"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.actions.act_window,help:purchase_landed_costs.action_landed_cost_report_all
+msgid "Landed cost Analysis allows you to easily check and analyse your estimated landed costs."
+msgstr ""
+
+#. module: purchase_landed_costs
+#: selection:landed.cost.distribution.type,landed_cost_type:0
+#: selection:product.template,landed_cost_type:0
+msgid "Value"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: view:landed.cost.position:0
+msgid "Purchase Line"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_distribution_type_landed_cost_type
+#: field:landed.cost.distribution.type,landed_cost_type:0
+msgid "Product Landed Cost Type"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.model,name:purchase_landed_costs.model_purchase_order
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_position_purchase_order_id
+#: field:landed.cost.position,purchase_order_id:0
+msgid "Purchase Order"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_purchase_order_line_landed_cost_line_ids
+#: field:purchase.order.line,landed_cost_line_ids:0
+msgid "Landed Costs Positions"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: code:addons/purchase_landed_costs/product.py:65
+#: code:addons/purchase_landed_costs/purchase.py:492
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_position_amount
+#: field:landed.cost.position,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_purchase_order_quantity_total
+#: field:purchase.order,quantity_total:0
+msgid "Total Quantity"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_position_amount_total_comp_currency
+#: field:landed.cost.position,amount_total_comp_currency:0
+msgid "Amount Total Company Currency"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.model,name:purchase_landed_costs.model_stock_partial_picking
+msgid "Partial Picking Processing Wizard"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: help:landed.cost.position,date_po:0
+msgid "Date of the related PO"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: help:landed.cost.position,generate_invoice:0
+msgid "If ticked, this will generate a draft invoice at the PO confirmation for this landed cost position from the related partner. If not, no invoice will be generated, but the cost will be included for the average price computation."
+msgstr ""
+
+#. module: purchase_landed_costs
+#: help:landed.cost.position,distribution_type_id:0
+msgid "Defines if the amount is to be calculated for each quantity or an absolute value"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.actions.act_window,name:purchase_landed_costs.action_landed_cost_report_all
+#: model:ir.ui.menu,name:purchase_landed_costs.menu_action_landed_cost_report_all
+msgid "Landed Costs Analysis"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: selection:landed.cost.distribution.type,landed_cost_type:0
+#: selection:product.template,landed_cost_type:0
+msgid "Quantity"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_position_product_id
+#: view:landed.cost.position:0
+#: field:landed.cost.position,product_id:0
+msgid "Landed Cost Name"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_purchase_order_landed_cost_base_quantity
+#: field:purchase.order,landed_cost_base_quantity:0
+msgid "Landed Costs Base Quantity"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_purchase_order_line_landing_costs_order
+#: field:purchase.order.line,landing_costs_order:0
+msgid "Landing Costs from Order"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.model,name:purchase_landed_costs.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.model,name:purchase_landed_costs.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: help:landed.cost.distribution.type,landed_cost_type:0
+msgid "Refer to the product landed cost type."
+msgstr ""
+
+#. module: purchase_landed_costs
+#: help:stock.move,price_unit_net:0
+msgid "This is the net purchase price, without landed cost as the price include landed price has been stored in price_unit field"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: help:landed.cost.position,amount_total_comp_currency:0
+msgid "This field represent the total amount of this position regarding a whole order. By summing it, you'll have the total landed cost for the order (in company reference currency)."
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_distribution_type_apply_on
+#: field:landed.cost.distribution.type,apply_on:0
+msgid "Applied on"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_position_partner_id
+#: field:landed.cost.position,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_purchase_order_landed_cost
+#: field:purchase.order,landed_cost:0
+msgid "Landed Costs Total Untaxed"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: view:purchase.order:0
+msgid "Open All Landed costs"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_purchase_order_line_landing_costs
+#: view:landed.cost.position:0
+#: view:purchase.order:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,landing_costs:0
+msgid "Landing Costs"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: model:ir.model.fields,field_description:purchase_landed_costs.field_landed_cost_position_amount_total
+#: field:landed.cost.position,amount_total:0
+msgid "Amount Total"
+msgstr ""
+
+#. module: purchase_landed_costs
+#: view:landed.cost.position:0
+msgid "Purchase Orders"
+msgstr ""
+

=== added file 'purchase_landed_costs/product.py'
--- purchase_landed_costs/product.py	1970-01-01 00:00:00 +0000
+++ purchase_landed_costs/product.py	2014-06-19 02:29:14 +0000
@@ -0,0 +1,76 @@
+#  -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-2013 Camptocamp (<http://www.camptocamp.com>)
+#    Authors: Ferdinand Gasauer, 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 openerp.osv import orm, fields
+from openerp.tools.translate import _
+
+
+class product_template(orm.Model):
+    _inherit = "product.template"
+
+    _columns = {
+        'landed_cost_type': fields.selection(
+            [('value', 'Value'),
+             ('per_unit', 'Quantity'),
+             ('none', 'None')],
+            'Distribution Type',
+            help="Used if this product is landed costs: "
+                 "If landed costs are defined for purchase orders or pickings, "
+                 "this indicates how the costs are distributed to the lines"),
+    }
+
+    _defaults = {
+        'landed_cost_type': lambda self, cr, uid, context: context.get('landed_cost_type')
+    }
+
+
+class product_product(orm.Model):
+    _inherit = "product.product"
+
+    def _choose_exp_account_from(self, cr, uid, product, fiscal_position=False,
+                                 context=None):
+        """ Method to compute the expense account to chose based on product and 
+        fiscal position.
+
+        Used in invoice creation and on_change of landed costs.
+        Taken from method : _choose_account_from_po_line of purchase.py in
+        purchase module.
+
+        """
+        fiscal_obj = self.pool.get('account.fiscal.position')
+        property_obj = self.pool.get('ir.property')
+        if product:
+            acc_id = product.property_account_expense.id
+            if not acc_id:
+                acc_id = product.categ_id.property_account_expense_categ.id
+            if not acc_id:
+                raise orm.except_orm(
+                    _('Error!'),
+                    _('Define expense account for this company: "%s" (id:%d).')
+                    % (product.name, product.id,))
+        else:
+            acc_id = property_obj.get(cr, uid,
+                                      'property_account_expense_categ',
+                                      'product.category').id
+        return fiscal_obj.map_account(cr, uid, fiscal_position, acc_id)
+
+

=== added file 'purchase_landed_costs/purchase.py'
--- purchase_landed_costs/purchase.py	1970-01-01 00:00:00 +0000
+++ purchase_landed_costs/purchase.py	2014-06-19 02:29:14 +0000
@@ -0,0 +1,632 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-2013 Camptocamp (<http://www.camptocamp.com>)
+#    Authors: Ferdinand Gasauer, 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 openerp.osv import orm, fields
+import openerp.addons.decimal_precision as dp
+from openerp.tools.translate import _
+import logging
+
+_logger = logging.getLogger(__name__)
+
+
+class landed_cost_distribution_type(orm.Model):
+    """ This is a model to give how we should distribute the amount given
+    for a landed costs. At the begining we use a selection field, but it
+    was impossible to filter it depending on the context (in a line or
+    on order). So we replaced it by this object, adding is_* method to
+    deal with. Base distribution are defined in YML file.
+
+    """
+
+    _name = "landed.cost.distribution.type"
+
+    _columns = {
+        'name': fields.char('Distribution Type', required=True),
+        'apply_on': fields.selection(
+            [('line', 'Line'),
+             ('order', 'Order')],
+            'Applied on',
+            required=True,
+            help="Defines if this distribution type Applied "
+                 "on order or line level."),
+        'landed_cost_type': fields.selection(
+            [('value', 'Value'),
+             ('per_unit', 'Quantity')],
+            'Product Landed Cost Type',
+            help="Refer to the product landed cost type."),
+    }
+
+
+class landed_cost_position(orm.Model):
+    """ The landed cost position represent a direct cost for the delivery
+    of the goods puchased. It can be from a different partner than the
+    original supplier, like transport. Cost will be re-affected to each
+    PO line in respect of the distribution method selected. The average
+    price computation for the product will take those direct costs into
+    account.
+
+    """
+
+    _name = "landed.cost.position"
+
+    def _get_company_currency_from_landed_cost(self, cr, uid, landed_cost,
+                                               amount, context=None):
+        """ Return the amount in company currency by looking at the po.
+
+        Always return a value, even if company currency = PO one.
+
+        :param browse_record landed_cost: Landed cost position browse record
+        :param float value to convert
+        :return: Float value amount in company currency converted at po date
+
+        """
+        cur_obj = self.pool.get('res.currency')
+        result = amount
+        # In some cases, po is not set, we must take it back from po_line
+        if landed_cost.purchase_order_id:
+            po = landed_cost.purchase_order_id
+        else:
+            po = landed_cost.purchase_order_line_id.order_id
+        if po:
+            cmp_cur_id = po.company_id.currency_id.id
+            po_cur_id = po.pricelist_id.currency_id.id
+            if cmp_cur_id != po_cur_id:
+                ctx = context.copy()
+                ctx['date'] = landed_cost.date_po or False
+                result = cur_obj.compute(cr, uid,
+                                         po_cur_id,
+                                         cmp_cur_id,
+                                         amount,
+                                         context=ctx)
+        return result
+
+    def _get_total_amount(self, cr, uid, landed_cost, context=None):
+        """ We should have a field that is the computed value (total
+        costs that land) e.g. if it's related to a line and per_unit =>
+        I want for the reporting the total line landed cost and multiply
+        the quantity by given amount.
+
+        :param browse_record landed_cost: Landed cost position browse record
+        :return total value of this landed cost position
+
+        """
+        vals_po_currency = 0.0
+        if (landed_cost.purchase_order_line_id and
+                landed_cost.distribution_type_id.landed_cost_type == 'per_unit'):
+            vals_po_currency = (landed_cost.amount *
+                                landed_cost.purchase_order_line_id.product_qty)
+        else:
+            vals_po_currency = landed_cost.amount
+        return vals_po_currency
+
+    def _get_amounts(self, cr, uid, ids, field_name, arg, context=None):
+        if not ids:
+            return {}
+        result = {}
+        for landed_cost in self.browse(cr, uid, ids, context=context):
+            val_comp_currency = self._get_company_currency_from_landed_cost(
+                cr, uid, landed_cost, landed_cost.amount, context=context)
+            val_total = self._get_total_amount(cr, uid, landed_cost,
+                                               context=context)
+            val_total_comp_currency = self._get_company_currency_from_landed_cost(
+                cr, uid, landed_cost, val_total, context=context)
+            amounts = {
+                'amount_company_currency': val_comp_currency,
+                'amount_total': val_total,
+                'amount_total_comp_currency': val_total_comp_currency
+            }
+            result[landed_cost.id] = amounts
+        return result
+
+    def _get_po(self, cr, uid, ids, context=None):
+        landed_obj = self.pool.get('landed.cost.position')
+        return landed_obj.search(cr, uid,
+                                 [('purchase_order_id', 'in', ids)],
+                                 context=context)
+
+    _columns = {
+        'product_id': fields.many2one(
+            'product.product',
+            'Landed Cost Name',
+            required=True,
+            domain=[('landed_cost_type', '!=', False)]),
+        'account_id': fields.many2one(
+            'account.account',
+            'Fiscal Account',
+            required=True,),
+        'partner_id': fields.many2one(
+            'res.partner',
+            'Partner',
+            help="The supplier of this cost component.",
+            required=True),
+        'distribution_type_id': fields.many2one(
+            'landed.cost.distribution.type',
+            'Distribution Type',
+            required=True,
+            help="Defines if the amount is to be calculated for each quantity "
+                 "or an absolute value"),
+        'purchase_order_line_id': fields.many2one(
+            'purchase.order.line',
+            'Purchase Order Line'),
+        'purchase_order_id': fields.many2one('purchase.order', 'Purchase Order'),
+        'generate_invoice': fields.boolean(
+            'Generate Invoice',
+            help="If ticked, this will generate a draft invoice at the "
+                 "PO confirmation for this landed cost position from the "
+                 "related partner. If not, no invoice will be generated, "
+                 "but the cost will be included for the average price "
+                 "computation."),
+        'amount': fields.float(
+            'Amount',
+            required=True,
+            digits_compute=dp.get_precision('Purchase Price'),
+            help="Landed cost expressed in PO currency used "
+                 "to fullfil landed cost."),
+        'amount_company_currency': fields.function(
+            _get_amounts,
+            type="float",
+            multi='compute_amounts',
+            string='Amount Company Currency',
+            # Use Account as it's for comparison with financial accounting
+            digits_compute=dp.get_precision('Account'),
+            store={
+                'purchase.order': (_get_po,
+                                   ['pricelist_id', 'company_id'], 50),
+                'landed.cost.position': (lambda self, cr, uid, ids, c=None: ids,
+                                          ['amount', 'purchase_order_id'], 10),
+            },
+            help="Landed cost for stock valuation (expressed in company currency). "
+                 "It will be added to the price of the supplier price."),
+        'amount_total': fields.function(
+            _get_amounts,
+            type="float",
+            multi='compute_amounts',
+            digits_compute=dp.get_precision('Purchase Price'),
+            string='Amount Total',
+            help="This field represent the total amount of this position "
+                 "regarding a whole order. By summing it, you'll have the total "
+                 "landed cost for the order (in his currency)",
+            store={
+                'purchase.order': (_get_po,
+                                   ['pricelist_id', 'company_id'], 50),
+                'landed.cost.position': (lambda self, cr, uid, ids, c=None: ids,
+                                          ['amount', 'purchase_order_id'], 10)
+            }),
+        'amount_total_comp_currency': fields.function(
+            _get_amounts,
+            type="float",
+            multi='compute_amounts',
+            digits_compute=dp.get_precision('Account'),
+            string='Amount Total Company Currency',
+            help="This field represent the total amount of this position "
+                 "regarding a whole order. By summing it, you'll have the total "
+                 "landed cost for the order (in company reference currency).",
+            store={
+                'purchase.order': (_get_po,
+                                   ['pricelist_id', 'company_id'], 50),
+                'landed.cost.position': (lambda self, cr, uid, ids, c=None: ids,
+                                          ['amount', 'purchase_order_id'], 10)
+            }),
+        'date_po': fields.related(
+            'purchase_order_id', 'date_order',
+            type='date',
+            string='Date',
+            store=True,
+            readonly=True,
+            help="Date of the related PO"),
+        'company_id': fields.related(
+            'purchase_order_id', 'company_id',
+            type='many2one',
+            relation='res.company',
+            string='Company',
+            store=True,
+            readonly=True),
+      }
+
+    _default = {
+        'generate_invoice': False,
+    }
+
+    def write(self, cr, uid, ids, vals, context=None):
+        """ Add the purchase_order_id if only linked to a line """
+        if vals.get('purchase_order_line_id'):
+            po_line_obj = self.pool.get('purchase.order.line')
+            line_id = vals['purchase_order_line_id']
+            po = po_line_obj.browse(cr, uid, line_id, context=context).order_id
+            vals['purchase_order_id'] = po.id
+        return super(landed_cost_position, self).write(
+            cr, uid, ids, vals, context=context)
+
+    def create(self, cr, uid, vals, context=None):
+        """ Add the purchase_order_id if only linked to a line """
+        if vals.get('purchase_order_line_id'):
+            po_line_obj = self.pool.get('purchase.order.line')
+            line_id = vals['purchase_order_line_id']
+            po = po_line_obj.browse(cr, uid, line_id, context=context).order_id
+            vals['purchase_order_id'] = po.id
+        return super(landed_cost_position, self).create(
+            cr, uid, vals, context=context)
+
+    def onchange_product_id(self, cr, uid, ids, product_id,
+                            purchase_order_id=False, context=None):
+        """ Give the default value for the distribution type depending
+        on the setting of the product and the use case: line or order
+        position.
+
+         """
+        res = {}
+        fiscal_position = False
+        landed_cost_type = False
+        # order or line depending on which view we are
+        if purchase_order_id:
+            apply_on = 'order'
+            po_obj = self.pool.get('purchase.order')
+            po = po_obj.browse(cr, uid, purchase_order_id, context=context)
+            fiscal_position = po.fiscal_position or False
+        else:
+            apply_on = 'line'
+        if not product_id:
+            return res
+        prod_obj = self.pool.get('product.product')
+        dist_type_obj = self.pool.get('landed.cost.distribution.type')
+        prod = prod_obj.browse(cr, uid, [product_id], context=context)[0]
+        account_id = prod_obj._choose_exp_account_from(
+            cr, uid, prod, fiscal_position=fiscal_position, context=context)
+        if prod.landed_cost_type in ('per_unit', 'value'):
+            landed_cost_type = dist_type_obj.search(
+                cr, uid,
+                [('apply_on', '=', apply_on),
+                 ('landed_cost_type', '=', prod.landed_cost_type)],
+                context=context)[0]
+        value = {
+            'distribution_type_id': landed_cost_type,
+            'account_id': account_id,
+            'partner_id': prod.seller_id and prod.seller_id.id or False
+        }
+        res = {'value': value}
+        return res
+
+
+class purchase_order_line(orm.Model):
+    _inherit = "purchase.order.line"
+
+    def _landing_cost(self, cr, uid, ids, name, args, context=None):
+        if not ids:
+            return {}
+        result = {}
+        # landed costs for the line
+        for line in self.browse(cr, uid, ids, context=context):
+            landed_costs = 0.0
+            if line.landed_cost_line_ids:
+                for costs in line.landed_cost_line_ids:
+                    if (costs.distribution_type_id.landed_cost_type == 'value' and
+                            costs.distribution_type_id.apply_on == 'line'):
+                        landed_costs += costs.amount
+                    else:
+                        landed_costs += costs.amount * line.product_qty
+            result[line.id] = landed_costs
+        return result
+
+    def _landing_cost_order(self, cr, uid, ids, name, args, context=None):
+        if not ids:
+            return {}
+        result = {}
+        lines = self.browse(cr, uid, ids,  context=context)
+        # Landed costs line by line
+        for line in lines:
+            landed_costs = 0.0
+            order = line.order_id
+            # distribution of landed costs of PO
+            if order.landed_cost_line_ids:
+                # Base value (Absolute Value)
+                if order.landed_cost_base_value:
+                    try:
+                        landed_costs += (order.landed_cost_base_value /
+                                         order.amount_untaxed *
+                                         line.price_subtotal)
+                    # We ignore the zero division error and doesn't sum
+                    # matter of function filed computation order
+                    except ZeroDivisionError:
+                        pass
+                # Base quantity (Per Quantity)
+                if order.landed_cost_base_quantity:
+                    try:
+                        landed_costs += (order.landed_cost_base_quantity /
+                                         order.quantity_total *
+                                         line.product_qty)
+                    # We ignore the zero division error and doesn't sum
+                    # matter of function filed computation order
+                    except ZeroDivisionError:
+                        pass
+            result[line.id] = landed_costs
+        return result
+
+    def _landed_cost(self, cr, uid, ids, name, args, context=None):
+        if not ids : return {}
+        result = {}
+        # landed costs for the line
+        for line in self.browse(cr, uid, ids, context=context):
+            landed_costs = 0.0
+            landed_costs += (line.price_subtotal +
+                             line.landing_costs + line.landing_costs_order)
+            result[line.id] = landed_costs
+        return result
+
+    _columns = {
+        'landed_cost_line_ids': fields.one2many(
+            'landed.cost.position',
+            'purchase_order_line_id',
+            'Landed Costs Positions'),
+        'landing_costs': fields.function(
+            _landing_cost,
+            digits_compute=dp.get_precision('Account'),
+            string='Landing Costs'),
+        'landing_costs_order': fields.function(
+            _landing_cost_order,
+            digits_compute=dp.get_precision('Account'),
+            string='Landing Costs from Order'),
+        'landed_costs': fields.function(
+            _landed_cost,
+            digits_compute=dp.get_precision('Account'),
+            string='Landed Costs'),
+    }
+
+
+class purchase_order(orm.Model):
+    _inherit = "purchase.order"
+
+    def _landed_cost_base_value(self, cr, uid, ids, name, args, context=None):
+        if not ids:
+            return {}
+        result = {}
+        landed_costs_base_value = 0.0
+        for line in self.browse(cr, uid, ids, context=context):
+            if line.landed_cost_line_ids:
+                for costs in line.landed_cost_line_ids:
+                    if (costs.distribution_type_id.landed_cost_type == 'value' and
+                            costs.distribution_type_id.apply_on == 'order'):
+                        landed_costs_base_value += costs.amount
+            result[line.id] = landed_costs_base_value
+        return result
+
+    def _landed_cost_base_quantity(self, cr, uid, ids, name, args, context=None):
+        if not ids:
+            return {}
+        result = {}
+        landed_costs_base_quantity = 0.0
+        for line in self.browse(cr, uid, ids, context=context):
+            if line.landed_cost_line_ids:
+                for costs in line.landed_cost_line_ids:
+                    if (costs.distribution_type_id.landed_cost_type == 'per_unit' and
+                            costs.distribution_type_id.apply_on == 'order'):
+                         landed_costs_base_quantity += costs.amount
+            result[line.id] = landed_costs_base_quantity
+        return result
+
+    def _quantity_total(self, cr, uid, ids, name, args, context=None):
+        if not ids:
+            return {}
+        result = {}
+        quantity_total = 0.0
+        for line in self.browse(cr, uid, ids, context=context):
+            if line.order_line:
+                for pol in line.order_line:
+                    if pol.product_qty > 0.0:
+                         quantity_total += pol.product_qty
+            result[line.id] = quantity_total
+        return result
+
+    def _landed_cost(self, cr, uid, ids, name, args, context=None):
+        if not ids:
+            return {}
+        result = {}
+        landed_costs = 0.0
+        # landed costs for the line
+        for line in self.browse(cr, uid, ids, context=context):
+            landed_costs += (line.landing_cost_lines +
+                             line.landed_cost_base_value +
+                             line.landed_cost_base_quantity +
+                             line.amount_untaxed)
+            result[line.id] = landed_costs
+        return result
+
+    def _landing_cost_lines(self, cr, uid, ids, name, args, context=None):
+        if not ids:
+            return {}
+        result = {}
+        landed_cost_lines = 0.0
+        for line in self.browse(cr, uid, ids, context=context):
+            if line.order_line:
+                for pol in line.order_line:
+                    if pol.product_qty > 0.0:
+                         landed_cost_lines += pol.landing_costs
+            result[line.id] = landed_cost_lines
+        return result
+
+    _columns = {
+        'landed_cost_line_ids': fields.one2many(
+            'landed.cost.position',
+            'purchase_order_id',
+            'Landed Costs',
+            domain=[('purchase_order_line_id', '=', False)]),
+        'landed_cost_base_value': fields.function(
+            _landed_cost_base_value,
+            digits_compute=dp.get_precision('Account'),
+            string='Landed Costs Base Value'),
+        'landed_cost_base_quantity': fields.function(
+            _landed_cost_base_quantity,
+            digits_compute=dp.get_precision('Account'),
+            string='Landed Costs Base Quantity'),
+        'landing_cost_lines': fields.function(
+            _landing_cost_lines,
+            digits_compute=dp.get_precision('Account'),
+            string='Landing Cost Lines'),
+        'landed_cost': fields.function(
+            _landed_cost,
+            digits_compute=dp.get_precision('Account'),
+            string='Landed Costs Total Untaxed'),
+        'quantity_total': fields.function(
+            _quantity_total,
+            digits_compute=dp.get_precision('Product UoM'),
+            string='Total Quantity'),
+    }
+
+    def _prepare_order_line_move(self, cr, uid, order, order_line, picking_id,
+                                 context=None):
+        """ Here, the technical price_unit field will store the purchase
+        price + landed cost. The original purchase price is stored in
+        price_unit_net new field to keep record of it.
+
+        """
+        res = super(purchase_order,self)._prepare_order_line_move(
+            cr, uid, order, order_line, picking_id, context=context)
+        res['price_unit_net'] =  res['price_unit']
+        try:
+            res['price_unit'] = order_line.landed_costs / order_line.product_qty
+        except ZeroDivisionError:
+            pass
+        return res
+
+    def _prepare_landed_cost_inv_line(self, cr, uid, account_id, inv_id,
+                                      landed_cost, context=None):
+        """ Collects require data from landed cost position that is used to
+        create invoice line for that particular position.
+
+        If it comes from a PO line and Distribution type is per unit
+        the quantity of the invoice is the PO line quantity
+
+        :param account_id: Expense account.
+        :param inv_id: Related invoice.
+        :param browse_record landed_cost: Landed cost position browse record
+        :return: Value for fields of invoice lines.
+        :rtype: dict
+
+        """
+        qty = 1.0
+        if (landed_cost.purchase_order_line_id and
+                landed_cost.distribution_type_id.landed_cost_type == 'per_unit'):
+            qty = landed_cost.purchase_order_line_id.product_qty
+        line_tax_ids = [x.id for x in landed_cost.product_id.supplier_taxes_id]
+        return {
+            'name': landed_cost.product_id.name,
+            'account_id': account_id,
+            'invoice_id' : inv_id,
+            'price_unit': landed_cost.amount or 0.0,
+            'quantity': qty,
+            'product_id': landed_cost.product_id.id or False,
+            'invoice_line_tax_id': [(6, 0, line_tax_ids)],
+        }
+
+    def _prepare_landed_cost_inv(self, cr, uid, landed_cost, context=None):
+        """ Collects require data from landed cost position that is used to
+        create invoice for that particular position.
+
+        Note that _landed can come from a line or at whole PO level.
+
+        :param browse_record landed_cost: Landed cost position browse record
+        :return: Value for fields of invoice.
+        :rtype: dict
+
+        """
+        po = (landed_cost.purchase_order_id or
+              landed_cost.purchase_order_line_id.order_id)
+        currency_id = landed_cost.purchase_order_id.pricelist_id.currency_id.id
+        fiscal_position_id = po.fiscal_position.id if po.fiscal_position else False
+        journal_obj = self.pool.get('account.journal')
+        journal_ids = journal_obj.search(
+            cr, uid,
+            [('type', '=', 'purchase'),
+             ('company_id', '=', po.company_id.id)],
+            limit=1)
+        if not journal_ids:
+            raise orm.except_orm(
+                _('Error!'),
+                _('Define purchase journal for this company: "%s" (id: %d).')
+                % (po.company_id.name, po.company_id.id))
+        return {
+            'currency_id': currency_id,
+            'partner_id': landed_cost.partner_id.id,
+            'account_id': landed_cost.partner_id.property_account_payable.id,
+            'type': 'in_invoice',
+            'origin': po.name,
+            'fiscal_position': fiscal_position_id,
+            'company_id': po.company_id.id,
+            'journal_id': len(journal_ids) and journal_ids[0] or False,
+        }
+
+    def _generate_invoice_from_landed_cost(self, cr, uid, landed_cost,
+                                           context=None):
+        """ Generate an invoice from order landed costs (means generic
+        costs to a whole PO) or from a line landed costs.
+
+        """
+        invoice_obj = self.pool.get('account.invoice')
+        invoice_line_obj = self.pool.get('account.invoice.line')
+        prod_obj = self.pool.get('product.product')
+        po = (landed_cost.purchase_order_id or
+              landed_cost.purchase_order_line_id.order_id)
+        vals_inv = self._prepare_landed_cost_inv(cr, uid, landed_cost,
+                                                 context=context)
+        inv_id = invoice_obj.create(cr, uid, vals_inv, context=context)
+        fiscal_position = (po.fiscal_position or False)
+        exp_account_id = prod_obj._choose_exp_account_from(
+            cr, uid,
+            landed_cost.product_id,
+            fiscal_position=fiscal_position,
+            context=context
+        )
+        vals_line = self._prepare_landed_cost_inv_line(
+            cr, uid, exp_account_id, inv_id,
+            landed_cost, context=context
+        )
+        inv_line_id = invoice_line_obj.create(cr, uid, vals_line,
+                                              context=context)
+        return inv_id
+
+    def wkf_approve_order(self, cr, uid, ids, context=None):
+        """ On PO approval, generate all invoices for all landed cost position.
+
+        Remember that only landed cost position with the checkbox
+        generate_invoice ticked are generated.
+
+        """
+        res = super(purchase_order,self).wkf_approve_order(cr, uid, ids,
+                                                           context=context)
+        for order in self.browse(cr, uid, ids, context=context):
+            invoice_ids = []
+            for order_cost in order.landed_cost_line_ids:
+                if order_cost.generate_invoice:
+                    inv_id = self._generate_invoice_from_landed_cost(
+                        cr, uid, order_cost, context=context)
+                    invoice_ids.append(inv_id)
+            for po_line in order.order_line:
+                for line_cost in po_line.landed_cost_line_ids:
+                    inv_id = self._generate_invoice_from_landed_cost(
+                        cr, uid, line_cost, context=context)
+                    invoice_ids.append(inv_id)
+            # Link this new invoice to related purchase order
+            # 4 in that list is "Add" mode in a many2many used here because
+            # the call to super() already add the main invoice
+            if invoice_ids:
+                commands = [(4, invoice_id) for invoice_id in invoice_ids]
+                order.write({'invoice_ids': commands}, context=context)
+        return res

=== added file 'purchase_landed_costs/purchase.py.save'
--- purchase_landed_costs/purchase.py.save	1970-01-01 00:00:00 +0000
+++ purchase_landed_costs/purchase.py.save	2014-06-19 02:29:14 +0000
@@ -0,0 +1,631 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-2013 Camptocamp (<http://www.camptocamp.com>)
+#    Authors: Ferdinand Gasauer, 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 openerp.osv import orm, fields
+import openerp.addons.decimal_precision as dp
+from openerp.tools.translate import _
+import logging
+
+_logger = logging.getLogger(__name__)
+
+
+class landed_cost_distribution_type(orm.Model):
+    """ This is a model to give how we should distribute the amount given
+    for a landed costs. At the begining we use a selection field, but it
+    was impossible to filter it depending on the context (in a line or
+    on order). So we replaced it by this object, adding is_* method to
+    deal with. Base distribution are defined in YML file.
+
+    """
+
+    _name = "landed.cost.distribution.type"
+
+    _columns = {
+        'name': fields.char('Distribution Type', required=True),
+        'apply_on': fields.selection(
+            [('line', 'Line'),
+             ('order', 'Order')],
+            'Applied on',
+            required=True,
+            help="Defines if this distribution type Applied "
+                 "on order or line level."),
+        'landed_cost_type': fields.selection(
+            [('value', 'Value'),
+             ('per_unit', 'Quantity')],
+            'Product Landed Cost Type',
+            help="Refer to the product landed cost type."),
+    }
+
+
+class landed_cost_position(orm.Model):
+    """ The landed cost position represent a direct cost for the delivery
+    of the goods puchased. It can be from a different partner than the
+    original supplier, like transport. Cost will be re-affected to each
+    PO line in respect of the distribution method selected. The average
+    price computation for the product will take those direct costs into
+    account.
+
+    """
+
+    _name = "landed.cost.position"
+
+    def _get_company_currency_from_landed_cost(self, cr, uid, landed_cost,
+                                               amount, context=None):
+        """ Return the amount in company currency by looking at the po.
+
+        Always return a value, even if company currency = PO one.
+
+        :param browse_record landed_cost: Landed cost position browse record
+        :param float value to convert
+        :return: Float value amount in company currency converted at po date
+
+        """
+        cur_obj = self.pool.get('res.currency')
+        result = amount
+        # In some cases, po is not set, we must take it back from po_line
+        if landed_cost.purchase_order_id:
+            po = landed_cost.purchase_order_id
+        else:
+            po = landed_cost.purchase_order_line_id.order_id
+        if po:
+            cmp_cur_id = po.company_id.currency_id.id
+            po_cur_id = po.pricelist_id.currency_id.id
+            if cmp_cur_id != po_cur_id:
+                ctx = context.copy()
+                ctx['date'] = landed_cost.date_po or False
+                result = cur_obj.compute(cr, uid,
+                                         po_cur_id,
+                                         cmp_cur_id,
+                                         amount,
+                                         context=ctx)
+        return result
+
+    def _get_total_amount(self, cr, uid, landed_cost, context=None):
+        """ We should have a field that is the computed value (total
+        costs that land) e.g. if it's related to a line and per_unit =>
+        I want for the reporting the total line landed cost and multiply
+        the quantity by given amount.
+
+        :param browse_record landed_cost: Landed cost position browse record
+        :return total value of this landed cost position
+
+        """
+        vals_po_currency = 0.0
+        if (landed_cost.purchase_order_line_id and
+                landed_cost.distribution_type_id.landed_cost_type == 'per_unit'):
+            vals_po_currency = (landed_cost.amount *
+                                landed_cost.purchase_order_line_id.product_qty)
+        else:
+            vals_po_currency = landed_cost.amount
+        return vals_po_currency
+
+    def _get_amounts(self, cr, uid, ids, field_name, arg, context=None):
+        if not ids:
+            return {}
+        result = {}
+        for landed_cost in self.browse(cr, uid, ids, context=context):
+            val_comp_currency = self._get_company_currency_from_landed_cost(
+                cr, uid, landed_cost, landed_cost.amount, context=context)
+            val_total = self._get_total_amount(cr, uid, landed_cost,
+                                               context=context)
+            val_total_comp_currency = self._get_company_currency_from_landed_cost(
+                cr, uid, landed_cost, val_total, context=context)
+            amounts = {
+                'amount_company_currency': val_comp_currency,
+                'amount_total': val_total,
+                'amount_total_comp_currency': val_total_comp_currency
+            }
+            result[landed_cost.id] = amounts
+        return result
+
+    def _get_po(self, cr, uid, ids, context=None):
+        landed_obj = self.pool.get('landed.cost.position')
+        return landed_obj.search(cr, uid,
+                                 [('purchase_order_id', 'in', ids)],
+                                 context=context)
+
+    _columns = {
+        'product_id': fields.many2one(
+            'product.product',
+            'Landed Cost Name',
+            required=True,
+            domain=[('landed_cost_type', '!=', False)]),
+        'account_id': fields.many2one(
+            'account.account',
+            'Fiscal Account',
+            required=True,),
+        'partner_id': fields.many2one(
+            'res.partner',
+            'Partner',
+            help="The supplier of this cost component.",
+            required=True),
+        'distribution_type_id': fields.many2one(
+            'landed.cost.distribution.type',
+            'Distribution Type',
+            required=True,
+            help="Defines if the amount is to be calculated for each quantity "
+                 "or an absolute value"),
+        'purchase_order_line_id': fields.many2one(
+            'purchase.order.line',
+            'Purchase Order Line'),
+        'purchase_order_id': fields.many2one('purchase.order', 'Purchase Order'),
+        'generate_invoice': fields.boolean(
+            'Generate Invoice',
+            help="If ticked, this will generate a draft invoice at the "
+                 "PO confirmation for this landed cost position from the "
+                 "related partner. If not, no invoice will be generated, "
+                 "but the cost will be included for the average price "
+                 "computation."),
+        'amount': fields.float(
+            'Amount',
+            required=True,
+            digits_compute=dp.get_precision('Purchase Price'),
+            help="Landed cost expressed in PO currency used "
+                 "to fullfil landed cost."),
+        'amount_company_currency': fields.function(
+            _get_amounts,
+            type="float",
+            multi='compute_amounts',
+            string='Amount Company Currency',
+            # Use Account as it's for comparison with financial accounting
+            digits_compute=dp.get_precision('Account'),
+            store={
+                'purchase.order': (_get_po,
+                                   ['pricelist_id', 'company_id'], 50),
+                'landed.cost.position': (lambda self, cr, uid, ids, c=None: ids,
+                                          ['amount', 'purchase_order_id'], 10),
+            },
+            help="Landed cost for stock valuation (expressed in company currency). "
+                 "It will be added to the price of the supplier price."),
+        'amount_total': fields.function(
+            _get_amounts,
+            type="float",
+            multi='compute_amounts',
+            digits_compute=dp.get_precision('Purchase Price'),
+            string='Amount Total',
+            help="This field represent the total amount of this position "
+                 "regarding a whole order. By summing it, you'll have the total "
+                 "landed cost for the order (in his currency)",
+            store={
+                'purchase.order': (_get_po,
+                                   ['pricelist_id', 'company_id'], 50),
+                'landed.cost.position': (lambda self, cr, uid, ids, c=None: ids,
+                                          ['amount', 'purchase_order_id'], 10)
+            }),
+        'amount_total_comp_currency': fields.function(
+            _get_amounts,
+            type="float",
+            multi='compute_amounts',
+            digits_compute=dp.get_precision('Account'),
+            string='Amount Total Company Currency',
+            help="This field represent the total amount of this position "
+                 "regarding a whole order. By summing it, you'll have the total "
+                 "landed cost for the order (in company reference currency).",
+            store={
+                'purchase.order': (_get_po,
+                                   ['pricelist_id', 'company_id'], 50),
+                'landed.cost.position': (lambda self, cr, uid, ids, c=None: ids,
+                                          ['amount', 'purchase_order_id'], 10)
+            }),
+        'date_po': fields.related(
+            'purchase_order_id', 'date_order',
+            type='date',
+            string='Date',
+            store=True,
+            readonly=True,
+            help="Date of the related PO"),
+        'company_id': fields.related(
+            'purchase_order_id', 'company_id',
+            type='many2one',
+            relation='res.company',
+            string='Company',
+            store=True,
+            readonly=True),
+      }
+
+    _default = {
+        'generate_invoice': False,
+    }
+
+    def write(self, cr, uid, ids, vals, context=None):
+        """ Add the purchase_order_id if only linked to a line """
+        if vals.get('purchase_order_line_id'):
+            po_line_obj = self.pool.get('purchase.order.line')
+            line_id = vals['purchase_order_line_id']
+            po = po_line_obj.browse(cr, uid, line_id, context=context).order_id
+            vals['purchase_order_id'] = po.id
+        return super(landed_cost_position, self).write(
+            cr, uid, ids, vals, context=context)
+
+    def create(self, cr, uid, vals, context=None):
+        """ Add the purchase_order_id if only linked to a line """
+        if vals.get('purchase_order_line_id'):
+            po_line_obj = self.pool.get('purchase.order.line')
+            line_id = vals['purchase_order_line_id']
+            po = po_line_obj.browse(cr, uid, line_id, context=context).order_id
+            vals['purchase_order_id'] = po.id
+        return super(landed_cost_position, self).create(
+            cr, uid, vals, context=context)
+
+    def onchange_product_id(self, cr, uid, ids, product_id,
+                            purchase_order_id=False, context=None):
+        """ Give the default value for the distribution type depending
+        on the setting of the product and the use case: line or order
+        position.
+
+         """
+        res = {}
+        fiscal_position = False
+        landed_cost_type = False
+        # order or line depending on which view we are
+        if purchase_order_id:
+            apply_on = 'order'
+            po_obj = self.pool.get('purchase.order')
+            po = po_obj.browse(cr, uid, purchase_order_id, context=context)
+other/purchase_landed_costs        else:
+            apply_on = 'line'
+        if not product_id:
+            return res
+        prod_obj = self.pool.get('product.product')
+        dist_type_obj = self.pool.get('landed.cost.distribution.type')
+        prod = prod_obj.browse(cr, uid, [product_id], context=context)[0]
+        account_id = prod_obj._choose_exp_account_from(
+            cr, uid, prod, fiscal_position=fiscal_position, context=context)
+        if prod.landed_cost_type in ('per_unit', 'value'):
+            landed_cost_type = dist_type_obj.search(
+                cr, uid,
+                [('apply_on', '=', apply_on),
+                 ('landed_cost_type', '=', prod.landed_cost_type)],
+                context=context)[0]
+        value = {
+            'distribution_type_id': landed_cost_type,
+            'account_id': account_id,
+            'partner_id': prod.seller_id and prod.seller_id.id or False
+        }
+        res = {'value': value}
+        return res
+
+
+class purchase_order_line(orm.Model):
+    _inherit = "purchase.order.line"
+
+    def _landing_cost(self, cr, uid, ids, name, args, context=None):
+        if not ids:
+            return {}
+        result = {}
+        # landed costs for the line
+        for line in self.browse(cr, uid, ids, context=context):
+            landed_costs = 0.0
+            if line.landed_cost_line_ids:
+                for costs in line.landed_cost_line_ids:
+                    if (costs.distribution_type_id.landed_cost_type == 'value' and
+                            costs.distribution_type_id.apply_on == 'line'):
+                        landed_costs += costs.amount
+                    else:
+                        landed_costs += costs.amount * line.product_qty
+            result[line.id] = landed_costs
+        return result
+
+    def _landing_cost_order(self, cr, uid, ids, name, args, context=None):
+        if not ids:
+            return {}
+        result = {}
+        lines = self.browse(cr, uid, ids,  context=context)
+        # Landed costs line by line
+        for line in lines:
+            landed_costs = 0.0
+            order = line.order_id
+            # distribution of landed costs of PO
+            if order.landed_cost_line_ids:
+                # Base value (Absolute Value)
+                if order.landed_cost_base_value:
+                    try:
+                        landed_costs += (order.landed_cost_base_value /
+                                         order.amount_untaxed *
+                                         line.price_subtotal)
+                    # We ignore the zero division error and doesn't sum
+                    # matter of function filed computation order
+                    except ZeroDivisionError:
+                        pass
+                # Base quantity (Per Quantity)
+                if order.landed_cost_base_quantity:
+                    try:
+                        landed_costs += (order.landed_cost_base_quantity /
+                                         order.quantity_total *
+                                         line.product_qty)
+                    # We ignore the zero division error and doesn't sum
+                    # matter of function filed computation order
+                    except ZeroDivisionError:
+                        pass
+            result[line.id] = landed_costs
+        return result
+
+    def _landed_cost(self, cr, uid, ids, name, args, context=None):
+        if not ids : return {}
+        result = {}
+        # landed costs for the line
+        for line in self.browse(cr, uid, ids, context=context):
+            landed_costs = 0.0
+            landed_costs += (line.price_subtotal +
+                             line.landing_costs + line.landing_costs_order)
+            result[line.id] = landed_costs
+        return result
+
+    _columns = {
+        'landed_cost_line_ids': fields.one2many(
+            'landed.cost.position',
+            'purchase_order_line_id',
+            'Landed Costs Positions'),
+        'landing_costs': fields.function(
+            _landing_cost,
+            digits_compute=dp.get_precision('Account'),
+            string='Landing Costs'),
+        'landing_costs_order': fields.function(
+            _landing_cost_order,
+            digits_compute=dp.get_precision('Account'),
+            string='Landing Costs from Order'),
+        'landed_costs': fields.function(
+            _landed_cost,
+            digits_compute=dp.get_precision('Account'),
+            string='Landed Costs'),
+    }
+
+
+class purchase_order(orm.Model):
+    _inherit = "purchase.order"
+
+    def _landed_cost_base_value(self, cr, uid, ids, name, args, context=None):
+        if not ids:
+            return {}
+        result = {}
+        landed_costs_base_value = 0.0
+        for line in self.browse(cr, uid, ids, context=context):
+            if line.landed_cost_line_ids:
+                for costs in line.landed_cost_line_ids:
+                    if (costs.distribution_type_id.landed_cost_type == 'value' and
+                            costs.distribution_type_id.apply_on == 'order'):
+                        landed_costs_base_value += costs.amount
+            result[line.id] = landed_costs_base_value
+        return result
+
+    def _landed_cost_base_quantity(self, cr, uid, ids, name, args, context=None):
+        if not ids:
+            return {}
+        result = {}
+        landed_costs_base_quantity = 0.0
+        for line in self.browse(cr, uid, ids, context=context):
+            if line.landed_cost_line_ids:
+                for costs in line.landed_cost_line_ids:
+                    if (costs.distribution_type_id.landed_cost_type == 'per_unit' and
+                            costs.distribution_type_id.apply_on == 'order'):
+                         landed_costs_base_quantity += costs.amount
+            result[line.id] = landed_costs_base_quantity
+        return result
+
+    def _quantity_total(self, cr, uid, ids, name, args, context=None):
+        if not ids:
+            return {}
+        result = {}
+        quantity_total = 0.0
+        for line in self.browse(cr, uid, ids, context=context):
+            if line.order_line:
+                for pol in line.order_line:
+                    if pol.product_qty > 0.0:
+                         quantity_total += pol.product_qty
+            result[line.id] = quantity_total
+        return result
+
+    def _landed_cost(self, cr, uid, ids, name, args, context=None):
+        if not ids:
+            return {}
+        result = {}
+        landed_costs = 0.0
+        # landed costs for the line
+        for line in self.browse(cr, uid, ids, context=context):
+            landed_costs += (line.landing_cost_lines +
+                             line.landed_cost_base_value +
+                             line.landed_cost_base_quantity +
+                             line.amount_untaxed)
+            result[line.id] = landed_costs
+        return result
+
+    def _landing_cost_lines(self, cr, uid, ids, name, args, context=None):
+        if not ids:
+            return {}
+        result = {}
+        landed_cost_lines = 0.0
+        for line in self.browse(cr, uid, ids, context=context):
+            if line.order_line:
+                for pol in line.order_line:
+                    if pol.product_qty > 0.0:
+                         landed_cost_lines += pol.landing_costs
+            result[line.id] = landed_cost_lines
+        return result
+
+    _columns = {
+        'landed_cost_line_ids': fields.one2many(
+            'landed.cost.position',
+            'purchase_order_id',
+            'Landed Costs',
+            domain=[('purchase_order_line_id', '=', False)]),
+        'landed_cost_base_value': fields.function(
+            _landed_cost_base_value,
+            digits_compute=dp.get_precision('Account'),
+            string='Landed Costs Base Value'),
+        'landed_cost_base_quantity': fields.function(
+            _landed_cost_base_quantity,
+            digits_compute=dp.get_precision('Account'),
+            string='Landed Costs Base Quantity'),
+        'landing_cost_lines': fields.function(
+            _landing_cost_lines,
+            digits_compute=dp.get_precision('Account'),
+            string='Landing Cost Lines'),
+        'landed_cost': fields.function(
+            _landed_cost,
+            digits_compute=dp.get_precision('Account'),
+            string='Landed Costs Total Untaxed'),
+        'quantity_total': fields.function(
+            _quantity_total,
+            digits_compute=dp.get_precision('Product UoM'),
+            string='Total Quantity'),
+    }
+
+    def _prepare_order_line_move(self, cr, uid, order, order_line, picking_id,
+                                 context=None):
+        """ Here, the technical price_unit field will store the purchase
+        price + landed cost. The original purchase price is stored in
+        price_unit_net new field to keep record of it.
+
+        """
+        res = super(purchase_order,self)._prepare_order_line_move(
+            cr, uid, order, order_line, picking_id, context=context)
+        res['price_unit_net'] =  res['price_unit']
+        try:
+            res['price_unit'] = order_line.landed_costs / order_line.product_qty
+        except ZeroDivisionError:
+            pass
+        return res
+
+    def _prepare_landed_cost_inv_line(self, cr, uid, account_id, inv_id,
+                                      landed_cost, context=None):
+        """ Collects require data from landed cost position that is used to
+        create invoice line for that particular position.
+
+        If it comes from a PO line and Distribution type is per unit
+        the quantity of the invoice is the PO line quantity
+
+        :param account_id: Expense account.
+        :param inv_id: Related invoice.
+        :param browse_record landed_cost: Landed cost position browse record
+        :return: Value for fields of invoice lines.
+        :rtype: dict
+
+        """
+        qty = 1.0
+        if (landed_cost.purchase_order_line_id and
+                landed_cost.distribution_type_id.landed_cost_type == 'per_unit'):
+            qty = landed_cost.purchase_order_line_id.product_qty
+        line_tax_ids = [x.id for x in landed_cost.product_id.supplier_taxes_id]
+        return {
+            'name': landed_cost.product_id.name,
+            'account_id': account_id,
+            'invoice_id' : inv_id,
+            'price_unit': landed_cost.amount or 0.0,
+            'quantity': qty,
+            'product_id': landed_cost.product_id.id or False,
+            'invoice_line_tax_id': [(6, 0, line_tax_ids)],
+        }
+
+    def _prepare_landed_cost_inv(self, cr, uid, landed_cost, context=None):
+        """ Collects require data from landed cost position that is used to
+        create invoice for that particular position.
+
+        Note that _landed can come from a line or at whole PO level.
+
+        :param browse_record landed_cost: Landed cost position browse record
+        :return: Value for fields of invoice.
+        :rtype: dict
+
+        """
+        po = (landed_cost.purchase_order_id or
+              landed_cost.purchase_order_line_id.order_id)
+        currency_id = landed_cost.purchase_order_id.pricelist_id.currency_id.id
+        fiscal_position = po.fiscal_position or False
+        journal_obj = self.pool.get('account.journal')
+        journal_ids = journal_obj.search(
+            cr, uid,
+            [('type', '=', 'purchase'),
+             ('company_id', '=', po.company_id.id)],
+            limit=1)
+        if not journal_ids:
+            raise orm.except_orm(
+                _('Error!'),
+                _('Define purchase journal for this company: "%s" (id: %d).')
+                % (po.company_id.name, po.company_id.id))
+        return {
+            'currency_id': currency_id,
+            'partner_id': landed_cost.partner_id.id,
+            'account_id': landed_cost.partner_id.property_account_payable.id,
+            'type': 'in_invoice',
+            'origin': po.name,
+            'fiscal_position':  fiscal_position,
+            'company_id': po.company_id.id,
+            'journal_id': len(journal_ids) and journal_ids[0] or False,
+        }
+
+    def _generate_invoice_from_landed_cost(self, cr, uid, landed_cost,
+                                           context=None):
+        """ Generate an invoice from order landed costs (means generic
+        costs to a whole PO) or from a line landed costs.
+
+        """
+        invoice_obj = self.pool.get('account.invoice')
+        invoice_line_obj = self.pool.get('account.invoice.line')
+        prod_obj = self.pool.get('product.product')
+        po = (landed_cost.purchase_order_id or
+              landed_cost.purchase_order_line_id.order_id)
+        vals_inv = self._prepare_landed_cost_inv(cr, uid, landed_cost,
+                                                 context=context)
+        inv_id = invoice_obj.create(cr, uid, vals_inv, context=context)
+        fiscal_position = (po.fiscal_position or False)
+        exp_account_id = prod_obj._choose_exp_account_from(
+            cr, uid,
+            landed_cost.product_id,
+            fiscal_position=fiscal_position,
+            context=context
+        )
+        vals_line = self._prepare_landed_cost_inv_line(
+            cr, uid, exp_account_id, inv_id,
+            landed_cost, context=context
+        )
+        inv_line_id = invoice_line_obj.create(cr, uid, vals_line,
+                                              context=context)
+        return inv_id
+
+    def wkf_approve_order(self, cr, uid, ids, context=None):
+        """ On PO approval, generate all invoices for all landed cost position.
+
+        Remember that only landed cost position with the checkbox
+        generate_invoice ticked are generated.
+
+        """
+        res = super(purchase_order,self).wkf_approve_order(cr, uid, ids,
+                                                           context=context)
+        for order in self.browse(cr, uid, ids, context=context):
+            invoice_ids = []
+            for order_cost in order.landed_cost_line_ids:
+                if order_cost.generate_invoice:
+                    inv_id = self._generate_invoice_from_landed_cost(
+                        cr, uid, order_cost, context=context)
+                    invoice_ids.append(inv_id)
+            for po_line in order.order_line:
+                for line_cost in po_line.landed_cost_line_ids:
+                    inv_id = self._generate_invoice_from_landed_cost(
+                        cr, uid, line_cost, context=context)
+                    invoice_ids.append(inv_id)
+            # Link this new invoice to related purchase order
+            # 4 in that list is "Add" mode in a many2many used here because
+            # the call to super() already add the main invoice
+            if invoice_ids:
+                commands = [(4, invoice_id) for invoice_id in invoice_ids]
+                order.write({'invoice_ids': commands}, context=context)
+        return res

=== added file 'purchase_landed_costs/purchase_landed_costs_data.yml'
--- purchase_landed_costs/purchase_landed_costs_data.yml	1970-01-01 00:00:00 +0000
+++ purchase_landed_costs/purchase_landed_costs_data.yml	2014-06-19 02:29:14 +0000
@@ -0,0 +1,20 @@
+-
+  !record {model: landed.cost.distribution.type, id: dist_unit}:
+    name: Distributed by Quantity
+    landed_cost_type: per_unit
+    apply_on: order
+-
+  !record {model: landed.cost.distribution.type, id: dist_value}:
+    name: Distributed by Value
+    landed_cost_type: value
+    apply_on: order
+-
+  !record {model: landed.cost.distribution.type, id: per_unit}:
+    name: Multiplied by Quantity
+    landed_cost_type: per_unit
+    apply_on: line
+-
+  !record {model: landed.cost.distribution.type, id: value}:
+    name: Simple Value
+    landed_cost_type: value
+    apply_on: line
\ No newline at end of file

=== added file 'purchase_landed_costs/purchase_view.xml'
--- purchase_landed_costs/purchase_view.xml	1970-01-01 00:00:00 +0000
+++ purchase_landed_costs/purchase_view.xml	2014-06-19 02:29:14 +0000
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+  <data>
+
+    <record model="ir.ui.view" id="c2c_landed_cost_tree">
+      <field name="name">c2clanded.cost.tree</field>
+      <field name="model">landed.cost.position</field>
+      <field name="priority">1</field>
+      <field name="type">tree</field>
+      <field name="arch" type="xml">
+        <tree string="Landing Costs" editable="bottom">
+              <field name="generate_invoice"/>
+              <field name="product_id" context="{'landed_cost_type':'per_unit'}" on_change="onchange_product_id(product_id)"/>
+              <field name="account_id" invisible="1"/>
+              <field name="partner_id"/>
+              <field name="amount"/>
+              <field name="distribution_type_id" domain="[('apply_on','=','line')]"  widget="selection"/>
+        </tree>
+      </field>
+    </record>
+
+     <record model="ir.ui.view" id="c2c_landed_cost_form">
+      <field name="name">c2clanded.cost.form</field>
+      <field name="model">landed.cost.position</field>
+      <field name="priority">1</field>
+      <field name="type">form</field>
+      <field name="arch" type="xml">
+        <form string="Landing Costs">
+              <field name="generate_invoice"/>
+              <field name="product_id" on_change="onchange_product_id(product_id)"/>
+              <field name="account_id" invisible="1"/>
+              <field name="partner_id"/>
+              <field name="amount"/>
+              <field name="distribution_type_id" domain="[('apply_on','=','line')]"  widget="selection"/>
+        </form>
+      </field>
+    </record>
+
+              
+        <!-- ******************
+         Landed cost definition in product form
+         ******************-->
+    <record model="ir.ui.view" id="c2c_product_landed_cost_view">
+      <field name="name">c2c_product.landed.cost.view</field>
+      <field name="model">product.product</field>
+      <field name="inherit_id" ref="product.product_normal_form_view"/>
+      <field name="type">form</field>
+      <field name="arch" type="xml">
+        <field name="description" position="before">
+           <group>
+             <field name="landed_cost_type" groups="purchase.group_purchase_user"/>
+           </group>
+        </field>
+      </field>
+    </record>
+
+    <!-- Analysis (placed before the view due to the action in c2c_purchase_order_landed_cost_view -->
+      <record model="ir.ui.view" id="c2c_landed_cost_tree_stat">
+        <field name="name">c2clanded.cost.tree</field>
+        <field name="model">landed.cost.position</field>
+        <field name="priority">20</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+          <tree string="Landing Costs" create="false">
+                <field name="date_po"/>
+                <field name="product_id"/>
+                <field name="account_id" />
+                <field name="partner_id"/>
+                <field name="amount_total" sum="Total amount"/>
+                <field name="amount_total_comp_currency" sum="Total amount"/>
+                <field name="distribution_type_id"  widget="selection"/>
+                <field name="purchase_order_id"/>
+                <field name="purchase_order_line_id"/>
+          </tree>
+        </field>
+      </record>
+
+    <record id="act_po_2_landed_costs" model="ir.actions.act_window">
+        <field name="name">Related Landed Costs</field>
+        <field name="res_model">landed.cost.position</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="context">{'search_default_purchase_order_id': active_id}</field>          
+        <field name="view_id" ref="c2c_landed_cost_tree_stat"></field>
+    </record>
+
+    <!-- Landed costs Purchase Form-->
+    <record model="ir.ui.view" id="c2c_purchase_order_landed_cost_view">
+      <field name="name">c2c_purchase.order.landed.cost.form.view</field>
+      <field name="model">purchase.order</field>
+      <field name="inherit_id" ref="purchase.purchase_order_form"/>
+      <field name="arch" type="xml">
+       <data>
+             <field name="price_subtotal" position="after">
+                <field name="landing_costs" invisible="1"/>
+                <field name="landing_costs_order"/>
+                <field name="landed_costs"/>
+            </field> 
+        <notebook position="inside">
+          <page string="Landing Costs" attrs="{'readonly':[('state','=','done')]}">
+            <group>
+              <group>
+                <field name="quantity_total"/>
+                <field name="landed_cost_base_quantity" />
+                <field name="landed_cost_base_value" />
+              </group>
+              <group> 
+                <field name="landing_cost_lines"/>
+                <field name="landed_cost"/>
+                <button name="%(act_po_2_landed_costs)d" type="action"
+                          string="Open All Landed costs"/>
+              </group>
+             </group>
+             <field name="landed_cost_line_ids" colspan="4" nolabel="1" context="{'landed_cost_type':'per_unit'}" widget="one2many_list">
+              <tree string="Landing Costs" editable="bottom">
+                  <field name="generate_invoice"/>
+                  <field name="product_id"  on_change="onchange_product_id(product_id,parent.id)"/>
+                  <field name="account_id" invisible="1"/>
+                  <field name="partner_id"/>
+                  <field name="amount"/>
+                  <field name="distribution_type_id" domain="[('apply_on','=','order')]" widget="selection"/>
+              </tree>
+            </field>
+          </page>
+        </notebook>
+        </data>
+      </field>
+    </record>
+
+     <!-- inherited view to make the order lines list in the form non-editable-->
+      <record id="view_order_form_editable_list" model="ir.ui.view">
+          <field name="name">purchase.order.landed.cost.form.view.form</field>
+          <field name="model">purchase.order</field>
+          <field name="inherit_id" ref="purchase.purchase_order_form"/>
+          <field name="arch" type="xml">
+              <xpath expr="//field[@name='order_line']/tree" position="attributes">
+                  <attribute name="editable">True</attribute>
+              </xpath>
+          </field>
+      </record>   
+        
+    <!-- Landed costs Purchase Line Form-->
+    <record model="ir.ui.view" id="purchase_oder_line_landed_cost_view">
+      <field name="name">purchase.oder.line.landed.cost.view</field>
+      <field name="model">purchase.order.line</field>
+      <field name="inherit_id" ref="purchase.purchase_order_line_form"/>
+      <field name="type">form</field>
+      <field name="arch" type="xml">
+        <notebook position="inside">
+             <page string="Landing Costs" >
+                <group colspan="2" col="2"> 
+                  <field name="landing_costs"/>
+                  <field name="landing_costs_order"/>
+                  <field name="landed_costs"/>
+                  <field name="landed_cost_line_ids" colspan="4" nolabel="1"  widget="one2many_list"/>
+                </group>  
+             </page>     
+        </notebook>
+      </field>
+    </record>
+
+    <record id="view_landed_cost_search" model="ir.ui.view">
+        <field name="name">landed.cost.position.search</field>
+        <field name="model">landed.cost.position</field>
+        <field name="arch" type="xml">
+            <search string="Purchase Orders">
+                <field name="date_po"/>
+                <field name="partner_id"/>
+                <field name="account_id"/>
+                <field name="product_id"/>
+                <field name="distribution_type_id"/>
+                <field name="purchase_order_id"/>
+                <field name="purchase_order_line_id"/>
+                <newline/>
+                <group expand="1" string="Group By...">
+                    <filter string="Date" name="group_date_po" icon="terp-personal" context="{'group_by':'date_po'}"/>
+                    <filter string="Supplier" name="group_partner_id" icon="terp-personal" context="{'group_by':'partner_id'}"/>
+                    <filter string="Account" name="group_account_id" icon="terp-stock_symbol-selection" context="{'group_by':'account_id'}"/>
+                    <filter string="Landed Cost Name" name="group_product_id" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                    <filter string="Distribution Type" name="distribution_type_id" icon="terp-accessories-archiver" context="{'group_by':'distribution_type_id'}"/>
+                    <filter string="Purchase" icon="terp-stock_effects-object-colorize" context="{'group_by':'purchase_order_id'}"/>
+                    <filter string="Purchase Line" icon="terp-stock_effects-object-colorize" context="{'group_by':'purchase_order_line_id'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="landed_cost_position_graph">
+        <field name="name">landed.cost.position.graph</field>
+        <field name="model">landed.cost.position</field>
+        <field name="type">graph</field>
+        <field name="arch" type="xml">
+            <graph string="Landed Costs" type="bar">
+                <field name="account_id"/>
+                <field name="amount_total_comp_currency" operator="+"/>
+            </graph>
+        </field>
+    </record>
+
+    <record id="action_landed_cost_report_all" model="ir.actions.act_window">
+        <field name="name">Landed Costs Analysis</field>
+        <field name="res_model">landed.cost.position</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,graph</field>
+        <field name="view_id" ref="c2c_landed_cost_tree_stat"></field>
+        <field name="context">{'search_default_group_account_id':1,'search_default_group_product_id': 1,'group_by':[]}</field>
+        <field name="help">Landed cost Analysis allows you to easily check and analyse your estimated landed costs.</field>
+    </record>
+    <menuitem action="action_landed_cost_report_all" id="menu_action_landed_cost_report_all" parent="base.next_id_73" sequence="3"/>
+
+
+  </data>
+</openerp>

=== added directory 'purchase_landed_costs/security'
=== added file 'purchase_landed_costs/security/ir.model.access.csv'
--- purchase_landed_costs/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ purchase_landed_costs/security/ir.model.access.csv	2014-06-19 02:29:14 +0000
@@ -0,0 +1,5 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+access_landed_cost,landed.cost.position,model_landed_cost_position,purchase.group_purchase_user,1,1,1,1
+access_landed_cost_manager,landed.cost.position,model_landed_cost_position,purchase.group_purchase_manager,1,1,1,1
+access_landed_cost_distribution_type_user,landed.cost.distribution user,model_landed_cost_distribution_type,purchase.group_purchase_user,1,0,0,0
+access_landed_cost_distribution_type_manager,landed.cost.distribution manager.type,model_landed_cost_distribution_type,purchase.group_purchase_manager,1,1,1,1

=== added file 'purchase_landed_costs/security/landed_cost_security.xml'
--- purchase_landed_costs/security/landed_cost_security.xml	1970-01-01 00:00:00 +0000
+++ purchase_landed_costs/security/landed_cost_security.xml	2014-06-19 02:29:14 +0000
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+
+<data noupdate="1">
+    <record id="landed_costs_comp_rule" model="ir.rule">
+        <field name="name">Landed Costs</field>
+        <field name="model_id" ref="model_landed_cost_position"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+</data>
+
+</openerp>

=== added file 'purchase_landed_costs/stock.py'
--- purchase_landed_costs/stock.py	1970-01-01 00:00:00 +0000
+++ purchase_landed_costs/stock.py	2014-06-19 02:29:14 +0000
@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-2013 Camptocamp (<http://www.camptocamp.com>)
+#    Authors: Ferdinand Gasauer, 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 openerp.osv import orm, fields
+import openerp.addons.decimal_precision as dp
+import logging
+
+_logger = logging.getLogger(__name__)
+
+
+class stock_move(orm.Model):
+    _inherit = "stock.move"
+
+    _columns = {
+         'price_unit_net' : fields.float(
+            'Purchase Price',
+            digits_compute=dp.get_precision('Account'),
+            help="This is the net purchase price, without landed cost "
+                  "as the price include landed price has been stored in "
+                  "price_unit field"),
+    }
+
+
+class stock_partial_picking(orm.TransientModel):
+    _inherit = "stock.partial.picking"
+
+    def _product_cost_for_average_update(self, cr, uid, move):
+        # Be aware of an OpenERP Bug !! If your price_type
+        # IS NOT in your comapny currency, AVG price is wrong.
+        # Currently, the cost on the product form is supposed to be expressed
+        # in the currency of the company owning the product. OpenERP 
+        # read the average price from price_get method, which 
+        # convert the price to company currency. 
+        # So, in case you have:
+        #   Rate from CHF to EUR 1.2
+        #   Company in CHF
+        #   Price type in EUR
+        #   Product AVG price = 10.-
+        #   Reception new product with cost 15.- (in CHF in price_unit 
+        #   of moves)
+        #   The price_get will return the current average price in CHF of 12.- 
+        #   The price computed will be =(12 * qty + 15 * qty') / (qty + qty')
+        #   in CHF. The new cost will be store as is in the procuct 
+        #   standard_price instead of converting the result in EUR
+        # Reference : https://bugs.launchpad.net/ocb-addons/+bug/1238525
+        res = super(stock_partial_picking, self)._product_cost_for_average_update(cr, uid, move)
+        _logger.debug('Before res stock_partial_picking `%s`', res)
+        # Re-take the cost from the PO line landed_costs field
+        if move.purchase_line_id:
+            res['cost'] = (move.purchase_line_id.landed_costs /
+                           move.purchase_line_id.product_qty)
+        _logger.debug('After res stock_partial_picking `%s`', res)
+        return res

=== added directory 'purchase_landed_costs/test'
=== added file 'purchase_landed_costs/test/landed_costs_based_on_quantity.yml'
--- purchase_landed_costs/test/landed_costs_based_on_quantity.yml	1970-01-01 00:00:00 +0000
+++ purchase_landed_costs/test/landed_costs_based_on_quantity.yml	2014-06-19 02:29:14 +0000
@@ -0,0 +1,156 @@
+-
+  Ensure main company, price_type of standard_price and pricelist are in EUR
+-
+ !record {model: res.company, id: base.main_company}:
+    currency_id: base.EUR
+-
+ !record {model: product.price.type, id: product.standard_price}:
+    currency_id: base.EUR
+-
+ !record {model: product.pricelist, id: purchase.list0}:
+    currency_id: base.EUR 
+-
+  Affect the admin user to the main company
+-
+ !record {model: res.users, id: base.user_root}:
+    company_id: base.main_company 
+-
+  Create a stock location for the test
+-
+ !record {model: stock.location, id: location_stock_01}:
+    name: Stock for PO
+    usage: internal
+-
+  Create a warehouse for the test
+-
+ !record {model: stock.warehouse, id: wh_stock_01}:
+    name: Warehouse for PO
+    lot_output_id: location_stock_01
+    lot_stock_id: location_stock_01
+    lot_input_id: location_stock_01
+    company_id: base.main_company
+-
+  Create a Supplier for PO
+-
+  !record {model: res.partner, id: res_partner_supplier_01}:
+    name: Supplier 1
+    supplier: 1
+-
+  Create a Supplier for landed cost
+-
+  !record {model: res.partner, id: res_partner_supplier_02}:
+    name: Supplier 2
+    supplier: 1
+-
+  Create a product with landed type Quantity
+-
+  !record {model: product.product, id: product_product_lcost_01}:
+    categ_id: product.product_category_1
+    cost_method: standard
+    landed_cost_type: per_unit
+    name: Transport Poste Express Quantity
+    standard_price: 50.0
+    list_price: 75.0
+    type: service
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    volume: 0.0
+    warranty: 0.0
+    weight: 0.0
+    weight_net: 0.0
+-
+  Create a wine product A with an avg price of 100
+-
+  !record {model: product.product, id: product_product_a_avg_01}:
+    categ_id: product.product_category_1
+    cost_method: standard
+    name: Wine A
+    standard_price: 100.0
+    list_price: 150.0
+    type: product
+    cost_method: average
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+-
+  Create a wine product B with an avg price of 200
+-
+  !record {model: product.product, id: product_product_b_avg_01}:
+    categ_id: product.product_category_1
+    cost_method: standard
+    name: Wine B
+    standard_price: 200.0
+    list_price: 250.0
+    type: product
+    cost_method: average
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+-
+  Create a purchase order with two lines and one landed cost based on quantity
+-
+  !record {model: purchase.order, id: purchase_order_lcost_01}:
+    partner_id: res_partner_supplier_01
+    invoice_method: order
+    location_id: location_stock_01
+    pricelist_id: purchase.list0
+    order_line:
+      - product_id: product_product_a_avg_01
+        price_unit: 100
+        product_qty: 15.0
+      - product_id: product_product_b_avg_01
+        price_unit: 200
+        product_qty: 5.0
+    landed_cost_line_ids:
+      - product_id: product_product_lcost_01
+        amount: 50
+        partner_id: res_partner_supplier_02
+        generate_invoice: 1
+        distribution_type_id: dist_unit
+-
+  Test the landed costs computation by lines
+-
+  !python {model: purchase.order}: |
+    po = self.browse(cr, uid, ref('purchase_order_lcost_01'))
+    for line in po.order_line:
+      # Compute pro-rata of quantity for line
+      value = (line.product_qty / (15+5)) * 50
+      assert line.landing_costs_order == value, "The landing cost based on quantity has not been computed correctly"
+-
+ I confirm the order where invoice control is 'Bases on order'.
+-
+  !workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_lcost_01}
+-
+  I check that the landed cost invoice and PO one is generated from PO confirmation
+-
+  !python {model: purchase.order}: |
+    purchase_order = self.browse(cr, uid, ref("purchase_order_lcost_01"))
+    assert len(purchase_order.invoice_ids) == 2, "2 invoices (PO + landed cost) should have been generated on order confirmation."
+-
+  Reception is ready for process, make it and check moves value
+-
+  !python {model: stock.partial.picking}: |
+    pick_ids = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_lcost_01")).picking_ids
+    partial_id = self.create(cr, uid, {},context={'active_model': 'stock.picking','active_ids': [pick_ids[0].id]})
+    self.do_partial(cr, uid, [partial_id])
+    picking = self.pool.get('stock.picking').browse(cr, uid, [pick_ids[0].id])[0]
+    for move in picking.move_lines:
+      if move.product_id.name == 'Wine A':
+        assert move.price_unit == 102.5,"Technical field price_unit of Wine A stock move should record the landed_costs, not purchase price"
+        assert move.price_unit_net == 100.0,"Technical field price_unit of Wine A stock move should record the purchase price"
+      elif move.product_id.name == 'Wine B':
+        assert move.price_unit == 202.5,"Technical field price_unit of Wine B stock move should record the landed_costs, not purchase price"
+        assert move.price_unit_net == 200.0,"Technical field price_unit_net of Wine B stock move should record the purchase price"
+-
+  I check that purchase order is shipped.
+-
+  !python {model: purchase.order}: |
+     assert self.browse(cr, uid, ref("purchase_order_lcost_01")).shipped == True,"Purchase order should be delivered"
+-
+  I check that avg price of products is computed with landed costs
+-
+  !python {model: product.product}: |
+     # computed as : ((15/20) * 50 + 100 * 15) / 15
+     value_a = 102.5
+     # computed as : ((5/20) * 50 + 200 * 5) / 5
+     value_b = 202.5
+     assert self.browse(cr, uid, ref("product_product_a_avg_01")).standard_price == value_a,"Avg price for product Wine A is wrongly computed"
+     assert self.browse(cr, uid, ref("product_product_b_avg_01")).standard_price == value_b,"Avg price for product Wine B is wrongly computed"

=== added file 'purchase_landed_costs/test/landed_costs_based_on_value.yml'
--- purchase_landed_costs/test/landed_costs_based_on_value.yml	1970-01-01 00:00:00 +0000
+++ purchase_landed_costs/test/landed_costs_based_on_value.yml	2014-06-19 02:29:14 +0000
@@ -0,0 +1,141 @@
+-
+  Ensure main company, price_type of standard_price and pricelist are in EUR
+-
+ !record {model: res.company, id: base.main_company}:
+    currency_id: base.EUR
+-
+ !record {model: product.price.type, id: product.standard_price}:
+    currency_id: base.EUR
+-
+ !record {model: product.pricelist, id: purchase.list0}:
+    currency_id: base.EUR 
+-
+  Affect the admin user to the main company
+-
+ !record {model: res.users, id: base.user_root}:
+    company_id: base.main_company 
+-
+  Create a Supplier for PO
+-
+  !record {model: res.partner, id: res_partner_supplier_03}:
+    name: Supplier 3
+    supplier: 1
+-
+  Create a Supplier for landed cost
+-
+  !record {model: res.partner, id: res_partner_supplier_04}:
+    name: Supplier 4
+    supplier: 1
+-
+  Create a product with landed type value
+-
+  !record {model: product.product, id: product_product_lcost_02}:
+    categ_id: product.product_category_1
+    cost_method: standard
+    landed_cost_type: value
+    name: Transport Poste Express Value
+    standard_price: 50.0
+    list_price: 75.0
+    type: service
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    volume: 0.0
+    warranty: 0.0
+    weight: 0.0
+    weight_net: 0.0
+-
+  Create a wine product C with an avg price of 100
+-
+  !record {model: product.product, id: product_product_c_avg_01}:
+    categ_id: product.product_category_1
+    cost_method: standard
+    name: Wine C
+    standard_price: 100.0
+    list_price: 150.0
+    type: product
+    cost_method: average
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+-
+  Create a wine product D with an avg price of 200
+-
+  !record {model: product.product, id: product_product_d_avg_01}:
+    categ_id: product.product_category_1
+    cost_method: standard
+    name: Wine D
+    standard_price: 200.0
+    list_price: 250.0
+    type: product
+    cost_method: average
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+-
+  Create a purchase order with two lines and one landed cost based on value
+-
+  !record {model: purchase.order, id: purchase_order_lcost_02}:
+    partner_id: res_partner_supplier_03
+    invoice_method: order
+    location_id: location_stock_01
+    pricelist_id: purchase.list0
+    order_line:
+      - product_id: product_product_c_avg_01
+        price_unit: 100
+        product_qty: 15.0
+      - product_id: product_product_d_avg_01
+        price_unit: 200
+        product_qty: 5.0
+    landed_cost_line_ids:
+      - product_id: product_product_lcost_02
+        amount: 50
+        partner_id: res_partner_supplier_04
+        generate_invoice: 1
+        distribution_type_id: dist_value
+-
+  Test the landed costs computation by lines
+-
+  !python {model: purchase.order}: |
+    po = self.browse(cr, uid, ref('purchase_order_lcost_02'))
+    for line in po.order_line:
+      # Compute pro-rata of value for line
+      value = (line.price_subtotal / (15 * 100 + 5 * 200)) * 50
+      assert line.landing_costs_order == value, "The landing cost based on value has not been computed correctly"
+-
+  I confirm the order where invoice control is 'Bases on order'.
+-
+  !workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_lcost_02}
+-
+  I check that the landed cost invoice and PO one is generated from PO confirmation
+-
+  !python {model: purchase.order}: |
+    purchase_order = self.browse(cr, uid, ref("purchase_order_lcost_02"))
+    assert len(purchase_order.invoice_ids) == 2, "2 invoices (PO + landed cost) should have been generated on order confirmation."
+-
+  Reception is ready for process, make it and check moves value
+-
+  !python {model: stock.partial.picking}: |
+    pick_ids = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_lcost_02")).picking_ids
+    partial_id = self.create(cr, uid, {},context={'active_model': 'stock.picking','active_ids': [pick_ids[0].id]})
+    self.do_partial(cr, uid, [partial_id])
+    picking = self.pool.get('stock.picking').browse(cr, uid, [pick_ids[0].id])[0]
+    for move in picking.move_lines:
+      if move.product_id.name == 'Wine C':
+        assert move.price_unit == 102.0,"Technical field price_unit of Wine C stock move should record the landed_costs, not purchase price"
+        assert move.price_unit_net == 100.0,"Technical field price_unit of Wine C stock move should record the purchase price"
+      elif move.product_id.name == 'Wine D':
+        assert move.price_unit == 204.0,"Technical field price_unit of Wine D stock move should record the landed_costs, not purchase price"
+        assert move.price_unit_net == 200.0,"Technical field price_unit_net of Wine D stock move should record the purchase price"
+-
+  I check that purchase order is shipped.
+-
+  !python {model: purchase.order}: |
+     assert self.browse(cr, uid, ref("purchase_order_lcost_02")).shipped == True,"Purchase order should be delivered"
+-
+  I check that avg price of products is computed with landed costs
+-
+  !python {model: product.product}: |
+     # computed as : ((15/20) * 50 + 100 * 15) / 15
+     value_c = 102.0
+     # computed as : ((5/20) * 50 + 200 * 5) / 5
+     value_d = 204.0
+     assert self.browse(cr, uid, ref("product_product_c_avg_01")).standard_price == value_c,"Avg price for product Wine A is wrongly computed"
+     assert self.browse(cr, uid, ref("product_product_d_avg_01")).standard_price == value_d,"Avg price for product Wine B is wrongly computed"

=== added file 'purchase_landed_costs/test/landed_costs_multicurrency_company.yml'
--- purchase_landed_costs/test/landed_costs_multicurrency_company.yml	1970-01-01 00:00:00 +0000
+++ purchase_landed_costs/test/landed_costs_multicurrency_company.yml	2014-06-19 02:29:14 +0000
@@ -0,0 +1,220 @@
+-
+  Setup the Company as CHF (rate 1.3086) while keeping pricelist and price_type as EUR
+-
+ !record {model: res.currency.rate, id: base.rateCHF}:
+    rate: 1.3086
+    currency_id: base.CHF
+    name: !eval time.strftime('%Y-01-01')
+-
+ !record {model: res.currency.rate, id: base.rateEUR}:
+    rate: 1.0
+    currency_id: base.EUR
+    name: !eval time.strftime('%Y-01-01')
+-
+ !record {model: res.company, id: base.main_company}:
+    currency_id: base.CHF
+-
+ !record {model: product.price.type, id: product.standard_price}:
+    currency_id: base.EUR
+-
+ !record {model: product.pricelist, id: purchase.list0}:
+    currency_id: base.EUR 
+-
+  Affect the admin user to the main company
+-
+ !record {model: res.users, id: base.user_root}:
+    company_id: base.main_company 
+-
+  Create a stock location for the test
+-
+ !record {model: stock.location, id: location_stock_01}:
+    name: Stock for PO
+    usage: internal
+-
+  Create a warehouse for the test
+-
+ !record {model: stock.warehouse, id: wh_stock_01}:
+    name: Warehouse for PO
+    lot_output_id: location_stock_01
+    lot_stock_id: location_stock_01
+    lot_input_id: location_stock_01
+    company_id: base.main_company
+-
+  Create a Supplier for PO
+-
+  !record {model: res.partner, id: res_partner_supplier_01}:
+    name: Supplier 1
+    supplier: 1
+-
+  Create a Supplier for landed cost
+-
+  !record {model: res.partner, id: res_partner_supplier_02}:
+    name: Supplier 2
+    supplier: 1
+-
+  Create a product with landed type Quantity
+-
+  !record {model: product.product, id: product_product_lcost_01}:
+    categ_id: product.product_category_1
+    cost_method: standard
+    landed_cost_type: per_unit
+    name: Transport Poste Express Quantity
+    standard_price: 50.0
+    list_price: 75.0
+    type: service
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    volume: 0.0
+    warranty: 0.0
+    weight: 0.0
+    weight_net: 0.0
+-
+  Create a wine product H with an avg price of 100
+-
+  !record {model: product.product, id: product_product_h_avg_01}:
+    categ_id: product.product_category_1
+    cost_method: standard
+    name: Wine H
+    standard_price: 100.0
+    list_price: 150.0
+    type: product
+    cost_method: average
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+-
+  Create a wine product I with an avg price of 200
+-
+  !record {model: product.product, id: product_product_i_avg_01}:
+    categ_id: product.product_category_1
+    cost_method: standard
+    name: Wine I
+    standard_price: 200.0
+    list_price: 250.0
+    type: product
+    cost_method: average
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+-
+  Create a purchase order with two lines and one landed cost based on quantity
+-
+  !record {model: purchase.order, id: purchase_order_lcost_05}:
+    partner_id: res_partner_supplier_01
+    invoice_method: order
+    location_id: location_stock_01
+    pricelist_id: purchase.list0
+    order_line:
+      - product_id: product_product_h_avg_01
+        price_unit: 100
+        product_qty: 15.0
+      - product_id: product_product_i_avg_01
+        price_unit: 200
+        product_qty: 5.0
+    landed_cost_line_ids:
+      - product_id: product_product_lcost_01
+        amount: 50
+        partner_id: res_partner_supplier_02
+        generate_invoice: 1
+        distribution_type_id: dist_unit
+-
+  Test the landed costs computation by lines
+-
+  !python {model: purchase.order}: |
+    po = self.browse(cr, uid, ref('purchase_order_lcost_05'))
+    for line in po.order_line:
+      # Compute pro-rata of quantity for line
+      value = (line.product_qty / (15+5)) * 50
+      assert line.landing_costs_order == value, "The landing cost based on quantity has not been computed correctly"
+-
+ I confirm the order where invoice control is 'Bases on order'.
+-
+  !workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_lcost_05}
+-
+  I check that the landed cost invoice and PO one is generated from PO confirmation
+-
+  !python {model: purchase.order}: |
+    purchase_order = self.browse(cr, uid, ref("purchase_order_lcost_05"))
+    assert len(purchase_order.invoice_ids) == 2, "2 invoices (PO + landed cost) should have been generated on order confirmation."
+-
+  Reception is ready for process, make it and check moves value
+-
+  !python {model: stock.partial.picking}: |
+    pick_ids = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_lcost_05")).picking_ids
+    partial_id = self.create(cr, uid, {},context={'active_model': 'stock.picking','active_ids': [pick_ids[0].id]})
+    self.do_partial(cr, uid, [partial_id])
+    picking = self.pool.get('stock.picking').browse(cr, uid, [pick_ids[0].id])[0]
+    for move in picking.move_lines:
+      if move.product_id.name == 'Wine H':
+        assert move.price_unit == 102.5,"Technical field price_unit of Wine H stock move should record the landed_costs, not purchase price"
+        assert move.price_unit_net == 100.0,"Technical field price_unit of Wine H stock move should record the purchase price"
+      elif move.product_id.name == 'Wine I':
+        assert move.price_unit == 202.5,"Technical field price_unit of Wine I stock move should record the landed_costs, not purchase price"
+        assert move.price_unit_net == 200.0,"Technical field price_unit_net of Wine I stock move should record the purchase price"
+-
+  I check that purchase order is shipped.
+-
+  !python {model: purchase.order}: |
+     assert self.browse(cr, uid, ref("purchase_order_lcost_05")).shipped == True,"Purchase order should be delivered"
+-
+  I check that avg price of products is computed with landed costs
+-
+  !python {model: product.product}: |
+     # computed as : ((15/20) * 50 + 100 * 15) / 15
+     value_a = 102.5
+     # computed as : ((5/20) * 50 + 200 * 5) / 5
+     value_b = 202.5
+     print self.browse(cr, uid, ref("product_product_h_avg_01")).standard_price
+     print self.browse(cr, uid, ref("product_product_i_avg_01")).standard_price
+     assert self.browse(cr, uid, ref("product_product_h_avg_01")).standard_price == value_a,"Avg price for product Wine H is wrongly computed"
+     assert self.browse(cr, uid, ref("product_product_i_avg_01")).standard_price == value_b,"Avg price for product Wine I is wrongly computed"
+-
+  Create a purchase order with two lines
+-
+  !record {model: purchase.order, id: purchase_order_lcost_05bis}:
+    partner_id: res_partner_supplier_01
+    invoice_method: order
+    location_id: location_stock_01
+    pricelist_id: purchase.list0
+    order_line:
+      - product_id: product_product_h_avg_01
+        price_unit: 200
+        product_qty: 15.0
+      - product_id: product_product_i_avg_01
+        price_unit: 400
+        product_qty: 5.0
+-
+ I confirm the order where invoice control is 'Bases on order'.
+-
+  !workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_lcost_05bis}
+-
+  Reception is ready for process, make it and check moves value
+-
+  !python {model: stock.partial.picking}: |
+    pick_ids = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_lcost_05bis")).picking_ids
+    partial_id = self.create(cr, uid, {},context={'active_model': 'stock.picking','active_ids': [pick_ids[0].id]})
+    self.do_partial(cr, uid, [partial_id])
+    picking = self.pool.get('stock.picking').browse(cr, uid, [pick_ids[0].id])[0]
+    for move in picking.move_lines:
+      if move.product_id.name == 'Wine H':
+        assert move.price_unit == 200.0,"Technical field price_unit of Wine H stock move should record the purchase price"
+      elif move.product_id.name == 'Wine I':
+        assert move.price_unit == 400.0,"Technical field price_unit_net of Wine I stock move should record the purchase price"
+-
+  I check that purchase order is shipped.
+-
+  !python {model: purchase.order}: |
+     assert self.browse(cr, uid, ref("purchase_order_lcost_05")).shipped == True,"Purchase order should be delivered"
+-
+  I check that avg price of products is computed correctly
+-
+  !python {model: product.product}: |
+     xchg_rate_chf = 1.3086
+     # Value in stock in EUR
+     value_a = 102.5
+     value_b = 202.5
+     # computed as : (value_a * 15 + (200) * 15) / 30
+     value_abis = round((value_a * 15 + (200) * 15) / 30, 2)
+     # computed as : (value_b * 5 + (400) * 5) / 10
+     value_bbis = round((value_b * 5 + (400) * 5) / 10, 2)
+
+     assert self.browse(cr, uid, ref("product_product_h_avg_01")).standard_price == value_abis,"Avg price for product Wine H is wrongly computed"
+     assert self.browse(cr, uid, ref("product_product_i_avg_01")).standard_price == value_bbis,"Avg price for product Wine I is wrongly computed"

=== added file 'purchase_landed_costs/test/landed_costs_multicurrency_pricelist.yml'
--- purchase_landed_costs/test/landed_costs_multicurrency_pricelist.yml	1970-01-01 00:00:00 +0000
+++ purchase_landed_costs/test/landed_costs_multicurrency_pricelist.yml	2014-06-19 02:29:14 +0000
@@ -0,0 +1,219 @@
+-
+  Setup the pricelist as CHF (rate 1.3086) while keeping company and price_type as EUR
+-
+ !record {model: res.currency.rate, id: base.rateCHF}:
+    rate: 1.3086
+    currency_id: base.CHF
+    name: !eval time.strftime('%Y-01-01')
+-
+ !record {model: res.currency.rate, id: base.rateEUR}:
+    rate: 1.0
+    currency_id: base.EUR
+    name: !eval time.strftime('%Y-01-01')
+-
+ !record {model: res.company, id: base.main_company}:
+    currency_id: base.EUR
+-
+ !record {model: product.price.type, id: product.standard_price}:
+    currency_id: base.EUR
+-
+ !record {model: product.pricelist, id: purchase.list0}:
+    currency_id: base.CHF 
+-
+  Affect the admin user to the main company
+-
+ !record {model: res.users, id: base.user_root}:
+    company_id: base.main_company 
+-
+  Create a stock location for the test
+-
+ !record {model: stock.location, id: location_stock_01}:
+    name: Stock for PO
+    usage: internal
+-
+  Create a warehouse for the test
+-
+ !record {model: stock.warehouse, id: wh_stock_01}:
+    name: Warehouse for PO
+    lot_output_id: location_stock_01
+    lot_stock_id: location_stock_01
+    lot_input_id: location_stock_01
+    company_id: base.main_company
+-
+  Create a Supplier for PO
+-
+  !record {model: res.partner, id: res_partner_supplier_01}:
+    name: Supplier 1
+    supplier: 1
+-
+  Create a Supplier for landed cost
+-
+  !record {model: res.partner, id: res_partner_supplier_02}:
+    name: Supplier 2
+    supplier: 1
+-
+  Create a product with landed type Quantity
+-
+  !record {model: product.product, id: product_product_lcost_01}:
+    categ_id: product.product_category_1
+    cost_method: standard
+    landed_cost_type: per_unit
+    name: Transport Poste Express Quantity
+    standard_price: 50.0
+    list_price: 75.0
+    type: service
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    volume: 0.0
+    warranty: 0.0
+    weight: 0.0
+    weight_net: 0.0
+-
+  Create a wine product F with an avg price of 100
+-
+  !record {model: product.product, id: product_product_f_avg_01}:
+    categ_id: product.product_category_1
+    cost_method: standard
+    name: Wine F
+    standard_price: 100.0
+    list_price: 150.0
+    type: product
+    cost_method: average
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+-
+  Create a wine product G with an avg price of 200
+-
+  !record {model: product.product, id: product_product_g_avg_01}:
+    categ_id: product.product_category_1
+    cost_method: standard
+    name: Wine G
+    standard_price: 200.0
+    list_price: 250.0
+    type: product
+    cost_method: average
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+-
+  Create a purchase order with two lines and one landed cost based on quantity
+-
+  !record {model: purchase.order, id: purchase_order_lcost_04}:
+    partner_id: res_partner_supplier_01
+    invoice_method: order
+    location_id: location_stock_01
+    pricelist_id: purchase.list0
+    order_line:
+      - product_id: product_product_f_avg_01
+        price_unit: 100
+        product_qty: 15.0
+      - product_id: product_product_g_avg_01
+        price_unit: 200
+        product_qty: 5.0
+    landed_cost_line_ids:
+      - product_id: product_product_lcost_01
+        amount: 50
+        partner_id: res_partner_supplier_02
+        generate_invoice: 1
+        distribution_type_id: dist_unit
+-
+  Test the landed costs computation by lines
+-
+  !python {model: purchase.order}: |
+    po = self.browse(cr, uid, ref('purchase_order_lcost_04'))
+    for line in po.order_line:
+      # Compute pro-rata of quantity for line
+      value = (line.product_qty / (15+5)) * 50
+      assert line.landing_costs_order == value, "The landing cost based on quantity has not been computed correctly"
+-
+ I confirm the order where invoice control is 'Bases on order'.
+-
+  !workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_lcost_04}
+-
+  I check that the landed cost invoice and PO one is generated from PO confirmation
+-
+  !python {model: purchase.order}: |
+    purchase_order = self.browse(cr, uid, ref("purchase_order_lcost_04"))
+    assert len(purchase_order.invoice_ids) == 2, "2 invoices (PO + landed cost) should have been generated on order confirmation."
+-
+  Reception is ready for process, make it and check moves value
+-
+  !python {model: stock.partial.picking}: |
+    pick_ids = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_lcost_04")).picking_ids
+    partial_id = self.create(cr, uid, {},context={'active_model': 'stock.picking','active_ids': [pick_ids[0].id]})
+    self.do_partial(cr, uid, [partial_id])
+    picking = self.pool.get('stock.picking').browse(cr, uid, [pick_ids[0].id])[0]
+    for move in picking.move_lines:
+      if move.product_id.name == 'Wine A':
+        assert move.price_unit == 102.5,"Technical field price_unit of Wine F stock move should record the landed_costs, not purchase price"
+        assert move.price_unit_net == 100.0,"Technical field price_unit of Wine F stock move should record the purchase price"
+      elif move.product_id.name == 'Wine B':
+        assert move.price_unit == 202.5,"Technical field price_unit of Wine G stock move should record the landed_costs, not purchase price"
+        assert move.price_unit_net == 200.0,"Technical field price_unit_net of Wine G stock move should record the purchase price"
+-
+  I check that purchase order is shipped.
+-
+  !python {model: purchase.order}: |
+     assert self.browse(cr, uid, ref("purchase_order_lcost_04")).shipped == True,"Purchase order should be delivered"
+-
+  I check that avg price of products is computed with landed costs
+-
+  !python {model: product.product}: |
+     xchg_rate_chf = 1.3086
+     # computed as : ((15/20) * 50 + 100 * 15) / 15
+     value_a = round(102.5 / xchg_rate_chf, 2)
+     # computed as : ((5/20) * 50 + 200 * 5) / 5
+     value_b = round(202.5 / xchg_rate_chf, 2)
+     assert self.browse(cr, uid, ref("product_product_f_avg_01")).standard_price == value_a,"Avg price for product Wine F is wrongly computed"
+     assert self.browse(cr, uid, ref("product_product_g_avg_01")).standard_price == value_b,"Avg price for product Wine G is wrongly computed"
+-
+  Create a purchase order with two lines
+-
+  !record {model: purchase.order, id: purchase_order_lcost_04bis}:
+    partner_id: res_partner_supplier_01
+    invoice_method: order
+    location_id: location_stock_01
+    pricelist_id: purchase.list0
+    order_line:
+      - product_id: product_product_f_avg_01
+        price_unit: 200
+        product_qty: 15.0
+      - product_id: product_product_g_avg_01
+        price_unit: 400
+        product_qty: 5.0
+-
+ I confirm the order where invoice control is 'Bases on order'.
+-
+  !workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_lcost_04bis}
+-
+  Reception is ready for process, make it and check moves value
+-
+  !python {model: stock.partial.picking}: |
+    pick_ids = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_lcost_04bis")).picking_ids
+    partial_id = self.create(cr, uid, {},context={'active_model': 'stock.picking','active_ids': [pick_ids[0].id]})
+    self.do_partial(cr, uid, [partial_id])
+    picking = self.pool.get('stock.picking').browse(cr, uid, [pick_ids[0].id])[0]
+    for move in picking.move_lines:
+      if move.product_id.name == 'Wine A':
+        assert move.price_unit == 200.0,"Technical field price_unit of Wine F stock move should record the purchase price"
+      elif move.product_id.name == 'Wine B':
+        assert move.price_unit == 400.0,"Technical field price_unit_net of Wine G stock move should record the purchase price"
+-
+  I check that purchase order is shipped.
+-
+  !python {model: purchase.order}: |
+     assert self.browse(cr, uid, ref("purchase_order_lcost_04bis")).shipped == True,"Purchase order should be delivered"
+-
+  I check that avg price of products is computed correctly
+-
+  !python {model: product.product}: |
+     xchg_rate_chf = 1.3086
+     # Value in stock in EUR
+     value_a = round(102.5 / xchg_rate_chf, 2)
+     value_b = round(202.5 / xchg_rate_chf, 2)
+     # computed as : (value_a * 15 + (200 / xchg_rate_chf) * 15) / 30
+     value_abis = round((value_a * 15 + (200 / xchg_rate_chf) * 15) / 30, 2) #152.84
+     # computed as : (value_b * 5 + (400 / xchg_rate_chf) * 5) / 10
+     value_bbis = round((value_b * 5 + (400 / xchg_rate_chf) * 5) / 10, 2)
+
+     assert self.browse(cr, uid, ref("product_product_f_avg_01")).standard_price == value_abis,"Avg price for product Wine F is wrongly computed"
+     assert self.browse(cr, uid, ref("product_product_g_avg_01")).standard_price == value_bbis,"Avg price for product Wine G is wrongly computed"
\ No newline at end of file

=== added file 'purchase_landed_costs/test/landed_costs_multicurrency_pricetype.yml'
--- purchase_landed_costs/test/landed_costs_multicurrency_pricetype.yml	1970-01-01 00:00:00 +0000
+++ purchase_landed_costs/test/landed_costs_multicurrency_pricetype.yml	2014-06-19 02:29:14 +0000
@@ -0,0 +1,219 @@
+-
+  Setup the Company as CHF (rate 1.3086) while keeping pricelist and price_type as EUR
+-
+ !record {model: res.currency.rate, id: base.rateCHF}:
+    rate: 1.3086
+    currency_id: base.CHF
+    name: !eval time.strftime('%Y-01-01')
+-
+ !record {model: res.currency.rate, id: base.rateEUR}:
+    rate: 1.0
+    currency_id: base.EUR
+    name: !eval time.strftime('%Y-01-01')
+-
+ !record {model: res.company, id: base.main_company}:
+    currency_id: base.EUR
+-
+ !record {model: product.price.type, id: product.standard_price}:
+    currency_id: base.CHF
+-
+ !record {model: product.pricelist, id: purchase.list0}:
+    currency_id: base.EUR 
+-
+  Affect the admin user to the main company
+-
+ !record {model: res.users, id: base.user_root}:
+    company_id: base.main_company 
+-
+  Create a stock location for the test
+-
+ !record {model: stock.location, id: location_stock_01}:
+    name: Stock for PO
+    usage: internal
+-
+  Create a warehouse for the test
+-
+ !record {model: stock.warehouse, id: wh_stock_01}:
+    name: Warehouse for PO
+    lot_output_id: location_stock_01
+    lot_stock_id: location_stock_01
+    lot_input_id: location_stock_01
+    company_id: base.main_company
+-
+  Create a Supplier for PO
+-
+  !record {model: res.partner, id: res_partner_supplier_01}:
+    name: Supplier 1
+    supplier: 1
+-
+  Create a Supplier for landed cost
+-
+  !record {model: res.partner, id: res_partner_supplier_02}:
+    name: Supplier 2
+    supplier: 1
+-
+  Create a product with landed type Quantity
+-
+  !record {model: product.product, id: product_product_lcost_01}:
+    categ_id: product.product_category_1
+    cost_method: standard
+    landed_cost_type: per_unit
+    name: Transport Poste Express Quantity
+    standard_price: 50.0
+    list_price: 75.0
+    type: service
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    volume: 0.0
+    warranty: 0.0
+    weight: 0.0
+    weight_net: 0.0
+-
+  Create a wine product J with an avg price of 100
+-
+  !record {model: product.product, id: product_product_j_avg_01}:
+    categ_id: product.product_category_1
+    cost_method: standard
+    name: Wine J
+    standard_price: 100.0
+    list_price: 150.0
+    type: product
+    cost_method: average
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+-
+  Create a wine product K with an avg price of 200
+-
+  !record {model: product.product, id: product_product_k_avg_01}:
+    categ_id: product.product_category_1
+    cost_method: standard
+    name: Wine K
+    standard_price: 200.0
+    list_price: 250.0
+    type: product
+    cost_method: average
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+-
+  Create a purchase order with two lines and one landed cost based on quantity
+-
+  !record {model: purchase.order, id: purchase_order_lcost_06}:
+    partner_id: res_partner_supplier_01
+    invoice_method: order
+    location_id: location_stock_01
+    pricelist_id: purchase.list0
+    order_line:
+      - product_id: product_product_j_avg_01
+        price_unit: 100
+        product_qty: 15.0
+      - product_id: product_product_k_avg_01
+        price_unit: 200
+        product_qty: 5.0
+    landed_cost_line_ids:
+      - product_id: product_product_lcost_01
+        amount: 50
+        partner_id: res_partner_supplier_02
+        generate_invoice: 1
+        distribution_type_id: dist_unit
+-
+  Test the landed costs computation by lines
+-
+  !python {model: purchase.order}: |
+    po = self.browse(cr, uid, ref('purchase_order_lcost_06'))
+    for line in po.order_line:
+      # Compute pro-rata of quantity for line
+      value = (line.product_qty / (15+5)) * 50
+      assert line.landing_costs_order == value, "The landing cost based on quantity has not been computed correctly"
+-
+ I confirm the order where invoice control is 'Bases on order'.
+-
+  !workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_lcost_06}
+-
+  I check that the landed cost invoice and PO one is generated from PO confirmation
+-
+  !python {model: purchase.order}: |
+    purchase_order = self.browse(cr, uid, ref("purchase_order_lcost_06"))
+    assert len(purchase_order.invoice_ids) == 2, "2 invoices (PO + landed cost) should have been generated on order confirmation."
+-
+  Reception is ready for process, make it and check moves value
+-
+  !python {model: stock.partial.picking}: |
+    pick_ids = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_lcost_06")).picking_ids
+    partial_id = self.create(cr, uid, {},context={'active_model': 'stock.picking','active_ids': [pick_ids[0].id]})
+    self.do_partial(cr, uid, [partial_id])
+    picking = self.pool.get('stock.picking').browse(cr, uid, [pick_ids[0].id])[0]
+    for move in picking.move_lines:
+      if move.product_id.name == 'Wine J':
+        assert move.price_unit == 102.5,"Technical field price_unit of Wine J stock move should record the landed_costs, not purchase price"
+        assert move.price_unit_net == 100.0,"Technical field price_unit of Wine J stock move should record the purchase price"
+      elif move.product_id.name == 'Wine K':
+        assert move.price_unit == 202.5,"Technical field price_unit of Wine K stock move should record the landed_costs, not purchase price"
+        assert move.price_unit_net == 200.0,"Technical field price_unit_net of Wine K stock move should record the purchase price"
+-
+  I check that purchase order is shipped.
+-
+  !python {model: purchase.order}: |
+     assert self.browse(cr, uid, ref("purchase_order_lcost_06")).shipped == True,"Purchase order should be delivered"
+-
+  I check that avg price of products is computed with landed costs
+-
+  !python {model: product.product}: |
+     xchg_rate_chf = 1.3086
+     # computed as : ((15/20) * 50 + 100 * 15) / 15
+     value_a = round(102.5 * xchg_rate_chf, 2)
+     # computed as : ((5/20) * 50 + 200 * 5) / 5
+     value_b = round(202.5 * xchg_rate_chf, 2)
+     assert self.browse(cr, uid, ref("product_product_j_avg_01")).standard_price == value_a,"Avg price for product Wine J is wrongly computed"
+     assert self.browse(cr, uid, ref("product_product_k_avg_01")).standard_price == value_b,"Avg price for product Wine K is wrongly computed"
+-
+  Create a purchase order with two lines
+-
+  !record {model: purchase.order, id: purchase_order_lcost_06bis}:
+    partner_id: res_partner_supplier_01
+    invoice_method: order
+    location_id: location_stock_01
+    pricelist_id: purchase.list0
+    order_line:
+      - product_id: product_product_j_avg_01
+        price_unit: 200
+        product_qty: 15.0
+      - product_id: product_product_k_avg_01
+        price_unit: 400
+        product_qty: 5.0
+-
+ I confirm the order where invoice control is 'Bases on order'.
+-
+  !workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_lcost_06bis}
+-
+  Reception is ready for process, make it and check moves value
+-
+  !python {model: stock.partial.picking}: |
+    pick_ids = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_lcost_06bis")).picking_ids
+    partial_id = self.create(cr, uid, {},context={'active_model': 'stock.picking','active_ids': [pick_ids[0].id]})
+    self.do_partial(cr, uid, [partial_id])
+    picking = self.pool.get('stock.picking').browse(cr, uid, [pick_ids[0].id])[0]
+    for move in picking.move_lines:
+      if move.product_id.name == 'Wine J':
+        assert move.price_unit == 200.0,"Technical field price_unit of Wine J stock move should record the purchase price"
+      elif move.product_id.name == 'Wine K':
+        assert move.price_unit == 400.0,"Technical field price_unit_net of Wine K stock move should record the purchase price"
+-
+  I check that purchase order is shipped.
+-
+  !python {model: purchase.order}: |
+     assert self.browse(cr, uid, ref("purchase_order_lcost_06bis")).shipped == True,"Purchase order should be delivered"
+-
+  I check that avg price of products is computed with landed costs
+-
+  !python {model: product.product}: |
+     xchg_rate_chf = 1.3086
+     # Value in stock in CHF
+     value_a = round(102.5 * xchg_rate_chf, 4)
+     value_b = round(202.5 * xchg_rate_chf, 4)
+     # computed as : (value_a * 15 + (200 * xchg_rate_chf) * 15) / 30
+     value_abis = round((value_a * 15 + (200 * xchg_rate_chf) * 15) / 30, 2)
+     # computed as : (value_b * 5 + (400 * xchg_rate_chf) * 5) / 10
+     value_bbis = round((value_b * 5 + (400 * xchg_rate_chf) * 5) / 10, 2)
+
+     assert self.browse(cr, uid, ref("product_product_j_avg_01")).standard_price == value_abis,"Avg price for product Wine J is wrongly computed"
+     assert self.browse(cr, uid, ref("product_product_k_avg_01")).standard_price == value_bbis,"Avg price for product Wine K is wrongly computed"

=== added file 'purchase_landed_costs/test/landed_costs_on_qty_by_line_and_order.yml'
--- purchase_landed_costs/test/landed_costs_on_qty_by_line_and_order.yml	1970-01-01 00:00:00 +0000
+++ purchase_landed_costs/test/landed_costs_on_qty_by_line_and_order.yml	2014-06-19 02:29:14 +0000
@@ -0,0 +1,144 @@
+-
+  Ensure main company, price_type of standard_price and pricelist are in EUR
+-
+ !record {model: res.company, id: base.main_company}:
+    currency_id: base.EUR
+-
+ !record {model: product.price.type, id: product.standard_price}:
+    currency_id: base.EUR
+-
+ !record {model: product.pricelist, id: purchase.list0}:
+    currency_id: base.EUR 
+-
+  Affect the admin user to the main company
+-
+ !record {model: res.users, id: base.user_root}:
+    company_id: base.main_company 
+-
+  Create a product with landed type for lines
+-
+  !record {model: product.product, id: product_product_lcost_03}:
+    categ_id: product.product_category_1
+    cost_method: standard
+    landed_cost_type: per_unit
+    name: Line fees
+    standard_price: 20.0
+    list_price: 20.0
+    type: service
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    volume: 0.0
+    warranty: 0.0
+    weight: 0.0
+    weight_net: 0.0
+-
+  Create a wine product E with an avg price of 100
+-
+  !record {model: product.product, id: product_product_e_avg_01}:
+    categ_id: product.product_category_1
+    cost_method: standard
+    name: Wine E
+    standard_price: 100.0
+    list_price: 150.0
+    type: product
+    cost_method: average
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+-
+  Create a purchase order with two lines and one landed cost based on quantity
+  And one landed cost for the first line
+-
+  !record {model: purchase.order, id: purchase_order_lcost_03}:
+    partner_id: res_partner_supplier_01
+    invoice_method: order
+    location_id: location_stock_01
+    pricelist_id: purchase.list0
+    order_line:
+      - product_id: product_product_e_avg_01
+        price_unit: 100
+        product_qty: 15.0
+        landed_cost_line_ids:
+          - product_id: product_product_lcost_03
+            amount: 20
+            partner_id: res_partner_supplier_02
+            generate_invoice: 1
+            distribution_type_id: per_unit
+      - product_id: product_product_b_avg_01
+        price_unit: 200
+        product_qty: 5.0
+    landed_cost_line_ids:
+      - product_id: product_product_lcost_01
+        amount: 50
+        partner_id: res_partner_supplier_02
+        generate_invoice: 1
+        distribution_type_id: dist_unit
+-
+  Test the landed costs computation for whole order
+-
+  !python {model: purchase.order}: |
+    po = self.browse(cr, uid, ref('purchase_order_lcost_03'))
+    for line in po.order_line:
+      # Compute pro-rata of quantity for line
+      value = (line.product_qty / (15+5)) * 50
+      assert line.landing_costs_order == value, "The landing cost based on quantity has not been computed correctly"
+-
+  Test the landed costs computation of the lines
+-
+  !python {model: purchase.order}: |
+    po = self.browse(cr, uid, ref('purchase_order_lcost_03'))
+    for line in po.order_line:
+      if line.product_id.name == 'Wine E':
+        # Value for the first line should be equal to landed cost of the line * qty
+        value_landing = 20 * line.product_qty
+        # value is landing value + landing cost order + price_subtotal of po line
+        value_landed = value_landing + (line.product_qty / (15+5)) * 50 + line.price_subtotal
+        assert line.landing_costs == value_landing, "The landing cost of the line has not been computed correctly"
+        assert line.landed_costs == value_landed, "The landed costs of the line has not been computed correctly"
+      elif line.product_id.name == 'Wine B':
+        # Value for the first line should be equal to landed cost of the line * qty
+        value_landing = 0 * line.product_qty
+        # value is landing value + landing cost order + price_subtotal of po line
+        value_landed = value_landing + (line.product_qty / (15+5)) * 50 + line.price_subtotal
+        assert line.landing_costs == value_landing, "The landing cost of the line has not been computed correctly"
+        assert line.landed_costs == value_landed, "The landed costs of the line has not been computed correctly"
+-
+  I confirm the order where invoice control is 'Bases on order'.
+-
+  !workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_lcost_03}
+-
+  I check that the landed cost invoice and PO one is generated from PO confirmation
+-
+  !python {model: purchase.order}: |
+    purchase_order = self.browse(cr, uid, ref("purchase_order_lcost_03"))
+    assert len(purchase_order.invoice_ids) == 3, "3 invoices (PO + landed cost) should have been generated on order confirmation."
+-
+  Reception is ready for process, make it and check moves value
+-
+  !python {model: stock.partial.picking}: |
+    pick_ids = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_lcost_03")).picking_ids
+    partial_id = self.create(cr, uid, {},context={'active_model': 'stock.picking','active_ids': [pick_ids[0].id]})
+    self.do_partial(cr, uid, [partial_id])
+    picking = self.pool.get('stock.picking').browse(cr, uid, [pick_ids[0].id])[0]
+    for move in picking.move_lines:
+      if move.product_id.name == 'Wine E':
+        assert move.price_unit == 122.5,"Technical field price_unit of Wine E stock move should record the landed_costs, not purchase price"
+        assert move.price_unit_net == 100.0,"Technical field price_unit of Wine E stock move should record the purchase price"
+      elif move.product_id.name == 'Wine B':
+        assert move.price_unit == 202.5,"Technical field price_unit of Wine B stock move should record the landed_costs, not purchase price"
+        assert move.price_unit_net == 200.0,"Technical field price_unit_net of Wine B stock move should record the purchase price"
+-
+  I check that purchase order is shipped.
+-
+  !python {model: purchase.order}: |
+     assert self.browse(cr, uid, ref("purchase_order_lcost_03")).shipped == True,"Purchase order should be delivered"
+-
+  I check that avg price of products is computed with landed costs
+-
+  !python {model: product.product}: |
+     # computed as : ((15/20) * 50 + 100 * 15) / 15
+     value_a = 122.5
+     # Here this scenario : landed_costs_based_on_quantity set the AVG price to 202.5; 5 PCE in stock
+     # computed as : ((5 * 202.5) + ( 5 * 202.5)) / 10
+     value_b = 202.5
+     assert self.browse(cr, uid, ref("product_product_e_avg_01")).standard_price == value_a,"Avg price for product Wine E is wrongly computed"
+     assert self.browse(cr, uid, ref("product_product_b_avg_01")).standard_price == value_b,"Avg price for product Wine B is wrongly computed"

=== added directory 'purchase_landed_costs/wizard'
=== added directory 'purchase_landed_costs_extended'
=== added file 'purchase_landed_costs_extended/__init__.py'
--- purchase_landed_costs_extended/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_landed_costs_extended/__init__.py	2014-06-19 02:29:14 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2014 Elico Corp. All Rights Reserved.
+#    Augustin Cisterne-Kaas <[e-mail]>
+#
+#    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 purchase
+import report
+import wizard

=== added file 'purchase_landed_costs_extended/__openerp__.py'
--- purchase_landed_costs_extended/__openerp__.py	1970-01-01 00:00:00 +0000
+++ purchase_landed_costs_extended/__openerp__.py	2014-06-19 02:29:14 +0000
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2014 Elico Corp. All Rights Reserved.
+#    Augustin Cisterne-Kaas <[e-mail]>
+#
+#    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': 'Purchase Landed Costs Extended',
+ 'version': '0.1',
+ 'category': 'Warehouse Management',
+ 'depends': ['purchase_landed_costs'],
+ 'author': 'Elico Corp',
+ 'license': 'AGPL-3',
+ 'website': 'https://www.elico-corp.com',
+ 'description': """
+
+""",
+ 'images': [],
+ 'demo': [],
+ 'data': ['purchase_view.xml',
+          'report/purchase_report_view.xml',
+          'wizard/landed_cost_position_invoice_view.xml',
+          'security/ir.model.access.csv'],
+ 'installable': True,
+ 'application': False}

=== added file 'purchase_landed_costs_extended/purchase.py'
--- purchase_landed_costs_extended/purchase.py	1970-01-01 00:00:00 +0000
+++ purchase_landed_costs_extended/purchase.py	2014-06-19 02:29:14 +0000
@@ -0,0 +1,167 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2014 Elico Corp. All Rights Reserved.
+#    Augustin Cisterne-Kaas <[e-mail]>
+#
+#    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 openerp.osv import orm, fields
+import openerp.addons.decimal_precision as dp
+
+
+class landed_cost_position(orm.Model):
+    _inherit = 'landed.cost.position'
+
+    def onchange_partner_id(self, cr, uid, ids, partner_id, context=None):
+        if not partner_id:
+            return {}
+        partner = self.pool.get('res.partner').browse(
+            cr, uid, partner_id, context=context)
+        pricelist = partner.property_product_pricelist_purchase
+        return {'value': {'currency_id': pricelist.currency_id.id}}
+
+    def onchange_amount_currency(self, cr, uid, ids,
+                                 amount_currency, currency_id,
+                                 date_po, context=None):
+        assert len(ids) < 2
+        parent_currency_id = None
+        if ids:
+            landed_cost = self.browse(cr, uid, ids[0], context=context)
+            parent_currency_id = landed_cost.po_currency_id.id
+        else:
+            parent_currency_id = self._default_currency(
+                cr, uid, context=context)
+        if not parent_currency_id or not amount_currency or not currency_id:
+            return {}
+        cur_obj = self.pool.get('res.currency')
+        amount = amount_currency
+        if currency_id != parent_currency_id:
+            ctx = context.copy()
+            ctx['date'] = date_po or False
+            amount = cur_obj.compute(cr, uid,
+                                     currency_id,
+                                     parent_currency_id,
+                                     amount,
+                                     context=ctx)
+        return {'value': {'amount': amount}}
+
+    def _default_currency(self, cr, uid, context=None):
+        context = context or {}
+        pricelist_id = context.get('pricelist_id', [])
+        pricelist = self.pool.get('product.pricelist').read(
+            cr, uid, pricelist_id, ['currency_id'])
+        parent_currency_id = None
+        if pricelist:
+            parent_currency_id = pricelist['currency_id'][0]
+        return parent_currency_id
+
+    _columns = {
+        'amount_currency': fields.float(
+            'Currency Amount',
+            digits_compute=dp.get_precision('Purchase Price'),
+            help="Landed cost expressed in Landed Cost line currency"),
+        'currency_id': fields.many2one(
+            'res.currency', 'Currency'),
+        'po_pricelist_id': fields.related(
+            'purchase_order_id', 'pricelist_id',
+            type='many2one',
+            relation='product.pricelist',
+            string='PO Pricelist',
+            store=True,
+            readonly=True,
+            help="PO pricelist"),
+        'po_currency_id': fields.related(
+            'po_pricelist_id', 'currency_id',
+            type='many2one',
+            relation='res.currency',
+            string='PO Currency',
+            store=True,
+            readonly=True,
+            help="PO Currency"),
+        'invoice_id': fields.many2one('account.invoice', 'Invoice'),
+        'active': fields.boolean('Active')
+    }
+
+    _defaults = {
+        'currency_id': _default_currency,
+        'active': True
+    }
+
+    def open_invoice(self, cr, uid, ids, context=None):
+        assert len(ids) == 1
+        lcp = self.browse(cr, uid, ids[0], context=context)
+        if not lcp.invoice_id:
+            return {}
+        return {
+            'type': 'ir.actions.act_window',
+            'name': 'Form heading',
+            'view_mode': 'form',
+            'view_type': 'form',
+            'res_model': 'account.invoice',
+            'nodestroy': True,
+            'res_id': lcp.invoice_id.id,
+            'context': context
+        }
+
+
+class purchase_order(orm.Model):
+    _inherit = 'purchase.order'
+
+    def _generate_invoice_from_landed_cost(self, cr, uid, landed_cost,
+                                           context=None):
+        if landed_cost.invoice_id:
+            return landed_cost.invoice_id.id
+        inv_id = super(
+            purchase_order, self
+        )._generate_invoice_from_landed_cost(
+            cr, uid, landed_cost, context=context)
+        landed_cost.write({'invoice_id': inv_id}, context=context)
+        return inv_id
+
+    def _prepare_landed_cost_inv_line(self, cr, uid, account_id, inv_id,
+                                      landed_cost, context=None):
+        res = super(purchase_order, self)._prepare_landed_cost_inv_line(
+            cr, uid, account_id, inv_id, landed_cost, context=context)
+        res['price_unit'] = landed_cost.amount_currency
+        return res
+
+    def _prepare_landed_cost_inv(self, cr, uid, landed_cost, context=None):
+        res = super(purchase_order, self)._prepare_landed_cost_inv(
+            cr, uid, landed_cost, context=context)
+        res['currency_id'] = landed_cost.currency_id.id
+        return res
+
+    def wkf_approve_order(self, cr, uid, ids, context=None):
+        """ On PO approval, generate all invoices for all landed cost position.
+
+        Remember that only landed cost position with the checkbox
+        generate_invoice ticked are generated.
+
+        """
+        lcp_pool = self.pool.get('landed.cost.position')
+        line_ids = []
+        for order in self.browse(cr, uid, ids, context=context):
+            for po_line in order.order_line:
+                for line_cost in po_line.landed_cost_line_ids:
+                    if not line_cost.generate_invoice or line_cost.invoice_id:
+                        line_ids = line_cost.id
+        lcp_pool.write(cr, uid, line_ids, {'active': False})
+
+        res = super(purchase_order, self).wkf_approve_order(cr, uid, ids,
+                                                            context=context)
+        lcp_pool.write(cr, uid, line_ids, {'active': True})
+        return res

=== added file 'purchase_landed_costs_extended/purchase_view.xml'
--- purchase_landed_costs_extended/purchase_view.xml	1970-01-01 00:00:00 +0000
+++ purchase_landed_costs_extended/purchase_view.xml	2014-06-19 02:29:14 +0000
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+
+
+        <record id="purchase_order_form" model="ir.ui.view">
+            <field name="name">purchase.order.form</field>
+            <field name="model">purchase.order</field>
+            <field name="inherit_id" ref="purchase_landed_costs.c2c_purchase_order_landed_cost_view" />
+            <field name="arch" type="xml" >
+                <field name="order_line" position="attributes">
+                    <attribute name="attrs">{'readonly': [('pricelist_id', '=', False)]}</attribute>
+                    <attribute name="context">{'pricelist_id': pricelist_id}</attribute>
+                </field>
+                <xpath expr="//field[@name='order_line']/tree" position="attributes">
+                    <attribute name="editable">False</attribute>
+                </xpath>
+                <field name="landed_cost_line_ids" position="attributes">
+                    <attribute name="attrs">{'readonly': [('pricelist_id', '=', False)]}</attribute>
+                    <attribute name="context">{'pricelist_id': pricelist_id}</attribute>
+                </field>
+                <xpath expr="//field[@name='landed_cost_line_ids']/tree/field[@name='amount']" position="before">
+                    <field
+                        name="amount_currency"
+                        on_change="onchange_amount_currency(amount_currency, currency_id, date_po, context)"
+                    />
+                    <field
+                        name="currency_id"
+                        on_change="onchange_amount_currency(amount_currency, currency_id, date_po, context)"
+                    />           
+                </xpath>
+                <xpath expr="//field[@name='landed_cost_line_ids']/tree/field[@name='amount']" position="after">
+                    <field name="invoice_id" readonly="True" />
+                    <button name="open_invoice" type="object" attrs="{'invisible': [('invoice_id', '=', False)]}" string="Invoice" icon="gtk-open" />
+                    
+                    <field name="date_po" invisible="True" />        
+                </xpath>
+   
+                <xpath expr="//field[@name='landed_cost_line_ids']/tree/field[@name='partner_id']" position="attributes">
+                    <attribute name="on_change">onchange_partner_id(partner_id)</attribute>         
+                </xpath>
+            </field>
+        </record>
+
+        <record id="purchase_order_line_form" model="ir.ui.view">
+            <field name="name">purchase.order.line.form</field>
+            <field name="model">purchase.order.line</field>
+            <field name="inherit_id" ref="purchase_landed_costs.purchase_oder_line_landed_cost_view" />
+            <field name="arch" type="xml" >
+                <field name="product_id" position="attributes">
+                    <attribute name="attrs">{'readonly': [('state', '!=', 'draft')]}</attribute>
+                </field>
+                <field name="product_qty" position="attributes">
+                    <attribute name="attrs">{'readonly': [('state', '!=', 'draft')]}</attribute>
+                </field>
+                <field name="price_unit" position="attributes">
+                    <attribute name="attrs">{'readonly': [('state', '!=', 'draft')]}</attribute>
+                </field>
+                <field name="taxes_id" position="attributes">
+                    <attribute name="attrs">{'readonly': [('state', '!=', 'draft')]}</attribute>
+                </field>
+                <field name="date_planned" position="attributes">
+                    <attribute name="attrs">{'readonly': [('state', '!=', 'draft')]}</attribute>
+                </field>
+                <field name="name" position="attributes">
+                    <attribute name="attrs">{'readonly': [('state', '!=', 'draft')]}</attribute>
+                </field>
+                <field name="product_id" position="after">
+                    <field name="state" invisible="True" />
+                </field>
+                <field name="landed_cost_line_ids" position="attributes">
+                    <attribute name="context">{'pricelist_id': context['pricelist_id']}</attribute>
+                </field>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="c2c_landed_cost_tree">
+            <field name="name">c2clanded.cost.tree</field>
+            <field name="model">landed.cost.position</field>
+            <field name="inherit_id" ref="purchase_landed_costs.c2c_landed_cost_tree" />
+            <field name="arch" type="xml">
+                <field name="partner_id" position="attributes">
+                    <attribute name="on_change">onchange_partner_id(partner_id)</attribute>
+                </field>
+                <field name="amount" position="before">
+                    <field
+                        name="amount_currency"
+                        on_change="onchange_amount_currency(amount_currency, currency_id, date_po, context)"
+                    />
+                    <field
+                        name="currency_id"
+                        on_change="onchange_amount_currency(amount_currency, currency_id, date_po, context)"
+                    />
+                </field>
+                <field name="amount" position="after">
+                    <field name="invoice_id" readonly="True" />
+                    <button name="open_invoice" type="object" attrs="{'invisible': [('invoice_id', '=', False)]}" string="Invoice" icon="gtk-open" />
+                    <field name="date_po" invisible="True" />
+                </field>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="c2c_landed_cost_form">
+            <field name="name">c2clanded.cost.form</field>
+            <field name="model">landed.cost.position</field>
+            <field name="inherit_id" ref="purchase_landed_costs.c2c_landed_cost_form" />
+            <field name="arch" type="xml">
+                <field name="partner_id" position="attributes">
+                    <attribute name="on_change">onchange_partner_id(partner_id)</attribute>
+                </field>
+                <field name="amount" position="before">
+                    <field
+                        name="amount_currency"
+                        on_change="onchange_amount_currency(amount_currency, currency_id, date_po, context)"
+                    />
+                    <field
+                        name="currency_id"
+                        on_change="onchange_amount_currency(amount_currency, currency_id, date_po, context)"
+                    />
+                </field>
+                <field name="amount" position="after">
+                    <field name="invoice_id" readonly="True" />
+                    <button name="open_invoice" type="object" attrs="{'invisible': [('invoice_id', '=', False)]}" string="Invoice" icon="gtk-open" />
+                    <field name="date_po" invisible="True" />
+                </field>
+            </field>
+        </record>
+
+
+
+        <record model="ir.ui.view" id="landed_cost_tree">
+          <field name="name">landed.cost.tree</field>
+          <field name="model">landed.cost.position</field>
+          <field name="priority">50</field>
+          <field name="type">tree</field>
+          <field name="arch" type="xml">
+            <tree string="Landing Costs" editable="bottom" create="false">
+                  <field name="purchase_order_id"/>
+                  <field name="generate_invoice"/>
+                  <field name="product_id" context="{'landed_cost_type':'per_unit'}" on_change="onchange_product_id(product_id)"/>
+                  <field name="account_id" invisible="1"/>
+                  <field name="partner_id" on_change="onchange_partner_id(partner_id)" />
+                  <field
+                      name="amount_currency"
+                      on_change="onchange_amount_currency(amount_currency, currency_id, date_po, context)"
+                  />
+                  <field
+                      name="currency_id"
+                      on_change="onchange_amount_currency(amount_currency, currency_id, date_po, context)"
+                  />
+                  <field name="amount"/>
+                  <field name="po_currency_id"/>
+                  <field name="distribution_type_id" domain="[('apply_on','=','line')]"  widget="selection"/>
+                  <field name="invoice_id" readonly="True" />
+                  <button name="open_invoice" type="object" attrs="{'invisible': [('invoice_id', '=', False)]}" string="Invoice" icon="gtk-open" />
+                  <field name="date_po" invisible="True" />
+            </tree>
+          </field>
+        </record>
+
+
+        <record id="po_landed_costs_extended" model="ir.actions.act_window">
+            <field name="name">Landed Costs</field>
+            <field name="res_model">landed.cost.position</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="landed_cost_tree"></field>
+        </record>
+
+        <menuitem action="po_landed_costs_extended" id="menu_action_landed_cost" parent="purchase.menu_procurement_management_invoice" sequence="100"/>
+    </data>
+</openerp>

=== added directory 'purchase_landed_costs_extended/report'
=== added file 'purchase_landed_costs_extended/report/__init__.py'
--- purchase_landed_costs_extended/report/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_landed_costs_extended/report/__init__.py	2014-06-19 02:29:14 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2014 Elico Corp. All Rights Reserved.
+#    Augustin Cisterne-Kaas <[e-mail]>
+#
+#    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 purchase_report

=== added file 'purchase_landed_costs_extended/report/purchase_report.py'
--- purchase_landed_costs_extended/report/purchase_report.py	1970-01-01 00:00:00 +0000
+++ purchase_landed_costs_extended/report/purchase_report.py	2014-06-19 02:29:14 +0000
@@ -0,0 +1,399 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2014 Elico Corp. All Rights Reserved.
+#    Augustin Cisterne-Kaas <[e-mail]>
+#
+#    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/>.
+#
+##############################################################################
+#
+# Please note that these reports are not multi-currency !!!
+#
+from openerp.osv import fields, orm
+from openerp import tools
+
+
+class purchase_landed_cost_report(orm.Model):
+    _name = "purchase.landed.cost.report"
+    _description = "Purchases Orders"
+    _auto = False
+    _columns = {
+        'date': fields.date(
+            'Order Date', readonly=True,
+            help="Date on which this document has been created"),
+        'name': fields.char('Year', size=64, required=False, readonly=True),
+        'day': fields.char('Day', size=128, readonly=True),
+        'state': fields.selection([
+            ('draft', 'Request for Quotation'),
+            ('confirmed', 'Waiting Supplier Ack'),
+            ('approved', 'Approved'),
+            ('except_picking', 'Shipping Exception'),
+            ('except_invoice', 'Invoice Exception'),
+            ('done', 'Done'),
+            ('cancel', 'Cancelled')],
+            'Order Status', readonly=True),
+        'product_id': fields.many2one(
+            'product.product', 'Product', readonly=True),
+        'warehouse_id': fields.many2one(
+            'stock.warehouse', 'Warehouse', readonly=True),
+        'location_id': fields.many2one(
+            'stock.location', 'Destination', readonly=True),
+        'partner_id': fields.many2one(
+            'res.partner', 'Supplier', readonly=True),
+        'pricelist_id': fields.many2one(
+            'product.pricelist', 'Pricelist', readonly=True),
+        'date_approve': fields.date(
+            'Date Approved', readonly=True),
+        'expected_date': fields.date(
+            'Expected Date', readonly=True),
+        'validator': fields.many2one(
+            'res.users', 'Validated By', readonly=True),
+        'product_uom': fields.many2one(
+            'product.uom', 'Reference Unit of Measure', required=True),
+        'company_id': fields.many2one(
+            'res.company', 'Company', readonly=True),
+        'user_id': fields.many2one(
+            'res.users', 'Responsible', readonly=True),
+        'quantity': fields.float('Quantity', readonly=True),
+        'price_total': fields.float('Total Price', readonly=True),
+        'price_average': fields.float(
+            'Average Price', readonly=True,
+            group_operator="avg"),
+        'negociation': fields.float(
+            'Purchase-Standard Price', readonly=True,
+            group_operator="avg"),
+        'price_standard': fields.float(
+            'Products Value', readonly=True,
+            group_operator="sum"),
+        'nbr': fields.integer('# of Lines', readonly=True),
+        'month': fields.selection(
+            [
+                ('01', 'January'), ('02', 'February'), ('03', 'March'),
+                ('04', 'April'), ('05', 'May'), ('06', 'June'),
+                ('07', 'July'), ('08', 'August'), ('09', 'September'),
+                ('10', 'October'), ('11', 'November'), ('12', 'December')
+            ], 'Month', readonly=True),
+        'category_id': fields.many2one('product.category', 'Category',
+                                       readonly=True),
+        'landed_cost_total': fields.float(
+            'Landed cost total', readonly=True,
+            group_operator="sum"),
+        'landed_cost_unit': fields.float(
+            'Landed cost unit', readonly=True,
+            group_operator="sum"),
+        'purchase_order_id': fields.many2one(
+            'purchase.order', 'Purchase Order', readonly=True),
+    }
+    _order = 'name desc,price_total desc'
+
+    def init(self, cr):
+        tools.sql.drop_view_if_exists(cr, 'purchase_landed_cost_report')
+        cr.execute("""
+            CREATE OR REPLACE FUNCTION po_landed_cost_per_unit(int)
+            RETURNS numeric
+                AS '
+            SELECT sum(subtotal) FROM (SELECT
+
+                                         ((po_lcp.amount_company_currency
+                                          / (SELECT sum(product_qty) FROM
+                                            purchase_order_line
+                                            WHERE order_id = pol.order_id))
+                                          * pol.product_qty
+                                    ) as subtotal
+                                    FROM purchase_order_line POL
+                                    LEFT JOIN landed_cost_position po_lcp
+                                    ON po_lcp.purchase_order_id = pol.order_id
+                                    LEFT JOIN landed_cost_distribution_type
+                                    po_lcdt
+                                    ON po_lcdt.id = po_lcp.distribution_type_id
+                                    WHERE pol.id = $1
+                                    AND po_lcp.active = true
+                                    AND po_lcp.purchase_order_line_id is null
+                                    AND po_lcdt.landed_cost_type = ''per_unit''
+                                    GROUP BY pol.id, po_lcp.id, po_lcdt.id)
+                                    as result'
+                       LANGUAGE SQL;
+
+            CREATE OR REPLACE FUNCTION po_landed_cost_per_value(int)
+            RETURNS numeric
+                AS '
+                    SELECT sum(subtotal)
+                    FROM (
+                        SELECT (
+                            (po_lcp.amount_company_currency
+                                * (pol.price_unit
+                                * pol.product_qty)) / po.amount_untaxed
+                        ) as subtotal
+                        FROM purchase_order_line POL
+                        LEFT JOIN purchase_order po
+                        ON po.id = pol.order_id
+                        LEFT JOIN landed_cost_position po_lcp
+                        ON po_lcp.purchase_order_id = pol.order_id
+                        LEFT JOIN landed_cost_distribution_type po_lcdt
+                        ON po_lcdt.id = po_lcp.distribution_type_id
+                        WHERE pol.id = $1
+                            AND po_lcp.active = true
+                            AND po_lcp.purchase_order_line_id is null
+                            AND po_lcdt.landed_cost_type = ''value''
+                        GROUP BY pol.id, po.id, po_lcp.id, po_lcdt.id) as
+                        result'
+            LANGUAGE SQL;
+
+
+            CREATE OR REPLACE FUNCTION pol_landed_cost_per_unit(int) RETURNS
+            numeric
+                AS '
+                    SELECT sum(subtotal)
+                    FROM (
+                        SELECT
+                                    pol.id as polid,
+                                    (
+                                        pol_lcp.amount_company_currency
+                                        * pol.product_qty
+                                    ) as subtotal
+                                    FROM purchase_order_line POL
+                                    LEFT JOIN landed_cost_position pol_lcp
+                                    ON pol_lcp.purchase_order_line_id = pol.id
+                                    LEFT JOIN landed_cost_distribution_type
+                                    pol_lcdt
+                                    ON
+                                    pol_lcdt.id = pol_lcp.distribution_type_id
+                                    WHERE pol.id = $1
+                                    AND pol_lcp.active = true
+                                    AND
+                                    pol_lcdt.landed_cost_type = ''per_unit''
+                                    GROUP BY pol.id, pol_lcp.id, pol_lcdt.id)
+                                    as result'
+            LANGUAGE SQL;
+
+            CREATE OR REPLACE FUNCTION pol_landed_cost_per_value(int) RETURNS
+            numeric
+                AS 'SELECT sum(subtotal)
+                    FROM (
+                            SELECT
+                                    pol.id as polid,
+                                    pol_lcp.amount_company_currency as subtotal
+                                    FROM purchase_order_line POL
+                                    LEFT JOIN landed_cost_position pol_lcp
+                                    ON pol_lcp.purchase_order_line_id = pol.id
+                                    LEFT JOIN landed_cost_distribution_type
+                                    pol_lcdt
+                                    ON
+                                    pol_lcdt.id = pol_lcp.distribution_type_id
+                                    WHERE pol.id = $1
+                                    AND pol_lcp.active = true
+                                    AND pol_lcdt.landed_cost_type = ''value''
+                                    GROUP BY pol.id, pol_lcp.id, pol_lcdt.id)
+                                    as result'
+            LANGUAGE SQL;
+
+
+            CREATE OR REPLACE FUNCTION pol_landed_cost_total(int) RETURNS
+            numeric
+                AS 'SELECT sum(subtotal)
+                    FROM (select po_landed_cost_per_unit as subtotal
+                        from po_landed_cost_per_unit($1) UNION
+            select po_landed_cost_per_value as subtotal
+            from po_landed_cost_per_value($1) UNION
+            select pol_landed_cost_per_unit as subtotal
+            from pol_landed_cost_per_unit($1) UNION
+            select pol_landed_cost_per_value as subtotal
+            from pol_landed_cost_per_value($1)) as result'
+            LANGUAGE SQL;
+
+            CREATE OR REPLACE FUNCTION single_pol_po_landed_cost_per_unit(int)
+            RETURNS numeric
+                AS '
+            SELECT sum(subtotal) FROM (SELECT
+
+                                         ((po_lcp.amount_company_currency
+                                          / (SELECT sum(product_qty) FROM
+                                            purchase_order_line WHERE
+                                            order_id = pol.order_id))
+                                    ) as subtotal
+                                    FROM purchase_order_line POL
+                                    LEFT JOIN landed_cost_position po_lcp
+                                    ON po_lcp.purchase_order_id = pol.order_id
+                                    LEFT JOIN landed_cost_distribution_type
+                                    po_lcdt
+                                    ON po_lcdt.id = po_lcp.distribution_type_id
+                                    WHERE pol.id = $1
+                                    AND po_lcp.active = true
+                                    AND po_lcp.purchase_order_line_id is null
+                                    AND po_lcdt.landed_cost_type = ''per_unit''
+                                    GROUP BY pol.id, po_lcp.id, po_lcdt.id)
+                                    as result'
+                       LANGUAGE SQL;
+            CREATE OR REPLACE FUNCTION single_pol_po_landed_cost_per_value(int)
+            RETURNS numeric
+                AS '
+                    SELECT sum(subtotal)
+                    FROM (
+                        SELECT (
+                            (po_lcp.amount_company_currency * pol.price_unit) /
+                            po.amount_untaxed
+                        ) as subtotal
+                        FROM purchase_order_line POL
+                        LEFT JOIN purchase_order po
+                        ON po.id = pol.order_id
+                        LEFT JOIN landed_cost_position po_lcp
+                        ON po_lcp.purchase_order_id = pol.order_id
+                        LEFT JOIN landed_cost_distribution_type po_lcdt
+                        ON po_lcdt.id = po_lcp.distribution_type_id
+                        WHERE pol.id = $1
+                            AND po_lcp.active = true
+                            AND po_lcp.purchase_order_line_id is null
+                            AND po_lcdt.landed_cost_type = ''value''
+                        GROUP BY pol.id, po.id, po_lcp.id, po_lcdt.id)
+                        as result'
+            LANGUAGE SQL;
+
+
+            CREATE OR REPLACE FUNCTION single_pol_landed_cost_per_unit(int)
+            RETURNS numeric
+                AS '
+                    SELECT sum(subtotal)
+                    FROM (
+                        SELECT
+                                    pol.id as polid,
+                                    pol_lcp.amount_company_currency as subtotal
+                                    FROM purchase_order_line POL
+                                    LEFT JOIN landed_cost_position pol_lcp
+                                    ON pol_lcp.purchase_order_line_id = pol.id
+                                    LEFT JOIN landed_cost_distribution_type
+                                    pol_lcdt
+                                    ON
+                                    pol_lcdt.id = pol_lcp.distribution_type_id
+                                    WHERE pol.id = $1
+                                    AND pol_lcp.active = true
+                                    AND
+                                    pol_lcdt.landed_cost_type = ''per_unit''
+                                    GROUP BY pol.id, pol_lcp.id, pol_lcdt.id)
+                                    as result'
+            LANGUAGE SQL;
+
+           CREATE OR REPLACE FUNCTION single_pol_landed_cost_per_value(int) RETURNS
+            numeric
+                AS 'SELECT sum(subtotal)
+                    FROM (
+                            SELECT
+                                    pol.id as polid,
+                                    (
+                                        pol_lcp.amount_company_currency /
+                                        pol.product_qty
+                                    )as subtotal
+                                    FROM purchase_order_line POL
+                                    LEFT JOIN landed_cost_position pol_lcp
+                                    ON pol_lcp.purchase_order_line_id = pol.id
+                                    LEFT JOIN landed_cost_distribution_type
+                                    pol_lcdt
+                                    ON
+                                    pol_lcdt.id = pol_lcp.distribution_type_id
+                                    WHERE pol.id = $1
+                                    AND pol_lcp.active = true
+                                    AND pol_lcdt.landed_cost_type = ''value''
+                                    GROUP BY pol.id, pol_lcp.id, pol_lcdt.id)
+                                    as result'
+            LANGUAGE SQL;
+            CREATE OR REPLACE FUNCTION pol_landed_cost_unit(int)
+            RETURNS numeric
+                AS 'SELECT sum(subtotal)
+                    FROM (select single_pol_po_landed_cost_per_unit as subtotal
+                        from single_pol_po_landed_cost_per_unit($1) UNION
+            select single_pol_po_landed_cost_per_value as subtotal
+            from single_pol_po_landed_cost_per_value($1) UNION
+            select single_pol_landed_cost_per_unit as subtotal
+            from single_pol_landed_cost_per_unit($1) UNION
+            select single_pol_landed_cost_per_value as subtotal
+            from single_pol_landed_cost_per_value($1)) as result'
+            LANGUAGE SQL;
+            create or replace view purchase_landed_cost_report as (
+                 select
+                    min(l.id) as id,
+                    s.id as purchase_order_id,
+                    s.date_order as date,
+                    to_char(s.date_order, 'YYYY') as name,
+                    to_char(s.date_order, 'MM') as month,
+                    to_char(s.date_order, 'YYYY-MM-DD') as day,
+                    s.state,
+                    s.date_approve,
+                    s.minimum_planned_date as expected_date,
+                    s.dest_address_id,
+                    s.pricelist_id,
+                    s.validator,
+                    s.warehouse_id as warehouse_id,
+                    s.partner_id as partner_id,
+                    s.create_uid as user_id,
+                    s.company_id as company_id,
+                    l.product_id,
+                    t.categ_id as category_id,
+                    t.uom_id as product_uom,
+                    s.location_id as location_id,
+                    sum(l.product_qty/u.factor*u2.factor) as quantity,
+                    count(*) as nbr,
+                    sum(l.price_unit*l.product_qty)::decimal(16,2)
+                    as price_total,
+                    avg(100.0 * (l.price_unit*l.product_qty) / NULLIF(
+                        t.standard_price*l.product_qty/
+                        u.factor*u2.factor, 0.0))::decimal(16,2)
+                        as negociation,
+                    sum(t.standard_price*l.product_qty/u.factor*u2.factor
+                        )::decimal(16,2) as price_standard,
+                    (sum(l.product_qty*l.price_unit)/NULLIF(sum(
+                        l.product_qty/u.factor*u2.factor),0.0)
+                        )::decimal(16,2) as price_average,
+                    pol_landed_cost_total(l.id)::decimal(16,2) as
+                    landed_cost_total,
+                    pol_landed_cost_unit(l.id)::decimal(16,2) as
+                    landed_cost_unit
+                from purchase_order_line l
+                    join purchase_order s on (l.order_id=s.id)
+                        left join product_product p on (l.product_id=p.id)
+                            left join product_template t on (
+                                p.product_tmpl_id=t.id)
+                    left join product_uom u on (u.id=l.product_uom)
+                    left join product_uom u2 on (u2.id=t.uom_id)
+                group by
+                    s.company_id,
+                    s.create_uid,
+                    s.partner_id,
+                    u.factor,
+                    s.location_id,
+                    l.id,
+                    s.id,
+                    l.price_unit,
+                    s.date_approve,
+                    l.date_planned,
+                    l.product_uom,
+                    s.minimum_planned_date,
+                    s.pricelist_id,
+                    s.validator,
+                    s.dest_address_id,
+                    l.product_id,
+                    t.categ_id,
+                    s.date_order,
+                    to_char(s.date_order, 'YYYY'),
+                    to_char(s.date_order, 'MM'),
+                    to_char(s.date_order, 'YYYY-MM-DD'),
+                    s.state,
+                    s.warehouse_id,
+                    u.uom_type,
+                    u.category_id,
+                    t.uom_id,
+                    u.id,
+                    u2.factor
+            )
+        """)

=== added file 'purchase_landed_costs_extended/report/purchase_report_view.xml'
--- purchase_landed_costs_extended/report/purchase_report_view.xml	1970-01-01 00:00:00 +0000
+++ purchase_landed_costs_extended/report/purchase_report_view.xml	2014-06-19 02:29:14 +0000
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+            <record model="ir.ui.view" id="view_purchase_order_landed_cost_graph">
+                <field name="name">product.month.graph</field>
+                <field name="model">purchase.landed.cost.report</field>
+                <field name="arch" type="xml">
+                    <graph string="Purchase Orders Statistics" type="bar">
+                        <field name="product_id"/>
+                        <field name="price_total" operator="+"/>
+                    </graph>
+                </field>
+            </record>
+
+            <record id="view_purchase_order_landed_cost_tree" model="ir.ui.view">
+                <field name="name">purchase.order.landed.cost.tree</field>
+                <field name="model">purchase.landed.cost.report</field>
+                <field name="arch" type="xml">
+                    <tree string="Purchase Orders Statistics" create="false">
+                        <field name="date" invisible="1"/>
+                        <field name="date_approve" invisible="1"/>
+                        <field name="expected_date" invisible="1"/>
+                        <field name="user_id" invisible="1"/>
+                        <field name="partner_id" invisible="1"/>
+                        <field name="product_id" invisible="1"/>
+                        <field name="category_id" invisible="1"/>
+                        <field name="product_uom" invisible="1"/>
+                        <field name="day" invisible="1"/>
+                        <field name="name" invisible="1"/>
+                        <field name="month" invisible="1"/>
+                        <field name="warehouse_id" invisible="1"/>
+                        <field name="validator" invisible="1"/>
+                        <field name="company_id" invisible="1"/>
+                        <field name="state" invisible="1"/>
+                        <field name="location_id" invisible="1"/>
+                        <field name="nbr" sum="# of Lines"/>
+                        <field name="quantity" sum="Quantity"/>
+                        <field name="price_average" sum="Average Price"/>
+                        <field name="price_total" sum="Total Price"/>
+                        <field name="price_standard" sum="Products Value"/>
+                        <field name="negociation" widget="progressbar"/>
+                        <field name="landed_cost_unit" sum="Landed cost unit"/>
+                        <field name="landed_cost_total" sum="Landed cost unit"/>
+                    </tree>
+                </field>
+            </record>
+
+            <record id="view_purchase_order_landed_cost_search" model="ir.ui.view">
+            <field name="name">report.purchase.order.landed.cost.search</field>
+            <field name="model">purchase.landed.cost.report</field>
+            <field name="arch" type="xml">
+                <search string="Purchase Orders">
+                    <filter icon="terp-document-new" string="Quotations" name="quotes" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-gtk-jump-to-rtl" string="Orders" name="orders" domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
+                    <field name="partner_id"/>
+                    <field name="product_id"/>
+                    <field name="purchase_order_id"/>
+                    <group expand="0" string="Extended Filters...">
+                        <field name="user_id"/>
+                        <field name="validator"/>
+                        <field name="location_id"/>
+                        <field name="warehouse_id"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                        <field name="date"/>
+                        <field name="date_approve"/>
+                        <field name="expected_date"/>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By...">
+                        <filter string="Supplier" name="group_partner_id" icon="terp-personal" context="{'group_by':'partner_id'}"/>
+                        <filter string="Responsible" name="Responsible" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                        <filter string="Validated by" icon="terp-personal" context="{'group_by':'validator'}"/>
+                        <filter string="Product" name="group_product_id" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                        <filter string="Order" name="group_purchase_order_id" icon="terp-accessories-archiver" context="{'group_by':'purchase_order_id'}"/>
+                        <filter string="Category" name="group_category_id" icon="terp-stock_symbol-selection" context="{'group_by':'category_id'}"/>
+                        <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}"/>
+                        <filter string="Reference UOM" name="group_product_uom" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
+                        <filter string="Destination" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_id'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                        <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Order of Day"/>
+                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Order of Month"/>
+                        <filter string="Year" icon="terp-go-year" context="{'group_by':'name'}" help="Order of Year"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_purchase_order_landed_cost_qty_amount_graph">
+                <field name="name">purchase.order.landed.cost.qty.amount.graph</field>
+                <field name="model">purchase.landed.cost.report</field>
+                <field name="arch" type="xml">
+                    <graph string="Total Qty and Amount by month" type="bar">
+                        <field name="month"/>
+                        <field name="quantity" operator="+"/>
+                        <field name="price_total" operator="+"/>
+                    </graph>
+                </field>
+            </record>
+
+        <record model="ir.ui.view" id="view_purchase_order_landed_cost_by_user_graph">
+                <field name="name">purchase.order.landed.cost.by.user.graph</field>
+                <field name="model">purchase.landed.cost.report</field>
+                <field name="arch" type="xml">
+                    <graph string="Total Orders Lines by User per month" orientation="vertical" type="bar">
+                        <field name="month" />
+                        <field name="nbr" operator="+"/>
+                        <field name="user_id" group="True" />
+                    </graph>
+                </field>
+            </record>
+
+
+        <record id="action_purchase_order_landed_cost_landed_cost_report_all" model="ir.actions.act_window">
+            <field name="name">Landed Cost Extended</field>
+            <field name="res_model">purchase.landed.cost.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
+            <field name="view_id" ref="view_purchase_order_landed_cost_tree"></field>
+            <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_group_partner_id':1,'search_default_group_product_id': 1, 'search_default_group_purchase_order_id': 1, 'search_default_orders': 1, 'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="help">Purchase Analysis allows you to easily check and analyse your company purchase history and performance. From this menu you can track your negotiation performance, the delivery performance of your suppliers, etc.</field>
+        </record>
+
+        <record id="action_purchase_order_landed_cost_landed_cost_report_graph" model="ir.actions.act_window">
+            <field name="name">Total Qty and Amount by month</field>
+            <field name="res_model">purchase.landed.cost.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_purchase_order_landed_cost_qty_amount_graph"></field>
+        </record>
+
+        <record id="action_purchase_order_landed_cost_by_user_all" model="ir.actions.act_window">
+            <field name="name">Total Orders by User per month</field>
+            <field name="res_model">purchase.landed.cost.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_purchase_order_landed_cost_by_user_graph"></field>
+        </record>
+
+
+        <menuitem action="action_purchase_order_landed_cost_landed_cost_report_all" id="menu_action_purchase_order_landed_cost_landed_cost_report_all" parent="base.next_id_73" sequence="3"/>
+
+    </data>
+</openerp>
\ No newline at end of file

=== added directory 'purchase_landed_costs_extended/security'
=== added file 'purchase_landed_costs_extended/security/ir.model.access.csv'
--- purchase_landed_costs_extended/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ purchase_landed_costs_extended/security/ir.model.access.csv	2014-06-19 02:29:14 +0000
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_report_purchase_order_landed_cost,purchase_landed_costs_extended.purchase_landed_cost_report,model_purchase_landed_cost_report,purchase.group_purchase_manager,1,0,0,0
+access_report_purchase_order_landed_cost_user,purchase_landed_costs_extended.purchase_landed_cost_report user,model_purchase_landed_cost_report,purchase.group_purchase_user,1,0,0,0
\ No newline at end of file

=== added directory 'purchase_landed_costs_extended/wizard'
=== added file 'purchase_landed_costs_extended/wizard/__init__.py'
--- purchase_landed_costs_extended/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_landed_costs_extended/wizard/__init__.py	2014-06-19 02:29:14 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2014 Elico Corp. All Rights Reserved.
+#    Augustin Cisterne-Kaas <[e-mail]>
+#
+#    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.
+#