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

Merge branch 'develop' into currency-exchange-settings

Browse Source
This commit is contained in:
Dany Robert 2021-09-04 17:57:05 +05:30 committed by GitHub
commit c8d313b992
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/patches/v13_0/create_gst_payment_entry_fields.py
View File

@ -4,6 +4,7 @@
import frappe import frappe
from frappe.custom.doctype.custom_field.custom_field import create_custom_fields from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
def execute(): def execute():
frappe.reload_doc('accounts', 'doctype', 'advance_taxes_and_charges') frappe.reload_doc('accounts', 'doctype', 'advance_taxes_and_charges')
frappe.reload_doc('accounts', 'doctype', 'payment_entry') frappe.reload_doc('accounts', 'doctype', 'payment_entry')

4
erpnext/public/js/controllers/transaction.js
View File

@ -487,6 +487,10 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
var me = this; var me = this;
var item = frappe.get_doc(cdt, cdn); var item = frappe.get_doc(cdt, cdn);
var update_stock = 0, show_batch_dialog = 0; var update_stock = 0, show_batch_dialog = 0;
item.weight_per_unit = 0;
item.weight_uom = '';
if(['Sales Invoice'].includes(this.frm.doc.doctype)) { if(['Sales Invoice'].includes(this.frm.doc.doctype)) {
update_stock = cint(me.frm.doc.update_stock); update_stock = cint(me.frm.doc.update_stock);
show_batch_dialog = update_stock; show_batch_dialog = update_stock;

4
erpnext/regional/report/gstr_1/gstr_1.py
View File

@ -54,7 +54,7 @@ class Gstr1Report(object):
self.get_invoice_items() self.get_invoice_items()
self.get_items_based_on_tax_rate() self.get_items_based_on_tax_rate()
self.invoice_fields = [d["fieldname"] for d in self.invoice_columns] self.invoice_fields = [d["fieldname"] for d in self.invoice_columns]
self.get_data() self.get_data()
return self.columns, self.data return self.columns, self.data
@ -713,7 +713,7 @@ class Gstr1Report(object):
"width": 100 "width": 100
} }
] ]
self.columns = self.invoice_columns + self.tax_columns + self.other_columns self.columns = self.invoice_columns + self.tax_columns + self.other_columns
@frappe.whitelist() @frappe.whitelist()

4
erpnext/stock/get_item_details.py
View File

@ -321,8 +321,8 @@ def get_basic_details(args, item, overwrite_warehouse=True):
"transaction_date": args.get("transaction_date"), "transaction_date": args.get("transaction_date"),
"against_blanket_order": args.get("against_blanket_order"), "against_blanket_order": args.get("against_blanket_order"),
"bom_no": item.get("default_bom"), "bom_no": item.get("default_bom"),
"weight_per_unit": item.get("weight_per_unit"), "weight_per_unit": args.get("weight_per_unit") or item.get("weight_per_unit"),
"weight_uom": item.get("weight_uom") "weight_uom": args.get("weight_uom") or item.get("weight_uom")
}) })
if item.get("enable_deferred_revenue") or item.get("enable_deferred_expense"): if item.get("enable_deferred_revenue") or item.get("enable_deferred_expense"):