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
03c9cc0921
Merge pull request #22764 from ruchamahabal/change-video-doctype-module
...
fix: move Video DocType from Core to Utilities module
2020-07-22 21:26:26 +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
gavin
35f726e75c
Merge branch 'develop' into dependabot/npm_and_yarn/lodash-4.17.19
2020-07-22 19:34:19 +05:30
Marica
60af68bc48
Merge pull request #22607 from AfshanKhan/club-mr-column
...
feat: added columns to get complete analysis for material request
2020-07-22 19:31:48 +05:30
Rucha Mahabal
f4a7adbf2e
refactor: Education Desk Page
2020-07-22 18:59:04 +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
Rucha Mahabal
a13a0608b6
Merge pull request #22743 from frappe/vehicle
...
fix: Heatmap in Vehicle
2020-07-20 23:52:25 +05:30
Marica
8ec4198af2
Merge branch 'develop' into club-mr-column
2020-07-20 16:07:10 +05:30
Afshan
2b21b7bafa
fix: moved custom_make_buttons to PurchaseOrderController to avoid duplication of dropdown options
2020-07-20 16:05:52 +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
Deepesh Garg
04e8af7dca
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_and_fixes
2020-07-20 09:53:26 +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