Merge lp:~lin-yu/openobject-addons/elico-7.0 into lp:openobject-addons

[LIN Yu]

Add Module l10n_cn_reports (bilingual reports for Sales, Purchase, Stock, Invoice)
Add Module Stock Express Track
Add Module l10n_cn_fapiao

[lp:~lin-yu/openobject-addons/elico-7.0]

13. By <elicoidal <email address hidden>> <email address hidden> on 2013-11-29

[ADD] Intercompany module

14. By <elicoidal <email address hidden>> <email address hidden> on 2013-11-29

[IMP] Bug fixing and description

15. By <elicoidal <email address hidden>> <email address hidden> on 2013-11-29

[IMP] Bug fixing and description

16. By <elicoidal <email address hidden>> <email address hidden> on 2013-11-29

[ADD] l10n_cn modules

17. By <elicoidal <email address hidden>> <email address hidden> on 2013-11-29

[ADD] l10n_cn modules

18. By <elicoidal <email address hidden>> <email address hidden> on 2013-11-30

[IMP] cosmetic on descriptions

19. By <elicoidal <email address hidden>> <email address hidden> on 2013-11-30

[IMP] cosmetic on descriptions and logos

20. By <elicoidal <email address hidden>> <email address hidden> on 2013-11-30

[IMP] cosmetic on descriptions and logos

21. By <elicoidal <email address hidden>> <email address hidden> on 2013-12-25

[ADD] prepayment and sale_payment modules

22. By LIN Yu on 2013-12-30

[MERGE] from Augustin

Unmerged revisions

22. By LIN Yu on 2013-12-30

[MERGE] from Augustin

21. By <elicoidal <email address hidden>> <email address hidden> on 2013-12-25

[ADD] prepayment and sale_payment modules

20. By <elicoidal <email address hidden>> <email address hidden> on 2013-11-30

[IMP] cosmetic on descriptions and logos

19. By <elicoidal <email address hidden>> <email address hidden> on 2013-11-30

[IMP] cosmetic on descriptions and logos

18. By <elicoidal <email address hidden>> <email address hidden> on 2013-11-30

[IMP] cosmetic on descriptions

17. By <elicoidal <email address hidden>> <email address hidden> on 2013-11-29

[ADD] l10n_cn modules

16. By <elicoidal <email address hidden>> <email address hidden> on 2013-11-29

[ADD] l10n_cn modules

15. By <elicoidal <email address hidden>> <email address hidden> on 2013-11-29

[IMP] Bug fixing and description

14. By <elicoidal <email address hidden>> <email address hidden> on 2013-11-29

[IMP] Bug fixing and description

13. By <elicoidal <email address hidden>> <email address hidden> on 2013-11-29

[ADD] Intercompany module

=== added directory 'account_invoice_line'
=== added file 'account_invoice_line/__init__.py'
--- account_invoice_line/__init__.py	1970-01-01 00:00:00 +0000
+++ account_invoice_line/__init__.py	2013-12-30 03:21:22 +0000
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Author: Andy Lu <[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 account
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'account_invoice_line/__openerp__.py'
--- account_invoice_line/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_invoice_line/__openerp__.py	2013-12-30 03:21:22 +0000
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Author: LIN Yu <[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': 'Invoice Line',
+    'version': '1.1',
+    'category': 'Account',
+    'sequence': 19,
+    'summary': 'Invoice line',
+    'description': """
+Invoice Line
+==================================================
+* Add Account Invoice Line View
+* Add Account Invoice Type
+* Add Several New Fields to Invoice supplier_invoice_number, fapiao_date, partner_ref, reference_type
+    """,
+    'author': 'Elico Corp',
+    'website': 'http://www.elico-corp.com',
+    'images' : [],
+    'depends': ['account'],
+    'data': [
+        'account_view.xml',        
+        'security/ir.model.access.csv',
+    ],
+    'test': [],
+    'demo': [],
+    'installable': True,
+    'auto_install': False,
+    'application': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'account_invoice_line/account.py'
--- account_invoice_line/account.py	1970-01-01 00:00:00 +0000
+++ account_invoice_line/account.py	2013-12-30 03:21:22 +0000
@@ -0,0 +1,106 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Author: Andy Lu <[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 tools.translate import _
+import openerp.addons.decimal_precision as dp
+import time
+
+class account_invoice_type(osv.osv):
+    _name = "account.invoice.type"
+    _description = "Account Invoice Type"
+
+    _columns = {
+        'name': fields.char('Name',size=128, required=True, translate=True),
+    }
+
+account_invoice_type()
+
+class account_invoice(osv.osv):
+    _inherit = "account.invoice"
+
+    def _get_reference_type(self, cr, uid, context=None):
+        return [('none', _('Free Reference'))] #,
+    
+    _columns = {
+        'account_invoice_type': fields.many2one('account.invoice.type', 'Invoice Type'),
+        'supplier_invoice_number': fields.char('Supplier Inv Ref', size=64, help="The reference of this invoice as provided by the supplier."),
+        'fapiao_date': fields.date('V.A.T Date', ),
+        'partner_ref': fields.related('partner_id','ref',type='char', size=64, string='Partner Ref'),
+        'reference_type': fields.selection(_get_reference_type, 'Payment Reference',
+            required=True, readonly=True, states={'draft':[('readonly',False)]}),
+    }
+account_invoice()
+
+class account_invoice_line(osv.osv):
+    _inherit = "account.invoice.line"
+
+    def _amount_line_with_tax(self, cr, uid, ids, prop, arg, context=None):
+        res = {}
+        tax_obj = self.pool.get('account.tax')
+        cur_obj = self.pool.get('res.currency')
+        for line in self.browse(cr, uid, ids, context=context):
+            price = line.price_unit * (1-(line.discount or 0.0)/100.0)
+            taxes = tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, price, line.quantity, product=line.product_id, partner=line.invoice_id.partner_id, force_excluded=True)
+            res[line.id] = taxes['total']
+            if line.invoice_id:
+                cur = line.invoice_id.currency_id
+                res[line.id] = cur_obj.round(cr, uid, cur, res[line.id])
+        return res
+    
+    _columns = {
+        'amount_subtotal': fields.function(_amount_line_with_tax, string='Amount (Inc. Tax)', type='float', digits_compute=dp.get_precision('Account')),
+        'partner_ref': fields.related(
+                    'partner_id', 'ref',
+                    type='char', size=64,relation='res.partner',
+                    string='Partner Ref',select=1),
+        'type': fields.related(
+                    'invoice_id', 'type',
+                    type='char', size=64,relation='account.invoice',
+                    string='Type'),
+        'number': fields.related(
+                    'invoice_id', 'number',
+                    type='char', size=64,relation='account.invoice',
+                    string='Number',select=1),
+        'supplier_invoice_number': fields.related(
+                    'invoice_id', 'supplier_invoice_number',
+                    type='char', size=64,relation='account.invoice',
+                    string='Supplier Inv Ref',select=1),
+        'date_invoice': fields.related(
+                    'invoice_id', 'date_invoice',
+                    type='date', relation='account.invoice',
+                    string='Date Invoice',select=1),
+        'fapiao_date': fields.related(
+                    'invoice_id', 'fapiao_date',
+                    type='date', relation='account.invoice',
+                    string='V.A.T Date',select=1),
+        'state': fields.related(
+                    'invoice_id', 'state',
+                    type='char', size=16,relation='account.invoice',
+                    string='State'),
+        'reference': fields.related(
+                    'invoice_id', 'reference',
+                    type='char', size=16,relation='account.invoice',
+                    string='Reference'),
+    }
+account_invoice_line()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_invoice_line/account_view.xml'
--- account_invoice_line/account_view.xml	1970-01-01 00:00:00 +0000
+++ account_invoice_line/account_view.xml	2013-12-30 03:21:22 +0000
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        
+      
+		<!-- Invoice Line by LY-->
+
+		<record id="account_invoice_line_tree" model="ir.ui.view">
+            <field name="name">account_invoice_line_tree</field>
+            <field name="model">account.invoice.line</field>
+            <field name="inherit_id" ref="account.view_invoice_line_tree"/>
+            <field name="arch" type="xml">
+            
+            	<xpath expr="/tree" position="attributes">
+            		<attribute name="create">0</attribute>
+            		<attribute name="delete">0</attribute>
+            	</xpath>  
+            	<xpath expr="/tree/field[@name='name']" position="before">
+            		<field name="partner_ref"/>
+            		<field name="partner_id"/>
+            		<field name="supplier_invoice_number"/>
+            		<field name="number"/>
+                    <field name="fapiao_date"/>
+            		<field name="date_invoice"/>
+            		<field name="invoice_id" invisible='1'/>
+            		<field name="origin"/>
+                </xpath>
+                <xpath expr="/tree/field[@name='quantity']" position="replace">
+            		<field name="product_id"/>
+            		<field name="quantity" sum="Quantity"/>
+                </xpath>
+                <xpath expr="//field[@name='price_subtotal']" position="replace">
+                	<field name="amount_subtotal" sum="Amount"/>
+					<field name="amount_subtotal" sum="Amount(Inc.Tax)"/>
+					<field name="state"/>
+					<field name="reference" string='Reference'/>
+		        </xpath>
+            </field>
+        </record>
+		<record id="account_invoice_line_search" model="ir.ui.view">
+            <field name="name">account.invoice.line.search.elico</field>
+            <field name="model">account.invoice.line</field>
+            <field name="arch" type="xml">
+            	<search string="Search Invoice">
+            		<field name="number" string="Number" filter_domain="['|','|',('number','ilike',self),('supplier_invoice_number','ilike',self),('origin','ilike',self)]"/>
+            		<field name="supplier_invoice_number" string="Supplier Invoice Number" />
+            		<field name="partner_id" string="Partner"/>
+            		<field name="partner_ref" string="Partner ref"/>
+            		<field name="product_id" string="Product" />
+            		<filter icon="terp-go-today" string="Draft" domain="[('state','=','draft')]" help="draft"/>
+            		<filter icon="terp-go-today" string="Open" domain="[('state','not in',('done','draft','cancel'))]" help="draft"/>
+            		<filter icon="terp-go-today" string="Paid" domain="[('state','=','done')]" help="Paid"/>
+            		<filter icon="terp-go-today" string="Cancel" domain="[('state','=','cancel')]" help="Cancel"/>
+                    <separator/>
+                    <filter icon="terp-go-today" string="Today" domain="[('date_invoice','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date_invoice','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
+                    <group expand="0" string="Group By...">
+                    	<filter icon="terp-partner" string="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                    	<filter icon="terp-product" string="Product" domain="[]" context="{'group_by':'product_id'}"/>
+                    	<filter icon="terp-invoice" string="Invoice" domain="[]" context="{'group_by':'invoice_id'}"/>
+                    	<filter icon="terp-state" string="State" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+		
+		<record id="action_supplier_invoice_line" model="ir.actions.act_window">
+            <field name="name">Invoice Line</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.invoice.line</field>
+            <field name="context">{}</field>
+            <field name="domain">[('type','=','in_invoice')]</field>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="account.view_invoice_line_tree"/>
+            <field name="search_view_id" ref="account_invoice_line_search"/>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to check Invoice Line.
+              </p>
+            </field>
+        </record>
+		<menuitem id="suppler_invoice_line" name="Supplier Invoice Line" parent="account.menu_finance_payables" action="action_supplier_invoice_line" sequence="13"/>
+
+		
+		<record id="action_customer_invoice_line" model="ir.actions.act_window">
+            <field name="name">Invoice Line</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.invoice.line</field>
+            <field name="context">{}</field>
+            <field name="domain">[('type','=','out_invoice')]</field>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="account.view_invoice_line_tree"/>
+            <field name="search_view_id" ref="account_invoice_line_search"/>
+            <field name="help" type="html">
+        
+              <p class="oe_view_nocontent_create">
+                Click to check Invoice Line.
+              </p>
+            </field>
+        </record>
+		<menuitem id="customer_invoice_line" name="Customer Invoice Line" parent="account.menu_finance_receivables" action="action_customer_invoice_line" sequence="13"/>
+
+
+        <!--
+        Account Invoice
+        -->
+        <record model="ir.ui.view" id="invoice_ait_tree">
+            <field name="name">account.invoice.ait.tree</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_tree" />
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='partner_id']" position="before">
+                    <field name="partner_ref"/>
+                </xpath>
+                <xpath expr="//field[@name='partner_id']" position="after">
+                    <field name="supplier_invoice_number"/>
+                    <field name="fapiao_date"/>
+                </xpath>
+                <xpath expr="//field[@name='state']" position="before">
+                    <field name="account_invoice_type"/>
+                    <field name="reference"/>
+                    <field name="type" invisible="1"/>
+                </xpath>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="invoice_supplier_ait_form">
+            <field name="name">account.invoice.supplier.ait.form</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_supplier_form" />
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='supplier_invoice_number']" position="after">
+                    <field name="fapiao_date"/>
+                </xpath>            
+                <xpath expr="//field[@name='journal_id']" position="after">
+                    <field name="account_invoice_type"/>
+                </xpath>            
+                <xpath expr="//field[@name='price_subtotal']" position="after">
+                    <field name="amount_subtotal"/>
+                </xpath>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="invoice_ait_form">
+            <field name="name">account.invoice.ait.form</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_form" />
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='account_id']" position="after">
+                    <field name="supplier_invoice_number"/>
+                    <field name="fapiao_date"/>
+                </xpath>
+                <xpath expr="//field[@name='fiscal_position']" position="after">
+                    <field name="account_invoice_type"/>
+                </xpath>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="view_account_invoice_ait_filter">
+            <field name="name">account.invoice.ait.select</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.view_account_invoice_filter" />
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='user_id']" position="after">
+                    <field name="partner_ref"/>
+                    <field name="supplier_invoice_number"/>
+                    <field name="account_invoice_type"/>
+                    
+                    <filter string="Invoice" icon="terp-partner" domain="[('type','=','in_invoice')]"/>
+                    <filter string="Refund" icon="terp-partner" domain="[('type','=','in_refund')]"/>
+                    <separator/>
+                </xpath>
+                <xpath expr="//filter[@string='Journal']" position="after">
+                    <filter string="Tax Type" icon="terp-partner" domain="[]" context="{'group_by':'account_invoice_type'}"/>
+                    <filter string="Partner Ref" icon="terp-partner" domain="[]" context="{'group_by':'partner_ref'}"/>
+                    <filter string="Type" icon="terp-partner" domain="[]" context="{'group_by':'type'}"/>
+                </xpath>
+            </field>
+        </record>
+        
+
+        <!--
+        Account Invoice Tax Type
+        -->        
+        <record id="view_account_invoice_type" model="ir.ui.view">
+            <field name="name">account.invoice.type.view</field>
+            <field name="model">account.invoice.type</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="invoice type" editable="top">
+                    <field name="name"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="action_account_invoice_type" model="ir.actions.act_window">
+            <field name="name">Account Invoice Type</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.invoice.type</field>
+            <field name="view_id" ref="view_account_invoice_type"/>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
+        </record>
+        <!-- Menu -->
+        <menuitem action="action_account_invoice_type" id="menu_account_invoice_type" sequence="4" parent="account.menu_finance_configuration" />
+
+    </data>
+
+     <data noupdate="1">
+        <record id="ait_normal" model="account.invoice.type">
+            <field name="name">Normal</field>
+        </record>
+        <record id="ait_13" model="account.invoice.type">
+            <field name="name">13%</field>
+        </record>
+        <record id="ait_17" model="account.invoice.type">
+            <field name="name">17%</field>
+        </record>
+        <record id="ait_none" model="account.invoice.type">
+            <field name="name">None</field>
+        </record>
+    </data>
+</openerp>

=== added directory 'account_invoice_line/i18n'
=== added file 'account_invoice_line/i18n/zh_CN.po'
--- account_invoice_line/i18n/zh_CN.po	1970-01-01 00:00:00 +0000
+++ account_invoice_line/i18n/zh_CN.po	2013-12-30 03:21:22 +0000
@@ -0,0 +1,107 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* fc_account_invoice
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-03-29 02:28+0000\n"
+"PO-Revision-Date: 2013-03-29 02:28+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: account
+#: field:account.invoice,supplier_invoice_number:0
+msgid "Supplier Invoice Number"
+msgstr "增值税普票号码"
+
+#. module: account
+#: code:addons/account/account_invoice.py:92
+#, python-format
+msgid "Free Reference"
+msgstr "入库说明"
+
+#. module: fc_account_invoice
+#: field:account.invoice,fapiao_date:0
+msgid "Fapiao Date"
+msgstr "增值税开票日期"
+
+#. module: fc_account_invoice
+#: model:account.invoice.type,name:fc_account_invoice.ait_none
+msgid "None"
+msgstr "无"
+
+#. module: fc_account_invoice
+#: model:ir.actions.act_window,name:fc_account_invoice.action_account_invoice_type
+#: model:ir.model,name:fc_account_invoice.model_account_invoice_type
+#: model:ir.ui.menu,name:fc_account_invoice.menu_account_invoice_type
+msgid "Account Invoice Type"
+msgstr "发票税别"
+
+#. module: fc_account_invoice
+#: field:account.invoice.type,name:0
+msgid "Name"
+msgstr "名称"
+
+#. module: fc_account_invoice
+#: model:account.invoice.type,name:fc_account_invoice.ait_13
+msgid "13%"
+msgstr "13%"
+
+#. module: fc_account_invoice
+#: model:account.invoice.type,name:fc_account_invoice.ait_normal
+msgid "Normal"
+msgstr "普票"
+
+#. module: fc_account_invoice
+#: model:account.invoice.type,name:fc_account_invoice.ait_17
+msgid "17%"
+msgstr "17%"
+
+#. module: fc_account_invoice
+#: model:ir.model,name:fc_account_invoice.model_stock_picking
+msgid "Picking List"
+msgstr "分拣单"
+
+#. module: fc_account_invoice
+#: model:ir.model,name:fc_account_invoice.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "发票明细"
+
+#. module: fc_account_invoice
+#: field:account.invoice.line,amount_subtotal:0
+msgid "Amount (Inc. Tax)"
+msgstr "金额(含税)"
+
+#. module: fc_account_invoice
+#: view:account.invoice.type:0
+msgid "invoice type"
+msgstr "发票税别"
+
+#. module: fc_account_invoice
+#: model:ir.model,name:fc_account_invoice.model_account_invoice
+msgid "Invoice"
+msgstr "发票"
+
+#. module: fc_account_invoice
+#: view:account.invoice:0
+#: field:account.invoice,account_invoice_type:0
+msgid "Invoice Type"
+msgstr "发票税别"
+
+#. module: fc_account_invoice
+#: code:addons/fc_account_invoice/account.py:42
+#, python-format
+msgid "Free Reference"
+msgstr "入库说明"
+
+#. module: fc_account_invoice
+#: field:account.invoice,partner_ref:0
+msgid "Partner Ref"
+msgstr "编号"
+

=== added directory 'account_invoice_line/security'
=== added file 'account_invoice_line/security/ir.model.access.csv'
--- account_invoice_line/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ account_invoice_line/security/ir.model.access.csv	2013-12-30 03:21:22 +0000
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_invoice_type,account.invoice.type,account_invoice_line.model_account_invoice_type,account.group_account_invoice,1,1,1,1

=== added directory 'account_invoice_line/static'
=== added directory 'account_invoice_line/static/description'
=== added file 'account_invoice_line/static/description/account_invoice_line.png'
Binary files account_invoice_line/static/description/account_invoice_line.png	1970-01-01 00:00:00 +0000 and account_invoice_line/static/description/account_invoice_line.png	2013-12-30 03:21:22 +0000 differ
=== added file 'account_invoice_line/static/description/index.html'
--- account_invoice_line/static/description/index.html	1970-01-01 00:00:00 +0000
+++ account_invoice_line/static/description/index.html	2013-12-30 03:21:22 +0000
@@ -0,0 +1,16 @@
+<section class="oe_container">
+    <div class="oe_row">
+    <h2 class="oe_slogan">account_invoice_line Module</h2> 
+    <h3 class="oe_slogan">Individual Invoices for Each Item Product in Invoices</h3>
+    <h4 class="oe_slogan"><a href="http://www.elico-corp.com">By Elico Corp</a></h4>
+       <p>This module separates each item in the Customer and Supplier invoices into separate invoices. This allows for each of the separate invoices to be categorized by information type (i.e. company, item, V.A.T., account, etc.) enabling easier search and usage of different search filters.</p>
+                <p>This module also adds more fields that can be filled in the Supplier and Customer invoices which includes:<br>&nbsp; - &nbsp;Account<br>&nbsp; - &nbsp;Journal<br>&nbsp; - &nbsp;Supplier Inv. Ref.<br>&nbsp; - &nbsp;V.A.T. Date<br>&nbsp; - &nbsp;Invoice Type&nbsp;</p>
+        <div class="oe_row_img oe_centered oe_mt32">
+            <img class="oe_picture oe_screenshot" src="account_invoice_line.png">
+        </div>
+    </div>
+     <div class="oe_row oe_centeralign oe_more_space">
+            <a href="http://www.elico-corp.com/saas/" class="oe_button oe_big">Start your <span class="oe_emph">free</span> trial</a>
+        </div>
+        <h4 class="oe_slogan">or</h4>
+</section>

=== added directory 'account_invoice_line/static/src'
=== added directory 'account_invoice_line/static/src/img'
=== added file 'account_invoice_line/static/src/img/icon.png'
Binary files account_invoice_line/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and account_invoice_line/static/src/img/icon.png	2013-12-30 03:21:22 +0000 differ
=== added directory 'account_prepayment'
=== added file 'account_prepayment/__init__.py'
--- account_prepayment/__init__.py	1970-01-01 00:00:00 +0000
+++ account_prepayment/__init__.py	2013-12-30 03:21:22 +0000
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Author: Andy Lu <[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 account
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'account_prepayment/__openerp__.py'
--- account_prepayment/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_prepayment/__openerp__.py	2013-12-30 03:21:22 +0000
@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Author: Elico Corp <[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': 'Account Prepayment',
+    'version': '1.0',
+    'category': 'Account',
+    'sequence': 19,
+    'summary': 'Account Prepayment',
+    'description': """
+Prepayment Process with payment wizard
+==================================================
+Create the possibility to generate the prepayment  directly from the payment wizard:
+** add the prepayment account in the partner
+
+** add a check box in the payment form Prepayment: if checked the prepayment account in the partner will be chosen
+
+** Usage for Supplier:
+Normal Payment (Choose the invoice in the payment form)
+AP 		debit 	3000
+Bank 	Credit 	-3000
+
+
+** Prepayment Move (At money reception, use the payment form with prepayment and select no invoice). It creates:
+Prepayment 		debit 	1000
+Bank 			Credit 	-1000
+
+** Create an Invoice
+AP				Credit 	-3000
+Sales 			Debit 	3000
+
+** New Payment (after invoice is created)
+Use the payment form (no prepayment option and select the invoice and already existing Prepayment move)
+Prepayment 		Credit 	-1000
+AP	 			Debit 	3000
+Bank			Credit	-2000
+
+    """,
+    'author': 'Elico Corp',
+    'website': 'http://www.elico-corp.com',
+    'images' : [],
+    'depends': ['account', 'account_voucher'],
+    'data': [
+        'account_view.xml',
+    ],
+    'test': [],
+    'demo': [],
+    'installable': True,
+    'auto_install': False,
+    'application': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_prepayment/account.py'
--- account_prepayment/account.py	1970-01-01 00:00:00 +0000
+++ account_prepayment/account.py	2013-12-30 03:21:22 +0000
@@ -0,0 +1,82 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Author: Elico Corp <[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 tools.translate import _
+
+class res_partner(osv.osv):
+    _inherit = 'res.partner'
+
+    _columns = {
+        'property_account_prepayable': fields.property(
+            'account.account',
+            type='many2one',
+            relation='account.account',
+            string="Account Payable (Prepayment)",
+            view_load=True,
+            domain="[('type', '=', 'payable')]",
+            help="This account will be used instead of the default one as the prepayment payable account for the current partner",
+            required=True),
+        'property_account_prereceivable': fields.property(
+            'account.account',
+            type='many2one',
+            relation='account.account',
+            string="Account Receivable (Prepayment)",
+            view_load=True,
+            domain="[('type', '=', 'receivable')]",
+            help="This account will be used instead of the default one as the prepayment receivable account for the current partner",
+            required=True),
+    }
+
+class account_voucher(osv.osv):
+    _inherit = "account.voucher"
+    
+    _columns = {
+        'use_prepayment_account': fields.boolean('Use Prepayment account', help="Check this if you want to input a prepayment on the prepayment accounts."),
+    }
+    _defaults = {
+        'use_prepayment_account': False,
+    }
+    
+    def writeoff_move_line_get(self, cr, uid, voucher_id, line_total, move_id, name, company_currency, current_currency, context=None):
+        line_vals = super(account_voucher, self).writeoff_move_line_get(cr, uid, voucher_id, line_total, move_id, name, company_currency, current_currency, context=context)
+        if line_vals:            
+            account_id = False
+            voucher_brw = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
+            if voucher_brw.use_prepayment_account:
+                if voucher_brw.payment_option == 'with_writeoff':
+                    account_id = voucher_brw.writeoff_acc_id.id
+                elif voucher_brw.type in ('sale', 'receipt'):
+                    if not voucher_brw.partner_id.property_account_prereceivable:
+                        raise osv.except_osv(_('Unable to validate payment !'), _('Please configure the partner Prereceivable Account at first!'))
+                    account_id = voucher_brw.partner_id.property_account_prereceivable.id
+                else:
+                    if not voucher_brw.partner_id.property_account_prepayable:
+                        raise osv.except_osv(_('Unable to validate payment !'), _('Please configure the partner Prepayable Account at first!'))
+                    account_id = voucher_brw.partner_id.property_account_prepayable.id
+                if account_id:                    
+                    line_vals['account_id'] = account_id
+        return line_vals
+account_voucher()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_prepayment/account_view.xml'
--- account_prepayment/account_view.xml	1970-01-01 00:00:00 +0000
+++ account_prepayment/account_view.xml	2013-12-30 03:21:22 +0000
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        
+        <!--
+        Partners Extension
+        -->
+        <record id="view_partner_preaccount_property_form" model="ir.ui.view">
+            <field name="name">res.partner.preaccount.property.form.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="priority">3</field>
+            <field name="inherit_id" ref="account.view_partner_property_form"/>
+            <field name="arch" type="xml">
+				<xpath expr="//field[@name='property_account_receivable']" position="after">
+					<field name="property_account_prereceivable" groups="account.group_account_invoice" />
+		        </xpath>
+				<xpath expr="//field[@name='property_account_payable']" position="after">
+					<field name="property_account_prepayable" groups="account.group_account_invoice" />
+		        </xpath>
+            </field>
+        </record>    
+        
+		<record model="ir.ui.view" id="view_vendor_prepayment_form">
+            <field name="name">account.voucher.prepayment.form</field>
+            <field name="model">account.voucher</field>
+			<field name="inherit_id" ref="account_voucher.view_vendor_payment_form" />
+			<field name="arch" type="xml">
+				<xpath expr="//field[@name='journal_id']" position="after">
+					<field name="use_prepayment_account"/>
+		        </xpath>				
+			</field>
+		</record>   
+        
+		<record model="ir.ui.view" id="view_vendor_prereceipt_form">
+            <field name="name">account.voucher.prereceipt.form</field>
+            <field name="model">account.voucher</field>
+			<field name="inherit_id" ref="account_voucher.view_vendor_receipt_form" />
+			<field name="arch" type="xml">
+				<xpath expr="//field[@name='journal_id']" position="after">
+					<field name="use_prepayment_account"/>
+		        </xpath>				
+			</field>
+		</record>
+
+    </data>
+</openerp>

=== added directory 'account_prepayment/i18n'
=== added file 'account_prepayment/i18n/zh_CN.po'
--- account_prepayment/i18n/zh_CN.po	1970-01-01 00:00:00 +0000
+++ account_prepayment/i18n/zh_CN.po	2013-12-30 03:21:22 +0000
@@ -0,0 +1,76 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* fc_account_prepayment
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-03-13 06:33+0000\n"
+"PO-Revision-Date: 2013-03-13 06:33+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_account_prepayment
+#: field:res.partner,property_account_prepayable:0
+msgid "Account Prepayable"
+msgstr "预付科目"
+
+#. module: fc_account_prepayment
+#: code:addons/fc_account_prepayment/account.py:70
+#, python-format
+msgid "Please configure the partner Prereceivable Account at first!"
+msgstr "请先配置客户预收账款科目!"
+
+#. module: fc_account_prepayment
+#: model:ir.model,name:fc_account_prepayment.model_account_voucher
+msgid "Accounting Voucher"
+msgstr "手工凭证"
+
+#. module: fc_account_prepayment
+#: code:addons/fc_account_prepayment/account.py:74
+#, python-format
+msgid "Please configure the partner Prepayable Account at first!"
+msgstr "请先配置供应商预付账款科目!"
+
+#. module: fc_account_prepayment
+#: help:res.partner,property_account_prereceivable:0
+msgid "This account will be used instead of the default one as the prereceivable account for the current partner"
+msgstr "当前客户的预收账款科目"
+
+#. module: fc_account_prepayment
+#: help:account.voucher,use_prepayment_account:0
+msgid "Check this if you receive or pay amounts in advance."
+msgstr "如果你要创建预收或者预付凭证，请选择此项."
+
+#. module: fc_account_prepayment
+#: code:addons/fc_account_prepayment/account.py:70
+#: code:addons/fc_account_prepayment/account.py:74
+#, python-format
+msgid "Unable to validate payment !"
+msgstr "不能审核该笔支付 !"
+
+#. module: fc_account_prepayment
+#: field:account.voucher,use_prepayment_account:0
+msgid "Use Prepayment account"
+msgstr "使用预付/预收科目"
+
+#. module: fc_account_prepayment
+#: help:res.partner,property_account_prepayable:0
+msgid "This account will be used instead of the default one as the prepayable account for the current partner"
+msgstr "当前供应商的预付账款科目"
+
+#. module: fc_account_prepayment
+#: model:ir.model,name:fc_account_prepayment.model_res_partner
+msgid "Partner"
+msgstr "业务伙伴"
+
+#. module: fc_account_prepayment
+#: field:res.partner,property_account_prereceivable:0
+msgid "Account Prereceivable"
+msgstr "预收科目"
+

=== 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-12-30 03:21:22 +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-12-30 03:21:22 +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-12-30 03:21:22 +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.elico-corp.com">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/saas/" class="oe_button oe_big">Start your <span class="oe_emph">free</span> trial</a>
+        </div>
+        <h4 class="oe_slogan">or</h4>
+</section>

=== added directory 'account_prepayment/static/src'
=== added directory 'account_prepayment/static/src/img'
=== added file 'account_prepayment/static/src/img/icon.png'
Binary files account_prepayment/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and account_prepayment/static/src/img/icon.png	2013-12-30 03:21:22 +0000 differ
=== added directory 'base_intercompany'
=== added file 'base_intercompany/__init__.py'
--- base_intercompany/__init__.py	1970-01-01 00:00:00 +0000
+++ base_intercompany/__init__.py	2013-12-30 03:21:22 +0000
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Augustin Cisterne-Kaas <[e-mail]>
+#    Eric Caudal <[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 company
+import sale
+import purchase
+# import stock_picking
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'base_intercompany/__openerp__.py'
--- base_intercompany/__openerp__.py	1970-01-01 00:00:00 +0000
+++ base_intercompany/__openerp__.py	2013-12-30 03:21:22 +0000
@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Augustin Cisterne-Kaas <[e-mail]>
+#    Eric Caudal <[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': 'Base Inter-Company',
+    'version': '1.0',
+    'author': 'Elico Corp',
+    'website': 'http://www.elico-corp.com',
+    'summary': '',
+    'description': """
+Inter-Company Processing (ICOPS)
+This module is designed to manage Inter-company Process (ICOPS) and allow 2 companies to create objects in each other:
+- When a PO to company B is created in company A, it creates automatically a SO in company B
+- When a SO to company B is created in company A, it creates automatically a PO in company B
+- Update PO from/to SO
+- Confirm SO for PO and vice versa
+- It is generic enough to allow intercompany process companies in cascade
+- it can be uni-directional/bi-directional (eg SO in company A creates PO in company B and when the PO is validated in company B it validate the SO in company A).
+
+Works fine with SO/PO
+Under construction: Sales invoice/Purchase invoice and Stock Moves
+Blueprint: https://blueprints.launchpad.net/multi-company/+spec/icops
+
+
+    """,
+    'depends': ['base', 'sale', 'stock',
+                'sale_stock', 'purchase', 'account_cancel',
+                'multi_company', ],
+    'category': 'Sale',
+    'sequence': 10,
+    'demo': ['base_intercompany_demo.xml'],
+    'data': [
+        'company_view.xml',
+        'sale_wkf.xml',
+        'purchase_wkf.xml',
+        #'stock_picking_wkf.xml',
+        'security/intercompany_security.xml',
+        'security/ir.model.access.csv'],
+    'test': [],
+    'installable': True,
+    'application': False,
+    'auto_install': False,
+    'css': [],
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'base_intercompany/base_intercompany_demo.xml'
--- base_intercompany/base_intercompany_demo.xml	1970-01-01 00:00:00 +0000
+++ base_intercompany/base_intercompany_demo.xml	2013-12-30 03:21:22 +0000
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="0">
+        <record id="partner_icops1" model="res.partner">
+            <field name="name">ICOPS User 1</field>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="customer" eval="False"/>
+            <field name="email">[e-mail]</field>
+        </record>
+
+        <record id="user_icops1" model="res.users">
+            <field name="partner_id" ref="partner_icops1"/>
+            <field name="login">icops1</field>
+            <field name="password">icops1</field>
+            <field name="signature">--
+Mr Icops 1</field>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="company_ids" eval="[(6,0,[ref('base.main_company')])]" />
+            <field name="groups_id" eval="[(6,0,[ref('base.group_user'), ref('base.group_partner_manager'), ref('base.group_sale_manager'), ref('purchase.group_purchase_manager'), ref('group_intercompany_user')])]"/>
+        </record>
+        <record id="partner_icops2" model="res.partner">
+            <field name="name">ICOPS User 2</field>
+            <field name="company_id" ref="multi_company.res_company_oerp_be"/>
+            <field name="customer" eval="False"/>
+            <field name="email">[e-mail]</field>
+        </record>
+
+        <record id="user_icops2" model="res.users">
+            <field name="partner_id" ref="partner_icops2"/>
+            <field name="login">icops2</field>
+            <field name="password">icops2</field>
+            <field name="signature">--
+Mr Icops 2</field>
+            <field name="company_id" ref="multi_company.res_company_oerp_be"/>
+            <field name="company_ids" eval="[(6,0,[ref('multi_company.res_company_oerp_be')])]" />
+            <field name="groups_id" eval="[(6,0,[ref('base.group_user'), ref('base.group_partner_manager'), ref('base.group_sale_manager'), ref('purchase.group_purchase_manager'), ref('group_intercompany_user')])]"/>
+        </record>
+        <record id="stock_location_shop_icops_1" model="stock.location">
+            <field model="res.partner" name="partner_id" ref="partner_icops1" />
+            <field name="company_id" ref="base.main_company"/>
+            <field name="location_id" ref="stock.stock_location_locations"/>
+            <field name="usage">internal</field>
+            <field eval="1" name="active"/>
+            <field name="name">Icops 1 shop</field>
+        </record>
+        <record id="stock_warehouse_shop_icops_1" model="stock.warehouse">
+                    <field name="lot_output_id" ref="stock_location_shop_icops_1"/>
+                    <field name="name">Icops 1 Warehouse</field>
+                    <field name="lot_stock_id" ref="stock_location_shop_icops_1"/>
+                    <field model="res.partner" name="partner_id" ref="partner_icops1" />
+                    <field name="company_id" ref="base.main_company"/>
+                    <field name="lot_input_id" ref="stock_location_shop_icops_1"/>
+        </record>
+        <record id="sale_shop_icops_1" model="sale.shop">
+            <field name="name">Icops 1 sale shop</field>
+            <field model="account.payment.term" name="payment_default_id" search="[]"/>
+            <field name="warehouse_id" ref="stock_warehouse_shop_icops_1"/>
+        </record>
+        <record id="stock_location_shop_icops_2" model="stock.location">
+            <field model="res.partner" name="partner_id" ref="partner_icops2" />
+            <field name="company_id" ref="multi_company.res_company_oerp_be"/>
+            <field name="location_id" ref="stock.stock_location_locations"/>
+            <field name="usage">internal</field>
+            <field eval="1" name="active"/>
+            <field name="name">Icops 2 shop</field>
+        </record>
+        <record id="stock_warehouse_shop_icops_2" model="stock.warehouse">
+                    <field name="lot_output_id" ref="stock_location_shop_icops_2"/>
+                    <field name="name">Icops 2 Warehouse</field>
+                    <field name="lot_stock_id" ref="stock_location_shop_icops_2"/>
+                    <field model="res.partner" name="partner_id" ref="partner_icops2" />
+                    <field name="company_id" ref="multi_company.res_company_oerp_be"/>
+                    <field name="lot_input_id" ref="stock_location_shop_icops_2"/>
+        </record>
+        <record id="sale_shop_icops_2" model="sale.shop">
+            <field name="name">Icops 2 sale shop</field>
+            <field model="account.payment.term" name="payment_default_id" search="[]"/>
+            <field name="warehouse_id" ref="stock_warehouse_shop_icops_2"/>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file

=== added file 'base_intercompany/company.py'
--- base_intercompany/company.py	1970-01-01 00:00:00 +0000
+++ base_intercompany/company.py	2013-12-30 03:21:22 +0000
@@ -0,0 +1,154 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Augustin Cisterne-Kaas <[e-mail]>
+#    Eric Caudal <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import orm, fields
+
+
+class res_intercompany(orm.Model):
+    _name = "res.intercompany"
+    _description = "Inter-Company"
+
+    def get_intercompany(self, cr, uid, obj_id,
+                         obj_class_name, obj_name, context=None):
+        """
+        get company from and to
+        """
+
+        assert isinstance(obj_id, int) or isinstance(obj_id, long)
+        obj = self.pool.get(obj_class_name).browse(
+            cr,
+            uid,
+            obj_id,
+            context=None)
+        company = obj.company_id
+        ic_uid_ids = None
+        company_to_ids = []
+        for ic in company.intercompany_ids:
+            if ic.obj2obj == obj_name:
+                company_to_ids.append(ic.company_to.id)
+                ic_uid_ids = ic.intercompany_uid.id
+        if company.intercompany_ids:
+            ic_uid_ids = company.intercompany_ids[0].intercompany_uid.id
+        return obj.company_id.id, company_to_ids, ic_uid_ids
+
+    def _check_intercompany_user(self, cr, uid, ids, context=None):
+        for ic in self.browse(cr, uid, ids, context=context):
+            if not ic.intercompany_uid:
+                return False
+        return True
+
+    _columns = {
+        'company_from': fields.many2one('res.company', 'Company From',
+                                        required=True, ondelete='cascade'),
+        'company_to': fields.many2one('res.company', 'Company', required=True,
+                                      ondelete='cascade'),
+        'obj2obj': fields.selection(
+            [('so2po', 'SO to PO'),
+             ('po2so', 'PO to SO'),
+             ('is2do', 'IS to DO'),
+             ('do2is', 'DO to IS'),
+             ('ci2si', 'CI to SI'),
+             ('si2ci', 'SI to CI')],
+            string="Relation", required=True),
+        'status': fields.selection(
+            [('draft', 'On Creation'),
+             ('confirm', 'On Confirmation'),
+             ('cancel', 'On Cancel'),
+             ('unlink', 'On Deletion')],
+            string='Status', required=True),
+        'direction': fields.selection(
+            [('bidirectional', 'Bidirectional'),
+             ('regular', 'Regular'),
+             ('inverse', 'Inverse')],
+            'Modification Direction', required=True),
+        'auto_confirm': fields.boolean('Automatic Confirm'),
+        'intercompany_uid': fields.related(
+            'company_to', 'intercompany_uid', type='many2one',
+            relation='res.users', readonly=True, string='IC User'),
+    }
+    _defaults = {
+        'auto_confirm': lambda *a: True,
+        'direction': lambda *a: 'bidirectional',
+    }
+
+    _constraints = [
+        (_check_intercompany_user, 'Please set IC user for the Company first',
+            ['intercompany_uid'])
+    ]
+
+    def check_need_create_intercompany_object(
+            self, cr, uid, company_from, company_to, o2o_field_name,
+            node=None, return_list_type=False):
+        """ @company_from
+            @company_to
+            @o2o_field_name  file name.Example, so2po po2so ,,,,
+            @node  value of  o2o_field_name ,  draft, confirm
+            @return_list_type,  the return type is list or boolean
+        """
+
+        if type(company_to) != list:
+            company_to = [company_to]
+
+        intercompany_ids = self.search(
+            cr, uid,
+            [('company_from', '=', company_from),
+             ('company_to', 'in', company_to),
+             ('obj2obj', '=', o2o_field_name),
+             ('status', '=', node)])
+        if return_list_type:
+            return intercompany_ids
+        else:
+            return intercompany_ids and True or False
+
+    def check_need_automatic_confirm(
+            self, cr, uid, company_from, company_to,
+            o2o_field_name, node=None, return_list_type=False):
+        """
+        check is need to automatic confirm internal company object
+        """
+        intercompany_ids = self.search(
+            cr, uid,
+            [('company_from', '=', company_from),
+             ('company_to', '=', company_to),
+             (o2o_field_name, '=', node),
+             ('auto_confirm', '=', True)])
+        return intercompany_ids and True or False
+
+
+class res_company(orm.Model):
+    _inherit = "res.company"
+
+    _columns = {
+        'intercompany_ids': fields.one2many(
+            'res.intercompany', 'company_from', 'Inter-Company Setup'),
+        'intercompany_uid': fields.many2one(
+            'res.users', 'IC User',
+            required=True,
+            domain="[('company_id', '=', id)]",
+            help="User to create update unlink IC records"),
+        'intercompany_shop_id': fields.many2one(
+            'sale.shop', 'IC Default location',
+            domain="[('company_id', '=', id)]")
+    }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'base_intercompany/company_view.xml'
--- base_intercompany/company_view.xml	1970-01-01 00:00:00 +0000
+++ base_intercompany/company_view.xml	2013-12-30 03:21:22 +0000
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="inherit_view_intercompany_form" model="ir.ui.view">
+            <field name="name">res.intercompany.form</field>
+            <field name="model">res.company</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//page[@string='Configuration']" position="before">
+                    <page string="InterCompany" groups="base.group_multi_company">
+                        <group string="Intercompany">
+                            <field name="intercompany_uid" />
+                            <field name="intercompany_shop_id" />
+	                        <field name="intercompany_ids">
+	                            <tree editable="bottom">
+	                                <field name="company_to"/>
+	                                <field name='intercompany_uid'/>
+	                                <field name="obj2obj"/> 
+                                    <field name="status" />
+	                                <field name="direction"/>
+	                                <field name="auto_confirm"/>
+	                            </tree>
+	                        </field>
+                        </group>
+                    </page>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added directory 'base_intercompany/icops'
=== added file 'base_intercompany/icops/__init__.py'
--- base_intercompany/icops/__init__.py	1970-01-01 00:00:00 +0000
+++ base_intercompany/icops/__init__.py	2013-12-30 03:21:22 +0000
@@ -0,0 +1,1 @@
+import order

=== added file 'base_intercompany/icops/order.py'
--- base_intercompany/icops/order.py	1970-01-01 00:00:00 +0000
+++ base_intercompany/icops/order.py	2013-12-30 03:21:22 +0000
@@ -0,0 +1,157 @@
+from openerp import SUPERUSER_ID
+from openerp.osv import osv
+from openerp.tools.translate import _
+from openerp import netsvc
+
+
+class icops_order(object):
+
+    def __init__(self, obj):
+        self.obj = obj
+        self.obj2obj_1 = 'so2po'
+        self.obj2obj_2 = 'po2so'
+        self.attr_id_1 = 'purchase_id'
+        self.attr_id_2 = 'sale_id'
+        self.name_2 = 'purchase.order'
+        self.confirm = 'purchase_confirm'
+        if self.obj._name == 'purchase.order':
+            self.confirm = 'order_confirm'
+            self.obj2obj_1 = 'po2so'
+            self.obj2obj_2 = 'so2po'
+            self.name_2 = 'sale.order'
+            self.attr_id_1 = 'sale_id'
+            self.attr_id_2 = 'purchase_id'
+        self.order_pool = self.obj.pool.get(self.name_2)
+
+    def create_intercompany(self, cr, uid, ids, node='draft', context=None):
+        ic_pool = self.obj.pool.get('res.intercompany')
+        company_from, company_to, ic_uid = ic_pool.get_intercompany(
+            cr, uid, ids[0], self.obj._name, self.obj2obj_1, context=context)
+        if ic_pool.check_need_create_intercompany_object(
+                cr, uid, company_from, company_to, self.obj2obj_1, node):
+            self._create_intercompany(
+                cr, uid, ids[0], company_to, ic_uid, context=context)
+        return True
+
+    def _create_intercompany(
+            self, cr, uid, id, company_to, ic_uid, context=None):
+        if isinstance(company_to, list):
+            company_to = company_to[0]
+        context = context or {}
+        order = self.obj.read(cr, uid, id, ['partner_id'], context=context)
+        company = self.obj.pool.get('res.company').read(
+            cr, ic_uid, company_to, ['partner_id'], context=context)
+        if order['partner_id'] != company['partner_id']:
+            return None
+        order_data = self.obj._prepare_IC(
+            cr, uid, id, company_to,
+            ic_uid, context=context)
+        if not 'is_locked' in context:
+            order_pool = self.obj.pool.get(self.name_2)
+            res = order_pool.create(cr, ic_uid, order_data, context=context)
+            data = {self.attr_id_1: res}
+            self.obj.write(
+                cr, uid, id, data, context=context)
+
+            return res
+
+    def action(self, cr, uid, ids, values=None, state='draft', context=None):
+        if not isinstance(ids, list):
+            ids = [ids]
+        for order in self.obj.read(
+                cr, uid, ids,
+                ['company_id', self.attr_id_1], context=context):
+            if not self.attr_id_1 in order:
+                continue
+            if values and 'state' in values:
+                if values['state'] == 'cancel':
+                    state = 'cancel'
+                elif values['state'] == 'confirmed':
+                    return
+            company_pool = self.obj.pool.get('res.company')
+            company = company_pool.read(
+                cr, uid, order['company_id'][0],
+                ['intercompany_ids'], context=context)
+            self.loop(
+                cr, uid, order['id'], company['intercompany_ids'], 'regular',
+                self.obj2obj_1, state, context)
+            company = None
+            if not order[self.attr_id_1]:
+                continue
+            obj = self.obj.pool.get(self.name_2).read(
+                cr, SUPERUSER_ID, order[self.attr_id_1][0],
+                ['company_id'], context=context)
+            if not obj:
+                continue
+            company = company_pool.read(
+                cr, SUPERUSER_ID, obj['company_id'][0],
+                ['intercompany_uid', 'intercompany_ids'], context=context)
+            ic_uid = company['intercompany_uid'][0]
+            self.loop(
+                cr, ic_uid, obj['id'],
+                company['intercompany_ids'], 'inverse', self.obj2obj_2,
+                state, context=context)
+        return True
+
+    def loop(
+            self, cr, uid, id, icops_ids,
+            direction, obj2obj, state, context=None):
+
+        order_pool = self.obj.pool.get(self.name_2)
+        opposite_direction = 'inverse' if direction == 'regular' else 'regular'
+        icops_pool = self.obj.pool.get('res.intercompany')
+        ic_att = ['obj2obj', 'status', 'intercompany_uid', 'direction',
+                  'company_to']
+        for ic in icops_pool.read(cr, uid, icops_ids, ic_att, context=context):
+            if ic['obj2obj'] != obj2obj or ic['status'] != state:
+                continue
+
+            ic_uid = ic['intercompany_uid'][0]
+            ic_order_ids = order_pool.search(
+                cr, ic_uid,
+                [(self.attr_id_2, '=', id)], context=context)
+            ic_order_id = ic_order_ids and ic_order_ids[0]
+            if((ic['direction'] == direction
+                    or ic['direction'] == 'bidirectional')
+                or
+                    ('force_update' in context)):
+                context['is_external'] = True
+                if state == 'draft':
+                    data = self.obj._prepare_IC(
+                        cr, uid, id, ic['company_to'][0], ic_uid,
+                        context=context)
+                    obj = order_pool.read(cr, ic_uid, ic_order_id, ['state'],
+                                          context=context)
+                    try:
+                        if not isinstance(obj, dict):
+                            continue
+                        if obj['state'] == "progress" and 'order_line' in data:
+                            data.pop('order_line')
+                    except:
+                        pass
+                    order_pool.write(
+                        cr, ic_uid, ic_order_id, data, context=context)
+                elif state == 'cancel':
+
+                    try:
+                        order_pool.action_cancel(
+                            cr, ic_uid, [ic_order_id], context=context)
+                    except:
+                        continue
+                elif state == 'confirm':
+                    if self.obj._name == 'purchase.order':
+                        order_pool.action_wait(
+                            cr, ic_uid, [ic_order_id], context=context)
+                        continue
+                    order_pool.wkf_confirm_order(
+                        cr, ic_uid, [ic_order_id], context=context)
+                elif state == 'unlink':
+                    order_pool.unlink(
+                        cr, SUPERUSER_ID, ic_order_id, context=context)
+
+            elif(not 'is_external' in context and
+                 ic['direction'] == opposite_direction):
+                raise osv.except_osv(
+                    _('Error!'),
+                    _('You can\'t edit this %s mode quotation'
+                        % opposite_direction))

=== added file 'base_intercompany/invoice.py'
--- base_intercompany/invoice.py	1970-01-01 00:00:00 +0000
+++ base_intercompany/invoice.py	2013-12-30 03:21:22 +0000
@@ -0,0 +1,198 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#     Jon Chow <[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
+from openerp import SUPERUSER_ID
+
+
+class account_invoice(osv.osv):
+    _inherit = "account.invoice"
+    _name = "account.invoice"
+
+    _columns = {
+        'is_locked': fields.boolean('Locked for Intercompany'),
+        'ic_create': fields.boolean('Intercompany Invoice generated'),
+        'invoice_ic_id': fields.many2one('account.invoice', 'Invoice'),
+    }
+
+    def get_from_to_company(self, cr, uid, ids, context=None):
+        """ get company from and to """
+        assert len(ids) == 1
+        cr.execute(""" 
+            SELECT
+                inv.company_id AS from_c, cmp.id AS to_c
+            FROM account_invoice AS inv
+                LEFT JOIN res_partner as part ON (inv.partner_id = part.id)
+                LEFT JOIN res_company as cmp  ON (part.id = cmp.partner_id )
+            WHERE inv.id=%s """, (ids[0],),
+        )
+        return cr.fetchone()
+
+    def need_to_create_intercompany_invoice(self, cr, uid, ids, o2o_field_name=None, node=None, context=None):
+        """
+        @o2o_field_name  
+        @node,  draft' or 'confirm', res.intercompany.so2po value ,
+        return boolean
+        """
+        company_from, company_to = self.get_from_to_company(cr, uid, ids, context=context)
+        need = self.pool.get('res.intercompany').check_need_create_intercompany_object(cr, uid, company_from, company_to, o2o_field_name, node)
+        return need
+
+    def action_draft(self, cr, uid, ids, context=None):
+        """
+        Picking wkf Draft action,
+        Use Administrator operate intercompany action
+        """
+        assert len(ids) == 1
+        self.action_intercompany(cr, SUPERUSER_ID, ids, node='draft', context=context)
+        return True
+
+    def action_intercompany(self, cr, uid, ids, node=None, context=None):
+        """
+        if CI, create SI
+        if SI, create CI
+        @node, draft or confirm,  
+        """
+        assert len(ids) == 1
+        cr.execute(""" SELECT type FROM account_invoice WHERE id=%s """,(ids[0],))
+        invoice_type = cr.fetchone()[0]
+
+        if invoice_type in ['in_invoice', 'out_invoice']:
+            #if type=in, check is2do,  type=out,
+            o2o_field_name = invoice_type=='in_invoice' and 'ci2si' or 'si2ci'
+            if self.need_to_create_intercompany_invoice(cr, uid, ids, o2o_field_name, node=node, context=context):
+                self.create_intercompany_invoice(cr, uid, ids, self_type=invoice_type, context=None)
+
+    def create_intercompany_invoice(self, cr, uid, ids, self_type=None, context=None):
+        invoice    = self.browse(cr, uid, ids[0])
+        company_from, company_to = self.get_from_to_company(cr, uid, ids, context=context)
+        data       = self.prepare_intercompany_invoice(cr, uid, invoice, company_to, context=context)
+        invoice_id = self.create(cr, uid, data, context=context)
+        return invoice_id
+
+    def prepare_intercompany_invoice(self, cr, uid, invoice, company_to,context=None):
+        """ prepare  intercompany invoice data
+            @invoice, browse of account.invoice 
+            @company_to,  intercompany_invoice company_id
+            return {}, data of create invoice
+        """
+        line_pool    = self.pool.get('account.invoice.line')
+        journal_pool = self.pool.get('account.journal')
+        period_pool  = self.pool.get('account.period')
+        part         = invoice.company_id.partner_id
+
+        #Invoice Type and acc_id
+        hash = {
+            'in_invoice': {'create_type':'out_invoice', 'value_reference_name':'property_account_payable'  },
+            'out_invoice':{'create_type':'in_invoice' , 'value_reference_name':'property_account_receivable' }
+        }
+        acc_id = part.property_account_receivable.id
+        cr.execute("SELECT value_reference FROM ir_property WHERE name=%s AND res_id='res.partner,%s' AND company_id=%s",(hash[invoice.type]['value_reference_name'],part.id,company_to, ))
+        prop = cr.fetchone()
+        if prop and prop[0]:
+            acc_id = prop[0].split('account.account,')[1]
+
+        #Invoice Journal
+        type2journal = {'out_invoice': 'sale', 'in_invoice': 'purchase', 'out_refund': 'sale_refund', 'in_refund': 'purchase_refund'}        
+        res          = journal_pool.search(cr, uid, [('type', '=', type2journal.get(hash[invoice.type]['create_type'], 'sale')), ('company_id', '=', company_to)], limit=1)
+        journal_id   = res and res[0] or False
+        # We assume periods in Inter-companies have the same code. 
+        period_ids = period_pool.search(cr, uid, [('code', '=', invoice.period_id.code), ('company_id', '=', company_to)], limit=1)
+        period_id  = period_ids and period_ids[0] or False
+
+        lines_data=[(5,)]
+        for invoice_line in invoice.invoice_line:
+            data_line = {
+                # invoice_id:  ,
+                'name':       invoice_line.name,
+                'origin':     invoice_line.origin,
+                'sequence':   invoice_line.sequence,
+                'uos_id':     invoice_line.uos_id     and invoice_line.uos_id.id     or False,
+                'product_id': invoice_line.product_id and invoice_line.product_id.id or False,
+                'account_id': acc_id,
+                'price_unit': invoice_line.price_unit,
+                'quantity':   invoice_line.quantity,
+                'discount':   invoice_line.discount,
+                'company_id': company_to,
+            }
+            lines_data.append( (0, 0, data_line) )
+
+        invoice_data = {
+            'name':           invoice.name,
+            'origin':         invoice.number and 'IC:' + str(invoice.number) or '',
+            'supplier_invoice_number': invoice.supplier_invoice_number,
+            'type':           hash[invoice.type]['create_type'],
+            'reference':      invoice.reference,
+            'reference_type': invoice.reference_type,
+            'comment':        invoice.comment,
+            'date_invoice':   invoice.date_invoice,
+            'date_due':       invoice.date_due,
+            'partner_id':     part.id,
+            'payment_term':   invoice.payment_term and invoice.payment_term.id or False,
+            'period_id':      period_id,
+            'account_id':     acc_id,
+            'journal_id':     journal_id,
+            'company_id':     company_to , 
+            'invoice_ic_id':  invoice.id,
+            'is_locked':      True,
+            'ic_create':      True,       
+            'invoice_line':   lines_data,      
+             #'currency_id':   invoice.currency_id and invoice.currency_id.id or False,
+        }
+        return invoice_data
+
+    def write(self, cr, uid, ids, values, context=None):
+        res = super(account_invoice, self).write(cr, uid, ids, values, context=context)
+        if type(ids) != list:
+            ids = [ids]
+        self.update_intercompany_invoice(cr, uid, ids, context=None)
+        return res
+
+    def unlink(self, cr, uid, ids, context=None):
+        res = super(account_invoice, self).unlink(cr, uid, ids, context=context)
+        if type(ids) != type([]):
+            ids = [ids]
+
+        for inv_id in ids:
+            inv_ic_ids = self.search(cr, uid, [('invoice_ic_id','=',inv_id)], context=context)
+            if inv_ic_ids:
+                self.unlink(cr, uid, inv_ic_ids, context=context)
+        return res
+
+    def update_intercompany_invoice(self, cr, uid, ids, context=None):
+        for invoice in self.browse(cr, uid, ids, context):
+            invoice_ic_id = self.search(cr, uid, [('invoice_ic_id','=',invoice.id )])
+            if invoice_ic_id:
+                company_from, company_to = self.get_from_to_company(cr, uid, [invoice.id,] ,context=context)
+                data = self.prepare_intercompany_invoice(cr, uid, invoice, company_to, context=context)
+                self.write(cr, uid, invoice_ic_id, data)
+        return True
+
+    def invoice_validate(self, cr, uid, ids, context=None):
+        res = super(account_invoice, self).invoice_validate(cr, uid, ids, context=context)
+        if res:
+            self.action_intercompany(cr, uid, ids, node='confirm', context=context)
+        return res
+
+account_invoice()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'base_intercompany/invoice_wkf.xml'
--- base_intercompany/invoice_wkf.xml	1970-01-01 00:00:00 +0000
+++ base_intercompany/invoice_wkf.xml	2013-12-30 03:21:22 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+<data>
+
+<!-- add the action_draft to invoice WKF. jon.chow#elico-corp.com Aug 23, 2013-->
+<record id="account.act_draft" model="workflow.activity">
+	    <field name="kind">function</field>
+	    <field name="action">action_draft()</field>
+</record>
+
+
+    
+</data>
+</openerp>
\ No newline at end of file

=== added file 'base_intercompany/purchase.py'
--- base_intercompany/purchase.py	1970-01-01 00:00:00 +0000
+++ base_intercompany/purchase.py	2013-12-30 03:21:22 +0000
@@ -0,0 +1,263 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Augustin Cisterne-Kaas <[e-mail]>
+#    Eric Caudal <[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 import SUPERUSER_ID
+from openerp.osv import fields, orm, osv
+from openerp.tools.translate import _
+from openerp import netsvc
+from icops.order import icops_order
+from openerp import netsvc
+
+
+class purchase_order(orm.Model):
+    _inherit = 'purchase.order'
+    _columns = {
+        'is_locked': fields.boolean('Locked for Intercompany'),
+        'ic_create': fields.boolean('Intercompany PO generated'),
+        'sale_id': fields.many2one('sale.order', 'Sales Order'),
+    }
+
+    _sql_constraints = [(
+        'sale_id_unique', 'unique(sale_id)',
+        'Sale Id already exists')]
+
+    def action_draft(self, cr, uid, ids, context=None):
+        """
+        function of wkf active draft,
+        intercompany action operate by Administrator
+        SUPERUSER_ID used to search, browse kinds of object.
+        but not used of create, write anything
+        """
+
+        assert len(ids) == 1
+        context = context or {}
+        order = self.read(cr, uid, ids[0], ['sale_id'])
+        if order['sale_id']:
+            context['is_locked'] = True
+            context['is_external'] = True
+        icops = icops_order(self)
+        icops.create_intercompany(cr, uid, ids,
+                                  node='draft', context=context)
+        return True
+
+    def write(self, cr, uid, ids, values, context=None):
+        if not isinstance(ids, list):
+            ids = [ids]
+        context = context or {}
+
+        res = super(purchase_order, self).write(
+            cr, uid, ids, values, context=context)
+        if 'is_locked' not in context:
+            if 'is_external' in context:
+                context['is_locked'] = True
+            icops = icops_order(self)
+            try:
+                icops.action(
+                    cr, uid, ids, values, context=context)
+            except:
+                raise
+        return res
+
+    def unlink(self, cr, uid, ids, context=None):
+        if not isinstance(ids, list):
+            ids = [ids]
+        context = context or {}
+        if 'is_locked' not in context:
+            if 'is_external' in context:
+                context['is_locked'] = True
+            icops = icops_order(self)
+            try:
+                icops.action(cr, uid, ids, state="unlink",
+                             context=context)
+            except:
+                raise
+
+        return super(purchase_order, self).unlink(
+            cr, uid, ids, context=context)
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        wf_service = netsvc.LocalService("workflow")
+        for purchase in self.browse(cr, uid, ids, context=context):
+            for pick in purchase.picking_ids:
+                if pick.state not in ('draft', 'cancel'):
+                    raise osv.except_osv(
+                        _('Unable to cancel this purchase order.'),
+                        _('First cancel all receptions related\
+                           to this purchase order.'))
+            for pick in purchase.picking_ids:
+                wf_service.trg_validate(
+                    uid, 'stock.picking', pick.id, 'button_cancel', cr)
+            for inv in purchase.invoice_ids:
+                if inv and inv.state not in ('cancel', 'draft'):
+                    raise osv.except_osv(
+                        _('Unable to cancel this purchase order.'),
+                        _('You must first cancel all receptions related to \
+                            this purchase order.'))
+                if inv:
+                    wf_service.trg_validate(
+                        uid, 'account.invoice', inv.id, 'invoice_cancel', cr)
+        self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
+
+        for (id, name) in self.name_get(cr, uid, ids):
+            wf_service.trg_validate(
+                uid, 'purchase.order', id, 'purchase_cancel', cr)
+        return True
+
+    def _prepare_IC(self, cr, uid, id,
+                    company_to, ic_uid, context=None):
+        """
+        according the PO and company_to, prepare the SO data,
+        It can be used to create or update SO record.
+        @po  SO browse record
+        @company_to      company_id
+        @ic_uid
+        return { }, value of SO data
+        """
+        if isinstance(company_to, list):
+            company_to = company_to[0]
+        order = self.read(cr, uid, id, ['name', 'company_id', 'order_line',
+                                        'state'])
+        company_pool = self.pool.get('res.company')
+        company = company_pool.read(
+            cr, uid, order['company_id'][0], ['partner_id'])
+        partner_pool = self.pool.get('res.partner')
+        customer = partner_pool.read(
+            cr, ic_uid, company['partner_id'][0],
+            ['property_product_pricelist',
+             'property_account_position',
+             'property_payment_term',
+             'user_id'])
+
+        addr = partner_pool.address_get(cr, uid, [customer['id']],
+                                        ['delivery', 'invoice', 'contact'])
+
+        pricelist = (customer['property_product_pricelist'][0]
+                     if customer['property_product_pricelist']
+                     else False)
+
+        fiscal_position = (customer['property_account_position'][0]
+                           if customer['property_account_position']
+                           else False)
+        payment_term = (customer['property_payment_term'][0]
+                        if customer['property_payment_term']
+                        else False)
+
+        salesman = customer['user_id'][0] if customer['user_id'] else ic_uid
+        company = company_pool.read(
+            cr, ic_uid, company_to, ['intercompany_shop_id'])
+
+        if not 'intercompany_shop_id' in company:
+            raise osv.except_osv(
+                _('Error!'),
+                _('There is no default shop for the destination company!'))
+
+        shop_id = company['intercompany_shop_id'][0]
+        sol_datas = [(5,)]
+        pol_pool = self.pool.get('purchase.order.line')
+        i = 0
+        for line in pol_pool.read(
+                cr, uid, order['order_line'],
+                ['name', 'ic_pol_id', 'product_qty',
+                 'product_id', 'product_uom', 'price_unit',
+                 'state']):
+            line_data = (0, 0, {
+                #'order_id':       so_id,
+                'name': line['name'],
+                'ic_pol_id': line['id'],
+                'product_uom_qty': line['product_qty'],
+                'product_id': line['product_id'][0],
+                'product_uom': line['product_uom'][0],
+                'price_unit': line['price_unit']
+            })
+            sol_datas.append(line_data)
+        state = "draft" if order['state'] != "approved" else "progress"
+        so_data = {
+            'partner_id': customer['id'],
+            'pricelist_id': pricelist,
+            'partner_invoice_id': addr['invoice'],
+            # 'partner_order_id': addr['contact'],
+            'partner_shipping_id': addr['delivery'],
+            'payment_term': payment_term,
+            'fiscal_position': fiscal_position,
+            'user_id': salesman,
+            'purchase_id': order['id'],
+            'ic_create': True,
+            'shop_id': shop_id,
+            'origin': 'IC:' + str(order['name']),
+            'order_line': sol_datas,
+            'state': state
+        }
+        if 'is_external' in context:
+            so_data = {
+                'order_line': sol_datas,
+                'state': state
+            }
+
+        return so_data
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        if not default:
+            default = {}
+        default.update({
+            'sale_id': None
+        })
+        return super(purchase_order, self).copy(cr, uid, id, default, context)
+
+    def wkf_confirm_order(self, cr, uid, ids, context=None):
+        if not isinstance(ids, list):
+            ids = [ids]
+        context = context or {}
+        if 'is_external' not in context:
+            icops = icops_order(self)
+            try:
+                icops.action(
+                    cr, uid, ids, state='confirm', context=context)
+            except:
+                raise
+            todo = []
+            sol_pool = self.pool.get('sale.order.line')
+            for po in self.read(cr, uid, ids, ['order_line']):
+                if not po['order_line']:
+                    raise osv.except_osv(_('Error!'), _(
+                        'You cannot confirm a purchase order without any\
+                         purchase order line.'))
+                for line in sol_pool.read(cr, uid, po['order_line'], ['state']):
+                    if line['state'] == 'draft':
+                        todo.append(line.id)
+
+            self.pool.get('purchase.order.line').action_confirm(
+                cr, uid, todo, context)
+            for id in ids:
+                self.write(
+                    cr, uid, [id], {'state': 'confirmed', 'validator': uid},
+                    context=context)
+        return True
+
+
+class purchase_order_line(orm.Model):
+    _inherit = 'purchase.order.line'
+    _columns = {
+        'ic_sol_id': fields.many2one('sale.order.line', 'IC SOL'),
+    }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'base_intercompany/purchase_wkf.xml'
--- base_intercompany/purchase_wkf.xml	1970-01-01 00:00:00 +0000
+++ base_intercompany/purchase_wkf.xml	2013-12-30 03:21:22 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+	<data>
+		<!-- purchase order wkf draft action  jon.chow#elico-corp.com Aug 8, 2013-->
+		<record id="purchase.act_draft" model="workflow.activity">
+		    <field name="wkf_id" ref="purchase.purchase_order"/>
+		   <field name="kind">function</field>
+		   <field name="action">action_draft()</field>
+		</record>
+        <record id="purchase.act_cancel" model="workflow.activity">
+            <field name="action">action_cancel()</field>
+        </record>
+		
+	</data>
+</openerp>

=== added file 'base_intercompany/sale.py'
--- base_intercompany/sale.py	1970-01-01 00:00:00 +0000
+++ base_intercompany/sale.py	2013-12-30 03:21:22 +0000
@@ -0,0 +1,246 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Augustin Cisterne-Kaas <[e-mail]>
+#    Eric Caudal <[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 fields, orm, osv
+from openerp.tools.translate import _
+from icops.order import icops_order
+from openerp import SUPERUSER_ID
+from openerp import netsvc
+from collections import namedtuple
+
+
+class sale_order(orm.Model):
+    _inherit = 'sale.order'
+    _columns = {
+        'is_locked': fields.boolean('Locked for Intercompany'),
+        'ic_create': fields.boolean('Intercompany SO generated'),
+        'purchase_id': fields.many2one('purchase.order', 'Purchase Order'),
+    }
+
+    _sql_constraints = [(
+        'purchase_id_unique', 'unique(purchase_id)',
+        'Purchase Id already exists')]
+
+    def action_draft(self, cr, uid, ids, context=None):
+        """
+        SO wkf Draft action,
+        Use Administrator operate intercompany action
+        """
+        assert len(ids) == 1
+        if context is None:
+            context = {}
+        order = self.browse(cr, SUPERUSER_ID, ids[0], context=context)
+        if order.purchase_id:
+            if order.purchase_id:
+                context['is_locked'] = True
+                context['is_external'] = True
+        icops = icops_order(self)
+        icops.create_intercompany(cr, uid, ids, context=context)
+        return True
+
+    def write(self, cr, uid, ids, values, context=None):
+        if not isinstance(ids, list):
+            ids = [ids]
+        context = context or {}
+        res = super(sale_order, self).write(
+            cr, uid, ids, values, context=context)
+        if 'is_locked' not in context:
+            if 'is_external' in context:
+                context['is_locked'] = True
+            icops = icops_order(self)
+            try:
+                icops.action(cr, uid, ids, values,
+                             context=context)
+            except:
+                raise
+        return res
+
+    def unlink(self, cr, uid, ids, context=None):
+        if not isinstance(ids, list):
+            ids = [ids]
+        if not isinstance(context, dict):
+            context = {}
+        if 'is_locked' not in context:
+            if 'is_external' in context:
+                context['is_locked'] = True
+            icops = icops_order(self)
+            try:
+                icops.action(cr, uid, ids, state="unlink",
+                             context=context)
+            except:
+                raise
+        return super(sale_order, self).unlink(
+            cr, uid, ids, context=context)
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        wf_service = netsvc.LocalService("workflow")
+        context = context or {}
+        sale_order_line_obj = self.pool.get('sale.order.line')
+        for sale in self.browse(cr, uid, ids, context=context):
+            for inv in sale.invoice_ids:
+                if inv.state not in ('draft', 'cancel'):
+                    raise osv.except_osv(
+                        _('Cannot cancel this sales order!'),
+                        _('First cancel all invoices attached\
+                            to this sales order.'))
+            for r in self.read(cr, uid, ids, ['invoice_ids']):
+                for inv in r['invoice_ids']:
+                    wf_service.trg_validate(
+                        uid, 'account.invoice', inv, 'invoice_cancel', cr)
+                    sale_order_line_obj.write(
+                        cr, uid, [l.id for l in sale.order_line],
+                        {'state': 'cancel'})
+            self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
+        return True
+
+    def action_wait(self, cr, uid, ids, context=None):
+        if not isinstance(ids, list):
+            ids = [ids]
+        context = context or {}
+        if 'is_external' not in context:
+            icops = icops_order(self)
+            try:
+                icops.action(
+                    cr, uid, ids, state='confirm', context=context)
+            except:
+                raise
+            return super(sale_order, self).action_wait(
+                cr, uid, ids, context=context)
+
+    def _prepare_IC(self, cr, uid, id,
+                    company_to, ic_uid, context=None):
+
+        """
+        prepare the intercompany PO data,
+        it can be used to create or update PO record
+        @ so  SO browse record
+        @ company_to  company_id
+        @ic_uid  Internal company user id
+        """
+        if isinstance(company_to, list):
+            company_to = company_to[0]
+        # to avoid many SQL requests
+        OrderStruct = namedtuple('OrderStruct', 'company_id')
+        CompanyStruct = namedtuple('CompanyStruct', 'security_lead')
+        LineStruct = namedtuple('LineStruct', 'delay')
+
+        order = self.read(cr, uid, id,
+                          ['order_line', 'date_order', 'company_id',
+                           'state', 'name'])
+        company_pool = self.pool.get('res.company')
+        company = company_pool.read(
+            cr, uid, order['company_id'][0], ['partner_id', 'security_lead'])
+
+        fake_company_obj = CompanyStruct(
+            security_lead=company['security_lead'] or 0)
+        fake_so_obj = OrderStruct(company_id=fake_company_obj)
+        supplier = self.pool.get('res.partner').read(
+            cr, ic_uid, company['partner_id'][0],
+            ['property_product_pricelist_purchase',
+             'property_account_position',
+             'property_supplier_payment_term'])
+        pricelist = (supplier['property_product_pricelist_purchase'][0]
+                     if supplier['property_product_pricelist_purchase']
+                     else False)
+
+        fiscal_position = (supplier['property_account_position'][0]
+                           if supplier['property_account_position']
+                           else False)
+        payment_term = (supplier['property_supplier_payment_term'][0]
+                        if supplier['property_supplier_payment_term']
+                        else False)
+
+        company = company_pool.read(
+            cr, ic_uid, company_to, ['intercompany_shop_id'])
+        intercompany_shop = self.pool.get('sale.shop').read(
+            cr, ic_uid, company['intercompany_shop_id'][0], ['warehouse_id'])
+        warehouse = self.pool.get('stock.warehouse').read(
+            cr, ic_uid, intercompany_shop['warehouse_id'][0], ['lot_stock_id'])
+
+        if not 'lot_stock_id' in warehouse:
+            raise osv.except_osv(
+                _('Error!'),
+                _('prepare_intercompany_po_data,not found location_id'))
+
+        location_id = warehouse['lot_stock_id'][0]
+        polines_data = [(5,)]
+        sol_pool = self.pool.get('sale.order.line')
+        for line in sol_pool.read(
+                cr, uid, order['order_line'],
+                ['name', 'product_uom_qty', 'product_id', 'product_uom',
+                 'price_unit', 'delay']):
+
+            fake_line_obj = LineStruct(delay=line['delay'])
+            date_planned = self._get_date_planned(
+                cr, uid, fake_so_obj,
+                fake_line_obj,
+                order['date_order'], context=context)
+            pol_data = (0, 0, {
+                'ic_sol_id': line['id'],
+                'name': line['name'],
+                'product_qty': line['product_uom_qty'],
+                'product_id': line['product_id'][0],
+                'product_uom': line['product_uom'][0],
+                'price_unit': line['price_unit'],
+                'date_planned': date_planned,
+            })
+            polines_data.append(pol_data)
+        company_id = company_to
+        state = "draft" if order['state'] != "progress" else "approved"
+        po_data = {
+            'partner_id': supplier['id'],
+            'pricelist_id': pricelist,
+            'payment_term_id': payment_term,
+            'fiscal_position': fiscal_position,
+            'sale_id': order['id'],
+            'ic_create': True,
+            'company_id': company['id'],
+            'location_id': location_id,
+            'origin': 'IC:' + str(order['name']),
+            'order_line': polines_data,
+            'state': state
+        }
+        if 'is_external' in context:
+            po_data = {
+                'order_line': polines_data,
+                'state': state
+            }
+
+        return po_data
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        if not default:
+            default = {}
+        default.update({
+            'purchase_id': None
+        })
+        return super(sale_order, self).copy(cr, uid, id, default, context)
+
+
+class sale_order_line(orm.Model):
+    _inherit = 'sale.order.line'
+    _columns = {
+        'ic_pol_id': fields.many2one('purchase.order.line',
+                                     'Intercompany PO Line'),
+    }
+#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'base_intercompany/sale_wkf.xml'
--- base_intercompany/sale_wkf.xml	1970-01-01 00:00:00 +0000
+++ base_intercompany/sale_wkf.xml	2013-12-30 03:21:22 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+	<data>
+		<!-- action draft   Activity -->
+		<record id="sale.act_draft" model="workflow.activity">
+		    <field name="wkf_id" ref="sale.wkf_sale"/>
+		    <field name="kind">function</field>
+		    <field name="action">action_draft()</field>
+		</record>
+        <record id="sale.act_cancel" model="workflow.activity">
+            <field name="action">action_cancel()</field>
+        </record>
+	</data>
+</openerp>
\ No newline at end of file

=== added directory 'base_intercompany/security'
=== added file 'base_intercompany/security/intercompany_security.xml'
--- base_intercompany/security/intercompany_security.xml	1970-01-01 00:00:00 +0000
+++ base_intercompany/security/intercompany_security.xml	2013-12-30 03:21:22 +0000
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <!-- Groups -->
+	<data noupdate="1">
+	    <record id="group_intercompany_user" model="res.groups">
+	        <field name="name">InterCompany User</field>
+	        <field name="users" eval="[(4, ref('base.user_root'))]"/>
+	    </record>
+	    <record id="group_intercompany_manager" model="res.groups">
+	        <field name="name">InterCompany Manager</field>
+	        <field name="implied_ids" eval="[(4, ref('group_intercompany_user'))]"/>
+	        <field name="users" eval="[(4, ref('base.user_root'))]"/>
+	    </record>
+	</data>
+	
+	<!-- Rules -->
+	<data noupdate="1">
+	    <record id="sale_order_intercompany" model="ir.rule">
+	        <field name="name">IC Sales Orders</field>
+	        <field ref="sale.model_sale_order" name="model_id"/>
+	        <field name="domain_force">[(1,'=',1)]</field>
+	        <field name="groups" eval="[(4, ref('group_intercompany_user'))]"/>
+	    </record>
+	    <record id="sale_order_line_intercompany" model="ir.rule">
+	        <field name="name">IC Sales Order Lines</field>
+	        <field ref="sale.model_sale_order_line" name="model_id"/>
+	        <field name="domain_force">[(1,'=',1)]</field>
+	        <field name="groups" eval="[(4, ref('group_intercompany_user'))]"/>
+	    </record>
+	    <record id="purchase_order_intercompany" model="ir.rule">
+	        <field name="name">IC Purchase Orders</field>
+	        <field ref="purchase.model_purchase_order" name="model_id"/>
+	        <field name="domain_force">[(1,'=',1)]</field>
+	        <field name="groups" eval="[(4, ref('group_intercompany_user'))]"/>
+	    </record>
+	    <record id="purchase_order_line_intercompany" model="ir.rule">
+	        <field name="name">IC Purchase Order Lines</field>
+	        <field ref="purchase.model_purchase_order_line" name="model_id"/>
+	        <field name="domain_force">[(1,'=',1)]</field>
+	        <field name="groups" eval="[(4, ref('group_intercompany_user'))]"/>
+	    </record>
+	    <record id="stock_picking_in_intercompany" model="ir.rule">
+	        <field name="name">IC Picking IN</field>
+	        <field ref="stock.model_stock_picking_in" name="model_id"/>
+	        <field name="domain_force">[(1,'=',1)]</field>
+	        <field name="groups" eval="[(4, ref('group_intercompany_user'))]"/>
+	    </record>
+	    <record id="stock_picking_out_intercompany" model="ir.rule">
+	        <field name="name">IC Picking OUT</field>
+	        <field ref="stock.model_stock_picking_out" name="model_id"/>
+	        <field name="domain_force">[(1,'=',1)]</field>
+	        <field name="groups" eval="[(4, ref('group_intercompany_user'))]"/>
+	    </record>
+	    <record id="stock_move_intercompany" model="ir.rule">
+	        <field name="name">IC Stock Moves</field>
+	        <field ref="stock.model_stock_move" name="model_id"/>
+	        <field name="domain_force">[(1,'=',1)]</field>
+	        <field name="groups" eval="[(4, ref('group_intercompany_user'))]"/>
+	    </record>
+	    <record id="account_invoice_intercompany" model="ir.rule">
+	        <field name="name">IC Invoices</field>
+	        <field ref="account.model_account_invoice" name="model_id"/>
+	        <field name="domain_force">[(1,'=',1)]</field>
+	        <field name="groups" eval="[(4, ref('group_intercompany_user'))]"/>
+	    </record>
+	    <record id="account_invoice_line_intercompany" model="ir.rule">
+	        <field name="name">IC Invoice Lines</field>
+	        <field ref="account.model_account_invoice_line" name="model_id"/>
+	        <field name="domain_force">[(1,'=',1)]</field>
+	        <field name="groups" eval="[(4, ref('group_intercompany_user'))]"/>
+	    </record>
+	</data>
+</openerp>
\ No newline at end of file

=== added file 'base_intercompany/security/ir.model.access.csv'
--- base_intercompany/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ base_intercompany/security/ir.model.access.csv	2013-12-30 03:21:22 +0000
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_intercompany_user,intercompany.user,model_res_intercompany,base.group_user,1,0,0,0
+access_intercompany_manager,intercompany.manager,model_res_intercompany,group_intercompany_manager,1,1,1,1

=== added directory 'base_intercompany/static'
=== added directory 'base_intercompany/static/description'
=== added file 'base_intercompany/static/description/Intercompany_setup.png'
Binary files base_intercompany/static/description/Intercompany_setup.png	1970-01-01 00:00:00 +0000 and base_intercompany/static/description/Intercompany_setup.png	2013-12-30 03:21:22 +0000 differ
=== added file 'base_intercompany/static/description/index.html'
--- base_intercompany/static/description/index.html	1970-01-01 00:00:00 +0000
+++ base_intercompany/static/description/index.html	2013-12-30 03:21:22 +0000
@@ -0,0 +1,29 @@
+<section class="oe_container">
+    <div class="oe_row">
+    <h2 class="oe_slogan">base_intercompany</h2> 
+    <h3 class="oe_slogan">Inter-Company Processing (ICOPS) <br></h3>
+    <h4 class="oe_slogan"><a href="http://www.elico-corp.com">By Elico Corp</a></h4>
+       <p>
+
+This module is designed to manage Inter-company Process (ICOPS) and allow 2 companies to create objects in each other:<br>
+- When a PO to company B is created in company A, it creates automatically a SO in company B<br>
+- When a SO to company B is created in company A, it creates automatically a PO in company B<br>
+- Update PO from/to SO<br>
+- Confirm SO for PO and vice versa<br>
+- It is generic enough to allow intercompany process companies in cascade<br>
+- it can be uni-directional/bi-directional (eg SO in company A creates PO in company B and when the PO is validated in company B it validate the SO in company A).</br>
+</br>
+Works fine with SO/PO<br>
+Under construction: Sales invoice/Purchase invoice and Stock Moves<br>
+TODO: demo data to be improved and tests <br>
+Blueprint: https://blueprints.launchpad.net/multi-company/+spec/icops<br>
+</p>
+        <div class="oe_row_img oe_centered oe_mt32">
+            <img class="oe_picture oe_screenshot" src="Intercompany_setup.png">
+        </div>
+    </div>
+     <div class="oe_row oe_centeralign oe_more_space">
+            <a href="http://www.elico-corp.com/saas/" class="oe_button oe_big">Start your <span class="oe_emph">free</span> trial</a>
+        </div>
+        <h4 class="oe_slogan">or</h4>
+</section>

=== added directory 'base_intercompany/static/src'
=== added directory 'base_intercompany/static/src/img'
=== added file 'base_intercompany/static/src/img/icon.png'
Binary files base_intercompany/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and base_intercompany/static/src/img/icon.png	2013-12-30 03:21:22 +0000 differ
=== added file 'base_intercompany/stock_picking.py'
--- base_intercompany/stock_picking.py	1970-01-01 00:00:00 +0000
+++ base_intercompany/stock_picking.py	2013-12-30 03:21:22 +0000
@@ -0,0 +1,806 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
+#    Jon Chow <[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 import SUPERUSER_ID, netsvc
+# from openerp.osv import fields, osv
+# from openerp.tools.translate import _
+
+
+# class stock_move(osv.osv):
+#     _inherit = 'stock.move'
+#     _name = 'stock.move'
+
+#     def _default_location_source(self, cr, uid, context=None):
+#         """
+#         Gets default address of partner for source location
+#         @return: Address id or False
+#         """
+#         context = context or {}
+#         mod_pool = self.pool.get('ir.model.data')
+#         picking_type = context.get('picking_type')
+#         location_id = False
+
+#         if context.get('move_line', []):
+#             try:
+#                 location_id = context['move_line'][0][2]['location_id']
+#             except:
+#                 pass
+#         elif context.get('address_in_id', False):
+#             part_obj_add = self.pool.get('res.partner').browse(
+#                 cr, uid, context['address_in_id'], context=context)
+#             if part_obj_add:
+#                 location_id = part_obj_add.property_stock_supplier.id
+#         else:
+#             location_xml_id = False
+#             if picking_type == 'in':
+#                 location_xml_id = 'stock_location_suppliers'
+#                 location_model, location_id = mod_pool.get_object_reference(
+#                     cr, uid, 'stock', location_xml_id)
+#             elif picking_type == 'internal':
+#                 location_xml_id = 'stock_location_stock'
+#                 location_model, location_id = mod_pool.get_object_reference(
+#                     cr, uid, 'stock', location_xml_id)
+#             else:
+#                 company_id = self.pool.get('res.users').browse(
+#                     cr, uid, uid, context=context).company_id.id
+#                 cr.execute("""
+#                 SELECT
+#                     id
+#                 FROM
+#                     stock_location
+#                 WHERE
+#                     company_id=%s AND name = 'Stock'
+#                 """, (company_id,))
+#                 location_id = cr.fetchone()[0]
+#         return location_id
+
+#     def _default_location_destination(self, cr, uid, context=None):
+#         """
+#         Gets default address of partner for destination location
+#         @return: Address id or False
+#         """
+
+#         context = context or {}
+#         mod_pool = self.pool.get('ir.model.data')
+#         picking_type = context.get('picking_type')
+#         location_id = False
+
+#         if context.get('move_line', []):
+#             if context['move_line'][0]:
+#                 if isinstance(context['move_line'][0], (tuple, list)):
+#                     location_id = (context['move_line'][0][2]
+#                                    and context['move_line'][0][2].get(
+#                                        'location_dest_id', False)
+#                                    )
+#                 else:
+#                     move_list = self.pool.get('stock.move').read(
+#                         cr, uid, context['move_line'][0], ['location_dest_id'])
+#                     location_id = (move_list
+#                                    and move_list['location_dest_id'][0]
+#                                    or False)
+#         elif context.get('address_out_id', False):
+#             property_out = self.pool.get('res.partner').browse(
+#                 cr, uid, context['address_out_id'],
+#                 context).property_stock_customer
+#             location_id = property_out and property_out.id or False
+#         else:
+#             location_xml_id = False
+#             if picking_type == 'internal':
+#                 location_xml_id = 'stock_location_stock'
+#                 location_model, location_id = mod_pool.get_object_reference(
+#                     cr, uid, 'stock', location_xml_id)
+#             elif picking_type == 'out':
+#                 location_xml_id = 'stock_location_customers'
+#                 location_model, location_id = mod_pool.get_object_reference(
+#                     cr, uid, 'stock', location_xml_id)
+#             else:
+#                 company_id = self.pool.get('res.users').browse(
+#                     cr, uid, uid, context=context).company_id.id
+#                 cr.execute("""
+#                 SELECT
+#                     id
+#                 FROM
+#                     stock_location
+#                 WHERE
+#                     company_id=%s AND name = 'Stock'
+#                 """, (company_id,))
+#                 location_id = cr.fetchone()[0]
+#         return location_id
+
+#     _defaults = {
+#         'location_id': _default_location_source,
+#         'location_dest_id': _default_location_destination,
+#     }
+
+# stock_move()
+
+
+# class stock_picking(osv.osv):
+#     _inherit = 'stock.picking'
+#     _name = 'stock.picking'
+
+#     _columns = {
+#         'is_locked': fields.boolean('Locked for Intercompany'),
+#         'ic_create': fields.boolean('Intercompany Picking generated'),
+#         'picking_ic_id': fields.many2one('stock.picking', 'Stock Picking'),
+#     }
+
+#     def get_intercompany(self, cr, uid, id, context=None):
+#         """
+#         Return company_from company_to
+#         """
+
+#         assert isinstance(id, int) or isinstance(id, long)
+#         cr.execute("""
+#         SELECT
+#             pick.company_id AS from_c, cmp.id AS to_c, cmp.intercompany_uid
+#         FROM
+#             stock_picking AS pick
+#             LEFT JOIN res_partner AS part ON (pick.partner_id=part.id)
+#             LEFT JOIN res_company AS cmp  ON (part.id=cmp.partner_id)
+#         WHERE
+#             pick.id=%s
+#         """, (id,))
+#         return cr.fetchone()
+
+#     def need_to_create_intercompany_picking(
+#             self, cr, uid, ids, o2o_field_name=None, node=None, context=None):
+#         """
+#         @o2o_field_name
+#         @node,  draft' or 'confirm', res.intercompany.so2po value,
+#         """
+
+#         intercompany_obj = self.pool.get('res.intercompany')
+#         cf, ct, ic_uid = self.get_intercompany(cr, uid, ids[0],
+#                                                context=context)
+#         return intercompany_obj.check_need_create_intercompany_object(
+#             cr, uid, cf, ct, o2o_field_name, node)
+
+#     def action_draft(self, cr, uid, ids, context=None):
+#         """
+#         Picking wkf Draft action,
+#         Use Administrator operate intercompany action
+#         """
+
+#         assert len(ids) == 1
+#         self.action_intercompany(cr, SUPERUSER_ID, ids,
+#                                  node='draft', context=context)
+#         return True
+
+#     def action_confirm(self, cr, uid, ids, context=None):
+#         """
+#         Action confirm include intercompany action
+#         """
+
+#         res = super(stock_picking, self).action_confirm(cr, uid, ids,
+#                                                         context=context)
+#         if res:
+#             self.action_intercompany(cr, uid, ids, node='confirm',
+#                                      context=context)
+#         return res
+
+#     def action_cancel(self, cr, uid, ids, context=None):
+#         """
+#         """
+
+#         res = super(stock_picking, self).action_cancel(cr, uid, ids,
+#                                                        context=context)
+#         wkf_service = netsvc.LocalService("workflow")
+
+#         if res:
+#             for pick_id in ids:
+#                 ic_uid = self.get_intercompany(cr, uid, pick_id)[2]
+#                 pick_ic_ids = self.search(cr, uid,
+#                                           [('picking_ic_id', '=', pick_id)]
+#                                           )
+#                 for pick_ic_id in pick_ic_ids:
+#                     wkf_service.trg_validate(ic_uid, 'stock.picking',
+#                                              pick_ic_id, 'button_cancel', cr)
+
+#         return res
+
+#     def action_intercompany(self, cr, uid, ids, node=None, context=None):
+#         """
+#         @node, draft or confirm
+#         """
+
+#         assert len(ids) == 1
+#         cr.execute("SELECT type FROM stock_picking WHERE id=%s", (ids[0],))
+#         pick_type = cr.fetchone()[0]
+
+#         if pick_type in ['in', 'out']:
+#             o2o_field_name = pick_type == 'in' and 'is2do' or 'do2is'
+#             if self.need_to_create_intercompany_picking(
+#                     cr, uid, ids, o2o_field_name, node=node, context=context):
+#                 self.create_intercompany_picking(
+#                     cr, uid, ids, self_type=pick_type, context=None)
+
+#     def create_intercompany_picking(self, cr, uid,
+#                                     ids, self_type, context=None):
+#         """
+#         prepare out and prepare in is similar, but don to merger it,
+#         @self_type,  self.type
+#         """
+
+#         pick = self.browse(cr, uid, ids[0])
+#         cf, ct, ic_uid = self.get_intercompany(cr, uid, ids[0],
+#                                                context=context)
+#         picking_pool = (self_type == 'in'
+#                         and self.pool.get('stock.picking.out')
+#                         or self.pool.get('stock.picking.in'))
+
+#         if self_type == 'in':
+#             picking_data = self.prepare_intercompany_picking_out_data(
+#                 cr, uid, pick, ct, ic_uid, context=context)
+#         elif self_type == 'out':
+#             picking_data = self.prepare_intercompany_picking_in_data(
+#                 cr, uid, pick, ct, ic_uid, context=context)
+
+#         return picking_pool.create(cr, ic_uid, picking_data, context=context)
+
+#     def prepare_intercompany_picking_out_data(
+#             self, cr, uid, pick_in, company_to, ic_uid, context=None):
+#         """
+#         prepare the picking.out data
+#         @pick_in  browse record of stock.picking, type == in
+#         @company_to  the company_id of this picking.out record
+#         """
+
+#         context = context or {}
+#         # context for to create stock.move, count the location
+#         context.update({'picking_type': 'out'})
+#         part_pool = self.pool.get('res.partner')
+#         customer = part_pool.browse(cr, ic_uid,
+#                                     pick_in.company_id.partner_id.id)
+
+#         location_id = False
+#         cr.execute("""
+#         SELECT
+#             id
+#         FROM
+#             stock_location
+#         WHERE
+#             company_id=%s
+#             AND name='Stock'
+#         """, (company_to,))
+#         location = cr.fetchone()
+#         if location and location[0]:
+#             location_id = location[0]
+#         location_dest_id = (customer.property_stock_customer
+#                             and customer.property_stock_customer.id
+#                             or False)
+
+#         if (not location_dest_id or not location_id):
+#             raise osv.except_osv(
+#                 _('Error!'),
+#                 _("""prepare_intercompany_picking_out_data location%s
+#                     location_dest%s"""
+#                   % (location_id, location_dest_id)))
+
+#         move_lines_data = [(5,)]
+#         for move_line in pick_in.move_lines:
+#             line_data = {
+#                 #'picking_id':        ic_id,
+#                 'name': move_line.name,
+#                 'product_qty': move_line.product_qty,
+#                 'product_id': move_line.product_id.id,
+#                 'product_uom': move_line.product_uom.id,
+#                 'price_unit': move_line.price_unit,
+#                 'price_currency_id': (move_line.price_currency_id
+#                                       and move_line.price_currency_id.id
+#                                       or False),
+#                 'location_id': location_id,
+#                 'location_dest_id': location_dest_id,
+#                 'company_id': company_to,
+#             }
+#             move_lines_data.append((0, 0, line_data))
+
+#         picking_data = {
+#             'partner_id': customer.id,
+#             'picking_ic_id': pick_in.id,
+#             'is_locked': True,
+#             'ic_create': True,
+#             'company_id': company_to,
+#             'type': 'out',
+#             'origin': 'IC:' + pick_in.name,
+#             'move_lines': move_lines_data,
+#             'magento_bind_ids': False,
+#             'related_backorder_ids': False,
+#         }
+#         return picking_data
+
+#     def prepare_intercompany_picking_in_data(
+#             self, cr, uid, pick_out, company_to, ic_uid, context=None):
+#         """
+#         prepare the picking.out data
+#         @pick_out  browse record of stock.picking, type == in
+#         @company_to  the company_id of this picking.out record
+#         """
+#         context = context or {}
+#         #context for to create stock.move, count the location
+#         context.update({'picking_type': 'in'})
+#         part_pool = self.pool.get('res.partner')
+#         supplier = part_pool.browse(cr, ic_uid,
+#                                     pick_out.company_id.partner_id.id)
+
+#         location_id = (supplier.property_stock_supplier
+#                        and supplier.property_stock_supplier.id
+#                        or False)
+#         location_dest_id = False
+#         cr.execute("""
+#         SELECT
+#             id
+#         FROM
+#             stock_location
+#         WHERE
+#             company_id=%s
+#             AND name='Stock'
+#         """, (company_to,))
+#         location = cr.fetchone()
+#         if location and location[0]:
+#             location_dest_id = location[0]
+
+#         if (not location_dest_id or not location_id):
+#             raise osv.except_osv(
+#                 _('Error!'),
+#                 _('''prepare_intercompany_picking_in_data
+#                     location%s location_dest%s'''
+#                   % (location_id, location_dest_id)))
+
+#         move_lines_data = [(5,)]
+#         for move_line in pick_out.move_lines:
+#             line_data = {
+#                 #'picking_id': ic_id,
+#                 'name': move_line.name,
+#                 'product_qty': move_line.product_qty,
+#                 'product_id': move_line.product_id.id,
+#                 'product_uom': move_line.product_uom.id,
+#                 'price_unit': move_line.price_unit,
+#                 'price_currency_id': (move_line.price_currency_id
+#                                       and move_line.price_currency_id.id
+#                                       or False),
+#                 'location_id': location_id,
+#                 'location_dest_id': location_dest_id,
+#                 'company_id': company_to,
+#             }
+#             move_lines_data.append((0, 0, line_data))
+
+#         picking_data = {
+#             'partner_id': supplier.id,
+#             'picking_ic_id': pick_out.id,
+#             'is_locked': True,
+#             'ic_create': True,
+#             'company_id': company_to,
+#             'type': 'in',
+#             'origin': 'IC:' + pick_out.name,
+#             'move_lines': move_lines_data,
+#             'magento_bind_ids': False,
+#             'related_backorder_ids': False,
+#         }
+#         return picking_data
+
+# stock_picking()
+
+
+# class stock_picking_in(osv.osv):
+#     _inherit = 'stock.picking.in'
+#     _name = 'stock.picking.in'
+
+#     _columns = {
+#         'is_locked': fields.boolean('Locked for Intercompany'),
+#         'ic_create': fields.boolean('Intercompany Picking generated'),
+#         'picking_ic_id': fields.many2one('stock.picking', 'Stock Picking'),
+#     }
+
+#     def get_intercompany(self, cr, uid, id, context=None):
+#         """
+#         get company from and to
+#         """
+
+#         assert isinstance(id, int) or isinstance(id, long)
+#         cr.execute("""
+#         SELECT
+#             pick.company_id AS from_c, cmp.id AS to_c,cmp.intercompany_uid
+#         FROM
+#             stock_picking AS pick
+#             LEFT JOIN res_partner AS part ON (pick.partner_id=part.id)
+#             LEFT JOIN res_company AS cmp ON (part.id=cmp.partner_id)
+#         WHERE pick.id=%s
+#         """, (id,))
+#         return cr.fetchone()
+
+#     #this function is same as the stock.picking function,
+#     #when modify this function of  stock.picking ,
+#     #copy and replace this.
+#     def prepare_IC_pick_out(self, cr, uid, pick_in, company_to,
+#                             ic_uid, context=None):
+#         """
+#         prepare the picking.out data
+#         @pick_in  browse record of stock.picking, type == in
+#         @company_to  the company_id of this picking.out record
+#         """
+
+#         context = context or {}
+#         # context for to create stock.move, count the location
+#         context.update({'picking_type': 'out'})
+#         part_pool = self.pool.get('res.partner')
+#         customer = part_pool.browse(cr, ic_uid,
+#                                     pick_in.company_id.partner_id.id)
+#         location_id = False
+#         cr.execute("""
+#         SELECT
+#             id
+#         FROM
+#             stock_location
+#         WHERE company_id=%s
+#             AND name='Stock'
+#         """, (company_to,))
+
+#         location = cr.fetchone()
+#         if location and location[0]:
+#             location_id = location[0]
+#         location_dest_id = (customer.property_stock_customer
+#                             and customer.property_stock_customer.id
+#                             or False)
+
+#         if (not location_dest_id or not location_id):
+#             raise osv.except_osv(
+#                 _('Error!'),
+#                 _('''prepare_intercompany_picking_out_data
+#                 location%s location_dest%s'''
+#                     % (location_id, location_dest_id)))
+
+#         move_lines_data = [(5,)]
+#         for move_line in pick_in.move_lines:
+#             line_data = {
+#                 #'picking_id':        ic_id,
+#                 'name': move_line.name,
+#                 'product_qty': move_line.product_qty,
+#                 'product_id': move_line.product_id.id,
+#                 'product_uom': move_line.product_uom.id,
+#                 'price_unit': move_line.price_unit,
+#                 'price_currency_id': (move_line.price_currency_id
+#                                       and move_line.price_currency_id.id
+#                                       or False),
+#                 'location_id': location_id,
+#                 'location_dest_id': location_dest_id,
+#                 'company_id': company_to,
+#             }
+#             move_lines_data.append((0, 0, line_data))
+
+#         picking_data = {
+#             'partner_id': customer.id,
+#             'picking_ic_id': pick_in.id,
+#             'is_locked': True,
+#             'ic_create': True,
+#             'company_id': company_to,
+#             'type': 'out',
+#             'origin': 'IC:' + pick_in.name,
+#             'move_lines': move_lines_data,
+#             'magento_bind_ids': False,
+#             'related_backorder_ids': False,
+#         }
+#         return picking_data
+
+#     def write(self, cr, uid, ids, values, context=None,
+#               ban_update_out=False, ban_inverse_out=False):
+#         """
+#         @need_update_out
+#             auto: according the IC set,return True or False
+#             True   update_intercompany_picking_out
+#             False  no update_intercompany_picking_out
+#         @need_inverse_out
+#             like need_update_out
+#         """
+#         print """>>>>picking in write ids:%s ban_update_out%s,
+#             ban_inverse_out%s
+#             """ % (ids, ban_update_out, ban_inverse_out)
+#         if isinstance(ids, int) or isinstance(ids, long):
+#             ids = [ids]
+#         res = super(stock_picking_in, self).write(cr, uid, ids,
+#                                                   values, context=context)
+
+#         if res and not ban_update_out:
+#             self.update_IC_pick_out(cr, SUPERUSER_ID, ids, context=context)
+#         if res and not ban_inverse_out:
+#             self.inverse_IC_pick_out(cr, SUPERUSER_ID, ids, context=context)
+#         return res
+
+#     def update_IC_pick_out(self, cr, uid, ids, context=None):
+#         """
+#         """
+#         out_pool = self.pool.get('stock.picking.out')
+#         ic_pool = self.pool.get('res.intercompany')
+
+#         for pick_in in self.browse(cr, uid, ids, context):
+#             out_id = out_pool.search(
+#                 cr, uid, [('picking_ic_id', '=', pick_in.id)])
+#             if out_id:
+#                 cf, ct, ic_uid = self.get_intercompany(cr, uid, pick_in.id,
+#                                                        context=context)
+#                 modify_mode = ic_pool.get_modify_model(cr, uid, cf,
+#                                                        ct, 'is2do',)
+#                 if modify_mode in ['regular', 'bidirectional']:
+#                     p_out_data = self.prepare_IC_pick_out(
+#                         cr, uid, pick_in, ct, ic_uid, context=context)
+#                     out_pool.write(cr, ic_uid, out_id,
+#                                    p_out_data, ban_inverse_in=True)
+#         return True
+
+#     def inverse_IC_pick_out(self, cr, uid, ids, context=None):
+#         """
+#         """
+#         pick_out_pool = self.pool.get('stock.picking.out')
+#         intercompany_pool = self.pool.get('res.intercompany')
+
+#         for pick_in in self.browse(cr, uid, ids, context=context):
+#             pick_out = pick_in.picking_ic_id
+#             if pick_out:
+#                 company_from, company_to = pick_out_pool.get_intercompany(
+#                     cr, uid, pick_out.id)[0:2]
+#                 modify_mode = intercompany_pool.get_modify_model(
+#                     cr, uid, company_from, company_to, 'do2is',)
+#                 if modify_mode in ['inverse', 'bidirectional']:
+
+#                     lines_data = [(5,)]
+#                     #TODO， all location is the same ?
+#                     #or how to make sure the location?
+#                     location_id = pick_out.move_lines[0].location_id.id
+#                     dest_id = pick_out.move_lines[0].location_dest_id.id
+
+#                     for in_line in pick_in.move_lines:
+#                         data = (0, 0, {
+#                             'name': in_line.name,
+#                             'product_qty': in_line.product_qty,
+#                             'product_id': in_line.product_id.id,
+#                             'product_uom': in_line.product_uom.id,
+#                             'price_unit': in_line.price_unit,
+#                             'price_currency_id': (
+#                                 in_line.price_currency_id
+#                                 and in_line.price_currency_id.id
+#                                 or False),
+#                             'location_id': location_id,
+#                             'location_dest_id': dest_id,
+#                             'company_id': pick_out.company_id.id,
+#                         })
+#                         lines_data.append(data)
+
+#                     pick_out_pool.write(cr, uid, pick_out.id,
+#                                         {'move_lines': lines_data},
+#                                         ban_update_in=True)
+#         return True
+
+#     def unlink(self, cr, uid, ids, context=None):
+#         res = super(stock_picking_in, self).unlink(cr, uid, ids,
+#                                                    context=context)
+#         if isinstance(ids, int) or isinstance(ids, long):
+#             ids = [ids]
+
+#         pick_out_pool = self.pool.get('stock.picking.out')
+#         for pick_in_id in ids:
+#             pick_out_ids = pick_out_pool.search(
+#                 cr, uid,
+#                 [('picking_ic_id', '=', pick_in_id)],
+#                 context=context)
+#             if pick_out_ids:
+#                 pick_out_pool.unlink(cr, uid, pick_out_ids, context=context)
+#         return res
+
+# stock_picking_in()
+
+
+# class stock_picking_out(osv.osv):
+#     _inherit = 'stock.picking.out'
+#     _name = 'stock.picking.out'
+
+#     _columns = {
+#         'is_locked': fields.boolean('Locked for Intercompany'),
+#         'ic_create': fields.boolean('Intercompany Picking generated'),
+#         'picking_ic_id': fields.many2one('stock.picking', 'Stock Picking'),
+#     }
+
+#     def get_intercompany(self, cr, uid, id, context=None):
+#         """
+#         get company from and to
+#         """
+
+#         assert isinstance(id, int) or isinstance(id, long)
+#         cr.execute("""
+#         SELECT
+#             pick.company_id AS from_c, cmp.id AS to_c, cmp.intercompany_uid
+#         FROM stock_picking AS pick
+#             LEFT JOIN res_partner AS part ON (pick.partner_id=part.id)
+#             LEFT JOIN res_company AS cmp  ON (part.id=cmp.partner_id)
+#         WHERE pick.id=%s
+#         """, (id,))
+#         return cr.fetchone()
+
+#     def write(self, cr, uid, ids, values, context=None,
+#               ban_update_in=False, ban_inverse_in=False):
+#         """
+#         """
+
+#         res = super(stock_picking_out, self).write(cr, uid, ids,
+#                                                    values, context=context)
+#         if isinstance(ids, int) or isinstance(ids, long):
+#             ids = [ids]
+#         if res and not ban_update_in:
+#             self.update_IC_pick_in(cr, SUPERUSER_ID, ids, context=context)
+#         if res and not ban_inverse_in:
+#             self.inverse_IC_pick_in(cr, SUPERUSER_ID, ids, context=context)
+
+#         return res
+
+#     def update_IC_pick_in(self, cr, uid, ids, context=None):
+#         pick_in_obj = self.pool.get('stock.picking.in')
+#         ic_pool = self.pool.get('res.intercompany')
+
+#         for pick_out in self.browse(cr, uid, ids, context):
+#             pick_in_id = pick_in_obj.search(
+#                 cr, uid, [('picking_ic_id', '=', pick_out.id)])
+#             if pick_in_id:
+#                 cf, ct, ic_uid = self.get_intercompany(cr, uid, pick_out.id,
+#                                                        context=context)
+#                 modify_mode = ic_pool.get_modify_model(cr, uid, cf, ct,
+#                                                        'do2is',)
+#                 if modify_mode in ['regular', 'bidirectional']:
+#                     p_in_data = self.prepare_intercompany_picking_in_data(
+#                         cr, uid, pick_out, ct, ic_uid, context=context)
+#                     pick_in_obj.write(cr, ic_uid, pick_in_id, p_in_data,
+#                                       ban_inverse_out=True)
+#         return True
+
+#     def inverse_IC_pick_in(self, cr, uid, ids, context=None):
+#         """
+#         """
+
+#         pick_in_pool = self.pool.get('stock.picking.in')
+#         intercompany_pool = self.pool.get('res.intercompany')
+
+#         for pick_out in self.browse(cr, uid, ids, context=context):
+#             pick_in = pick_out.picking_ic_id
+#             if pick_in:
+#                 cf, ct = pick_in_pool.get_intercompany(cr, uid,
+#                                                        pick_in.id)[0:2]
+#                 modify_mode = intercompany_pool.get_modify_model(cr, uid, cf,
+#                                                                  ct, 'is2do',)
+#                 if modify_mode in ['inverse', 'bidirectional']:
+#                     lines_data = [(5,)]
+#                     #TODO， all location is the same ?
+#                     #or how to make sure the location?
+#                     location_id = pick_in.move_lines[0].location_id.id
+#                     dest_id = pick_in.move_lines[0].location_dest_id.id
+
+#                     for out_line in pick_out.move_lines:
+#                         data = (0, 0, {
+#                             'picking_id': pick_in.id,
+#                             'name': out_line.name,
+#                             'product_qty': out_line.product_qty,
+#                             'product_id': out_line.product_id.id,
+#                             'product_uom': out_line.product_uom.id,
+#                             'price_unit': out_line.price_unit,
+#                             'price_currency_id': (
+#                                 out_line.price_currency_id
+#                                 and out_line.price_currency_id.id
+#                                 or False),
+#                             'location_id': location_id,
+#                             'location_dest_id': dest_id,
+#                             'company_id': pick_in.company_id.id,
+#                         })
+#                         lines_data.append(data)
+#                     #pick_in_uid = pick_in.create_uid or
+#                     #pick_in.company_id.itercompany_uid
+#                     pick_in_pool.write(cr, uid, pick_in.id,
+#                                        {'move_lines': lines_data},
+#                                        ban_update_out=True)
+#         return True
+
+#     def unlink(self, cr, uid, ids, context=None):
+#         res = super(stock_picking_out, self).unlink(cr, uid, ids,
+#                                                     context=context)
+#         if isinstance(ids, int) or isinstance(ids, long):
+#             ids = [ids]
+
+#         pick_in_pool = self.pool.get('stock.picking.in')
+#         for pick_out_id in ids:
+#             pick_in_ids = pick_in_pool.search(
+#                 cr, uid, [('picking_ic_id', '=', pick_out_id)],
+#                 context=context)
+#             if pick_in_ids:
+#                 pick_in_pool.unlink(cr, uid, pick_in_ids, context=context)
+#         return res
+
+#     #this function is same as stock.picking,
+#     #when modify that, copy and replace this
+#     def prepare_intercompany_picking_in_data(
+#             self, cr, uid, pick_out, company_to, ic_uid, context=None):
+#         """
+#         prepare the picking.out data
+#         @pick_out  browse record of stock.picking, type == in
+#         @company_to  the company_id of this picking.out record
+#         """
+
+#         context = context or {}
+#         # context for to create stock.move, count the location
+#         context.update({'picking_type': 'in'})
+#         part_pool = self.pool.get('res.partner')
+#         supplier_id = pick_out.company_id.partner_id.id
+#         supplier = part_pool.browse(cr, ic_uid, supplier_id)
+
+#         location_id = (supplier.property_stock_supplier
+#                        and supplier.property_stock_supplier.id
+#                        or False)
+#         location_dest_id = False
+#         cr.execute("""
+#         SELECT
+#             id
+#         FROM
+#             stock_location
+#         WHERE company_id=%s
+#             AND name='Stock'
+#         """, (company_to,))
+#         location = cr.fetchone()
+#         if location and location[0]:
+#             location_dest_id = location[0]
+
+#         if (not location_dest_id or not location_id):
+#             raise osv.except_osv(
+#                 _('Error!'),
+#                 _('''prepare_intercompany_picking_in_data
+#                     location%s location_dest%s'''
+#                     % (location_id, location_dest_id)))
+
+#         move_lines_data = [(5,)]
+#         for move_line in pick_out.move_lines:
+#             line_data = {
+#                 #'picking_id': ic_id,
+#                 'name': move_line.name,
+#                 'product_qty': move_line.product_qty,
+#                 'product_id': move_line.product_id.id,
+#                 'product_uom': move_line.product_uom.id,
+#                 'price_unit': move_line.price_unit,
+#                 'price_currency_id': (move_line.price_currency_id
+#                                       and move_line.price_currency_id.id
+#                                       or False),
+#                 'location_id': location_id,
+#                 'location_dest_id': location_dest_id,
+#                 'company_id': company_to,
+#             }
+#             move_lines_data.append((0, 0, line_data))
+
+#         picking_data = {
+#             'partner_id': supplier.id,
+#             'picking_ic_id': pick_out.id,
+#             'is_locked': True,    
+#             'ic_create': True,
+#             'company_id': company_to,
+#             'type': 'in',
+#             'origin': 'IC:' + pick_out.name,
+#             'move_lines': move_lines_data,
+#             'magento_bind_ids': False,
+#             'related_backorder_ids': False,
+#         }
+#         return picking_data
+
+# stock_picking_out()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'base_intercompany/stock_picking_wkf.xml'
--- base_intercompany/stock_picking_wkf.xml	1970-01-01 00:00:00 +0000
+++ base_intercompany/stock_picking_wkf.xml	2013-12-30 03:21:22 +0000
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+	<data>
+		<record id="stock.act_draft" model="workflow.activity">
+		    <field name="kind">function</field>
+		    <field name="action">action_draft()</field>
+		</record>
+	</data>
+</openerp>
\ No newline at end of file

=== added directory 'base_intercompany/tests'
=== added file 'base_intercompany/tests/__init__.py'
--- base_intercompany/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ base_intercompany/tests/__init__.py	2013-12-30 03:21:22 +0000
@@ -0,0 +1,8 @@
+import test_sale
+
+fast_suite = [
+]
+
+checks = [
+    # test_sale
+]

=== added file 'base_intercompany/tests/test_sale.py'
--- base_intercompany/tests/test_sale.py	1970-01-01 00:00:00 +0000
+++ base_intercompany/tests/test_sale.py	2013-12-30 03:21:22 +0000
@@ -0,0 +1,559 @@
+import mock
+import unittest2
+from datetime import datetime, timedelta
+
+import openerp
+import openerp.tests.common as common
+from openerp.osv import osv
+
+DB = common.DB
+ADMIN_USER_ID = common.ADMIN_USER_ID
+
+
+class test_icops_sale(common.TransactionCase):
+
+    def setUp(self):
+        super(test_icops_sale, self).setUp()
+        # get super user
+        self.m = self.registry('ir.model.data')
+        self.user_pool = self.registry('res.users')
+        self.super_user = self.user_pool.browse(self.cr, self.uid, self.uid)
+        # creates companies
+        self.company_1 = self.m.get_object(
+            self.cr, self.uid, 'base', 'main_company')
+
+        self.company_2 = self.m.get_object(
+            self.cr, self.uid, 'multi_company', 'res_company_oerp_be')
+
+        self.user_1 = self.m.get_object(
+            self.cr, self.uid, 'base_intercompany', 'user_icops1')
+
+        self.user_2 = self.m.get_object(
+            self.cr, self.uid, 'base_intercompany', 'user_icops2')
+
+        self.shop_1 = self.m.get_object(
+            self.cr, self.uid, 'base_intercompany',
+            'sale_shop_icops_1')
+
+        self.shop_2 = self.m.get_object(
+            self.cr, self.uid, 'base_intercompany',
+            'sale_shop_icops_2')
+
+        company_pool = self.registry('res.company')
+        company_pool.write(
+            self.cr, self.uid, self.company_1.id,
+            {'intercompany_uid': self.user_1.id,
+             'intercompany_shop_id': self.shop_1.id})
+
+        company_pool.write(
+            self.cr, self.uid, self.company_2.id,
+            {'intercompany_uid': self.user_2.id,
+             'intercompany_shop_id': self.shop_2.id})
+
+        self.icops_pool = self.registry('res.intercompany')
+        self.so_pool = self.registry('sale.order')
+        self.po_pool = self.registry('purchase.order')
+
+    def test_01_so_creates_po(self):
+
+        self.icops_pool.create(
+            self.cr, self.uid,
+            {'company_from': self.company_1.id,
+             'company_to': self.company_2.id,
+             'obj2obj': 'so2po',
+             'status': 'draft',
+             'direction': 'regular'})
+        sale_id = self.so_pool.create(self.cr, self.user_1.id, {
+            'partner_id': self.company_2.partner_id.id,
+            'partner_invoice_id': self.company_2.partner_id.id,
+            'partner_shipping_id': self.company_2.partner_id.id,
+            'shop_id': self.shop_1.id,
+            'date_order': datetime.now().strftime('%Y-%m-%d'),
+            'pricelist_id': self.user_1.property_product_pricelist.id
+        })
+        so = self.so_pool.browse(self.cr, self.user_1.id, sale_id)
+        self.assertTrue(so.purchase_id.id)
+        po = self.po_pool.browse(self.cr, self.uid, so.purchase_id.id)
+        self.assertIsNotNone(po.id)
+        self.assertEqual(so.purchase_id.id, po.id)
+        self.assertEqual(po.sale_id.id, so.id)
+
+    def test_02_creates_normal_so(self):
+
+        self.icops_pool.create(
+            self.cr, self.uid,
+            {'company_from': self.company_1.id,
+             'company_to': self.company_2.id,
+             'obj2obj': 'so2po',
+             'status': 'draft',
+             'direction': 'regular'})
+        sale_id = self.so_pool.create(self.cr, self.user_1.id, {
+            'partner_id': self.company_1.partner_id.id,
+            'partner_invoice_id': self.company_1.partner_id.id,
+            'partner_shipping_id': self.company_1.partner_id.id,
+            'shop_id': self.shop_1.id,
+            'date_order': datetime.now().strftime('%Y-%m-%d'),
+            'pricelist_id': self.user_1.property_product_pricelist.id
+        })
+        so = self.so_pool.browse(self.cr, self.user_1.id, sale_id)
+
+        self.assertFalse(so.purchase_id.id)
+
+    def test_03_so_creates_po_updates_so_line_regular(self):
+        product = self.m.get_object(
+            self.cr, self.uid, 'product', 'product_product_1')
+        self.icops_pool.create(
+            self.cr, self.uid,
+            {'company_from': self.company_1.id,
+             'company_to': self.company_2.id,
+             'obj2obj': 'so2po',
+             'status': 'draft',
+             'direction': 'regular'})
+        sale_id = self.so_pool.create(self.cr, self.user_1.id, {
+            'partner_id': self.company_2.partner_id.id,
+            'partner_invoice_id': self.company_2.partner_id.id,
+            'partner_shipping_id': self.company_2.partner_id.id,
+            'shop_id': self.shop_1.id,
+            'date_order': datetime.now().strftime('%Y-%m-%d'),
+            'pricelist_id': self.user_1.property_product_pricelist.id
+        })
+        so = self.so_pool.browse(self.cr, self.user_1.id, sale_id)
+
+        po = so.purchase_id
+        self.assertEqual(so.order_line, po.order_line)
+        sol = [(0, False, {
+            'product_uos_qty': 1, 'product_id': product.id,
+            'product_uom': 1, 'price_unit': 885,
+            'product_uom_qty': 1, 'th_weight': 0, 'product_uos': False,
+            'tax_id': [[6, False, []]],
+            'name': product.name})]
+        self.so_pool.write(
+            self.cr, self.user_1.id, so.id, {'order_line': sol})
+        so = self.so_pool.browse(
+            self.cr, self.user_1.id, so.id)
+
+        self.assertEqual(len(so.order_line), 1)
+
+        po = self.po_pool.browse(
+            self.cr, self.user_2.id, po.id)
+        self.assertEqual(
+            so.order_line[0].product_id, po.order_line[0].product_id)
+        self.assertEqual(
+            so.order_line[0].product_uom_qty, po.order_line[0].product_qty)
+
+    def test_04_so_creates_po_updates_so_line_inverse(self):
+        product = self.m.get_object(
+            self.cr, self.uid, 'product', 'product_product_1')
+        self.icops_pool.create(
+            self.cr, self.uid,
+            {'company_from': self.company_1.id,
+             'company_to': self.company_2.id,
+             'obj2obj': 'so2po',
+             'status': 'draft',
+             'direction': 'inverse'})
+        sale_id = self.so_pool.create(self.cr, self.user_1.id, {
+            'partner_id': self.company_2.partner_id.id,
+            'partner_invoice_id': self.company_2.partner_id.id,
+            'partner_shipping_id': self.company_2.partner_id.id,
+            'shop_id': self.shop_1.id,
+            'date_order': datetime.now().strftime('%Y-%m-%d'),
+            'pricelist_id': self.user_1.property_product_pricelist.id
+        })
+        so = self.so_pool.browse(self.cr, self.user_1.id, sale_id)
+
+        po = so.purchase_id
+        self.assertEqual(so.order_line, po.order_line)
+        sol = [(0, False, {
+            'product_uos_qty': 1, 'product_id': product.id,
+            'product_uom': 1, 'price_unit': 885,
+            'product_uom_qty': 1, 'th_weight': 0, 'product_uos': False,
+            'tax_id': [[6, False, []]],
+            'name': product.name})]
+
+        self.assertEqual(len(so.order_line), 0)
+        a = None
+        with self.assertRaises(osv.except_osv):
+            a = self.so_pool.write(
+                self.cr, self.user_1.id, so.id, {'order_line': sol})
+
+        so = self.so_pool.browse(
+            self.cr, self.user_1.id, so.id)
+
+        self.assertEqual(len(so.order_line), 0)
+
+        pol = [(0, False, {
+            'product_id': product.id,
+            'name': product.name,
+            'date_planned': '10/20/2013',
+            'product_qty': 1,
+            'price_unit': 885,
+            'product_uom': 1,
+            'tax_id': [[6, False, []]]
+        })]
+        self.po_pool.write(
+            self.cr, self.user_2.id, po.id, {'order_line': pol})
+
+        so = self.so_pool.browse(
+            self.cr, self.user_1.id, so.id)
+
+        self.assertEqual(len(so.order_line), 1)
+
+        po = self.po_pool.browse(
+            self.cr, self.user_2.id, po.id)
+        self.assertEqual(
+            so.order_line[0].product_id, po.order_line[0].product_id)
+        self.assertEqual(
+            so.order_line[0].product_uom_qty, po.order_line[0].product_qty)
+
+    # def test_05_so_creates_po_updates_so_line_bidirectional(self):
+    #     product = self.m.get_object(
+    #         self.cr, self.uid, 'product', 'product_product_1')
+    #     self.icops_pool.create(
+    #         self.cr, self.uid,
+    #         {'company_from': self.company_1.id,
+    #          'company_to': self.company_2.id,
+    #          'obj2obj': 'so2po',
+    #          'status': 'draft',
+    #          'direction': 'bidirectional'})
+    #     sale_id = self.so_pool.create(self.cr, self.user_1.id, {
+    #         'partner_id': self.company_2.partner_id.id,
+    #         'partner_invoice_id': self.company_2.partner_id.id,
+    #         'partner_shipping_id': self.company_2.partner_id.id,
+    #         'shop_id': self.shop_1.id,
+    #         'date_order': datetime.now().strftime('%Y-%m-%d'),
+    #         'pricelist_id': self.user_1.property_product_pricelist.id
+    #     })
+    #     so = self.so_pool.browse(self.cr, self.user_1.id, sale_id)
+
+    #     po = so.purchase_id
+    #     self.assertEqual(so.order_line, po.order_line)
+    #     sol = [(0, False, {
+    #         'product_uos_qty': 1, 'product_id': product.id,
+    #         'product_uom': 1, 'price_unit': 885,
+    #         'product_uom_qty': 1, 'th_weight': 0, 'product_uos': False,
+    #         'tax_id': [[6, False, []]],
+    #         'name': product.name})]
+    #     self.so_pool.write(
+    #         self.cr, self.user_1.id, so.id, {'order_line': sol})
+    #     so = self.so_pool.browse(
+    #         self.cr, self.user_1.id, so.id)
+
+    #     self.assertEqual(len(so.order_line), 1)
+
+    #     po = self.po_pool.browse(
+    #         self.cr, self.user_2.id, po.id)
+
+    #     self.assertEqual(
+    #         so.order_line[0].product_id, po.order_line[0].product_id)
+    #     self.assertEqual(
+    #         so.order_line[0].product_uom_qty, po.order_line[0].product_qty)
+
+    #     self.assertEqual(po.order_line[0].product_qty, 1)
+    #     pol = [(1, po.order_line[0].id, {
+    #         'product_qty': 2,
+    #     })]
+    #     self.po_pool.write(
+    #         self.cr, self.user_2.id, po.id, {'order_line': pol})
+
+    #     so = self.so_pool.browse(
+    #         self.cr, self.user_1.id, so.id)
+
+    #     self.assertEqual(len(so.order_line), 1)
+
+    #     po = self.po_pool.browse(
+    #         self.cr, self.user_2.id, po.id)
+    #     self.assertEqual(
+    #         so.order_line[0].product_id, po.order_line[0].product_id)
+    #     self.assertEqual(
+    #         so.order_line[0].product_uom_qty, po.order_line[0].product_qty)
+    #     self.assertEqual(so.order_line[0].product_uom_qty, 2)
+
+    # def test_06_delete_so(self):
+
+    #     sale_id = self.so_pool.create(self.cr, self.user_1.id, {
+    #         'partner_id': self.company_2.partner_id.id,
+    #         'partner_invoice_id': self.company_2.partner_id.id,
+    #         'partner_shipping_id': self.company_2.partner_id.id,
+    #         'shop_id': self.shop_1.id,
+    #         'date_order': datetime.now().strftime('%Y-%m-%d'),
+    #         'pricelist_id': self.user_1.property_product_pricelist.id
+    #     })
+    #     result = self.so_pool.unlink(self.cr, self.user_1.id, sale_id)
+    #     self.assertTrue(result)
+
+    def test_07_so_deletes_po(self):
+
+        self.icops_pool.create(
+            self.cr, self.uid,
+            {'company_from': self.company_1.id,
+             'company_to': self.company_2.id,
+             'obj2obj': 'so2po',
+             'status': 'draft',
+             'direction': 'regular'})
+
+        self.icops_pool.create(
+            self.cr, self.uid,
+            {'company_from': self.company_1.id,
+             'company_to': self.company_2.id,
+             'obj2obj': 'so2po',
+             'status': 'unlink',
+             'direction': 'regular'})
+
+        sale_id = self.so_pool.create(self.cr, self.user_1.id, {
+            'partner_id': self.company_2.partner_id.id,
+            'partner_invoice_id': self.company_2.partner_id.id,
+            'partner_shipping_id': self.company_2.partner_id.id,
+            'shop_id': self.shop_1.id,
+            'date_order': datetime.now().strftime('%Y-%m-%d'),
+            'pricelist_id': self.user_1.property_product_pricelist.id
+        })
+        so = self.so_pool.browse(self.cr, self.user_1.id, sale_id)
+
+        po_ids = self.po_pool.search(
+            self.cr, self.uid, [('sale_id', '=', so.id)])
+
+        self.assertEqual(len(po_ids), 1)
+
+        self.so_pool.unlink(
+            self.cr, self.user_1.id, so.id)
+
+        po_ids = self.po_pool.search(
+            self.cr, self.user_2.id, [('sale_id', '=', so.id)])
+        self.assertEqual(len(po_ids), 0)
+
+    def test_07_so_deletes_po_inverse(self):
+
+        self.icops_pool.create(
+            self.cr, self.uid,
+            {'company_from': self.company_1.id,
+             'company_to': self.company_2.id,
+             'obj2obj': 'so2po',
+             'status': 'draft',
+             'direction': 'regular'})
+
+        self.icops_pool.create(
+            self.cr, self.uid,
+            {'company_from': self.company_1.id,
+             'company_to': self.company_2.id,
+             'obj2obj': 'so2po',
+             'status': 'unlink',
+             'direction': 'inverse'})
+
+        sale_id = self.so_pool.create(self.cr, self.user_1.id, {
+            'partner_id': self.company_2.partner_id.id,
+            'partner_invoice_id': self.company_2.partner_id.id,
+            'partner_shipping_id': self.company_2.partner_id.id,
+            'shop_id': self.shop_1.id,
+            'date_order': datetime.now().strftime('%Y-%m-%d'),
+            'pricelist_id': self.user_1.property_product_pricelist.id
+        })
+        so = self.so_pool.browse(self.cr, self.user_1.id, sale_id)
+
+        po_ids = self.po_pool.search(
+            self.cr, self.user_2.id, [('sale_id', '=', so.id)])
+
+        self.assertEqual(len(po_ids), 1)
+
+        so_ids = self.so_pool.search(
+            self.cr, self.user_1.id, [('purchase_id', '=', so.purchase_id.id)])
+
+        self.assertEqual(len(po_ids), 1)
+
+        # with self.assertRaises(osv.except_osv):
+        #     self.so_pool.unlink(
+        #         self.cr, self.user_1.id, so.id)
+
+        # so_ids = self.so_pool.search(
+        #     self.cr, self.user_1.id, [('purchase_id', '=', so.purchase_id.id)])
+
+        # self.assertEqual(len(po_ids), 1)
+
+        self.po_pool.unlink(
+            self.cr, self.user_2.id, so.purchase_id.id)
+
+        so_ids = self.so_pool.search(
+            self.cr, self.user_1.id, [('purchase_id', '=', so.purchase_id.id)])
+
+        self.assertEqual(len(so_ids), 0)
+
+    # def test_08_so_deletes_po_bidirectional_1(self):
+
+    #     self.icops_pool.create(
+    #         self.cr, self.uid,
+    #         {'company_from': self.company_1.id,
+    #          'company_to': self.company_2.id,
+    #          'obj2obj': 'so2po',
+    #          'status': 'draft',
+    #          'direction': 'regular'})
+
+    #     self.icops_pool.create(
+    #         self.cr, self.uid,
+    #         {'company_from': self.company_1.id,
+    #          'company_to': self.company_2.id,
+    #          'obj2obj': 'so2po',
+    #          'status': 'unlink',
+    #          'direction': 'bidirectional'})
+
+    #     sale_id = self.so_pool.create(self.cr, self.user_1.id, {
+    #         'partner_id': self.company_2.partner_id.id,
+    #         'partner_invoice_id': self.company_2.partner_id.id,
+    #         'partner_shipping_id': self.company_2.partner_id.id,
+    #         'shop_id': self.shop_1.id,
+    #         'date_order': datetime.now().strftime('%Y-%m-%d'),
+    #         'pricelist_id': self.user_1.property_product_pricelist.id
+    #     })
+    #     so = self.so_pool.browse(self.cr, self.user_1.id, sale_id)
+
+    #     po_ids = self.po_pool.search(
+    #         self.cr, self.uid, [('sale_id', '=', so.id)])
+
+    #     self.assertEqual(len(po_ids), 1)
+
+    #     self.so_pool.unlink(
+    #         self.cr, self.user_1.id, so.id)
+
+    #     po_ids = self.po_pool.search(
+    #         self.cr, self.user_2.id, [('sale_id', '=', so.id)])
+    #     self.assertEqual(len(po_ids), 0)
+
+    # def test_09_so_deletes_po_bidirectional_2(self):
+
+    #     self.icops_pool.create(
+    #         self.cr, self.uid,
+    #         {'company_from': self.company_1.id,
+    #          'company_to': self.company_2.id,
+    #          'obj2obj': 'so2po',
+    #          'status': 'draft',
+    #          'direction': 'regular'})
+
+    #     self.icops_pool.create(
+    #         self.cr, self.uid,
+    #         {'company_from': self.company_1.id,
+    #          'company_to': self.company_2.id,
+    #          'obj2obj': 'so2po',
+    #          'status': 'unlink',
+    #          'direction': 'bidirectional'})
+
+    #     sale_id = self.so_pool.create(self.cr, self.user_1.id, {
+    #         'partner_id': self.company_2.partner_id.id,
+    #         'partner_invoice_id': self.company_2.partner_id.id,
+    #         'partner_shipping_id': self.company_2.partner_id.id,
+    #         'shop_id': self.shop_1.id,
+    #         'date_order': datetime.now().strftime('%Y-%m-%d'),
+    #         'pricelist_id': self.user_1.property_product_pricelist.id
+    #     })
+    #     so = self.so_pool.browse(self.cr, self.user_1.id, sale_id)
+
+    #     po_ids = self.po_pool.search(
+    #         self.cr, self.uid, [('sale_id', '=', so.id)])
+
+    #     self.assertEqual(len(po_ids), 1)
+
+    #     self.po_pool.unlink(
+    #         self.cr, self.user_2.id, so.purchase_id.id)
+
+    #     so_ids = self.so_pool.search(
+    #         self.cr, self.user_1.id, [('purchase_id', '=', so.purchase_id.id)])
+    #     self.assertEqual(len(so_ids), 0)
+
+    # def test_100_so_creates_po_double_setup(self):
+    #     product = self.m.get_object(
+    #         self.cr, self.uid, 'product', 'product_product_1')
+    #     self.icops_pool.create(
+    #         self.cr, self.uid,
+    #         {'company_from': self.company_1.id,
+    #          'company_to': self.company_2.id,
+    #          'obj2obj': 'so2po',
+    #          'status': 'draft',
+    #          'direction': 'bidirectional'})
+
+    #     self.icops_pool.create(
+    #         self.cr, self.uid,
+    #         {'company_from': self.company_2.id,
+    #          'company_to': self.company_1.id,
+    #          'obj2obj': 'po2so',
+    #          'status': 'draft',
+    #          'direction': 'bidirectional'})
+
+    #     sale_id = self.so_pool.create(self.cr, self.user_1.id, {
+    #         'partner_id': self.company_2.partner_id.id,
+    #         'partner_invoice_id': self.company_2.partner_id.id,
+    #         'partner_shipping_id': self.company_2.partner_id.id,
+    #         'shop_id': self.shop_1.id,
+    #         'date_order': datetime.now().strftime('%Y-%m-%d'),
+    #         'pricelist_id': self.user_1.property_product_pricelist.id
+    #     })
+    #     so = self.so_pool.browse(self.cr, self.user_1.id, sale_id)
+
+    #     po = so.purchase_id
+    #     self.assertEqual(so.order_line, po.order_line)
+    #     sol = [(0, False, {
+    #         'product_uos_qty': 1, 'product_id': product.id,
+    #         'product_uom': 1, 'price_unit': 885,
+    #         'product_uom_qty': 1, 'th_weight': 0, 'product_uos': False,
+    #         'tax_id': [[6, False, []]],
+    #         'name': product.name})]
+    #     self.so_pool.write(
+    #         self.cr, self.user_1.id, so.id, {'order_line': sol})
+    #     so = self.so_pool.browse(
+    #         self.cr, self.user_1.id, so.id)
+
+    #     self.assertEqual(len(so.order_line), 1)
+
+    #     po = self.po_pool.browse(
+    #         self.cr, self.user_2.id, po.id)
+    #     self.assertEqual(
+    #         so.order_line[0].product_id, po.order_line[0].product_id)
+    #     self.assertEqual(
+    #         so.order_line[0].product_uom_qty, po.order_line[0].product_qty)
+
+    # def test_101_so_creates_po_double_setup_inverse(self):
+    #     product = self.m.get_object(
+    #         self.cr, self.uid, 'product', 'product_product_1')
+    #     self.icops_pool.create(
+    #         self.cr, self.uid,
+    #         {'company_from': self.company_1.id,
+    #          'company_to': self.company_2.id,
+    #          'obj2obj': 'so2po',
+    #          'status': 'draft',
+    #          'direction': 'inverse'})
+
+    #     self.icops_pool.create(
+    #         self.cr, self.uid,
+    #         {'company_from': self.company_2.id,
+    #          'company_to': self.company_1.id,
+    #          'obj2obj': 'po2so',
+    #          'status': 'draft',
+    #          'direction': 'inverse'})
+
+    #     sale_id = self.so_pool.create(self.cr, self.user_1.id, {
+    #         'partner_id': self.company_2.partner_id.id,
+    #         'partner_invoice_id': self.company_2.partner_id.id,
+    #         'partner_shipping_id': self.company_2.partner_id.id,
+    #         'shop_id': self.shop_1.id,
+    #         'date_order': datetime.now().strftime('%Y-%m-%d'),
+    #         'pricelist_id': self.user_1.property_product_pricelist.id
+    #     })
+    #     so = self.so_pool.browse(self.cr, self.user_1.id, sale_id)
+
+    #     po = so.purchase_id
+    #     self.assertEqual(so.order_line, po.order_line)
+    #     sol = [(0, False, {
+    #         'product_uos_qty': 1, 'product_id': product.id,
+    #         'product_uom': 1, 'price_unit': 885,
+    #         'product_uom_qty': 1, 'th_weight': 0, 'product_uos': False,
+    #         'tax_id': [[6, False, []]],
+    #         'name': product.name})]
+    #     self.so_pool.write(
+    #         self.cr, self.user_1.id, so.id, {'order_line': sol})
+    #     so = self.so_pool.browse(
+    #         self.cr, self.user_1.id, so.id)
+
+    #     self.assertEqual(len(so.order_line), 1)
+
+    #     po = self.po_pool.browse(
+    #         self.cr, self.user_2.id, po.id)
+    #     self.assertEqual(
+    #         so.order_line[0].product_id, po.order_line[0].product_id)
+    #     self.assertEqual(
+    #         so.order_line[0].product_uom_qty, po.order_line[0].product_qty)

=== 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-12-30 03:21:22 +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-12-30 03:21:22 +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-12-30 03:21:22 +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-12-30 03:21:22 +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-12-30 03:21:22 +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-12-30 03:21:22 +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-12-30 03:21:22 +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-12-30 03:21:22 +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>