nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-20 03:47:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into export_type_mandatory_v13

Browse Source
This commit is contained in:
Deepesh Garg
2021-08-16 14:40:13 +05:30
parent 5fddd27cab 321dd33015
commit 2aa0daf47b
124 changed files with 5219 additions and 2214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/regional/india/e_invoice/utils.py
View File

@@ -190,8 +190,10 @@ def get_item_list(invoice):
item.description = sanitize_for_json(d.item_name)
item.qty = abs(item.qty)
item.unit_rate = abs(item.taxable_value / item.qty)
if flt(item.qty) != 0.0:
item.unit_rate = abs(item.taxable_value / item.qty)
else:
item.unit_rate = abs(item.taxable_value)
item.gross_amount = abs(item.taxable_value)
item.taxable_value = abs(item.taxable_value)
item.discount_amount = 0

4
erpnext/regional/india/setup.py
View File

@@ -457,7 +457,7 @@ def make_custom_fields(update=True):
depends_on='eval:in_list(["Registered Regular", "SEZ", "Overseas", "Deemed Export"], doc.gst_category) && doc.irn_cancelled === 0'),
dict(fieldname='irn_cancelled', label='IRN Cancelled', fieldtype='Check', no_copy=1, print_hide=1,
depends_on='eval:(doc.irn_cancelled === 1)', read_only=1, allow_on_submit=1, insert_after='customer'),
depends_on='eval: doc.irn', allow_on_submit=1, insert_after='customer'),
dict(fieldname='eway_bill_validity', label='E-Way Bill Validity', fieldtype='Data', no_copy=1, print_hide=1,
depends_on='ewaybill', read_only=1, allow_on_submit=1, insert_after='ewaybill'),
@@ -987,4 +987,4 @@ def create_gratuity_rule():
def update_accounts_settings_for_taxes():
if frappe.db.count('Company') == 1:
frappe.db.set_value('Accounts Settings', None, "add_taxes_from_item_tax_template", 0)
frappe.db.set_value('Accounts Settings', None, "add_taxes_from_item_tax_template", 0)

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

@@ -851,7 +851,7 @@ def get_depreciation_amount(asset, depreciable_value, row):
# if its the first depreciation
if depreciable_value == asset.gross_purchase_amount:
# as per IT act, if the asset is purchased in the 2nd half of fiscal year, then rate is divided by 2
diff = date_diff(asset.available_for_use_date, row.depreciation_start_date)
diff = date_diff(row.depreciation_start_date, asset.available_for_use_date)
if diff <= 180:
rate_of_depreciation = rate_of_depreciation / 2
frappe.msgprint(