34602 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Shivam Mishra	a90b6a73dd	fix: syntax error	2020-12-24 18:02:07 +05:30
Shivam Mishra	419c889a9a	feat: add docstrings	2020-12-24 17:58:18 +05:30
Shivam Mishra	293f483cb4	feat: add ProductQuery engine	2020-12-24 17:54:07 +05:30
rohitwaghchaure	b9352b729a	Merge pull request #24063 from rohitwaghchaure/fixed-job-card-cacncel-flow-develop ... fix: don't cancel job card if manufacturing entry has made	2020-12-24 17:46:45 +05:30
rohitwaghchaure	630258f493	Merge pull request #24164 from rohitwaghchaure/do-not-manufacture-same-serial-no-two-develop ... fix: do not manufacture same serial no multiple times	2020-12-24 17:46:26 +05:30
Rucha Mahabal	d013d94e8d	Merge branch 'develop' into fix-therapy-type-filter	2020-12-24 17:44:25 +05:30
Rohit Waghchaure	304100db3b	fix: don't cancel job card if manufacturing entry has made	2020-12-24 16:36:37 +05:30
Rohit Waghchaure	ed20819432	fix: travis	2020-12-24 16:24:10 +05:30
Shivam Mishra	d0437cfb59	feat: clear document cache on validate	2020-12-24 14:15:09 +05:30
Shivam Mishra	bba2726333	fix: minor styling fixes	2020-12-24 14:14:17 +05:30
Anurag Mishra	527a156512	feat: validated employees whose salary has been already precessed	2020-12-24 13:59:12 +05:30
Jannat Patel	29dd7e5fc4	Merge branch 'develop' into partially-submit-drop-ship-items-issue	2020-12-24 13:44:42 +05:30
prssanna	eb0e596d43	feat: store home page and product page	2020-12-24 11:40:33 +05:30
prssanna	7a38f41350	Merge branch 'shopping-cart' of https://github.com/frappe/erpnext into shopping-cart	2020-12-24 11:39:41 +05:30
prssanna	79c3d6f71d	Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into shopping-cart	2020-12-24 11:36:59 +05:30
Rucha Mahabal	d2f91e8c11	fix: Do not cancel reference document on Quality Inspection cancellation (#24197)	2020-12-24 11:03:36 +05:30
Rushabh Mehta	ab1c2b7631	fix(minor): routing	2020-12-23 23:26:58 +05:30
Deepesh Garg	aa7ab211be	Merge pull request #24171 from deepeshgarg007/breadcrum_schema ... fix: Add breadcrumbs to item group page	2020-12-23 16:52:48 +05:30
Shivam Mishra	1ab4f09ee9	fix: use file_url to save file and not file name	2020-12-23 15:18:41 +05:30
Anurag Mishra	d884216c6f	fix: leave policy dashboard fix ... fix: leave policy dashboard fix	2020-12-23 13:19:12 +05:30
Anurag Mishra	d556847fca	fix: allow addition and removal of employee in payroll Entry	2020-12-23 12:59:48 +05:30
Nabin Hait	0411a43c6e	fix: set finished good item rate based on qty	2020-12-23 12:14:41 +05:30
Saqib Ansari	09c6842199	fix: accounting entries of asset when submitting purchase receipt	2020-12-23 11:29:26 +05:30
Tim Gates	1fb412e3f6	docs: fix simple typo, udpate -> update ... There is a small typo in erpnext/patches/v4_0/map_charge_to_taxes_and_charges.py. Should read `update` rather than `udpate`.	2020-12-23 11:39:37 +11:00
barredterra	df8ea19406	fix: whitespace	2020-12-22 17:34:31 +01:00
barredterra	2acd8cbc02	fix: sider	2020-12-22 17:34:22 +01:00
Jannat Patel	b07914d185	Merge branch 'develop' into project-template-and-tasks	2020-12-22 20:47:30 +05:30
pateljannat	8dec1c142f	fix: removed unused imports	2020-12-22 19:55:31 +05:30
Deepesh Garg	e5e2ad646a	fix: Test Cases	2020-12-22 19:53:07 +05:30
pateljannat	6cf018c762	fix: holiday update in tests	2020-12-22 19:40:41 +05:30
pateljannat	4ebee5014e	feat: aholiday check before setting start and end date in task	2020-12-22 18:14:46 +05:30
barredterra	511be6466d	Revert "fix: fail silently" ... This reverts commit 6900a79421.	2020-12-22 11:43:33 +01:00
barredterra	a69021018a	test: add test for accounts controller	2020-12-22 11:38:09 +01:00
barredterra	5adbe49ca6	refactor: translation syntax	2020-12-22 11:37:43 +01:00
barredterra	6900a79421	fix: fail silently	2020-12-22 11:37:13 +01:00
Deepesh Garg	e1320c7e47	Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency	2020-12-22 13:32:59 +05:30
Deepesh Garg	468f67a4de	fix: Add parent for all-products page	2020-12-22 12:44:09 +05:30
Mohammad Hasnain Mohsin Rajan	61b92b312a	Merge branch 'develop' into fix-analytics-reports	2020-12-22 12:41:43 +05:30
Shivam Mishra	46bc7ca69f	feat: use call icon	2020-12-22 12:32:36 +05:30
Shivam Mishra	64fa0e8729	fix: wrap assignees in a list	2020-12-22 12:32:36 +05:30
barredterra	1725fbc59a	feat: separate equity tree in CoA SKR04	2020-12-22 12:32:36 +05:30
Rucha Mahabal	7574a14d57	fix: Remove patch for setting next date in Subscription (#24158)	2020-12-22 12:32:36 +05:30
Rucha Mahabal	5f53b140e2	fix: Auto Repeat Import (#24157)	2020-12-22 12:32:36 +05:30
Rucha Mahabal	7d848b1785	refactor: Auto Repeat next schedule date function params (#23959) ... * refactor: Auto Repeat next schedule date function params * refactor: Auto Repeat next schedule date function params	2020-12-22 12:32:36 +05:30
prssanna	ec959bc3b9	fix: override field_map for job card gantt	2020-12-22 12:32:36 +05:30
pateljannat	3a26f26671	fix: get_doc to avoid modified error	2020-12-22 11:56:59 +05:30
Shivam Mishra	59a2029c87	Merge branch 'shopping-cart' of https://github.com/frappe/erpnext into shopping-cart	2020-12-22 11:28:33 +05:30
Shivam Mishra	7d3876d51a	feat: shopping cart search	2020-12-22 11:17:14 +05:30
Shivam Mishra	721251f09f	feat: add product category cards	2020-12-22 11:17:14 +05:30
Shivam Mishra	b4946c31b4	refactor: use h1 for slidetitle	2020-12-22 11:17:14 +05:30