[FIX]发货单生成的源单和收款都取发货单日期 osbzr#529

tedi3231 · Sep 9, 2016 · 590bdaf · 590bdaf
1 parent aab5ea5
commit 590bdaf
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 19 deletions.
diff --git a/finance/tests/finance_demo.xml b/finance/tests/finance_demo.xml
@@ -28,6 +28,10 @@
             <field name='year'>2016</field>
             <field name='month'>2</field>
         </record>
+        <record id='period_201603' model='finance.period'>
+            <field name='year'>2016</field>
+            <field name='month'>3</field>
+        </record>
         <!--凭证-->
         <!-- 2015年12月的凭证 -->
         <record id='voucher_12' model='voucher'>

diff --git a/sell/sell.py b/sell/sell.py
@@ -658,7 +658,7 @@ def sell_delivery_done(self):
             'name': self.name,
             'partner_id': self.partner_id.id,
             'category_id': categ.id,
-            'date': fields.Date.context_today(self),
+            'date': self.date,
             'amount': amount,
             'reconciled': 0,
             'to_reconcile': amount,
@@ -676,7 +676,7 @@ def sell_delivery_done(self):
                     'name': self.name,
                     'partner_id': line.partner_id.id,
                     'category_id': line.category_id.id,
-                    'date': fields.Date.context_today(self),
+                    'date': self.date,
                     'amount': line.amount,
                     'reconciled': 0.0,
                     'to_reconcile': line.amount,
@@ -704,7 +704,7 @@ def sell_delivery_done(self):
             rec = self.with_context(type='get')
             money_order = rec.env['money.order'].create({
                 'partner_id': self.partner_id.id,
-                'date': fields.Date.context_today(self),
+                'date': self.date,
                 'line_ids': [(0, 0, line) for line in money_lines],
                 'source_ids': [(0, 0, line) for line in source_lines],
                 'type': 'get',

diff --git a/sell/tests/test_sell.py b/sell/tests/test_sell.py
@@ -38,12 +38,7 @@ def setUp(self):
         self.order_2.sell_order_done()
         self.sell_delivery = self.env['sell.delivery'].search([('order_id', '=', self.order_2.id)])
         self.sell_delivery.write({"date_due": (datetime.now()).strftime(ISODATEFORMAT)})
-        # 销售退货订单审核，退货出库单审核
-        return_receipt = self.env.ref('sell.sell_order_return')
-        return_receipt.sell_order_done()
-        receipt = self.env['sell.delivery'].search(
-                  [('order_id', '=', return_receipt.id)])
-        receipt.sell_delivery_done()
+
     def test_sell(self):
         ''' 测试销售订单  '''
         # 正常销售订单
@@ -62,9 +57,6 @@ def test_sell(self):
         # 正常的反审核
         self.order.sell_order_draft()
 
-        # with self.assertRaises(except_orm):
-        #     self.order_2.sell_order_draft()
-
         for goods_state in [(u'未出库', 0), (u'部分出库', 1), (u'全部出库', 10000)]:
             self.order.line_ids.write({'quantity_out': goods_state[1]})
             self.assertEqual(self.order.goods_state, goods_state[0])
@@ -76,16 +68,10 @@ def test_sell(self):
                 self.order.sell_order_done()
                 self.order.sell_order_draft()
 
-        # # 销售退货单的测试
-        # #
-        # self.order_3.write({'type': "return"})
-        # self.order_3.sell_order_done()
-
         # sell.order onchange test
         self.order.discount_rate = 10
         self.order.onchange_discount_rate()
         self.assertEqual(self.order.discount_amount, 16848.0)
-#         self.order.unlink()
 
     def test_sale_order_line_compute(self):
         """测试销售订单的on_change 和 计算字段"""
@@ -133,7 +119,7 @@ def test_sell_delievery_in(self):
         self.assertEqual(self.sell_delivery_obj.discount_amount, 50)
         #  结算账户 需要输入付款额 测试
         self.sell_delivery_obj.bank_account_id = self.bank.id
-        self.receipt = False
+        self.sell_delivery_obj.receipt = False
         with self.assertRaises(except_orm):
             self.sell_delivery_obj.sell_delivery_done()