[MERGE] forward port of branch 8.0 up to 09ceb9c

17 files changed, 306 insertions, 112 deletions

diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index 5ea8333e761..2af0df89122 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -74,7 +74,7 @@
                 <group col="4">
                     <field name="name"/>
                     <field name="code"/>
-                    <field name="plan_id"/>
+                    <field name="plan_id" required="1"/>
                     <field name="journal_id"/>
                 </group>
                 <field name="account_ids">
diff --git a/addons/l10n_cn/account_chart_small_business_template.xml b/addons/l10n_cn/account_chart_small_business_template.xml
index 810191cccd5..6034baf9c71 100644
--- a/addons/l10n_cn/account_chart_small_business_template.xml
+++ b/addons/l10n_cn/account_chart_small_business_template.xml
@@ -4,7 +4,7 @@
 <!--
 
      Copyright (C) 2012-2012 南京盈通 ccdos@intoerp.com <small business chart>
-     
+
 会计科目表模板( 小企业会计准则2011)
 
 科目表依据：
@@ -13,28 +13,35 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
 
 -->
     <data noupdate="True">
-      
+
         <!-- 科目表模板-->
         <record id="cn_small_business_root" model="account.account.template">
-            <field name="name">会计科目</field>
+            <field name="name">2011会计科目</field>
             <field name="code">0</field>
             <field name="type">view</field>
             <field name="user_type" ref="user_type_all"/>
         </record>
 
         <!-- 资产类 -->
+        <record id="cn_small_business_asset" model="account.account.template">
+            <field name="name">资产类</field>
+            <field name="code">1</field>
+            <field name="parent_id" ref="cn_small_business_root"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="user_type_all"/>
+        </record>
         <record id="small_business_chart1001" model="account.account.template">
             <field name="code">1001</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">liquidity</field>
-            <field name="name">现金</field>
+            <field name="name">库存现金</field>
             <field name="user_type" ref="user_type_bs1"/>
         </record>
         <record id="small_business_chart1002" model="account.account.template">
             <field name="code">1002</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">view</field>
             <field name="name">银行存款</field>
             <field name="user_type" ref="user_type_bs1"/>
@@ -42,7 +49,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart1012" model="account.account.template">
             <field name="code">1012</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">其他货币资金</field>
             <field name="user_type" ref="user_type_bs1"/>
@@ -51,7 +58,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart1101" model="account.account.template">
             <field name="code">1101</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">短期投资</field>
             <field name="user_type" ref="user_type_bs2"/>
@@ -60,7 +67,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart1121" model="account.account.template">
             <field name="code">1121</field>
             <field eval="True" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">应收票据</field>
             <field name="user_type" ref="user_type_bs3"/>
@@ -68,7 +75,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart1122" model="account.account.template">
             <field name="code">1122</field>
             <field eval="True" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">receivable</field>
             <field name="name">应收账款</field>
             <field name="user_type" ref="user_type_bs6"/>
@@ -76,15 +83,15 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart1123" model="account.account.template">
             <field name="code">1123</field>
             <field eval="True" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">payable</field>
             <field name="name">预付账款</field>
-            <field name="user_type" ref="user_type_bs6"/>
+            <field name="user_type" ref="user_type_bs8"/>
         </record>
         <record id="small_business_chart1131" model="account.account.template">
             <field name="code">1131</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">应收股利</field>
             <field name="user_type" ref="user_type_bs4"/>
@@ -92,7 +99,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart1132" model="account.account.template">
             <field name="code">1132</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">应收利息</field>
             <field name="user_type" ref="user_type_bs5"/>
@@ -100,8 +107,8 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart1221" model="account.account.template">
             <field name="code">1221</field>
             <field eval="True" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
-            <field name="type">other</field>
+            <field ref="cn_small_business_asset" name="parent_id"/>
+            <field name="type">receivable</field>
             <field name="name">其他应收款</field>
             <field name="user_type" ref="user_type_bs7"/>
         </record>
@@ -109,7 +116,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart1401" model="account.account.template">
             <field name="code">1401</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">材料采购</field>
             <field name="user_type" ref="user_type_bs10"/>
@@ -117,7 +124,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart1402" model="account.account.template">
             <field name="code">1402</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">在途物资</field>
             <field name="user_type" ref="user_type_bs10"/>
@@ -125,7 +132,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart1403" model="account.account.template">
             <field name="code">1403</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">原材料</field>
             <field name="user_type" ref="user_type_bs10"/>
@@ -133,7 +140,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart1404" model="account.account.template">
             <field name="code">1404</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">材料成本差异</field>
             <field name="user_type" ref="user_type_bs10"/>
