Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into navupdate

Browse Source
This commit is contained in:
Anand Doshi 2012-03-01 14:55:22 +05:30
commit 496d9a0980
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/doctype/gl_entry/gl_entry.py
View File

@ -52,10 +52,12 @@ class DocType:
msgprint("GL Entry: Debit or Credit amount is mandatory for %s" % self.doc.account)
raise Exception
# COMMMENTED below to allow zero amount (+ and -) entry in tax table
# Debit and credit can not done at the same time
if flt(self.doc.credit) != 0 and flt(self.doc.debit) != 0:
msgprint("Sorry you cannot credit and debit under same account head.")
raise Exception, "Validation Error."
#if flt(self.doc.credit) != 0 and flt(self.doc.debit) != 0:
# msgprint("Sorry you cannot credit and debit under same account head.")
# raise Exception, "Validation Error."
# Cost center is required only if transaction made against pl account
#--------------------------------------------------------------------

4
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@ -453,8 +453,8 @@ class DocType:
if self.doc.purpose == 'Purchase Return':
#delete_doc("Serial No", serial_no)
serial_doc = Document("Serial No", serial_no)
serial_doc.status = 'Purchase Returned'
serial_doc.docstatus = 2
serial_doc.status = is_submit and 'Purchase Returned' or 'In Store'
serial_doc.docstatus = is_submit and 2 or 0
serial_doc.save()