brotherton-erpnext

Author	SHA1	Message	Date
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
pateljannat	c0b4eea415	fix: sider	2021-03-25 14:39:05 +05:30
pateljannat	6597bf7dd7	feat: profitability report default working hours and tests	2021-03-25 13:31:43 +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
pateljannat	453e07e32a	fix: exclude cancelled salary slips	2021-03-23 11:18:57 +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
pateljannat	a2068d9b98	feat: profitability report	2021-03-18 15:25:22 +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
Rohit Waghchaure	39b5ad8e69	fix: patch failing because of incorrect gl entries	2021-02-23 18:35:36 +05:30
Rohit Waghchaure	bc8c9de26d	fix: patch failing because of incorrect gl entries	2021-02-23 18:26:48 +05:30
Deepesh Garg	231aec9257	Merge pull request #24478 from nextchamp-saqib/tcs_calculation feat: tax collected at source using tax withholding category	2021-02-23 18:04:38 +05:30
pateljannat	1e2772d389	fix: custom buttons in issue	2021-02-23 17:55:51 +05:30
Ankush Menat	d5656f4b76	fix(india): Escape json characters in text fields (#24699 ) Escape all text fields and add helpful error message if JSON decode error does happen.	2021-02-23 17:26:37 +05:30
Nabin Hait	d46b23699c	fix: optimize reposting of gle and sle (#24702 ) * fix(india): escape for special characters in JSON (#24695) JSON does not accept special whitespace characters like tab, carriage return, line feed Ref: https://www.ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf Related issue: ISS-20-21-09811 * fix: Accounting Dimension creation background job timeout * fix(regional): vehicle no is mandatory for ewaybill generation (#24679) * fix: vehicle no required for e-invoice * fix: ewaybill generation dialog condition * fix: excluding unidentified accounts from gstr-1 * fix: optimize reposting of sle and gle (#24694) * fix: optimize update_gl_entries_after method * fix: Optimized reposting patch * fix: accounting dimensions * added reload_doc in patch * Update item_reposting_for_incorrect_sl_and_gl.py Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com> * fix: Replaced spaces with tabs * fix: merge conflict * fix: test cases Co-authored-by: Ankush Menat <ankush@iwebnotes.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Saqib <nextchamp.saqib@gmail.com> Co-authored-by: pateljannat <pateljannat2308@gmail.com> Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>	2021-02-23 16:38:52 +05:30
Saqib Ansari	85c91ca2db	Merge branch 'develop' into tcs_calculation	2021-02-23 15:56:29 +05:30
Afshan	ae63d66b8f	fix: column names	2021-02-23 13:38:52 +05:30
Deepesh Garg	3dd0e49525	Merge pull request #24703 from deepeshgarg007/loan_test_precision_fix_new fix: Precision fixes in loans	2021-02-23 11:22:52 +05:30
Deepesh Garg	8f8d9744f1	Merge pull request #24629 from deepeshgarg007/loan_dashboard feat: Loans Dashboard	2021-02-23 11:22:32 +05:30
Deepesh Garg	b5a2320b33	fix: Precision fixes in loans	2021-02-22 23:04:48 +05:30
Nabin Hait	19f8fa59d3	fix: optimize reposting of sle and gle (#24694 ) * fix: optimize update_gl_entries_after method * fix: Optimized reposting patch * fix: accounting dimensions * added reload_doc in patch * Update item_reposting_for_incorrect_sl_and_gl.py Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>	2021-02-22 22:27:22 +05:30
Mohammad Hasnain Mohsin Rajan	07f40596bc	feat(Bank Reconciliation): Redesign (#24273 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-02-22 22:19:47 +05:30
Nabin Hait	866cf70d3a	fix: validate pan	2021-02-22 21:35:00 +05:30
shariquerik	f5d6bd77e5	fix: item attributes not editable until refresh	2021-02-22 21:27:14 +05:30
Deepesh Garg	c839177f8e	fix: Issue on posting inter-warehouse transfer invoice	2021-02-22 21:04:51 +05:30
Marica	214951a9c6	Merge pull request #24631 from AfshanKhan/fix-valuation-errror-customer-provided fix: check if customer provided item while setting opening stock	2021-02-22 20:10:27 +05:30
Nabin Hait	69a6bed106	fix: Replaced spaces with tabs	2021-02-22 20:03:23 +05:30
Shridhar Patil	58399f6524	fix: next follow up date should be always greater then current time (#24308 )	2021-02-22 19:37:38 +05:30
Nabin Hait	0ca74ce04b	fix: Fixes related to client script renaming (#24698 )	2021-02-22 19:32:51 +05:30
Ankush Menat	98a0feab89	fix(india): escape for special characters in JSON (#24695 ) JSON does not accept special whitespace characters like tab, carriage return, line feed Ref: https://www.ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf Related issue: ISS-20-21-09811	2021-02-22 19:30:02 +05:30
Deepesh Garg	bb8cd1cdaa	feat: Basic validation for indian PAN No. in Supplier (#24687 )	2021-02-22 19:28:45 +05:30
Shariq Ansari	8676bedd18	fix: Add phone icon on read only phone fields (#24680 ) * fix: Add phone icon on read only phone fields * fix: sider fix	2021-02-22 19:28:01 +05:30
Saqib	14472f6bab	fix(regional): vehicle no is mandatory for ewaybill generation (#24679 ) * fix: vehicle no required for e-invoice * fix: ewaybill generation dialog condition	2021-02-22 19:27:23 +05:30
Afshan	fdafb55fba	fix: error message when making reverse journal entry (#24665 )	2021-02-22 19:25:57 +05:30
Marica	28c834ac95	Merge branch 'develop' into fix-valuation-errror-customer-provided	2021-02-22 16:00:28 +05:30
rohitwaghchaure	311bb6452f	Merge pull request #24691 from deepeshgarg007/accounting_dimension_timeout fix: Accounting Dimension creation background job timeout	2021-02-22 15:29:41 +05:30
Deepesh Garg	d780f56ba8	Revert "fix: Error handling in loan reports and precision fixes"	2021-02-22 15:12:35 +05:30
Afshan	133ebc1d51	Merge branch 'develop' into fix-valuation-errror-customer-provided	2021-02-22 14:16:33 +05:30
Marica	4a1ffcf742	Merge branch 'develop' into quality-inspection-parameter-group	2021-02-22 11:34:34 +05:30
Afshan	01b4ee8a3c	Merge branch 'develop' into fix-valuation-errror-customer-provided	2021-02-22 11:17:45 +05:30
Deepesh Garg	aa46def745	fix: Accounting Dimension creation background job timeout	2021-02-21 21:54:23 +05:30
Deepesh Garg	e4964a0c6c	fix: Update color in charts	2021-02-21 21:03:42 +05:30
Deepesh Garg	e53fd87669	fix: Rearrange cards	2021-02-21 20:57:56 +05:30
Deepesh Garg	cbb4fe2cce	fix: Add cards	2021-02-21 20:57:30 +05:30
Deepesh Garg	a6d0610730	Merge pull request #24505 from deepeshgarg007/loan_exposure_report_fix fix: Error handling in loan reports and precision fixes	2021-02-20 17:57:09 +05:30
Deepesh Garg	e12398e75e	Merge pull request #24682 from frappe/michellealva-leave fix: typo in Leave Balance Report	2021-02-20 17:53:04 +05:30
Deepesh Garg	75b01e3d72	Merge pull request #24683 from frappe/michellealva-patch-1 fix: Typo in Leave Application	2021-02-20 17:52:38 +05:30
Deepesh Garg	bbadebcf64	Merge branch 'develop' into loan_exposure_report_fix	2021-02-20 17:32:17 +05:30
Deepesh Garg	6f29f67a83	Merge pull request #24667 from pateljannat/gstr-1-unidentified-accounts-issue fix: excluding unidentified accounts from gstr-1	2021-02-20 17:27:56 +05:30
Michelle Alva	43f126ed13	fix: Typo in Leave Application Change "Leaves" to "Leave"	2021-02-20 10:46:22 +05:30
Michelle Alva	ab149f196e	fix: typo in Leave Balance Report Change Leaves to Leave	2021-02-20 10:43:47 +05:30
rohitwaghchaure	1aad27a539	Merge pull request #24612 from rohitwaghchaure/fixed-validation-for-job-card fix: [minor] validation of job card in stock entry	2021-02-19 21:22:57 +05:30
Saqib Ansari	8c7c682f17	chore: make parameter group optional	2021-02-19 20:35:23 +05:30
Deepesh Garg	6a5ef261f2	feat: Normal rounding for GST Taxes (#24488 ) * feat: Normal rounding for GST Taxes * fix: Add test case Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-02-19 14:30:23 +05:30
Deepesh Garg	811ff5c397	Merge pull request #24669 from deepeshgarg007/transaction_delete_fix fix: Do not delete GST Accounts from GST Settings on clearing transactions from Company Master	2021-02-19 10:54:56 +05:30
Deepesh Garg	7efbbcf3aa	fix: Do not delete GST Accounts from GST Settings on clearing transactions from Company Master	2021-02-19 10:53:58 +05:30
Deepesh Garg	bc857522ad	fix: Loan Interest Accrual Chart	2021-02-19 10:13:56 +05:30
Ankush Menat	3248da9089	fix(India): Add GST state code for Ladakh	2021-02-18 21:32:48 +05:30
Anupam Kumar	b1997da488	feat: capture Rate of stock UOM in purchase (#24315 ) * feat: capture Rate of stock UOM in purchase * fix: review changes * added server side code * added stock uom rate in sales transactions * fix: review changes * fix: resolving conflicts * adding patch * fix: removing patch	2021-02-18 21:32:05 +05:30
Jannat Patel	4cef0f5983	fix: salary slip attribute error (#24455 ) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-02-18 21:30:13 +05:30
Ankush Menat	d9c84dff0f	fix(selling): cancel sales order with cancelled PE Allow cancelling sales order with cancelled payment entry. Ignoring GL entries while cancelling the document is required to cancel it, reverse entries are created by accounts controller. Related issue: ISS-20-21-09586	2021-02-18 21:29:12 +05:30
Ankush Menat	3508ed176b	test(selling): add test for cancelling sales order Add failing test to reproduce bug in cancelling sales order with advance payments Related issue: ISS-20-21-09586	2021-02-18 21:29:03 +05:30
Nabin Hait	186a045e28	fix: update qty in future sle (#24649 ) * fix: update qty in future sle * fix: validate cancellation due to ongoing reposting * fix: process sle against current timestamp	2021-02-18 21:28:28 +05:30
Nabin Hait	deddcc513d	fix: stock and account balance syncing (#24644 ) * fix: stock and account balance syncing * fix: stock and account balance syncing * fix: stock and account balance syncing * fix: minor fix	2021-02-18 21:28:16 +05:30
Rohit Waghchaure	83f5468ca1	fix: patch	2021-02-18 21:28:03 +05:30
rohitwaghchaure	7797e9d3ac	fix: added patch to fix incorrect stock qty and account value (#24628 )	2021-02-18 21:27:01 +05:30
Nabin Hait	f2be0805f7	fix: formatting query args (#24627 )	2021-02-18 21:25:59 +05:30
rohitwaghchaure	76f616565e	fix: Consolidated Financial Statement report not works if child company account not present in parent company (#24580 ) Fixed conflicts	2021-02-18 21:25:40 +05:30
Ankush Menat	4b2cbdc2dd	fix: update total in words after updating items (#24602 ) * fix: Update total in words after Updating items Update total in words after Updating items in sales/purchase orders. Port of #24592 Closes ISS-20-21-09425 * test: Add test for total & words after update item Add test for total & words after updating items in sales order.	2021-02-18 21:25:00 +05:30
rohitwaghchaure	83792ec009	fix: reposting issue with same posting date and posting time (#24570 ) * fix: reposting issue with same posting date and posting time * Update erpnext/stock/stock_ledger.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-02-18 21:24:48 +05:30
Nabin Hait	56e6ca6285	fix: couple of travis fixes (#24554 ) Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	2021-02-18 21:24:31 +05:30
Afshan	33f4419a78	fix: StopIteration error when e-invoice not enabled (#24548 ) * fix: StopIteration error when e-invoice not enabled * chore: update message Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-02-18 21:23:38 +05:30
Deepesh Garg	d60a40ae82	fix: Add accounts user role permission for accounting dimension filter	2021-02-18 21:23:20 +05:30
Afshan	83768b68c1	fix: emp disappear (#24525 ) * fix: emp disappear * fix: renamed set_totals_call to set_totals Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-02-18 21:20:14 +05:30
Saqib	90ff48baa3	refactor: POS Invoice merging and cancellation (#24351 ) * feat: pos invoice merging with background jobs * fix: invoice threshold for queueing job * refactor: cancellation flow of point of sale * feat: tests for cancellation of pos closing Co-authored-by: Marica <maricadsouza221197@gmail.com>	2021-02-18 21:00:34 +05:30
Saqib	e965d0ff90	fix: discount amount calculation on net total (#24497 )	2021-02-18 20:59:46 +05:30
Saqib	fd4bed1a38	fix(e-invoice): do not validate gstin for exports (#24561 )	2021-02-18 20:59:26 +05:30
Saqib	ade96589b4	fix(e-invoice): skip e-invoice generation for non-taxable invoices (#24568 )	2021-02-18 20:58:54 +05:30
Saqib	18c7c45cfe	fix: NoneType has no len() (#24600 )	2021-02-18 20:55:53 +05:30
Saqib	4fb547179d	fix: customer_currency referenced before assignment (#24607 )	2021-02-18 20:53:49 +05:30
Saqib	a439d19917	feat(pos): mpesa related fixes & additions (#24306 ) * fix: switching of mode of payments * feat: transaction limit for mpesa integration * feat: resend payment request if one fails * feat: make new request only for failed ones * fix: invalid amount for mpesa request * fix: payment successful message not shown * fix: url and business shortcode for live env * fix: duplicate items validation for pos invoices * fix: pos closing entry queued status * fix: peroid end date for amended pos closing	2021-02-18 20:53:26 +05:30
Saqib	57c2e07c45	fix: validate cancellation only if irn generated (#24608 )	2021-02-18 20:45:27 +05:30
Anupam Kumar	4dad1f01ba	fix: contact permmission issue (#24503 )	2021-02-18 20:26:39 +05:30
Rucha Mahabal	73c2d23a9a	feat: Department Wise Appointment Type charges (#24572 ) * feat: Appointment Type Service Items Co-Authored-By: muhammad <muhammadmp@users.noreply.github.com> * fix: set practitioner service item charges mandatory on item selection Co-Authored-By: muhammad <muhammadmp@users.noreply.github.com> * feat: use charges from appointment type during billing * feat: handle appointment charges priority for invoice automation * test: patient appointment auto invoicing scenarios * fix: sider * fix: minor fixes Co-authored-by: muhammad <muhammadmp@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-02-18 20:22:41 +05:30
Anupam Kumar	6485eeb302	fix: portal permission issue (#24577 )	2021-02-18 20:21:39 +05:30
pateljannat	4858b40813	fix: excluding unidentified accounts from gstr-1	2021-02-18 18:44:29 +05:30
Marica	77d72d59ef	Merge branch 'develop' into quality-inspection-parameter-group	2021-02-18 16:55:44 +05:30
Marica	f3ca4bcb70	Merge branch 'develop' into rfq-contact-email-set	2021-02-18 16:51:50 +05:30
Rucha Mahabal	ccc80927f6	feat: Department Wise Appointment Type charges (#24572 ) * feat: Appointment Type Service Items Co-Authored-By: muhammad <muhammadmp@users.noreply.github.com> * fix: set practitioner service item charges mandatory on item selection Co-Authored-By: muhammad <muhammadmp@users.noreply.github.com> * feat: use charges from appointment type during billing * feat: handle appointment charges priority for invoice automation * test: patient appointment auto invoicing scenarios * fix: sider * fix: minor fixes Co-authored-by: muhammad <muhammadmp@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-02-18 16:41:10 +05:30
Raffael Meyer	d44e60f17c	feat: add Print Language to Lead and Opportunity (#24317 ) * fix: move "Print Language" to "More Information" * feat: add "Print Language" in "More Information" Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-02-18 16:24:37 +05:30
Rucha Mahabal	e7bf87cc84	fix: POS return for Serialized Items (#24292 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-02-18 16:04:35 +05:30
Jannat Patel	ef5c714de2	fix: salary slip attribute error (#24455 ) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-02-18 15:52:29 +05:30
Rohit Waghchaure	c697cb8b2d	fix: validation of job card in stock entry	2021-02-18 15:10:12 +05:30
Nabin Hait	d826bee13a	fix: update qty in future sle (#24649 ) * fix: update qty in future sle * fix: validate cancellation due to ongoing reposting * fix: process sle against current timestamp	2021-02-18 14:14:21 +05:30
Anurag Mishra	5ec592d09c	fix: supplier was not able to Submit RFQ due to in sufficient permission	2021-02-18 13:42:04 +05:30
Deepesh Garg	c5b94adc87	Merge pull request #24651 from ankush/ignore_gl_while_cancelling_so fix(selling): cancel sales order with cancelled PE	2021-02-17 18:39:35 +05:30
rohitwaghchaure	03a1484aed	Merge pull request #24621 from rohitwaghchaure/fixed-consolidated-report-not-working-develop fix: Consolidated Financial Statement report not works if child compa…	2021-02-17 16:35:43 +05:30
Marica	208d1942c3	Merge branch 'develop' into quality-inspection-parameter-group	2021-02-17 12:56:35 +05:30
Marica	7de7bb5202	Merge branch 'develop' into item_group_on_update_items	2021-02-16 23:06:20 +05:30
Marica	4441cebbb3	Merge branch 'develop' into shopping-cart	2021-02-16 20:55:00 +05:30
Ankush Menat	3f16902b00	fix(selling): cancel sales order with cancelled PE Allow cancelling sales order with cancelled payment entry. Ignoring GL entries while cancelling the document is required to cancel it, reverse entries are created by accounts controller. Related issue: ISS-20-21-09586	2021-02-16 18:53:40 +05:30
Ankush Menat	f9d4d9a095	test(selling): add test for cancelling sales order Add failing test to reproduce bug in cancelling sales order with advance payments Related issue: ISS-20-21-09586	2021-02-16 18:45:39 +05:30
prssanna	9c36dc3798	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2021-02-16 16:17:32 +05:30
prssanna	7166b6740f	fix: duplicate css property	2021-02-16 16:17:17 +05:30
Nabin Hait	9b178bcd10	fix: stock and account balance syncing (#24644 ) * fix: stock and account balance syncing * fix: stock and account balance syncing * fix: stock and account balance syncing * fix: minor fix	2021-02-16 14:57:00 +05:30
prssanna	7e8113c7e8	fix: broken image style	2021-02-16 12:00:35 +05:30
Rohit Waghchaure	9a40c1b2e1	fix: patch	2021-02-16 10:35:10 +05:30
rohitwaghchaure	d60ff83b6f	fix: added patch to fix incorrect stock qty and account value (#24628 )	2021-02-16 09:12:27 +05:30
Deepesh Garg	79f63526cb	Merge pull request #24632 from ankush/ladakh_gst_addition fix(India): Add GST state code for Ladakh	2021-02-15 21:11:54 +05:30
Deepesh Garg	e2324c77fe	fix: Test Cases	2021-02-15 20:01:32 +05:30
Nabin Hait	243661b37b	fix: formatting query args (#24627 )	2021-02-15 19:27:49 +05:30
Rushabh Mehta	8cc6a2d62c	fix(typo): erpnext-logo.png	2021-02-15 17:40:50 +05:30
Rushabh Mehta	b0735732f9	fix(minor): add erpnext-logo.png	2021-02-15 17:38:55 +05:30
Deepesh Garg	df4eed4c0d	Merge pull request #24615 from ruchamahabal/packed-item-fixes_v13 fix: Issues with packing items	2021-02-15 16:44:10 +05:30
Deepesh Garg	47f5f4757a	Merge branch 'develop' into fixed-consolidated-report-not-working-develop	2021-02-15 16:35:31 +05:30
Deepesh Garg	b6cd97e5fc	Merge pull request #24320 from pateljannat/ldc-validations fix: validation for ldc against supplier and section code	2021-02-15 16:33:41 +05:30
Deepesh Garg	535dc4aea2	fix: Do not round off per day interest	2021-02-15 15:54:25 +05:30
Ankush Menat	57c3d373a7	fix(India): Add GST state code for Ladakh	2021-02-15 15:03:50 +05:30
Afshan	e963362dfd	fix: check if customer provided item while setting opening stock	2021-02-15 15:00:37 +05:30
Deepesh Garg	429fb3bba8	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_exposure_report_fix	2021-02-15 14:10:10 +05:30
Deepesh Garg	9bf05ad927	feat: Loans Dashboard	2021-02-15 13:32:50 +05:30
Richard Case	fd4e7bdbb1	fix: plaid client version to support latest API (#24531 )	2021-02-15 11:58:27 +05:30
Marica	45db1c5d74	Merge branch 'develop' into shopping-cart	2021-02-15 10:35:05 +05:30
rohitwaghchaure	164ffac4ef	fix: Consolidated Financial Statement report not works if child company account not present in parent company (#24580 ) Fixed conflicts	2021-02-12 17:33:07 +05:30
Nabin Hait	85252e7aef	Merge branch 'develop' into packed-item-fixes_v13	2021-02-12 12:39:38 +05:30
Afshan	c44d6b9546	fix: NoneType object has no attribute len() (#24616 )	2021-02-12 12:24:41 +05:30
Marica	87fcae4efd	Merge branch 'develop' into shopping-cart	2021-02-12 12:16:13 +05:30
Rucha Mahabal	ad1f2b41f4	fix: Issues with packing items	2021-02-12 11:29:24 +05:30
Saqib Ansari	138e98fef2	Merge branch 'develop' into quality-inspection-parameter-group	2021-02-12 11:19:25 +05:30
Nabin Hait	1e6cce3593	Merge branch 'develop' into item_group_on_update_items	2021-02-11 21:59:38 +05:30
Jannat Patel	bb0d8f8038	Update accounts_controller.py	2021-02-11 20:59:28 +05:30
Anupam Kumar	7e1dcf911d	feat: capture Rate of stock UOM in purchase (#24315 ) * feat: capture Rate of stock UOM in purchase * fix: review changes * added server side code * added stock uom rate in sales transactions * fix: review changes * fix: resolving conflicts * adding patch * fix: removing patch	2021-02-11 20:19:30 +05:30
Afshan	ee87484134	fix: calculated discount percentage (#24510 ) * fix: calculated discount percentage * fix: slider Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-02-11 20:11:58 +05:30
Jannat Patel	0a7939277c	fix: dynamic links for reports (#24462 ) * fix: dynamic links for reports * fix: revert changes for payment period report * fix: link doctypes	2021-02-11 20:11:06 +05:30
marination	e2d0715cdf	fix: Server side validation for missing payment gateway account	2021-02-11 19:06:10 +05:30
marination	8615227090	fix: Shopping cart breaks without Payment Gateway Account	2021-02-11 18:51:35 +05:30
Saqib	f25ab6f826	fix: validate cancellation only if irn generated (#24608 )	2021-02-11 17:50:57 +05:30
Jannat Patel	6756d3b561	Merge branch 'develop' into item_group_on_update_items	2021-02-11 16:29:34 +05:30
Marica	819b8d0266	Merge branch 'develop' into rfq-contact-email-set	2021-02-11 14:45:09 +05:30
Saqib	0681a480c2	feat(pos): mpesa related fixes & additions (#24306 ) * fix: switching of mode of payments * feat: transaction limit for mpesa integration * feat: resend payment request if one fails * feat: make new request only for failed ones * fix: invalid amount for mpesa request * fix: payment successful message not shown * fix: url and business shortcode for live env * fix: duplicate items validation for pos invoices * fix: pos closing entry queued status * fix: peroid end date for amended pos closing	2021-02-11 14:06:15 +05:30
Shariq Ansari	a46a83b476	fix: Assignment Rule Unassign Condition doesn't work (#24551 ) Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-02-11 13:41:10 +05:30
Nabin Hait	aa235b36e0	Update erpnext/controllers/accounts_controller.py Co-authored-by: Marica <maricadsouza221197@gmail.com>	2021-02-11 13:26:53 +05:30
Marica	a5039e8f85	Merge branch 'develop' into rfq-contact-email-set	2021-02-11 13:23:56 +05:30
Shariq Ansari	47f784aa9c	fix: Lead not getting linked to call logs (#24593 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-02-11 13:23:51 +05:30
rohitwaghchaure	aa00eb9898	fix: reposting issue with same posting date and posting time (#24570 ) * fix: reposting issue with same posting date and posting time * Update erpnext/stock/stock_ledger.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-02-11 13:23:01 +05:30
Saqib	e37a5c2646	fix: customer_currency referenced before assignment (#24607 )	2021-02-11 13:10:52 +05:30
Saqib	e07eb86498	Merge branch 'develop' into tcs_calculation	2021-02-11 12:13:47 +05:30
Saqib	15f4672ffa	fix: pos closing valdation (#24605 )	2021-02-11 12:11:44 +05:30
Jannat Patel	30c8873f24	fix: validation for disabled warehouse (#24539 ) * fix: validation for disabled warehouse * fix: better function name * fix: validation in stock ledger entry	2021-02-11 11:46:48 +05:30
Kanchan Chauhan	bb05acb60d	fix(Leave Application): List view fix (#24550 )	2021-02-11 11:18:59 +05:30
Nabin Hait	9d3f242f39	Update subscription.js	2021-02-11 11:17:33 +05:30
Nabin Hait	b58b8ec2fb	Merge branch 'develop' into quality-inspection-parameter-group	2021-02-11 11:14:02 +05:30
Anupam Kumar	e816ed89e6	fix: portal permission issue (#24577 )	2021-02-11 11:12:13 +05:30
Anuja Pawar	e3c72a3d71	fix: fix filters for the report (#24594 )	2021-02-11 11:06:12 +05:30
Afshan	8609d31430	fix: amend cancelled job offer (#24589 )	2021-02-11 11:05:48 +05:30
Ankush Menat	df6e20887d	fix: update total in words after updating items (#24602 ) * fix: Update total in words after Updating items Update total in words after Updating items in sales/purchase orders. Port of #24592 Closes ISS-20-21-09425 * test: Add test for total & words after update item Add test for total & words after updating items in sales order.	2021-02-11 11:04:39 +05:30
Nabin Hait	79ba299abc	Merge branch 'develop' into subscription_fix_new	2021-02-11 11:03:45 +05:30
Suraj Shetty	969d37da4c	Merge pull request #24598 from surajshetty3416/fix-favicon	2021-02-10 22:18:10 +05:30
Saqib	7b2afaf349	fix: NoneType has no len() (#24600 )	2021-02-10 17:21:12 +05:30
Prssanna Desai	161e3954a8	Merge branch 'develop' into fix-favicon	2021-02-10 16:37:13 +05:30
Rucha Mahabal	3237f5bb88	fix: Inpatient Medication Orders report test (#24596 )	2021-02-10 16:36:49 +05:30
prssanna	fd0e8a4e23	fix: also fetch item variants if hide variants is disabled	2021-02-10 16:31:41 +05:30
Suraj Shetty	5f27c9e100	chore: Remove unnecessary image files	2021-02-10 15:48:58 +05:30
Suraj Shetty	6fa44fefc3	fix: Use new favicon	2021-02-10 15:48:32 +05:30
Marica	bb87950e96	Merge branch 'develop' into rfq-contact-email-set	2021-02-10 12:02:14 +05:30
pateljannat	1ab95413be	fix: conditions simplified	2021-02-09 17:35:17 +05:30
Deepesh Garg	516b3ae1bc	fix: get company attribute	2021-02-09 16:47:55 +05:30
Deepesh Garg	45cec6928b	fix: get company attribute	2021-02-09 16:44:12 +05:30
Deepesh Garg	5006a2065e	fix: Comment	2021-02-09 16:38:11 +05:30
Anurag Mishra	5164223b99	fix: error on group by filter (#24587 ) Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>	2021-02-09 16:22:28 +05:30
pateljannat	637ddff6e9	fix: code cleanup	2021-02-09 16:17:30 +05:30
Deepesh Garg	e56daeb347	fix: Multiple fixes in subscription	2021-02-09 16:13:45 +05:30
Suraj Shetty	1016ff48fc	fix: Create new call popup if call popup does not exists	2021-02-09 12:17:29 +05:30
Marica	6330e20d16	Merge pull request #24565 from marination/stock-dashboard-font-weight fix: (ui) Empty State text font weight in Item Dashboard	2021-02-09 11:03:18 +05:30
Deepesh Garg	236c9ae453	Merge pull request #24578 from marination/acc-dimension-update-fix fix: Avoid changing Ref. Doctype in Accounting Dimension after creation	2021-02-09 06:51:58 +05:30
Suraj Shetty	fbc3988037	Merge pull request #24581 from surajshetty3416/fix-telephony	2021-02-08 20:27:04 +05:30
Saqib	8991d4ed0b	fix: fetching of standalone cr/dr notes for reconciliation (#24575 )	2021-02-08 20:19:11 +05:30
Suraj Shetty	dcc9947d10	fix: Update call_popup - Setup missed & call ended listeners - Show contacts based on links	2021-02-08 20:13:23 +05:30
Suraj Shetty	c5248b30eb	fix: Do not re-use call popup if call ID is different	2021-02-08 18:50:05 +05:30
Suraj Shetty	ba26020a82	fix: Show audio interface in call log which has recording URL - Also, remove unneccesary column & section break in call log doctype	2021-02-08 18:45:55 +05:30
Suraj Shetty	723e6dd73f	fix: Update style of call log shown in timeline	2021-02-08 18:43:26 +05:30
Suraj Shetty	c4d67c2afe	refactor: Move call_popup style from less to scss - Add style for audio	2021-02-08 18:42:27 +05:30
marination	5a7ddba9a3	fix: Avoid changing Ref. Doctype in Accounting Dimension after creation	2021-02-08 17:06:23 +05:30
Afshan	53dbe39d12	fix: StopIteration error when e-invoice not enabled (#24548 ) * fix: StopIteration error when e-invoice not enabled * chore: update message Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-02-08 12:32:42 +05:30
Saqib	9490122abb	fix(e-invoice): skip e-invoice generation for non-taxable invoices (#24568 )	2021-02-08 11:40:56 +05:30
Marica	0aef0fd764	Merge branch 'develop' into stock-dashboard-font-weight	2021-02-08 10:34:17 +05:30
marination	a97eb6a052	fix: Empty State text font weight in Item Dashboard	2021-02-07 22:27:40 +05:30
Saqib	f29b811a56	fix(e-invoice): do not validate gstin for exports (#24561 )	2021-02-06 17:55:20 +05:30
Anuja Pawar	ffb36aac8f	fix: fixing item_code not found error in the report (#24483 )	2021-02-05 23:35:47 +05:30
Nabin Hait	c4a1bb0e1c	fix: couple of travis fixes (#24554 ) Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	2021-02-05 23:34:18 +05:30
prssanna	4742a25942	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2021-02-05 17:35:29 +05:30
prssanna	91b41db9e3	fix: check if product_info exists before setting price	2021-02-05 17:34:56 +05:30
Anupam	d7f4aefd00	feat: added continue-shopping button on cart	2021-02-05 16:17:20 +05:30
Prssanna Desai	b8f4cdfbce	Merge pull request #24555 from prssanna/product-query-fix fix: check if product_info exists	2021-02-05 14:54:23 +05:30
prssanna	a7820f310c	fix: check if product_info exists	2021-02-05 14:52:31 +05:30
Afshan	b814b002ce	fix: creating salary slip from timesheet (#24541 )	2021-02-05 11:34:55 +05:30
Saqib Ansari	8c3da162ba	feat: introduce parameter group in quality inspection	2021-02-04 19:39:41 +05:30
Saqib	0f2dc0eb73	Merge branch 'develop' into tcs_calculation	2021-02-04 18:38:26 +05:30
Deepesh Garg	dce73d1881	fix: Add accounts user role permission for accounting dimension filter	2021-02-03 12:06:36 +05:30
pateljannat	0701f08ab6	fix: item_group on update items	2021-02-03 11:53:14 +05:30
Nabin Hait	7177579051	fix: Dependant sle logic fixes (#24489 ) * fix: Dependant sle logic fixes * fix: negative qty validation * fix: Travis fixes	2021-02-02 22:03:07 +05:30
Saurabh	df589594cd	Merge branch 'version-13-beta-pre-release' into version-13-beta	2021-02-02 20:58:26 +05:30
Saurabh	7645e5319d	bumped to version 13.0.0-beta.11	2021-02-02 21:15:21 +05:50
Afshan	c0f8f32801	fix: fetch query for employee (#24529 )	2021-02-02 20:27:23 +05:30
Saurabh	17433d2c90	fix: version number	2021-02-02 17:40:11 +05:30
Nabin Hait	243d59b0c3	Reposting logic fixes (#24520 ) * fix: Dependant sle logic fixes * fix: negative qty validation * fix: Travis fixes * fix: test fix	2021-02-02 16:55:13 +05:30
Afshan	10b00f9d0d	fix: separation of salary creation from payroll (#24528 ) * fix: separation of salary creation from payroll * fix: removed unnecessary veriable * fix: check existing sal slips * fix: existing checks * style: refactoring query	2021-02-02 16:24:01 +05:30
Anupam Kumar	7d64a291b8	fix: contact permmission issue (#24503 )	2021-02-02 12:43:13 +05:30
Afshan	91a02868cb	fix: emp disappear (#24525 ) * fix: emp disappear * fix: renamed set_totals_call to set_totals Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-02-02 11:04:25 +05:30
Afshan	8676089794	fix: emp disappear (#24524 ) * fix: emp disappear * fix: renamed set_totals_call to set_totals Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-02-02 11:02:22 +05:30
Nabin Hait	bf97eb2d3b	core: Added change log (#24526 )	2021-02-02 10:57:55 +05:30
Suraj Shetty	54a253616a	Merge pull request #24508 from frappe/rebrand-ui	2021-02-02 09:07:35 +05:30
Rohit Waghchaure	d4d639c7ed	fix: test cases for pricing rule	2021-02-01 23:01:18 +05:30
Rohit Waghchaure	5c28416daa	fix: test cases for pricing rule	2021-02-01 22:58:22 +05:30
Suraj Shetty	d809de6579	Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui	2021-02-01 22:40:46 +05:30
Suraj Shetty	852e67c5ee	fix(patch): Use db_set to ignore validation	2021-02-01 22:40:40 +05:30
prssanna	6f1664223d	style: missing semicolon	2021-02-01 20:43:30 +05:30
prssanna	44a055b52f	Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui	2021-02-01 20:39:20 +05:30
Marica	0ea2587679	fix: Numeric/Non-numeric QI UX (#24516 ) * chore: Show 1 field each of both types of Insoections in grid view * fix: Make QI check Numeric by default and make checkbox "Numeric" - Reducing cognitive load	2021-02-01 20:38:53 +05:30
Marica	003ae90e12	fix: Numeric/Non-numeric QI UX (#24517 ) * chore: Show 1 field each of both types of Insoections in grid view * fix: Make QI check Numeric by default and make checkbox "Numeric" - Reducing cognitive load	2021-02-01 20:38:32 +05:30
prssanna	73d60aa498	style: fix formatting	2021-02-01 20:38:17 +05:30
Suraj Shetty	cfb5f58141	style: Fix formatting issues	2021-02-01 20:37:18 +05:30
Saurabh	9dcb286c31	fix: consider select perm while setting party details (#24518 )	2021-02-01 20:36:15 +05:30
Suraj Shetty	723bd9676d	style: Fix formatting issues	2021-02-01 20:34:21 +05:30
prssanna	62442d1c52	style: fix formatting	2021-02-01 20:26:09 +05:30
rohitwaghchaure	bf7317d4e2	fix: multiple pricing rule issue (#24509 )	2021-02-01 20:22:14 +05:30
rohitwaghchaure	68edf749ec	fix: multiple pricing rule issue (#24515 )	2021-02-01 20:22:02 +05:30
Saurabh	081f506992	fix: consider select perm while setting party details (#24514 )	2021-02-01 20:18:44 +05:30
prssanna	9a69c0e21e	Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui	2021-02-01 20:13:01 +05:30
prssanna	526ea46ae2	fix: formatting issues	2021-02-01 20:12:47 +05:30
Suraj Shetty	159063db29	Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui	2021-02-01 20:09:58 +05:30
Suraj Shetty	f57efd1150	style: Fix invalid translation syntax usages	2021-02-01 20:09:20 +05:30
Marica	2fa840e5d4	chore: Use sql to set naming series in older projects (#24513 ) * chore: Use sql to set naming series in older projects * fix: Remove unncessary db.commit()	2021-02-01 20:07:00 +05:30
Marica	fb016edb7a	chore: Use sql to set naming series in older projects (#24512 ) * chore: Use sql to set naming series in older projects * fix: Remove unncessary db.commit()	2021-02-01 20:05:29 +05:30
prssanna	53225f5cbb	Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui	2021-02-01 20:01:54 +05:30
prssanna	11eae6d51a	fix: add default product-image css class	2021-02-01 20:01:37 +05:30
Suraj Shetty	8fef3a3814	Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui	2021-02-01 19:52:12 +05:30
Suraj Shetty	1ab79da7d1	style: Fix formatting issues	2021-02-01 19:51:25 +05:30
prssanna	ba54c4f1b3	Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui	2021-02-01 19:50:46 +05:30
prssanna	a3585e40f7	style: fix formatting	2021-02-01 19:50:27 +05:30
Suraj Shetty	8030abe1bd	Merge branches 'rebrand-ui' and 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui	2021-02-01 19:41:03 +05:30
Suraj Shetty	f67bf7ae98	chore: Fix formatting issues	2021-02-01 19:40:44 +05:30
prssanna	1d346702ed	chore: add .stylelintrc file	2021-02-01 19:07:32 +05:30
prssanna	7863118994	fix: docs link for store page in shopping cart settings	2021-02-01 18:57:30 +05:30
Saqib Ansari	cee3670167	chore: clean up sales invoice form	2021-02-01 15:45:26 +05:30
Suraj Shetty	13d48a0c20	Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui	2021-02-01 15:11:07 +05:30
Suraj Shetty	055b81da7b	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2021-02-01 15:10:52 +05:30
Saqib	beebaf6e1e	refactor: assets form cleanup with rebrand ui (#24494 )	2021-02-01 11:22:57 +05:30
Deepesh Garg	ab88ec208e	fix: Error handling in loan reports	2021-01-31 12:31:46 +05:30
prssanna	2aebf99968	fix: add removed get_employee_emails function	2021-01-29 15:55:21 +05:30
Saqib	fb75f0935f	Merge branch 'develop' into tcs_calculation	2021-01-29 14:26:48 +05:30
Saqib	77d5f59376	fix: discount amount calculation on net total (#24497 )	2021-01-29 14:24:08 +05:30
pateljannat	fd91973ac1	fix: template task parent child deadlock	2021-01-29 13:18:39 +05:30
Rohit Waghchaure	aeba3d311c	fix: extra transferred qty has not consumed against work order	2021-01-29 12:33:09 +05:30
rohitwaghchaure	cf3e0cf271	Merge pull request #24365 from rohitwaghchaure/fixed-extra-trasnferred_qty_issue-develop fix: extra transferred qty has not consumed against work order	2021-01-29 12:28:28 +05:30
Saqib Ansari	3b2327ba8d	fix: sider	2021-01-29 12:08:35 +05:30
Suraj Shetty	0a8939e1c1	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2021-01-29 08:56:22 +05:30
Deepesh Garg	7e3f5e04ab	fix: LTV ration in interest report	2021-01-28 23:25:23 +05:30
Saqib	675a8330a4	refactor: POS Invoice merging and cancellation (#24351 ) * feat: pos invoice merging with background jobs * fix: invoice threshold for queueing job * refactor: cancellation flow of point of sale * feat: tests for cancellation of pos closing Co-authored-by: Marica <maricadsouza221197@gmail.com>	2021-01-28 18:42:43 +05:30
leela	3234df5581	feat: improved call log doctype * Added links and some more fields into Call Log Doctype * Display call info in the call log link pages	2021-01-28 18:34:58 +05:30
Saqib	62dfff5dde	Merge branch 'develop' into tcs_calculation	2021-01-28 18:08:13 +05:30
Saqib Ansari	4d9b6066a2	fix: tcs amount calculation	2021-01-28 18:07:08 +05:30
Saqib	ac9e6ff704	fix(pos): multiple pos fixes and additions (#24227 ) * fix: make custom fields in pos invoice similar to sales invoice * feat: allow/disallow rate & discount change * fix: any pos profile can be selected while creating pos opening * fix: cannot add item to cart * fix: validate phone payment only if payment request exists * fix: replace pos payment method patch * chore: rearrange item & customer group filter * fix: allow/disallow invoice level discount * fix: updating qty of item with uom having space char * fix: move configuration checbox to config section * fix: invalid item rate trigger * fix: cannot remove item from draft invoices * fix: customer currency not set in pos invoice * fix: duplicate item error message * fix: sales uom not fetched in pos invoice * fix: cannot add taxes to pos invoice for uae region * fix: cannot merge pos invoice into credit note * fix: tax calculation while merging pos invoices * feat: delete draft orders from order list * fix: merging of pos invoice with pricing rules	2021-01-28 17:58:55 +05:30
Nabin Hait	a6213ccd61	Merge branch 'develop' into version-13-beta-pre-release	2021-01-28 17:36:08 +05:30
Anupam Kumar	0d9a8ae4d2	feat: shopping portal changes (#24445 ) * feat: shopping portal changes * fix: review changes * review changes	2021-01-28 17:32:57 +05:30
Anupam	e6f925e5e6	review changes	2021-01-28 15:58:03 +05:30
Marica	56c6805d79	Merge branch 'develop' into fixed-extra-trasnferred_qty_issue-develop	2021-01-28 15:03:15 +05:30
Marica	9580adad0c	Merge branch 'develop' into project-naming-series-patch	2021-01-28 14:32:11 +05:30
Marica	7aa16bafff	Merge branch 'develop' into lcv_multicurrency	2021-01-28 13:29:36 +05:30
Deepesh Garg	b4be292217	fix: Item valuation for internal stock transfers (#24200 ) * fix: Item valuation for internal stocktransfers * fix: Consider conversion factor for invoices * fix: Add missing set warehouse fields * fix: Add validations and other fixes * fix: Fixes in flow * fix: Internal sales item link in Purchase Invoice * fix: Debugging * fix: Debug travis * fix: Remove commented code * fix: Rate forcing in sales order * fix: Unreallized profit in Sales Register * fix: Item wise gst sales register fix * fix: From warehouse in Purchase Order * fix: Target field in Sales Invoice * fix: remove self * fix: GST Purchasse register and other fixes * fix: Add shipping_address to no field map * fix: Ref doc map * fix: Test Cases * fix: address mapping between sales and purchase document * fix: Import Error * fix: Tax updation for internal invoices * fix: Purchase Order and Invoice linking * fix: Internal Party validation fix * fix: validation * fix(india): GST Taxes for intra state transfer * fix(india): GST Taxes for intra state transfer Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-01-28 13:09:56 +05:30
Marica	465974cff0	Merge branch 'develop' into project-naming-series-patch	2021-01-28 13:01:28 +05:30
Marica	ed6368d782	Merge pull request #24481 from marination/stock-entry-indicator chore: Set Stock Entry Form Indicators in setup	2021-01-28 13:00:24 +05:30
Marica	9e11521764	Merge pull request #24466 from marination/stock-entry-qi fix: Always show QI Template in Item	2021-01-28 12:45:49 +05:30
Mohamed Almubarak	f7ea340181	fix(template): cards on second row overlaps the one before (#23454 ) * Update macros.html fix second row of cards overlapps with the one before * Update macros.html fix(template): second row of cards overlaps with the one before * Update macros.html fix(template): second row of cards overlaps with the one before	2021-01-28 12:32:13 +05:30
Jannat Patel	9f8cbe9101	Material request wrong status issue (#24019 ) * fix: material request status fix * fix: changing precision to global defaults for material request status * fix: adding back the removed flt * fix: sider issues fixed Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>	2021-01-28 12:29:52 +05:30
Saqib	8e55677f10	feat: deleting account & stock entries on deletion of transaction (#24298 ) * feat: control for deleting account & stock entries on deletion of a transaction * chore: change label & fieldname Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-01-28 12:26:45 +05:30
Jannat Patel	3914aca647	fix: check for tax rate (#24376 )	2021-01-28 12:25:15 +05:30
Anurag Mishra	5756bf50e6	fix: removed all day event from shift assignment calendar (#24397 ) Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>	2021-01-28 12:24:39 +05:30
Afshan	e5529ad461	fix: validate tax template for tax category (#24402 ) * fix: validate tax template for tax category * Update sales_taxes_and_charges_template.py	2021-01-28 12:22:39 +05:30
Raffael Meyer	f6f4376463	feat: remove german sales invoice validation (#24441 ) This can be better achieved via Customize Form (mandatory and mandatory_depends_on)	2021-01-28 12:16:26 +05:30
Marica	cc22814df5	Merge branch 'develop' into lcv_multicurrency	2021-01-28 12:15:09 +05:30
Marica	cdccf4be52	Merge branch 'develop' into stock-entry-qi	2021-01-28 12:12:03 +05:30
Deepesh Garg	16bcd01f6d	feat: Provision to disable serial no and batch selector (#24398 ) * feat: feat: Provision to disbale serial no and batch selector * fix: Sider issues * fix: Linting issues	2021-01-28 12:09:35 +05:30
Deepesh Garg	bd9bdc5797	feat: Batch wise item pricing (#24470 ) * feat: Batch wise item pricing * fix: Rate for items with no batch * fix: Add test case for batch pricing * fix: Sider Issues * fix: Add item filter for batch	2021-01-28 12:05:57 +05:30
marination	27bac2aaec	fix: Missing semi-colon	2021-01-28 12:04:14 +05:30
pateljannat	55e7c5644c	fix:rfq contact email set	2021-01-28 12:00:18 +05:30
marination	bc370b3ee5	chore: Set Stock Entry Form Indicators in setup - Makes it easier to override via customisations - Style consistency with other forms that set indicator in setup as well	2021-01-28 11:44:26 +05:30
Marica	ea7c2dbfaf	Merge branch 'develop' into stock-entry-qi	2021-01-28 11:31:43 +05:30
Saqib	31eb740aef	Merge branch 'develop' into tcs_calculation	2021-01-27 19:47:19 +05:30
Saqib Ansari	ae9a9a2167	fix: tcs chargable amount	2021-01-27 19:36:29 +05:30
Saqib Ansari	ff12f91486	feat: charging tcs on sales invoice	2021-01-27 19:17:38 +05:30
prssanna	74feaf85dc	fix: website order page style	2021-01-27 17:41:15 +05:30
Saqib Ansari	6db14d02d2	fix: test	2021-01-27 17:11:34 +05:30
Saqib Ansari	58250aac10	feat: pan and tax withholding category fields for customer	2021-01-27 16:59:36 +05:30
Saqib Ansari	6f718a31f0	refactor: tax withholding category against customer	2021-01-27 16:59:07 +05:30
Afshan	907e2990d0	fix: remove function to get earning deduction components (#24465 ) * fix: remove function to get earning deduction components * fix: slider	2021-01-27 15:34:42 +05:30
Saqib	5ba2f58355	fix: e_invoice print format not showing other charges (#24474 )	2021-01-27 12:34:08 +05:30
prssanna	2d1d900c88	Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui	2021-01-27 10:58:17 +05:30
prssanna	72053cc4ab	fix: cart address overflow	2021-01-27 10:57:34 +05:30
Deepesh Garg	dade7a4583	fix: Translation Syntax	2021-01-26 21:11:55 +05:30
Deepesh Garg	a0d61524c1	fix: Add distribute manually option in LCV	2021-01-26 17:05:00 +05:30
Deepesh Garg	ff3adfd1cf	Merge pull request #24468 from deepeshgarg007/lse_report_fix fix: Division by 0 error in security exposure reports	2021-01-26 10:13:39 +05:30
Deepesh Garg	7a4db2214a	fix: Division by 0 error in security exposure reports	2021-01-26 10:10:35 +05:30
Deepesh Garg	224fdf34e4	Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency	2021-01-25 22:16:02 +05:30
Raffael Meyer	1991ba7910	feat: temporary against account (#24086 ) * feat: add temporaray against account nmber to datev settings * feat: use temporary against account in datev report * test: add temp against account number to test data * test: include temp against aaccount in filters	2021-01-25 21:22:10 +05:30
Marica	35455d2de6	Merge branch 'develop' into project-naming-series-patch	2021-01-25 21:16:02 +05:30
marination	b0ef8fb7c5	fix: Always show QI Template in Item	2021-01-25 21:00:24 +05:30
David Angulo	e1e4810a46	feat: Make patient age translateable	2021-01-25 08:29:11 -06:00
rohitwaghchaure	fa3ec3c346	Merge pull request #23969 from marination/putaway feat: Putaway	2021-01-25 16:42:04 +05:30
Suraj Shetty	0c34a711eb	Merge branch 'develop' of github.com:frappe/erpnext into version-13-beta-pre-release	2021-01-25 16:06:38 +05:30
Anupam	8541d9738f	fix: review changes	2021-01-25 14:18:26 +05:30
Marica	62a1caf6c4	Merge branch 'develop' into lcv_multicurrency	2021-01-25 12:39:16 +05:30
Marica	ec4f42d4a9	Merge branch 'develop' into project-naming-series-patch	2021-01-25 11:29:23 +05:30
Deepesh Garg	164079127f	Merge pull request #24446 from deepeshgarg007/patch-fix-1-new fix: Project Template patch	2021-01-25 10:37:43 +05:30
Deepesh Garg	befe32cbe1	Merge pull request #24456 from deepeshgarg007/ltv_in_report fix: Add loan to value field in Loan Interest Report	2021-01-24 19:18:42 +05:30
Deepesh Garg	91eb9bb5c2	fix: Add loan to value field in Loan Interest Report	2021-01-24 19:15:57 +05:30
Kaviya Periyasamy	c680547be3	fix(einvoice): QRCode generation (#24412 )	2021-01-24 10:59:37 +05:30
rohitwaghchaure	13df7a0ca6	Merge pull request #24033 from ruchamahabal/patient-history-enhancements feat: Patient History Enhancements	2021-01-23 18:19:16 +05:30
Rucha Mahabal	ab920b55a7	Merge branch 'develop' into service-units-in-appointment	2021-01-23 13:27:03 +05:30
Rucha Mahabal	edf5da3394	Merge branch 'develop' into patient-history-enhancements	2021-01-23 13:26:36 +05:30
Rucha Mahabal	ee28328006	fix(travis): Issue Analytics Report Test (#24453 )	2021-01-23 13:26:24 +05:30
Rucha Mahabal	6f4ad3b73d	fix: sider	2021-01-23 12:52:41 +05:30
Rucha Mahabal	cb1da4d07c	fix: doctype meta not loading while setting up fields	2021-01-22 19:26:56 +05:30
Marica	6b0d334d25	Merge pull request #24399 from pateljannat/item-wise-purchase-registry-item-name-error fix: Item wise purchase registry item_name error	2021-01-22 19:20:51 +05:30
Deepesh Garg	5b4ece5054	fix: Update patch	2021-01-22 17:12:35 +05:30
marination	7ba60570e7	fix: Spaces to Tabs	2021-01-22 16:55:06 +05:30
marination	c908deea61	fix: Patch to Add Naming Series to old projects	2021-01-22 16:10:01 +05:30
Rucha Mahabal	75a93d9057	feat: fetch date field for custom doctypes	2021-01-22 15:51:25 +05:30
Afshan	217440952f	fix: slider	2021-01-22 15:39:59 +05:30
Afshan	02d495f1fb	fix: added query for fetching salary component	2021-01-22 15:39:59 +05:30
prssanna	2aa1efb70e	fix: broken image style	2021-01-22 15:31:38 +05:30
Rucha Mahabal	6058ea88e8	fix: SLA not applied automatically when priority is missing (#24447 )	2021-01-22 13:35:08 +05:30
Marica	5631d014a7	Merge branch 'develop' into item-wise-purchase-registry-item-name-error	2021-01-22 12:35:35 +05:30
Deepesh Garg	0d26d24164	Merge pull request #24414 from Alchez/dev-irs-1099-year fix: use supplied year for IRS 1099 forms	2021-01-22 12:17:43 +05:30
Deepesh Garg	cf7209f3d4	fix: Project Template patch	2021-01-22 11:47:13 +05:30
Anupam	988ea8d61d	feat: shopping portal changes	2021-01-22 10:53:50 +05:30
Jannat Patel	02a7af1e6c	fix: full form for opportunity in crm dashboard (#24436 ) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-01-22 10:03:29 +05:30
Rucha Mahabal	858ad20dd0	Merge branch 'develop' into service-units-in-appointment	2021-01-22 09:09:29 +05:30
Rucha Mahabal	7201498801	Merge branch 'develop' into patient-history-enhancements	2021-01-22 09:04:37 +05:30
Rucha Mahabal	b9a21c4824	feat: added search to the Select fields dialog in Patient History Settings	2021-01-22 09:00:40 +05:30
Rucha Mahabal	ded08245cc	fix: duplicate filters added on patient change	2021-01-22 08:52:17 +05:30
rohitwaghchaure	3afc6b1333	Merge pull request #24437 from AfshanKhan/fix-stock-ageing fix: stock ageing should not take cancelled stock entries.	2021-01-21 23:09:41 +05:30
Rucha Mahabal	7a21e40527	Merge branch 'develop' into membership-enhancements-2	2021-01-21 20:21:17 +05:30
Rucha Mahabal	02e424fae2	chore: Add description for settings	2021-01-21 20:16:17 +05:30
Rucha Mahabal	bcc0674d37	fix: test	2021-01-21 19:52:13 +05:30
Abhishek Balam	ea30e0a37d	fix: change modified date	2021-01-21 19:38:37 +05:30
Abhishek Balam	ae3a9c1ead	fix: remove payroll card from HR workspace	2021-01-21 19:33:19 +05:30
Suraj Shetty	f0ff23eac3	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2021-01-21 19:07:57 +05:30
Saqib	577d2bed6e	fix: failing einvoice test (#24434 )	2021-01-21 18:43:55 +05:30
Suraj Shetty	bed55bb7ba	fix: Use multisql to support postgres	2021-01-21 18:36:50 +05:30
Afshan	96edfd93c9	fix: stock ageing should not take cancelled stock entries.	2021-01-21 18:22:35 +05:30
Rucha Mahabal	eee71f37d8	fix: test	2021-01-21 17:47:20 +05:30
Suraj Shetty	5f52f8d473	fix: Temporarily comment out help article link in issue timeline	2021-01-21 16:50:47 +05:30
Suraj Shetty	8670dda5b7	fix: Use abbr method for abbr	2021-01-21 16:47:04 +05:30
Rucha Mahabal	f1cca59d80	feat: update expiry for memberships	2021-01-21 16:36:15 +05:30
Suraj Shetty	2dcdeb8231	Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui	2021-01-21 15:33:42 +05:30
Suraj Shetty	17ed3fc270	fix: Set css_style fallback	2021-01-21 15:33:36 +05:30
prssanna	f3d321fb82	fix: remove console.log	2021-01-21 15:31:42 +05:30
Rucha Mahabal	b9781a4675	fix: membership test cases	2021-01-21 15:13:29 +05:30
Suraj Shetty	0c0155e885	fix: Make birthday messages translatable	2021-01-21 14:59:19 +05:30
Suraj Shetty	8b1a720ae8	Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui	2021-01-21 14:32:45 +05:30
Suraj Shetty	164fe37fa0	fix: Employee birthday reminder	2021-01-21 14:32:35 +05:30
Rucha Mahabal	f3e3f80102	Merge branch 'develop' into membership-enhancements-2	2021-01-21 13:24:39 +05:30
Rucha Mahabal	d98b506478	fix: patch	2021-01-21 13:23:59 +05:30
prssanna	9f1a156307	Merge branch 'shopping-cart' of https://github.com/frappe/erpnext into rebrand-ui	2021-01-21 13:04:58 +05:30
Rucha Mahabal	b48eab972e	fix: sider issues	2021-01-21 13:00:10 +05:30
Marica	d1e6303d67	Merge branch 'develop' into item-wise-purchase-registry-item-name-error	2021-01-21 12:14:47 +05:30
Rucha Mahabal	3af46cc6cc	fix: show custom buttons after save	2021-01-21 11:59:34 +05:30
Rucha Mahabal	4284ad880b	fix: create member from membership for website users only	2021-01-21 11:54:14 +05:30
Rucha Mahabal	53d0eebbe8	fix: patch for renaming field in Membership Settings	2021-01-20 23:22:08 +05:30
Rucha Mahabal	bc49815d54	refactor: missing validations, code clean-up	2021-01-20 23:14:27 +05:30
Rucha Mahabal	fa4b3ba505	fix: basic validations for Membership Type Linked Item	2021-01-20 21:59:27 +05:30
Rucha Mahabal	3575939386	fix: sider issues	2021-01-20 20:48:51 +05:30
pateljannat	f110759897	fix: date validation	2021-01-20 18:12:48 +05:30
prssanna	b00eb1b0cc	feat: shopping cart page	2021-01-20 17:52:54 +05:30
prssanna	706eae7cac	fix: product page fixes	2021-01-20 17:47:25 +05:30
prssanna	ac7bc78afe	fix: show product price in item card	2021-01-20 17:46:19 +05:30
prssanna	599322871a	fix: product query issues	2021-01-20 17:44:08 +05:30
Afshan	36e3e05a0e	fix: query for salary componet in salary structure	2021-01-20 16:48:42 +05:30
Afshan	912647f4f2	fix: allow statistical component in salary structure.	2021-01-20 13:58:32 +05:30
Saqib	e2ed2324c3	fix: (e-invoicing) qrcode image generation (#24395 ) * fix: invalid taxable value of item for e-invoice * fix: qrcode image duplicate error * fix: net total discount calculation * fix: auto fetch auth token	2021-01-20 13:17:42 +05:30
Rucha Mahabal	bd02a42904	Merge branch 'develop' into membership-enhancements-2	2021-01-20 12:49:37 +05:30
Deepesh Garg	60a8ba5cbd	Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency	2021-01-20 10:30:52 +05:30
Suraj Shetty	2e67a41c27	fix: Update birthday avatar code	2021-01-20 10:12:01 +05:30
Afshan	c69ab6d184	fix: select sal comp while making sal struct	2021-01-19 19:29:31 +05:30
Rohan Bansal	97b9995f8f	fix: use supplied year for IRS 1099 forms	2021-01-19 19:10:03 +05:30
rohitwaghchaure	c474caba70	Merge pull request #24354 from rohitwaghchaure/fixed-incorrect-key-in-subcontract-develop fix: incorrect serial no in the subcontracted purchase receipt	2021-01-19 15:08:53 +05:30
Rucha Mahabal	a28579a130	fix: sider issues	2021-01-19 14:16:44 +05:30
Rucha Mahabal	f39cbd3a1d	test: appointment booking for admission service unit	2021-01-19 13:59:03 +05:30
Suraj Shetty	c858bb8122	fix: Rename patch	2021-01-19 10:47:50 +05:30
Jannat Patel	953960b193	Merge branch 'develop' into item-wise-purchase-registry-item-name-error	2021-01-19 10:44:49 +05:30
Deepesh Garg	6fb66f9428	Merge pull request #24362 from ruchamahabal/year-to-date-in-salary-components feat(Payroll): compute Year to Date for Salary Slip components	2021-01-19 09:40:47 +05:30
Suraj Shetty	bbc6bfd3c3	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2021-01-19 09:34:06 +05:30
marination	957615bec8	fix: Stricter validations - Validation for overreceipt on Purchase Invoice, Stock Entry, Purchase Receipt & Stock Reconciliation - Every incoming stock transaction must be checked to avoid overcapacity - However application of rule and splitting only on certain doctypes - Validate capacity < stock balance on save in putaway rule, irrespective	2021-01-18 23:47:24 +05:30
Marica	6ac51edc56	Merge branch 'develop' into putaway	2021-01-18 17:47:25 +05:30
Saqib	7b8eac958e	feat: re-linking bank accounts with plaid (#24392 )	2021-01-18 16:44:41 +05:30
Suraj Shetty	e560d7428e	fix: Update split issue & help article	2021-01-18 16:43:22 +05:30
pateljannat	6bec696396	fix: item_group fallback	2021-01-18 16:21:56 +05:30
pateljannat	fa2b0d43bd	fix: handled invoices with no item_code	2021-01-18 15:27:40 +05:30
Rucha Mahabal	20e5315480	feat: Allow selecting admission service unit in Patient Appointment for inpatients	2021-01-18 14:56:55 +05:30
Rucha Mahabal	ea19434af4	feat: Issue Analytics Script Report (#23604 ) * feat: Issue Analytics Report * feat: add more filters, code clean-up * fix: add report link to desk page * test: Issue Analytics Report * fix: sider issues * fix: test * debug: travis * debug: travis * fix: travis * fix: travis Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-01-18 13:53:52 +05:30
Deepesh Garg	c3d82a889a	Merge pull request #24370 from deepeshgarg007/loan_report_and_enhancements feat: Loan report and enhancements	2021-01-18 12:26:45 +05:30
Deepesh Garg	52172252b4	fix: Interest calculations in Loan Interest Report	2021-01-18 12:07:54 +05:30
Deepesh Garg	2cb12e6f70	fix: Loan Security name fetch	2021-01-17 18:38:21 +05:30
Deepesh Garg	dd25ecb70d	fix: Add reports in Desk Page	2021-01-17 17:52:02 +05:30
Deepesh Garg	ec60063155	fix: Auto Loan Write Off	2021-01-17 17:39:51 +05:30
Deepesh Garg	914ab7e4b0	fix: Add filters and currency in reports	2021-01-17 14:40:32 +05:30
Deepesh Garg	addea9697d	feat: Loan Exposure report	2021-01-17 11:36:51 +05:30
Deepesh Garg	7976d12ed0	fix: Applicant-Wise Loan Security Exposure report	2021-01-16 18:10:01 +05:30
Deepesh Garg	1564d6ee1f	fix: Test Case	2021-01-15 19:51:15 +05:30
Deepesh Garg	0c4d61269a	fix: test case	2021-01-15 15:57:18 +05:30
Deepesh Garg	e30b33a3b8	fix: Linting issues	2021-01-15 15:47:15 +05:30
Deepesh Garg	cbed6f970a	Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters	2021-01-15 15:43:59 +05:30
Suraj Shetty	cde1566606	fix: Typo	2021-01-15 15:28:50 +05:30
Suraj Shetty	f75d1bb043	fix: Typo	2021-01-15 14:53:51 +05:30
Suraj Shetty	22cdfbea87	Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui	2021-01-15 14:48:35 +05:30
Suraj Shetty	3d00e25232	refactor: Employee birthday reminder	2021-01-15 14:48:28 +05:30
Kanchan Chauhan	d2c71350cd	refactor(Job Application): New fields in Job Applicant and webform (#23326 ) * refactor(Job Application): New fields in Job Applicant and webform * fix: translation syntax Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-01-15 13:56:03 +05:30
Rohan	b1d08126b0	feat: add "Sync Now" to Plaid Settings (#23602 )	2021-01-15 12:56:30 +05:30
Rucha Mahabal	004e51ed9f	Merge branch 'develop' into patient-history-enhancements	2021-01-15 12:09:53 +05:30
Rucha Mahabal	1873c389e5	feat: Only allow submittable doctypes for Patient Medical Record	2021-01-15 02:12:57 +05:30
Rucha Mahabal	b15a19c6e0	test: Medical Record creation for custom doctypes	2021-01-15 01:27:30 +05:30
Rucha Mahabal	060d647248	fix: travis	2021-01-15 00:19:14 +05:30
Anuja P	47b42e6441	fix: Translation fixes	2021-01-14 21:20:00 +05:30
Anuja P	5ead7ee6cf	fix:Payment Period based on invoice date report fix/refactor	2021-01-14 20:58:34 +05:30
Deepesh Garg	c96ea002a0	Merge pull request #24375 from deepeshgarg007/plv_cost_center_ignore_v13 fix: Ignore group cost center validation for period closing voucher	2021-01-14 19:47:56 +05:30
Deepesh Garg	847c706d2f	fix: Ignore group cost center validation for period closing voucher	2021-01-14 19:44:41 +05:30
Anuja Pawar	4569e52b45	fix: fix for not having fiscal year while creating new company (#24130 ) * fix: Fiscal year fix while creating new company * fix: for failing Travis * fix: suggested changes Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>	2021-01-14 19:24:30 +05:30
Mohammad Hasnain Mohsin Rajan	00981206ad	fix: last purchase rate not updating when voucher cancelled if only one voucher is present (#24322 ) * fix: last purchase rate not updating * chore: use orm for updating Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>	2021-01-14 19:23:18 +05:30
Deepesh Garg	660d4a1097	Merge pull request #24346 from GangaManoj/timesheet-linking fix: Link timesheets with corresponding projects	2021-01-14 18:49:40 +05:30
Deepesh Garg	3f015f7142	fix: Update fieldnames	2021-01-14 18:44:14 +05:30
Marica	3c878505cb	Merge branch 'develop' into naming-series-proj	2021-01-14 16:34:51 +05:30
Marica	2b75342811	Merge pull request #24294 from marination/mr-se-warehouse-validation fix: Don't validate warehouse values between Material Request and Stock Entry	2021-01-14 15:09:00 +05:30
Rucha Mahabal	751719ea0d	Merge branch 'develop' into patient-history-enhancements	2021-01-14 14:08:50 +05:30
marination	bc9eaac342	fix: Clear merge conflicts - 'get_project_template' was removed a month back - in 'make_project' insert the project directly as a check for it is there in the beginning.	2021-01-14 13:47:40 +05:30
Rucha Mahabal	6c90e26982	feat: add descriptions for YTD and MTD fields	2021-01-14 13:42:40 +05:30
Marica	17614c9860	Merge branch 'develop' into mr-se-warehouse-validation	2021-01-14 13:02:45 +05:30
Rucha Mahabal	6b9efa894f	Merge branch 'develop' into inpatient-visits-billing	2021-01-14 12:31:43 +05:30
marination	814858061f	fix: test for raising MR-SE mismatch error - Make test add mismatched item code instead of warehouse, since warehouse can be different.	2021-01-14 12:13:08 +05:30
Rucha Mahabal	49702c1487	test: year to date computation for salary slip components	2021-01-14 11:57:24 +05:30
Rohit Waghchaure	56c7b554a6	fix: extra transferred qty has not consumed against work order	2021-01-14 11:54:32 +05:30
Rucha Mahabal	2c315a738e	feat: Salary Slip with Year to Date Print Format	2021-01-14 10:06:24 +05:30
Rucha Mahabal	fdad94f983	feat(Payroll): compute Year to Date for Salary Slip components	2021-01-14 00:40:58 +05:30
Anuja Pawar	e62ce4b172	fix: Add button PO, PI, SI, DN and, Quotation Dashboard (#24187 )	2021-01-13 21:13:12 +05:30
Anupam Kumar	4a649a4fce	fix: removing payment_field from loan repayment closuer (#24291 )	2021-01-13 21:10:49 +05:30
Afshan	33fac19bce	fix: calculation of remaining_sub_periods if relieving date before month start date (#24319 )	2021-01-13 21:06:04 +05:30
Anuja Pawar	0b04e23f6d	fix: BOM Stock Report UoM correction (#24339 )	2021-01-13 21:04:03 +05:30
Jannat Patel	00ccec7314	fix: subscription prepaid date validation (#24356 )	2021-01-13 21:02:15 +05:30
Saqib	53cb9f9f47	fix(e-invoicing): ux issues (#24358 ) * fix: overseas invoice rounding adjustment * fix: overseas shipping address * fix: qrcode for document name having forward slash * feat: sandbox mode toggle * fix: cannot delete sales invoice if linked to e invoice req log	2021-01-13 21:00:44 +05:30
Kanchan Chauhan	511434190d	fix(work order): Actual start and end dates update (#24360 ) Currently, even when the Work Order (without Operations) is completed and Stock Entries are there, the Actual Start Date and Actual End Date is not updated. For some reason need to db_set, then it updates the Actual Start Date and Actual End Date	2021-01-13 20:59:43 +05:30
Rucha Mahabal	ef5f0c0461	feat: Issue Summary Script Report (#23603 ) * feat: Issue Summary Report * feat: Add Issue Metrics to Issue Summary Report * fix: code clean-up * feat: Added Report Summary * feat: Add SLA status fields * fix: add report link to desk page * fix: sider issues Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-01-13 19:59:16 +05:30
Anurag Mishra	1e396dcb2a	fix: validated GST state	2021-01-13 14:01:57 +05:30
Jannat Patel	8aeadc743e	fix: assessment plan error handling for course field (#23961 ) * fix: assessment plan error handling for course field * fix: message rectification * fix(travis): clean-up tests * fix: travis * fix: tests Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-01-13 12:56:04 +05:30
Marica	1ff7743d81	Merge branch 'develop' into naming-series-proj	2021-01-13 10:40:24 +05:30

... 13 14 15 16 17 ...

26823 Commits