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

Merge branch 'develop' into pi-expense-account

Browse Source
This commit is contained in:
Marica 2021-07-26 20:15:20 +05:30 committed by GitHub
commit a4bafe2dbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CODEOWNERS
View File

@ -21,13 +21,13 @@ erpnext/quality_management/ @marination @rohitwaghchaure
erpnext/shopping_cart/ @marination erpnext/shopping_cart/ @marination
erpnext/stock/ @marination @rohitwaghchaure @ankush erpnext/stock/ @marination @rohitwaghchaure @ankush
erpnext/crm/ @ruchamahabal erpnext/crm/ @ruchamahabal @pateljannat
erpnext/education/ @ruchamahabal erpnext/education/ @ruchamahabal @pateljannat
erpnext/healthcare/ @ruchamahabal erpnext/healthcare/ @ruchamahabal @pateljannat @chillaranand
erpnext/hr/ @ruchamahabal erpnext/hr/ @ruchamahabal @pateljannat
erpnext/non_profit/ @ruchamahabal erpnext/non_profit/ @ruchamahabal
erpnext/payroll @ruchamahabal erpnext/payroll @ruchamahabal @pateljannat
erpnext/projects/ @ruchamahabal erpnext/projects/ @ruchamahabal @pateljannat
erpnext/controllers @deepeshgarg007 @nextchamp-saqib @rohitwaghchaure @marination erpnext/controllers @deepeshgarg007 @nextchamp-saqib @rohitwaghchaure @marination

3
erpnext/hooks.py
View File

@ -25,7 +25,8 @@ doctype_js = {
"Address": "public/js/address.js", "Address": "public/js/address.js",
"Communication": "public/js/communication.js", "Communication": "public/js/communication.js",
"Event": "public/js/event.js", "Event": "public/js/event.js",
"Newsletter": "public/js/newsletter.js" "Newsletter": "public/js/newsletter.js",
"Contact": "public/js/contact.js"
} }
override_doctype_class = { override_doctype_class = {

16
erpnext/public/js/contact.js Normal file
View File

@ -0,0 +1,16 @@
frappe.ui.form.on("Contact", {
refresh(frm) {
frm.set_query('link_doctype', "links", function() {
return {
query: "frappe.contacts.address_and_contact.filter_dynamic_link_doctypes",
filters: {
fieldtype: ["in", ["HTML", "Text Editor"]],
fieldname: ["in", ["contact_html", "company_description"]],
}
};
});
frm.refresh_field("links");
}
});

8
erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py
View File

@ -214,9 +214,8 @@ class GSTR3BReport(Document):
for d in item_details: for d in item_details:
if d.item_code not in self.invoice_items.get(d.parent, {}): if d.item_code not in self.invoice_items.get(d.parent, {}):
self.invoice_items.setdefault(d.parent, {}).setdefault(d.item_code, self.invoice_items.setdefault(d.parent, {}).setdefault(d.item_code, 0.0)
sum((i.get('taxable_value', 0) or i.get('base_net_amount', 0)) for i in item_details self.invoice_items[d.parent][d.item_code] += d.get('taxable_value', 0) or d.get('base_net_amount', 0)
if i.item_code == d.item_code and i.parent == d.parent))
if d.is_nil_exempt and d.item_code not in self.is_nil_exempt: if d.is_nil_exempt and d.item_code not in self.is_nil_exempt:
self.is_nil_exempt.append(d.item_code) self.is_nil_exempt.append(d.item_code)
@ -322,6 +321,9 @@ class GSTR3BReport(Document):
inter_state_supply_details[(gst_category, place_of_supply)]['txval'] += taxable_value inter_state_supply_details[(gst_category, place_of_supply)]['txval'] += taxable_value
inter_state_supply_details[(gst_category, place_of_supply)]['iamt'] += (taxable_value * rate /100) inter_state_supply_details[(gst_category, place_of_supply)]['iamt'] += (taxable_value * rate /100)
if self.invoice_cess.get(inv):
self.report_dict['sup_details']['osup_det']['csamt'] += flt(self.invoice_cess.get(inv), 2)
self.set_inter_state_supply(inter_state_supply_details) self.set_inter_state_supply(inter_state_supply_details)
def set_supplies_liable_to_reverse_charge(self): def set_supplies_liable_to_reverse_charge(self):

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

@ -217,9 +217,8 @@ class Gstr1Report(object):
for d in items: for d in items:
if d.item_code not in self.invoice_items.get(d.parent, {}): if d.item_code not in self.invoice_items.get(d.parent, {}):
self.invoice_items.setdefault(d.parent, {}).setdefault(d.item_code, self.invoice_items.setdefault(d.parent, {}).setdefault(d.item_code, 0.0)
sum((i.get('taxable_value', 0) or i.get('base_net_amount', 0)) for i in items self.invoice_items[d.parent][d.item_code] += d.get('taxable_value', 0) or d.get('base_net_amount', 0)
if i.item_code == d.item_code and i.parent == d.parent))
item_tax_rate = {} item_tax_rate = {}