Merge branch 'master' into edge

This commit is contained in:
Anand Doshi 2013-03-15 17:51:45 +05:30
commit f33bef5a69

View File

@ -13,7 +13,6 @@ def execute():
and gl1.voucher_type = gl2.voucher_type
and gl1.posting_date = gl2.posting_date
and gl1.account = gl2.account
and ifnull(gl1.cost_center, "") = ifnull(gl2.cost_center, "")
and ifnull(gl1.is_cancelled, 'No') = 'No' and ifnull(gl2.is_cancelled, 'No') = 'No'
and ifnull(gl1.against_voucher, '') = ifnull(gl2.against_voucher, '')
and ifnull(gl1.against_voucher_type, '') = ifnull(gl2.against_voucher_type, '')