Merge lp:~jean-lelievre/openobject-addons/elico-7.0_modules_updates into lp:~elico-corp/openobject-addons/elico-7.0

[Jean LELIEVRE ElicoCorp]

Add the "static" folder in each required modules.

=== added directory 'account_prepayment/static'
=== added directory 'account_prepayment/static/description'
=== added file 'account_prepayment/static/description/account_invoice_line1.png'
Binary files account_prepayment/static/description/account_invoice_line1.png	1970-01-01 00:00:00 +0000 and account_prepayment/static/description/account_invoice_line1.png	2013-09-09 08:37:27 +0000 differ
=== added file 'account_prepayment/static/description/account_invoice_line2.png'
Binary files account_prepayment/static/description/account_invoice_line2.png	1970-01-01 00:00:00 +0000 and account_prepayment/static/description/account_invoice_line2.png	2013-09-09 08:37:27 +0000 differ
=== added file 'account_prepayment/static/description/index.html'
--- account_prepayment/static/description/index.html	1970-01-01 00:00:00 +0000
+++ account_prepayment/static/description/index.html	2013-09-09 08:37:27 +0000
@@ -0,0 +1,16 @@
+<section class="oe_container">
+    <div class="oe_row">
+    <h2 class="oe_slogan">account_prepayment Module</h2> 
+    <h3 class="oe_slogan">Prepayment Account for Customers and <br>Usage of Prepayment Account for Payments in Purchase Order</h3>
+    <h4 class="oe_slogan"><a href="http://www.openerp.com.cn">By Elico Corp</a></h4>
+       <p>This module allows for creation of prepayment accounts for Customers. This module also allows for payment to Suppliers in Purchase Orders to be deducted from the Prepayment Accounts instead of just other normal payment accounts. </p>
+        <div class="oe_row_img oe_centered oe_mt32">
+            <img class="oe_picture oe_screenshot" src="account_invoice_line1.png">
+            <img class="oe_picture oe_screenshot" src="account_invoice_line2.png">
+        </div>
+    </div>
+     <div class="oe_row oe_centeralign oe_more_space">
+            <a href="http://www.elico-corp.com" class="oe_button oe_big">Start your <span class="oe_emph">free</span> trial</a>
+        </div>
+        <h4 class="oe_slogan">or</h4>
+</section>
\ No newline at end of file

=== added directory 'delivery_plan'
=== added file 'delivery_plan/__init__.py'
--- delivery_plan/__init__.py	1970-01-01 00:00:00 +0000
+++ delivery_plan/__init__.py	2013-09-09 08:37:27 +0000
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Author: Yannick Gouin <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import sale
+import wizard
+import partner
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'delivery_plan/__openerp__.py'
--- delivery_plan/__openerp__.py	1970-01-01 00:00:00 +0000
+++ delivery_plan/__openerp__.py	2013-09-09 08:37:27 +0000
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Author: Yannick Gouin <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'Delivery Time Plan',
+    'version': '1',
+    'category': 'Delivery',
+    'sequence': 19,
+    'summary': 'Plan delivery time for sale order',
+    'description': """
+Delivery Time Plan
+=================================
+* Plan delivery time for sale order
+* Add delivery return reason,
+* Calculate sale order dts, pts based on order start_date, enddate,
+* Compute dts,pts of delivery order based on start_date and end date of sale order, delivery zone of partner.
+    """,
+    'author': 'Elico Corp',
+    'website': 'http://www.elico-corp.com',
+    'images' : [],
+    'depends': ['sale_stock', 'delivery_routes',
+            'mrp',
+            "report_webkit", 'stock_extra'],
+    'data': [
+        #'security/security.xml',
+        'security/ir.model.access.csv',
+        'stock_view.xml',
+        "delivery_report.xml",
+        'wizard/stock_view.xml',
+        'sequence.xml',
+    ],
+    'test': [],
+    'demo': [],
+    'installable': True,
+    'auto_install': False,
+    'application': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'delivery_plan/delivery_report.xml'
--- delivery_plan/delivery_report.xml	1970-01-01 00:00:00 +0000
+++ delivery_plan/delivery_report.xml	2013-09-09 08:37:27 +0000
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record id="ir_header_webkit_delivery_routes" model="ir.header_webkit">
+            <field eval="&quot;&quot;&quot;Portrait&quot;&quot;&quot;" name="orientation"/>
+            <field eval="&quot;&quot;&quot;A4&quot;&quot;&quot;" name="format"/>
+            <field eval="&quot;&quot;&quot;DeliveryRoutes&quot;&quot;&quot;" name="name"/>
+            <field eval="15.0" name="margin_top"/>
+            <field name="footer_html"><![CDATA[<html>
+    <head>
+        <meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
+        <script>
+            function subst() {
+            var vars={};
+            var x=document.location.search.substring(1).split('&');
+            for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
+            var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
+            for(var i in x) {
+            var y = document.getElementsByClassName(x[i]);
+            for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
+                }
+            }
+        </script>
+    </head>
+    <body style="border:0; margin: 0;" onload="subst()">
+        <table style="border-top: 1px solid black; font-size:8px; width: 100%; position:absolute;">
+            <tr>
+		    <td width="10%"><b>备注</b></td><td width="80%">1.拿货前请先确认是否有以下货物并勾选(干货蔬果，冰冻货物，熟食，饼房).     2.支付方式简写 现金 C，刷卡 P，不收钱 NC，券 Q（配送结束时填写）</td>
+		</tr>
+		<tr>
+		    <td width="10%"></td><td width="80%">3.配送结果有以下几种：1：配送成功。2：没有收钱。3：部分退货.4：改时间送。（配送结束时填写）</td>
+		</tr>
+        </table>
+    </body>
+</html>]]></field>
+                        <field name="html"><![CDATA[<html>
+    <head>
+        <meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
+        <script>
+            function subst() {
+            var vars={};
+            var x=document.location.search.substring(1).split('&');
+            for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
+            var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
+            for(var i in x) {
+            var y = document.getElementsByClassName(x[i]);
+            for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
+                }
+            }
+        </script>
+        <style type="text/css">
+            ${css}
+        </style>
+    </head>
+    <body style="border:0; margin: 0;" onload="subst()">
+    ${_debug or ''|n} </body>        
+</html>]]>
+</field>
+
+                        <field name="css" ><![CDATA[
+body { font-family:Helvetica; font-size:12px; }
+.title { font-size:16px; font-weight: bold; text-align: center; }
+.basic_table{ text-align:center; border-collapse: collapse; }
+.basic_table td { border:1px solid lightGrey; font-size:12px; }
+td { padding: 0 3px; text-align:left; font-size: 12px; }
+table.noborder, table.noborder tr, table.noborder tr td, tr.noborder, tr.noborder td, td.noborder { border: none; }
+.dontcutme { page-break-inside: avoid; }]]> </field>
+        </record>
+
+        <report id="report_delivery_route_print" name="delivery.route.print" string="Delivery Route" model="delivery.route" 
+            file="fc_delivery_plan/report/delivery_route_print.mako" report_type="webkit" auto="False" header = "True" menu="True" webkit_header="ir_header_webkit_delivery_routes"/>
+    </data>
+</openerp>
\ No newline at end of file

=== added directory 'delivery_plan/i18n'
=== added file 'delivery_plan/i18n/zh_CN.po'
--- delivery_plan/i18n/zh_CN.po	1970-01-01 00:00:00 +0000
+++ delivery_plan/i18n/zh_CN.po	2013-09-09 08:37:27 +0000
@@ -0,0 +1,703 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* fc_delivery_plan
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-03-11 10:05+0000\n"
+"PO-Revision-Date: 2013-03-11 10:05+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: fc_delivery_plan
+#: field:delivery.route.line,to_be_received:0
+msgid "To be Received"
+msgstr "待收"
+
+#. module: fc_delivery_plan
+#: field:delivery.route.line,account_checked:0
+msgid "Checked"
+msgstr "已检查"
+
+#. module: fc_delivery_plan
+#: code:addons/fc_delivery_plan/sale.py:648
+#: code:addons/fc_delivery_plan/sale.py:657
+#, python-format
+msgid "Error"
+msgstr "错误"
+
+#. module: fc_delivery_plan
+#: view:stock.picking:0
+msgid "Orders planned for the Past"
+msgstr "已安排订单"
+
+#. module: fc_delivery_plan
+#: view:delivery.route:0
+#: view:delivery.route.line:0
+#: view:stock.picking:0
+msgid "Group By..."
+msgstr "分组..."
+
+#. module: fc_delivery_plan
+#: view:delivery.route:0
+#: view:delivery.route.line:0
+#: view:stock.picking:0
+msgid "Today"
+msgstr "今天"
+
+#. module: fc_delivery_plan
+#: code:addons/fc_delivery_plan/sale.py:799
+#: field:delivery.route.line,customer_date:0
+#, python-format
+msgid "Customer Delivery Time"
+msgstr "客户发货时间"
+
+#. module: fc_delivery_plan
+#: view:delivery.route.line:0
+msgid "Delivery for Today"
+msgstr "今日配送"
+
+#. module: fc_delivery_plan
+#: view:delivery.change.dts:0
+msgid "Update"
+msgstr "更新"
+
+#. module: fc_delivery_plan
+#: field:delivery.route.line,cs_remark:0
+msgid "CS Remark"
+msgstr "CS备注"
+
+#. module: fc_delivery_plan
+#: view:stock.picking:0
+msgid "Picking without batch"
+msgstr "未设分拣批次"
+
+#. module: fc_delivery_plan
+#: view:stock.picking:0
+msgid "Picking list"
+msgstr "发货单"
+
+#. module: fc_delivery_plan
+#: code:addons/fc_delivery_plan/sale.py:546
+#, python-format
+msgid "Latest error"
+msgstr "上次错误"
+
+#. module: fc_delivery_plan
+#: field:delivery.route.line,picking_note:0
+msgid "DO Notes"
+msgstr "发货单备注"
+
+#. module: fc_delivery_plan
+#: field:delivery.route.line,delivered_cpt:0
+msgid "Delivered x times"
+msgstr "已发货 x 次"
+
+#. module: fc_delivery_plan
+#: selection:delivery.change.dts,action:0
+msgid "Blank DTS/PTS"
+msgstr "未设DTS/PTS"
+
+#. module: fc_delivery_plan
+#: view:stock.picking:0
+msgid "Batch"
+msgstr "批次"
+
+#. module: fc_delivery_plan
+#: code:addons/fc_delivery_plan/sale.py:657
+#, python-format
+msgid "The Route Line %s (origin: %s) is confirmed. You can not change it."
+msgstr "路线 %s (来源: %s) 已经确认. 不可修改."
+
+#. module: fc_delivery_plan
+#: field:stock.tracking,ul_id:0
+msgid "Picking Box"
+msgstr "移库单Box"
+
+#. module: fc_delivery_plan
+#: field:delivery.route.line,origin:0
+#: view:stock.picking:0
+msgid "Origin"
+msgstr "来源"
+
+#. module: fc_delivery_plan
+#: help:stock.picking.in,dts_id:0
+msgid "Delivery time or turn to receive"
+msgstr "配送时间(收货)"
+
+#. module: fc_delivery_plan
+#: field:delivery.route.line,exceptions:0
+msgid "Received with exceptions"
+msgstr "收货例外"
+
+#. module: fc_delivery_plan
+#: model:ir.model,name:fc_delivery_plan.model_stock_move
+msgid "Stock Move"
+msgstr "库存调拨"
+
+#. module: fc_delivery_plan
+#: model:ir.model,name:fc_delivery_plan.model_delivery_dts_to_vans
+msgid "delivery.dts_to_vans"
+msgstr "delivery.dts_to_vans"
+
+#. module: fc_delivery_plan
+#: field:delivery.change.dts,dts_id:0
+#: field:delivery.driver_for_routes,dts_id:0
+#: field:delivery.dts_to_routes,dts_id:0
+#: field:delivery.dts_to_vans,dts_id:0
+#: view:delivery.route:0
+#: view:delivery.route.line:0
+#: field:delivery.route.line,dts_id:0
+#: view:sale.order:0
+#: field:sale.order,dts_id:0
+#: field:stock.move,dts_id:0
+#: view:stock.picking:0
+#: field:stock.picking.in,dts_id:0
+#: field:stock.picking.in,route_line_id:0
+#: field:stock.picking.out,route_line_id:0
+msgid "Delivery Time"
+msgstr "发货时间"
+
+#. module: fc_delivery_plan
+#: view:stock.picking:0
+msgid "Ready"
+msgstr "就绪"
+
+#. module: fc_delivery_plan
+#: view:delivery.driver:0
+#: view:delivery.route:0
+#: view:delivery.route.line:0
+msgid "Edit..."
+msgstr "编辑..."
+
+#. module: fc_delivery_plan
+#: field:delivery.route.line,adjustment:0
+msgid "Adjustment"
+msgstr "调整"
+
+#. module: fc_delivery_plan
+#: model:ir.model,name:fc_delivery_plan.model_stock_picking_out
+msgid "Delivery Orders"
+msgstr "送货单"
+
+#. module: fc_delivery_plan
+#: field:delivery.change.dts,pts_id:0
+#: field:mrp.production,pts_id:0
+#: field:procurement.order,pts_id:0
+#: view:sale.order:0
+#: view:stock.picking:0
+#: field:stock.picking.in,pts_id:0
+msgid "Preparation Time"
+msgstr "拣货时间"
+
+#. module: fc_delivery_plan
+#: model:ir.ui.menu,name:fc_delivery_plan.menu_delivery_delivery_payment
+msgid "Delivery Payments"
+msgstr "发货支付"
+
+#. module: fc_delivery_plan
+#: field:delivery.route.line,vip:0
+msgid "is VIP ?"
+msgstr "是否 VIP ?"
+
+#. module: fc_delivery_plan
+#: view:delivery.driver_for_routes:0
+#: view:delivery.dts_to_routes:0
+#: view:delivery.dts_to_vans:0
+msgid "Confirm"
+msgstr "确认"
+
+#. module: fc_delivery_plan
+#: view:stock.picking:0
+msgid "Internal Picking List"
+msgstr "内部分拣单"
+
+#. module: fc_delivery_plan
+#: view:delivery.route.line:0
+msgid "State"
+msgstr "状态"
+
+#. module: fc_delivery_plan
+#: model:ir.model,name:fc_delivery_plan.model_stock_picking
+msgid "Picking List"
+msgstr "发货单"
+
+#. module: fc_delivery_plan
+#: model:ir.model,name:fc_delivery_plan.model_delivery_dts_to_routes
+msgid "delivery.dts_to_routes"
+msgstr "delivery.dts_to_routes"
+
+#. module: fc_delivery_plan
+#: field:delivery.return.reason,type:0
+#: field:delivery.time,type:0
+msgid "Type"
+msgstr "类型"
+
+#. module: fc_delivery_plan
+#: view:stock.picking:0
+msgid "Expected Date"
+msgstr "预计日期"
+
+#. module: fc_delivery_plan
+#: selection:stock.picking.in,delivery_state:0
+msgid "Delivered with exception"
+msgstr "发货例外"
+
+#. module: fc_delivery_plan
+#: model:ir.model,name:fc_delivery_plan.model_delivery_route_line
+msgid "delivery.route.line"
+msgstr "delivery.route.line"
+
+#. module: fc_delivery_plan
+#: selection:delivery.route.line,complete_state:0
+msgid "Not planned"
+msgstr "未计划"
+
+#. module: fc_delivery_plan
+#: field:delivery.route.line,partner_phone:0
+msgid "Partner Phone"
+msgstr "客户电话"
+
+#. module: fc_delivery_plan
+#: view:stock.picking:0
+msgid "Related Order"
+msgstr "相关单据"
+
+#. module: fc_delivery_plan
+#: view:stock.picking:0
+msgid "Confirmed Internal Moves"
+msgstr "确认内部调拨"
+
+#. module: fc_delivery_plan
+#: selection:delivery.route.line,complete_state:0
+msgid "No redelivery"
+msgstr "未重新发货"
+
+#. module: fc_delivery_plan
+#: view:stock.picking:0
+msgid "Order Date"
+msgstr "订单日期"
+
+#. module: fc_delivery_plan
+#: model:ir.model,name:fc_delivery_plan.model_procurement_order
+msgid "Procurement"
+msgstr "需求单"
+
+#. module: fc_delivery_plan
+#: view:stock.picking:0
+msgid "Orders planned for the Future"
+msgstr "已计划订单"
+
+#. module: fc_delivery_plan
+#: selection:delivery.route.line,complete_state:0
+msgid "Planned"
+msgstr "已计划"
+
+#. module: fc_delivery_plan
+#: view:delivery.route:0
+msgid "Delivery Routes"
+msgstr "配送车次"
+
+#. module: fc_delivery_plan
+#: view:delivery.driver:0
+#: view:delivery.route:0
+#: view:delivery.route.line:0
+msgid "Delete"
+msgstr "删除"
+
+#. module: fc_delivery_plan
+#: field:delivery.route.line,return_reasons:0
+msgid "Return Reasons"
+msgstr "退货原因"
+
+#. module: fc_delivery_plan
+#: code:addons/fc_delivery_plan/sale.py:800
+#: field:delivery.route.line,neighborhood:0
+#, python-format
+msgid "Neighborhood"
+msgstr "邻居"
+
+#. module: fc_delivery_plan
+#: model:ir.actions.act_window,name:fc_delivery_plan.action_delivery_route_form_cs
+#: model:ir.ui.menu,name:fc_delivery_plan.menu_action_delivery_route_form_cs
+msgid "Delivery Route CS"
+msgstr "发送路线 CS"
+
+#. module: fc_delivery_plan
+#: model:ir.model,name:fc_delivery_plan.model_delivery_time
+msgid "delivery.time"
+msgstr "delivery.time"
+
+#. module: fc_delivery_plan
+#: view:stock.picking:0
+msgid "Past"
+msgstr "过去"
+
+#. module: fc_delivery_plan
+#: view:stock.picking:0
+msgid "Future"
+msgstr "未来"
+
+#. module: fc_delivery_plan
+#: selection:stock.picking.in,delivery_state:0
+msgid "Returned, no delivery"
+msgstr "退回, 未发货"
+
+#. module: fc_delivery_plan
+#: field:delivery.route.line,amount_received:0
+msgid "Received"
+msgstr "已收"
+
+#. module: fc_delivery_plan
+#: view:delivery.route:0
+#: view:delivery.route.line:0
+#: model:ir.actions.report.xml,name:fc_delivery_plan.report_delivery_route_print
+msgid "Delivery Route"
+msgstr "配送车次"
+
+#. module: fc_delivery_plan
+#: view:delivery.change.dts:0
+#: view:delivery.driver_for_routes:0
+#: view:delivery.dts_to_routes:0
+#: view:delivery.dts_to_vans:0
+msgid "or"
+msgstr "或者"
+
+#. module: fc_delivery_plan
+#: view:stock.picking:0
+msgid "Picking already processed"
+msgstr "分拣已处理"
+
+#. module: fc_delivery_plan
+#: field:res.users,dts_id:0
+msgid "Last Used Delivery Time"
+msgstr "上次配送时间"
+
+#. module: fc_delivery_plan
+#: code:addons/fc_delivery_plan/sale.py:648
+#, python-format
+msgid "The Route %s is confirmed, you can not add lines to it."
+msgstr "路线 %s 已经确认, 不可增加新的明细."
+
+#. module: fc_delivery_plan
+#: model:ir.model,name:fc_delivery_plan.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "生产订单"
+
+#. module: fc_delivery_plan
+#: model:ir.ui.menu,name:fc_delivery_plan.menu_delivery_wizard
+msgid "Prepare Delivery Routes"
+msgstr "准备配送路线"
+
+#. module: fc_delivery_plan
+#: view:stock.picking:0
+msgid "Status"
+msgstr "状态"
+
+#. module: fc_delivery_plan
+#: model:ir.model,name:fc_delivery_plan.model_sale_order
+msgid "Sales Order"
+msgstr "销售订单"
+
+#. module: fc_delivery_plan
+#: view:delivery.driver:0
+#: view:delivery.route:0
+#: view:delivery.route.line:0
+msgid "í"
+msgstr "í"
+
+#. module: fc_delivery_plan
+#: model:ir.model,name:fc_delivery_plan.model_stock_tracking
+msgid "Packs"
+msgstr "包装"
+
+#. module: fc_delivery_plan
+#: model:ir.actions.act_window,name:fc_delivery_plan.action_delivery_line_form_cs
+#: model:ir.ui.menu,name:fc_delivery_plan.menu_action_delivery_line_form_cs
+msgid "Delivery Route Line CS"
+msgstr "路线明细 CS"
+
+#. module: fc_delivery_plan
+#: code:addons/fc_delivery_plan/sale.py:824
+#: view:delivery.dts_to_vans:0
+#: model:ir.actions.act_window,name:fc_delivery_plan.action_dts_to_vans
+#: model:ir.ui.menu,name:fc_delivery_plan.menu_action_dts_to_vans
+#, python-format
+msgid "Prepare Vans for DTS"
+msgstr "根据配送时间 Vans拣货"
+
+#. module: fc_delivery_plan
+#: selection:delivery.route.line,complete_state:0
+#: view:stock.picking:0
+#: selection:stock.picking.in,delivery_state:0
+msgid "In delivery"
+msgstr "配送中"
+
+#. module: fc_delivery_plan
+#: field:picking.batch,active:0
+msgid "Active"
+msgstr "可用"
+
+#. module: fc_delivery_plan
+#: model:ir.actions.act_window,name:fc_delivery_plan.action_picking_batch
+#: view:picking.batch:0
+#: field:stock.picking,batch_id:0
+#: field:stock.picking.in,batch_id:0
+#: field:stock.picking.out,batch_id:0
+msgid "Picking Batch"
+msgstr "拣货批次"
+
+#. module: fc_delivery_plan
+#: selection:stock.picking.in,delivery_state:0
+msgid "Not yet planned for delivery"
+msgstr "还未计划配送"
+
+#. module: fc_delivery_plan
+#: selection:delivery.route.line,complete_state:0
+msgid "Exception"
+msgstr "例外"
+
+#. module: fc_delivery_plan
+#: view:delivery.route.line:0
+msgid "Delivery Route Lines"
+msgstr "配送车次清单"
+
+#. module: fc_delivery_plan
+#: selection:delivery.time,type:0
+msgid "Preparation"
+msgstr "拣货"
+
+#. module: fc_delivery_plan
+#: field:delivery.route.line,amount_unpaid:0
+msgid "Unpaid"
+msgstr "未付"
+
+#. module: fc_delivery_plan
+#: field:stock.tracking,picking_id:0
+msgid "Picking Related"
+msgstr "相关分拣"
+
+#. module: fc_delivery_plan
+#: field:delivery.change.dts,action:0
+msgid "Action"
+msgstr "动作"
+
+#. module: fc_delivery_plan
+#: field:delivery.route.line,box_type:0
+msgid "Box Type"
+msgstr "Box 类型"
+
+#. module: fc_delivery_plan
+#: view:delivery.route:0
+#: view:delivery.route.line:0
+msgid "Delivery Route for Today"
+msgstr "今日配送路线"
+
+#. module: fc_delivery_plan
+#: code:addons/fc_delivery_plan/sale.py:840
+#: view:delivery.dts_to_routes:0
+#: model:ir.actions.act_window,name:fc_delivery_plan.action_dts_to_routes
+#: model:ir.ui.menu,name:fc_delivery_plan.menu_action_dts_to_routes
+#, python-format
+msgid "Prepare Routes for DTS"
+msgstr "根据配送时间 预备路线"
+
+#. module: fc_delivery_plan
+#: field:delivery.route.line,driver_phone:0
+msgid "Driver Phone"
+msgstr "司机电话"
+
+#. module: fc_delivery_plan
+#: view:stock.picking:0
+msgid "Orders planned for Today"
+msgstr "今日安排订单"
+
+#. module: fc_delivery_plan
+#: view:delivery.route:0
+#: view:stock.picking:0
+msgid "Done"
+msgstr "完成"
+
+#. module: fc_delivery_plan
+#: view:delivery.change.dts:0
+#: view:delivery.driver_for_routes:0
+#: view:delivery.dts_to_routes:0
+#: view:delivery.dts_to_vans:0
+#: selection:delivery.route.line,complete_state:0
+msgid "Cancel"
+msgstr "取消"
+
+#. module: fc_delivery_plan
+#: selection:stock.picking.in,delivery_state:0
+msgid "Planned for delivery"
+msgstr "配送计划"
+
+#. module: fc_delivery_plan
+#: selection:delivery.route.line,complete_state:0
+#: view:stock.picking:0
+#: selection:stock.picking.in,delivery_state:0
+msgid "Delivered"
+msgstr "已配送"
+
+#. module: fc_delivery_plan
+#: code:addons/fc_delivery_plan/sale.py:856
+#: view:delivery.driver_for_routes:0
+#: model:ir.actions.act_window,name:fc_delivery_plan.action_driver_for_routes
+#: model:ir.ui.menu,name:fc_delivery_plan.menu_action_driver_for_routes
+#, python-format
+msgid "Choose Driver / Deliver for DTS"
+msgstr "根据配送时间 选择司机 / 送货"
+
+#. module: fc_delivery_plan
+#: model:ir.actions.act_window,name:fc_delivery_plan.action_delivery_return_type
+#: model:ir.ui.menu,name:fc_delivery_plan.menu_action_delivery_return_type
+msgid "Return Reason Type"
+msgstr "退货原因类型"
+
+#. module: fc_delivery_plan
+#: model:ir.model,name:fc_delivery_plan.model_stock_picking_in
+msgid "Incoming Shipments"
+msgstr "入库"
+
+#. module: fc_delivery_plan
+#: field:picking.batch,picking_ids:0
+msgid "Contains"
+msgstr "包含"
+
+#. module: fc_delivery_plan
+#: field:delivery.route.line,complete_state:0
+#: view:stock.picking:0
+#: field:stock.picking.in,delivery_state:0
+msgid "Delivery State"
+msgstr "配送状态"
+
+#. module: fc_delivery_plan
+#: model:ir.model,name:fc_delivery_plan.model_picking_batch
+msgid "picking.batch"
+msgstr "拣货批次"
+
+#. module: fc_delivery_plan
+#: field:delivery.route.line,so_payment_method:0
+msgid "Payment Method"
+msgstr "付款方式"
+
+#. module: fc_delivery_plan
+#: selection:delivery.route.line,complete_state:0
+msgid "Returned"
+msgstr "已退货"
+
+#. module: fc_delivery_plan
+#: view:stock.picking:0
+msgid "Assigned Internal Moves"
+msgstr "指定的内部调拨"
+
+#. module: fc_delivery_plan
+#: view:stock.picking:0
+msgid "Journal"
+msgstr "账簿"
+
+#. module: fc_delivery_plan
+#: model:ir.actions.act_window,name:fc_delivery_plan.action_delivery_route_driver_kanban
+msgid "Delivery Route Driver Kanban"
+msgstr "配送路线司机看板"
+
+#. module: fc_delivery_plan
+#: selection:delivery.time,type:0
+msgid "Delivery"
+msgstr "配送"
+
+#. module: fc_delivery_plan
+#: model:ir.model,name:fc_delivery_plan.model_delivery_driver_for_routes
+msgid "delivery.driver_for_routes"
+msgstr "delivery.driver_for_routes"
+
+#. module: fc_delivery_plan
+#: view:stock.picking:0
+msgid "Waiting"
+msgstr "正在等待"
+
+#. module: fc_delivery_plan
+#: selection:delivery.change.dts,action:0
+msgid "Change DTS/PTS"
+msgstr "变更 DTS/PTS"
+
+#. module: fc_delivery_plan
+#: field:delivery.return.reason,reason:0
+#: field:delivery.return.type,name:0
+#: field:picking.batch,name:0
+msgid "Name"
+msgstr "名称"
+
+#. module: fc_delivery_plan
+#: view:stock.picking:0
+msgid "Not Planned"
+msgstr "未计划"
+
+#. module: fc_delivery_plan
+#: view:delivery.route.line:0
+msgid "Route"
+msgstr "路线"
+
+#. module: fc_delivery_plan
+#: selection:stock.picking.in,delivery_state:0
+msgid "Delivered and returned"
+msgstr "已配送和已退回"
+
+#. module: fc_delivery_plan
+#: field:stock.picking.in,carrier_id:0
+msgid "Carrier"
+msgstr "运输工具"
+
+#. module: fc_delivery_plan
+#: view:delivery.change.dts:0
+#: model:ir.actions.act_window,name:fc_delivery_plan.action_stock_change_dts_wizard
+#: model:ir.model,name:fc_delivery_plan.model_delivery_change_dts
+msgid "Change DTS / PTS"
+msgstr "变更 DTS / PTS"
+
+#. module: fc_delivery_plan
+#: field:delivery.return.reason,route_line_id:0
+msgid "Delivery Route Line"
+msgstr "配送路线明细"
+
+#. module: fc_delivery_plan
+#: model:ir.model,name:fc_delivery_plan.model_res_users
+msgid "Users"
+msgstr "用户"
+
+#. module: fc_delivery_plan
+#: model:ir.model,name:fc_delivery_plan.model_delivery_return_reason
+msgid "delivery.return.reason"
+msgstr "delivery.return.reason"
+
+#. module: fc_delivery_plan
+#: field:delivery.return.type,sequence:0
+msgid "Sequence"
+msgstr "序号"
+
+#. module: fc_delivery_plan
+#: model:ir.model,name:fc_delivery_plan.model_delivery_return_type
+msgid "delivery.return.type"
+msgstr "delivery.return.type"
+
+#. module: fc_delivery_plan
+#: view:stock.picking:0
+msgid "No batch"
+msgstr "未设批次"
+
+#. module: fc_delivery_plan
+#: field:delivery.route.line,amount_total:0
+msgid "Total"
+msgstr "合计"
+
+#. module: fc_delivery_plan
+#: field:delivery.route.line,account_remark:0
+msgid "Remark Accounting"
+msgstr "财务备注"
+

