25431 Commits

Author	SHA1	Message	Date
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
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
Marica	0600d572ba	Merge branch 'develop' into batch-selector	2021-01-12 10:28:47 +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
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
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	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
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
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
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
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
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
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
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
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
pateljannat	3a26f26671	fix: get_doc to avoid modified error	2020-12-22 11:56:59 +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
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
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
pateljannat	87b477a311	feat: patch for project template tasks	2020-12-16 13:37:21 +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
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
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
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
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
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