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-12-12 16:44:40 +05:30
commit d5f45c7c1a
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/bank_transaction/bank_transaction_upload.py
View File

@ -15,8 +15,8 @@ def upload_bank_statement():
with open(frappe.uploaded_file, "rb") as upfile:
fcontent = upfile.read()
else:
from frappe.utils.file_manager import get_uploaded_content
fname, fcontent = get_uploaded_content()
fcontent = frappe.local.uploaded_file
fname = frappe.local.uploaded_filename
if frappe.safe_encode(fname).lower().endswith("csv".encode('utf-8')):
from frappe.utils.csvutils import read_csv_content

2
erpnext/public/js/controllers/buying.js
View File

@ -30,7 +30,7 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
&& frappe.meta.has_field(this.frm.doc.doctype, "disable_rounded_total")) {
var df = frappe.meta.get_docfield(this.frm.doc.doctype, "disable_rounded_total");
var disable = df.default || cint(frappe.sys_defaults.disable_rounded_total);
var disable = cint(df.default) || cint(frappe.sys_defaults.disable_rounded_total);
this.frm.set_value("disable_rounded_total", disable);
}

2
erpnext/quality_management/doctype/quality_action_resolution/quality_action_resolution.json
View File

@ -13,7 +13,7 @@
"fieldname": "problem",
"fieldtype": "Long Text",
"in_list_view": 1,
"label": "Problem"
"label": "Review"
},
{
"fieldname": "sb_00",

2
erpnext/quality_management/doctype/quality_procedure_process/quality_procedure_process.json
View File

@ -18,7 +18,7 @@
"fieldname": "procedure",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Procedure",
"label": "Child Procedure",
"options": "Quality Procedure"
}
],

2
erpnext/regional/india/utils.py
View File

@ -179,6 +179,8 @@ def get_regional_address_details(party_details, doctype, company, return_taxes=N
if not party_details.place_of_supply: return
if not party_details.company_gstin: return
if ((doctype in ("Sales Invoice", "Delivery Note", "Sales Order") and party_details.company_gstin
and party_details.company_gstin[:2] != party_details.place_of_supply[:2]) or (doctype in ("Purchase Invoice",
"Purchase Order", "Purchase Receipt") and party_details.supplier_gstin and party_details.supplier_gstin[:2] != party_details.place_of_supply[:2])):

5
erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
View File

@ -245,7 +245,7 @@ class PurchaseReceipt(BuyingController):
negative_expense_to_be_booked += flt(d.item_tax_amount)
# Amount added through landed-cost-voucher
if landed_cost_entries:
if d.landed_cost_voucher_amount and landed_cost_entries:
for account, amount in iteritems(landed_cost_entries[(d.item_code, d.name)]):
gl_entries.append(self.get_gl_dict({
"account": account,
@ -611,7 +611,7 @@ def make_stock_entry(source_name,target_doc=None):
def get_item_account_wise_additional_cost(purchase_document):
landed_cost_voucher = frappe.get_value("Landed Cost Purchase Receipt",
{"receipt_document": purchase_document}, "parent")
{"receipt_document": purchase_document, "docstatus": 1}, "parent")
if not landed_cost_voucher:
return
@ -622,7 +622,6 @@ def get_item_account_wise_additional_cost(purchase_document):
based_on_field = frappe.scrub(landed_cost_voucher_doc.distribute_charges_based_on)
for item in landed_cost_voucher_doc.items:
if item.receipt_document == purchase_document:
total_item_cost += item.get(based_on_field)
for item in landed_cost_voucher_doc.items: