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

[minor] fixes to patch

Browse Source
This commit is contained in:
Rushabh Mehta 2015-12-03 08:09:27 +05:30
parent ceb82324ad
commit f7911687a0
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/accounts/doctype/journal_entry/journal_entry.py
View File

@ -350,7 +350,7 @@ class JournalEntry(AccountsController):
elif frappe.db.get_value("Account", d.account, "account_type") in ["Bank", "Cash"]: elif frappe.db.get_value("Account", d.account, "account_type") in ["Bank", "Cash"]:
total_amount += (d.debit_in_account_currency or d.credit_in_account_currency) total_amount += (d.debit_in_account_currency or d.credit_in_account_currency)
bank_account_currency = d.account_currency bank_account_currency = d.account_currency
self.set_total_amount(total_amount, bank_account_currency) self.set_total_amount(total_amount, bank_account_currency)
def set_total_amount(self, amt, currency): def set_total_amount(self, amt, currency):
@ -743,6 +743,11 @@ def get_account_balance_and_party_type(account, date, company, debit=None, credi
"exchange_rate": get_exchange_rate(account, account_details.account_currency, "exchange_rate": get_exchange_rate(account, account_details.account_currency,
company, debit=debit, credit=credit, exchange_rate=exchange_rate) company, debit=debit, credit=credit, exchange_rate=exchange_rate)
} }
# un-set party if not party type
if not party_type:
grid_values["party"] = ""
return grid_values return grid_values
@frappe.whitelist() @frappe.whitelist()

12
erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
View File

@ -10,7 +10,7 @@
"fields": [ "fields": [
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 1,
"collapsible": 0, "collapsible": 0,
"fieldname": "account", "fieldname": "account",
"fieldtype": "Link", "fieldtype": "Link",
@ -334,7 +334,7 @@
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 1,
"collapsible": 0, "collapsible": 0,
"fieldname": "debit_in_account_currency", "fieldname": "debit_in_account_currency",
"fieldtype": "Currency", "fieldtype": "Currency",
@ -359,7 +359,7 @@
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 1,
"collapsible": 0, "collapsible": 0,
"fieldname": "debit", "fieldname": "debit",
"fieldtype": "Currency", "fieldtype": "Currency",
@ -408,7 +408,7 @@
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 1,
"collapsible": 0, "collapsible": 0,
"fieldname": "credit_in_account_currency", "fieldname": "credit_in_account_currency",
"fieldtype": "Currency", "fieldtype": "Currency",
@ -433,7 +433,7 @@
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 1,
"collapsible": 0, "collapsible": 0,
"fieldname": "credit", "fieldname": "credit",
"fieldtype": "Currency", "fieldtype": "Currency",
@ -614,7 +614,7 @@
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"max_attachments": 0, "max_attachments": 0,
"modified": "2015-11-24 02:36:05.804010", "modified": "2015-12-02 04:14:37.571883",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Journal Entry Account", "name": "Journal Entry Account",

4
erpnext/patches/v4_4/make_email_accounts.py
View File

@ -35,7 +35,7 @@ def execute():
"enable_incoming": "sync_support_mails", "enable_incoming": "sync_support_mails",
"email_id": "mail_login", "email_id": "mail_login",
"password": "mail_password", "password": "mail_password",
"pop3_server": "mail_server", "email_server": "mail_server",
"use_ssl": "use_ssl", "use_ssl": "use_ssl",
"signature": "support_signature", "signature": "support_signature",
"enable_auto_reply": "send_autoreply", "enable_auto_reply": "send_autoreply",
@ -59,7 +59,7 @@ def execute():
"enable_incoming": "extract_emails", "enable_incoming": "extract_emails",
"email_id": "username", "email_id": "username",
"password": "password", "password": "password",
"pop3_server": "host", "email_server": "host",
"use_ssl": "use_ssl", "use_ssl": "use_ssl",
} }

3
erpnext/patches/v6_8/move_drop_ship_to_po_items.py
View File

@ -4,6 +4,9 @@ def execute():
frappe.reload_doctype("Purchase Order") frappe.reload_doctype("Purchase Order")
frappe.reload_doctype("Purchase Order Item") frappe.reload_doctype("Purchase Order Item")
if not frappe.db.has_column("Purchase Order", "delivered_by_supplier"):
return
for po in frappe.get_all("Purchase Order", filters={"delivered_by_supplier": 1}, fields=["name"]): for po in frappe.get_all("Purchase Order", filters={"delivered_by_supplier": 1}, fields=["name"]):
purchase_order = frappe.get_doc("Purchase Order", po) purchase_order = frappe.get_doc("Purchase Order", po)