@@ -141,7 +148,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart1405" model="account.account.template">
             <field name="code">1405</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">库存商品</field>
             <field name="user_type" ref="user_type_bs10"/>
@@ -150,7 +157,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart1407" model="account.account.template">
             <field name="code">1407</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">商品进销差价</field>
             <field name="user_type" ref="user_type_bs10"/>
@@ -158,7 +165,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart1408" model="account.account.template">
             <field name="code">1408</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">委托加工物资</field>
             <field name="user_type" ref="user_type_bs10"/>
@@ -167,7 +174,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart1411" model="account.account.template">
             <field name="code">1411</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">周转材料</field>
             <field name="user_type" ref="user_type_bs10"/>
@@ -176,7 +183,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart1421" model="account.account.template">
             <field name="code">1421</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">消耗性生物资产</field>
             <field name="user_type" ref="user_type_bs10"/>
@@ -185,7 +192,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart1501" model="account.account.template">
             <field name="code">1501</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">长期债券投资</field>
             <field name="user_type" ref="user_type_bs34"/>
@@ -194,7 +201,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart1511" model="account.account.template">
             <field name="code">1511</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">长期股权投资</field>
             <field name="user_type" ref="user_type_bs32"/>
@@ -203,7 +210,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart1601" model="account.account.template">
             <field name="code">1601</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">固定资产</field>
             <field name="user_type" ref="user_type_bs39"/>
@@ -211,7 +218,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart1602" model="account.account.template">
             <field name="code">1602</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">累计折旧</field>
             <field name="user_type" ref="user_type_bs40"/>
@@ -220,7 +227,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart1604" model="account.account.template">
             <field name="code">1604</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">在建工程</field>
             <field name="user_type" ref="user_type_bs45"/>
@@ -228,7 +235,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart1605" model="account.account.template">
             <field name="code">1605</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">工程物资</field>
             <field name="user_type" ref="user_type_bs44"/>
@@ -237,34 +244,34 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart1606" model="account.account.template">
             <field name="code">1606</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">固定资产清理</field>
-            <field name="user_type" ref="user_type_bs39"/>
+            <field name="user_type" ref="user_type_bs46"/>
         </record>
 
         <record id="small_business_chart1621" model="account.account.template">
             <field name="code">1621</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">生产性生物资产</field>
-            <field name="user_type" ref="user_type_bs39"/>
+            <field name="user_type" ref="user_type_bs47"/>
         </record>
 
-        <record id="small_business_chart1602" model="account.account.template">
+        <record id="small_business_chart1622" model="account.account.template">
             <field name="code">1622</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">生产性生物资产累计折旧</field>
-            <field name="user_type" ref="user_type_bs40"/>
+            <field name="user_type" ref="user_type_bs47"/>
         </record>
 
         <record id="small_business_chart1701" model="account.account.template">
             <field name="code">1701</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">无形资产</field>
             <field name="user_type" ref="user_type_bs51"/>
@@ -273,7 +280,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart1702" model="account.account.template">
             <field name="code">1702</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">累计摊销</field>
             <field name="user_type" ref="user_type_bs51"/>
@@ -282,7 +289,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart1801" model="account.account.template">
             <field name="code">1801</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">长期待摊费用</field>
             <field name="user_type" ref="user_type_bs52"/>
@@ -292,18 +299,25 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart1901" model="account.account.template">
             <field name="code">1901</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_asset" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">待处理财产损溢</field>
-            <field name="user_type" ref="user_type_bs44"/>
+            <field name="user_type" ref="user_type_bs53"/>
         </record>
-        
-        
+
+
         <!-- 二、负债类 -->
+        <record id="cn_small_business_liability" model="account.account.template">
+            <field name="name">负债类</field>
+            <field name="code">2</field>
+            <field name="parent_id" ref="cn_small_business_root"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="user_type_all"/>
+        </record>
         <record id="small_business_chart2001" model="account.account.template">
             <field name="code">2001</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_liability" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">短期借款</field>
             <field name="user_type" ref="user_type_bs68"/>
@@ -312,7 +326,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart2201" model="account.account.template">
             <field name="code">2201</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_liability" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">应付票据</field>
             <field name="user_type" ref="user_type_bs69"/>
@@ -320,7 +334,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart2202" model="account.account.template">
             <field name="code">2202</field>
             <field eval="True" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_liability" name="parent_id"/>
             <field name="type">payable</field>
             <field name="name">应付账款</field>
             <field name="user_type" ref="user_type_bs70"/>
@@ -328,7 +342,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart2203" model="account.account.template">
             <field name="code">2203</field>
             <field eval="True" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_liability" name="parent_id"/>
             <field name="type">receivable</field>
             <field name="name">预收账款</field>
             <field name="user_type" ref="user_type_bs71"/>
