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

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Brahma K 2011-08-23 16:22:50 +05:30
commit c43768aa5d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accounts/doctype/receivable_voucher/receivable_voucher.py
View File

@ -128,7 +128,7 @@ class DocType(TransactionBase):
get_obj('DocType Mapper', 'Sales Order-Receivable Voucher').dt_map('Sales Order', 'Receivable Voucher', self.doc.sales_order_main, self.doc, self.doclist, "[['Sales Order', 'Receivable Voucher'],['Sales Order Detail', 'RV Detail'],['RV Tax Detail','RV Tax Detail'], ['Sales Team', 'Sales Team']]")
self.get_income_account('entries')
ret = eval(self.get_debit_to())
ret = self.get_debit_to()
if ret.has_key('debit_to'):
self.doc.debit_to = ret['debit_to']

2
hr/doctype/leave_allocation/leave_allocation.py
View File

@ -75,7 +75,7 @@ class DocType:
# get total allocated leaves
# ---------------------------
def get_total_allocated_leaves(self):
leave_det = eval(self.get_carry_forwarded_leaves())
leave_det = self.get_carry_forwarded_leaves()
set(self.doc,'carry_forwarded_leaves',flt(leave_det['carry_forwarded_leaves']))
set(self.doc,'total_leaves_allocated',flt(leave_det['total_leaves_allocated']))

2
hr/doctype/leave_application/leave_application.py
View File

@ -82,7 +82,7 @@ class DocType:
if not self.is_lwp():
bal = self.get_leave_balance()
tot_leaves = self.get_total_leave_days()
bal, tot_leaves = eval(bal), eval(tot_leaves)
bal, tot_leaves = bal, tot_leaves
set(self.doc,'leave_balance',flt(bal['leave_balance']))
set(self.doc,'total_leave_days',flt(tot_leaves['total_leave_days']))
if flt(bal['leave_balance']) < flt(tot_leaves['total_leave_days']):