=== added file 'delivery_plan/partner.py'
--- delivery_plan/partner.py	1970-01-01 00:00:00 +0000
+++ delivery_plan/partner.py	2013-09-09 08:37:27 +0000
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Author: Yannick Gouin <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import osv, fields
+
+
+class res_partner(osv.osv):
+    _inherit = "res.partner"
+    
+    _columns = {
+        'deliver_zone':   fields.char('Delivery Zone', size= 64),
+    }
+
+res_partner()
\ No newline at end of file

=== added directory 'delivery_plan/report'
=== added file 'delivery_plan/report/__init__.py'
--- delivery_plan/report/__init__.py	1970-01-01 00:00:00 +0000
+++ delivery_plan/report/__init__.py	2013-09-09 08:37:27 +0000
@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+# Copyright (c) 2011 Cubic ERP - Teradata SAC. (http://cubicerp.com).
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import delivery_route_print
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'delivery_plan/report/delivery_route_print.mako'
--- delivery_plan/report/delivery_route_print.mako	1970-01-01 00:00:00 +0000
+++ delivery_plan/report/delivery_route_print.mako	2013-09-09 08:37:27 +0000
@@ -0,0 +1,110 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+    <head>
+        <meta content="text/html; charset=UTF-8" http-equiv="content-type"> 
+        <style type="text/css">
+        	${css}
+        </style>
+    </head>
+    <body>
+    <% cpt = 0 %>
+        %for delivery_route in objects :
+%if cpt > 0:
+<div style="page-break-after: always;"><span style="display: none;"> </span></div>
+%endif
+		<div class="title">Delivery Distribution Control Sheet (配送交接控制表)</div>
+		<div style="font-size:12px;font-style:italic;text-align:center;">Ref / 编号 : ${delivery_route.name}</div>
+		<td><b></b></td><td></td>
+		<br />
+		<table class="basic_table" width="100%">
+		<tr>
+		    <td width="17%"><b>Date<br />日期</b></td><td width="33%">${delivery_route.date}</td>
+		    <td width="17%"><b>Time Slot<br />时间段</b></td><td>${delivery_route.dts_id.name or '&nbsp;'}</td>
+		</tr>
+		<tr>
+			<td><b>Driver<br />驾驶员</b></td><td>${delivery_route.driver_id.name or '&nbsp;'}</td>
+		    <td><b>Deliver<br />送货员</b></td><td>${delivery_route.picker_id.name or '&nbsp;'}</td>
+		</tr>
+		<tr>
+			<td><b>Departure Time<br />出发时间</b></td><td>${delivery_route.departure_date or '&nbsp;'}</td>
+		    <td><b>Operation Rep<br />运营人员</b></td><td></td>
+		</tr>
+		</table>
+		<br />
+        <div class="main">
+            <table width="100%" class="basic_table">
+                <tbody>
+                    <tr style="font-weight:bold;">
+                    	<td style="height:26px;" colspan="4">Reason for delayed/Early departure 延迟的原因</td>
+                    	<td colspan="2">出库公里数: </td>
+                    	<td colspan="2">回库公里数: </td>
+                    </tr>
+                    <tr style="font-weight:bold;">
+                    	<td style="vertical-align:top; height:30px;" colspan="8">&nbsp;</td>
+                    </tr>
+                    <tr style="font-weight:bold;">
+                    	<td style="text-align:center; height:16px;" colspan="8">List of deliveries / 交货清单</td>
+                    </tr>
+                    <tr style="font-weight:bold;">
+                    	<td style="vertical-align:top; width:15px;">No</td>
+                    	<td style="vertical-align:top; width:70px;">Order <br /> 单号</td>
+                    	<td style="vertical-align:top; width:48px;">T<br />装箱</td>
+                        <td style="vertical-align:top; width:175px;">Address<br />地址</td>
+                        <td style="vertical-align:top;">Time<br />时间要求</td>
+                        <td style="vertical-align:top;">Payment<br />支付方式</td>
+                        <td style="vertical-align:top; width:75px;">Arrive Time<br />到达时间</td>
+                        <td style="vertical-align:top; width:75px;">Observation<br />结果</td>
+                    </tr>
+                    <% cpt=0 %>
+                    %for line in delivery_route.line_ids:
+                    	<% cpt+=1 %>
+                    	<% iced  = False %>
+            			<% warm  = False %>
+            			<% other = False %>
+                    %if line.vip:
+                    <tr style="font-style:italic;">
+                    %else:
+                    <tr>
+					%endif
+                    	<td style="vertical-align: top;"><div class="dontcutme">${cpt}</div></td>
+                    	<td style="vertical-align: top;"><div class="dontcutme">${line.origin and line.origin or ''}<!--${line.picking_id.name and '('+ line.picking_id.name + ')' or ''}--></div></td>
+                    	<td style="vertical-align: top;"><div class="dontcutme"><%
+                        pack_set = set([ move.product_id.joomla_deliver_in for move in line.picking_id.move_lines ])
+                        %>
+                        % for pack in pack_set:
+                        	%if pack in ['warm', 'iced', 'iced_n_warm','cold']:
+                    			%if pack in ['iced', 'iced_n_warm'] and not iced:
+	                    			<input type="checkbox" /> 冻F<br />
+	                    			<% iced = True %>
+	                			%endif
+	                			%if pack in ['warm', 'iced_n_warm'] and not warm:
+	                    			<input type="checkbox" /> 热W<br />
+	                    			<% warm = True %>
+	                    		%endif
+	                    		%if pack in ['cold']:
+	                    			<input type="checkbox" /> 冷C<br />
+	                    			<% warm = True %>
+	                    		%endif
+                			%else:
+                				%if not other:
+                    				<input type="checkbox" /> 常温<br />
+                    				<% other = True %>
+                    			%endif
+                    		%endif
+                    	%endfor
+                        </div></td>
+                        <td style="vertical-align: top;"><div class="dontcutme">${line.address_id.name or  ''}<br />${line.street or line.address_id.street or  ''}</div></td>
+		                <td style="vertical-align: top;"><div class="dontcutme">${line.customer_date or ''}</div></td>
+		                <td style="vertical-align: top;"><div class="dontcutme">${line.so_payment_method or ''}</div></td>
+                        <td style="vertical-align: top;">&nbsp;</td>
+                        <td style="vertical-align: top;">&nbsp;</td>
+                    </tr>
+                    %endfor
+                </tbody>
+            </table>
+        </div>
+        <div style="page-break-after: auto;"><span style="display: none;"> </span></div>
+        <% cpt+=1 %>
+        %endfor
+    </body>
+</html>
\ No newline at end of file

=== added file 'delivery_plan/report/delivery_route_print.mako.1'
--- delivery_plan/report/delivery_route_print.mako.1	1970-01-01 00:00:00 +0000
+++ delivery_plan/report/delivery_route_print.mako.1	2013-09-09 08:37:27 +0000
@@ -0,0 +1,111 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+    <head>
+        <meta content="text/html; charset=UTF-8" http-equiv="content-type"> 
+        <style type="text/css">
+        	${css}
+        </style>
+    </head>
+    <body>
+    <% cpt = 0 %>
+        %for delivery_route in objects :
+%if cpt > 0:
+<div style="page-break-after: always;"><span style="display: none;"> </span></div>
+%endif
+		<div class="title">Delivery Distribution Control Sheet (配送交接控制表)</div>
+		<div style="font-size:12px;font-style:italic;text-align:center;">Ref / 编号 : ${delivery_route.name}</div>
+		<td><b></b></td><td></td>
+		<br />
+		<table class="basic_table" width="100%">
+		<tr>
+		    <td width="17%"><b>Date<br />日期</b></td><td width="33%">${delivery_route.date}</td>
+		    <td width="17%"><b>Time Slot<br />时间段</b></td><td>${delivery_route.dts_id.name or '&nbsp;'}</td>
+		</tr>
+		<tr>
+			<td><b>Driver<br />驾驶员</b></td><td>${delivery_route.driver_id.name or '&nbsp;'}</td>
+		    <td><b>Deliver<br />送货员</b></td><td>${delivery_route.picker_id.name or '&nbsp;'}</td>
+		</tr>
+		<tr>
+			<td><b>Departure Time<br />出发时间</b></td><td>${delivery_route.departure_date or '&nbsp;'}</td>
+		    <td><b>Operation Rep<br />运营人员</b></td><td></td>
+		</tr>
+		</table>
+		<br />
+        <div class="main">
+            <table width="100%" class="basic_table">
+                <tbody>
+                    <tr style="font-weight:bold;">
+                    	<td style="border:0; padding-left:15px;vertical-align:top; height:16px;" colspan="8">Reason for delayed/Early departure 延迟的原因
+                    	/&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                    	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 出库公里数 <u>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;            </u>
+                    	/&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 回库公里数 <u>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;           </u></td>
+                    </tr>
+                    <tr style="font-weight:bold;">
+                    	<td style="vertical-align:top; height:30px;" colspan="8">&nbsp;</td>
+                    </tr>
+                    <tr style="font-weight:bold;">
+                    	<td style="text-align:center; height:16px;" colspan="8">List of deliveries / 交货清单</td>
+                    </tr>
+                    <tr style="font-weight:bold;">
+                    	<td style="vertical-align:top; width:15px;">No</td>
+                    	<td style="vertical-align:top; width:70px;">Order <br /> 单号</td>
+                    	<td style="vertical-align:top; width:48px;">T<br />装箱</td>
+                        <td style="vertical-align:top; width:175px;">Address<br />地址</td>
+                        <td style="vertical-align:top;">Time<br />时间要求</td>
+                        <td style="vertical-align:top;">Payment<br />支付方式</td>
+                        <td style="vertical-align:top; width:75px;">Arrive Time<br />到达时间</td>
+                        <td style="vertical-align:top; width:75px;">Observation<br />结果</td>
+                    </tr>
+                    <% cpt=0 %>
+                    %for line in delivery_route.line_ids:
+                    	<% cpt+=1 %>
+                    	<% iced  = False %>
+            			<% warm  = False %>
+            			<% other = False %>
+                    %if line.vip:
+                    <tr style="font-style:italic;">
+                    %else:
+                    <tr>
+					%endif
+                    	<td style="vertical-align: top;"><div class="dontcutme">${cpt}</div></td>
+                    	<td style="vertical-align: top;"><div class="dontcutme">${line.origin and line.origin or ''}<!--${line.picking_id.name and '('+ line.picking_id.name + ')' or ''}--></div></td>
+                    	<td style="vertical-align: top;"><div class="dontcutme"><%
+                        pack_set = set([ move.product_id.joomla_deliver_in for move in line.picking_id.move_lines ])
+                        %>
+                        % for pack in pack_set:
+                        	%if pack in ['warm', 'iced', 'iced_n_warm']:
+                    			%if pack in ['iced', 'iced_n_warm'] and not iced:
+	                    			<input type="checkbox" /> 冻F<br />
+	                    			<% iced = True %>
+	                			%endif
+	                			%if pack in ['warm', 'iced_n_warm'] and not warm:
+	                    			<input type="checkbox" /> 热W<br />
+	                    			<% warm = True %>
+	                    		%endif
+	                    		%if pack in ['cold']:
+	                    			<input type="checkbox" /> 冷C<br />
+	                    			<% warm = True %>
+	                    		%endif
+                			%else:
+                				%if not other:
+                    				<input type="checkbox" /> 常温<br />
+                    				<% other = True %>
+                    			%endif
+                    		%endif
+                    	%endfor
+                        </div></td>
+                        <td style="vertical-align: top;"><div class="dontcutme">${line.address_id.name or  ''}<br />${line.street or line.address_id.street or  ''}</div></td>
+		                <td style="vertical-align: top;"><div class="dontcutme">${line.customer_date or ''}</div></td>
+		                <td style="vertical-align: top;"><div class="dontcutme">${line.so_payment_method or ''}</div></td>
+                        <td style="vertical-align: top;">&nbsp;</td>
+                        <td style="vertical-align: top;">&nbsp;</td>
+                    </tr>
+                    %endfor
+                </tbody>
+            </table>
+        </div>
+        <div style="page-break-after: auto;"><span style="display: none;"> </span></div>
+        <% cpt+=1 %>
+        %endfor
+    </body>
+</html>
\ No newline at end of file