@@ -336,7 +350,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart2211" model="account.account.template">
             <field name="code">2211</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_liability" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">应付职工薪酬</field>
             <field name="user_type" ref="user_type_bs72"/>
@@ -344,7 +358,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart2221" model="account.account.template">
             <field name="code">2221</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>            
+            <field ref="cn_small_business_liability" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">应交税费</field>
             <field name="user_type" ref="user_type_bs75"/>
@@ -353,41 +367,41 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart2231" model="account.account.template">
             <field name="code">2231</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_liability" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">应付利息</field>
-            <field name="user_type" ref="user_type_bs74"/>
+            <field name="user_type" ref="user_type_bs174"/>
         </record>
         <record id="small_business_chart2232" model="account.account.template">
             <field name="code">2232</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_liability" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">应付利润</field>
-            <field name="user_type" ref="user_type_bs74"/>
+            <field name="user_type" ref="user_type_bs175"/>
         </record>
 
         <record id="small_business_chart2241" model="account.account.template">
             <field name="code">2241</field>
             <field eval="True" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
+            <field ref="cn_small_business_liability" name="parent_id"/>
             <field name="type">payable</field>
             <field name="name">其他应付款</field>
-            <field name="user_type" ref="user_type_bs70"/>
+            <field name="user_type" ref="user_type_bs73"/>
         </record>
 
         <record id="small_business_chart2401" model="account.account.template">
             <field name="code">2401</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_liability" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">递延收益</field>
-            <field name="user_type" ref="user_type_all"/>
+            <field name="user_type" ref="user_type_bs104"/>
         </record>
         <record id="small_business_chart2501" model="account.account.template">
             <field name="code">2501</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_liability" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">长期借款</field>
             <field name="user_type" ref="user_type_bs101"/>
@@ -396,7 +410,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart2701" model="account.account.template">
             <field name="code">2701</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_liability" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">长期应付款</field>
             <field name="user_type" ref="user_type_bs103"/>
@@ -404,10 +418,17 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
 
 
         <!-- 所有者权益类 -->
+        <record id="cn_small_business_right" model="account.account.template">
+            <field name="name">所有者权益类</field>
+            <field name="code">3</field>
+            <field name="parent_id" ref="cn_small_business_root"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="user_type_all"/>
+        </record>
         <record id="small_business_chart3001" model="account.account.template">
             <field name="code">3001</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_right" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">实收资本</field>
             <field name="user_type" ref="user_type_bs115"/>
@@ -415,7 +436,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart3002" model="account.account.template">
             <field name="code">3002</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_right" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">资本公积</field>
             <field name="user_type" ref="user_type_bs118"/>
@@ -423,7 +444,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart3101" model="account.account.template">
             <field name="code">3101</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_right" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">盈余公积</field>
             <field name="user_type" ref="user_type_bs119"/>
@@ -431,71 +452,85 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart3103" model="account.account.template">
             <field name="code">3103</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_right" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">本年利润</field>
-            <field name="user_type" ref="user_type_bs121"/>
+            <field name="user_type" ref="user_type_bs120"/>
         </record>
         <record id="small_business_chart3104" model="account.account.template">
             <field name="code">3104</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_right" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">利润分配</field>
             <field name="user_type" ref="user_type_bs121"/>
         </record>
 
         <!-- 成本类 -->
+        <record id="cn_small_business_cost" model="account.account.template">
+            <field name="name">成本类</field>
+            <field name="code">4</field>
+            <field name="parent_id" ref="cn_small_business_root"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="user_type_all"/>
+        </record>
         <record id="small_business_chart4001" model="account.account.template">
             <field name="code">4001</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_cost" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">生产成本</field>
-            <field name="user_type" ref="user_type_all"/>
+            <field name="user_type" ref="user_type_cost2"/>
         </record>
         <record id="small_business_chart4101" model="account.account.template">
             <field name="code">4101</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_cost" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">制造费用</field>
-            <field name="user_type" ref="user_type_all"/>
+            <field name="user_type" ref="user_type_cost2"/>
         </record>
 
         <record id="small_business_chart4301" model="account.account.template">
             <field name="code">4301</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_cost" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">研发支出</field>
-            <field name="user_type" ref="user_type_all"/>
+            <field name="user_type" ref="user_type_cost3"/>
         </record>
 
         <record id="small_business_chart4401" model="account.account.template">
             <field name="code">4401</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_cost" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">工程施工</field>
-            <field name="user_type" ref="user_type_all"/>
+            <field name="user_type" ref="user_type_cost2"/>
         </record>
 
         <record id="small_business_chart4403" model="account.account.template">
             <field name="code">4403</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_cost" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">机械作业</field>
