Afshan
55125fbe4e
fix: moved custom_make_buttons to PurchaseOrderController to avoid duplication of dropdown options ( #22744 )
2020-07-23 17:44:38 +05:30
Rucha Mahabal
833682b03d
feat(Education): Student Attendance and Leave Enhancements ( #22623 )
...
* feat: make Student Attendance doctype submittable
* feat: add attendance related fields in Student Leave Application
* feat: update Attendance records on Leave Application submission
* refactor: better error messages and ORM queries
* fix: show present only for leave applications with mark_as_present enabled in attendance reports
* test: Student Leave Application
* fix: filter for attendance records
* fix: codacy issues
2020-07-23 16:40:07 +05:30
Anupam Kumar
04a76285e2
fix: Unable to change link from new lead to existing customer ( #22787 )
...
* Unable to change link from new lead to existing customer
* Unable to change link from new lead to existing customer
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-07-23 16:30:56 +05:30
Anupam Kumar
7137b0b670
refactor: shopping cart ( #22617 )
...
* refactoring shopping cart settings
* adding column_break in shopping cart settings
2020-07-23 15:58:47 +05:30
Rucha Mahabal
5142fc9365
feat(Education): added form dashboards and refactored custom buttons for better linking ( #22727 )
...
* feat: add form dashboards to all forms in Education Module
* feat: Add Course to Programs button in Course DocType
* refactor: custom buttons in Education module forms
* feat: buttons to add topic, article, quiz to their respective parent doctypes
* feat: add charts to form dashboards
* fix: code cleanup
2020-07-23 15:57:27 +05:30
KanchanChauhan
2826fd3c20
feat: Dunning ( #22559 )
...
* feat: Dunning
* fix: Replaces spaces with tab
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-07-23 15:45:03 +05:30
Afshan
767ee1cdb8
fix: logic to get other items also other than just 1st one
2020-07-23 15:39:27 +05:30
Anoop
23481cc484
feat: Laboratory Module Enhancements ( #22416 )
...
* feat: option to add organism count in descriptive tests
print format to accommodate descriptive test changes
fix: refactoring, clean up wip
* lab test - result based on secondary uom, result format options
lab test print - consider result format options, result legend and worksheet instructions
* feat: option to allow results blank in lab test if configured via lab test template
* fix: rename child doctypes, rename related links
* fix: field display depends on, cleanup - rename fields and variables
* fix: get from encounter popup layout, code cleanup and minor fixes
* fix: sms send dialog bug
* fix: lab test get from encounter html class name typo corrected
* fix: lab test organisms depends on condition
* fix: reorder fields - depends on fields brought together
* fix: PR review feedback, removed : separator, result formatting applied to result UOM
* fix: child table js removed
* fix: internal field require_result_value hidden, secondary uom result field type set to data
* fix: Use ORM methods instead of db.sql, code cleanup, style
* fix: create item price for lab test template if billable, code cleanup
* fix: patch rename doctypes before fields, deleted renamed child doctypes
* fix: secondary uom result calc - warn user if calculation fails
* fix: patch to insert entries into renamed child tables
* fix: codacy issues
* fix: patch duplicate error as items are already migrated in v12 migrate
organisms child table field name updated
* fix: patch a bit lenghty, added comments
* fix: patch
* fix: require_result_value flag marked hidden
* fix: code cleanup-up
* fix: patch - lab_test rename field, lab_test_group_template select option corrected
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-07-23 15:00:54 +05:30
Anurag Mishra
453325fbc9
fix: job applicant fixes ( #22448 )
...
* fix(validation): not two job offer should be allowed for single job_applicant
* fix: don't allow to create employee_onboarding without job offer
* fix: server side validation
* fix: requested changes
2020-07-23 12:22:42 +05:30
Deepesh Garg
7ac4ad8410
fix: Error due to comma in Pricing rule name ( #22741 )
...
* fix: Error due to commma in Pricing rule name
* fix: Remove print statement
* fix: Tests
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-23 12:12:55 +05:30
Anurag Mishra
9aa0602065
Fix: HR and Payroll Dashboard ( #22771 )
...
* Fix: HR and Payroll Dashboard
* fix: requested changes
2020-07-23 12:10:48 +05:30
Chinmay D. Pai
3e503e4404
chore: do not reset homepage through hooks
...
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-07-23 12:06:19 +05:30
Anurag Mishra
ce5b490f66
feat : Recruitment analytics ( #21732 )
...
* feat: recruitment_anlytics
* fix: filters
* feat: added missing column designation
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-23 12:04:58 +05:30
Deepesh Garg
9c49f2d886
feat: Enhancement in subscription ( #22263 )
...
* feat: Add supplier in subscription doctype
* fix: Code cleanup
* fix: Add dynamic link in subscription invoices
* fix: Multiple enhanccement in subscription
* feat: Follow calendar months in subscription
* fix: Test Cases and patch
* fix: Patch
* fix: Update patch and add fixes
* fix: Update permission for subscription settings
* fix: Patch and Test
* fix: Add cost center dimension in Subscripiton
2020-07-23 11:11:23 +05:30
Anupam Kumar
a18f2ec23e
fix: setting filter for project in kanban board ( #22717 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-07-23 11:09:17 +05:30
Marica
43b4b1cb55
chore: Export Buying Dashboard ( #22767 )
...
* chore: Export Buying Dashboard
* fix: Use Timespan instead of Between for static filters
2020-07-23 11:08:49 +05:30
Anupam Kumar
4a5fc23d5c
Export Project dashboard ( #22782 )
2020-07-23 11:07:56 +05:30
Marica
f207f48a67
Merge branch 'develop' into change-video-doctype-module
2020-07-22 21:22:39 +05:30
Prssanna Desai
fb89906354
fix: pass date range instead of from date ( #22114 )
...
* fix: pass date range instead of from date
* fix: escape inputs
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-07-22 20:17:50 +05:30
Marica
3994aa8b06
fix: Same Contact name for different parties at Portal Login ( #22715 )
2020-07-22 19:49:54 +05:30
Marica
2ee64ceaff
Merge branch 'develop' into club-mr-column
2020-07-22 18:52:10 +05:30
Deepesh Garg
c88a3b4bf9
Merge pull request #22765 from anupamvs/rfq
...
feat: Provision to make RFQ against Opportunity
2020-07-22 18:28:48 +05:30
rohitwaghchaure
d45ff31ff0
fix: incorrect stock after merging the items ( #22526 )
...
* fix: incorrect stock after merging items
* fix: Readability fix
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-22 18:24:01 +05:30
Deepesh Garg
7c50f421e1
fix: Move branch code back to bank account ( #22725 )
...
* fix: Move branch code back to bank account
* fix: Patch
2020-07-22 18:21:04 +05:30
Anupam Kumar
3e4b5e5496
fix: item-wise sales history report ( #22783 )
2020-07-22 18:17:58 +05:30
Anupam Kumar
e519334dfc
feat: Export CRM dashboard ( #22778 )
...
* feat: Exported CRM dashboard
* feat: Export CRM Dashboard
* fix: adding company in all dashboard and number card
2020-07-22 18:16:57 +05:30
Anupam K
5bd0b93acf
fix: cur_frm -> frm
2020-07-22 18:10:57 +05:30
Anupam Kumar
93afbe143b
feat: Export Selling Dashboard ( #22776 )
...
* feat:Export Stock Dashboard
* Export Selling Dashboard
* Export Selling Dashboard
2020-07-22 18:07:39 +05:30
Deepesh Garg
c7eadfceb0
fix: Multi currency payment reconciliation ( #22738 )
...
* fix: Multi currency payment reconciliation
* fix: Hide currency link fields
2020-07-22 17:59:37 +05:30
Prssanna Desai
f098221550
feat: Exported manufacturing dashboard ( #22626 )
...
* feat: exported Manufacturing Dashboard
* fix: update use_report_chart fieldname
* fix: add dynamic filter for company in Produced Quantity chart
2020-07-22 16:58:17 +05:30
sahil28297
3d3c922d7f
fix(patch): handle duplicate entry error while inserting account ( #22745 )
2020-07-22 16:42:31 +05:30
Marica
514366654e
fix: Serial No Rename does not affect Stock Ledger Entry ( #22746 )
...
* Revert "fix: Remove rename related code from Serial No (#22627 )"
This reverts commit 1ec2d962db
.
* fix: Rename fails on Stock Ledger Entry
* fix: Allow Rename in Serial No
2020-07-22 16:40:24 +05:30
Marica
53646cb360
chore: Export Stock Dashboard ( #22768 )
2020-07-22 16:17:40 +05:30
Shivam Mishra
f50312b6d2
fix: button sizing ( #22777 )
2020-07-22 16:17:11 +05:30
Rucha Mahabal
1fddc6d126
chore: Exported Accounts Module Dashboard ( #22769 )
...
* chore: Exported Accounts Module Dashboards
* chore: deleted dashboard fixtures for Accounts module
2020-07-22 16:11:06 +05:30
Afshan
6b9acf4476
updated patch to delete auto email reports and moved patch to v13 from v12
2020-07-22 16:00:18 +05:30
Rucha Mahabal
8d28eacb09
chore: Exported Healthcare Module Dashboard ( #22775 )
2020-07-22 15:57:33 +05:30
Deepesh Garg
d6615248a8
Merge pull request #22762 from DeeMysterio/financial-stat
...
fix(report): fix alignment in script report that extends financial_statements.js
2020-07-22 14:45:22 +05:30
Anupam K
de417d2774
feat: Provision to make RFQ against Opportunity
2020-07-22 01:05:32 +05:30
Afshan
871889220b
style: moved parent warehouse to top section also added a section bre… ( #22708 )
...
* style: moved parent warehouse to top section also added a section break for better look
* style: changes display depends on for HTML field
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-21 20:39:00 +05:30
Afshan
66d4b42df0
fix: update set query for warehouse after changing the company ( #22632 )
...
* fix: update set query for warehouse after changing the company
* fix: changed set_query to get_query
* fix: variable filter doesn't get updated once set on load hence removed
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-21 19:59:30 +05:30
Rucha Mahabal
ffbd7b4087
fix: move Video DocType from Core to Utilities module
2020-07-21 19:40:18 +05:30
Diksha Jadhav
09b8caf866
fix(report): fix alignment in script report that extends financial_statements.js
2020-07-21 17:35:10 +05:30
Deepesh Garg
9e5aa282ec
Merge pull request #22753 from nabinhait/trial-balance-opening-cancelled-entry-fix
...
fix: Ignore cancelled entries in trial balance opening
2020-07-21 16:42:02 +05:30
Abhishek Balam
a5b83e85c3
feat: dashboard for timesheet ( #22750 )
2020-07-21 12:54:59 +05:30
Nabin Hait
493b581862
fix: Ignore cancelled entries in trial balance opening
2020-07-21 12:47:16 +05:30
Marica
8ec4198af2
Merge branch 'develop' into club-mr-column
2020-07-20 16:07:10 +05:30
michellealva
8c7d8ba917
fix: remove tab in code
2020-07-20 13:12:17 +05:30
michellealva
37cd1b8021
fix: Heatmap in Vehicle
2020-07-20 13:04:46 +05:30
Chinmay D. Pai
33bf0574a3
chore: fix get single value call
...
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-07-19 15:54:11 +05:30
Chinmay D. Pai
5bda28eae6
fix: reset homepage to home after unchecking products page
...
resets homepage back to home when "home page is products" is unchecked
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-07-19 00:15:40 +05:30
Deepesh Garg
d81372a39c
Merge pull request #22734 from deepeshgarg007/custom_cash_flow
...
fix: Period list api changes for custom cash flow report
2020-07-18 20:35:28 +05:30
Deepesh Garg
07f8e749be
fix: Period list api changes for custom cash flow report
2020-07-18 19:47:33 +05:30
Deepesh Garg
f6c70bca0a
Merge pull request #22615 from aerele/fix_mandatory_error
...
fix: log type mandatory error while exposing api call to employee checkin.
2020-07-17 17:38:21 +05:30
Deepesh Garg
2fd4aa3051
Merge pull request #22661 from frappe/lead-owner-efficiency
...
fix: making owner fieldtype to link
2020-07-17 17:36:59 +05:30
rohitwaghchaure
f4db8c1c11
Merge pull request #22724 from rohitwaghchaure/fixed-incorrect-currency-symbol-in-stock-balance-report-develop
...
fix: currency symbol not showing as per company currency in stock balance report
2020-07-17 16:56:22 +05:30
rohitwaghchaure
b4ef13c686
Merge pull request #22726 from rohitwaghchaure/fixed-actual-qty-showing-as-zero-develop
...
fix: Stock Reconciliation Invalid Quantity for Batched Item
2020-07-17 16:55:59 +05:30
Rucha Mahabal
3e6fe38d02
Merge branch 'develop' into fix-maintenance-visit
2020-07-17 16:34:59 +05:30
Rohit Waghchaure
2347e69cb9
fix: for past dated stock reco, batched item showing the current available qty instead of quantity as per posting date
2020-07-17 14:50:49 +05:30
Rohit Waghchaure
848568d023
fix: currency symbol not showing as per company currency in stock balance
2020-07-17 14:49:12 +05:30
rohitwaghchaure
7e56e80057
Merge pull request #22721 from deepeshgarg007/gstr_test
...
fix: Multiple fixes in GST
2020-07-17 14:34:43 +05:30
Mangesh-Khairnar
9be6787b80
fix(maintenance-visit): change fieldtype of status to select
2020-07-17 12:51:49 +05:30
Rucha Mahabal
7e64a1f170
Merge branch 'develop' into issue-list-action
2020-07-17 11:48:23 +05:30
Deepesh Garg
188273564c
fix: Multiple fixes in GST
2020-07-17 11:31:15 +05:30
michellealva
d02465a68f
fix: Update modified timestamp for Delivery Note Item
2020-07-17 10:35:16 +05:30
marination
6319073d81
fix: Move Issue List actions under 'Actions' dropdown
2020-07-16 15:38:51 +05:30
Karthikeyan S
ff6ba25386
fix: remove FE validation for log_type field
2020-07-16 13:33:38 +05:30
Anurag Mishra
ac23ac6a02
fix: validation for additional salary ( #22645 )
...
* fix: validation for additional salary
* fix:changes requested
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-07-16 13:10:43 +05:30
Rucha Mahabal
6b3110ed13
Merge branch 'develop' into expense-claim-payment-fix
2020-07-16 12:23:26 +05:30
Anurag Mishra
50902cf30c
Fix: Changes Requested
2020-07-16 12:21:46 +05:30
Suraj Shetty
11b0554ae9
Merge branch 'develop' into fix-financial-statement-print-format
2020-07-16 09:45:26 +05:30
Deepesh Garg
52c319cfa7
fix: Update RCM only for indian countries
2020-07-16 00:23:58 +05:30
Deepesh Garg
2af43b3df6
fix: linting
2020-07-15 21:54:28 +05:30
Deepesh Garg
49821df0ae
Merge pull request #22697 from rohitwaghchaure/fixed-not-able-to-submit-si
...
fix: not able to submit sales invoice
2020-07-15 21:51:16 +05:30
Deepesh Garg
177bbd8e20
Merge pull request #22701 from deepeshgarg007/gstr3b_cess
...
fix: Cess amount in GSTR 3B report
2020-07-15 18:20:42 +05:30
Deepesh Garg
0fa4143bac
fix: Cess amount in GSTR 3B report
2020-07-15 18:17:38 +05:30
rohitwaghchaure
8ff821970a
Merge pull request #22700 from rohitwaghchaure/fixed-incorrect-balance-qty-in-stock-ledger-develop
...
fix: incorrect balance qty in stock ledger report
2020-07-15 17:25:11 +05:30
Rohit Waghchaure
132376750c
fix: incorrect balance qty in stock ledger report
2020-07-15 17:23:17 +05:30
Rohit Waghchaure
e0de0ac617
fix: not able to submit sales invoice
2020-07-15 17:13:43 +05:30
Rohit Waghchaure
07cc918d70
fix: patch update_actual_start_and_end_date_in_wo
2020-07-15 16:41:32 +05:30
Suraj Shetty
34617744e1
fix: Show total row in print format of financial statement
2020-07-15 16:37:21 +05:30
rohitwaghchaure
f16bd00463
Merge pull request #22608 from ruchamahabal/fix-sla-ui
...
fix: allow creating SLA documents even if SLA tracking is not enabled
2020-07-15 15:47:37 +05:30
rohitwaghchaure
30030230bf
Merge pull request #22675 from marination/material-request-warehouse
...
fix: Dont overwrite default warehouse in Material Request
2020-07-15 15:35:38 +05:30
rohitwaghchaure
7c08ff7572
Merge pull request #22596 from marination/exploded-item-rate
...
fix: Exploded Item Rate in BOM
2020-07-15 14:30:27 +05:30
Rohit Waghchaure
e1b3f16abd
fix: project field added two time in purchase receipt
2020-07-15 12:28:19 +05:30
Deepesh Garg
5beac7a0cc
fix: Period list fixes in financial statements ( #22677 )
2020-07-15 12:17:43 +05:30
Anurag Mishra
c1636f8fab
fix: conversion rate as 1 if no conversion rate
2020-07-14 18:58:02 +05:30
marination
392f323d2d
fix: Dont overwrite default warehouse in Material Request
2020-07-14 17:03:17 +05:30
rohitwaghchaure
eb2a42d9e1
Merge pull request #22589 from deepeshgarg007/rcm_fix
...
fix: Do not add GST tax amount in grand total for reverse charge invoices
2020-07-14 13:42:48 +05:30
Rucha Mahabal
c4a1b34811
Merge branch 'develop' into fix-sla-error
2020-07-14 13:24:57 +05:30
Marica
82a606d04b
fix: Added Project Field in Purchase Receipt for Stock Ledger Tagging ( #22666 )
2020-07-14 13:16:28 +05:30
Anupam Kumar
c5f14da99c
Merge branch 'develop' into lead-owner-efficiency
2020-07-14 12:59:42 +05:30
Rucha Mahabal
88931f0677
fix(Support): TypeError while saving Service Level Agreement
2020-07-14 11:46:11 +05:30
John Veness
72320afb07
Correct help link for Address ( #22673 )
2020-07-14 10:44:15 +05:30
bhavesh95863
eb69859d3e
fix: Quotation list view blank if quotation_to field not set as a standard filter
2020-07-13 23:15:31 +05:30
rohitwaghchaure
165d57aa0b
Merge pull request #22663 from rohitwaghchaure/fixed-error-report-related-to-task-develop
...
fix: '>' not supported between instances of 'str' and 'int'
2020-07-13 18:11:50 +05:30
rohitwaghchaure
165eb5a1c3
Merge pull request #22665 from marination/maintenance-schedule
...
fix: Block Invalid Serial No updates in Maintenance Schedule
2020-07-13 18:11:06 +05:30
rohitwaghchaure
62fe2cac19
Merge pull request #22051 from deepeshgarg007/project-link-for-all-accounts
...
fix: Project link not set in accounts other than profit and loss accounts
2020-07-13 18:09:41 +05:30
Marica
3f8840cd7a
Merge branch 'develop' into maintenance-schedule
2020-07-13 15:24:37 +05:30
Rucha Mahabal
68cc3e4220
Merge branch 'develop' into fix-sla-ui
2020-07-13 14:40:01 +05:30