26468 Commits

Author	SHA1	Message	Date
Rohit Waghchaure	410d36beca	fix: bom stock calculated report	2021-03-31 12:11:00 +05:30
Marica	8451da7924	Merge branch 'develop' into drop-shipping	2021-03-31 11:44:07 +05:30
Afshan	91a8a74d54	fix: column width in Recruitment Analytics report (#25074)	2021-03-31 11:30:04 +05:30
Anurag Mishra	720f69caaf	fix: column width in Recruitment analytics report (#25003) ... Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>	2021-03-31 11:23:34 +05:30
Anupam	41229ba705	fix: unable to submit stock entry	2021-03-31 02:32:25 +05:30
marination	a5de6c779b	fix: Cleaned up and fixed validation and bin updation on deletion ... - Created separate smaller functions for validation and bin updation of deleted row - Made sure previous doc (linked doc) was also updated after deletion of row - Tests to check bin updation on add/update/delete - Made reserved qty for subcontrating read only in bin	2021-03-31 02:03:26 +05:30
Andy Zhu	ba3578929e	Update accounts_controller.py ... Updating Bin quantity based on doctype to optimize running efficiency.	2021-03-31 02:03:16 +05:30
Andy Zhu	c0ba6eafd5	fix: Update Items on Purchase Order ... 1. set warehouse using `get_item_warehouse` 2. update "reserved_qty" for sales order	2021-03-31 02:03:10 +05:30
Andy Zhu	a21e347bf1	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.	2021-03-31 02:03:02 +05:30
marination	0673f558c1	fix: Cleaned up and fixed validation and bin updation on deletion ... - Created separate smaller functions for validation and bin updation of deleted row - Made sure previous doc (linked doc) was also updated after deletion of row - Tests to check bin updation on add/update/delete - Made reserved qty for subcontrating read only in bin	2021-03-31 01:42:18 +05:30
Prssanna Desai	7e442c74b6	Merge pull request #25020 from prssanna/help-links-fix-v13	2021-03-30 19:29:30 +05:30
Marica	c5739957de	Merge branch 'develop' into patch-7	2021-03-30 18:07:32 +05:30
Deepesh Garg	6be78db62c	Merge pull request #25052 from deepeshgarg007/gst_rounding_v13_beta ... feat: Normal rounding for GST Taxes	2021-03-30 17:01:45 +05:30
Anurag Mishra	679177f9e0	Merge pull request #25022 from shariquerik/employee-profile-pic-access-fix ... fix: Employee profile pic upload access for erpnext user	2021-03-30 14:32:21 +05:30
Rucha Mahabal	30f67c3f57	fix: add filters to account link fields in Non Profit Settings (#25060) ... - fetch memberships ordered by date in certificate	2021-03-30 12:39:56 +05:30
Rucha Mahabal	04c0296558	fix: add filters to account link fields in Non Profit Settings ... - fetch memberships ordered by date in certificate	2021-03-30 12:30:40 +05:30
Anupam Kumar	9be11afbde	feat: price margin in buying (#25058)	2021-03-30 12:09:46 +05:30
Rucha Mahabal	a54eecb230	fix: membership renewal validation (#24963)	2021-03-30 12:02:52 +05:30
Rucha Mahabal	146cbb10f8	fix: calculate 80g certificate amount on validate for memberships (#24925)	2021-03-30 12:02:28 +05:30
Rucha Mahabal	5f4a2bfc61	fix(Non Profit): Membership and Donation API fixes (#24900) ... * fix: Donation fixes - differentiate between subscription payment and payment - issue with donation amount * fix: existing membership validation * fix: ignore subscription payments while capturing donations	2021-03-30 12:02:09 +05:30
Rucha Mahabal	170d2efd35	fix(Payroll): Exchange Rate not getting set in Salary Slip (#25013)	2021-03-30 11:02:46 +05:30
Sagar Vora	7f43c051df	fix(Italy): setup, validations, optimisations	2021-03-29 21:18:26 +05:30
Deepesh Garg	f954ec7c78	fix: Add patch for GST category field in Delivery Note	2021-03-29 20:31:11 +05:30
Sagar Vora	ba76f87e44	fix(Italy): setup, validations, optimisations (#25054) ... * fix(Italy): setup, validations, optimisations * fix: remove unused import	2021-03-29 20:18:45 +05:30
Deepesh Garg	29997414ad	fix: Add GST category field in Dellivery Note	2021-03-29 19:49:52 +05:30
Deepesh Garg	237033704f	fix: Add test case	2021-03-29 16:42:59 +05:30
Deepesh Garg	c2548ddc75	feat: Normal rounding for GST Taxes	2021-03-29 16:42:47 +05:30
Saurabh	ceb026c5ab	bumped to version 13.0.0-beta.14	2021-03-28 16:14:56 +05:50
rohitwaghchaure	b38ea0cc8b	fix: patch (#25014) ... * fix: patch * fix: pricing_rule test cases	2021-03-28 15:51:32 +05:30
Sagar Vora	5c907fa7f0	test: make Stock Entry to avoid NegativeStockError (#25044)	2021-03-27 20:30:26 +05:30
rohitwaghchaure	f4901b4f22	Merge pull request #25034 from anupamvs/naming-pre-release ... fix: unable to submit stock entry	2021-03-27 19:50:06 +05:30
Walstan Baptista	ee822a9dcd	test: use different product attribute value; cleanup (#25043) ... Co-authored-by: Sagar Vora <sagar@resilient.tech>	2021-03-27 19:42:25 +05:30
Anupam	d429138dcc	fix: added flag for dont_fetch_price_list_rate in transaction	2021-03-27 19:31:23 +05:30
Walstan Baptista	d6c7d8e631	test: reset session user if test errors in test_sle (#25042)	2021-03-27 18:30:07 +05:30
Sagar Vora	868c0bf45b	perf: reduce no of queries for checking if future sl entry exists (#24881)	2021-03-27 16:10:20 +05:30
walstanb	ab673d9e4b	fix: minor changes	2021-03-27 12:54:49 +05:30
walstanb	225c64a1ad	test: sets is_purchase_item while item creation	2021-03-27 12:54:49 +05:30
walstanb	52403c537b	fix: check if gst account exists before appending	2021-03-27 12:54:49 +05:30
walstanb	9826ac4602	test: reset session user if test errors	2021-03-27 12:54:49 +05:30
walstanb	98dcf8a1fd	fix: type casting for None type value	2021-03-27 12:54:49 +05:30
rohitwaghchaure	6c7f029597	Merge pull request #25016 from hasnain2808/fix-ams-error-v13-pre-release ... fix: ams integration breaks when error raised	2021-03-27 09:59:51 +05:30
Anupam	4adaf7ed2e	Merge branch 'version-13-beta-pre-release' of https://github.com/frappe/erpnext into naming-pre-release	2021-03-27 00:56:48 +05:30
Anupam	5d994d8aa1	fix: unable to submit stock entry	2021-03-27 00:54:19 +05:30
Anupam	096da429ed	fix: unable to submit stock entry	2021-03-27 00:45:31 +05:30
rohitwaghchaure	d5759bab11	Merge pull request #24922 from rohitwaghchaure/feat-recursice-pricing-rule ... feat: recursive pricing rule	2021-03-26 19:10:10 +05:30
Rohit Waghchaure	256b9c7bf9	fix: total weight not set for free items	2021-03-26 19:05:46 +05:30
Rohit Waghchaure	0486276789	fix: don't club same free item	2021-03-26 19:05:45 +05:30
Rohit Waghchaure	fce552b811	fix: nonetype object has no attribute options	2021-03-26 19:05:45 +05:30
Rohit Waghchaure	cd8422a840	feat: recursive product discount	2021-03-26 19:05:43 +05:30
Rucha Mahabal	44853da7c2	feat: Show Required Qty as per BOM in Material Request Items	2021-03-26 18:55:16 +05:30
Rucha Mahabal	4cd68cdecb	feat: Add more fields to raw material download	2021-03-26 18:55:08 +05:30
Rucha Mahabal	d74ff72527	fix: Ordered and Reserved Qty for Production not getting fetched in Items	2021-03-26 18:55:00 +05:30
Rucha Mahabal	28a885a3a9	feat: show ordered and reserved qty in Material Request Plan Item table	2021-03-26 18:54:51 +05:30
Rucha Mahabal	efe2b425b1	feat(Production Plan): Consider Safety Stock in Required Qty Calculation	2021-03-26 18:54:34 +05:30
Rucha Mahabal	87a70fe8cb	feat: Show Required Qty as per BOM in Material Request Items	2021-03-26 18:37:50 +05:30
Rucha Mahabal	9dbabb92df	feat: Add more fields to raw material download	2021-03-26 18:37:40 +05:30
Rucha Mahabal	07409990a0	fix: Ordered and Reserved Qty for Production not getting fetched in Items	2021-03-26 18:37:24 +05:30
Rucha Mahabal	1f86471656	feat: show ordered and reserved qty in Material Request Plan Item table	2021-03-26 18:36:52 +05:30
Rucha Mahabal	66bae19c16	feat(Production Plan): Consider Safety Stock in Required Qty Calculation	2021-03-26 18:36:33 +05:30
shariquerik	82d7986a2f	fix: sider fix	2021-03-26 17:02:37 +05:30
Saqib	f66aab6d98	fix: e-invoicing option visible even if settings disabled (#25021)	2021-03-26 16:40:51 +05:30
shariquerik	1989375be4	fix: Employee profile pic upload access for erpnext user	2021-03-26 16:34:22 +05:30
prssanna	5243eea532	style: fix formatting	2021-03-26 15:47:08 +05:30
prssanna	0ae0368d34	fix: re-execute add_standard_navbar_items patch ... - check that same items aren't appended again	2021-03-26 15:47:07 +05:30
prssanna	eeb3121622	fix: missing help links in navbar help dropdown	2021-03-26 15:47:07 +05:30
Prssanna Desai	3da2df55f4	Merge branch 'develop' into help-links-fix	2021-03-26 15:35:17 +05:30
Sagar Vora	0b569b3e43	fix: allow creating stock entry based on work order for customer provided items (#24885)	2021-03-26 14:40:15 +05:30
prssanna	dd2a315d06	style: fix formatting	2021-03-26 14:35:47 +05:30
hasnain2808@gmail.com	e9c801e4bd	fix: ams integration breaks when error raised	2021-03-26 14:32:02 +05:30
Nabin Hait	2a39b74ad2	fix: Fixes on job card and salary slip (#25011) ... * fix: map conversion factor while making stock entry from job card * fix: fetch additional salary in salary slip	2021-03-26 10:49:39 +05:30
Marica	ffb4e3f280	Merge pull request #24937 from ankush/hide_alt_field ... fix: hide alt tag if item is not shown in website	2021-03-25 20:14:52 +05:30
Anurag Mishra	344c14c9ca	Merge pull request #25004 from ruchamahabal/fix-exchange-rate-in-salary-slip ... fix(Payroll): Exchange Rate not getting set in Salary Slip	2021-03-25 18:12:11 +05:30
Deepesh Garg	74200bcd62	Merge pull request #24975 from frappe/revert-24039-fixed-incorrect-gstr-report-issue ... Revert "fix: GSTR B2C report"	2021-03-25 16:50:10 +05:30
Deepesh Garg	7b8742bd70	Merge pull request #24998 from frappe/revert-24318-fix-currency-validation-for-party ... Revert "fix: validating party currency with doc currency"	2021-03-25 16:49:50 +05:30
Rucha Mahabal	b2b12f303e	fix(Payroll): Exchange Rate not getting set in Salary Slip	2021-03-25 14:48:08 +05:30
Mohammad Hasnain Mohsin Rajan	52701dcbbc	fix: patch regional fields for old companies (#24988)	2021-03-25 12:56:33 +05:30
Mohammad Hasnain Mohsin Rajan	f29c075bc3	fix: patch regional fields for old companies (#24999) ... * fix: patch regional fields for old companies * chore: fix sider	2021-03-25 12:56:13 +05:30
Marica	36d125a720	Merge branch 'develop' into item-dashboard-fixes	2021-03-25 12:32:47 +05:30
Nabin Hait	d4499277b4	chore: Added change log	2021-03-25 12:18:22 +05:30
Marica	7c6f72fd39	Merge branch 'develop' into hide_alt_field	2021-03-25 12:15:58 +05:30
Nabin Hait	91026e026f	chore: Added change log	2021-03-25 11:53:07 +05:30
Syed Mujeer Hashmi	f8b44e05c4	refactor: Add student mobile number to student attendance (#24990) ... To setup SMS alert notification for student attendance we need student mobile number in this doctype. Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>	2021-03-25 11:48:29 +05:30
Anupam Kumar	b4e842e25e	fix: opportunity-quotation mapping order status (#25001)	2021-03-25 11:45:57 +05:30
Deepesh Garg	1a6e6320cf	Revert "fix: validating party currency with doc currency (#24318)" ... This reverts commit 02142c41bb.	2021-03-24 21:26:04 +05:30
Prssanna Desai	8a87ffc8f6	fix: POS print receipt (#24924) ... * fix: POS print receipt * fix: print recepit dialog	2021-03-24 19:52:39 +05:30
Saqib	dd39a6b47c	fix(pos): mode of payments disappear on loading draft pos invoice (#24917)	2021-03-24 17:56:24 +05:30
prssanna	194dd12882	fix: re-execute add_standard_navbar_items patch ... - check that same items aren't appended again	2021-03-24 16:45:32 +05:30
prssanna	97aab3ac21	fix: missing help links in navbar help dropdown	2021-03-24 16:44:49 +05:30
Rohit Waghchaure	244f3eeedc	fix: incorrect fieldname	2021-03-24 16:42:22 +05:30
Anurag Mishra	4217a4b1ff	Merge branch 'develop' into item-dashboard-fixes	2021-03-24 15:35:33 +05:30
Anupam Kumar	d1bbb4c311	Merge branch 'develop' into planning	2021-03-24 15:12:04 +05:30
rohitwaghchaure	3c490088c4	Merge pull request #24991 from rohitwaghchaure/repost-not-completed-transactions-pre ... fix: repost not completed backdated transactions	2021-03-24 12:38:42 +05:30
Ishan Loya	de774ae080	Correct state code for 'Other Territory' ... Corrects state code for 'Other Territory' to match e-invoicing state codes list. Attempts to fix #24992	2021-03-24 12:30:51 +05:30
Rohit Waghchaure	9165327cf6	fix: repost not completed backdated transactions	2021-03-24 11:32:26 +05:30
rohitwaghchaure	575f8f226b	fix: repost not completed backdated transactions (#24980)	2021-03-24 11:30:53 +05:30
Deepesh Garg	734f5c2533	Merge pull request #24971 from deepeshgarg007/loan_security_shortfall_process_update ... fix: Pending shortfall update on processing loan security shortfall	2021-03-24 11:24:49 +05:30
Anupam Kumar	5ce0569f80	fix: validate_series (#24984)	2021-03-23 21:13:41 +05:30
Anupam Kumar	5c172044d7	fix: validate_series (#24987)	2021-03-23 21:13:06 +05:30
Deepesh Garg	d26ed25c3e	fix: Period list for exponential smoothing forecasting report (#24983)	2021-03-23 21:11:06 +05:30
Deepesh Garg	82983369fa	fix: Period list for exponential smoothing forecasting report (#24982)	2021-03-23 21:11:01 +05:30
Jannat Patel	d7b139182b	fix: serial no trim issue (#24981) ... * fix: serial no trim issue * fix: sider	2021-03-23 21:09:54 +05:30
Jannat Patel	12f0923a61	fix: serial no trim issue (#24949) ... * fix: serial no trim issue * fix: valid serial nos * fix: sider Co-authored-by: Marica <maricadsouza221197@gmail.com>	2021-03-23 21:09:49 +05:30
Afshan	02142c41bb	fix: validating party currency with doc currency (#24318) ... * fix: validating supplier currency * fix: compare current currency with company currency as well. * fix: replaced or with add in condition * fix: conditioning to get proper payment terms values Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-03-23 20:53:56 +05:30
Syed Mujeer Hashmi	f114da2f67	refactor: Make Discharge Schedule Date as Datetime (#24940) ... * refactor: Make Discharge Schedule Date as Datetime Like Admitted Datetime make discharge date as discharge datetime. Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in> * fix: Add patch for renaming discharge_date to discharge_datetime Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in> * fix: quote style Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-03-23 17:48:25 +05:30
Anupam	940c75f8ac	fix: validate_series	2021-03-23 16:54:54 +05:30
Ankush Menat	2ba198576c	fix: set valuation rate for customer items to zero ... - In stock reconciliation always set valuation rate of customer provided items to zero during validation. - Let user know the valuation has been changed.	2021-03-23 14:03:09 +05:30
Ankush Menat	2a391298a7	test: customer item in stock reconciliation	2021-03-23 14:03:00 +05:30
Ankush Menat	6a534ea82b	fix: Allow zero valuation in stock reconciliation ... Stock reconciliation can not be done for customer provided item as they have zero valuation. This change adds a checkbox in item table to allow such items. Related issue: ISS-20-21-10248	2021-03-23 14:02:52 +05:30
Ankush Menat	e76ecb8f74	fix: set valuation rate for customer items to zero ... - In stock reconciliation always set valuation rate of customer provided items to zero during validation. - Let user know the valuation has been changed.	2021-03-23 13:01:21 +05:30
Ankush Menat	714b780868	test: customer item in stock reconciliation	2021-03-23 12:43:02 +05:30
Ankush Menat	762d6e38f7	fix: Allow zero valuation in stock reconciliation ... Stock reconciliation can not be done for customer provided item as they have zero valuation. This change adds a checkbox in item table to allow such items. Related issue: ISS-20-21-10248	2021-03-23 11:18:04 +05:30
Marica	e6ad39038e	chore: Allow changing Work Stations in WO. (#24897)	2021-03-23 10:46:03 +05:30
Marica	4ccda9f799	chore: Allow changing Work Stations in WO. (#24898)	2021-03-23 10:45:57 +05:30
Deepesh Garg	ad9b65fcf2	fix: TDS check getting checked after reload (#24972)	2021-03-23 10:45:20 +05:30
Deepesh Garg	d1f15b2a88	fix: TDS check getting checked after reload (#24973)	2021-03-23 10:45:06 +05:30
Rohit Waghchaure	bde159a77d	fix: total weight not set for free items	2021-03-22 23:36:48 +05:30
Deepesh Garg	48d5a65ef5	fix: Add test for pending shortfall update	2021-03-22 21:19:19 +05:30
Deepesh Garg	ea487b6c2e	Revert "fix: GSTR B2C report"	2021-03-22 20:54:07 +05:30
Deepesh Garg	f112ce14cf	fix: Pending shortfall update on processing loan security shortfall	2021-03-22 18:33:55 +05:30
Anupam	661b1e59c1	Merge branch 'develop' of https://github.com/frappe/erpnext into planning	2021-03-22 11:48:11 +05:30
Anupam	4980dd616b	fix: resolving commits	2021-03-22 11:23:47 +05:30
Anuja Pawar	c7c921495b	fix: payment reference on adding cost center in PE and Issue Summary Report error fixes (#24951)	2021-03-22 11:21:15 +05:30
Rucha Mahabal	dffa647071	fix: membership renewal validation (#24963) (#24964)	2021-03-20 22:24:55 +05:30
Rucha Mahabal	5e1cb5e4bc	fix: membership renewal validation (#24963)	2021-03-20 22:22:01 +05:30
Sagar Vora	a85959f574	fix: remove unwanted parameter in calculate_rate_and_amount (#24883) ... * fix: remove unwanted parameter in calculate_rate_and_amount * fix: translation syntax	2021-03-20 16:37:33 +05:30
Walstan Baptista	22054044a3	test: created a new user to test warehouse user perms (#24954) ... Co-authored-by: Sagar Vora <sagar@resilient.tech>	2021-03-20 16:35:14 +05:30
Jannat Patel	08855182a3	test: fix test_loan for payroll module (#24946) ... * test: fix test_loan for payroll module * fix: minor style changes	2021-03-19 16:34:14 +05:30
rohitwaghchaure	98a40d81d5	Merge pull request #24957 from rohitwaghchaure/revert-stock-balance-value-calculation-v13-pre ... fix: revert stock balance value calculation	2021-03-19 16:22:51 +05:30
rohitwaghchaure	081499c0c0	Merge pull request #24956 from rohitwaghchaure/revert-stock-balance-value-calculation-develop ... fix: revert stock balance value calculation	2021-03-19 16:22:13 +05:30
Rohit Waghchaure	67d94ac0cc	fix: revert stock balance value calculation	2021-03-19 16:21:30 +05:30
Rohit Waghchaure	f21a55c8ef	fix: revert stock balance value calculation	2021-03-19 16:19:34 +05:30
Deepesh Garg	23af1ed372	Merge pull request #24947 from deepeshgarg007/multi_currency_lcv_issues_v13 ... fix: Allow user to update exchange rate in Multi-currency LCV	2021-03-18 21:21:57 +05:30
Deepesh Garg	b75cbeee4d	fix: Allow user to update exchange rate in Multi-currency LCV	2021-03-18 21:20:44 +05:30
Deepesh Garg	9b0a9cc2c0	Merge pull request #24912 from deepeshgarg007/multi_currency_lcv_issues ... fix: Allow user to update exchange rate in Multi-currency LCV	2021-03-18 21:20:06 +05:30
Deepesh Garg	adcf9a42bd	Merge pull request #24916 from deepeshgarg007/nil_exempt_gstr_3b ... fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report	2021-03-18 21:02:51 +05:30
Deepesh Garg	a5de22cb8e	Merge pull request #24918 from deepeshgarg007/nil_exempt_gstr_3b_v13 ... fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report	2021-03-18 21:02:41 +05:30
Walstan Baptista	6df61d217f	test: created a new user to test child perms (#24943) ... Co-authored-by: Sagar Vora <sagar@resilient.tech>	2021-03-18 19:23:59 +05:30
Sagar Vora	6ac11a04b0	test: added warehouse for TCS Item as it is a Stock Item (#24942)	2021-03-18 18:07:21 +05:30
Sagar Vora	8ee1146f72	test: add stock to avoid NegativeStockError (#24941)	2021-03-18 17:45:25 +05:30
Afshan	a04091aaf7	fix: exclude current doc while validation. (#24914)	2021-03-18 16:40:43 +05:30
Sagar Vora	b134b89fb0	test: fix NegativeStockError (#24936)	2021-03-18 16:36:40 +05:30
Sagar Vora	78e576ee6a	fix: default total_estimated_cost to zero (#24939) ... Co-authored-by: walstanb <walstanb@gmail.com>	2021-03-18 15:23:52 +05:30
Ankush Menat	c0a9c391eb	fix: hide alt tag if item is not shown in website	2021-03-18 14:07:24 +05:30
Deepesh Garg	d39055785a	Merge pull request #24934 from Anuja-pawar/fix_report_issue_summary ... fix: Report Issue Summary fix for zero issues	2021-03-18 12:24:43 +05:30
Anuja Pawar	9bf1083d9e	fix: payment references from disappearing on selecting cost center (#24831) ... Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>	2021-03-18 11:22:24 +05:30
Rushabh Mehta	14c3c5172d	fix(minor): rearrange the cards on home workspace	2021-03-18 10:45:38 +05:30
Anuja P	2c8a38d9fa	fix: report issue summary fix for zero issues	2021-03-18 10:36:46 +05:30
Sagar Vora	500f54e515	test: fix shift type not found (#24929)	2021-03-17 23:25:04 +05:30
Sagar Vora	52bbd4e182	test: clear Leave Period before running Leave Allocation tests (#24928)	2021-03-17 22:37:59 +05:30
Sagar Vora	7645315424	test: set correct qty when creating subcontract transfer entry (#24903)	2021-03-17 20:01:21 +05:30
Sagar Vora	95e9b2fd6e	refactor(payroll): simplified logic for additional salary (#24907)	2021-03-17 19:58:56 +05:30
Sagar Vora	f4a6c7823a	test: create new item instead of using _Test Item to prevent error (#24915)	2021-03-17 19:57:53 +05:30
Sagar Vora	cf3fc99b12	test: fix salary component not found; other optimisation (#24920)	2021-03-17 19:54:08 +05:30
Rucha Mahabal	bacfaa4396	fix: calculate 80g certificate amount on validate for memberships (#24925) (#24926)	2021-03-17 19:51:59 +05:30
Rucha Mahabal	cbd67e662f	fix: calculate 80g certificate amount on validate for memberships (#24925)	2021-03-17 19:49:27 +05:30
Anurag Mishra	abf974daee	fix: precision and formated document	2021-03-17 18:55:04 +05:30
Rohit Waghchaure	77add49c6a	fix: don't club same free item	2021-03-17 18:49:54 +05:30
Deepesh Garg	438d9cad90	fix: Remove print statement	2021-03-17 18:04:05 +05:30
Deepesh Garg	f9519c7e13	fix: Group nil exempted and non gst items separately	2021-03-17 18:03:58 +05:30
Deepesh Garg	f9f0e347ed	fix: Remove print statement	2021-03-17 18:03:17 +05:30
Deepesh Garg	084ec9773e	fix: Group nil exempted and non gst items separately	2021-03-17 18:00:08 +05:30
Anurag Mishra	23b6294f5c	Merge pull request #24842 from resilient-tech/allow-duplicate-additional ... fix(payroll): allow duplicate additional salaries	2021-03-17 17:39:52 +05:30
Deepesh Garg	a5987782bd	fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report	2021-03-17 15:49:44 +05:30
Deepesh Garg	56c20fb79f	fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report	2021-03-17 15:47:03 +05:30
Rohit Waghchaure	a9b1347600	fix: nonetype object has no attribute options	2021-03-17 14:30:34 +05:30
Rohit Waghchaure	ff70e61d7a	feat: recursive product discount	2021-03-17 14:30:34 +05:30
Deepesh Garg	22f5ff8492	fix: Allow user to update exchange rate in Multi-currency LCV	2021-03-17 10:56:52 +05:30
Sagar Vora	68aaf12902	test: use _Test Company to avoid Holiday List error (#24902)	2021-03-17 10:06:05 +05:30
Sagar Vora	bce904cf97	test: fix Employee Not Found errors (#24906)	2021-03-17 10:03:30 +05:30
Sagar Vora	65d7f2c798	fix(Project): get correct holiday list when calculating dates; test fixes (#24901)	2021-03-17 10:00:35 +05:30
Andy Zhu	6117ac5aff	fix: copy_parent_value_in_all_row function error	2021-03-17 13:53:02 +13:00
Anurag Mishra	8fbb043190	Merge pull request #24824 from resilient-tech/fix-salary ... refactor(payroll): simplified logic for additional salary	2021-03-16 21:42:10 +05:30
Rucha Mahabal	00cce433a5	fix(Non Profit): Membership and Donation API fixes (#24900) (#24905) ... * fix: Donation fixes - differentiate between subscription payment and payment - issue with donation amount * fix: existing membership validation * fix: ignore subscription payments while capturing donations	2021-03-16 20:52:53 +05:30
Rucha Mahabal	1482b2883f	fix(Non Profit): Membership and Donation API fixes (#24900) ... * fix: Donation fixes - differentiate between subscription payment and payment - issue with donation amount * fix: existing membership validation * fix: ignore subscription payments while capturing donations	2021-03-16 20:08:51 +05:30
prssanna	1cdef8bd97	style: missing semicolon	2021-03-16 15:39:16 +05:30
prssanna	b8b89a02af	fix: item variant dialog dropdown issue	2021-03-16 14:16:22 +05:30
prssanna	f1dbc021fc	fix: issue web list style	2021-03-16 14:15:59 +05:30
Deepesh Garg	d4a3cf1395	Merge branch 'version-13-beta-pre-release' of https://github.com/frappe/erpnext into add_account_method_v13	2021-03-16 13:24:33 +05:30
Deepesh Garg	635c480771	fix: Add method for regional round off account back	2021-03-16 13:22:20 +05:30
Afshan	46eb4b2f90	Merge branch 'develop' into settings_for_eanbling_leave_notificstion	2021-03-16 13:15:55 +05:30
Deepesh Garg	004f9e6b0c	fix: Add method for regional round off account back	2021-03-16 13:09:59 +05:30
Anurag Mishra	6bafbffee0	fix: added also for leave applier as requested	2021-03-16 13:01:39 +05:30
Anurag Mishra	54482fd83f	feat: added for disabling leave notification in HR settings	2021-03-16 13:01:39 +05:30
Rushabh Mehta	45735b35c4	fix(minor): login: set as Login to ERPNext	2021-03-16 12:22:31 +05:30
marination	dd7d71ca2e	fix: POS Opening Entry with empty balance detail rows	2021-03-16 12:05:37 +05:30
Rushabh Mehta	6ef213e5c6	fix(minor): patch add_state_code_for_ladakh	2021-03-16 11:59:54 +05:30
Marica	4d869906b6	Merge branch 'develop' into drop-shipping	2021-03-16 11:43:46 +05:30
Deepesh Garg	7f2e45e0f4	fix: Unequal debit and credit issue on RCM Invoice (#24838) ... * fix: Unequal debit and credit issue on RCM Invoice * fix: Travis	2021-03-15 18:04:47 +05:30
Deepesh Garg	93f925fb98	fix: Unequal debit and credit issue on RCM Invoice (#24836) ... * fix: Unequal debit and credit issue on RCM Invoice * fix: Travis Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-03-15 18:04:42 +05:30
Raffael Meyer	db24b13a7d	Merge branch 'develop' into improve_taxes_setup	2021-03-15 13:27:56 +01:00
Anurag Mishra	5e475f85b9	Merge branch 'develop' into suplier_portal_fixes	2021-03-15 16:21:55 +05:30
Raffael Meyer	6d5ea4cee8	Merge branch 'develop' into improve_taxes_setup	2021-03-15 11:40:39 +01:00
Rohit Waghchaure	00a0e8da10	fix: validation of job card in stock entry	2021-03-15 14:15:10 +05:30
Marica	3575314260	Merge branch 'develop' into drop-shipping	2021-03-15 12:53:45 +05:30
Marica	4ceea333a7	fix: POS Opening Entry with empty balance detail rows (#24876)	2021-03-15 12:49:14 +05:30
Mohammad Hasnain Mohsin Rajan	46d5431bad	fix: Github Action not failing when tests fail (#24867) ... Co-authored-by: Sagar Vora <sagar@resilient.tech>	2021-03-15 11:17:19 +05:30
Anupam Kumar	ed42afc5e8	feat: price margin in buying (#24685)	2021-03-15 11:11:28 +05:30
Marica	5499401fcb	Merge branch 'develop' into drop-shipping	2021-03-15 11:09:04 +05:30
Deepesh Garg	a2e4564464	fix: Prevent non sequential repayment entries	2021-03-15 10:32:38 +05:30
Anupam	d8f7a75eae	feat: add total available stock field	2021-03-15 10:31:53 +05:30
Deepesh Garg	5165859e51	Merge pull request #24873 from GangaManoj/filter-bank-reconciliation ... fix(Bank Reconciliation Tool): Filter Bank Account drop-down list	2021-03-15 10:21:14 +05:30
Deepesh Garg	61fb9bf869	fix: Loan Repayment entry cancellation on salary slip cancel	2021-03-14 21:25:21 +05:30
Ganga Manoj	ca03997ab5	fix(Bank Reconciliation): Filter Bank Account drop-down list	2021-03-13 22:21:07 +05:30
Deepesh Garg	e196be4d8a	Merge pull request #24866 from resilient-tech/fix-test-import ... test: fix import_doc call in test_shopify_settings	2021-03-13 19:12:15 +05:30
Sagar Vora	c5869d5b47	test: fix import_doc call in test_shopify_settings	2021-03-12 16:21:45 +05:30
Marica	51c500d446	fix: Don't throw exception on invoice lines when there is no item_code (fixes #24640) (#24864) ... Co-authored-by: casesolved-co-uk <richard@casesolved.co.uk>	2021-03-12 15:51:45 +05:30
Afshan	5d66a2b326	fix: added correct path in hooks (#24862)	2021-03-12 15:51:34 +05:30
Afshan	9ab3bedd0a	fix: added correct path in hooks (#24865)	2021-03-12 15:51:23 +05:30
marination	e685c787d2	fix: Sider (unused variables)	2021-03-12 14:24:09 +05:30
marination	86725a6580	fix: PO not created against all selected suppliers (drop shipping) ... - Return list of created POs instead of first doc - test case added	2021-03-12 14:12:46 +05:30
rohitwaghchaure	90ea17fbd6	Merge pull request #24825 from rohitwaghchaure/allow-to-set-item-in-batch-naming-pre ... fix: allow to select item code in batch naming	2021-03-12 11:52:43 +05:30
Sagar Vora	6727792aaf	test: fix syntax error	2021-03-11 18:12:01 +05:30
Raffael Meyer	fb68aba30d	Merge branch 'develop' into improve_taxes_setup	2021-03-11 13:17:44 +01:00
Sagar Vora	514122bf6f	refactor(payroll): simplified logic for additional salary	2021-03-11 17:22:11 +05:30
Nabin Hait	fe3529b194	fix: merge conflict	2021-03-11 16:45:41 +05:30
Nabin Hait	6e3668dc30	fix: merge conflict	2021-03-11 16:14:27 +05:30
Ankush Menat	2b61491adb	fix: use account_name only in consolidated report (#24840) ... Don't use account_number and only rely on account_name for preparing consolidated financial statement. Related issue: ISS-20-21-10217	2021-03-11 16:05:58 +05:30
Rucha Mahabal	0b29f87fa2	feat(Non Profit): 80G Certificates and Donations (#24848) ... * feat(Non Profit): 80G Certificates and Donations * fix(Membership): Generate Invoice for membership webhook only if automation is enabled (#24849)	2021-03-11 16:02:23 +05:30
Rucha Mahabal	d1e331f77f	fix(Membership): Generate Invoice for membership webhook only if automation is enabled (#24849)	2021-03-11 15:27:22 +05:30
Rucha Mahabal	be2c1fca7b	feat(Non Profit): 80G Certificates and Donations (#24657) ... * feat: 80G Certificates * feat: add non-profit custom fields for India * feat: 80G Certificate print format for memberships * feat: Donation doctype and API endpoint to capture donations via razorpay * chore: Rename Membership Settings to Non Profit Settings * chore: clean up Non Profit Settings - Rename fields, better labels - patch for renaming * feat: Webhook secret generation for Razorpay donations in Non-Profit Settings * feat: Payment Entry for donations - added Donor as Party Type - setting for automating payment entries for donations created via web form * fix: linter and sider issues * fix: translation syntax * feat: PAN Details custom field for Indian donors * feat: 80G certificates for Donations with Print Format * fix: sider * feat: validations for donor and donation - create donor for website user from donations - validate donor email * feat: extract member name from subscription notes * test: Donation * test: Tax Exemption 80G Certificate * chore: styling fixes * fix: tests * fix: sider * feat: extract PAN number from additional subscription notes * feat: Add creation user field in Non Profit Settings fix: Payment Entry not generating for memberships and donations * feat: update desk page * fix: tests	2021-03-11 13:19:44 +05:30
Marica	63eb6bdb3c	Merge pull request #24643 from CaseSolvedUK/sinvfix-v13 ... fix: Don't throw exception on invoice lines when there is no item_code	2021-03-11 10:47:24 +05:30
Sagar Vora	5822b6d76f	fix(payroll): allow duplicate additional salaries	2021-03-10 21:45:32 +05:30
casesolved-co-uk	a780306ec7	fix: Don't throw exception on invoice lines when there is no item_code (fixes #24640)	2021-03-10 15:50:45 +00:00
Anupam Kumar	6f0fabc54e	fix: gle issue in internal transfer(Purchase) (#24830)	2021-03-10 18:36:46 +05:30
Ankush Menat	59fdee4dfa	Merge branch 'develop' into consolidated_report_acc_name_fix	2021-03-10 16:35:59 +05:30
Raffael Meyer	fbd810c2ae	Merge branch 'develop' into improve_taxes_setup	2021-03-10 11:38:52 +01:00
Rucha Mahabal	c7fff34cf5	fix(travis): Customer Testcase Failing (#24833)	2021-03-10 15:51:44 +05:30
Ankush Menat	000fa824d3	fix: use account_name only in consolidated report ... Don't use account_number and only rely on account_name for preparing consolidated financial statement. Related issue: ISS-20-21-10217	2021-03-10 15:23:48 +05:30
rohitwaghchaure	a0e7787f7b	fix: removed show cancelled entries checkbox from the stock ledger report (#24826)	2021-03-10 13:46:42 +05:30
Anupam Kumar	77eaf2939a	fix: rate of stock uom division by zero error (#24829)	2021-03-10 12:04:54 +05:30
Raffael Meyer	20cc2bb0d8	fix: autoname for Item Tax Template ... * fix: autoname for Item Tax Template Use title + company abbreviation instead of just title. * fix: test records of Item Tax Template * fix: rename item tax templates in test records * Revert "fix: test records of Item Tax Template" This reverts commit 53875c54ffe059c32d52b9ee60795d56f95473b1. * fix: rename hardcoded item tax templates in tests * fix: rename hardcoded Item Tax Templates in tests (2) * fix: delete Item Tax Template with company	2021-03-10 10:24:43 +05:30
Marica	6ccd64c2ec	Merge pull request #24464 from sgtpepper9907/feat-make-patient-age-translateable ... feat: Make patient age translateable	2021-03-10 10:15:38 +05:30
Afshan	0623a34210	fix: added supplier warehouse field back again (#24827)	2021-03-10 09:46:38 +05:30
David Angulo	fe0f46c5b3	fix sider	2021-03-09 13:28:08 -06:00
David Angulo	06e99dfe7b	fix sider	2021-03-09 13:23:48 -06:00
David Angulo	358153b04b	fix sider	2021-03-09 13:19:12 -06:00
Francisco Roldán	894cff5aa4	fix: lms program and index missing context variables when is no data available (#24828) ... * fix: program and index * fix: moved default value to get_course_progress	2021-03-09 23:35:24 +05:30
Afshan	27bcb2a064	fix: renamed "supplier_warehouse" to "set_from_warehouse" (#24816) ... * fix: reverting and adding new field for supplier warehouse	2021-03-09 22:25:48 +05:30
Anupam Kumar	832098f042	fix: In-Transit Feature enhancements (#24652)	2021-03-09 21:14:25 +05:30
Syed Mujeer Hashmi	ec829786e9	fix: Add student category to student applicant (#24779) ... * fix: Add student category to student applicant Student category will be automatically fetched during program enrollment while importing students into the system. Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in> * fix: Allow student category during program enrollment Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>	2021-03-09 21:04:55 +05:30
Rohan	db2d196296	fix: do not send emails to disabled users from Employee Onboarding (#24795)	2021-03-09 21:03:45 +05:30
Rohit Waghchaure	535406cb0c	fix: allow to select item code in batch naming	2021-03-09 21:01:12 +05:30
Jannat Patel	d7ac2394e8	fix: error in bulk attendance (#24806) ... * fix: error in bulk attendance * fix: no date selected scenario * fix: translation and sider	2021-03-09 20:41:58 +05:30
Sagar Vora	78777d6ed4	fix: fetch Material Requests of type Customer Provided in Stock Entry using Get Items From (#24756) ... Co-authored-by: walstanb <walstanb@gmail.com>	2021-03-09 20:35:08 +05:30
Afshan	e314b8b209	fix: general ledger report (#24770)	2021-03-09 20:31:57 +05:30
Afshan	9f6015a4e9	fix: batch no in POS (#24771) ... * fix: batch no in list * fix: check for batch no to be list	2021-03-09 20:31:14 +05:30
Shariq Ansari	261c42186f	fix: updating phone icon setup logic for readonly fields (#24787) ... * fix: updating phone icon setup logic for readonly fields * fix: sider fix	2021-03-09 20:28:00 +05:30
Jannat Patel	fa73074250	fix: salary structure assign to employee (#24798) ... * fix: salary structure assign to employee * fix: pass data from dialog	2021-03-09 20:27:29 +05:30
Raffael Meyer	79b5be1830	fix: Group German VAT Accounts (#24804) ... * fix: group account for tax assets and liabilities (germany) * fix: spacing	2021-03-09 20:26:43 +05:30
Deepesh Garg	06a6ee37cb	fix: Ignore mandatory fields in opening invoice via Opening Invoice Creation tool (#24821)	2021-03-09 20:23:26 +05:30
Deepesh Garg	47c6d2e00f	Merge pull request #24814 from AfshanKhan/fix-tds-computation-summary ... fix: sending proper arguments for TDS Computation Summary report	2021-03-09 20:01:30 +05:30
Deepesh Garg	6249798d84	Merge pull request #24801 from ankush/dont_update_pe_title ... fix: do not update PE title during data import	2021-03-09 19:47:21 +05:30
Deepesh Garg	79005a4a76	Merge pull request #24820 from resilient-tech/fix-company-breadcrumbs ... fix: breadcrumbs for company	2021-03-09 19:46:39 +05:30
Marica	e1ee9034ef	Merge branch 'develop' into item-attribute-fix	2021-03-09 18:35:44 +05:30
Marica	5accf8adf5	Merge branch 'develop' into salary_slip_error	2021-03-09 18:20:54 +05:30
Ankush Menat	9b4e5bfa87	chore: improve error message for missing fields.	2021-03-09 13:59:14 +05:30
Marica	5471265f92	Merge branch 'develop' into patch-6	2021-03-09 13:32:23 +05:30
walstanb	be98ee26cd	fix: breadcrumbs for company	2021-03-09 13:03:52 +05:30
Marica	baa406e99f	Merge pull request #24794 from alyf-de/set_value_instead_of_sql ... fix: use set_value instead of sql	2021-03-09 11:54:31 +05:30
barredterra	99c8b8efcf	Merge branch 'develop' into improve_taxes_setup	2021-03-08 20:00:59 +01:00
barredterra	ebd1d08e55	refactor: taxes setup ... Better structure of input data.	2021-03-08 19:53:50 +01:00
Afshan	d1fb363a37	Merge branch 'develop' into fix-tds-computation-summary	2021-03-08 22:50:04 +05:30
Afshan	d95b59e90c	fix: call function when arguments available	2021-03-08 18:19:53 +05:30
Ankush Menat	afc766bbf1	Merge branch 'develop' into dont_update_pe_title	2021-03-08 15:44:15 +05:30
Ankush Menat	5571b988dd	fix: make title field read only	2021-03-08 15:43:03 +05:30
Ankush Menat	cc46866cd9	fix: do not update PE title during data import ... Related issue: ISS-20-21-10132	2021-03-08 15:42:39 +05:30
Afshan	1002e36c53	fix: removed unused import	2021-03-08 14:39:19 +05:30
Afshan	fa932e2a3e	fix: sending proper arguments for report	2021-03-08 14:36:40 +05:30
Deepesh Garg	48b0f0da96	Merge pull request #24776 from ankush/gst_invoice_validation ... fix: Add warning for invalid GST invoice numbers	2021-03-07 18:09:00 +05:30
Rohit Waghchaure	4c089b5852	minor fixes	2021-03-07 12:17:59 +05:30
Deepesh Garg	45870317f2	Merge pull request #24797 from UrvashiKishnani/patch-1 ... fix: total row in AR/AP summary report	2021-03-06 21:28:04 +05:30
Saqib	92b0691c68	fix: einvoice button visiblity condition (#24800)	2021-03-06 19:00:08 +05:30
Deepesh Garg	36a0085905	Merge pull request #24799 from danielchalmers/patch-8 ... fix: typo in Charts of Account doctype	2021-03-06 13:11:26 +05:30
Deepesh Garg	3e0a9383b4	Merge pull request #24789 from ankush/track_settings ... fix: track setting changes	2021-03-06 13:09:58 +05:30
Saurabh	202ef92fa1	Merge branch 'version-13-beta-pre-release' into version-13-beta	2021-03-05 09:34:01 +05:30
Saurabh	4e1206bf21	bumped to version 13.0.0-beta.13	2021-03-05 09:54:01 +05:50
barredterra	25afad3dc1	refactor: extend taxes and charges setup ... Add option to specify taxes and charges template depending on the CoA used. Differentiate between purchase, sales and item taxes. Maintain flexibility by using wildcards.	2021-03-04 21:11:31 +01:00
barredterra	dcfc3d7d12	fix: remove redundant calls to create_sales_tax	2021-03-04 19:29:55 +01:00
Saqib Ansari	49e4693abf	fix(patch): updating pos closing reference in merge log	2021-03-04 11:58:45 +05:30
Daniel Chalmers	9b4a258c89	Chart Of Accounts -> Chart of Accounts	2021-03-04 00:15:46 -06:00
UrvashiKishnani	27ea23223d	fix: total row in AR/AP summary report	2021-03-04 09:21:25 +04:00
Raffael Meyer	f1d13a4ff3	Merge branch 'develop' into track_settings	2021-03-03 12:40:37 +01:00
barredterra	1521b31795	fix: use set_value instead of sql	2021-03-03 12:33:48 +01:00
barredterra	53d261702a	fix: make quick entry for Tax Category work	2021-03-03 11:52:48 +01:00
Ankush Menat	7c4c42ad67	refactor: move regex patterns to global variables	2021-03-03 14:56:19 +05:30
Ankush Menat	7c78220eac	Merge branch 'develop' into gst_invoice_validation	2021-03-03 13:38:14 +05:30
Ankush Menat	9b3f5d5f67	test: add tests for gst invoice name checks	2021-03-03 13:36:59 +05:30
Ankush Menat	a44df63a91	fix: Add warning for invalid GST invoice numbers ... GST Invoice numbers should be 16 characters alphanumeric with dash(/) or slash(-) only. Add check for doc.name before saving and warn about naming series.	2021-03-03 11:26:12 +05:30
Deepesh Garg	82c6223196	Merge pull request #24745 from ankush/no_team_updates ... fix(HR): hide "more" button from team updates	2021-03-02 18:55:34 +05:30
Deepesh Garg	ecde26409b	Update team_updates.js	2021-03-02 18:54:50 +05:30
Deepesh Garg	846500e8bc	Merge pull request #24751 from danielchalmers/patch-2 ... chore: Add description field & enable quick entry	2021-03-02 18:53:51 +05:30
Deepesh Garg	11092d0824	feat: Additon of leave details in Salary Slip (#24674) ... * feat: Additon of leave details in Salary Slip * fix: Change leaves to leave	2021-03-02 18:38:31 +05:30
Deepesh Garg	a5c4558f8b	feat: Additon of leave details in Salary Slip (#24674) ... * feat: Additon of leave details in Salary Slip * fix: Change leaves to leave	2021-03-02 18:36:48 +05:30
Deepesh Garg	7a5b6021b9	Merge pull request #24772 from anupamvs/si-timesheet ... feat: provision to pull timesheet in sales invoice	2021-03-02 18:05:42 +05:30
Ankush Menat	7d892438f0	fix: track setting changes	2021-03-02 17:50:58 +05:30
Deepesh Garg	f06c166ee4	Merge pull request #24773 from UrvashiKishnani/patch-1 ... fix: GL Entries for AP/AR Summary	2021-03-02 17:49:13 +05:30
Jannat Patel	b27d4f6095	fix: salary slip working hours increment (#24784)	2021-03-02 17:44:42 +05:30
Nabin Hait	d96be3f9f1	Reposting patch and earned leave rounding (#24783) ... * fix: rounding of earned leave is optional (#24782) * fix: reposting patch fixes (#24775)	2021-03-02 17:02:47 +05:30
Nabin Hait	190106a8b8	fix: rounding of earned leave is optional (#24782)	2021-03-02 13:38:14 +05:30
Nabin Hait	bd10d7c028	fix: reposting patch fixes (#24775)	2021-03-02 13:37:45 +05:30
Anupam	47ce85484b	feat: provistion to pull timesheet in sales invoice	2021-03-02 11:31:26 +05:30
UrvashiKishnani	810a36105c	fix: GL Entries for AP/AR Summary without SQL join ... SQL query modified to fetch only those GL Entries for Accounts Payable Summary and Accounts Receivable Summary reports where the corresponding payment entry is not in cancelled state.	2021-03-02 08:20:03 +04:00
Deepesh Garg	f45756d821	Merge pull request #24735 from FHenry/fix_create_item_tax_with_salespurchasetax ... fix: add item taxes at the same times as sales and purchase taxes	2021-03-01 20:52:42 +05:30
Deepesh Garg	236a232de0	Merge pull request #24769 from rohitwaghchaure/allow-to-set-item-in-batch-naming ... fix: allow to select item code in batch naming	2021-03-01 20:25:14 +05:30
Daniel Chalmers	2efdfa26b4	fix: Change FieldType from Text to Text Editor in Non-Conformance DocType (#24760) ... * Enable Text Editors Enable rich Text Editors for Corrective Action and Preventive Action fields. Closes #24759 * Update non_conformance.json	2021-03-01 15:44:16 +05:30
UrvashiKishnani	10e4b9d4e8	fix: GL Entries for AP/AR Summary ... SQL query modified to fetch only those GL Entries for Accounts Payable Summary and Accounts Receivable Summary reports where the corresponding payment entry is in submitted state.	2021-03-01 12:50:07 +04:00
Rohit Waghchaure	eb6b3cfe6d	fix: allow to select item code in batch naming	2021-03-01 11:32:39 +05:30
Anuja Pawar	8755339cba	fix: to update sales person's incentives on save (#24179)	2021-03-01 10:44:13 +05:30
Saqib	fa777555b7	fix(india): inflated item tax rate for e-invoicing (#24752)	2021-02-28 20:46:23 +05:30
Deepesh Garg	d7a81be56d	Merge pull request #24742 from deepeshgarg007/project_filter_search_fields ... fix: Add searchfields in project query	2021-02-27 18:20:56 +05:30
Deepesh Garg	6fdd859a10	Merge pull request #24700 from deepeshgarg007/rounding_issue_fix ... fix: Issue on posting inter-warehouse transfer invoice	2021-02-27 17:30:01 +05:30
Deepesh Garg	b5819c74c8	Merge branch 'develop' of https://github.com/frappe/erpnext into project_filter_search_fields	2021-02-27 17:29:11 +05:30
Daniel Chalmers	28da945ecd	Update quality_meeting.json	2021-02-26 21:14:12 -06:00
Daniel Chalmers	56f6dbb666	Remove obsolete section titles	2021-02-26 21:11:56 -06:00
Daniel Chalmers	aa09628358	Skill fields: enable allow_in_quick_entry	2021-02-26 15:24:34 -06:00
rohitwaghchaure	630ce6e531	Merge pull request #24754 from rohitwaghchaure/fixed-repost-item-valuation-patch ... fix: reposting patch	2021-02-26 23:58:29 +05:30
rohitwaghchaure	0e89d71d34	Merge pull request #24755 from rohitwaghchaure/fixed-repost-item-valuation-patch-v13-pre ... fix: reposting patch	2021-02-26 23:58:10 +05:30
Rohit Waghchaure	9f13a060f0	fix: reposting patch	2021-02-26 17:44:54 +05:30
Rohit Waghchaure	c603fd638b	fix: reposting patch	2021-02-26 17:42:52 +05:30
Saqib	3dfa017f1d	refactor: (coa importer) create coa tree with account no & account name (#23601)	2021-02-26 16:50:22 +05:30
Saqib	2a1b1537f9	fix(pos): rounded total and search fixes (#24738)	2021-02-26 16:49:28 +05:30
Daniel Chalmers	9803835436	Add "description" field to Skill doctype ... Lets us describe a skill past just the title. Closes #23592	2021-02-26 00:33:48 -06:00
Deepesh Garg	28ca4ec79d	Merge branch 'develop' into fix_create_item_tax_with_salespurchasetax	2021-02-26 10:43:15 +05:30
Deepesh Garg	27da2bb63a	fix: Remove unique check from represents company field	2021-02-25 22:39:47 +05:30
Ankush Menat	027db0b41e	fix(HR): hide "more" button from team updates	2021-02-25 21:29:00 +05:30
Deepesh Garg	b85fb0c3a4	Merge branch 'develop' into rounding_issue_fix	2021-02-25 20:17:35 +05:30
Ankush Menat	dca307e7cc	feat: track changes to HR settings (#24739) ... related issue: FR-ISS-259927	2021-02-25 19:05:07 +05:30
Syed Mujeer Hashmi	286e00bdf2	fix: Fetch Task subject from Task (#24729)	2021-02-25 19:02:54 +05:30
Afshan	1be997beb4	fix: reference variable in pricing rule (#24711)	2021-02-25 19:01:32 +05:30
Deepesh Garg	2d0b277ce0	Merge pull request #24054 from gwhitney/other_app_acc_dims ... feat(Accounting Dimension): accounting dimension doctypes for other apps	2021-02-25 18:48:42 +05:30
Anurag Mishra	02f50a93e5	fix: copy variants property and Attributes whil duplicatinh item Tamplate (#24662)	2021-02-25 18:47:17 +05:30
Anuja Pawar	118a4ffb08	fix: rounding error in finished goods qty (#24653)	2021-02-25 18:44:44 +05:30
Mohammad Hasnain Mohsin Rajan	8cdba8ab64	fix: ams integration breaks when error raised (#24383)	2021-02-25 18:36:19 +05:30
Deepesh Garg	6af3c3fa2a	Merge pull request #24722 from danielchalmers/patch-1 ... fix: Allow renaming skills	2021-02-25 15:44:44 +05:30
Deepesh Garg	7a837170ea	Merge branch 'develop' of https://github.com/frappe/erpnext into other_app_acc_dims	2021-02-25 15:41:03 +05:30
Deepesh Garg	b990e71b4c	fix: Add search field in project query	2021-02-25 14:01:22 +05:30
Deepesh Garg	834a8b740d	Merge branch 'develop' into subscription_fix_new	2021-02-25 11:24:27 +05:30
Ankush Menat	325a461c34	Merge branch 'develop' into opening_round_gl	2021-02-25 07:53:48 +05:30
Daniel Chalmers	d3e122259d	Update skill.json	2021-02-24 17:13:48 -06:00
Florian HENRY	e11ce57f3c	fix: add item taxes at the same times as sales and purchase taxes	2021-02-24 21:45:29 +01:00
Afshan	684fc4e27b	fix: asset category name disappear (#24728)	2021-02-24 19:08:56 +05:30
Afshan	6bd2bbc953	fix: show custom button for saved projects (#24730) ... * fix: show custom button for saved projects * fix: slider	2021-02-24 18:13:10 +05:30
rohitwaghchaure	d0baa90b50	Merge pull request #24715 from rohitwaghchaure/fixed-patch-item-reposting-develop ... fix: patch failing because of incorrect gl entries	2021-02-24 17:18:43 +05:30
Afshan	84184559bc	fix: currency symbol in update items (#24726)	2021-02-24 16:51:11 +05:30
Saurabh	fefacced13	bumped to version 13.0.0-beta.12	2021-02-24 15:21:19 +05:50
Shariq Ansari	1dba7d2161	fix: Added parent task expected end date validation (#24611) ... * fix: Added parent task expected end date validation * fix: implemented suggested code * fix: updated test case	2021-02-24 12:39:23 +05:30
Rucha Mahabal	402fcbd489	Merge pull request #24716 from pateljannat/issue-custom-buttons ... fix: custom buttons in issue	2021-02-24 11:47:29 +05:30
Rohit Waghchaure	f613d41408	chore: change log	2021-02-24 11:20:29 +05:30
Ankush Menat	23c30e43f0	fix: make round off GLE always non-opening ... Opening GL entries can not be for profit and loss accounts. Round off accounts are by default P&L account. Hence when making opening entry, make round off entries as non-opening. Related issue: ISS-20-21-09677	2021-02-24 11:03:24 +05:30
Daniel Chalmers	c04ed62863	Allow renaming skills	2021-02-23 22:02:09 -06:00