brotherton-erpnext

Author	SHA1	Message	Date
Deepesh Garg	5c8dd6a0ed	Merge pull request #23355 from Anurag810/accounts_recievable fix: Cost Center filter in accounts receivable and payable report	2020-09-20 19:36:30 +05:30
Saqib	f2ea3877c8	fix: depreciation start date ux fixes (#23339 )	2020-09-20 19:31:18 +05:30
Saqib	4b25eb4db4	fix: mode of payment not fetched if no account is set (#23334 ) Co-authored-by: Sagar Vora <sagar@resilient.tech>	2020-09-19 19:33:21 +05:30
Deepesh Garg	6bcfffda1d	Merge branch 'develop' into barredterra-patch-1	2020-09-19 18:33:14 +05:30
Deepesh Garg	c646a56d68	fix: Update modified timestamp	2020-09-19 18:28:20 +05:30
Deepesh Garg	e3ee63f677	Merge pull request #23346 from AfshanKhan/stock-entry-warehouse-address-filter fix: warehouse address filtered based on warehouse	2020-09-19 18:17:08 +05:30
Deepesh Garg	095161ff60	Merge pull request #23328 from rohitwaghchaure/fixed-set-taxes-missing-error fix: set_taxes() missing 1 required positional argument: 'company'	2020-09-19 18:07:08 +05:30
Deepesh Garg	0aff6d83af	Update erpnext/public/js/utils/party.js Co-authored-by: Sagar Vora <sagar@resilient.tech>	2020-09-19 18:05:58 +05:30
marination	b782d2a99d	fix: Added back accidentally deleted field	2020-09-19 01:04:28 +05:30
marination	90d9d80ef9	fix: More MR UX fixes	2020-09-19 00:43:53 +05:30
Mangesh-Khairnar	a3ac4bf681	fix: create payment request via pos	2020-09-18 19:47:33 +05:30
Saqib	7126e179c3	fix: button click event not working in POS custom fields (#23358 )	2020-09-22 16:35:11 +05:30
Abhishek Balam	4e6733293f	fix(DocTypes): Reset "owner" values in DocTypes to Administrator (#23350 ) * fix: reset owner values in doctype to Administrator * fix: updated modified value * fix: also fixed modified by * fix: change modified_by to Administrator	2020-09-18 18:27:24 +05:30
Anupam	bf166736b0	fix: Batch-Wise Balance History filter validation	2020-09-18 17:15:49 +05:30
Abhishek Balam	123eaea1a6	fix: added new doctypes in get_level	2020-09-18 16:35:59 +05:30
Michelle Alva	cc6ca97dc5	fix: Item-wise Sales History Report Error (#23349 ) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-09-18 15:50:29 +05:30
Saqib	c29ee691d4	fix: button click event not working in POS custom fields (#23358 )	2020-09-18 15:27:17 +05:30
Marica	2cfaf71d59	Merge branch 'develop' into supplier-quotn-comparison	2020-09-18 15:22:59 +05:30
Anurag Mishra	170ecdc76e	fix: No handlefor Cost centers in Accounts Receivable	2020-09-18 13:26:46 +05:30
SDLyu	68672af8ab	Fix missing tax autoload when frm.doc.taxes is []	2020-09-18 13:58:23 +08:00
Deepesh Garg	6f3d93e5a0	fix: Taxes not getting fetched from Opportunity to Quotation	2020-09-18 11:23:35 +05:30
Afshan	d5710b4d6f	style: removed extra spaces	2020-09-17 13:01:47 +05:30
Afshan	e813684433	fix: warehouse address filtered based on warehouse	2020-09-17 12:57:26 +05:30
Deepesh Garg	2aea184f6f	Merge pull request #23309 from anupamvs/sales-analytics feat: added project in Sales Analytics report	2020-09-17 12:37:14 +05:30
Rucha Mahabal	c78ca36ee5	fix(Non Profit): Hide Address and Contact section for unsaved docs	2020-09-16 23:47:33 +05:30
Anupam Kumar	11649efc41	Merge branch 'develop' into sales-analytics	2020-09-16 21:45:57 +05:30
Deepesh Garg	5c04b2eea4	Merge pull request #23235 from Anurag810/custom_remark feat: added option to add custom remarks in payment entry	2020-09-16 13:38:04 +05:30
Deepesh Garg	15f698251b	Merge pull request #23079 from marination/item-tax-update-items fix: Item Tax Updating via `Update Items` in SO/PO	2020-09-15 20:47:20 +05:30
Deepesh Garg	db52cfe05a	Merge pull request #22849 from alyf-de/datev_refactor refactor: move datev-specific stuff to utils	2020-09-15 19:50:00 +05:30
Rucha Mahabal	8193582645	fix: codacy issue	2020-09-15 18:53:38 +05:30
Marica	9ce5c77a21	Merge branch 'develop' into supplier-quotn-comparison	2020-09-15 18:50:34 +05:30
Rucha Mahabal	253936c8df	fix: create Course Enrollment only for courses added in Program Enrollment	2020-09-15 18:16:42 +05:30
Rucha Mahabal	42d7acf522	fix: academic term and year date validations	2020-09-15 17:52:47 +05:30
Marica	f63b6719e3	Merge branch 'develop' into item-tax-update-items	2020-09-15 17:45:05 +05:30
marination	f995f517c9	fix: Test	2020-09-15 17:06:27 +05:30
Rucha Mahabal	f5eb45bf23	fix: validate academic term while checking for enrollment duplication	2020-09-15 17:01:00 +05:30
Rucha Mahabal	68a07eda72	fix: program enrollment date not considered during course enrollment	2020-09-15 16:55:35 +05:30
Deepesh Garg	2f50cb3e58	fix: Supplier trigger onload	2020-09-15 15:00:32 +05:30
Rohit Waghchaure	4f3b7da9ba	fix: set_taxes() missing 1 required positional argument: 'company'	2020-09-15 14:47:36 +05:30
Mangesh-Khairnar	27f81e06ea	fix: create custom pos fields	2020-09-15 14:38:06 +05:30
Anupam Kumar	699e853009	Merge branch 'develop' into sales-analytics	2020-09-15 13:24:02 +05:30
Anurag Mishra	9397b7f58b	fix: requested changes	2020-09-15 12:36:01 +05:30
Anupam	bae2d5d485	fix: review changes	2020-09-15 12:12:31 +05:30
marination	665c27af58	fix: Merge conflict missing line	2020-09-15 12:04:38 +05:30
Marica	baedc627ee	Merge branch 'develop' into item-tax-update-items	2020-09-15 11:30:22 +05:30
marination	4bb8d0c193	chore: Test for PO	2020-09-15 11:18:02 +05:30
Saqib	61314248bb	feat: uom in update items for SO & PO (#22869 ) * feat: uom in update items for SO & PO * fix: supplied items doesn't updates on uom change * chore: add uom and conv factor change test * fix: test * fix: purchase order updates are not tracked * fix: fetch conversion factor on uom change * fix: codacy Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-09-15 11:14:31 +05:30
Marica	65c2c4f85f	Merge branch 'develop' into item-tax-update-items	2020-09-15 09:49:06 +05:30
Deepesh Garg	36bc0577a2	fix: Item GL entries for purchase invoice (#23027 )	2020-09-15 09:44:46 +05:30
marination	b7cd84196d	fix: Revert tax calculation changes	2020-09-15 09:42:51 +05:30
Anupam Kumar	8cb356bf30	Merge branch 'develop' into sales-analytics	2020-09-14 11:21:58 -07:00
Rucha Mahabal	fcb6ba6ec7	fix: get_transaction_entries function arguments in Bank Statement Transaction Entry (#23051 )	2020-09-14 21:12:36 +05:30
Marica	a544e10778	Merge branch 'develop' into supplier-quotn-comparison	2020-09-14 20:17:59 +05:30
Saqib	6db92fbb6a	feat: validate workflow before so/po update items (#23024 ) * feat: validate workflow before so/po update items * fix: incorrect workflow validation on so/po update items Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-09-14 19:54:17 +05:30
Deepesh Garg	93d7c2f1da	Merge pull request #23283 from ruchamahabal/fix-student-email-id fix: Set student email id mandatory only if skip user creation is disabled	2020-09-14 19:34:10 +05:30
Mangesh-Khairnar	757fa5d010	fix(shopping-cart-settings): filter payment gateway accounts	2020-09-14 17:44:51 +05:30
marination	59239172a1	feat: Supplier Quotation Comparison - v3	2020-09-14 17:34:21 +05:30
Mangesh-Khairnar	40d3add63c	feat(payment-gateway-account): add additional payment channel	2020-09-14 15:14:36 +05:30
Rucha Mahabal	026cf2d3cc	Merge branch 'develop' into refactor-lab-module	2020-09-14 14:45:19 +05:30
Marica	c4a8c9eb26	Merge branch 'develop' into pr-dn-get-items	2020-09-14 11:09:32 +05:30
marination	9205101ecf	fix: Make Reference fields mandatory in Quality Inspection	2020-09-12 16:17:13 +05:30
marination	0a688005be	fix: Make sure Supplier/Customer is selected before fetching Items.	2020-09-12 15:39:27 +05:30
barredterra	16f1435d63	fix: codacy	2020-09-11 18:57:58 +02:00
barredterra	41978ac882	Merge branch 'develop' into datev_refactor	2020-09-11 17:54:50 +02:00
barredterra	8e41fdfee4	Merge branch 'develop' into website_theme_scss	2020-09-11 16:05:49 +02:00
barredterra	60bfbbc5af	fix: use path istead of hook	2020-09-11 16:05:10 +02:00
marination	02c550c07d	fix: Redundant imports	2020-09-11 16:22:54 +05:30
Marica	1807437fe0	Merge branch 'develop' into youtube-analytics	2020-09-11 16:18:23 +05:30
marination	9533318832	chore: Tests for Rename and Add child Account	2020-09-11 16:09:27 +05:30
Anupam K	ed08e593c3	feat: added project in Sales Analytics report	2020-09-11 14:03:31 +05:30
Saqib	cd89994b33	fix: multiple pos issues (#23297 ) * fix: returns can be made against unconsolidated invoices * fix: indentation * fix: mode of payment not fetching for pos returns * patch: default pos profile print format * fix: tests * chore: clean up retail desk page	2020-09-10 19:28:46 +05:30
marination	37b99d202d	fix: Separate function to get bulk and single youtube stats	2020-09-10 18:27:20 +05:30
Rucha Mahabal	a29436dc91	fix: codacy	2020-09-10 17:45:17 +05:30
Rucha Mahabal	c0f9d1b65a	test: Lab Module	2020-09-10 17:33:52 +05:30
Mangesh-Khairnar	2dabd2182f	feat: add mpesa integration	2020-09-10 17:05:43 +05:30
marination	799d663398	fix: Make set_youtube_statistics reusable and job logic fix - Make sure job runs only once every hour - set_youtube_statistics should be usable in and outside class	2020-09-10 16:42:20 +05:30
Gavin D'souza	71ac399369	fix: Commonified function and updated scheduler events Co-authored-by: marination <maricadsouza221197@gmail.com>	2020-09-10 13:58:48 +05:30
Gavin D'souza	0a0e258d8b	feat: Add Desk Page for Utilities for Video group	2020-09-10 13:12:35 +05:30
Rucha Mahabal	42bff3289d	Merge branch 'develop' into refactor-lab-module	2020-09-10 12:36:29 +05:30
Rucha Mahabal	2388199347	Merge branch 'develop' into fix-student-email-id	2020-09-10 12:16:16 +05:30
Rucha Mahabal	1915a60834	fix: education settings check	2020-09-10 12:13:58 +05:30
Marica	6520655d59	Merge branch 'develop' into youtube-analytics	2020-09-10 10:16:02 +05:30
marination	53cd60c217	fix: Patch reload doctype	2020-09-09 20:57:10 +05:30
Saqib	ec6a97fb6a	fix: cannot delete pos page if linked with desk page (#22993 ) * fix: cannot delete pos page if linked with desk page * fix: replace pos page links with point-of-sale page Co-authored-by: gavin <gavin18d@gmail.com>	2020-09-09 10:54:14 +05:30
Deepesh Garg	dc84633860	Merge pull request #23301 from deepeshgarg007/closed_loan_amount fix: Amount for closed loans	2020-09-08 21:32:54 +05:30
Deepesh Garg	846e6d4803	fix: Add test	2020-09-08 21:32:06 +05:30
Deepesh Garg	f247686ace	fix: Amount for closed states	2020-09-08 21:26:06 +05:30
Saqib	8f43cf2c9a	fix: asset movement date for backdated asset entry (#23298 )	2020-09-08 17:44:47 +05:30
rohitwaghchaure	93dccd2eaa	Merge pull request #23132 from anupamvs/item-group-filter-portal fix: [Portal] added filter show in website	2020-09-08 17:03:54 +05:30
rohitwaghchaure	1d555f35a7	Merge pull request #23282 from deepeshgarg007/tds_bug fix: Apply TDS on Purchase Invoice creation from Purchase Order and Purchase Receipt	2020-09-08 16:59:29 +05:30
Anupam Kumar	09e2cb5f87	Merge branch 'develop' into item-group-filter-portal	2020-09-08 14:54:31 +05:30
Deepesh Garg	f7731b0715	fix: TDS applicable on creating PI from get items button	2020-09-08 13:41:04 +05:30
Afshan	12ab8ebc95	fix: removed ignore permission flag	2020-09-08 12:55:42 +05:30
Marica	c8eca9d5f3	Merge branch 'develop' into handle-irs	2020-09-08 12:03:45 +05:30
Rucha Mahabal	f7619df8b2	fix: Lock row in subquery while setting delivered qty (#23100 )	2020-09-08 11:57:45 +05:30
Afshan	9691422fb7	feat: added report for mismatch in serial nos and stock quantity in warehouse (#22669 ) * feat: added report for mismatch in serial nos and stock quantity in warehouse * style: removed print statement * fix: rename of reports and refactor of code * fix: handled null condition for actual qty and added report link in stock desk page * style: breaking code in multiple lines	2020-09-08 11:57:15 +05:30
rohitwaghchaure	31fd90136d	Merge pull request #23243 from Anurag810/overlap_for_additional_salary feat: Overlap validation additional salary	2020-09-08 10:18:41 +05:30
rohitwaghchaure	7d7fa79efa	Update additional_salary.py	2020-09-08 10:18:18 +05:30
rohitwaghchaure	900d0e3ae2	Merge pull request #23245 from Anurag810/attendance_calendar_map fix: Attendance calendar map fix	2020-09-08 10:14:37 +05:30
rohitwaghchaure	842cb6d1d6	Update shift_assignment.py	2020-09-08 10:14:04 +05:30
Anupam Kumar	7131024bf9	Merge branch 'develop' into item-group-filter-portal	2020-09-08 10:04:51 +05:30
rohitwaghchaure	0cb805308f	Merge pull request #23256 from Mangesh-Khairnar/fix-adv-payment-payment-order fix: capture advance payments in payment order	2020-09-08 09:59:47 +05:30
barry86m	5b381ac5b7	fix: consolidated financial statement sums values into wrong parent fix proposed by Andriesvn in bug report closes #22180	2020-09-08 00:27:57 +01:00
Deepesh Garg	b828e2fcf4	Merge pull request #23287 from deepeshgarg007/lsu_api_fix fix: Only submitted Loan security pledges should be approved	2020-09-07 23:23:55 +05:30
Deepesh Garg	03b0ad4f98	fix: Only submitted Loan security pledges should be approved	2020-09-07 23:22:21 +05:30
Anupam Kumar	22bd03e63c	Merge branch 'develop' into item-group-filter-portal	2020-09-07 20:20:42 +05:30
Rucha Mahabal	4673bed67e	fix: codacy issues	2020-09-07 20:12:29 +05:30
Rucha Mahabal	06f89a1b94	fix: Set student email id mandatory only if skip user creation is disabled	2020-09-07 19:46:53 +05:30
marination	f18dd05c00	fix: Missing import and typo	2020-09-07 18:59:57 +05:30
Marica	54ab426c1c	Merge branch 'develop' into youtube-analytics	2020-09-07 18:54:11 +05:30
marination	06ee0ea00b	feat: Added Scheduler Job to auto update statistics - Added frequency in Video Settings - Cron job to check half hourly job - Hourly job to run job based on frequency - Patch to set youtube id in video for ease in computing	2020-09-07 18:49:06 +05:30
Deepesh Garg	74ab1084b3	fix: Apply TDS on Purchase Invoice creation from Purchase Order and Purchase Receipt	2020-09-07 17:55:10 +05:30
Deepesh Garg	af1c4ba443	Merge pull request #23279 from deepeshgarg007/loan_closure_interest fix: Pending loan interest accrual on loan closure	2020-09-07 15:01:33 +05:30
Deepesh Garg	afefa878b0	fix: Pending loan interest accrual on loan closure	2020-09-07 14:57:44 +05:30
Deepesh Garg	da6074a84c	fix: Pending loan interest accrual on loan closure	2020-09-07 14:55:04 +05:30
marination	9ce38de439	chore: Key Validation and restructure - Added API Key validation in Video Settings - Moved Statistics section above description in Video - Moved id retrieving from URL to py side - Removed js side calls, added section toggling in js - Restructured Code	2020-09-07 13:27:17 +05:30
Mangesh-Khairnar	06130ee56b	fix: leave ledger patch (#23182 )	2020-09-07 11:53:50 +05:30
Anupam Kumar	209f7c76c9	feat: added transaction_type in leave ledger enter (#23258 )	2020-09-07 11:50:24 +05:30
barry86m	fa98e81f0b	fix: sql error on saving sales invoice without a sales order	2020-09-07 01:36:15 +01:00
Anupam Kumar	ffd30beeca	Merge branch 'develop' into item-group-filter-portal	2020-09-06 21:48:16 +05:30
rohitwaghchaure	937b63433d	Merge pull request #23270 from kasgel/patch-1 fix(utils): pass stock_qty to get_pricing_rule_for_item	2020-09-06 20:46:15 +05:30
Deepesh Garg	5158d0fbba	fix: Repayment Method not visible correctly	2020-09-05 21:16:57 +05:30
kasgel	a59f8640d1	fix: pass stock_qty to get_pricing_rule_for_item get_pricing_rule_for_item uses the "stock_qty" and "qty" arguments to filter pricing rules. Not passing stock_qty prevents for example the shopping cart from filtering pricing rules appropriately based on Quantity.	2020-09-05 12:15:49 +02:00
Deepesh Garg	1b4ed454d2	fix: Add reference no and descripiton field in Loan Security Pledge and Unpledge	2020-09-04 22:42:41 +05:30
Deepesh Garg	e4c38e5fe5	fix: Remove print statement	2020-09-04 22:30:13 +05:30
Deepesh Garg	4d636fde3a	fix: API changes in loan security unpledge utility	2020-09-04 22:23:30 +05:30
Mangesh-Khairnar	7456ffca0f	fix: teardown created payment order	2020-09-04 19:59:01 +05:30
Mangesh-Khairnar	a76bf4d7af	fix: remove unused imports	2020-09-04 19:08:08 +05:30
Mangesh-Khairnar	d9e4883392	test: check payment order creation against payment entry	2020-09-04 18:55:14 +05:30
rohitwaghchaure	515d8b9e50	Merge pull request #23259 from anupamvs/se-quntity fix: SE quantity data type issue	2020-09-04 16:07:13 +05:30
rohitwaghchaure	c9a5afaa1c	Merge pull request #23263 from Semiranis/uom_after_qty feat: Option to print UOM after quantity	2020-09-04 16:06:46 +05:30
Shivam Mishra	4a238a2093	feat: don't allow guests	2020-09-04 15:18:16 +05:30
Anupam K	faebef21b7	fix: SE quantity data type issue	2020-09-04 15:09:16 +05:30
Mangesh-Khairnar	e1889d0c1b	fix(payment entry): update payment order status	2020-09-04 14:45:19 +05:30
Mangesh-Khairnar	8d8af94182	fix: capture advance payments in payment order	2020-09-04 12:17:56 +05:30
Frappe ERPnext	2e8e06c350	Merge branch 'develop' of https://github.com/frappe/erpnext into uom_after_qty	2020-09-03 18:08:02 +02:00
Frappe ERPnext	9355641c49	refactor: logic moved to standard template Previously print_settings.py controller decided which template to use. Now standard template decides what to print according to settings.	2020-09-03 17:31:21 +02:00
Frappe ERPnext	a5d5e70bf4	Revert "feat: Option to print UOM after quantity" This reverts commit `a787882a8f`.	2020-09-03 17:30:25 +02:00
Marica	8d6b2d016f	Merge branch 'develop' into leaderboard-supplier	2020-09-03 20:08:37 +05:30
marination	2a56000460	fix: Supplier Leaderboard fix	2020-09-03 19:45:04 +05:30
Deepesh Garg	b306fa355d	Merge pull request #23248 from deepeshgarg007/pda_account_filter fix: Account filter in Process Deferred Accounting doctype	2020-09-03 19:22:56 +05:30
Deepesh Garg	9b681770d0	fix: Account filter in Process Deferred Accounting doctype	2020-09-03 18:09:02 +05:30
Anurag Mishra	e5b7cb0c15	fix: data was not properly maped	2020-09-03 16:59:21 +05:30
gavin	f20b6360de	Merge branch 'develop' into overlap_for_additional_salary	2020-09-03 15:27:58 +05:30
Anurag Mishra	7952f89596	feat: Overlap validation additional salary	2020-09-03 15:21:35 +05:30
Rohit Waghchaure	68b0108301	fix: incorrect qty after transaction in stock ledger entry	2020-09-03 15:10:07 +05:30
rohitwaghchaure	d00bc3f422	Merge branch 'develop' into item-group-filter-portal	2020-09-03 15:04:04 +05:30
rohitwaghchaure	4b59043266	Merge pull request #23241 from Anurag810/hiding_regional_reports feat: removed roles for some regional report and added via setup	2020-09-03 15:01:07 +05:30
rohitwaghchaure	6ffe809c66	Merge pull request #23233 from ruchamahabal/fix-rfq-conv-factor fix: set conversion factor while creating RFQ from Opportunity	2020-09-03 14:45:01 +05:30
Anurag Mishra	54cd194b41	feat: removed roles for some reginal report and added via setup	2020-09-03 13:52:40 +05:30
Rucha Mahabal	979ad180fa	fix: update rfq item in postprocess	2020-09-03 11:03:22 +05:30
michellealva	0857e6d669	fix: Add "Bank Clearance" and "Bank Reconciliation" in desk	2020-09-03 10:37:43 +05:30
Frappe ERPnext	f28bef868d	feat: Checkbox for activation of printing UOM after quantity Checkbox will be added to Frappe after installation of ERPNext. (Print Settings docType is part of frappe app, not erpnext app)	2020-09-02 21:42:52 +02:00
Frappe ERPnext	be3b8a1c96	Merge branch 'develop' of https://github.com/frappe/erpnext into uom_after_qty	2020-09-02 21:31:31 +02:00
Anupam Kumar	c3984691b3	fix: Sales funnel data is inconsistent (#23110 ) * fix: Sales funnel data is inconsistent * fix: data inconsistency * fix: Converted Count Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-09-02 20:01:14 +05:30
Anurag Mishra	41f421d400	feat: added option to add custom remarks in payment entry	2020-09-02 13:47:18 +05:30
Rucha Mahabal	a1b5d57076	test: make rfq from opportunity	2020-09-02 13:14:01 +05:30
rohitwaghchaure	3312956890	Merge pull request #23019 from prssanna/gross-profit-total feat: enable total row in Gross Profit Report	2020-09-02 12:18:41 +05:30
rohitwaghchaure	1ab6c3fe94	Merge pull request #23059 from marination/credit-limit-email fix: Credit Limit Email not working	2020-09-02 12:14:51 +05:30
Rucha Mahabal	d2881ba4dd	fix: set conversion factor while creating RFQ from Opportunity	2020-09-02 11:52:59 +05:30
rohitwaghchaure	efd1ac5840	Merge pull request #23050 from anupamvs/stock-entry-type fix: deleting unused Stock Entry Type	2020-09-02 11:43:29 +05:30
rohitwaghchaure	f898c807b8	Merge pull request #23227 from rohitwaghchaure/multiple-job-card-fixes Fix: job card issues	2020-09-02 11:41:37 +05:30
Rohit Waghchaure	86a190652e	fix: incorrect job card timer issue	2020-09-02 11:04:56 +05:30
rohitwaghchaure	6a51f3929b	Merge pull request #23054 from marination/general-ledger-filters fix: General Ledger filter validation	2020-09-01 17:53:32 +05:30
Deepesh Garg	36b7bb0282	Merge pull request #23229 from deepeshgarg007/gst_template_update fix: Update tax template on supplier address change	2020-09-01 16:27:44 +05:30
Marica	329292b9c3	Merge branch 'develop' into credit-limit-email	2020-09-01 16:18:12 +05:30
Deepesh Garg	cebf803455	fix: Update tax template on supplier address change	2020-09-01 16:15:28 +05:30
rohitwaghchaure	a3dd156a8a	Merge pull request #22796 from anupamvs/variance-report-fix fix: Target variance report signs	2020-09-01 15:12:21 +05:30
rohitwaghchaure	9bbb9dad8b	Merge pull request #23217 from anupamvs/product-contact-us-v13 fix: contact us button issue	2020-09-01 15:10:37 +05:30
Afshan	eb4b2aa142	fix: get_items from product bundle for purchase order (#22821 ) * fix: get_items from product bundle for purchase order * fix: Don't overwrite doctype while setting attributes in child row Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-09-01 15:01:32 +05:30
Shivam Mishra	d19947fccd	Merge pull request #23148 from scmmishra/feat-exotel-customer-link	2020-09-01 13:47:31 +05:30
Shivam Mishra	e91a5437bd	Merge pull request #23038 from scmmishra/iff-invoicing	2020-09-01 13:35:32 +05:30
Shivam Mishra	1b5de62454	Merge pull request #23121 from Mangesh-Khairnar/add-integrations-desk-page feat: add integrations desk page	2020-09-01 13:34:52 +05:30
Anupam Kumar	232cb37ebf	Merge branch 'develop' into variance-report-fix	2020-09-01 09:31:22 +05:30
Anupam Kumar	477e41197e	Merge branch 'develop' into item-group-filter-portal	2020-09-01 09:09:19 +05:30
Deepesh Garg	37cb44e109	Merge pull request #23127 from marination/quoted-item-report-v2 feat: Quoted Item Comparison Report Enhancements v2	2020-08-31 21:28:56 +05:30
Deepesh Garg	26eab47851	Merge pull request #23221 from deepeshgarg007/pending_principal fix: Pending amount after loan closure request	2020-08-31 21:25:53 +05:30
Deepesh Garg	14718e2bde	fix: Add unit test for pending principal amount	2020-08-31 21:21:05 +05:30
Afshan	1dc9a9b669	fix: reverse journal entry for multi-currency (#23165 ) * fix: reverse journal entry for multi-currency * fix: test case for reverse journal entry	2020-08-31 20:35:05 +05:30
marination	bc6c4e864d	fix: Status in Report and filter query	2020-08-31 20:32:17 +05:30
Deepesh Garg	25042a22eb	fix: Pending amount after loan closure request	2020-08-31 19:17:29 +05:30
marination	8938d1040d	fix: Rename/Update Child company Accounts as well	2020-08-31 18:18:10 +05:30
Deepesh Garg	bdc933b3d3	Merge pull request #22985 from deepeshgarg007/accounting_period_cancellation fix: Cancellation of accounting transactions within closed accounting period	2020-08-31 17:16:55 +05:30
Deepesh Garg	d79b511e3f	Merge pull request #22950 from deepeshgarg007/billing_address_fetch fix: Add default billing address for purchase documents	2020-08-31 17:16:31 +05:30
Deepesh Garg	5523142ced	Merge pull request #23078 from deepeshgarg007/hsn_wise_json feat: JSON download for HSN wise outward summary	2020-08-31 17:16:03 +05:30
Anupam Kumar	8089b00df2	Merge branch 'develop' into item-group-filter-portal	2020-08-31 16:42:47 +05:30
marination	fdcda85f87	fix: Validate Missing Accounts in Child Companies - If parent account exists in Parent and now child, throw error	2020-08-31 16:10:52 +05:30
Deepesh Garg	56ddf41873	Merge pull request #23211 from michellealva/tax-cat feat: Allow Rename for Tax Category	2020-08-31 15:56:43 +05:30
Anupam K	f9f26d2fa4	fix: contact us button issue	2020-08-31 14:34:42 +05:30
Rohit Waghchaure	d0aafece32	fix: incorrect completed qty against operation in work order if workstation is different in job card	2020-08-31 13:41:17 +05:30
Rohit Waghchaure	a5963e1b2c	fix: user created manual job card not linking job card operations with work order operations	2020-08-31 13:40:55 +05:30
Rohit Waghchaure	e7ab53a711	fix: completed qty not updated in work order	2020-08-31 13:40:01 +05:30
Shivam Mishra	d70e711aea	fix: events not deleted on cancelling maintenance schedule (#22954 ) * feat: add participant to event_participant child table * feat: add tests * chore: update function name Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-08-31 13:14:32 +05:30
Deepesh Garg	d1b88af5b6	Merge pull request #23213 from deepeshgarg007/loan_disbursement_utility feat: Utility function to get possible loan disbursal amount	2020-08-31 12:53:08 +05:30
Marica	ee56d0e0a9	Merge branch 'develop' into quoted-item-report-v2	2020-08-31 12:45:05 +05:30
Shivam Mishra	1c96befbaf	Merge branch 'develop' into feat-exotel-customer-link	2020-08-31 11:47:06 +05:30
Shivam Mishra	b4e0d300f7	Merge branch 'develop' into iff-invoicing	2020-08-31 11:46:41 +05:30
Marica	d2d350ce14	Merge branch 'develop' into credit-limit-email	2020-08-31 11:45:15 +05:30
Deepesh Garg	e8b121c2c2	fix: Add status in field list	2020-08-31 11:31:48 +05:30
Deepesh Garg	ce29757bff	fix: Import flt	2020-08-31 11:26:51 +05:30
Rucha Mahabal	5c6ed4dbcd	Merge branch 'develop' into refactor-lab-module	2020-08-31 09:50:30 +05:30
Deepesh Garg	a03ebf007c	Merge pull request #23212 from marination/customer-from-quotation fix: Better error feedback on creating SO from Quotation	2020-08-30 23:24:02 +05:30
Deepesh Garg	a4259208e7	feat: Utility function to get possible loan disbursal amount	2020-08-30 23:09:23 +05:30
marination	e268d294b3	fix: Better error feedback on creating SO from Quotation	2020-08-30 21:01:34 +05:30
michellealva	c71e37c988	feat: Allow Rename for Tax Category	2020-08-30 19:42:24 +05:30
Syed Mujeer Hashmi	b23840bf7b	fix: Filter out cancelled entries in customer ledger summary Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>	2020-08-29 23:09:18 +05:30
rohitwaghchaure	2badd93d8f	Merge pull request #23193 from bhavesh95863/patch-10 fix: can't multiply sequence by non-int of type 'float	2020-08-28 20:01:05 +05:30
rohitwaghchaure	7c61779a94	Merge pull request #23195 from marination/purchase-over-receipt-subcontracted fix: Raise Error on over receipt/consumption for sub-contracted PR	2020-08-28 19:59:51 +05:30
Raffael Meyer	a7ea0ffcf9	Merge branch 'develop' into barredterra-patch-1	2020-08-28 15:44:21 +02:00
barredterra	a162248f32	fix: use hook for website theme scss	2020-08-28 15:16:39 +02:00
Frappe ERPnext	a787882a8f	feat: Option to print UOM after quantity Standard for ERPNext prints was UOM before quantity. Now user has a choice.	2020-08-28 13:28:52 +02:00
marination	731bae170e	fix: Test for Over Receipt via PRs on a PO	2020-08-28 14:09:02 +05:30
Afshan	d659774190	fix:tests	2020-08-28 13:40:48 +05:30
Afshan	7586c3408e	fix: test case	2020-08-28 12:56:37 +05:30
Deepesh Garg	ecc282930a	Merge branch 'develop' into navbar_links	2020-08-28 12:48:46 +05:30
marination	e9274283bd	fix: Raise Error on over receipt/consumption for sub-contrcated PR	2020-08-28 12:21:10 +05:30
Deepesh Garg	6887382937	fix: Ignore cpmpany and bank account doctype while deleting company transactions (#22953 )	2020-08-28 11:52:00 +05:30
bhavesh95863	3e9f493f15	fix: change parseFloat to flt	2020-08-28 11:15:02 +05:30
Rucha Mahabal	bae2a77d08	Merge branch 'develop' into barredterra-patch-1	2020-08-28 10:43:02 +05:30
Rucha Mahabal	8cdc3b5d91	Merge branch 'develop' into patch-9	2020-08-28 10:41:02 +05:30
rohitwaghchaure	78a32f79df	Merge pull request #23168 from ruchamahabal/fix-appointment-overlap fix: don't overwrite patient appointment duration if already specified	2020-08-28 10:39:25 +05:30
rohitwaghchaure	3018d38940	Merge pull request #23170 from anupamvs/product-contact-us-v13 feat: Added phone field in product Inquiry	2020-08-28 10:38:44 +05:30
rohitwaghchaure	c31ae27227	Merge pull request #23176 from marination/pricing-rule-missing-fix fix: Pricing Rule encoding missing line	2020-08-28 10:37:38 +05:30
rohitwaghchaure	939b95ad3c	Merge pull request #23190 from ruchamahabal/fix-bom-update fix: BOM Update Tool failing due to Too Many Writes error	2020-08-28 10:35:59 +05:30
bhavesh95863	33f984c7af	fix: can't multiply sequence by non-int of type 'float	2020-08-27 21:49:21 +05:30
Rucha Mahabal	c8eea556d1	fix: BOM Update Tool failing due to Too Many Writes error	2020-08-27 18:54:25 +05:30
michellealva	ead2f6abf0	fix: Chage fiedtype of Customer's PO in Sales Invoice	2020-08-27 13:57:15 +05:30
Rucha Mahabal	1bd83e69ee	feat: added Installation Note and Warranty Claim links to Customer dashboard (#23183 )	2020-08-27 13:06:52 +05:30
Marica	e7fabb10e1	Merge branch 'develop' into general-ledger-filters	2020-08-27 11:59:01 +05:30
Afshan	b719620d0c	fix: handleling condition if default company doesn't exist	2020-08-26 20:55:16 +05:30
Afshan	7600960d2b	fix: returned empty list if non US based company	2020-08-26 18:40:11 +05:30
bhavesh95863	bb5d886930	fix: account & cost center filter by company	2020-08-26 18:23:21 +05:30
marination	733fd5f03c	fix: get_applied_pricing_rule in taxes_and_totals	2020-08-26 18:23:12 +05:30
Marica	d741ac6871	Merge branch 'develop' into quoted-item-report-v2	2020-08-26 17:33:13 +05:30
Rucha Mahabal	cf2db41876	Merge branch 'develop' into fix-appointment-overlap	2020-08-26 16:33:27 +05:30
Anupam K	c7830f7107	feat: Added phone field in product Inquiry	2020-08-26 15:28:22 +05:30
Rucha Mahabal	9766adbf4e	fix: don't overwrite appointment duration if already specified	2020-08-26 14:53:23 +05:30
Rushabh Mehta	73f648473f	fix(minor): update_start_end_date_for_old_shift_assignment.py	2020-08-26 14:51:37 +05:30
Rushabh Mehta	a163d8bc84	fix(minor): rename_lost_reason_detail	2020-08-26 14:51:37 +05:30
Rushabh Mehta	544d18327c	fix(patch): quotation_lost_reason_detail	2020-08-26 14:51:37 +05:30
Rushabh Mehta	38fad58834	fix(patch)	2020-08-26 14:51:37 +05:30
rohitwaghchaure	fe0ecc2ff7	Merge pull request #23144 from anupamvs/product-image fix: Homepage Featured Product image fetch issue	2020-08-26 13:05:50 +05:30
rohitwaghchaure	5f4b5f3f46	Merge pull request #23151 from ruchamahabal/fix-conversion-factor fix: conversion factor for BOM exploded item rate	2020-08-26 13:01:13 +05:30
bhavesh95863	d888a59bd1	fix: set company filter in condition	2020-08-26 12:44:20 +05:30
Abhishek Balam	dc9af639a7	fix: move condition field	2020-08-26 12:26:15 +05:30
Abhishek Balam	7d0bb25aca	fix: dont show message on condition syntax error	2020-08-26 12:22:31 +05:30
Deepesh Garg	f4b939754c	fix: Codacy fixes	2020-08-26 12:10:12 +05:30
Deepesh Garg	29f187f4f3	Merge branch 'develop' into hsn_wise_json	2020-08-26 12:05:59 +05:30
Shivam Mishra	e1e5e3c915	Merge branch 'develop' into iff-invoicing	2020-08-26 11:30:01 +05:30
Michelle Alva	7a927cefbd	fix: Social Media Status hidden in Mobie View (#23158 )	2020-08-26 10:32:26 +05:30
Deepesh Garg	b4a992e6a3	Merge pull request #23156 from ruchamahabal/add-maintenance-visit-link feat: add Maintenance Visit link in Customer and Sales Order dashboards	2020-08-25 21:04:00 +05:30
Anupam Kumar	91461a0016	fix: heading is hidden in the mobile view (#23145 )	2020-08-25 21:01:17 +05:30
Michelle Alva	258b256dc6	fix: Add Delivery Note link in Sales Invoice Dashboard (#23161 )	2020-08-25 20:37:39 +05:30
Rucha Mahabal	12f7aeb147	feat: add Maintenance Visit link in Sales Order dashboard	2020-08-25 19:03:35 +05:30
Rucha Mahabal	5bf0a51ed4	feat: add Maintenance Visit link in Customer dashboard	2020-08-25 18:22:06 +05:30
Rucha Mahabal	d43d1408cf	fix: conversion factor for BOM exploded item rate	2020-08-25 17:13:05 +05:30
Shivam Mishra	de4ac0c905	chore: remove stray tabs	2020-08-25 17:10:05 +05:30
Shivam Mishra	2030b66fc6	feat: add customer link to call log	2020-08-25 17:09:53 +05:30
Anupam K	42092cc377	fix: Homepage Featured Product image fetch issue	2020-08-25 15:29:18 +05:30
Rushabh Mehta	ee921052c0	fix(minor): test dependencies	2020-08-25 14:35:49 +05:30
Rushabh Mehta	b5b8f9e72d	fix(minor): import	2020-08-25 14:14:23 +05:30
Rushabh Mehta	8ad0fa48bf	fix(minor): circular imports?	2020-08-25 12:24:31 +05:30
Rushabh Mehta	ff5d19609f	fix(hot): Pricing Rule encoding fixed	2020-08-25 11:59:57 +05:30
Anupam K	28f4417fc5	fix: added filter show in website for filtering product	2020-08-25 08:59:37 +05:30
Deepesh Garg	07ee7a5bd6	Merge branch 'develop' into dims_in_gl_report	2020-08-24 20:23:19 +05:30
Marica	3e966d6889	Merge branch 'develop' into crm-reports	2020-08-24 19:42:18 +05:30
Shivam Mishra	7556517a4f	feat: validate if removed item attributes exist in variants (#22911 ) * feat: validate if removed item attributes exist in variants * Update erpnext/stock/doctype/item/item.py Co-authored-by: Marica <maricadsouza221197@gmail.com> * Update erpnext/stock/doctype/item/item.py Co-authored-by: Marica <maricadsouza221197@gmail.com> * refactor: smaller loop Co-authored-by: marination <maricadsouza221197@gmail.com> * feat: don't run validation for new entries Co-authored-by: Marica <maricadsouza221197@gmail.com> * fix: use tuple as is Co-authored-by: Marica <maricadsouza221197@gmail.com> * refactor: error description Co-authored-by: Marica <maricadsouza221197@gmail.com> * refactor: remove unused variable Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-08-24 19:37:09 +05:30
marination	8f452b8663	fix: Codacy and indicator message	2020-08-24 18:57:07 +05:30
marination	f49665077c	feat: Quoted Item Comparison Report Enhancements v2	2020-08-24 18:26:48 +05:30
Anupam K	64e84643fb	lost opportunity	2020-08-24 18:01:28 +05:30
rohitwaghchaure	cf4268e21a	Merge pull request #23116 from nabinhait/subcontracted-pr-gle fix: GLE for subcontracted PR is fg item rate is zero	2020-08-24 16:07:32 +05:30
Shivam Mishra	5d6b07558d	Merge branch 'develop' into iff-invoicing	2020-08-24 07:56:01 +00:00
rohitwaghchaure	554e2c2eb7	Merge pull request #23120 from deepeshgarg007/sle_cancel fix: Reverse SLE not created for fraction qty or qty less than 1	2020-08-24 13:25:12 +05:30
rohitwaghchaure	7d8d26bbea	Merge pull request #23106 from ruchamahabal/add-pos-page fix: POS page link not visible on Desk	2020-08-24 12:22:18 +05:30
Mangesh-Khairnar	e292fd6c58	feat: add integrations desk page	2020-08-24 00:45:13 +05:30
Deepesh Garg	8331a38ace	fix: Test Case for qty less than 1	2020-08-23 21:23:26 +05:30
Deepesh Garg	cb0bc2dcaf	fix: Negative SLE not created for fraction qty or qty less than 1	2020-08-23 20:43:50 +05:30
Nabin Hait	337ee0a4bf	test: Test case for GLE in subcontracted PR if FG item rate is zero	2020-08-22 20:02:27 +05:30
Nabin Hait	df175cc8fc	fix: GLE for subcontracted PR is fg item rate is zero	2020-08-22 19:17:18 +05:30
Nabin Hait	111183d080	fix: Installation failed due to global variable (#23114 )	2020-08-22 12:31:06 +05:30
Deepesh Garg	1b760cb278	Merge branch 'develop' of https://github.com/frappe/erpnext into navbar_links	2020-08-21 12:36:21 +05:30
Saurabh	66ff5e5e77	Merge pull request #22990 from saurabh6790/erpnext-before-install-flag-1 fix: check setup complete flag instead setup page	2020-08-21 11:55:38 +05:30
Nabin Hait	1ba62c9732	fix:Validate Job offer against vacancies (#23109 )	2020-08-20 19:39:10 +05:30
Deepesh Garg	cf3e482052	Merge pull request #23105 from deepeshgarg007/rcm_submit_v13 fix: Unable to submit reverse charge invoice	2020-08-20 19:35:25 +05:30
Marica	c23797e350	fix: Create Opportunity without Default Company from Email (#23097 ) * fix: Create Opoortunity without Default Company from Email * fix: Add Prompt to Select Company * Update communication.js Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-08-20 19:12:12 +05:30
Rucha Mahabal	4061186429	fix: POS page link not visible on Desk	2020-08-20 18:01:20 +05:30
Deepesh Garg	afd2dd3570	fix: Unable to submit reverse charge invoice	2020-08-20 16:52:52 +05:30
rohitwaghchaure	019d4debb2	fix: incorrect stock value in return case (#23102 )	2020-08-20 15:53:58 +05:30
Raffael Meyer	f0b9f660cd	Merge branch 'develop' into datev_refactor	2020-08-20 12:05:50 +02:00
Shivam Mishra	25ba271562	Merge branch 'develop' into fix-margin-for-filter	2020-08-20 08:59:04 +00:00
Shivam Mishra	d5971d3c59	Merge branch 'develop' into iff-invoicing	2020-08-20 08:16:22 +00:00
rohitwaghchaure	5f2463933a	Merge pull request #23061 from DeeMysterio/dev-sort-warehouses-qty feat(queries): sort warehouses based on item quantity in descending manner	2020-08-20 09:36:16 +05:30
Raffael Meyer	585f1f67b7	Merge branch 'develop' into navbar_links	2020-08-19 18:55:44 +02:00
Raffael Meyer	2c26144a6b	Update erpnext/patches/v13_0/add_standard_navbar_items.py	2020-08-19 18:55:06 +02:00
Deepesh Garg	cbedb3de3a	Merge pull request #23089 from deepeshgarg007/rcm_deduction_v13 fix: Do not update total for RCM invoices if net taxes are zero	2020-08-19 20:19:06 +05:30
Deepesh Garg	8aed48fe31	fix: Do not update total for RCM invvoices if net taxes are zero	2020-08-19 18:59:27 +05:30
Rucha Mahabal	eed2a6340c	Merge branch 'develop' into fix-pos-print	2020-08-19 18:57:47 +05:30
marination	22d3729427	fix: Codacy	2020-08-19 15:42:40 +05:30
Deepesh Garg	aaeb3980bc	feat: JSON download for HSN wise outward summary	2020-08-19 15:13:30 +05:30
marination	698d983eef	fix: Item Tax Updation via Update Items in SO/PO	2020-08-19 14:59:46 +05:30
Diksha Jadhav	182ee5e7c1	feat(queries): sort warehouses based on item quantity	2020-08-19 14:04:34 +05:30
Deepesh Garg	1fb1c08872	Merge pull request #23076 from deepeshgarg007/hsn_wise_outward_v13 fix: Tax amounts in HSN Wise Outward summary	2020-08-19 11:43:14 +05:30
Deepesh Garg	b240cfe401	fix: Remove print statements	2020-08-19 11:41:43 +05:30
Deepesh Garg	64ebbf0907	fix: Tax amounts in HSN Wise Outward summary	2020-08-19 11:41:33 +05:30
Rucha Mahabal	434bab8003	fix: Print Language for Customer not set for Print Receipt in POS	2020-08-19 01:00:59 +05:30
Deepesh Garg	1c14606c06	fix: Total calculations for multicurrency RCM invoices (#23072 )	2020-08-18 19:32:52 +05:30
Deepesh Garg	9d60e48538	Merge pull request #23067 from rohitwaghchaure/profit-and-loss-report-not-working fix: profit and loss report not working	2020-08-18 17:03:10 +05:30
Rohit Waghchaure	310ade7282	profit and loss report not working	2020-08-18 16:07:24 +05:30
Marica	847343af86	Merge branch 'develop' into general-ledger-filters	2020-08-18 13:40:45 +05:30
Marica	12c68d0450	Merge branch 'develop' into credit-limit-email	2020-08-18 13:39:03 +05:30
Marica	2d767debf1	Merge branch 'develop' into shift_management	2020-08-18 13:27:15 +05:30
Michelle Alva	849b712770	fix: Change spelling of "Successful" (#23063 ) Before: Import Successfull After: Import Successful	2020-08-18 12:06:46 +05:30
Shivam Mishra	115ad3e99a	Merge branch 'develop' into iff-invoicing	2020-08-18 05:51:41 +00:00
Rucha Mahabal	035907a24f	fix: remove Request for Quotation link from Fiscal Year dashboard (#23040 )	2020-08-18 10:57:10 +05:30
Glen Whitney	b2604d1f77	fix(General Ledger): include Accounting Dimension columns in report Prior to this commit, custom Accounting Dimensions are not (by default) shown or even considered in generating a General Ledger report. Moreover, as they are not considered, they are not used to distinguish GL Entry lines in the same voucher with the same Account when the "Group By" value is "Group by Voucher (Consolidated)". This situation leads to lines with different values for the accounting dimension to be ganged together in the General Ledger view of a Journal entry, making the entry difficult for an accountant to read. This commit alleviates the problem by adding a checkbox to control whether Accounting Dimension columns are considered in the General Ledger report. When they are considered, they are displayed and also included in the key that distinguishes lines in the "Group by Voucher (Consolidated)" mode. Resolves #23033.	2020-08-17 20:43:56 +00:00
Deepesh Garg	1067f7ed3e	fix: Price rule filtering in case of no doc	2020-08-17 23:47:58 +05:30
Deepesh Garg	38cabbd4b8	Merge pull request #23007 from prssanna/expense-claim-list-currency fix: add company in list fields to fetch for Expense Claim	2020-08-17 23:07:51 +05:30
Deepesh Garg	aef5c4cb64	Merge pull request #23044 from frappe/sales-analytics fix: Remove dependency of Sales Order in Sales Analytics	2020-08-17 23:00:49 +05:30
Shivam Mishra	eb832f6861	Merge branch 'develop' into iff-invoicing	2020-08-17 12:53:43 +00:00
Marica	4c1ea3e0e3	Merge branch 'develop' into credit-limit-email	2020-08-17 18:10:29 +05:30
Marica	0a926ee20d	Merge branch 'develop' into general-ledger-filters	2020-08-17 18:10:05 +05:30
Marica	11a167f8bb	Merge branch 'develop' into shift_management	2020-08-17 16:39:27 +05:30
marination	205df14a48	fix: Credit Limit Email not working	2020-08-17 16:23:44 +05:30
Anurag Mishra	df7b428331	fix: UI/UX Salary details and salary slip form cleanup (#22536 ) * fix: UI/UX Salary details * feat: salary slip form cleaup * fix(test): set working days zero if salary slip is based on timesheet * fix(revert): set working days zero if salary slip is based on timesheet * fix: salary slip form cleanup Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-17 14:09:54 +05:30
Marica	39c97bfbe9	Merge branch 'develop' into shift_management	2020-08-17 13:46:51 +05:30
Anurag Mishra	13be09e883	Update update_start_end_date_for_old_shift_assignment.py	2020-08-17 13:43:33 +05:30
Afshan	084de5f0b2	fix: handled condition if staffing isn't created (#22992 ) * fix: handled condition if staffing isn't created * style: reformated code for redability * Update erpnext/hr/doctype/job_offer/job_offer.py Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-08-17 13:14:09 +05:30
marination	eb241c6c42	fix: General Ledger filter validation	2020-08-17 12:57:56 +05:30
Anupam K	d7b69e57ae	fix: deleting unused Stock Entry Type	2020-08-17 11:20:56 +05:30
Afshan	5b45961b9d	fix: the JSON object must be str, bytes or bytearray, not "list" (#23047 ) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-17 10:51:53 +05:30
Deepesh Garg	e1e847a3f7	feat: Enhancement in Loan Topups	2020-08-16 20:57:39 +05:30
Deepesh Garg	a2249e013d	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_top_up_fixes	2020-08-15 18:28:04 +05:30
michellealva	e69b2e0da1	fix: Remove dependency of Sales Order in Sales Analytics	2020-08-15 10:16:26 +05:30
Deepesh Garg	d9accededa	fix: filter pricing rules based on condition	2020-08-14 22:36:01 +05:30
Shivam Mishra	fe57ed629e	Merge branch 'develop' into iff-invoicing	2020-08-14 14:31:31 +00:00
Shivam Mishra	736aee886e	Merge branch 'develop' into support-search	2020-08-14 13:36:59 +00:00
Rucha Mahabal	5fb0e7184e	fix: list index out of range error while setting POS payment mode (#23018 )	2020-08-14 17:11:39 +05:30
Suraj Shetty	cab5918244	Merge branch 'develop' into HR-fix	2020-08-14 16:12:28 +05:30
Shivam Mishra	3daa9de998	feat: add email option to field email_id	2020-08-14 13:46:58 +05:30
Shivam Mishra	6b68eaad1e	feat: use email template for membership acknowledgement	2020-08-14 13:46:58 +05:30
Shivam Mishra	b4d3666e69	feat: show send acknowledgement button if enabled in settings	2020-08-14 13:46:58 +05:30
Shivam Mishra	e4c58c37c8	feat: allow member creation via API	2020-08-14 13:46:58 +05:30
Shivam Mishra	98bcedd09c	feat: create member if not already exists	2020-08-14 13:46:58 +05:30
Shivam Mishra	d7139bbd43	fix: type error	2020-08-14 13:46:58 +05:30
Shivam Mishra	87ddec069e	refactor: try block across the function	2020-08-14 13:46:58 +05:30
Shivam Mishra	6fbe9b5404	fix: remove payload	2020-08-14 13:46:58 +05:30
Shivam Mishra	733bde31c9	fix: doctype name in patch	2020-08-14 13:46:58 +05:30
Shivam Mishra	3a67a78ece	feat: add custom buttons for invoice and email	2020-08-14 13:46:58 +05:30
Shivam Mishra	8e0314e7f6	feat: separate invoice generation and email	2020-08-14 13:46:58 +05:30
Shivam Mishra	c8d9e7f77b	feat: add message field	2020-08-14 13:46:58 +05:30
Shivam Mishra	1678eb9b50	feat: drop payload column	2020-08-14 13:46:58 +05:30
Shivam Mishra	62e344188a	feat: update settings and link filters	2020-08-14 13:46:32 +05:30
Shivam Mishra	15340e0c7f	feat: send invoice via email	2020-08-14 13:46:32 +05:30
Shivam Mishra	811ac909f9	feat: add auto invoice creation fields and controllers	2020-08-14 13:46:32 +05:30
Shivam Mishra	96dc67c35e	feat: add copy button and docs link	2020-08-14 13:46:32 +05:30
Shivam Mishra	3a1868dae8	feat: add item field	2020-08-14 13:46:32 +05:30
Shivam Mishra	a16b24d50a	feat: add enable or disable invoicing and print format field	2020-08-14 13:46:32 +05:30
Anurag Mishra	759632c025	fix: requested Changes	2020-08-14 12:26:04 +05:30
Anurag Mishra	6f1579da1f	Merge branch 'develop' into shift_management	2020-08-14 12:11:41 +05:30
Deepesh Garg	8ca57eb5dd	Merge pull request #23022 from marination/loan-amount fix: Validate or Set Loan Amount first	2020-08-13 19:53:09 +05:30
Afshan	d7d92c520e	fix: removed code relating to standard working hours (#23009 )	2020-08-13 19:40:09 +05:30
Deepesh Garg	1151f888ba	fix: Set pledge amount before setting loan amount	2020-08-13 18:52:23 +05:30
bhavesh95863	a647bef682	fix: warehouse mandatory even update stock uncheck (#23023 )	2020-08-13 17:41:55 +05:30
Anupam K	b3bd780d46	fix: codasy dix	2020-08-13 17:07:15 +05:30
Anurag Mishra	f096ba4998	patch: Old Shift Assignment	2020-08-13 14:18:48 +05:30
Anurag Mishra	c2710e05ce	fix: showing on_going shift on calendar	2020-08-13 14:17:47 +05:30
Anurag Mishra	74f0a1ab7c	fix: changes Requested	2020-08-13 14:17:47 +05:30
Anurag Mishra	00a8081aba	Fix: button label	2020-08-13 14:17:47 +05:30
Anurag Mishra	dcf598dc2d	Fix: requested Changes	2020-08-13 14:17:47 +05:30
Anurag Mishra	d5c921e358	Fix: Requested Changes	2020-08-13 14:17:47 +05:30
Anurag Mishra	b48110caf1	Update erpnext/hr/doctype/shift_assignment/shift_assignment.py Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-08-13 14:17:47 +05:30
Anurag Mishra	3aa1101d5e	fix: requested changes	2020-08-13 14:17:47 +05:30
Anurag Mishra	17e6d0918b	feat: Employee level Shift Request Approver	2020-08-13 14:17:47 +05:30
Anurag Mishra	43ba7dd4c8	feat: don't allow to request for default shift	2020-08-13 14:17:47 +05:30
Anurag Mishra	feef4a6c1e	test: employee checkin	2020-08-13 14:17:47 +05:30
Anurag Mishra	b3e00de0ae	refactor: Shift Request	2020-08-13 14:17:47 +05:30
Anurag Mishra	a6ec7e31d2	test: shift assignment	2020-08-13 14:17:47 +05:30
Anurag Mishra	dd46d19765	feat: map event calendar to show ongoing shift assignment and fixed period assigment	2020-08-13 14:17:47 +05:30
Anurag Mishra	afa98bb39b	feat: Assign shift for period or create ongoing assignment	2020-08-13 14:17:47 +05:30
Abhishek Balam	a25760046f	fix: condition syntax validation readded, fetch item details if condition not met ignoring rule	2020-08-13 13:22:58 +05:30
marination	8264fcd0a5	fix: Only validate repayment if term loan	2020-08-13 12:47:34 +05:30
Abhishek Balam	487aa30aef	fix: eval fail message fix	2020-08-13 12:19:34 +05:30
marination	6988fbb82d	fix: Validate or Set Loan Amount first	2020-08-13 12:17:13 +05:30
Deepesh Garg	ca898c6da3	fix: Condition fix	2020-08-13 11:54:18 +05:30
Deepesh Garg	cbde04d3da	fix: Pass doc instead of args	2020-08-13 11:47:41 +05:30
prssanna	bfb219612e	feat: enable total row in Gross Profit Report	2020-08-13 11:34:05 +05:30
Anupam Kumar	e447c79f9d	fix: Quotation lost reason options fix (#22814 ) * adding patch and lost reason child tables * fix: conflict resolved	2020-08-13 09:20:36 +05:30
Saqib	c7614174d0	fix: cannot change customer fields if credit exhausted (#22838 ) * fix: cannot change customer fields if credit exhausted * fix: order based on company * fix: sort current limits w.r.t company before compare * fix: CustomerCreditLimit Object is not subscriptable	2020-08-13 09:18:59 +05:30
Nabin Hait	e2ee455acc	fix: Calculate taxes if tax is based on item quantity	2020-08-12 20:58:03 +05:30
Abhishek Balam	fdfab03c11	feat: add condition field in pricing rule	2020-08-12 20:33:54 +05:30
Raffael Meyer	94308fc107	Merge branch 'develop' into barredterra-patch-1	2020-08-12 16:14:55 +02:00
Deepesh Garg	21a220e2a5	fix: Update state code and union territory for Daman and Diu (#22988 ) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-12 19:19:03 +05:30
Rucha Mahabal	cd5821e00a	Merge pull request #23011 from ruchamahabal/fix-asset-maintenance-status fix: don't set asset maintenance log status as Overdue when Completed or Cancelled	2020-08-12 19:17:33 +05:30
Deepesh Garg	617027c6ca	Merge branch 'develop' of https://github.com/frappe/erpnext into navbar_links	2020-08-12 18:39:20 +05:30
Rucha Mahabal	517a6d0054	fix: set draft indicators for Asset Maintenance Log listview	2020-08-12 18:01:45 +05:30
Rucha Mahabal	691ec1bd27	fix: don't set maintenance log status as Overdue when Completed or Cancelled	2020-08-12 18:01:07 +05:30
Anupam Kumar	674d1b0803	feat: Material Request and Stock Entry Enhancement (#22671 ) * feat: send to warehouse * adding warehouse validation * fix: review changes * fix: review changes * stock entry enhancement * fix: review changes	2020-08-12 17:55:02 +05:30
Rucha Mahabal	e0cc421e50	fix: TypeError while setting transfer_qty in Stock Entry (#22929 ) Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-08-12 14:33:30 +05:30
Marica	846771cb29	Merge branch 'develop' into item-image-alt	2020-08-12 13:37:19 +05:30
Deepesh Garg	1d5ab618d2	Merge pull request #23001 from nabinhait/inclusive-tax-based-on-item-quantity fix: Calculate taxes if tax is based on item quantity and inclusive on item price	2020-08-11 22:05:02 +05:30
Deepesh Garg	7d0a625b9c	git commit -m "fix: Add missing semicolon"	2020-08-11 22:02:12 +05:30
Nabin Hait	19ea7218d9	fix: Calculate taxes if tax is based on item quantity and inclusive on item price	2020-08-11 20:34:57 +05:30
Shivam Mishra	1679c7af88	Merge branch 'develop' into support-search	2020-08-11 14:54:10 +00:00
Afshan	ba33900712	Merge remote-tracking branch 'upstream/develop' into fix-duplicate-dropdown-PO	2020-08-11 20:17:05 +05:30
Afshan	b5b2586968	fix: referencing frm	2020-08-11 20:15:57 +05:30
Shivam Mishra	2fe5d76fe4	Merge branch 'develop' into item-image-alt	2020-08-11 14:45:55 +00:00
Shivam Mishra	ccdaf3da66	Merge branch 'develop' into fix-margin-for-filter	2020-08-11 14:41:29 +00:00
Deepesh Garg	ca9038feb7	Merge pull request #22998 from abhishekbalam/rename_source_section_opportunity fix(CRM): Change 'Source' section name to 'More Information' in Opportunity	2020-08-11 18:26:09 +05:30
Anurag Mishra	ed6e9550ca	fix: removed payroll from HR. (#22991 ) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-11 18:04:42 +05:30
Deepesh Garg	2633e292a5	fix: Is Secured Loan check mapping	2020-08-11 18:03:28 +05:30
Abhishek Balam	d0ae92d4bd	fix: moved company field, renamed to 'More Information'	2020-08-11 17:39:17 +05:30
prssanna	5a7618d8ec	fix: add company in list fields to fetch for Expense Claim	2020-08-11 16:50:31 +05:30
Abhishek Balam	ee5b9c7691	feat(Accounting): Process Statement Of Accounts (#22901 ) * feat: Process Statement Of Accounts initial commit * fix: add jinja supported inputs for subject and body in email settings * feat: utils support in template, tested autoemail, fixed issues	2020-08-11 16:23:47 +05:30
Abhishek Balam	9f6d114265	fix: Change Source section name to 'Company Information'	2020-08-11 16:16:05 +05:30
Anupam Kumar	79d731dcd8	feat: Naming series for Sales/Purchase Return (#22942 ) * feat: adding return naming series * Update purchase_invoice.json Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-08-11 16:11:20 +05:30
Deepesh Garg	145b80b11c	Merge pull request #22987 from frappe/fix-company-field fix: Consistent capitalization	2020-08-11 16:09:27 +05:30
Deepesh Garg	2621016884	fix: Allocated advance amount for multi-currency payment (#22923 ) * fix: Allocated advance amount for multicurrency payment * fix: Get grand total based on party currency * fix: Remove unwanted code	2020-08-11 16:06:13 +05:30
Abhishek Balam	ef3b82dae2	fix(CRM): Move Source section above Follow Up section In Opportunity (#22974 ) * fix: move source section above follow up * fix: only moving source field to 1st section	2020-08-11 16:05:02 +05:30
Shivam Mishra	3325be1d87	fix: spacing for slideshow (#22996 )	2020-08-11 16:03:46 +05:30
Deepesh Garg	285e059394	Merge pull request #22997 from abhishekbalam/set_opportunity_status_to_converted fix(CRM): Change Opportunity to 'Converted' when Sales Order is created	2020-08-11 16:00:16 +05:30
Abhishek Balam	c992616d35	fix: change opportunity to 'Converted' when items not selected in opportunity itself for making quotation and sales order	2020-08-11 15:22:54 +05:30
Shivam Mishra	c798c6abbd	Merge branch 'develop' into fix-margin-for-filter	2020-08-11 09:11:30 +00:00
Afshan	acc3d42cf0	fix: escape apostrophe in company name if exist (#22956 ) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-11 14:40:44 +05:30
Shivam Mishra	49dd8782fd	fix: margin overflow cutting the focus state	2020-08-11 14:39:04 +05:30
Rucha Mahabal	19b51762ef	fix: escape fields for Payroll Entry (#22994 )	2020-08-11 13:12:00 +05:30
Rucha Mahabal	f7a7cc08d9	Merge branch 'develop' into escape-company-field	2020-08-11 10:22:32 +05:30
Saurabh	58d05ac0e0	fix: check setup complete flag insted setup page	2020-08-10 19:36:45 +05:30
Jai Chavan	dbbb864ba5	fix: Consistent capitalization	2020-08-10 16:55:03 +05:30
Deepesh Garg	069a54e5c3	fix: Cancellation of accounting transactions within closed accounting period	2020-08-10 16:01:01 +05:30
Deepesh Garg	372abaa420	Merge pull request #22976 from marination/sales-taxes-dashboard fix: Susbcription in Sales Taxes and Charges Dashboard	2020-08-10 15:17:59 +05:30
marination	0f27500197	fix: Susbcription in Sales Taxes and Charges Dashboard	2020-08-10 15:17:58 +05:30
Saurabh	2547b7479e	Merge pull request #22975 from nextchamp-saqib/pos-fixes-1 fix: [pos] minor bugs	2020-08-10 14:50:53 +05:30
Marica	0fcb05a3aa	fix: Misleading filters on Item tax Template Link field (#22918 ) Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-10 14:48:13 +05:30
Saqib Ansari	f1091534cd	fix: [pos] minor bugs	2020-08-10 14:45:58 +05:30
Marica	42fbdc09f8	Merge branch 'develop' into opportunity-from-email	2020-08-10 13:48:43 +05:30
Anoop	d3d3db654e	fix: Inpatient Record - Transfer check-in time validation (#22958 ) * fix: inpatient transfer should not allow future checkin time * Update erpnext/healthcare/doctype/inpatient_record/inpatient_record.js Error message corrected Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-10 13:21:12 +05:30
Deepesh Garg	d626e3bd2e	Merge branch 'develop' into billing_address_fetch	2020-08-10 12:57:12 +05:30
Shivam Mishra	ded9f41cce	refactor: update confusing label	2020-08-10 12:45:07 +05:30
marination	a07973cfa5	fix: Creating opportunity from email	2020-08-10 12:39:42 +05:30
Anurag Mishra	95984fd921	fix: Not able to cancel application,allocation nad encashments	2020-08-10 12:36:00 +05:30
Rucha Mahabal	97ecf52d6f	fix: failing Fees test	2020-08-10 12:13:35 +05:30
Prssanna Desai	5c0439f768	fix: set correct default value from from date in downtime analysis report (#22903 ) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-10 11:12:52 +05:30
Deepesh Garg	bc8a281f83	fix: Subscripition link in Customer dashboard (#22960 ) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-10 11:00:08 +05:30
Deepesh Garg	41a4999711	Merge pull request #22843 from nextchamp-saqib/asset-adj-dimension-fix fix: cannot submit value adjustment with custom dimension	2020-08-10 10:12:41 +05:30
Deepesh Garg	097d89f550	Merge pull request #22946 from deepeshgarg007/gst_export_wopay fix: GSTR 1 report for exports without payment of Tax	2020-08-10 09:56:12 +05:30
Anupam K	d01caac852	report lead detail	2020-08-10 09:39:58 +05:30
Raffael Meyer	821eeb9852	fix(membership): currency should be a link	2020-08-09 14:07:32 +02:00
Mangesh-Khairnar	a53f15ca35	fix: remove mentions of display items in stock (#22963 )	2020-08-09 13:12:47 +05:30
Deepesh Garg	7882c70244	Merge pull request #22959 from deepeshgarg007/gst_rcm_fixes_v13 fix: Taxable value for RCM	2020-08-08 22:34:36 +05:30
Deepesh Garg	d4ecf426b7	fix: Place of supply fix	2020-08-08 22:33:18 +05:30

... 7 8 9 10 11 ...

24121 Commits