brotherton-erpnext

Author	SHA1	Message	Date
Marica	510436931b	fix: Added Missing Trends Reports to Buying/Selling Desk (#22502 ) * fix: Added Missing Trends Reports to Buying/Selling Desk * fix: Move Reports to Other Reports	2020-06-29 19:52:23 +05:30
Anurag Mishra	343651fc39	fix: job offer validation fix (#22504 )	2020-06-29 18:23:22 +05:30
Marica	3e93a2f67f	fix: Set Root as Parent if no parent in new tree view node (#22497 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-06-29 17:39:26 +05:30
Marica	8732b8caf6	fix: Stock Onboarding typo and reorder (#22499 )	2020-06-29 17:38:42 +05:30
Anurag Mishra	ba5f571b0d	fix: take parent cost center for child if no cost center at child (#22496 )	2020-06-29 17:35:27 +05:30
Saqib	41034f760d	Merge branch 'develop' into asset-delete-fix	2020-06-29 10:54:01 +05:30
Saqib Ansari	cc42aa1750	fix: cancel asset movement on asset cancellation	2020-06-29 10:33:24 +05:30
Mangesh-Khairnar	73edba0e10	fix: handle nonetype issue for packed items (#22493 )	2020-06-29 08:54:53 +05:30
Deepesh Garg	a74cffe7a4	Merge pull request #21047 from vishdha/feat_taxjar feat(ERPNext Integrations): Taxjar Integration Added	2020-06-28 23:01:37 +05:30
Deepesh Garg	50e6e47e66	fix: Patch	2020-06-28 21:32:08 +05:30
rohitwaghchaure	6acde987c5	Merge pull request #22488 from rohitwaghchaure/fixed-letter-head-not-found fix: letter head not found in opening invoice creation tool	2020-06-28 20:02:29 +05:30
Deepesh Garg	eca2c1cd93	fix: patch	2020-06-28 18:53:55 +05:30
Rohit Waghchaure	04cf2e029f	fix: letter head not found in opening invoice creation tool	2020-06-28 17:08:12 +05:30
Deepesh Garg	4c230ed4b0	Merge pull request #21690 from alyf-de/refactor_datev fix(regional): DATEV report	2020-06-28 16:55:18 +05:30
Deepesh Garg	c8b11143a1	Merge pull request #22445 from Alchez/dev-job-offer-list-view fix: setup status indicators for Job Offer and Job Applicant (develop)	2020-06-28 16:49:28 +05:30
rohitwaghchaure	e4d296bb1c	Merge pull request #22413 from Anurag810/salary-structure-help-fix fix: 'Condition & Formula Help' appears twice	2020-06-28 16:29:20 +05:30
rohitwaghchaure	7e3f10e5bc	Merge pull request #22397 from Anurag810/salary_deductions_report_fixes fix: Salary deductions report fixes	2020-06-28 16:27:37 +05:30
rohitwaghchaure	81af2235f4	Merge branch 'develop' into dev-job-offer-list-view	2020-06-28 15:25:32 +05:30
rohitwaghchaure	41cd4fc788	Merge pull request #22478 from michellealva/cost_center_filter fix: apply filters in all transactions	2020-06-28 15:10:13 +05:30
rohitwaghchaure	4cc2e70348	Merge pull request #22454 from wojosc/patch-10 refactor: update customs_tariff_number.json	2020-06-28 15:07:19 +05:30
rohitwaghchaure	cc2d7f3e7f	Merge pull request #22450 from marination/serial-no-rename fix: Disable Renaming in Serial No	2020-06-28 11:15:35 +05:30
rohitwaghchaure	d5736711ce	fix: indentation	2020-06-28 11:12:20 +05:30
rohitwaghchaure	2f4971b5a6	Merge pull request #22461 from britlog/develop fix: product_info	2020-06-28 11:05:26 +05:30
Deepesh Garg	1d8b13c943	Merge pull request #22483 from deepeshgarg007/loan_security_shorttfall_fixes fix: Loan security shortfall fixes	2020-06-27 18:57:14 +05:30
Deepesh Garg	a4b9fc74aa	Merge branch 'develop' into feat_taxjar	2020-06-27 18:51:48 +05:30
Deepesh Garg	589364856c	fix: Syntax Error	2020-06-27 18:44:36 +05:30
Michelle Alva	2f37c447dd	fix: change button label in issue Changed the label of the button from "Make" to "Create" so that it is consistent with other DocTypes. Before:	2020-06-27 09:27:45 +05:30
Marica	92bea1326a	Merge branch 'develop' into serial-no-rename	2020-06-26 20:34:09 +05:30
michellealva	08f842d12e	fix: apply filters in all transactions	2020-06-26 19:56:00 +05:30
michellealva	e9cec2ff76	fix: remove redundant label in salary slip	2020-06-26 19:39:54 +05:30
britlog	0086a3727f	fix: product_info	2020-06-26 15:30:27 +02:00
rohitwaghchaure	275ebefdd2	Merge pull request #22468 from frappe/shopping-cart-settings fix: enable show_configure_button when shopping cart is enabled	2020-06-26 17:20:35 +05:30
rohitwaghchaure	b2ae6d9961	Merge pull request #22467 from nabinhait/credit_limit_email fix: Send email to credit controllers to increase credit limit	2020-06-26 15:49:25 +05:30
rohitwaghchaure	13e8c32172	Update shopping_cart_settings.js	2020-06-26 15:07:32 +05:30
marination	0f056ec51d	fix: Sales Order to MR test failing	2020-06-26 14:12:11 +05:30
Wolfram Schmidt	a97715e464	Update customs_tariff_number.json	2020-06-26 10:24:48 +02:00
Anupam K	0ce70bd68f	Merge branch 'develop' of https://github.com/frappe/erpnext into shopping-cart-settings	2020-06-26 12:47:37 +05:30
Nabin Hait	0ff5af222a	fix: Send email to credit controllers to increase credit limit	2020-06-26 12:46:42 +05:30
Anupam K	27d27c924d	enable show_configure_button when shopping cart is enabled	2020-06-26 12:46:40 +05:30
rohitwaghchaure	cc7e1b0ec5	Merge pull request #22400 from AfshanKhan/FR_ISS_204290 fix: removed condition that considered "Standard working hours" while…	2020-06-25 23:23:33 +05:30
rohitwaghchaure	2eb452f3bb	Merge pull request #22458 from scmmishra/fix-email-digest-so-company fix: add company filter in email digest	2020-06-25 23:18:38 +05:30
rohitwaghchaure	6cf568d094	Merge pull request #22462 from marination/production-plan-ux fix: Handling Empty tables in Production Plan	2020-06-25 23:15:28 +05:30
Michelle Alva	978722621f	fix: grammatical fix on error message Before: Fiscal Year: 2020 does not exists After: Fiscal Year 2020 Does Not Exist	2020-06-25 22:35:33 +05:30
marination	c8f590bc8f	fix: Handling Empty tables in Production Plan	2020-06-25 21:30:45 +05:30
Shivam Mishra	5374e7ae1f	fix: add company filter in email digest	2020-06-25 19:41:42 +05:30
Wolfram Schmidt	7f2a3e8c7d	Update customs_tariff_number.json Main information of tariff numbers are the number. A description is more or less double information as this is mostly the number. Thus a description should not be mandetory.	2020-06-25 13:56:32 +02:00
marination	f311f52f6e	fix: Disable Renaming in Serial No	2020-06-25 16:02:18 +05:30
Saqib	40847aeac3	fix: cannot cancel assets with repair pending (#22440 ) * fix: cannot cancel assets with repair pending * fix: message * Update asset.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-06-25 15:43:31 +05:30
Deepesh Garg	8a55ec1580	fix: Add view ledger button for cancelled docs (#22432 ) * fix: Add view ledger button for cancelled docs * fix: Add moddified to date in Stock Ledger	2020-06-25 15:34:01 +05:30
Sun Howwrongbum	ecff8f9582	fix: UnboundLocalError when setting product_info (#22436 ) Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-06-25 14:25:53 +05:30
Afshan	a462e29172	Merge branch 'develop' into FR_ISS_204290	2020-06-25 14:16:35 +05:30
Rohan Bansal	e7c91917aa	fix: setup status indicators for Job Offer and Job Applicant	2020-06-25 13:40:18 +05:30
Rucha Mahabal	7b3700b3ec	fix: handle custom statuses for the pause SLA configuration (#22349 ) * fix: handle hold time for custom statuses * fix: set total hold time only if hold configurations are enabled Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>	2020-06-25 13:29:14 +05:30
Saqib Ansari	acdaf2b001	fiix: cannot cancel asset and asset movement	2020-06-25 12:43:25 +05:30
Shivam Mishra	53346217d2	Revert "feat: added search to support page (#22376 )" (#22431 ) This reverts commit `3ab8d865dd`.	2020-06-25 11:12:09 +05:30
Michelle Alva	da0385cd39	fix: change error messages in RFQ Before: 1. Row {0}: For supplier {0} Email Address is required to send email 2. Email sent to supplier 3. Request for Quotation is disabled to access from portal, for more check portal settings. 4. Supplier Quotation created. After: 1. Row {0}: For Supplier {0} Email Address is Required to Send Email 2. Email sent to Supplier 3. The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings. 4. Supplier Quotation Created.	2020-06-25 08:24:01 +05:30
John Clarke	6fd1068af3	Update stock_ageing.py	2020-06-24 07:31:21 -06:00
Deepesh Garg	06a37660ae	Merge pull request #22421 from deepeshgarg007/update_jv_account_timestamp fix: Update journal entry accounts times stamp	2020-06-24 17:56:51 +05:30
Deepesh Garg	2abd66da9d	fix: Update journal entry account timesstamp	2020-06-24 17:49:50 +05:30
Anurag Mishra	2f867ca357	Merge branch 'develop' into salary-structure-help-fix	2020-06-24 17:41:32 +05:30
Anupam Kumar	10c7faf090	updating education report modified time (#22418 ) Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>	2020-06-24 17:34:52 +05:30
vishdha	d3ec1c1d89	feat: Taxjar Integration Added	2020-06-24 16:37:21 +05:30
Shivam Mishra	3ab8d865dd	feat: added search to support page (#22376 ) * feat: added search to support page * style: add styles in style block	2020-06-24 15:50:06 +05:30
Anurag Mishra	020c6e9175	fix: Create salary slip button disappears	2020-06-24 15:22:45 +05:30
Afshan	a07a548622	fix: removed "standard working hours" also fixed test cases	2020-06-24 13:07:59 +05:30
Anurag Mishra	a81c54f23a	fix: 'Condition & Formula Help' appears twice	2020-06-24 11:51:06 +05:30
rohitwaghchaure	a50c95c959	Merge pull request #22223 from deepeshgarg007/grn_posting feat: Accounting entries for service item in Purchase receipt	2020-06-24 11:00:19 +05:30
rohitwaghchaure	c4382abc03	Merge pull request #22410 from kennethsequeira/item_report_date fix: add error prompt for wrong date range	2020-06-24 10:49:21 +05:30
rohitwaghchaure	d63c59ced4	Merge branch 'develop' into grn_posting	2020-06-24 10:23:23 +05:30
Marica	7af7bb8311	fix: Insert Supplier Group via List View (#22403 )	2020-06-23 17:51:02 +05:30
Rohan	9c25101d9b	feat: add ability for a contract to be authorised internally (#22095 ) * Added ability for a contract to be signed by a company user before being sent out * feat: contract signed by stays even after reload (#402) * format: use new JSON format Co-authored-by: Neil Lasrado <neil@digithinkit.com> Co-authored-by: nehasacher143 <45919049+nehasacher143@users.noreply.github.com> Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-06-23 17:39:37 +05:30
Kenneth Sequeira	f5b7bd9dcb	fix: add error prompt for wrong date range	2020-06-23 16:55:35 +05:30
Anurag Mishra	ecbfda7d6a	fix: typo in template(#22401 )	2020-06-23 14:33:49 +05:30
Anurag Mishra	ece9508eb5	fix: test_tax_for_payroll_period	2020-06-23 14:25:43 +05:30
Afshan	4e37d25374	fix: removed condition that considered "Standard working hours" while creating "timesheet" as it was setting wrong time #20848	2020-06-23 14:10:40 +05:30
Anurag Mishra	f9ca29cebd	Fix: if there is no component	2020-06-23 11:57:02 +05:30
Anurag Mishra	d0d9b53361	feat: added year filters	2020-06-23 11:49:57 +05:30
Anoop	5e16ca0326	fix: Login page doesn't load for new sites (#22388 ) * fix: Login page doesn't load for new sites Login page broken as active domains are not set for new sites * Update footer_powered.html Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-06-23 11:11:13 +05:30
Anurag Mishra	101d15f2f8	fix: not working without from_amount and percentage_deduction (#22380 )	2020-06-23 10:45:54 +05:30
Anurag Mishra	36560c8406	fix: staffing Plan validation (#22379 )	2020-06-23 10:44:33 +05:30
mergify[bot]	ca8894b0fc	fix: alternative item not working for subcontract (#22386 ) (cherry picked from commit 171699537c3e7d7632f45123c6d30012c8de7281) Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>	2020-06-23 10:42:32 +05:30
Marica	3dee5273d6	fix: Update Packed Items via Update Items in SO (#22392 )	2020-06-23 10:33:47 +05:30
Marica	bd5c8573de	fix: Unable to create batched Item (#22393 )	2020-06-23 10:32:51 +05:30
Deepesh Garg	7cc1cf36ca	feat: More controlled deferred revenue booking (#21671 ) * feat: More controller deferred revenue booking * fix: Query for last gl entry * fix: Accounting Dimension for Deferred entries * fix: Deferred revenue booking against paid invoices * fix: Don not update outstanding on Deferred Entry submission * fix: Naming fixes * feat: Deferred revenue/expense booking based on months * fix: Test case for fix monthly deferred revenue booking * fix: Typo * fix: Patch to update settings * fix: Test case to book deferred expense via journal entry * fix: Update field for better UX * fix: Codacy * fix: Change select field to checkbox	2020-06-23 09:57:56 +05:30
Marica	b073544e06	Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop	2020-06-23 02:24:35 +05:30
Raffael Meyer	c3e91be48e	Merge branch 'develop' into refactor_datev	2020-06-22 19:53:47 +02:00
Suraj Shetty	c753502412	Merge branch 'develop' into patch-1	2020-06-22 21:41:31 +05:30
rohitwaghchaure	b658a010f1	Merge pull request #22383 from frappe/mergify/bp/develop/pr-22330 fix(pricing_rule): apply_on logic dont get cleanup (bp #22330)	2020-06-22 21:08:55 +05:30
Deepesh Garg	49f51f4132	Merge pull request #22346 from AfshanKhan/ISS_20_21_02455 fix: set row_id by default as previous row for On Previous Row Amount and On Previous Row Total	2020-06-22 20:53:23 +05:30
Rohit Waghchaure	aaed3b988f	added validation and clear fields for Apply Rule On Other (cherry picked from commit ebbbc85fc0f9aa418163f8344d3a234ecbe08488)	2020-06-22 14:52:30 +00:00
Poranut Chollavorn	e3973a4730	fix(pricing_rule): apply_on logic dont get cleanup (cherry picked from commit acf399c4e0c74458c17866be7d72788aeecbe829)	2020-06-22 14:52:29 +00:00
Deepesh Garg	5dc175f068	fix(Immutable Ledger): Item wise backdated stock entry posting (#22366 ) * fix(Immutable Ledger): Item wise backdated stock entry posting * fix: Remove fiscal year query * fix: Update message string	2020-06-22 19:05:39 +05:30
Deepesh Garg	c914d1b8e8	Merge branch 'develop' into ISS_20_21_02455	2020-06-22 18:46:58 +05:30
Anupam Kumar	71da90034d	fix: resetting lost reason in opportunity and quotation (#22378 )	2020-06-22 18:27:14 +05:30
Deepesh Garg	be4fc1a78e	fix(UX): Notify user of expense account change in Purchase Invoice (#22193 )	2020-06-22 18:03:11 +05:30
Anurag Mishra	7672166ce3	fix: Wrong filter (#22375 )	2020-06-22 17:22:05 +05:30
Anurag Mishra	0093b3b27c	fix: label (#22377 )	2020-06-22 17:21:01 +05:30
Deepesh Garg	0252cb6789	Merge pull request #22374 from deepeshgarg007/employee_advance_cancel fix: Unable to cancel employee advance	2020-06-22 14:55:21 +05:30
Deepesh Garg	62897d3878	fix: Unable to cancel employee advance	2020-06-22 14:54:01 +05:30
Anurag Mishra	8ffb9f852f	fix: patch check_is_income_tax_component (#22371 )	2020-06-22 12:17:29 +05:30
rohitwaghchaure	39a7516252	Merge pull request #22241 from deepeshgarg007/cost_center_fix fix: Minor fixes in cost center	2020-06-22 11:21:14 +05:30
Alvaro	43be163b32	feat: Enabled translation on html files in LMS [Proposal] (#21582 ) * :fix: translation fix for html files in LMS * fix: typo in translation * Update content.html * Update content.html * Update profile.html Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-06-22 11:06:12 +05:30
Deepesh Garg	d79e8e82cb	fix: Test cases	2020-06-22 10:00:12 +05:30
Deepesh Garg	edd4aa6faa	Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts	2020-06-22 09:59:39 +05:30
Deepesh Garg	ded3ab1cd7	fix: Test Cases	2020-06-22 09:40:15 +05:30
Deepesh Garg	7f94765d02	Merge pull request #22350 from AfshanKhan/ISS_20_21_02392 fix: Skipping total row for tree-view reports	2020-06-21 19:25:59 +05:30
Afshan	84c6973742	fix: adding json for checked add total row	2020-06-21 17:48:44 +05:30
Deepesh Garg	95a497cffb	Merge branch 'develop' of https://github.com/frappe/erpnext into cost_center_fix	2020-06-20 12:33:41 +05:30
Deepesh Garg	bef80b7981	fix: Test	2020-06-20 12:32:30 +05:30
Deepesh Garg	dee1c92df1	Merge pull request #22351 from kennethsequeira/purchase_inv_due fix: status error in purchase invoice	2020-06-20 11:58:19 +05:30
Deepesh Garg	c70eb30e7e	Merge branch 'develop' of https://github.com/frappe/erpnext into grn_posting	2020-06-20 11:56:25 +05:30
Deepesh Garg	53d5d16abb	fix: Move check from Stock Settings to Company Master	2020-06-20 11:55:56 +05:30
Afshan	3fbe6e9e4b	fix: test case	2020-06-19 22:51:52 +05:30
Kenneth Sequeira	b7c8037e9a	fix codacy	2020-06-19 22:33:51 +05:30
Anurag Mishra	289c82243f	feat: New Payroll module (#21990 ) * feat: Moved Document to Payroll Module * feat: Moved Reports to Payroll Module * feat: Moved Print fromat With Patch * feat: Moved Notifiction to Payroll Module and patches * feat: added dashboard and desk page to Payroll * feat: Payroll Dashboard * feat: Module onboarding * feat: Income tax Deductions Report * feat: Ecs Checklist Report * feat: Provident Fund Report * feat: Professional Fund report and commonified Code * feat: Total Payments Based On Payment Mode Report * fix: refactor and added chart Total Payments Based On Payment Mode * feat: Payroll Settings * fix: Bank remittance Report * feat(Payroll based on): Considered unmarked days * feat: Added Help for condition an formula in Salary structure * fix: requested changes * fix: rename report Ecs checklist to salary_payments_via_ecs * fix: renamed report report/total_payments_based_on_payment_mode * fix: added role via setup.py for regional report * feat: added All reports to desk page * fix: frappe.reload doc in all patches * fix: codacy * fix: frappe.reload_doctype for patches * patch: is_income_tax_component and component_type for salary component * fix: uncommented code * test: fixture * fix: test * test: test_payment_days_based_on_attendance	2020-06-19 19:17:57 +05:30
Marica	47a4567301	Merge branch 'develop' into purchase_inv_due	2020-06-19 18:44:53 +05:30
Kenneth Sequeira	02f3e045ab	fix: due date filter in purchase invoice	2020-06-19 18:22:04 +05:30
Afshan	65f00cea15	fix: Skipping*	2020-06-19 18:19:06 +05:30
Afshan	fbd66574ad	Skiping total row for tree-view reports	2020-06-19 18:17:01 +05:30
Deepesh Garg	aea450c36a	Revert "fix: update remark on submitting payment entry"	2020-06-19 17:29:49 +05:30
Afshan	aca2ca5982	style: formate according to Codacy/PR Quality Review	2020-06-19 16:22:41 +05:30
Marica	383807f72e	feat: Selling Desk, Dashboard and Onboarding (#22055 ) * feat: Selling Desk, Dashboard and Onboarding * chore: Selling Onboarding and fixes in Other onboardings * chore: Dashboard and Number card Fixtures * fix: Escape filters and Reposition Accounts Dashboard shortcut. Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-06-19 15:33:21 +05:30
Afshan	0fe14ce94e	style: formate according to Codacy/PR Quality Review	2020-06-19 15:10:15 +05:30
Afshan	6f7652f425	fix: set row_id by default as previous row for On Previous Row Amount and On Previous Row Total	2020-06-19 14:36:56 +05:30
Afshan	7a45c8bc28	fix: replaced "row_id" to "idx" as "row_id" was not available in variable "tax", also replaced "-1" by "-2" as "idx" starts with 0 rather than 1	2020-06-19 12:37:50 +05:30
Deepesh Garg	1b30ca6a36	fix: Codacy	2020-06-19 12:12:08 +05:30
Deepesh Garg	163a569715	chore: Delete Bank Reco doctype	2020-06-19 12:03:36 +05:30
Deepesh Garg	3c63f5b76b	Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts	2020-06-19 11:41:21 +05:30
Deepesh Garg	23cb5e1869	Merge pull request #22312 from frappe/email-digest-html fix: Email digest html view fix	2020-06-19 11:36:02 +05:30
Rucha Mahabal	428235c478	fix: revert issue metrics patch (#22331 )	2020-06-19 11:15:59 +05:30
Afshan	a9cdc7b696	style: moved project from reference section to accounting dimensions section (#22309 )	2020-06-19 11:11:33 +05:30
rohitwaghchaure	a504bdb448	Merge pull request #22329 from scmmishra/fix-grammar-footer refactor: show service instead of services	2020-06-19 10:59:52 +05:30
rohitwaghchaure	ec2dec03cc	Merge pull request #22334 from kennethsequeira/item-sale-hist fix: Customer Group label in Item-wise Sales History report	2020-06-19 10:53:09 +05:30
Kenneth Sequeira	766f978858	fix: Customer Group label in Itemwise Sales report	2020-06-18 23:23:54 +05:30
rohitwaghchaure	9d25826bbe	Merge pull request #22249 from marination/rfq-multi-uom feat: Multi UOM support in Request for Quotation	2020-06-18 20:48:13 +05:30
Shivam Mishra	e892448733	Merge branch 'develop' into fix-grammar-footer	2020-06-18 14:21:03 +00:00
Shivam Mishra	25702a1c55	refactor: show service instead of services	2020-06-18 19:49:46 +05:30
Anurag Mishra	d9b2d635d8	feat: added Expense approver for employee and validation (#22244 ) * feat: added Expense approver for employee nad validation * fix: requested changes	2020-06-18 19:13:01 +05:30
Prssanna Desai	82ddef58c0	feat: date filter for fiscal year (#21880 ) * feat: date filter for fiscal year * fix: rename fieldtypes to valid_for_fieldtypes * Update utils.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-06-18 18:18:41 +05:30
Anupam Kumar	77673e27e0	enable Lead create by email (#22314 ) Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>	2020-06-18 17:46:20 +05:30
Deepesh Garg	bdb40553c3	Merge pull request #22323 from deepeshgarg007/item_tax_map fix: Do not copy Item Tax template from SO to PO	2020-06-18 17:01:53 +05:30
Deepesh Garg	1ba7708b60	fix: Do not copy Item Tax template from SO to PO	2020-06-18 16:45:16 +05:30
rohitwaghchaure	b5af614824	Merge pull request #22219 from Anurag810/quality_procedure_fix fix: Child is shown in Parent process if added from tree view	2020-06-18 15:51:00 +05:30
rohitwaghchaure	853fce8c7e	Merge branch 'develop' into rfq-multi-uom	2020-06-18 15:49:53 +05:30
rohitwaghchaure	b7a2f8731f	Merge pull request #22048 from nextchamp-saqib/update-items-permission-fix fix: submitted sales order can be updated with no permission	2020-06-18 15:47:12 +05:30
rohitwaghchaure	f1cbe89496	Merge pull request #22086 from deepeshgarg007/rcm_develop fix(India): Reverse charge mechanism for GST	2020-06-18 15:46:42 +05:30
Rucha Mahabal	a529d71ca0	fix(patch): add patch for setting issue metrics (#22296 ) * patch: set issue metrics in Issue documents * fix: commit after every 100 records	2020-06-18 15:38:43 +05:30
Shivam Mishra	34d2bfbb3e	refactor: handle exceptions when updating addresses (#22307 ) * refactor: handle exceptions when updating addresses * refactor: fold common statements in a loop	2020-06-18 15:28:55 +05:30
Marica	d6906dccfe	Merge branch 'develop' into rfq-multi-uom	2020-06-18 14:44:46 +05:30
marination	95e9a4ef2c	fix: Patch simplification - Also, apply patch to all docs	2020-06-18 14:46:42 +05:30
Anupam K	bd449c8d07	email digest html fix	2020-06-18 14:20:22 +05:30
Rohit Waghchaure	8d5380a2f0	fix: incorrect variable used	2020-06-18 14:06:31 +05:30
Chinmay Pai	96100e9507	chore: add standard queries hooks to whitelist (#21939 ) standard queries are used within the search widget, and now require to be whitelisted before they can be executed through the search widget. Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com> Co-authored-by: sahil28297 <37302950+sahil28297@users.noreply.github.com>	2020-06-18 11:58:54 +05:30
Deepesh Garg	8db89bfab6	Merge pull request #22210 from abhishekbalam/customer_acq_revenue_fix fix: Revenue and Customer Count only in date range in Customer Acq. Report	2020-06-18 11:55:09 +05:30
marination	24ee482d8f	fix: Codacy	2020-06-18 11:49:15 +05:30
Afshan	ea78b24035	style: subtitle to be displayed if provided else empty (#22298 ) * added: /support * refactor code and implemented fail checks * removed unused imports * changed filter from from title to name * refactor code to move context inside main * removed unused variable * added: /support * refactor code and implemented fail checks * removed unused imports * changed filter from from title to name * refactor code to move context inside main * removed unused variable * refactor: renamed set to get * style: subtitle to be displyed if provided else empty Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>	2020-06-18 09:49:35 +05:30
P-Froggy	c3b74affe3	fix: Set Value of wrong Bank Account Field in Payment Entry Company bank account was wrongly inserted into the field "Party Bank Account" in payment entry, instead of "Bank Account". Also changes the label of "Default Bank Account" to "Default Company Bank Account", like suggested in PR #20632	2020-06-18 01:48:37 +02:00
Mangesh-Khairnar	53b601523b	fix: update shopify api version (#22284 ) Co-authored-by: Saurabh <saurabh@erpnext.com>	2020-06-17 19:31:57 +05:30
Marica	7bc9352546	Merge branch 'develop' into variant-error-msg	2020-06-17 19:22:49 +05:30
marination	91dfd000ed	fix: Typo	2020-06-17 19:05:40 +05:30
Shivam Mishra	64d772480b	fix: limit max length for cards (#22289 )	2020-06-17 18:48:15 +05:30
Shivam Mishra	6e231ae0cb	refactor: remove translation	2020-06-17 18:43:59 +05:30
Shivam Mishra	2462f07c87	refactor: update titles	2020-06-17 18:39:49 +05:30
Shivam Mishra	2b18bdfe72	fix: title for support	2020-06-17 18:36:51 +05:30
marination	b9c38a13d1	chore: Remove unnecessary get_doc	2020-06-17 18:36:12 +05:30
Shivam Mishra	7057a807ca	refactor: minor layout fixes to portal	2020-06-17 18:35:38 +05:30
marination	8b19d01d57	fix: Quality Procedure Fixes - Dont prompt error message if parent is the same in child - filter child procedure field - Disable New button in tree view - Editable grid for Quality Procedure Proces table.	2020-06-17 18:35:27 +05:30
Marica	5f3cdce353	Merge branch 'develop' into quality_procedure_fix	2020-06-17 18:27:04 +05:30
Kaviya Periyasamy	fec894f530	fix: modified time updated with the latest date (#22286 )	2020-06-17 17:39:12 +05:30
Abhishek Balam	a4cd9e2389	use getdate() for comparing dates	2020-06-17 17:13:13 +05:30
Afshan	8546b71358	feat: /support (#22194 ) * added: /support * refactor code and implemented fail checks * removed unused imports * changed filter from from title to name * refactor code to move context inside main * removed unused variable * added: /support * refactor code and implemented fail checks * removed unused imports * changed filter from from title to name * refactor code to move context inside main * removed unused variable * refactor: renamed set to get Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>	2020-06-17 16:16:59 +05:30
Deepesh Garg	179365683f	Merge pull request #22265 from frappe/edu-academic-term-validation fix: Adding filter in academic term	2020-06-17 15:34:47 +05:30
Deepesh Garg	0511e8cc03	Merge branch 'develop' into rcm_develop	2020-06-17 15:33:29 +05:30
marination	17422a3e45	fix: Message Formatting	2020-06-17 14:00:45 +05:30
Marica	6e751440cf	Merge branch 'develop' into quality_procedure_fix	2020-06-17 13:49:46 +05:30
Anupam Kumar	c6592c880a	fix: Student Admission (#22255 ) * Student Admission fix * adding check for application * adding check for application * updating error message * added date_diff for date comparision	2020-06-17 12:38:31 +05:30
rohitwaghchaure	67022b2d15	Merge pull request #22275 from frappe/mergify/bp/develop/pr-22267 refactor: hide company currency fields in the routing (bp #22267)	2020-06-17 12:27:40 +05:30
Anupam K	8d4ba6c7ec	Adding filter in academic term	2020-06-17 11:48:15 +05:30
Anupam Kumar	0a3c34de01	address label chages (#22137 ) Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-06-17 10:53:13 +05:30
rohitwaghchaure	8d856659af	refactor: hide company currency fields in the routing (#22267 ) (cherry picked from commit fd3ff6be18b0bd5accc88aea22e3adfe48e62aff)	2020-06-17 05:22:45 +00:00
Kenneth Sequeira	c159556c24	fix: typo for language in Terms description (#22270 )	2020-06-17 09:34:58 +05:30
Anurag Mishra	58831ecc7d	fix(HR): wrong shortcut in desk page (#22269 )	2020-06-16 19:23:52 +05:30
Marica	74f34c2ee3	Merge branch 'develop' into update-items-permission-fix	2020-06-16 17:18:33 +05:30
rohitwaghchaure	64c0e8f325	Merge pull request #22257 from rohitwaghchaure/fixed-travis-for-develop-branch fix: travis for develop	2020-06-16 12:38:10 +05:30
Rohit Waghchaure	fa6e4f62e2	fix: travis for develop	2020-06-16 12:02:58 +05:30
Marica	2112834743	fix: Handle unavailable Variants in Website (#22195 ) * fix: Handle unavailable Variants in Website * fix: Fetch cart setting from argument	2020-06-16 00:20:57 +05:30
marination	87dafb4d70	Merge branch 'develop' of https://github.com/frappe/erpnext into rfq-multi-uom	2020-06-15 17:44:04 +05:30
marination	ae862c993b	feat: Multi UOM support in Request for Quotation	2020-06-15 17:38:47 +05:30
rohitwaghchaure	d8683d381b	Merge pull request #22205 from deepeshgarg007/fiscal_year_travis fix: Travis(develop)	2020-06-15 16:12:10 +05:30
Deepesh Garg	a66ce050ff	fix: Minor fixes in loan	2020-06-15 16:03:12 +05:30
rohitwaghchaure	75366ebaec	Merge pull request #22243 from Anurag810/expense-claim-standard-filter-fix fix: added some standard filters in expense claim	2020-06-15 15:36:37 +05:30
rohitwaghchaure	21a95e1327	Merge pull request #22242 from Anurag810/employee_fix fix(hr): allow to enter Relieving date if status = Left	2020-06-15 15:35:22 +05:30
Deepesh Garg	c2496a3600	fix: Asset maintenance test	2020-06-15 15:18:49 +05:30
Rucha Mahabal	b8b11bb8ea	Merge branch 'develop' into sla-enhancements	2020-06-15 15:11:40 +05:30
marination	8a0058787e	fix: Wrong key sent to gte_valuation_rate	2020-06-15 14:40:39 +05:30
Rucha Mahabal	096792791b	fix(patch): reload child tables	2020-06-15 14:07:06 +05:30
Rucha Mahabal	30487bd854	fix: codacy issues	2020-06-15 13:49:58 +05:30
P-Froggy	2957a631db	fix: Validation of Purchase Order against Material Request missing (#22192 ) Validation of Purchase Order and Purchase Order Item against the linked Material Request Item was missing, so it was possible to exchange items in the purcahse order against others and still fullfill the material request. Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-06-15 13:41:16 +05:30
Rucha Mahabal	bf26b10df4	Merge branch 'develop' into sla-enhancements	2020-06-15 13:15:03 +05:30
Anurag Mishra	45b6fed029	fix: added some standard filters in expense cliam	2020-06-15 12:44:55 +05:30
Anurag Mishra	a2cf79da0f	fix: allow to enter Releaving date if status = Left	2020-06-15 12:28:31 +05:30
Deepesh Garg	0d880079b1	fix: Validation for group cost center	2020-06-15 12:23:24 +05:30
marination	8d68ba37bb	Merge branch 'update-items-permission-fix' of https://github.com/nextchamp-saqib/erpnext into update-items-permission-fix	2020-06-15 12:18:16 +05:30
marination	b7e94cc742	fix: Travis	2020-06-15 12:16:30 +05:30
Deepesh Garg	817cbc4b48	fix: Minor fixes in cost center	2020-06-15 12:07:04 +05:30
Marica	7dd92f15fa	Merge branch 'develop' into update-items-permission-fix	2020-06-15 11:44:59 +05:30
marination	359e934cd2	fix: Travis	2020-06-15 11:44:29 +05:30
Abhishek Balam	6c4a24a6c3	cleanup	2020-06-15 11:36:56 +05:30
Abhishek Balam	1a28227daa	fix merge conflict	2020-06-15 10:58:51 +05:30
Deepesh Garg	11253a91f1	Merge pull request #22199 from marination/qi-on-return fix: Don't prompt for Quality Inspection on Return Documents.	2020-06-14 17:09:51 +05:30
rohitwaghchaure	25f49d59c5	Merge pull request #22233 from deepeshgarg007/pi_billing_address fix: Billing address in for Purchase documents	2020-06-14 15:10:43 +05:30
rohitwaghchaure	c5a2803a1c	Merge pull request #22239 from rohitwaghchaure/item-none-not-found-opening-creation-tool-develop fix: item none not found while making sales invoice using opening inv…	2020-06-14 15:09:38 +05:30
Rohit Waghchaure	d6f9a51cbb	fix: item none not found while making sales invoice using opening invoice creation tool	2020-06-14 14:46:49 +05:30
Deepesh Garg	5bf6bec656	fix: Consider Overseas category in RCM	2020-06-14 13:18:08 +05:30
Anupam K	234b5f9a8c	sm-post-permission-fix	2020-06-14 10:34:58 +05:30
Anupam K	c2d1ed7a34	Merge branch 'develop' of https://github.com/frappe/erpnext into opportunity-dashboard	2020-06-14 00:09:45 +05:30
Anupam K	65e7a2e7a6	opportunity-dashboard-fix	2020-06-14 00:05:38 +05:30
Deepesh Garg	3a16b033b6	Merge branch 'develop' of https://github.com/frappe/erpnext into rcm_develop	2020-06-13 22:50:14 +05:30
Deepesh Garg	6760077674	fix: Billing address in for Purchase documents	2020-06-13 22:40:23 +05:30
Deepesh Garg	dcdd1f3d9b	Merge pull request #22227 from frappe/opportunity-dashboard fix: Links in opportunity dashboard	2020-06-13 22:16:10 +05:30
Deepesh Garg	5f4330621c	Merge pull request #22231 from deepeshgarg007/financila_satement_immutable fix: Handle cancelled entries in financial statements	2020-06-13 21:19:20 +05:30
Deepesh Garg	cc4943d54d	fix: Distributed cost center query updation	2020-06-13 21:13:52 +05:30
Deepesh Garg	d80d442aa1	fix: Do not select cancelled entries in financial statements	2020-06-13 21:12:19 +05:30
Deepesh Garg	f3261794d9	Merge pull request #22230 from deepeshgarg007/financial_statement_to_date_v13 fix: Data not appearing properly for some fiscal_year in financial statements	2020-06-13 19:27:38 +05:30
Deepesh Garg	15231aa60d	fix: Data not appearing properly for some fiscal_year in financial statemets	2020-06-13 19:26:39 +05:30
Anupam K	8bc414620b	opportunity-dashboard-fix	2020-06-13 13:11:43 +05:30
Anurag Mishra	5b8a47d072	fix: patch for expense claim (#22226 )	2020-06-13 01:04:32 +05:30
Deepesh Garg	28fecb1b29	Merge pull request #22198 from scmmishra/membership-fixes fix: verification for razorpay hooks	2020-06-12 21:28:07 +05:30
John Clarke	15e4ea0472	Merge branch 'develop' into clarkejj-patch-1	2020-06-12 07:55:49 -06:00
John Clarke	85f237257a	Thanks so much for your pointer Marica - that violation is clear and obvious to me in retrospect, but a good relearning experience in any case	2020-06-12 07:22:14 -06:00
Deepesh Garg	c258ac82c5	feat: Accounting entries for service item in Purchase receipt	2020-06-12 18:33:42 +05:30
Anurag Mishra	7558e64d6d	fix: set_query in leave application (#22197 )	2020-06-12 17:37:59 +05:30
John Clarke	677978dd00	Update stock_ageing.py As reviewer Deepesh Garg advised thanks! batch[0] can be int of float - see line 49 - so change proposed cint to flt	2020-06-12 05:53:24 -06:00
Anurag Mishra	ec54653852	fix: Child is shown in Parent process if added from tree view	2020-06-12 17:02:31 +05:30
rohitwaghchaure	ee6f80e25b	Merge pull request #22213 from vishdha/fix-credit-limit-notification_v13 feat: notify credit controller role users with credit limit extension request	2020-06-12 16:37:41 +05:30
marination	f9c4b20985	fix: Added PO test and conversion factor fix - Don't change conversion factor if stock uom and uom is the same - Added PO test - Added Accounts User basic role in PO - Minor fixes, wrong variables	2020-06-12 15:49:53 +05:30
Deepesh Garg	7e974c9e2c	fix: Test Cases	2020-06-12 15:29:40 +05:30
Sahil Khan	182c1f860b	fix(patch): escape special characters in company field	2020-06-12 15:16:20 +05:30
Abhishek Balam	86ea75e49e	fix(HR): Change Due Advance Amount to Pending Amount (#22123 ) * rename 'Due Advance Amount' field to 'Pending Amount' * changed fieldname and references for easier debugging * added patch for moving data * added newline added Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>	2020-06-12 13:13:14 +05:30
Shivam Mishra	3bf18509ba	Merge branch 'develop' into membership-fixes	2020-06-12 07:27:20 +00:00
Rohan Bansal	ccd03bc120	feat: notify credit controller role users with credit limit extension requests	2020-06-12 12:48:54 +05:30
Vignesh S	90957b7f74	feat(Attendance): Add In and Out time to attendance (#21547 ) * feat(Attendance): Add In and Out time to attendance Co-authored-by: Karthikeyan S <skarthikeyan1410@gmail.com> * fix:add depends in attendance IN time and OUT time Co-authored-by: Karthikeyan S <skarthikeyan1410@gmail.com>	2020-06-12 12:32:55 +05:30
Marica	c62a6df016	Merge branch 'develop' into qi-on-return	2020-06-12 12:31:20 +05:30
Marica	fd3d976e06	Update erpnext/controllers/stock_controller.py Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-06-12 12:30:59 +05:30
Abhishek Balam	996b306cda	fix territory count	2020-06-12 11:38:07 +05:30
Abhishek Balam	72450d2af3	add revenue if within date range	2020-06-12 11:07:57 +05:30
Abhishek Balam	f596b5950e	indent to tabs	2020-06-12 11:07:28 +05:30
Deepesh Garg	d09aa53571	Merge pull request #22208 from aliriocastro/fix-itemwise-rec-reord-level-report fix: key name to get float precision was misspelled	2020-06-12 10:04:58 +05:30
Deepesh Garg	ca97e19b7e	Merge pull request #22203 from marination/account-tree fix: Check for Company before rendering tree in Account Tree	2020-06-12 10:02:41 +05:30
Alirio Castro	faf33072c8	fix: key was mispelled	2020-06-11 23:32:53 -04:00
Shivam Mishra	241088c73e	Merge branch 'develop' into membership-fixes	2020-06-11 16:53:15 +00:00
John Clarke	6b55f66f02	Stock Ageing TypeError: ‘<’ not supported between instances of ‘int’ and ‘str’ Proposed fix re this error report https://discuss.erpnext.com/t/stock-ageing-report-typeerror-not-supported-between-instances-of-int-and-str/62605	2020-06-11 10:24:48 -06:00
Deepesh Garg	9df4532d14	fix: Travis(develop)	2020-06-11 21:33:43 +05:30
marination	c9a6e4f151	fix: Check for Company before rendering tree in Account Tree	2020-06-11 19:54:44 +05:30
Abhishek Balam	44b8cf4fef	enable 'user cannot create' for payment request (#22044 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-06-11 19:31:41 +05:30
Rucha Mahabal	d7481f59ba	fix: patch	2020-06-11 17:41:05 +05:30
Rucha Mahabal	4dbb7c552c	Merge branch 'develop' into sla-enhancements	2020-06-11 17:04:20 +05:30
Rucha Mahabal	9c27d683ba	fix: priority column width Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>	2020-06-11 17:03:53 +05:30
marination	596560c3c2	fix: Don't prompt for Quality Inspection on Return Documents.	2020-06-11 16:39:03 +05:30
Shivam Mishra	3f60801566	Merge branch 'develop' into membership-fixes	2020-06-11 10:16:39 +00:00
Shivam Mishra	8c24810f30	refactor: ignore mandatory for customer	2020-06-11 15:42:29 +05:30
Shivam Mishra	49d51b8ce7	feat: check duplicate contact explicitly	2020-06-11 14:24:07 +05:30
Shivam Mishra	84fcc55a36	refactor: do nothing if member is not found	2020-06-11 13:34:40 +05:30
Shivam Mishra	8d61a0abef	fix: use string to verify webhook	2020-06-11 13:34:25 +05:30
Deepesh Garg	7d3c3b9a8b	Merge pull request #22188 from deepeshgarg007/payment_terms_outstanding fix: Update payment schedule based on payment terms	2020-06-10 22:17:37 +05:30
Deepesh Garg	a0fd97f2ac	fix: Update payment schedule based on payment terms	2020-06-10 22:15:27 +05:30
Deepesh Garg	f108574772	Merge pull request #22186 from deepeshgarg007/inter_warehouse_party_validation fix: Party validation for inter-warehouse transaction	2020-06-10 20:02:43 +05:30
Deepesh Garg	7963e2b708	fix: Party validation for inter-warehouse transaction	2020-06-10 19:57:49 +05:30
Rohan	d60d2e1826	fix: only auto-set serial nos and batches if allowed in Stock Settings (develop) (#21781 ) * fix: only auto-set serial nos and batches if allowed in Stock Settings * fix: bug with setting disabled batch no in Pick List * fix: remove auto-set batch variable Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-06-10 19:10:56 +05:30
Marica	170d4b7db9	Merge branch 'develop' into website-price-list	2020-06-10 18:57:44 +05:30
Deepesh Garg	6e0d6bd74c	Merge pull request #22184 from deepeshgarg007/item-wise-report-export fix: Item-wise sales and purchase register export	2020-06-10 18:48:35 +05:30
Deepesh Garg	08fee12266	fix: Item-wise sales and purchase register export	2020-06-10 18:33:24 +05:30
marination	fdddb679ed	fix: Prioritize Default Customer Price List in Portal	2020-06-10 18:22:59 +05:30
rohitwaghchaure	496b6a28f2	Merge pull request #22179 from rohitwaghchaure/code-cleanup-for-handling-batch-case-in-SI-develop fix: Cannot read property 'has_batch_no' of undefined	2020-06-10 17:57:07 +05:30
Rohit Waghchaure	afe8e88cb8	fix: Cannot read property 'has_batch_no' of undefined	2020-06-10 17:55:24 +05:30
Marica	aeeadee8f8	Merge branch 'develop' into update-items-permission-fix	2020-06-10 15:19:33 +05:30
rohitwaghchaure	0233f94570	Merge pull request #22081 from deepeshgarg007/jv_list_view fix: Add total debit in Journal Entry list view	2020-06-10 14:17:13 +05:30
rohitwaghchaure	95331a31a7	Merge pull request #22155 from frappe/barredterra-billing_hours feat(projects): bill all hours by default	2020-06-10 14:16:18 +05:30
rohitwaghchaure	9ea9a99889	Merge pull request #22063 from marination/procurement-tracker-develop fix: Procurement Tracker Data Consistency	2020-06-10 14:13:36 +05:30
rohitwaghchaure	3a9c1b23db	Merge pull request #22096 from marination/valuation-rate fix: '>=' not supported between instances of 'str' and 'int'	2020-06-10 14:12:13 +05:30
rohitwaghchaure	63e8f2c430	Merge pull request #22175 from Anurag810/expense_claim_cost_center_fix fix: set cost center in child table	2020-06-10 13:40:51 +05:30
Rucha Mahabal	1e49c6b68b	fix: update duration options	2020-06-10 12:58:16 +05:30
Anurag Mishra	452b7760df	fix: dependency for leave Period in Desk page	2020-06-10 12:48:21 +05:30
Rucha Mahabal	5b6d2c2e7b	Merge branch 'develop' into sla-enhancements	2020-06-10 12:33:19 +05:30
rohitwaghchaure	904e0f4eda	Merge pull request #22106 from Anurag810/employee_onboarding_fix fix: problem during assigning	2020-06-10 12:30:15 +05:30
Anurag Mishra	402c347f83	fix: set cost center in child table	2020-06-10 12:27:59 +05:30
Anupam Kumar	934e30ecac	update program course (#22166 )	2020-06-10 11:07:43 +05:30
Rucha Mahabal	bb3b616a04	fix: set valuesin db for handle hold time	2020-06-09 23:17:51 +05:30
Raffael Meyer	088ab75083	fix: move feature into update_billing_hours	2020-06-09 16:09:40 +02:00
Deepesh Garg	0dd925cfc8	Merge pull request #22164 from frappe/revert-21123-patch-1 Revert "fix: docfield of sales_order is not fetching route options for new doc"	2020-06-09 17:42:42 +05:30
rohitwaghchaure	b42ac845da	Merge pull request #22147 from marination/finished-good-valuation fix: Finished Product Valuation at Repack	2020-06-09 17:42:06 +05:30
Deepesh Garg	e5fe00cf58	Revert "fix: docfield of sales_order is not fetching route options for new doc (#21123 )" This reverts commit `5c54adec28`.	2020-06-09 17:41:27 +05:30
Raffael Meyer	d27d88c3e4	feat: bill all hours by default	2020-06-08 22:52:44 +02:00
marination	f5b9deea5b	fix: Finished Product Valuation at Repack	2020-06-08 13:02:00 +05:30
Karthikeyan S	e9ff6d3d52	feat(Cost Center): Distributed Cost Center (#21531 ) * feat: Distributed Cost Center Squashed commit of the following: commit 274236eb92dfddfd015583ee1e6b5e1937366d28 Author: Vignesh <kaviya.3111999@gmail.com> Date: Mon Mar 23 18:32:26 2020 +0530 Fix: Indentation commit beae0b9849f333dd1d9f29c27192ea7de2e4e809 Author: Vignesh <kaviya.3111999@gmail.com> Date: Mon Mar 23 18:26:50 2020 +0530 The validations are added to distributed cost center. commit 3f66943adacb5797338ef3510251bf6633be3dba Author: Vignesh <kaviya.3111999@gmail.com> Date: Thu Mar 19 22:17:25 2020 +0530 The distributed cost centers are shown with the percentage allocation in the reports commit 1ac11df522096fa187d2f5863b4c970e18b37fac Author: Vignesh <kaviya.3111999@gmail.com> Date: Thu Mar 19 13:36:04 2020 +0530 The child table distributed cost center are added to cost center doctype and then validate percentage allocation. * fix(Distributed Cost Center): validation and filters * fix(Distributed Cost Center): financial statement query * fix(Distributed Cost Center): add test cases Co-authored-by: Vignesh S <svignesh0308@gmail.com> * fix(Distributed Cost Center): budget variance, general ledger, profitability analysis reports. * Merge branch 'develop' into develop-distributed-cost-center * fix(Distributed Cost Center): Added DCC reflection in actual amount column of Budget Variance Report. * Update creation field in general ledger report Co-authored-by: Nabin Hait <nabinhait@gmail.com> * creation field updated in gl_entries query Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: KaviyaPeriyasamy <kaviya.3111999@gmail.com> Co-authored-by: Vignesh S <svignesh0308@gmail.com> Co-authored-by: KaviyaPeriyasamy <kaviyaperiyasamy22@gmail.com> Co-authored-by: Kaviya Periyasamy <36359901+KaviyaPeriyasamy@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-06-08 12:20:21 +05:30
rohitwaghchaure	c6d4c2afb6	Merge pull request #22113 from Anurag810/leave_application-fixes fix: Wrong filters	2020-06-08 10:43:22 +05:30
rohitwaghchaure	b3b5c96749	Merge pull request #22092 from marination/shippinng-address fix: Apply shipping rule without address too	2020-06-08 10:36:19 +05:30
rohitwaghchaure	6debdc89c2	Merge pull request #22121 from rohitwaghchaure/error-report-exponential-smoothing-report fix: 'ForecastingReport' object has no attribute 'total_demand'	2020-06-08 10:30:19 +05:30
Deepesh Garg	63e8391381	Merge pull request #22142 from deepeshgarg007/loan_amount_precision fix: Precision in loan amount calculation	2020-06-07 21:28:23 +05:30
Deepesh Garg	0bc163c230	fix: Ignore GL Entry on cancel	2020-06-07 21:23:55 +05:30
Deepesh Garg	e5ac8cc430	fix: Precision in loan amount calculation	2020-06-07 21:18:47 +05:30
Mangesh-Khairnar	3031128167	fix: fetch tax lines within the shipping lines (#22138 )	2020-06-07 18:02:23 +05:30
Deepesh Garg	c01b4aa2e5	Merge pull request #22131 from deepeshgarg007/tds_monthly_cancelled fix: Cancelled entries in tds payable monthly report	2020-06-07 00:08:17 +05:30
Deepesh Garg	57f9d43c43	fix: Cancelled entries in tds payable monthly report	2020-06-07 00:01:20 +05:30
Rucha Mahabal	73326d308b	refactor: move pause SLA configuration to SLA DocType	2020-06-05 18:23:39 +05:30
Rucha Mahabal	d7d3ca4214	fix: tests	2020-06-05 16:57:37 +05:30
Abhishek Balam	328a55749d	fix(HR): Fix half day error when only 1 day is selected (#22122 ) * fix half day error when only 1 day is selected * adding validation fix for half day on serverside	2020-06-05 16:46:57 +05:30
Rucha Mahabal	25ef6a9638	fix: add default hold statuses in fixtures and patch	2020-06-05 16:37:20 +05:30
Rucha Mahabal	8d39928418	refactor: dashboard indicator when SLA is on hold	2020-06-05 16:36:31 +05:30
Rucha Mahabal	2c9f7cf371	feat: pause SLA on statuses configuration	2020-06-05 16:35:57 +05:30
Rohit Waghchaure	5a82276389	fix: 'ForecastingReport' object has no attribute 'total_demand'	2020-06-05 13:56:20 +05:30
Rucha Mahabal	b29cb87868	refactor: setting avg_response_time moved to communication	2020-06-05 13:35:38 +05:30
Deepesh Garg	407c7bc113	Merge pull request #22067 from marination/item-attribute fix: Misleading Error message for Item Attribute.	2020-06-05 11:21:08 +05:30
P-Froggy	6f87f97efe	fix: Wrong Ordered-Status Indicator for Material Request Items (#22118 ) The indicator displaying if a material request item has been ordered or not (green/orange) used the wrong quantity field for determining the status. The qty field used in the code is not in stock uom while the ordered_qty field is. Now, the stock_qty field is used for correct comparison with ordered_qty.	2020-06-05 10:57:07 +05:30
Anurag Mishra	94582a89c7	fix: Wrong filters	2020-06-04 17:50:47 +05:30
Rucha Mahabal	3f08350181	fix: retain Hold status	2020-06-04 15:56:59 +05:30
Marica	d03ebbd51d	Merge branch 'develop' into valuation-rate	2020-06-04 15:31:11 +05:30
rohitwaghchaure	2213ea3d82	Merge pull request #22109 from rohitwaghchaure/routing-operations-not-in-a-sequence fix: routing operations not added sequentially in the BOM	2020-06-04 14:56:10 +05:30
Rohit Waghchaure	404ed88c0c	fix: routing operations not added sequentially in the BOM	2020-06-04 14:46:50 +05:30
rohitwaghchaure	dd97a5f4a8	Merge pull request #22107 from rohitwaghchaure/fixed-import-supplier-invoice-not-worked fix: import supplier invoice not working	2020-06-04 14:40:30 +05:30
Rohit Waghchaure	60c1855014	fix: import supplier invoice not working	2020-06-04 14:31:35 +05:30
Anurag Mishra	225802e3a0	fix: problem during assigning	2020-06-04 14:15:55 +05:30
Rucha Mahabal	94d03c6100	fix: remove Service Level DocType from Support Desk Page	2020-06-04 12:35:36 +05:30
Rucha Mahabal	b3338a149b	fix: code clean-up	2020-06-04 12:35:00 +05:30
Deepesh Garg	c83ad8185a	Merge pull request #22098 from deepeshgarg007/accounts_payable_error fix: Error when no data is present in AR/AP report	2020-06-03 21:59:28 +05:30
Deepesh Garg	7135a75e5e	fix: Error when no data is present in AR/AP reeport	2020-06-03 21:51:21 +05:30
marination	6f7e9d2904	fix: '>=' not supported between instances of 'str' and 'int'	2020-06-03 17:13:58 +05:30
marination	0c72249403	fix: Apply shipping rule without address too	2020-06-03 14:32:07 +05:30
Deepesh Garg	881999d3bf	Merge pull request #22089 from scmmishra/selling-dash-fix fix: dashboard chart does not exist on selling page	2020-06-03 13:38:36 +05:30
Shivam Mishra	b84dd9b5f5	fix: dashboard chart does not exist on selling page	2020-06-03 13:24:18 +05:30
Myuddin khatri	9276d16420	fix(stock): able to create purchase invoice from purchase receipt dashboard able to create purchase invoice from purchase receipt dashboard	2020-06-03 11:22:49 +05:30
Deepesh Garg	24f9a80e7d	fix(India): Reverse charge mechanism for GST	2020-06-03 10:59:37 +05:30
Shivam Mishra	f460c17961	fix: syntax error (#22082 )	2020-06-02 21:48:23 +05:30
Shivam Mishra	789df32683	feat: verify signature on webhook (#21872 )	2020-06-02 19:18:22 +05:30
Deepesh Garg	60f3a2b8e7	fix: Add total debit in Journal Entry list view	2020-06-02 18:26:43 +05:30
gavin	7a05662e9f	Merge pull request #21491 from gavindsouza/tally-migration-feat feat(Tally migration): Errored documents handling	2020-06-02 13:03:13 +05:30
Deepesh Garg	fecac677ec	Merge pull request #22075 from abhishekbalam/fix-customer-count fix(Accounts): Customer Count in Customer Acq. Report wrong	2020-06-02 00:09:01 +05:30
Abhishek Balam	192d4c8810	indent to tabs instead of spaces	2020-06-01 23:58:05 +05:30
Abhishek Balam	732f5c1867	fixed customer count logic	2020-06-01 23:51:39 +05:30
marination	0df7f0fe9d	fix: Misleading Error message for Item Attribute.	2020-06-01 11:56:33 +05:30
Deepesh Garg	de03d2cba4	fix: Method in hooks for proccesing deferred revenue	2020-06-01 11:30:34 +05:30
marination	c0c455c471	fix: Procurement Tracker Data Consistency	2020-05-31 20:20:59 +05:30
karthikeyan5	ca46bedfcb	fix(ewb): remove checksum validation for TRANSIN	2020-05-30 15:00:56 +05:30
Saqib	c16e278979	Merge branch 'develop' into update-items-permission-fix	2020-05-30 13:16:55 +05:30
Deepesh Garg	3609ddedbb	fix: Purchase receipt item json	2020-05-30 12:03:37 +05:30
Deepesh Garg	159d0734ef	fix: Proccurement tracker report test	2020-05-30 11:47:22 +05:30
Deepesh Garg	1aec30d849	fix: Procurement Tracker test case	2020-05-30 11:47:04 +05:30
Deepesh Garg	c96bf870e4	fix: Test Cases	2020-05-30 11:46:39 +05:30
Deepesh Garg	8a4dc521cd	Revert 'fix: tests depending on global default company'	2020-05-30 11:40:16 +05:30
Deepesh Garg	36f7710356	Revert "fix: tests depending on global default company" This reverts commit `1f20c99ecf`.	2020-05-30 11:38:04 +05:30
Deepesh Garg	f8550790fa	This reverts commit `aa196c0a66`	2020-05-30 11:37:36 +05:30
Abhishek Balam	40694c98aa	fix(HR) : Filter Leave Type based on allocation for a particular employee (#22050 ) * table was showing empty with just headers when no leaves allocated, fixed template code * added filters on Leave Type based on leave allocation for a particular employee and to/from dates	2020-05-30 01:02:06 +05:30
Saqib Ansari	a655db6a79	fix: unexpected removal of print hide field	2020-05-29 22:44:59 +05:30
Saqib Ansari	d531a8ab8d	Merge branch 'develop' of https://github.com/frappe/erpnext into update-items-permission-fix	2020-05-29 22:37:13 +05:30
Saqib Ansari	c579b0879e	fix: cannot update delivery date	2020-05-29 22:34:22 +05:30
Saqib Ansari	5da8b98a04	fix: label	2020-05-29 21:59:01 +05:30
Saqib Ansari	2c3c8aaa2d	fix: submitted sales order can be updated with no permission	2020-05-29 21:55:38 +05:30
rohitwaghchaure	7544160374	fix: routing operations table is blank on pull of operations in BOM (#22039 )	2020-05-29 21:27:24 +05:30
Nabin Hait	2186c223b9	fix: Migrate standard_tax_exemption_amount if field exists (#22036 )	2020-05-29 21:26:49 +05:30
Deepesh Garg	dfa32a77c1	fix: Patch to remove Property Setter	2020-05-29 17:20:33 +05:30
Deepesh Garg	52baf8f863	fix: Test Cases	2020-05-29 17:20:03 +05:30
Chinmay D. Pai	d6587fa1d5	fix: check if swift_number exists in bank account Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-05-29 12:44:09 +05:30
Rucha Mahabal	43d4397003	Merge branch 'develop' into sla-enhancements	2020-05-29 11:43:49 +05:30
Rucha Mahabal	bc38289a59	fix: added patch for sla enhancements	2020-05-29 11:43:05 +05:30
Deepesh Garg	c897e800ed	Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts	2020-05-29 11:04:20 +05:30
Saqib	cd8b5d1e4c	fix: cannot assign same task to other asset maintenance (#22024 )	2020-05-29 10:21:20 +05:30
Mangesh-Khairnar	c302d066a3	fix: only save end date when transactions are returned (#22023 )	2020-05-29 10:19:58 +05:30
Anurag Mishra	cf0168668f	fix: Correct filters (#22022 )	2020-05-29 10:19:33 +05:30
Saqib	3c460364b5	fix: disposed asset creates inconsistencies in asset depr report (#22021 )	2020-05-29 10:18:06 +05:30
Anupam Kumar	8385fed042	crm onboarding typos (#22008 )	2020-05-28 22:14:59 +05:30
Rucha Mahabal	a3dd75e77f	fix: empty filters in Healthcare Charts	2020-05-28 19:03:37 +05:30
sahil28297	9209b9a7de	fix(set_purchase_receipt_delivery_note_detail): commit after every 100 sql updates (#22016 )	2020-05-28 18:49:47 +05:30
Deepesh Garg	1f3fe59e36	fix: Default period start date and period end date for financial statements (#22011 )	2020-05-28 18:36:21 +05:30
sahil28297	517ab955ac	fix(rename_bank_reconcilliation): do not delete doc after renaming (#22013 )	2020-05-28 18:32:16 +05:30
Marica	1a25aa83de	fix: Delete Auto Email Reports (#22009 )	2020-05-28 18:16:24 +05:30
mergify[bot]	fd351f8268	fix: set fiscal year for Profit and Loss chart (#22006 ) (cherry picked from commit `4afda76015`) Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>	2020-05-28 15:18:47 +05:30
Shivam Mishra	6621e22c02	refactor: clean up desk pages (#22004 ) * refactor: clean up desk pages * refactor: update label for CRM	2020-05-28 14:48:50 +05:30
rohitwaghchaure	af91e13435	Merge pull request #22001 from nextchamp-saqib/price-rule-date-field-fix fix: transaction date not found in sales invoice	2020-05-28 14:38:13 +05:30
Rucha Mahabal	3a51a97b2d	Merge branch 'develop' into sla-enhancements	2020-05-28 14:33:51 +05:30
Rucha Mahabal	376a46f1e5	test: hold time for Replied status	2020-05-28 14:33:30 +05:30
Rucha Mahabal	c8e8e29083	test: Issue Metrics	2020-05-28 13:48:09 +05:30
Deepesh Garg	cfcdd52bf4	fix: Inter-company Invoice currency for multicurrency transactions (#21984 )	2020-05-28 13:35:29 +05:30
Anupam Kumar	f10771029a	CRM dashboard fixes (#21989 )	2020-05-28 13:34:55 +05:30
Mangesh-Khairnar	706524f1ae	fix: make transaction date of the oldest transaction as the last integration date (#22000 ) * fix: make transaction date of the oldest transaction as the last integration date * chore: remove blank line after docstring	2020-05-28 13:33:58 +05:30
Saqib Ansari	dd39ba0014	chore: tests	2020-05-28 13:11:04 +05:30
Michelle Alva	8653419c4c	fix: change modified time changed modified time to sync the changes	2020-05-28 12:52:58 +05:30
Saqib Ansari	603cc3d05e	fix: transaction date not found in sales invoice	2020-05-28 12:49:33 +05:30
Deepesh Garg	ab17b07f14	Merge pull request #21985 from marination/import-italian-invoice-dev chore: Added Italian Import Supplier Invoice to Desk	2020-05-28 12:33:53 +05:30
rohitwaghchaure	063d344000	Merge pull request #21998 from rohitwaghchaure/fixed-label-for-date fix: labels for date in manufacturing reports	2020-05-28 12:09:02 +05:30
Rohit Waghchaure	b86c0eb404	fix: labels for date in manufacturing reports	2020-05-28 12:07:13 +05:30
rohitwaghchaure	bf561f9387	Merge pull request #21738 from theopen-institute/fee-schedule-date fix(Education): Added a posting_date field to Fee Schedule	2020-05-28 12:01:30 +05:30
totolouis	596b3dbeee	fix: translation from HTML code to apostrophe For French translation, the apostrophe was in HTML code and thus is not displayed correctly. Issue reported a few times: https://discuss.erpnext.com/t/apostrophe-is-showed-as-39-is-not-interpreted/49954/3 and https://discuss.erpnext.com/t/mega-thread-version-12-release-bugs/50987/49.	2020-05-27 22:51:03 -07:00
Michelle Alva	f7beeff2d8	fix: change description for field (#21995 ) grammatical fixes for description of Default Customer	2020-05-28 11:05:19 +05:30
Rohit Waghchaure	5226403b62	refactor: display draft job card as Open job card	2020-05-28 10:15:01 +05:30
rohitwaghchaure	7320a72237	Merge pull request #21991 from rohitwaghchaure/fixed-forecasting-data-and-changed-columns refactor: showing the order's data for past period	2020-05-28 09:56:47 +05:30
Rohit Waghchaure	234a55c6bc	refactor: showing the order's data for past period	2020-05-28 09:55:24 +05:30
Deepesh Garg	6fe3a24c5d	Merge pull request #21986 from deepeshgarg007/tds_computation_summary fix: TDS computation summary report	2020-05-27 22:49:42 +05:30
Deepesh Garg	33a08f1ea7	fix: TDS computation summary report	2020-05-27 22:44:50 +05:30
marination	50956aa29e	chore: Added to v13 desk under Regional Link Card	2020-05-27 22:24:39 +05:30
marination	29d7a7ea05	fix: Added permission via regional setup and patch	2020-05-27 22:14:36 +05:30
marination	3da51984f2	chore: Add Import Supplier Invoice to Menu	2020-05-27 22:13:40 +05:30
rohitwaghchaure	7ac731dd4f	fix: raw material warehouse in Production Planning Report (#21982 )	2020-05-27 21:53:17 +05:30
Marica	c2aabb0fbf	fix: Buying Module fixes (#21965 ) * fix: Buying Module fixes * fix: Delete Report files as well * fix: Add Purchase Order Analysis to Stock & Accounting	2020-05-27 20:56:39 +05:30
Shivam Mishra	cb1a7d0fbc	fix: use get_datetime instead of getdate	2020-05-27 20:36:28 +05:30
Shivam Mishra	8fcbf1b90e	fix: compare start and end time to prevent negative diff (#21974 ) * fix: compare start and end time to prevent negative diff * feat: parse date when comparing	2020-05-27 20:31:30 +05:30
Deepesh Garg	152377f84d	fix: Total for ageing column 121-Above (#21972 )	2020-05-27 20:29:10 +05:30
Marica	a49f045d14	fix: Grammar fixes (#21970 )	2020-05-27 20:28:37 +05:30
Deepesh Garg	0030b95595	fix: Filtering issues in opneing invoice creation tool (#21969 )	2020-05-27 20:27:33 +05:30
Deepesh Garg	873542bc7f	fix: Do not allow backdated stock transactions in previous fiscal year (#21967 )	2020-05-27 20:26:38 +05:30
Anurag Mishra	d6d84a3c15	fix: Module Onboarding for HR (#21963 )	2020-05-27 20:21:15 +05:30
Anupam Kumar	a77032f926	onbarding steps fix (#21959 )	2020-05-27 20:20:20 +05:30
Deepesh Garg	df5f8528e7	Merge pull request #21957 from nabinhait/fix344 fix: label changed in production plan	2020-05-27 18:42:12 +05:30
rohitwaghchaure	29bd1c3968	Merge pull request #21960 from rohitwaghchaure/fixed-filters-for-manufacturing-reports fix: filters for the manufacturing reports	2020-05-27 15:38:51 +05:30
Shivam Mishra	45571b99a8	feat: added tour to manufacturing settings	2020-05-27 15:36:59 +05:30
Rohit Waghchaure	cb1a910538	fix: filters for the manufacturing reports	2020-05-27 15:26:40 +05:30
Andrew McLeod	0fa1cc647f	fix: website_list_for_contact, fix changed frappe.db.exist keyword argument (#21958 )	2020-05-27 13:36:35 +05:30
Nabin Hait	07388495f3	fix: label changed in production plan	2020-05-27 12:59:03 +05:30
Deepesh Garg	ed2c1803df	fix: Post Dated unallocated amount not considered in Advance Amount in AR/AP summary (#21837 ) * fix: Post Dated unallocateed amount not considered in Advance Amount in AR/AP summary report * fix: Add future payment filter in AR/AP summary * fix: Show unallocated future payments only till current creation date * fix: Remove extra query * fix: Remove debug * fix: Condition	2020-05-27 12:46:12 +05:30
Rucha Mahabal	a18c896a56	fix: titles and order of Healthcare Onboarding steps (#21948 ) * fix(Healthcare): title and order of onboarding steps * refactor: healthcare settings tour	2020-05-27 12:43:44 +05:30
Anurag Mishra	ef0026c06f	fix: addtional salary date validation (#21952 )	2020-05-27 12:28:11 +05:30
Anurag Mishra	01bced8c67	fix Report not working on parameter Grade (#21951 )	2020-05-27 12:26:54 +05:30
Shivam Mishra	2a81058f90	refactor: project summary report (#21943 ) * feat: added more filters * feat: show only first 30 projects in chart * Update erpnext/projects/report/project_summary/project_summary.js Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-05-27 11:53:48 +05:30
Shivam Mishra	e4bbdbbfe1	fix: get data from request directly (#21954 )	2020-05-27 11:47:26 +05:30
rohitwaghchaure	07b56610dd	Merge pull request #21946 from rohitwaghchaure/fixed-v13-beta-2-issues-develop fix: manufacturing dashboard and work order summary chart	2020-05-26 23:19:57 +05:30
Rohit Waghchaure	1e04b455f0	fix: manufacturing dashboard and work order summary chart	2020-05-26 23:14:21 +05:30
Deepesh Garg	3a723dd815	Merge pull request #21940 from deepeshgarg007/acc_dim_report_filter fix: Do not add filters in report on accounting dimension creation if it already exists	2020-05-26 19:30:43 +05:30
Deepesh Garg	bcee78d054	fix: Remove console statement	2020-05-26 19:26:47 +05:30
Deepesh Garg	11ea0b1289	fix: Do not add filters in report on accounting dimension creation if it already exists	2020-05-26 19:23:45 +05:30
Abhishek Balam	18e7b60acc	feat(Selling): Gross Profit In Quotation (#21795 ) * added valuation rate and gross_profit in quotation item table * modified code to not fetch valuation_rate manually, used set_gross_profit from selling controller	2020-05-26 18:37:02 +05:30
Chinmay Pai	49b2b155b6	fix: sanitize all-products search before displaying results (#21764 ) Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-05-26 18:21:11 +05:30
Afshan	c0b4ec52de	fix: UX date range field separated in from and to date fields. (#21765 ) * fix for issue #21419 * changing group by filter to default Group by Voucher (Consolidated) * divided date range to seperate from and to date * divided date range to seperate from and to date for purcase and sales register	2020-05-26 18:20:47 +05:30
Rohan	d28854b3c2	fix: throw error if no serial numbers are found in Pick List (#21915 ) Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-05-26 18:13:25 +05:30
Anurag Mishra	56357fafeb	fix: Added column Expired Leave (#21857 )	2020-05-26 18:08:22 +05:30
Deepesh Garg	5fa207f020	fix(UAE): Incorrect VAT rate display in Sales Invoice (#21882 )	2020-05-26 18:02:21 +05:30
Anurag Mishra	752ca63fea	fix: Was showing opening on date not remaimning leave (#21899 )	2020-05-26 18:01:03 +05:30
Anurag Mishra	93e15c5f5c	fix: showing Wrong balance on allocation boundary dates (#21904 )	2020-05-26 18:00:37 +05:30
Mangesh-Khairnar	7402451b96	fix: shopify error message on failure of sales order creation (#21924 )	2020-05-26 17:56:40 +05:30
Mangesh-Khairnar	ddc170521f	fix: check for warehouse in the woocommerce settings (#21925 )	2020-05-26 17:55:56 +05:30
Rucha Mahabal	c52bbd79bf	fix(Healthcare): set company in healthcare service unit setup (#21929 )	2020-05-26 17:54:46 +05:30
Marica	74a910ae92	fix: title for onboarding step (#21933 ) Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>	2020-05-26 17:49:34 +05:30
Prssanna Desai	ee70d7a7eb	fix: fix function import (#21927 )	2020-05-26 17:02:51 +05:30
Rucha Mahabal	f91ed4ce24	fix: add default priority field in SLA	2020-05-26 16:03:47 +05:30
Rucha Mahabal	f3fc544918	fix: SLA tests	2020-05-26 15:03:15 +05:30
Rucha Mahabal	5379e87880	refactor: code cleanup, break functions	2020-05-26 12:48:03 +05:30
Rucha Mahabal	ec6246306c	refactor: set variance and SLA as Ongoing on Issue reopen	2020-05-26 12:32:12 +05:30
Rucha Mahabal	899ec36532	feat: added Resolved status with same functionality as Closed	2020-05-26 12:23:28 +05:30
Rucha Mahabal	79ed5755be	refactor: remove Hold status	2020-05-25 22:04:04 +05:30
Rucha Mahabal	372aa44b19	feat: implement hold time on Replied status for SLA	2020-05-25 21:37:58 +05:30
Anurag Mishra	a7f42f7256	fix: showing wrong record (#21884 )	2020-05-25 19:23:17 +05:30
Anupam Kumar	0a147d5c76	fix: adding dashboard in course and assessment plan (#21889 ) * Adding dashboards * adding dashboard in course and assessment plan	2020-05-25 19:21:48 +05:30

... 7 8 9 10 11 ...

23303 Commits