Merge lp:~savoirfairelinux-openerp/purchase-wkfl/pallet-delivery into lp:~purchase-core-editors/purchase-wkfl/7.0

[Maxime Chambreuil (http://www.savoirfairelinux.com)]

[lp:~savoirfairelinux-openerp/purchase-wkfl/pallet-delivery]

131. By Vincent Vinet on 2014-04-25

Remove context from a call -- that breaks views

132. By Mathieu Benoit on 2014-04-30

[FIX] purchase_lot_tracking: show error when missing serial number or when no analytic account in line.

133. By Mathieu Benoit on 2014-04-30

[ADD] sale_warn_under: access_sale_order_warn to group base.group_sale_salesman with read/write/create

134. By Mathieu Benoit on 2014-05-06

[IMP] stock_forecast: add default security access

135. By Mathieu Benoit on 2014-05-06

[DEL] product_reserve_forecast: remove unsued access security.

136. By Mathieu Benoit on 2014-05-13

[FIX] product_reserve_forecast: revert last commit

137. By Mathieu Benoit on 2014-05-13

Merge pallet-delivery

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

MP Description : ''
MP Commit message : ''

__openerp__.py 'description': """""",

My remarks : '''?'''

Please fix this lack of information about this module

review: Needs Fixing

[lp:~savoirfairelinux-openerp/purchase-wkfl/pallet-delivery]

138. By Mathieu Benoit on 2014-05-22

[FIX] writeoff_lot_tracking: missing var move_lines in function writeoff_move_line_get

139. By Mathieu Benoit on 2014-06-12

[IMP] pallet: change int nb_pallet to float

140. By Mathieu Benoit on 2014-06-12

[IMP] stock_forecast: add in green po_line in draft. Change 0 to empy in some columns.

141. By Mathieu Benoit on 2014-07-02

[IMP] sale_improved_slip: add more line of table CPC/CHEP in picking.rml

142. By Mathieu Benoit on 2014-07-02

[FIX] purchase_lot_tracking: don't write prodlot when not matching between order_line and product.

143. By Mathieu Benoit on 2014-07-03

[FIX] purchase_lot_tracking: ignore service when match analytic account with stock.move

144. By Mathieu Benoit on 2014-07-11

[FIX] stock_move_autolot/account.py, don't calcul if don't find account_analytic_id associated.

145. By Mathieu Benoit on 2014-07-14

[FIX] writeoff_lot_tracking/account.py, ignore writeoff move line when it's supplier, bug when it's more than 2 currency.

146. By Mathieu Benoit on 2014-07-23

[IMP] clean purchase_lot_tracking/purchase.py and adapt function to be utilize in another module.

147. By Mathieu Benoit on 2014-07-23

[ADD] add module stock_picking_create_lot_button in tree view of Incoming Shipment.

148. By Mathieu Benoit on 2014-07-23

[FIX] delivery stock when the stock_move is not associated with a po, but only with stock.picking.in. clean stock_move of sale_lot_available.

[Pedro Manuel Baeza (pedro.baeza)]

This project is now hosted on https://github.com/OCA/purchase-workflow. Please move your proposal there. This guide may help you https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub

review: Needs Resubmitting

[lp:~savoirfairelinux-openerp/purchase-wkfl/pallet-delivery]

149. By Mathieu Benoit on 2014-08-18

[FIX] stock_move_autolot/account.py, fix list out of index.

150. By Mathieu Benoit on 2014-08-18

[IMP] sale_lot_available: show only positive prodlot. Add limit of 10 in selection.

151. By Mathieu Benoit on 2014-08-20

FIX: generate error when create new lot on tree view if not in stock.move.in

152. By Mathieu Benoit on 2014-08-21

[IMP] sale_lot_available: reduice available lot in other stock.picking.line where stock.picking is not done.

153. By Mathieu Benoit on 2014-08-25

[FIX] Revert commit 150,cause another bug in Delivery Orders, we need to show all prodlot_id to associate it with an empty prodlot.

154. By Mathieu Benoit on 2014-08-27

[FIX] sale_lot_available: ignore compute lot when cancel.

Unmerged revisions

154. By Mathieu Benoit on 2014-08-27

[FIX] sale_lot_available: ignore compute lot when cancel.

153. By Mathieu Benoit on 2014-08-25

[FIX] Revert commit 150,cause another bug in Delivery Orders, we need to show all prodlot_id to associate it with an empty prodlot.

152. By Mathieu Benoit on 2014-08-21

[IMP] sale_lot_available: reduice available lot in other stock.picking.line where stock.picking is not done.

151. By Mathieu Benoit on 2014-08-20

FIX: generate error when create new lot on tree view if not in stock.move.in

150. By Mathieu Benoit on 2014-08-18

[IMP] sale_lot_available: show only positive prodlot. Add limit of 10 in selection.

149. By Mathieu Benoit on 2014-08-18

[FIX] stock_move_autolot/account.py, fix list out of index.

148. By Mathieu Benoit on 2014-07-23

[FIX] delivery stock when the stock_move is not associated with a po, but only with stock.picking.in. clean stock_move of sale_lot_available.

147. By Mathieu Benoit on 2014-07-23

[ADD] add module stock_picking_create_lot_button in tree view of Incoming Shipment.

146. By Mathieu Benoit on 2014-07-23

[IMP] clean purchase_lot_tracking/purchase.py and adapt function to be utilize in another module.

145. By Mathieu Benoit on 2014-07-14

[FIX] writeoff_lot_tracking/account.py, ignore writeoff move line when it's supplier, bug when it's more than 2 currency.

=== added directory 'delivery_editable_dates'
=== added file 'delivery_editable_dates/__init__.py'
=== added file 'delivery_editable_dates/__openerp__.py'
--- delivery_editable_dates/__openerp__.py	1970-01-01 00:00:00 +0000
+++ delivery_editable_dates/__openerp__.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'Editable Delivery Dates',
+    'version': '0.1',
+    'author': 'Savoir-faire Linux',
+    'maintainer': 'Savoir-faire Linux',
+    'website': 'http://www.savoirfairelinux.com',
+    'caterogy': 'sales',
+    'description': """
+""",
+    'depends': ['base', 'sale'],
+    'data': [
+        'editable_delivery_dates_view.xml',
+    ],
+    'demo': [],
+    'test': [],
+    'installable': True,
+    'active': False,
+}
 
=== added file 'delivery_editable_dates/editable_delivery_dates_view.xml'
--- delivery_editable_dates/editable_delivery_dates_view.xml	1970-01-01 00:00:00 +0000
+++ delivery_editable_dates/editable_delivery_dates_view.xml	2014-08-27 19:22:25 +0000
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<openerp>
+  <data>
+    <record id="editable_so_form" model="ir.ui.view">
+      <field name="name">sale.order.editable.form</field>
+      <field name="model">sale.order</field>
+      <field name="inherit_id" ref="sale.view_order_form" />
+      <field name="arch" type="xml">
+        <field name="date_order" position="replace">
+          <field name="date_order" attrs="{'readonly': False}" />
+        </field>
+      </field>
+    </record>
+
+    <record id="editable_do_form" model="ir.ui.view">
+      <field name="name">stock.picking.out.editable.form</field>
+      <field name="model">stock.picking.out</field>
+      <field name="inherit_id" ref="stock.view_picking_out_form" />
+      <field name="arch" type="xml">
+        <field name="min_date" position="replace">
+          <field name="min_date" attrs="{'readonly': False, 'invisible': [('min_date', '=', False)]}" />
+        </field>
+      </field>
+    </record>
+
+    <record id="editable_in_form" model="ir.ui.view">
+      <field name="name">stock.picking.in.editable.form</field>
+      <field name="model">stock.picking.in</field>
+      <field name="inherit_id" ref="stock.view_picking_in_form" />
+      <field name="arch" type="xml">
+        <field name="min_date" position="replace">
+          <field name="min_date" attrs="{'readonly': False, 'invisible': [('min_date', '=', False)]}" />
+        </field>
+      </field>
+    </record>
+  </data>
+</openerp>
 
=== added directory 'delivery_editable_dates/i18n'
=== added file 'delivery_editable_dates/i18n/delivery_editable_dates.pot'
--- delivery_editable_dates/i18n/delivery_editable_dates.pot	1970-01-01 00:00:00 +0000
+++ delivery_editable_dates/i18n/delivery_editable_dates.pot	2014-08-27 19:22:25 +0000
@@ -0,0 +1,16 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0-20130811-231021\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-09-18 14:19+0000\n"
+"PO-Revision-Date: 2013-09-18 14:19+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"
+
 
=== added directory 'landed_cost_per_pallet'
=== added file 'landed_cost_per_pallet/README'
=== added file 'landed_cost_per_pallet/__init__.py'
--- landed_cost_per_pallet/__init__.py	1970-01-01 00:00:00 +0000
+++ landed_cost_per_pallet/__init__.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import purchase
 
=== added file 'landed_cost_per_pallet/__openerp__.py'
--- landed_cost_per_pallet/__openerp__.py	1970-01-01 00:00:00 +0000
+++ landed_cost_per_pallet/__openerp__.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+# NOTE: The name of the supplied field was initially "display_name", but it seems that OpenERP,
+# whenever it seems "name" in the field, returns the value for "name". Well...
+
+{
+    'name': 'Landed Cost per Pallet',
+    'version': '1.1',
+    'author': 'Savoir-faire Linux',
+    'maintainer': 'Savoir-faire Linux',
+    'website': 'http://www.savoirfairelinux.com',
+    'category': 'Generic Modules/Purchases',
+    'description': """
+
+Lets you manage product quantities using crates and pallets
+===========================================================
+
+This module modifies the purchase module to let you manage product
+quantities by specifying a number of pallets and a number of crates
+per pallet.
+
+This also adds a 'Per Pallet' option to landed costs, in order to compute the
+landed costs per pallet.
+""",
+    'depends': ['base', 'purchase', 'purchase_landed_costs'],
+    'data': [
+        'landed_cost_per_pallet_view.xml',
+    ],
+    'demo': [],
+    'test': [],
+    'installable': True,
+    'active': False,
+}
 
=== added directory 'landed_cost_per_pallet/i18n'
=== added file 'landed_cost_per_pallet/i18n/fr.po'
--- landed_cost_per_pallet/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ landed_cost_per_pallet/i18n/fr.po	2014-08-27 19:22:25 +0000
@@ -0,0 +1,46 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* landed_cost_per_pallet
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0-20130811-231021\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-09-18 14:21+0000\n"
+"PO-Revision-Date: 2013-09-18 14:21+0000\n"
+"Last-Translator: Alexandre Boily <[e-mail]>\n"
+"Language-Team: Savoir-faire Linux\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: landed_cost_per_pallet
+#: field:purchase.order,landed_cost_base_pallet:0
+msgid "Landed Costs Base Pallet"
+msgstr "Coûts d'aterissage par palette"
+
+#. module: landed_cost_per_pallet
+#: model:ir.model,name:landed_cost_per_pallet.model_purchase_order_line
+msgid "Purchase Order Line"
+msgstr "Ligne de bon de commande"
+
+#. module: landed_cost_per_pallet
+#: model:ir.model,name:landed_cost_per_pallet.model_purchase_order
+msgid "Purchase Order"
+msgstr "Bon de commande"
+
+#. module: landed_cost_per_pallet
+#: field:purchase.order.line,nb_crates_per_pallet:0
+msgid "Crates per pallet"
+msgstr "Caisses par palette"
+
+#. module: landed_cost_per_pallet
+#: field:purchase.order.line,nb_pallets:0
+msgid "Pallets"
+msgstr "Palettes"
+
+#. module: landed_cost_per_pallet
+#: model:ir.model,name:landed_cost_per_pallet.model_landed_cost_position
+msgid "landed.cost.position"
+msgstr "landed.cost.position"
 
=== added file 'landed_cost_per_pallet/i18n/landed_cost_per_pallet.pot'
--- landed_cost_per_pallet/i18n/landed_cost_per_pallet.pot	1970-01-01 00:00:00 +0000
+++ landed_cost_per_pallet/i18n/landed_cost_per_pallet.pot	2014-08-27 19:22:25 +0000
@@ -0,0 +1,47 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* landed_cost_per_pallet
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0-20130811-231021\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-09-18 14:21+0000\n"
+"PO-Revision-Date: 2013-09-18 14:21+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: landed_cost_per_pallet
+#: field:purchase.order,landed_cost_base_pallet:0
+msgid "Landed Costs Base Pallet"
+msgstr ""
+
+#. module: landed_cost_per_pallet
+#: model:ir.model,name:landed_cost_per_pallet.model_purchase_order_line
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: landed_cost_per_pallet
+#: model:ir.model,name:landed_cost_per_pallet.model_purchase_order
+msgid "Purchase Order"
+msgstr ""
+
+#. module: landed_cost_per_pallet
+#: field:purchase.order.line,nb_crates_per_pallet:0
+msgid "Crates per pallet"
+msgstr ""
+
+#. module: landed_cost_per_pallet
+#: field:purchase.order.line,nb_pallets:0
+msgid "Pallets"
+msgstr ""
+
+#. module: landed_cost_per_pallet
+#: model:ir.model,name:landed_cost_per_pallet.model_landed_cost_position
+msgid "landed.cost.position"
+msgstr ""
+
 
=== added file 'landed_cost_per_pallet/landed_cost_per_pallet_view.xml'
--- landed_cost_per_pallet/landed_cost_per_pallet_view.xml	1970-01-01 00:00:00 +0000
+++ landed_cost_per_pallet/landed_cost_per_pallet_view.xml	2014-08-27 19:22:25 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+    <record id="view_purchase_pallet_crate_order_line" model="ir.ui.view">
+      <field name="name">purchase.order.form</field>
+      <field name="model">purchase.order</field>
+      <field name="inherit_id" ref="purchase.purchase_order_form"/>
+      <field name="arch" type="xml">
+        <field name="product_qty" position="before">
+          <field name="nb_pallets"/>
+          <field name="nb_crates_per_pallet"/>
+        </field>
+      </field>
+    </record>
+
+    <record id="view_purchase_pallet_crate_thing" model="ir.ui.view">
+      <field name="name">purchase.order.landing.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="landed_cost_base_value" position="after">
+          <field name="landed_cost_base_pallet" />
+        </field>
+      </field>
+    </record>
+  </data>
+</openerp>
 
=== added file 'landed_cost_per_pallet/purchase.py'
--- landed_cost_per_pallet/purchase.py	1970-01-01 00:00:00 +0000
+++ landed_cost_per_pallet/purchase.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,125 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import orm, fields
+import openerp.addons.decimal_precision as dp
+
+class purchase_order(orm.Model):
+
+    _inherit = 'purchase.order'
+
+    def _landed_cost_base_pallet(self, cr, uid, ids, name, args, context):
+        if not ids:
+            return {}
+
+        result = {}
+        landed_costs_base_pallet = 0.0
+
+        for line in self.browse(cr, uid, ids):
+            if line.landed_cost_line_ids:
+                for costs in line.landed_cost_line_ids:
+                    if costs.price_type == 'per_pallet':
+                        landed_costs_base_pallet += costs.amount
+            result[line.id] = landed_costs_base_pallet
+
+        return result
+
+    _columns = {
+        'landed_cost_base_pallet': fields.function(
+            _landed_cost_base_pallet,
+            digits_compute=dp.get_precision('Account'),
+            string='Landed Costs Base Pallet'),
+    }
+
+
+class purchase_order_line(orm.Model):
+
+    _inherit = 'purchase.order.line'
+
+    def _product_quantity(self, cursor, user, ids, name, arg, context=None):
+        res = {}
+        for line in self.browse(cursor, user, ids, context=context):
+            if not line.nb_crates_per_pallet or not line.nb_pallets:
+                res[line.id] = 0
+            else:
+                res[line.id] = line.nb_crates_per_pallet * line.nb_pallets
+        return res
+
+    def _landing_cost_order(self, cr, uid, ids, name, args, context):
+        if not ids:
+            return {}
+
+        result = {}
+
+        lines = self.browse(cr, uid, ids)
+
+        # Pre-compute total number of pallets
+        pallets_total = 0.0
+        for line in lines:
+            for po_line in line.order_id.order_line:
+                if po_line.order_id.landed_cost_line_ids:
+                    pallets_total += po_line.nb_pallets
+
+        # Landed costs line by line
+        for line in lines:
+            landed_costs = 0.0
+            # distribution of landed costs of PO
+            if line.order_id.landed_cost_line_ids:
+                # Base value (Absolute Value)
+                landed_costs += line.order_id.landed_cost_base_value / line.order_id.amount_total * line.price_subtotal
+
+                # Base quantity (Per Quantity)
+                landed_costs += line.order_id.landed_cost_base_quantity / line.order_id.quantity_total * line.product_qty
+
+                # Base pallet (Per Pallet)
+                landed_costs += line.order_id.landed_cost_base_pallet / pallets_total * line.nb_pallets
+            result[line.id] = landed_costs
+
+        return result
+
+    _columns = {
+        'nb_pallets': fields.float('Pallets', required=True),
+        'nb_crates_per_pallet': fields.integer('Crates per pallet', required=True),
+        'product_qty': fields.function(_product_quantity,
+                                       digits_compute=dp.get_precision('Product Unit of Measure'),
+                                       string="Quantity",
+                                       type='float'),
+        'landing_costs_order': fields.function(_landing_cost_order,
+                                               digits_compute=dp.get_precision('Account'),
+                                               string='Landing Costs from Order'),
+    }
+
+
+class landed_cost_position(orm.Model):
+
+    _inherit = 'landed.cost.position'
+
+    _columns = {
+        'price_type': fields.selection(
+            [('per_pallet', 'Per Pallet'), ('per_unit','Per Quantity'), ('value','Absolute Value')],
+            'Amount Type',
+            required=True,
+            help="Defines if the amount is to be calculated for each quantity or an absolute value"),
+    }
+
+    _defaults = {
+        'price_type': 'per_pallet',
+    }
 
=== added directory 'pallet_delivery'
=== added file 'pallet_delivery/README'
=== added file 'pallet_delivery/__init__.py'
--- pallet_delivery/__init__.py	1970-01-01 00:00:00 +0000
+++ pallet_delivery/__init__.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import stock
 
=== added file 'pallet_delivery/__openerp__.py'
--- pallet_delivery/__openerp__.py	1970-01-01 00:00:00 +0000
+++ pallet_delivery/__openerp__.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+# NOTE: The name of the supplied field was initially "display_name", but it seems that OpenERP,
+# whenever it seems "name" in the field, returns the value for "name". Well...
+
+{
+    'name': 'Pallet delivery',
+    'version': '1.1',
+    'author': 'Savoir-faire Linux',
+    'maintainer': 'Savoir-faire Linux',
+    'website': 'http://www.savoirfairelinux.com',
+    'category': 'warehouse',
+    'description': """
+
+Lets you manage truck deliveries 
+===========================================================
+
+This module lets you specify where exactly in the delivery truck
+was the merchandise.
+
+Also lets you give more specific information like the temperature
+at various points.
+
+""",
+    'depends': [
+        'base', 'purchase', 'stock',
+        'landed_cost_per_pallet', 'purchase_lot_tracking',
+    ],
+    'data': [
+        'security/ir.model.access.csv',
+        'stock_workflow.xml',
+        'pallet_delivery_data.xml',
+        'pallet_delivery_view.xml',
+    ],
+    'demo': [],
+    'test': [],
+    'installable': True,
+    'active': False,
+}
 
=== added directory 'pallet_delivery/i18n'
=== added file 'pallet_delivery/i18n/fr.po'
--- pallet_delivery/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ pallet_delivery/i18n/fr.po	2014-08-27 19:22:25 +0000
@@ -0,0 +1,186 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* pallet_delivery
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0-20130811-231021\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-09-05 14:56+0000\n"
+"PO-Revision-Date: 2013-09-05 14:56+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: pallet_delivery
+#: model:ir.actions.act_window,help:pallet_delivery.action_truck_pending
+msgid "<p class=\"oe_view_nocontent_create\">Click to create a draft truck</p>\n"
+"\n"
+"        <p>The truck contains an incoming, physical shipment. With it you can\n"
+"          register the truck's details, such as its serial number, sampled\n"
+"          temperatures, and other information. Also, the truck serves you as a\n"
+"          map of what your company received.</p>\n"
+"\n"
+"        <p>When you confirm the truck, it will act as an “Incoming Shipment”\n"
+"          confirmation, and the products will be moved from your Suppliers (as\n"
+"          listed in Purchase Orders) to your Stock.</p>\n"
+"      "
+msgstr "<p class=\"oe_view_nocontent_create\">Cliquez pour créer un camion brouillon</p>\n
+<p>Le camion contient une livraison physique entrante. Avec celui-ci, vous
+pouvez enregistrer les détails du camion, comme son numéro de série, les
+températures échantillonnées, et d'autre informations. De même, le camion est
+utile comme carte des produits reçus.</p>
+<p>Lorsque vous confirmez la réception du camion, ce dernier agira comme une
+\"Livraison entrante\" confirmée, et le produits seront déplacés de vos
+fournisseurs (tels que listés dans vos bons de commandes) vers votre
+entrepôt.</p>"
+
+#. module: pallet_delivery
+#: model:ir.model,name:pallet_delivery.model_purchase_order_line
+msgid "Purchase Order Line"
+msgstr "Ligne de bon d'achat"
+
+#. module: pallet_delivery
+#: view:stock.truck:0
+msgid "Confirm"
+msgstr "Confirmer"
+
+#. module: pallet_delivery
+#: model:ir.model,name:pallet_delivery.model_stock_truck_line
+msgid "A single pallet shipped in an incoming truck"
+msgstr "Une seule palette livrée dans un camion entrant"
+
+#. module: pallet_delivery
+#: view:stock.truck:0
+#: field:stock.truck.line,crates:0
+msgid "Crates"
+msgstr "Caisses"
+
+#. module: pallet_delivery
+#: field:stock.truck.line,pallet:0
+msgid "Pallet"
+msgstr "Palette"
+
+#. module: pallet_delivery
+#: field:stock.truck,state:0
+msgid "State"
+msgstr "État"
+
+#. module: pallet_delivery
+#: model:ir.model,name:pallet_delivery.model_stock_truck
+msgid "Incoming truck"
+msgstr "Camion entrant"
+
+#. module: pallet_delivery
+#: selection:stock.truck,state:0
+msgid "Draft"
+msgstr "Ébauche"
+
+#. module: pallet_delivery
+#: view:stock.truck:0
+msgid "Details"
+msgstr "Détails"
+
+#. module: pallet_delivery
+#: field:stock.truck,front_temperature:0
+msgid "Front Temperature"
+msgstr "Température avant"
+
+#. module: pallet_delivery
+#: field:stock.truck,supplier:0
+msgid "Supplier"
+msgstr "Fournisseur"
+
+#. module: pallet_delivery
+#: view:stock.truck:0
+msgid "Truck Composition"
+msgstr "Composition du camion"
+
+#. module: pallet_delivery
+#: field:stock.truck,back_temperature:0
+msgid "Back Temperature"
+msgstr "Température arrière"
+
+#. module: pallet_delivery
+#: view:stock.truck:0
+msgid "Serial Number"
+msgstr "Numéro de série"
+
+#. module: pallet_delivery
+#: view:stock.truck:0
+msgid "Left Pallets"
+msgstr "Palettes gauche"
+
+#. module: pallet_delivery
+#: field:stock.truck,left_pallet_ids:0
+#: field:stock.truck,right_pallet_ids:0
+msgid "Pallets"
+msgstr "Palettes"
+
+#. module: pallet_delivery
+#: field:stock.truck,truck_sn:0
+msgid "Truck S/N"
+msgstr "Numéro de série"
+
+#. module: pallet_delivery
+#: field:stock.truck,name:0
+#: field:stock.truck.line,name:0
+msgid "Name"
+msgstr "Nom"
+
+#. module: pallet_delivery
+#: field:purchase.order,stock_truck_ids:0
+msgid "Trucks"
+msgstr "Camions"
+
+#. module: pallet_delivery
+#: view:stock.truck:0
+msgid "Search Truck"
+msgstr "Rechercher un camion"
+
+#. module: pallet_delivery
+#: model:ir.model,name:pallet_delivery.model_purchase_order
+msgid "Purchase Order"
+msgstr "Bon d'achat"
+
+#. module: pallet_delivery
+#: field:stock.truck,arrival:0
+msgid "Date of Arrival"
+msgstr "Date d'arrivée"
+
+#. module: pallet_delivery
+#: view:stock.truck:0
+#: field:stock.truck.line,left_id:0
+#: field:stock.truck.line,right_id:0
+msgid "Truck"
+msgstr "Camion"
+
+#. module: pallet_delivery
+#: view:stock.truck:0
+msgid "Right Pallets"
+msgstr "Palettes droite"
+
+#. module: pallet_delivery
+#: model:ir.actions.act_window,name:pallet_delivery.action_truck_pending
+msgid "On Draft Truck"
+msgstr "Camion en ébauche"
+
+#. module: pallet_delivery
+#: model:ir.ui.menu,name:pallet_delivery.menu_truck
+msgid "Incoming Truck"
+msgstr "Camion entrant"
+
+#. module: pallet_delivery
+#: selection:stock.truck,state:0
+msgid "Done"
+msgstr "Complété"
+
+#. module: pallet_delivery
+#: view:stock.truck:0
+#: field:stock.truck,purchase_order_ids:0
+msgid "Purchase Orders"
+msgstr "Bons d'achats"
+
 
=== added file 'pallet_delivery/i18n/pallet_delivery.pot'
--- pallet_delivery/i18n/pallet_delivery.pot	1970-01-01 00:00:00 +0000
+++ pallet_delivery/i18n/pallet_delivery.pot	2014-08-27 19:22:25 +0000
@@ -0,0 +1,225 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* pallet_delivery
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-05-04 15:54+0000\n"
+"PO-Revision-Date: 2014-05-04 15:54+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: pallet_delivery
+#: model:ir.actions.act_window,help:pallet_delivery.action_truck_pending
+msgid "<p class=\"oe_view_nocontent_create\">Click to create a draft truck</p>\n"
+"\n"
+"        <p>The truck contains an incoming, physical shipment. With it you can\n"
+"          register the truck's details, such as its serial number, sampled\n"
+"          temperatures, and other information. Also, the truck serves you as a\n"
+"          map of what your company received.</p>\n"
+"\n"
+"        <p>When you confirm the truck, it will act as an “Incoming Shipment”\n"
+"          confirmation, and the products will be moved from your Suppliers (as\n"
+"          listed in Purchase Orders) to your Stock.</p>\n"
+"      "
+msgstr ""
+
+#. module: pallet_delivery
+#: model:ir.model,name:pallet_delivery.model_purchase_order_line
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: pallet_delivery
+#: field:stock.truck,back_temperature:0
+msgid "Back Temperature"
+msgstr ""
+
+#. module: pallet_delivery
+#: model:ir.model,name:pallet_delivery.model_stock_picking_in
+msgid "Incoming Shipments"
+msgstr ""
+
+#. module: pallet_delivery
+#: model:ir.model,name:pallet_delivery.model_stock_truck_line
+msgid "A single pallet shipped in an incoming truck"
+msgstr ""
+
+#. module: pallet_delivery
+#: view:stock.truck:0
+#: field:stock.truck.line,crates:0
+msgid "Crates"
+msgstr ""
+
+#. module: pallet_delivery
+#: field:stock.truck.line,pallet:0
+msgid "Pallet"
+msgstr ""
+
+#. module: pallet_delivery
+#: field:stock.truck,state:0
+msgid "State"
+msgstr ""
+
+#. module: pallet_delivery
+#: model:ir.model,name:pallet_delivery.model_stock_truck
+msgid "Incoming truck"
+msgstr ""
+
+#. module: pallet_delivery
+#: selection:stock.truck,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: pallet_delivery
+#: view:stock.truck:0
+msgid "Details"
+msgstr ""
+
+#. module: pallet_delivery
+#: field:stock.truck,front_temperature:0
+msgid "Front Temperature"
+msgstr ""
+
+#. module: pallet_delivery
+#: field:stock.truck,supplier:0
+msgid "Supplier"
+msgstr ""
+
+#. module: pallet_delivery
+#: field:purchase.order,hidden:0
+msgid "Hidden"
+msgstr ""
+
+#. module: pallet_delivery
+#: view:stock.truck:0
+msgid "Truck Composition"
+msgstr ""
+
+#. module: pallet_delivery
+#: field:purchase.order,assigned:0
+msgid "unknown"
+msgstr ""
+
+#. module: pallet_delivery
+#: view:stock.truck:0
+msgid "Confirm"
+msgstr ""
+
+#. module: pallet_delivery
+#: view:stock.truck:0
+msgid "Serial Number"
+msgstr ""
+
+#. module: pallet_delivery
+#: view:stock.truck:0
+msgid "Right Pallets"
+msgstr ""
+
+#. module: pallet_delivery
+#: field:stock.truck,left_pallet_ids:0
+#: field:stock.truck,right_pallet_ids:0
+msgid "Pallets"
+msgstr ""
+
+#. module: pallet_delivery
+#: field:stock.truck,truck_sn:0
+msgid "Truck S/N"
+msgstr ""
+
+#. module: pallet_delivery
+#: code:addons/pallet_delivery/stock.py:293
+#, python-format
+msgid "Input Error !"
+msgstr ""
+
+#. module: pallet_delivery
+#: field:stock.truck,name:0
+#: field:stock.truck.line,name:0
+msgid "Name"
+msgstr ""
+
+#. module: pallet_delivery
+#: field:purchase.order,stock_truck_ids:0
+msgid "Trucks"
+msgstr ""
+
+#. module: pallet_delivery
+#: view:stock.truck:0
+msgid "Search Truck"
+msgstr ""
+
+#. module: pallet_delivery
+#: model:ir.model,name:pallet_delivery.model_purchase_order
+msgid "Purchase Order"
+msgstr ""
+
+#. module: pallet_delivery
+#: field:stock.truck,arrival:0
+msgid "Date of Arrival"
+msgstr ""
+
+#. module: pallet_delivery
+#: view:stock.truck:0
+#: field:stock.truck.line,left_id:0
+#: field:stock.truck.line,right_id:0
+msgid "Truck"
+msgstr ""
+
+#. module: pallet_delivery
+#: view:stock.truck:0
+msgid "Left Pallets"
+msgstr ""
+
+#. module: pallet_delivery
+#: model:ir.actions.act_window,help:pallet_delivery.purchase_order_hidden
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+"          Click to create a quotation that will be converted into a purchase order. \n"
+"        </p><p>\n"
+"          Use this menu to search within your purchase orders by\n"
+"          references, supplier, products, etc. For each purchase order,\n"
+"          you can track the related discussion with the supplier, control\n"
+"          the products received and control the supplier invoices.\n"
+"        </p>\n"
+"      "
+msgstr ""
+
+#. module: pallet_delivery
+#: model:ir.actions.act_window,name:pallet_delivery.action_truck_pending
+msgid "On Draft Truck"
+msgstr ""
+
+#. module: pallet_delivery
+#: code:addons/pallet_delivery/stock.py:294
+#, python-format
+msgid "Please enter real numbers."
+msgstr ""
+
+#. module: pallet_delivery
+#: model:ir.model,name:pallet_delivery.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: pallet_delivery
+#: model:ir.ui.menu,name:pallet_delivery.menu_truck_purchase
+#: model:ir.ui.menu,name:pallet_delivery.menu_truck_stock
+msgid "Incoming Truck"
+msgstr ""
+
+#. module: pallet_delivery
+#: selection:stock.truck,state:0
+msgid "Done"
+msgstr ""
+
+#. module: pallet_delivery
+#: model:ir.actions.act_window,name:pallet_delivery.purchase_order_hidden
+#: view:stock.truck:0
+#: field:stock.truck,purchase_order_ids:0
+msgid "Purchase Orders"
+msgstr ""
+
 
=== added file 'pallet_delivery/pallet_delivery_data.xml'
--- pallet_delivery/pallet_delivery_data.xml	1970-01-01 00:00:00 +0000
+++ pallet_delivery/pallet_delivery_data.xml	2014-08-27 19:22:25 +0000
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data noupdate="1">
+    <record id="pallet_delivery_external_po" model="purchase.order">
+      <field name="partner_id">1</field>
+      <field name="location_id">8</field>
+      <field name="state">cancel</field>
+      <field name="pricelist_id" ref="purchase.list0"/>
+      <field name="hidden">1</field>
+    </record>
+
+    <record id="pallet_delivery_external_line" model="purchase.order.line">
+      <field name="product_uom">1</field>
+      <field name="order_id" ref="pallet_delivery_external_po" />
+      <field name="price_unit">1</field>
+      <field name="name">Not ours</field>
+      <field name="date_planned">2013-01-01</field>
+      <field name="state">confirmed</field>
+      <field name="nb_pallets">1</field>
+      <field name="nb_crates_per_pallet">1</field>
+    </record>
+
+    <record id="seq_type_stock_truck" model="ir.sequence.type">
+      <field name="name">Truck</field>
+      <field name="code">stock.truck</field>
+    </record>
+
+    <record id="seq_stock_truck" model="ir.sequence">
+      <field name="name">Truck</field>
+      <field name="code">stock.truck</field>
+      <field name="prefix">TRK</field>
+      <field name="padding">5</field>
+    </record>
+  </data>
+</openerp>
 
=== added file 'pallet_delivery/pallet_delivery_view.xml'
--- pallet_delivery/pallet_delivery_view.xml	1970-01-01 00:00:00 +0000
+++ pallet_delivery/pallet_delivery_view.xml	2014-08-27 19:22:25 +0000
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+    <!-- Purchase Order -->
+    <record id="purchase_order_hidden" model="ir.actions.act_window">
+      <field name="name">Purchase Orders</field>
+      <field name="type">ir.actions.act_window</field>
+      <field name="res_model">purchase.order</field>
+      <field name="view_mode">tree,form,graph,calendar</field>
+      <field name="context">{}</field>
+      <field name="domain">['&amp;', ('state','not in',('draft','sent','confirmed')), ('hidden', '!=', True)]</field>
+      <field name="search_view_id" ref="purchase.view_purchase_order_filter"/>
+      <field name="help" type="html">
+        <p class="oe_view_nocontent_create">
+          Click to create a quotation that will be converted into a purchase order. 
+        </p><p>
+          Use this menu to search within your purchase orders by
+          references, supplier, products, etc. For each purchase order,
+          you can track the related discussion with the supplier, control
+          the products received and control the supplier invoices.
+        </p>
+      </field>
+    </record>
+
+    <menuitem
+      id="purchase.menu_purchase_form_action"
+      action="purchase_order_hidden"
+      parent="purchase.menu_procurement_management"
+      sequence="6" />
+
+    <!-- Truck -->
+    <record id="truck_tree" model="ir.ui.view">
+      <field name="name">stock.truck.tree</field>
+      <field name="model">stock.truck</field>
+      <field name="arch" type="xml">
+        <tree string="Truck">
+          <field name="name" />
+          <field name="truck_sn" />
+          <field name="supplier" />
+          <field name="arrival" />
+        </tree>
+      </field>
+    </record>
+
+    <record id="truck_form" model="ir.ui.view">
+      <field name="name">stock.truck.form</field>
+      <field name="model">stock.truck</field>
+      <field eval="1" name="priority" />
+      <field name="arch" type="xml">
+        <form string="Truck" version="7.0">
+          <header>
+            <button
+              name="action_done"
+              type="object"
+              states="draft"
+              string="Confirm"
+              class="oe_highlight" />
+
+            <field
+              name="state"
+              widget="statusbar"
+              statusbar_visible="draft,done"
+              statusbar_colors='{"draft":"blue","done":"blue"}' />
+          </header>
+
+          <sheet>
+            <group>
+              <group name="pedigree" string="Details" colspan="4" col="4">
+                <group>
+                  <field name="truck_sn" />
+                  <field name="supplier" />
+                  <field name="arrival" on_change="onchange_arrival(arrival)" />
+                </group>
+
+                <group>
+                  <field name="front_temperature" on_change="validate_temperature(front_temperature, 'front_temperature')" />
+                  <field name="back_temperature" on_change="validate_temperature(back_temperature, 'back_temperature')" />
+                </group>
+              </group>
+
+              <group name="purchase_orders" string="Purchase Orders" colspan="4">
+                <field name="purchase_order_ids" nolabel="1" domain="[('state', 'not in', ['draft', 'done']), ('assigned', '=', True)]">
+                  <tree>
+                    <field name="name" />
+                  </tree>
+                </field>
+              </group>
+
+              <group name="pallets" string="Truck Composition" colspan="4">
+                <group>
+                  <field name="left_pallet_ids" nolabel="1">
+                    <tree editable="bottom">
+                      <field name="pallet" string="Left Pallets" context="{'nice':'nice','parent':parent}" />
+                      <field name="crates" string="Crates" />
+                    </tree>
+                  </field>
+                </group>
+
+                <group>
+                  <field name="right_pallet_ids" nolabel="1">
+                    <tree editable="bottom">
+                      <field name="pallet" string="Right Pallets" context="{'nice':'nice','parent':parent}" />
+                      <field name="crates" string="Crates" />
+                    </tree>
+                  </field>
+                </group>
+              </group>
+            </group>
+          </sheet>
+        </form>
+      </field>
+    </record>
+
+    <record id="view_truck_filter" model="ir.ui.view">
+      <field name="name">stock.truck.select</field>
+      <field name="model">stock.truck</field>
+      <field name="arch" type="xml">
+        <search string="Search Truck">
+          <field name="truck_sn" string="Serial Number" filter_domain="[('truck_sn', '=', self)]" />
+        </search>
+      </field>
+    </record>
+
+    <!-- Menu -->
+    <record id="action_truck_pending" model="ir.actions.act_window">
+      <field name="name">On Draft Truck</field>
+      <field name="res_model">stock.truck</field>
+      <field name="view_type">form</field>
+      <field name="view_mode">tree,form</field>
+      <field eval="False" name="view_id" />
+      <field name="search_view_id" ref="pallet_delivery.view_truck_filter" />
+      <field name="help" type="html">
+        <p class="oe_view_nocontent_create">Click to create a draft truck</p>
+
+        <p>The truck contains an incoming, physical shipment. With it you can
+          register the truck's details, such as its serial number, sampled
+          temperatures, and other information. Also, the truck serves you as a
+          map of what your company received.</p>
+
+        <p>When you confirm the truck, it will act as an “Incoming Shipment”
+          confirmation, and the products will be moved from your Suppliers (as
+          listed in Purchase Orders) to your Stock.</p>
+      </field>
+    </record>
+
+    <menuitem
+      name="Incoming Truck"
+      id="menu_truck_purchase"
+      action="action_truck_pending"
+      parent="purchase.menu_procurement_management_inventory"
+      sequence="8" />
+
+    <menuitem
+      name="Incoming Truck"
+      id="menu_truck_stock"
+      action="action_truck_pending"
+      parent="stock.menu_stock_warehouse_mgmt"
+      sequence="0" />
+  </data>
+</openerp>
 
=== added directory 'pallet_delivery/security'
=== added file 'pallet_delivery/security/ir.model.access.csv'
--- pallet_delivery/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ pallet_delivery/security/ir.model.access.csv	2014-08-27 19:22:25 +0000
@@ -0,0 +1,5 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_stock_truck_stock,stock.truck all,model_stock_truck,stock.group_stock_user,1,1,1,1
+access_stock_truck_purchase,stock.truck all,model_stock_truck,purchase.group_purchase_user,1,1,1,1
+access_stock_truck_line_stock,stock.truck.line all,model_stock_truck_line,stock.group_stock_user,1,1,1,1
+access_stock_truck_line_purchase,stock.truck.line all,model_stock_truck_line,purchase.group_purchase_user,1,1,1,1
 
=== added file 'pallet_delivery/stock.py'
--- pallet_delivery/stock.py	1970-01-01 00:00:00 +0000
+++ pallet_delivery/stock.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,310 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from collections import defaultdict
+from openerp.tools.translate import _
+from openerp.osv import orm, fields
+
+def group(lst):
+    """Saner group function than the one found in itertools
+
+    This one mimics Haskell's group from Data.List:
+        group :: Eq a => [a] -> [[a]]
+    """
+
+    if not lst:
+        return []
+
+    res = []
+    current = lst[0]
+
+    grp = []
+    for x in lst:
+        if x != current:
+            res.append(grp)
+            grp = []
+        grp.append(x)
+        current = x
+
+    if grp:
+        res.append(grp)
+
+    return res
+
+
+class stock_move(orm.Model):
+
+    _inherit = 'stock.move'
+
+    def _find_hidden(self, cr, uid, ids, context=None):
+        po_pool = self.pool.get("purchase.order")
+        hidden_id = po_pool.search(cr, uid, [('hidden', '=', True)], context=context)[0]
+        return po_pool.browse(cr, uid, hidden_id, context)
+
+    @staticmethod
+    def _unique_line(seq):
+        seen = set()
+        seen_add = seen.add
+        return [ x for x in seq if x not in seen and not seen_add(x)]
+
+    @staticmethod
+    def _get_line_name(line, crates=None, force_total_qty=False):
+        available = None
+        nice = '%s' % line.product_id.name
+        incoming_crates = line.product_qty
+        if crates:
+            # Incoming crates
+            available = max(0, incoming_crates - crates[line.id])
+        elif force_total_qty:
+            available = incoming_crates
+
+        nice += " / %s" % line.prodlot_id.name
+
+        if available is not None:
+            nice += " (%d)" % available
+
+        return nice, available
+
+    def name_get(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        stl_pool = self.pool.get('stock.truck.line')
+        spi_pool = self.pool.get('stock.picking.in')
+        # Out from selection; display name
+
+        #hidden = self._find_hidden(cr, uid, ids, context=context)
+        res = []
+        if not context.has_key('nice'):
+            for line in self.browse(cr, uid, ids, context=context):
+                name, available = self._get_line_name(line)
+                res.append((line.id, name))
+
+            # Add special 'not ours' line
+            #res.append((hidden.id, hidden.name))
+            return res
+
+        # Doing a selection
+        # Add special 'not ours' line
+        #res.append((hidden.id, hidden.name))
+
+        # Retrieve entered form data
+        parent = context['parent']
+        all_pallets = parent['left_pallet_ids'] + parent['right_pallet_ids']
+        po_ids = parent['purchase_order_ids'][0][2]
+
+        # find list of stock picking in
+        spi_ids = spi_pool.search(cr, uid, [('purchase_id', '=', po_ids)],
+                                  context=context)
+
+        # Build crate structure
+        crates = defaultdict(lambda: 0)
+        for pallet_struct in all_pallets:
+            if pallet_struct[0] == 4:
+                st_line = stl_pool.browse(cr, uid, pallet_struct[1],
+                                          context=context)
+                crates[st_line.pallet.id] += st_line.crates
+            else:
+                fields = pallet_struct[2]
+                if fields and 'pallet' in fields:
+                    crates[fields['pallet']] += fields['crates']
+
+        spi_lines = spi_pool.browse(cr, uid, spi_ids, context=context)
+        all_lines = [line for lines in spi_lines for line in lines.move_lines
+                     if line.state == "assigned"]
+        move_line = self._unique_line(all_lines)
+
+        # Prettify data to be displayed
+        for line in move_line:
+            force_total_qty = not crates
+            name, available = self._get_line_name(line, crates=crates,
+                                                  force_total_qty=force_total_qty)
+            if available:
+                res.append((line.id, name))
+
+        return res
+
+
+class purchase_order(orm.Model):
+
+    _inherit = 'purchase.order'
+
+    def _assigned(self, cr, uid, obj, name, args, context=None):
+        '''Domain filter on corresponding entries in stock.picking where state is assigned'''
+
+        if context is None:
+            context = {}
+
+        picking_pool = self.pool.get('stock.picking')
+        ids = picking_pool.search(cr, uid, [('state', '=', 'assigned')], context=context)
+        po_ids = [po.purchase_id.id for po in picking_pool.browse(cr, uid, ids, context=context)]
+
+        return [('id', 'in', po_ids)]
+
+    _columns = {
+        'hidden': fields.boolean('Hidden'),
+        'stock_truck_ids': fields.many2many(
+            'stock.truck', 'truck_order_rel', 'order_id', 'truck_id', 'Trucks'),
+        'assigned': fields.function(lambda **x: True, fnct_search=_assigned, type='boolean', method=True),
+    }
+
+
+class stock_truck_line(orm.Model):
+
+    _name = 'stock.truck.line'
+    _description = 'A single pallet shipped in an incoming truck'
+
+    _columns = {
+        'name': fields.char('Name', size=64),
+        'left_id': fields.many2one('stock.truck', 'Truck'),
+        'right_id': fields.many2one('stock.truck', 'Truck'),
+        'pallet': fields.many2one('stock.move', 'Pallet', required=True),
+        'crates': fields.integer('Crates', required=True),
+    }
+
+
+class stock_truck(orm.Model):
+
+    _name = 'stock.truck'
+    _description = 'Incoming truck'
+
+    def onchange_arrival(self, cr, uid, ids, arrival, context=None):
+        '''Force seconds to zero'''
+
+        arrival = arrival[:-2] + '00'
+
+        return {'value': {'arrival': arrival}}
+    
+    def action_done(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+
+        truck = self.browse(cr, uid, ids, context=context)[0]
+
+        # Build a dictionary of:
+        #   - key: Purchase Order
+        #   - value: a dictionary of:
+        #     - key: Lot Number
+        #     - value: tuple of
+        #       - Purchase Order Line
+        #       - Crate count
+        products = defaultdict(dict)
+
+        def _process_pallets(column):
+            for line in column:
+                pallet = line.pallet
+                pi = pallet.picking_id
+                po = pallet.purchase_line_id.order_id
+                lot = pallet.prodlot_id if pallet.prodlot_id else None
+                # Skip over fake 'not ours' line
+                if po and po.hidden:
+                    continue
+
+                if not products[pi.id].has_key(lot):
+                    products[pi.id][lot] = (pallet, 0)
+
+                lot_product = products[pi.id][lot]
+                count = lot_product[1]
+                products[pi.id][lot] = (lot_product[0], count + line.crates)
+
+        _process_pallets(truck.left_pallet_ids)
+        _process_pallets(truck.right_pallet_ids)
+
+        # Make the calls to the Pickings stock moves
+
+        picking_pool = self.pool.get('stock.picking')
+
+        for po in truck.purchase_order_ids:
+            pi = None
+            pi_ids = picking_pool.search(
+                cr, uid,
+                ['&', ('purchase_id', '=', po.id), ('state', '=', 'assigned')],
+                context=context)
+            if pi_ids:
+                # take the last one
+                pi = pi_ids[-1]
+
+            if not pi or not products.has_key(pi):
+                # Purchase Order was added to the list, but there are not
+                # pallets pertaining to that PO.
+                continue
+
+            partial_data = {'delivery_date': truck.arrival}
+
+
+            for move_line, count in products[pi].values():
+                # Skip over the fake 'not ours' line
+                po_line = move_line.purchase_line_id
+                if po_line and po_line.order_id.hidden:
+                    continue
+
+                partial_data['move%s' % (move_line.id, )] = {
+                    'product_id': move_line.product_id.id,
+                    'product_qty': count,
+                    'product_uom': 1,
+                    'prodlot_id': move_line.prodlot_id.id,
+                }
+
+            picking_pool.do_partial(cr, uid, [pi], partial_data, context=context)
+
+        self.write(cr, uid, ids, {'state': 'done'})
+
+        return True
+
+    @staticmethod
+    def validate_temperature(cr, uid, ids, temperature, field_name,
+                             context=None):
+        try:
+            float(temperature)
+        except ValueError:
+            warning = {'title': _('Input Error !'),
+                       'message': _('Please enter real numbers.')}
+            return {'value': {field_name: ""}, 'warning': warning}
+        return True
+
+    _columns = {
+        # Overhead
+        'name': fields.char('Name', size=64),
+        'state': fields.selection([
+            ('draft', 'Draft'),
+            ('done', 'Done'),
+            ], 'State', readonly=True, select=True, track_visibility='onchange'),
+
+        # Display
+        'front_temperature': fields.char('Front Temperature', required=True),
+        'back_temperature': fields.char('Back Temperature', required=True),
+        'truck_sn': fields.char('Truck S/N', size=64),
+        'supplier': fields.many2one('res.partner', 'Supplier', required=True),
+        'arrival': fields.datetime('Date of Arrival', required=True),
+        'purchase_order_ids': fields.many2many(
+            'purchase.order', 'truck_order_rel', 'truck_id', 'order_id', 'Purchase Orders'),
+        'left_pallet_ids': fields.one2many('stock.truck.line', 'left_id', 'Pallets'),
+        'right_pallet_ids': fields.one2many('stock.truck.line', 'right_id', 'Pallets'),
+    }
+
+    _defaults = {
+        'name': lambda self, cr, uid, ctx={}: self.pool.get('ir.sequence').get(cr, uid, 'stock.truck'),
+        'state': 'draft',
+        'front_temperature': None,
+    }
 
=== added file 'pallet_delivery/stock_workflow.xml'
--- pallet_delivery/stock_workflow.xml	1970-01-01 00:00:00 +0000
+++ pallet_delivery/stock_workflow.xml	2014-08-27 19:22:25 +0000
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+    <record id="wkf_stock_truck" model="workflow">
+      <field name="name">stock.truck</field>
+      <field name="osv">stock.truck</field>
+      <field name="on_create">True</field>
+    </record>
+
+    <record id="act_draft" model="workflow.activity">
+      <field name="wkf_id" ref="wkf_stock_truck" />
+      <field name="name">draft</field>
+      <field name="flow_start">True</field>
+    </record>
+
+    <record id="act_done" model="workflow.activity">
+      <field name="wkf_id" ref="wkf_stock_truck" />
+      <field name="name">done</field>
+      <field name="flow_stop">True</field>
+      <field name="kind">function</field>
+      <field name="action">action_done()</field>
+    </record>
+
+    <record id="trans_draft_done" model="workflow.transition">
+      <field name="act_from" ref="act_draft" />
+      <field name="act_to" ref="act_done" />
+      <field name="signal">button_done</field>
+    </record>
+  </data>
+</openerp>
 
=== added directory 'partner_discount'
=== added file 'partner_discount/__init__.py'
--- partner_discount/__init__.py	1970-01-01 00:00:00 +0000
+++ partner_discount/__init__.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+###############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2013 Savoir-faire Linux
+#    (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+###############################################################################
+
+import res_partner
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'partner_discount/__openerp__.py'
--- partner_discount/__openerp__.py	1970-01-01 00:00:00 +0000
+++ partner_discount/__openerp__.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,41 @@
+# -*- encoding: utf-8 -*-
+###############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2013 Savoir-faire Linux
+#    (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+###############################################################################
+
+{
+    'name': 'Partner Discount',
+    'version': '1.0',
+    'author': 'Savoir-faire Linux',
+    'maintainer': 'Savoir-faire Linux',
+    'website': 'http://www.savoirfairelinux.com',
+    'category': 'sale',
+    'description': """\
+Adds a discount percentage to the partner form.
+""",
+    'depends': [],
+    'data': ['res_partner_view.xml'],
+    'demo': [],
+    'test': [],
+    'installable': True,
+    'active': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added directory 'partner_discount/i18n'
=== added file 'partner_discount/i18n/fr.po'
--- partner_discount/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ partner_discount/i18n/fr.po	2014-08-27 19:22:25 +0000
@@ -0,0 +1,36 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* partner_discount
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-11-01 15:41+0000\n"
+"PO-Revision-Date: 2013-11-01 15:41+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: partner_discount
+#: field:res.partner,discount:0
+msgid "Discount"
+msgstr "Ristourne"
+
+#. module: partner_discount
+#: help:res.partner,discount:0
+msgid "For percent enter a ratio between 0-1."
+msgstr "Pour être en pourcentage, saisir une valeur entre 0 et 1."
+
+#. module: partner_discount
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Achats-Ventes"
+
+#. module: partner_discount
+#: model:ir.model,name:partner_discount.model_res_partner
+msgid "Partner"
+msgstr "Partenaire"
 
=== added file 'partner_discount/i18n/partner_discount.pot'
--- partner_discount/i18n/partner_discount.pot	1970-01-01 00:00:00 +0000
+++ partner_discount/i18n/partner_discount.pot	2014-08-27 19:22:25 +0000
@@ -0,0 +1,36 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* partner_discount
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-11-01 15:41+0000\n"
+"PO-Revision-Date: 2013-11-01 15:41+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: partner_discount
+#: field:res.partner,discount:0
+msgid "Discount"
+msgstr ""
+
+#. module: partner_discount
+#: help:res.partner,discount:0
+msgid "For percent enter a ratio between 0-1."
+msgstr ""
+
+#. module: partner_discount
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: partner_discount
+#: model:ir.model,name:partner_discount.model_res_partner
+msgid "Partner"
+msgstr ""
 
=== added file 'partner_discount/res_partner.py'
--- partner_discount/res_partner.py	1970-01-01 00:00:00 +0000
+++ partner_discount/res_partner.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,36 @@
+# -*- encoding: utf-8 -*-
+###############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2013 Savoir-faire Linux
+#    (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+###############################################################################
+
+from openerp.osv import orm, fields
+
+
+class res_partner(orm.Model):
+    """ Inherits partner and adds discount percentage """
+    _inherit = 'res.partner'
+    _columns = {
+        'discount': fields.float('Discount', digits=(1, 4),
+                                 help="For percent enter a ratio between 0-1."),
+    }
+    _defaults = {'discount': 0.0}
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'partner_discount/res_partner_view.xml'
--- partner_discount/res_partner_view.xml	1970-01-01 00:00:00 +0000
+++ partner_discount/res_partner_view.xml	2014-08-27 19:22:25 +0000
@@ -0,0 +1,19 @@
+<?xml version = "1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_partner_discount_form" model="ir.ui.view">
+            <field name="name">res.partner.discount.form.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+                <page string="Sales &amp; Purchases">
+                    <group>
+                        <group>
+                            <field name="discount"/>
+                        </group>
+                    </group>
+                </page>
+            </field>
+        </record>
+    </data>
+</openerp>
 
=== added directory 'produce_details'
=== added file 'produce_details/__init__.py'
--- produce_details/__init__.py	1970-01-01 00:00:00 +0000
+++ produce_details/__init__.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import product
 
=== added file 'produce_details/__openerp__.py'
--- produce_details/__openerp__.py	1970-01-01 00:00:00 +0000
+++ produce_details/__openerp__.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'Produce Details',
+    'version': '0.1',
+    'author': 'Savoir-faire Linux',
+    'maintainer': 'Savoir-faire Linux',
+    'website': 'http://www.savoirfairelinux.com',
+    'category': 'product',
+    'description': """
+Agricultural produce details
+============================
+
+This module adds four descriptive fields for produce-related products, namely:
+
+* A variety (e.g. Haden)
+* An origin (Brazil)
+* Conditioning weight (10 kg)
+* A size category (#12)
+* PLU code (4216)
+""",
+    'depends': ['base', 'purchase'],
+    'data': [
+        'produce_details_view.xml',
+    ],
+    'demo': [],
+    'test': [],
+    'installable': True,
+    'active': False,
+}
 
=== added directory 'produce_details/i18n'
=== added file 'produce_details/i18n/fr.po'
--- produce_details/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ produce_details/i18n/fr.po	2014-08-27 19:22:25 +0000
@@ -0,0 +1,41 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* produce_details
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0-20130811-231021\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-09-18 14:22+0000\n"
+"PO-Revision-Date: 2013-09-18 14:22+0000\n"
+"Last-Translator: Alexandre Boily <[e-mail]>\n"
+"Language-Team: Savoir-faire Linux\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: produce_details
+#: field:product.product,origin:0
+msgid "Origin"
+msgstr "Origine"
+
+#. module: produce_details
+#: model:ir.model,name:produce_details.model_product_product
+msgid "Product"
+msgstr "Produit"
+
+#. module: produce_details
+#: field:product.product,variety:0
+msgid "Variety"
+msgstr "Variété"
+
+#. module: produce_details
+#: field:product.product,cond_weight:0
+msgid "Conditioning weight"
+msgstr "Poids de conditionnement"
+
+#. module: produce_details
+#: field:product.product,size_category:0
+msgid "Size"
+msgstr "Taille"
 
=== added file 'produce_details/i18n/produce_details.pot'
--- produce_details/i18n/produce_details.pot	1970-01-01 00:00:00 +0000
+++ produce_details/i18n/produce_details.pot	2014-08-27 19:22:25 +0000
@@ -0,0 +1,42 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* produce_details
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0-20130811-231021\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-09-18 14:22+0000\n"
+"PO-Revision-Date: 2013-09-18 14:22+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: produce_details
+#: field:product.product,origin:0
+msgid "Origin"
+msgstr ""
+
+#. module: produce_details
+#: model:ir.model,name:produce_details.model_product_product
+msgid "Product"
+msgstr ""
+
+#. module: produce_details
+#: field:product.product,variety:0
+msgid "Variety"
+msgstr ""
+
+#. module: produce_details
+#: field:product.product,cond_weight:0
+msgid "Conditioning weight"
+msgstr ""
+
+#. module: produce_details
+#: field:product.product,size_category:0
+msgid "Size"
+msgstr ""
+
 
=== added file 'produce_details/produce_details_view.xml'
--- produce_details/produce_details_view.xml	1970-01-01 00:00:00 +0000
+++ produce_details/produce_details_view.xml	2014-08-27 19:22:25 +0000
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<openerp>
+  <data>
+    <record id="produce_details_form" model="ir.ui.view">
+      <field name="name">product.product.produce.details.form</field>
+      <field name="model">product.product</field>
+      <field name="inherit_id" ref="product.product_normal_form_view" />
+      <field name="arch" type="xml">
+        <field name="description" position="before">
+          <group>
+            <group>
+              <field name="variety" />
+              <field name="origin" />
+            </group>
+
+            <group>
+              <field name="cond_weight" />
+              <field name="size_category" />
+            </group>
+          </group>
+          <group>
+              <group>
+                <label for="plu1"/>
+                <field name="plu1" nolabel="1" />
+                <div />
+                <field name="plu2" nolabel="1" />
+              </group>
+              <group/>
+          </group>
+        </field>
+      </field>
+    </record>
+  </data>
+</openerp>
 
=== added file 'produce_details/product.py'
--- produce_details/product.py	1970-01-01 00:00:00 +0000
+++ produce_details/product.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import openerp.addons.decimal_precision as dp
+from openerp.osv import orm, fields
+
+class product_product(orm.Model):
+
+    _inherit = 'product.product'
+
+    _columns = {
+        'variety': fields.char('Variety', size=64),
+        'origin': fields.many2one('res.country', 'Origin'),
+        'cond_weight': fields.float('Conditioning weight', digits_compute=dp.get_precision('Stock Weight'), help='Conditioning weight in kg.'),
+        'size_category': fields.char('Size', size=16),
+        'plu1': fields.char('PLU', size=8),
+        'plu2': fields.char('PLU2', size=8),
+    }
 
=== added directory 'product_reserve_forecast'
=== added file 'product_reserve_forecast/__init__.py'
--- product_reserve_forecast/__init__.py	1970-01-01 00:00:00 +0000
+++ product_reserve_forecast/__init__.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import product
+import sale_stock
 
=== added file 'product_reserve_forecast/__openerp__.py'
--- product_reserve_forecast/__openerp__.py	1970-01-01 00:00:00 +0000
+++ product_reserve_forecast/__openerp__.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'Reserve Product Quantity on Forecast',
+    'version': '0.1',
+    'author': 'Savoir-faire Linux',
+    'maintainer': 'Savoir-faire Linux',
+    'website': 'http://www.savoirfairelinux.com',
+    'category': 'product',
+    'description': """
+Put aside an unsaleable quantity for a product
+==============================================
+
+This reduces the forecasted quantity by a given amount.
+""",
+    'depends': ['base', 'product', 'sale', 'sale_stock', 'stock'],
+    'data': [
+        'security/product_reserve_forecast_security.xml',
+        'product_reserve_forecast_view.xml',
+    ],
+    'demo': [],
+    'test': [],
+    'installable': True,
+    'active': False,
+}
 
=== added directory 'product_reserve_forecast/i18n'
=== added file 'product_reserve_forecast/i18n/fr.po'
--- product_reserve_forecast/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ product_reserve_forecast/i18n/fr.po	2014-08-27 19:22:25 +0000
@@ -0,0 +1,67 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* product_reserve_forecast
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0-20130811-231021\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-09-26 11:42+0000\n"
+"PO-Revision-Date: 2013-09-26 11:42+0000\n"
+"Last-Translator: Alexandre Boily <[e-mail]>\n"
+"Language-Team: Savoir-faire Linux\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: product_reserve_forecast
+#: field:product.product,virtual_clone:0
+msgid "Forecasted Quantity"
+msgstr "Quantité prévue"
+
+#. module: product_reserve_forecast
+#: model:ir.model,name:product_reserve_forecast.model_product_product
+msgid "Product"
+msgstr "Produit"
+
+#. module: product_reserve_forecast
+#: code:addons/product_reserve_forecast/sale_stock.py:85
+#, python-format
+msgid "Not enough stock ! : "
+msgstr "Pas assez de stock: "
+
+#. module: product_reserve_forecast
+#: code:addons/product_reserve_forecast/sale_stock.py:81
+#, python-format
+msgid "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr "Vous planifiez vendre %.2f %s, mais seulement %.2f %s sont disponibles.
+La vraie quantité en stock est %.2f %s (sans réservations)."
+
+#. module: product_reserve_forecast
+#: model:res.groups,name:product_reserve_forecast.group_product_reserve
+msgid "Define product reserve quantity"
+msgstr "Définir la quantié réservée sur un produit"
+
+#. module: product_reserve_forecast
+#: code:addons/product_reserve_forecast/sale_stock.py:90
+#, python-format
+msgid "Configuration Error!"
+msgstr "Erreur de configuration!"
+
+#. module: product_reserve_forecast
+#: field:product.product,reserved:0
+msgid "Reserved Quantity"
+msgstr "Quantité réservée"
+
+#. module: product_reserve_forecast
+#: model:ir.model,name:product_reserve_forecast.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Ligne de vente"
+
+#. module: product_reserve_forecast
+#: model:res.groups,comment:product_reserve_forecast.group_product_reserve
+msgid "Can see and set the per product reserve quantity."
+msgstr "Peut voir et modifier la quantité réservée d'un produit."
+
 
=== added file 'product_reserve_forecast/i18n/product_reserve_forecast.pot'
--- product_reserve_forecast/i18n/product_reserve_forecast.pot	1970-01-01 00:00:00 +0000
+++ product_reserve_forecast/i18n/product_reserve_forecast.pot	2014-08-27 19:22:25 +0000
@@ -0,0 +1,66 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* product_reserve_forecast
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0-20130811-231021\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-09-26 11:42+0000\n"
+"PO-Revision-Date: 2013-09-26 11:42+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: product_reserve_forecast
+#: field:product.product,virtual_clone:0
+msgid "Forecasted Quantity"
+msgstr ""
+
+#. module: product_reserve_forecast
+#: model:ir.model,name:product_reserve_forecast.model_product_product
+msgid "Product"
+msgstr ""
+
+#. module: product_reserve_forecast
+#: code:addons/product_reserve_forecast/sale_stock.py:85
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: product_reserve_forecast
+#: code:addons/product_reserve_forecast/sale_stock.py:81
+#, python-format
+msgid "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: product_reserve_forecast
+#: model:res.groups,name:product_reserve_forecast.group_product_reserve
+msgid "Define product reserve quantity"
+msgstr ""
+
+#. module: product_reserve_forecast
+#: code:addons/product_reserve_forecast/sale_stock.py:90
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: product_reserve_forecast
+#: field:product.product,reserved:0
+msgid "Reserved Quantity"
+msgstr ""
+
+#. module: product_reserve_forecast
+#: model:ir.model,name:product_reserve_forecast.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: product_reserve_forecast
+#: model:res.groups,comment:product_reserve_forecast.group_product_reserve
+msgid "Can see and set the per product reserve quantity."
+msgstr ""
+
 
=== added file 'product_reserve_forecast/product.py'
--- product_reserve_forecast/product.py	1970-01-01 00:00:00 +0000
+++ product_reserve_forecast/product.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import openerp.addons.decimal_precision as dp
+from openerp.osv import orm, fields
+
+class product_product(orm.Model):
+
+    _inherit = 'product.product'
+
+    def _virtual_available(self, cr, uid, ids, names, arg, context=None):
+        orig = self._product_available(cr, uid, ids, names, arg, context=context)
+        product_pool = self.pool.get('product.product')
+        for product_id in orig.keys():
+            reserved = product_pool.browse(cr, uid, product_id, context=context).reserved
+            orig[product_id]['virtual_available'] -= reserved
+
+        return orig
+
+    def _virtual_clone(self, cr, uid, ids, names, arg, context=None):
+        '''Small hack to get priority over the Stock module's virtual_available'''
+
+        res = {}
+
+        for line in self.browse(cr, uid, ids, context=context):
+            res[line.id] = line.virtual_available
+
+        return res
+
+    _columns = {
+        'reserved': fields.integer('Reserved Quantity'),
+
+        'virtual_clone':
+            fields.function(_virtual_clone, type='float',
+                digits_compute=dp.get_precision('Product Unit of Measure'), string='Forecasted Quantity'),
+
+        'virtual_available': fields.function(_virtual_available, multi='qty_available',
+            type='float',  digits_compute=dp.get_precision('Product Unit of Measure'),
+            string='Forecasted Quantity',
+            help="Forecast quantity (computed as Quantity On Hand "
+                 "- Outgoing - Reserved + Incoming)\n"
+                 "In a context with a single Stock Location, this includes "
+                 "goods stored in this location, or any of its children.\n"
+                 "In a context with a single Warehouse, this includes "
+                 "goods stored in the Stock Location of this Warehouse, or any "
+                 "of its children.\n"
+                 "In a context with a single Shop, this includes goods "
+                 "stored in the Stock Location of the Warehouse of this Shop, "
+                 "or any of its children.\n"
+                 "Otherwise, this includes goods stored in any Stock Location "
+                 "with 'internal' type."),
+    }
 
=== added file 'product_reserve_forecast/product_reserve_forecast_view.xml'
--- product_reserve_forecast/product_reserve_forecast_view.xml	1970-01-01 00:00:00 +0000
+++ product_reserve_forecast/product_reserve_forecast_view.xml	2014-08-27 19:22:25 +0000
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf8" ?>
+<openerp>
+  <data>
+    <record id="product_reserve_forecast_form" model="ir.ui.view">
+      <field name="name">product.product.reserve.form</field>
+      <field name="model">product.product</field>
+      <field name="inherit_id" ref="stock.view_normal_procurement_locations_form" />
+      <field name="arch" type="xml">
+        <field name="virtual_available" position="replace">
+          <field name="virtual_clone" />
+          <field name="reserved" groups="product_reserve_forecast.group_product_reserve" />
+        </field>
+      </field>
+    </record>
+
+    <record id="product_reserve_forecast_tree" model="ir.ui.view">
+      <field name="name">product.product.reserve.tree</field>
+      <field name="model">product.product</field>
+      <field name="inherit_id" ref="product.product_product_tree_view" />
+      <field name="arch" type="xml">
+        <field name="virtual_available" position="replace">
+          <field name="virtual_available" invisible="1" />
+          <field name="virtual_clone" />
+        </field>
+      </field>
+    </record>
+  </data>
+</openerp>
 
=== added file 'product_reserve_forecast/sale_stock.py'
--- product_reserve_forecast/sale_stock.py	1970-01-01 00:00:00 +0000
+++ product_reserve_forecast/sale_stock.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,94 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import fields, orm
+from openerp.tools import float_compare
+from openerp.tools.translate import _
+
+class sale_order_line(orm.Model):
+
+    _inherit = 'sale.order.line'
+
+    def product_id_change(self, cr, uid, ids, pricelist, product, qty=0,
+            uom=False, qty_uos=0, uos=False, name='', partner_id=False,
+            lang=False, update_tax=True, date_order=False, packaging=False,
+            fiscal_position=False, flag=False, context=None):
+        '''Slightly tweaked copy from sale_stock
+
+        The only difference resides in the way the compare_qty is computed: in
+        this implementation, take into account the product's reserved quantity.
+        '''
+
+        context = context or {}
+        product_uom_obj = self.pool.get('product.uom')
+        partner_obj = self.pool.get('res.partner')
+        product_obj = self.pool.get('product.product')
+        warning = {}
+        res = super(sale_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty=qty,
+            uom=uom, qty_uos=qty_uos, uos=uos, name=name, partner_id=partner_id,
+            lang=lang, update_tax=update_tax, date_order=date_order, packaging=packaging, fiscal_position=fiscal_position, flag=flag, context=context)
+
+        if not product:
+            res['value'].update({'product_packaging': False})
+            return res
+
+        #update of result obtained in super function
+        product_obj = product_obj.browse(cr, uid, product, context=context)
+        res['value']['delay'] = (product_obj.sale_delay or 0.0)
+        res['value']['type'] = product_obj.procure_method
+
+        #check if product is available, and if not: raise an error
+        uom2 = False
+        if uom:
+            uom2 = product_uom_obj.browse(cr, uid, uom)
+            if product_obj.uom_id.category_id.id != uom2.category_id.id:
+                uom = False
+        if not uom2:
+            uom2 = product_obj.uom_id
+
+        # Calling product_packaging_change function after updating UoM
+        res_packing = self.product_packaging_change(cr, uid, ids, pricelist, product, qty, uom, partner_id, packaging, context=context)
+        res['value'].update(res_packing.get('value', {}))
+        warning_msgs = res_packing.get('warning') and res_packing['warning']['message'] or ''
+
+        # Original comparison did not substract reserved quantity
+        avail = product_obj.virtual_available - product_obj.reserved
+        compare_qty = float_compare(
+                avail * uom2.factor,
+                qty * product_obj.uom_id.factor,
+                precision_rounding=product_obj.uom_id.rounding)
+
+        if (product_obj.type=='product') and int(compare_qty) == -1 \
+          and (product_obj.procure_method=='make_to_stock'):
+            warn_msg = _('You plan to sell %.2f %s but you only have %.2f %s available !\nThe real stock is %.2f %s. (without reservations)') % \
+                    (qty, uom2 and uom2.name or product_obj.uom_id.name,
+                     max(0,product_obj.virtual_available), product_obj.uom_id.name,
+                     max(0,product_obj.qty_available), product_obj.uom_id.name)
+            warning_msgs += _("Not enough stock ! : ") + warn_msg + "\n\n"
+
+        #update of warning messages
+        if warning_msgs:
+            warning = {
+                       'title': _('Configuration Error!'),
+                       'message' : warning_msgs
+                    }
+        res.update({'warning': warning})
+        return res
 
=== added directory 'product_reserve_forecast/security'
=== added file 'product_reserve_forecast/security/ir.model.access.csv'
--- product_reserve_forecast/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ product_reserve_forecast/security/ir.model.access.csv	2014-08-27 19:22:25 +0000
@@ -0,0 +1,1 @@
+access_sale_order_warn,access_sale_order_warn,model_sale_order_warn,,1,1,1,1
 
=== added file 'product_reserve_forecast/security/product_reserve_forecast_security.xml'
--- product_reserve_forecast/security/product_reserve_forecast_security.xml	1970-01-01 00:00:00 +0000
+++ product_reserve_forecast/security/product_reserve_forecast_security.xml	2014-08-27 19:22:25 +0000
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<openerp>
+  <data>
+    <record id="group_product_reserve" model="res.groups">
+      <field name="name">Define product reserve quantity</field>
+      <field name="category_id" ref="base.module_category_hidden" />
+      <field name="comment">Can see and set the per product reserve quantity.</field>
+      <field name="implied_ids" eval="[(4, ref('base.group_user'))]" />
+    </record>
+  </data>
+</openerp>
 
=== added directory 'purchase_gains'
=== added file 'purchase_gains/__init__.py'
--- purchase_gains/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_gains/__init__.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import report
+import purchase
 
=== added file 'purchase_gains/__init__.pyc'
 Binary files purchase_gains/__init__.pyc	1970-01-01 00:00:00 +0000 and purchase_gains/__init__.pyc	2014-08-27 19:22:25 +0000 differ
=== added file 'purchase_gains/__openerp__.py'
--- purchase_gains/__openerp__.py	1970-01-01 00:00:00 +0000
+++ purchase_gains/__openerp__.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+# NOTE: The name of the supplied field was initially "display_name", but it seems that OpenERP,
+# whenever it seems "name" in the field, returns the value for "name". Well...
+
+{
+    'name': 'Purchase gain',
+    'version': '1.1',
+    'author': 'Savoir-faire Linux',
+    'maintainer': 'Savoir-faire Linux',
+    'website': 'http://www.savoirfairelinux.com',
+    'category': 'Generic Modules/Purchases',
+    'description': """
+Create a menu in reporting for Purchase gains
+====================================================
+""",
+    'depends': ['base', 'purchase'],
+    'data': [
+        'purchase_report.xml',
+        'purchase_view.xml',
+    ],
+    'demo': [],
+    'test': [],
+    'installable': True,
+    'active': False,
+}
 
=== added file 'purchase_gains/purchase.py'
--- purchase_gains/purchase.py	1970-01-01 00:00:00 +0000
+++ purchase_gains/purchase.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,106 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import orm, fields
+import openerp.addons.decimal_precision as dp
+
+class purchase_order(orm.Model):
+
+    _inherit = 'purchase.order'
+
+    def get_profit_all(self, cr, uid, ids, name, args, context):
+        if not ids:
+            return {}
+        res = {}
+        for line in self.browse(cr, uid, ids):
+            res[line.id] = {
+                'profit_po': 0.0,
+                'amount_total_discount': 0.0,
+                'amount_landing_cost': 0.0,
+                'amount_total_price_unit': 0.0,
+                'amount_total_sale_order': 0.0
+            }
+            total_landed_cost_po = 0.0
+            if line.landed_cost_line_ids:
+                for costs in line.landed_cost_line_ids:
+                    total_landed_cost_po += costs.amount
+            res[line.id]['amount_landing_cost'] = total_landed_cost_po
+            total_price_unit = 0.0
+
+            amount_total_sale_order = 0.0
+            amount_total_discounts = 0.0
+            total_landed_cost_so = 0.0
+            if line.order_line:
+                for one_line in line.order_line:
+                    acc_id = one_line.account_analytic_id.id
+                    total_price_unit += one_line.price_unit
+                    ids_stock_prod_lot = self.pool.get('stock.production.lot').search(cr, uid, [('account_analytic_id', '=', acc_id)], context=context)[0]
+                    id_stock_prod_lot = self.pool.get('stock.production.lot').browse(cr, uid, ids_stock_prod_lot).id
+                    stock_move_ids = self.pool.get('stock.move').search(cr, uid, [('prodlot_id', '=', id_stock_prod_lot)], context=context)
+
+                    list_stock_move = self.pool.get('stock.move').browse(cr, uid, stock_move_ids, context)
+                    amount_total_sale_order = 0.0
+                    amount_total_discounts = 0.0
+                    if list_stock_move:
+                        for one_move_line in list_stock_move:
+                            if one_move_line.picking_id.sale_id:
+                                amount_total_sale_order += one_move_line.picking_id.sale_id.amount_total
+                                amount_total_discounts += one_move_line.picking_id.sale_id.amount_total * (1-(one_move_line.picking_id.sale_id.partner_id.discount or 0.0))
+                                total_landed_cost_so = 0.0
+                                if one_move_line.picking_id.sale_id.landed_cost_line_ids:
+                                    for costs_so in one_move_line.picking_id.sale_id.landed_cost_line_ids:
+                                        total_landed_cost_so += costs_so.amount
+            res[line.id]['total_landed_cost_so'] = total_landed_cost_so
+            res[line.id]['amount_total_price_unit'] = total_price_unit
+            res[line.id]['amount_total_discount'] = amount_total_discounts
+            res[line.id]['amount_total_sale_order'] = amount_total_sale_order
+            res[line.id]['profit_po'] = res[line.id]['amount_total_sale_order'] - (res[line.id]['total_landed_cost_so'] + res[line.id]['amount_total_price_unit'] + res[line.id]['amount_total_discount'] + res[line.id]['amount_landing_cost'])
+        return res
+
+
+    _columns = {
+        'profit_po': fields.function(
+            get_profit_all,
+            digits_compute=dp.get_precision('Account'),
+            string='Profit', multi='all'),
+        'amount_total_discount': fields.function(
+            get_profit_all,
+            digits_compute=dp.get_precision('Account'),
+            string='Total amount discount', multi='all'),
+        'amount_landing_cost': fields.function(
+            get_profit_all,
+            digits_compute=dp.get_precision('Account'),
+            string='Total amount landing cost', multi='all'),
+        'amount_total_price_unit': fields.function(
+            get_profit_all,
+            digits_compute=dp.get_precision('Account'),
+            string='Total amount price unit', multi='all'),
+        'amount_total_sale_order': fields.function(
+            get_profit_all,
+            digits_compute=dp.get_precision('Account'),
+            string='Total amount sale order', multi='all'),
+        'total_landed_cost_so': fields.function(
+            get_profit_all,
+            digits_compute=dp.get_precision('Account'),
+            string='Total amount landing cost sale order', multi='all'),
+    }
+
+
 
=== added file 'purchase_gains/purchase.pyc'
 Binary files purchase_gains/purchase.pyc	1970-01-01 00:00:00 +0000 and purchase_gains/purchase.pyc	2014-08-27 19:22:25 +0000 differ
=== added file 'purchase_gains/purchase_report.xml'
--- purchase_gains/purchase_report.xml	1970-01-01 00:00:00 +0000
+++ purchase_gains/purchase_report.xml	2014-08-27 19:22:25 +0000
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <report auto="False" id="report_purchase_order_gains" model="purchase.order"
+                name="purchase.order.gains" rml="purchase_gains/report/order.rml"
+                usage="default" string="Purchase Order gains"/>
+
+    </data>
+</openerp>
 \ No newline at end of file
 
=== added file 'purchase_gains/purchase_view.xml'
--- purchase_gains/purchase_view.xml	1970-01-01 00:00:00 +0000
+++ purchase_gains/purchase_view.xml	2014-08-27 19:22:25 +0000
@@ -0,0 +1,14 @@
+<openerp>
+    <data>
+        <record id="purchase_order_tree_inherit44" model="ir.ui.view">
+            <field name="name">purchase.order.tree.inherit44</field>
+            <field name="model">purchase.order</field>
+            <field name="inherit_id" ref="purchase.purchase_order_tree"></field>
+            <field name="arch" type="xml">
+                <field name="state" position="after">
+                    <field name="profit_po"></field>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>
 
=== added directory 'purchase_gains/report'
=== added file 'purchase_gains/report/__init__.py'
--- purchase_gains/report/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_gains/report/__init__.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import order
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 \ No newline at end of file
 
=== added file 'purchase_gains/report/order.py'
--- purchase_gains/report/order.py	1970-01-01 00:00:00 +0000
+++ purchase_gains/report/order.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+from openerp.report import report_sxw
+from openerp.osv import osv
+from openerp import pooler
+
+class order(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(order, self).__init__(cr, uid, name, context=context)
+        self.localcontext.update({'time': time})
+
+report_sxw.report_sxw('report.purchase.order.gains','purchase.order','addons/purchase_gains/report/order.rml',parser=order)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
 
=== added file 'purchase_gains/report/order.rml'
--- purchase_gains/report/order.rml	1970-01-01 00:00:00 +0000
+++ purchase_gains/report/order.rml	2014-08-27 19:22:25 +0000
@@ -0,0 +1,172 @@
+<?xml version="1.0"?>
+<document filename="Purchase Order.pdf">
+  <template title="Purchase Order" author="OpenERP S.A.([e-mail])" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="18.0" y1="42.0" width="535" height="758"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Header_Order_Reference_Tbl">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Content_Order_Reference_Table">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Header_Pur_ord_Line">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Order_Pur_line_Content">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_All_Total_Detail">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,2" stop="2,2"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Outer_Notes">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="terp_header" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9_Right" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
+  </stylesheet>
+  <story>
+  <pto>
+  <!--<para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>-->
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_header"><b>Purchase Order gains </b></para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="136.0,132.0,96.0,100.0,70.0" style="Header_Order_Reference_Tbl">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre"><b>Our Order Reference</b></para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre"><b>Your Order Reference</b></para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre"><b>Order Date</b></para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre"><b>Validated By</b></para>
+        </td>
+         <td>
+          <para style="terp_tblheader_General_Centre"><b>Profit</b></para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+    <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
+    <blockTable colWidths="136.0,132.0,96.0,100.0,70.0" style="Content_Order_Reference_Table">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ o.name or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ o.partner_ref or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[formatLang(o.date_order,date=True) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ (o.validator and o.validator.name) or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(o.profit_po, digits=get_digits(dp='Account'), currency_obj=o.pricelist_id.currency_id ) ]]</para>
+          <para style="terp_default_Centre_8"></para>
+        </td>
+      </tr>
+    </blockTable>
+    </section>
+  </pto>
+  </story>
+</document>
 
=== added directory 'purchase_lot_tracking'
=== added file 'purchase_lot_tracking/README'
=== added file 'purchase_lot_tracking/__init__.py'
--- purchase_lot_tracking/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_lot_tracking/__init__.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import purchase_lot_tracking
+import product
+import purchase
+import stock
+import wizard
+import account
+import sale
 
=== added file 'purchase_lot_tracking/__openerp__.py'
--- purchase_lot_tracking/__openerp__.py	1970-01-01 00:00:00 +0000
+++ purchase_lot_tracking/__openerp__.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+# NOTE: The name of the supplied field was initially "display_name", but it seems that OpenERP,
+# whenever it seems "name" in the field, returns the value for "name". Well...
+
+{
+    'name': 'purchase_lot_tracking',
+    'version': '1.0',
+    'author': 'Savoir-faire Linux',
+    'website': 'http://www.savoirfairelinux.com',
+    'category': 'Generic Modules/Purchases',
+    'description': """
+Lets you track expenses using product's lots numbers
+====================================================
+
+This module lets you track expenses using a product's lot
+number.
+
+If you create an analytic account for a product 
+
+
+""",
+    'depends': ['base', 'purchase', 'purchase_landed_costs', 'analytic', 'sale'],
+    'data': [
+        'purchase_lot_tracking_view.xml',
+        'purchase_workflow.xml',
+        'account_view.xml'
+    ],
+    'demo': [],
+    'test': [],
+    'installable': True,
+    'active': False,
+}
 
=== added file 'purchase_lot_tracking/account.py'
--- purchase_lot_tracking/account.py	1970-01-01 00:00:00 +0000
+++ purchase_lot_tracking/account.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,88 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import orm, fields
+import openerp.addons.decimal_precision as dp
+
+class account_analytic_account(orm.Model):
+
+    _inherit = 'account.analytic.account'
+
+    def _calculate_total_in(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+
+        move_pool = self.pool.get('stock.move')
+
+        for account in self.browse(cr, uid, ids):
+            res[account.id] = 0.0
+            total_moves = 0
+            production_pool = self.pool.get('stock.production.lot')
+            lot_ids = production_pool.search(cr, uid, [('name', '=', account.name)])
+
+            for lot in production_pool.browse(cr, uid, lot_ids):
+                move_ids = move_pool.search(
+                    cr, uid, [('prodlot_id', '=', lot.id)])
+                for move in move_pool.browse(cr, uid, move_ids):
+
+                    # Add in purchases, remove sales
+                    if move.type == 'in':
+                        total_moves += move.product_qty
+                    #else:
+                    #    total_moves -= move.product_qty
+
+            total_moves = max(total_moves, 0)
+            res[account.id] = total_moves
+
+        return res
+
+    def _calculate_tcu(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        for account in self.browse(cr, uid, ids):
+            res[account.id] = 0.0
+            if account.total_in_qty > 0:
+                res[account.id] = account.credit / account.total_in_qty
+        return res
+
+    def _estimated_tcu(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        po_line_pool = self.pool.get('purchase.order.line')
+        for line in self.browse(cr, uid, ids):
+            if line.code.startswith('LOT'):
+                po_line_ids = po_line_pool.search(cr, uid, [('account_analytic_id', '=', line.id)])
+                if po_line_ids:
+                    po_line_id = po_line_ids[0]
+                    po_line = po_line_pool.browse(cr, uid, po_line_id, context)
+                    if po_line.product_qty == 0:
+                        res[line.id] = 0
+                    else:
+                        res[line.id] = po_line.landed_costs / po_line.product_qty
+                else:
+                    res[line.id] = 0.0
+            else:
+                res[line.id] = 0.0
+        return res
+
+    _columns = {
+        'purchase_order': fields.many2one('purchase.order', 'Purchase Order', help='Issuing Purchase Order'),
+        'total_cost_unit': fields.function(_calculate_tcu, string='Total Cost Unit', type='float'),
+        'estimated_tcu': fields.function(_estimated_tcu, string='Estimated Total Cost per Unit', type='float'),
+        'total_in_qty': fields.function(_calculate_total_in, string='Total Received Quantity', type='float'),
+    }
 
=== added file 'purchase_lot_tracking/account_view.xml'
--- purchase_lot_tracking/account_view.xml	1970-01-01 00:00:00 +0000
+++ purchase_lot_tracking/account_view.xml	2014-08-27 19:22:25 +0000
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+    <record id="lot_total_cost_unit" model="ir.ui.view">
+      <field name="name">Total Cost Unit</field>
+      <field name="model">account.analytic.account</field>
+      <field name="inherit_id" ref="account.view_account_analytic_account_tree" />
+      <field name="arch" type="xml">
+        <field name="type" position="before">
+          <field name="total_in_qty" />
+          <field name="estimated_tcu" />
+          <field name="total_cost_unit"/>
+        </field>
+      </field>
+    </record>
+
+    <record id="lot_purchase_order" model="ir.ui.view">
+      <field name="name">Purchase Order</field>
+      <field name="model">account.analytic.account</field>
+      <field name="inherit_id" ref="account.view_account_analytic_account_tree" />
+      <field name="arch" type="xml">
+        <field name="code" position="before">
+          <field name="purchase_order" />
+        </field>
+      </field>
+    </record>
+  </data>
+</openerp>
 
=== added directory 'purchase_lot_tracking/i18n'
=== added file 'purchase_lot_tracking/i18n/fr.po'
--- purchase_lot_tracking/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ purchase_lot_tracking/i18n/fr.po	2014-08-27 19:22:25 +0000
@@ -0,0 +1,109 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* purchase_lot_tracking
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0-20130811-231021\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-09-18 14:23+0000\n"
+"PO-Revision-Date: 2013-09-18 14:23+0000\n"
+"Last-Translator: Alexandre Boily <[e-mail]>\n"
+"Language-Team: Savoir-faire Linux\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: purchase_lot_tracking
+#: field:sale.order.line,average:0
+msgid "Avg."
+msgstr "Moy."
+
+#. module: purchase_lot_tracking
+#: model:ir.model,name:purchase_lot_tracking.model_product_category
+msgid "Product Category"
+msgstr "Catégorie de produit"
+
+#. module: purchase_lot_tracking
+#: model:ir.model,name:purchase_lot_tracking.model_stock_invoice_onshipping
+msgid "Stock Invoice Onshipping"
+msgstr "Stock Invoice Onshipping"
+
+#. module: purchase_lot_tracking
+#: field:sale.order.line,minimum:0
+msgid "Min."
+msgstr "Min."
+
+#. module: purchase_lot_tracking
+#: model:ir.model,name:purchase_lot_tracking.model_purchase_order_line
+msgid "Purchase Order Line"
+msgstr "Ligne de bon de commande"
+
+#. module: purchase_lot_tracking
+#: model:ir.model,name:purchase_lot_tracking.model_stock_partial_picking_line
+msgid "stock.partial.picking.line"
+msgstr "stock.partial.picking.line"
+
+#. module: purchase_lot_tracking
+#: field:product.category,account_id:0
+#: field:product.product,account_id:0
+msgid "Analytical Account"
+msgstr "Compte analytique"
+
+#. module: purchase_lot_tracking
+#: model:ir.model,name:purchase_lot_tracking.model_product_product
+msgid "Product"
+msgstr "Produit"
+
+#. module: purchase_lot_tracking
+#: model:ir.model,name:purchase_lot_tracking.model_account_analytic_account
+#: view:product.category:0
+#: field:stock.production.lot,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "Compte analytique"
+
+#. module: purchase_lot_tracking
+#: field:purchase.order.line,lot:0
+msgid "Lot Number"
+msgstr "Numéro de lot"
+
+#. module: purchase_lot_tracking
+#: model:ir.model,name:purchase_lot_tracking.model_stock_production_lot
+msgid "Serial Number"
+msgstr "Numéro de série"
+
+#. module: purchase_lot_tracking
+#: field:sale.order.line,maximum:0
+msgid "Max."
+msgstr "Max."
+
+#. module: purchase_lot_tracking
+#: field:account.analytic.account,estimated_tcu:0
+msgid "Estimated Total Cost per Unit"
+msgstr "Coût total estimé par unité"
+
+#. module: purchase_lot_tracking
+#: model:ir.model,name:purchase_lot_tracking.model_account_invoice
+msgid "Invoice"
+msgstr "Facture"
+
+#. module: purchase_lot_tracking
+#: field:account.analytic.account,total_cost_unit:0
+msgid "Total Cost Unit"
+msgstr "Coût total unitaire"
+
+#. module: purchase_lot_tracking
+#: model:ir.model,name:purchase_lot_tracking.model_purchase_order
+msgid "Purchase Order"
+msgstr "Bon de commande"
+
+#. module: purchase_lot_tracking
+#: model:ir.model,name:purchase_lot_tracking.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Ligne de bon d'achat"
+
+#. module: purchase_lot_tracking
+#: field:account.analytic.account,total_in_qty:0
+msgid "Total Received Quantity"
+msgstr "Quantité reçue totale"
 
=== added file 'purchase_lot_tracking/i18n/purchase_lot_tracking.pot'
--- purchase_lot_tracking/i18n/purchase_lot_tracking.pot	1970-01-01 00:00:00 +0000
+++ purchase_lot_tracking/i18n/purchase_lot_tracking.pot	2014-08-27 19:22:25 +0000
@@ -0,0 +1,110 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* purchase_lot_tracking
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0-20130811-231021\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-09-18 14:23+0000\n"
+"PO-Revision-Date: 2013-09-18 14:23+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_lot_tracking
+#: field:sale.order.line,average:0
+msgid "Avg."
+msgstr ""
+
+#. module: purchase_lot_tracking
+#: model:ir.model,name:purchase_lot_tracking.model_product_category
+msgid "Product Category"
+msgstr ""
+
+#. module: purchase_lot_tracking
+#: model:ir.model,name:purchase_lot_tracking.model_stock_invoice_onshipping
+msgid "Stock Invoice Onshipping"
+msgstr ""
+
+#. module: purchase_lot_tracking
+#: field:sale.order.line,minimum:0
+msgid "Min."
+msgstr ""
+
+#. module: purchase_lot_tracking
+#: model:ir.model,name:purchase_lot_tracking.model_purchase_order_line
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: purchase_lot_tracking
+#: model:ir.model,name:purchase_lot_tracking.model_stock_partial_picking_line
+msgid "stock.partial.picking.line"
+msgstr ""
+
+#. module: purchase_lot_tracking
+#: field:product.category,account_id:0
+#: field:product.product,account_id:0
+msgid "Analytical Account"
+msgstr ""
+
+#. module: purchase_lot_tracking
+#: model:ir.model,name:purchase_lot_tracking.model_product_product
+msgid "Product"
+msgstr ""
+
+#. module: purchase_lot_tracking
+#: model:ir.model,name:purchase_lot_tracking.model_account_analytic_account
+#: view:product.category:0
+#: field:stock.production.lot,account_analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: purchase_lot_tracking
+#: field:purchase.order.line,lot:0
+msgid "Lot Number"
+msgstr ""
+
+#. module: purchase_lot_tracking
+#: model:ir.model,name:purchase_lot_tracking.model_stock_production_lot
+msgid "Serial Number"
+msgstr ""
+
+#. module: purchase_lot_tracking
+#: field:sale.order.line,maximum:0
+msgid "Max."
+msgstr ""
+
+#. module: purchase_lot_tracking
+#: field:account.analytic.account,estimated_tcu:0
+msgid "Estimated Total Cost per Unit"
+msgstr ""
+
+#. module: purchase_lot_tracking
+#: model:ir.model,name:purchase_lot_tracking.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: purchase_lot_tracking
+#: field:account.analytic.account,total_cost_unit:0
+msgid "Total Cost Unit"
+msgstr ""
+
+#. module: purchase_lot_tracking
+#: model:ir.model,name:purchase_lot_tracking.model_purchase_order
+msgid "Purchase Order"
+msgstr ""
+
+#. module: purchase_lot_tracking
+#: model:ir.model,name:purchase_lot_tracking.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: purchase_lot_tracking
+#: field:account.analytic.account,total_in_qty:0
+msgid "Total Received Quantity"
+msgstr ""
+
 
=== added file 'purchase_lot_tracking/product.py'
--- purchase_lot_tracking/product.py	1970-01-01 00:00:00 +0000
+++ purchase_lot_tracking/product.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import orm, fields
+
+class product_category(orm.Model):
+    """
+    Adds an analytical account to a purchase category
+    """
+
+    _inherit = 'product.category'
+
+    _columns = {
+        'account_id': fields.many2one('account.analytic.account', 'Analytical Account', required=False)
+    }
+
+class product_product(orm.Model):
+    """
+    Adds an analytical account to a purchase category
+    """
+
+    _inherit = 'product.product'
+
+    _columns = {
+        'account_id': fields.many2one('account.analytic.account', 'Analytical Account', required=False)
+    }
 
=== added file 'purchase_lot_tracking/purchase.py'
--- purchase_lot_tracking/purchase.py	1970-01-01 00:00:00 +0000
+++ purchase_lot_tracking/purchase.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,265 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import orm, fields
+from openerp import netsvc
+
+
+def assign_lot_number(pool, cr, uid, line_orders, context=None):
+    """
+    Manages and tracks a lot number for this production line
+
+    Generates a lot number, a stock.production.lot and an analytic
+    account for this purchase order line.
+    """
+    stock_prod_lot_obj = pool.get('stock.production.lot')
+    ir_sequence_obj = pool.get('ir.sequence')
+
+    for line_order in line_orders:
+        order_id = line_order.order_id.id
+
+        lot_number = ir_sequence_obj.get(cr, uid, 'ls.lot')
+        product = line_order.product_id
+
+        # Creates the analytic account
+        account_id = _analytic_account_from_product(pool,
+                                                    cr,
+                                                    uid,
+                                                    order_id,
+                                                    product,
+                                                    lot_number,
+                                                    context=context)
+
+        # Creates the stock.production.line
+        serial_number_data = {
+            'name': lot_number,
+            'product_id': product.id,
+            'account_analytic_id': account_id,
+        }
+
+        serial_number_id = stock_prod_lot_obj.create(cr, uid,
+                                                     serial_number_data,
+                                                     context=context)
+
+        return serial_number_id, account_id
+
+
+def _analytic_account_from_product(pool, cr, uid, order_id, product,
+                                   lot_number, context=None):
+    """
+    Creates an analytic account for the lot number and places it
+    as a children of the product's analytic account.
+
+    Assumes two variables in the context
+        - product: parent product id
+        - lot_number: lot_number to create analytic account for
+    """
+    account_analytic_obj = pool.get('account.analytic.account')
+    parent_account = product.account_id
+
+    account_values = {
+        'name': lot_number,
+        'complete_name': lot_number,
+        'purchase_order': order_id,
+        'code': lot_number,
+        'type': 'normal',
+        'parent_id': parent_account.id,
+        'balance': 0.0,
+        'debit': 0.0,
+        'credit': 0.0,
+        'quantity': 0.0,
+        'date_start': parent_account.date_start,
+        'date': parent_account.date,
+        'state': parent_account.state,
+    }
+
+    if parent_account.currency_id:
+        account_values['currency_id'] = parent_account.currency_id.id
+
+    analytic_account_id = account_analytic_obj.create(cr, uid,
+                                                      account_values,
+                                                      context=context)
+
+    return analytic_account_id
+
+
+class purchase_order_line(orm.Model):
+    """
+    Adds an analytical account to a product
+    """
+
+    _inherit = 'purchase.order.line'
+
+    def must_be_tracked(self, cr, uid, ids):
+        """
+        Determines if this purchase order line for this product must be tracked
+        """
+        return True
+
+
+
+
+    _columns = {
+        'lot': fields.char('Lot Number', size=64, required=False,
+                           translate=True),
+    }
+
+
+class purchase_order(orm.Model):
+    _inherit = "purchase.order"
+
+    def _create_pickings(self, cr, uid, order, order_lines, picking_id=False,
+                         context=None):
+        if not picking_id:
+            picking_id = self.pool.get('stock.picking').create(
+                cr, uid,
+                self._prepare_order_picking(cr, uid, order, context=context))
+
+        todo_moves = []
+        stock_move = self.pool.get('stock.move')
+        wf_service = netsvc.LocalService("workflow")
+
+        for order_line in order_lines:
+            if not order_line.product_id:
+                continue
+            if order_line.product_id.type in ('product', 'consu'):
+                move = stock_move.create(
+                    cr, uid,
+                    self._prepare_order_line_move(cr, uid, order, order_line,
+                                                  picking_id, context=context))
+
+                if order_line.move_dest_id:
+                    order_line.move_dest_id.write(
+                        {'location_id': order.location_id.id})
+
+                todo_moves.append(move)
+
+        stock_move.action_confirm(cr, uid, todo_moves)
+        stock_move.force_assign(cr, uid, todo_moves)
+        wf_service.trg_validate(uid, 'stock.picking', picking_id,
+                                'button_confirm', cr)
+
+        res = [picking_id]
+        pick_id = int(res[0])
+
+        invoice_obj = self.pool.get('account.invoice')
+        invoice_line_obj = self.pool.get('account.invoice.line')
+        journal_obj = self.pool.get('account.journal')
+        journal_ids = journal_obj.search(
+            cr, uid, [('type', '=', 'purchase'),
+                      ('company_id', '=', order.company_id.id)], limit=1)
+
+        # Create the analytic account
+
+        stock_picking_id = self.pool.get('stock.picking.in').search(cr, uid, [
+            ('origin', 'like', order.name)])
+        stock_picking = \
+            self.pool.get('stock.picking.in').browse(cr, uid,
+                                                     stock_picking_id)[0]
+
+        all_lines_tracked = True
+        total_pallets = 0.0
+
+        for po_line in order.order_line:
+            if not po_line.product_id.track_production:
+                all_lines_tracked = False
+            else:
+                lot_number, account_id = assign_lot_number(self.pool, cr, uid, [po_line], context=context)
+                matching_lines = [line for line in stock_picking.move_lines
+                                  if line.product_qty == po_line.product_qty
+                                  and line.product_id.id == po_line.product_id.id
+                                  and not line.prodlot_id]
+                if matching_lines:
+                    matching_lines[0].write({'prodlot_id': lot_number})
+
+                po_line.write({'account_analytic_id': account_id})
+                po_line.refresh()
+                stock_picking.refresh()
+
+            total_pallets += po_line.nb_pallets
+
+        for order_cost in order.landed_cost_line_ids:
+            fiscal_position = False
+            if order.partner_id.property_account_position:
+                fiscal_position = order.partner_id.property_account_position.id
+
+            vals_inv = {
+                'partner_id': order_cost.partner_id.id,
+                'currency_id': order_cost.currency_id.id or order.company_id.currency_id.id,
+                'account_id': order_cost.partner_id.property_account_payable.id,
+                'type': 'in_invoice',
+                'origin': order.name,
+                'fiscal_position': fiscal_position,
+                'company_id': order.company_id.id,
+                'journal_id': len(journal_ids) and journal_ids[0] or False,
+            }
+
+            inv_id = invoice_obj.create(cr, uid, vals_inv, context=None)
+
+            if all_lines_tracked:
+                for po_line in order.order_line:
+                    factor = 0.0
+
+                    if order_cost.price_type == 'per_unit':
+                        factor = po_line.product_qty / po_line.order_id.quantity_total
+
+                    elif order_cost.price_type == 'value':
+                        factor = po_line.price_subtotal / po_line.order_id.amount_total
+
+                    elif order_cost.price_type == 'per_pallet':
+                        factor = po_line.nb_pallets / total_pallets
+
+                    else:
+                        raise ValueError(
+                            'Unknown price type (neither "per_unit", "value" nor "per_pallet")')
+
+                    amount = order_cost.amount * factor
+                    vals_line = {
+                        'product_id': order_cost.product_id.id,
+                        'name': order_cost.product_id.name,
+                        'account_id': self._get_product_account_expense_id(
+                            order_cost.product_id),
+                        'partner_id': order_cost.partner_id.id,
+                        'invoice_id': inv_id,
+                        'origin': order.name,
+                        'account_analytic_id': po_line.account_analytic_id.id,
+                        'price_unit': amount,
+                        'invoice_line_tax_id': [(6, 0, [x.id for x in
+                                                        order_cost.product_id.supplier_taxes_id])],
+                    }
+
+                    invoice_line_obj.create(cr, uid, vals_line, context=None)
+            else:
+                vals_line = {
+                    'product_id': order_cost.product_id.id,
+                    'name': order_cost.product_id.name,
+                    'account_id': self._get_product_account_expense_id(
+                        order_cost.product_id),
+                    'partner_id': order_cost.partner_id.id,
+                    'invoice_id': inv_id,
+                    'price_unit': order_cost.amount,
+                    'invoice_line_tax_id': [(6, 0, [x.id for x in
+                                                    order_cost.product_id.supplier_taxes_id])],
+                }
+
+                invoice_line_obj.create(cr, uid, vals_line, context=None)
+
+        return res
 
=== added file 'purchase_lot_tracking/purchase_lot_tracking.py'
--- purchase_lot_tracking/purchase_lot_tracking.py	1970-01-01 00:00:00 +0000
+++ purchase_lot_tracking/purchase_lot_tracking.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import orm, fields, osv
+from openerp import netsvc
+import openerp.addons.decimal_precision as dp
+
+from datetime import datetime
+
+
+
+
+#class stock_partial_picking(orm.Model):
+
+#    _inherit = 'stock.picking.in'
+
+#    def action_process(self, cr, uid, ids, context=None):
+
+#        if context is None:
+#            context = {} 
+#            """Open the partial picking wizard"""
+#            context.update({
+#                'active_model': self._name,
+#                'active_ids': ids, 
+#                'active_id': len(ids) and ids[0] or False
+#            })   
+#
+#        for stock_picking in self.browse(cr, uid, ids):
+#            import ipdb; ipdb.set_trace()            
+#            ref_po_id = self.pool.get('purchase.order').search(cr, uid, [('name', 'like', stock_picking.origin)])
+#            ref_po = self.pool.get('purchase.order').browse(cr, uid, ref_po_id)[0]
+#
+#            for stock_picking_line in stock_picking.move_lines:
+#                
+#                matching_line = [po_line for po_line in ref_po.order_line if\
+#                                 po_line.product_qty == stock_picking_line.product_qty and \
+#                                 po_line.product_id.id == stock_picking_line.product_id.id][0]
+#
+##                matching_lot = self.pool.get('stock.production.lot').search(cr, uid, [('name', 'like', matching_line.lot)])[0]
+#
+#                stock_picking_line.write({'prodlot_id': matching_lot})
+#                stock_picking_line.refresh()
+
+
+
+#        return {
+#            'view_type': 'form',
+#            'view_mode': 'form',
+#            'res_model': 'stock.partial.picking',
+#            'type': 'ir.actions.act_window',
+#            'target': 'new',
+#            'context': context,
+#            'nodestroy': True,
+#        }   
 
=== added file 'purchase_lot_tracking/purchase_lot_tracking_view.xml'
--- purchase_lot_tracking/purchase_lot_tracking_view.xml	1970-01-01 00:00:00 +0000
+++ purchase_lot_tracking/purchase_lot_tracking_view.xml	2014-08-27 19:22:25 +0000
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+    <record id="purchase_lot_tracking_product" model="ir.ui.view">
+      <field name="name">purchase_lot_tracking.product.view</field>
+      <field name="model">product.product</field>
+      <field name="inherit_id" ref="product.product_normal_form_view"/>
+      <field name="arch" type="xml">
+        <field name="taxes_id" position="after">
+          <field name="account_id"/>
+        </field>
+      </field>
+    </record>
+
+    <record id="purchase_lot_tracking_product_category" model="ir.ui.view">
+      <field name="name">purchase_lot_tracking.product_category.view</field>
+      <field name="model">product.category</field>
+      <field name="inherit_id" ref="product.product_category_form_view"/>
+      <field name="arch" type="xml">
+        <field name="type" position="after">
+          <group name="analytic_account" string="Analytic Account" colspan="2">
+            <field name="account_id"/>
+          </group>
+        </field>
+      </field>
+    </record>
+
+    <record id="purchase_order_line_readonly_aa" model="ir.ui.view">
+      <field name="name">purchase.order.readonly.aa</field>
+      <field name="model">purchase.order</field>
+      <field name="inherit_id" ref="purchase.purchase_order_form" />
+      <field name="arch" type="xml">
+        <field name="account_analytic_id" position="replace">
+          <field
+            name="account_analytic_id"
+            colspan="2"
+            groups="purchase.group_analytic_accounting"
+            attrs="{'readonly': True}" />
+        </field>
+      </field>
+    </record>
+
+    <record id="purchase_lot_tracking_sale_order" model="ir.ui.view">
+      <field name="name">purchase_lot_tracking.sale.order.view</field>
+      <field name="model">sale.order</field>
+      <field name="inherit_id" ref="sale.view_order_form"/>
+      <field name="arch" type="xml">
+        <xpath expr="/form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_unit']" position="before">
+          <field name="minimum" />
+          <field name="average" />
+          <field name="maximum" />
+        </xpath>
+      </field>
+    </record>
+
+    <!-- Sequence -->
+    <record id="seq_type_lot" model="ir.sequence.type">
+      <field name="name">ls.lot</field>
+      <field name="code">ls.lot</field>
+    </record>
+
+    <record id="seq_lot" model="ir.sequence">
+      <field name="name">ls.lot</field>
+      <field name="code">ls.lot</field>
+      <field name="prefix">LOT</field>
+      <field name="padding">6</field>
+    </record>
+  </data>
+</openerp>
 
=== added file 'purchase_lot_tracking/purchase_workflow.xml'
--- purchase_lot_tracking/purchase_workflow.xml	1970-01-01 00:00:00 +0000
+++ purchase_lot_tracking/purchase_workflow.xml	2014-08-27 19:22:25 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="act_confirmed" model="workflow.activity">
+            <field name="wkf_id" ref="purchase.purchase_order"/>
+            <field name="name">confirmed</field>
+            <field name="split_mode">OR</field>
+            <field name="kind">function</field>
+            <field name="action">wkf_confirm_order()</field>
+        </record>
+    </data>
+</openerp>
 
=== added file 'purchase_lot_tracking/sale.py'
--- purchase_lot_tracking/sale.py	1970-01-01 00:00:00 +0000
+++ purchase_lot_tracking/sale.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,95 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import orm, fields
+import logging
+
+class sale(orm.Model):
+
+    _inherit = 'sale.order.line'
+    _logger = logging.Logger(__name__)
+
+    def _minimum(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+
+        for order_line in self.browse(cr, uid, ids, context):
+            account = order_line.product_id.account_id
+            minimum = 0.0
+
+            if account:
+                values = [lot.estimated_tcu for lot in account.child_ids
+                          if lot.total_in_qty != 0]
+            
+                if values:
+                    minimum = min(values)
+
+            res[order_line.id] = minimum
+
+        return res
+
+    def _average(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+
+        for order_line in self.browse(cr, uid, ids, context):
+            account = order_line.product_id.account_id
+            average = 0.0
+            
+            total_count = 0
+
+            if account:
+                for lot in account.child_ids:
+                    quantity = lot.total_in_qty
+                    tcu = lot.estimated_tcu
+
+                    if quantity != 0:
+                        average += quantity * tcu
+                        total_count += quantity
+        
+            if total_count == 0:
+                res[order_line.id] = 0
+            else:
+                res[order_line.id] = average / total_count
+
+        return res
+
+    def _maximum(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+
+        for order_line in self.browse(cr, uid, ids, context):
+            account = order_line.product_id.account_id
+            maximum = 0.0
+
+            if account:
+                values = [lot.estimated_tcu for lot in account.child_ids
+                          if lot.total_in_qty != 0]
+
+                if values:
+                    maximum = max(values)
+
+            res[order_line.id] = maximum
+
+        return res
+
+    _columns = {
+        'minimum': fields.function(_minimum, string='Min.', type='float'),
+        'average': fields.function(_average, string='Avg.', type='float'),
+        'maximum': fields.function(_maximum, string='Max.', type='float')
+    }
 
=== added file 'purchase_lot_tracking/stock.py'
--- purchase_lot_tracking/stock.py	1970-01-01 00:00:00 +0000
+++ purchase_lot_tracking/stock.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,141 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import orm, fields
+from openerp.tools.translate import _
+
+class stock_production_lot(orm.Model):
+
+    _inherit = 'stock.production.lot'
+
+    _columns = {
+        'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', required=False)
+    }
+
+
+class stock_invoice_onshipping(orm.TransientModel):
+
+    _inherit = 'stock.invoice.onshipping'
+
+    def retrieve_move_lines(self, cr, uid, ids, context=None):
+        """Retrieves all different move lines from the stock picking
+        """
+        move_lines = []
+        for pick in self.pool.get('stock.picking').browse(cr, uid,
+                                                          context['active_ids'],
+                                                          context=context):
+            move_lines += pick.move_lines
+
+        return move_lines
+
+    def _retrieve_invoice_lines(self, cr, uid, ids, context=None):
+        """Retrieves invoice lines of a newly created invoice
+
+           expects invoice_id to be passed in context
+        """
+        invoice = self.pool.get('account.invoice')\
+                           .browse(cr,uid, context['invoice_id'])
+        return invoice.invoice_line
+
+    def _find_matching_move_line(self, invoice_line, move_lines):
+        """Finds the matching invoice line in the move lines list
+
+           It is considered matching if they have the same product quantity
+           and the same product id.
+        """
+        matching_move_lines = [line for line in move_lines if
+                               line.product_qty == invoice_line.quantity and
+                               line.product_id.id == invoice_line.product_id.id]
+
+        if matching_move_lines:
+            return matching_move_lines[0]
+        return None
+
+    def create_invoice(self, cr, uid, ids, context=None):
+        """
+        Creates an invoice when the delivery lots are confirmed
+
+        Iterates through all the lines of the invoice to specify
+        the proper analytic_account
+        """
+        prod_lot_pool = self.pool.get('stock.production.lot')
+        # creates the invoice properly
+        res = super(stock_invoice_onshipping, self)\
+            .create_invoice(cr, uid, ids, context=context)
+
+        context['invoice_id'] = res.values()[0]
+        
+        # retrieve move lines of stock pickings
+        move_lines = self.retrieve_move_lines(cr, uid, ids, context=context)
+
+        # retrieve invoice lines of newly create invoice
+        invoice_lines = self._retrieve_invoice_lines(cr, uid, ids,
+                                                    context=context)
+
+        # first iteration, check if matching
+        lst_match = []
+        for invoice_line in invoice_lines:
+            # don't add service to analytic account
+            if invoice_line.product_id.type == u'service':
+                continue
+            matching_move_line = self._find_matching_move_line(invoice_line,
+                                                               move_lines)
+            name = invoice_line.name
+            if not matching_move_line:
+                msg = _("The item %s is not in stock picking." % name)
+                raise orm.except_orm(_("Missed line!"), msg)
+
+            # search account analytic
+            prod_lot_id = matching_move_line.prodlot_id
+            if not prod_lot_id:
+                msg = _("The item '%s' missed 'prodlot_id' on associated move \
+                item, origin %s." % (name, matching_move_line.origin))
+                raise orm.except_orm(_("Missed Serial Number!"), msg)
+
+            matching_prod_lot = prod_lot_pool.browse(cr, uid, prod_lot_id.id)
+            matching_account = matching_prod_lot.account_analytic_id.id
+
+            lst_match.append((invoice_line, matching_account))
+
+        # transaction
+        for invoice_line, matching_account in lst_match:
+            invoice_line.write({'account_analytic_id': matching_account})
+        
+        return res
+
+
+class stock_picking_out(orm.Model):
+
+    _inherit = 'stock.picking.out'
+
+    def action_process(self, cr, uid, ids, context={}):
+        '''Check if tracked products have their lot number specified'''
+
+        picking = self.browse(cr, uid, ids, context=context)[0]
+
+        for line in picking.move_lines:
+            if line.product_id.track_production and not line.prodlot_id.id:
+                message = ' '.join([
+                        _('Please specify a lot number for all products of type:'),
+                        line.product_id.name_template])
+                raise orm.except_orm(_('Missing lot number'), message)
+                        
+        return super(stock_picking_out, self).action_process(cr, uid, ids, context)
 
=== added directory 'purchase_lot_tracking/wizard'
=== added file 'purchase_lot_tracking/wizard/__init__.py'
--- purchase_lot_tracking/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_lot_tracking/wizard/__init__.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,1 @@
+import stock_partial_picking
 
=== added file 'purchase_lot_tracking/wizard/stock_partial_picking.py'
--- purchase_lot_tracking/wizard/stock_partial_picking.py	1970-01-01 00:00:00 +0000
+++ purchase_lot_tracking/wizard/stock_partial_picking.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-                                                                                                                                                                                                                        
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-TODAY OpenERP SA (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+from lxml import etree
+from openerp.osv import fields, osv 
+from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
+from openerp.tools.float_utils import float_compare
+import openerp.addons.decimal_precision as dp
+from openerp.tools.translate import _
+
+class stock_partial_picking_line(osv.TransientModel):
+
+    def _tracking(self, cursor, user, ids, name, arg, context=None):
+        res = {}
+        for tracklot in self.browse(cursor, user, ids, context=context):
+            tracking = False
+            if (tracklot.move_id.picking_id.type == 'in' and tracklot.product_id.track_incoming == True) or \
+                (tracklot.move_id.picking_id.type == 'out' and tracklot.product_id.track_outgoing == True):
+                tracking = True
+            res[tracklot.id] = tracking
+        return res 
+
+    _inherit  = "stock.partial.picking.line"
+
+    def onchange_product_id(self, cr, uid, ids, product_id, context=None):
+
+        raise Exception()
+
+        uom_id = False
+        if product_id:
+            product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+            uom_id = product.uom_id.id
+        return {'value': {'product_uom': uom_id}}
+
 
=== added directory 'purchase_order_pick_up_date'
=== added file 'purchase_order_pick_up_date/__init__.py'
--- purchase_order_pick_up_date/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_order_pick_up_date/__init__.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import purchase
 
=== added file 'purchase_order_pick_up_date/__openerp__.py'
--- purchase_order_pick_up_date/__openerp__.py	1970-01-01 00:00:00 +0000
+++ purchase_order_pick_up_date/__openerp__.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'Purchase Order Pick Up Date',
+    'version': '0.1',
+    'author': 'Savoir-faire Linux',
+    'maintainer': 'Savoir-faire Linux',
+    'website': 'http://www.savoirfairelinux.com',
+    'category': 'purchase',
+    'description': """
+Add a field for a purchase pick up date
+=======================================
+
+This module lets you specify a scheduled pick up date for a purchase order.
+""",
+    'depends': ['base', 'purchase'],
+    'data': [
+        'purchase_order_pick_up_date_report.xml',
+        'purchase_order_pick_up_date_view.xml',
+    ],
+    'demo': [],
+    'test': [],
+    'installable': True,
+    'active': False,
+}
 
=== added directory 'purchase_order_pick_up_date/i18n'
=== added file 'purchase_order_pick_up_date/i18n/fr.po'
--- purchase_order_pick_up_date/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ purchase_order_pick_up_date/i18n/fr.po	2014-08-27 19:22:25 +0000
@@ -0,0 +1,31 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* purchase_order_pick_up_date
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0-20130811-231021\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-09-18 14:24+0000\n"
+"PO-Revision-Date: 2013-09-18 14:24+0000\n"
+"Last-Translator: Alexandre Boily <[e-mail]>\n"
+"Language-Team: Savoir-faire Linux\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: purchase_order_pick_up_date
+#: help:purchase.order,date_pick_up:0
+msgid "Scheduled date where the purchase will arrive at one of your warehouses"
+msgstr "Date prévue à laquelle l'achat arrivera à l'un de vos entrepôts"
+
+#. module: purchase_order_pick_up_date
+#: field:purchase.order,date_pick_up:0
+msgid "Pick Up Date"
+msgstr "Date de pick up"
+
+#. module: purchase_order_pick_up_date
+#: model:ir.model,name:purchase_order_pick_up_date.model_purchase_order
+msgid "Purchase Order"
+msgstr "Bon de commande"
 
=== added file 'purchase_order_pick_up_date/i18n/purchase_order_pick_up_date.pot'
--- purchase_order_pick_up_date/i18n/purchase_order_pick_up_date.pot	1970-01-01 00:00:00 +0000
+++ purchase_order_pick_up_date/i18n/purchase_order_pick_up_date.pot	2014-08-27 19:22:25 +0000
@@ -0,0 +1,32 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* purchase_order_pick_up_date
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0-20130811-231021\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-09-18 14:24+0000\n"
+"PO-Revision-Date: 2013-09-18 14:24+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_order_pick_up_date
+#: help:purchase.order,date_pick_up:0
+msgid "Scheduled date where the purchase will arrive at one of your warehouses"
+msgstr ""
+
+#. module: purchase_order_pick_up_date
+#: field:purchase.order,date_pick_up:0
+msgid "Pick Up Date"
+msgstr ""
+
+#. module: purchase_order_pick_up_date
+#: model:ir.model,name:purchase_order_pick_up_date.model_purchase_order
+msgid "Purchase Order"
+msgstr ""
+
 
=== added file 'purchase_order_pick_up_date/purchase.py'
--- purchase_order_pick_up_date/purchase.py	1970-01-01 00:00:00 +0000
+++ purchase_order_pick_up_date/purchase.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import orm, fields
+
+class purchase_order(orm.Model):
+
+    _inherit = 'purchase.order'
+
+    _columns = {
+        'date_pick_up':
+            fields.date(
+                'Pick Up Date',
+                help='''Scheduled date where the purchase will arrive at one of your warehouses'''),
+    }
 
=== added file 'purchase_order_pick_up_date/purchase_order_pick_up_date_report.xml'
--- purchase_order_pick_up_date/purchase_order_pick_up_date_report.xml	1970-01-01 00:00:00 +0000
+++ purchase_order_pick_up_date/purchase_order_pick_up_date_report.xml	2014-08-27 19:22:25 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<openerp>
+  <data>
+    <report
+      auto="False"
+      id="purchase.report_purchase_quotation"
+      model="purchase.order"
+      name="purchase.quotation"
+      rml="purchase_order_pick_up_date/report/request_quotation.rml"
+      usage="default"
+      string="Request for Quotation" />
+
+    <report
+      auto="False"
+      id="purchase.report_purchase_order"
+      model="purchase.order"
+      name="purchase.order"
+      rml="purchase_order_pick_up_date/report/order.rml"
+      string="Purchase Order" />
+  </data>
+</openerp>
 
=== added file 'purchase_order_pick_up_date/purchase_order_pick_up_date_view.xml'
--- purchase_order_pick_up_date/purchase_order_pick_up_date_view.xml	1970-01-01 00:00:00 +0000
+++ purchase_order_pick_up_date/purchase_order_pick_up_date_view.xml	2014-08-27 19:22:25 +0000
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<openerp>
+  <data>
+    <record id="purchase_order_pick_up_date_tree" model="ir.ui.view">
+      <field name="name">purchase.order.pick.tree</field>
+      <field name="model">purchase.order</field>
+      <field name="inherit_id" ref="purchase.purchase_order_tree" />
+      <field name="arch" type="xml">
+        <field name="minimum_planned_date" position="after">
+          <field name="date_pick_up" />
+        </field>
+      </field>
+    </record>
+
+    <record id="purchase_order_pick_up_date_form" model="ir.ui.view">
+      <field name="name">purchase.order.pick.form</field>
+      <field name="model">purchase.order</field>
+      <field name="inherit_id" ref="purchase.purchase_order_form" />
+      <field name="arch" type="xml">
+        <field name="date_order" position="after">
+          <field name="date_pick_up" />
+        </field>
+      </field>
+    </record>
+  </data>
+</openerp>
 
=== added directory 'purchase_order_pick_up_date/report'
=== added file 'purchase_order_pick_up_date/report/order.rml'
--- purchase_order_pick_up_date/report/order.rml	1970-01-01 00:00:00 +0000
+++ purchase_order_pick_up_date/report/order.rml	2014-08-27 19:22:25 +0000
@@ -0,0 +1,335 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<document filename="Purchase Order.pdf">
+  <template title="Purchase Order" author="Savoir-faire Linux ([e-mail])" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="18.0" y1="42.0" width="535" height="758"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Header_Order_Reference_Tbl">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Content_Order_Reference_Table">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Header_Pur_ord_Line">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Order_Pur_line_Content">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_All_Total_Detail">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,2" stop="2,2"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Outer_Notes">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="terp_header" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9_Right" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <pto>
+      <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
+      <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
+      <pto_header>
+        <blockTable colWidths="180.0,70.0,60.0,80.0,60.0,85.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
+          <tr>
+            <td>
+              <para style="terp_tblheader_General"><b>Description</b></para>
+            </td>
+            <td>
+              <para style="terp_tblheader_General"><b>Taxes</b></para>
+            </td>
+            <td>
+              <para style="terp_tblheader_General"><b>Date Req.</b></para>
+            </td>
+            <td>
+              <para style="terp_tblheader_General_Right"><b>Qty</b></para>
+            </td>
+            <td>
+              <para style="terp_tblheader_General_Right"><b>Unit Price</b></para>
+            </td>
+            <td>
+              <para style="terp_tblheader_General_Right"><b>Net Price</b></para>
+            </td>
+          </tr>
+        </blockTable>
+      </pto_header>
+      <para style="terp_default_9">
+        <font color="white"> </font>
+      </para>
+      <blockTable colWidths="253.0,59.0,223.0" style="Tableau1">
+        <tr>
+          <td>
+            <blockTable colWidths="253.0" style="Tableau2">
+              <tr>
+                <td>
+                  <para style="terp_default_Bold_9"><b>Shipping address :</b></para>
+                  <para style="terp_default_9">[[ (o.dest_address_id and o.dest_address_id.name) or (o.warehouse_id and o.warehouse_id.name) or '']]</para>
+                  <para style="terp_default_9">[[ (o.dest_address_id and display_address(o.dest_address_id)) or (o.warehouse_id and display_address(o.warehouse_id.partner_id)) or '']]</para>
+                </td>
+              </tr>
+            </blockTable>
+            <para style="terp_default_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
+            <para style="terp_default_9">[[ o.partner_id and display_address(o.partner_id) ]] </para>
+            <para style="terp_default_9">
+              <font color="white"> </font>
+            </para>
+            <para style="terp_default_9">Tel : [[ (o.partner_id.phone) or removeParentNode('para') ]]</para>
+            <para style="terp_default_9">Fax : [[ (o.partner_id.fax) or removeParentNode('para') ]]</para>
+            <para style="terp_default_9">TIN : [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_9">
+        <font color="white"> </font>
+      </para>
+      <para style="terp_header"><b>[[ o.state=='draft' and removeParentNode('para') ]] Purchase Order Confirmation N° [[ o.name ]]</b></para>
+      <para style="terp_header"><b>[[ o.state&lt;&gt;'draft' and removeParentNode('para') ]] Request for Quotation N° [[ o.name ]]</b></para>
+      <para style="terp_default_8">
+        <font color="white"> </font>
+      </para>
+      <blockTable colWidths="106.8,106.8,106.8,106.8,106.8" style="Header_Order_Reference_Tbl">
+        <tr>
+          <td>
+            <para style="terp_tblheader_General_Centre"><b>Our Order Reference</b></para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Centre"><b>Your Order Reference</b></para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Centre"><b>Order Date</b></para>
+          </td>
+
+          <td>
+            <para style="terp_tblheader_General_Centre"><b>Pick Up Date</b></para>
+          </td>
+
+          <td>
+            <para style="terp_tblheader_General_Centre"><b>Validated By</b></para>
+          </td>
+        </tr>
+      </blockTable>
+      <blockTable colWidths="106.8,106.8,106.8,106.8,106.8" style="Content_Order_Reference_Table">
+        <tr>
+          <td>
+            <para style="terp_default_Centre_8">[[ o.name or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_8">[[ o.partner_ref or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_8">[[formatLang(o.date_order,date=True) ]]</para>
+          </td>
+
+          <td>
+            <para style="terp_default_Centre_8">[[ formatLang(o.date_pick_up, date=True) ]]</para>
+          </td>
+
+          <td>
+            <para style="terp_default_Centre_8">[[ (o.validator and o.validator.name) or '' ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_9">
+        <font color="white"> </font>
+      </para>
+      <blockTable colWidths="180.0,70.0,60.0,80.0,60.0,85.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
+        <tr>
+          <td>
+            <para style="terp_tblheader_General"><b>Description</b></para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General"><b>Taxes</b></para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General"><b>Date Req.</b></para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right"><b>Qty</b></para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right"><b>Unit Price</b></para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right"><b>Net Price</b></para>
+          </td>
+        </tr>
+      </blockTable>
+      <section>
+        <para style="terp_default_8">[[repeatIn(o.order_line,'line')]]</para>
+        <blockTable colWidths="180.0,70.0,60.0,80.0,60.0,85.0" style="Table_Order_Pur_line_Content">
+          <tr>
+            <td>
+              <para style="terp_default_9">[[ line.name ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_9">[[ ', '.join(map(lambda x: x.name, line.taxes_id)) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_9">[[ formatLang( line.date_planned, date=True) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(line.product_qty ) ]] [[ line.product_uom.name ]] </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(line.price_unit, digits=get_digits(dp='Product Price') ) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account'), currency_obj=o.pricelist_id.currency_id ) ]]</para>
+            </td>
+          </tr>
+        </blockTable>
+      </section>
+      <blockTable colWidths="375.0,60.0,100.0" style="Table_All_Total_Detail">
+        <tr>
+          <td>
+            <para style="terp_default_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_9">Net Total :</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account'), currency_obj=o.pricelist_id.currency_id ) ]]</para>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <para style="terp_default_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_9">Taxes :</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Account', currency_obj=o.pricelist_id.currency_id) ]]</para>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <para style="terp_default_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9"><b>Total :</b></para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right"><b>[[ formatLang(o.amount_total, digits=get_digits(dp='Account') , currency_obj=o.pricelist_id.currency_id) ]]</b></para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_8">
+        <font color="white"> </font>
+      </para>
+      <blockTable colWidths="535.0" style="Table_Outer_Notes">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ format(o.notes or '') ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_9">
+        <font color="white"> </font>
+      </para>
+    </pto>
+  </story>
+</document>
 
=== added file 'purchase_order_pick_up_date/report/request_quotation.rml'
--- purchase_order_pick_up_date/report/request_quotation.rml	1970-01-01 00:00:00 +0000
+++ purchase_order_pick_up_date/report/request_quotation.rml	2014-08-27 19:22:25 +0000
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<document filename="requestforquotation.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Savoir-faire Linux ([e-mail])" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="23.0" y1="43.0" width="530" height="799"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Product_Header_Title">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Product_Line">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard"/>
+    <paraStyle name="terp_header" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Space bet user and signature" fontSize="4.0" leading="5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="terp_default_9">[[repeatIn(objects,'order')]]</para>
+    <para style="terp_default_9">[[ setLang(order.partner_id.lang) ]]</para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="250.0,59.0,221.0" style="Tableau1">
+      <tr>
+        <td>
+          <blockTable colWidths="250.0" style="Tableau2">
+            <tr>
+              <td>
+                <para style="terp_default_Bold_9"><b>Expected Delivery address:</b></para>
+                <para style="terp_default_9">[[ (order.dest_address_id and order.dest_address_id.name) or (order.warehouse_id and order.warehouse_id.name) or '']]</para>
+                <para style="P1">[[ order.dest_address_id and display_address(order.dest_address_id) ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ (order .partner_id and order.partner_id.title and order.partner_id.title.name) or '' ]] [[ (order .partner_id and order.partner_id.name) or '' ]] </para>
+          <para style="terp_default_9">[[ order.partner_id and display_address(order .partner_id) ]] </para>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+          <para style="terp_default_9">Tel.: [[ (order.partner_id and order.partner_id.phone) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Fax: [[ (order.partner_id and order.partner_id.fax) or removeParentNode('para') ]]</para>
+          <para style="P1">TVA: [[ (order.partner_id and order.partner_id.vat) or removeParentNode('para') ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+
+    <blockTable colWidths="524.0" style="Tableau1">
+      <tr>
+        <td>
+          <para style="terp_default_9">Expected Pick Up Date: [[ (order.date_pick_up and formatLang(order.date_pick_up, date=True)) or removeParentNode('para') and '']]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_header"><b>Request for Quotation : [[order.name]]</b></para>
+
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+
+    <blockTable colWidths="371.0,98.0,61.0" repeatRows="1" style="Table_Product_Header_Title">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details"><b>Description</b></para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre"><b>Expected Date</b></para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre"><b>Qty</b></para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="terp_default_9">[[ repeatIn(order.order_line,'order_line') ]]</para>
+      <blockTable colWidths="371.0,98.0,61.0" style="Table_Product_Line">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ order_line.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_9">[[ formatLang(order_line.date_planned, date = True) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">
+              [[ formatLang(order_line.product_qty )]]
+              <i>[[ (order_line.product_uom and order_line.product_uom.name) or '' ]]</i>
+            </para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">[[ format(order.notes or '') ]]</para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">Regards,</para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <para style="Space bet user and signature">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">[[ user.signature or '' ]]</para>
+  </story>
+</document>
 
=== added directory 'sale_improved_slip'
=== added file 'sale_improved_slip/__init__.py'
--- sale_improved_slip/__init__.py	1970-01-01 00:00:00 +0000
+++ sale_improved_slip/__init__.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import report
+import sale
 
=== added file 'sale_improved_slip/__openerp__.py'
--- sale_improved_slip/__openerp__.py	1970-01-01 00:00:00 +0000
+++ sale_improved_slip/__openerp__.py	2014-08-27 19:22:25 +0000
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{