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

fix: Styling and minor fixes

Browse Source
This commit is contained in:
Deepesh Garg 2020-02-07 15:25:43 +05:30
parent f2fb963986
commit 16445305d5
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
View File

@ -35,7 +35,7 @@ class BankReconciliation(Document):
and ifnull(t1.is_opening, 'No') = 'No' %(condition)s
group by t2.account, t1.name
order by t1.posting_date ASC, t1.name DESC
""", {"condition":condition, "account":self.account, "from":self.from_date, "to":self.to_date}, as_dict=1)
""", {"condition":condition, "account": self.account, "from": self.from_date, "to": self.to_date}, as_dict=1)
payment_entries = frappe.db.sql("""
select
@ -52,8 +52,8 @@ class BankReconciliation(Document):
and bank_account = %(bank_account)s
order by
posting_date ASC, name DESC
""", {"account":self.account, "from":self.from_date,
"to":self.to_date, "bank_account": self.bank_account}, as_dict=1)
""", {"account": self.account, "from":self.from_date,
"to": self.to_date, "bank_account": self.bank_account}, as_dict=1)
pos_entries = []
if self.include_pos_transactions:

7
erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.json
View File

@ -49,9 +49,10 @@
},
{
"fieldname": "plaid_env",
"fieldtype": "Data",
"fieldtype": "Select",
"in_list_view": 1,
"label": "Plaid Environment"
"label": "Plaid Environment",
"options": "sandbox\ndevelopment\nproduction"
},
{
"fieldname": "column_break_2",
@ -69,7 +70,7 @@
],
"issingle": 1,
"links": [],
"modified": "2020-01-05 10:00:22.137832",
"modified": "2020-02-07 15:21:11.616231",
"modified_by": "Administrator",
"module": "ERPNext Integrations",
"name": "Plaid Settings",

11
erpnext/patches/v12_0/rename_bank_reconciliation_fields.py
View File

@ -9,11 +9,6 @@ def _rename_single_field(**kwargs):
frappe.db.sql("UPDATE tabSingles SET field='{new_name}' WHERE doctype='{doctype}' AND field='{old_name}';".format(**kwargs)) #nosec
def execute():
BR = "Bank Reconciliation"
AC = "account"
BA = "bank_account"
BAN = "bank_account_no"
_rename_single_field(doctype = BR, old_name = BA , new_name = AC)
_rename_single_field(doctype = BR, old_name = BAN, new_name = BA)
frappe.reload_doc("Accounts", "doctype", BR)
_rename_single_field(doctype = "Bank Reconciliation", old_name = "bank_account" , new_name = "account")
_rename_single_field(doctype = "Bank Reconciliation", old_name = "bank_account_no", new_name = "bank_account")
frappe.reload_doc("Accounts", "doctype", "Bank Reconciliation")