=== added file 'delivery_plan/report/delivery_route_print.py'
--- delivery_plan/report/delivery_route_print.py	1970-01-01 00:00:00 +0000
+++ delivery_plan/report/delivery_route_print.py	2013-09-09 08:37:27 +0000
@@ -0,0 +1,39 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution    
+#    Copyright (c) 2010-2012 Elico Corp. All Rights Reserved.
+#    Author: Yannick Gouin <[e-mail]>
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+
+from report import report_sxw
+import pooler
+
+class report_delivery_route_print(report_sxw.rml_parse):
+    _name = 'report.delivery.route.print'
+    
+    def __init__(self, cr, uid, name, context):
+        super(report_delivery_route_print, self).__init__(cr, uid, name, context)
+
+
+report_sxw.report_sxw('delivery.route.print', 'delivery.route',
+        'addons/fc_delivery_plan/report/delivery_route_print.mako', parser=report_delivery_route_print)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'delivery_plan/report/delivery_route_print.py.bak'
--- delivery_plan/report/delivery_route_print.py.bak	1970-01-01 00:00:00 +0000
+++ delivery_plan/report/delivery_route_print.py.bak	2013-09-09 08:37:27 +0000
@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 report import report_sxw
+import netsvc
+
+class report_delivery_route_print(report_sxw.rml_parse):
+    _name = 'report.delivery.route.print'
+    def __init__(self, cr, uid, name, context):
+        super(report_delivery_route_print, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+            'convert': self.convert,
+            'day': self.day,
+            'month': self.month,
+            'year': self.year,
+        })
+
+    def convert(self, amount, currency): return self.pool.get('ir.translation').amount_to_text(amount, 'zh_cn', currency or 'Nuevo Sol')
+    
+    def day(self, date): return self.pool.get('ir.translation').date_part(date, 'day', format='number' ,lang='zh_cn')
+    
+    def month(self, date): return self.pool.get('ir.translation').date_part(date, 'month', format='text' ,lang='zh_cn')
+    
+    def year(self, date): return self.pool.get('ir.translation').date_part(date, 'year', format='number' ,lang='zh_cn')
+    
+report_sxw.report_sxw(
+    'delivery.route.print',
+    'delivery.route',
+    'addons/delivery_routes/report/delivery_route_print.rml',
+    parser=report_delivery_route_print,header="external"
+)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'delivery_plan/report/delivery_route_print.rml'
--- delivery_plan/report/delivery_route_print.rml	1970-01-01 00:00:00 +0000
+++ delivery_plan/report/delivery_route_print.rml	2013-09-09 08:37:27 +0000
@@ -0,0 +1,243 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(842.0,595.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="16.0" y1="20.0" width="808" height="545"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="4,1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="5,1" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="5,1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,2" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,2" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,2" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,2" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="4,2" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="5,2" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="5,2" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P6" fontName="Helvetica" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" rightIndent="0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_Right_9" rightIndent="0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9_30" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <para style="P3">[[repeatIn(objects,'o')]]</para>
+    <para style="P3">[[ setLang(o.partner_id.lang) ]]</para>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <para style="P3">Referencia : [[ o.name ]]</para>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <para style="P3">Conductor: [[ o.driver_id.name ]]</para>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <para style="P3">Fecha: [[ o.date ]] - Horario: [[ o.dts_id.name ]]</para>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="85.0,138.0,114.0,138.0" style="Table1">
+      <tr>
+        <td>
+          <para style="P1">Hora de Salida:</para>
+        </td>
+        <td>
+          <para style="P2">[[ (o.departure_date) ]]</para>
+        </td>
+        <td>
+          <para style="P1">Hora de Llegada:</para>
+        </td>
+        <td>
+          <para style="P2">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="27.0,67.0,273.0,146.0,84.0,209.0" style="Table2">
+      <tr>
+        <td>
+          <para style="P6">Seq</para>
+        </td>
+        <td>
+          <para style="P6">POS Order</para>
+        </td>
+        <td>
+          <para style="P6">Dirección de Entrega</para>
+        </td>
+        <td>
+          <para style="P6">Destinatario</para>
+        </td>
+        <td>
+          <para style="P6">Hora de Visita</para>
+        </td>
+        <td>
+          <para style="P6">Detalle de Visita</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P2">[[repeatIn(o.line_ids,'line')]] [[line.sequence]]</para>
+        </td>
+        <td>
+          <para style="P5">[[line.pos_order_id.name]]</para>
+        </td>
+        <td>
+          <para style="P5">[[line.address_id.street]] [[line.address_id.street2]], [[line.address_id.district_id.name]] ([[line.address_id.address_ref]])</para>
+        </td>
+        <td>
+          <para style="P5">[[line.address_id.name]] ([[line.address_id.phone]] / [[line.address_id.mobile]])</para>
+        </td>
+        <td>
+          <para style="P5">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P5">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P2">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P5">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P5">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P5">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P5">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P5">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+

=== added file 'delivery_plan/report/delivery_route_print.rml.bk'
--- delivery_plan/report/delivery_route_print.rml.bk	1970-01-01 00:00:00 +0000
+++ delivery_plan/report/delivery_route_print.rml.bk	2013-09-09 08:37:27 +0000
@@ -0,0 +1,266 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="1.0" y1="56.0" width="594" height="786"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Partner_Address">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tabla2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tabla1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tabla4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tabla5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tabla6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" rightIndent="0.0" leftIndent="-3.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P9" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P10" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text_20_body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="terp_5f_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_5f_default_5f_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Table_20_Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_5f_default_5f_Centre_5f_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_5f_default_5f_Centre_5f_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_5f_default_5f_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_5f_default_5f_Bold_5f_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_5f_default_5f_Bold_5f_9" rightIndent="0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_5f_default_5f_Bold_5f_Right_5f_9" rightIndent="0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_5f_default_5f_Right_5f_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_5f_default_5f_Right_5f_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_5f_default_5f_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_5f_default_5f_9_5f_30" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="terp_5f_default_5f_8">[[repeatIn(objects,'route')]]</para>
+    <para style="terp_5f_default_5f_8">[[ setLang(o.partner_id.lang) ]]</para>
+    <para style="terp_5f_default_5f_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="393.0,202.0" style="Table_Partner_Address">
+      <tr>
+        <td>
+          <blockTable colWidths="55.0,338.0" style="Tabla2">
+            <tr>
+              <td>
+                <para style="P2">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P1">
+                  <font color="white"> </font>
+                </para>
+                <para style="P1">[[ route.date ]]</para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P2">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P10">Horario </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P2">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P10">Conductor</para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P2">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P10">[[ route.dts_id.name ]]</para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P2">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P9">[[ route.driver_id.name ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+        </td>
+        <td>
+          <blockTable colWidths="202.0" style="Tabla1">
+            <tr>
+              <td>
+                <para style="P2">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="terp_5f_default_5f_9">blabla 1</para>
+                <para style="terp_5f_default_5f_9">bla bla 2</para>
+                <para style="P8">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+          </blockTable>
+          <para style="terp_5f_default_5f_8">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_5f_default_5f_8">
+            <font color="white"> </font>
+          </para>
+          <blockTable colWidths="35.0,74.0,351.0,68.0,67.0" style="Tabla4">
+            <tr>
+              <td>
+                <para style="P5">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P8">[[repeatIn(o.line_ids,'lines')]][[ lines.pos_order_id.name]]</para>
+              </td>
+              <td>
+                <para style="P8">[[ lines.address_id.street]]</para>
+              </td>
+              <td>
+                <para style="P5">[[ lines.address_id.district_id.name]]</para>
+              </td>
+              <td>
+                <para style="P5">[[ day(lines.visit_day) month(lines.visit_day) year(lines.visit_day) ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+          <blockTable colWidths="30.0,384.0,182.0" style="Tabla5">
+            <tr>
+              <td>
+                <para style="P2">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P4">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P2">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+          </blockTable>
+          <blockTable colWidths="85.0,254.0,76.0,88.0,93.0" style="Tabla6">
+            <tr>
+              <td>
+                <para style="P2">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P2">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P2">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P2">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P2">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P2">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P2">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P6">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P6">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="P7">
+                  <font color="white"> </font>
+                </para>
+              </td>
+            </tr>
+          </blockTable>
+        </td>
+      </tr>
+    </blockTable>
+  </story>
+</document>

=== added file 'delivery_plan/report/delivery_route_print.sxw'
Binary files delivery_plan/report/delivery_route_print.sxw	1970-01-01 00:00:00 +0000 and delivery_plan/report/delivery_route_print.sxw	2013-09-09 08:37:27 +0000 differ
=== added file 'delivery_plan/sale.py'
--- delivery_plan/sale.py	1970-01-01 00:00:00 +0000
+++ delivery_plan/sale.py	2013-09-09 08:37:27 +0000
@@ -0,0 +1,1182 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Author: Yannick Gouin <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
+import pytz
+from openerp import netsvc
+from openerp.tools.translate import _
+
+
+class sale_order(osv.osv):
+    _inherit = "sale.order"
+    
+    def _get_dts_id(self, cr, uid, ids, fields, args, context=None):
+        result = {}
+        for so in self.browse(cr, uid, ids, context=context):
+            result[so.id] = so.pts_id and so.pts_id.dts_id and so.pts_id.dts_id.id or False
+        return result
+        
+    def _so_to_update_after_dts_change(self, cr, uid, ids, fields=None, arg=None, context=None):
+        if type(ids) != type([]):
+            ids = [ids]
+        return self.pool.get('sale.order').search(cr, uid, [('pts_id', 'in', ids)]) or []
+    
+    _store_dts_id = {
+        'sale.order': (lambda self, cr, uid, ids, context: ids, ['pts_id'], 10),
+        'delivery.time': (_so_to_update_after_dts_change, ['dts_id'], 10),
+    }    
+    
+    _columns = {
+        'pts_id':   fields.many2one('delivery.time', 'Preparation Time', domain=[('type', '=', 'pts')]),
+        'dts_id':  fields.function(_get_dts_id, method=True, type='many2one', relation='delivery.time', string='Delivery Time', store=_store_dts_id, readonly=True, domain=[('type', '=', 'dts')]),
+        'batch_id': fields.many2one('picking.batch', 'Picking Batch', change_default=True),
+        'start_date': fields.datetime('Delivery Start Date'),
+        'end_date': fields.datetime(' Delivery End Date'),
+        # 'so_payment_method': fields.char('Payment Method', size=32),
+    }
+
+    
+    def action_cancel_order_with_moves_not_delivered(self, cr, uid, ids, context=None):
+        wf_service = netsvc.LocalService("workflow")
+        if context is None:
+            context = {}
+        sale_order_line_obj = self.pool.get('sale.order.line')
+        drl_obj = self.pool.get('delivery.route.line')
+        #proc_obj = self.pool.get('procurement.order')
+        for sale in self.browse(cr, uid, ids, context=context):
+            try:
+                for pick in sale.picking_ids:
+                    for mov in pick.move_lines:
+                        if mov.state not in ('done','cancel'):
+                            mov.write({'state':'cancel'})
+                                    
+                for pick in sale.picking_ids:
+                    if pick.state != 'cancel':
+                        #wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_cancel', cr)
+                        pick.write({'state':'cancel'})
+                for inv in sale.invoice_ids:
+                    wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_cancel', cr)
+                for line in sale.order_line:
+                    if line.procurement_id:
+                        wf_service.trg_validate(uid, 'procurement.order', line.procurement_id.id, 'button_check', cr)
+                
+                #cancel delivery route line
+                drl_ids = drl_obj.search(cr, uid, [('sale_order_id','=',sale.id),('state','!=','cancel')])
+                drl_obj.action_cancel(cr,uid,drl_ids,context=context)
+                
+                order_ref = context.get('order_ref',False)
+                self.write(cr, uid, [sale.id], {'state':'shipping_except','client_order_ref':order_ref})
+                cr.commit()
+            except:
+                _logger.info('==== #LY action_cancel_order_with_moves_not_delivered fail %s===='%(sale.id))
+        return True
+    
+    def action_cancel_order_with_moves(self, cr, uid, ids, context=None):
+        wf_service = netsvc.LocalService("workflow")
+        if context is None:
+            context = {}
+        sale_order_line_obj = self.pool.get('sale.order.line')
+        drl_obj = self.pool.get('delivery.route.line')
+        #proc_obj = self.pool.get('procurement.order')
+        for sale in self.browse(cr, uid, ids, context=context):
+            try:
+                if sale.state == 'done':
+                        return False
+                for pick in sale.picking_ids:
+                    if pick.state == 'done':
+                        return False
+                    for mov in pick.move_lines:
+                        if mov.state == 'done':
+                            return False
+                for inv in sale.invoice_ids:
+                    if inv.state == 'paid':
+                        return False
+                    
+                for pick in sale.picking_ids:
+                    wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_cancel', cr)
+                for pick in sale.picking_ids:
+                    if pick.state != 'cancel':
+                        wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_cancel', cr)
+                                    
+                for inv in sale.invoice_ids:
+                    wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_cancel', cr)
+                for line in sale.order_line:
+                    if line.procurement_id:
+                        wf_service.trg_validate(uid, 'procurement.order', line.procurement_id.id, 'button_check', cr)
+                
+                #cancel delivery route line
+                drl_ids = drl_obj.search(cr, uid, [('sale_order_id','=',sale.id),('state','!=','cancel')])
+                drl_obj.action_cancel(cr,uid,drl_ids,context=context)
+                
+                sale_order_line_obj.write(cr, uid, [l.id for l in  sale.order_line], {'state': 'cancel'})
+                self.write(cr, uid, [sale.id], {'state': 'cancel'})
+                cr.commit()
+            except:
+                _logger.info('==== #LY action_cancel_order_with_moves fail %s===='%(sale.id))
+        return True
+
+    def _prepare_order_line_procurement(self, cr, uid, order, pt_id, line, move_id, date_planned, context=None):
+        return {
+            'name': line.name,
+            'origin': order.name,
+            'date_planned': date_planned,
+            'product_id': line.product_id.id,
+            'product_qty': line.product_uom_qty,
+            'product_uom': line.product_uom.id,
+            'product_uos_qty': (line.product_uos and line.product_uos_qty) or line.product_uom_qty,
+            'product_uos': (line.product_uos and line.product_uos.id) or line.product_uom.id,
+            'location_id': order.shop_id.warehouse_id.lot_stock_id.id,
+            'procure_method': line.type,
+            'move_id': move_id,
+            'company_id': order.company_id.id,
+            'note': line.name,
+            'pts_id': pt_id,
+        }
+    
+    def _prepare_order_line_move_fc(self, cr, uid, order, line, picking_id, pt_id, date_planned, context=None):
+        location_id = order.shop_id.warehouse_id.lot_stock_id.id
+        output_id = order.shop_id.warehouse_id.lot_output_id.id
+        return {
+            'name': line.name,
+            'picking_id': picking_id,
+            'product_id': line.product_id.id,
+            'date': date_planned,
+            'date_expected': date_planned,
+            'product_qty': line.product_uom_qty,
+            'product_uom': line.product_uom.id,
+            'product_uos_qty': (line.product_uos and line.product_uos_qty) or line.product_uom_qty,
+            'product_uos': (line.product_uos and line.product_uos.id) or line.product_uom.id,
+            'product_packaging': line.product_packaging.id,
+            'partner_id': line.address_allotment_id.id or order.partner_shipping_id.id,
+            'location_id': location_id,
+            'location_dest_id': output_id,
+            'sale_line_id': line.id,
+            'tracking_id': False,
+            'state': 'draft',
+            'company_id': order.company_id.id,
+            'price_unit': line.product_id.standard_price or 0.0,
+            'pts_id':pt_id,
+        }
+    
+    def _prepare_order_picking(self, cr, uid, order, dt_id, pt_id, context=None):
+        # SHOULD USE ir_sequence.next_by_code() or ir_sequence.next_by_id()
+        pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out')
+        return {
+            'name': pick_name,
+            'origin': order.name,
+            'date': order.date_order,
+            'type': 'out',
+            'state': 'auto',
+            'move_type': order.picking_policy,
+            'sale_id': order.id,
+            'partner_id': order.partner_shipping_id.id,
+            'note': order.note,
+            'invoice_state': (order.order_policy == 'picking' and '2binvoiced') or 'none',
+            'company_id': order.company_id.id,
+            'dts_id':dt_id,
+            'pts_id':pt_id,
+        }
+    
+    def _prepare_pts_dts(self, cr, uid, order, context=None):
+        if not context:
+            context = {}
+        tz = pytz.timezone('Asia/Shanghai')
+        tz2 = pytz.timezone('America/Anchorage')
+        delivery_time_obj = self.pool.get('delivery.time')
+        time_slot_obj = self.pool.get('delivery.time.slot')
+        val={}
+        
+        dts = False
+        pts = False
+        pt_id = False
+        dt_id = False
+        min_date = False
+        slot_id = False
+        now = datetime.now()
+        address = order.partner_shipping_id or order.partner_id or False
+        
+        if order.start_date:
+            min_date = order.start_date
+            dts = order.start_date
+            dts = datetime.strptime(dts, '%Y-%m-%d %H:%M:%S')            
+            dts = pytz.utc.localize(dts).astimezone(tz)
+        if order.date_order:
+            pts = datetime.strptime(order.date_order, '%Y-%m-%d')
+            pts = pytz.utc.localize(pts).astimezone(tz)
+        if not pts:
+            pts = dts
+        
+        if dts:
+            start_date = datetime.strftime(dts, '%Y-%m-%d')
+            from_time = datetime.strftime(dts, '%H:%M')
+            #LY remove the shanghai restrict out
+            # if address and (not address.city or address.city.lower() in ['shanghai']):
+            #     from_time = datetime.strftime(dts, '%H:%M')
+            # else:  # eg: in Nanjing
+            #     from_time = '09:30'
+            name = datetime.strftime(dts, '%y%m%d')
+            name_pts = name
+            start_date_pts = start_date
+            
+            slot_ids = time_slot_obj.search(cr, uid, [('max_time', '>=', from_time), ('type', '=', 'dts')], order='max_time')
+            if slot_ids:
+                slot = time_slot_obj.browse(cr, uid, slot_ids[0])
+                name += slot.name
+                end_date = start_date + ' ' + slot.end_time
+                start_date += ' ' + slot.start_time 
+                start_date = datetime.strptime(start_date, '%Y-%m-%d %H:%M')
+                start_date = pytz.utc.localize(start_date).astimezone(tz2)
+                start_date = datetime.strftime(start_date, '%Y-%m-%d %H:%M')
+                end_date = datetime.strptime(end_date, '%Y-%m-%d %H:%M')
+                end_date = pytz.utc.localize(end_date).astimezone(tz2)
+                end_date = datetime.strftime(end_date, '%Y-%m-%d %H:%M')
+                
+                dt_ids = delivery_time_obj.search(cr, uid, [('name', '=', name), ('type', '=', 'dts'), ('slot_id', '=', slot.id)])
+                if dt_ids:
+                    dt_id = dt_ids[0]
+                else:
+                    dt_id = delivery_time_obj.create(cr, uid, {
+                        'name':name,
+                        'start_date': start_date,
+                        'end_date': end_date,
+                        'active': True,
+                        'type': 'dts',
+                        'slot_id': slot.id,
+                        }, context)
+                    cr.commit()
+        
+        if pts and dt_id:
+            date_pts = datetime.strftime(pts, '%Y-%m-%d')
+            from_time = datetime.strftime(pts, '%H:%M')
+            if date_pts < datetime.strftime(dts, '%Y-%m-%d'):
+                date_pts = datetime.strftime(dts, '%Y-%m-%d')
+                from_time = '00:00'
+            
+            pts_slot_ids = time_slot_obj.search(cr, uid, [('max_time', '>=', from_time), ('type', '=', 'pts'), ('dts_id', '=', slot.id)], order='max_time')
+            if pts_slot_ids:
+                pts_slot = time_slot_obj.browse(cr, uid, pts_slot_ids[0])
+                name_pts += pts_slot.name
+                end_date_pts = start_date_pts + ' ' + pts_slot.end_time
+                start_date_pts += ' ' + pts_slot.start_time
+                start_date_pts = datetime.strptime(start_date_pts, '%Y-%m-%d %H:%M')
+                start_date_pts = pytz.utc.localize(start_date_pts).astimezone(tz2)
+                start_date_pts = datetime.strftime(start_date_pts, '%Y-%m-%d %H:%M')
+                end_date_pts = datetime.strptime(end_date_pts, '%Y-%m-%d %H:%M')
+                end_date_pts = pytz.utc.localize(end_date_pts).astimezone(tz2)
+                end_date_pts = datetime.strftime(end_date_pts, '%Y-%m-%d %H:%M')
+            
+                pt_ids = delivery_time_obj.search(cr, uid, [('name', '=', name_pts), ('type', '=', 'pts'), ('slot_id', '=', pts_slot.id)])
+                if pt_ids:
+                    pt_id = pt_ids[0]
+                else:
+                    pt_id = delivery_time_obj.create(cr, uid, {
+                        'name':name_pts,
+                        'start_date': start_date_pts,
+                        'end_date': end_date_pts,
+                        'active': True,
+                        'type': 'pts',
+                        'slot_id': pts_slot.id,
+                        'dts_id': dt_id,
+                        }, context)
+                    cr.commit()
+                val['pts_id'] = pt_id
+        if val:
+            order.write(val)
+        return min_date, dt_id, pt_id
+    
+    
+    def _create_pickings_and_procurements(self, cr, uid, order, order_lines, picking_id=False, context=None):
+        """Create the required procurements to supply sales order lines, also connecting
+        the procurements to appropriate stock moves in order to bring the goods to the
+        sales order's requested location.
+
+        If ``picking_id`` is provided, the stock moves will be added to it, otherwise
+        a standard outgoing picking will be created to wrap the stock moves, as returned
+        by :meth:`~._prepare_order_picking`.
+
+        Modules that wish to customize the procurements or partition the stock moves over
+        multiple stock pickings may override this method and call ``super()`` with
+        different subsets of ``order_lines`` and/or preset ``picking_id`` values.
+
+        :param browse_record order: sales order to which the order lines belong
+        :param list(browse_record) order_lines: sales order line records to procure
+        :param int picking_id: optional ID of a stock picking to which the created stock moves
+                               will be added. A new picking will be created if ommitted.
+        :return: True
+        """
+        val = {}
+        move_obj = self.pool.get('stock.move')
+        picking_obj = self.pool.get('stock.picking')
+        procurement_obj = self.pool.get('procurement.order')
+        proc_ids = []
+        
+        min_date, dt_id, pt_id = self._prepare_pts_dts(cr, uid, order)
+        # min_date, dt_id, pt_id = order.date_order, order.dts_id.id, order.pts_id.id
+        print '<<<<<<<<<<<<<<  %s, %s, %s' % (min_date, dt_id, pt_id)
+        
+        for line in order_lines:
+            if line.state == 'done':
+                continue
+
+            date_planned = min_date or self._get_date_planned(cr, uid, order, line, order.date_order, context=context)
+
+            if line.product_id:
+                if line.product_id.type in ('product', 'consu'):
+                    if not picking_id:
+                        picking_id = picking_obj.create(cr, uid, self._prepare_order_picking(cr, uid, order, dt_id, pt_id, context=context))
+                    move_id = move_obj.create(cr, uid, self._prepare_order_line_move_fc(cr, uid, order, line, picking_id, pt_id, date_planned, context=context))
+                else:
+                    # a service has no stock move
+                    move_id = False
+
+                proc_id = procurement_obj.create(cr, uid, self._prepare_order_line_procurement(cr, uid, order, pt_id, line, move_id, date_planned, context=context))
+                proc_ids.append(proc_id)
+                line.write({'procurement_id': proc_id})
+                self.ship_recreate(cr, uid, order, line, move_id, proc_id)
+
+        wf_service = netsvc.LocalService("workflow")
+        if picking_id:
+            wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
+        for proc_id in proc_ids:
+            wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
+        
+        if order.state == 'shipping_except':
+            val['state'] = 'progress'
+            val['shipped'] = False
+
+            if (order.order_policy == 'manual'):
+                for line in order.order_line:
+                    if (not line.invoiced) and (line.state not in ('cancel', 'draft')):
+                        val['state'] = 'manual'
+                        break
+        order.write(val)
+        return True
+
+sale_order()
+
+
+class picking_batch(osv.osv):
+    _name = "picking.batch"
+    _columns = {
+        'name': fields.char('Name', size=32, translate=True),
+        'picking_ids': fields.one2many('stock.picking', 'batch_id', 'Contains'),
+        'active': fields.boolean('Active'),
+    }
+
+    _defaults = {
+        'active': True,
+    }
+
+picking_batch()
+
+
+class stock_picking(osv.osv):
+    _name = "stock.picking"
+    _inherit = "stock.picking"
+    _columns = {
+        'batch_id': fields.many2one('picking.batch', 'Picking Batch', change_default=True),
+        'route_line_id': fields.one2many('delivery.route.line', 'picking_id', 'Delivery Time'),
+        'so_payment_method': fields.char('Payment Method', size=32),
+    }
+        
+    def write(self, cr, uid, ids, vals, context=None):
+        context = context or {}
+        pts_id = False
+        if type(ids) != type([]):
+            ids = [ids]
+        if 'dts_id' in vals:
+            move_pool = self.pool.get('stock.move')
+            proc_pool = self.pool.get('procurement.order')
+            pts_pool = self.pool.get('delivery.time')
+            drl_pool = self.pool.get('delivery.route.line')
+            
+            if 'pts_id' not in vals:
+                pts_id = pts_pool.search(cr, uid, [('active', '=', True), ('type', '=', 'pts'), ('dts_id', '=', vals['dts_id'])], order='start_date DESC')
+                if pts_id:
+                    pts_id = pts_id[0]
+                    vals.update({'pts_id':pts_id})
+            else:
+                pts_id = vals['pts_id']
+            
+            if pts_id:
+                move_ids = move_pool.search(cr, uid, [('state', 'not in', ['cancel', 'done']), ('picking_id', 'in', ids)])
+                if move_ids:
+                    move_pool.write(cr, uid, move_ids, {'pts_id':pts_id})
+                    proc_ids = proc_pool.search(cr, uid, [('state', 'not in', ['cancel', 'done']), ('move_id', 'in', move_ids)])
+                    if proc_ids:
+                        proc_pool.write(cr, uid, proc_ids, {'pts_id':pts_id})
+            
+#            Actually DONE in fields.function
+#            route_lines = drl_pool.search(cr, uid, [('state', 'in', ['draft']), ('picking_id', 'in', ids)])
+#            if route_lines:
+#                drl_pool.write(cr, uid, route_lines, {'dts_id': vals['dts_id']})
+        return super(stock_picking, self).write(cr, uid, ids, vals, context=context)
+    
+    
+    def pts_id_change(self, cr, uid, ids, pts_id, context=None):
+        res = {}
+        context = context or {}
+        if type(ids) != type([]):
+            ids = [ids]
+        move_pool = self.pool.get('stock.move')
+        proc_pool = self.pool.get('procurement.order')
+        pts_pool = self.pool.get('delivery.time')
+        drl_pool = self.pool.get('delivery.route.line')
+        
+        if pts_id:
+            pts = pts_pool.browse(cr, uid, [pts_id])[0]
+            #self.write(cr, uid, ids, {'dts_id':pts and pts.dts_id and pts.dts_id.id or False})
+            res['dts_id'] = pts and pts.dts_id and pts.dts_id.id or False
+        
+        move_ids = move_pool.search(cr, uid, [('state', 'not in', ['cancel', 'done']), ('picking_id', 'in', ids)])
+        if move_ids:
+            vals = {'pts_id':pts_id}
+            if pts_id:
+                vals.update({'date_expected':pts.dts_id.start_date})
+            move_pool.write(cr, uid, move_ids, vals)
+            proc_ids = proc_pool.search(cr, uid, [('state', 'not in', ['cancel', 'done']), ('move_id', 'in', move_ids)])
+            if proc_ids:
+                proc_pool.write(cr, uid, proc_ids, {'pts_id':pts_id})
+        
+#        Actually DONE in fields.function
+#        route_lines = drl_pool.search(cr, uid, [('state', 'in', ['draft']), ('picking_id', 'in', ids)])
+#        if route_lines and 'dts_id' in res:
+#            drl_pool.write(cr, uid, route_lines, {'dts_id': res['dts_id']})
+        return {'value': res}
+
+
+    def create(self, cr, uid, data, context=None):
+        """
+        create route line 
+        """
+        if not data.get('pts_id', False) and data.get('origin', False):
+            so_obj = self.pool.get('sale.order')
+            so_ids = so_obj.search(cr, uid, [('name', '=', data.get('origin'))]) or []
+            for so in so_obj.browse(cr, uid, so_ids):
+                data.update({'pts_id':so.pts_id and so.pts_id.id or False, 'dts_id':so.pts_id and so.pts_id.dts_id and so.pts_id.dts_id.id or False})
+        
+        return_type = data.get('return', 'none')
+        sp = super(stock_picking, self).create(cr, uid, data, context=context)
+        if data.get('type', 'internal') in ['in','out'] and data.get('pts_id', False) and return_type not in ['customer', 'supplier']:
+            self.pool.get('delivery.route.line').create(cr, uid, {'picking_id':sp, })
+        return sp
+
+stock_picking()
+
+
+class stock_picking_out(osv.osv):
+    _inherit = "stock.picking.out"
+    _columns = {
+        'batch_id': fields.many2one('picking.batch', 'Picking Batch', change_default=True),
+        'route_line_id': fields.one2many('delivery.route.line', 'picking_id', 'Delivery Time'),
+        'so_payment_method': fields.char('Payment Method', size=32),
+    }
+        
+    def write(self, cr, uid, ids, vals, context=None):
+        context = context or {}
+        pts_id = False
+        if type(ids) != type([]):
+            ids = [ids]
+        if 'dts_id' in vals:
+            move_pool = self.pool.get('stock.move')
+            proc_pool = self.pool.get('procurement.order')
+            pts_pool = self.pool.get('delivery.time')
+            drl_pool = self.pool.get('delivery.route.line')
+            
+            if 'pts_id' not in vals:
+                pts_id = pts_pool.search(cr, uid, [('active', '=', True), ('type', '=', 'pts'), ('dts_id', '=', vals['dts_id'])], order='start_date DESC')
+                if pts_id:
+                    pts_id = pts_id[0]
+                    vals.update({'pts_id':pts_id})
+            else:
+                pts_id = vals['pts_id']
+            
+            if pts_id:
+                move_ids = move_pool.search(cr, uid, [('state', 'not in', ['cancel', 'done']), ('picking_id', 'in', ids)])
+                if move_ids:
+                    move_pool.write(cr, uid, move_ids, {'pts_id':pts_id})
+                    proc_ids = proc_pool.search(cr, uid, [('state', 'not in', ['cancel', 'done']), ('move_id', 'in', move_ids)])
+                    if proc_ids:
+                        proc_pool.write(cr, uid, proc_ids, {'pts_id':pts_id})
+            
+#            Actually DONE in fields.function
+#            route_lines = drl_pool.search(cr, uid, [('state', 'in', ['draft']), ('picking_id', 'in', ids)])
+#            if route_lines:
+#                drl_pool.write(cr, uid, route_lines, {'dts_id': vals['dts_id']})
+        return super(stock_picking_out, self).write(cr, uid, ids, vals, context=context)
+    
+    
+    def pts_id_change(self, cr, uid, ids, pts_id, context=None):
+        res = {}
+        context = context or {}
+        if type(ids) != type([]):
+            ids = [ids]
+        move_pool = self.pool.get('stock.move')
+        proc_pool = self.pool.get('procurement.order')
+        pts_pool = self.pool.get('delivery.time')
+        drl_pool = self.pool.get('delivery.route.line')
+        
+        if pts_id:
+            pts = pts_pool.browse(cr, uid, [pts_id])[0]
+            #self.write(cr, uid, ids, {'dts_id':pts and pts.dts_id and pts.dts_id.id or False})
+            res['dts_id'] = pts and pts.dts_id and pts.dts_id.id or False
+        
+        move_ids = move_pool.search(cr, uid, [('state', 'not in', ['cancel', 'done']), ('picking_id', 'in', ids)])
+        if move_ids:
+            vals = {'pts_id':pts_id}
+            if pts_id:
+                vals.update({'date_expected':pts.dts_id.start_date})
+            move_pool.write(cr, uid, move_ids, vals)
+            proc_ids = proc_pool.search(cr, uid, [('state', 'not in', ['cancel', 'done']), ('move_id', 'in', move_ids)])
+            if proc_ids:
+                proc_pool.write(cr, uid, proc_ids, {'pts_id':pts_id})
+        
+#        Actually DONE in fields.function
+#        route_lines = drl_pool.search(cr, uid, [('state', 'in', ['draft']), ('picking_id', 'in', ids)])
+#        if route_lines and 'dts_id' in res:
+#            drl_pool.write(cr, uid, route_lines, {'dts_id': res['dts_id']})
+        return {'value': res}
+    
+
+    def create(self, cr, uid, data, context=None):
+        """
+        create route line 
+        """
+        if not data.get('pts_id', False) and data.get('origin', False):
+            so_obj = self.pool.get('sale.order')
+            so_ids = so_obj.search(cr, uid, [('name', '=', data.get('origin'))]) or []
+            for so in so_obj.browse(cr, uid, so_ids):
+                data.update({'pts_id':so.pts_id and so.pts_id.id or False, 'dts_id':so.pts_id and so.pts_id.dts_id and so.pts_id.dts_id.id or False})
+        
+        return_type = data.get('return', 'none')
+        sp = super(stock_picking_out, self).create(cr, uid, data, context=context)
+        if data.get('pts_id', False) and return_type not in ['customer', 'supplier']:
+            self.pool.get('delivery.route.line').create(cr, uid, {'picking_id':sp, })
+        return sp
+
+stock_picking_out()
+
+
+class stock_picking_in(osv.osv):
+    _inherit = "stock.picking.in"
+    
+    _columns = {
+        'batch_id': fields.many2one('picking.batch', 'Picking Batch', change_default=True),
+        'route_line_id': fields.one2many('delivery.route.line', 'picking_id', 'Delivery Time'),
+    }
+    
+    def write(self, cr, uid, ids, vals, context=None):
+        context = context or {}
+        pts_id = False
+        if type(ids) != type([]):
+            ids = [ids]
+        if 'dts_id' in vals:
+            move_pool = self.pool.get('stock.move')
+            proc_pool = self.pool.get('procurement.order')
+            pts_pool = self.pool.get('delivery.time')
+            drl_pool = self.pool.get('delivery.route.line')
+            
+            if 'pts_id' not in vals:
+                pts_id = pts_pool.search(cr, uid, [('active', '=', True), ('type', '=', 'pts'), ('dts_id', '=', vals['dts_id'])], order='start_date DESC')
+                if pts_id:
+                    pts_id = pts_id[0]
+                    vals.update({'pts_id':pts_id})
+            else:
+                pts_id = vals['pts_id']
+            
+            if pts_id:
+                move_ids = move_pool.search(cr, uid, [('state', 'not in', ['cancel', 'done']), ('picking_id', 'in', ids)])
+                if move_ids:
+                    move_pool.write(cr, uid, move_ids, {'pts_id':pts_id})
+                    proc_ids = proc_pool.search(cr, uid, [('state', 'not in', ['cancel', 'done']), ('move_id', 'in', move_ids)])
+                    if proc_ids:
+                        proc_pool.write(cr, uid, proc_ids, {'pts_id':pts_id})
+                        
+#            Actually DONE in fields.function
+#            route_lines = drl_pool.search(cr, uid, [('state', 'in', ['draft']), ('picking_id', 'in', ids)])
+#            if route_lines:
+#                drl_pool.write(cr, uid, route_lines, {'dts_id': vals['dts_id']})
+        return super(stock_picking_in, self).write(cr, uid, ids, vals, context=context)
+    
+    
+    def pts_id_change(self, cr, uid, ids, pts_id, context=None):
+        res = {}
+        context = context or {}
+        if type(ids) != type([]):
+            ids = [ids]
+        move_pool = self.pool.get('stock.move')
+        proc_pool = self.pool.get('procurement.order')
+        pts_pool = self.pool.get('delivery.time')
+        drl_pool = self.pool.get('delivery.route.line')
+        
+        if pts_id:
+            pts = pts_pool.browse(cr, uid, [pts_id])[0]
+            #self.write(cr, uid, ids, {'dts_id':pts and pts.dts_id and pts.dts_id.id or False})
+            res['dts_id'] = pts and pts.dts_id and pts.dts_id.id or False
+        
+        move_ids = move_pool.search(cr, uid, [('state', 'not in', ['cancel', 'done']), ('picking_id', 'in', ids)])
+        if move_ids:
+            vals = {'pts_id':pts_id}
+            if pts_id:
+                vals.update({'date_expected':pts.dts_id.start_date})
+            move_pool.write(cr, uid, move_ids, vals)
+            proc_ids = proc_pool.search(cr, uid, [('state', 'not in', ['cancel', 'done']), ('move_id', 'in', move_ids)])
+            if proc_ids:
+                proc_pool.write(cr, uid, proc_ids, {'pts_id':pts_id})
+        
+#        Actually DONE in fields.function
+#        route_lines = drl_pool.search(cr, uid, [('state', 'in', ['draft']), ('picking_id', 'in', ids)])
+#        if route_lines and 'dts_id' in res:
+#            drl_pool.write(cr, uid, route_lines, {'dts_id': res['dts_id']})
+        return {'value': res}
+    
+
+    def create(self, cr, uid, data, context=None):
+        """
+        create route line 
+        """
+        if not data.get('pts_id', False) and data.get('origin', False):
+            so_obj = self.pool.get('sale.order')
+            so_ids = so_obj.search(cr, uid, [('name', '=', data.get('origin'))]) or []
+            for so in so_obj.browse(cr, uid, so_ids):
+                data.update({'pts_id':so.pts_id and so.pts_id.id or False, 'dts_id':so.pts_id and so.pts_id.dts_id and so.pts_id.dts_id.id or False})
+        
+        purchase_id = data.get('purchase_id', False)
+        return_type = data.get('return', 'none')
+        if purchase_id:
+            po = self.pool.get('purchase.order').browse(cr, uid, purchase_id)
+            if not po.is_collected:
+                purchase_id = False
+        
+        sp = super(stock_picking_in, self).create(cr, uid, data, context=context)
+        if data.get('pts_id', False) and return_type not in ['customer', 'supplier'] and not purchase_id:
+            self.pool.get('delivery.route.line').create(cr, uid, {'picking_id':sp, })
+        return sp
+
+stock_picking_in()
+
+
+class stock_tracking(osv.osv):
+    _inherit = "stock.tracking"
+    
+    _columns = {
+        'picking_id': fields.many2one('stock.picking', 'Picking Related', change_default=True),
+        'ul_id': fields.many2one('product.ul', 'Picking Box', change_default=True),
+    }
+stock_tracking()
+
+
+class mrp_production(osv.osv):
+    _inherit = 'mrp.production'
+
+    _columns = {
+        'pts_id':  fields.many2one('delivery.time', 'Preparation Time', select=True, domain=[('type', '=', 'pts')]),
+    }
+    
+    def _make_production_internal_shipment_line(self, cr, uid, production_line, shipment_id, parent_move_id, destination_location_id=False, context=None):
+        stock_move = self.pool.get('stock.move')
+        production = production_line.production_id
+        date_planned = production.date_planned
+        # Internal shipment is created for Stockable and Consumer Products
+        if production_line.product_id.type not in ('product', 'consu'):
+            return False
+        source_location_id = production.location_src_id.id
+        if not destination_location_id:
+            destination_location_id = source_location_id
+        return stock_move.create(cr, uid, {
+                        'name': production.name,
+                        'picking_id': shipment_id,
+                        'product_id': production_line.product_id.id,
+                        'product_qty': production_line.product_qty,
+                        'product_uom': production_line.product_uom.id,
+                        'product_uos_qty': production_line.product_uos and production_line.product_uos_qty or False,
+                        'product_uos': production_line.product_uos and production_line.product_uos.id or False,
+                        'date': date_planned,
+                        'move_dest_id': parent_move_id,
+                        'location_id': source_location_id,
+                        'location_dest_id': destination_location_id,
+                        'state': 'waiting',
+                        'company_id': production.company_id.id,
+                        'pts_id': production.pts_id and production.pts_id.id or False,
+                })
+    
+    def _make_production_internal_shipment(self, cr, uid, production, context=None):
+        ir_sequence = self.pool.get('ir.sequence')
+        stock_picking = self.pool.get('stock.picking')
+        routing_loc = None
+        pick_type = 'internal'
+        partner_id = False
+
+        # Take routing address as a Shipment Address.
+        # If usage of routing location is a internal, make outgoing shipment otherwise internal shipment
+        if production.bom_id.routing_id and production.bom_id.routing_id.location_id:
+            routing_loc = production.bom_id.routing_id.location_id
+            if routing_loc.usage != 'internal':
+                pick_type = 'out'
+            partner_id = routing_loc.partner_id and routing_loc.partner_id.id or False
+
+        # Take next Sequence number of shipment base on type
+        # SHOULD USE ir_sequence.next_by_code() or ir_sequence.next_by_id()
+        pick_name = ir_sequence.get(cr, uid, 'stock.picking.' + pick_type)
+
+        picking_id = stock_picking.create(cr, uid, {
+            'name': pick_name,
+            'origin': (production.origin or '').split(':')[0] + ':' + production.name,
+            'type': pick_type,
+            'move_type': 'one',
+            'state': 'auto',
+            'partner_id': partner_id,
+            'auto_picking': self._get_auto_picking(cr, uid, production),
+            'company_id': production.company_id.id,
+            'pts_id': production.pts_id and production.pts_id.id or False,
+            'dts_id': production.pts_id and production.pts_id.dts_id and production.pts_id.dts_id.id or False,
+        })
+        production.write({'picking_id': picking_id}, context=context)
+        return picking_id
+
+    def _make_production_produce_line(self, cr, uid, production, context=None):
+        stock_move = self.pool.get('stock.move')
+        source_location_id = production.product_id.property_stock_production.id
+        destination_location_id = production.location_dest_id.id
+        data = {
+            'name': production.name,
+            'date': production.date_planned,
+            'product_id': production.product_id.id,
+            'product_qty': production.product_qty,
+            'product_uom': production.product_uom.id,
+            'product_uos_qty': production.product_uos and production.product_uos_qty or False,
+            'product_uos': production.product_uos and production.product_uos.id or False,
+            'location_id': source_location_id,
+            'location_dest_id': destination_location_id,
+            'move_dest_id': production.move_prod_id.id,
+            'state': 'waiting',
+            'company_id': production.company_id.id,
+            'pts_id': production.pts_id and production.pts_id.id or False,
+        }
+        move_id = stock_move.create(cr, uid, data, context=context)
+        production.write({'move_created_ids': [(6, 0, [move_id])]}, context=context)
+        return move_id
+
+    def _make_production_consume_line(self, cr, uid, production_line, parent_move_id, source_location_id=False, context=None):
+        stock_move = self.pool.get('stock.move')
+        production = production_line.production_id
+        # Internal shipment is created for Stockable and Consumer Products
+        if production_line.product_id.type not in ('product', 'consu'):
+            return False
+        destination_location_id = production.product_id.property_stock_production.id
+        if not source_location_id:
+            source_location_id = production.location_src_id.id
+        move_id = stock_move.create(cr, uid, {
+            'name': production.name,
+            'date': production.date_planned,
+            'product_id': production_line.product_id.id,
+            'product_qty': production_line.product_qty,
+            'product_uom': production_line.product_uom.id,
+            'product_uos_qty': production_line.product_uos and production_line.product_uos_qty or False,
+            'product_uos': production_line.product_uos and production_line.product_uos.id or False,
+            'location_id': source_location_id,
+            'location_dest_id': destination_location_id,
+            'move_dest_id': parent_move_id,
+            'state': 'waiting',
+            'company_id': production.company_id.id,
+            'pts_id': production.pts_id and production.pts_id.id or False,
+        })
+        production.write({'move_lines': [(4, move_id)]}, context=context)
+        return move_id
+    
+mrp_production()
+
+
+class procurement_order(osv.osv):
+    _inherit = 'procurement.order'
+
+    _columns = {
+        'pts_id':  fields.many2one('delivery.time', 'Preparation Time', select=True, domain=[('type', '=', 'pts')]),
+        'message': fields.char(_('Latest error'), size=2048, help="Exception occurred while computing procurement orders."),
+    }
+
+    def make_mo(self, cr, uid, ids, context=None):
+        """ Make Manufacturing(production) order from procurement
+        @return: New created Production Orders procurement wise 
+        """
+        res = {}
+        company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
+        production_obj = self.pool.get('mrp.production')
+        move_obj = self.pool.get('stock.move')
+        wf_service = netsvc.LocalService("workflow")
+        procurement_obj = self.pool.get('procurement.order')
+        for procurement in procurement_obj.browse(cr, uid, ids, context=context):
+            res_id = procurement.move_id.id
+            newdate = datetime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S') - relativedelta(days=procurement.product_id.produce_delay or 0.0)
+            newdate = newdate - relativedelta(days=company.manufacturing_lead)
+            produce_id = production_obj.create(cr, uid, {
+                'origin': procurement.origin,
+                'product_id': procurement.product_id.id,
+                'product_qty': procurement.product_qty,
+                'product_uom': procurement.product_uom.id,
+                'product_uos_qty': procurement.product_uos and procurement.product_uos_qty or False,
+                'product_uos': procurement.product_uos and procurement.product_uos.id or False,
+                'location_src_id': procurement.location_id.id,
+                'location_dest_id': procurement.location_id.id,
+                'bom_id': procurement.bom_id and procurement.bom_id.id or False,
+                'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'),
+                'move_prod_id': res_id,
+                'company_id': procurement.company_id.id,
+                'pts_id': procurement.pts_id and procurement.pts_id.id or context and context.get('force_pts_id', False) or False,
+            })
+            
+            res[procurement.id] = produce_id
+            self.write(cr, uid, [procurement.id], {'state': 'running', 'production_id': produce_id})   
+            bom_result = production_obj.action_compute(cr, uid,
+                    [produce_id], properties=[x.id for x in procurement.property_ids])
+            wf_service.trg_validate(uid, 'mrp.production', produce_id, 'button_confirm', cr)
+            if res_id:
+                move_obj.write(cr, uid, [res_id], {'location_id': procurement.location_id.id})
+        self.production_order_create_note(cr, uid, ids, context=context)
+        return res
+
+procurement_order()
+
+
+class delivery_time(osv.osv):
+    _inherit = 'delivery.time'
+    
+    def search(self, cr, uid, args, offset=0, limit=None, order='name', context=None, count=False):
+        # now = datetime.now()
+        # args.append(('name','>=',datetime.strftime(now,'%y%m%d')))
+        return super(delivery_time, self).search(cr, uid, args, offset=offset, limit=limit, order=order, context=context, count=count)
+
+delivery_time()
+
+
+class delivery_return_type(osv.osv):
+    _name = 'delivery.return.type'
+    
+    _columns = {
+        'name': fields.char('Name', size=64, required=True, select=True),
+        'sequence': fields.integer('Sequence'),
+    }
+    _order = 'sequence'
+delivery_return_type()
+    
+
+class delivery_return_reason(osv.osv):
+    _name = 'delivery.return.reason'
+    
+    _columns = {
+        'type': fields.many2one('delivery.return.type', 'Type', required=True),
+        'reason': fields.char('Name', size=1024, required=False),
+        'route_line_id': fields.many2one('delivery.route.line', 'Delivery Route Line'),
+    }
+delivery_return_reason()
+
+
+class delivery_route(osv.osv):
+    _inherit = 'delivery.route'
+    
+    def _auto_init(self, cr, context=None):
+        super(delivery_route, self)._auto_init(cr, context=context)
+        cr.execute("SELECT table_name FROM information_schema.tables WHERE table_name = 'delivery_scheduler_running'")
+        if not cr.fetchone():
+            cr.execute('CREATE TABLE delivery_scheduler_running (running boolean)')
+            cr.commit()
+            cr.execute('INSERT INTO delivery_scheduler_running (running) VALUES (FALSE)')
+    
+    def set_confirm_cs(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'confirm_cs': True}, context=context)
+        return True
+    
+delivery_route()
+
+    
+class delivery_route_line(osv.osv):
+    _inherit = 'delivery.route.line'
+    
+    def search(self, cr, uid, args, offset=0, limit=None, order='dts_name', context=None, count=False):
+        context = context or {}
+        new_order = context.get('sorting', order)
+        return super(delivery_route_line, self).search(cr, uid, args, offset=offset, limit=limit, order=new_order, context=context, count=count)
+    
+    def set_not_vip(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'vip':False})
+
+    def set_vip(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'vip':True})
+    
+    def write(self, cr, uid, ids, vals, context=None):
+        if type(ids) != type([]):
+            ids = [ids]
+        context = context or {}
+        if ('route_id' in vals or 'color' in vals or 'sequence' in vals) and not 'force_update' in context:
+            for line in self.browse(cr, uid, ids):
+                if line.state == 'draft':
+                    current_dts = context.get('force_dts_id_kanban', False) or False
+                    # if current_dts:
+                    #    vals.update({'dts_id':current_dts})
+                    if 'route_id' in vals and vals['route_id']:
+                        route_state = self.pool.get('delivery.route').read(cr, uid, [vals['route_id']], ['state', 'name'])
+                        if route_state[0]['state'] != 'draft': 
+                            print('The Route %s is confirmed, you can not add lines to it.' % (route_state[0]['name']))
+                            raise osv.except_osv(_('Error'), _('The Route %s is confirmed, you can not add lines to it.' % (route_state[0]['name'])))
+                        
+                        elif 'update_color' in context and context['update_color'] == 1:
+                            current_color = str(line.color)
+                            cr.execute("SELECT color FROM (select count(*) as cpt, color as color from delivery_route_line WHERE route_id=" + str(vals['route_id']) + " AND color != " + current_color + " AND color IS NOT null AND color > 0 GROUP BY color) t ORDER BY cpt DESC")
+                            color = cr.fetchone()
+                            if color and color[0]:
+                                vals.update({'color':color[0]})
+                            
+                            elif current_dts:
+                                cr.execute("SELECT DISTINCT color FROM delivery_route_line WHERE (dts_id=" + str(current_dts) + " OR id = " + str(line.id) + ") AND color IS NOT null AND color > 0")
+                                colors = map(lambda x: x[0], cr.fetchall())
+                                color = False
+                                
+                                for idx in range(1, 22):
+                                    if idx not in colors and not color and idx != current_color:
+                                        color = idx
+                                if color:
+                                    vals.update({'color':color})
+                                else:
+                                    print('No more Route available for the DTS %s.' % (line.dts_id.name))
+                                    raise osv.except_osv(_('Error'), _('No more Route available for the DTS %s.' % (line.dts_id.name)))
+                    
+                    elif 'check4color' in context and context['check4color'] and 'color' in vals:
+                        cr.execute("SELECT DISTINCT route_id FROM delivery_route_line WHERE dts_id=" + str(line.dts_id.id) + " AND color = " + str(vals['color']) + " AND color > 0 AND state not in ('draft','cancel')")
+                        route_line_ids = map(lambda x: x[0], cr.fetchall())
+                        if route_line_ids:
+                            print('The Route Line %s (origin: %s) can not be put in a confirmed Route (%s).' % (line.picking_id.name, line.picking_id.origin, route_line_ids))
+                            raise osv.except_osv(_('Error'), _('The Route Line %s (origin: %s) can not be put in a confirmed Route (%s).' % (line.picking_id.name, line.picking_id.origin, route_line_ids)))
+                else:
+                    print('The Route Line %s (origin: %s) is confirmed. You can not change it.' % (line.picking_id.name, line.picking_id.origin))
+                    raise osv.except_osv(_('Error'), _('The Route Line %s (origin: %s) is confirmed. You can not change it.' % (line.picking_id.name, line.picking_id.origin)))
+        return super(delivery_route_line, self).write(cr, uid, ids, vals, context=context)
+    
+    
+    def set_van(self, cr, uid, ids, van=0, context=None):
+        self.write(cr, uid, ids, {'color': van}, context=context)
+        return True
+    def set_van_0(self, cr, uid, ids, context=None):
+        return self.set_van(cr, uid, ids, 0, context)
+    def set_van_1(self, cr, uid, ids, context=None):
+        return self.set_van(cr, uid, ids, 1, context)
+    def set_van_2(self, cr, uid, ids, context=None):
+        return self.set_van(cr, uid, ids, 2, context)
+    def set_van_3(self, cr, uid, ids, context=None):
+        return self.set_van(cr, uid, ids, 3, context)
+    def set_van_4(self, cr, uid, ids, context=None):
+        return self.set_van(cr, uid, ids, 4, context)
+    def set_van_5(self, cr, uid, ids, context=None):
+        return self.set_van(cr, uid, ids, 5, context)
+    def set_van_6(self, cr, uid, ids, context=None):
+        return self.set_van(cr, uid, ids, 6, context)
+    def set_van_7(self, cr, uid, ids, context=None):
+        return self.set_van(cr, uid, ids, 7, context)
+    def set_van_8(self, cr, uid, ids, context=None):
+        return self.set_van(cr, uid, ids, 8, context)
+    def set_van_9(self, cr, uid, ids, context=None):
+        return self.set_van(cr, uid, ids, 9, context)
+    
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
+        context = context or {}
+        if 'view_name' in context and view_type == 'kanban':
+            view_ids = self.pool.get('ir.ui.view').search(cr, uid, [('model', '=', 'delivery.route.line'), ('name', '=', context['view_name'])], context=context)
+            if view_ids:
+                view_id = view_ids[0]
+                del context['view_name']
+        return super(delivery_route_line, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
+    
+    
+    def _get_neighborhood(self, cr, uid, ids, fields, args, context=None):
+        res = {}
+        for route in self.browse(cr, uid, ids):
+            # res[route.id] = route.picking_id and route.picking_id.sale_id and route.picking_id.sale_id.deliver_zone or route.picking_id and route.picking_id.partner_id and route.picking_id.partner_id.vm_district or False
+            res[route.id] = route.picking_id and route.picking_id.partner_id and route.picking_id.partner_id.deliver_zone or False
+        return res
+    
+    def _get_dts_id(self, cr, uid, ids, fields, args, context=None):
+        context = context or {}
+        res = {}
+        for route in self.browse(cr, uid, ids):
+            if route.state in ['draft'] and context.get('set_dts', True):
+                res[route.id] = route.picking_id and route.picking_id.pts_id and route.picking_id.pts_id.dts_id and route.picking_id.pts_id.dts_id.id or False
+            else:
+                res[route.id] = route.dts_id and route.dts_id.id or False
+        return res
+    
+    def _get_dts_name(self, cr, uid, ids, fields, args, context=None):
+        context = context or {}
+        res = {}
+        for route in self.browse(cr, uid, ids):
+            if route.state in ['draft'] and context.get('set_dts', True):
+                res[route.id] = route.picking_id and route.picking_id.pts_id and route.picking_id.pts_id.dts_id and route.picking_id.pts_id.dts_id.name or 'n/a'
+            else:
+                res[route.id] = route.dts_name or 'n/a'
+        return res
+    
+    def _get_special_time(self, cr, uid, ids, fields, args, context=None):
+        tz = pytz.timezone('Asia/Shanghai')
+        result = {}
+        for route in self.browse(cr, uid, ids):
+            res = {}
+            customer_date = ''
+            route_dts_id = route.dts_id and route.dts_id.id
+            so_dts_id    = route.picking_id.sale_id.dts_id and route.picking_id.sale_id.dts_id.id
+            
+            if so_dts_id and route_dts_id != so_dts_id:
+                customer_date = route.picking_id.sale_id.dts_id.name
+            
+            elif route.picking_id.sale_id:
+                date_start = route.picking_id.sale_id.start_date or False
+                date_end = route.picking_id.sale_id.end_date or False
+                
+                if date_start:
+                    date_start = datetime.strptime(date_start, '%Y-%m-%d %H:%M:%S')            
+                    date_start = pytz.utc.localize(date_start).astimezone(tz)
+                    
+                    customer_date = datetime.strftime(date_start, '%H:%M')
+                    #LY if customer_date is 00:00, no special time. 
+                    if customer_date != '00:00':    
+                        if date_end:
+                            date_end = datetime.strptime(date_end, '%Y-%m-%d %H:%M:%S')            
+                            date_end = pytz.utc.localize(date_end).astimezone(tz)
+                            customer_date += ' - '
+                            customer_date += datetime.strftime(date_end, '%H:%M')
+            res['customer_date'] = customer_date or ' '
+            result[route.id] = res
+        return result
+    
+    def _get_street(self, cr, uid, ids, fields, args, context=None):
+        res = {}
+        for route in self.browse(cr, uid, ids):
+            res[route.id] = route.picking_id and route.picking_id.partner_id and route.picking_id.partner_id.street or ' n/a'
+        return res
+    
+    def _route_to_update_after_picking_change(self, cr, uid, ids, fields=None, arg=None, context=None):
+        if type(ids) != type([]):
+            ids = [ids]
+        return self.pool.get('delivery.route.line').search(cr, uid, [('picking_id', 'in', ids)]) or []
+    
+    def _route_to_update_after_dts_change(self, cr, uid, ids, fields=None, arg=None, context=None):
+        if type(ids) != type([]):
+            ids = [ids]
+        picking_ids = self.pool.get('stock.picking').search(cr, uid, [('dts_id', 'in', ids)]) or []
+        return self.pool.get('delivery.route.line')._route_to_update_after_picking_change(cr, uid, picking_ids, None, None, context=context)
+    
+    def _route_to_update_after_so_change(self, cr, uid, ids, fields=None, arg=None, context=None):
+        if type(ids) != type([]):
+            ids = [ids]
+        return self.pool.get('delivery.route.line').search(cr, uid, [('sale_order_id', 'in', ids)]) or []
+    
+    def _route_to_update_after_po_change(self, cr, uid, ids, fields=None, arg=None, context=None):
+        if type(ids) != type([]):
+            ids = [ids]
+        return self.pool.get('delivery.route.line').search(cr, uid, [('purchase_id', 'in', ids)]) or []
+    
+    def _route_to_update_after_partner_change(self, cr, uid, ids, fields=None, arg=None, context=None):
+        if type(ids) != type([]):
+            ids = [ids]
+        picking_ids = self.pool.get('stock.picking').search(cr, uid, [('partner_id', 'in', ids)]) or []
+        return self.pool.get('delivery.route.line')._route_to_update_after_picking_change(cr, uid, picking_ids, None, None, context=context)
+    
+    _store_dts = {
+        'delivery.route.line': (lambda self, cr, uid, ids, context: ids, ['picking_id'], 10),
+        'stock.picking': (_route_to_update_after_picking_change, ['pts_id'], 10),
+    }
+    _store_dts_name = {
+        'delivery.route.line': (lambda self, cr, uid, ids, context: ids, ['picking_id'], 10),
+        'stock.picking': (_route_to_update_after_picking_change, ['pts_id'], 10),
+        'delivery.time': (_route_to_update_after_dts_change, ['name'], 10),
+    }
+    _store_special_time = {
+        'delivery.route.line': (lambda self, cr, uid, ids, context: ids, ['picking_id'], 12),
+        'stock.picking': (_route_to_update_after_picking_change, ['sale_id','dts_id'], 12),
+        'sale.order': (_route_to_update_after_so_change, ['dts_id'], 12),
+    }
+    _store_neighborhood = {
+        'delivery.route.line': (lambda self, cr, uid, ids, context: ids, ['picking_id'], 10),
+        'stock.picking': (_route_to_update_after_picking_change, ['partner_id'], 10),
+        'res.partner': (_route_to_update_after_partner_change, ['vm_district'], 10),
+    }
+    
+    _store_amount = {
+        'delivery.route.line': (lambda self, cr, uid, ids, context: ids, ['picking_id', 'adjustment'], 10),
+        'stock.picking': (_route_to_update_after_picking_change, ['sale_id', 'purchase_id', 'origin'], 10),
+        'purchase.order': (_route_to_update_after_po_change, ['amount_total'], 10),
+    }
+    
+    _store_street = {
+        'delivery.route.line': (lambda self,cr,uid,ids,context: ids,['picking_id'],10), 
+        'stock.picking': (_route_to_update_after_picking_change, ['partner_id'], 10),
+    }
+    
+    def _get_amount(self, cr, uid, ids, fields, args, context=None):
+        result = {}
+        for route in self.browse(cr, uid, ids):
+            res = {}
+            res['amount_total'] = 0.0
+            res['amount_unpaid'] = 0.0
+            res['to_be_received'] = 0.0
+            
+            if route.picking_id and route.picking_id.sale_id:
+                res['amount_total'] = route.picking_id.sale_id.amount_total
+                res['amount_unpaid'] = res['amount_total']
+                res['to_be_received'] = res['amount_unpaid'] + route.adjustment
+            elif route.picking_id and route.picking_id.purchase_id:
+                res['amount_total'] = route.picking_id.purchase_id.amount_total
+                res['amount_unpaid'] = 0.0
+                res['to_be_received'] = res['amount_unpaid'] + route.adjustment
+            result[route.id] = res
+        return result
+    
+    _columns = {
+        'dts_id': fields.function(_get_dts_id, type='many2one', obj='delivery.time', store=_store_dts, string='Delivery Time', _classic_read=True),
+        'dts_name': fields.function(_get_dts_name, type='char', size=124, store=_store_dts_name, string='Delivery Time'),
+        'return_reasons': fields.one2many('delivery.return.reason', 'route_line_id', 'Return Reasons', readonly=False),
+        'delivered_cpt': fields.related('picking_id', 'delivered_cpt', type='integer', string='Delivered x times', readonly=True),
+        'customer_date': fields.function(_get_special_time, type='char', size=64, store=_store_special_time, multi="special_time", string=_('Customer Delivery Time')),
+        'neighborhood': fields.function(_get_neighborhood, type='char', size=255, store=_store_neighborhood, string=_('Neighborhood')),
+        'street': fields.function(_get_street, type='char', size=128, store=_store_street, string='Street'),
+        'vip': fields.boolean('is VIP ?'),
+        'amount_total':  fields.function(_get_amount, type='float', multi="amount", store=_store_amount, string='Total'),
+        'amount_unpaid': fields.function(_get_amount, type='float', multi="amount", store=_store_amount, string='Unpaid'),
+        'adjustment': fields.float('Adjustment'),
+        'cs_remark': fields.text('CS Remark'),
+        'to_be_received': fields.function(_get_amount, type='float', multi="amount", store=_store_amount, string='To be Received'),
+        'amount_received': fields.float('Received'),
+        'account_checked': fields.boolean('Checked'),
+        'account_remark': fields.text('Remark Accounting'),
+    }
+delivery_route_line()
+
+
+class res_users(osv.osv):
+    _inherit = 'res.users'
+    
+    _columns = {
+        'dts_id': fields.many2one('delivery.time', 'Last Used Delivery Time'),
+    }
+res_users()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'delivery_plan/security'
=== added file 'delivery_plan/security/ir.model.access.csv'
--- delivery_plan/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ delivery_plan/security/ir.model.access.csv	2013-09-09 08:37:27 +0000
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_delivery_return_reason_fc,delivery.return.reason.fc,delivery_plan.model_delivery_return_reason,delivery_routes.group_delivery_user,1,1,1,1
+access_delivery_return_reason_cs,delivery.return.reason.cs,delivery_plan.model_delivery_return_reason,delivery_routes.group_customer_service_user,1,1,0,0

=== added file 'delivery_plan/sequence.xml'
--- delivery_plan/sequence.xml	1970-01-01 00:00:00 +0000
+++ delivery_plan/sequence.xml	2013-09-09 08:37:27 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <!-- Sequences for sale.order -->
+        <record id="seq_type_picking_batch" model="ir.sequence.type">
+            <field name="name">Picking Batch</field>
+            <field name="code">picking.batch</field>
+        </record>
+
+        <record id="seq_picking_batch" model="ir.sequence">
+            <field name="name">Picking Batch</field>
+            <field name="code">picking.batch</field>
+            <field name="prefix">PB%(year)s%(month)s%(day)s</field>
+            <field name="padding">3</field>
+            <field name="company_id" eval="False"/>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file

=== added directory 'delivery_plan/static'
=== added directory 'delivery_plan/static/description'
=== added file 'delivery_plan/static/description/delivery_plan1.png'
Binary files delivery_plan/static/description/delivery_plan1.png	1970-01-01 00:00:00 +0000 and delivery_plan/static/description/delivery_plan1.png	2013-09-09 08:37:27 +0000 differ
=== added file 'delivery_plan/static/description/delivery_plan2.png'
Binary files delivery_plan/static/description/delivery_plan2.png	1970-01-01 00:00:00 +0000 and delivery_plan/static/description/delivery_plan2.png	2013-09-09 08:37:27 +0000 differ
=== added file 'delivery_plan/static/description/delivery_plan3.png'
Binary files delivery_plan/static/description/delivery_plan3.png	1970-01-01 00:00:00 +0000 and delivery_plan/static/description/delivery_plan3.png	2013-09-09 08:37:27 +0000 differ
=== added file 'delivery_plan/static/description/delivery_plan4.png'
Binary files delivery_plan/static/description/delivery_plan4.png	1970-01-01 00:00:00 +0000 and delivery_plan/static/description/delivery_plan4.png	2013-09-09 08:37:27 +0000 differ
=== added file 'delivery_plan/static/description/index.html'
--- delivery_plan/static/description/index.html	1970-01-01 00:00:00 +0000
+++ delivery_plan/static/description/index.html	2013-09-09 08:37:27 +0000
@@ -0,0 +1,40 @@
+    <section class="oe_container oe_website_only">
+
+        <div class="oe_row oe_more_spaced">
+            <h2 class="oe_slogan">delivery_plan Module</h2> 
+            <h3 class="oe_slogan">Add and Edit Details of Delivery</h3>
+            <h4 class="oe_slogan"><a href="http://www.openerp.com.cn">By Elico Corp</a></h4>            
+            <div class="oe_span6">
+					<p>This modules adds the 2 new fields to the purchase and sales orders which are: Start Delivery Date and End Delivery Date.<br> Users will be able to edit delivery details with this module.</p>
+					<div class="oe_span6">
+                <img class="oe_picture" src="delivery_plan1.png">
+            	</div>
+				</div>
+            <div class="oe_span6">
+                <p>Features:</p> － Automatically assign Purchase / Sales Orders a Preparation Time Slot and  Delivery Time Slot to match Start and End Delivery Date<br> － Edit Delivery Time Slot and Assigned Transport and its Drivers for Orders<br> － Kanban View of All Deliveries categorized by Delivery Time Slot and Assigned Transport<br> － Input reason for returned goods<br> － Easier Confirmation for Delivery before Departure by Customer Service<br> － Adjust of payments of the received by Customers<br> － Input notes for special services for customers during delivery 
+            </div>
+        </div>
+        <div class="oe_span4 oe_centered">
+            <h3>Prepare Vans for DTS</h3>
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture" src="delivery_plan2.png">
+            </div>
+        </div>
+         <div class="oe_span4 oe_centered">
+            <h3>Prepare Routes for DTS</h3>
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture" src="delivery_plan3.png">
+            </div>
+        </div>
+         <div class="oe_span4 oe_centered">
+            <h3>Choose Driver for DTS</h3>
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture" src="delivery_plan4.png">
+            </div>
+        </div>
+        <div class="oe_row oe_centeralign oe_more_space" style="clear:both;">
+            <a href="http://www.elico-corp.com" class="oe_button oe_big"> Start your <span class="oe_emph">free</span> trial</a>
+        </div>
+        <h4 class="oe_slogan">or</h4> 
+
+</section>  
\ No newline at end of file

=== added file 'delivery_plan/stock_view.xml'
--- delivery_plan/stock_view.xml	1970-01-01 00:00:00 +0000
+++ delivery_plan/stock_view.xml	2013-09-09 08:37:27 +0000
@@ -0,0 +1,694 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+		<record id="procurement_form_view_pts_elico" model="ir.ui.view">
+			<field name="name">procurement_form_view_pts_elico</field>
+			<field name="model">procurement.order</field>
+			<field name="inherit_id" ref="procurement.procurement_form_view" />
+			<field name="arch" type="xml">
+				<xpath expr="//field[@name='origin']" position="after">
+				    <field name="pts_id" attrs="{'readonly': [('state','!=','draft')]}" domain="[('type','=','pts'),('active','=',True)]"/>
+				</xpath>
+			</field>
+		</record>
+		<record id="procurement_tree_view_pts_elico" model="ir.ui.view">
+			<field name="name">procurement_tree_view_pts_elico</field>
+			<field name="model">procurement.order</field>
+			<field name="inherit_id" ref="procurement.procurement_tree_view" />
+			<field name="arch" type="xml">
+				<xpath expr="//field[@name='origin']" position="before">
+				    <field name="pts_id" domain="[('type','=','pts')]"/>
+				</xpath>
+			</field>
+		</record>
+		
+		<record id="mrp_production_search_view_pts_elico" model="ir.ui.view">
+			<field name="name">mrp_production_search_view_pts_elico</field>
+			<field name="model">mrp.production</field>
+			<field name="inherit_id" ref="mrp.view_mrp_production_filter" />
+			<field name="arch" type="xml">
+				<xpath expr="//field[@string='Production']" position="after">
+                    <field name="pts_id" context="{'domain':[('type','=','pts')]}"/>
+                </xpath>
+                <xpath expr="//filter[@string='Date']" position="after">
+                    <filter string="Preparation Time" icon="terp-folder-orange" domain="[]" context="{'group_by':'pts_id'}"/>
+                </xpath>
+			</field>
+		</record>
+		<record id="mrp_production_form_view_pts_elico" model="ir.ui.view">
+			<field name="name">mrp_production_form_view_pts_elico</field>
+			<field name="model">mrp.production</field>
+			<field name="inherit_id" ref="mrp.mrp_production_form_view" />
+			<field name="arch" type="xml">
+				<xpath expr="//field[@name='date_planned']" position="after">
+				    <field name="pts_id" readonly="1" domain="[('type','=','pts'),('active','=',True)]"/>
+				</xpath>
+			</field>
+		</record>
+		<record id="mrp_production_tree_view_pts_elico" model="ir.ui.view">
+			<field name="name">mrp_production_tree_view_pts_elico</field>
+			<field name="model">mrp.production</field>
+			<field name="inherit_id" ref="mrp.mrp_production_tree_view" />
+			<field name="arch" type="xml">
+				<xpath expr="//field[@name='date_planned']" position="after">
+				    <field name="pts_id" domain="[('type','=','pts')]"/>
+				</xpath>
+			</field>
+		</record>
+		
+        <record id="view_picking_out_pts_form_elico" model="ir.ui.view">
+            <field name="name">stock.picking.out.form_pts_elico</field>
+            <field name="model">stock.picking.out</field>
+            <field name="inherit_id" ref="stock.view_picking_out_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='partner_id']" position="after">
+                    <field name="dts_id" readonly="1"/>
+                    <field name="pts_id" on_change="pts_id_change(pts_id, context)" attrs="{'readonly': [('state','in',['cancel','done'])]}" domain="[('type','=','pts'),('active','=',True)]"/>
+                    <field name="sale_id"/>
+                </xpath>
+            </field>
+        </record>
+        
+        <record id="view_picking_out_pts_tree_elico" model="ir.ui.view">
+            <field name="name">stock.picking.out.tree_pts_elico</field>
+            <field name="model">stock.picking.out</field>
+            <field name="inherit_id" ref="stock.view_picking_out_tree"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='partner_id']" position="after">
+                    <field name="dts_id" domain="[('type','=','dts')]"/>
+                    <field name="pts_id" domain="[('type','=','pts')]"/>
+                </xpath>
+            </field>
+        </record>
+        <record id="view_picking_pts_form_elico" model="ir.ui.view">
+            <field name="name">stock.picking.form_pts_elico</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.view_picking_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='partner_id']" position="after">
+                    <field name="dts_id" readonly="1"/>
+                    <field name="pts_id" on_change="pts_id_change(pts_id, context)" attrs="{'readonly': [('state','in',['cancel','done'])]}" domain="[('type','=','pts'),('active','=',True)]"/>
+               </xpath>
+            </field>
+        </record>
+        <record id="view_picking_pts_tree_elico" model="ir.ui.view">
+            <field name="name">stock.picking.tree_pts_elico</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.vpicktree"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='min_date']" position="after">
+                    <field name="dts_id" domain="[('type','=','dts')]"/>
+                    <field name="pts_id" domain="[('type','=','pts')]"/>
+                </xpath>
+            </field>
+        </record>
+        <record id="view_picking_in_pts_form_elico" model="ir.ui.view">
+            <field name="name">stock.picking.in.form_pts_elico</field>
+            <field name="model">stock.picking.in</field>
+            <field name="inherit_id" ref="stock.view_picking_in_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='partner_id']" position="after">
+                    <field name="dts_id" domain="[('type','=','dts'),('active','=',True)]" attrs="{'readonly': [('state','in',['cancel','done'])]}"/>
+                    <field name="pts_id" invisible="1" on_change="pts_id_change(pts_id, context)" attrs="{'readonly': [('state','in',['cancel','done'])]}" domain="[('type','=','pts'),('active','=',True)]"/>
+                </xpath>
+            </field>
+        </record>
+        <record id="view_picking_in_pts_tree_elico" model="ir.ui.view">
+            <field name="name">stock.picking.in.tree_pts_elico</field>
+            <field name="model">stock.picking.in</field>
+            <field name="inherit_id" ref="stock.view_picking_in_tree"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='partner_id']" position="after">
+                    <field name="dts_id" domain="[('type','=','dts')]"/>
+                    <!--field name="pts_id" invisible="1"/-->
+                </xpath>
+            </field>
+        </record>
+        
+        <record id="view_order_pts_form_elico" model="ir.ui.view">
+            <field name="name">sale.order.form_pts_elico</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_order_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='date_order']" position="after">
+                    <field name="dts_id" domain="[('type','=','dts')]"/>
+                    <field name="pts_id" domain="[('type','=','pts')]"/>
+                    <field name="start_date" />
+                    <field name="end_date" />
+                    <field name="so_payment_method"/>
+                </xpath>
+            </field>
+        </record>
+        <record id="view_order_pts_tree_elico" model="ir.ui.view">
+            <field name="name">sale.order.tree_pts_elico</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_order_tree"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='date_order']" position="after">
+                    <field name="dts_id" domain="[('type','=','dts')]"/>
+                    <field name="pts_id" domain="[('type','=','pts')]"/>
+                </xpath>
+            </field>
+        </record>
+        <record id="view_quotation_pts_tree_elico" model="ir.ui.view">
+            <field name="name">sale.quotation.tree_pts_elico</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_quotation_tree"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='date_order']" position="after">
+                    <field name="dts_id" invisible="1"/>
+                    <field name="pts_id" invisible="1"/>
+                </xpath>
+            </field>
+        </record>
+        <record id="view_order_pts_search_elico" model="ir.ui.view">
+            <field name="name">sale.order.search_pts_elico</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_sales_order_filter"/>
+            <field name="arch" type="xml">
+				<xpath expr="/search/group/filter[@string='Order Date']" position="after">
+                    <field name="pts_id" context="{'domain':[('type','=','pts')]}"/>
+                    <field name="dts_id" context="{'domain':[('type','=','dts')]}"/>
+                    <filter string="Preparation Time" icon="terp-folder-orange" domain="[]" context="{'group_by':'pts_id'}"/>
+                    <filter string="Delivery Time" icon="terp-folder-orange" domain="[]" context="{'group_by':'dts_id'}"/>
+                </xpath>
+            </field>
+        </record>
+        
+        <!-- Delivery Picking Tree -->
+        <record id="delivery_picking_tree" model="ir.ui.view">
+            <field name="name">stock.picking.tree</field>
+            <field name="model">stock.picking</field>
+            <field name="arch" type="xml">
+                <tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and min_date &lt; current_date" string="Picking list">
+                    <field name="name"/>
+                    <field name="origin"/>
+                    <field name="partner_id"/>
+                    <field name="street"/>
+                    <field name="pts_id" invisible="1"/>
+                    <field name="purchase_id" invisible="1"/>
+                    <field name="sale_id" invisible="1"/>
+                    <field name="dts_id"/>
+                    <field name="min_date"/>
+                    <field name="type"/>
+                    <field name="state"/>
+                    <field name="delivery_state"/>
+                    <button name="%(delivery_routes.action_picking_get_order)d"
+                       string="Related Order" type="action"
+                       icon="terp-mail-forward"
+                       attrs="{'invisible': [('purchase_id','=',None),('sale_id','=',None)]}"
+                       groups="base.group_user"/>
+                </tree>
+            </field>
+        </record>
+
+        <!-- Delivery Picking Search -->
+        <record id="view_picking_internal_search_extend" model="ir.ui.view">
+            <field name="name">stock.picking.internal.search.extend</field>
+            <field name="model">stock.picking</field>
+            <field name="arch" type="xml">
+                <search string="Internal Picking List">
+                    <field name="name" string="Internal Picking List" filter_domain="['|',('name','ilike', self),('origin','ilike',self)]"/>
+                    <filter icon="terp-go-today" name="for_past" string="Past" domain="[('min_date','&lt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for the Past"/>
+                    <filter icon="terp-go-today" name="for_today" string="Today" domain="[('min_date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('min_date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for Today"/>
+                    <filter icon="terp-go-today" name="for_future" string="Future" domain="[('min_date','&gt;=',time.strftime('%%Y-%%m-%%d 23:59:59'))]" help="Orders planned for the Future"/>
+                    <separator/>
+                    <filter icon="terp-check" name="not_planned" string="Not Planned" domain="[('delivery_state','=','not_planned')]"/>
+                    <filter icon="terp-check" name="delivery" string="In delivery" domain="[('delivery_state','=',['del_rt','in_del','in_del','in_del','planned'])]"/>
+                    <filter icon="terp-check" name="delivered" string="Delivered" domain="[('delivery_state','=',['del_ok','del_ex','del_rt_exp'])]"/>
+                    <separator/>
+                    <filter icon="terp-check" name="available" string="Ready" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
+                    <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves"/>
+                    <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Picking already processed"/>
+                    <filter icon="terp-dialog-close" name="no_batch" string="No batch" domain="[('batch_id','=',None)]" help="Picking without batch"/>
+                    <field name="partner_id"/>
+                    <field name="batch_id"/>
+                    <field name="product_id"/>
+                    <field name="origin"/>
+                    <field name="stock_journal_id"/>
+                    <field name="pts_id" context="{'domain':[('type','=','pts')]}"/>
+                    <field name="dts_id" context="{'domain':[('type','=','dts')]}"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
+                        <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
+                        <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
+                        <filter string="Batch" domain="[]" context="{'group_by':'batch_id'}"/>
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}"/>
+                        <filter string="Preparation Time" icon="terp-folder-orange" domain="[]" context="{'group_by':'pts_id'}"/>
+                        <filter string="Delivery Time" icon="terp-folder-orange" domain="[]" context="{'group_by':'dts_id'}"/>
+                        <filter string="Delivery State" icon="terp-folder-orange" domain="[]" context="{'group_by':'delivery_state'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="delivery_routes.action_delivery_routes_picking" model="ir.actions.act_window">
+            <field name="name">Delivery Pickings</field>
+            <field name="res_model">stock.picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="delivery_picking_tree"/>
+            <field name="view_mode">tree,form,calendar</field>
+            <field name="domain">[('type','in',['out','in']),('return','=','none'),('state','!=','cancel')]</field>
+            <field name="context">{'default_type': 'out', 'search_default_for_today':1, 'contact_display': 'partner_address'}</field>
+            <field name="search_view_id" ref="view_picking_internal_search_extend"/>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create"> 
+              </p><p>
+                Pack selected delivery notes
+              </p>
+            </field>
+        </record>
+
+        <!-- picking batch Form view -->
+        <record id="picking_batch_view" model="ir.ui.view">
+            <field name="name">picking.batch.form</field>
+            <field name="model">picking.batch</field>
+            <field name="type">form</field>  
+            <field name="arch" type="xml">
+                <form string="Picking Batch" version="7.0">
+                    <group>
+                        <field name="name"/>
+                        <field name="active"/>
+                    </group>
+                    <field name="picking_ids"/>
+                </form>
+            </field>
+        </record>
+
+        <!-- picking batch Tree view -->
+        <record id="picking_batch_tree_view" model="ir.ui.view">
+            <field name="name">picking.batch.tree</field>
+            <field name="model">picking.batch</field>
+            <field name="arch" type="xml">
+                <tree string="Picking Batch">
+                    <field name="name"/>
+                </tree>
+            </field>
+        </record>
+
+        <!-- picking batch action -->
+        <record id="action_picking_batch" model="ir.actions.act_window">
+            <field name="name">Picking Batch</field>
+            <field name="res_model">picking.batch</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>        
+        
+        <!-- Delivery route kanban view -->
+        <record model="ir.ui.view" id="delivery_routes.delivery_route_line_kanban_view">
+            <field name="name">delivery.route.line.kanban</field>
+            <field name="model">delivery.route.line</field>
+            <field name="arch" type="xml">
+                <kanban version="7.0" default_group_by="route_id" quick_creatable="false">
+                    <field name="dts_id"/>
+                    <field name="picking_id"/>
+                    <field name="route_id"/>
+                    <field name="address_id"/>
+                    <field name="customer_date"/>
+                    <field name="street"/>
+                    <field name="note"/>
+                    <field name="vip"/>
+                    <field name="sequence"/>
+                    <field name="color"/>
+                    <field name="state"/>
+                    <templates>
+                    <t t-name="kanban-box">                        
+                        <div t-if="record.state.raw_value != 'draft'" t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click not_dragable">
+                            <div class="oe_kanban_content">
+                                <div>
+                                    <b><field name="origin"/></b> (<field name="delivered_cpt"/>)
+                                    <a t-if="record.vip.raw_value == 1" type="object" name="set_not_vip" class="oe_e oe_star_on">7</a>
+                                    <a t-if="record.vip.raw_value != 1" type="object" name="set_vip" class="oe_e oe_star_off">7</a>
+                                </div>
+                                <div>
+                                    <field name="address_id"/><br/>
+                                    <field name="street"/><br/>
+                                    <field name="customer_date"/><br/>
+                                    <div class="oe_ellipsis"><t t-raw="record.note.value"/></div>
+                                </div>
+                            </div>
+                            <div class="oe_clear"></div>
+                        </div>
+                        <div t-if="record.state.raw_value == 'draft'" t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
+                            <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
+                                <span class="oe_e">í</span>
+                                <ul class="oe_dropdown_menu">
+                                    <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                </ul>
+                            </div>
+                            <div class="oe_kanban_content">
+                                <div>
+                                    <b><field name="origin"/></b> (<field name="delivered_cpt"/>)
+                                    <a t-if="record.vip.raw_value == 1" type="object" name="set_not_vip" class="oe_e oe_star_on">7</a>
+                                    <a t-if="record.vip.raw_value != 1" type="object" name="set_vip" class="oe_e oe_star_off">7</a>
+                                </div>
+                                <div>
+                                    <field name="address_id"/><br/>
+                                    <field name="street"/><br/>
+                                    <field name="customer_date"/>
+                                    <div class="oe_ellipsis"><t t-raw="record.note.value"/></div>
+                                </div>
+                            </div>
+                            <div class="oe_clear"></div>
+                        </div>
+                    </t>
+                </templates>
+            </kanban>
+        </field>
+    </record>     
+        
+        <record id="delivery_routes.view_delivery_route_line_form" model="ir.ui.view">
+            <field name="name">delivery.route.line.form</field>
+            <field name="model">delivery.route.line</field>
+            <field name="arch" type="xml">
+                <form string="Delivery Route Line" version="7.0">
+	                <header>
+	                    <!--button name="action_draft" string="Draft" type="object" states="cancel"/-->
+	                    <!--button name="action_confirm" string="Confirm" class="oe_highlight" type="object" states="draft"/-->
+	                    <!--button name="action_delivered" string="In delivery" type="object" class="oe_highlight" states="confirm"/-->
+	                    <button name="action_received" string="Received" type="object" class="oe_highlight" states="delivered" groups="delivery_routes.group_delivery_manager"/>
+	                    <button name="action_received_exp" string="Received with exception" type="object" states="delivered" groups="delivery_routes.group_delivery_manager"/>
+	                    <button name="action_returned" string="Returned" type="object" states="delivered" groups="delivery_routes.group_delivery_manager"/>
+	                    <button name="action_returned_exp" string="Returned, no Delivery" type="object" states="delivered" groups="delivery_routes.group_delivery_manager"/>
+	                    <button name="action_cancel" string="Cancel" type="object" states="confirm" groups="delivery_routes.group_delivery_user"/>
+	                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,delivered,received,returned,cancel" statusbar_colors='{"received":"green","returned":"red","delivered":"blue"}'/>
+	                </header>
+	                <sheet>
+	                    <group colspan="4" col="4">
+		                    <field name="sequence" attrs="{'readonly':[('state','not in',['draft'])]}"/>
+		                    <field name="route_id" attrs="{'readonly':[('state','not in',['draft'])]}"/>
+		                    <field name="address_id" readonly="1"/>
+		                    <field name="dts_id" domain="[('type','=','dts')]"/>
+		                    <!--field name="origin"/-->
+		                    <field name="street" readonly="1"/>
+		                    <field name="picking_id" domain="[('return','=','none'),('delivery_state','in',['not_planned','del_rt']),('type','in',['in','out']),('state','!=','cancel')]"/>
+		                    <field name="so_payment_method" readonly="1"/>
+		                    <field name="box_type"/>
+		                    <field name="visit_date"/>
+		                    <field name="driver" readonly="1"/>
+		                    <field name="purchase_id" attrs="{'invisible':[('purchase_id','=',False)]}"/>
+		                    <field name="sale_order_id" attrs="{'invisible':[('sale_order_id','=',False)]}"/>
+		                    <field name="exceptions" invisible="1"/>
+		                    <group colspan="4" col="1" attrs="{'invisible':[('exceptions','=',False),('state','not in',['returned'])]}">
+		                    	<separator string="Return Reasons"/>
+		                    	<field name="return_reasons" nolabel="1">
+	                                <tree editable="bottom">
+	                                    <field name="type"/>
+	                                    <field name="reason"/>                                    
+	                                </tree>
+	                            </field>
+		                    </group>
+		                    <group colspan="4" col="2">
+		                    	<separator string="Notes"/>
+		                    	<separator string="DO Notes"/>
+		                    </group>
+		                    <group colspan="4" col="2">
+		                    	<field name="note" nolabel="1"/>
+		                    	<field name="picking_note" nolabel="1" readonly="1"/>
+		                    </group>
+	                   </group>
+	                </sheet>
+                </form>
+            </field>
+        </record>
+        
+        <record id="view_delivery_route_line_tree_elico" model="ir.ui.view">
+            <field name="name">delivery.route.line.tree_elico</field>
+            <field name="model">delivery.route.line</field>
+        	<field name="inherit_id" ref="delivery_routes.view_delivery_route_line_tree"/>
+			<field name="arch" type="xml">
+				<xpath expr="//field[@name='origin']" position="after">
+                    <field name="dts_id"/>
+                    <field name="dts_name" invisible="1"/>
+                    <field name="customer_date"/>
+                </xpath>
+                <xpath expr="//field[@name='note']" position="after">
+                    <field name="amount_received" groups="account.group_account_user" sum="Total Received"/>
+                    <field name="account_checked" string="OK" groups="account.group_account_user"/>
+                   	<field name="account_remark"  string="Acc. Notes" groups="account.group_account_user"/>
+                </xpath>
+            </field>
+        </record>
+        <record id="delivery_routes.view_delivery_line_search" model="ir.ui.view">
+            <field name="name">delivery.route.line.search_elico</field>
+            <field name="model">delivery.route.line</field>
+			<field name="arch" type="xml">
+			    <search string="Delivery Line"> 
+                    <field name="picking_id" />
+                    <field name="address_id" />
+                    <field name="origin" />
+                    <filter name="no_route" string="no route" domain="[('route_id','=',None)]" help="line without route" />
+				    <filter icon="terp-go-today" string="Today" domain="[('route_id.date','=',time.strftime('%%Y-%%m-%%d'))]" help="Delivery for Today" name="today"/>
+                    <group expand="0" string="Group By...">
+	                    <filter string="Route" icon="terp-folder-orange" domain="[]" context="{'group_by':'route_id'}"/>
+	                    <filter string="Delivery Time" icon="terp-folder-orange" domain="[]" context="{'group_by':'dts_name'}"/>
+	                    <filter string="State" icon="terp-folder-orange" domain="[]" context="{'group_by':'state'}"/>
+	                </group>
+                </search>
+            </field>
+        </record>
+        
+        <!--record model="ir.ui.view" id="delivery_route_address_kanban_view">
+            <field name="name">delivery.route.address.kanban</field>
+            <field name="model">delivery.route.line</field>
+            <field name="arch" type="xml">
+                <kanban version="7.0">
+                    <field name="dts_id"/>
+                    <field name="picking_id"/>
+                    <field name="route_id"/>
+                    <field name="address_id"/>
+                    <field name="note"/>
+                    <field name="sequence"/>
+                    <templates>
+                    <t t-name="kanban-box">
+                        <div t-attf-class="oe_kanban_card oe_kanban_global_click">
+                            <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
+                                <span class="oe_e">í</span>
+                                <ul class="oe_dropdown_menu">
+                                    <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                    <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
+                                </ul>
+                            </div>
+                            <div class="oe_kanban_content">
+                                <div><b><field name="street"/></b></div>
+                            </div>
+                            <div class="oe_clear"></div>
+                        </div>
+                    </t>
+                </templates>
+            </kanban>
+        </field>
+    </record-->
+        
+        
+    	<record id="action_delivery_return_type" model="ir.actions.act_window">
+            <field name="name">Return Reason Type</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">delivery.return.type</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem action="action_delivery_return_type" id="menu_action_delivery_return_type" parent="delivery_routes.menu_delivery_config" sequence="99"/>
+        
+        
+        <menuitem name="Delivery Payments"
+            id="menu_delivery_delivery_payment"
+            parent="delivery_routes.menu_delivery_root"
+            groups="delivery_routes.group_customer_service_user,account.group_account_user"
+            sequence="5"/>
+        
+        
+        <record id="view_delivery_route_form_cs" model="ir.ui.view">
+            <field name="name">delivery.route.form_CS</field>
+            <field name="model">delivery.route</field>
+            <field name="priority">17</field>
+            <field name="arch" type="xml">
+                <form string="Delivery Route" version="7.0">
+                <header>
+                    <button name="set_confirm_cs" string="Confirm CS" type="object" class="oe_highlight" groups="delivery_routes.group_customer_service_user" attrs="{'invisible':[('confirm_cs','=',True)]}"/>
+                    <button name="action_done" string="Done" type="object" class="oe_highlight" states="departure" groups="account.group_account_user"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,departure,done,cancel" statusbar_colors='{"done":"green","cancel":"red","departure":"blue"}'/>
+                </header>
+                <sheet>
+                    <group colspan="4" col="4">
+	                    <field name="name" readonly="1"/>
+	                    <field name="date" readonly="1"/>
+	                    <field name="departure_date" readonly="1"/>
+	                    <field name="arrive_date"/>
+	                    <field name="dts_id" readonly="1"/>
+	                    <newline />
+	                    <field name="driver_id" readonly="1"/>
+	                    <field name="picker_id" readonly="1"/>
+	                    <field name="confirm_cs" groups="delivery_routes.group_customer_service_user" attrs="{'readonly':[('state','not in',['confirm','draft'])]}"/>
+	                    <newline />
+                    	<field name="line_ids" colspan="4" nolabel="1">
+                    		<tree editable="bottom" create="false" delete="false">
+                    		    <field name="origin"/>
+                    		    <field name="amount_total" sum="Total"/>
+                    		    <field name="amount_unpaid" sum="Total Unpaid"/>
+                    		    <field name="adjustment" groups="delivery_routes.group_customer_service_user" attrs="{'readonly':[('confirm_cs','=',True)]}" sum="Total Adjustment"/>
+                    		    <field name="cs_remark"  string="CS Notes" groups="delivery_routes.group_customer_service_user" attrs="{'readonly':[('confirm_cs','=',True)]}"/>
+                    		    <field name="to_be_received" sum="Total to be received" string="To be Rec."/>
+                    		    <field name="amount_received" groups="account.group_account_user" attrs="{'readonly':[('state','not in',['received','returned'])]}" sum="Total Received"/>
+                    		    <field name="account_checked" string="OK" groups="account.group_account_user" attrs="{'readonly':[('state','not in',['received','returned'])]}"/>
+                    		    <field name="account_remark"  string="Acc. Notes" groups="account.group_account_user" attrs="{'readonly':[('state','not in',['received','returned'])]}"/>
+                    		    <field name="complete_state"  string="State" readonly="1"/>
+                    		    <field name="state" invisible="1"/>
+                    		    <field name="confirm_cs" invisible="1"/>
+                    		</tree>
+                    	</field>
+                    </group>
+                </sheet>
+                </form>
+            </field>
+        </record>
+        <record id="view_delivery_route_tree_cs" model="ir.ui.view">
+            <field name="name">delivery.route.tree_cs</field>
+            <field name="model">delivery.route</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Delivery Routes">
+                    <field name="name"/>
+                    <field name="date"/>
+                    <field name="dts_id"/>
+                    <field name="departure_date"/>
+        			<field name="arrive_date"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+        <record id="view_delivery_search_cs" model="ir.ui.view">
+            <field name="name">delivery.route.search_cs</field>
+            <field name="model">delivery.route</field>
+            <field name="arch" type="xml">
+                <search string="Delivery Route"> 
+                    <field name="dts_id" context="{'domain':[('type','=','dts')]}"/>
+                    <field name="date"/>
+                    <filter icon="terp-go-today" string="Today" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]" help="Delivery Route for Today" name="today"/>
+	                <group expand="0" string="Group By...">
+	                    <filter string="Delivery Time" icon="terp-folder-orange" domain="[]" context="{'group_by':'dts_id'}"/>
+	                </group>
+                </search>
+            </field>
+        </record>
+        <record id="action_delivery_route_form_cs" model="ir.actions.act_window">
+            <field name="name">Delivery Route CS</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">delivery.route</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'active_test':False,'search_default_today':True,'force_update':True}</field>
+            <field name="search_view_id" ref="view_delivery_search_cs"/>
+        </record>
+        <record id="action_delivery_route_form_form_cs" model="ir.actions.act_window.view">
+            <field name="view_mode">form</field>
+            <field name="sequence">2</field>
+            <field name="view_id" ref="view_delivery_route_form_cs"/>
+            <field name="act_window_id" ref="action_delivery_route_form_cs"/>
+        </record>
+        <record id="action_delivery_route_form_tree_cs" model="ir.actions.act_window.view">
+            <field name="view_mode">tree</field>
+            <field name="sequence">1</field>
+            <field name="view_id" ref="view_delivery_route_tree_cs"/>
+            <field name="act_window_id" ref="action_delivery_route_form_cs"/>
+        </record>
+        <menuitem action="action_delivery_route_form_cs" id="menu_action_delivery_route_form_cs" parent="menu_delivery_delivery_payment" sequence="1" groups="delivery_routes.group_customer_service_user,account.group_account_user"/>
+        
+        <record id="view_delivery_line_tree_cs" model="ir.ui.view">
+            <field name="name">delivery.route.line.tree_cs</field>
+            <field name="model">delivery.route.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Delivery Route Lines" editable="bottom" create="false" delete="false">
+                    <field name="origin" readonly="1"/>
+                    <field name="dts_id" readonly="1"/>
+                    <field name="dts_name" invisible="1"/>
+        			<field name="route_id" invisible="1"/>
+        			<field name="address_id" readonly="1"/>
+					<field name="amount_total" sum="Total"/>
+           		    <field name="amount_unpaid" sum="Total Unpaid"/>
+           		    <field name="adjustment" groups="delivery_routes.group_customer_service_user" attrs="{'readonly':[('confirm_cs','=',True)]}" sum="Total Adjustment"/>
+                    <field name="cs_remark" groups="delivery_routes.group_customer_service_user" attrs="{'readonly':[('confirm_cs','=',True)]}"/>
+           		    <field name="to_be_received" sum="Total to be received"/>
+           		    <field name="amount_received" groups="account.group_account_user" attrs="{'readonly':[('state','not in',['received','returned'])]}" sum="Total Received"/>
+           		    <field name="account_checked" groups="account.group_account_user" attrs="{'readonly':[('state','not in',['received','returned'])]}"/>
+           		    <field name="account_remark" groups="account.group_account_user" attrs="{'readonly':[('state','not in',['received','returned'])]}"/>
+                    <field name="complete_state" readonly="1"/>
+                    <field name="state" invisible="1"/>
+                    <field name="confirm_cs" invisible="1"/>
+                </tree>
+            </field>
+        </record>
+        <record id="view_delivery_line_search_cs" model="ir.ui.view">
+            <field name="name">delivery.route.search_cs</field>
+            <field name="model">delivery.route.line</field>
+            <field name="arch" type="xml">
+                <search string="Delivery Route"> 
+                    <field name="dts_id" context="{'domain':[('type','=','dts')]}"/>
+                    <field name="origin"/>
+                    <filter icon="terp-go-today" string="Today" domain="[('route_id.date','=',time.strftime('%%Y-%%m-%%d'))]" help="Delivery Route for Today" name="today"/>
+	                <group expand="0" string="Group By...">
+	                    <filter string="Delivery Time" icon="terp-folder-orange" domain="[]" context="{'group_by':'dts_name'}"/>
+	                </group>
+                </search>
+            </field>
+        </record>
+        <record id="action_delivery_line_form_cs" model="ir.actions.act_window">
+            <field name="name">Delivery Route Line CS</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">delivery.route.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
+            <field name="context">{'active_test':False,'search_default_today':True,'force_update':True}</field>
+            <field name="search_view_id" ref="view_delivery_line_search_cs"/>
+        </record>
+        <record id="action_delivery_line_form_tree_cs" model="ir.actions.act_window.view">
+            <field name="view_mode">tree</field>
+            <field name="sequence">1</field>
+            <field name="view_id" ref="view_delivery_line_tree_cs"/>
+            <field name="act_window_id" ref="action_delivery_line_form_cs"/>
+        </record>
+        <menuitem action="action_delivery_line_form_cs" id="menu_action_delivery_line_form_cs" parent="menu_delivery_delivery_payment" sequence="99" groups="delivery_routes.group_customer_service_user,account.group_account_user"/>
+        
+        
+        
+        
+        
+        
+        <!-- Menu -->
+        <!--
+        <menuitem action="action_picking_batch" name="Picking Batch" 
+            id="menu_action_picking_batch"
+            parent="delivery_routes.menu_delivery_delivery" sequence="9"/>
+            -->
+
+        <!-- picking Form view -->
+                    <!--
+        <record model='ir.ui.view' id='picking_batch_form_view'>
+            <field name='name'>Delivery Routes Picking Form Inherit</field>
+            <field name='model'>stock.picking</field>
+            <field name='inherit_id' ref='stock.view_picking_form'/>
+            <field name='type'>form</field>
+            <field name="priority" eval="2"/>
+            <field name='arch' type='xml'>
+                <field name="move_type" position="after">
+                    <field name="batch_id" />
+                    <field name="pts_id" domain="[('type','=','pts'),('active','=',True)]"/>
+                    <field name="route_line_id"/>
+                    <field name="delivery_date"/>
+                    <field name="route_state"/>
+                    <field name="delivered"/>
+                </field>
+            </field>
+        </record>
+        <menuitem action="action_picking_pack_tree" name="Delivery Picking" 
+            id="menu_action_picking_pack"
+            parent="delivery_routes.menu_delivery_delivery" sequence="10"/>
+                    -->
+        <!-- Menu -->
+    </data>
+</openerp>

