From 96cb130263cef2192fc2c3f5d81327e015b159e2 Mon Sep 17 00:00:00 2001 From: nabinhait Date: Mon, 14 Jul 2014 14:52:49 +0530 Subject: [PATCH 1/6] Default letter head in general ledger and bank reco statement print --- .../bank_reconciliation_statement.html | 3 +++ erpnext/accounts/report/general_ledger/general_ledger.html | 3 +++ 2 files changed, 6 insertions(+) diff --git a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html index 91e07ab7da..1a401f5e68 100644 --- a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +++ b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html @@ -1,3 +1,6 @@ +
+ {%= frappe.boot.letter_heads[frappe.defaults.get_default("letter_head")] %} +

{%= __("Bank Reconciliation Statement") %}

{%= filters.account %}

diff --git a/erpnext/accounts/report/general_ledger/general_ledger.html b/erpnext/accounts/report/general_ledger/general_ledger.html index 63cd1a19d2..fd5fa5fa54 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.html +++ b/erpnext/accounts/report/general_ledger/general_ledger.html @@ -1,3 +1,6 @@ +
+ {%= frappe.boot.letter_heads[frappe.defaults.get_default("letter_head")] %} +

{%= __("Statement of Account") %}

{%= filters.account || "General Ledger" %}

From 143400d444cf51de9afa09fb8423531e2243ab7e Mon Sep 17 00:00:00 2001 From: nabinhait Date: Thu, 17 Jul 2014 11:00:13 +0530 Subject: [PATCH 2/6] Batch no get query fix --- erpnext/stock/doctype/stock_entry/stock_entry.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 2609ff5042..82a099eef6 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -676,9 +676,9 @@ def get_batch_no(doctype, txt, searchfield, start, page_len, filters): batch_nos = None args = { - 'item_code': filters['item_code'], - 's_warehouse': filters['s_warehouse'], - 'posting_date': filters['posting_date'], + 'item_code': filters.get("item_code"), + 's_warehouse': filters.get('s_warehouse'), + 'posting_date': filters,get('posting_date'), 'txt': "%%%s%%" % txt, 'mcond':get_match_cond(doctype), "start": start, From d16081c4d93ee0acbf39eacc3dc62b4b8cf8a027 Mon Sep 17 00:00:00 2001 From: nabinhait Date: Thu, 17 Jul 2014 11:08:19 +0530 Subject: [PATCH 3/6] Batch no get query fix --- erpnext/stock/doctype/stock_entry/stock_entry.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 82a099eef6..7629c3cefd 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -678,7 +678,7 @@ def get_batch_no(doctype, txt, searchfield, start, page_len, filters): args = { 'item_code': filters.get("item_code"), 's_warehouse': filters.get('s_warehouse'), - 'posting_date': filters,get('posting_date'), + 'posting_date': filters.get('posting_date'), 'txt': "%%%s%%" % txt, 'mcond':get_match_cond(doctype), "start": start, From fa1cd5faff541bad9ca99267a3d87cebf6f18dd1 Mon Sep 17 00:00:00 2001 From: nabinhait Date: Thu, 17 Jul 2014 11:52:50 +0530 Subject: [PATCH 4/6] Fixed root type of liability accounts --- erpnext/patches.txt | 1 + erpnext/setup/doctype/company/company.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index b7fc5e7768..1a903de743 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -68,3 +68,4 @@ erpnext.patches.v4_1.set_outgoing_email_footer erpnext.patches.v4_1.fix_jv_remarks erpnext.patches.v4_1.fix_sales_order_delivered_status erpnext.patches.v4_1.fix_delivery_and_billing_status +execute:frappe.db.sql("update `tabAccount` set root_type='Liability' where root_type='Income' and report_type='Balance Sheet'") \ No newline at end of file diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py index d24c7e78e2..f8e043a927 100644 --- a/erpnext/setup/doctype/company/company.py +++ b/erpnext/setup/doctype/company/company.py @@ -241,7 +241,7 @@ class Company(Document): [_('Sales'),_('Direct Income'),'Ledger','Income Account','Profit and Loss', None, 'Income'], [_('Service'),_('Direct Income'),'Ledger','Income Account','Profit and Loss', None, 'Income'], [_('Indirect Income'),_('Income'),'Group','Income Account','Profit and Loss', None, 'Income'], - [_('Source of Funds (Liabilities)'), None,'Group', None,'Balance Sheet', None, 'Income'], + [_('Source of Funds (Liabilities)'), None,'Group', None,'Balance Sheet', None, 'Liability'], [_('Capital Account'),_('Source of Funds (Liabilities)'),'Group', None,'Balance Sheet', None, 'Liability'], [_('Reserves and Surplus'),_('Capital Account'),'Ledger', None,'Balance Sheet', None, 'Liability'], [_('Shareholders Funds'),_('Capital Account'),'Ledger', None,'Balance Sheet', None, 'Liability'], From e26204e61d94e39dc759df7c7ec6c6ae81cb06e3 Mon Sep 17 00:00:00 2001 From: nabinhait Date: Thu, 17 Jul 2014 12:22:58 +0530 Subject: [PATCH 5/6] From date and to date in general ledger print format --- erpnext/accounts/report/general_ledger/general_ledger.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/report/general_ledger/general_ledger.html b/erpnext/accounts/report/general_ledger/general_ledger.html index fd5fa5fa54..a639266819 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.html +++ b/erpnext/accounts/report/general_ledger/general_ledger.html @@ -2,7 +2,12 @@ {%= frappe.boot.letter_heads[frappe.defaults.get_default("letter_head")] %}

{%= __("Statement of Account") %}

-

{%= filters.account || "General Ledger" %}

+

{%= filters.account || "General Ledger" %}

+
+ {%= dateutil.str_to_user(filters.from_date) %} + {%= __(" to ") %} + {%= dateutil.str_to_user(filters.to_date) %} +
From 5f2f9552249394ca47adbc42b8e7c3651bd0a27d Mon Sep 17 00:00:00 2001 From: nabinhait Date: Thu, 17 Jul 2014 12:29:56 +0530 Subject: [PATCH 6/6] From date and to date in general ledger print format --- erpnext/accounts/report/general_ledger/general_ledger.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/report/general_ledger/general_ledger.html b/erpnext/accounts/report/general_ledger/general_ledger.html index a639266819..190d45555a 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.html +++ b/erpnext/accounts/report/general_ledger/general_ledger.html @@ -5,7 +5,7 @@

{%= filters.account || "General Ledger" %}

{%= dateutil.str_to_user(filters.from_date) %} - {%= __(" to ") %} + {%= __("to") %} {%= dateutil.str_to_user(filters.to_date) %}