From 0db94077125f7748cbfc446501e145d912dfe6c4 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 15 Mar 2013 17:50:21 +0530 Subject: [PATCH 1/5] fix in payment reconciliation patch --- patches/march_2013/p05_payment_reconciliation.py | 1 - 1 file changed, 1 deletion(-) diff --git a/patches/march_2013/p05_payment_reconciliation.py b/patches/march_2013/p05_payment_reconciliation.py index f2f03064d6..9208aa798f 100644 --- a/patches/march_2013/p05_payment_reconciliation.py +++ b/patches/march_2013/p05_payment_reconciliation.py @@ -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, '') From 36a3461e55fb4df442d082e57b5936bdd4f80cf6 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Sat, 16 Mar 2013 19:09:26 +0530 Subject: [PATCH 2/5] fix in payment reconciliation patch - run for all modified dates >= 2013-03-11 --- patches/march_2013/p05_payment_reconciliation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/march_2013/p05_payment_reconciliation.py b/patches/march_2013/p05_payment_reconciliation.py index 9208aa798f..7b6306b385 100644 --- a/patches/march_2013/p05_payment_reconciliation.py +++ b/patches/march_2013/p05_payment_reconciliation.py @@ -6,7 +6,7 @@ def execute(): res = webnotes.conn.sql_list("""select distinct gl1.voucher_no from `tabGL Entry` gl1, `tabGL Entry` gl2 where - (date(gl1.modified) between "2013-03-11" and "2013-03-15") + date(gl1.modified) >= "2013-03-11" and date(gl1.modified) = date(gl2.modified) and gl1.voucher_no = gl2.voucher_no and gl1.voucher_type = "Journal Voucher" From 5265f79e031bab256483a30c2a5f7f21ce19d792 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 18 Mar 2013 10:31:18 +0530 Subject: [PATCH 3/5] [website] product_page.html - fixed width --- website/templates/css/product_page.css | 2 +- website/templates/html/product_page.html | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/website/templates/css/product_page.css b/website/templates/css/product_page.css index 5780ee4fd3..566b6b57aa 100644 --- a/website/templates/css/product_page.css +++ b/website/templates/css/product_page.css @@ -1,6 +1,6 @@