Merge pull request #1895 from floraXiao/master

floraXiao · web-flow · commit 12c7d1b584f5 · 2018-07-30T17:13:27.000+08:00
[FIX]关于批次号的收货的bug #1887:入库单生成退货单时不该传入lot_id
diff --git a/buy/models/buy_receipt.py b/buy/models/buy_receipt.py
@@ -532,8 +532,6 @@ def buy_to_return(self):
                     'discount_amount': line.discount_amount,
                     'type': 'out'
                 }
-                if line.goods_id.using_batch:
-                    dic.update({'lot_id': line.id})
                 receipt_line.append(dic)
         if len(receipt_line) == 0:
             raise UserError(u'该订单已全部退货！')

Original file line number	Diff line number	Diff line change
`@@ -532,8 +532,6 @@ def buy_to_return(self):`
`532`	`532`	`'discount_amount': line.discount_amount,`
`533`	`533`	`'type': 'out'`
`534`	`534`	`}`
`535`		`- if line.goods_id.using_batch:`
`536`		`- dic.update({'lot_id': line.id})`
`537`	`535`	`receipt_line.append(dic)`
`538`	`536`	`if len(receipt_line) == 0:`
`539`	`537`	`raise UserError(u'该订单已全部退货！')`