=== added directory 'delivery_plan/wizard'
=== added file 'delivery_plan/wizard/__init__.py'
--- delivery_plan/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ delivery_plan/wizard/__init__.py	2013-09-09 08:37:27 +0000
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Author: Yannick Gouin <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import stock
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'delivery_plan/wizard/stock.py'
--- delivery_plan/wizard/stock.py	1970-01-01 00:00:00 +0000
+++ delivery_plan/wizard/stock.py	2013-09-09 08:37:27 +0000
@@ -0,0 +1,503 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Author: Yannick Gouin <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import threading
+from openerp import netsvc
+from openerp import pooler
+from openerp import tools
+from openerp.tools.translate import _
+from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT
+from osv import osv, fields
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
+import math
+import pytz
+import logging
+logger = logging.getLogger(__name__)
+
+
+class delivery_dts_to_routes(osv.osv_memory):
+    _name = 'delivery.dts_to_routes'
+    
+    def _init_dts_id(self, cr, uid, context=None):
+        last_dts = self.pool.get('res.users').read(cr, 1, [uid], ['dts_id'])[0]['dts_id']
+        if last_dts:
+            ids = self.pool.get('delivery.time').search(cr, uid, [('id', '=', last_dts[0])])
+        else:
+            now = datetime.now()
+            ids = self.pool.get('delivery.time').search(cr, uid, [('type', '=', 'dts'), ('active', '=', True), ('name', 'ilike', datetime.strftime(now, '%y%m%d') + '%')])
+        return ids and ids[0] or False
+
+    _columns = {
+        'dts_id': fields.many2one('delivery.time', 'Delivery Time', select=True, required=True, domain=[('type', '=', 'dts'), ('active', '=', True)]),
+    }
+    _defaults = {
+        'dts_id': lambda self, cr, uid, context: self._init_dts_id(cr, uid, context=context),
+    }
+    
+    def generate_routes(self, cr, uid, ids, context=None):
+        context = context or {}
+        route_obj = self.pool.get('delivery.route')
+        line_obj = self.pool.get('delivery.route.line')
+        
+        if ids:
+            data = self.browse(cr, uid, ids)[0]
+        else:
+            data = self.pool.get('delivery.time').browse(cr, 1, context['wiz_dts_id'])
+        self.pool.get('res.users').write(cr, 1, [uid], {'dts_id':data.dts_id.id})
+        
+        color2routes = {}
+        line_ids = line_obj.search(cr, uid, [("dts_id", "=", data.dts_id.id)], order="color")
+        for line in line_obj.browse(cr, uid, line_ids):
+            route_id = False
+            base_name = data.dts_id.name.split()[0]
+            if line.color > 0:
+                line_color = str(line.color).rjust(2, '0')
+                if line_color in color2routes:
+                    route_id = color2routes[line_color]
+                else:
+                    route_ids = route_obj.search(cr, uid, [('name', '=', base_name  + str(line_color))], context=context)
+                    route_id  = route_ids and route_ids[0] or False
+                    color2routes.update({line_color: route_id})
+                
+                if not route_id:
+                    route_id = route_obj.create(cr, uid, {
+                        'name': base_name + str(line_color),
+                        'date': data.dts_id.start_date and data.dts_id.start_date.split() and data.dts_id.start_date.split()[0] or False,
+                        'dts_id': data.dts_id.id,
+                        'departure_date': data.dts_id.start_date or False,
+                        'arrive_date': data.dts_id.end_date or False,
+                    })
+                    color2routes.update({line_color: route_id})
+                line_obj.write(cr, uid, [line.id], {'route_id':route_id}, context={'force_update':1})
+        
+        #domain = ['&','|','&',('picking_id.type','=','in'),'&',('picking_id.state','=','assigned'),("picking_id.is_collected","=",True),'&',('picking_id.type','=','out'),("picking_id.state","not in",["cancel"]),'|',("route_id","in",tuple(route_ids)),("route_id","=",None)]
+        domain = ['&','|','&',('picking_id.type','=','in'),'&',('picking_id.state','=','assigned'),("picking_id.is_collected","=",True),'&',('picking_id.type','=','out'),("picking_id.state","not in",["cancel"]),("dts_id","=",data.dts_id.id)]
+        
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model':'delivery.route.line',
+            'view_type':'form',
+            'view_mode':'kanban,form',
+            'context':"{'update_color':1,'view_name':'delivery.route.line.kanban','force_dts_id_kanban': %s}" % data.dts_id.id,
+            'domain': domain,
+        }        
+delivery_dts_to_routes()
+
+
+class delivery_dts_to_vans(osv.osv_memory):
+    _name = 'delivery.dts_to_vans'
+    
+    def _init_dts_id(self, cr, uid, context=None):
+        last_dts = self.pool.get('res.users').read(cr, 1, [uid], ['dts_id'])[0]['dts_id']
+        if last_dts:
+            ids = self.pool.get('delivery.time').search(cr, uid, [('id', '=', last_dts[0])])
+        else:
+            now = datetime.now()
+            ids = self.pool.get('delivery.time').search(cr, uid, [('type', '=', 'dts'), ('active', '=', True), ('name', 'ilike', datetime.strftime(now, '%y%m%d') + '%')])
+        return ids and ids[0] or False
+
+    _columns = {
+        'dts_id': fields.many2one('delivery.time', 'Delivery Time', select=True, required=True, domain=[('type', '=', 'dts'), ('active', '=', True)]),
+    }
+    _defaults = {
+        'dts_id': lambda self, cr, uid, context: self._init_dts_id(cr, uid, context=context),
+    }
+    
+    def open_kanban(self, cr, uid, ids, context=None):
+        if ids:
+            data = self.browse(cr, uid, ids)[0]
+        else:
+            data = self.pool.get('delivery.time').browse(cr, 1, context['wiz_dts_id'])
+        self.pool.get('res.users').write(cr, 1, [uid], {'dts_id':data.dts_id.id})
+        #domain = [("picking_id.state", "!=", "cancel"), ("picking_id.type", "in", ["in", "out"]), ("dts_id", "=", data.dts_id.id)]
+        domain = ['&','|','&',('picking_id.type','=','in'),'&',('picking_id.state','=','assigned'),("picking_id.is_collected","=",True),'&',('picking_id.type','=','out'),("picking_id.state","not in",["cancel"]),("dts_id","=",data.dts_id.id)]
+        
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model':'delivery.route.line',
+            'view_type':'form',
+            'view_mode':'kanban,form',
+            'context':"{'view_name':'delivery.route.line.kanban_fc','sorting':'neighborhood,street,picking_id','check4color':" + str(data.dts_id.id) + "}",
+            'domain': domain,
+        }
+delivery_dts_to_vans()
+
+
+
+class delivery_driver_for_routes(osv.osv_memory):
+    _name = 'delivery.driver_for_routes'
+    
+    def _init_dts_id(self, cr, uid, context=None):
+        last_dts = self.pool.get('res.users').read(cr, 1, [uid], ['dts_id'])[0]['dts_id']
+        if last_dts:
+            ids = self.pool.get('delivery.time').search(cr, uid, [('id', '=', last_dts[0])])
+        else:
+            now = datetime.now()
+            ids = self.pool.get('delivery.time').search(cr, uid, [('type', '=', 'dts'), ('active', '=', True), ('name', 'ilike', datetime.strftime(now, '%y%m%d') + '%')])
+        return ids and ids[0] or False
+
+    _columns = {
+        'dts_id': fields.many2one('delivery.time', 'Delivery Time', select=True, required=True, domain=[('type', '=', 'dts'), ('active', '=', True)]),
+        #'action': fields.selection([('driver_id','Driver'),('picker_id','Deliver')], string="Choose", required=True),
+    }
+    _defaults = {
+        'dts_id': lambda self, cr, uid, context: self._init_dts_id(cr, uid, context=context),
+        #'action': lambda *a: 'driver_id',
+    }
+    
+    def open_kanban(self, cr, uid, ids, context=None):
+        if ids:        
+            data = self.browse(cr, uid, ids)[0]
+        else:
+            data = self.pool.get('delivery.time').browse(cr, 1, context['wiz_dts_id'])
+        self.pool.get('res.users').write(cr, 1, [uid], {'dts_id':data.dts_id.id})
+        driver_pool = self.pool.get('delivery.driver')
+        route_tmp_pool = self.pool.get('delivery.route_tmp')        
+        route_pool = self.pool.get('delivery.route')
+        
+        #cr.execute("DELETE FROM delivery_route_tmp WHERE dts_id=" + data.dts_id.id + " ")
+        cr.execute("DELETE FROM delivery_route_tmp")
+        cr.execute("UPDATE delivery_driver SET tmp_route_id = Null")
+        cr.commit()
+        
+        route_ids = route_pool.search(cr, uid, [('dts_id', '=', data.dts_id.id)]) or []
+        for route in route_pool.browse(cr, uid, route_ids):
+            route_tmp_id = route_tmp_pool.create(cr, uid, {'dts_id': data.dts_id.id, 'route_id': route.id, 'name': route.name})
+            if route.driver_id:
+                driver_pool.write(cr, uid, [route.driver_id.id], {'tmp_route_id': route_tmp_id})
+            if route.picker_id:
+                driver_pool.write(cr, uid, [route.picker_id.id], {'tmp_route_id': route_tmp_id})        
+        
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model':'delivery.driver',
+            'view_type':'tree',
+            'view_mode':'kanban',
+            'context':"{'force_dts_id': %s}" % (data.dts_id.id),
+        }    
+delivery_driver_for_routes()
+
+
+class delivery_change_dts(osv.osv_memory):
+    _name = 'delivery.change.dts'
+    _description = 'Change DTS / PTS'
+    
+    _columns = {
+        'action': fields.selection([('cleanup', 'Blank DTS/PTS'), ('change', 'Change DTS/PTS')], string='Action', required=True),
+        'dts_id': fields.many2one('delivery.time', 'Delivery Time', domain=[('type', '=', 'dts')]),
+        'pts_id': fields.many2one('delivery.time', 'Preparation Time', domain=[('type', '=', 'pts')]),
+    }
+    _defaults = {
+        'action': 'change',
+    }
+    
+    
+    def dts_id_change(self, cr, uid, ids, dts_id, pts_id, context=None):
+        context = context or {}
+        new_pts_id = False
+        
+        if pts_id and dts_id:
+            pts_pool = self.pool.get('delivery.time')
+            pts = pts_pool.browse(cr, uid, [pts_id])[0]
+            if pts.dts_id.id == dts_id:
+                new_pts_id = pts_id           
+        return {'value': {'pts_id': new_pts_id}}
+    
+    
+    def change_dts(self, cr, uid, ids, context=None):
+        context = context or {}
+        context.update({'update_pts':1})
+        pick_ids = context.get('active_ids', False) or context.get('active_id', False) or []
+        if pick_ids and type(pick_ids) != type([]):
+            pick_ids = [pick_ids]
+        
+        if pick_ids:
+            move_pool = self.pool.get('stock.move')
+            pick_pool = self.pool.get('stock.picking')
+            this = self.browse(cr, uid, ids[0], context=context)
+            
+            if this.action == 'cleanup':
+                pts_id = False
+                dts_id = False
+            else:
+                dts_id = this.dts_id and this.dts_id.id or False
+                if dts_id:
+                    pts_id = this.pts_id and this.pts_id.id or False
+                else:
+                    pts_id = False
+            
+            for pick in pick_pool.browse(cr, uid, pick_ids):
+                if pick.state not in ['cancel'] and pick.delivery_state in ["not_planned", "del_rt", ""]:
+                    pick_pool.write(cr, uid, [pick.id], {'pts_id':pts_id, 'dts_id':dts_id}, context=context)
+        return {'type': 'ir.actions.act_window_close'}
+
+delivery_change_dts()
+
+
+
+########## TO BE DELETED ASAP ###############
+class dts_reset(osv.osv):
+    _name = 'dts.reset'
+    
+    def resetall(self, cursor, uid, context=None):
+        logger.warning('################ START ################')
+        picking_obj  = self.pool.get('stock.picking')
+        delivery_obj = self.pool.get('delivery.route.line')
+        
+        cr2 = pooler.get_db(cursor.dbname).cursor()
+        cr2.execute("SELECT DISTINCT picking_id FROM delivery_route_line WHERE picking_id is not null")
+        pick_ids    = map(lambda x: x[0], cr2.fetchall())
+        picking_ids =  picking_obj.search(cr2, uid, [('id','not in',pick_ids),('state','not in',['cancel']),('type','in',['in','out'])])
+        for sp in picking_ids:
+            delivery_obj.create(cr2, uid, {'picking_id':sp, })
+            cr2.commit()
+            logger.warning('####  %s done  #### '%sp)
+        #cancel picking canceled
+        logger.warning('################ DONE ################')
+        cr2.close()
+        
+        """
+        logger.warning('################ START ################')
+        tz = pytz.timezone('Asia/Shanghai')
+        tz2 = pytz.timezone('America/Anchorage')
+        move_obj = self.pool.get('stock.move')
+        picking_obj = self.pool.get('stock.picking')
+        procurement_obj = self.pool.get('procurement.order')
+        delivery_time_obj = self.pool.get('delivery.time')
+        time_slot_obj = self.pool.get('delivery.time.slot')
+        so_pool = self.pool.get('sale.order')
+        
+        use_new_cursor = cursor.dbname
+        cr = pooler.get_db(use_new_cursor).cursor()
+        cr2 = pooler.get_db(use_new_cursor).cursor()
+        cr3 = pooler.get_db(use_new_cursor).cursor()
+        
+        cr2.execute("SELECT DISTINCT sale_id FROM stock_picking WHERE sale_id is not null AND sale_id > 0")
+        ids_from_pick = map(lambda x: x[0], cr2.fetchall())
+        so_ids = so_pool.search(cr3, uid, [('id','not in',ids_from_pick)])
+        
+        cpt_commit = 1
+        for order in so_pool.browse(cr3, uid, so_ids):
+            val = {}
+            dts = False
+            pts = False
+            pt_id = False
+            dt_id = False
+            min_date = False
+            slot_id = False
+            
+            try:
+                now = datetime.now()
+                address = order.partner_shipping_id or order.partner_id or False
+                
+                if order.start_date:
+                    min_date = order.start_date
+                    dts = order.start_date
+                    dts = datetime.strptime(dts, '%Y-%m-%d %H:%M:%S')            
+                    dts = pytz.utc.localize(dts).astimezone(tz)
+                if order.cdate:
+                    pts = datetime.strptime(order.cdate, '%Y-%m-%d %H:%M:%S')
+                    pts = pytz.utc.localize(pts).astimezone(tz)
+                elif order.date_order:
+                    pts = datetime.strptime(order.date_order, '%Y-%m-%d')
+                    pts = pytz.utc.localize(pts).astimezone(tz)
+                if not pts:
+                    pts = dts
+                
+                if dts:
+                    start_date = datetime.strftime(dts, '%Y-%m-%d')
+                    if address and (not address.city or address.city.lower() in ['shanghai']):
+                        from_time = datetime.strftime(dts, '%H:%M')
+                    else:#eg: in Nanjing
+                        from_time = '09:30'
+                    name = datetime.strftime(dts, '%y%m%d')
+                    name_pts = name
+                    start_date_pts = start_date
+                    
+                    slot_ids = time_slot_obj.search(cr, uid, [('max_time', '>=', from_time), ('type', '=', 'dts')], order='max_time')
+                    if slot_ids:
+                        slot = time_slot_obj.browse(cr, uid, slot_ids[0])
+                        name += slot.name
+                        end_date = start_date + ' ' + slot.end_time
+                        start_date += ' ' + slot.start_time
+                        start_date = datetime.strptime(start_date, '%Y-%m-%d %H:%M')
+                        start_date = pytz.utc.localize(start_date).astimezone(tz2)
+                        start_date = datetime.strftime(start_date, '%Y-%m-%d %H:%M')
+                        end_date   = datetime.strptime(end_date, '%Y-%m-%d %H:%M')
+                        end_date   = pytz.utc.localize(end_date).astimezone(tz2)
+                        end_date   = datetime.strftime(end_date, '%Y-%m-%d %H:%M')
+                        
+                        cr2.execute("SELECT id FROM delivery_time WHERE name='" + name + "' AND type='dts' AND slot_id='" + str(slot.id) + "'")
+                        dt_ids = map(lambda x: x[0], cr2.fetchall())
+                        if dt_ids:
+                            dt_id = dt_ids[0]
+                        else:
+                            dt_id = delivery_time_obj.create(cr3, uid, {
+                                'name':name,
+                                'start_date': start_date,
+                                'end_date': end_date,
+                                'active': True,
+                                'type': 'dts',
+                                'slot_id': slot.id,
+                                }, context)
+                            cr3.commit()
+                            cr2.commit()
+                
+                if pts and dt_id:
+                    date_pts = datetime.strftime(pts, '%Y-%m-%d')
+                    from_time = datetime.strftime(pts, '%H:%M')
+                    if date_pts < datetime.strftime(dts, '%Y-%m-%d'):
+                        date_pts = datetime.strftime(dts, '%Y-%m-%d')
+                        from_time = '00:00'
+                    
+                    pts_slot_ids = time_slot_obj.search(cr, uid, [('max_time', '>=', from_time), ('type', '=', 'pts'), ('dts_id', '=', slot.id)], order='max_time')
+                    if pts_slot_ids:
+                        pts_slot = time_slot_obj.browse(cr, uid, pts_slot_ids[0])
+                        name_pts += pts_slot.name
+                        end_date_pts = start_date_pts + ' ' + pts_slot.end_time
+                        start_date_pts += ' ' + pts_slot.start_time
+                        start_date_pts = datetime.strptime(start_date_pts, '%Y-%m-%d %H:%M')
+                        start_date_pts = pytz.utc.localize(start_date_pts).astimezone(tz2)
+                        start_date_pts = datetime.strftime(start_date_pts, '%Y-%m-%d %H:%M')
+                        end_date_pts   = datetime.strptime(end_date_pts, '%Y-%m-%d %H:%M')
+                        end_date_pts   = pytz.utc.localize(end_date_pts).astimezone(tz2)
+                        end_date_pts   = datetime.strftime(end_date_pts, '%Y-%m-%d %H:%M')
+                    
+                        cr2.execute("SELECT id FROM delivery_time WHERE name='" + name_pts + "' AND type='pts' AND slot_id='" + str(pts_slot.id) + "'")
+                        pt_ids = map(lambda x: x[0], cr2.fetchall())
+                        if pt_ids:
+                            pt_id = pt_ids[0]
+                        else:
+                            pt_id = delivery_time_obj.create(cr3, uid, {
+                                'name':name_pts,
+                                'start_date': start_date_pts,
+                                'end_date': end_date_pts,
+                                'active': True,
+                                'type': 'pts',
+                                'slot_id': pts_slot.id,
+                                'dts_id': dt_id,
+                                }, context)
+                            cr3.commit()
+                            cr2.commit()
+                        val['pts_id'] = pt_id
+                if not pt_id:
+                    val['pts_id'] = False
+                if not dt_id:
+                    val['dts_id'] = False
+                
+                if val:
+                    so_pool.write(cr2, 1, [order.id], val)
+                
+                ##################################################
+                #cr2.execute("SELECT DISTINCT id FROM stock_picking WHERE sale_id = "+ str(order.id) +"")
+                #pick_ids = map(lambda x: x[0], cr2.fetchall()) or []
+                #if pick_ids and val:
+                #    picking_obj.write(cr2, uid, pick_ids, val)
+                ##################################################
+                
+                cpt_commit += 1
+                if cpt_commit >= 30:
+                    cr2.commit()
+                    cr3.commit()
+                    cr.commit()
+                    cpt_commit = 1
+            except Exception as err:
+                logger.warning('>>> Error during SO %s : %s' % (order.id, err))
+        ##################################################
+        # We update the old wrong start_date and end_date in delivery.time
+        #delivery_time_obj = self.pool.get('delivery.time')
+        #cr.execute("SELECT id FROM delivery_time WHERE id<16613 and start_date is not null and end_date is not null")
+        #delivery_ids = map(lambda x: x[0], cr.fetchall()) or []
+        #for delivery in delivery_time_obj.browse(cr, 1, delivery_ids):
+        #    delivery_start = datetime.strptime(delivery.start_date, '%Y-%m-%d %H:%M:%S')
+        #    delivery_start = pytz.utc.localize(delivery_start).astimezone(tz2)
+        #    
+        #    delivery_end   = datetime.strptime(delivery.end_date, '%Y-%m-%d %H:%M:%S')
+        #    delivery_end   = pytz.utc.localize(delivery_end).astimezone(tz2)
+        #
+        #    delivery_time_obj.write(cr2, 1, [delivery.id], {'start_date':delivery_start,'end_date':delivery_end})
+        #    cr2.commit()
+        ##################################################
+        cr.close()
+        cr2.close()
+        cr3.close()
+        logger.warning('################ DONE ################')
+        """
+        return
+dts_reset()
+
+class delivery_reset(osv.osv_memory):
+    _name = 'delivery.reset'
+    
+    def go(self, cr, uid, ids, context=None):
+        context = context or {}
+        use_new_cursor = cr.dbname
+        threaded_calculation = threading.Thread(target=self.pool.get('dts.reset').resetall, args=(cr, uid, context))
+        threaded_calculation.start()
+        return {'type': 'ir.actions.act_window_close'}
+delivery_reset()
+
+#class add_picking_pack(osv.osv_memory):
+#    _name='add.picking.pack'
+#
+#    _columns = {
+#            }
+#
+#    def confirm_add(self, cr, uid, ids, context=None):
+#        picking_ids = context['active_ids']
+#        
+#        sequence_obj = self.pool.get('ir.sequence')
+#        picking_obj = self.pool.get('stock.picking')
+#        move_obj = self.pool.get('stock.move')
+#        ul_obj = self.pool.get('product.ul')
+#        batch_obj = self.pool.get('picking.batch')
+#        tracking_obj = self.pool.get('stock.tracking')
+#
+#        batch_id = batch_obj.create(cr, uid, {
+#            'name': sequence_obj.get(cr, uid, 'picking.batch')
+#            },context=context)
+#
+#        for picking in picking_obj.browse(cr, uid, picking_ids, context):
+#            picking_obj.write(cr, uid, [picking.id,], {'batch_id':batch_id})
+#            for line in picking.move_lines :
+#                tracking_ids = tracking_obj.search(cr, uid, [
+#                    ('picking_id','=',picking.id),
+#                    ('ul_id','=',line.product_id.ul_id and line.product_id.ul_id.id or False)],context=context)
+#                if tracking_ids :
+#                    tracking_id = tracking_ids[0]
+#                else:
+#                    tracking_id = tracking_obj.create(cr, uid, {
+#                        'name':'%s_%s' % (picking.name,line.product_id.ul_id.name),
+#                        'picking_id':picking.id,
+#                        'ul_id':line.product_id.ul_id and line.product_id.ul_id.id or False,
+#                        },
+#                        context=context)
+#                move_obj.write(cr, uid,[line.id], {'tracking_id':tracking_id},context=context)
+#
+#        return {
+#                'type': 'ir.actions.act_window_close',
+#                }
+#
+#add_picking_pack()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'delivery_plan/wizard/stock_view.xml'
--- delivery_plan/wizard/stock_view.xml	1970-01-01 00:00:00 +0000
+++ delivery_plan/wizard/stock_view.xml	2013-09-09 08:37:27 +0000
@@ -0,0 +1,463 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_dts_to_routes" model="ir.ui.view">
+            <field name="name">Prepare Routes for DTS</field>
+            <field name="model">delivery.dts_to_routes</field>
+            <field name="arch" type="xml">
+                <form string="Prepare Routes for DTS" version="7.0">
+                    <field name="dts_id"/>
+                    <footer>
+                        <button name="generate_routes" string="Confirm" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+        <record id="view_dts_to_vans" model="ir.ui.view">
+            <field name="name">Prepare Vans for DTS</field>
+            <field name="model">delivery.dts_to_vans</field>
+            <field name="arch" type="xml">
+                <form string="Prepare Vans for DTS" version="7.0">
+                    <field name="dts_id"/>
+                    <footer>
+                        <button name="open_kanban" string="Confirm" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+		<act_window name="Prepare Routes for DTS"
+            res_model="delivery.dts_to_routes"
+            view_mode="form"
+            target="new"
+            id="action_dts_to_routes"/>
+		
+		<act_window name="Prepare Vans for DTS"
+            res_model="delivery.dts_to_vans"
+            view_mode="form"
+            target="new"
+            id="action_dts_to_vans"/>
+        
+		<menuitem name="Prepare Delivery Routes" id="menu_delivery_wizard" parent="delivery_routes.menu_delivery_root" sequence="0"/>
+		<menuitem action="action_dts_to_vans" name="Prepare Vans for DTS" id="menu_action_dts_to_vans" parent="menu_delivery_wizard" sequence="10"/>
+        <menuitem action="action_dts_to_routes" name="Prepare Routes for DTS" id="menu_action_dts_to_routes" parent="menu_delivery_wizard" sequence="15"/>
+        
+        
+        
+        <record id="view_driver_for_routes" model="ir.ui.view">
+            <field name="name">Choose Driver / Deliver for DTS</field>
+            <field name="model">delivery.driver_for_routes</field>
+            <field name="arch" type="xml">
+                <form string="Choose Driver / Deliver for DTS" version="7.0">
+                    <group colspan="2" col="4">
+                        <field name="dts_id"/>
+                        <!--field name="action"/-->
+                    </group>
+                    <footer>
+                        <button name="open_kanban" string="Confirm" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+        
+		<act_window name="Choose Driver / Deliver for DTS"
+            res_model="delivery.driver_for_routes"
+            view_mode="form"
+            target="new"
+            id="action_driver_for_routes"/>
+        <menuitem action="action_driver_for_routes" name="Choose Driver / Deliver for DTS" id="menu_action_driver_for_routes" parent="menu_delivery_wizard" sequence="25"/>
+        
+        
+        
+        <record model="ir.ui.view" id="delivery_route_driver_kanban_view">
+            <field name="name">delivery.route.driver.kanban</field>
+            <field name="model">delivery.route</field>
+            <field name="arch" type="xml">
+                <kanban version="7.0">
+                    <field name="dts_id"/>
+                    <field name="driver_id"/>
+                    <field name="picker_id"/>
+                    <field name="state"/>
+                    <templates>
+                    <t t-name="kanban-box">
+                        <div t-attf-class="oe_kanban_card oe_kanban_global_click">
+                            <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
+                                <span class="oe_e">í</span>
+                                <ul class="oe_dropdown_menu">
+                                    <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                </ul>
+                            </div>
+                            <div class="oe_kanban_content">
+                                <div><b><field name="name"/></b></div>
+                                <div>
+                                    <field name="date"/><br />
+                                    <field name="state"/>
+                                </div>
+                            </div>
+                            <div class="oe_clear"></div>
+                        </div>
+                    </t>
+                </templates>
+            </kanban>
+        </field>
+    </record>
+	<record id="action_delivery_route_driver_kanban" model="ir.actions.act_window">
+	    <field name="name">Delivery Route Driver Kanban</field>
+	    <field name="type">ir.actions.act_window</field>
+	    <field name="res_model">delivery.route</field>
+	    <field name="view_type">tree</field>
+	    <field name="view_mode">kanban,form</field>
+    </record>
+        
+        
+        <record model="ir.ui.view" id="delivery_route_line_kanban_view_fc">
+            <field name="name">delivery.route.line.kanban_fc</field>
+            <field name="model">delivery.route.line</field>
+            <field name="arch" type="xml">
+                <kanban version="7.0">
+                    <field name="picking_id"/>
+                    <field name="route_id"/>
+                    <field name="address_id"/>
+                    <field name="note"/>
+                    <field name="sequence"/>
+                    <field name="color"/>
+                    <field name="neighborhood"/>
+                    <field name="state"/>
+                    <field name="customer_date"/>
+                    <templates>
+                    <t t-name="kanban-box">
+                        <div style="width:175px;" t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_kanban_no_auto_height">
+                            <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
+                                <span class="oe_e">í</span>
+                                <ul class="oe_dropdown_menu">
+                                    <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                    <t t-if="record.state.raw_value == 'draft'"><li><ul class="oe_kanban_colorpicker" data-field="color"/></li></t>
+                                </ul>
+                            </div>
+                            <div class="oe_kanban_content">
+                                <div>
+                                    <field name="color"/> - 
+                                    <span t-if="record.neighborhood.raw_value != null"><field name="neighborhood"/> - </span>
+                                    <field name="street"/>
+                                    <div t-if="record.customer_date.raw_value != null"><field name="customer_date"/></div>
+                                </div>
+	                            <!--div class="oe_kanban_bottom_right">
+		                            <a name="set_van_0" type="object" class="oe_kanban_color_0 oe_kanban_button">No</a>
+		                            <a name="set_van_1" type="object" class="oe_kanban_color_1 oe_kanban_button">1</a>
+		                            <a name="set_van_2" type="object" class="oe_kanban_color_2 oe_kanban_button">2</a>
+		                            <a name="set_van_3" type="object" class="oe_kanban_color_3 oe_kanban_button">3</a>
+		                            <a name="set_van_4" type="object" class="oe_kanban_color_4 oe_kanban_button">4</a>
+		                            <a name="set_van_5" type="object" class="oe_kanban_color_5 oe_kanban_button">5</a>
+		                            <a name="set_van_6" type="object" class="oe_kanban_color_6 oe_kanban_button">6</a>
+		                            <a name="set_van_7" type="object" class="oe_kanban_color_7 oe_kanban_button">7</a>
+		                            <a name="set_van_8" type="object" class="oe_kanban_color_8 oe_kanban_button">8</a>
+		                            <a name="set_van_9" type="object" class="oe_kanban_color_9 oe_kanban_button">9</a>
+		                        </div-->
+		                        <div class="oe_clear"></div>
+                            </div>
+                            <div class="oe_clear"></div>
+                        </div>
+                    </t>
+                </templates>
+            </kanban>
+        </field>
+    </record>
+        
+        
+        <record id="view_stock_change_dts_wizard" model="ir.ui.view">
+            <field name="name">Change DTS / PTS</field>
+            <field name="model">delivery.change.dts</field>
+            <field name="arch" type="xml">
+                <form string="Change DTS / PTS" version="7.0">
+                    <group>
+                        <field name="action"/>
+                        <field name="dts_id" on_change="dts_id_change(dts_id, pts_id, context)" attrs="{'invisible':[('action','=','cleanup')]}"/>
+                        <field name="pts_id" domain="[('dts_id','=',dts_id)]" attrs="{'invisible':[('action','=','cleanup')]}"/>
+                    </group>
+                    <footer>
+                        <button name="change_dts" string="Update" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
+                </form>
+            </field>
+        </record>
+        
+        <act_window name="Change DTS / PTS"
+            res_model="delivery.change.dts"
+            src_model="stock.picking"
+            view_mode="form"
+            target="new"
+            key2="client_action_multi"
+            multi="True"
+            id="action_stock_change_dts_wizard"/>
+
+
+
+		<record model="ir.ui.view" id="delivery_driver_kanban_view">
+            <field name="name">delivery.driver.kanban</field>
+            <field name="model">delivery.driver</field>
+            <field name="arch" type="xml">
+                <kanban version="7.0" default_group_by="tmp_route_id">
+                    <field name="tmp_route_id"/>
+                    <field name="is_driver"/>
+                    <field name="is_picker"/>
+                    <field name="color"/>
+                    <templates>
+                    <t t-name="kanban-box">
+                        <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_kanban_no_auto_height">
+                            <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
+                                <span class="oe_e">í</span>
+                                <ul class="oe_dropdown_menu">
+                                    <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                </ul>
+                            </div>
+                            <div class="oe_kanban_content">
+                                <div><b><field name="name"/></b></div>
+                            </div>
+                            <div class="oe_clear"></div>
+                        </div>
+                    </t>
+                </templates>
+            </kanban>
+        </field>
+    </record>
+        
+        <!--record id="view_add_picking_pack" model="ir.ui.view">
+            <field name="name">Add Picking to Pack</field>
+            <field name="model">add.picking.pack</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Pack Delivery notes">
+                    <separator string="Pack the selected Delivery notes ?"/>
+                    <newline/>
+                    <button special="cancel" string="Cancel"/>
+                    <button name="confirm_add" string="Confirm" type="object"/>
+                </form>
+            </field>
+        </record>
+
+        <act_window name="Add Picking to Pack"
+            src_model="stock.picking"
+            res_model="add.picking.pack"
+            id="action_add_picking_pack_wizard"
+            view_mode="form"
+            multi="True"
+            key2="client_action_multi"
+            target="new"/-->
+           
+        <record id="view_to_be_deleted_soon" model="ir.ui.view">
+            <field name="name">TO BE DELETED SOON</field>
+            <field name="model">delivery.reset</field>
+            <field name="arch" type="xml">
+                <form string="RESET ALL DELIVERY" version="7.0">
+                    <footer>
+                        <button name="go" string="Confirm" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+		<act_window name="RESET ALL DELIVERY"
+            res_model="delivery.reset"
+            view_mode="form"
+            target="new"
+            id="action_resetall"/>
+        <menuitem action="action_resetall" name="RESET ALL DELIVERY" id="menu_action_resetall" parent="delivery_routes.menu_delivery_config" sequence="125"/>
+
+
+        
+        <!-- kanban view for stock picking with delivery-->
+        <record model="ir.ui.view" id="stock_picking_inout_kanban_elico">
+            <field name="name">stock.picking.out.kanban</field>
+            <field name="model">stock.picking</field>
+            <field name="arch" type="xml">
+                <kanban version="7.0" default_group_by="dts_id">
+                    <field name="dts_id"/>
+                    <field name="min_date"/>
+                    <field name="origin"/>
+                    <field name="partner_id"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div t-attf-class="oe_kanban_card oe_kanban_global_click">
+                                <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
+                                    <span class="oe_e">í</span>
+                                    <ul class="oe_dropdown_menu">
+                                        <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                        <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
+                                    </ul>
+                                </div>
+                                <div class="oe_kanban_content">
+                                    <div><b><field name="origin"/></b></div>
+                                    <div>
+                                        <field name="street"/><br />
+                                        <field name="min_date"/>
+                                    </div>
+                                </div>
+                                <div class="oe_clear"></div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+        
+        <record id="view_picking_search_kanban" model="ir.ui.view">
+            <field name="name">stock.picking.search.kanban</field>
+            <field name="model">stock.picking</field>
+            <field name="arch" type="xml">
+                <search string="PO + SO">
+                    <field name="name" string="Incoming Shipments" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
+                    <filter icon="terp-check" name="available" string="Ready to Process" domain="[('state','=','assigned')]" help="Incoming Shipments Available"/>
+                    <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Incoming Shipments already processed"/>
+                    <separator/>
+                    <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
+                    <separator/>
+                    <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]"/>
+                    <field name="stock_journal_id"/>
+                    <field name="product_id"/>
+                    <group expand="0" string="Group By...">
+                        <filter icon="terp-stock_effects-object-colorize" name="state" string="Status" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+                        <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'min_date'}"/>
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}"/>
+                        <filter icon="terp-go-today" string="DTS Today" name="dts_today" domain="[('dts_id.start_date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('dts_id.start_date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="DTS planned for Today"/>
+                        <filter icon="terp-go-today" string="DTS Today+Past" name="dts_min_today" domain="['|',('dts_id.start_date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('dts_id','=',None)]" help="DTS planned Today or before"/>
+                        <filter icon="terp-go-today" string="Today" domain="[('min_date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('min_date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+        <record id="action_picking_inout_kanban" model="ir.actions.act_window">
+            <field name="name">PO + SO / DTS</field>
+            <field name="res_model">stock.picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">tree</field>
+            <field name="view_mode">kanban,form</field>
+            <field name="domain">['&amp;','|','&amp;',('type','=','in'),'&amp;',('state','=','assigned'),("is_collected","=",True),'&amp;',('type','=','out'),("state","not in",["cancel"]),("delivery_state","in",['','not_planned','del_rt'])]</field>
+            <field name="context">{'contact_display': 'partner_address', 'update_pts':1, 'search_default_dts_min_today': 1}</field>
+            <field name="search_view_id" ref="view_picking_search_kanban"/>
+        </record>
+        <menuitem action="action_picking_inout_kanban" id="menu_action_picking_inout_kanban" parent="delivery_plan.menu_delivery_wizard" sequence="1"/>
+        <!-- stock picking with delivery end -->
+        
+
+
+
+        <!-- kanban view for stock picking with delivery-->
+        <record model="ir.ui.view" id="stock_picking_inout_kanban_elico">
+            <field name="name">stock.picking.out.kanban</field>
+            <field name="model">stock.picking</field>
+            <field name="arch" type="xml">
+                <kanban version="7.0" default_group_by="dts_id">
+                    <field name="dts_id"/>
+                    <field name="min_date"/>
+                    <field name="origin"/>
+                    <field name="partner_id"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div t-attf-class="oe_kanban_card oe_kanban_global_click">
+                                <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
+                                    <span class="oe_e">í</span>
+                                    <ul class="oe_dropdown_menu">
+                                        <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                        <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
+                                    </ul>
+                                </div>
+                                <div class="oe_kanban_content">
+                                    <div><b><field name="origin"/></b></div>
+                                    <div>
+                                        <field name="street"/><br />
+                                        <field name="min_date"/>
+                                    </div>
+                                </div>
+                                <div class="oe_clear"></div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+        <!--record model="ir.ui.view" id="stock_picking_in_kanban_elico">
+            <field name="name">stock.picking.in.kanban</field>
+            <field name="model">stock.picking.in</field>
+            <field name="arch" type="xml">
+                <kanban version="7.0" default_group_by="dts_id">
+                    <field name="dts_id"/>
+                    <field name="min_date"/>
+                    <field name="origin"/>
+                    <field name="partner_id"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div t-attf-class="oe_kanban_card oe_kanban_global_click">
+                                <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
+                                    <span class="oe_e">í</span>
+                                    <ul class="oe_dropdown_menu">
+                                        <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                        <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
+                                    </ul>
+                                </div>
+                                <div class="oe_kanban_content">
+                                    <div><b><field name="origin"/></b></div>
+                                    <div>
+                                        (<field name="name"/>)<br />
+                                        <field name="partner_id"/><br />
+                                        <field name="min_date"/>
+                                    </div>
+                                </div>
+                                <div class="oe_clear"></div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record-->
+        
+        <record id="view_picking_search_kanban" model="ir.ui.view">
+            <field name="name">stock.picking.search.kanban</field>
+            <field name="model">stock.picking</field>
+            <field name="arch" type="xml">
+                <search string="PO + SO">
+                    <field name="name" string="Incoming Shipments" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
+                    <filter icon="terp-check" name="available" string="Ready to Process" domain="[('state','=','assigned')]" help="Incoming Shipments Available"/>
+                    <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Incoming Shipments already processed"/>
+                    <separator/>
+                    <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
+                    <separator/>
+                    <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]"/>
+                    <field name="stock_journal_id"/>
+                    <field name="product_id"/>
+                    <group expand="0" string="Group By...">
+                        <filter icon="terp-stock_effects-object-colorize" name="state" string="Status" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+                        <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'min_date'}"/>
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}"/>
+                        <filter icon="terp-go-today" string="DTS Today" name="dts_today" domain="[('dts_id.start_date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('dts_id.start_date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="DTS planned for Today"/>
+                        <filter icon="terp-go-today" string="DTS Today+Past" name="dts_min_today" domain="['|',('dts_id.start_date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('dts_id','=',None)]" help="DTS planned Today or before"/>
+                        <filter icon="terp-go-today" string="Today" domain="[('min_date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('min_date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+        <record id="action_picking_inout_kanban" model="ir.actions.act_window">
+            <field name="name">PO + SO / DTS</field>
+            <field name="res_model">stock.picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">tree</field>
+            <field name="view_mode">kanban,form</field>
+            <field name="domain">['&amp;','|','&amp;',('type','=','in'),'&amp;',('state','=','assigned'),("is_collected","=",True),'&amp;',('type','=','out'),("state","not in",["cancel"]),("delivery_state","in",['','not_planned','del_rt'])]</field>
+            <field name="context">{'contact_display': 'partner_address', 'update_pts':1, 'search_default_dts_min_today': 1}</field>
+            <field name="search_view_id" ref="view_picking_search_kanban"/>
+        </record>
+        <menuitem action="action_picking_inout_kanban" id="menu_action_picking_inout_kanban" parent="delivery_plan.menu_delivery_wizard" sequence="1"/>
+        <!-- stock picking with delivery end -->
+        
+    </data>
+</openerp>
\ No newline at end of file

=== added directory 'delivery_routes'
=== added file 'delivery_routes/__init__.py'
--- delivery_routes/__init__.py	1970-01-01 00:00:00 +0000
+++ delivery_routes/__init__.py	2013-09-09 08:37:27 +0000
@@ -0,0 +1,34 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+# Copyright (c) 2011 Cubic ERP - Teradata SAC. (http://cubicerp.com).
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import stock
+import delivery
+import purchase 
+import wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'delivery_routes/__openerp__.py'
--- delivery_routes/__openerp__.py	1970-01-01 00:00:00 +0000
+++ delivery_routes/__openerp__.py	2013-09-09 08:37:27 +0000
@@ -0,0 +1,63 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 Cubic ERP - Teradata SAC (<http://cubicerp.com>).
+#    Copyright (C) 2013 Elico Corp (<http://www.elico-corp.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": "Delivery Routes",
+    "version": "1",
+    "description": """
+Manage delivery routes.
+=======================
+Based on Cubic ERP's Delivery Routes Module\n
+it add the following features:\n
+* Add group Customer Service
+* Add dts_id in purchase order, A purchase order with flag is_collected can have a delivery_route_line
+* Improve DTS , PTS. 
+* Improve Delivery carrier and driver, picker. Add color for delivery driver and picker.
+* Add interface functions with other modules sales, purchase, stock
+* use 3-seg daily dts/pts to arrange delivery.
+""",
+    "author": "Elico Corp",
+    "website": "http://www.elico-corp.com",
+    "category": "Stock Management",
+    "depends": [
+            "delivery",
+            "stock",
+            "hr",
+            #'quality_control_elico',
+        ],
+    "data":[
+            "security/delivery_security.xml",
+            "security/ir.model.access.csv",
+            "wizard/fill_picking.xml",
+            "wizard/select_range_view.xml",
+            "delivery_view.xml",
+            "delivery_sequence.xml",
+            "stock_view.xml",
+            "purchase_view.xml",
+            "wizard/stock_view.xml",
+    ],
+    "demo_xml": [ ],
+    "active": False,
+    "installable": True,
+    "certificate" : "",
+    'images': [],
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'delivery_routes/delivery.py'
--- delivery_routes/delivery.py	1970-01-01 00:00:00 +0000
+++ delivery_routes/delivery.py	2013-09-09 08:37:27 +0000
@@ -0,0 +1,660 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2012 Cubic ERP - Teradata SAC. (http://cubicerp.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 osv import fields, osv
+import time
+from datetime import datetime
+import pytz
+from tools.translate import _
+from tools import ustr
+import logging
+_logger = logging.getLogger(__name__)
+
+
+class sale_order(osv.osv):
+    _inherit = "sale.order"
+    
+    _columns = {
+        'so_payment_method': fields.char('Payment Method', size=32),
+    }
+sale_order()
+
+class delivery_driver(osv.osv):
+    _name='delivery.driver'
+    
+    _columns = {
+        'partner_id': fields.many2one('res.partner','Partner',help='Fill this field if the driver is a outsourcing of the company'),
+        'employee_id': fields.many2one('hr.employee','Employee',help='Fill this if the driver is a employee of the company'),
+        'name': fields.char('Name', size=64, required=True),
+        'carrier_id': fields.many2one('delivery.carrier','Carrier'),
+        'outsourcing': fields.boolean('Outsourcing ?'),
+        'route_ids': fields.one2many('delivery.route','driver_id','Delivery Routes'),
+        'is_driver': fields.boolean('Is Driver ?'),
+        'is_picker': fields.boolean('Is Picker ?'),
+        'active': fields.boolean('Active ?'),
+        'color': fields.integer('Color Index'),
+        'tmp_route_id': fields.many2one('delivery.route_tmp','Temporary Delivery Route'),
+    }
+    _defaults = {
+        'outsourcing': False,
+        'is_driver':   True,