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

Merge branch 'develop' of https://github.com/frappe/erpnext into develop

Browse Source
This commit is contained in:
Khushal Trivedi 2019-10-25 13:23:04 +05:30
commit ea142971a8
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/payment_entry/payment_entry.js
View File

@ -308,7 +308,7 @@ frappe.ui.form.on('Payment Entry', {
() => { () => {
frm.set_party_account_based_on_party = false; frm.set_party_account_based_on_party = false;
if (r.message.bank_account) { if (r.message.bank_account) {
frm.set_value("bank_account", r.message.bank_account); frm.set_value("party_bank_account", r.message.bank_account);
} }
} }
]); ]);

4
erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py
View File

@ -4,7 +4,7 @@ from frappe.model.utils.rename_field import rename_field
def execute(): def execute():
frappe.reload_doc('desk', 'doctype', 'auto_repeat') frappe.reload_doc('automation', 'doctype', 'auto_repeat')
doctypes_to_rename = { doctypes_to_rename = {
'accounts': ['Journal Entry', 'Payment Entry', 'Purchase Invoice', 'Sales Invoice'], 'accounts': ['Journal Entry', 'Payment Entry', 'Purchase Invoice', 'Sales Invoice'],
@ -41,4 +41,4 @@ def drop_columns_from_subscription():
if field in frappe.db.get_table_columns("Subscription"): if field in frappe.db.get_table_columns("Subscription"):
fields_to_drop['Subscription'].append(field) fields_to_drop['Subscription'].append(field)
frappe.model.delete_fields(fields_to_drop, delete=1) frappe.model.delete_fields(fields_to_drop, delete=1)

2
erpnext/shopping_cart/cart.py
View File

@ -66,7 +66,7 @@ def place_order():
from erpnext.selling.doctype.quotation.quotation import _make_sales_order from erpnext.selling.doctype.quotation.quotation import _make_sales_order
sales_order = frappe.get_doc(_make_sales_order(quotation.name, ignore_permissions=True)) sales_order = frappe.get_doc(_make_sales_order(quotation.name, ignore_permissions=True))
if not cart_settings.allow_items_not_in_stock: if not cint(cart_settings.allow_items_not_in_stock):
for item in sales_order.get("items"): for item in sales_order.get("items"):
item.reserved_warehouse, is_stock_item = frappe.db.get_value("Item", item.reserved_warehouse, is_stock_item = frappe.db.get_value("Item",
item.item_code, ["website_warehouse", "is_stock_item"]) item.item_code, ["website_warehouse", "is_stock_item"])