Merge branch 'master' into edge

Conflicts:
	patches/patch_list.py
This commit is contained in:
Anand Doshi
2013-04-10 19:47:46 +05:30
15 changed files with 33 additions and 94 deletions

View File

@@ -79,7 +79,6 @@ class DocType(StockController):
values = [{
'item_code' : self.doc.item_code,
'warehouse' : self.doc.warehouse,
'transaction_date' : nowdate(),
'posting_date' : self.doc.purchase_date or (self.doc.creation and self.doc.creation.split(' ')[0]) or nowdate(),
'posting_time' : self.doc.purchase_time or '00:00',
'voucher_type' : 'Serial No',