27743 Commits

Author	SHA1	Message	Date
marination	bc9eaac342	fix: Clear merge conflicts ... - 'get_project_template' was removed a month back - in 'make_project' insert the project directly as a check for it is there in the beginning.	2021-01-14 13:47:40 +05:30
Rucha Mahabal	6c90e26982	feat: add descriptions for YTD and MTD fields	2021-01-14 13:42:40 +05:30
Marica	17614c9860	Merge branch 'develop' into mr-se-warehouse-validation	2021-01-14 13:02:45 +05:30
Rucha Mahabal	6b9efa894f	Merge branch 'develop' into inpatient-visits-billing	2021-01-14 12:31:43 +05:30
marination	814858061f	fix: test for raising MR-SE mismatch error ... - Make test add mismatched item code instead of warehouse, since warehouse can be different.	2021-01-14 12:13:08 +05:30
Rucha Mahabal	49702c1487	test: year to date computation for salary slip components	2021-01-14 11:57:24 +05:30
Rohit Waghchaure	56c7b554a6	fix: extra transferred qty has not consumed against work order	2021-01-14 11:54:32 +05:30
Rucha Mahabal	2c315a738e	feat: Salary Slip with Year to Date Print Format	2021-01-14 10:06:24 +05:30
Rucha Mahabal	fdad94f983	feat(Payroll): compute Year to Date for Salary Slip components	2021-01-14 00:40:58 +05:30
Anuja Pawar	e62ce4b172	fix: Add button PO, PI, SI, DN and, Quotation Dashboard (#24187)	2021-01-13 21:13:12 +05:30
Anupam Kumar	4a649a4fce	fix: removing payment_field from loan repayment closuer (#24291)	2021-01-13 21:10:49 +05:30
Afshan	33fac19bce	fix: calculation of remaining_sub_periods if relieving date before month start date (#24319)	2021-01-13 21:06:04 +05:30
Anuja Pawar	0b04e23f6d	fix: BOM Stock Report UoM correction (#24339)	2021-01-13 21:04:03 +05:30
Jannat Patel	00ccec7314	fix: subscription prepaid date validation (#24356)	2021-01-13 21:02:15 +05:30
Saqib	53cb9f9f47	fix(e-invoicing): ux issues (#24358) ... * fix: overseas invoice rounding adjustment * fix: overseas shipping address * fix: qrcode for document name having forward slash * feat: sandbox mode toggle * fix: cannot delete sales invoice if linked to e invoice req log	2021-01-13 21:00:44 +05:30
Kanchan Chauhan	511434190d	fix(work order): Actual start and end dates update (#24360) ... Currently, even when the Work Order (without Operations) is completed and Stock Entries are there, the Actual Start Date and Actual End Date is not updated. For some reason need to db_set, then it updates the Actual Start Date and Actual End Date	2021-01-13 20:59:43 +05:30
Rucha Mahabal	ef5f0c0461	feat: Issue Summary Script Report (#23603) ... * feat: Issue Summary Report * feat: Add Issue Metrics to Issue Summary Report * fix: code clean-up * feat: Added Report Summary * feat: Add SLA status fields * fix: add report link to desk page * fix: sider issues Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-01-13 19:59:16 +05:30
Anurag Mishra	1e396dcb2a	fix: validated GST state	2021-01-13 14:01:57 +05:30
Jannat Patel	8aeadc743e	fix: assessment plan error handling for course field (#23961) ... * fix: assessment plan error handling for course field * fix: message rectification * fix(travis): clean-up tests * fix: travis * fix: tests Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-01-13 12:56:04 +05:30
Marica	1ff7743d81	Merge branch 'develop' into naming-series-proj	2021-01-13 10:40:24 +05:30
rohitwaghchaure	1c362c81f2	Merge pull request #24324 from marination/bom-rm-rate-company-based ... fix: Company Wise Valuation Rate for RM in BOM	2021-01-13 10:39:39 +05:30
Rucha Mahabal	0f05925ff4	test: Do Not Bill Patient Encounters for Inpatients	2021-01-13 09:46:33 +05:30
Rucha Mahabal	1354197c72	feat(Healthcare Settings): Do Not Bill Patient Encounters for Inpatients	2021-01-13 09:12:50 +05:30
Rohit Waghchaure	7cd7bf7f96	fix: incorrect key	2021-01-13 00:13:57 +05:30
rohitwaghchaure	bc465a3045	Merge pull request #24332 from rohitwaghchaure/fixed-payment-entry-multi-currency-issue-develop ... fix: payment entry multi-currency issue	2021-01-13 00:13:14 +05:30
Marica	b8c5cd7331	Merge branch 'develop' into mr-se-warehouse-validation	2021-01-12 20:16:58 +05:30
Marica	30cc040d50	Merge branch 'develop' into batch-selector	2021-01-12 20:14:35 +05:30
Marica	cb079cd8c4	Merge branch 'develop' into naming-series-proj	2021-01-12 19:57:55 +05:30
Marica	69f66664ce	Merge branch 'develop' into qi-reading-status	2021-01-12 19:32:47 +05:30
Anurag Mishra	36fa0512d2	fix: not able to create dunning from sales invoice	2021-01-12 17:02:19 +05:30
Deepesh Garg	59e2114419	Merge pull request #24311 from wojosc/patch-14 ... fix: Update item_tax_template_dashboard.py	2021-01-12 13:09:35 +05:30
Rushabh Mehta	b6c7ba2eea	fix(minor): Rename loan workspace to loan management for naming	2021-01-12 11:34:11 +05:30
Deepesh Garg	7fd2b35a7d	Merge pull request #24092 from pateljannat/project-template-and-tasks ... feat: Project template with dependent tasks	2021-01-12 11:28:35 +05:30
Marica	69abc27316	Merge branch 'develop' into qi-reading-status	2021-01-12 11:15:36 +05:30
Anupam	c53ad88503	fix: resolved commit	2021-01-12 10:51:29 +05:30
Rushabh Mehta	37aa81526a	fix(minor): clear merge conflicts	2021-01-12 10:29:00 +05:30
Marica	0600d572ba	Merge branch 'develop' into batch-selector	2021-01-12 10:28:47 +05:30
Rushabh Mehta	7619d3d6d6	fix(merge): develop	2021-01-12 09:16:21 +05:30
Rucha Mahabal	80911577f5	Merge pull request #24340 from ruchamahabal/make-ipme-entries-editable ... fix: allow medication entries to be deleted from the table	2021-01-11 17:59:02 +05:30
rohitwaghchaure	c92da35997	Merge pull request #22944 from anupamvs/opportunity-status ... fix: Opportunity Status fix	2021-01-11 17:34:06 +05:30
Rucha Mahabal	8549358708	Merge branch 'develop' into make-ipme-entries-editable	2021-01-11 15:31:08 +05:30
Marica	aef71a8abe	Merge branch 'develop' into batch-selector	2021-01-11 14:22:11 +05:30
Marica	cffc489d57	Merge branch 'develop' into partially-submit-drop-ship-items-issue	2021-01-11 13:39:49 +05:30
Saqib	d43bb4db41	fix(pos): error while merging pos invoices into sales invoice (#24337)	2021-01-11 12:59:35 +05:30
marination	7646d7b741	fix: Batch/Serial Selector for Batched Item	2021-01-11 12:51:15 +05:30
Jannat Patel	dcda8b9e8c	feat: Patient appointment status changes (#24201) ... * feat: patient appointment status changes * fix: sider * fix: sider * fix: test status on cancel of docs and test refactor Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-01-11 12:50:39 +05:30
Rucha Mahabal	aff3f611d3	fix: allow medication entries to be deleted from the table	2021-01-11 12:48:11 +05:30
Jannat Patel	8a07de9ee0	Merge branch 'develop' into project-template-and-tasks	2021-01-11 10:57:09 +05:30
pateljannat	2460e101a7	fix: indicator ofor template task	2021-01-11 10:05:54 +05:30
Deepesh Garg	d3634f6dac	feat: Loan Interest Report	2021-01-10 19:26:45 +05:30
Deepesh Garg	1b208e0695	fix: Add total loan interest amount field in loans	2021-01-10 12:29:55 +05:30
Ganga Manoj	2ffa4b9ce4	fix: Link timesheets with corresponding projects	2021-01-08 20:58:00 +05:30
Marica	b9d5ae9285	Merge branch 'develop' into qi-ux	2021-01-08 20:28:28 +05:30
Marica	63a91fc742	Merge branch 'develop' into qi-ux	2021-01-08 18:42:54 +05:30
Marica	ace08b1e48	Merge branch 'develop' into qc-back-update-se	2021-01-08 18:42:19 +05:30
marination	b7637f49cd	fix: Remove QI link on cancel wherever same QI name exists	2021-01-08 18:35:49 +05:30
Anurag Mishra	05f6edfe0a	Merge branch 'develop' into fixed-payment-entry-multi-currency-issue-develop	2021-01-08 17:27:22 +05:30
Rushabh Mehta	f8a6dde8d8	fix(minor): routing	2021-01-08 14:37:38 +05:30
Rohit Waghchaure	3777c6aa38	fix: payment entry multi-currency issue	2021-01-08 12:59:15 +05:30
Rucha Mahabal	a93151502c	fix: Components formulated from additional salary not being fetched in Payroll Entry	2021-01-08 12:10:26 +05:30
marination	c4963bfdb2	fix: Back Update from QC based on Batch No	2021-01-08 09:56:04 +05:30
marination	ff6ee9d4e7	fix: Formula field description and Rearrange grid view ... - Missing closing quote in Formula field description - In grid view of child table in QI, show only input fields	2021-01-08 09:14:43 +05:30
Leela vadlamudi	df9144c198	feat: Voice Call Settings doctype added (#24126) ... (cherry picked from commit 29778e2fba)	2021-01-07 17:20:40 +05:30
Marica	5cfdd0f503	Merge branch 'develop' into qi-ux	2021-01-07 15:47:55 +05:30
Marica	d91c7e2b38	Merge branch 'develop' into mr-se-warehouse-validation	2021-01-07 15:41:21 +05:30
marination	fab080c875	fix: Company Wise Valuation Rate for RM in BOM	2021-01-07 15:25:39 +05:30
pateljannat	fd5ebe9d4a	fix: patch and columns	2021-01-07 15:16:15 +05:30
Jannat Patel	a586b0ba17	Merge branch 'develop' into project-template-and-tasks	2021-01-07 13:01:02 +05:30
pateljannat	3c55463b4b	fix: validation for ldc against supplier and section code	2021-01-07 12:41:44 +05:30
Anurag Mishra	77ba72c4ff	Merge branch 'develop' into payroll_fixes2.0	2021-01-06 14:23:53 +05:30
Anurag Mishra	e7fa6f6a1c	fix: edditable employee grid	2021-01-06 13:25:09 +05:30
Shivam Mishra	9fc44f1606	Merge pull request #24182 from scmmishra/fix-dont-set-primary	2021-01-06 12:52:44 +05:30
Jannat Patel	5a579089c2	fix: indentation	2021-01-06 11:21:13 +05:30
Deepesh Garg	5e15a5d230	Merge pull request #24186 from frappe/validate_regional_germany ... fix: regional validation of sales invoice (germany)	2021-01-06 09:35:05 +05:30
Deepesh Garg	e72c51204b	Merge pull request #24189 from timgates42/bugfix_typo_update ... docs: fix simple typo, udpate -> update	2021-01-06 09:34:11 +05:30
Deepesh Garg	f2863f9d16	Merge pull request #24313 from deepeshgarg007/ytd_error_fix_v13 ... fix: Consider only submitted salary slips	2021-01-06 09:30:00 +05:30
Deepesh Garg	ad8be7c1fe	fix: Consider only submitted salary slips	2021-01-06 09:29:03 +05:30
Rucha Mahabal	a7a609d4ff	Merge pull request #24281 from ruchamahabal/allow-discharge ... feat: Allow Discharge despite Unbilled Healthcare Services	2021-01-06 09:27:26 +05:30
Deepesh Garg	6f18d4c0f6	Merge pull request #24312 from deepeshgarg007/sanctioned_loan_unpledge ... fix: Sanctioned loan security unpledge	2021-01-06 09:13:19 +05:30
Deepesh Garg	05fe7ac29c	fix: fieldname	2021-01-06 09:10:28 +05:30
Deepesh Garg	dd768a07c5	fix: Sanctioned loan security unpledge	2021-01-05 23:55:00 +05:30
Wolfram Schmidt	5eef19723d	Update item_tax_template_dashboard.py ... added missing backlink. In Item Groups I can set Item Tax Temple in Table taxes.	2021-01-05 18:47:11 +01:00
Nabin Hait	f7b9b0687e	fix: tax calculation on salary slip for the first month (#24272) ... * fix: tax calculation on salary slip for the first month * fix: net pay precision issue * fix: net pay precision issue Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>	2021-01-05 20:43:11 +05:30
Deepesh Garg	b01b108dfa	fix: do not consider current salary slip in sum	2021-01-05 17:34:16 +05:30
Saurabh	994fa48cd4	Merge branch 'develop' into fix-dont-set-primary	2021-01-05 16:32:56 +05:30
Saqib	80e0952ba7	refactor: fetch & validate address from erpnext rather than gst portal	2021-01-05 16:04:25 +05:30
Saqib	a56a5ccefa	refactor: fetch & validate address from erpnext rather than gst portal (#24297)	2021-01-05 15:59:17 +05:30
Marica	ba6e50b15e	Merge branch 'develop' into qi-ux	2021-01-05 15:15:10 +05:30
Anurag Mishra	b864b09d40	Merge branch 'develop' into gratuity	2021-01-05 14:47:38 +05:30
Anurag Mishra	112b3894cc	Merge pull request #24296 from AfshanKhan/fix-add-comp-in-leave-ledger ... fix: set company in leave allocation and leave ledger entry	2021-01-05 14:45:16 +05:30
Marica	eab1867235	Merge branch 'develop' into qi-ux	2021-01-05 14:23:05 +05:30
Anurag Mishra	239fe7336e	fix: charts not displaying when tree_type changed ... fix: charts not displaying when tree_type changed	2021-01-05 14:03:03 +05:30
Saqib	60460a6d23	fix(e-invoicing): minor calculation fixes (#24282)	2021-01-05 13:54:04 +05:30
Saqib	1f591ab02e	fix(e-invoicing): minor calculation fixes (#24285)	2021-01-05 13:53:51 +05:30
Afshan	f79c4d3560	Merge branch 'develop' into fix-add-comp-in-leave-ledger	2021-01-05 13:27:15 +05:30
Jannat Patel	16a809483b	fix: indentation	2021-01-05 12:28:45 +05:30
marination	b8aeb9ea88	fix: Indentation and missing semi-colon ... - Fix incorrect indentation after merge conflict - Sider	2021-01-05 12:16:25 +05:30
Rucha Mahabal	d643bb7c4b	Merge branch 'develop' into allow-discharge	2021-01-05 12:07:26 +05:30
Jannat Patel	06a401ffbf	fix: incoming rate attribute error (#24287) ... Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>	2021-01-05 11:54:34 +05:30
Marica	41ea77ce31	Merge branch 'develop' into putaway	2021-01-05 11:24:05 +05:30
Marica	95344f01e6	Merge branch 'develop' into qi-ux	2021-01-05 10:44:52 +05:30
Jannat Patel	7d0f35c4ab	Merge branch 'develop' into partially-submit-drop-ship-items-issue	2021-01-05 10:42:30 +05:30
Rucha Mahabal	f97e668130	Merge branch 'develop' into allow-discharge	2021-01-05 10:38:16 +05:30
Deepesh Garg	bfa71c23ae	Merge pull request #23965 from vorasmit/remarks-fix-develop ... fix: add remarks to sales invoice	2021-01-05 09:54:53 +05:30
Nabin Hait	72fa368e8f	Merge branch 'develop' into mr-se-warehouse-validation	2021-01-05 09:30:16 +05:30
Nabin Hait	5a8f141eda	Merge branch 'develop' into fix-add-comp-in-leave-ledger	2021-01-05 09:29:44 +05:30
Marica	099162814c	Merge branch 'develop' into qi-ux	2021-01-05 09:27:40 +05:30
Nabin Hait	517fd8b9e6	fix: Ignore customer and supplier while deleting company transactions (#24279) ... * fix: Ignore customer and supplier while deleting company transactions * fix: Test cases fixed based on Travis	2021-01-05 09:23:39 +05:30
Afshan	0da201c6a5	fix: set company in leave allocation and leave ledger entry	2021-01-04 19:04:05 +05:30
marination	0c883853b3	fix: Dont validate warehouse values between MR to Stock Entry ... - Remove validation thta checks if warehouse in Stock Entry is the same as MR that it was pulled from	2021-01-04 18:48:50 +05:30
Anupam	27fd9e4d7d	fix: added empty value in Quality Inspection Reading status	2021-01-04 18:18:00 +05:30
Deepesh Garg	797a742cb2	Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters	2021-01-04 14:24:00 +05:30
Deepesh Garg	a873ae0d9f	fix: Check for custom dimensions	2021-01-04 14:23:31 +05:30
Rucha Mahabal	7206e12c2f	test: Allow Discharge despite Unbilled Services	2021-01-04 12:11:00 +05:30
Rucha Mahabal	03b25be9e9	feat: Allow Discharge despite Unbilled Healthcare Services	2021-01-04 11:16:59 +05:30
marination	7877d5a7c2	fix: Create QI Parameters (links) in test cases	2021-01-04 11:10:04 +05:30
Saurabh	0feaab5261	bumped to version 13.0.0-beta.9	2021-01-02 20:19:56 +05:50
Afshan	a245f667d0	fix: pos error pop up (#24237)	2021-01-02 10:30:22 +05:30
Deepesh Garg	ffca52a348	Merge pull request #24254 from nextchamp-saqib/loan-patch-fix ... fix: update old loan patch	2021-01-01 13:50:52 +05:30
vorasmit	3ef965f253	Update patches.txt	2021-01-01 10:55:20 +05:30
vorasmit	8c39ab68df	Delete update_sales_invoice_remarks.py	2021-01-01 10:54:57 +05:30
Anurag Mishra	b901d4002a	Merge pull request #24264 from AfshanKhan/fix-sal-struc-assign-payroll-acc ... fix: setting correct account for sal struct assignment if not specified.	2020-12-31 18:26:46 +05:30
Afshan	47bc42740b	Merge branch 'develop' into fix-sal-struc-assign-payroll-acc	2020-12-31 17:41:44 +05:30
Afshan	4edcf813e7	Merge branch 'develop' into allow-cancel-leave-policy	2020-12-31 17:41:34 +05:30
Rohit Waghchaure	16bce49f18	fix: incorrect valuation rate for finished good	2020-12-31 17:39:52 +05:30
Anurag Mishra	d7ea2bd705	Merge pull request #24177 from AfshanKhan/fix-perm-empl-sal-slip ... fix: error popup for submitted doc	2020-12-31 17:07:30 +05:30
Afshan	e69148c266	fix: allow leave policy assignment to be cancelled.	2020-12-31 16:45:00 +05:30
Afshan	8b60fe6125	fix: setting correct account for sal struct assignment if not specified.	2020-12-31 16:10:39 +05:30
Saqib	f8f015c961	fix: cannot submit e-invoice if legal name not found	2020-12-31 13:28:08 +05:30
Saqib	2b67d57480	fix: cannot submit e-invoice if legal name not found	2020-12-31 13:26:05 +05:30
Saqib Ansari	d5d571ab9d	fix: update old loan patch	2020-12-31 12:55:35 +05:30
Saurabh	08b89d1ce0	bumped to version 13.0.0-beta.8	2020-12-31 12:12:58 +05:50
Saqib	fc7a11e2aa	fix (e-invoicing): item & invoice value calculation (#24253)	2020-12-31 11:35:46 +05:30
Deepesh Garg	23ab5c5cc0	fix: Multiplle sider issues	2020-12-31 11:29:06 +05:30
Deepesh Garg	133ce286f9	Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters	2020-12-31 11:24:14 +05:30
Deepesh Garg	f57089532a	Merge pull request #24252 from deepeshgarg007/partial_security_unpledge ... fix: Partial loan security unpledging	2020-12-30 21:37:52 +05:30
Mohammad Hasnain Mohsin Rajan	11176852eb	Merge branch 'develop' into bugfix_typo_update	2020-12-30 20:59:38 +05:30
Deepesh Garg	9716216632	fix: check for string types	2020-12-30 20:33:35 +05:30
Deepesh Garg	a60707873c	fix: Partial loan security unpledging	2020-12-30 20:24:15 +05:30
Karthikeyan S	a25cb9a563	fix(GST E Invoice): update live URLs for adaequare GSP (#24251)	2020-12-30 19:41:00 +05:30
Karthikeyan S	aa44c754de	fix(GST E Invoice): update live URLs for adaequare GSP (#24248)	2020-12-30 19:22:37 +05:30
Deepesh Garg	5891b48cf6	Merge pull request #24176 from GangaManoj/Year-to-Date ... feat: Add year_to_date field (cumulative salary for a fiscal year)	2020-12-30 16:53:47 +05:30
rohitwaghchaure	bb0fd33ac5	Merge pull request #24169 from Anurag810/payroll-entry-fixes ... fix: allow addition and removal of employee in payroll Entry	2020-12-30 16:50:02 +05:30
Shivam Mishra	45a56288bb	feat: style adjustments to product page	2020-12-30 15:51:50 +05:30
Shivam Mishra	31a651365d	feat: update item group website slider	2020-12-30 15:51:34 +05:30
Deepesh Garg	66dcaf3ab2	fix: Salary structure assignment in tests	2020-12-30 15:47:22 +05:30
Saqib	f946bbd032	fix: minor e-invoicing issues (#24239) ... * fix: invoice value set to zero if rounded total disabled * fix: unit rate & gross amount calculation * fix: e-invoice-setup patch * chore: no need to re-run the patch * fix: item value & invoice value calculations	2020-12-30 14:43:42 +05:30
Deepesh Garg	97d055dfc3	fix: Test Case	2020-12-30 14:06:13 +05:30
Anurag Mishra	b7631af741	Merge branch 'develop' into payroll-entry-fixes	2020-12-30 13:22:13 +05:30
Deepesh Garg	8b7ebe5044	fix: Test Case cleanup and fixes	2020-12-30 12:45:46 +05:30
Deepesh Garg	20133bd1df	fix: Remove comments	2020-12-29 22:19:12 +05:30
Deepesh Garg	7e4eacba8d	Merge branch 'develop' of https://github.com/frappe/erpnext into Year-to-Date	2020-12-29 22:13:55 +05:30
Deepesh Garg	353f8f4d85	fix: Add test case for YTD	2020-12-29 22:13:40 +05:30
Anurag Mishra	15af7a4afc	Merge pull request #24226 from AfshanKhan/asset-report ... fix: asset depreciation ledger	2020-12-29 18:58:56 +05:30
Deepesh Garg	60b77f9865	Merge branch 'develop' of https://github.com/frappe/erpnext into Year-to-Date	2020-12-29 18:26:32 +05:30
rohitwaghchaure	b09ddc4672	Merge pull request #24233 from rohitwaghchaure/back-dates-allow-field-issue ... fix: option name for the field 'Role Allowed to Create/Edit Back-dated Transactions'	2020-12-29 17:52:43 +05:30
Shivam Mishra	355943c3a0	feat: only show attributes that have an item	2020-12-29 17:46:18 +05:30
Shivam Mishra	2a6c4ec26e	chore: remove dead code	2020-12-29 17:20:12 +05:30
Shivam Mishra	565b178721	feat: use ProductFiltersBuilder in all products page	2020-12-29 17:18:58 +05:30
Shivam Mishra	7055969ef3	feat: update item group template	2020-12-29 17:18:41 +05:30
Shivam Mishra	425bae8bf6	feat: use ProductQuery and ProductFiltersBuilder to build item group page	2020-12-29 17:18:22 +05:30
Shivam Mishra	298608ef40	feat: add product filters generator for item group and all products	2020-12-29 17:17:44 +05:30
Shivam Mishra	ed21350871	fix: page limit filter bug	2020-12-29 17:17:18 +05:30
Shivam Mishra	2dd26f7551	chore: cleanup product query	2020-12-29 17:17:03 +05:30
Shivam Mishra	b06ed4908f	feat: add filter tables in item group	2020-12-29 17:16:29 +05:30
Shivam Mishra	134f6b1b6c	chore: update style rules	2020-12-29 17:16:08 +05:30
Deepesh Garg	ff51540eed	Merge branch 'accounting_dimension_filters' of github.com:deepeshgarg007/erpnext into accounting_dimension_filters	2020-12-29 17:02:07 +05:30
Deepesh Garg	e061004956	fix: Improve validation message	2020-12-29 17:00:39 +05:30
Raffael Meyer	a3462f6b0c	Merge branch 'develop' into validate_regional_germany	2020-12-29 11:58:57 +01:00
Rohit Waghchaure	81285204dc	fix: option name for the field 'Role Allowed to Create/Edit Back-dated Transactions'	2020-12-29 16:25:45 +05:30
Deepesh Garg	4a8c2c4cb5	Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters	2020-12-29 15:10:36 +05:30
Shivam Mishra	aa42886851	fix: template json	2020-12-29 13:28:35 +05:30
Anurag Mishra	dfe8f7601b	Merge branch 'develop' into gratuity	2020-12-29 13:27:03 +05:30
Anurag Mishra	5af8d2b883	Merge branch 'develop' into payroll-entry-fixes	2020-12-29 13:09:42 +05:30
Afshan	91e3c07d77	fix: assest depreciation ledger	2020-12-28 19:42:46 +05:30
marination	a69e81a151	chore: Made 'Parameter' a link field in QI and QI Template ... - Added doctype Quality Inspection Parameter - Made 'Parameter' a link field in QI and QI Template - Added patch to create Quality Inspection Parameter records for every parameter in the system	2020-12-28 18:07:22 +05:30
marination	29a03bd5a1	feat: Add 'Manual Inspection' checkbox ... - fix merge conflict in js file - Dont auto set status if manual inspection is checked - Added 'Manual Inspection' checkbox in QI readings table	2020-12-28 16:59:13 +05:30
pateljannat	88471854d5	fix: sider	2020-12-28 15:40:23 +05:30
rohitwaghchaure	527b7e16e5	Revert "feat: Batch wise item selling pricing"	2020-12-28 15:29:30 +05:30
Marica	62f9cc6c5a	Merge branch 'develop' into qi-ux	2020-12-28 15:09:15 +05:30
rohitwaghchaure	72e8ec5eee	Merge pull request #24087 from deepeshgarg007/batch-wise-pricing ... feat: Batch wise item selling pricing	2020-12-28 14:37:33 +05:30
Rohit Waghchaure	40d2c6a0cc	fix: finished good produced qty validation	2020-12-28 14:08:45 +05:30
pateljannat	aa8ff81061	Merge branch 'project-template-and-tasks' of https://github.com/pateljannat/erpnext into project-template-and-tasks	2020-12-28 12:35:27 +05:30
pateljannat	71f203dbc5	fix: template task status, subject in project template task	2020-12-28 12:35:19 +05:30
Shivam Mishra	c640065a66	feat: cleanup json	2020-12-28 12:16:29 +05:30
Rucha Mahabal	e1b9707ec1	Merge pull request #24152 from ruchamahabal/fix-therapy-type-filter ... fix: filter Therapy Types and Therapy Plan in Patient Appointment	2020-12-28 11:36:34 +05:30
Deepesh Garg	d3814b2676	Merge branch develop into batch-wise-pricing	2020-12-28 10:48:29 +05:30
Jannat Patel	c09100d738	Merge branch 'develop' into partially-submit-drop-ship-items-issue	2020-12-28 10:20:27 +05:30
Deepesh Garg	7c300859ed	fix: Test Cases	2020-12-26 20:14:51 +05:30
Deepesh Garg	d4fc451c2a	Merge pull request #24191 from nextchamp-saqib/accounting-entries-for-asset ... fix: accounting entries of asset when submitting purchase receipt	2020-12-26 19:14:32 +05:30
Saurabh	d1d030b54a	bumped to version 13.0.0-beta.7	2020-12-26 15:15:51 +05:50
Saqib	60a1d25196	fix: cancelling of asset value adjustement (#24193)	2020-12-26 13:01:49 +05:30
rohitwaghchaure	9f1e1f6c23	Merge pull request #24207 from rohitwaghchaure/fixed-serial-no-return-issue ... fix: partial serial no return issue	2020-12-26 12:12:04 +05:30
Deepesh Garg	4f8da4c313	fix: Test Cases	2020-12-26 11:37:51 +05:30
Nabin Hait	af1af925ac	chore: Added change log (#24213)	2020-12-26 11:09:46 +05:30
Saqib	17e96901db	feat: GST E Invoicing (#23455) ... * feat: init e-invoice settings * feat: read public key file * feat: rsa encryption with public key * feat: save token and sek from auth request * chore: handle error response * feat: AES decryption of SEK with appkey * feat: decrypt json data with SEK * feat: make e invoice from erpnext sales invoice * feat: generate IRN * feat: decode signed json and QR code * chore: validations * feat: cancel IRN * feat: complete e-invoice schema * chore: move e-invoice settings to regional * chore: split einvoice settings and operations * chore: rename schema to template & js cleanup * feat: make IRN field on regional setup * feat: Generate & Cancel IRN from Sales Invoice * chore: minor fixes * fix: item discount * chore: show irn cancelled check after cancellation * fix: hide cancel irn dialog on error * fix: public key is required on validate * fix: cannot find attached key file * fix: validation if e invoicing is disabled * fix: do not show generate irn for invalid supply type * fix: update irn_cancelled after cancelling irn * chore: show irn field for proper gst_category * feat: e-way bill details in e-invoice * fix: save e-way bill no on irn generation * chore: no copy on e invoice custom fields * feat: cancel e-way bill before cancelling IRN * feat: manual download / upload json * chore: group e-invoicing actions * fix: fn name * chore: save signed invoice and qrcode after uplaoding irn * fix: fetch token if not valid * chore: move einvoicing stuff to seperate folder * feat: QRCode Image and E-Invoice Print Format * fix: bug * fix: invalid syntax * chore: code cleanup * chore: clean up e invoice actions * fix: download & upload e-invoice * fix: print format * fix: validations * fix: add permissions on regional setup * feat: add patch * fix: validate document name * fix: return date * fix: credit note einvoice * fix: validations * fix: error logging * fix: e_invoice module not found * fix: add missing package * fix: rename e_invoice_utils.py * fix: einvoice field validation * fix: patch * fix: invoice totals calculation * fix: other charges calculation * chore: improve document name validation message * fix: qr code image string * feat: initialize GSP connector * chore: remove unwanted fields * fix: qr code generation * feat: fetch and cache GSTIN details * feat: generate & cancel IRN * feat: cancel eway bill * chore: remove unwanted fuctions * chore: clean up einvoice actions * fix: attach qrcode on irn generation * fix: generate & cancel IRN * fix: show/hide eway bill fields * fix: valiations * feat: generate eway bill from IRN * chore: remove unwanted imports * chore: error logging * feat: header & footer in GST E Invoice * chore: remove test pincode * fix: invalid syntax * feat: cess non advolem on einvoice item * chore: remove fetch token from e invocie settings * fix: imports * fix: error handling * feat: update timeline on einvoice actions * fix: qrcode image size * fix: exclude intra company transactions * fix: eway bill test * fix: ewaybill mandatory conditions * chore: add tests * fix: returning condition * feat: log e-invocing requests * chore: add ack date and ack no field for print formats * fix: sider issues * feat: show e-invoice preview before IRN generation * fix: use as_list for error message * fix: minor ux issues * fix: dialog is undefined * fix: error handling * feat: add docs link to e invoice settings * feat: multiple gstins for e invoicing * fix: uncomment test condition * fix: remove test pincode * fix: cannot cancel irn without submitting sales invoice * chore: code cleanup * fix: sider issues * fix: e invoice request log permissions Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-12-25 20:55:21 +05:30
Nabin Hait	0788df412c	fix: Removed permissions from UAE VAT Settings	2020-12-25 20:54:01 +05:30
Nabin Hait	f8c1cb5dc3	fix: Removed permissions from UAE VAT Settings	2020-12-25 20:53:18 +05:30
Deepesh Garg	5269f02919	Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency	2020-12-25 18:35:26 +05:30
Deepesh Garg	bfc17e487c	fix: Commonify code for Stock Entry	2020-12-25 18:34:39 +05:30
rohitwaghchaure	49d7499990	fix: added shipment link in delivery note dashboard (#24210) ... * fix: added shipment link in delivery note dashboard * Update shipment.py	2020-12-25 18:15:35 +05:30
rohitwaghchaure	0917c1ec7c	fix: travis failing (#24211)	2020-12-25 18:13:12 +05:30
Nabin Hait	b99c77b753	Reposting fixes (#24202) ... * fix: finished item validation and rate * fix: Check if stock and account balance in sync after reposting * fix: validate stock accounts in journal entry * fix: validate expense against budget	2020-12-25 18:12:35 +05:30
Nabin Hait	327f03566a	Reposting fixes pre release (#24203) ... * fix: finished item validation and rate * fix: Check if stock and account balance in sync after reposting * fix: validate stock accounts in journal entry * fix: validate expense against budget	2020-12-25 18:11:54 +05:30
hasnain2808@gmail.com	46d5f4c7f1	refactor(analytics report): linting	2020-12-25 16:34:43 +05:30
rohitwaghchaure	fa0a075e95	Merge pull request #24196 from scmmishra/fix-file-url-employee ... fix: use file_url to save file and not file name	2020-12-25 16:22:15 +05:30
rohitwaghchaure	ebcd4c454e	Merge pull request #24209 from rohitwaghchaure/added-shipment-link-in-delivery-note ... fix: added shipment link in delivery note dashboard	2020-12-25 16:07:35 +05:30
Rohit Waghchaure	dab1ab990d	fix: partial serial no return issue	2020-12-25 15:25:16 +05:30
rohitwaghchaure	de10d7dcf2	Update shipment.py	2020-12-25 15:15:55 +05:30
Rohit Waghchaure	5bcc6c6b15	fix: added shipment link in delivery note dashboard	2020-12-25 15:02:53 +05:30
rohitwaghchaure	fc01a838b5	Merge pull request #24208 from rohitwaghchaure/fixed-serial-no-return-issue-v13 ... fix: partial serial no return issue	2020-12-25 13:32:36 +05:30
Rohit Waghchaure	adc369f726	fix: partial serial no return issue	2020-12-25 13:28:47 +05:30
Saqib	6d74f5b59b	feat: GST E Invoicing (#23455) ... * feat: init e-invoice settings * feat: read public key file * feat: rsa encryption with public key * feat: save token and sek from auth request * chore: handle error response * feat: AES decryption of SEK with appkey * feat: decrypt json data with SEK * feat: make e invoice from erpnext sales invoice * feat: generate IRN * feat: decode signed json and QR code * chore: validations * feat: cancel IRN * feat: complete e-invoice schema * chore: move e-invoice settings to regional * chore: split einvoice settings and operations * chore: rename schema to template & js cleanup * feat: make IRN field on regional setup * feat: Generate & Cancel IRN from Sales Invoice * chore: minor fixes * fix: item discount * chore: show irn cancelled check after cancellation * fix: hide cancel irn dialog on error * fix: public key is required on validate * fix: cannot find attached key file * fix: validation if e invoicing is disabled * fix: do not show generate irn for invalid supply type * fix: update irn_cancelled after cancelling irn * chore: show irn field for proper gst_category * feat: e-way bill details in e-invoice * fix: save e-way bill no on irn generation * chore: no copy on e invoice custom fields * feat: cancel e-way bill before cancelling IRN * feat: manual download / upload json * chore: group e-invoicing actions * fix: fn name * chore: save signed invoice and qrcode after uplaoding irn * fix: fetch token if not valid * chore: move einvoicing stuff to seperate folder * feat: QRCode Image and E-Invoice Print Format * fix: bug * fix: invalid syntax * chore: code cleanup * chore: clean up e invoice actions * fix: download & upload e-invoice * fix: print format * fix: validations * fix: add permissions on regional setup * feat: add patch * fix: validate document name * fix: return date * fix: credit note einvoice * fix: validations * fix: error logging * fix: e_invoice module not found * fix: add missing package * fix: rename e_invoice_utils.py * fix: einvoice field validation * fix: patch * fix: invoice totals calculation * fix: other charges calculation * chore: improve document name validation message * fix: qr code image string * feat: initialize GSP connector * chore: remove unwanted fields * fix: qr code generation * feat: fetch and cache GSTIN details * feat: generate & cancel IRN * feat: cancel eway bill * chore: remove unwanted fuctions * chore: clean up einvoice actions * fix: attach qrcode on irn generation * fix: generate & cancel IRN * fix: show/hide eway bill fields * fix: valiations * feat: generate eway bill from IRN * chore: remove unwanted imports * chore: error logging * feat: header & footer in GST E Invoice * chore: remove test pincode * fix: invalid syntax * feat: cess non advolem on einvoice item * chore: remove fetch token from e invocie settings * fix: imports * fix: error handling * feat: update timeline on einvoice actions * fix: qrcode image size * fix: exclude intra company transactions * fix: eway bill test * fix: ewaybill mandatory conditions * chore: add tests * fix: returning condition * feat: log e-invocing requests * chore: add ack date and ack no field for print formats * fix: sider issues * feat: show e-invoice preview before IRN generation * fix: use as_list for error message * fix: minor ux issues * fix: dialog is undefined * fix: error handling * feat: add docs link to e invoice settings * feat: multiple gstins for e invoicing * fix: uncomment test condition * fix: remove test pincode * fix: cannot cancel irn without submitting sales invoice * chore: code cleanup * fix: sider issues * fix: e invoice request log permissions Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-12-25 10:26:43 +05:30
rohitwaghchaure	4e9361f74b	Merge pull request #24204 from rohitwaghchaure/pricing-rule-not-working-margin ... fix: multiple pricing rule with margin type as Percentage is not working	2020-12-25 09:33:39 +05:30
Rohit Waghchaure	ba5b603a0b	fix: multiple pricing rule with margin type not working	2020-12-24 22:49:38 +05:30
Rohit Waghchaure	aea62da544	fix: multiple pricing rule with margin type not working	2020-12-24 22:44:31 +05:30
Shivam Mishra	c54aca3f44	chore: cleanup comments	2020-12-24 18:02:50 +05:30
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	9fe7f235d0	fix: Do not cancel reference document on Quality Inspection cancellation (#24198)	2020-12-24 11:03:48 +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
Anurag Mishra	3278d02cd2	fix: sider	2020-12-23 18:07:54 +05:30
Anurag Mishra	1446749b63	fix: changes requested	2020-12-23 18:07:54 +05:30
Nabin Hait	eb065d6d40	fix: fixed gl entries	2020-12-23 18:07:54 +05:30
Nabin Hait	4da7a15ac0	fix: Fixed typo	2020-12-23 18:07:54 +05:30
Anurag Mishra	b71611dd3d	feat: Added Form dashboard	2020-12-23 18:07:54 +05:30
Anurag Mishra	4cc333996c	fix: test	2020-12-23 18:07:54 +05:30
Anurag Mishra	ba6ff6e227	fix: conflict	2020-12-23 18:07:53 +05:30
Anurag Mishra	708065cb85	fix: test cases	2020-12-23 18:07:53 +05:30
Anurag Mishra	af9f172be8	fix: requested changes and sider	2020-12-23 18:07:53 +05:30
Anurag Mishra	66b697cd05	feat: fix test for Gratuity	2020-12-23 18:07:53 +05:30
Anurag Mishra	550e60a69d	feat: fix test for Gratuity	2020-12-23 18:07:53 +05:30
Anurag Mishra	b88af3a3f7	feat: Accrural Entry for Gratuity beafore Payment	2020-12-23 18:07:53 +05:30
Anurag Mishra	78fdd5d9b4	fix: update status on salary Slip submission	2020-12-23 18:07:53 +05:30
Anurag Mishra	46e1c09b45	style: Broken into smaller function	2020-12-23 18:07:53 +05:30
Anurag Mishra	4d6c3c9449	Fix: Changes Requested, Sider, codacy, Transalation	2020-12-23 18:07:53 +05:30
Anurag Mishra	493eea19e8	feat: added link from desk page and some minor fixes	2020-12-23 18:07:53 +05:30
Anurag Mishra	25c356894d	test: gratuity	2020-12-23 18:07:53 +05:30
Anurag Mishra	f63df91186	patch: to create standard Gratuity Rule for india and UAE	2020-12-23 18:07:53 +05:30
Anurag Mishra	e1464a7bf0	feat: Indian Standard Gratuity Rule	2020-12-23 18:07:06 +05:30
Anurag Mishra	34a7250a2d	fix: Some enhancements and better validation	2020-12-23 18:07:06 +05:30
Anurag Mishra	0761301c2e	feat: Added all 3 standard slab for UAE	2020-12-23 18:07:06 +05:30
Anurag Mishra	47f3a3a5bd	feat: validation for if no slab found	2020-12-23 18:07:06 +05:30
Anurag Mishra	6f1538026a	feat: added minimum year for gratuity and condition utilisation	2020-12-23 18:07:06 +05:30
Anurag Mishra	30299c6f49	feat: validating and ordeing the rule slabr	2020-12-23 18:07:06 +05:30
Anurag Mishra	dedc0015c0	feat(HR): Working day calulation based on attendance or Leave	2020-12-23 18:07:06 +05:30
Anurag Mishra	49b326fc08	feat(HR): Gratuity Payment	2020-12-23 18:07:05 +05:30
Anurag Mishra	fc2cb3a85e	Feat: gratuity	2020-12-23 18:07:05 +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
Afshan	adf9b49e14	fix: sal slip popup error	2020-12-23 11:39:38 +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	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
Shivam Mishra	e40926b4cc	fix: don't use primary action for create	2020-12-22 11:17:14 +05:30
Shivam Mishra	09c8aaa87a	feat: add slider template	2020-12-22 11:17:14 +05:30
Shivam Mishra	fa102e4713	feat: add templates for online store	2020-12-22 11:17:14 +05:30
Anurag Mishra	0a1390a7ca	fix: leave policy dashboard fix and roles (#24170)	2020-12-22 11:16:36 +05:30
Ganga Manoj	090783804b	fix: Improve month_to_date computation	2020-12-21 23:52:05 +05:30
Ganga Manoj	c36cab81f2	fix: Update year_to_date and month_to_date field labels to show company currency	2020-12-21 23:46:02 +05:30
pateljannat	9466e42e70	fix: change request modifications	2020-12-21 20:52:20 +05:30
Nabin Hait	bd4bdca6ad	feat: Repost item costing (#24183) ... * Repost item valuation (#24031) * feat: Reposting logic for future finished/transferred item * feat: added fields to identify needs to recalculate rate while reposting * refactor: Set rate for outgoing and finished items * refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item * refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item * refactor: Get outgoing rate for purchase return * refactor: Get incoming rate for sales return * test: Added tests for reposting valuation of transferred/finished/returned items * feat: added incoming rate field in DN, SI and Packed Item table * feat: get incoming rate for returned item * fix: no error while getting valuation rate in stock entry * fix: update stock ledger for DN and SI * feat: update item valuation rate in PR and PI based on supplied items cost * feat: SLE reposting logic for sales return and subcontracted item with test cases * feat: update qty in future sle * feat: repost future sle and gle via Repost Item Valuation * fix: Skip unwanted function calling while reposting * fix: repost sle for specific item and warehouse * test: Modified tests for backdated stock reco * fix: ignore cancelled sle in few methods * feat: role allowed to do backdated entry * feat: Show reposting status on stock valuation related reports * fix: minor fixes * fix: fixed sider issues * fix: serial no fix related to immutable ledger * fix: Test cases fixes related to perpetual inventory * fix: Test cases fixed * fix: Fixed reposting on cancel and test cases * feat: Restart reposting item valuation * refactor: Code cleanup using small functions and test case fixes * fix: minor fixes * fix: Raise on error while reposting item valuation * fix: minor fix * fix: Tests fixed * fix: skip some validation ig gle made from reposting * fix: test fixes * fix: debugging stock and account validation * fix: debugging stock and account validation * fix: debugging travis for stock and account sync validation * fix: debugging travis * fix: debugging travis * fix: debugging travis * fix: removed duplicate field from pos profile	2020-12-21 20:03:59 +05:30
Nabin Hait	a77b8c9fcc	Repost item valuation (#24031) ... * feat: Reposting logic for future finished/transferred item * feat: added fields to identify needs to recalculate rate while reposting * refactor: Set rate for outgoing and finished items * refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item * refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item * refactor: Get outgoing rate for purchase return * refactor: Get incoming rate for sales return * test: Added tests for reposting valuation of transferred/finished/returned items * feat: added incoming rate field in DN, SI and Packed Item table * feat: get incoming rate for returned item * fix: no error while getting valuation rate in stock entry * fix: update stock ledger for DN and SI * feat: update item valuation rate in PR and PI based on supplied items cost * feat: SLE reposting logic for sales return and subcontracted item with test cases * feat: update qty in future sle * feat: repost future sle and gle via Repost Item Valuation * fix: Skip unwanted function calling while reposting * fix: repost sle for specific item and warehouse * test: Modified tests for backdated stock reco * fix: ignore cancelled sle in few methods * feat: role allowed to do backdated entry * feat: Show reposting status on stock valuation related reports * fix: minor fixes * fix: fixed sider issues * fix: serial no fix related to immutable ledger * fix: Test cases fixes related to perpetual inventory * fix: Test cases fixed * fix: Fixed reposting on cancel and test cases * feat: Restart reposting item valuation * refactor: Code cleanup using small functions and test case fixes * fix: minor fixes * fix: Raise on error while reposting item valuation * fix: minor fix * fix: Tests fixed * fix: skip some validation ig gle made from reposting * fix: test fixes * fix: debugging stock and account validation * fix: debugging stock and account validation * fix: debugging travis for stock and account sync validation * fix: debugging travis * fix: debugging travis * fix: debugging travis	2020-12-21 14:45:50 +05:30
marination	eae31f02cc	fix: Sider (missing semi-colons)	2020-12-21 13:58:44 +05:30
Shivam Mishra	0e222173ea	fix: don't set primary action if workflow is set	2020-12-21 13:44:03 +05:30
marination	68f91c9640	chore: Added tests for new ux ... - Test for value based inspection - tweaks in test for formula based inspection - tweaks in create_quality_inspection as status in child row is auto set now	2020-12-21 12:24:45 +05:30
marination	0c4f97368d	chore: UX improvement ... - Removed 'single reading' checkbox, unnecessary - Removed 'Mean' field and added computed mean to formula data - Changed 'Value Based' to 'Non-Numeric' - Re-arranged fields	2020-12-21 11:44:48 +05:30
Ganga Manoj	ddd9fe49fc	feat: Add month_to_date field	2020-12-18 23:58:05 +05:30
Ganga Manoj	59fbf702da	feat: Compute month_to_date	2020-12-18 23:52:11 +05:30
Ganga Manoj	1b1df6b6bc	feat: Add month_to_date field	2020-12-18 23:51:05 +05:30
marination	d6277cdc7f	feat: Value Based and Numeric Quality Inspection ... - Acceptance Formula is optional - Choose between Value based and Numeric QI - If numeric, select single or multiple readings - Added Min, Max and Mean Values for numeric inspection to avoid formula usage - Deprecated code cleanup in js file	2020-12-18 21:37:19 +05:30
Ganga Manoj	89a02d7d3f	feat: Changed Fiscal Year to Payroll Period	2020-12-18 15:31:45 +05:30
Rushabh Mehta	2cd41bca06	fix(routes): desk to app	2020-12-18 13:17:58 +05:30
Afshan	a81519f557	fix: error popup for submitted doc	2020-12-18 11:16:01 +05:30
Ganga Manoj	9f1e018e4f	feat: Compute year_to_date	2020-12-18 01:35:27 +05:30
Ganga Manoj	04f48a011d	feat: Add year_to_date field	2020-12-18 01:31:00 +05:30
pateljannat	b8e656512e	fix: test cleanup	2020-12-17 20:22:06 +05:30
Deepesh Garg	e77e3aa36d	fix: Typo in tax category doctype query	2020-12-17 18:49:58 +05:30
Deepesh Garg	b074334dcf	fix: Typo in tax category doctype query	2020-12-17 18:46:59 +05:30
pateljannat	79b71462cb	fix: patch	2020-12-17 18:21:34 +05:30
Deepesh Garg	5a06908bbc	fix: Add breadccrumbs to item group page	2020-12-17 17:38:53 +05:30
pateljannat	09f0e9111d	fix: patch	2020-12-17 17:20:21 +05:30
Anurag Mishra	611b42733b	fix: leave policy dashboard fix and roles	2020-12-17 16:34:15 +05:30
Anurag Mishra	5e8e0037d6	Merge branch 'develop' into do-not-manufacture-same-serial-no-two-develop	2020-12-17 16:01:42 +05:30
Anurag Mishra	7e641f457c	Merge pull request #24166 from scmmishra/appointment-fix ... fix: wrap assignees in a list	2020-12-17 16:00:48 +05:30
pateljannat	2dbb1d6bc7	fix: indentation	2020-12-17 15:49:52 +05:30
Shivam Mishra	1872e2c1ac	fix: wrap assignees in a list	2020-12-17 14:29:52 +05:30
Deepesh Garg	5432ee3364	Merge pull request #24095 from frappe/skr04_equity_dev ... feat: separate equity tree in CoA SKR04	2020-12-17 12:37:28 +05:30
Deepesh Garg	51892efd60	fix: Translation issues	2020-12-17 12:35:22 +05:30
Deepesh Garg	f48296ddf0	Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency	2020-12-17 12:20:16 +05:30
Deepesh Garg	6f99c0850c	fix: Linting Issues	2020-12-17 12:19:58 +05:30
pateljannat	2f4c88b228	Merge branch 'project-template-and-tasks' of https://github.com/pateljannat/erpnext into project-template-and-tasks	2020-12-17 11:56:06 +05:30
pateljannat	f2bff8e220	fix: patch relaod doctype	2020-12-17 11:54:59 +05:30
Deepesh Garg	d6cd02d29d	fix: Add tests	2020-12-17 09:21:24 +05:30
Deepesh Garg	5a2030c2f2	fix: Add server side methods and other fixes	2020-12-17 09:21:11 +05:30
Rucha Mahabal	f1854f9196	Merge branch 'develop' into fix-therapy-type-filter	2020-12-17 08:46:39 +05:30
Rohit Waghchaure	c9f63accdd	fix: do not manufacture same serial no multiple times	2020-12-17 00:18:17 +05:30
Deepesh Garg	a9db5a200f	Merge pull request #24160 from deepeshgarg007/tax_template_update_customer_v13 ... fix: Tax template update on customer address change	2020-12-16 21:51:01 +05:30
Suraj Shetty	70cfc4df15	fix: Remove dashboard page from home	2020-12-16 20:55:47 +05:30
Deepesh Garg	ad59726f20	fix: Tax template update on customer address change	2020-12-16 20:51:59 +05:30
Jannat Patel	28098d6f93	Merge branch 'develop' into project-template-and-tasks	2020-12-16 20:09:27 +05:30
Rucha Mahabal	21168eab7f	fix: Remove patch for setting next date in Subscription (#24158)	2020-12-16 19:39:34 +05:30
pateljannat	2528d5ee15	fix: tests	2020-12-16 18:29:49 +05:30
Rucha Mahabal	23d6afe43a	fix: Auto Repeat Import (#24157)	2020-12-16 18:21:08 +05:30
Prssanna Desai	230bc1f2d8	Merge pull request #24155 from prssanna/job-card-gantt-version-13 ... fix: override field_map for job card gantt	2020-12-16 17:02:34 +05:30
prssanna	6273d3ada6	fix: override field_map for job card gantt	2020-12-16 17:01:20 +05:30
Prssanna Desai	421bfee874	Merge branch 'develop' into job-card-gantt-v13	2020-12-16 16:59:50 +05:30
prssanna	ff59f18012	fix: override field_map for job card gantt	2020-12-16 16:56:30 +05:30
pateljannat	d44f45c57b	fix: sider issues	2020-12-16 16:28:09 +05:30
hasnain2808@gmail.com	2da0035a0f	Merge branch 'develop' into fix-analytics-reports	2020-12-16 16:14:23 +05:30
Rucha Mahabal	f2a431d866	fix: filter Therapy Types and Therapy Plan in Patient Appointment	2020-12-16 16:09:58 +05:30
Rucha Mahabal	5a8a52b9c6	fix: Therapy Type and Therapy Plan field visibility in Patient Appointment	2020-12-16 15:54:06 +05:30
Deepesh Garg	924f99bead	fix: Help message	2020-12-16 15:42:50 +05:30
Deepesh Garg	4638f604ed	Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters	2020-12-16 14:59:30 +05:30
Rucha Mahabal	b184d43e75	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-16 14:51:42 +05:30
hasnain2808@gmail.com	9962ba86d0	fix: charts not displaying when tree_type changed	2020-12-16 14:41:04 +05:30
Your Name	3ebe511eb9	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-12-16 08:19:47 +00:00
pateljannat	87b477a311	feat: patch for project template tasks	2020-12-16 13:37:21 +05:30
Shivam Mishra	fd044b032f	Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into desk-enhancements	2020-12-16 13:21:10 +05:30
Deepesh Garg	bc462fa140	Merge pull request #24146 from deepeshgarg007/tax_template_update_customer ... fix: Tax template update on customer address change	2020-12-16 13:02:00 +05:30
Deepesh Garg	96a5e4effa	fix: Tax template update on customer address change	2020-12-16 13:00:55 +05:30
Rucha Mahabal	02ebc9a11e	Merge branch 'develop' into patient-history-enhancements	2020-12-16 12:51:45 +05:30
Rushabh Mehta	34fc528500	fix(minor): debounce taxes call	2020-12-16 09:44:11 +05:30
Leela vadlamudi	29778e2fba	feat: Voice Call Settings doctype added (#24126)	2020-12-15 21:23:17 +05:30
Mohammad Hasnain Mohsin Rajan	c553453825	fix: user is not a field (#24129)	2020-12-15 16:29:10 +05:30
Saqib Ansari	d050816e17	fix: overflow of customer selector	2020-12-15 12:02:26 +05:30
pateljannat	a6fef7ae6b	feat: parent-child relation tasks	2020-12-15 11:50:18 +05:30
pateljannat	caf67e608f	fix: tests	2020-12-15 10:00:31 +05:30
pateljannat	23f0debf88	fix: tests	2020-12-15 10:00:21 +05:30
Rucha Mahabal	85213fa8cb	fix(Asset): set current asset value before calculating difference amount (#24119)	2020-12-15 09:32:02 +05:30
Afshan	89d14fdf68	fix: minor ui changes (#24125) ... * fix: minor ui changes * fix: slider	2020-12-15 09:31:30 +05:30
Afshan	58e8e06ab7	fix: retention filters (#24123) ... * fix: retention filters * fix: slider	2020-12-15 09:17:17 +05:30
Afshan	e64718b2ae	fix: selecting salary component (#24121)	2020-12-15 09:16:27 +05:30
Nabin Hait	13dc63499a	Merge branch 'develop' into version-13-beta-pre-release	2020-12-15 09:06:27 +05:30
Deepesh Garg	46f3c65b00	feat: Multi currency in landed cost voucher	2020-12-14 23:09:19 +05:30
pateljannat	f9751f1f95	feat: project template having dependent tasks	2020-12-14 16:20:02 +05:30
Marica	406af27b9e	Merge branch 'develop' into putaway	2020-12-14 13:07:50 +05:30
Anurag Mishra	0fc4bb02d1	Merge pull request #24100 from hasnain2808/add-fb-to-je ... fix(asset_val_adj): finance book not getting added in journal Entry of asset value adjustment	2020-12-14 12:36:03 +05:30
marination	c47d38dc18	chore: Stock Entry Tests and fixes ... - Maintain item-warehouse wise rules for Stock Entry Material Transfer - Test cases for Stock Entry with more use cases - Sider fixes	2020-12-14 12:12:49 +05:30
Deepesh Garg	05e8479521	Merge pull request #24117 from deepeshgarg007/gstr_opening_invoices ... fix: Opening invoices in GSTR-1 report	2020-12-14 11:14:23 +05:30
Mohammad Hasnain Mohsin Rajan	b59d573009	Merge branch 'develop' into add-fb-to-je	2020-12-14 11:13:46 +05:30
Deepesh Garg	c838682188	fix: Opening invoices in GSTR-1 report	2020-12-14 10:35:16 +05:30
Suraj Shetty	f2511c84b5	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-12-14 09:05:48 +05:30
rohitwaghchaure	cf5f895617	Merge pull request #24110 from marination/status-updater-same-source-target-tables ... fix: Same source and target tables in Status Updater's update query	2020-12-13 21:29:19 +05:30
rohitwaghchaure	d06ac9a958	Merge pull request #24114 from rohitwaghchaure/shipping-charges-not-added-in-invoice-develop ... fix: shipping chanrges not sync in erpnext from shopify	2020-12-13 13:31:39 +05:30
rohitwaghchaure	8b8ef8d364	Merge pull request #24116 from rohitwaghchaure/fixed-stock-entry-multi-consumption-develop ... fix: incorrect stock quantity if 'Allow Multiple Material Consumption…	2020-12-13 13:31:25 +05:30
rohitwaghchaure	e5e6d8297b	Merge pull request #24115 from rohitwaghchaure/delete-receive-at-warehouse-entry-develop ... fix: delete Receive at Warehouse entry on cancellation of Send to War…	2020-12-13 12:33:50 +05:30
Nabin Hait	3423d94145	fix: Fixed merge conflict	2020-12-12 21:12:56 +05:30
Deepesh Garg	ced3b13492	fix: Check for paid field	2020-12-12 19:31:05 +05:30
Deepesh Garg	68fce6d029	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_fix	2020-12-12 19:28:50 +05:30
Rohit Waghchaure	edb99d4e53	fix: incorrect stock quantity if 'Allow Multiple Material Consumption' has enabled	2020-12-12 16:03:07 +05:30
Rohit Waghchaure	5bfd6831c4	fix: delete Receive at Warehouse entry on cancellation of Send to Warehouse entry	2020-12-12 16:00:28 +05:30
Rohit Waghchaure	67dfe5db0d	fix: shipping chanrges not sync in erpnext from shopify	2020-12-12 15:59:17 +05:30
Deepesh Garg	f17ea2ccab	fix: Accounting for internal transfer invoices within same company (#24021) ... * fix: Accounting for internal transfer invoices within same company * fix: warehouse fetching * fix: Linting issues * fix: GL entry fixes and validation for intercompany account * fix: Account naming changes and other fixes * fix: Add test for internal transfer * fix: Test Case * fix: Add description for fields * fix: Commonfied code * fix: Map warehouse and serial no	2020-12-11 21:30:39 +05:30
Rohit Waghchaure	3eea3c6c95	fix: Table 'tabStock Entry Detail' is specified twice	2020-12-11 18:45:39 +05:30
Mohammad Hasnain Mohsin Rajan	f8d6726990	fix(acc recv report): columns mismatch (#24109) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-12-11 13:28:23 +05:30
Suraj Shetty	ada5facdf5	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-12-11 12:57:49 +05:30
Suraj Shetty	dc13d4b0fc	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-12-11 12:57:04 +05:30
Jannat Patel	79fe7758d4	Merge branch 'develop' into partially-submit-drop-ship-items-issue	2020-12-11 11:57:09 +05:30
pateljannat	06961a261e	fix: conflicts	2020-12-11 11:46:43 +05:30
pateljannat	fa72671929	fix: partial order for drop ship	2020-12-11 11:16:54 +05:30
Mohammad Hasnain Mohsin Rajan	f60e303ac7	Merge branch 'develop' into add-fb-to-je	2020-12-11 09:35:36 +05:30
Suraj Shetty	c9209237da	fix: Progress bar style	2020-12-10 22:45:27 +05:30
pateljannat	6574404536	Merge branch 'project-template-and-tasks' of https://github.com/pateljannat/erpnext into project-template-and-tasks	2020-12-10 20:55:40 +05:30
pateljannat	e15ef1e19f	fix: corrected tests	2020-12-10 20:55:25 +05:30
Marica	d857d70a96	Merge branch 'develop' into stock-entry-for-medication-entries	2020-12-10 20:44:10 +05:30
Marica	3bc69e59ec	Merge branch 'develop' into update-barcode-if-scan-barcode-used	2020-12-10 18:05:00 +05:30
Mohammad Hasnain Mohsin Rajan	8abe7b91fe	fix: linting ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-12-10 17:48:22 +05:30
Mohammad Hasnain Mohsin Rajan	ce1ca28296	fix: linting ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-12-10 17:48:05 +05:30
Anurag Mishra	fcf0a733ac	Merge branch 'develop' into add-fb-to-je	2020-12-10 17:30:38 +05:30
Saqib	7acb42d6df	feat(POS): hide images & auto add item checkbox (#24102)	2020-12-10 16:22:01 +05:30
Deepesh Garg	009721a3b2	Merge pull request #24035 from nextchamp-saqib/abs-value-in-pf ... fix: get formatted value in 'taxes' print template	2020-12-10 15:33:41 +05:30
Raffael Meyer	7f387452ca	Merge branch 'develop' into skr04_equity_dev	2020-12-10 10:51:55 +01:00
Mohammad Hasnain	f82997e3c3	fix(asset_val_adj): fb not getting added in je	2020-12-10 13:34:01 +05:30
Rushabh Mehta	39154e5296	fix(minor): add debounce to calls	2020-12-10 12:37:16 +05:30
Saqib	dc3e9f4216	fix: asset with value zero doesn't show up in fixed asset register (#24091)	2020-12-10 12:30:15 +05:30
barredterra	52d37edf98	feat: separate equity tree in CoA SKR04	2020-12-09 17:57:29 +01:00
Deepesh Garg	6e58260d26	Merge pull request #24082 from ruchamahabal/fix-item-details-in-reports ... feat(reports): get item details from Item document instead of the Transactions	2020-12-09 18:28:28 +05:30
Deepesh Garg	249595a2d8	fix: Sider Issues	2020-12-09 18:13:23 +05:30
Jannat Patel	ad705d04a7	Merge branch 'develop' into project-template-and-tasks	2020-12-09 18:12:25 +05:30
Marica	4efbee57f3	Merge branch 'develop' into cont-temp	2020-12-09 17:33:26 +05:30
pateljannat	f936e8a334	fix: sider issues fixed	2020-12-09 17:09:22 +05:30
marination	a5d8d32775	chore: Test and fixes ... - Tests as per new design flow - Fixed duplicate data bug in Warehouse Capacity Summary - Set Amount currently on applying rule in client side - Apply rules on server side before validate	2020-12-09 16:27:18 +05:30
Deepesh Garg	c41fb7556b	fix: Add test case for batch pricing	2020-12-09 15:55:39 +05:30
pateljannat	811629a961	feat: tasks in project template and tests	2020-12-09 15:52:05 +05:30
Deepesh Garg	bc0a2859e4	fix: Rate for items with no batch	2020-12-09 12:40:09 +05:30
Mohammad Hasnain Mohsin Rajan	deaf2e80cb	fix: linting	2020-12-09 12:36:14 +05:30
Mohammad Hasnain	69514c4761	fix: scan barcode does not update barcode item field in sales order	2020-12-09 12:10:28 +05:30
Deepesh Garg	91e1136d2c	feat: Batch wise item pricing	2020-12-08 22:53:03 +05:30
marination	0f3cfc502b	feat: Trigger rule application from client side ... - Table is reset and overwritten with applied rules on checkbox trigger - Sider fixes	2020-12-08 19:44:29 +05:30
Rushabh Mehta	fec8dba16c	fix(merge): merge develop	2020-12-08 16:23:09 +05:30
rohitwaghchaure	08d57e3530	Merge pull request #24074 from hasnain2808/required-qty-multiplying-fix ... fix(Production Planning Report): incorrect required_qty	2020-12-08 12:52:12 +05:30
Rucha Mahabal	fa950662b9	fix: import statement	2020-12-08 12:32:19 +05:30
Rucha Mahabal	db0bbfac97	feat(reports): get item details from Item doctype instead of the Transaction	2020-12-08 12:20:07 +05:30
Marica	0b68243979	Merge branch 'develop' into putaway	2020-12-08 11:44:00 +05:30
Mohammad Hasnain	59dffb96b3	fix(Production Planning): incorrect required qty	2020-12-08 11:13:00 +05:30
pateljannat	c82b52855c	fix: template filter for tasks	2020-12-08 11:07:59 +05:30
Afshan	727b2f9b97	fix: throw an error when no pos profile exist (#24025) ... * fix: throw an error when no pos profile exist * fix: throw an error when no pos profile exist * fix: test cases * fix: tests * fix: test * fix: space as indent * fix: travis	2020-12-08 09:45:19 +05:30
Walstan Baptista	0baebbdafe	fix: added Purchase Order to Global Search (#24055)	2020-12-08 09:43:29 +05:30
Anuja Pawar	d369710c65	fix: fixed home desk page (#24075) ... * fix: fixed home desk page * fix: suggested changes Co-authored-by: Marica <maricadsouza221197@gmail.com> * fix: suggested changes Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-12-08 09:40:08 +05:30
Jannat Patel	797f0cfa61	fix: sales invoice add button from sales order dashboard (#24077) ... Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>	2020-12-08 09:33:13 +05:30
Afshan	749d36a4dd	fix: double exception in payroll (#24078)	2020-12-08 09:32:04 +05:30
Afshan	01eca12fa7	fix: overriding po (#24022) ... * fix: overriding po * fix: po * fix: refactor condition * fix: condition * fix: missing code	2020-12-08 09:27:56 +05:30
marination	fac4035f23	feat: Apply Putaway Rules within transaction itself ... - Added checkbox 'Apply Putaway Rule' in PR and SE - Added link to rule in child tables - Rule is applied on Save - Validation for over receipt - Apply Rule on Stock Entry as well for Material Transfer and Receipt	2020-12-07 21:35:49 +05:30
pateljannat	71b1a0ca7d	fix: cancelling both test po created	2020-12-07 19:09:29 +05:30
pateljannat	32e77d73cf	fix: added supplier to second item in test	2020-12-07 17:39:37 +05:30
pateljannat	89624ad622	fix: sider issue fixed	2020-12-07 16:50:03 +05:30
pateljannat	5597e386b4	fix: added test for drop ship partial order	2020-12-07 15:53:45 +05:30
pateljannat	c32ac223ed	feat: adding task field in project template	2020-12-07 14:53:15 +05:30
Marica	654a71e35a	Merge pull request #24065 from Anuja-pawar/company_fiscal_year_fix ... fix: Added TDS Payable account number and an error message	2020-12-07 13:21:18 +05:30
Marica	724d03ec68	Merge branch 'develop' into fix-si-pos-return	2020-12-07 12:01:19 +05:30
Kenneth Sequeira	85af44b7ed	fix: client side UX fixes	2020-12-07 11:18:20 +05:30
Anuja P	550cb9c78f	fix: suggested changes	2020-12-07 11:11:00 +05:30
Kenneth Sequeira	00510e7f12	Merge branch 'cont-temp' of https://github.com/kennethsequeira/erpnext into cont-temp ... pull latest	2020-12-07 10:56:30 +05:30
Anuja P	47b4b7009d	Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix ... Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix	2020-12-07 10:55:44 +05:30
Kenneth Sequeira	5f95ba57a8	fix: py code clean up and doc help	2020-12-07 10:45:13 +05:30
Rucha Mahabal	063be69b58	fix(patch): set update_modified to False while setting issue/opportunity metrics (#24073)	2020-12-07 10:41:05 +05:30
Marica	13dcd18ede	Merge branch 'develop' into cont-temp	2020-12-07 09:53:23 +05:30
Deepesh Garg	6c35767995	Merge pull request #24069 from deepeshgarg007/gstr_3b_report_ims ... fix: Show tax amount in base currencies	2020-12-06 23:24:24 +05:30
rohitwaghchaure	0a672b69e6	Merge pull request #22859 from marination/pr-dn-return ... feat: Return tracking in PR/DN	2020-12-06 22:43:34 +05:30
Deepesh Garg	cfeca0dc87	fix: Show tax amount in base currencies	2020-12-06 18:28:30 +05:30
Michelle Alva	c9067e40cb	fix: Change validation message ... grammatical fix	2020-12-06 10:48:32 +05:30
Deepesh Garg	2d1cfae596	fix: fieldname	2020-12-05 22:44:45 +05:30
Deepesh Garg	ceefd66090	Merge pull request #24041 from saurabh6790/v13-patch-fixes-1 ... fix: reload doctype number card link	2020-12-05 22:43:46 +05:30
Anuja P	b6cf75d2a8	fix: error messsage indent fix	2020-12-05 22:25:17 +05:30
Anuja P	d3157c9347	Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix ... Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix	2020-12-05 22:21:03 +05:30
Marica	3b2da41f84	Merge branch 'develop' into debit-credit-opening-invoice-tool	2020-12-05 17:04:26 +05:30
Anuja P	2e4faf96f2	fix: Added TDS Payable account number and an error message	2020-12-05 13:36:43 +05:30
Deepesh Garg	eb951f3996	Merge pull request #24060 from deepeshgarg007/template_update ... fix(India): Tax template update on supplier change	2020-12-05 12:38:10 +05:30
Marica	067f35df26	Merge branch 'develop' into debit-credit-opening-invoice-tool	2020-12-04 21:13:23 +05:30
marination	c866abca56	fix: (travis) Disable update stock for deferred accounting item's Sales Invoice	2020-12-04 20:12:52 +05:30
Anurag Mishra	26b3328af7	fix: leave policy assignment patch (#24061)	2020-12-04 19:50:24 +05:30
pateljannat	7fef622b13	fix: drop ship partial order fixed	2020-12-04 19:18:36 +05:30
Deepesh Garg	a767085276	fix: Tax template update on supplier	2020-12-04 18:07:46 +05:30
Marica	afc517b8bf	Merge branch 'develop' into link-to-mr	2020-12-04 16:30:40 +05:30
Anuja Pawar	8a8a91c6b9	Merge branch 'develop' into issue_customer_filter	2020-12-04 15:26:40 +05:30
Anuja P	2e48cf7308	Merge branch 'issue_customer_filter' of https://github.com/Anuja-pawar/erpnext into issue_customer_filter ... Merge branch 'issue_customer_filter' of https://github.com/Anuja-pawar/erpnext into issue_customer_filter	2020-12-04 15:19:06 +05:30
Kenneth Sequeira	c4eb41c92b	fix; styling for sider	2020-12-04 15:00:22 +05:30
Anuja P	931f2e73a7	fix: sider changes	2020-12-04 14:57:23 +05:30
Anuja Pawar	84166a931e	Merge branch 'develop' into issue_customer_filter	2020-12-04 13:33:18 +05:30
marination	6a2431586e	fix: Make new Customers for account missing test and set company	2020-12-04 13:31:36 +05:30
Rucha Mahabal	edee530d4c	fix: paid amount in Sales Invoice POS return resets to 0	2020-12-04 12:13:26 +05:30
Rohit Waghchaure	28e86cf183	fix: pricing rule with transaction not working for additional product	2020-12-04 11:57:56 +05:30
Deepesh Garg	7b2d518059	fix: Dimension filters in accounting reports	2020-12-04 11:28:26 +05:30
Anuja P	0139109de2	fix: consistency check	2020-12-04 11:28:13 +05:30
Glen Whitney	dea6a90a1f	feat(Accounting Dimension): other apps may have accounting dimension doctypes ... Prior to this change, there was simply a single hardcoded list of doctypes with accounting dimensions in ERPNext. However, when extending the capabilities of ERPNext using an add-on app rather than by modifying ERPNext itself, it may well be necessary to create new doctypes in other apps that will have accounting dimensions as well. So, this PR moves the list of doctypes with accounting dimensions into hooks.py so it can be accumulated from multiple apps. It also allows the list of doctypes in make_dimension_in_accounting_doctypes be specifiable, for more convenient use in the after_install hooks of other apps.	2020-12-03 22:27:44 +00:00
Marica	4bf951a85b	Merge branch 'develop' into v13-patch-fixes-1	2020-12-03 19:55:03 +05:30
Saqib Ansari	f4d645f87a	perf: async pos app start	2020-12-03 19:30:12 +05:30
Saqib Ansari	a6a37b7c81	fix: scroll elements	2020-12-03 19:24:07 +05:30
Anuja P	25e058833a	fix: sider changes	2020-12-03 18:13:24 +05:30
Anuja P	26cc662a78	feat: added filter for customer field	2020-12-03 17:45:34 +05:30
Shivam Mishra	2fa3cac814	feat: update workspace folders	2020-12-03 15:48:57 +05:30
Shivam Mishra	2895645f86	feat: rename desk page to workspace	2020-12-03 15:39:53 +05:30
Rohit Waghchaure	8474476316	fix: incorrect balance value in stock balance report	2020-12-03 13:43:11 +05:30
Kenneth Sequeira	131e46bab7	chore: add help section for Jinja	2020-12-02 21:37:55 +05:30
Kenneth Sequeira	9abc685504	feat: add jinja templating in contract template	2020-12-02 21:13:50 +05:30
Joshua Angelo Bienes	324622bd2a	Merge branch 'develop' into shipment_with_integration	2020-12-02 19:21:32 +08:00
marination	523c464a92	fix: Test Payment Based on Leave Application (Travis)	2020-12-02 16:01:35 +05:30
jbienesdev	8e68f128c1	fix: travis build error ... - Removed shipment notification and subscription files - Minor changes on shipment field configuration - Add shipment to desk	2020-12-02 08:56:49 +00:00
Deepesh Garg	12b45b3f2a	Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters	2020-12-02 12:46:23 +05:30
jbienesdev	b4b542d1c3	chore: linter issues and sider checks	2020-12-02 07:15:16 +00:00
jbienesdev	99361b4a9e	chore: remove notification details section	2020-12-02 07:15:14 +00:00
jbienesdev	28055f483d	fix(shipment): change shipment test and refactor shipment.js	2020-12-02 07:15:13 +00:00
jbienesdev	ac3c1f1493	chore: remove packlink, letmeship, and sendcloud files	2020-12-02 07:15:11 +00:00
jbienesdev	000494f548	fix(shipment): apply code review	2020-12-02 07:15:05 +00:00
jbienesdev	1c9410e5e8	feat(shipment): Shipment Doctype with Integrations	2020-12-02 07:14:58 +00:00
Deepesh Garg	59820004b8	fix: Exception naming	2020-12-02 12:34:59 +05:30
Deepesh Garg	ab5053ef9c	fix: Accounting dimension import in PCV	2020-12-02 12:34:40 +05:30
Deepesh Garg	d8aeaed6ab	Merge pull request #24039 from rohitwaghchaure/fixed-incorrect-gstr-report-issue ... fix: GSTR B2C report	2020-12-01 20:44:33 +05:30
Saurabh	2e27f074c3	feat: reload doctype number card link	2020-12-01 18:08:04 +05:30
Rohit Waghchaure	1ac040a418	fix: GSTR report	2020-12-01 13:50:01 +05:30
Rucha Mahabal	288853d8f0	Merge branch 'develop' into patient-history-enhancements	2020-12-01 13:44:16 +05:30
Shivam Mishra	9aaca25edb	feat: update desk page json	2020-12-01 13:39:54 +05:30
Anurag Mishra	0e9eb95b22	Merge branch 'develop' into bom-fix	2020-12-01 13:18:00 +05:30
Leela vadlamudi	a3845a95ed	feat: Introducing telephony module (#24032)	2020-12-01 13:04:53 +05:30
Shivam Mishra	de68f74b4c	chore: update all desk pages	2020-12-01 12:51:38 +05:30
Nabin Hait	029b9c08dd	Update bom.py	2020-12-01 09:33:17 +05:30
Suraj Shetty	ad57eef40c	fix(product-listing): Check if customer exists (#24030) ... - It might happen that perty_name might not always be Customer (it might be Supplier as well)	2020-12-01 09:14:57 +05:30
Afshan	ccf5dc66e2	feat: multi-currency payroll (#23519) ... * feat: multi-currency payroll * fix: refactor and added conditions * fix: uncommented code * style: removed comments * fix: missing argument * style: styling changes * fix: test cases * Update asset_value_adjustment.py * patch: update columns * style: formating * style: formatting * fix: 1st review * fix: refactor * Revert "fix: refactor" This reverts commit eca0e17d11a192d60f249b2af992971c625aec46. reverting to previous state * Revert "fix: 1st review" This reverts commit 7eac48b102157df4353598f73b2ea97308af436a. reverting before 1st review * fix: 2nd review changes * fix: test cases * fix: added call to fetch exchange rate * fix: remove unnecessary code * fix: refactor * fix: refactor patch * fix: refactor * fix: refactor * fix: clear test data * fix: slider * feat: multi-currency payroll * fix: refactor and added conditions * fix: uncommented code * style: removed comments * fix: missing argument * style: styling changes * fix: test cases * patch: update columns * Update asset_value_adjustment.py * style: formating * style: formatting * fix: 1st review * fix: refactor * Revert "fix: refactor" This reverts commit eca0e17d11a192d60f249b2af992971c625aec46. reverting to previous state * Revert "fix: 1st review" This reverts commit 7eac48b102157df4353598f73b2ea97308af436a. reverting before 1st review * fix: 2nd review changes * fix: test cases * fix: added call to fetch exchange rate * fix: remove unnecessary code * fix: refactor * fix: refactor patch * fix: refactor * fix: refactor * fix: clear test data * fix: slider * feat: Added company field in leave encashment and employee benefit * refactor: Refactored multi-currency payroll patch * fix: currency column in salary register * refactor: Refactored code for making bank and return entry against employee advance * fix: minor cleanup * fix: fixed translation * fix: removed salary component type * fix: fixed sider issues * fix: translation and slider * style: formatted msg * fix: fixed slider * fix: travis * fix: refactor * fix: slider * fix: slider * fix: slider * fix: travis * fix: patch * fix: patch * fix: travis * fix: travis * fix: travis * fix: travis * fix: travis * fix: travis * fix: re-run travis * fix: rerun travis * fix: rerun travis * fix: rerun travis * fix: travis rerun * fix: increased throttle_user_limit from 60 to 100 * fix: patch * fix: patch * fix: assign payroll payable account as default payroll payable account in SSA * fix: removed debugger * fix: slider Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-12-01 09:11:05 +05:30
Saqib Ansari	188e0ecbcb	fix: submit order summary center alignment	2020-11-30 17:53:57 +05:30
Anurag Mishra	66e8a12d0f	fix: KeyError 'sourced_by_supplier'	2020-11-30 17:53:28 +05:30
Rucha Mahabal	f6756838ba	fix: patch	2020-11-30 17:51:56 +05:30
Saqib Ansari	02d1491e39	fix: order summary qty alignment	2020-11-30 17:42:51 +05:30
Rucha Mahabal	b5b8c5474a	refactor: move call to fetch doctype fields to server-side	2020-11-30 16:09:15 +05:30
Saqib Ansari	19d5074c25	fix: get formatted value in 'taxes' print template	2020-11-30 15:49:00 +05:30
Rucha Mahabal	0d43ea5ebb	refactor: show Patient History feed as per configured date instead of creation	2020-11-30 15:00:42 +05:30
Shivam Mishra	27e7c264f2	fix: link type	2020-11-30 14:58:16 +05:30
Shivam Mishra	3e6cdea51f	feat: delete config python files	2020-11-30 14:58:16 +05:30
Shivam Mishra	61388d412b	feat: update desk pages	2020-11-30 14:58:00 +05:30
rohitwaghchaure	9707b4789e	fix: stock ageing report not working (#23923)	2020-11-30 14:58:00 +05:30
Afshan	7e2d8ca916	fix: Handle the "no leave_allocation found" case (#23922) ... * fix: Handle the "no leave_allocation found" case * fix: format of error msg	2020-11-30 14:58:00 +05:30
Marica	1466ed4579	fix: Don't copy terms and discount from SO to PO (#23903) ... * fix: Dont copy terms, discount and required by from SO to PO * fix: Let delivery date and required by date get mapped	2020-11-30 14:58:00 +05:30
Suraj Shetty	c8b5f982ac	fix: Typo (Enchashment > Encashment) (#23919)	2020-11-30 14:58:00 +05:30
Afshan	8c3b2d0a0d	fix: change query to frappe.get_all	2020-11-30 14:58:00 +05:30
Afshan	beb1811523	fix: payroll attendance error	2020-11-30 14:58:00 +05:30
marination	d0ee615c2c	chore: Pricing Rule with Item Price Test	2020-11-30 14:58:00 +05:30
marination	8e2ce641c3	fix: Dont overrule Item Price via Pricing Rule Rate if 0	2020-11-30 14:58:00 +05:30
Anurag Mishra	58a3fea1b7	fix: Error handling in Upload Attendance (#23907)	2020-11-30 14:58:00 +05:30
Raffael Meyer	896e4b1722	fix: improve UX of DATEV report (#23892) ... * feat(DATEV Settings): button to show report * feat(desk): add DATEV to Reports under Accounting * fix(report DATEV): last calendar month as default * fix: let user create DATEV Settings (Instead of showing an error message.)	2020-11-30 14:58:00 +05:30
Kenneth Sequeira	39102e68df	fix: make contract template editable (#23891)	2020-11-30 14:58:00 +05:30
rohitwaghchaure	10c168e257	fix: default cost center in item master not set in stock entry (#23877) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-11-30 14:58:00 +05:30
Raffael Meyer	59be7ff144	feat: make account number length configurable (#23845)	2020-11-30 14:58:00 +05:30
Raffael Meyer	1ea12079da	fix: fiscal year can be shorter than 12 months (#23838) ... * fix: replace unnecessary SQL query * feat: checkbox "Is Short Year" Also, set checkbox and dates only once. * fix: toggle no longer necessary Date fields use set_only_once. * feat: short years can be less than 12 months * fix: if short year, don't add 12 months to start date * test: short year * fix: move short fiscal year to test records	2020-11-30 14:58:00 +05:30
Marica	ecce3bca2f	chore: PO cleanup (#23774) ... * chore: Subcontracting section and items section enhancement - Set target warehouse moved to Items section - Added subcontraction label to supply RM section * chore: PO & PO Item Form Cleanup * chore: PO Get Items from cleanup * fix: Taxes and Charges field visibility * chore: Cleanup * fix: Translation styling	2020-11-30 14:58:00 +05:30
Rohit Waghchaure	d6a2b390dc	fix: not able to save bom	2020-11-30 14:58:00 +05:30
Deepesh Garg	7b16c55c9a	feat: Sync old shopify orders (#23841) ... * feat: Sync old shopify orders * fix: Old orders syncing by date * fix: Remove unnecessary code * fix: Remove unintentional changes Co-authored-by: Saurabh <saurabh@erpnext.com>	2020-11-30 14:58:00 +05:30
Anurag Mishra	a81e872cdb	fix: added wrong absent days calculation in salary slip	2020-11-30 14:57:27 +05:30
Rucha Mahabal	ed3fc20731	fix: sider issues	2020-11-30 14:56:24 +05:30
Rucha Mahabal	7a69a3367c	Merge branch 'develop' into patient-history-enhancements	2020-11-30 14:16:46 +05:30
Rucha Mahabal	4ee293d2f4	fix: handle non-configured fields	2020-11-30 14:12:48 +05:30
Rucha Mahabal	5e3c51bf7d	refactor: format value using standard formatters	2020-11-30 13:35:00 +05:30
Anurag Mishra	8b6c58d560	Merge pull request #24005 from Anurag810/leave_ledger_patch ... fix: ignore exception during leave ledger creation from patch	2020-11-30 13:26:47 +05:30
Rucha Mahabal	c538a4a31d	refactor: remove medical record creation methods from individual doctypes	2020-11-30 13:22:34 +05:30
Rucha Mahabal	c0fcc807d3	feat: hooks for updating and deleting medical records	2020-11-30 13:22:01 +05:30
marination	724e16bca1	chore: Use JSON style response and use ORM ... - Use JSON style response for report columns - Use ORM instead of frappe.db.sql - Remove returned % from list view	2020-11-30 12:55:30 +05:30
Rucha Mahabal	4097e89f8b	feat: Standard doctype config for Patient History	2020-11-30 12:48:39 +05:30
Rucha Mahabal	f3df5c9f3c	feat: patch to setup standard doctype config in Patient History Settings	2020-11-30 12:16:28 +05:30
Rucha Mahabal	06e7cc2c35	fix: Handle table field rendering in Patient Medical record	2020-11-30 12:01:48 +05:30
Deepesh Garg	8db507bfd9	Merge pull request #24027 from resilient-tech/fix-taxjar ... fix: import taxjar globally in the taxjar_integration module	2020-11-30 11:23:32 +05:30
Deepesh Garg	6302de9290	Merge pull request #23975 from deepeshgarg007/jv_zero_value ... fix: Validation for journal entry with 0 debit and credit values	2020-11-30 10:56:40 +05:30
Deepesh Garg	452cbcd6ea	fix: Update payments directly in Loan Interest Accrual	2020-11-30 10:55:12 +05:30
Rucha Mahabal	4d6d115a4d	feat: date range filter for Patient History	2020-11-29 23:16:12 +05:30
Deepesh Garg	681c0e297c	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_fix	2020-11-29 23:07:14 +05:30
Rucha Mahabal	4af3d4e4bb	fix: feed not visible when filter is reset	2020-11-29 22:43:56 +05:30
Rucha Mahabal	fc1e352adf	feat: Doctype filter for Patient History	2020-11-29 22:38:14 +05:30
Deepesh Garg	2d5530da96	fix: Invoice discounting test	2020-11-29 22:17:47 +05:30
Sagar Vora	38e4635a10	fix: import taxjar globally in the taxjar_integration module	2020-11-29 20:26:26 +05:30
Rucha Mahabal	cbdbb9e65d	chore: code clean-up	2020-11-28 23:58:00 +05:30
Rucha Mahabal	a75f79762f	feat: Link for individual documents in Patient History	2020-11-28 23:09:07 +05:30
Rucha Mahabal	c91e03c891	feat: Create Patient Medical Record on configured doctype submission	2020-11-28 20:24:06 +05:30
Rucha Mahabal	f2932d7208	feat: set date field in Settings for Patient Medical Record	2020-11-28 19:19:58 +05:30
Rucha Mahabal	2c114053ad	feat: Patient History Settings	2020-11-27 15:05:28 +05:30
Rucha Mahabal	cf012ca9c3	fix: show stock entry button only if update stock is enabled	2020-11-27 12:39:33 +05:30
Rucha Mahabal	f5eddce407	test: Inpatient Medication Entry Drug Shortage	2020-11-27 12:27:17 +05:30
Rucha Mahabal	ac8ee249d5	feat: Medication doctypes added to Desk page and Patient dashboard	2020-11-26 22:11:20 +05:30
Rucha Mahabal	54228691e7	feat(IPME): Button to create Stock Entry for Drug Shortage	2020-11-26 16:38:28 +05:30
marination	1087d97c03	feat: Warehouse Capacity Summary ... - Added Page Warehouse Capacity Summary - Added Page to Desk and Putaway List View - Reused Item Dashboard/Stock Balance page render code - Added naming series to Putaway Rule	2020-11-26 10:45:44 +05:30
Marica	307bd01504	Merge branch 'develop' into pr-dn-return	2020-11-25 17:24:03 +05:30
Anurag Mishra	755b773616	feat: Leave policy assignment (#23112) ... * feat: Leave Policy Assignment * feat: linking with leave allocation and valiations * style: removed old code from leave period * feat: Bulk Leave policy Assignment and grant Leaves * fix: overlap validation * feat: earned leaves based on joining date * feat: automatic grant leave based on leave policy * patch: create leave policy assignment based on employee current leave policy * fix: dependent test cases * test: Leave policy assignment * fix: some enhancement * style: break large function into small function * fix:requested Changes * fix(patch): Handled old Leave allocatioln * fix:codacy * fix: travis and sider,codacy * fix: codacy * fix: codacy * fix: requested changes and sider Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-11-25 16:05:17 +05:30
Anurag Mishra	f32cff1080	feat : Leave type with partial payment (#23173) ... * feat: Partially paid Leaves * feat: some importatnt validation * fix: requested changes * fix: requested changes * fix: travis, sider, codacy * fix: changes requested * test: Partially Paid Leaves	2020-11-25 16:00:15 +05:30
Mohammad Hasnain Mohsin Rajan	90e33e53fd	refactor: Format translation strings (#24004) ... * fix: translation strings * fix: linting	2020-11-25 15:37:54 +05:30
Prssanna Desai	e60a62bde5	fix: function imports in account_balance_timeline.py (#24003)	2020-11-25 15:37:02 +05:30
Mohammad Hasnain Mohsin Rajan	e15b6a91de	Filters for tax templates (#23998) ... * feat: add company filter to tax templates * fix: remove filer from PO because it is from tran * fix: linting * fix: solve translation string issues * fix: remove doctype name	2020-11-25 15:36:41 +05:30
Anurag Mishra	7824e81298	fix: ignore exception during leave ledger creation from patch	2020-11-25 14:54:50 +05:30
Deepesh Garg	1a4390de44	Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters	2020-11-25 14:51:11 +05:30
Deepesh Garg	6b9dda5f3e	fix: Move filter setup to doctype controllers	2020-11-25 14:49:10 +05:30
Deepesh Garg	92b3449789	fix: Label changes	2020-11-25 14:01:57 +05:30
Deepesh Garg	4e991fe668	fix: Define specific exceptions and fix tests	2020-11-25 13:46:07 +05:30
Deepesh Garg	df065f7044	fix: form layout and naming fixes	2020-11-25 13:44:52 +05:30
Deepesh Garg	6c17b84cae	fix: Replace raw query with ORM	2020-11-25 13:42:16 +05:30
Marica	df17b4ff83	Merge branch 'develop' into pr-dn-return	2020-11-25 10:43:55 +05:30
Rucha Mahabal	6b57cf3285	feat: Quality Inspection on Job Card (#23964) ... * feat: Quality Inspection on Job Card * fix(Job Card): quality inspection filter query * fix: sider issues	2020-11-25 09:17:16 +05:30
Nabin Hait	0508e6bdfa	fix: Added link of bank reconciliation and clearance in accounting desk page (#23809)	2020-11-25 09:16:12 +05:30
Raffael Meyer	fbcc3c1b70	fix: Translatable strings (#23783) ... * fix: start_pattern * fix: translatable strings * fix: add missing semicolon (task) * fix: add missing semicolon (setup_wizard) * fix: text should start on the same line Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> * fix: move out HTML element as variable Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> * fix: pull out message, translate "Undo". Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> * fix: typo Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> * fix: text should start on the same line Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> * Revert "fix: start_pattern" This reverts commit decc62e2ab75f45db1df022fe13780c2d0d2560d. Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	2020-11-25 09:11:51 +05:30
Rucha Mahabal	c66bd45ba4	feat: Inpatient Medication Orders Script Report (#23984) ... * feat: Inpatient Medication Orders Script Report * feat: add chart for Inpatient Medication Order Report * feat: add report to Desk Page * feat: added filters for dates and healthcare service unit * test: Inpatient Medication Orders report	2020-11-25 09:09:40 +05:30
Deepesh Garg	a339752ba4	fix: Loan disbursement amount validation (#24000)	2020-11-25 08:54:51 +05:30
Mohammad Hasnain Mohsin Rajan	e4755828c4	fix: template errors in pricing rule (#23999) ... * fix: solve microtemplating errors	2020-11-24 23:31:06 +05:30
rohitwaghchaure	f38abdeac0	Merge pull request #23994 from rohitwaghchaure/bom-stock-project-item-color-develop ... fix: bom stock report color showing always red	2020-11-24 21:16:51 +05:30
marination	2ed80656aa	chore: Code Cleanup ... - Validate capacity < stock level only on new rule - Mention stock uom while validating capacity in new rule - Separate function to format and display unassigned items - Format ORM args	2020-11-24 21:07:56 +05:30
marination	2fbaa5dc58	Merge branch 'putaway' of https://github.com/marination/erpnext into putaway	2020-11-24 17:39:19 +05:30
marination	68a49efc80	chore: Added Putaway Rule to Desk Page and added Priority to List View	2020-11-24 17:38:34 +05:30
Marica	e762bc67eb	Merge branch 'develop' into putaway	2020-11-24 17:28:34 +05:30
rohitwaghchaure	5ab2e6c1ff	Merge pull request #23991 from pateljannat/job-card-operation-field-error ... fix: job card error handling for operations field	2020-11-24 17:05:44 +05:30
Rohit Waghchaure	5a33f2c394	fix: bom stock report color showing always red	2020-11-24 16:59:36 +05:30
Saqib Ansari	ac164c66ed	perf: get recent transaction only when component is visible	2020-11-24 16:09:11 +05:30
Saqib Ansari	7f1d7894c2	fix: cannot find erpnext.payments	2020-11-24 16:08:38 +05:30
rohitwaghchaure	ccd554c19c	Merge pull request #23989 from Anurag810/item-maintain-stock-fixes ... fix: maintain stock can't be changed it there is product bundle	2020-11-24 15:57:01 +05:30
pateljannat	b67ebc7636	fix: job card error handling for operations field	2020-11-24 15:37:30 +05:30
Deepesh Garg	d39ebf248e	Merge pull request #23990 from deepeshgarg007/shopify_order_id_sync ... fix: Old shopify order syncing date	2020-11-24 15:12:53 +05:30
Deepesh Garg	43a830f3f5	fix: Old shopify order syncing date	2020-11-24 15:10:36 +05:30
Anurag Mishra	927106f552	fix: maintain stock can't be changed it there is product bundle	2020-11-24 15:02:52 +05:30
marination	ccbd432b56	chore: Added Tests ... - Fixed Sider Issues - Added perms to Putaway Rule - Added Unit Tests to check warehouse assignment	2020-11-24 12:47:13 +05:30
Deepesh Garg	d07447aa5f	fix: Validation for duplicate Tax Category (#23978) ... * fix: Validation for duplicate Tax Category * Update utils.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-11-24 08:09:17 +05:30
Afshan	6aa6ec1832	fix: clear error message when approval not available (#23971)	2020-11-24 08:01:19 +05:30
marination	0cec1477f2	chore: Format unassigned Items dialog and add freeze message	2020-11-23 19:19:35 +05:30
Saqib Ansari	c1afc95e3c	chore: remove unused code	2020-11-23 18:40:06 +05:30
Saqib Ansari	96feae608d	refactor: build point of sale min js	2020-11-23 18:39:56 +05:30
Saqib Ansari	937dc467a0	fix: no transactions placeholder	2020-11-23 18:34:08 +05:30
Saqib Ansari	eeee7e9427	fix: post submission invoice recipt screen	2020-11-23 18:34:03 +05:30
Saqib Ansari	69ef766a93	feat: number pad in payment screen	2020-11-23 18:33:55 +05:30
Saqib Ansari	fa0ef218dd	fix: customer details spacing	2020-11-23 18:33:45 +05:30
Saqib Ansari	f719380a0d	fix: discount and taxes spacing	2020-11-23 18:33:40 +05:30
Saqib Ansari	fada84cc47	fix: remove console and asset loading	2020-11-23 18:33:34 +05:30
Saqib Ansari	d0d6fc2e17	fix: cannot open past order summary	2020-11-23 18:33:29 +05:30
Saqib Ansari	b0b6aa9124	refactor: past order list and summary with new ui	2020-11-23 18:33:22 +05:30
Saqib Ansari	7202e9f658	refactor: pos payment with new ui	2020-11-23 18:33:05 +05:30
Saqib Ansari	fc3315a6d7	feat: pos item details with new ui	2020-11-23 18:32:58 +05:30
Saqib Ansari	cc208839cf	feat: pos cart with new ui	2020-11-23 18:32:49 +05:30
Saqib Ansari	210baafad4	feat: pos customer selector new ui	2020-11-23 18:32:07 +05:30
Saqib Ansari	0fb2e02b56	feat: pos item selector new ui	2020-11-23 18:32:00 +05:30
marination	90598ea19c	chore: Multi UOM support for Putaway ... - Added UOM & conversion factor field in Putaway Rule - Items are split and assigned as per UOM - Handled Whole UOMs too	2020-11-23 17:35:13 +05:30
rohitwaghchaure	b9b8a13393	Merge pull request #23980 from rohitwaghchaure/color-not-showing-in-bom-stock-report-develop ... fix: bom stock report color issue	2020-11-23 16:43:32 +05:30
Rucha Mahabal	9a73a67dcd	Merge pull request #23982 from pateljannat/track-changes-in-stock-settings ... fix: enabling track changes for stock settings	2020-11-23 15:57:48 +05:30
rohitwaghchaure	f9a44000d9	Update bom_stock_report.js	2020-11-23 15:40:06 +05:30
pateljannat	34f381df17	fix: enabling track changes for stock settings	2020-11-23 15:31:08 +05:30
Rohit Waghchaure	610d9ca649	fix: bom stock report color issue	2020-11-23 14:10:55 +05:30
marination	9596276b95	fix: Linter and Sider	2020-11-23 10:32:17 +05:30
Deepesh Garg	20d6143c38	fix: Validation for journal entry with 0 debit and credit values	2020-11-21 12:09:11 +05:30
Jannat Patel	34d07b6306	fix: purchase receipt to purchase invoice bill date mapping (#23967) ... Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>	2020-11-20 19:22:35 +05:30
Saurabh	ecc50c8c24	bumped to version 13.0.0-beta.6	2020-11-20 15:22:00 +05:50
rohitwaghchaure	6b53ef7cce	Merge pull request #23947 from rohitwaghchaure/incorrect-delink-serial-no-and-batch ... fix: incorrect delink serial no and batch	2020-11-20 13:45:17 +05:30
Rohit Waghchaure	0b71801462	fix: incorrect delink serial no and batch	2020-11-20 12:59:00 +05:30
marination	c7991f8561	feat: Putaway Rule	2020-11-20 11:53:20 +05:30
Deepesh Garg	06e16eb748	Merge pull request #23941 from pateljannat/place-of-supply-change-issue ... fix: place of supply change on address change	2020-11-20 11:13:19 +05:30
Rohit Waghchaure	ceab692f73	fix: incorrect delink serial no and batch	2020-11-20 00:25:03 +05:30
pateljannat	1d5d863e9a	fix: removing return_taxes condition	2020-11-19 20:11:45 +05:30
Smit Vora	8aeb340dc8	fix: add remarks to sales invoice	2020-11-19 19:18:48 +05:30
Rohit Waghchaure	f0b1670abc	fix: tds test case	2020-11-19 18:40:13 +05:30
Rohit Waghchaure	b6ef59f8e9	fix: incorrect delink serial no and batch	2020-11-19 16:15:32 +05:30
marination	86e03325c3	Merge branch 'develop' of https://github.com/frappe/erpnext into putaway	2020-11-19 14:07:48 +05:30
Jannat Patel	c1187bc1d5	fix: duplicate items validation for POS Invoice when allow multiple items is disabled (#23896) ... * fix: duplicate items validation for POS when allow multiple items in disabled * fix: variable name change for duplicate item validation Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>	2020-11-19 13:10:24 +05:30
Nabin Hait	93bb7b0000	Merge branch 'develop' into membership-enhancements-2	2020-11-19 13:05:17 +05:30
Marica	9b897c4073	Merge branch 'develop' into pr-dn-return	2020-11-19 12:21:38 +05:30
pateljannat	cd05b34691	fix: company filter added again	2020-11-19 11:37:08 +05:30
Deepesh Garg	dd7a6d948c	Merge pull request #23672 from rohitwaghchaure/skip-non-apply-tds-invoices-develop ... fix: tds calculation, skip invoices with "Apply Tax Withholding Amount" has disabled	2020-11-19 11:27:38 +05:30
Deepesh Garg	ebdc8cee5b	Merge pull request #23825 from igormbq/fix-demo ... fix: location data on Asset to use command(make_demo)	2020-11-19 11:26:12 +05:30
Nabin Hait	2afc0bd87b	Merge branch 'develop' into naming-series-proj	2020-11-19 08:24:32 +05:30
Rucha Mahabal	14514f776b	fix: Enable Allow Auto Repeat for standard doctypes having auto_repeat field (#23776) ... Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>	2020-11-19 08:17:16 +05:30
Marica	6dafe1eabf	feat: Formula based Quality Inspection (#23916) ... * feat: Formula based Quality Inspection * chore: Added Test for Formula Based QI reading	2020-11-19 08:12:58 +05:30
rohitwaghchaure	6e974bf246	Merge pull request #23949 from pateljannat/email-digest-user-not-found-issue ... fix: email digest user not found	2020-11-18 23:54:34 +05:30
Smit Vora	bbe4933a52	fix(regional): set proper state code in ewaybill JSON when gst_category is SEZ	2020-11-18 21:00:09 +05:30
Shivam Mishra	1a74dd4237	feat: add product category cards	2020-11-18 17:56:37 +05:30
Shivam Mishra	ca3809831c	refactor: use h1 for slidetitle	2020-11-18 17:39:17 +05:30
pateljannat	188657d05a	fix: email digest user not found	2020-11-18 17:15:54 +05:30
Shivam Mishra	3bec3cfef1	fix: don't use primary action for create	2020-11-18 17:10:02 +05:30
Shivam Mishra	8cf3bdd044	feat: add slider template	2020-11-18 17:09:45 +05:30
rohitwaghchaure	67ba0462e9	Merge pull request #23408 from kevingdc/fix/item-price-duplicate-checking ... fix: Item price duplicate checking	2020-11-18 16:41:48 +05:30
pateljannat	410db04b48	fix: linter issue for translation syntax	2020-11-18 15:57:16 +05:30
Deepesh Garg	a0b17c4ef6	Merge pull request #23836 from pateljannat/purchase-taxes-and-charges-account-name-issue ... fix: correcting description field in taxes and charges for accounts with account number + account name	2020-11-18 15:31:25 +05:30
Deepesh Garg	81f6ef3e1a	Merge pull request #23934 from Anurag810/memebership-fixes ... fix: validation for membership	2020-11-18 15:25:24 +05:30
Deepesh Garg	f0187f6db2	Merge pull request #23447 from hasnain2808/UAE-VAT-Format ... feat: UAE VAT 201 Report	2020-11-18 15:15:00 +05:30
Rushabh Mehta	542bc01718	fix(minor): update routes	2020-11-18 15:00:34 +05:30
pateljannat	d0c528143f	Merge branch 'place-of-supply-change-issue' of https://github.com/pateljannat/erpnext into place-of-supply-change-issue	2020-11-18 12:52:24 +05:30
pateljannat	8c9b60edfe	fix: reversing previous commits and adding condition in regional controller	2020-11-18 12:51:13 +05:30
Saqib	d82b76fe0a	fix: pos item search includes non stock items (#23914) ... * fix: pos item search includes non stock items * chore: add validation for non stock items	2020-11-18 11:56:49 +05:30
Jannat Patel	96a0c17626	Merge branch 'develop' into place-of-supply-change-issue	2020-11-18 10:27:20 +05:30
Deepesh Garg	69232f8dd1	fix: Loan application link on creating loan	2020-11-17 22:00:41 +05:30
pateljannat	6b10d87d46	fix: place of supply change on address change	2020-11-17 20:34:51 +05:30
Anurag Mishra	3271437314	fix: Handle for custom field IFSC code in Bank remittance report. (#23905) ... * fix: Handel for custom field IFSC code * fix: changes_requested	2020-11-17 17:52:59 +05:30
Shivam Mishra	f9e4f6b57a	feat: add templates for online store	2020-11-17 16:38:09 +05:30
Anurag Mishra	a77f2ba0de	fix: validation for membership	2020-11-17 15:34:05 +05:30
Deepesh Garg	350972ece4	fix: Account filters	2020-11-17 13:51:58 +05:30
Deepesh Garg	8b4d92d4fc	fix: Disable filters after test	2020-11-17 13:19:29 +05:30
Shivam Mishra	e0b2e31f86	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-11-17 12:28:14 +05:30
rohitwaghchaure	7aa60d1dea	fix: stock ageing report not working (#23923)	2020-11-17 12:10:27 +05:30
Afshan	c72b693223	fix: Handle the "no leave_allocation found" case (#23922) ... * fix: Handle the "no leave_allocation found" case * fix: format of error msg	2020-11-17 12:08:31 +05:30
Marica	23614b650e	fix: Don't copy terms and discount from SO to PO (#23903) ... * fix: Dont copy terms, discount and required by from SO to PO * fix: Let delivery date and required by date get mapped	2020-11-17 11:12:31 +05:30
Deepesh Garg	6456c3dc24	fix: Linting and test cases	2020-11-17 11:10:00 +05:30
Suraj Shetty	5e8b00207b	fix: Typo (Enchashment > Encashment) (#23919)	2020-11-17 10:58:09 +05:30
pateljannat	642819b955	fix: place of supply change when address changes	2020-11-17 09:47:10 +05:30
Deepesh Garg	4bd52b4842	fix: Add test case	2020-11-16 23:01:36 +05:30
Deepesh Garg	d82c0f3bea	fix: Add disable and mandatory check for accounting dimension filters	2020-11-16 20:32:16 +05:30
Mohammad Hasnain	d2477e6cc5	fix(UAE VAT 201): remove branch parts	2020-11-16 18:47:05 +05:30
Mohammad Hasnain	2e1787300d	feat(UAE VAT 201): emirate according to branch	2020-11-16 17:36:27 +05:30
Anurag Mishra	d6e6c51f37	Merge branch 'develop' into salary_slip_fixes	2020-11-16 15:56:22 +05:30
Anurag Mishra	17d5ce3e41	fix: payroll attendance error (#23887) ... * fix: payroll attendance error * fix: change query to frappe.get_all	2020-11-16 14:20:18 +05:30
Marica	06f522cb27	Merge branch 'develop' into naming-series-proj	2020-11-16 13:32:24 +05:30
Deepesh Garg	0c6319194e	fix: GL Entry validation for dimensions	2020-11-16 13:20:19 +05:30
Mohammad Hasnain	b8d0b546a7	feat(UAE VAT Format): use company address for emir	2020-11-16 12:58:38 +05:30
marination	d51c953c22	chore: Fix Tests, use project name instead of project_name field	2020-11-16 12:48:40 +05:30
rohitwaghchaure	6094d66a6d	Merge pull request #23636 from marination/item-price-pricing-rule-conflict ... fix: Dont overrule Item Price via Pricing Rule Rate if 0	2020-11-16 12:22:30 +05:30
Deepesh Garg	9e9ea96582	fix: linting	2020-11-16 12:03:47 +05:30
Deepesh Garg	1f9b03345d	fix: Remove project filter	2020-11-16 09:55:35 +05:30
Deepesh Garg	f916bc048f	fix: Remove cost center query from doctypes	2020-11-15 22:44:39 +05:30
Deepesh Garg	6e5748e2a3	fix: dimension filter query	2020-11-15 22:43:48 +05:30
Deepesh Garg	96e874bfda	fix: dimension filter query	2020-11-15 22:43:01 +05:30
Deepesh Garg	8b6370bb45	feat: Add accounting dimension filter doctype	2020-11-15 22:41:36 +05:30
Anurag Mishra	69be37f88d	fix: Error handling in Upload Attendance (#23907)	2020-11-15 11:14:35 +05:30
Raffael Meyer	7178df8567	fix: improve UX of DATEV report (#23892) ... * feat(DATEV Settings): button to show report * feat(desk): add DATEV to Reports under Accounting * fix(report DATEV): last calendar month as default * fix: let user create DATEV Settings (Instead of showing an error message.)	2020-11-15 09:45:10 +05:30
Kenneth Sequeira	c5966d3d70	fix: make contract template editable (#23891)	2020-11-15 09:44:36 +05:30
rohitwaghchaure	1c8c1d78e9	fix: default cost center in item master not set in stock entry (#23877) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-11-15 09:40:44 +05:30
Raffael Meyer	8ff0d0cff6	feat: make account number length configurable (#23845)	2020-11-15 09:34:05 +05:30
Raffael Meyer	4bf09dd02b	fix: fiscal year can be shorter than 12 months (#23838) ... * fix: replace unnecessary SQL query * feat: checkbox "Is Short Year" Also, set checkbox and dates only once. * fix: toggle no longer necessary Date fields use set_only_once. * feat: short years can be less than 12 months * fix: if short year, don't add 12 months to start date * test: short year * fix: move short fiscal year to test records	2020-11-15 09:32:24 +05:30
Marica	188ecd7b39	chore: PO cleanup (#23774) ... * chore: Subcontracting section and items section enhancement - Set target warehouse moved to Items section - Added subcontraction label to supply RM section * chore: PO & PO Item Form Cleanup * chore: PO Get Items from cleanup * fix: Taxes and Charges field visibility * chore: Cleanup * fix: Translation styling	2020-11-15 09:17:42 +05:30
Rohit Waghchaure	30c704a4cb	fix: not able to save bom	2020-11-14 07:15:19 +05:30
rohitwaghchaure	a8eedb057b	Merge pull request #23910 from rohitwaghchaure/not-able-to-save-bom ... fix: not able to save bom	2020-11-14 07:12:22 +05:30
Rohit Waghchaure	4abc5657ab	fix: not able to save bom	2020-11-13 22:18:48 +05:30
Deepesh Garg	a862eb25e6	fix: Make repayment entry only if amount exists	2020-11-13 17:57:57 +05:30
Afshan	3e7f7e3374	Merge branch 'fix-payroll-attendance' of https://github.com/AfshanKhan/erpnext into fix-payroll-attendance ... Merge branch 'fix-payroll-attendance' of https://github.com/AfshanKhan/erpnext into fix-payroll-attendance	2020-11-13 17:04:18 +05:30
Afshan	1a4cafb97d	fix: change query to frappe.get_all	2020-11-13 17:04:05 +05:30
Deepesh Garg	37dc369af9	feat: Sync old shopify orders (#23841) ... * feat: Sync old shopify orders * fix: Old orders syncing by date * fix: Remove unnecessary code * fix: Remove unintentional changes Co-authored-by: Saurabh <saurabh@erpnext.com>	2020-11-13 16:53:35 +05:30
Marica	510b389838	Merge branch 'develop' into naming-series-proj	2020-11-13 13:37:19 +05:30
Afshan	5cffb6c72f	Merge branch 'develop' into fix-payroll-attendance	2020-11-13 13:01:51 +05:30
Deepesh Garg	78690af440	fix: Update only if loans to close	2020-11-12 18:47:34 +05:30
Deepesh Garg	c51b340ddf	fix: Update closed loans	2020-11-12 18:43:43 +05:30
Anurag Mishra	2f5d896f8c	fix: added wrong absent days calculation in salary slip	2020-11-12 16:57:42 +05:30
Deepesh Garg	b58dca8d94	fix: Only update open loans	2020-11-12 13:37:11 +05:30
Shivam Mishra	dc1e240642	Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui	2020-11-12 11:33:47 +05:30
Shivam Mishra	bed717b442	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-11-12 11:32:59 +05:30
Jannat Patel	0ea0a7495c	fix: making company address read-only in delivery note (#23890)	2020-11-12 11:10:59 +05:30
marination	c1b0e65f9f	feat: Putaway	2020-11-12 09:54:44 +05:30
Rucha Mahabal	159d3bf14b	Merge branch 'develop' into production-planning-status-filter	2020-11-11 22:36:21 +05:30
Deepesh Garg	5e0f4e2f4b	Merge pull request #23582 from deepeshgarg007/loan_repayment_type_remove ... fix: Loan repayment type option remove	2020-11-11 22:08:41 +05:30
Marica	a8ac101f5c	Merge branch 'develop' into fix-po-no-fetching	2020-11-11 16:55:13 +05:30
Jannat Patel	a9e02bba77	Merge branch 'develop' into purchase-taxes-and-charges-account-name-issue	2020-11-11 16:46:01 +05:30
Mangesh-Khairnar	a91b68c868	feat: add communication channel to communication medium (#23793) ... Co-authored-by: Saqib <nextchamp.saqib@gmail.com> Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	2020-11-11 16:34:43 +05:30
Afshan	6c95bc5e11	fix: payroll attendance error	2020-11-11 15:13:38 +05:30
Deepesh Garg	a2dc1740df	fix: Use autoname for loan creation	2020-11-11 13:57:10 +05:30
Deepesh Garg	0dc052e635	fix: Return loan type name	2020-11-11 12:57:16 +05:30
Marica	78cccbe015	Merge branch 'develop' into fix-po-no-fetching	2020-11-11 12:18:14 +05:30
Rushabh Mehta	780b6b466b	fix(hooks): include js/css with full path	2020-11-11 11:44:28 +05:30
Marica	2b44f22cf4	Merge branch 'develop' into fix-po-no-fetching	2020-11-11 11:10:34 +05:30
Deepesh Garg	13d1dda74b	fix: Handle loan type naming collisions	2020-11-11 11:07:17 +05:30
Jannat Patel	e008f85816	Merge branch 'develop' into production-planning-status-filter	2020-11-11 10:00:39 +05:30
pateljannat	7e4d115e36	fix: sider issues fixed	2020-11-11 09:52:27 +05:30
Deepesh Garg	73bde45bc5	fix: Pass updated loan type	2020-11-10 22:08:02 +05:30
Deepesh Garg	1c969d64a2	fix: Handle cases where same loan type is used for multiple companies	2020-11-10 20:25:35 +05:30
pateljannat	b648b9cf93	fix: code review changes	2020-11-10 18:50:02 +05:30
pateljannat	d08c91673a	fix: removed unnecessary filter options	2020-11-10 18:04:30 +05:30
Deepesh Garg	101bad3ea1	fix: Remarks for penalty GL Entry	2020-11-10 17:53:50 +05:30
prssanna	922432616f	Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui	2020-11-10 17:24:15 +05:30
prssanna	e3b71b9b24	fix: compact item print style	2020-11-10 17:23:24 +05:30
Afshan	1e564bc02d	fix: refactor	2020-11-10 13:23:59 +05:30
Afshan	a75708b02e	Merge branch 'fix-po-no-fetching' of https://github.com/AfshanKhan/erpnext into fix-po-no-fetching	2020-11-10 13:19:53 +05:30
Afshan	1924019531	fix: refactor	2020-11-10 13:19:21 +05:30
Mohammad Hasnain Mohsin Rajan	72adb0b218	Merge branch 'develop' into UAE-VAT-Format	2020-11-10 09:58:45 +05:30
Raffael Meyer	57ce0462d9	fix: remove check for exempt_from_sales_tax	2020-11-09 19:04:46 +01:00
Anurag Mishra	91fdb7aa69	feat: added column cost_center to receivable reports (#23835)	2020-11-09 20:20:05 +05:30
Raffael Meyer	4f880e7454	refactor: zip_and_download (#23844)	2020-11-09 20:17:56 +05:30
Shivam Mishra	f38a1c305e	refactor: show form buttons only if permissions exist (#23851) ... * refactor: show form buttons only if permissions exist * style: add semicolon * fix: typo in conditions	2020-11-09 20:16:28 +05:30
Deepesh Garg	8cfb210dc4	fix: Ignore doctypes on company transaction deleted (#23864)	2020-11-09 20:14:53 +05:30
UrvashiKishnani	bc64f5dfbb	fix: spelling error in filter label (#23867)	2020-11-09 20:14:06 +05:30
Suraj Shetty	e3fe8ff195	Merge branch 'develop' into purchase-taxes-and-charges-account-name-issue	2020-11-09 19:16:23 +05:30
Rucha Mahabal	30d58cc3d7	feat: Consider Holiday List in Student Leave Application and Attendance (#23388) ... * feat: Consider holiday list in Student Attendance and Leave Application * feat: Show Holidays as 'H' in Student Monthly Attendance Sheet * fix: check if date is a holiday in attendance reports * test: skip attendance record creation for holidays * fix: holiday list validation * fix: clean up after test * fix: codacy * fix: show date in user format * fix: remove ununsed imports * fix: sider * fix: test Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-11-09 18:41:03 +05:30
Frappe PR Bot	7915a3acae	chore: Update translations (#23856) ... Co-authored-by: frappe <frappe@scw-dazzling-elgamal>	2020-11-09 18:37:28 +05:30
Deepesh Garg	d53abf194e	fix: Party for loan ledger entries	2020-11-09 18:34:38 +05:30
rohitwaghchaure	8d39d7570a	Merge pull request #23764 from anupamvs/project-timesheet ... fix: added project link in timesheet form	2020-11-09 17:34:11 +05:30
Deepesh Garg	928dc432ab	fix: Reload journal entry account doc	2020-11-09 17:17:12 +05:30
Deepesh Garg	4f2a64479d	fix: Patch for old loans	2020-11-09 17:00:09 +05:30
Marica	9a3e1f6f83	Merge branch 'develop' into purchase-invoice-payment-terms	2020-11-09 14:51:20 +05:30
Shivam Mishra	723e220a34	chore: remove commented code	2020-11-09 14:07:40 +05:30
Shivam Mishra	12fafa3e7a	chore: remove validation for old member field	2020-11-09 14:07:39 +05:30
Shivam Mishra	7e1cdf9b97	feat(breaking): update get_last_membership to fetch correct details	2020-11-09 14:07:39 +05:30
Shivam Mishra	c04321e645	test(membership): add test for invoicing and validation	2020-11-09 14:06:53 +05:30
Shivam Mishra	286ec04197	test(membership): setup test defaults	2020-11-09 14:06:23 +05:30
Shivam Mishra	e0f4dd0643	fix: fieldtype for auto_create_for_web_forms	2020-11-09 14:06:23 +05:30
Shivam Mishra	9d9fa74e6b	refactor(member): drop email column ... * remove email column * update controller methods * add patch to add value from email to email_id	2020-11-09 14:06:23 +05:30
Shivam Mishra	d75ff1a93e	feat: generate invoice on payment authorized	2020-11-09 14:06:23 +05:30
Shivam Mishra	e927224fbc	feat: update membership setting doctype ... * rename enable_auto_invoicing to enable_invoicing * add option to make_payment entry	2020-11-09 14:05:39 +05:30
Suraj Shetty	1183980e0e	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-11-09 13:14:11 +05:30
Marica	63d1a0436c	Merge branch 'develop' into fix-po-no-fetching	2020-11-09 12:59:10 +05:30
rohitwaghchaure	94bfa6a659	Merge pull request #23843 from frappe/datev_check_fiscal_year ... feat: validate fiscal year	2020-11-09 12:33:15 +05:30
Marica	f72a5a6dca	Merge branch 'develop' into pr-dn-return	2020-11-09 12:19:36 +05:30
Marica	709daf354b	Merge branch 'develop' into purchase-invoice-payment-terms	2020-11-09 10:33:32 +05:30
Marica	da2c6444f6	Merge branch 'develop' into bank-link-card-desk	2020-11-09 10:29:51 +05:30
Deepesh Garg	29a8994506	Merge pull request #23832 from deepeshgarg007/india_tax_template_fetch ... fix: Auto Statewise gst tax template	2020-11-08 17:48:57 +05:30
Deepesh Garg	dd94587ef8	fix: Loan write off precision issue	2020-11-07 17:08:30 +05:30
Deepesh Garg	2ad015450e	fix: Remarks fix	2020-11-07 00:14:40 +05:30
Mohammad Hasnain Mohsin Rajan	d54969bd86	Merge branch 'develop' into UAE-VAT-Format	2020-11-06 23:39:34 +05:30
Mohammad Hasnain	c5aad7b6e5	feat(UAE VAT 201): reorder desk page listing	2020-11-06 23:36:50 +05:30
Mohammad Hasnain	4d99d695a3	feat(uae vat 201): update desk page entry	2020-11-06 23:33:19 +05:30
Saurabh	7c06c28216	fix: merge-conflicts	2020-11-06 19:08:58 +05:30
Saurabh	e7ab61da9a	bumped to version 13.0.0-beta.5	2020-11-06 19:23:55 +05:50
rohitwaghchaure	8cbcd54f3b	chore: change log for v13-beta-pre-release-5 (#23846)	2020-11-06 18:48:34 +05:30
Saqib	e0af8fe8e5	fix: auto fetch sr nos with modifed conversion factor (#23854)	2020-11-06 18:19:36 +05:30
Saqib	1090181204	fix: auto fetch sr nos with modifed conversion factor (#23855)	2020-11-06 18:19:26 +05:30
Deepesh Garg	3899079bb9	fix: Loan seurity unpledge msg improvement	2020-11-06 17:39:54 +05:30
Anupam Kumar	bdb8a4023a	Delete test_parameter.py	2020-11-06 17:13:02 +05:30
Anupam Kumar	a739554b7d	Delete parameter.py	2020-11-06 17:12:44 +05:30
Anupam Kumar	c7f8204997	Delete parameter.json	2020-11-06 17:12:21 +05:30
Anupam Kumar	b4bad63e25	Delete parameter.js	2020-11-06 17:11:47 +05:30
Anupam Kumar	ec7002625f	Delete __init__.py	2020-11-06 17:11:33 +05:30
Anupam	14ef229b12	Revert "Update item_add_to_cart.html" ... This reverts commit 5b3af82e75.	2020-11-06 16:50:15 +05:30
Anupam	886b680e1b	revert changes	2020-11-06 16:48:39 +05:30
Anupam Kumar	ca9b58589b	fix: replaced formatdate -> format_date (#23847) ... Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	2020-11-06 14:56:27 +05:30
Deepesh Garg	3e69756e15	fix: Add better remarks for Loan GL entries	2020-11-06 14:25:09 +05:30
Marica	d07f6b7ef6	Merge pull request #23848 from AfshanKhan/fix-stock-mismatch-filter-pre-release ... fix: showing error for wrong filters.	2020-11-06 13:42:07 +05:30
Marica	0d441b66cd	Merge pull request #23808 from nabinhait/web-page-bank-statement-section-pre-release ... fix: Added link of bank reconciliation and clearance in accounting desk page	2020-11-06 13:16:44 +05:30
marination	0b4946ba27	fix: Add missing links ... - Added Bank Transaction Statement Entry and Bank Statement Settings	2020-11-06 13:15:46 +05:30
Nabin Hait	06ba92be7a	fix: Added link of bank reconciliation and clearance in accounting desk page	2020-11-06 13:15:38 +05:30
marination	427c1bb0a7	fix: Add missing links ... - Added Bank Transaction Statement Entry and Bank Statement Settings	2020-11-06 13:08:53 +05:30
Marica	7e1511f527	Merge branch 'develop' into purchase-invoice-payment-terms	2020-11-06 12:28:55 +05:30
Anupam	c3307f7900	fix: replaced formatdate -> format_date	2020-11-06 12:28:38 +05:30
Afshan	4d3e83682e	fix: showing error for wrong filters.	2020-11-06 12:25:46 +05:30
Marica	d845e8a53a	Merge branch 'develop' into pr-dn-return	2020-11-06 12:25:11 +05:30
Marica	9694432270	Merge branch 'develop' into dialog-cleanup	2020-11-06 12:19:41 +05:30
Suraj Shetty	c2d97e9d9c	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-11-06 10:26:19 +05:30
Raffael Meyer	a62d138748	Merge branch 'develop' into datev_check_fiscal_year	2020-11-05 17:29:42 +01:00
barredterra	f91d82b538	fix: imports	2020-11-05 17:28:39 +01:00
barredterra	815341d454	feat: validate fiscal year	2020-11-05 16:57:23 +01:00
Deepesh Garg	1145b3796c	fix: Remove accrual type from process	2020-11-05 21:21:40 +05:30
Deepesh Garg	a2bff7fbfc	fix: Penalty amount calculation fix	2020-11-05 21:14:29 +05:30
Deepesh Garg	49cc57e76e	fix: Negative amount check for amounts	2020-11-05 21:14:07 +05:30
Rohit Waghchaure	88e0a64df2	added test cases	2020-11-05 20:07:27 +05:30
Rohit Waghchaure	2fe3b1807f	fix: multiple pricing rules are not working on selling side	2020-11-05 20:07:19 +05:30
Anupam Kumar	3a9dc90695	fix: fix: replaced formatdate -> format_date (#23829)	2020-11-05 18:51:56 +05:30
rohitwaghchaure	9a62858da2	Merge pull request #23831 from rohitwaghchaure/incorrect-assign-to-in-asset-maintenance-develop ... fix: incorrect assign to in Maintenance Schedule	2020-11-05 18:43:51 +05:30
Marica	c070f2ed57	Merge branch 'develop' into dialog-cleanup	2020-11-05 18:37:56 +05:30
Marica	08f6c9d5f9	Merge pull request #23820 from marination/so-to-po-dialog-fix ... fix: SO to PO Mapping Issue	2020-11-05 18:29:52 +05:30
pateljannat	5b02d32826	fix: trailling spaces removed	2020-11-05 18:04:14 +05:30
Saqib	65820f6b6c	fix: cannot expand row in update items dialog (#23840)	2020-11-05 17:38:43 +05:30
Saqib	bc919e2e7d	fix: cannot expand row in update items dialog (#23839)	2020-11-05 17:38:35 +05:30
Saqib	19df4534f5	fix: asset finance book depreciation posting date fix (#23833)	2020-11-05 16:37:40 +05:30
Saqib	76cd680c57	fix: asset finance book depreciation posting date fix (#23834)	2020-11-05 16:37:19 +05:30
Deepesh Garg	59ccb64e18	fix: Auto Statewise gst tax template	2020-11-05 16:29:34 +05:30
pateljannat	403822afb3	fix: correcting description field in taxes and charges for accounts that have account number + account name	2020-11-05 16:24:33 +05:30
Afshan	5c93ca7bef	fix: leave ledger patch (#23807) ... Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>	2020-11-05 15:45:15 +05:30
Rohit Waghchaure	421348a5f2	fix: not able to select assign to	2020-11-05 15:43:41 +05:30
Marica	6d2bcd2404	Merge branch 'develop' into purchase-invoice-payment-terms	2020-11-05 12:25:38 +05:30
Marica	fd2b7d3c1d	Merge branch 'develop' into dialog-cleanup	2020-11-05 12:22:50 +05:30
Marica	7e9b9e7278	Merge branch 'develop' into so-to-po-dialog-fix	2020-11-05 12:19:49 +05:30
Marica	9a4975d3fe	Merge pull request #23823 from marination/delete-quoted-item-old-report ... chore: Delete Quoted Item Comparison Report	2020-11-05 12:19:26 +05:30
rohitwaghchaure	64059db69f	Merge pull request #23814 from Anurag810/stock_ledger_report ... fix: list index out of range on including UOM	2020-11-05 11:49:46 +05:30
Marica	a45f98ba99	Merge branch 'develop' into pr-dn-return	2020-11-05 10:34:23 +05:30
Marica	596656b372	Merge pull request #23824 from marination/delete-quoted-item-old-report-pre-release ... chore: Delete Quoted Item Comparison Report	2020-11-05 10:03:58 +05:30
Marica	6ae1b269ea	Merge branch 'develop' into delete-quoted-item-old-report	2020-11-05 09:32:47 +05:30
Marica	6bbdc58d56	Merge branch 'develop' into link-to-mr	2020-11-05 09:31:39 +05:30
Marica	144fef0097	Merge branch 'develop' into item-price-pricing-rule-conflict	2020-11-05 09:28:30 +05:30
Marica	364916fa7b	Merge branch 'develop' into dialog-cleanup	2020-11-05 09:27:57 +05:30
Marica	0c74cd8872	Merge pull request #23821 from marination/so-to-po-dialog-fix-v13-beta ... fix: SO to PO Mapping Issue	2020-11-05 09:26:32 +05:30
Marica	2f0bd68fde	Merge branch 'develop' into so-to-po-dialog-fix	2020-11-05 09:25:00 +05:30
Marica	5c4b35e65e	Merge pull request #23827 from marination/rfq-test-fixes-pre-release ... chore: Reposition RFQ fields	2020-11-05 09:24:29 +05:30
Abhishek Balam	5db99e0649	fix: code improvement, match error type for message	2020-11-04 23:43:11 +05:30
Abhishek Balam	5fe3abcfae	fix: sales person without customer link throwing keyerror	2020-11-04 23:23:34 +05:30
marination	edd9080ea6	chore: Reposition RFQ fields	2020-11-04 22:13:57 +05:30
marination	2b3412ea05	chore: Reposition RFQ fields	2020-11-04 22:07:33 +05:30
Rucha Mahabal	dd7f4df669	fix: Budget test cases (#23822)	2020-11-04 21:59:08 +05:30
Marica	4c81de0810	Merge branch 'develop' into so-to-po-dialog-fix	2020-11-04 21:24:45 +05:30
marination	75fcfbb49c	chore: Delete Quoted Item Comparison Report	2020-11-04 21:24:04 +05:30
marination	5de719fc74	chore: Delete Quoted Item Comparison Report	2020-11-04 21:22:22 +05:30
marination	e3864c9b16	fix: Make sure row object has doctype so that read only property is applied to rows	2020-11-04 21:08:36 +05:30
marination	413b1c3b43	fix: SO to PO Mapping Issue ... - removed type: GET , which made the URL longer - Added only relevant fields from Items table to Dialog table to reduce args load - Made separate method to set table data in dialog - Added freeze message	2020-11-04 21:08:27 +05:30
marination	2b8aa91cf2	fix: Make sure row object has doctype so that read only property is applied to rows	2020-11-04 21:00:52 +05:30
Rucha Mahabal	13fb562e9c	fix: sider	2020-11-04 20:25:10 +05:30
Rucha Mahabal	e50697d459	fix: sider	2020-11-04 20:24:04 +05:30
Rucha Mahabal	40246caf5e	fix: therapy plan and session fixes	2020-11-04 20:13:53 +05:30
igormbq	aa08fb9716	Add location on Asset to use make_demo	2020-11-04 11:40:57 -03:00
Rucha Mahabal	2673c19c1a	fix: therapy plan and session fixes	2020-11-04 20:06:07 +05:30
Afshan	cdc17bb9f3	fix: added code for testing	2020-11-04 19:28:55 +05:30
marination	23b7591c91	fix: SO to PO Mapping Issue ... - removed type: GET , which made the URL longer - Added only relevant fields from Items table to Dialog table to reduce args load - Made separate method to set table data in dialog - Added freeze message	2020-11-04 18:23:00 +05:30
Mangesh-Khairnar	5756798689	fix: update integrations desk page (#23772)	2020-11-04 16:44:44 +05:30
Anurag Mishra	09b8ca0ddb	fix: list index out of range on incilding uom	2020-11-04 15:04:50 +05:30
rohitwaghchaure	0fde102ea5	Merge pull request #23812 from rohitwaghchaure/fixed-sequence-id-column-display ... fix: on save sequence id column override with workstation	2020-11-04 14:25:15 +05:30
Rohit Waghchaure	58c538d46b	fix: on save sequence id column override with workstation	2020-11-04 13:35:42 +05:30
rohitwaghchaure	9a0325e2b9	Merge pull request #23801 from rohitwaghchaure/fixed-budget-test-cases ... fix: Budget test cases	2020-11-04 13:27:03 +05:30
Rohit Waghchaure	dd87bcfda0	fix: on save sequence id column override with workstation	2020-11-04 13:26:03 +05:30
Rohit Waghchaure	4cf346c082	fix: sequence id override with operation column	2020-11-04 13:14:28 +05:30
Rohit Waghchaure	81b2c8ed60	fix: sequence id override with operation column	2020-11-04 13:10:03 +05:30
Nabin Hait	da14a76ee0	fix: Added link of bank reconciliation and clearance in accounting desk page	2020-11-04 13:06:36 +05:30
Mangesh-Khairnar	2df2b2f351	fix: update integrations desk page (#23767) ... * fix: update integrations desk page * fix: setup dashboard after receiving API callback Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-11-04 12:48:33 +05:30
Mangesh-Khairnar	1354aecafa	fix: add check for allowing access to european region (#23770)	2020-11-04 12:42:02 +05:30
Frappe PR Bot	f4e410af5f	chore: Update translations (#23787) ... Co-authored-by: frappe <frappe@scw-dazzling-elgamal>	2020-11-04 12:17:40 +05:30
rohitwaghchaure	a53454d3d1	Update test_budget.py	2020-11-04 12:06:21 +05:30
Mohammad Hasnain	bed4e85aec	fix(uae vat 201): date filters were not working	2020-11-04 10:44:22 +05:30
Mohammad Hasnain	510d0d3f20	Merge branch 'UAE-VAT-Format' of https://github.com/hasnain2808/erpnext into UAE-VAT-Format	2020-11-04 10:32:22 +05:30
Mohammad Hasnain	f2c895ddb5	feat(uae vat 201): do not take zero and nil rated items in standard rated expense emiratewise	2020-11-04 10:31:37 +05:30
Mohammad Hasnain Mohsin Rajan	2b2961678c	Merge branch 'develop' into UAE-VAT-Format	2020-11-04 08:43:21 +05:30
marination	7837161a3f	fix: Sider	2020-11-03 22:09:42 +05:30
marination	574477187f	chore: Pricing Rule with Item Price Test	2020-11-03 20:22:48 +05:30
Marica	cf08f0da70	Merge branch 'develop' into item-price-pricing-rule-conflict	2020-11-03 18:29:22 +05:30
pateljannat	846ff323e2	feat: sales order status filter for production plan	2020-11-03 17:35:44 +05:30
Rohit Waghchaure	c8cc4bfc56	fix: Budget test cases	2020-11-03 17:09:09 +05:30
Marica	7b42e8e27c	Merge branch 'develop' into dialog-cleanup	2020-11-03 16:26:06 +05:30
marination	53b1a9a40b	chore: Add Test for missing debit account	2020-11-03 15:56:09 +05:30
Rucha Mahabal	6c135dd06d	fix: Inpatient Medication Order and Entry fixes	2020-11-03 14:43:40 +05:30
Rucha Mahabal	ce8b5fc5ca	Merge branch 'develop' into fix-ipme	2020-11-03 13:56:53 +05:30
Rucha Mahabal	7190e1e4bb	fix: Inpatient Medication Order and Entry fixes	2020-11-03 13:45:12 +05:30
Marica	9a75a60784	Merge branch 'develop' into debit-credit-opening-invoice-tool	2020-11-03 12:03:50 +05:30
marination	f21e3fbf04	chore: Tests ... - Added test for mapping secnd return doc - Added test for billing % of partially returned doc - Handled PR with 0 billing amount	2020-11-03 12:01:56 +05:30
Saqib	940e307194	fix: cannot save customer email & phone (#23798)	2020-11-03 10:51:18 +05:30
Saqib	da878c43fc	fix: cannot save customer email & phone (#23797)	2020-11-03 10:51:09 +05:30
Saqib	c95dff7b7d	fix: cannot add items to cart (#23796) ... * fix: _ is not defined * fix: item image alt gets overflowed due to large text * fix: available item qty in pos search * fix: cash shortcuts overflow	2020-11-03 10:16:58 +05:30
Saqib	a53e8404d1	fix: cannot add items to cart (#23795) ... * fix: _ is not defined * fix: item image alt gets overflowed due to large text * fix: available item qty in pos search * fix: cash shortcuts overflow	2020-11-03 10:07:50 +05:30
Kevin Chan	a2ba8ea74a	style: Clean up code formatting	2020-11-03 10:57:52 +08:00
Kevin Chan	312561fd77	Merge branch 'develop' into fix/item-price-duplicate-checking	2020-11-03 10:56:23 +08:00
Mohammad Hasnain Mohsin Rajan	6a0b28bde3	Merge branch 'develop' into UAE-VAT-Format	2020-11-02 23:59:13 +05:30
marination	3991b84b2b	chore: Avoid multiline string in Translation & remove print statement	2020-11-02 15:23:41 +05:30
marination	28dd90f3dc	Merge branch 'develop' of https://github.com/frappe/erpnext into pr-dn-return	2020-11-02 15:16:31 +05:30
marination	d6596a169c	fix: Billing % Logic and Map Pending Qty only in PR and DN ... - Billing % should consider unreturned amount as total - While mapping to return doc, map unreturned amount - Added field Received Qty in Stock UOM, to tally against Returned Qty in PR - PR billing percentage updation custom function - In patch set received qty in stock uom first, then update returned qty and billing	2020-11-02 15:07:48 +05:30
Mohammad Hasnain	7a034595fe	fix(UAE VAT 201): Remove Chart	2020-11-02 13:12:27 +05:30
Mohammad Hasnain	b0eca23485	Refactor(UAE VAT 201): Fix fomatiing	2020-11-02 12:47:10 +05:30
Deepesh Garg	992bd69fc4	Merge pull request #23785 from deepeshgarg007/place_of_supply ... fix: Place of Supply fix in Sales Invoices	2020-11-02 11:23:25 +05:30
Mohammad Hasnain	c53237f5e0	refactor(UAE VAT 201): solve syntax errors	2020-11-02 11:02:41 +05:30
Mohammad Hasnain Mohsin Rajan	c8d8d0868d	Merge branch 'develop' into UAE-VAT-Format	2020-11-02 10:36:03 +05:30
Mohammad Hasnain Mohsin Rajan	d322181fd7	refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/uae_vat_201.py ... Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>	2020-11-02 10:29:38 +05:30
Mohammad Hasnain Mohsin Rajan	7b771d139c	refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/test_uae_vat_201.py ... Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>	2020-11-02 10:29:14 +05:30
Mohammad Hasnain Mohsin Rajan	46265d3fc7	refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/test_uae_vat_201.py ... Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>	2020-11-02 10:28:41 +05:30
Mohammad Hasnain Mohsin Rajan	be7a4c8b0a	refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/test_uae_vat_201.py ... Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>	2020-11-02 10:28:14 +05:30
Mohammad Hasnain Mohsin Rajan	f116fbf84d	refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/test_uae_vat_201.py ... Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>	2020-11-02 10:27:54 +05:30
marination	542ae6ab97	chore: Linter and Sider fixes ... - Translatable strings cannot be multi line or be formatted by '+' - Reduce no of tabs in stock_entry.js	2020-11-02 08:50:48 +05:30
Marica	e0ec58d8fa	Merge branch 'develop' into link-to-mr	2020-11-01 23:48:58 +05:30
Deepesh Garg	eacfd792e6	fix: fieldname	2020-10-30 22:12:24 +05:30
Deepesh Garg	db3fa4e6b2	fix: Place of Supply fix in Sales Invoices	2020-10-30 19:19:48 +05:30
marination	97d38548aa	chore: Purchase Invoice Get Items From cleanup	2020-10-30 17:50:25 +05:30
marination	66b2b544f8	chore: Purchase Receipt, added required by date in PO popup	2020-10-30 17:45:28 +05:30
marination	08e5031be2	chore: Supplier Quotation Get Items From cleanup	2020-10-30 17:36:20 +05:30
marination	e14fdf4a3c	chore: RFQ cleanup and Title case for 'Get Items From' ... - Cleanup up RFQ Get Items From Dialogs - Title cased 'Get items from' to 'Get Items From'	2020-10-30 17:06:00 +05:30
rohitwaghchaure	c451c08824	Merge pull request #23777 from rohitwaghchaure/fixed-set-po-details-in-subcontract-stock-entry-develop ... fix: po_detail field has no value for subcontracted stock entry	2020-10-30 16:48:11 +05:30
rohitwaghchaure	ce7f9dffa9	Merge pull request #23781 from rohitwaghchaure/patch-to-update-reason-for-leaving ... fix: patch to update reason for leaving in employee	2020-10-30 16:47:48 +05:30
Shivam Mishra	2d1f8341f9	feat: update onboarding for accounts	2020-10-30 15:55:19 +05:30
Shivam Mishra	18ef17f3ba	feat: add tour for sales taxes template	2020-10-30 15:55:19 +05:30
Rohit Waghchaure	e1781dc0bb	fix: patch to update reason for leaving in employee	2020-10-30 15:34:04 +05:30
Saqib	ce7d7155db	fix: asset finance book posting date fix (#23779)	2020-10-30 15:30:27 +05:30
Saqib	32442008dc	fix: asset finance book posting date fix (#23778)	2020-10-30 15:30:18 +05:30
Rohit Waghchaure	71913c36a7	fix: po_detail field has no value for subcontracted stock entry	2020-10-30 14:35:16 +05:30
marination	6bf507a54b	chore: (MR)Added delivery date in SO dialog	2020-10-30 13:59:47 +05:30
Marica	b05318aa51	Merge branch 'develop' into prod-plan-status	2020-10-30 12:33:27 +05:30
Mohammad Hasnain Mohsin Rajan	30197d7fba	Merge branch 'develop' into UAE-VAT-Format	2020-10-30 10:29:56 +05:30
rohitwaghchaure	707788da4b	Merge pull request #22711 from rohitwaghchaure/multiple-pricing-rules-are-not-applied ... fix: multiple pricing rules are not working on selling side	2020-10-30 02:42:51 +05:30
Marica	9dc4941072	Merge branch 'develop' into prod-plan-status	2020-10-30 00:53:10 +05:30
Rucha Mahabal	400737d005	Merge pull request #23768 from ruchamahabal/fix-issue-v13-beta ... fix: set SLA variance in seconds for Duration fieldtype	2020-10-30 00:10:45 +05:30
Rucha Mahabal	1636383120	fix: subscription test case ... Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com> Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-10-30 00:09:55 +05:30
François de Ryckel	ca5f5cb367	Update student_attendance.py (#23761) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-10-29 23:04:13 +05:30
Rucha Mahabal	2bb7ed34d8	fix: Student Attendance error message (#23769)	2020-10-29 23:03:53 +05:30
Rucha Mahabal	c548d56498	fix: set SLA variance in seconds for Duration fieldtype (#23765) ... * fix: calculate SLA variance in seconds for Duration fieldtype * fix: sider	2020-10-29 22:41:38 +05:30
Rucha Mahabal	9db26155ad	fix: set SLA variance in seconds for Duration fieldtype (#23765) ... * fix: calculate SLA variance in seconds for Duration fieldtype * fix: sider	2020-10-29 22:39:21 +05:30
rohitwaghchaure	445d23223b	Merge branch 'develop' into multiple-pricing-rules-are-not-applied	2020-10-29 22:25:19 +05:30
Anupam Kumar	e43f8f12d5	Merge branch 'develop' into project-timesheet	2020-10-29 22:03:31 +05:30
Anupam	9002904131	feat: added project link in timesheet form	2020-10-29 21:36:31 +05:30
Deepesh Garg	9c67629e28	fix: Ignore cancelled entries instock balance report (#23757) ... Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-29 19:51:57 +05:30
Nabin Hait	b7285fdcad	Merge branch 'develop' into prod-plan-status	2020-10-29 18:58:32 +05:30
Nabin Hait	2bb110b3d1	Merge branch 'develop' into fix-po-no-fetching	2020-10-29 18:57:33 +05:30
Marica	8f6bd851d3	chore: Show Toast alert feedback on Scanning Barcode (#23760)	2020-10-29 18:55:52 +05:30
Marica	bf54ea9976	chore: (Production Plan) Simplify and fix translation in message popup (#23753)	2020-10-29 18:54:36 +05:30
rohitwaghchaure	d0c2700c85	fix: subscription test case (#23763) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-10-29 18:52:16 +05:30
prssanna	71e5b60df1	refactor: refactor contextual print setting implementation	2020-10-29 14:19:34 +05:30
Saqib	825d79b31b	fix: pos profile has no attr 'show_only_available_items' (#23759)	2020-10-29 13:23:59 +05:30
Saqib	b193731158	fix: pos profile has no attr 'show_only_available_items' (#23758)	2020-10-29 13:23:50 +05:30
Marica	1b8a1cfed2	Merge branch 'develop' into prod-plan-status	2020-10-29 13:02:19 +05:30
Mohammad Hasnain Mohsin Rajan	55c78b17ba	fix(UAE VAT 201): change desk page record	2020-10-29 12:43:43 +05:30
Kenneth Sequeira	10f2468076	fix: make asset dashboard charts public (#23751)	2020-10-29 12:02:48 +05:30
Deepesh Garg	2004f64bcd	Merge pull request #23755 from deepeshgarg007/accounting_dimension_gl_fix_v13 ... fix: Do not allow Company as accounting dimension	2020-10-29 11:58:19 +05:30
Deepesh Garg	0dcb5887f3	fix: Do not allow Company as accounting dimension	2020-10-29 11:54:14 +05:30
Syed Mujeer Hashmi	c17cdd7c2e	fix: Fix for LMS Sign Up link (#23743) ... Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-10-29 11:10:06 +05:30
Mohammad Hasnain	eb3084b072	refactor(UAE VAT 201): break functions	2020-10-29 09:52:17 +05:30
Mohammad Hasnain	bf261a6c39	fix(UAE VAT 201): fix helper	2020-10-29 00:07:52 +05:30
Mohammad Hasnain	08846f6b11	refactor(UAE VAT 201): replace cartesian product to inner joins	2020-10-28 23:33:56 +05:30
Mohammad Hasnain	2c00549dfe	refactor(UAE VAT 201): Use frappe api instead sql	2020-10-28 22:54:56 +05:30
Deepesh Garg	ae6a51b83a	Merge pull request #23749 from deepeshgarg007/accounting_dimension_gl_fix ... fix: Do not allow Company as accounting dimension	2020-10-28 22:05:11 +05:30
Mohammad Hasnain Mohsin Rajan	6e9e6d2491	Merge branch 'develop' into UAE-VAT-Format	2020-10-28 21:06:11 +05:30
Rohit Waghchaure	0fa741b267	added test cases	2020-10-28 17:43:36 +05:30
Deepesh Garg	94a630c255	fix: Do not allow Company as accounting dimension	2020-10-28 17:15:14 +05:30
Saqib	0d5aff54c2	fix: pos register shows cancelled documents (#23745)	2020-10-28 17:09:07 +05:30
Saqib	a51d9e3259	fix: pos register shows cancelled documents (#23747)	2020-10-28 17:08:47 +05:30
Saqib	b088c783df	fix: item wise tax calculation (#23746)	2020-10-28 17:07:30 +05:30
Saqib	7d9dd3c628	fix: item wise tax calculation (#23744)	2020-10-28 17:07:10 +05:30
Rohit Waghchaure	a248dfb9a5	fix: multiple pricing rules are not working on selling side	2020-10-28 16:22:49 +05:30
Faris Ansari	bc6a2b2f9c	wip	2020-10-28 13:54:11 +05:30
Deepesh Garg	c9a6135d6c	fix: Interest accrual after loan topup	2020-10-28 13:38:15 +05:30
Marica	7496ac0fe2	Merge branch 'develop' into pr-dn-return	2020-10-28 11:54:01 +05:30
Rushabh Mehta	1dd54e457d	Merge pull request #23734 from rmehta/quality-form-cleanup ... fix(cleanup): Quality Module, cleanup of forms, dashboards etc.	2020-10-28 11:36:00 +05:30
Mohammad Hasnain	81f2efd9b0	chore(UAE VAT 201): Rename emirate to vat emirate	2020-10-28 10:28:25 +05:30
Marica	4326d21a79	Merge branch 'develop' into purchase-invoice-payment-terms	2020-10-27 18:40:20 +05:30
Rushabh Mehta	12a2e51e20	fix(minor): translation string encoding in quality_procedure.py	2020-10-27 18:38:44 +05:30
Rushabh Mehta	cf1428904a	fix(refactor): refactor tests, client side code	2020-10-27 17:36:30 +05:30
Marica	cf8698fb0b	Merge branch 'develop' into pr-dn-return	2020-10-27 15:34:51 +05:30
marination	67f2c82d90	chore: Test case for Payment Terms in PI from PR	2020-10-27 14:49:43 +05:30
Deepesh Garg	0db4d91c30	Merge pull request #23550 from nextchamp-saqib/add-acc-to-a-group-fix ... chore: validate is_group of child parent account	2020-10-27 13:54:17 +05:30
marination	fa085d7f4b	fix: Payment Terms not fetched in Purchase Invoice from Purchase Receipt	2020-10-27 13:18:30 +05:30
Marica	16a1f7e7e3	Merge branch 'develop' into link-to-mr	2020-10-27 11:49:35 +05:30
Andy Zhu	b44af32628	Update accounts_controller.py ... Updating Bin quantity based on doctype to optimize running efficiency.	2020-10-27 14:57:59 +13:00
Afshan	0a6e1b3503	fix: refactor	2020-10-26 21:23:31 +05:30
Afshan	bd987e56bc	fix: showing error for wrong filters. (#23726) ... * fix: showing error for wrong filters. * style: formatting translation	2020-10-26 19:37:33 +05:30
Saqib	fa5fe18b70	fix error message ... Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-10-26 19:27:02 +05:30
Deepesh Garg	13f4b3fc17	fix: Translation syntax	2020-10-26 19:01:36 +05:30
Deepesh Garg	a630de56e9	fix: Loan disbursement amount validation check	2020-10-26 18:53:56 +05:30
Deepesh Garg	64a4437b48	Merge branch 'develop' into add-acc-to-a-group-fix	2020-10-26 18:41:32 +05:30
Afshan	3f971b2371	fix: copying po no when mapping doc	2020-10-26 16:59:57 +05:30
Deepesh Garg	5b4742fd25	fix: Permission fixes for some doctypes	2020-10-26 16:56:05 +05:30
marination	689b77d1ed	fix: Don't show buttons if status is Completed	2020-10-26 16:28:39 +05:30
Rushabh Mehta	ea49e30bfd	fix(cleanup): cleaned up forms	2020-10-26 15:30:52 +05:30
marination	097b32fe67	feat: Close Production Plan	2020-10-26 15:27:37 +05:30
Deepesh Garg	d63fbd79f4	fix: Unaccrued interest from last accrual date instead of disbursement date	2020-10-26 14:20:55 +05:30
rohitwaghchaure	8ba05dc674	Merge branch 'develop' into skip-non-apply-tds-invoices-develop	2020-10-26 14:11:34 +05:30
Saqib	34873bf26b	fix: multiple pos issues (#23725) ... * fix: point of sale search * fix: pos fetches expired serial nos * fix: pos doesn't refresh on route change * fix: opening balances not set in opening entry * fix: remove debug statement * fix: invalid query if no serial no is reserved by pos invoice * chore: make new order btn primary * chore: filter warehouse by company * chore: add shortcuts for new order and email * fix: cannot fetch serial no if no batch control * chore: add shortcuts for menu items * feat: standard keyboard shortcuts for pos page * feat: display only items that are in stock * fix: empty point of sale page if opening entry dialog is closed * feat: conversion factor in pos item details * fix: show all invalid mode of payments * chore: show all items if allow negative stock is checked * fix: -ve amount set when changing mode of payment * fix: pos closing validations * fix: test * fix: non expired serial no fetching query * fix: cannot dismiss pos opening creation dialog * fix: transalation strings * fix: msgprint to throw * chore: use as_list in frappe.throw * chore: clean up pos invoice.js & .py * fix: codacy * fix: transalation syntax * fix: codacy * fix: set_missing_values called twice from pos page * fix: mode selector with double spaces * fix: do not allow tables in pos additional fields * fix: pos is not defined * feat: set mode of payments for returns * fix: remove naming series from pos profile * fix: error message * fix: minor bugs * chore: re-arrange pos closing entry detail fields * fix: sider & frappe linter * fix: more translation strings * fix: travis * fix: more translation strings * fix: sider * fix: travis * fix: unexpected end of string * fix: travis	2020-10-26 13:24:47 +05:30
Rohit Waghchaure	103ecec9d4	fixed translation syntax	2020-10-26 12:20:11 +05:30
Rohit Waghchaure	9caac6976c	fix: incorrect supplied qty error	2020-10-26 12:19:00 +05:30
Rohit Waghchaure	538d62b43d	fix: incorrect consumed qty if raw material with batch	2020-10-26 12:19:00 +05:30
rohitwaghchaure	4c688b71f3	fix: consumed qty logic for subcontracted raw materials (#23314) ... * fix: consumed qty logic for subcontracted raw materials * added test case * fix: sales order workflow test case	2020-10-26 12:19:00 +05:30
rohitwaghchaure	1cfa61628d	fix: incorrect calculation for consumed qty for subcontract item (#23257) ... * fix: incorrect calculation for consumed qty for subcontract item * added test case	2020-10-26 12:19:00 +05:30
Saqib	60212ff9b9	fix: multiple pos issues (#23347) ... * fix: point of sale search * fix: pos fetches expired serial nos * fix: pos doesn't refresh on route change * fix: opening balances not set in opening entry * fix: remove debug statement * fix: invalid query if no serial no is reserved by pos invoice * chore: make new order btn primary * chore: filter warehouse by company * chore: add shortcuts for new order and email * fix: cannot fetch serial no if no batch control * chore: add shortcuts for menu items * feat: standard keyboard shortcuts for pos page * feat: display only items that are in stock * fix: empty point of sale page if opening entry dialog is closed * feat: conversion factor in pos item details * fix: show all invalid mode of payments * chore: show all items if allow negative stock is checked * fix: -ve amount set when changing mode of payment * fix: pos closing validations * fix: test * fix: non expired serial no fetching query * fix: cannot dismiss pos opening creation dialog * fix: transalation strings * fix: msgprint to throw * chore: use as_list in frappe.throw * chore: clean up pos invoice.js & .py * fix: codacy * fix: transalation syntax * fix: codacy * fix: set_missing_values called twice from pos page * fix: mode selector with double spaces * fix: do not allow tables in pos additional fields * fix: pos is not defined * feat: set mode of payments for returns * fix: remove naming series from pos profile * fix: error message * fix: minor bugs * chore: re-arrange pos closing entry detail fields * fix: sider & frappe linter * fix: more translation strings * fix: travis * fix: more translation strings * fix: sider * fix: travis * fix: unexpected end of string * fix: travis Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-26 11:17:04 +05:30
Mohammad Hasnain	5953acab8b	chore(UAE VAT 201): cleanup	2020-10-25 15:43:21 +05:30
Nabin Hait	da301b0b7a	fix: merge conflict	2020-10-25 13:07:59 +05:30
Mohammad Hasnain	0ceae0bd66	feat(UAE VAT 201): emirate customizable	2020-10-25 13:06:42 +05:30
Frappe PR Bot	33881fd7e2	chore: Update translations (#23717) ... Co-authored-by: frappe <frappe@scw-dazzling-elgamal>	2020-10-25 12:36:35 +05:30
Mohammad Hasnain	0ac40c75aa	chore(UAE VAT): update tesr dependencies	2020-10-25 01:16:06 +05:30
Nabin Hait	ba1cca6b2d	fix: Show accounts in financial statements upto level 20 (#23718)	2020-10-24 22:00:32 +05:30
rohitwaghchaure	58016b07e0	Merge branch 'develop' into opportunity-status	2020-10-24 19:09:38 +05:30
rohitwaghchaure	8be296b343	Merge pull request #23675 from rohitwaghchaure/feat-added-balance-serial-no-column-develop ... feat: balance serial nos in stock ledger report	2020-10-24 19:04:31 +05:30
Rucha Mahabal	434791ed6e	feat: Therapy Plan Template (#23558) ... * feat: Therapy Plan Template * feat: Handle billing Therapy Plans created via Templates * feat: add dashboard to Therapy Plan Template * fix: codacy issues * fix: sider * fix: validate Therapy Session overlap * feat: Create Sales Invoice from Therapy Plan * fix: sider * chore: added tests for Therapy Plan Template * fix: test * fix: test Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-24 14:20:38 +05:30
Rucha Mahabal	5ecf6b34b0	Merge branch 'develop' into education-module-fixes	2020-10-24 00:27:24 +05:30
Rucha Mahabal	1c4d732873	fix: sider and translation issues	2020-10-24 00:21:05 +05:30
Rucha Mahabal	b3f81ad5b0	fix: allow future attendance marking for leave applications	2020-10-23 21:21:58 +05:30
Rucha Mahabal	4887b69946	feat: Inpatient Medication Order and Entry (#23473) ... * feat: Inpatient Medication Order * feat: Inpatient Medication Entry * feat: update medication orders on medication entry submission * feat: added custom fields for medication references in Stock Entry * feat: make stock entry if update stock is checked in IPMOE * fix: handle cancel event for Inpatient Medication Entry * fix(ux): add link and progress bar to dashboard * refactor(ux): Adding Medication Orders without linking to Patient Encounter * fix: make medication entry child table read only * fix: filter stock items during manual medication order creation * fix: codacy * chore: tests for Inpatient Medication Order * chore: tests for Inpatient Medication Entry * fix: code clean-up * fix: filter for inpatients in IPMO * fix: add datetime validations for IPME filters * fix: do not hardcode stock entry type Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-23 20:33:30 +05:30
Marica	6f45a86920	Merge branch 'develop' into debit-credit-opening-invoice-tool	2020-10-23 19:56:15 +05:30
Marica	97e065f94f	Merge branch 'develop' into link-to-mr	2020-10-23 19:47:18 +05:30
Marica	3ad9393ff8	fix: SO to PO flow improvement (#23357) ... * fix: SO to PO flow improvement * fix: Dont map shipping_address - shipping_address is a text field in SO and link field in PO - Drop shipping case handles its mapping - normal case doesnt need to map * fix: Hide/Add rows depending on Against Default Supplier * fix: Removed Default Supplier Select field from popup - removed Default Supplier Select field from popup - only loop through suppliers of selected items if via default supplier - only check for items in selected items * fix: Sales Order Drop Shipping Test * fix: (translation)Multi line to single line strings Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-23 19:40:55 +05:30
Marica	0bd576aa44	fix: RFQ UX fixes (#23382) ... * chore: RFQ UX fixes * fix: RFQ to SUpplier Quotation Dialog * fix: Remove 'No Quote' functionality - No Quote in Suppliers table is removed - It's use everywhere has been removed too (tests, server side files, DOM event) * chore: More Info section and Project field Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-23 19:38:30 +05:30
Deepesh Garg	c4be397954	Merge pull request #23439 from Mangesh-Khairnar/mpesa-integration ... feat: M-pesa integration	2020-10-23 19:35:52 +05:30
Saqib	b4448114cf	feat: opening invoice creation tool with background jobs (#23595) ... * feat: opening invoice creation tool with background jobs * fix: tests * fix: codacy * fix: sider * fix: codacy Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-23 19:32:37 +05:30
Marica	758a68da35	fix: Sequence Matcher shouldn't get None input (#23539) ... Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-23 19:26:43 +05:30
Deepesh Garg	2b3f8e0c3b	fix: Cancel repayment accrual interest entry on payment cancellation	2020-10-23 19:02:24 +05:30
Rucha Mahabal	b01334d2e1	fix: attendance cannot be marked outside of Academic Year validation	2020-10-23 18:32:33 +05:30
Michelle Alva	b39c17dd55	fix: Typo/Grammatical fixes in Settings (#23612) ... * fix(Stock Settings): Type/Grammatical fixes in Settings * fix: grammatical fixes in manufacturing settings * fix: typo fix in accounting settings * fix: typo fixes in HR settings * fix: typo fixes in buying settings * fix: typo fixes in Selling Settings * Update erpnext/accounts/doctype/accounts_settings/accounts_settings.json Co-authored-by: Sagar Vora <sagar@resilient.tech> * Apply suggestions from code review Co-authored-by: Sagar Vora <sagar@resilient.tech> * Apply suggestions from code review Co-authored-by: Sagar Vora <sagar@resilient.tech> * Update accounts_settings.json Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Rushabh Mehta <rmehta@gmail.com> Co-authored-by: Sagar Vora <sagar@resilient.tech>	2020-10-23 18:22:26 +05:30
rohitwaghchaure	93bbc52a68	feat: added sequence id in routing for the completion of operations sequentially (#23641) ... * feat: added sequence id in routing for the completion of operations sequentially * fix: translation syntax	2020-10-23 18:18:03 +05:30
Marica	9d94f785e9	fix: Hide Ex-Employees from Employee Tree and minor message UX (#23711) ... * fix: Hide Ex-Employees from Employee Tree and minor message UX * fix: translation syntax	2020-10-23 18:15:55 +05:30
Rucha Mahabal	8b4d33474e	fix: validation for attendance marked on future dates	2020-10-23 16:23:30 +05:30
Rucha Mahabal	6c3efbdb48	fix: filters for course and academic term fields	2020-10-23 16:11:40 +05:30
rohitwaghchaure	4eb87ea8e2	Merge pull request #23695 from rohitwaghchaure/fix-stock-entry-consumption-issue ... fix: incorrect backflush qty in manufacture entry	2020-10-23 15:43:43 +05:30
Mangesh-Khairnar	675f79920e	fix: consider the existing paid payment request for phone payment channel	2020-10-23 15:41:05 +05:30
Rohit Waghchaure	558879fad7	fix: Translation Syntax	2020-10-23 13:42:51 +05:30
Mangesh-Khairnar	e03a02d9c0	fix: show descriptive message for missing fields	2020-10-23 13:38:55 +05:30
marination	efcc489967	fix: Cashier Closing Type Issue	2020-10-23 11:55:03 +05:30
Deepesh Garg	ca6cb6433c	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_repayment_type_remove	2020-10-22 21:52:16 +05:30
Deepesh Garg	cd2c90451e	fix: Unaccrued interest after disbursal	2020-10-22 21:50:06 +05:30
Nabin Hait	f30c389e4d	Merge branch 'develop' into naming-series-proj	2020-10-22 21:46:13 +05:30
Nabin Hait	db474aea95	Merge branch 'develop' into link-to-mr	2020-10-22 21:45:07 +05:30
Nabin Hait	ed1553ea81	Merge branch 'develop' into mpesa-integration	2020-10-22 21:45:03 +05:30
Nabin Hait	c77ce99ce8	Merge branch 'develop' into UAE-VAT-Format	2020-10-22 21:44:55 +05:30
Nabin Hait	5778595d50	Merge branch 'develop' into debit-credit-opening-invoice-tool	2020-10-22 21:42:54 +05:30
Nabin Hait	9ff4a2ebd8	Merge branch 'develop' into feat-added-balance-serial-no-column-develop	2020-10-22 21:40:29 +05:30
prssanna	13c6e2f320	feat: contextual setting for print uom after quantity	2020-10-22 17:19:00 +05:30
Marica	3b1be2b1de	fix: Add Taxes if missing via Update Items (#23702) ... * fix: Add Taxes if missing via Update Items * chore: PO Test for adding tax row via Update Items * chore: SO Test for adding tax row via Update Items	2020-10-22 17:04:31 +05:30
rohitwaghchaure	e3ad5f0bc3	Merge pull request #23407 from deepeshgarg007/stock_entry_conversion_factor ... fix: Conversion factor fixes in Stock Entry	2020-10-22 16:58:06 +05:30
Saqib	a6ff664386	fix: cannot auto unlink payments for credit/debit notes (#23689)	2020-10-22 16:30:57 +05:30
prssanna	d7b704c90f	Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui	2020-10-22 15:39:47 +05:30
prssanna	b57b3c9f6c	feat: hook to fetch additional print settings in print view	2020-10-22 15:37:47 +05:30
rohitwaghchaure	cc5171a324	Merge branch 'develop' into stock_entry_conversion_factor	2020-10-22 15:20:32 +05:30
Saqib	52435ee291	Merge branch 'develop' into UAE-VAT-Format	2020-10-22 14:16:28 +05:30
Suraj Shetty	6a0eb61af3	fix: Set customer only if contact is present (#23704)	2020-10-22 14:05:58 +05:30
Rohit Waghchaure	fa842e8774	fix: incorrect backflush qty in manufacture entry	2020-10-22 13:35:27 +05:30
Michelle Alva	52514a30d7	feat: Add Integrations Settings in desk (#22857) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	2020-10-22 09:52:34 +05:30
Deepesh Garg	2c97244bad	fix: Test Cases	2020-10-22 09:34:27 +05:30
Mangesh-Khairnar	1a6d82a447	fix(payment-request): only consider paid transactions	2020-10-22 01:07:49 +05:30
Deepesh Garg	3f177bffac	fix: Add test for loan top up	2020-10-21 22:15:18 +05:30
Deepesh Garg	8f9bab79a7	fix: Update no copy fields	2020-10-21 19:03:13 +05:30
Deepesh Garg	13cbda110d	fix: Test Case	2020-10-21 16:11:52 +05:30
Mangesh-Khairnar	c8a04fec35	fix(mpesa-settings): add test cases to verify transactions	2020-10-21 14:07:00 +05:30
Shivam Mishra	5e00ed926c	feat: update icons	2020-10-21 12:30:22 +05:30
Shivam Mishra	9d468a8daf	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-10-21 11:38:31 +05:30
Deepesh Garg	2f65ab5355	fix: Validatiion for loan write off amountt	2020-10-21 10:40:59 +05:30
Saqib	4970386990	Merge branch 'develop' into UAE-VAT-Format	2020-10-20 18:38:44 +05:30
Mohammad Hasnain	8796567b42	chore(UAE VAT 201): add puctuation	2020-10-20 16:35:28 +05:30
Deepesh Garg	ce95bc2ce0	Merge pull request #23691 from nextchamp-saqib/fix-#214 ... fix: '>' not supported between instances of 'str' and 'int'	2020-10-20 14:17:55 +05:30
Mohammad Hasnain	33e9a1ab31	refactor(UAE VAT 201): solve linting issues	2020-10-20 13:04:38 +05:30
Saqib Ansari	903055b7b6	fix: '>' not supported between instances of 'str' and 'int'	2020-10-20 11:59:06 +05:30
Mohammad Hasnain	6a24da4efd	refactor(UAE VAT 201): break functions	2020-10-20 11:53:06 +05:30
Rohit Waghchaure	09572f10f8	fix: overproduction, not allowed to transfer extra materials	2020-10-20 11:01:36 +05:30
Mohammad Hasnain	c08591124c	chore(UAE VAT 21): solve merge conflicts	2020-10-20 10:17:48 +05:30
Rohit Waghchaure	6471912216	fix: not able to do overproduction	2020-10-20 10:02:01 +05:30
Mohammad Hasnain	75ccb62d46	Merge branch 'develop' into UAE-VAT-Format	2020-10-20 09:40:44 +05:30
Mohammad Hasnain	78ec254da4	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2020-10-20 09:39:01 +05:30
Mohammad Hasnain	234036df32	chore(uae vat 201): solve travis issues	2020-10-20 07:42:10 +05:30
Mohammad Hasnain	853fd03f49	feat(uae vat 201): fix linter issues	2020-10-19 22:35:16 +05:30
Mohammad Hasnain	33cdfdfb7f	feat(UAE VAT 201): Add tests for report	2020-10-19 20:48:43 +05:30
Mohammad Hasnain	c1b8004757	feat(UAE VAT 21): claimable to recoverable	2020-10-19 20:47:56 +05:30
Mangesh-Khairnar	5c29eb08c4	Merge branch 'develop' of https://github.com/frappe/erpnext into mpesa-integration	2020-10-19 18:29:46 +05:30
Mangesh-Khairnar	ebb8ee3dc6	fix(payment gateway account): add patch to set the payment channel as email	2020-10-19 18:27:40 +05:30
Mohammad Hasnain	32eb9a7893	feat(UAE VAT 201): claimable to recoverable	2020-10-19 17:58:50 +05:30
Joseph Marie Alba	8115be58a3	fix: Posting Date bug in load_defaults (#23415) ... this.frm.posting_date is always invalid and should be changed to this.frm.doc.posting_date The effect of this bug fix is, a default Posting Date value may now be set in Custom Script's onload event, and the default value will be honored. Example: (Assuming posting date has been included in standard filter) ``` frappe.ui.form.on('Journal Entry', { before_load(frm) { var posting_date = $("input[data-fieldname='posting_date']")[0].value posting_date = moment(posting_date)._d frm.set_value('posting_date', posting_date ) } }) ``` Without the fix, the posting date will always be today's date. With the bug fix, the default value for posting date which is taken from the posting date's Standard Filter vale is honored. Co-authored-by: Sagar Vora <sagar@resilient.tech>	2020-10-19 17:02:04 +05:30
Rucha Mahabal	174019a838	fix: Student Admission and Student Applicant fixes (#23515) ... * fix: student admission list portal styling * fix: added basic validations to Student Admission DocType * fix: show program description and apply button for every program * fix: don't show apply now button if admissions have not started * fix: fetch admission details in student applicant web form Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-19 17:00:56 +05:30
Deepesh Garg	8859b71956	fix: Check for backdated validation only for transaction company (#23639) ... * fix: Check SLE only for transaction company * fix: Add tests * fix: Move backdated entry validation from transaction base to stock ledger entry * chore: Add tests Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-19 16:56:45 +05:30
Afshan	e0cb6c3b9d	fix: removed extra space from label "Rate" (#23683)	2020-10-19 16:55:20 +05:30
rohitwaghchaure	3a17147a32	refactor: book loss amount in the COGS instead of stock received but not billed (#23671)	2020-10-19 16:54:11 +05:30
Glen Whitney	f5a8dc0f9c	fix(Bank Reconciliation): update/merge CR/DR journal entry search (#23629) ... * fix(Bank Reconciliation): update/merge CR/DR journal entry search Prior to this commit, the debit journal entry search (for credit-side Bank Transaction entries) and the corresponding credit journal entry search had diverged, with the latter working but the former not working. Thus, the search for journal entries matching a credit Bank Transaction (for the purposes of reconciliation) was never returning any matching journal entries, making reconciliation difficult. To fix this, this commit not only updates the debit journal entry search, but takes advantage of the fact that the two SQL queries for the two sides (debit/credit) differ only by the word "debit" or "credit," to merge the code for the two queries, making the code more DRY and hopefully reducing the chance of similar bugs occurring in the future. * fix: message translation Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-19 16:49:55 +05:30
Shivam Mishra	2c2e7297ae	feat: update accounts onboarding	2020-10-19 14:44:02 +05:30
Shivam Mishra	8261df29c4	feat: update splash logo	2020-10-19 13:52:35 +05:30
Saqib	896a0cc1f7	Merge branch 'develop' into add-acc-to-a-group-fix	2020-10-19 11:55:12 +05:30
rohitwaghchaure	2fbeb7c1dd	refactor: added new filters in the Batch-wise balance history report (#23676) ... * refactor: added new filters in the Batch-wise balance history report * fix: added semicolon Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-19 11:37:54 +05:30
Frappe PR Bot	083f3fd981	chore: Update translations (#23677) ... Co-authored-by: frappe <frappe@scw-dazzling-elgamal> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-19 11:19:27 +05:30
Rucha Mahabal	96bd65e203	fix: duplicate validation for Course Enrollment (#23659) ... * fix: duplicate validation for Course Enrollment * fix: clean-up failing tests	2020-10-19 10:41:25 +05:30
rohitwaghchaure	5d6686bd8c	Fixed stock ageing report data develop (#23673) ... * fix: stock ageing report * Update stock_ageing.py	2020-10-19 10:39:20 +05:30
rohitwaghchaure	21bf5e9b8e	Fixed incorrect operation time calculation develop (#23674) ... * fix: incorrect operation time calculation for batch size * Update test_work_order.py	2020-10-19 10:38:48 +05:30
Deepesh Garg	8cd8dbe15d	fix: Add write off test	2020-10-18 22:26:09 +05:30
Deepesh Garg	9945ccc0cc	fix: Write Off amount handling in Loan accrual and closure	2020-10-18 22:25:24 +05:30
Rucha Mahabal	c3b1aef9f9	fix(minor): msgprint not defined in POS Invoice (#23680) ... * fix(minor): msgprint not defined in POS Invoice * fix: translation friendly syntax	2020-10-18 19:28:26 +05:30
Deepesh Garg	c0e24735e3	feat: Add loan write off doctype	2020-10-17 22:31:36 +05:30
Faris Ansari	c6f4e84a45	Merge pull request #23640 from abhishekbalam/address_customisation	2020-10-16 18:21:09 +05:30
Marica	569e218aa0	Merge pull request #23666 from marination/payment-reco-mandatory-check ... fix: Payment Reconciliation client side validations	2020-10-16 18:06:16 +05:30
Rohit Waghchaure	e6a29cc33a	fix: performance issue while adding template item in the cart	2020-10-16 17:59:54 +05:30
Rohit Waghchaure	76fafe8842	feat: balance serial nos in stock leder report	2020-10-16 17:58:54 +05:30
Rohit Waghchaure	c70cc0d950	fix: tds calculation, skip invoices with "Apply Tax Withholding Amount" has disabled	2020-10-16 17:43:36 +05:30
rohitwaghchaure	e30397bf2e	Merge pull request #23668 from rohitwaghchaure/incorrect-work-order-qty-againt-production-plan-develop ... fix: production plan incorrect work order qty (#23264)	2020-10-16 17:41:25 +05:30
Deepesh Garg	eb3983ec6c	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_repayment_type_remove	2020-10-16 17:31:38 +05:30
Marica	ca5ad076d5	Merge branch 'develop' into link-to-mr	2020-10-16 16:49:38 +05:30
marination	359778e235	chore: Code cleanup, reduce redundancy	2020-10-16 16:47:23 +05:30
rohitwaghchaure	6646c524e6	Merge pull request #23670 from rohitwaghchaure/enabled-no-copy-for-bill-date-devlop ... refactor: enabled no copy property for Supplier Invoice Date to due date validation	2020-10-16 16:45:56 +05:30
rohitwaghchaure	4eaa74c4f5	Merge pull request #23669 from rohitwaghchaure/not-able-to-make-material-request-from-so-develop ... fix: not able to make material request from SO	2020-10-16 16:43:45 +05:30
Marica	3f7333af7f	Merge branch 'develop' into payment-reco-mandatory-check	2020-10-16 16:03:59 +05:30
marination	b14ffc4349	fix: Missing semicolon	2020-10-16 16:04:56 +05:30
Faris Ansari	be0fcbea68	fix: Dont add Contact link if is company address	2020-10-16 15:55:25 +05:30
Faris Ansari	22bcad9dc7	fix: Cleanup code	2020-10-16 15:28:12 +05:30
Rohit Waghchaure	3cdaa92582	refactor: enabled no copy property for Supplier Invoice Date to avoid due date validation	2020-10-16 15:26:27 +05:30
Rohit Waghchaure	2ce67b0ef9	fix: not able to make material request from SO	2020-10-16 15:21:52 +05:30
rohitwaghchaure	f01856d7a9	fix: production plan incorrect work order qty (#23264) ... * fix: production plan incorrect work order qty * added test case * Update test_production_plan.py	2020-10-16 15:19:23 +05:30
Shivam Mishra	5418818683	feat: add tour for account settings	2020-10-16 14:24:22 +05:30
marination	e9b04dc727	fix: Payment Reconciliation client side validations	2020-10-16 12:36:13 +05:30
Saqib	2f71927af8	fix: fuel expense amount of vehicle log (#23632) ... * fix: fuel expense amount of vehicle log * fix: undefined var employee_id in test * fix: test	2020-10-16 12:32:59 +05:30
Mangesh-Khairnar	c66fce4965	fix: reload current pos doc after updating the information via callback	2020-10-16 12:03:08 +05:30
Mangesh-Khairnar	cab5d22ef5	fix: add a realtime publish to refresh the dashboard content	2020-10-16 11:38:07 +05:30
prssanna	5ee7bca185	Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui	2020-10-16 11:32:10 +05:30
prssanna	12d4be7f3f	feat: icons in leaderboard	2020-10-16 11:31:47 +05:30
Saqib Ansari	de505631a6	fix: codacy	2020-10-16 11:30:34 +05:30
Saqib Ansari	1dec68e8e4	fix: transalation syntax	2020-10-16 10:47:29 +05:30
Deepesh Garg	775e689ba9	fix: Add tests	2020-10-15 22:09:05 +05:30
Deepesh Garg	01a7297f69	Merge branch 'develop' of https://github.com/frappe/erpnext into stock_entry_conversion_factor	2020-10-15 17:13:29 +05:30
Rohit Waghchaure	5f465394a7	fix: serial no field is blank in stock reconciliation	2020-10-15 15:56:50 +05:30
rohitwaghchaure	79c1c4e3fb	Merge pull request #23398 from anupamvs/quality-procedure-v13 ... fix: quality procedure parent	2020-10-15 15:52:22 +05:30
Shivam Mishra	cb8457b9ae	feat: add description to Accounts onboarding	2020-10-15 13:53:12 +05:30
Abhishek Balam	349fcfd6a5	fix: set default filters on unchecking box, code cleanup	2020-10-15 12:21:43 +05:30
Wolfram Schmidt	3959ed5bef	Update payment_term.json (#23644) ... added descriptions to fields to clarify input.	2020-10-14 22:48:46 +05:30
Deepesh Garg	ddccec4f5d	Merge pull request #23643 from deepeshgarg007/payment_reco_cancel ... fix: Do not get cancelled vouchers in Payment Reconciliation	2020-10-14 22:09:08 +05:30
Deepesh Garg	37c2ed269e	fix: Do not get cancelled vouchers in Payment Reconciliation	2020-10-14 21:47:43 +05:30
Abhishek Balam	89419c9a30	fix: move get_shipping_address() from frappe to erpnext and fix references	2020-10-14 20:09:05 +05:30
Abhishek Balam	2f528c1c73	fix: gettext import and changed function order in address.py	2020-10-14 19:48:57 +05:30
Abhishek Balam	c0215d257c	Merge branch 'develop' into address_customisation	2020-10-14 19:33:16 +05:30
Abhishek Balam	6e9e7b4c7a	fix: serverside validation overrides	2020-10-14 19:31:37 +05:30
Abhishek Balam	38b26c8f3e	fix: added semicolons	2020-10-14 18:24:51 +05:30
rohitwaghchaure	f8ce64c0ca	Merge pull request #23443 from marination/rfq-email ... feat: Supplier Email Preview in RFQ	2020-10-14 18:16:59 +05:30
Abhishek Balam	346ca568b7	fix: set company link in address when is_your_company_address is set	2020-10-14 18:11:04 +05:30
Mohammad Hasnain	b9dc13294d	chore(UAE VAT 201) solve translations issues	2020-10-14 16:56:26 +05:30
Nabin Hait	a2d6f254c5	Merge branch 'develop' into add-acc-to-a-group-fix	2020-10-14 16:34:56 +05:30
Afshan	9e08b21e0b	fix: removing unused imports (#23633)	2020-10-14 15:44:52 +05:30
Saqib	577a7fe01d	fix: stock & account balance difference in fraction (#23635)	2020-10-14 15:44:30 +05:30
Marica	1cdb9b5b39	Merge branch 'develop' into debit-credit-opening-invoice-tool	2020-10-14 14:26:22 +05:30
marination	b5d16a82eb	fix: Dont overrule Item Price via Pricing Rule Rate if 0	2020-10-14 14:05:54 +05:30
Mohammad Hasnain	dfc3993cec	chore(UAE VAT 21): rename report	2020-10-14 12:21:36 +05:30
Anupam	d8a002cd8e	Merge branch 'opportunity-status' of https://github.com/anupamvs/erpnext into opportunity-status	2020-10-14 11:48:42 +05:30
Raffael Meyer	d1863e6f9e	fix: Chart of Accounts (#23530) ... * fix: Chart of Accounts * fix: Chart of Accounts with lower case "of" Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-14 10:29:53 +05:30
Anupam Kumar	31417864cb	fix: project value is missing from procurement-tracker (#23549) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-10-14 10:29:25 +05:30
Frappe PR Bot	d8ddc321f8	chore: Update translations (#23577) ... Co-authored-by: frappe <frappe@scw-dazzling-elgamal> Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-10-14 10:28:21 +05:30
Mohammad Hasnain Mohsin Rajan	abf628c95d	Merge branch 'develop' into UAE-VAT-Format	2020-10-14 00:26:57 +05:30
rohitwaghchaure	cb791330f6	Merge branch 'develop' into quality-procedure-v13	2020-10-13 23:39:45 +05:30
Rucha Mahabal	f625da2b8b	Merge branch 'develop' into enrollment-fixes	2020-10-13 23:24:42 +05:30
rohitwaghchaure	4d93bfebd8	Merge pull request #23622 from AfshanKhan/fix-billing-summary-report-precision ... fix: setting user defined precision instead of 2	2020-10-13 22:46:02 +05:30
Rucha Mahabal	ff0917358c	fix: test	2020-10-13 22:39:05 +05:30
Saqib	639eea142f	Merge branch 'develop' into add-acc-to-a-group-fix	2020-10-13 21:42:22 +05:30
Deepesh Garg	8a7886ac60	Merge pull request #23621 from frappe/address_template_luxembourg ... feat: add address template for luxembourg	2020-10-13 21:31:51 +05:30
Deepesh Garg	71a58a8fd0	Merge pull request #23605 from marination/item-link-formatter ... fix: Item Link Formatter Behaviour	2020-10-13 21:26:00 +05:30
Sun Howwrongbum	93da52941e	fix: consider rounded_total in returns (#23609) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-10-13 21:23:26 +05:30
Deepesh Garg	06268e5f57	Merge pull request #23623 from kennethsequeira/italy-fy ... fix: Fiscal Year and Tax Rates for Italy	2020-10-13 20:29:51 +05:30
Shivam Mishra	55f52e8135	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-10-13 20:09:22 +05:30
rohitwaghchaure	db0fefd92c	Merge pull request #23614 from aakvatech/patch-3 ... feat: Add company and correct filter in bank reconciliation statement	2020-10-13 19:59:31 +05:30
rohitwaghchaure	2a8a2215d0	Merge pull request #23620 from anupamvs/lead-address ... fix: displaying mandatory address field in Lead form	2020-10-13 19:54:44 +05:30
Kenneth Sequeira	3eec4e61ab	fix: GST rates for Australia	2020-10-13 19:23:48 +05:30
Kenneth Sequeira	1b329aaa7b	fix: json format fixes	2020-10-13 19:10:09 +05:30
Afshan	c359d3528f	fix: setting user precision instead of default	2020-10-13 18:54:54 +05:30
Deepesh Garg	54c898708b	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_repayment_type_remove	2020-10-13 18:11:45 +05:30
Anupam Kumar	67a7279d1f	Merge branch 'develop' into opportunity-status	2020-10-13 18:11:23 +05:30
Anupam	73d944da21	fix: review changes	2020-10-13 18:11:05 +05:30
Deepesh Garg	66967c6d45	fix: Loan Security unpledge on loan cancel	2020-10-13 18:10:51 +05:30
Anupam	7db38058f3	fix: displayings mandatory address field in Lead form	2020-10-13 17:33:58 +05:30
Rucha Mahabal	fc8ced9958	Merge branch 'develop' into enrollment-fixes	2020-10-13 17:28:39 +05:30
Mangesh-Khairnar	51228b5ee3	fix: make response handling more descriptive	2020-10-13 17:10:16 +05:30
barredterra	9aa3e7a37d	feat: address template for luxembourg	2020-10-13 13:35:33 +02:00
Marica	43d3176d62	Merge branch 'develop' into patch-3	2020-10-13 17:01:18 +05:30
Marica	50b708f615	Merge branch 'develop' into pr-dn-return	2020-10-13 16:57:11 +05:30
Marica	0ed3e947ba	Merge branch 'develop' into rfq-email	2020-10-13 16:55:25 +05:30
Marica	6f819d797b	Merge branch 'develop' into debit-credit-opening-invoice-tool	2020-10-13 16:54:39 +05:30
Marica	9cd79b6859	Merge branch 'develop' into item-link-formatter	2020-10-13 16:54:28 +05:30
Marica	c5e139a542	fix: Travis (#23606) ... * fix: Rename `make_supplier_quotation` to `make_supplier_quotation_from_rfq` in missing places * fix: Item Barcode and Test * fix: Over Receipt on subcontracting test * fix: POS Invoice and Loyalty Program Tests * fix: POS serialized item test and subcontracting exploded items in PO * fix: Subcontracting test considering sourced_by_supplier items * fix: Make only one Additonal Salary List with overwrite set	2020-10-13 16:53:10 +05:30
Anupam	3245eaaeb0	fix: displayings mandatory address field in Lead form	2020-10-13 15:35:10 +05:30
Marica	ae1c65cde7	Merge branch 'develop' into item-link-formatter	2020-10-13 15:05:53 +05:30
Anupam	528a75ae9b	fix: review changes	2020-10-13 11:46:52 +05:30
justmejust	ed779a416c	Update ar.csv (#23490) ... these changes made to the file is critical and important for Arabic user of the this software .the changes made to make appropriate and more correct meaning fro example in the Blanket Orders from Costumers the previous translation meaning امر بطانية) ) which mean you have an order to get ta Blanket which used when you want to sleep. so i decided to make this changes and will continue update this translation file in the future.	2020-10-13 11:46:02 +05:30
aakvatech	617892db20	feat: Add company and correct filter in bank statement reconciliation report filters ... If you have multi company scenario and many bank accounts that are no longer active, then it becomes difficult in bank statement reconciliation report to filter the account to reconcile and it also shows disabled accounts so futher confusion is created. https://github.com/frappe/erpnext/issues/23613	2020-10-13 08:18:59 +03:00
Deepesh Garg	8c13fded17	fix: Add unaccrued interest in interest amount for loan closure	2020-10-13 09:23:04 +05:30
marination	5b790a0095	fix: Convert dates to datetime.date before comparing in Holiday List	2020-10-13 02:37:55 +05:30
Kenneth Sequeira	968f61d8ba	fix: add multiple VAT rates for Italy	2020-10-13 00:25:46 +05:30
Kenneth Sequeira	56d305b966	fix: update italy fiscal year	2020-10-13 00:07:52 +05:30
Marica	978e16481e	Merge branch 'develop' into debit-credit-opening-invoice-tool	2020-10-12 21:17:22 +05:30
marination	824f48fd23	fix: Item Link Formatter Behaviour	2020-10-12 20:08:03 +05:30
Anupam Kumar	71c02a6e89	Merge branch 'develop' into subscription-invoice-issue	2020-10-12 19:41:31 +05:30
Raffael Meyer	0975b961f9	Merge branch 'develop' into validate_regional_germany	2020-10-12 15:08:58 +02:00
Saqib	3daad224ad	fix: cannot merge pos invoice if validate selling price is checked (#23593) ... * fix: cannot merge pos invoice if validate selling price is checked * fix: validate selling price * fix: test * chore: add test * fix: error message	2020-10-12 18:31:23 +05:30
Marica	9cc05bb83e	Merge branch 'develop' into rfq-email	2020-10-12 18:02:15 +05:30
rohitwaghchaure	4164d08d17	Merge pull request #23323 from marination/supplier-quotn-comparison ... feat: Supplier Quotation Comparison - v3	2020-10-12 17:55:15 +05:30
Marica	41067e204c	Merge branch 'develop' into print-uom-after-quantity-patch	2020-10-12 17:32:29 +05:30
Marica	6d935d4e48	Merge branch 'develop' into company-issue	2020-10-12 17:25:12 +05:30
Marica	14b9c79ddc	Merge branch 'develop' into supplier-quotation-ux	2020-10-12 17:16:28 +05:30
Saqib	b332c5f06f	fix: sales invoice series gets overwritten with pos invoice series (#23479) ... * fix: sales invoice series gets overwritten with pos invoice series * chore: show is consolidated only if sales invoice is pos	2020-10-12 17:10:37 +05:30
Saqib	ebb0a6266a	fix: last purchase rate in item prices report (#23506) ... * fix: last purchase rate in item prices report * fix: last purchase rate in item prices report * fix: last purchase rate in item prices report * chore: fetch last purchase rate from update stock purchase invoices	2020-10-12 17:09:09 +05:30
Saqib	ebbe285872	feat: (report) POS Register (#23313) ... * feat: pos register report * feat: group by fields in pos register * chore: add paid amount column * fix: (minor) remove redundant group by label	2020-10-12 17:02:31 +05:30
rohitwaghchaure	a060f8c00b	Merge pull request #23524 from michellealva/employee_exit ... fix(Employee): Field level change in Exit section	2020-10-12 16:23:54 +05:30
rohitwaghchaure	14e7656a57	Merge pull request #23588 from kevingdc/fix/asset-update-maintenance-status ... fix: Asset status after maintenance or repair	2020-10-12 16:13:29 +05:30
Marica	e9f0268d32	Merge branch 'develop' into item-attribute-validation-on-non-template-item	2020-10-12 15:26:34 +05:30
rohitwaghchaure	a57ad47cb8	Merge pull request #23538 from kennethsequeira/spellcheck ... chore: spell fixes for Condition	2020-10-12 15:25:23 +05:30
Marica	aeba75cd08	Merge branch 'develop' into mr-ux	2020-10-12 15:17:32 +05:30
rohitwaghchaure	4e59abf0bf	Merge pull request #23583 from anupamvs/item-price ... fix: can't save item price after adding child table	2020-10-12 15:15:50 +05:30
Rushabh Mehta	2bef986f14	Merge pull request #23450 from michellealva/jc ... fix: Change Error Message in Work Order	2020-10-12 15:07:21 +05:30
Glen Whitney	6ec3dc5453	fix(asset): cannot create asset if cwip disabled and account not set (#23580) ... * Never add an asset GL entry if CWIP is not enabled * fix: asset purchase with purchase invoice * chore: allow enable cwip accounting only if cwip account is set * fix: cannot create asset if cwip disabled and account not set Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>	2020-10-12 14:56:55 +05:30
Kevin Chan	f6bcd5c2b2	test: Add test case for duplicate checking	2020-10-12 16:57:33 +08:00
Kevin Chan	58389ebd40	style: Collapse whitespace	2020-10-12 15:20:11 +08:00
Deepesh Garg	15d46040ff	fix: Do not consider opening entries for TDS calculation (#23597)	2020-10-12 12:39:08 +05:30
Anupam	efc3e1fa62	fix: Payment Schedule not fetching	2020-10-12 12:15:49 +05:30
marination	03975a692e	fix: Perform Item Attribute Value Validation on Variants Only	2020-10-12 12:03:07 +05:30
Kevin Chan	39bed3a65e	fix: Add null or empty checking to validation ... This commit adds null or empty checking in the **Item Price** DocType's `check_duplicates()`. This was done to fix a bug where some prices are shown to be duplciates even though they aren't because they don't have values in some fields.	2020-10-12 11:42:05 +08:00
Kevin Chan	a322f0d0b3	chore: Fix error message grammar	2020-10-12 11:38:55 +08:00
Kevin Chan	7a86a77322	fix: Asset status after maintenance or repair ... Fix a bug where an **Asset**'s status is not being set to what it was previously after an **Asset Repair** or **Asset Maintenance**.	2020-10-12 11:30:36 +08:00
Deepesh Garg	c9ebef4d30	Merge pull request #23567 from nextchamp-saqib/restrict-future-posting ... chore: do not allow future transactions	2020-10-11 20:55:38 +05:30
Deepesh Garg	a034311b1b	fix: Acrual type	2020-10-11 20:52:02 +05:30
Anupam	2be23309bb	fix: can't add child table in item price	2020-10-11 14:14:50 +05:30
Mohammad Hasnain	ac451b3a54	feat(UAE VAT 21): Move standard rated expense from Sales invoice to Purchase invoice	2020-10-11 01:40:22 +05:30
Deepesh Garg	d86b7c5537	fix: Remove repayment type	2020-10-11 00:37:34 +05:30
Deepesh Garg	6dccf79250	fix: Add accrual type and penalty field in interest accrual	2020-10-10 23:32:57 +05:30
Deepesh Garg	6d27adccfc	fix: Button to close loan	2020-10-10 23:28:39 +05:30
Deepesh Garg	51c6cf692e	fix: Add method for loan closure	2020-10-10 23:20:36 +05:30
Mohammad Hasnain	fc2ace1a31	Merge branch 'develop' into UAE-VAT-Format	2020-10-10 22:06:06 +05:30
Mohammad Hasnain	72bcb56368	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2020-10-10 22:04:16 +05:30
Saqib Ansari	3d91d48b77	fix: validate only for stock transactions	2020-10-10 21:56:50 +05:30
rohitwaghchaure	ad9db89514	Merge pull request #23573 from deepeshgarg007/opening_jv ... fix: Opening Journal Entry via Data Import	2020-10-10 13:16:41 +05:30
Deepesh Garg	e9c1098f5f	Merge pull request #23566 from michellealva/sales_team ... fix: Change name of Sales Team table	2020-10-10 12:14:00 +05:30
rohitwaghchaure	1bcd84450c	Merge pull request #23560 from deepeshgarg007/regional_doctypes_desk ... fix: Add lower deduction certificate in desk page	2020-10-10 11:23:26 +05:30
rohitwaghchaure	01e23264a6	Merge pull request #23557 from KanchanChauhan/issue#23475-2 ... feat: Supplier Sourced Items in BOM	2020-10-10 11:17:53 +05:30
rohitwaghchaure	5065f8ac83	Merge pull request #23545 from tundebabzy/develop ... fix: pass self.flags.ignore_permissions to the ignore_permissions	2020-10-10 11:11:57 +05:30
rohitwaghchaure	04ddf24ffe	Merge pull request #23572 from marination/payment-entry-list-view ... fix: Check if list view standard filter exists in Payment Entry	2020-10-10 11:09:31 +05:30
rohitwaghchaure	9333a1dd54	Merge pull request #23570 from nextchamp-saqib/si-dashboard-fix ... fix: (revert) Add Delivery Note Count in Sales Invoice Dashboard	2020-10-10 11:08:37 +05:30
rohitwaghchaure	ea8ea4abb5	Merge pull request #23569 from marination/prod-order-reference-in-item ... fix: Remove Production Order reference from Item Validation	2020-10-10 11:03:26 +05:30
Kanchan Chauhan	654c36ea99	feat: Supplier Sourced Items in BOM	2020-10-09 22:05:03 +05:30
Deepesh Garg	2676f96203	fix: Opening Journal Entry via Data Import	2020-10-09 21:58:38 +05:30
marination	07731c7735	fix: Check if list view standard filter exists in Payment Entry	2020-10-09 21:44:23 +05:30
Saqib	56fea7d243	fix: update items after submission ignores precision (#23491) ... * fix: update items after submission ignores precision * chore: add test	2020-10-09 21:19:25 +05:30
Saqib Ansari	d927c8efba	fix: (revert) Add Delivery Note Count in Sales Invoice Dashboard	2020-10-09 21:00:33 +05:30
marination	bd6d5eb5ac	fix: Remove Production Order reference from Item Validation	2020-10-09 20:57:17 +05:30
michellealva	1bc7fc41a5	fix: Change name of Sales Team table	2020-10-09 16:01:13 +05:30
Saqib Ansari	776d8f72cf	chore: do not allow future transactions	2020-10-09 15:36:11 +05:30
Anupam	22dc42efb9	fix: error log while creating company	2020-10-09 14:58:39 +05:30
Tunde Akinyanmi	f2b12a3b9c	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2020-10-09 07:20:19 +01:00
Rucha Mahabal	a6dc7833f6	Merge pull request #23537 from michellealva/missing_links ... fix: Add links in Stock desk page	2020-10-09 11:46:14 +05:30
Deepesh Garg	5e6ea36938	fix: Add lower deduction certificate in desk page	2020-10-08 20:32:36 +05:30
marination	4be5b5c891	fix: Handle missing Account and Item in Opening Invoice Creation Tool	2020-10-08 19:51:42 +05:30
Rohit Waghchaure	a86cab0bb2	fix: added patch to make custom field 'Print UOM after Quantity'	2020-10-08 16:41:23 +05:30
Deepesh Garg	c837b5f48c	Merge pull request #23014 from abhishekbalam/pricing_rule_on_condition ... feat(Accounts): Add Condition Field In Pricing Rule	2020-10-08 16:32:21 +05:30
Abhishek Balam	6d1af84fef	Merge branch 'develop' into budget	2020-10-08 16:23:36 +05:30
Deepesh Garg	8242da6310	Merge branch 'develop' of https://github.com/frappe/erpnext into stock_entry_conversion_factor	2020-10-08 16:23:34 +05:30
Saqib Ansari	3f28fb19aa	chore: validate is_group of child parent account before auto creating an account	2020-10-08 14:57:27 +05:30
rohitwaghchaure	242bae4a81	Merge pull request #23548 from michellealva/selling_links ... fix(Selling): Add missing reports on desk	2020-10-08 11:24:46 +05:30
Saqib	22b4c86a38	fix: cannot merge pos invoices with inclusive tax (#23541) ... * fix: cannot merge pos invoices with inclusive tax * fix: item rate calculation	2020-10-08 11:23:21 +05:30
michellealva	38aee6e3cb	fix(Selling): Add missing reports on desk	2020-10-08 10:24:11 +05:30
Tunde Akinyanmi	4010196488	fix: pass self.flags.ignore_permissions to the ignore_permissions ... argument of Address and Contact controller	2020-10-08 02:25:09 +01:00
Kenneth Sequeira	0b84a6399b	fix: remove default nationality as Indian	2020-10-07 23:14:27 +05:30
Kenneth Sequeira	be0ebc5085	spell fixes for Condition	2020-10-07 20:47:12 +05:30
Marica	71db253b86	Merge branch 'develop' into fix_title_customer_name	2020-10-07 20:27:32 +05:30
Abhishek Balam	ebf53a7f25	fix(HR): Appraisal form Enhancements (#23500) ... * fix: remove total score button * Removing conflicts	2020-10-07 19:59:26 +05:30
michellealva	3525ddabc5	fix: Add links in Stock desk page	2020-10-07 19:02:19 +05:30
barredterra	242579b77c	fix: use party name as title	2020-10-07 14:34:21 +02:00
michellealva	a9c2401a2d	fix: Typo in Accounts Setings	2020-10-07 15:13:57 +05:30
Abhishek Balam	937308854a	Merge branch 'develop' into pricing_rule_on_condition	2020-10-07 13:35:53 +05:30
Raffael Meyer	2acfc2a034	Merge branch 'develop' into validate_regional_germany	2020-10-06 16:53:52 +02:00
michellealva	203585f292	fix(Employee): Field level change in Exit section	2020-10-06 16:00:39 +05:30
michellealva	2e425efae8	fix: blank option in the beginning	2020-10-06 15:15:29 +05:30
michellealva	a2aae5644e	fix(Budget): Change options in select field	2020-10-06 15:02:01 +05:30
Mangesh-Khairnar	faa0cce7a7	fix: pass mobile number to generate the stk push	2020-10-06 13:58:54 +05:30
Deepesh Garg	f183dd6d3a	Merge branch 'develop' into tax_fetch_quote	2020-10-06 13:27:28 +05:30
rohitwaghchaure	59ee417d31	Merge pull request #23483 from marination/item-attr ... fix: Handle Blank from/to range in Numeric Item Attribute	2020-10-06 12:00:26 +05:30
Mangesh-Khairnar	862433febb	fix: create custom field for mpesa receipt	2020-10-06 10:59:59 +05:30
Andy Zhu	1062d7eee0	fix: Update Items on Purchase Order ... 1. set warehouse using `get_item_warehouse` 2. update "reserved_qty" for sales order	2020-10-06 10:51:42 +13:00
Mangesh-Khairnar	8d54d61c28	fix: handle payment completion via payment request	2020-10-05 22:37:31 +05:30
Sun Howwrongbum	72a596971c	fix: also update employee field when renamed (#23482)	2020-10-05 20:48:53 +05:30
Deepesh Garg	f58a5ec6a5	fix: Codition in batch selector query	2020-10-05 13:55:53 +05:30
rohitwaghchaure	96fadb7c9b	Merge pull request #23511 from marination/sales-order-project ... fix: Show Project under Create button in SO	2020-10-05 13:17:48 +05:30
rohitwaghchaure	ad2dd6062e	Merge pull request #23513 from deepeshgarg007/batch_search ... fix: Search batches based on search fields	2020-10-05 13:16:03 +05:30
Shivam Mishra	6a506b63bf	fix: variables path	2020-10-05 12:41:30 +05:30
Deepesh Garg	1fae7749be	fix: Search batches based on search fields	2020-10-05 12:38:54 +05:30
marination	e7af9ff999	fix: Show Project under Create button in SO	2020-10-05 12:24:43 +05:30
Andy Zhu	760248911d	fix: Update Items on Purchase Order ... If user add rows or remove rows to update items on purchase order, the quantity in bin won't get updated. This fix is not mature yet but to give an tempopary solution for fixing this issue.	2020-10-05 12:16:48 +13:00
Saqib	2016a34e30	fix: naming series - cannot reset current value to zero (#23504)	2020-10-04 18:13:24 +05:30
Deepesh Garg	5bf35e465e	Merge pull request #23220 from marination/account-add-rename ... feat: Validate and Update Child Company Accounts on Rename/Adding Account	2020-10-04 15:19:26 +05:30
Mangesh-Khairnar	1bef6a530c	fix: create payment entry against payment request	2020-10-04 13:01:11 +05:30
Deepesh Garg	f8bf139692	Merge pull request #23498 from aakvatech/patch-3 ... fix: get_outstanding_invoices not ignoring the cancelled transactions	2020-10-03 22:36:24 +05:30
aakvatech	38ccf82604	fix: get_outstanding_invoices not ignoring the cancelled transactions ... Added is_cancelled=0 in 2 places for get_outstanding_invoices	2020-10-03 19:41:38 +03:00
Suraj Shetty	5dc0432cff	chore: Update translations	2020-10-03 08:52:07 +00:00
rohitwaghchaure	3c77a4697b	Merge pull request #23471 from rohitwaghchaure/fixed-currency-issue-in-pl-report ... fix: currency symbol in profit and loss report	2020-10-03 10:32:00 +05:30
marination	c213cd96c5	fix: Handle Blank from/to range in Numeric Item Attribute	2020-10-02 12:22:28 +05:30
marination	0bc61b31f7	chore: Move Qty fields (received qty,etc.) close to Qty/Stock UOM	2020-10-02 11:54:54 +05:30
Suraj Shetty	70c06512d2	chore: Update translations	2020-10-02 03:57:15 +00:00
marination	b9e2f17f4f	fix: More secure query	2020-10-01 21:31:51 +05:30
marination	f57ba86bce	chore: Add Date and Valid Till to List View	2020-10-01 21:10:00 +05:30
marination	5006345a0a	chore: Fetch RFQs in Get Items from RFQ based on Supplier selected ... - Rfq will appear only if selected supplier is in the RFQ	2020-10-01 20:41:05 +05:30
marination	4993ef19d6	feat: Supplier Quotation UX fixes	2020-10-01 16:35:09 +05:30
marination	29d7528a95	fix: Hide Preview Email button on submitted doc	2020-10-01 14:55:21 +05:30
Abhishek Balam	71c24c8a90	feat: add tests	2020-10-01 14:54:11 +05:30
marination	f90c3602a7	fix: Price should be total amount, modified deskpage	2020-10-01 14:38:17 +05:30
hasnain2808	f8db9582c3	feat(UAE VAT 21): Add currency formatting	2020-10-01 12:59:39 +05:30
hasnain2808	8cc6f2b388	feat(UAE VAT 21): add fixed width to columns	2020-10-01 12:44:39 +05:30
hasnain2808	10a3a338b6	refactor: change uae vat settingplural	2020-09-30 21:51:00 +05:30
Faris Ansari	db8764a520	Merge pull request #23201 from alyf-de/website_theme_scss ... fix: style for website theme	2020-09-30 18:26:58 +05:30
rohitwaghchaure	d65e050f4b	Update profit_and_loss_statement.py	2020-09-30 18:17:21 +05:30
Saurabh	2118d215e5	fix: validate theme_scss attribute (#23467) ... #22851	2020-09-30 18:10:30 +05:30
Rohit Waghchaure	b428e4c493	fix: currency symbol in profit and loss report	2020-09-30 17:44:35 +05:30
Shivam Mishra	1323a9a990	feat: set app name for ERPNext in install and patch	2020-09-30 16:33:14 +05:30
Deepesh Garg	287014a9a2	fix: Remove any taxes fetched due to unknown rules	2020-09-30 13:42:10 +05:30
Deepesh Garg	fc71e5b5b7	fix: Remove any taxes fetched due to unknown rules	2020-09-30 13:42:00 +05:30
Deepesh Garg	23313538df	Merge pull request #23465 from abhishekbalam/currency_in_trial_balance ... fix(Accounts): Add Currency filter in Trial Balance report	2020-09-30 13:16:16 +05:30
Marica	8fbd960f66	Merge branch 'develop' into update-items-perm	2020-09-30 12:51:35 +05:30
hasnain2808	3294f86b92	refactor: fix linting	2020-09-30 12:15:07 +05:30
Shivam Mishra	b04b53c613	Merge branch 'develop' into better-logging-for-membership	2020-09-30 12:01:54 +05:30
Shivam Mishra	86171a3fda	fix: translate error log	2020-09-30 12:01:35 +05:30
Shivam Mishra	3ec67077a9	chore: use .format for message ... Co-authored-by: Sagar Vora <sagar@resilient.tech>	2020-09-30 12:00:46 +05:30
Abhishek Balam	001e7e9df9	fix: remove default value	2020-09-30 10:39:26 +05:30
Abhishek Balam	42d8db59f0	fix: add currency select to Trial Balance	2020-09-30 01:32:42 +05:30
Deepesh Garg	bc44bc64cc	fix: Add test	2020-09-29 18:39:45 +05:30
marination	661bf64bba	fix: Check only Read and Write Permission in Update Items	2020-09-29 18:16:45 +05:30
Deepesh Garg	2b38361ff5	Merge branch 'develop' of https://github.com/frappe/erpnext into tax_fetch_quote	2020-09-29 17:26:48 +05:30
Deepesh Garg	c33fbd7e52	Merge pull request #23416 from anupamvs/quotation-portal ... feat: provision to draft quotation from portal	2020-09-29 17:08:05 +05:30
barredterra	81ad90c1d4	feat: validate sales invoice for germany	2020-09-29 11:54:57 +02:00
Marica	25f4c1636e	Merge branch 'develop' into account-add-rename	2020-09-29 13:18:54 +05:30
Marica	3b610bd07d	Merge branch 'develop' into dialog-filters	2020-09-29 13:16:33 +05:30
michellealva	3aedeb642f	fix: Change Error Message in Work Order	2020-09-29 12:54:55 +05:30
marination	65fc48da25	fix: Email Template and Codacy ... - Email Preview works well with email template - Codacy for docstrings	2020-09-29 12:46:19 +05:30
Marica	e5a60f1cec	Merge branch 'develop' into rfq-email	2020-09-29 11:56:44 +05:30
Marica	818522bd45	Merge branch 'develop' into dialog-filters	2020-09-28 21:18:23 +05:30
marination	629fa57f9d	fix: Remove unneccessary div	2020-09-28 21:17:49 +05:30
marination	a6ea86432e	fix: Skip Update Password in Preview ... - dont show update password button in preview, its for the suppliers mail only - modified docstrings - update supplier row contact only if None	2020-09-28 21:05:11 +05:30
hasnain2808	a5e8e449ee	chore: Merge branch 'develop' into UAE-VAT-Format	2020-09-28 20:43:03 +05:30
marination	f911228871	fix: UX and code cleanup ... - Added a small note in muted text at bottom of Dialog - Dont call 'update_supplier_contact' at the time of preview, its a dummy view anyway - Renamed `update_contact_of_supplier` to `link_supplier_contact` - On sending mail, new users and contacts that were created get updated in RFQ doc - Added docstrings to functions	2020-09-28 20:21:44 +05:30
hasnain2808	23c8966e81	Merge branch 'develop' into UAE-VAT-Format	2020-09-28 20:06:02 +05:30
hasnain2808	2c62d946f5	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2020-09-28 20:03:27 +05:30
Mangesh-Khairnar	8d12c3841f	fix: process transaction callback	2020-09-28 19:40:42 +05:30
hasnain2808	80068e16e8	Refactor(UAE VAT 21): Replace f-strings by format	2020-09-28 18:58:27 +05:30
Anupam	77cf53201a	feat: open lead status on next contact date	2020-09-28 18:38:41 +05:30
marination	056c86033d	fix: Reuse function to render email preview ... - Reused `supplier_rfq_mail` to render preview - Print hid Salutation and Subject - Completely dynamic greeting	2020-09-28 17:42:22 +05:30
madar2020	ce39323a0a	feat: Allow rich text edit for questions (#23402) ... * rich text * Update question.json As to make sense for rich text * Update quiz_question.json * Update question.json * Update quiz_question.json * Update macros.html fix: cards in second row of homepage section overlapps the row before. * Revert "Update macros.html" This reverts commit b649b507e5d546b5b4a78fbf68053493a71c7af2. Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-09-28 17:36:25 +05:30
marination	bd36f2b94d	feat: Supplier Email Preview in RFQ	2020-09-28 15:59:03 +05:30
hasnain2808	587bb05a37	feat(UAE VAT 21): Add desk page for UAE VAT 21	2020-09-28 14:52:29 +05:30
hasnain2808	0860c74c82	feat(UAE VAT 21): Add permissions for doctypes	2020-09-28 14:38:45 +05:30
hasnain2808	2d30148940	feat(UAE VAT 21): Add vat settings	2020-09-28 14:38:14 +05:30
Raffael Meyer	21266fe4a4	Merge branch 'develop' into website_theme_scss	2020-09-28 10:15:55 +02:00
rohitwaghchaure	7b2f141d0d	Merge pull request #23441 from anupamvs/lead-contact-detail ... fix: flushing contact details, generates assignment rule issues	2020-09-28 13:30:09 +05:30
hasnain2808	2a601e59bf	fix(UAE VAT 21): remove extra legend	2020-09-28 13:26:43 +05:30
hasnain2808	bed1add349	docs(UAE VAT 21): add docstrings	2020-09-28 13:26:05 +05:30
hasnain2808	815b7584dd	refactor(UAE VAT 21): seperate get_chart, get_data	2020-09-28 13:24:40 +05:30
Anupam	519a00ce44	fix: flushing contact details, generating assignment rule issues	2020-09-28 13:10:06 +05:30
hasnain2808	79aca28453	refactor(UAE VAT 21): rename UAE VAT - UAE VAT 21	2020-09-28 12:27:41 +05:30
Anupam Kumar	5b3af82e75	Update item_add_to_cart.html	2020-09-28 10:59:43 +05:30
Mangesh-Khairnar	98658603dd	Merge branch 'develop' of https://github.com/frappe/erpnext into mpesa-integration	2020-09-28 02:10:53 +05:30
Sagar Vora	382676d875	Merge branch 'develop' into mr-stock-uom-v13	2020-09-27 20:09:00 +05:30
Mangesh-Khairnar	a26c6b4c2d	fix: fetch account balance info	2020-09-25 23:56:39 +05:30
hasnain2808	127fbfcb93	feat(UAE VAT 21): Added Print Format	2020-09-25 20:42:54 +05:30
Anupam Kumar	6e0c1eeb68	Merge branch 'develop' into quotation-portal	2020-09-25 20:04:43 +05:30
prssanna	fec4ea5643	fix: set stock uom in tem while creating material request from stock entry	2020-09-25 18:01:12 +05:30
hasnain2808	321b5f54ae	feat(UAE VAT 21): Add Roles for UAE VAT 21 Report	2020-09-25 14:24:57 +05:30
hasnain2808	72cad2a8ab	feat(UAE VAT 21): Add zero rated and vat exempt	2020-09-25 13:13:38 +05:30
rohitwaghchaure	7512565184	fix: Patient Appointment not able to save (#23434) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-09-25 12:45:47 +05:30
Shivam Mishra	9a4d603403	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-09-25 11:44:37 +05:30
hasnain2808	5225215d31	feat(UAE VAT 21): Add rows for inputs and tourists	2020-09-24 18:41:43 +05:30
marination	be4dbad823	style: (minor) Reduce loc	2020-09-24 16:43:25 +05:30
Anupam	dd2f547c3b	fix: Ui fixes	2020-09-24 16:37:08 +05:30
Anupam	5a72022289	Merge branch 'develop' of https://github.com/frappe/erpnext into quotation-portal	2020-09-24 16:18:47 +05:30
Anupam	78ee75d744	fix: review changes	2020-09-24 16:17:02 +05:30
marination	a119688e32	fix: (RFQ/SQ) Link to Material Requests in Tools section	2020-09-24 15:57:43 +05:30
Saqib	2fa2a40b3f	chore: make asset movement transaction date match with purchase date & time (#23423)	2020-09-24 15:07:29 +05:30
Rucha Mahabal	9ed208364d	Merge branch 'develop' into enrollment-fixes	2020-09-24 14:31:23 +05:30
Anupam	a4df105813	fix: UI fixes	2020-09-24 13:21:54 +05:30
hasnain2808	3ef11b1d64	feat(UAE VAT 21): Add region fields for UAE VAT 21	2020-09-24 13:21:23 +05:30
marination	4f395cce54	chore: Add Filter Group to dialogs	2020-09-24 12:43:41 +05:30
marination	8370d9b997	fix: Check Company in Payment Entry before selecting values	2020-09-24 11:51:03 +05:30
Anupam	09775bbdaa	feat: showing UOM even item price is hidden	2020-09-24 11:19:32 +05:30
Shivam Mishra	0bd8719035	Merge branch 'develop' into better-logging-for-membership	2020-09-24 10:32:41 +05:30
Shivam Mishra	cee891aa92	refactor: better logging for membership	2020-09-24 10:31:36 +05:30
Anupam	c077fac2a6	feat: provision to draft quotation from portal	2020-09-23 22:02:31 +05:30
Marica	d5e6eb75cf	Merge branch 'develop' into supplier-quotn-comparison	2020-09-23 21:06:18 +05:30
Deepesh Garg	cfc5e29127	fix: Post cancellation accounting entry on posting date instaed of current (#23361)	2020-09-23 17:19:11 +05:30
Prssanna Desai	fd42af5b91	fix: ignore permission while creating supplier scorecard period in supplier scorecard (#23406)	2020-09-23 17:14:37 +05:30
Rucha Mahabal	46d4180381	refactor: Issue form cleaned up and renamed Minutes to First Response field (#23066) ... * refactor: re-order fields in Issue DocType * refactor: rename Mins to First Response to First Response Time * refactor: First Response Time Reports for Issue and Opportunity * fix: added patch for renamed fields and setting durations * chore: update CRM and Support Desk Pages for Response Time reports * fix: first response time for opportunity report * fix: patch Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	2020-09-23 16:53:16 +05:30
Mangesh-Khairnar	4eb215badb	fix: bind callback callback for realtime event	2020-09-23 15:55:21 +05:30
Marica	f804eacfb5	Merge branch 'develop' into fix-report-gp	2020-09-23 15:36:23 +05:30
Michelle Alva	879a8ef26b	fix: Change button label in Item (#23410)	2020-09-23 15:36:07 +05:30
Raffael Meyer	8b78bf19bd	Merge branch 'develop' into website_theme_scss	2020-09-23 11:38:59 +02:00
Afshan	8be51e22c4	fix: escape apostrophe in cost centre and project if exist	2020-09-23 14:52:36 +05:30
marination	fd155408e5	fix: Check if account exists in parent company on rename ... - Check if child company is dependent on parent company - Check if account-to-be-renamed exists in parent, if yes, block - Revised Test basd on the same	2020-09-23 14:42:10 +05:30
Saqib	1831893b77	fix: failed workflow condition error message in update items (#23393)	2020-09-23 13:01:49 +05:30
Marica	dd10c54baa	Merge branch 'develop' into supplier-quotn-comparison	2020-09-23 12:58:35 +05:30
Deepesh Garg	2bf4245334	fix: Conversion factor fixes in Stock Entry	2020-09-23 12:50:06 +05:30
gavin	639542c81d	Merge pull request #22867 from marination/youtube-analytics ... feat: Youtube interactions via Video	2020-09-22 18:02:31 +05:30
marination	6087fcaa9b	chore: Added video settings to List View Menu	2020-09-22 17:48:04 +05:30
rohitwaghchaure	27bccd7f81	Merge pull request #23397 from deepeshgarg007/search_field_batch_query ... feat: Show searchfields in batch query	2020-09-22 16:59:24 +05:30
Marica	ef2b5e8284	Merge branch 'develop' into pr-dn-return	2020-09-22 15:39:25 +05:30
gavin	d935b2753f	Merge branch 'develop' into youtube-analytics	2020-09-22 15:36:00 +05:30
Anupam	c39b65a5f5	fix: quality procedure parent	2020-09-22 14:23:54 +05:30
Deepesh Garg	a0d192eae4	feat: Show searchfields in batch query	2020-09-22 13:54:07 +05:30
Mangesh-Khairnar	97ab96c8bf	fix: handle api changes from callbacks	2020-09-22 12:58:32 +05:30
Shivam Mishra	2b53b98c1d	fix: reload dashboard (#23380)	2020-09-22 12:18:12 +05:30
rohitwaghchaure	9e6d377eea	Merge pull request #23370 from prssanna/account-user-permission ... fix: apply user permissions in tax accounts query	2020-09-22 10:34:35 +05:30
rohitwaghchaure	7230b0f9a0	Merge pull request #23360 from anupamvs/batch-wise ... fix: Batch-Wise Balance History filter validation	2020-09-22 10:32:51 +05:30
Marica	cbac025a5f	Merge branch 'develop' into supplier-quotn-comparison	2020-09-21 22:08:38 +05:30
Mangesh-Khairnar	e3c6128638	fix(plaid): do not send null list in account ids (#23376)	2020-09-21 18:50:22 +05:30
Saurabh	30dbfc31e2	Merge pull request #23369 from abhishekbalam/breadcrumbs_for_maintenance ... Fix(Maintenance): Breadcrumbs for Maintenance Visit and Schedule	2020-09-21 17:03:46 +05:30
Saurabh	324cbe89f8	Merge pull request #23359 from abhishekbalam/activation ... fix(activation): Added New DocTypes in get_level()	2020-09-21 15:38:45 +05:30
Saurabh	0a88624df0	Merge pull request #23373 from abhishekbalam/version-13-beta ... fix(activation): Added New DocTypes in get_level()	2020-09-21 15:38:19 +05:30
Abhishek Balam	064a2c9aed	fix: add doctypes to activation	2020-09-21 15:35:24 +05:30
prssanna	de7a2bc4be	fix: apply user permissions in tax accounts query	2020-09-21 13:57:04 +05:30
Rohan	e42f08085b	fix: use Plaid's new API (develop) (#23318) ... Co-authored-by: Mangesh-Khairnar <mkhairnar10@gmail.com>	2020-09-21 13:14:07 +05:30
Abhishek Balam	97f61d233e	fix: breadcrumbs for maintenance visit and schedule under support	2020-09-21 13:00:43 +05:30
Deepesh Garg	44c692ed40	Merge pull request #23278 from barry86m/patch-3 ... fix: sql error on saving sales invoice without a sales order	2020-09-20 20:40:16 +05:30
Deepesh Garg	c152b92ef4	Update erpnext/controllers/selling_controller.py ... Co-authored-by: Sagar Vora <sagar@resilient.tech>	2020-09-20 20:04:10 +05:30
Deepesh Garg	5c8dd6a0ed	Merge pull request #23355 from Anurag810/accounts_recievable ... fix: Cost Center filter in accounts receivable and payable report	2020-09-20 19:36:30 +05:30
Saqib	f2ea3877c8	fix: depreciation start date ux fixes (#23339)	2020-09-20 19:31:18 +05:30
Saqib	4b25eb4db4	fix: mode of payment not fetched if no account is set (#23334) ... Co-authored-by: Sagar Vora <sagar@resilient.tech>	2020-09-19 19:33:21 +05:30
Deepesh Garg	6bcfffda1d	Merge branch 'develop' into barredterra-patch-1	2020-09-19 18:33:14 +05:30
Deepesh Garg	c646a56d68	fix: Update modified timestamp	2020-09-19 18:28:20 +05:30
Deepesh Garg	e3ee63f677	Merge pull request #23346 from AfshanKhan/stock-entry-warehouse-address-filter ... fix: warehouse address filtered based on warehouse	2020-09-19 18:17:08 +05:30
Deepesh Garg	095161ff60	Merge pull request #23328 from rohitwaghchaure/fixed-set-taxes-missing-error ... fix: set_taxes() missing 1 required positional argument: 'company'	2020-09-19 18:07:08 +05:30
Deepesh Garg	0aff6d83af	Update erpnext/public/js/utils/party.js ... Co-authored-by: Sagar Vora <sagar@resilient.tech>	2020-09-19 18:05:58 +05:30
marination	b782d2a99d	fix: Added back accidentally deleted field	2020-09-19 01:04:28 +05:30
marination	90d9d80ef9	fix: More MR UX fixes	2020-09-19 00:43:53 +05:30
Mangesh-Khairnar	a3ac4bf681	fix: create payment request via pos	2020-09-18 19:47:33 +05:30
Saqib	7126e179c3	fix: button click event not working in POS custom fields (#23358)	2020-09-22 16:35:11 +05:30
Abhishek Balam	4e6733293f	fix(DocTypes): Reset "owner" values in DocTypes to Administrator (#23350) ... * fix: reset owner values in doctype to Administrator * fix: updated modified value * fix: also fixed modified by * fix: change modified_by to Administrator	2020-09-18 18:27:24 +05:30
Anupam	bf166736b0	fix: Batch-Wise Balance History filter validation	2020-09-18 17:15:49 +05:30
Abhishek Balam	123eaea1a6	fix: added new doctypes in get_level	2020-09-18 16:35:59 +05:30
Michelle Alva	cc6ca97dc5	fix: Item-wise Sales History Report Error (#23349) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-09-18 15:50:29 +05:30
Saqib	c29ee691d4	fix: button click event not working in POS custom fields (#23358)	2020-09-18 15:27:17 +05:30
Marica	2cfaf71d59	Merge branch 'develop' into supplier-quotn-comparison	2020-09-18 15:22:59 +05:30
Anurag Mishra	170ecdc76e	fix: No handlefor Cost centers in Accounts Receivable	2020-09-18 13:26:46 +05:30
SDLyu	68672af8ab	Fix missing tax autoload when frm.doc.taxes is []	2020-09-18 13:58:23 +08:00
Deepesh Garg	6f3d93e5a0	fix: Taxes not getting fetched from Opportunity to Quotation	2020-09-18 11:23:35 +05:30
Afshan	d5710b4d6f	style: removed extra spaces	2020-09-17 13:01:47 +05:30
Afshan	e813684433	fix: warehouse address filtered based on warehouse	2020-09-17 12:57:26 +05:30
Deepesh Garg	2aea184f6f	Merge pull request #23309 from anupamvs/sales-analytics ... feat: added project in Sales Analytics report	2020-09-17 12:37:14 +05:30
Rucha Mahabal	c78ca36ee5	fix(Non Profit): Hide Address and Contact section for unsaved docs	2020-09-16 23:47:33 +05:30
Anupam Kumar	11649efc41	Merge branch 'develop' into sales-analytics	2020-09-16 21:45:57 +05:30
Deepesh Garg	5c04b2eea4	Merge pull request #23235 from Anurag810/custom_remark ... feat: added option to add custom remarks in payment entry	2020-09-16 13:38:04 +05:30
Deepesh Garg	15f698251b	Merge pull request #23079 from marination/item-tax-update-items ... fix: Item Tax Updating via `Update Items` in SO/PO	2020-09-15 20:47:20 +05:30
Deepesh Garg	db52cfe05a	Merge pull request #22849 from alyf-de/datev_refactor ... refactor: move datev-specific stuff to utils	2020-09-15 19:50:00 +05:30
Rucha Mahabal	8193582645	fix: codacy issue	2020-09-15 18:53:38 +05:30
Marica	9ce5c77a21	Merge branch 'develop' into supplier-quotn-comparison	2020-09-15 18:50:34 +05:30
Rucha Mahabal	253936c8df	fix: create Course Enrollment only for courses added in Program Enrollment	2020-09-15 18:16:42 +05:30
Rucha Mahabal	42d7acf522	fix: academic term and year date validations	2020-09-15 17:52:47 +05:30
Marica	f63b6719e3	Merge branch 'develop' into item-tax-update-items	2020-09-15 17:45:05 +05:30
marination	f995f517c9	fix: Test	2020-09-15 17:06:27 +05:30
Rucha Mahabal	f5eb45bf23	fix: validate academic term while checking for enrollment duplication	2020-09-15 17:01:00 +05:30
Rucha Mahabal	68a07eda72	fix: program enrollment date not considered during course enrollment	2020-09-15 16:55:35 +05:30
Deepesh Garg	2f50cb3e58	fix: Supplier trigger onload	2020-09-15 15:00:32 +05:30
Rohit Waghchaure	4f3b7da9ba	fix: set_taxes() missing 1 required positional argument: 'company'	2020-09-15 14:47:36 +05:30
Mangesh-Khairnar	27f81e06ea	fix: create custom pos fields	2020-09-15 14:38:06 +05:30
Anupam Kumar	699e853009	Merge branch 'develop' into sales-analytics	2020-09-15 13:24:02 +05:30
Anurag Mishra	9397b7f58b	fix: requested changes	2020-09-15 12:36:01 +05:30
Anupam	bae2d5d485	fix: review changes	2020-09-15 12:12:31 +05:30
marination	665c27af58	fix: Merge conflict missing line	2020-09-15 12:04:38 +05:30
Marica	baedc627ee	Merge branch 'develop' into item-tax-update-items	2020-09-15 11:30:22 +05:30
marination	4bb8d0c193	chore: Test for PO	2020-09-15 11:18:02 +05:30
Saqib	61314248bb	feat: uom in update items for SO & PO (#22869) ... * feat: uom in update items for SO & PO * fix: supplied items doesn't updates on uom change * chore: add uom and conv factor change test * fix: test * fix: purchase order updates are not tracked * fix: fetch conversion factor on uom change * fix: codacy Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-09-15 11:14:31 +05:30
Marica	65c2c4f85f	Merge branch 'develop' into item-tax-update-items	2020-09-15 09:49:06 +05:30
Deepesh Garg	36bc0577a2	fix: Item GL entries for purchase invoice (#23027)	2020-09-15 09:44:46 +05:30
marination	b7cd84196d	fix: Revert tax calculation changes	2020-09-15 09:42:51 +05:30
Anupam Kumar	8cb356bf30	Merge branch 'develop' into sales-analytics	2020-09-14 11:21:58 -07:00
Rucha Mahabal	fcb6ba6ec7	fix: get_transaction_entries function arguments in Bank Statement Transaction Entry (#23051)	2020-09-14 21:12:36 +05:30
Marica	a544e10778	Merge branch 'develop' into supplier-quotn-comparison	2020-09-14 20:17:59 +05:30
Saqib	6db92fbb6a	feat: validate workflow before so/po update items (#23024) ... * feat: validate workflow before so/po update items * fix: incorrect workflow validation on so/po update items Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-09-14 19:54:17 +05:30
Deepesh Garg	93d7c2f1da	Merge pull request #23283 from ruchamahabal/fix-student-email-id ... fix: Set student email id mandatory only if skip user creation is disabled	2020-09-14 19:34:10 +05:30
Mangesh-Khairnar	757fa5d010	fix(shopping-cart-settings): filter payment gateway accounts	2020-09-14 17:44:51 +05:30
marination	59239172a1	feat: Supplier Quotation Comparison - v3	2020-09-14 17:34:21 +05:30
Mangesh-Khairnar	40d3add63c	feat(payment-gateway-account): add additional payment channel	2020-09-14 15:14:36 +05:30
Rucha Mahabal	026cf2d3cc	Merge branch 'develop' into refactor-lab-module	2020-09-14 14:45:19 +05:30
Marica	c4a8c9eb26	Merge branch 'develop' into pr-dn-get-items	2020-09-14 11:09:32 +05:30
marination	9205101ecf	fix: Make Reference fields mandatory in Quality Inspection	2020-09-12 16:17:13 +05:30
marination	0a688005be	fix: Make sure Supplier/Customer is selected before fetching Items.	2020-09-12 15:39:27 +05:30
barredterra	16f1435d63	fix: codacy	2020-09-11 18:57:58 +02:00
barredterra	41978ac882	Merge branch 'develop' into datev_refactor	2020-09-11 17:54:50 +02:00
barredterra	8e41fdfee4	Merge branch 'develop' into website_theme_scss	2020-09-11 16:05:49 +02:00
barredterra	60bfbbc5af	fix: use path istead of hook	2020-09-11 16:05:10 +02:00
marination	02c550c07d	fix: Redundant imports	2020-09-11 16:22:54 +05:30
Marica	1807437fe0	Merge branch 'develop' into youtube-analytics	2020-09-11 16:18:23 +05:30
Marica	4153a9f8de	Merge branch 'develop' into pr-dn-return	2020-09-11 16:10:48 +05:30
marination	9533318832	chore: Tests for Rename and Add child Account	2020-09-11 16:09:27 +05:30
Anupam K	ed08e593c3	feat: added project in Sales Analytics report	2020-09-11 14:03:31 +05:30
Saqib	cd89994b33	fix: multiple pos issues (#23297) ... * fix: returns can be made against unconsolidated invoices * fix: indentation * fix: mode of payment not fetching for pos returns * patch: default pos profile print format * fix: tests * chore: clean up retail desk page	2020-09-10 19:28:46 +05:30
hasnain2808	f44524dd3e	feat: Added a Chart to compare Vat and sales between emirates	2020-09-10 18:35:04 +05:30
marination	37b99d202d	fix: Separate function to get bulk and single youtube stats	2020-09-10 18:27:20 +05:30
hasnain2808	323791d123	refactor: added docstrings	2020-09-10 17:53:29 +05:30
Rucha Mahabal	a29436dc91	fix: codacy	2020-09-10 17:45:17 +05:30
hasnain2808	031d77be2e	feat: add reverse charge to uae vat report	2020-09-10 17:40:01 +05:30
Rucha Mahabal	c0f9d1b65a	test: Lab Module	2020-09-10 17:33:52 +05:30
Suraj Shetty	67095d239f	fix: Custom dashboard sections	2020-09-10 17:15:52 +05:30
Mangesh-Khairnar	2dabd2182f	feat: add mpesa integration	2020-09-10 17:05:43 +05:30
marination	799d663398	fix: Make set_youtube_statistics reusable and job logic fix ... - Make sure job runs only once every hour - set_youtube_statistics should be usable in and outside class	2020-09-10 16:42:20 +05:30
Shivam Mishra	2b405b9bb3	feat: add icon to healthcare desk page	2020-09-10 15:37:54 +05:30
Gavin D'souza	71ac399369	fix: Commonified function and updated scheduler events ... Co-authored-by: marination <maricadsouza221197@gmail.com>	2020-09-10 13:58:48 +05:30
hasnain2808	91f1e26672	feat: Add rated supplies rows in UAE VAT report	2020-09-10 13:55:14 +05:30
Gavin D'souza	0a0e258d8b	feat: Add Desk Page for Utilities for Video group	2020-09-10 13:12:35 +05:30
Rucha Mahabal	42bff3289d	Merge branch 'develop' into refactor-lab-module	2020-09-10 12:36:29 +05:30
Rucha Mahabal	2388199347	Merge branch 'develop' into fix-student-email-id	2020-09-10 12:16:16 +05:30
Rucha Mahabal	1915a60834	fix: education settings check	2020-09-10 12:13:58 +05:30
Marica	6520655d59	Merge branch 'develop' into youtube-analytics	2020-09-10 10:16:02 +05:30
marination	53cd60c217	fix: Patch reload doctype	2020-09-09 20:57:10 +05:30
hasnain2808	7b7a8e1309	feat: RCM for UAE VAT	2020-09-09 20:54:30 +05:30
marination	83a03689a1	fix: Use independent item for DN Test	2020-09-09 20:51:01 +05:30
marination	dc5f2aa8b8	chore: Patch to set returned qty in PR and DN	2020-09-09 17:56:20 +05:30
marination	efb211af6d	chore: Fix Received/Delivered Items to Billed Logic	2020-09-09 16:24:11 +05:30
Marica	52e87d1a4f	Merge branch 'develop' into pr-dn-return	2020-09-09 11:56:26 +05:30
Saqib	ec6a97fb6a	fix: cannot delete pos page if linked with desk page (#22993) ... * fix: cannot delete pos page if linked with desk page * fix: replace pos page links with point-of-sale page Co-authored-by: gavin <gavin18d@gmail.com>	2020-09-09 10:54:14 +05:30
Deepesh Garg	dc84633860	Merge pull request #23301 from deepeshgarg007/closed_loan_amount ... fix: Amount for closed loans	2020-09-08 21:32:54 +05:30
Deepesh Garg	846e6d4803	fix: Add test	2020-09-08 21:32:06 +05:30
Deepesh Garg	f247686ace	fix: Amount for closed states	2020-09-08 21:26:06 +05:30
marination	8484d1cd95	fix: Patch and test codacy	2020-09-08 20:58:33 +05:30
marination	315bf3051c	chore: Tests for Delivery Note	2020-09-08 19:27:36 +05:30
Saqib	8f43cf2c9a	fix: asset movement date for backdated asset entry (#23298)	2020-09-08 17:44:47 +05:30
rohitwaghchaure	93dccd2eaa	Merge pull request #23132 from anupamvs/item-group-filter-portal ... fix: [Portal] added filter show in website	2020-09-08 17:03:54 +05:30
rohitwaghchaure	1d555f35a7	Merge pull request #23282 from deepeshgarg007/tds_bug ... fix: Apply TDS on Purchase Invoice creation from Purchase Order and Purchase Receipt	2020-09-08 16:59:29 +05:30
marination	e35fd5e305	chore: Tests for Purchase Receipt	2020-09-08 16:24:10 +05:30
Anupam Kumar	09e2cb5f87	Merge branch 'develop' into item-group-filter-portal	2020-09-08 14:54:31 +05:30
Deepesh Garg	f7731b0715	fix: TDS applicable on creating PI from get items button	2020-09-08 13:41:04 +05:30
Afshan	12ab8ebc95	fix: removed ignore permission flag	2020-09-08 12:55:42 +05:30
Marica	c8eca9d5f3	Merge branch 'develop' into handle-irs	2020-09-08 12:03:45 +05:30
Rucha Mahabal	f7619df8b2	fix: Lock row in subquery while setting delivered qty (#23100)	2020-09-08 11:57:45 +05:30
Afshan	9691422fb7	feat: added report for mismatch in serial nos and stock quantity in warehouse (#22669) ... * feat: added report for mismatch in serial nos and stock quantity in warehouse * style: removed print statement * fix: rename of reports and refactor of code * fix: handled null condition for actual qty and added report link in stock desk page * style: breaking code in multiple lines	2020-09-08 11:57:15 +05:30
Marica	0411026ad6	Merge branch 'develop' into pr-dn-return	2020-09-08 10:48:44 +05:30
rohitwaghchaure	31fd90136d	Merge pull request #23243 from Anurag810/overlap_for_additional_salary ... feat: Overlap validation additional salary	2020-09-08 10:18:41 +05:30
rohitwaghchaure	7d7fa79efa	Update additional_salary.py	2020-09-08 10:18:18 +05:30
rohitwaghchaure	900d0e3ae2	Merge pull request #23245 from Anurag810/attendance_calendar_map ... fix: Attendance calendar map fix	2020-09-08 10:14:37 +05:30
rohitwaghchaure	842cb6d1d6	Update shift_assignment.py	2020-09-08 10:14:04 +05:30
Anupam Kumar	7131024bf9	Merge branch 'develop' into item-group-filter-portal	2020-09-08 10:04:51 +05:30
rohitwaghchaure	0cb805308f	Merge pull request #23256 from Mangesh-Khairnar/fix-adv-payment-payment-order ... fix: capture advance payments in payment order	2020-09-08 09:59:47 +05:30
barry86m	5b381ac5b7	fix: consolidated financial statement sums values into wrong parent ... fix proposed by Andriesvn in bug report closes #22180	2020-09-08 00:27:57 +01:00
Deepesh Garg	b828e2fcf4	Merge pull request #23287 from deepeshgarg007/lsu_api_fix ... fix: Only submitted Loan security pledges should be approved	2020-09-07 23:23:55 +05:30
Deepesh Garg	03b0ad4f98	fix: Only submitted Loan security pledges should be approved	2020-09-07 23:22:21 +05:30
Anupam Kumar	22bd03e63c	Merge branch 'develop' into item-group-filter-portal	2020-09-07 20:20:42 +05:30
Rucha Mahabal	4673bed67e	fix: codacy issues	2020-09-07 20:12:29 +05:30
Rucha Mahabal	06f89a1b94	fix: Set student email id mandatory only if skip user creation is disabled	2020-09-07 19:46:53 +05:30
marination	f18dd05c00	fix: Missing import and typo	2020-09-07 18:59:57 +05:30
Marica	54ab426c1c	Merge branch 'develop' into youtube-analytics	2020-09-07 18:54:11 +05:30
marination	06ee0ea00b	feat: Added Scheduler Job to auto update statistics ... - Added frequency in Video Settings - Cron job to check half hourly job - Hourly job to run job based on frequency - Patch to set youtube id in video for ease in computing	2020-09-07 18:49:06 +05:30
Deepesh Garg	74ab1084b3	fix: Apply TDS on Purchase Invoice creation from Purchase Order and Purchase Receipt	2020-09-07 17:55:10 +05:30
Deepesh Garg	af1c4ba443	Merge pull request #23279 from deepeshgarg007/loan_closure_interest ... fix: Pending loan interest accrual on loan closure	2020-09-07 15:01:33 +05:30
Deepesh Garg	afefa878b0	fix: Pending loan interest accrual on loan closure	2020-09-07 14:57:44 +05:30
Deepesh Garg	da6074a84c	fix: Pending loan interest accrual on loan closure	2020-09-07 14:55:04 +05:30
marination	9ce38de439	chore: Key Validation and restructure ... - Added API Key validation in Video Settings - Moved Statistics section above description in Video - Moved id retrieving from URL to py side - Removed js side calls, added section toggling in js - Restructured Code	2020-09-07 13:27:17 +05:30
hasnain2808	2744765757	feat(UAE VAT Format): add fields for emirates in address and sales invoice	2020-09-07 12:31:19 +05:30
Mangesh-Khairnar	06130ee56b	fix: leave ledger patch (#23182)	2020-09-07 11:53:50 +05:30
Anupam Kumar	209f7c76c9	feat: added transaction_type in leave ledger enter (#23258)	2020-09-07 11:50:24 +05:30
barry86m	fa98e81f0b	fix: sql error on saving sales invoice without a sales order	2020-09-07 01:36:15 +01:00
Anupam Kumar	ffd30beeca	Merge branch 'develop' into item-group-filter-portal	2020-09-06 21:48:16 +05:30
Anupam Kumar	924618e1e3	Merge branch 'develop' into opportunity-status	2020-09-06 21:24:32 +05:30
rohitwaghchaure	937b63433d	Merge pull request #23270 from kasgel/patch-1 ... fix(utils): pass stock_qty to get_pricing_rule_for_item	2020-09-06 20:46:15 +05:30
Deepesh Garg	5158d0fbba	fix: Repayment Method not visible correctly	2020-09-05 21:16:57 +05:30
Deepesh Garg	f658b7bd8c	fix: typo	2020-09-05 21:07:56 +05:30
kasgel	a59f8640d1	fix: pass stock_qty to get_pricing_rule_for_item ... get_pricing_rule_for_item uses the "stock_qty" and "qty" arguments to filter pricing rules. Not passing stock_qty prevents for example the shopping cart from filtering pricing rules appropriately based on Quantity.	2020-09-05 12:15:49 +02:00
Deepesh Garg	1b4ed454d2	fix: Add reference no and descripiton field in Loan Security Pledge and Unpledge	2020-09-04 22:42:41 +05:30
Deepesh Garg	e4c38e5fe5	fix: Remove print statement	2020-09-04 22:30:13 +05:30
Deepesh Garg	4d636fde3a	fix: API changes in loan security unpledge utility	2020-09-04 22:23:30 +05:30
Mangesh-Khairnar	7456ffca0f	fix: teardown created payment order	2020-09-04 19:59:01 +05:30
aakvatech	7d780ce772	fix: Repayment Method not visible correctly ... https://github.com/frappe/erpnext/issues/23266	2020-09-04 16:41:09 +03:00
Mangesh-Khairnar	a76bf4d7af	fix: remove unused imports	2020-09-04 19:08:08 +05:30
Mangesh-Khairnar	d9e4883392	test: check payment order creation against payment entry	2020-09-04 18:55:14 +05:30
rohitwaghchaure	515d8b9e50	Merge pull request #23259 from anupamvs/se-quntity ... fix: SE quantity data type issue	2020-09-04 16:07:13 +05:30
rohitwaghchaure	c9a5afaa1c	Merge pull request #23263 from Semiranis/uom_after_qty ... feat: Option to print UOM after quantity	2020-09-04 16:06:46 +05:30
Shivam Mishra	4a238a2093	feat: don't allow guests	2020-09-04 15:18:16 +05:30
Anupam K	faebef21b7	fix: SE quantity data type issue	2020-09-04 15:09:16 +05:30
Mangesh-Khairnar	e1889d0c1b	fix(payment entry): update payment order status	2020-09-04 14:45:19 +05:30
Mangesh-Khairnar	8d8af94182	fix: capture advance payments in payment order	2020-09-04 12:17:56 +05:30
Frappe ERPnext	2e8e06c350	Merge branch 'develop' of https://github.com/frappe/erpnext into uom_after_qty	2020-09-03 18:08:02 +02:00
Frappe ERPnext	9355641c49	refactor: logic moved to standard template ... Previously print_settings.py controller decided which template to use. Now standard template decides what to print according to settings.	2020-09-03 17:31:21 +02:00
Frappe ERPnext	a5d5e70bf4	Revert "feat: Option to print UOM after quantity" ... This reverts commit a787882a8f.	2020-09-03 17:30:25 +02:00
Marica	8d6b2d016f	Merge branch 'develop' into leaderboard-supplier	2020-09-03 20:08:37 +05:30
marination	2a56000460	fix: Supplier Leaderboard fix	2020-09-03 19:45:04 +05:30
Deepesh Garg	b306fa355d	Merge pull request #23248 from deepeshgarg007/pda_account_filter ... fix: Account filter in Process Deferred Accounting doctype	2020-09-03 19:22:56 +05:30
Deepesh Garg	9b681770d0	fix: Account filter in Process Deferred Accounting doctype	2020-09-03 18:09:02 +05:30
Anurag Mishra	e5b7cb0c15	fix: data was not properly maped	2020-09-03 16:59:21 +05:30
gavin	f20b6360de	Merge branch 'develop' into overlap_for_additional_salary	2020-09-03 15:27:58 +05:30
gavin	c09b92d673	Merge branch 'develop' into naming-series-proj	2020-09-03 15:23:06 +05:30
Anurag Mishra	7952f89596	feat: Overlap validation additional salary	2020-09-03 15:21:35 +05:30
Rohit Waghchaure	68b0108301	fix: incorrect qty after transaction in stock ledger entry	2020-09-03 15:10:07 +05:30
rohitwaghchaure	d00bc3f422	Merge branch 'develop' into item-group-filter-portal	2020-09-03 15:04:04 +05:30
rohitwaghchaure	4b59043266	Merge pull request #23241 from Anurag810/hiding_regional_reports ... feat: removed roles for some regional report and added via setup	2020-09-03 15:01:07 +05:30
rohitwaghchaure	6ffe809c66	Merge pull request #23233 from ruchamahabal/fix-rfq-conv-factor ... fix: set conversion factor while creating RFQ from Opportunity	2020-09-03 14:45:01 +05:30
Anurag Mishra	54cd194b41	feat: removed roles for some reginal report and added via setup	2020-09-03 13:52:40 +05:30
Rucha Mahabal	979ad180fa	fix: update rfq item in postprocess	2020-09-03 11:03:22 +05:30
michellealva	0857e6d669	fix: Add "Bank Clearance" and "Bank Reconciliation" in desk	2020-09-03 10:37:43 +05:30
Michelle Alva	d8c38249e0	fix: Change naming series ... Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>	2020-09-03 09:04:21 +05:30
Frappe ERPnext	f28bef868d	feat: Checkbox for activation of printing UOM after quantity ... Checkbox will be added to Frappe after installation of ERPNext. (Print Settings docType is part of frappe app, not erpnext app)	2020-09-02 21:42:52 +02:00
Frappe ERPnext	be3b8a1c96	Merge branch 'develop' of https://github.com/frappe/erpnext into uom_after_qty	2020-09-02 21:31:31 +02:00
Anupam Kumar	c3984691b3	fix: Sales funnel data is inconsistent (#23110) ... * fix: Sales funnel data is inconsistent * fix: data inconsistency * fix: Converted Count Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-09-02 20:01:14 +05:30
Anurag Mishra	41f421d400	feat: added option to add custom remarks in payment entry	2020-09-02 13:47:18 +05:30
Rucha Mahabal	a1b5d57076	test: make rfq from opportunity	2020-09-02 13:14:01 +05:30
rohitwaghchaure	3312956890	Merge pull request #23019 from prssanna/gross-profit-total ... feat: enable total row in Gross Profit Report	2020-09-02 12:18:41 +05:30
rohitwaghchaure	1ab6c3fe94	Merge pull request #23059 from marination/credit-limit-email ... fix: Credit Limit Email not working	2020-09-02 12:14:51 +05:30
marination	099d6718c9	fix: Dont Copy or Print Naming Series	2020-09-02 11:54:55 +05:30
Rucha Mahabal	d2881ba4dd	fix: set conversion factor while creating RFQ from Opportunity	2020-09-02 11:52:59 +05:30
marination	f51cf9f23e	fix: Crop Cycle Test	2020-09-02 11:43:36 +05:30
rohitwaghchaure	efd1ac5840	Merge pull request #23050 from anupamvs/stock-entry-type ... fix: deleting unused Stock Entry Type	2020-09-02 11:43:29 +05:30
rohitwaghchaure	f898c807b8	Merge pull request #23227 from rohitwaghchaure/multiple-job-card-fixes ... Fix: job card issues	2020-09-02 11:41:37 +05:30
Rohit Waghchaure	86a190652e	fix: incorrect job card timer issue	2020-09-02 11:04:56 +05:30
rohitwaghchaure	6a51f3929b	Merge pull request #23054 from marination/general-ledger-filters ... fix: General Ledger filter validation	2020-09-01 17:53:32 +05:30
Deepesh Garg	36b7bb0282	Merge pull request #23229 from deepeshgarg007/gst_template_update ... fix: Update tax template on supplier address change	2020-09-01 16:27:44 +05:30
Marica	329292b9c3	Merge branch 'develop' into credit-limit-email	2020-09-01 16:18:12 +05:30
Deepesh Garg	cebf803455	fix: Update tax template on supplier address change	2020-09-01 16:15:28 +05:30
rohitwaghchaure	a3dd156a8a	Merge pull request #22796 from anupamvs/variance-report-fix ... fix: Target variance report signs	2020-09-01 15:12:21 +05:30
rohitwaghchaure	9bbb9dad8b	Merge pull request #23217 from anupamvs/product-contact-us-v13 ... fix: contact us button issue	2020-09-01 15:10:37 +05:30
Afshan	eb4b2aa142	fix: get_items from product bundle for purchase order (#22821) ... * fix: get_items from product bundle for purchase order * fix: Don't overwrite doctype while setting attributes in child row Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-09-01 15:01:32 +05:30
Suraj Shetty	9cc87f8b9a	Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui	2020-09-01 13:55:49 +05:30
Suraj Shetty	df00c5c846	fix: Update erpnext logo	2020-09-01 13:55:34 +05:30
Shivam Mishra	d19947fccd	Merge pull request #23148 from scmmishra/feat-exotel-customer-link	2020-09-01 13:47:31 +05:30
Shivam Mishra	e91a5437bd	Merge pull request #23038 from scmmishra/iff-invoicing	2020-09-01 13:35:32 +05:30
Shivam Mishra	1b5de62454	Merge pull request #23121 from Mangesh-Khairnar/add-integrations-desk-page ... feat: add integrations desk page	2020-09-01 13:34:52 +05:30
Marica	a222081316	Merge branch 'develop' into naming-series-proj	2020-09-01 12:35:11 +05:30
Anupam Kumar	232cb37ebf	Merge branch 'develop' into variance-report-fix	2020-09-01 09:31:22 +05:30
Anupam Kumar	477e41197e	Merge branch 'develop' into item-group-filter-portal	2020-09-01 09:09:19 +05:30
Deepesh Garg	37cb44e109	Merge pull request #23127 from marination/quoted-item-report-v2 ... feat: Quoted Item Comparison Report Enhancements v2	2020-08-31 21:28:56 +05:30
Deepesh Garg	26eab47851	Merge pull request #23221 from deepeshgarg007/pending_principal ... fix: Pending amount after loan closure request	2020-08-31 21:25:53 +05:30
Deepesh Garg	14718e2bde	fix: Add unit test for pending principal amount	2020-08-31 21:21:05 +05:30
Afshan	1dc9a9b669	fix: reverse journal entry for multi-currency (#23165) ... * fix: reverse journal entry for multi-currency * fix: test case for reverse journal entry	2020-08-31 20:35:05 +05:30
marination	bc6c4e864d	fix: Status in Report and filter query	2020-08-31 20:32:17 +05:30
Deepesh Garg	25042a22eb	fix: Pending amount after loan closure request	2020-08-31 19:17:29 +05:30
marination	8938d1040d	fix: Rename/Update Child company Accounts as well	2020-08-31 18:18:10 +05:30
Deepesh Garg	bdc933b3d3	Merge pull request #22985 from deepeshgarg007/accounting_period_cancellation ... fix: Cancellation of accounting transactions within closed accounting period	2020-08-31 17:16:55 +05:30
Deepesh Garg	d79b511e3f	Merge pull request #22950 from deepeshgarg007/billing_address_fetch ... fix: Add default billing address for purchase documents	2020-08-31 17:16:31 +05:30
Deepesh Garg	5523142ced	Merge pull request #23078 from deepeshgarg007/hsn_wise_json ... feat: JSON download for HSN wise outward summary	2020-08-31 17:16:03 +05:30
Anupam Kumar	8089b00df2	Merge branch 'develop' into item-group-filter-portal	2020-08-31 16:42:47 +05:30
marination	fdcda85f87	fix: Validate Missing Accounts in Child Companies ... - If parent account exists in Parent and now child, throw error	2020-08-31 16:10:52 +05:30
Deepesh Garg	56ddf41873	Merge pull request #23211 from michellealva/tax-cat ... feat: Allow Rename for Tax Category	2020-08-31 15:56:43 +05:30
Anupam K	f9f26d2fa4	fix: contact us button issue	2020-08-31 14:34:42 +05:30
Rohit Waghchaure	d0aafece32	fix: incorrect completed qty against operation in work order if workstation is different in job card	2020-08-31 13:41:17 +05:30
Rohit Waghchaure	a5963e1b2c	fix: user created manual job card not linking job card operations with work order operations	2020-08-31 13:40:55 +05:30
Rohit Waghchaure	e7ab53a711	fix: completed qty not updated in work order	2020-08-31 13:40:01 +05:30
Shivam Mishra	d70e711aea	fix: events not deleted on cancelling maintenance schedule (#22954) ... * feat: add participant to event_participant child table * feat: add tests * chore: update function name Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-08-31 13:14:32 +05:30
Deepesh Garg	d1b88af5b6	Merge pull request #23213 from deepeshgarg007/loan_disbursement_utility ... feat: Utility function to get possible loan disbursal amount	2020-08-31 12:53:08 +05:30
Marica	ee56d0e0a9	Merge branch 'develop' into quoted-item-report-v2	2020-08-31 12:45:05 +05:30
Shivam Mishra	1c96befbaf	Merge branch 'develop' into feat-exotel-customer-link	2020-08-31 11:47:06 +05:30
Shivam Mishra	b4e0d300f7	Merge branch 'develop' into iff-invoicing	2020-08-31 11:46:41 +05:30
Marica	d2d350ce14	Merge branch 'develop' into credit-limit-email	2020-08-31 11:45:15 +05:30
Deepesh Garg	e8b121c2c2	fix: Add status in field list	2020-08-31 11:31:48 +05:30
Deepesh Garg	ce29757bff	fix: Import flt	2020-08-31 11:26:51 +05:30
Rucha Mahabal	5c6ed4dbcd	Merge branch 'develop' into refactor-lab-module	2020-08-31 09:50:30 +05:30
Deepesh Garg	a03ebf007c	Merge pull request #23212 from marination/customer-from-quotation ... fix: Better error feedback on creating SO from Quotation	2020-08-30 23:24:02 +05:30
Deepesh Garg	a4259208e7	feat: Utility function to get possible loan disbursal amount	2020-08-30 23:09:23 +05:30
michellealva	f46c1c5164	fix: Change property of field	2020-08-30 21:37:45 +05:30
marination	e268d294b3	fix: Better error feedback on creating SO from Quotation	2020-08-30 21:01:34 +05:30
michellealva	c71e37c988	feat: Allow Rename for Tax Category	2020-08-30 19:42:24 +05:30
michellealva	288ced24db	feat: Add Naming Series for Project DocType	2020-08-30 19:33:27 +05:30
Syed Mujeer Hashmi	b23840bf7b	fix: Filter out cancelled entries in customer ledger summary ... Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>	2020-08-29 23:09:18 +05:30
rohitwaghchaure	2badd93d8f	Merge pull request #23193 from bhavesh95863/patch-10 ... fix: can't multiply sequence by non-int of type 'float	2020-08-28 20:01:05 +05:30
rohitwaghchaure	7c61779a94	Merge pull request #23195 from marination/purchase-over-receipt-subcontracted ... fix: Raise Error on over receipt/consumption for sub-contracted PR	2020-08-28 19:59:51 +05:30
Raffael Meyer	a7ea0ffcf9	Merge branch 'develop' into barredterra-patch-1	2020-08-28 15:44:21 +02:00
barredterra	a162248f32	fix: use hook for website theme scss	2020-08-28 15:16:39 +02:00
Frappe ERPnext	a787882a8f	feat: Option to print UOM after quantity ... Standard for ERPNext prints was UOM before quantity. Now user has a choice.	2020-08-28 13:28:52 +02:00
prssanna	fa400820bb	fix: move leaderboard style to frappe	2020-08-28 15:02:04 +05:30
marination	731bae170e	fix: Test for Over Receipt via PRs on a PO	2020-08-28 14:09:02 +05:30
Afshan	d659774190	fix:tests	2020-08-28 13:40:48 +05:30
Afshan	7586c3408e	fix: test case	2020-08-28 12:56:37 +05:30
Deepesh Garg	ecc282930a	Merge branch 'develop' into navbar_links	2020-08-28 12:48:46 +05:30
marination	e9274283bd	fix: Raise Error on over receipt/consumption for sub-contrcated PR	2020-08-28 12:21:10 +05:30
Deepesh Garg	6887382937	fix: Ignore cpmpany and bank account doctype while deleting company transactions (#22953)	2020-08-28 11:52:00 +05:30
bhavesh95863	3e9f493f15	fix: change parseFloat to flt	2020-08-28 11:15:02 +05:30
Rucha Mahabal	bae2a77d08	Merge branch 'develop' into barredterra-patch-1	2020-08-28 10:43:02 +05:30
Rucha Mahabal	8cdc3b5d91	Merge branch 'develop' into patch-9	2020-08-28 10:41:02 +05:30
rohitwaghchaure	78a32f79df	Merge pull request #23168 from ruchamahabal/fix-appointment-overlap ... fix: don't overwrite patient appointment duration if already specified	2020-08-28 10:39:25 +05:30
rohitwaghchaure	3018d38940	Merge pull request #23170 from anupamvs/product-contact-us-v13 ... feat: Added phone field in product Inquiry	2020-08-28 10:38:44 +05:30
rohitwaghchaure	c31ae27227	Merge pull request #23176 from marination/pricing-rule-missing-fix ... fix: Pricing Rule encoding missing line	2020-08-28 10:37:38 +05:30
rohitwaghchaure	939b95ad3c	Merge pull request #23190 from ruchamahabal/fix-bom-update ... fix: BOM Update Tool failing due to Too Many Writes error	2020-08-28 10:35:59 +05:30
bhavesh95863	33f984c7af	fix: can't multiply sequence by non-int of type 'float	2020-08-27 21:49:21 +05:30
Suraj Shetty	f39bb116cc	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-08-27 19:27:49 +05:30
prssanna	a324e9bd12	fix: remove text-muted and small class fromtree items	2020-08-27 19:26:14 +05:30
Suraj Shetty	a49af09705	fix: Primary button icon	2020-08-27 18:57:43 +05:30
Suraj Shetty	b6ebcd7559	refactor: Replace darkgray indicator with gray indicator	2020-08-27 18:57:18 +05:30
Rucha Mahabal	c8eea556d1	fix: BOM Update Tool failing due to Too Many Writes error	2020-08-27 18:54:25 +05:30
prssanna	744169833c	fix: replace indicator color darkgrey with darkgray	2020-08-27 17:06:10 +05:30
michellealva	ead2f6abf0	fix: Chage fiedtype of Customer's PO in Sales Invoice	2020-08-27 13:57:15 +05:30
Rucha Mahabal	1bd83e69ee	feat: added Installation Note and Warranty Claim links to Customer dashboard (#23183)	2020-08-27 13:06:52 +05:30
Marica	e7fabb10e1	Merge branch 'develop' into general-ledger-filters	2020-08-27 11:59:01 +05:30
Afshan	b719620d0c	fix: handleling condition if default company doesn't exist	2020-08-26 20:55:16 +05:30
Afshan	7600960d2b	fix: returned empty list if non US based company	2020-08-26 18:40:11 +05:30
bhavesh95863	bb5d886930	fix: account & cost center filter by company	2020-08-26 18:23:21 +05:30
marination	733fd5f03c	fix: get_applied_pricing_rule in taxes_and_totals	2020-08-26 18:23:12 +05:30
Marica	d741ac6871	Merge branch 'develop' into quoted-item-report-v2	2020-08-26 17:33:13 +05:30
Rucha Mahabal	cf2db41876	Merge branch 'develop' into fix-appointment-overlap	2020-08-26 16:33:27 +05:30
Anupam K	c7830f7107	feat: Added phone field in product Inquiry	2020-08-26 15:28:22 +05:30
Rucha Mahabal	9766adbf4e	fix: don't overwrite appointment duration if already specified	2020-08-26 14:53:23 +05:30
Rushabh Mehta	73f648473f	fix(minor): update_start_end_date_for_old_shift_assignment.py	2020-08-26 14:51:37 +05:30
Rushabh Mehta	a163d8bc84	fix(minor): rename_lost_reason_detail	2020-08-26 14:51:37 +05:30
Rushabh Mehta	544d18327c	fix(patch): quotation_lost_reason_detail	2020-08-26 14:51:37 +05:30
Rushabh Mehta	38fad58834	fix(patch)	2020-08-26 14:51:37 +05:30
rohitwaghchaure	fe0ecc2ff7	Merge pull request #23144 from anupamvs/product-image ... fix: Homepage Featured Product image fetch issue	2020-08-26 13:05:50 +05:30
rohitwaghchaure	5f4b5f3f46	Merge pull request #23151 from ruchamahabal/fix-conversion-factor ... fix: conversion factor for BOM exploded item rate	2020-08-26 13:01:13 +05:30
bhavesh95863	d888a59bd1	fix: set company filter in condition	2020-08-26 12:44:20 +05:30
Abhishek Balam	dc9af639a7	fix: move condition field	2020-08-26 12:26:15 +05:30
Abhishek Balam	7d0bb25aca	fix: dont show message on condition syntax error	2020-08-26 12:22:31 +05:30
Deepesh Garg	f4b939754c	fix: Codacy fixes	2020-08-26 12:10:12 +05:30
Deepesh Garg	29f187f4f3	Merge branch 'develop' into hsn_wise_json	2020-08-26 12:05:59 +05:30
Shivam Mishra	e1e5e3c915	Merge branch 'develop' into iff-invoicing	2020-08-26 11:30:01 +05:30
Michelle Alva	7a927cefbd	fix: Social Media Status hidden in Mobie View (#23158)	2020-08-26 10:32:26 +05:30
Deepesh Garg	b4a992e6a3	Merge pull request #23156 from ruchamahabal/add-maintenance-visit-link ... feat: add Maintenance Visit link in Customer and Sales Order dashboards	2020-08-25 21:04:00 +05:30
Anupam Kumar	91461a0016	fix: heading is hidden in the mobile view (#23145)	2020-08-25 21:01:17 +05:30
Michelle Alva	258b256dc6	fix: Add Delivery Note link in Sales Invoice Dashboard (#23161)	2020-08-25 20:37:39 +05:30
Rucha Mahabal	12f7aeb147	feat: add Maintenance Visit link in Sales Order dashboard	2020-08-25 19:03:35 +05:30
Rucha Mahabal	5bf0a51ed4	feat: add Maintenance Visit link in Customer dashboard	2020-08-25 18:22:06 +05:30
Rucha Mahabal	d43d1408cf	fix: conversion factor for BOM exploded item rate	2020-08-25 17:13:05 +05:30
Shivam Mishra	de4ac0c905	chore: remove stray tabs	2020-08-25 17:10:05 +05:30
Shivam Mishra	2030b66fc6	feat: add customer link to call log	2020-08-25 17:09:53 +05:30
Anupam K	42092cc377	fix: Homepage Featured Product image fetch issue	2020-08-25 15:29:18 +05:30
Saurabh	10bf6dc2a6	fix: check setup complete flag instead setup page	2020-08-25 14:51:00 +05:30
Deepesh Garg	afd2e7bb8e	Merge pull request #23141 from deepeshgarg007/sle_cancel_v13_beta ... fix: Reverse SLE not created for fraction qty or qty less than 1	2020-08-25 14:42:04 +05:30
Rushabh Mehta	ee921052c0	fix(minor): test dependencies	2020-08-25 14:35:49 +05:30
Deepesh Garg	04e3098481	fix: Test Case for qty less than 1	2020-08-25 14:27:47 +05:30
Deepesh Garg	84e78ec7ad	fix: Negative SLE not created for fraction qty or qty less than 1	2020-08-25 14:27:35 +05:30
Rushabh Mehta	b5b8f9e72d	fix(minor): import	2020-08-25 14:14:23 +05:30
Afshan	930adec7ee	fix:referencing frm	2020-08-25 13:48:44 +05:30
Deepesh Garg	c3fb68265f	fix: Do not update total for RCM invvoices if net taxes are zero	2020-08-25 13:35:33 +05:30
Rushabh Mehta	8ad0fa48bf	fix(minor): circular imports?	2020-08-25 12:24:31 +05:30
Rushabh Mehta	ff5d19609f	fix(hot): Pricing Rule encoding fixed	2020-08-25 11:59:57 +05:30
Anupam K	28f4417fc5	fix: added filter show in website for filtering product	2020-08-25 08:59:37 +05:30
Deepesh Garg	07ee7a5bd6	Merge branch 'develop' into dims_in_gl_report	2020-08-24 20:23:19 +05:30
Marica	3e966d6889	Merge branch 'develop' into crm-reports	2020-08-24 19:42:18 +05:30
Shivam Mishra	7556517a4f	feat: validate if removed item attributes exist in variants (#22911) ... * feat: validate if removed item attributes exist in variants * Update erpnext/stock/doctype/item/item.py Co-authored-by: Marica <maricadsouza221197@gmail.com> * Update erpnext/stock/doctype/item/item.py Co-authored-by: Marica <maricadsouza221197@gmail.com> * refactor: smaller loop Co-authored-by: marination <maricadsouza221197@gmail.com> * feat: don't run validation for new entries Co-authored-by: Marica <maricadsouza221197@gmail.com> * fix: use tuple as is Co-authored-by: Marica <maricadsouza221197@gmail.com> * refactor: error description Co-authored-by: Marica <maricadsouza221197@gmail.com> * refactor: remove unused variable Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-08-24 19:37:09 +05:30
marination	8f452b8663	fix: Codacy and indicator message	2020-08-24 18:57:07 +05:30
marination	f49665077c	feat: Quoted Item Comparison Report Enhancements v2	2020-08-24 18:26:48 +05:30
Anupam K	64e84643fb	lost opportunity	2020-08-24 18:01:28 +05:30
rohitwaghchaure	cf4268e21a	Merge pull request #23116 from nabinhait/subcontracted-pr-gle ... fix: GLE for subcontracted PR is fg item rate is zero	2020-08-24 16:07:32 +05:30
Shivam Mishra	5d6b07558d	Merge branch 'develop' into iff-invoicing	2020-08-24 07:56:01 +00:00
rohitwaghchaure	554e2c2eb7	Merge pull request #23120 from deepeshgarg007/sle_cancel ... fix: Reverse SLE not created for fraction qty or qty less than 1	2020-08-24 13:25:12 +05:30
rohitwaghchaure	7d8d26bbea	Merge pull request #23106 from ruchamahabal/add-pos-page ... fix: POS page link not visible on Desk	2020-08-24 12:22:18 +05:30
Mangesh-Khairnar	e292fd6c58	feat: add integrations desk page	2020-08-24 00:45:13 +05:30
Deepesh Garg	8331a38ace	fix: Test Case for qty less than 1	2020-08-23 21:23:26 +05:30
Deepesh Garg	cb0bc2dcaf	fix: Negative SLE not created for fraction qty or qty less than 1	2020-08-23 20:43:50 +05:30
Suraj Shetty	99dfb9556d	refactor: Simplify code	2020-08-23 16:56:46 +05:30
Suraj Shetty	314551ceb2	refactor: Use right css clas name	2020-08-23 16:36:56 +05:30
Suraj Shetty	a43e760703	fix: Item dashboard style	2020-08-23 16:36:28 +05:30
Suraj Shetty	ecc7eedd10	fix: Update erpnext logo	2020-08-23 16:35:39 +05:30
Suraj Shetty	6f9f40992c	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-08-23 16:33:50 +05:30
Nabin Hait	337ee0a4bf	test: Test case for GLE in subcontracted PR if FG item rate is zero	2020-08-22 20:02:27 +05:30
Nabin Hait	df175cc8fc	fix: GLE for subcontracted PR is fg item rate is zero	2020-08-22 19:17:18 +05:30
Nabin Hait	111183d080	fix: Installation failed due to global variable (#23114)	2020-08-22 12:31:06 +05:30
Deepesh Garg	1b760cb278	Merge branch 'develop' of https://github.com/frappe/erpnext into navbar_links	2020-08-21 12:36:21 +05:30
Saurabh	66ff5e5e77	Merge pull request #22990 from saurabh6790/erpnext-before-install-flag-1 ... fix: check setup complete flag instead setup page	2020-08-21 11:55:38 +05:30
Nabin Hait	1ba62c9732	fix:Validate Job offer against vacancies (#23109)	2020-08-20 19:39:10 +05:30
Deepesh Garg	cf3e482052	Merge pull request #23105 from deepeshgarg007/rcm_submit_v13 ... fix: Unable to submit reverse charge invoice	2020-08-20 19:35:25 +05:30
Marica	c23797e350	fix: Create Opportunity without Default Company from Email (#23097) ... * fix: Create Opoortunity without Default Company from Email * fix: Add Prompt to Select Company * Update communication.js Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-08-20 19:12:12 +05:30
Rucha Mahabal	4061186429	fix: POS page link not visible on Desk	2020-08-20 18:01:20 +05:30
Deepesh Garg	afd2dd3570	fix: Unable to submit reverse charge invoice	2020-08-20 16:52:52 +05:30
rohitwaghchaure	019d4debb2	fix: incorrect stock value in return case (#23102)	2020-08-20 15:53:58 +05:30
Raffael Meyer	f0b9f660cd	Merge branch 'develop' into datev_refactor	2020-08-20 12:05:50 +02:00
Shivam Mishra	25ba271562	Merge branch 'develop' into fix-margin-for-filter	2020-08-20 08:59:04 +00:00
Shivam Mishra	d5971d3c59	Merge branch 'develop' into iff-invoicing	2020-08-20 08:16:22 +00:00
rohitwaghchaure	5f2463933a	Merge pull request #23061 from DeeMysterio/dev-sort-warehouses-qty ... feat(queries): sort warehouses based on item quantity in descending manner	2020-08-20 09:36:16 +05:30
Raffael Meyer	585f1f67b7	Merge branch 'develop' into navbar_links	2020-08-19 18:55:44 +02:00
Raffael Meyer	2c26144a6b	Update erpnext/patches/v13_0/add_standard_navbar_items.py	2020-08-19 18:55:06 +02:00
Deepesh Garg	cbedb3de3a	Merge pull request #23089 from deepeshgarg007/rcm_deduction_v13 ... fix: Do not update total for RCM invoices if net taxes are zero	2020-08-19 20:19:06 +05:30
Deepesh Garg	8aed48fe31	fix: Do not update total for RCM invvoices if net taxes are zero	2020-08-19 18:59:27 +05:30
Rucha Mahabal	eed2a6340c	Merge branch 'develop' into fix-pos-print	2020-08-19 18:57:47 +05:30
marination	22d3729427	fix: Codacy	2020-08-19 15:42:40 +05:30
Deepesh Garg	aaeb3980bc	feat: JSON download for HSN wise outward summary	2020-08-19 15:13:30 +05:30
marination	698d983eef	fix: Item Tax Updation via Update Items in SO/PO	2020-08-19 14:59:46 +05:30
Diksha Jadhav	182ee5e7c1	feat(queries): sort warehouses based on item quantity	2020-08-19 14:04:34 +05:30
Deepesh Garg	1fb1c08872	Merge pull request #23076 from deepeshgarg007/hsn_wise_outward_v13 ... fix: Tax amounts in HSN Wise Outward summary	2020-08-19 11:43:14 +05:30
Deepesh Garg	b240cfe401	fix: Remove print statements	2020-08-19 11:41:43 +05:30
Deepesh Garg	64ebbf0907	fix: Tax amounts in HSN Wise Outward summary	2020-08-19 11:41:33 +05:30
Rucha Mahabal	434bab8003	fix: Print Language for Customer not set for Print Receipt in POS	2020-08-19 01:00:59 +05:30
Deepesh Garg	1c14606c06	fix: Total calculations for multicurrency RCM invoices (#23072)	2020-08-18 19:32:52 +05:30
Deepesh Garg	9d60e48538	Merge pull request #23067 from rohitwaghchaure/profit-and-loss-report-not-working ... fix: profit and loss report not working	2020-08-18 17:03:10 +05:30
Rohit Waghchaure	310ade7282	profit and loss report not working	2020-08-18 16:07:24 +05:30
Marica	847343af86	Merge branch 'develop' into general-ledger-filters	2020-08-18 13:40:45 +05:30
Marica	12c68d0450	Merge branch 'develop' into credit-limit-email	2020-08-18 13:39:03 +05:30
Marica	2d767debf1	Merge branch 'develop' into shift_management	2020-08-18 13:27:15 +05:30
Michelle Alva	849b712770	fix: Change spelling of "Successful" (#23063) ... Before: Import Successfull After: Import Successful	2020-08-18 12:06:46 +05:30
Shivam Mishra	115ad3e99a	Merge branch 'develop' into iff-invoicing	2020-08-18 05:51:41 +00:00
Rucha Mahabal	035907a24f	fix: remove Request for Quotation link from Fiscal Year dashboard (#23040)	2020-08-18 10:57:10 +05:30
Glen Whitney	b2604d1f77	fix(General Ledger): include Accounting Dimension columns in report ... Prior to this commit, custom Accounting Dimensions are not (by default) shown or even considered in generating a General Ledger report. Moreover, as they are not considered, they are not used to distinguish GL Entry lines in the same voucher with the same Account when the "Group By" value is "Group by Voucher (Consolidated)". This situation leads to lines with different values for the accounting dimension to be ganged together in the General Ledger view of a Journal entry, making the entry difficult for an accountant to read. This commit alleviates the problem by adding a checkbox to control whether Accounting Dimension columns are considered in the General Ledger report. When they are considered, they are displayed and also included in the key that distinguishes lines in the "Group by Voucher (Consolidated)" mode. Resolves #23033.	2020-08-17 20:43:56 +00:00
Deepesh Garg	1067f7ed3e	fix: Price rule filtering in case of no doc	2020-08-17 23:47:58 +05:30
Deepesh Garg	38cabbd4b8	Merge pull request #23007 from prssanna/expense-claim-list-currency ... fix: add company in list fields to fetch for Expense Claim	2020-08-17 23:07:51 +05:30
Deepesh Garg	aef5c4cb64	Merge pull request #23044 from frappe/sales-analytics ... fix: Remove dependency of Sales Order in Sales Analytics	2020-08-17 23:00:49 +05:30
Shivam Mishra	eb832f6861	Merge branch 'develop' into iff-invoicing	2020-08-17 12:53:43 +00:00
Marica	4c1ea3e0e3	Merge branch 'develop' into credit-limit-email	2020-08-17 18:10:29 +05:30
Marica	0a926ee20d	Merge branch 'develop' into general-ledger-filters	2020-08-17 18:10:05 +05:30
Marica	11a167f8bb	Merge branch 'develop' into shift_management	2020-08-17 16:39:27 +05:30
marination	205df14a48	fix: Credit Limit Email not working	2020-08-17 16:23:44 +05:30
Anurag Mishra	df7b428331	fix: UI/UX Salary details and salary slip form cleanup (#22536) ... * fix: UI/UX Salary details * feat: salary slip form cleaup * fix(test): set working days zero if salary slip is based on timesheet * fix(revert): set working days zero if salary slip is based on timesheet * fix: salary slip form cleanup Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-17 14:09:54 +05:30
Marica	39c97bfbe9	Merge branch 'develop' into shift_management	2020-08-17 13:46:51 +05:30
Anurag Mishra	13be09e883	Update update_start_end_date_for_old_shift_assignment.py	2020-08-17 13:43:33 +05:30
Afshan	084de5f0b2	fix: handled condition if staffing isn't created (#22992) ... * fix: handled condition if staffing isn't created * style: reformated code for redability * Update erpnext/hr/doctype/job_offer/job_offer.py Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-08-17 13:14:09 +05:30
marination	eb241c6c42	fix: General Ledger filter validation	2020-08-17 12:57:56 +05:30
Anupam K	d7b69e57ae	fix: deleting unused Stock Entry Type	2020-08-17 11:20:56 +05:30
Afshan	5b45961b9d	fix: the JSON object must be str, bytes or bytearray, not "list" (#23047) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-17 10:51:53 +05:30
Deepesh Garg	e1e847a3f7	feat: Enhancement in Loan Topups	2020-08-16 20:57:39 +05:30
Deepesh Garg	a2249e013d	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_top_up_fixes	2020-08-15 18:28:04 +05:30
michellealva	e69b2e0da1	fix: Remove dependency of Sales Order in Sales Analytics	2020-08-15 10:16:26 +05:30
Deepesh Garg	d9accededa	fix: filter pricing rules based on condition	2020-08-14 22:36:01 +05:30
Shivam Mishra	fe57ed629e	Merge branch 'develop' into iff-invoicing	2020-08-14 14:31:31 +00:00
Shivam Mishra	736aee886e	Merge branch 'develop' into support-search	2020-08-14 13:36:59 +00:00
Rucha Mahabal	5fb0e7184e	fix: list index out of range error while setting POS payment mode (#23018)	2020-08-14 17:11:39 +05:30
Suraj Shetty	cab5918244	Merge branch 'develop' into HR-fix	2020-08-14 16:12:28 +05:30
Shivam Mishra	3daa9de998	feat: add email option to field email_id	2020-08-14 13:46:58 +05:30
Shivam Mishra	6b68eaad1e	feat: use email template for membership acknowledgement	2020-08-14 13:46:58 +05:30
Shivam Mishra	b4d3666e69	feat: show send acknowledgement button if enabled in settings	2020-08-14 13:46:58 +05:30
Shivam Mishra	e4c58c37c8	feat: allow member creation via API	2020-08-14 13:46:58 +05:30
Shivam Mishra	98bcedd09c	feat: create member if not already exists	2020-08-14 13:46:58 +05:30
Shivam Mishra	d7139bbd43	fix: type error	2020-08-14 13:46:58 +05:30
Shivam Mishra	87ddec069e	refactor: try block across the function	2020-08-14 13:46:58 +05:30
Shivam Mishra	6fbe9b5404	fix: remove payload	2020-08-14 13:46:58 +05:30
Shivam Mishra	733bde31c9	fix: doctype name in patch	2020-08-14 13:46:58 +05:30
Shivam Mishra	3a67a78ece	feat: add custom buttons for invoice and email	2020-08-14 13:46:58 +05:30
Shivam Mishra	8e0314e7f6	feat: separate invoice generation and email	2020-08-14 13:46:58 +05:30
Shivam Mishra	c8d9e7f77b	feat: add message field	2020-08-14 13:46:58 +05:30
Shivam Mishra	1678eb9b50	feat: drop payload column	2020-08-14 13:46:58 +05:30
Shivam Mishra	62e344188a	feat: update settings and link filters	2020-08-14 13:46:32 +05:30
Shivam Mishra	15340e0c7f	feat: send invoice via email	2020-08-14 13:46:32 +05:30
Shivam Mishra	811ac909f9	feat: add auto invoice creation fields and controllers	2020-08-14 13:46:32 +05:30
Shivam Mishra	96dc67c35e	feat: add copy button and docs link	2020-08-14 13:46:32 +05:30
Shivam Mishra	3a1868dae8	feat: add item field	2020-08-14 13:46:32 +05:30
Shivam Mishra	a16b24d50a	feat: add enable or disable invoicing and print format field	2020-08-14 13:46:32 +05:30
Anurag Mishra	759632c025	fix: requested Changes	2020-08-14 12:26:04 +05:30
Anurag Mishra	6f1579da1f	Merge branch 'develop' into shift_management	2020-08-14 12:11:41 +05:30
Deepesh Garg	8ca57eb5dd	Merge pull request #23022 from marination/loan-amount ... fix: Validate or Set Loan Amount first	2020-08-13 19:53:09 +05:30
Afshan	d7d92c520e	fix: removed code relating to standard working hours (#23009)	2020-08-13 19:40:09 +05:30
Deepesh Garg	1151f888ba	fix: Set pledge amount before setting loan amount	2020-08-13 18:52:23 +05:30
bhavesh95863	a647bef682	fix: warehouse mandatory even update stock uncheck (#23023)	2020-08-13 17:41:55 +05:30
Anupam K	b3bd780d46	fix: codasy dix	2020-08-13 17:07:15 +05:30
Anurag Mishra	f096ba4998	patch: Old Shift Assignment	2020-08-13 14:18:48 +05:30
Anurag Mishra	c2710e05ce	fix: showing on_going shift on calendar	2020-08-13 14:17:47 +05:30
Anurag Mishra	74f0a1ab7c	fix: changes Requested	2020-08-13 14:17:47 +05:30
Anurag Mishra	00a8081aba	Fix: button label	2020-08-13 14:17:47 +05:30
Anurag Mishra	dcf598dc2d	Fix: requested Changes	2020-08-13 14:17:47 +05:30
Anurag Mishra	d5c921e358	Fix: Requested Changes	2020-08-13 14:17:47 +05:30
Anurag Mishra	b48110caf1	Update erpnext/hr/doctype/shift_assignment/shift_assignment.py ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-08-13 14:17:47 +05:30
Anurag Mishra	3aa1101d5e	fix: requested changes	2020-08-13 14:17:47 +05:30
Anurag Mishra	17e6d0918b	feat: Employee level Shift Request Approver	2020-08-13 14:17:47 +05:30
Anurag Mishra	43ba7dd4c8	feat: don't allow to request for default shift	2020-08-13 14:17:47 +05:30
Anurag Mishra	feef4a6c1e	test: employee checkin	2020-08-13 14:17:47 +05:30
Anurag Mishra	b3e00de0ae	refactor: Shift Request	2020-08-13 14:17:47 +05:30
Anurag Mishra	a6ec7e31d2	test: shift assignment	2020-08-13 14:17:47 +05:30
Anurag Mishra	dd46d19765	feat: map event calendar to show ongoing shift assignment and fixed period assigment	2020-08-13 14:17:47 +05:30
Anurag Mishra	afa98bb39b	feat: Assign shift for period or create ongoing assignment	2020-08-13 14:17:47 +05:30
Abhishek Balam	a25760046f	fix: condition syntax validation readded, fetch item details if condition not met ignoring rule	2020-08-13 13:22:58 +05:30
marination	8264fcd0a5	fix: Only validate repayment if term loan	2020-08-13 12:47:34 +05:30
Abhishek Balam	487aa30aef	fix: eval fail message fix	2020-08-13 12:19:34 +05:30
marination	6988fbb82d	fix: Validate or Set Loan Amount first	2020-08-13 12:17:13 +05:30
Deepesh Garg	ca898c6da3	fix: Condition fix	2020-08-13 11:54:18 +05:30
Deepesh Garg	cbde04d3da	fix: Pass doc instead of args	2020-08-13 11:47:41 +05:30
prssanna	bfb219612e	feat: enable total row in Gross Profit Report	2020-08-13 11:34:05 +05:30
Anupam Kumar	e447c79f9d	fix: Quotation lost reason options fix (#22814) ... * adding patch and lost reason child tables * fix: conflict resolved	2020-08-13 09:20:36 +05:30
Saqib	c7614174d0	fix: cannot change customer fields if credit exhausted (#22838) ... * fix: cannot change customer fields if credit exhausted * fix: order based on company * fix: sort current limits w.r.t company before compare * fix: CustomerCreditLimit Object is not subscriptable	2020-08-13 09:18:59 +05:30
Nabin Hait	e2ee455acc	fix: Calculate taxes if tax is based on item quantity	2020-08-12 20:58:03 +05:30
Abhishek Balam	fdfab03c11	feat: add condition field in pricing rule	2020-08-12 20:33:54 +05:30
Raffael Meyer	94308fc107	Merge branch 'develop' into barredterra-patch-1	2020-08-12 16:14:55 +02:00
Deepesh Garg	21a220e2a5	fix: Update state code and union territory for Daman and Diu (#22988) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-12 19:19:03 +05:30
Rucha Mahabal	cd5821e00a	Merge pull request #23011 from ruchamahabal/fix-asset-maintenance-status ... fix: don't set asset maintenance log status as Overdue when Completed or Cancelled	2020-08-12 19:17:33 +05:30
Deepesh Garg	617027c6ca	Merge branch 'develop' of https://github.com/frappe/erpnext into navbar_links	2020-08-12 18:39:20 +05:30
Rucha Mahabal	517a6d0054	fix: set draft indicators for Asset Maintenance Log listview	2020-08-12 18:01:45 +05:30
Rucha Mahabal	691ec1bd27	fix: don't set maintenance log status as Overdue when Completed or Cancelled	2020-08-12 18:01:07 +05:30
Anupam Kumar	674d1b0803	feat: Material Request and Stock Entry Enhancement (#22671) ... * feat: send to warehouse * adding warehouse validation * fix: review changes * fix: review changes * stock entry enhancement * fix: review changes	2020-08-12 17:55:02 +05:30
Rucha Mahabal	e0cc421e50	fix: TypeError while setting transfer_qty in Stock Entry (#22929) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-08-12 14:33:30 +05:30
Marica	846771cb29	Merge branch 'develop' into item-image-alt	2020-08-12 13:37:19 +05:30
Deepesh Garg	1d5ab618d2	Merge pull request #23001 from nabinhait/inclusive-tax-based-on-item-quantity ... fix: Calculate taxes if tax is based on item quantity and inclusive on item price	2020-08-11 22:05:02 +05:30
Deepesh Garg	7d0a625b9c	git commit -m "fix: Add missing semicolon"	2020-08-11 22:02:12 +05:30
Nabin Hait	19ea7218d9	fix: Calculate taxes if tax is based on item quantity and inclusive on item price	2020-08-11 20:34:57 +05:30
Shivam Mishra	1679c7af88	Merge branch 'develop' into support-search	2020-08-11 14:54:10 +00:00
Afshan	ba33900712	Merge remote-tracking branch 'upstream/develop' into fix-duplicate-dropdown-PO	2020-08-11 20:17:05 +05:30
Afshan	b5b2586968	fix: referencing frm	2020-08-11 20:15:57 +05:30
Shivam Mishra	2fe5d76fe4	Merge branch 'develop' into item-image-alt	2020-08-11 14:45:55 +00:00
Shivam Mishra	ccdaf3da66	Merge branch 'develop' into fix-margin-for-filter	2020-08-11 14:41:29 +00:00
Deepesh Garg	ca9038feb7	Merge pull request #22998 from abhishekbalam/rename_source_section_opportunity ... fix(CRM): Change 'Source' section name to 'More Information' in Opportunity	2020-08-11 18:26:09 +05:30
Anurag Mishra	ed6e9550ca	fix: removed payroll from HR. (#22991) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-11 18:04:42 +05:30
Deepesh Garg	2633e292a5	fix: Is Secured Loan check mapping	2020-08-11 18:03:28 +05:30
Abhishek Balam	d0ae92d4bd	fix: moved company field, renamed to 'More Information'	2020-08-11 17:39:17 +05:30
prssanna	5a7618d8ec	fix: add company in list fields to fetch for Expense Claim	2020-08-11 16:50:31 +05:30
Abhishek Balam	ee5b9c7691	feat(Accounting): Process Statement Of Accounts (#22901) ... * feat: Process Statement Of Accounts initial commit * fix: add jinja supported inputs for subject and body in email settings * feat: utils support in template, tested autoemail, fixed issues	2020-08-11 16:23:47 +05:30
Abhishek Balam	9f6d114265	fix: Change Source section name to 'Company Information'	2020-08-11 16:16:05 +05:30
Anupam Kumar	79d731dcd8	feat: Naming series for Sales/Purchase Return (#22942) ... * feat: adding return naming series * Update purchase_invoice.json Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-08-11 16:11:20 +05:30
Deepesh Garg	145b80b11c	Merge pull request #22987 from frappe/fix-company-field ... fix: Consistent capitalization	2020-08-11 16:09:27 +05:30
Deepesh Garg	2621016884	fix: Allocated advance amount for multi-currency payment (#22923) ... * fix: Allocated advance amount for multicurrency payment * fix: Get grand total based on party currency * fix: Remove unwanted code	2020-08-11 16:06:13 +05:30
Abhishek Balam	ef3b82dae2	fix(CRM): Move Source section above Follow Up section In Opportunity (#22974) ... * fix: move source section above follow up * fix: only moving source field to 1st section	2020-08-11 16:05:02 +05:30
Shivam Mishra	3325be1d87	fix: spacing for slideshow (#22996)	2020-08-11 16:03:46 +05:30
Deepesh Garg	285e059394	Merge pull request #22997 from abhishekbalam/set_opportunity_status_to_converted ... fix(CRM): Change Opportunity to 'Converted' when Sales Order is created	2020-08-11 16:00:16 +05:30
Abhishek Balam	c992616d35	fix: change opportunity to 'Converted' when items not selected in opportunity itself for making quotation and sales order	2020-08-11 15:22:54 +05:30
Shivam Mishra	c798c6abbd	Merge branch 'develop' into fix-margin-for-filter	2020-08-11 09:11:30 +00:00
Afshan	acc3d42cf0	fix: escape apostrophe in company name if exist (#22956) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-11 14:40:44 +05:30
Shivam Mishra	49dd8782fd	fix: margin overflow cutting the focus state	2020-08-11 14:39:04 +05:30
Rucha Mahabal	19b51762ef	fix: escape fields for Payroll Entry (#22994)	2020-08-11 13:12:00 +05:30
Rucha Mahabal	f7a7cc08d9	Merge branch 'develop' into escape-company-field	2020-08-11 10:22:32 +05:30
Saurabh	58d05ac0e0	fix: check setup complete flag insted setup page	2020-08-10 19:36:45 +05:30
Jai Chavan	dbbb864ba5	fix: Consistent capitalization	2020-08-10 16:55:03 +05:30
sahil28297	4e4a19d3e6	Merge pull request #22984 from saurabh6790/tax-template-issue ... fix: Susbcription in Sales Taxes and Charges Dashboard	2020-08-10 16:01:35 +05:30
Deepesh Garg	069a54e5c3	fix: Cancellation of accounting transactions within closed accounting period	2020-08-10 16:01:01 +05:30
sahil28297	8aeb20cab8	Merge pull request #22977 from sahil28297/fix_pos_isse_v13 ... fix: remove mentions of display items in stock (#22963)	2020-08-10 16:00:56 +05:30
sahil28297	e5e0e93229	Merge pull request #22978 from sahil28297/fix_pos_isse_v13 ... Fix pos isse v13	2020-08-10 16:00:36 +05:30
sahil28297	81e35f67be	Merge pull request #22979 from saurabh6790/pos ... fix: [pos] minor bugs	2020-08-10 16:00:20 +05:30
sahil28297	e183161158	Merge pull request #22980 from sahil28297/sub_dashboard_link_v13 ... fix: Subscripition link in Customer dashboard (#22960)	2020-08-10 15:59:58 +05:30
sahil28297	4ace0829b9	Merge pull request #22983 from saurabh6790/pos ... Pos	2020-08-10 15:59:39 +05:30
marination	3beeeb589a	fix: Susbcription in Sales Taxes and Charges Dashboard	2020-08-10 15:55:02 +05:30
Deepesh Garg	b1e2cdd4d2	fix: Subscripition link in Customer dashboard (#22960) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-10 15:53:29 +05:30
Saqib Ansari	cc5b49bff4	fix: [pos] minor bugs	2020-08-10 15:52:32 +05:30
Mangesh-Khairnar	9305e7f1cc	fix: remove mentions of display items in stock (#22963)	2020-08-10 15:48:33 +05:30
Deepesh Garg	372abaa420	Merge pull request #22976 from marination/sales-taxes-dashboard ... fix: Susbcription in Sales Taxes and Charges Dashboard	2020-08-10 15:17:59 +05:30
marination	0f27500197	fix: Susbcription in Sales Taxes and Charges Dashboard	2020-08-10 15:17:58 +05:30
Saurabh	2547b7479e	Merge pull request #22975 from nextchamp-saqib/pos-fixes-1 ... fix: [pos] minor bugs	2020-08-10 14:50:53 +05:30
Marica	0fcb05a3aa	fix: Misleading filters on Item tax Template Link field (#22918) ... Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-10 14:48:13 +05:30
Saqib Ansari	f1091534cd	fix: [pos] minor bugs	2020-08-10 14:45:58 +05:30
Marica	42fbdc09f8	Merge branch 'develop' into opportunity-from-email	2020-08-10 13:48:43 +05:30
Anoop	d3d3db654e	fix: Inpatient Record - Transfer check-in time validation (#22958) ... * fix: inpatient transfer should not allow future checkin time * Update erpnext/healthcare/doctype/inpatient_record/inpatient_record.js Error message corrected Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-10 13:21:12 +05:30
Deepesh Garg	d626e3bd2e	Merge branch 'develop' into billing_address_fetch	2020-08-10 12:57:12 +05:30
Shivam Mishra	ded9f41cce	refactor: update confusing label	2020-08-10 12:45:07 +05:30
marination	a07973cfa5	fix: Creating opportunity from email	2020-08-10 12:39:42 +05:30
Anurag Mishra	95984fd921	fix: Not able to cancel application,allocation nad encashments	2020-08-10 12:36:00 +05:30
Rucha Mahabal	97ecf52d6f	fix: failing Fees test	2020-08-10 12:13:35 +05:30
Prssanna Desai	5c0439f768	fix: set correct default value from from date in downtime analysis report (#22903) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-10 11:12:52 +05:30
Deepesh Garg	bc8a281f83	fix: Subscripition link in Customer dashboard (#22960) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-10 11:00:08 +05:30
Deepesh Garg	41a4999711	Merge pull request #22843 from nextchamp-saqib/asset-adj-dimension-fix ... fix: cannot submit value adjustment with custom dimension	2020-08-10 10:12:41 +05:30
Deepesh Garg	097d89f550	Merge pull request #22946 from deepeshgarg007/gst_export_wopay ... fix: GSTR 1 report for exports without payment of Tax	2020-08-10 09:56:12 +05:30
Anupam K	d01caac852	report lead detail	2020-08-10 09:39:58 +05:30
Raffael Meyer	821eeb9852	fix(membership): currency should be a link	2020-08-09 14:07:32 +02:00
Mangesh-Khairnar	a53f15ca35	fix: remove mentions of display items in stock (#22963)	2020-08-09 13:12:47 +05:30
Deepesh Garg	7882c70244	Merge pull request #22959 from deepeshgarg007/gst_rcm_fixes_v13 ... fix: Taxable value for RCM	2020-08-08 22:34:36 +05:30
Deepesh Garg	d4ecf426b7	fix: Place of supply fix	2020-08-08 22:33:18 +05:30
Deepesh Garg	5ac2fd94f0	fix: Taxable value for RCM	2020-08-08 22:28:13 +05:30
Deepesh Garg	af1f46f2d9	fix: Add default billing address for purchase documents	2020-08-07 19:44:20 +05:30
Deepesh Garg	72fc188706	Merge pull request #21756 from deepeshgarg007/loan_patch_and_fixes ... fix: Description for fields and patch for old loans	2020-08-07 17:08:31 +05:30
Deepesh Garg	bad269c354	fix: Parent income account check	2020-08-07 16:21:41 +05:30
Afshan	1f3cc7553c	fix: grand_total assigment before reference	2020-08-07 15:57:31 +05:30
Rucha Mahabal	8118dd9e62	fix: escape company field	2020-08-07 14:52:50 +05:30
Deepesh Garg	ab611d5fd8	fix: GSTR 1 report for exports without payment of Tax	2020-08-07 14:47:40 +05:30
Shivam Mishra	b7a24ad95b	Merge branch 'develop' into item-image-alt	2020-08-07 09:15:00 +00:00
Shivam Mishra	b1f8859121	feat: add alt value in product page	2020-08-07 14:38:40 +05:30
Shivam Mishra	a0954e66a8	feat: add image alt argument for product_image macros	2020-08-07 14:34:54 +05:30
Shivam Mishra	ba4c4f107e	feat: add image alt field in items	2020-08-07 14:34:28 +05:30
Deepesh Garg	b98088bb01	Merge branch 'develop' into loan_patch_and_fixes	2020-08-07 13:27:40 +05:30
Anupam K	9d82953242	fix: Opportunity Status fix	2020-08-06 23:58:56 +05:30
Deepesh Garg	a306af8c08	fix: Add help link in navbar settings	2020-08-06 20:52:02 +05:30
Shivam Mishra	124eabaac8	Merge branch 'develop' into barredterra-patch-1	2020-08-06 14:16:48 +00:00
Rucha Mahabal	a78336e77d	fix: remove patch for retaining permissions for Video DocType (#22932) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-08-06 19:01:42 +05:30
Raffael Meyer	d854d39c00	fix: show only company's bank accounts	2020-08-06 15:09:22 +02:00
Shivam Mishra	b110e5842f	fix: unbound error in product configurator	2020-08-06 18:30:55 +05:30
marination	0702fbd206	fix: Show Add to Cart Button anyway ... - add to cart wasnt visible if show price is disabled in shopping cart settings (product_info = null), creating confusion	2020-08-06 18:28:55 +05:30
marination	72fdc1302c	fix: product action instead of info	2020-08-06 18:28:55 +05:30
Shivam Mishra	aa4f8cf4fc	fix: handle product_info null	2020-08-06 18:28:55 +05:30
marination	63513f1b14	fix: Show Add to Cart Button anyway ... - add to cart wasnt visible if show price is disabled in shopping cart settings (product_info = null), creating confusion	2020-08-06 18:22:28 +05:30
marination	ccf44a1bfd	fix: product action instead of info	2020-08-06 17:34:38 +05:30
Shivam Mishra	01f664a88f	fix: handle product_info null	2020-08-06 17:24:02 +05:30
Shivam Mishra	33a5fdfb78	fix: unbound error in product configurator	2020-08-06 17:23:51 +05:30
Afshan	085061fa21	fix: show or hide section or attributes depending on other attributes… (#22861) ... * fix: show or hide section or attributes depending on other attributes for better UI * Update erpnext/stock/doctype/item/item.js Co-authored-by: Marica <maricadsouza221197@gmail.com> * fix: made has_variants checkbox to read_only if stock_exists Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-08-06 14:36:34 +05:30
Marica	1afe177a4f	Merge branch 'develop' into education-dashboard	2020-08-06 14:12:00 +05:30
Saurabh	5ad9c2a1a0	bumped to version 13.0.0-beta.4	2020-08-06 13:50:20 +05:50
Deepesh Garg	44d62ad0d7	Merge pull request #22921 from ruchamahabal/fix-payment-entry-ref ... fix: condition for checking reference details for Payment Entry	2020-08-05 23:16:14 +05:30
Suraj Shetty	8d05514260	refactor: Format and sanitise user inputs to search queries. (#22922) ... * refactor: Sanitize whitelisted method inputs Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> * refactor: Format and sanitize tax_account_query inputs Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> * refactor: Validate and sanitize search inputs via decorator Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> * style: Minor formatting fix * refactor: Validate and sanitize search inputs using decorator * fix: Typo * fix: Remove unwanted import statement * refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-08-05 20:07:30 +05:30
Suraj Shetty	1923ef052c	refactor: Format and sanitise user inputs to search queries. (#22913) ... * refactor: Sanitize whitelisted method inputs Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> * refactor: Format and sanitize tax_account_query inputs Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> * refactor: Validate and sanitize search inputs via decorator Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> * style: Minor formatting fix * refactor: Validate and sanitize search inputs using decorator * fix: Typo * fix: Remove unwanted import statement * refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-08-05 19:42:25 +05:30
Rucha Mahabal	5da067b689	fix: condition for checking reference detail for Payment Entry	2020-08-05 18:18:57 +05:30
Marica	0c818927a5	fix: get_regional_address_details missing positional arg 'company' (#22915)	2020-08-05 16:47:41 +05:30
Rucha Mahabal	f9143e9bb0	Merge branch 'develop' into education-dashboard	2020-08-05 16:28:14 +05:30
Rucha Mahabal	8edace1a58	fix: covert Program wise Fee Collection to a Script Report	2020-08-05 16:24:21 +05:30
Rucha Mahabal	d67c2ea0d4	fix: make program field mandatory in Fees	2020-08-05 14:13:14 +05:30
marination	6823e8ed03	fix: Remove Duplicate Banket order method	2020-08-04 14:04:15 +05:30
Nabin Hait	a042d4721e	fix: Bank Clearance of POS purchase invoice (#22882)	2020-08-03 20:42:15 +05:30
Nabin Hait	a1d3537f2a	fix: Bank Clearance of POS purchase invoice (#22883)	2020-08-03 20:42:00 +05:30
Rucha Mahabal	b7311c8fc1	fix: SQL query in accounts receivable, payable reports (#22888)	2020-08-03 20:41:25 +05:30
Marica	e211bb7a53	fix: Reposition description in Warehouse (#22895)	2020-08-03 20:40:09 +05:30
Nabin Hait	5e548b4387	Dunning cleanup beta (#22899) ... * fix: Dunning cleanup * fix: Added dashboard for Dunning	2020-08-03 20:39:15 +05:30
Nabin Hait	48163e31c5	Dunning cleanup (#22898) ... * fix: Dunning cleanup * fix: Added dashboard for Dunning	2020-08-03 20:38:28 +05:30
Rucha Mahabal	cb665dc4d1	fix: Assessment Result child table not visible when accessed via dashboard (#22881)	2020-08-03 19:43:17 +05:30
Rucha Mahabal	101fe2b769	fix: Assessment Result child table not visible when accessed via dashboard (#22880) ... Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-08-03 19:42:24 +05:30
Anupam Kumar	25ee4328d3	card company issue (#22900)	2020-08-03 19:39:55 +05:30
Anupam Kumar	1895e9b89a	fix: Shopping cart issue v13 (#22868) ... * refactoring shopping cart settings * adding column_break in shopping cart settings * fix: mandatory depend on fix company * fix: resetting company, price_list, default_customer_group, quotation_series when card is diabled.	2020-08-03 18:50:11 +05:30
Rucha Mahabal	b50b20458e	fix: TypeError while concatenating account number and name in COA (#22885) ... Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-08-03 15:51:57 +05:30
Prssanna Desai	b44ee186cd	fix: check if row['delay'] exists (#22892)	2020-08-03 15:18:35 +05:30
Marica	4e0989d0cb	fix: Misleading description in Warehouse (#22878)	2020-08-03 14:56:20 +05:30
Marica	dd97524db5	fix: Misleading description in Warehouse (#22877) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-03 14:55:40 +05:30
Prssanna Desai	1dfd9fd756	fix: check if row['delay'] exists (#22889)	2020-08-03 14:48:45 +05:30
Deepesh Garg	2f2de2264d	Merge pull request #22887 from deepeshgarg007/subscription_test ... fix: Test case for subscription	2020-08-03 14:31:21 +05:30
Deepesh Garg	5572f8eb1e	fix: Test case for subscription	2020-08-03 13:40:11 +05:30
Wolfram Schmidt	5e438cc853	Update lead_source.json (#22872) ... Allow Lead Source to be renamed. This is usefull for cleaning up data at a later point and allow correcting spelling errors. Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-03 12:46:50 +05:30
Shivam Mishra	de80553d89	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-08-03 12:34:05 +05:30
Nabin Hait	1a64d1a4ab	Reset home page based on product settings (#22876)	2020-08-03 10:43:56 +05:30
Nabin Hait	9cc2d340ba	Reset home page based on product settings (#22875)	2020-08-03 10:43:47 +05:30
Nabin Hait	826158c792	fix: Update modified timestamp in accounts settings (#22874)	2020-08-03 09:34:55 +05:30
Nabin Hait	4cc99286c0	fix: Update modified timestamp in accounts settings (#22873)	2020-08-03 09:33:31 +05:30
Anurag Mishra	804426023f	fix: minor payroll_dashboard fixes (#22832) ... * fix: minor payroll_dashboard fixes * Update erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-03 09:28:04 +05:30
Anurag Mishra	ba52dd8ba6	fix: minor payroll_dashboard fixes (#22832) ... * fix: minor payroll_dashboard fixes * Update erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-03 08:57:49 +05:30
Deepesh Garg	4104887abb	fix: fieldname in filter	2020-08-02 18:23:54 +05:30
marination	e3495116dd	chore: Error Logging and exception hnadling on connection failure	2020-08-02 17:13:34 +05:30
Deepesh Garg	d909669a18	fix: Test cases	2020-08-02 17:00:53 +05:30
marination	c16ace6732	fix: Codacy	2020-08-02 16:43:15 +05:30
marination	ccf4ab9f85	chore: Added Interactions Report and behaviour fixes ... - Youtube Interactions Report with Chart and Summary - Statistics change in doc on refresh and get updated in db as well	2020-08-02 16:26:36 +05:30
marination	ddc2be36ab	Merge branch 'develop' of https://github.com/frappe/erpnext into youtube-analytics	2020-08-02 05:37:30 +05:30
marination	d4817c8685	feat: Track Youtube interactions via Video DocType	2020-08-02 05:35:45 +05:30
Deepesh Garg	b9dc21129c	fix: Loan Seurity shortfall calculation fixes	2020-08-01 22:51:40 +05:30
Deepesh Garg	946e106714	Merge pull request #22863 from deepeshgarg007/taxjar_fix ... fix: Import pycountry and taxjar only if taxjar is enabled	2020-08-01 13:52:40 +05:30
Deepesh Garg	dcb462f305	fix: Import pycountry and taxjar only if taxjar is enabled	2020-08-01 13:47:09 +05:30
marination	d36df92750	fix: Codacy and repositioned Returned Qty in DN Item	2020-07-31 20:22:55 +05:30
marination	e4dc7642bc	Merge branch 'pr-dn-return' of https://github.com/marination/erpnext into pr-dn-return	2020-07-31 20:01:59 +05:30
marination	ba37fe796c	chore: Delivery Note Return status	2020-07-31 20:01:06 +05:30
Anurag Mishra	2a4c90302b	fix: minor recritment analytics fixes (#22830) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-07-31 17:59:30 +05:30
Marica	8058a81dc1	Merge branch 'develop' into pr-dn-return	2020-07-31 16:02:17 +05:30
marination	66069df020	feat: Return tracking in PR/DN	2020-07-31 15:54:05 +05:30
Marica	cf00ee49ec	fix: PO/SO view title (#22858)	2020-07-31 15:14:50 +05:30
Deepesh Garg	7a004615a7	Merge pull request #22855 from nabinhait/gl-balance-fix-pre--v13 ... fix: Ignore cancelled gl entries to get account balance	2020-07-30 22:15:46 +05:30
Deepesh Garg	01e0d50eba	Merge pull request #22854 from nabinhait/gl-balance-fix ... fix: Ignore cancelled gl entries to get account balance	2020-07-30 22:15:23 +05:30
Shivam Mishra	11111cd9a9	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-07-30 21:29:02 +05:30
Nabin Hait	38d5c2e04f	fix: Ignore cancelled gl entries to get account balance	2020-07-30 20:53:07 +05:30
Nabin Hait	9837285bf1	fix: Ignore cancelled gl entries to get account balance	2020-07-30 20:52:20 +05:30
Rucha Mahabal	b6675f8dd4	feat: Lab Test Report Summary and Chart	2020-07-30 19:33:08 +05:30
Rucha Mahabal	c5ccf38cdf	refactor: Lab Test Report	2020-07-30 18:56:16 +05:30
Saurabh	a14618efe4	fix: validate theme_scss attribute	2020-07-30 17:22:29 +05:30
Rucha Mahabal	ca1b389c99	fix: validate negative quantity for sample collection	2020-07-30 16:58:19 +05:30
Rucha Mahabal	fa2c20ea9e	chore: Sample Collection Form clean-up	2020-07-30 16:56:11 +05:30
Rucha Mahabal	9087689d90	fix: subtitle for onboarding ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-30 16:10:05 +05:30
Rucha Mahabal	afa001a1d1	fix: code clean-up	2020-07-30 15:25:04 +05:30
Rucha Mahabal	73edb12ab3	fix: msgprint for sample collection doc created on Lab Test creation	2020-07-30 14:50:30 +05:30
Rucha Mahabal	c33703d54c	fix: move result value validations to server side	2020-07-30 14:25:40 +05:30
Rucha Mahabal	b00f870c77	fix: Lab Test Completed status not visible in list view	2020-07-30 13:49:13 +05:30
Rucha Mahabal	621529adfb	fix: unlink item from healthcare service unit type (#22828) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-30 13:18:41 +05:30
Marica	c0ea2bc804	Merge branch 'develop' into validate-patient-transfer-time	2020-07-30 13:10:19 +05:30
Saqib	031768f49d	chore: asset form reorder (#22833) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-30 12:40:53 +05:30
Rucha Mahabal	ff0b9bffcf	feat: added dashboard for Lab Test Template	2020-07-30 12:16:56 +05:30
Rucha Mahabal	440c752529	chore: Lab Test Template form clean-up	2020-07-30 12:16:18 +05:30
Anupam K	6bab21483c	report lost opportunity	2020-07-30 00:41:06 +05:30
barredterra	517df5fb0e	fix: codacy (again)	2020-07-29 18:16:49 +02:00
barredterra	b719378ee5	fix: codacy	2020-07-29 18:11:04 +02:00
Shivam Mishra	5b056988a6	Merge branch 'develop' of https://github.com/frappe/erpnext into support-search	2020-07-29 21:16:35 +05:30
barredterra	dec2c90866	refactor: move datev-specific stuff to utils	2020-07-29 17:14:23 +02:00
prssanna	60cdef7d57	fix: add range filters to oldest items chart	2020-07-29 18:06:54 +05:30
Prssanna Desai	9e81bb9a11	fix: add range filters to oldest items chart (#22842)	2020-07-29 17:28:30 +05:30
Anupam K	61bfb8c817	Merge branch 'develop' of https://github.com/frappe/erpnext into crm-reports	2020-07-29 15:45:55 +05:30
Saqib Ansari	8cfa00920e	fix: cannot submit value adjustment with custom dimension	2020-07-29 15:24:03 +05:30
anoop	5903002039	fix: exclude Cancelled appointments while Get Items in Sales Invoice	2020-07-28 21:15:54 +05:30
Rucha Mahabal	a695971596	fix: show the standard validation message ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-28 20:15:29 +05:30
Rucha Mahabal	7cbc7946af	fix: validate check out and check in time for inpatient occupancy	2020-07-28 14:11:12 +05:30
Marica	c1e46d8131	Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop	2020-07-28 12:29:47 +05:30
Rucha Mahabal	81ae6c3240	fix: reload HR Settings to fix failing setup (#22802) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-28 12:27:41 +05:30
Nabin Hait	b7602d29f2	fix: POS patch fix (#22827)	2020-07-28 09:13:42 +05:30
Nabin Hait	701474cbaa	fix: POS patch fix (#22818)	2020-07-28 09:11:37 +05:30
Shivam Mishra	48be7d37b8	fix: add order_by explicitly for lead (#22820)	2020-07-28 09:00:09 +05:30
Deepesh Garg	9119b4c538	fix: Unable to submit backdated stock transactions for different items (#22648) ... * fix: Unable to submit backdated stock transactions for different items * fix: Test cases * fix: Test Cases * fix: Test Cases * fix: Test for stock account JV * fix: Journal Entry Test	2020-07-28 08:49:44 +05:30
Deepesh Garg	fa28e600b5	fix: Unable to submit backdated stock transactions for different items (#22822) ... * fix: Unable to submit backdated stock transactions for different items * fix: Test cases * fix: Test Cases * fix: Test Cases * fix: Test for stock account JV * fix: Journal Entry Test * fix: Delete unwanted code	2020-07-28 08:49:21 +05:30
Rucha Mahabal	fdcaecb58c	Merge branch 'develop' into education-dashboard	2020-07-27 22:23:08 +05:30
Rucha Mahabal	9a2cc74414	feat: onboarding for Education module	2020-07-27 21:33:00 +05:30
Anupam K	9ceeefbd2b	refactor: CRM Reports	2020-07-27 19:56:07 +05:30
Rucha Mahabal	6c11f26a11	feat: Education dashboard charts and number cards	2020-07-27 18:50:04 +05:30
Rucha Mahabal	49140ccbfd	feat: Program wise Fee Collection Query Report	2020-07-27 18:48:15 +05:30
Shivam Mishra	97a316c09a	feat: add create customer button to member	2020-07-27 15:27:09 +05:30
Shivam Mishra	9e3776e001	feat: improve webhook logging	2020-07-27 14:26:37 +05:30
Shivam Mishra	e43d362d53	feat: verbose logging for verification	2020-07-27 14:19:36 +05:30
Shivam Mishra	4e40b9bdbe	feat: log everything	2020-07-27 14:19:36 +05:30
bhavesh95863	bcb49e59e7	fix: Add missing translation function (#22813) ... * fix: Add missing translation function Add missing translation function * fix: Add missing function for translation * fix: Add missing translation function * fix: Add missing translation function	2020-07-26 14:02:16 +05:30
Anupam K	8718daa11e	Adding formatter in budget variance report	2020-07-25 23:56:11 +05:30
Nabin Hait	abc3227480	chore: Added change log	2020-07-24 21:02:15 +05:30
Deepesh Garg	b2fccc1d05	Merge pull request #22800 from ruchamahabal/fix-assessment-report ... fix(Education): course wise assessment report labels	2020-07-24 19:12:24 +05:30
Deepesh Garg	c591b77613	Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop	2020-07-24 19:04:05 +05:30
Mangesh-Khairnar	762f6297f6	fix(payment-request): do not set guest as administrator (#22804)	2020-07-24 18:05:13 +05:30
Mangesh-Khairnar	8721530b4b	fix(payment-request): do not set guest as administrator (#22801)	2020-07-24 17:19:56 +05:30
Rucha Mahabal	860a824a7c	fix: change label for final grade	2020-07-24 14:32:36 +05:30
Rucha Mahabal	27835b7789	fix: add labels to chart datasets in course wise assessment	2020-07-24 14:07:00 +05:30
Nabin Hait	a8efe8eb5f	Merge branch 'develop' into version-13-beta-pre-release	2020-07-24 11:15:13 +05:30
Rucha Mahabal	1010feefe0	feat: Patient Progress Page (#22474) ... * feat: add patient progress page * feat: patient progress sidebar * feat: Patient Progress Charts * feat: set up sidebar links * feat: added heatmap chart for patient interactions * fix: styles * fix: add markers for max score in assessment charts * fix(style): mobile view css * fix: heatmap and percentage chart filters * feat: add time span filters to line charts * fix: make date fields mandatory in healthcare doctypes for better analytics * fix: title and filter styles * fix: handle null state for charts * feat: add Patient Progress Page to desk * feat: add date range filter to all charts * fix: code clean-up * fix: assign roles for Patient Progress Page Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-07-24 10:49:04 +05:30
Afshan	ecb1460440	fix: update the project after task deletion so that the % completed s… (#22591) ... * fix: update the project after task deletion so that the % completed shows correct value * fix: patch to correct % complete of previous projects * fix: for version-13 * fix: removed patch from v13 Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-07-24 10:48:16 +05:30
Afshan	91fe10666e	fix: buying price for non stock item in gross profit report (#22616) ... * fix: buying price for non stock item in gross profit report * fix: refactor query	2020-07-24 09:49:17 +05:30
Nabin Hait	39969647ca	fix: Added missing project field in Purchase invoice (#22799)	2020-07-24 09:48:54 +05:30
Nabin Hait	6bbd4d0c14	fix: Other charges on income tax (#22797)	2020-07-24 09:20:48 +05:30
Anupam K	5d5f026a0d	fix: Target variance report signs	2020-07-24 02:32:45 +05:30
Deepesh Garg	7cb1613173	Merge pull request #22622 from AfshanKhan/add-age-range-in-stock-ageing ... feat: added range for age in stock ageing	2020-07-23 21:56:45 +05:30
Afshan	73b86d241c	fix: conversion to float	2020-07-23 21:09:27 +05:30
Rucha Mahabal	89f9346185	fix(Education): descriptions not copied while creating fees from fee structure (#22792) ... Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-07-23 20:59:56 +05:30
Deepesh Garg	9843e9f917	fix: Expnese claim outstanding while making payment entry (#22735)	2020-07-23 20:58:57 +05:30
Afshan	13d2a34548	Merge remote-tracking branch 'upstream' into add-age-range-in-stock-ageing ... Merge remote-tracking branch 'upstream' into add-age-range-in-stock-ageing	2020-07-23 20:35:21 +05:30
Afshan	7965f655a2	Merge branch 'add-age-range-in-stock-ageing' of https://github.com/AfshanKhan/erpnext into add-age-range-in-stock-ageing ... Merge branch 'add-age-range-in-stock-ageing' of https://github.com/AfshanKhan/erpnext into add-age-range-in-stock-ageing	2020-07-23 20:33:43 +05:30
Afshan	775fbe74c5	fix: fixed the logic	2020-07-23 20:33:07 +05:30
Sun Howwrongbum	9bd5f1e4b0	fix: incorrect available_qty being set (#22539) ... * fix: incorrect available_qty being set * style: descriptive variables	2020-07-23 20:06:26 +05:30
Afshan	aa94abf601	fix: asset dashboard report changes (#22759) ... * fix: asset dashboard report changes * fix: moved static filters to dynamic filters Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-23 19:12:38 +05:30
Abhishek Balam	cb45836cda	feat(CRM): Email Group Option In Email Campaign (#22731) ... * new parent updating logic, made requested changes * feat: adding Email Group option in Email Campaign * fix: inv commas	2020-07-23 19:07:11 +05:30
Deepesh Garg	76028cde6a	Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop	2020-07-23 19:05:17 +05:30
Abhishek Balam	d05a98517d	Fix: Increase Length Of "In Words" and "In Words (Company Currency)" fields (#22732) ... * new parent updating logic, made requested changes * fix: Increase Length of In Words fields Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-07-23 19:01:31 +05:30
Deepesh Garg	718870f4a2	Merge pull request #22736 from Thunderbottom/set-homepage ... fix: reset homepage to home after unchecking products page	2020-07-23 18:53:37 +05:30
Nabin Hait	9389b3625a	Merge branch 'develop' into add-age-range-in-stock-ageing	2020-07-23 18:53:00 +05:30
Saqib	a6f98d48bc	refactor: POS workflow (#20789) ... * refactor: add pos invoice doctype replacing sales invoice in POS * refactor: move pos.py to pos invoice * feat: add pos invoice merge log doctype * feat: ability to merge pos invoices into a sales invoice * feat: [wip] new ui for point of sale * fix: pos.py moved to pos_invoice * feat: loyalty points for POS Invoice * fix: loyalty points on merging * feat: return against pos invoices * Merge 'fork/serial-no-selector' into refactor-pos-invoice * chore: status fix and set warehouse from pos profile * fix: naming series * feat: merge pos returns into credit notes * feat: add pos list action for merging into sales invoices * feat[UX]: add shortcuts & focus on search after customer selection * feat: stock validation from previous pos transactions * Merge 'fork/serial-no-selector' into refactor-pos-invoice * chore: fix df not found for base_amount precision * feat: serial no validation from previous pos transactions * chore: move pos.py into pos page * feat: pos opening voucher * feat: link pos closing voucher with opening voucher * chore: use map_doc instead of get_mapped_doc for better perf * feat: enforce opening voucher on pos page * feat: [ui] [wip] point of sale beta ui refactor * fix: auto fetching serial nos with batch no * feat: [ui] item details section for new pos ui * feat: remove item from cart * refactor: [ui] [wip] split point_of_sale into components * new payment component * new numberpad * fix pos opening status * move from flex to grids * fix: search from item selector * feat: loyalty points as payment method * feat: pos invoice status * fix a bug with invalid JSON * fix: loyalty program ui fixes * feat: past order list and past order summary * feat: (minor) setting discount from item details * fix: adding item before customer selection * feat: post order submission summary * save and open draft orders * fix: item group filter * fix: item_det not defined while submitting sle * fix: minor bugs * fix: minor ux fixes * feat: show opening time in pos ui * feat: item and customer images * feat: emailing and printing an invoice * fix: item details field edit shows empty alert * fix: (minor) ux fixes * chore: rename pos opening voucher to pos opening entry * chore: (minor) rename pos closing voucher and sub doctypes * chore: add patch for renaming pos closing doctypes * fix: negative stock not allowed in pos invoices* default is_pos in pos invoices* fix: transalation * fix: invoices not getting fetched on pos closing * fix: indentation * feat: view / edit customer info * fix: minor bugs * fix: minor bug * fix: patch * fix: minor ux issues * fix: remove uppercase status * refactor: pos closing payment reconciliation * fix: move pos invoice print formats to pos invoice doctype * fix: ui issues * feat: new child doctype to store pos payment mode details * fix: add to patches.txt * feat: search by serial no * chore: [wip] code cleanup * fix: item not selectable from cart * chore: [wip] code cleanup * fix: minor issues * loyalty points transactions * default payment mode * fix: minor fixes * set correct mop amount with loaylty points * editing draft invoices from UI * chore: pos invoice merge log tests * fix: batch / serial validation in pos ui and on submission * feat: use onscan js for barcode scan events * fix: cart header with amount column * fix: validate batch no and qty in pos transactions * chore: do not fetch closing balances as opening balance * feat: show available qty in item selector * feat: shortcuts * fix: onscan.js not found * fix: onscan.js not found * fix: cannot return partial items * fix: neagtive stock indicator * feat: invoice discount * fix: change available stock on warehouse change * chore: cleanup code * fix: pos profile payment method table * feat: adding same item with different uom * fix: loyalty points deleted after consolidation * fix: enter loyalty amount instead of loyalty points * chore: return print format * feat: custom fields in pos view * chore: pos invoice test * chore: remove offline pos * fix: cyclic dependency * fix: cyclic dependency * patch: remove pos page and order fixes * chore: little fixes * fix: patch perf and plural naming * chore: tidy up pos invoice validation * chore: move pos closing to accounts * fix: move pos doctypes to accounts * fix: move pos doctypes to accounts * fix: item description in cart * fix: item description in cart * chore: loyalty tests * minor fixes * chore: rename point of sale beta to point of sale * chore: reset past order summary on filter change * chore: add point of sale to accounting desk * fix: payment reconciliation table in pos closing * fix: travis * Update accounting.json * fix: test cases * fix: tests * patch loyalty point entries * fix: remove test * default mode of payment is mandatory for pos transaction * chore: remove unused checks from pos profile * fix: loyalty point entry patch * fix: numpad reset and patches * fix: minor bugs * fix: travis * fix: travis * fix: travis * fix: travis Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-07-23 18:51:26 +05:30
Nabin Hait	8712ac6d39	fix: Job offer is mandatory for employee onboarding (#22791)	2020-07-23 18:09:35 +05:30
Marica	3c8c346227	fix: Pick List empty table and Serial-Batch items handling (#22426) ... * chore: Pick List empty table and serial-batch items handling * fix: Remove console statement * chore: Added tests for batched and batched-serialised item	2020-07-23 17:52:06 +05:30
Afshan	55125fbe4e	fix: moved custom_make_buttons to PurchaseOrderController to avoid duplication of dropdown options (#22744)	2020-07-23 17:44:38 +05:30
Shivam Mishra	b6fb13258f	feat: move financial statement switcher to page toolbar	2020-07-23 17:02:32 +05:30
Shivam Mishra	f59d927f73	feat: update summary items	2020-07-23 17:02:32 +05:30
Shivam Mishra	840550e25f	refactor: change sequence for profit and loss statement	2020-07-23 17:02:32 +05:30
Shivam Mishra	be5e129259	feat: update icons for erpnext settings shortcuts	2020-07-23 17:02:32 +05:30
Shivam Mishra	1358efe896	feat: update icons	2020-07-23 17:02:32 +05:30
Rucha Mahabal	833682b03d	feat(Education): Student Attendance and Leave Enhancements (#22623) ... * feat: make Student Attendance doctype submittable * feat: add attendance related fields in Student Leave Application * feat: update Attendance records on Leave Application submission * refactor: better error messages and ORM queries * fix: show present only for leave applications with mark_as_present enabled in attendance reports * test: Student Leave Application * fix: filter for attendance records * fix: codacy issues	2020-07-23 16:40:07 +05:30
Anupam Kumar	04a76285e2	fix: Unable to change link from new lead to existing customer (#22787) ... * Unable to change link from new lead to existing customer * Unable to change link from new lead to existing customer Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-07-23 16:30:56 +05:30
Anupam Kumar	7137b0b670	refactor: shopping cart (#22617) ... * refactoring shopping cart settings * adding column_break in shopping cart settings	2020-07-23 15:58:47 +05:30
Rucha Mahabal	5142fc9365	feat(Education): added form dashboards and refactored custom buttons for better linking (#22727) ... * feat: add form dashboards to all forms in Education Module * feat: Add Course to Programs button in Course DocType * refactor: custom buttons in Education module forms * feat: buttons to add topic, article, quiz to their respective parent doctypes * feat: add charts to form dashboards * fix: code cleanup	2020-07-23 15:57:27 +05:30
KanchanChauhan	2826fd3c20	feat: Dunning (#22559) ... * feat: Dunning * fix: Replaces spaces with tab Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-07-23 15:45:03 +05:30
Afshan	767ee1cdb8	fix: logic to get other items also other than just 1st one	2020-07-23 15:39:27 +05:30
Anoop	23481cc484	feat: Laboratory Module Enhancements (#22416) ... * feat: option to add organism count in descriptive tests print format to accommodate descriptive test changes fix: refactoring, clean up wip * lab test - result based on secondary uom, result format options lab test print - consider result format options, result legend and worksheet instructions * feat: option to allow results blank in lab test if configured via lab test template * fix: rename child doctypes, rename related links * fix: field display depends on, cleanup - rename fields and variables * fix: get from encounter popup layout, code cleanup and minor fixes * fix: sms send dialog bug * fix: lab test get from encounter html class name typo corrected * fix: lab test organisms depends on condition * fix: reorder fields - depends on fields brought together * fix: PR review feedback, removed : separator, result formatting applied to result UOM * fix: child table js removed * fix: internal field require_result_value hidden, secondary uom result field type set to data * fix: Use ORM methods instead of db.sql, code cleanup, style * fix: create item price for lab test template if billable, code cleanup * fix: patch rename doctypes before fields, deleted renamed child doctypes * fix: secondary uom result calc - warn user if calculation fails * fix: patch to insert entries into renamed child tables * fix: codacy issues * fix: patch duplicate error as items are already migrated in v12 migrate organisms child table field name updated * fix: patch a bit lenghty, added comments * fix: patch * fix: require_result_value flag marked hidden * fix: code cleanup-up * fix: patch - lab_test rename field, lab_test_group_template select option corrected Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-07-23 15:00:54 +05:30
Anurag Mishra	453325fbc9	fix: job applicant fixes (#22448) ... * fix(validation): not two job offer should be allowed for single job_applicant * fix: don't allow to create employee_onboarding without job offer * fix: server side validation * fix: requested changes	2020-07-23 12:22:42 +05:30
Deepesh Garg	7ac4ad8410	fix: Error due to comma in Pricing rule name (#22741) ... * fix: Error due to commma in Pricing rule name * fix: Remove print statement * fix: Tests Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-23 12:12:55 +05:30
Anurag Mishra	9aa0602065	Fix: HR and Payroll Dashboard (#22771) ... * Fix: HR and Payroll Dashboard * fix: requested changes	2020-07-23 12:10:48 +05:30
Chinmay D. Pai	3e503e4404	chore: do not reset homepage through hooks ... Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-07-23 12:06:19 +05:30
Anurag Mishra	ce5b490f66	feat : Recruitment analytics (#21732) ... * feat: recruitment_anlytics * fix: filters * feat: added missing column designation Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-23 12:04:58 +05:30
Deepesh Garg	9c49f2d886	feat: Enhancement in subscription (#22263) ... * feat: Add supplier in subscription doctype * fix: Code cleanup * fix: Add dynamic link in subscription invoices * fix: Multiple enhanccement in subscription * feat: Follow calendar months in subscription * fix: Test Cases and patch * fix: Patch * fix: Update patch and add fixes * fix: Update permission for subscription settings * fix: Patch and Test * fix: Add cost center dimension in Subscripiton	2020-07-23 11:11:23 +05:30
Anupam Kumar	a18f2ec23e	fix: setting filter for project in kanban board (#22717) ... Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-07-23 11:09:17 +05:30
Marica	43b4b1cb55	chore: Export Buying Dashboard (#22767) ... * chore: Export Buying Dashboard * fix: Use Timespan instead of Between for static filters	2020-07-23 11:08:49 +05:30
Anupam Kumar	4a5fc23d5c	Export Project dashboard (#22782)	2020-07-23 11:07:56 +05:30
Marica	f207f48a67	Merge branch 'develop' into change-video-doctype-module	2020-07-22 21:22:39 +05:30
Prssanna Desai	fb89906354	fix: pass date range instead of from date (#22114) ... * fix: pass date range instead of from date * fix: escape inputs Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	2020-07-22 20:17:50 +05:30
Marica	3994aa8b06	fix: Same Contact name for different parties at Portal Login (#22715)	2020-07-22 19:49:54 +05:30
Rucha Mahabal	f4a7adbf2e	refactor: Education Desk Page	2020-07-22 18:59:04 +05:30
Marica	2ee64ceaff	Merge branch 'develop' into club-mr-column	2020-07-22 18:52:10 +05:30
Deepesh Garg	c88a3b4bf9	Merge pull request #22765 from anupamvs/rfq ... feat: Provision to make RFQ against Opportunity	2020-07-22 18:28:48 +05:30
rohitwaghchaure	d45ff31ff0	fix: incorrect stock after merging the items (#22526) ... * fix: incorrect stock after merging items * fix: Readability fix Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-22 18:24:01 +05:30
Deepesh Garg	7c50f421e1	fix: Move branch code back to bank account (#22725) ... * fix: Move branch code back to bank account * fix: Patch	2020-07-22 18:21:04 +05:30
Anupam Kumar	3e4b5e5496	fix: item-wise sales history report (#22783)	2020-07-22 18:17:58 +05:30
Anupam Kumar	e519334dfc	feat: Export CRM dashboard (#22778) ... * feat: Exported CRM dashboard * feat: Export CRM Dashboard * fix: adding company in all dashboard and number card	2020-07-22 18:16:57 +05:30
Anupam K	5bd0b93acf	fix: cur_frm -> frm	2020-07-22 18:10:57 +05:30
Anupam Kumar	93afbe143b	feat: Export Selling Dashboard (#22776) ... * feat:Export Stock Dashboard * Export Selling Dashboard * Export Selling Dashboard	2020-07-22 18:07:39 +05:30
Deepesh Garg	c7eadfceb0	fix: Multi currency payment reconciliation (#22738) ... * fix: Multi currency payment reconciliation * fix: Hide currency link fields	2020-07-22 17:59:37 +05:30
Prssanna Desai	f098221550	feat: Exported manufacturing dashboard (#22626) ... * feat: exported Manufacturing Dashboard * fix: update use_report_chart fieldname * fix: add dynamic filter for company in Produced Quantity chart	2020-07-22 16:58:17 +05:30
sahil28297	3d3c922d7f	fix(patch): handle duplicate entry error while inserting account (#22745)	2020-07-22 16:42:31 +05:30
Marica	514366654e	fix: Serial No Rename does not affect Stock Ledger Entry (#22746) ... * Revert "fix: Remove rename related code from Serial No (#22627)" This reverts commit 1ec2d962db. * fix: Rename fails on Stock Ledger Entry * fix: Allow Rename in Serial No	2020-07-22 16:40:24 +05:30
Marica	53646cb360	chore: Export Stock Dashboard (#22768)	2020-07-22 16:17:40 +05:30
Shivam Mishra	f50312b6d2	fix: button sizing (#22777)	2020-07-22 16:17:11 +05:30
Rucha Mahabal	1fddc6d126	chore: Exported Accounts Module Dashboard (#22769) ... * chore: Exported Accounts Module Dashboards * chore: deleted dashboard fixtures for Accounts module	2020-07-22 16:11:06 +05:30
Afshan	6b9acf4476	updated patch to delete auto email reports and moved patch to v13 from v12	2020-07-22 16:00:18 +05:30
Rucha Mahabal	8d28eacb09	chore: Exported Healthcare Module Dashboard (#22775)	2020-07-22 15:57:33 +05:30
Deepesh Garg	d6615248a8	Merge pull request #22762 from DeeMysterio/financial-stat ... fix(report): fix alignment in script report that extends financial_statements.js	2020-07-22 14:45:22 +05:30
Anupam K	de417d2774	feat: Provision to make RFQ against Opportunity	2020-07-22 01:05:32 +05:30
Afshan	871889220b	style: moved parent warehouse to top section also added a section bre… (#22708) ... * style: moved parent warehouse to top section also added a section break for better look * style: changes display depends on for HTML field Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-21 20:39:00 +05:30
Afshan	66d4b42df0	fix: update set query for warehouse after changing the company (#22632) ... * fix: update set query for warehouse after changing the company * fix: changed set_query to get_query * fix: variable filter doesn't get updated once set on load hence removed Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-21 19:59:30 +05:30
Rucha Mahabal	ffbd7b4087	fix: move Video DocType from Core to Utilities module	2020-07-21 19:40:18 +05:30
Diksha Jadhav	09b8caf866	fix(report): fix alignment in script report that extends financial_statements.js	2020-07-21 17:35:10 +05:30
Deepesh Garg	9e5aa282ec	Merge pull request #22753 from nabinhait/trial-balance-opening-cancelled-entry-fix ... fix: Ignore cancelled entries in trial balance opening	2020-07-21 16:42:02 +05:30
Abhishek Balam	a5b83e85c3	feat: dashboard for timesheet (#22750)	2020-07-21 12:54:59 +05:30
Nabin Hait	493b581862	fix: Ignore cancelled entries in trial balance opening	2020-07-21 12:47:16 +05:30
Marica	8ec4198af2	Merge branch 'develop' into club-mr-column	2020-07-20 16:07:10 +05:30
Afshan	2b21b7bafa	fix: moved custom_make_buttons to PurchaseOrderController to avoid duplication of dropdown options	2020-07-20 16:05:52 +05:30
michellealva	8c7d8ba917	fix: remove tab in code	2020-07-20 13:12:17 +05:30
michellealva	37cd1b8021	fix: Heatmap in Vehicle	2020-07-20 13:04:46 +05:30
Deepesh Garg	04e8af7dca	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_and_fixes	2020-07-20 09:53:26 +05:30
Chinmay D. Pai	33bf0574a3	chore: fix get single value call ... Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-07-19 15:54:11 +05:30
Chinmay D. Pai	5bda28eae6	fix: reset homepage to home after unchecking products page ... resets homepage back to home when "home page is products" is unchecked Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-07-19 00:15:40 +05:30
Deepesh Garg	d81372a39c	Merge pull request #22734 from deepeshgarg007/custom_cash_flow ... fix: Period list api changes for custom cash flow report	2020-07-18 20:35:28 +05:30
Deepesh Garg	07f8e749be	fix: Period list api changes for custom cash flow report	2020-07-18 19:47:33 +05:30
Deepesh Garg	f6c70bca0a	Merge pull request #22615 from aerele/fix_mandatory_error ... fix: log type mandatory error while exposing api call to employee checkin.	2020-07-17 17:38:21 +05:30
Deepesh Garg	2fd4aa3051	Merge pull request #22661 from frappe/lead-owner-efficiency ... fix: making owner fieldtype to link	2020-07-17 17:36:59 +05:30
rohitwaghchaure	f4db8c1c11	Merge pull request #22724 from rohitwaghchaure/fixed-incorrect-currency-symbol-in-stock-balance-report-develop ... fix: currency symbol not showing as per company currency in stock balance report	2020-07-17 16:56:22 +05:30
rohitwaghchaure	b4ef13c686	Merge pull request #22726 from rohitwaghchaure/fixed-actual-qty-showing-as-zero-develop ... fix: Stock Reconciliation Invalid Quantity for Batched Item	2020-07-17 16:55:59 +05:30
Rucha Mahabal	3e6fe38d02	Merge branch 'develop' into fix-maintenance-visit	2020-07-17 16:34:59 +05:30
Rohit Waghchaure	2347e69cb9	fix: for past dated stock reco, batched item showing the current available qty instead of quantity as per posting date	2020-07-17 14:50:49 +05:30
Rohit Waghchaure	848568d023	fix: currency symbol not showing as per company currency in stock balance	2020-07-17 14:49:12 +05:30
rohitwaghchaure	7e56e80057	Merge pull request #22721 from deepeshgarg007/gstr_test ... fix: Multiple fixes in GST	2020-07-17 14:34:43 +05:30
Mangesh-Khairnar	9be6787b80	fix(maintenance-visit): change fieldtype of status to select	2020-07-17 12:51:49 +05:30
Rucha Mahabal	7e64a1f170	Merge branch 'develop' into issue-list-action	2020-07-17 11:48:23 +05:30
Deepesh Garg	188273564c	fix: Multiple fixes in GST	2020-07-17 11:31:15 +05:30
michellealva	d02465a68f	fix: Update modified timestamp for Delivery Note Item	2020-07-17 10:35:16 +05:30
marination	6319073d81	fix: Move Issue List actions under 'Actions' dropdown	2020-07-16 15:38:51 +05:30
Karthikeyan S	ff6ba25386	fix: remove FE validation for log_type field	2020-07-16 13:33:38 +05:30
Anurag Mishra	ac23ac6a02	fix: validation for additional salary (#22645) ... * fix: validation for additional salary * fix:changes requested Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-07-16 13:10:43 +05:30
Rucha Mahabal	6b3110ed13	Merge branch 'develop' into expense-claim-payment-fix	2020-07-16 12:23:26 +05:30
Anurag Mishra	50902cf30c	Fix: Changes Requested	2020-07-16 12:21:46 +05:30
Suraj Shetty	11b0554ae9	Merge branch 'develop' into fix-financial-statement-print-format	2020-07-16 09:45:26 +05:30
Deepesh Garg	52c319cfa7	fix: Update RCM only for indian countries	2020-07-16 00:23:58 +05:30
Deepesh Garg	2af43b3df6	fix: linting	2020-07-15 21:54:28 +05:30
Deepesh Garg	49821df0ae	Merge pull request #22697 from rohitwaghchaure/fixed-not-able-to-submit-si ... fix: not able to submit sales invoice	2020-07-15 21:51:16 +05:30
Deepesh Garg	177bbd8e20	Merge pull request #22701 from deepeshgarg007/gstr3b_cess ... fix: Cess amount in GSTR 3B report	2020-07-15 18:20:42 +05:30
Deepesh Garg	0fa4143bac	fix: Cess amount in GSTR 3B report	2020-07-15 18:17:38 +05:30
rohitwaghchaure	8ff821970a	Merge pull request #22700 from rohitwaghchaure/fixed-incorrect-balance-qty-in-stock-ledger-develop ... fix: incorrect balance qty in stock ledger report	2020-07-15 17:25:11 +05:30
Rohit Waghchaure	132376750c	fix: incorrect balance qty in stock ledger report	2020-07-15 17:23:17 +05:30
Rohit Waghchaure	e0de0ac617	fix: not able to submit sales invoice	2020-07-15 17:13:43 +05:30
Rohit Waghchaure	07cc918d70	fix: patch update_actual_start_and_end_date_in_wo	2020-07-15 16:41:32 +05:30
Suraj Shetty	34617744e1	fix: Show total row in print format of financial statement	2020-07-15 16:37:21 +05:30
rohitwaghchaure	f16bd00463	Merge pull request #22608 from ruchamahabal/fix-sla-ui ... fix: allow creating SLA documents even if SLA tracking is not enabled	2020-07-15 15:47:37 +05:30
rohitwaghchaure	30030230bf	Merge pull request #22675 from marination/material-request-warehouse ... fix: Dont overwrite default warehouse in Material Request	2020-07-15 15:35:38 +05:30
rohitwaghchaure	7c08ff7572	Merge pull request #22596 from marination/exploded-item-rate ... fix: Exploded Item Rate in BOM	2020-07-15 14:30:27 +05:30
Rohit Waghchaure	e1b3f16abd	fix: project field added two time in purchase receipt	2020-07-15 12:28:19 +05:30
Deepesh Garg	5beac7a0cc	fix: Period list fixes in financial statements (#22677)	2020-07-15 12:17:43 +05:30
Anurag Mishra	c1636f8fab	fix: conversion rate as 1 if no conversion rate	2020-07-14 18:58:02 +05:30
marination	392f323d2d	fix: Dont overwrite default warehouse in Material Request	2020-07-14 17:03:17 +05:30
rohitwaghchaure	eb2a42d9e1	Merge pull request #22589 from deepeshgarg007/rcm_fix ... fix: Do not add GST tax amount in grand total for reverse charge invoices	2020-07-14 13:42:48 +05:30
Rucha Mahabal	c4a1b34811	Merge branch 'develop' into fix-sla-error	2020-07-14 13:24:57 +05:30
Marica	82a606d04b	fix: Added Project Field in Purchase Receipt for Stock Ledger Tagging (#22666)	2020-07-14 13:16:28 +05:30
Anupam Kumar	c5f14da99c	Merge branch 'develop' into lead-owner-efficiency	2020-07-14 12:59:42 +05:30
Rucha Mahabal	88931f0677	fix(Support): TypeError while saving Service Level Agreement	2020-07-14 11:46:11 +05:30
John Veness	72320afb07	Correct help link for Address (#22673)	2020-07-14 10:44:15 +05:30
bhavesh95863	eb69859d3e	fix: Quotation list view blank if quotation_to field not set as a standard filter	2020-07-13 23:15:31 +05:30
rohitwaghchaure	165d57aa0b	Merge pull request #22663 from rohitwaghchaure/fixed-error-report-related-to-task-develop ... fix: '>' not supported between instances of 'str' and 'int'	2020-07-13 18:11:50 +05:30
rohitwaghchaure	165eb5a1c3	Merge pull request #22665 from marination/maintenance-schedule ... fix: Block Invalid Serial No updates in Maintenance Schedule	2020-07-13 18:11:06 +05:30
rohitwaghchaure	62fe2cac19	Merge pull request #22051 from deepeshgarg007/project-link-for-all-accounts ... fix: Project link not set in accounts other than profit and loss accounts	2020-07-13 18:09:41 +05:30
Marica	3f8840cd7a	Merge branch 'develop' into maintenance-schedule	2020-07-13 15:24:37 +05:30
Rucha Mahabal	68cc3e4220	Merge branch 'develop' into fix-sla-ui	2020-07-13 14:40:01 +05:30
Anurag Mishra	b9d8ff91a5	Merge branch 'develop' into lead-owner-efficiency	2020-07-13 14:22:34 +05:30
Anurag Mishra	d38c22d85d	Merge branch 'develop' into fixed-error-report-related-to-task-develop	2020-07-13 14:21:58 +05:30
rohitwaghchaure	a8fea8df98	Merge pull request #22614 from deepeshgarg007/payment_reco_cost_center_fix ... fix: Add default cost center in payment reconciliation JV	2020-07-13 13:44:49 +05:30
marination	1791bc187b	fix: Block Invalid Serial No updates in Maintenance Schedule	2020-07-13 12:32:09 +05:30
Rohit Waghchaure	2e8d8b9aeb	fix: '>' not supported between instances of 'str' and 'int'	2020-07-13 12:09:10 +05:30
rohitwaghchaure	ac984eb37c	Merge branch 'develop' into project-link-for-all-accounts	2020-07-13 11:50:11 +05:30
Afshan	ccf6b5f640	Merge remote-tracking branch 'upstream/develop' into add-age-range-in-stock-ageing ... Merge remote-tracking branch 'upstream/develop' into add-age-range-in-stock-ageing	2020-07-13 11:45:33 +05:30
Afshan	e40605d711	Merge remote-tracking branch 'upstream/develop' into club-mr-column ... Merge remote-tracking branch 'upstream/develop' into club-mr-column	2020-07-13 11:43:19 +05:30
Deepesh Garg	f5a457c397	Merge branch 'develop' into lead-owner-efficiency	2020-07-13 11:32:09 +05:30
Anupam K	cd445786fe	making owner fieldtype to link	2020-07-12 20:03:15 +05:30
Afshan	d058840094	fix: removed fiscal year field from "Request for Quotation" doctype (#22446) ... * fix: removed fiscal year field from "Request for Quotation" doctype	2020-07-12 19:19:59 +05:30
Raffael Meyer	193e12f02a	fix: download button (#22652)	2020-07-12 17:26:27 +05:30
Afshan	83cd1dcc44	fix: Add project filter in parent task field (#22655) ... * fix: Add project filter in parent task field	2020-07-11 21:54:54 +05:30
Deepesh Garg	1ab228b52e	Merge pull request #22657 from deepeshgarg007/eway_bill_json_gen ... fix: ewaybill json had json dump of json dump, and other related fixes	2020-07-11 21:42:01 +05:30
Sagar Vora	c9b4ba6de8	fix: ewaybill json had json dump of json dump, and other related fixes	2020-07-11 21:29:17 +05:30
Deepesh Garg	62d047bf9b	Merge branch 'develop' into payment_reco_cost_center_fix	2020-07-11 21:05:32 +05:30
Deepesh Garg	8cdf33f618	Merge pull request #22635 from deepeshgarg007/item_tax_test ... fix(travis): Item Tax template test	2020-07-11 21:04:31 +05:30
Deepesh Garg	a9820cdcf6	fix: Remove every bit of randomness from this test	2020-07-11 19:38:51 +05:30
Deepesh Garg	46bcb46422	fix: Do not use random customers	2020-07-11 18:36:32 +05:30
Deepesh Garg	f15ff5fbfa	fix: Test	2020-07-11 13:58:53 +05:30
Deepesh Garg	87eb2827ef	fix: Update tests	2020-07-10 22:45:45 +05:30
marination	a6c10b1bc0	fix: Pricing Rule breaks if no item_code	2020-07-10 20:09:58 +05:30
Karthikeyan S	183ebb237e	Merge branch 'develop' into fix_mandatory_error	2020-07-10 18:05:18 +05:30
gavin	ecf2bae041	Merge branch 'develop' into erpnext-install-check	2020-07-10 17:42:39 +05:30
Afshan	e9affe3705	merge branch develop	2020-07-10 16:31:40 +05:30
Faris Ansari	70aa3c0b1f	fix: Remove explicit exception ... Co-authored-by: gavin <gavin18d@gmail.com>	2020-07-10 16:13:21 +05:30
Afshan	0863beec92	created new report named "requested_items_to_order_and_receive" removed report "requested_items_to_order" also wrote a patch for deleting old report from table "tabReport"	2020-07-10 15:14:01 +05:30
Afshan	dca8a1d69d	renamed "pending qty" to "qty to recieved"	2020-07-10 14:26:21 +05:30
rohitwaghchaure	bca8483dc8	Merge pull request #22634 from Anurag810/retention-bonus-fixes ... fix: default overwrite property and 'company' is not defined	2020-07-10 13:41:40 +05:30
Deepesh Garg	e99091fd4f	Merge pull request #22644 from deepeshgarg007/dcc_query ... fix: Distributed cost center query	2020-07-10 13:35:34 +05:30
Deepesh Garg	7cb195b304	fix: Distributed cost center query	2020-07-10 13:33:50 +05:30
Marica	eee12fbcb4	fix: Remove redundant variable declaration (#22641)	2020-07-10 12:34:59 +05:30
Afshan	fd28f1071e	style: arrangements of filters for reports (#22636)	2020-07-10 11:25:39 +05:30
rohitwaghchaure	3a3787f9e7	fix: Due to decimal issue make purchase receipt button not showing from PO (#22629)	2020-07-09 20:07:40 +05:30
rohitwaghchaure	d14666e419	fix: incorrect delivered qty in Supplier-Wise Sales Analytics (#22631)	2020-07-09 20:07:10 +05:30
Marica	1ec2d962db	fix: Remove rename related code from Serial No (#22627)	2020-07-09 20:02:18 +05:30
Deepesh Garg	b74077faf5	fix(travis): Item Tax tempate template test	2020-07-09 19:50:41 +05:30
Anurag Mishra	d7563f0327	fix: default overwroite property n 'company' is not defined	2020-07-09 19:40:18 +05:30
Rohan	cdf55cef80	fix: fetch project-related info in Timesheet (#22423) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-09 11:36:01 +05:30
Rucha Mahabal	6c6c36e780	fix: attribute error while cancelling patient encounter	2020-07-09 11:23:41 +05:30
Afshan	a629c9e1bc	style: remove import comment	2020-07-08 19:28:28 +05:30
Afshan	d16d0efde5	feat: added range for age in stock ageing	2020-07-08 19:23:13 +05:30
Rucha Mahabal	45b01d2c02	feat: add medical coding fields to Healthcare DocTypes (#22501) ... * feat: add medical coding fields to templates * feat: fetch medical codes from templates in forms * fix: codacy issues Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-08 15:39:45 +05:30
Afshan	e0ff0cfcb9	fix: fetch "Employee Leave Policy" from "Employee Grade" if available (#22570) ... * fix:fetch "Employee Leave Policy" from "Employee Grade" if available * fix: checked "Fetch IF Empty" checkbox Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-08 14:40:22 +05:30
Marica	b78dc75456	Merge pull request #22573 from deepeshgarg007/employee_tree ... feat: Added all companies option in employee tree to view employee ac…	2020-07-08 14:34:33 +05:30
rohitwaghchaure	0cd39e3a38	Merge pull request #22611 from frappe/hrms-dashboard-fix ... fix: HR dashboard number card filter	2020-07-08 14:33:45 +05:30
Marica	9e73fdd866	Merge branch 'develop' into employee_tree	2020-07-08 14:33:10 +05:30
Michelle Alva	5d514fe4df	fix: grammatical fixes in module onboarding (#22580) ... * fix: grammatical fixes in module onboarding * fix: more grammatical changes for consistency * fix: Reorder Stock Onboarding * fix: update success message * fix: change order of stock onboarding steps Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-08 14:25:51 +05:30
Marica	3f05a2692e	Merge branch 'develop' into employee_tree	2020-07-08 14:04:49 +05:30
rohitwaghchaure	41c9708f99	Merge branch 'develop' into project-link-for-all-accounts	2020-07-08 13:11:37 +05:30
Marica	0afdafdbce	Merge branch 'develop' into error-message	2020-07-08 13:07:01 +05:30
rohitwaghchaure	37d828eda6	Merge pull request #22511 from deepeshgarg007/gl_entry_ignore_validation ... fix: Do not ignore validate methods on GL entry submit	2020-07-08 13:06:47 +05:30
rohitwaghchaure	be9f8dc5db	Merge pull request #22522 from Anurag810/leave_application_fixes ... fix: set half day date None if half day is unchecked	2020-07-08 12:40:30 +05:30
rohitwaghchaure	1fce8b7475	Update leave_application.js	2020-07-08 12:40:01 +05:30
rohitwaghchaure	c7b63bfcaf	Merge pull request #22415 from Anurag810/payroll_entry_ux_fix_2.0 ... fix: Create salary slip button disappears	2020-07-08 12:35:24 +05:30
rohitwaghchaure	e862b3f9ce	Update payroll_entry.js	2020-07-08 12:34:15 +05:30
rohitwaghchaure	3431d42d12	Merge pull request #22610 from frappe/lead-creation-from-email ... fix: Creating Lead from email	2020-07-08 12:27:18 +05:30
rohitwaghchaure	50f48f5176	Merge pull request #22592 from frappe/number-card-filter-fix ... fix: crm dashboard Number card filter fix	2020-07-08 12:25:12 +05:30
rohitwaghchaure	fae570e0a2	Merge pull request #22612 from netchampfaris/fix-item-price-labels ... fix: Remove trailing spaces from labels	2020-07-08 12:14:21 +05:30
Faris Ansari	0a06580e2c	fix: Update message ... Co-authored-by: gavin <gavin18d@gmail.com>	2020-07-08 12:06:28 +05:30
Deepesh Garg	9071a7de82	fix: Add default cost center in payment reconciliation JV	2020-07-08 11:27:25 +05:30
Kaviya Periyasamy	923ed8a741	fix: log type mandatory error while exposing api call to employee checkin	2020-07-08 11:15:04 +05:30
Faris Ansari	f3a6e30e6a	fix: Check if homepage is not setup-wizard ... The new desk changes sets the default homepage to 'workspace'. To avoid problem in the future, check if the value is not setup-wizard. Also throw an exception if the check passes, so it exits with error.	2020-07-08 10:45:55 +05:30
Deepesh Garg	addd1e842b	Merge pull request #22568 from ahmadpak/develop ... fix: Item Tax Template permissions as per company	2020-07-08 10:08:53 +05:30
Faris Ansari	8c5c74ca06	fix: Remove trailing spaces from labels	2020-07-08 09:20:13 +05:30
Anupam K	6669f7457a	hr dashboard number card filter fix	2020-07-08 01:24:53 +05:30
Anupam K	8bc92b90f5	updating lead.py	2020-07-08 00:56:21 +05:30
Rucha Mahabal	3d14011d23	fix: allow creating SLA documents even if SLA tracking is not enabled	2020-07-07 18:30:54 +05:30
Afshan	e3269039d3	feat: added columns to get complete analysis for material request	2020-07-07 18:01:37 +05:30
Marica	4d5d706a4b	Merge branch 'develop' into error-message	2020-07-07 16:41:39 +05:30
Mitali Deshpande	f642be9727	fix: Changed error message in the Product Bundle	2020-07-07 16:14:01 +05:30
Marica	f4d0a3e7b0	Merge branch 'develop' into whitelist-query	2020-07-07 15:42:42 +05:30
rohitwaghchaure	546cfdaac2	Merge pull request #22601 from deepeshgarg007/payment_reco_company ... fix: Payment reco error in multi-company setup	2020-07-07 15:32:36 +05:30
Deepesh Garg	ca351e3549	fix: Pass company	2020-07-07 14:37:17 +05:30
Marica	8dbdf0902f	Merge branch 'develop' into whitelist-query	2020-07-07 14:29:24 +05:30
marination	32f3d24dac	fix: Employee benefit application & quality inspection whitelist	2020-07-07 14:31:49 +05:30
Deepesh Garg	e2fdff5777	fix: Payment reco error in multicompany setup	2020-07-07 14:14:07 +05:30
Marica	7860d9e699	Merge branch 'develop' into whitelist-query	2020-07-07 11:53:19 +05:30
Afshan	70b3edd502	fix: format according to cordacy	2020-07-07 00:03:45 +05:30
Afshan	3819c0bf28	fix: cost center should only show option of selectedcompany	2020-07-06 23:52:11 +05:30
Marica	d187a6ac48	Merge branch 'develop' into exploded-item-rate	2020-07-06 23:35:37 +05:30
marination	4355d3cf0f	fix: Exploded Item Rate	2020-07-06 23:15:08 +05:30
Marica	5f299a08bd	fix: General Message in previous doc validation for buying and selling (#22546)	2020-07-06 18:26:56 +05:30
Marica	e3e5fd7e74	fix: Skip Progress and Completed by fields on Task Duplication (#22565)	2020-07-06 18:26:19 +05:30
rohitwaghchaure	39933a4db1	Merge pull request #22441 from nextchamp-saqib/asset-delete-fix ... fix: cannot cancel asset and asset movement	2020-07-06 16:13:55 +05:30
Anupam K	8b26ea720b	Merge branch 'develop' of https://github.com/frappe/erpnext into number-card-filter-fix	2020-07-06 15:21:53 +05:30
rohitwaghchaure	71e1d2cc79	Merge pull request #22563 from AndyOverLord/patch-6 ... fix: fetch item price in sales invoice	2020-07-06 14:18:03 +05:30
Deepesh Garg	05738bd29a	fix: Remove print statements	2020-07-06 13:40:48 +05:30
rohitwaghchaure	661bc46b81	Merge pull request #22571 from marination/quality-feedback ... fix: Quality Feedback and Template (minor)	2020-07-06 13:17:10 +05:30
rohitwaghchaure	1cc1fd4f86	Merge pull request #22576 from marination/party-details ... fix: Check for Company before trying to fetch party details	2020-07-06 12:42:16 +05:30
Deepesh Garg	92a03aa5db	Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts	2020-07-06 12:37:28 +05:30
rohitwaghchaure	e5d9ebe32e	Merge pull request #22577 from deepeshgarg007/coa_fiscal_year_fix ... fix: Consider company fiscal year for getting balance	2020-07-06 12:34:56 +05:30
Anupam K	e88f2bb053	number card filter	2020-07-06 12:34:05 +05:30
Marica	7e198527b9	Merge branch 'develop' into party-details	2020-07-06 11:09:20 +05:30
Saqib	819879dd12	Merge branch 'develop' into asset-delete-fix	2020-07-05 18:38:51 +05:30
Deepesh Garg	be05c4e14a	fix: Codacy and minor fixes	2020-07-05 18:16:16 +05:30
Deepesh Garg	4993ab5191	Merge branch 'develop' into develop	2020-07-04 18:28:06 +05:30
rohitwaghchaure	3292e63dee	Merge pull request #22569 from rohitwaghchaure/fixed-travis-failing-due-to-loan-issue ... fix: travis	2020-07-04 14:14:52 +05:30
Rohit Waghchaure	f0f4f70a76	fix: test case for salary slip	2020-07-04 13:30:22 +05:30
Deepesh Garg	96d40ec9da	fix: Consider company fiscal for getting balalnce	2020-07-03 22:59:00 +05:30
marination	e27b996e38	fix: Check for Company before trying to fetch party details	2020-07-03 22:12:00 +05:30
Deepesh Garg	62181707ee	Merge pull request #22574 from deepeshgarg007/uae_item_tax_fix ... fix: Update item tax only if item code available	2020-07-03 21:25:28 +05:30
Deepesh Garg	04661a4e15	fix: Update item tax only if item code available	2020-07-03 21:23:23 +05:30
Rohit Waghchaure	2cbf598b4b	fix: travis	2020-07-03 20:15:18 +05:30
Deepesh Garg	d7adacd3e2	feat: Added all companies option in employee tree to view employee accress all companies	2020-07-03 18:39:51 +05:30
marination	8e62035991	fix: Quality Feedback and Template (minor)	2020-07-03 16:19:55 +05:30
mohammadahmad1990	405b20884b	fix: patch	2020-07-03 15:15:27 +05:00
mohammadahmad1990	b2725577b2	Patch file updated	2020-07-03 15:06:36 +05:00
mohammadahmad1990	f933cf80df	Patch for Updating item Tax Template Company	2020-07-03 15:04:37 +05:00
mohammadahmad1990	261ecba3d6	Company field removed from Item Taxes Table	2020-07-03 15:04:28 +05:00
mohammadahmad1990	ad3d44d622	fix: Item Tax Template check on company field	2020-07-03 15:02:39 +05:00
mohammadahmad1990	015910b4c4	Company Field Added in Item Tax Template	2020-07-03 15:02:32 +05:00
mohammadahmad1990	728bf0e6dd	fix: Item Tax Template	2020-07-03 15:02:16 +05:00
mohammadahmad1990	e39649bc9e	fix: Item Tax Template with no validity	2020-07-03 15:02:03 +05:00
mohammadahmad1990	41c0c9f46b	fix: Item Tax Template	2020-07-03 15:01:49 +05:00
Deepesh Garg	9ed0384bea	fix: Code cleanup	2020-07-03 14:54:41 +05:30
sahil28297	32d7ff7b34	Merge branch 'develop' into fix_develop_version	2020-07-03 11:48:22 +05:30
Deepesh Garg	271ccff77d	Merge pull request #22564 from deepeshgarg007/loan_doc_cleanup ... fix: Remove loan security field from loan	2020-07-03 09:34:56 +05:30
Andy Zhu	b60abb0158	fix: fetch item price in sales invoice ... When create standalone sales invoice, the item price will not be created fetch. By adding "posting_date" to dict: item_price_args, it will be fetch on building the condition of SQL.	2020-07-03 14:13:15 +12:00
Deepesh Garg	30d9101cbf	fix: Remove loan security field from loan	2020-07-02 23:39:12 +05:30
Deepesh Garg	3c004ad798	fix(GST): Do not add tax amount in grand total for reverse charge invoices	2020-07-02 21:18:29 +05:30
Afshan	bfffd9b01b	made "Subscription Section", "Auto Repeat" and Hub Publishing" collapsible by default (#22521) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-02 15:11:45 +05:30
Khushal Trivedi	49d04f449e	fix: no else condition required since we can decalre it by default (#22537) ... * fix: removing unnecessary else condition on customer form * fix: removing unnecessary else condition on customer form * fix: no else condition required since we can decalre it by default Co-authored-by: Khushal Trivedi <khushalt5@gmail.com>	2020-07-02 14:51:20 +05:30
Chinmay D. Pai	ed0bb20e6f	chore: add query functions to whitelist ... Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-07-02 12:35:41 +05:30
Chinmay D. Pai	aa1210921b	fix: whitelist all query functions for search widget ... Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-07-01 21:14:32 +05:30
Marica	484a681e0c	Merge branch 'develop' into FR_ISS_204863	2020-07-01 11:29:03 +05:30
Sahil Khan	f278425c01	bumped to version 13.0.0-beta.3	2020-06-30 19:06:02 +05:50
Michelle Alva	ec84afa86d	fix: Refactor dashboard links in leave policy (#22519) ... * fix: refactor dashboard links in leave policy * fx: code fix * fix: add labels to links * fix: code change	2020-06-30 18:04:20 +05:30
Sahil Khan	ad4eb649a2	chore: set develop version as 13.x.x	2020-06-30 17:54:41 +05:30
Anurag Mishra	8f2cb0beb6	fix: set half day date None if half day is unchecked	2020-06-30 12:11:03 +05:30
mergify[bot]	dca65de1b6	fix: Salary deductions report fixes (bp #22397) (#22520) ... * feat: added year filters (cherry picked from commit d0d9b53361) * Fix: if there is no component (cherry picked from commit f9ca29cebd) * fix: test_tax_for_payroll_period (cherry picked from commit ece9508eb5) Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>	2020-06-30 11:45:40 +05:30
Nabin Hait	7813cabfd3	chore: Added Change Log	2020-06-30 11:35:41 +05:30
mergify[bot]	7db00dde2d	fix: Dashboard label in Projects and Assets module (#22517) (#22518) ... (cherry picked from commit fdbd10f193) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-06-30 09:33:18 +05:30
Nabin Hait	fdbd10f193	fix: Dashboard label in Projects and Assets module (#22517)	2020-06-30 09:25:17 +05:30
mergify[bot]	e0388a169a	fix: manufacturing dashboard grammar (#22510) (#22516) ... * fix: manufacturing dashboard grammar * Update manufacturing.json (cherry picked from commit 7056cd3782) Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>	2020-06-30 08:57:26 +05:30
Marica	7ca8022b8f	fix: Set Root as Parent if no parent in new tree view node (#22508)	2020-06-30 08:20:58 +05:30
Marica	0efda4e457	fix: Added Missing Trends Reports to Buying/Selling Desk (#22509) ... * fix: Added Missing Trends Reports to Buying/Selling Desk * fix: Move Reports to Other Reports	2020-06-30 08:20:35 +05:30
rohitwaghchaure	7056cd3782	fix: manufacturing dashboard grammar (#22510) ... * fix: manufacturing dashboard grammar * Update manufacturing.json	2020-06-30 08:20:03 +05:30
Afshan	06f11aba0b	feat: Autofill Supplier pop-up when only 1 Supplier in RFQ	2020-06-29 21:39:35 +05:30
Deepesh Garg	8230e41a42	fix: Insert instead of DB insert	2020-06-29 21:20:05 +05:30
Deepesh Garg	d1bf6e0277	fix: Do not ignore validate methods on GLL entry submit	2020-06-29 21:14:03 +05:30
mergify[bot]	9cba6bddde	fixes: Payroll module pre relese test fixes (#22500) (#22506) ... * fix: salary payment based on payments * fix: bank remittance report * fix: Payroll period onboarding * fix: provident-fund-deductions report * fix: Considered unmarked days * fix: onboarding paYroll * feat: quick entry in payroll entry (cherry picked from commit c2523e8453) Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>	2020-06-29 20:07:57 +05:30
Anurag Mishra	c2523e8453	fixes: Payroll module pre relese test fixes (#22500) ... * fix: salary payment based on payments * fix: bank remittance report * fix: Payroll period onboarding * fix: provident-fund-deductions report * fix: Considered unmarked days * fix: onboarding paYroll * feat: quick entry in payroll entry	2020-06-29 19:54:23 +05:30
Marica	510436931b	fix: Added Missing Trends Reports to Buying/Selling Desk (#22502) ... * fix: Added Missing Trends Reports to Buying/Selling Desk * fix: Move Reports to Other Reports	2020-06-29 19:52:23 +05:30
mergify[bot]	c312b3af13	fix: job offer validation fix (#22504) (#22505) ... (cherry picked from commit 343651fc39) Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>	2020-06-29 19:10:57 +05:30
mergify[bot]	47a3524a7d	fix: Stock Onboarding typo and reorder (#22499) (#22503) ... (cherry picked from commit 8732b8caf6) Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-06-29 18:24:25 +05:30
Anurag Mishra	343651fc39	fix: job offer validation fix (#22504)	2020-06-29 18:23:22 +05:30
Marica	3e93a2f67f	fix: Set Root as Parent if no parent in new tree view node (#22497) ... Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-06-29 17:39:26 +05:30
Marica	8732b8caf6	fix: Stock Onboarding typo and reorder (#22499)	2020-06-29 17:38:42 +05:30
Anurag Mishra	ba5f571b0d	fix: take parent cost center for child if no cost center at child (#22496)	2020-06-29 17:35:27 +05:30
Saqib	41034f760d	Merge branch 'develop' into asset-delete-fix	2020-06-29 10:54:01 +05:30
Saqib Ansari	cc42aa1750	fix: cancel asset movement on asset cancellation	2020-06-29 10:33:24 +05:30
Mangesh-Khairnar	73edba0e10	fix: handle nonetype issue for packed items (#22493)	2020-06-29 08:54:53 +05:30
Deepesh Garg	a74cffe7a4	Merge pull request #21047 from vishdha/feat_taxjar ... feat(ERPNext Integrations): Taxjar Integration Added	2020-06-28 23:01:37 +05:30
Deepesh Garg	23c64c0b3a	Merge pull request #22487 from frappe/mergify/bp/version-13-beta-pre-release/pr-21690 ... fix(regional): DATEV report (bp #21690)	2020-06-28 21:38:58 +05:30
Deepesh Garg	50e6e47e66	fix: Patch	2020-06-28 21:32:08 +05:30
rohitwaghchaure	6acde987c5	Merge pull request #22488 from rohitwaghchaure/fixed-letter-head-not-found ... fix: letter head not found in opening invoice creation tool	2020-06-28 20:02:29 +05:30
Deepesh Garg	eca2c1cd93	fix: patch	2020-06-28 18:53:55 +05:30
Rucha Mahabal	67608c3179	Merge pull request #22476 from ruchamahabal/fix-custom-status-v13 ... fix: handle custom statuses for the pause SLA configuration	2020-06-28 17:32:25 +05:30
Rohit Waghchaure	04cf2e029f	fix: letter head not found in opening invoice creation tool	2020-06-28 17:08:12 +05:30
barredterra	7df5de9468	fix: hide transaction-specific for master data ... (cherry picked from commit 30d194d8a7)	2020-06-28 11:29:48 +00:00
barredterra	8f7d214853	fix: customer and supplier data ... (cherry picked from commit 53445aa25a)	2020-06-28 11:29:48 +00:00
barredterra	6adb617ede	fix: truncate account names to max length ... (cherry picked from commit 2976831560)	2020-06-28 11:29:48 +00:00
barredterra	3efe0d0e83	refactor: query meta data only once ... (cherry picked from commit 55c048f56c)	2020-06-28 11:29:47 +00:00
barredterra	cf53305abb	fix(report view): explicitly set column width for ... (cherry picked from commit 7a7add5001)	2020-06-28 11:29:47 +00:00
Deepesh Garg	4c230ed4b0	Merge pull request #21690 from alyf-de/refactor_datev ... fix(regional): DATEV report	2020-06-28 16:55:18 +05:30
Deepesh Garg	c8b11143a1	Merge pull request #22445 from Alchez/dev-job-offer-list-view ... fix: setup status indicators for Job Offer and Job Applicant (develop)	2020-06-28 16:49:28 +05:30
rohitwaghchaure	e4d296bb1c	Merge pull request #22413 from Anurag810/salary-structure-help-fix ... fix: 'Condition & Formula Help' appears twice	2020-06-28 16:29:20 +05:30
rohitwaghchaure	7e3f10e5bc	Merge pull request #22397 from Anurag810/salary_deductions_report_fixes ... fix: Salary deductions report fixes	2020-06-28 16:27:37 +05:30
rohitwaghchaure	81af2235f4	Merge branch 'develop' into dev-job-offer-list-view	2020-06-28 15:25:32 +05:30
rohitwaghchaure	41cd4fc788	Merge pull request #22478 from michellealva/cost_center_filter ... fix: apply filters in all transactions	2020-06-28 15:10:13 +05:30
rohitwaghchaure	4cc2e70348	Merge pull request #22454 from wojosc/patch-10 ... refactor: update customs_tariff_number.json	2020-06-28 15:07:19 +05:30
rohitwaghchaure	69aa2e400a	Merge pull request #22412 from frappe/mergify/bp/version-13-beta-pre-release/pr-22223 ... feat: Accounting entries for service item in Purchase receipt (bp #22223)	2020-06-28 11:26:21 +05:30
rohitwaghchaure	cc2d7f3e7f	Merge pull request #22450 from marination/serial-no-rename ... fix: Disable Renaming in Serial No	2020-06-28 11:15:35 +05:30
rohitwaghchaure	d5736711ce	fix: indentation	2020-06-28 11:12:20 +05:30
rohitwaghchaure	2f4971b5a6	Merge pull request #22461 from britlog/develop ... fix: product_info	2020-06-28 11:05:26 +05:30
Deepesh Garg	1d8b13c943	Merge pull request #22483 from deepeshgarg007/loan_security_shorttfall_fixes ... fix: Loan security shortfall fixes	2020-06-27 18:57:14 +05:30
Deepesh Garg	a4b9fc74aa	Merge branch 'develop' into feat_taxjar	2020-06-27 18:51:48 +05:30
Deepesh Garg	589364856c	fix: Syntax Error	2020-06-27 18:44:36 +05:30
Michelle Alva	2f37c447dd	fix: change button label in issue ... Changed the label of the button from "Make" to "Create" so that it is consistent with other DocTypes. Before:	2020-06-27 09:27:45 +05:30
Marica	92bea1326a	Merge branch 'develop' into serial-no-rename	2020-06-26 20:34:09 +05:30
michellealva	08f842d12e	fix: apply filters in all transactions	2020-06-26 19:56:00 +05:30
michellealva	e9cec2ff76	fix: remove redundant label in salary slip	2020-06-26 19:39:54 +05:30
britlog	0086a3727f	fix: product_info	2020-06-26 15:30:27 +02:00
Rucha Mahabal	5dd4bcb229	fix: set total hold time only if hold configurations are enabled	2020-06-26 18:22:24 +05:30
Rucha Mahabal	28c1e8ef77	fix: handle hold time for custom statuses	2020-06-26 18:21:53 +05:30
rohitwaghchaure	275ebefdd2	Merge pull request #22468 from frappe/shopping-cart-settings ... fix: enable show_configure_button when shopping cart is enabled	2020-06-26 17:20:35 +05:30
mergify[bot]	fce39f706d	fix: Send email to credit controllers to increase credit limit (#22473) ... (cherry picked from commit 0ff5af222a) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-06-26 16:21:56 +05:30
rohitwaghchaure	b2ae6d9961	Merge pull request #22467 from nabinhait/credit_limit_email ... fix: Send email to credit controllers to increase credit limit	2020-06-26 15:49:25 +05:30
rohitwaghchaure	13e8c32172	Update shopping_cart_settings.js	2020-06-26 15:07:32 +05:30
marination	0f056ec51d	fix: Sales Order to MR test failing	2020-06-26 14:12:11 +05:30
Wolfram Schmidt	a97715e464	Update customs_tariff_number.json	2020-06-26 10:24:48 +02:00
Anupam K	0ce70bd68f	Merge branch 'develop' of https://github.com/frappe/erpnext into shopping-cart-settings	2020-06-26 12:47:37 +05:30
Nabin Hait	0ff5af222a	fix: Send email to credit controllers to increase credit limit	2020-06-26 12:46:42 +05:30
Anupam K	27d27c924d	enable show_configure_button when shopping cart is enabled	2020-06-26 12:46:40 +05:30
rohitwaghchaure	cc7e1b0ec5	Merge pull request #22400 from AfshanKhan/FR_ISS_204290 ... fix: removed condition that considered "Standard working hours" while…	2020-06-25 23:23:33 +05:30
rohitwaghchaure	2eb452f3bb	Merge pull request #22458 from scmmishra/fix-email-digest-so-company ... fix: add company filter in email digest	2020-06-25 23:18:38 +05:30
rohitwaghchaure	6cf568d094	Merge pull request #22462 from marination/production-plan-ux ... fix: Handling Empty tables in Production Plan	2020-06-25 23:15:28 +05:30
Michelle Alva	978722621f	fix: grammatical fix on error message ... Before: Fiscal Year: 2020 does not exists After: Fiscal Year 2020 Does Not Exist	2020-06-25 22:35:33 +05:30