24435 Commits

Author	SHA1	Message	Date
Suraj Shetty	e3fe8ff195	Merge branch 'develop' into purchase-taxes-and-charges-account-name-issue	2020-11-09 19:16:23 +05:30
Rucha Mahabal	30d58cc3d7	feat: Consider Holiday List in Student Leave Application and Attendance (#23388) ... * feat: Consider holiday list in Student Attendance and Leave Application * feat: Show Holidays as 'H' in Student Monthly Attendance Sheet * fix: check if date is a holiday in attendance reports * test: skip attendance record creation for holidays * fix: holiday list validation * fix: clean up after test * fix: codacy * fix: show date in user format * fix: remove ununsed imports * fix: sider * fix: test Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-11-09 18:41:03 +05:30
Frappe PR Bot	7915a3acae	chore: Update translations (#23856) ... Co-authored-by: frappe <frappe@scw-dazzling-elgamal>	2020-11-09 18:37:28 +05:30
Deepesh Garg	d53abf194e	fix: Party for loan ledger entries	2020-11-09 18:34:38 +05:30
rohitwaghchaure	8d39d7570a	Merge pull request #23764 from anupamvs/project-timesheet ... fix: added project link in timesheet form	2020-11-09 17:34:11 +05:30
Marica	9a3e1f6f83	Merge branch 'develop' into purchase-invoice-payment-terms	2020-11-09 14:51:20 +05:30
Marica	63d1a0436c	Merge branch 'develop' into fix-po-no-fetching	2020-11-09 12:59:10 +05:30
rohitwaghchaure	94bfa6a659	Merge pull request #23843 from frappe/datev_check_fiscal_year ... feat: validate fiscal year	2020-11-09 12:33:15 +05:30
Marica	709daf354b	Merge branch 'develop' into purchase-invoice-payment-terms	2020-11-09 10:33:32 +05:30
Marica	da2c6444f6	Merge branch 'develop' into bank-link-card-desk	2020-11-09 10:29:51 +05:30
Deepesh Garg	29a8994506	Merge pull request #23832 from deepeshgarg007/india_tax_template_fetch ... fix: Auto Statewise gst tax template	2020-11-08 17:48:57 +05:30
Deepesh Garg	dd94587ef8	fix: Loan write off precision issue	2020-11-07 17:08:30 +05:30
Deepesh Garg	2ad015450e	fix: Remarks fix	2020-11-07 00:14:40 +05:30
Mohammad Hasnain Mohsin Rajan	d54969bd86	Merge branch 'develop' into UAE-VAT-Format	2020-11-06 23:39:34 +05:30
Mohammad Hasnain	c5aad7b6e5	feat(UAE VAT 201): reorder desk page listing	2020-11-06 23:36:50 +05:30
Mohammad Hasnain	4d99d695a3	feat(uae vat 201): update desk page entry	2020-11-06 23:33:19 +05:30
Saqib	e0af8fe8e5	fix: auto fetch sr nos with modifed conversion factor (#23854)	2020-11-06 18:19:36 +05:30
Deepesh Garg	3899079bb9	fix: Loan seurity unpledge msg improvement	2020-11-06 17:39:54 +05:30
Deepesh Garg	3e69756e15	fix: Add better remarks for Loan GL entries	2020-11-06 14:25:09 +05:30
marination	0b4946ba27	fix: Add missing links ... - Added Bank Transaction Statement Entry and Bank Statement Settings	2020-11-06 13:15:46 +05:30
Nabin Hait	06ba92be7a	fix: Added link of bank reconciliation and clearance in accounting desk page	2020-11-06 13:15:38 +05:30
Marica	7e1511f527	Merge branch 'develop' into purchase-invoice-payment-terms	2020-11-06 12:28:55 +05:30
Anupam	c3307f7900	fix: replaced formatdate -> format_date	2020-11-06 12:28:38 +05:30
Marica	9694432270	Merge branch 'develop' into dialog-cleanup	2020-11-06 12:19:41 +05:30
Raffael Meyer	a62d138748	Merge branch 'develop' into datev_check_fiscal_year	2020-11-05 17:29:42 +01:00
barredterra	f91d82b538	fix: imports	2020-11-05 17:28:39 +01:00
barredterra	815341d454	feat: validate fiscal year	2020-11-05 16:57:23 +01:00
Deepesh Garg	1145b3796c	fix: Remove accrual type from process	2020-11-05 21:21:40 +05:30
Deepesh Garg	a2bff7fbfc	fix: Penalty amount calculation fix	2020-11-05 21:14:29 +05:30
Deepesh Garg	49cc57e76e	fix: Negative amount check for amounts	2020-11-05 21:14:07 +05:30
Anupam Kumar	3a9dc90695	fix: fix: replaced formatdate -> format_date (#23829)	2020-11-05 18:51:56 +05:30
rohitwaghchaure	9a62858da2	Merge pull request #23831 from rohitwaghchaure/incorrect-assign-to-in-asset-maintenance-develop ... fix: incorrect assign to in Maintenance Schedule	2020-11-05 18:43:51 +05:30
Marica	c070f2ed57	Merge branch 'develop' into dialog-cleanup	2020-11-05 18:37:56 +05:30
Marica	08f6c9d5f9	Merge pull request #23820 from marination/so-to-po-dialog-fix ... fix: SO to PO Mapping Issue	2020-11-05 18:29:52 +05:30
pateljannat	5b02d32826	fix: trailling spaces removed	2020-11-05 18:04:14 +05:30
Saqib	bc919e2e7d	fix: cannot expand row in update items dialog (#23839)	2020-11-05 17:38:35 +05:30
Saqib	19df4534f5	fix: asset finance book depreciation posting date fix (#23833)	2020-11-05 16:37:40 +05:30
Deepesh Garg	59ccb64e18	fix: Auto Statewise gst tax template	2020-11-05 16:29:34 +05:30
pateljannat	403822afb3	fix: correcting description field in taxes and charges for accounts that have account number + account name	2020-11-05 16:24:33 +05:30
Afshan	5c93ca7bef	fix: leave ledger patch (#23807) ... Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>	2020-11-05 15:45:15 +05:30
Rohit Waghchaure	421348a5f2	fix: not able to select assign to	2020-11-05 15:43:41 +05:30
Marica	6d2bcd2404	Merge branch 'develop' into purchase-invoice-payment-terms	2020-11-05 12:25:38 +05:30
Marica	fd2b7d3c1d	Merge branch 'develop' into dialog-cleanup	2020-11-05 12:22:50 +05:30
Marica	7e9b9e7278	Merge branch 'develop' into so-to-po-dialog-fix	2020-11-05 12:19:49 +05:30
Marica	9a4975d3fe	Merge pull request #23823 from marination/delete-quoted-item-old-report ... chore: Delete Quoted Item Comparison Report	2020-11-05 12:19:26 +05:30
rohitwaghchaure	64059db69f	Merge pull request #23814 from Anurag810/stock_ledger_report ... fix: list index out of range on including UOM	2020-11-05 11:49:46 +05:30
Marica	6ae1b269ea	Merge branch 'develop' into delete-quoted-item-old-report	2020-11-05 09:32:47 +05:30
Marica	6bbdc58d56	Merge branch 'develop' into link-to-mr	2020-11-05 09:31:39 +05:30
Marica	144fef0097	Merge branch 'develop' into item-price-pricing-rule-conflict	2020-11-05 09:28:30 +05:30
Marica	364916fa7b	Merge branch 'develop' into dialog-cleanup	2020-11-05 09:27:57 +05:30
Marica	2f0bd68fde	Merge branch 'develop' into so-to-po-dialog-fix	2020-11-05 09:25:00 +05:30
marination	2b3412ea05	chore: Reposition RFQ fields	2020-11-04 22:07:33 +05:30
Marica	4c81de0810	Merge branch 'develop' into so-to-po-dialog-fix	2020-11-04 21:24:45 +05:30
marination	5de719fc74	chore: Delete Quoted Item Comparison Report	2020-11-04 21:22:22 +05:30
marination	2b8aa91cf2	fix: Make sure row object has doctype so that read only property is applied to rows	2020-11-04 21:00:52 +05:30
Rucha Mahabal	13fb562e9c	fix: sider	2020-11-04 20:25:10 +05:30
igormbq	aa08fb9716	Add location on Asset to use make_demo	2020-11-04 11:40:57 -03:00
Rucha Mahabal	2673c19c1a	fix: therapy plan and session fixes	2020-11-04 20:06:07 +05:30
Afshan	cdc17bb9f3	fix: added code for testing	2020-11-04 19:28:55 +05:30
marination	23b7591c91	fix: SO to PO Mapping Issue ... - removed type: GET , which made the URL longer - Added only relevant fields from Items table to Dialog table to reduce args load - Made separate method to set table data in dialog - Added freeze message	2020-11-04 18:23:00 +05:30
Anurag Mishra	09b8ca0ddb	fix: list index out of range on incilding uom	2020-11-04 15:04:50 +05:30
rohitwaghchaure	0fde102ea5	Merge pull request #23812 from rohitwaghchaure/fixed-sequence-id-column-display ... fix: on save sequence id column override with workstation	2020-11-04 14:25:15 +05:30
rohitwaghchaure	9a0325e2b9	Merge pull request #23801 from rohitwaghchaure/fixed-budget-test-cases ... fix: Budget test cases	2020-11-04 13:27:03 +05:30
Rohit Waghchaure	dd87bcfda0	fix: on save sequence id column override with workstation	2020-11-04 13:26:03 +05:30
Rohit Waghchaure	81b2c8ed60	fix: sequence id override with operation column	2020-11-04 13:10:03 +05:30
Mangesh-Khairnar	2df2b2f351	fix: update integrations desk page (#23767) ... * fix: update integrations desk page * fix: setup dashboard after receiving API callback Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-11-04 12:48:33 +05:30
Mangesh-Khairnar	1354aecafa	fix: add check for allowing access to european region (#23770)	2020-11-04 12:42:02 +05:30
Frappe PR Bot	f4e410af5f	chore: Update translations (#23787) ... Co-authored-by: frappe <frappe@scw-dazzling-elgamal>	2020-11-04 12:17:40 +05:30
rohitwaghchaure	a53454d3d1	Update test_budget.py	2020-11-04 12:06:21 +05:30
Mohammad Hasnain	bed4e85aec	fix(uae vat 201): date filters were not working	2020-11-04 10:44:22 +05:30
Mohammad Hasnain	510d0d3f20	Merge branch 'UAE-VAT-Format' of https://github.com/hasnain2808/erpnext into UAE-VAT-Format	2020-11-04 10:32:22 +05:30
Mohammad Hasnain	f2c895ddb5	feat(uae vat 201): do not take zero and nil rated items in standard rated expense emiratewise	2020-11-04 10:31:37 +05:30
Mohammad Hasnain Mohsin Rajan	2b2961678c	Merge branch 'develop' into UAE-VAT-Format	2020-11-04 08:43:21 +05:30
marination	574477187f	chore: Pricing Rule with Item Price Test	2020-11-03 20:22:48 +05:30
Marica	cf08f0da70	Merge branch 'develop' into item-price-pricing-rule-conflict	2020-11-03 18:29:22 +05:30
pateljannat	846ff323e2	feat: sales order status filter for production plan	2020-11-03 17:35:44 +05:30
Rohit Waghchaure	c8cc4bfc56	fix: Budget test cases	2020-11-03 17:09:09 +05:30
Marica	7b42e8e27c	Merge branch 'develop' into dialog-cleanup	2020-11-03 16:26:06 +05:30
marination	53b1a9a40b	chore: Add Test for missing debit account	2020-11-03 15:56:09 +05:30
Rucha Mahabal	ce8b5fc5ca	Merge branch 'develop' into fix-ipme	2020-11-03 13:56:53 +05:30
Rucha Mahabal	7190e1e4bb	fix: Inpatient Medication Order and Entry fixes	2020-11-03 13:45:12 +05:30
Marica	9a75a60784	Merge branch 'develop' into debit-credit-opening-invoice-tool	2020-11-03 12:03:50 +05:30
Saqib	da878c43fc	fix: cannot save customer email & phone (#23797)	2020-11-03 10:51:09 +05:30
Saqib	c95dff7b7d	fix: cannot add items to cart (#23796) ... * fix: _ is not defined * fix: item image alt gets overflowed due to large text * fix: available item qty in pos search * fix: cash shortcuts overflow	2020-11-03 10:16:58 +05:30
Kevin Chan	a2ba8ea74a	style: Clean up code formatting	2020-11-03 10:57:52 +08:00
Kevin Chan	312561fd77	Merge branch 'develop' into fix/item-price-duplicate-checking	2020-11-03 10:56:23 +08:00
Mohammad Hasnain Mohsin Rajan	6a0b28bde3	Merge branch 'develop' into UAE-VAT-Format	2020-11-02 23:59:13 +05:30
Mohammad Hasnain	7a034595fe	fix(UAE VAT 201): Remove Chart	2020-11-02 13:12:27 +05:30
Mohammad Hasnain	b0eca23485	Refactor(UAE VAT 201): Fix fomatiing	2020-11-02 12:47:10 +05:30
Deepesh Garg	992bd69fc4	Merge pull request #23785 from deepeshgarg007/place_of_supply ... fix: Place of Supply fix in Sales Invoices	2020-11-02 11:23:25 +05:30
Mohammad Hasnain	c53237f5e0	refactor(UAE VAT 201): solve syntax errors	2020-11-02 11:02:41 +05:30
Mohammad Hasnain Mohsin Rajan	c8d8d0868d	Merge branch 'develop' into UAE-VAT-Format	2020-11-02 10:36:03 +05:30
Mohammad Hasnain Mohsin Rajan	d322181fd7	refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/uae_vat_201.py ... Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>	2020-11-02 10:29:38 +05:30
Mohammad Hasnain Mohsin Rajan	7b771d139c	refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/test_uae_vat_201.py ... Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>	2020-11-02 10:29:14 +05:30
Mohammad Hasnain Mohsin Rajan	46265d3fc7	refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/test_uae_vat_201.py ... Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>	2020-11-02 10:28:41 +05:30
Mohammad Hasnain Mohsin Rajan	be7a4c8b0a	refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/test_uae_vat_201.py ... Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>	2020-11-02 10:28:14 +05:30
Mohammad Hasnain Mohsin Rajan	f116fbf84d	refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/test_uae_vat_201.py ... Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>	2020-11-02 10:27:54 +05:30
marination	542ae6ab97	chore: Linter and Sider fixes ... - Translatable strings cannot be multi line or be formatted by '+' - Reduce no of tabs in stock_entry.js	2020-11-02 08:50:48 +05:30
Marica	e0ec58d8fa	Merge branch 'develop' into link-to-mr	2020-11-01 23:48:58 +05:30
Deepesh Garg	eacfd792e6	fix: fieldname	2020-10-30 22:12:24 +05:30
Deepesh Garg	db3fa4e6b2	fix: Place of Supply fix in Sales Invoices	2020-10-30 19:19:48 +05:30
marination	97d38548aa	chore: Purchase Invoice Get Items From cleanup	2020-10-30 17:50:25 +05:30
marination	66b2b544f8	chore: Purchase Receipt, added required by date in PO popup	2020-10-30 17:45:28 +05:30
marination	08e5031be2	chore: Supplier Quotation Get Items From cleanup	2020-10-30 17:36:20 +05:30
marination	e14fdf4a3c	chore: RFQ cleanup and Title case for 'Get Items From' ... - Cleanup up RFQ Get Items From Dialogs - Title cased 'Get items from' to 'Get Items From'	2020-10-30 17:06:00 +05:30
rohitwaghchaure	c451c08824	Merge pull request #23777 from rohitwaghchaure/fixed-set-po-details-in-subcontract-stock-entry-develop ... fix: po_detail field has no value for subcontracted stock entry	2020-10-30 16:48:11 +05:30
rohitwaghchaure	ce7f9dffa9	Merge pull request #23781 from rohitwaghchaure/patch-to-update-reason-for-leaving ... fix: patch to update reason for leaving in employee	2020-10-30 16:47:48 +05:30
Rohit Waghchaure	e1781dc0bb	fix: patch to update reason for leaving in employee	2020-10-30 15:34:04 +05:30
Saqib	32442008dc	fix: asset finance book posting date fix (#23778)	2020-10-30 15:30:18 +05:30
Rohit Waghchaure	71913c36a7	fix: po_detail field has no value for subcontracted stock entry	2020-10-30 14:35:16 +05:30
marination	6bf507a54b	chore: (MR)Added delivery date in SO dialog	2020-10-30 13:59:47 +05:30
Marica	b05318aa51	Merge branch 'develop' into prod-plan-status	2020-10-30 12:33:27 +05:30
Mohammad Hasnain Mohsin Rajan	30197d7fba	Merge branch 'develop' into UAE-VAT-Format	2020-10-30 10:29:56 +05:30
rohitwaghchaure	707788da4b	Merge pull request #22711 from rohitwaghchaure/multiple-pricing-rules-are-not-applied ... fix: multiple pricing rules are not working on selling side	2020-10-30 02:42:51 +05:30
Marica	9dc4941072	Merge branch 'develop' into prod-plan-status	2020-10-30 00:53:10 +05:30
François de Ryckel	ca5f5cb367	Update student_attendance.py (#23761) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-10-29 23:04:13 +05:30
Rucha Mahabal	9db26155ad	fix: set SLA variance in seconds for Duration fieldtype (#23765) ... * fix: calculate SLA variance in seconds for Duration fieldtype * fix: sider	2020-10-29 22:39:21 +05:30
rohitwaghchaure	445d23223b	Merge branch 'develop' into multiple-pricing-rules-are-not-applied	2020-10-29 22:25:19 +05:30
Anupam Kumar	e43f8f12d5	Merge branch 'develop' into project-timesheet	2020-10-29 22:03:31 +05:30
Anupam	9002904131	feat: added project link in timesheet form	2020-10-29 21:36:31 +05:30
Deepesh Garg	9c67629e28	fix: Ignore cancelled entries instock balance report (#23757) ... Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-29 19:51:57 +05:30
Nabin Hait	b7285fdcad	Merge branch 'develop' into prod-plan-status	2020-10-29 18:58:32 +05:30
Nabin Hait	2bb110b3d1	Merge branch 'develop' into fix-po-no-fetching	2020-10-29 18:57:33 +05:30
Marica	8f6bd851d3	chore: Show Toast alert feedback on Scanning Barcode (#23760)	2020-10-29 18:55:52 +05:30
Marica	bf54ea9976	chore: (Production Plan) Simplify and fix translation in message popup (#23753)	2020-10-29 18:54:36 +05:30
rohitwaghchaure	d0c2700c85	fix: subscription test case (#23763) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-10-29 18:52:16 +05:30
Saqib	b193731158	fix: pos profile has no attr 'show_only_available_items' (#23758)	2020-10-29 13:23:50 +05:30
Marica	1b8a1cfed2	Merge branch 'develop' into prod-plan-status	2020-10-29 13:02:19 +05:30
Mohammad Hasnain Mohsin Rajan	55c78b17ba	fix(UAE VAT 201): change desk page record	2020-10-29 12:43:43 +05:30
Kenneth Sequeira	10f2468076	fix: make asset dashboard charts public (#23751)	2020-10-29 12:02:48 +05:30
Syed Mujeer Hashmi	c17cdd7c2e	fix: Fix for LMS Sign Up link (#23743) ... Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-10-29 11:10:06 +05:30
Mohammad Hasnain	eb3084b072	refactor(UAE VAT 201): break functions	2020-10-29 09:52:17 +05:30
Mohammad Hasnain	bf261a6c39	fix(UAE VAT 201): fix helper	2020-10-29 00:07:52 +05:30
Mohammad Hasnain	08846f6b11	refactor(UAE VAT 201): replace cartesian product to inner joins	2020-10-28 23:33:56 +05:30
Mohammad Hasnain	2c00549dfe	refactor(UAE VAT 201): Use frappe api instead sql	2020-10-28 22:54:56 +05:30
Deepesh Garg	ae6a51b83a	Merge pull request #23749 from deepeshgarg007/accounting_dimension_gl_fix ... fix: Do not allow Company as accounting dimension	2020-10-28 22:05:11 +05:30
Mohammad Hasnain Mohsin Rajan	6e9e6d2491	Merge branch 'develop' into UAE-VAT-Format	2020-10-28 21:06:11 +05:30
Rohit Waghchaure	0fa741b267	added test cases	2020-10-28 17:43:36 +05:30
Deepesh Garg	94a630c255	fix: Do not allow Company as accounting dimension	2020-10-28 17:15:14 +05:30
Saqib	a51d9e3259	fix: pos register shows cancelled documents (#23747)	2020-10-28 17:08:47 +05:30
Saqib	7d9dd3c628	fix: item wise tax calculation (#23744)	2020-10-28 17:07:10 +05:30
Rohit Waghchaure	a248dfb9a5	fix: multiple pricing rules are not working on selling side	2020-10-28 16:22:49 +05:30
Deepesh Garg	c9a6135d6c	fix: Interest accrual after loan topup	2020-10-28 13:38:15 +05:30
Rushabh Mehta	1dd54e457d	Merge pull request #23734 from rmehta/quality-form-cleanup ... fix(cleanup): Quality Module, cleanup of forms, dashboards etc.	2020-10-28 11:36:00 +05:30
Mohammad Hasnain	81f2efd9b0	chore(UAE VAT 201): Rename emirate to vat emirate	2020-10-28 10:28:25 +05:30
Marica	4326d21a79	Merge branch 'develop' into purchase-invoice-payment-terms	2020-10-27 18:40:20 +05:30
Rushabh Mehta	12a2e51e20	fix(minor): translation string encoding in quality_procedure.py	2020-10-27 18:38:44 +05:30
Rushabh Mehta	cf1428904a	fix(refactor): refactor tests, client side code	2020-10-27 17:36:30 +05:30
marination	67f2c82d90	chore: Test case for Payment Terms in PI from PR	2020-10-27 14:49:43 +05:30
Deepesh Garg	0db4d91c30	Merge pull request #23550 from nextchamp-saqib/add-acc-to-a-group-fix ... chore: validate is_group of child parent account	2020-10-27 13:54:17 +05:30
marination	fa085d7f4b	fix: Payment Terms not fetched in Purchase Invoice from Purchase Receipt	2020-10-27 13:18:30 +05:30
Marica	16a1f7e7e3	Merge branch 'develop' into link-to-mr	2020-10-27 11:49:35 +05:30
Afshan	0a6e1b3503	fix: refactor	2020-10-26 21:23:31 +05:30
Afshan	bd987e56bc	fix: showing error for wrong filters. (#23726) ... * fix: showing error for wrong filters. * style: formatting translation	2020-10-26 19:37:33 +05:30
Saqib	fa5fe18b70	fix error message ... Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-10-26 19:27:02 +05:30
Deepesh Garg	13f4b3fc17	fix: Translation syntax	2020-10-26 19:01:36 +05:30
Deepesh Garg	a630de56e9	fix: Loan disbursement amount validation check	2020-10-26 18:53:56 +05:30
Deepesh Garg	64a4437b48	Merge branch 'develop' into add-acc-to-a-group-fix	2020-10-26 18:41:32 +05:30
Afshan	3f971b2371	fix: copying po no when mapping doc	2020-10-26 16:59:57 +05:30
Deepesh Garg	5b4742fd25	fix: Permission fixes for some doctypes	2020-10-26 16:56:05 +05:30
marination	689b77d1ed	fix: Don't show buttons if status is Completed	2020-10-26 16:28:39 +05:30
Rushabh Mehta	ea49e30bfd	fix(cleanup): cleaned up forms	2020-10-26 15:30:52 +05:30
marination	097b32fe67	feat: Close Production Plan	2020-10-26 15:27:37 +05:30
Deepesh Garg	d63fbd79f4	fix: Unaccrued interest from last accrual date instead of disbursement date	2020-10-26 14:20:55 +05:30
rohitwaghchaure	8ba05dc674	Merge branch 'develop' into skip-non-apply-tds-invoices-develop	2020-10-26 14:11:34 +05:30
Rohit Waghchaure	103ecec9d4	fixed translation syntax	2020-10-26 12:20:11 +05:30
Rohit Waghchaure	9caac6976c	fix: incorrect supplied qty error	2020-10-26 12:19:00 +05:30
Rohit Waghchaure	538d62b43d	fix: incorrect consumed qty if raw material with batch	2020-10-26 12:19:00 +05:30
rohitwaghchaure	4c688b71f3	fix: consumed qty logic for subcontracted raw materials (#23314) ... * fix: consumed qty logic for subcontracted raw materials * added test case * fix: sales order workflow test case	2020-10-26 12:19:00 +05:30
rohitwaghchaure	1cfa61628d	fix: incorrect calculation for consumed qty for subcontract item (#23257) ... * fix: incorrect calculation for consumed qty for subcontract item * added test case	2020-10-26 12:19:00 +05:30
Saqib	60212ff9b9	fix: multiple pos issues (#23347) ... * fix: point of sale search * fix: pos fetches expired serial nos * fix: pos doesn't refresh on route change * fix: opening balances not set in opening entry * fix: remove debug statement * fix: invalid query if no serial no is reserved by pos invoice * chore: make new order btn primary * chore: filter warehouse by company * chore: add shortcuts for new order and email * fix: cannot fetch serial no if no batch control * chore: add shortcuts for menu items * feat: standard keyboard shortcuts for pos page * feat: display only items that are in stock * fix: empty point of sale page if opening entry dialog is closed * feat: conversion factor in pos item details * fix: show all invalid mode of payments * chore: show all items if allow negative stock is checked * fix: -ve amount set when changing mode of payment * fix: pos closing validations * fix: test * fix: non expired serial no fetching query * fix: cannot dismiss pos opening creation dialog * fix: transalation strings * fix: msgprint to throw * chore: use as_list in frappe.throw * chore: clean up pos invoice.js & .py * fix: codacy * fix: transalation syntax * fix: codacy * fix: set_missing_values called twice from pos page * fix: mode selector with double spaces * fix: do not allow tables in pos additional fields * fix: pos is not defined * feat: set mode of payments for returns * fix: remove naming series from pos profile * fix: error message * fix: minor bugs * chore: re-arrange pos closing entry detail fields * fix: sider & frappe linter * fix: more translation strings * fix: travis * fix: more translation strings * fix: sider * fix: travis * fix: unexpected end of string * fix: travis Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-26 11:17:04 +05:30
Mohammad Hasnain	5953acab8b	chore(UAE VAT 201): cleanup	2020-10-25 15:43:21 +05:30
Mohammad Hasnain	0ceae0bd66	feat(UAE VAT 201): emirate customizable	2020-10-25 13:06:42 +05:30
Frappe PR Bot	33881fd7e2	chore: Update translations (#23717) ... Co-authored-by: frappe <frappe@scw-dazzling-elgamal>	2020-10-25 12:36:35 +05:30
Mohammad Hasnain	0ac40c75aa	chore(UAE VAT): update tesr dependencies	2020-10-25 01:16:06 +05:30
Nabin Hait	ba1cca6b2d	fix: Show accounts in financial statements upto level 20 (#23718)	2020-10-24 22:00:32 +05:30
rohitwaghchaure	8be296b343	Merge pull request #23675 from rohitwaghchaure/feat-added-balance-serial-no-column-develop ... feat: balance serial nos in stock ledger report	2020-10-24 19:04:31 +05:30
Rucha Mahabal	434791ed6e	feat: Therapy Plan Template (#23558) ... * feat: Therapy Plan Template * feat: Handle billing Therapy Plans created via Templates * feat: add dashboard to Therapy Plan Template * fix: codacy issues * fix: sider * fix: validate Therapy Session overlap * feat: Create Sales Invoice from Therapy Plan * fix: sider * chore: added tests for Therapy Plan Template * fix: test * fix: test Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-24 14:20:38 +05:30
Rucha Mahabal	5ecf6b34b0	Merge branch 'develop' into education-module-fixes	2020-10-24 00:27:24 +05:30
Rucha Mahabal	1c4d732873	fix: sider and translation issues	2020-10-24 00:21:05 +05:30
Rucha Mahabal	b3f81ad5b0	fix: allow future attendance marking for leave applications	2020-10-23 21:21:58 +05:30
Rucha Mahabal	4887b69946	feat: Inpatient Medication Order and Entry (#23473) ... * feat: Inpatient Medication Order * feat: Inpatient Medication Entry * feat: update medication orders on medication entry submission * feat: added custom fields for medication references in Stock Entry * feat: make stock entry if update stock is checked in IPMOE * fix: handle cancel event for Inpatient Medication Entry * fix(ux): add link and progress bar to dashboard * refactor(ux): Adding Medication Orders without linking to Patient Encounter * fix: make medication entry child table read only * fix: filter stock items during manual medication order creation * fix: codacy * chore: tests for Inpatient Medication Order * chore: tests for Inpatient Medication Entry * fix: code clean-up * fix: filter for inpatients in IPMO * fix: add datetime validations for IPME filters * fix: do not hardcode stock entry type Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-23 20:33:30 +05:30
Marica	6f45a86920	Merge branch 'develop' into debit-credit-opening-invoice-tool	2020-10-23 19:56:15 +05:30
Marica	97e065f94f	Merge branch 'develop' into link-to-mr	2020-10-23 19:47:18 +05:30
Marica	3ad9393ff8	fix: SO to PO flow improvement (#23357) ... * fix: SO to PO flow improvement * fix: Dont map shipping_address - shipping_address is a text field in SO and link field in PO - Drop shipping case handles its mapping - normal case doesnt need to map * fix: Hide/Add rows depending on Against Default Supplier * fix: Removed Default Supplier Select field from popup - removed Default Supplier Select field from popup - only loop through suppliers of selected items if via default supplier - only check for items in selected items * fix: Sales Order Drop Shipping Test * fix: (translation)Multi line to single line strings Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-23 19:40:55 +05:30
Marica	0bd576aa44	fix: RFQ UX fixes (#23382) ... * chore: RFQ UX fixes * fix: RFQ to SUpplier Quotation Dialog * fix: Remove 'No Quote' functionality - No Quote in Suppliers table is removed - It's use everywhere has been removed too (tests, server side files, DOM event) * chore: More Info section and Project field Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-23 19:38:30 +05:30
Deepesh Garg	c4be397954	Merge pull request #23439 from Mangesh-Khairnar/mpesa-integration ... feat: M-pesa integration	2020-10-23 19:35:52 +05:30
Saqib	b4448114cf	feat: opening invoice creation tool with background jobs (#23595) ... * feat: opening invoice creation tool with background jobs * fix: tests * fix: codacy * fix: sider * fix: codacy Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-23 19:32:37 +05:30
Marica	758a68da35	fix: Sequence Matcher shouldn't get None input (#23539) ... Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-23 19:26:43 +05:30
Deepesh Garg	2b3f8e0c3b	fix: Cancel repayment accrual interest entry on payment cancellation	2020-10-23 19:02:24 +05:30
Rucha Mahabal	b01334d2e1	fix: attendance cannot be marked outside of Academic Year validation	2020-10-23 18:32:33 +05:30
Michelle Alva	b39c17dd55	fix: Typo/Grammatical fixes in Settings (#23612) ... * fix(Stock Settings): Type/Grammatical fixes in Settings * fix: grammatical fixes in manufacturing settings * fix: typo fix in accounting settings * fix: typo fixes in HR settings * fix: typo fixes in buying settings * fix: typo fixes in Selling Settings * Update erpnext/accounts/doctype/accounts_settings/accounts_settings.json Co-authored-by: Sagar Vora <sagar@resilient.tech> * Apply suggestions from code review Co-authored-by: Sagar Vora <sagar@resilient.tech> * Apply suggestions from code review Co-authored-by: Sagar Vora <sagar@resilient.tech> * Update accounts_settings.json Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Rushabh Mehta <rmehta@gmail.com> Co-authored-by: Sagar Vora <sagar@resilient.tech>	2020-10-23 18:22:26 +05:30
rohitwaghchaure	93bbc52a68	feat: added sequence id in routing for the completion of operations sequentially (#23641) ... * feat: added sequence id in routing for the completion of operations sequentially * fix: translation syntax	2020-10-23 18:18:03 +05:30
Marica	9d94f785e9	fix: Hide Ex-Employees from Employee Tree and minor message UX (#23711) ... * fix: Hide Ex-Employees from Employee Tree and minor message UX * fix: translation syntax	2020-10-23 18:15:55 +05:30
Rucha Mahabal	8b4d33474e	fix: validation for attendance marked on future dates	2020-10-23 16:23:30 +05:30
Rucha Mahabal	6c3efbdb48	fix: filters for course and academic term fields	2020-10-23 16:11:40 +05:30
rohitwaghchaure	4eb87ea8e2	Merge pull request #23695 from rohitwaghchaure/fix-stock-entry-consumption-issue ... fix: incorrect backflush qty in manufacture entry	2020-10-23 15:43:43 +05:30
Mangesh-Khairnar	675f79920e	fix: consider the existing paid payment request for phone payment channel	2020-10-23 15:41:05 +05:30
Rohit Waghchaure	558879fad7	fix: Translation Syntax	2020-10-23 13:42:51 +05:30
Mangesh-Khairnar	e03a02d9c0	fix: show descriptive message for missing fields	2020-10-23 13:38:55 +05:30