-            <field name="user_type" ref="user_type_all"/>
+            <field name="user_type" ref="user_type_cost2"/>
         </record>
 
 
-       <!-- 损益类 -->
+        <!-- 损益类 -->
+        <record id="cn_small_business_gal" model="account.account.template">
+            <field name="name">损益类</field>
+            <field name="code">5</field>
+            <field name="parent_id" ref="cn_small_business_root"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="user_type_all"/>
+        </record>
         <record id="small_business_chart5001" model="account.account.template">
             <field name="code">5001</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_gal" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">主营业务收入</field>
             <field name="user_type" ref="user_type_pl1"/>
@@ -503,16 +538,16 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart5051" model="account.account.template">
             <field name="code">5051</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_gal" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">其他业务收入</field>
-            <field name="user_type" ref="user_type_pl23"/>
+            <field name="user_type" ref="user_type_pl1"/>
         </record>
 
         <record id="small_business_chart5111" model="account.account.template">
             <field name="code">5111</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_gal" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">投资收益</field>
             <field name="user_type" ref="user_type_pl19"/>
@@ -520,7 +555,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart5301" model="account.account.template">
             <field name="code">5301</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_gal" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">营业外收入</field>
             <field name="user_type" ref="user_type_pl23"/>
@@ -529,7 +564,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart5401" model="account.account.template">
             <field name="code">5401</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_gal" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">主营业务成本</field>
             <field name="user_type" ref="user_type_pl3"/>
@@ -537,7 +572,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart5402" model="account.account.template">
             <field name="code">5402</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_gal" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">其他业务成本</field>
             <field name="user_type" ref="user_type_pl3"/>
@@ -546,7 +581,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart5403" model="account.account.template">
             <field name="code">5403</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_gal" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">营业税金及附加</field>
             <field name="user_type" ref="user_type_pl5"/>
@@ -554,7 +589,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart5601" model="account.account.template">
             <field name="code">5601</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_gal" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">销售费用</field>
             <field name="user_type" ref="user_type_pl11"/>
@@ -562,7 +597,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart5602" model="account.account.template">
             <field name="code">5602</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_gal" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">管理费用</field>
             <field name="user_type" ref="user_type_pl13"/>
@@ -570,7 +605,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart5603" model="account.account.template">
             <field name="code">5603</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_gal" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">财务费用</field>
             <field name="user_type" ref="user_type_pl15"/>
@@ -579,7 +614,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart5711" model="account.account.template">
             <field name="code">5711</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_gal" name="parent_id"/>
             <field name="type">other</field>
             <field name="name">营业外支出</field>
             <field name="user_type" ref="user_type_pl25"/>
@@ -587,9 +622,9 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <record id="small_business_chart5801" model="account.account.template">
             <field name="code">5801</field>
             <field eval="False" name="reconcile"/>
-            <field ref="cn_small_business_root" name="parent_id"/>
+            <field ref="cn_small_business_gal" name="parent_id"/>
             <field name="type">other</field>
-            <field name="name">所得税</field>
+            <field name="name">所得税费用</field>
             <field name="user_type" ref="user_type_pl29"/>
         </record>
 
diff --git a/addons/l10n_cn/account_chart_template.xml b/addons/l10n_cn/account_chart_template.xml
index a09ea67f0d0..ccb8ab62552 100644
--- a/addons/l10n_cn/account_chart_template.xml
+++ b/addons/l10n_cn/account_chart_template.xml
@@ -24,7 +24,7 @@
             <field eval="False" name="reconcile"/>
             <field ref="cn_root" name="parent_id"/>
             <field name="type">liquidity</field>
-            <field name="name">现金</field>
+            <field name="name">库存现金</field>
             <field name="user_type" ref="user_type_bs1"/>
         </record>
         <record id="chart1002" model="account.account.template">
@@ -95,7 +95,7 @@
             <field name="code">1231</field>
             <field eval="True" name="reconcile"/>
             <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
+            <field name="type">receivable</field>
             <field name="name">其他应收款</field>
             <field name="user_type" ref="user_type_bs7"/>
         </record>
@@ -571,6 +571,14 @@
             <field name="name">应付利息</field>
             <field name="user_type" ref="user_type_bs74"/>
         </record>
+        <record id="chart2241" model="account.account.template">
+            <field name="code">2241</field>
+            <field eval="True" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">payable</field>
+            <field name="name">其他应付款</field>
+            <field name="user_type" ref="user_type_bs73"/>
+        </record>
         <record id="chart2401" model="account.account.template">
             <field name="code">2401</field>
             <field eval="True" name="reconcile"/>
