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

This commit is contained in:
Rushabh Mehta 2012-12-01 12:05:29 +01:00
commit 9840bcfd15
3 changed files with 23 additions and 0 deletions

View File

@ -141,6 +141,9 @@ class DocType:
# ----------------
def save_entries(self, cancel, adv_adj, update_outstanding):
for le in self.entries:
# round off upto 2 decimal
le.debit, le.credit = round(le.debit, 2), round(le.credit, 2)
#toggle debit, credit if negative entry
if flt(le.debit) < 0 or flt(le.credit) < 0:
tmp=le.debit

View File

@ -0,0 +1,16 @@
def execute():
import webnotes
webnotes.conn.sql("""update `tabGL Entry`
set debit = round(debit, 2), credit = round(credit, 2)""")
gle = webnotes.conn.sql("""select voucher_type, voucher_no,
sum(ifnull(debit,0)) - sum(ifnull(credit, 0)) as diff
from `tabGL Entry`
group by voucher_type, voucher_no
having sum(ifnull(debit, 0)) != sum(ifnull(credit, 0))""", as_dict=1)
for d in gle:
webnotes.conn.sql("""update `tabGL Entry` set debit = debit - %s
where voucher_type = %s and voucher_no = %s and debit > 0 limit 1""",
(d['diff'], d['voucher_type'], d['voucher_no']))

View File

@ -701,4 +701,8 @@ patch_list = [
'patch_module': 'patches.november_2012',
'patch_file': 'production_order_patch',
},
{
'patch_module': 'patches.november_2012',
'patch_file': 'gle_floating_point_issue',
},
]