[FIX] New account field make ci fail

diqiuche · Nov 17, 2016 · 8177d2b · 8177d2b
1 parent 4ff2716
commit 8177d2b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/finance/data/finance_data.xml b/finance/data/finance_data.xml
@@ -1280,7 +1280,7 @@
             <field name="profit_account" ref='account_profit'/>
             <field name="remain_account" ref='account_remain'/>
             <field name="import_tax_account" ref='small_business_chart2221001001'/>
-            <field name="output_tax_account" ref='small_business_chart2221001005'/>
+            <field name="operating_cost_account_id" ref='small_business_chart2211001'/>'
         </record>
         <!--设置cny为1-->
         <record forcecreate="0" id="base.rateCNY" model="res.currency.rate">

diff --git a/finance/finance.py b/finance/finance.py
@@ -440,11 +440,8 @@ class res_company(models.Model):
                                          help=u'进项税额，是指纳税人购进货物、加工修理修配劳务、服务、无形资产或者不动产，支付或者负担的增值税额。')
     output_tax_account = fields.Many2one('finance.account', u"销项税科目", ondelete='restrict')
 
-    def _get_operating_cost_account_id(self):
-        return self.env.ref('finance.small_business_chart2211001').id
-
-    operating_cost_account_id = fields.Many2one('finance.account', default=_get_operating_cost_account_id,ondelete='restrict',
-                                                string='生产费用科目',help='用在组装拆卸的费用上!')
+    operating_cost_account_id = fields.Many2one('finance.account', ondelete='restrict',
+                                                string=u'生产费用科目', help='用在组装拆卸的费用上')
 
 class bank_account(models.Model):
     _inherit = 'bank.account'