diff --git a/addons/l10n_cn/account_chart_type.xml b/addons/l10n_cn/account_chart_type.xml
index 16f3f8ae0ac..d55a9fd5c4e 100644
--- a/addons/l10n_cn/account_chart_type.xml
+++ b/addons/l10n_cn/account_chart_type.xml
@@ -17,7 +17,7 @@
         </record>
         <!-- 利润表科目 -->
         <record id="user_type_pl1" model="account.account.type">
-            <field name="name">一、主营业务收入</field>
+            <field name="name">一、营业收入</field>
             <field name="code">pl1</field>
             <field name="close_method">none</field>
             <field name="report_type">income</field>
@@ -29,7 +29,7 @@
             <field name="report_type">income</field>
         </record>
         <record id="user_type_pl3" model="account.account.type">
-            <field name="name">减：主营业务成本</field>
+            <field name="name">减：营业成本</field>
             <field name="code">pl3</field>
             <field name="close_method">none</field>
             <field name="report_type">expense</field>
@@ -47,7 +47,7 @@
             <field name="report_type">income</field>
         </record>
         <record id="user_type_pl11" model="account.account.type">
-            <field name="name">减：营业费用</field>
+            <field name="name">    销售费用</field>
             <field name="code">pl11</field>
             <field name="close_method">none</field>
             <field name="report_type">expense</field>
@@ -125,10 +125,16 @@
             <field name="close_method">unreconciled</field>
             <field name="report_type">asset</field>
         </record>
+        <record id="user_type_bs8" model="account.account.type">
+            <field name="name">预付账款</field>
+            <field name="code">bs8</field>
+            <field name="close_method">unreconciled</field>
+            <field name="report_type">asset</field>
+        </record>
         <record id="user_type_bs7" model="account.account.type">
             <field name="name">其他应收款</field>
             <field name="code">bs7</field>
-            <field name="close_method">balance</field>
+            <field name="close_method">unreconciled</field>
             <field name="report_type">asset</field>
         </record>
         <record id="user_type_bs10" model="account.account.type">
@@ -197,6 +203,12 @@
             <field name="close_method">balance</field>
             <field name="report_type">asset</field>
         </record>
+        <record id="user_type_bs47" model="account.account.type">
+            <field name="name">生产性生物资产</field>
+            <field name="code">bs47</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">asset</field>
+        </record>
         <record id="user_type_bs51" model="account.account.type">
             <field name="name">无形资产</field>
             <field name="code">bs51</field>
@@ -209,6 +221,12 @@
             <field name="close_method">balance</field>
             <field name="report_type">asset</field>
         </record>
+        <record id="user_type_bs53" model="account.account.type">
+            <field name="name">待处理财产损溢-无结转</field>
+            <field name="code">bs53</field>
+            <field name="close_method">none</field>
+            <field name="report_type">asset</field>
+        </record>
         <record id="user_type_bs61" model="account.account.type">
             <field name="name">递延税款借项</field>
             <field name="code">bs61</field>
@@ -233,6 +251,12 @@
             <field name="close_method">unreconciled</field>
             <field name="report_type">liability</field>
         </record>
+        <record id="user_type_bs73" model="account.account.type">
+            <field name="name">其他应付款</field>
+            <field name="code">bs73</field>
+            <field name="close_method">unreconciled</field>
+            <field name="report_type">liability</field>
+        </record>
         <record id="user_type_bs71" model="account.account.type">
             <field name="name">预收账款</field>
             <field name="code">bs71</field>
@@ -240,11 +264,23 @@
             <field name="report_type">liability</field>
         </record>
         <record id="user_type_bs72" model="account.account.type">
-            <field name="name">应付工资</field>
+            <field name="name">应付职工薪酬</field>
             <field name="code">bs72</field>
             <field name="close_method">balance</field>
             <field name="report_type">liability</field>
         </record>
+        <record id="user_type_bs174" model="account.account.type">
+            <field name="name">应付利息</field>
+            <field name="code">bs174</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">liability</field>
+        </record>
+        <record id="user_type_bs175" model="account.account.type">
+            <field name="name">应付利润</field>
+            <field name="code">bs175</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">liability</field>
+        </record>
         <record id="user_type_bs74" model="account.account.type">
             <field name="name">应付股利</field>
             <field name="code">bs74</field>
@@ -281,6 +317,13 @@
             <field name="close_method">balance</field>
             <field name="report_type">liability</field>
         </record>
+         <record id="user_type_bs104" model="account.account.type">
+            <field name="name">递延收益</field>
+            <field name="code">bs104</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">liability</field>
+        </record>
+
         <record id="user_type_bs115" model="account.account.type">
             <field name="name">实收资本</field>
             <field name="code">bs115</field>
