Commit Graph

40943 Commits

Author SHA1 Message Date
Kenneth Sequeira
513375f264 fix: Nested/Multi-level BOM help link (#26409)
Updated the link for multi-level boms. Current link is broken.
2021-07-14 16:07:47 +05:30
Kenneth Sequeira
7a89033163 fix: update integration links in help.js (#26483) 2021-07-14 16:07:31 +05:30
Saqib
72715956f1 fix: tds computation summary shows cancelled invoices (#26486) 2021-07-14 15:56:20 +05:30
Saqib
ac721ae147 fix: tds computation summary shows cancelled invoices (#26485) 2021-07-14 15:20:14 +05:30
Saqib
9c04079d04 fix: test fails due to improper gain loss account set (#26482) (#26484) 2021-07-14 14:45:11 +05:30
Afshan
9168bb369a fix: filter by accounts with group by accounts (#26439) 2021-07-14 13:57:14 +05:30
Saqib
59bf2df28e fix: pos item cart dom updates (#26461) 2021-07-14 11:40:58 +05:30
Saqib
cbf7e1b676 fix: pos item cart dom updates (#26460) 2021-07-14 11:40:47 +05:30
Anurag Mishra
adfdc71844 fix: Tax calculation for Recurring additional salary (#24206)
* fix: Tax calculation for Recurring additional salary

* fix: conflicts
2021-07-14 09:59:41 +05:30
marination
fed3b575eb chore: Wishlist UI (minor)
- Minor wishlist UI refresh, actions on hover, new icon
- Increase max length of wishlist card title
- Dont fetch outdated price in wishlist
- Translate 'out of stock'
- Use ORM
2021-07-14 01:36:50 +05:30
marination
f14596a8f3 feat: Recommended Items and Item full page refresh
- Added Optional Recommended Items
- Item Full Page minor UI Refresh
- Floating wishlist button in item full page
- Reviews section UI Refresh
2021-07-13 23:46:24 +05:30
rohitwaghchaure
96eb147bb6 Merge pull request #26457 from rohitwaghchaure/fixed-multi-currency-issue
fix: multi-currency issue
2021-07-13 23:01:30 +05:30
Deepesh Garg
7ff6865817 Merge pull request #26470 from deepeshgarg007/new_company_error_v13
fix: Errors on parallel requests creation of company for India
2021-07-13 20:30:06 +05:30
Deepesh Garg
75f66f78d7 Merge pull request #26420 from deepeshgarg007/new_company_error
fix: Errors on parallel requests creation of company for India
2021-07-13 20:29:56 +05:30
Deepesh Garg
c00d851a88 fix: Unallocated amount for inclusive charges 2021-07-13 16:42:21 +05:30
Deepesh Garg
740d5c6c53 fix: Deduct included taxes from unallocated amount 2021-07-13 16:42:10 +05:30
Deepesh Garg
01c89eaad9 fix: Remove unintentional changes 2021-07-13 16:42:10 +05:30
Deepesh Garg
2f350bf450 fix: Remove unintentional changes 2021-07-13 16:42:10 +05:30
Deepesh Garg
9513d61a50 fix: Hide amount after tax fields 2021-07-13 16:42:10 +05:30
Deepesh Garg
51ae46f0de fix: Unallocated amount in Payment Entry after taxes 2021-07-13 16:42:10 +05:30
Deepesh Garg
2f89b5b38e Merge pull request #26466 from deepeshgarg007/amended_doc_discount_v13
fix: Incorrect discount amount on amended document
2021-07-13 16:24:54 +05:30
Deepesh Garg
41c5357602 Merge pull request #26468 from deepeshgarg007/gstr_1_json_dpwnload_error_v13
fix: Unable to download GSTR-1 json
2021-07-13 16:17:52 +05:30
Deepesh Garg
fc20ff02d0 Merge pull request #26418 from deepeshgarg007/gstr_1_json_dpwnload_error
fix: Unable to download GSTR-1 json
2021-07-13 16:17:37 +05:30
rohitwaghchaure
bd8699b8a9 Merge pull request #26458 from rohitwaghchaure/fixed-multi-currency-issue-pre
fix: multi-currency issue
2021-07-13 16:05:36 +05:30
Deepesh Garg
fea29ae8cb fix: Use update flag for company dependant fixtures 2021-07-13 16:05:05 +05:30
Deepesh Garg
7be9f8dab1 fix: Error on creation of company for India 2021-07-13 16:04:56 +05:30
Deepesh Garg
0bad696faf fix: Unable to download GSTR-1 json 2021-07-13 15:46:58 +05:30
Deepesh Garg
07d9f3f74b fix: Incorrect discount amount on amended document 2021-07-13 15:35:59 +05:30
Rohit Waghchaure
4acbeecbbe fix: multi-currency issue 2021-07-13 15:35:30 +05:30
Deepesh Garg
eef8e4a9d4 Merge pull request #26292 from deepeshgarg007/amended_doc_discount
fix: Incorrect discount amount on amended document
2021-07-13 15:34:24 +05:30
Rohit Waghchaure
0d190bb930 fix: multi-currency issue 2021-07-13 15:32:39 +05:30
Saqib
621927d9f9 fix: move the rename abbreviation job to long queue (#26462) 2021-07-13 14:13:39 +05:30
Rucha Mahabal
40793f4a18 test: introduce cypress tests
Co-authored-by: Ankush <ankush@iwebnotes.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-07-13 13:17:19 +05:30
Rucha Mahabal
fc4079587b Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into org-chart 2021-07-13 12:38:37 +05:30
Marica
fad426fd5c Merge pull request #26454 from noahjacob/supplier_defaults_v13pr
feat: fetching details from supplier/customer groups
2021-07-13 11:39:55 +05:30
rohitwaghchaure
84f23ac8d2 Merge pull request #26222 from 18alantom/teabox-cogs-by-item-group
feat: report to show cogs by item groups
2021-07-13 11:24:59 +05:30
Deepesh Garg
4a2e4748ac fix: Unallocated amount for inclusive charges 2021-07-13 11:22:55 +05:30
Noah Jacob
449c58d809 refactor: suggested changes 2021-07-13 11:12:33 +05:30
Noah Jacob
a1a4e8d616 fix: Sider 2021-07-13 11:12:33 +05:30
Noah Jacob
e60a349432 test: updated test cases 2021-07-13 11:12:33 +05:30
Noah Jacob
872cd1cac8 test: test cases for fetching customer group details 2021-07-13 11:12:33 +05:30
Noah Jacob
d160e73c03 test: test case for fetching supplier group details 2021-07-13 11:12:33 +05:30
Noah Jacob
905aebc310 feat: details fetched from customer group in customer 2021-07-13 11:12:33 +05:30
Noah Jacob
47c2317b1a feat: details fetched from supplier group in supplier 2021-07-13 11:12:33 +05:30
Noah Jacob
74b3fc1e1c refactor: suggested changes 2021-07-13 11:05:53 +05:30
Noah Jacob
1e8f598ba5 fix: Sider 2021-07-13 11:05:53 +05:30
Noah Jacob
dd0a8f20e2 test: updated test cases 2021-07-13 11:05:53 +05:30
Noah Jacob
fedee0e8da test: test cases for fetching customer group details 2021-07-13 11:05:53 +05:30
Noah Jacob
f07f7e9305 test: test case for fetching supplier group details 2021-07-13 11:05:53 +05:30
Noah Jacob
1cb2af00a8 feat: details fetched from customer group in customer 2021-07-13 11:05:53 +05:30