@@ -299,11 +342,35 @@
             <field name="close_method">balance</field>
             <field name="report_type">liability</field>
         </record>
+        <record id="user_type_bs120" model="account.account.type">
+            <field name="name">本年利润</field>
+            <field name="code">bs120</field>
+            <field name="close_method">none</field>
+            <field name="report_type">liability</field>
+        </record>
         <record id="user_type_bs121" model="account.account.type">
             <field name="name">未分配利润</field>
             <field name="code">bs121</field>
             <field name="close_method">balance</field>
             <field name="report_type">liability</field>
-        </record>        
+        </record>
+        <record id="user_type_cost1" model="account.account.type">
+            <field name="name">成本类-余额结转</field>
+            <field name="code">cost</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">none</field>
+        </record>
+        <record id="user_type_cost2" model="account.account.type">
+            <field name="name">成本-无结转</field>
+            <field name="code">cost_no</field>
+            <field name="close_method">none</field>
+            <field name="report_type">none</field>
+        </record>
+        <record id="user_type_cost3" model="account.account.type">
+            <field name="name">开发支出</field>
+            <field name="code">cost-dev</field>
+            <field name="close_method">none</field>
+            <field name="report_type">none</field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/mrp_repair/wizard/make_invoice.py b/addons/mrp_repair/wizard/make_invoice.py
index 89ea7cad1f0..221404a868c 100644
--- a/addons/mrp_repair/wizard/make_invoice.py
+++ b/addons/mrp_repair/wizard/make_invoice.py
@@ -54,7 +54,7 @@ class make_invoice(osv.osv_memory):
         form_res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
         form_id = form_res and form_res[1] or False
         tree_res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_tree')
-        tree_id = tree_res and tree_res[1] or Fals
+        tree_id = tree_res and tree_res[1] or False
 
         return {
             'domain': [('id','in', newinv.values())],
diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index 24713cca51f..dfa9be39ff9 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -172,7 +172,7 @@ class stock_move(osv.osv):
                 pricelist_obj = self.pool.get("product.pricelist")
                 pricelist = partner.property_product_pricelist_purchase.id
                 price = pricelist_obj.price_get(cr, uid, [pricelist],
-                                    move.product_id.id, move.product_uom_qty, partner, {
+                                    move.product_id.id, move.product_uom_qty, partner.id, {
                                                                                 'uom': move.product_uom.id,
                                                                                 'date': move.date,
                                                                                 })[pricelist]
diff --git a/addons/sale_stock/sale_stock_view.xml b/addons/sale_stock/sale_stock_view.xml
index 395b5d816bd..6171304e589 100644
--- a/addons/sale_stock/sale_stock_view.xml
+++ b/addons/sale_stock/sale_stock_view.xml
@@ -40,6 +40,7 @@
                         parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position,
                         False, parent.warehouse_id, context)
                       </attribute>
+                      <attribute name="context">{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':False}</attribute>
                     </xpath>
                     <xpath expr="//field[@name='order_line']/tree//field[@name='product_id']" position="attributes">
                        <attribute name="on_change">product_id_change_with_wh(
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 5791b050f23..be43f04d0ce 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -3096,7 +3096,7 @@ class stock_warehouse(osv.osv):
         'crossdock_route_id': fields.many2one('stock.location.route', 'Crossdock Route'),
         'reception_route_id': fields.many2one('stock.location.route', 'Receipt Route'),
         'delivery_route_id': fields.many2one('stock.location.route', 'Delivery Route'),
-        'resupply_from_wh': fields.boolean('Resupply From Other Warehouses'),
+        'resupply_from_wh': fields.boolean('Resupply From Other Warehouses', help='Unused field'),
         'resupply_wh_ids': fields.many2many('stock.warehouse', 'stock_wh_resupply_table', 'supplied_wh_id', 'supplier_wh_id', 'Resupply Warehouses'),
         'resupply_route_ids': fields.one2many('stock.location.route', 'supplied_wh_id', 'Resupply Routes', 
                                               help="Routes will be created for these resupply warehouses and you can select them on products and product categories"),
@@ -3156,7 +3156,7 @@ class stock_warehouse(osv.osv):
                     pull_obj.create(cr, uid, vals=pull_rule, context=context)
                 #if the warehouse is also set as default resupply method, assign this route automatically to the warehouse
                 if default_resupply_wh and default_resupply_wh.id == wh.id:
-                    self.write(cr, uid, [warehouse.id], {'route_ids': [(4, inter_wh_route_id)]}, context=context)
+                    self.write(cr, uid, [warehouse.id, wh.id], {'route_ids': [(4, inter_wh_route_id)]}, context=context)
 
     _defaults = {
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.inventory', context=c),
diff --git a/addons/stock/tests/__init__.py b/addons/stock/tests/__init__.py
index 4c20f7a769a..c372f3c8fb5 100644
--- a/addons/stock/tests/__init__.py
+++ b/addons/stock/tests/__init__.py
@@ -2,3 +2,4 @@
 
 from . import test_stock_flow
 from . import test_owner_available
+from . import test_resupply
diff --git a/addons/stock/tests/test_resupply.py b/addons/stock/tests/test_resupply.py
new file mode 100644
index 00000000000..79ecbf456b7
--- /dev/null
+++ b/addons/stock/tests/test_resupply.py
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+
+from openerp.addons.stock.tests.common import TestStockCommon
+from openerp.tools import mute_logger, float_round
+
+
+class TestResupply(TestStockCommon):
+    def setUp(self):
+        super(TestResupply, self).setUp()
+        self.Warehouse = self.env['stock.warehouse']
+        # create 2 WH, BIG and SMALL
+        # SMALL resupplies from BIG
+        self.bigwh = self.Warehouse.create({'name': 'BIG', 'code': 'B'})
+        self.smallwh = self.Warehouse.create({'name': 'SMALL', 'code': 'S',
+                                              'default_resupply_wh_id': self.bigwh.id,
+                                              'resupply_wh_ids': [(6, 0, [self.bigwh.id])],
+                                              })
+        # minimum stock rule for Product A on SMALL
+        Orderpoint = self.env['stock.warehouse.orderpoint']
+        Orderpoint.create({'warehouse_id': self.smallwh.id,
+                           'location_id': self.smallwh.lot_stock_id.id,
+                           'product_id': self.productA.id,
+                           'product_min_qty': 100,
+                           'product_max_qty': 200,
+                           'product_uom': self.uom_unit.id,
+                           })
+        # create some stock on BIG
+        Wiz = self.env['stock.change.product.qty']
+        wiz = Wiz.create({'product_id': self.productA.id,
+                          'new_quantity': 1000,
+                          'location_id':  self.bigwh.lot_stock_id.id,
+                          })
+        wiz.change_product_qty()
+
+    def test_resupply_from_wh(self):
+        sched = self.env['procurement.order']
+        sched.run_scheduler()
+        # we generated 2 procurements for product A: one on small wh and the
+        # other one on the transit location
+        procs = sched.search([('product_id', '=', self.productA.id)])
+        self.assertEqual(len(procs), 2)
+        proc1 = sched.search([('product_id', '=', self.productA.id),
+                              ('warehouse_id', '=', self.smallwh.id)])
+        self.assertEqual(proc1.state, 'running')
+        proc2 = sched.search([('product_id', '=', self.productA.id),
+                              ('warehouse_id', '=', self.bigwh.id)])
+        self.assertEqual(proc2.location_id.usage, 'transit')
+        self.assertNotEqual(proc2.state, 'exception')
+        proc2.run()
+        self.assertEqual(proc2.state, 'running')
+        self.assertTrue(proc2.rule_id)
diff --git a/addons/stock_account/stock.py b/addons/stock_account/stock.py
index f40e7b3c561..e589b36594e 100644
--- a/addons/stock_account/stock.py
+++ b/addons/stock_account/stock.py
@@ -240,7 +240,7 @@ class stock_picking(osv.osv):
             @return: object of the partner to invoice
         """
         return picking.partner_id and picking.partner_id.id
-        
+
     def action_invoice_create(self, cr, uid, ids, journal_id, group=False, type='out_invoice', context=None):
         """ Creates invoice based on the invoice state selected for picking.
         @param journal_id: Id of journal
@@ -319,7 +319,7 @@ class stock_picking(osv.osv):
                 if not invoice.origin or invoice_vals['origin'] not in invoice.origin.split(', '):
                     invoice_origin = filter(None, [invoice.origin, invoice_vals['origin']])
                     merge_vals['origin'] = ', '.join(invoice_origin)
-                if not invoice.name or invoice_vals['name'] not in invoice.name.split(', '):
+                if invoice_vals.get('name', False) and (not invoice.name or invoice_vals['name'] not in invoice.name.split(', ')):
                     invoice_name = filter(None, [invoice.name, invoice_vals['name']])
                     merge_vals['name'] = ', '.join(invoice_name)
                 if merge_vals:
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 612ce78abfa..7a4617c328e 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -21,6 +21,7 @@
 
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
+from openerp import SUPERUSER_ID
 from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT as DF
 from openerp.addons.website.models.website import slug
 from urlparse import urljoin
@@ -1143,7 +1144,7 @@ class survey_user_input_line(osv.Model):
                                         ('question_id', '=', question.id)],
                               context=context)
         if old_uil:
-            self.unlink(cr, uid, old_uil, context=context)
+            self.unlink(cr, SUPERUSER_ID, old_uil, context=context)
 
         if answer_tag in post and post[answer_tag].strip() != '':
             vals.update({'answer_type': 'suggestion', 'value_suggested': post[answer_tag]})
@@ -1174,7 +1175,7 @@ class survey_user_input_line(osv.Model):
                                         ('question_id', '=', question.id)],
                               context=context)
         if old_uil:
-            self.unlink(cr, uid, old_uil, context=context)
+            self.unlink(cr, SUPERUSER_ID, old_uil, context=context)
 
         ca = dict_keys_startswith(post, answer_tag)
         comment_answer = ca.pop(("%s_%s" % (answer_tag, 'comment')), '').strip()
@@ -1205,7 +1206,7 @@ class survey_user_input_line(osv.Model):
                                         ('question_id', '=', question.id)],
                               context=context)
         if old_uil:
-            self.unlink(cr, uid, old_uil, context=context)
+            self.unlink(cr, SUPERUSER_ID, old_uil, context=context)
 
         no_answers = True
         ca = dict_keys_startswith(post, answer_tag)
diff --git a/addons/website/models/ir_ui_view.py b/addons/website/models/ir_ui_view.py
index 75d03986438..b84be1a5440 100644
--- a/addons/website/models/ir_ui_view.py
+++ b/addons/website/models/ir_ui_view.py
@@ -8,6 +8,7 @@ from openerp import SUPERUSER_ID, api, tools
 from openerp.addons.website.models import website
 from openerp.http import request
 from openerp.osv import osv, fields
+from openerp.tools import html_escape
 
 _logger = logging.getLogger(__name__)
 
@@ -143,6 +144,14 @@ class view(osv.osv):
             # ensure there's only one match
             [root] = arch.xpath(section_xpath)
 
+        # html text need to be escaped for xml storage
+        def escape_node(node):
+            node.text = node.text and html_escape(node.text)
+            node.tail = node.tail and html_escape(node.tail)
+        escape_node(replacement)
+        for descendant in replacement.iterdescendants():
+            escape_node(descendant)
+
         root.text = replacement.text
         root.tail = replacement.tail
         # replace all children
diff --git a/addons/website/tests/test_views.py b/addons/website/tests/test_views.py
index 1adb11712ec..c8e7efb9044 100644
--- a/addons/website/tests/test_views.py
+++ b/addons/website/tests/test_views.py
@@ -174,6 +174,16 @@ class TestViewSaving(common.TransactionCase):
             )
         )
 
+    def test_save_escaped_text(self):
+        view_id = self.registry('ir.ui.view').create(self.cr, self.uid, {
+            'arch':'<t>hello world</t>',
+            'type':'qweb'
+        })
+        view = self.registry('ir.ui.view').browse(self.cr, self.uid, view_id)
+        replacement = 'hello world &amp; &lt;angle brackets&gt;!'
+        view.save(replacement, xpath='/t')
+        self.assertEqual(view.render(), replacement, 'html special characters wrongly escaped')
+
     def test_save_only_embedded(self):
         Company = self.registry('res.company')
         company_id = 1
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 4e5063f4d27..efa32ae5e71 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -542,7 +542,7 @@ class website_sale(http.Controller):
 
         partner_lang = request.lang if request.lang in [lang.code for lang in request.website.language_ids] else None
 
-        billing_info = {}
+        billing_info = {'customer': True}
         if partner_lang:
             billing_info['lang'] = partner_lang
         billing_info.update(self.checkout_parse('billing', checkout, True))
diff --git a/doc/cla/individual/cysnake4713.md b/doc/cla/individual/cysnake4713.md
new file mode 100644
index 00000000000..911c1b318e9
--- /dev/null
+++ b/doc/cla/individual/cysnake4713.md
@@ -0,0 +1,11 @@
+China, 2015-07-09
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Matt Cai 蔡旸 cysnake4713@gmail.com https://github.com/cysnake4713
diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py
index 7acbf86a8cc..cadd668514c 100644
--- a/openerp/addons/base/ir/ir_ui_view.py
+++ b/openerp/addons/base/ir/ir_ui_view.py
@@ -1029,7 +1029,7 @@ class view(osv.osv):
         def get_trans(text):
             if not text or not text.strip():
                 return None
-            text = h.unescape(text.strip())
+            text = text.strip()
             if len(text) < 2 or (text.startswith('<!') and text.endswith('>')):
                 return None
             return translate_func(text)