Rucha Mahabal
eaa956b994
feat(Healthcare): Rehabilitation Module ( #21216 )
...
* feat: added rehab sub-module doctypes
* feat: rehab module
* feat: prescribe procedures in Patient Encounter
* feat: create Therapy Plan on Encounter submission
* feat: manage item for Therapy Type
* feat: book appointments, get prescribed therapies for Therapy Sessions
* feat: invoice Therapy Sessions
* feat: plan completion progress bar and exercise countsindicators
* feat: Motor Assessment Scale
* feat: add editable card view for exercise steps
* fix: add rehab in healthcare desk page
* fix: card deletion not working when child table is hidden
* feat: automatically fetch therapies according to Body Part
* fix: added tests for Therapy Type and Plan
* fix: add exercises according to body parts in Therapy Type
* fix: label for Exercise Instructions
* fix: exercise cards css
* feat: add dashboard for Therapy Plan
* feat: Patient Assessment Template and Patient Assessment
* feat: add title fields in Therapy Plan and Session
* fix: remove Motor Assessment Scale
* fix: fetch assessment description
* feat: create Patient Assessment from Therapy Session
* fix: anti pattern code
* fix: update desk page
* fix: exercise card rendering
* fix(test): filter out disabled Items in test_mapper
* fix: get stock uom from Stock Settings for Therapy Type Item creation
* fix: multiline SQL query
* fix: permissions for DocTypes
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-22 13:07:12 +05:30
Rucha Mahabal
06d1b047e0
refactor: Healthcare Module Page
2020-03-12 12:16:23 +05:30
marination
24f4683999
chore: Rearranged Buying Module Dashboard
2020-02-28 12:58:41 +05:30
Deepesh Garg
d1d0a50a70
feat: Loan management and accounting ( #19035 )
...
* fix: Create Loan Management module
* fix: Move loan doctype for hr module to loan management
* fix: Add loan dashboard
* fix: Move loan application form hr module to loan management
* fix: Move Loan Type from hr to loan management
* fix: Move salary slip loan from hr to loan management
* fix: Create loan security pledge doctype
* fix: Create loan security type doctype
* fix: Create Loan security doctype
* fix: Add customer in loan_common.js
* fix: Import patch for loan
* fix: Add security pledging in loan doctype
* fix: Add loan application pledge doctype
* fix: Add logic for security pledgeing in loan
* fix: Add logic for security pledging in loan application
* fix: Rename Loan security doctype to Loan Security Pledge
* fix: Add doctype for loan security
* fix: Fixes in loan and loan application
* fix: Add doctypes for loan repayment
* fix: Fixes in loan and loan application
* fix: Move loan repayment report from HR module to loan management
* fix: Create doctype for loan security price
* fix: Create doctype for loan security shortfall
* fix: Make fields in Loan shortfall readonly
* fix: Make loan type submittable
* fix: Add daily job for loan security revaluation in hooks.py
* fix: Add loan management module
* fix: Doctype for loan disbursement Entry
* fix: GL entry fix for loan disbursement
* fix: Add company currency options in Loan related doctypes
* fix: Changes in Loan Doctypes
* fix: Allow miltiple loan securities in Loan Security Pledge
* fix: Add proposed pledges in Loan Application
* fix: Add test cases for loan
* fix: Interest Accrual Entry for loans
* fix: Remove loan from journal entry
* fix: Update triggers in loan_common.js
* fix: Accrual Entries for loan Interest
* fix: Proposed Pledges for loan application
* fix: Update items in loan management module
* fix: Allow multiple disbursements against a loan
* fix: Add loan security code in loan security master
* fix: Allow multiple securities in a single pledge
* fix: Spelling and label fixes
* fix: Replace date in loan security price with datetime
* fix: Add dashboard to loan master
* fix: Move Repayment Schedule from HR to Loan Management
* fix: Add back jobs for loan accrual entries
* fix: Multiple fixes in loan
* fix: Multiple fixes in loan application
* fix: Loan Reapayment for term loans
* fix: Interest Accural Entries for term loans
* fix: Changes in Loan Doctypes
* fix: Add test case for term loan repayment
* fix: Add custom button to update loan security price and trigger shortfall
* fix: Usability fixes in Loan management
* fix: Multiple usablity and doctype fixes
* fix: Muliple bug and usability fixes in loan
* fix: Test case fixes for loan repayment from Salary
* fix: Codacy fixes
* fix: Test Case fixes
* fix: Minor fix in validate_repayment_method
* fix: Test case and codacy fixes
* fix: Provide consistent naming series to loan doctypes
* fix: Loan Application fix
* fix: Loan Application Dashboard
* fix: Add doctypes to process loan interest accural and loan security price
* fix: Provision to make loan topup
* fix: Pledge and unpledge statuses and doctype for loan securit unpledge
* fix: Multiple fixes in Loan Cycle
* fix: Add missing dashboards to loan doctypes
* fix: Add Loan Manager role to loan doctypes
* fix: Loan Process fixes
* fix: Loan Security Unpledge fixes
* fix: UX, List and dashboards fixes
* fix: Minor fixes
* fix: Minor fixes
* fix: Status on additional loan security
* fix: Codacy fixes
* fix: Multiple fixes in loan
* fix: Rename Process Loan Security Price to Process Loan Security Shortfall
* fix: Loan Repayment and Closure report
* fix: Loan Security Status report and minor fixes
* fix: Multiple UX fixes
* fix: Test Case fixes and UX fixes
* fix: Currency symbol fixes in Salary Slip Loan
* fix: Make loan account details read only
* fix: Changes in loan security price updation
* fix: Sanctioned Loan Amount doctype
* fix: Updates in process loan interest accrual
* fix: Pass loan doc instead of loan name
* fix: Fixes in process loan interest accrual
* fix: Add missing semicolon
* fix: Test case
* fix: Test case
* fix: Sandbox method to get proposed pledges
* fix: Sandbox method
* fix: Nonetype fix in loan sanction limit
* fix: GL entry fixes
* fix: Update maximum loan amount on loan security pledging
* fix: Round off loan amounts
* fix: Loan Security unpledging
* fix: Interest amount for loan closure
* fix: Due date for loan repayments
* fix: API fixes for loan disbursement method
* fix: Disable quick entry for sanctioned loan amount
* fix: Add misssing translations for validations and codecleanup
* fix: Translation fixes and code cleanup
* fix: Test Cases
* fix: Loan Interest Accrual test case
2020-02-26 10:44:24 +05:30
Deepesh Garg
cf8e2732c9
Merge pull request #20428 from 0Pranav/territory-sales-pipeline
...
feat: add territory wise sales report
2020-02-06 13:11:07 +05:30
Deepesh Garg
a4928f6f5b
fix: Add report link in module view and fix date filter
2020-02-06 12:50:25 +05:30
Anurag Mishra
1f6cc2b6ec
feat: appointment Letter ( #20104 )
...
* feat: appointment Letter
* fix: requested changes
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-03 17:52:42 +05:30
rohitwaghchaure
d4d7d211ea
feat: report to show difference between stock and account value ( #20186 )
2020-01-09 15:05:05 +05:30
marination
126a63af26
chore: Added Reports to Stock Module Desk
2019-12-27 17:18:27 +05:30
Anurag Mishra
935517d914
fix: added bank reconciliation page in the accounting module ( #19719 )
...
* fix: added bank reconcilation page inaccounting module
* Update accounts.py
2019-11-29 18:08:42 +05:30
Marica
f51ccbf5d4
chore: Added Quick Stock Balance to Stock Module ( #19726 )
...
- Also 'Stock Balance Report' button no longer primary button
2019-11-28 16:44:46 +05:30
Pranav Nachnekar
fc5d8fcd9f
Merge branch 'develop' into scheduling-ui-rewrite
2019-11-25 12:24:32 +00:00
Pranav Nachnekar
d63ad3bb5f
fix: add email group and newsletter links to CRM module view ( #19679 )
...
* fix: add email group and newsletter links to CRM module view
* chore: move email group to bottom
2019-11-25 16:50:47 +05:30
0Pranav
18fda5a571
add appointment list to module page
2019-11-15 11:58:21 +05:30
Marica
d00c59830e
feat: Disable CWIP Accounting checkbox added in Company and Asset Category ( #19262 )
...
* feat: Disable CWIP Accounting checkbox added in Company and Asset Category
Asset Settings is removed completely
Disable CWIP Accounting checkbox will give priority to Asset Category
* fix: Changed checkbox name to 'Enable Capital Work in Progress Accounting'
- checkbox will be disabled by default
- Enabling it in Company will globally enable it
- When globally disabled , it's value on the asset category will be considered
* chore: Added patch to set pre-existing CWIP checkbox value into new checkbox
* fix(test): Asset
* fix: Asset Test and Patch
* fix(test): Opening Invoice Creation Tool
* Update asset.py
* fix: Patch and other fixes
2019-11-12 19:17:43 +05:30
Deepesh Garg
d9e27b727f
Merge branch 'develop' into item_row_link_issue
2019-10-23 12:20:19 +05:30
Rucha Mahabal
b5bd3f3abf
fix: custom doctypes and reports not visible in Accounts module view
2019-10-22 13:38:36 +05:30
ashish-greycube
a32618dff4
add coupon code on selling card of desk
2019-10-16 10:26:25 +05:30
Suraj Shetty
f8899827e0
fix: Add Exotel Settings to integration module ( #19025 )
...
* fix: Add Exotel Settings to integration module
* fix: Add description
2019-09-13 12:27:00 +05:30
Suraj Shetty
1c29c520bd
Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list
2019-08-29 13:18:57 +05:30
Mangesh-Khairnar
2f322609d7
Merge pull request #18852 from mbhavesh95863/patch-1
...
fix(selling): remove redundant listing
2019-08-29 13:12:38 +05:30
Rohit Waghchaure
354d0af44e
fix: added purchase invoice in buying module
2019-08-28 17:51:31 +05:30
Suraj Shetty
be0ae7a430
fix: Doctype changes
...
- Check no copy for work order series field
- Add dashboard
- Set naming_series for pick list
2019-08-28 12:40:26 +05:30
Mangesh-Khairnar
671c20ec56
Merge branch 'develop' into patch-1
2019-08-27 22:42:35 +05:30
mbhavesh95863
cfec328c74
Same report 2 times in list
2019-08-27 19:17:19 +05:30
Harshit
56d03a456b
fix: add contract to CRM module ( #18817 )
2019-08-23 11:34:25 +05:30
Sahil Khan
5f2c030ddc
Merge branch 'version-12-hotfix' into merge_v12_hotfix_1
2019-08-20 16:22:49 +05:30
Mangesh-Khairnar
dab5b1f319
Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management
2019-08-13 13:33:26 +05:30
Michelle Alva
af969d664f
Added Employee Tax Exxxemption category and sub-category links ( #18659 )
2019-08-12 12:59:59 +05:30
Mangesh-Khairnar
e173d54054
Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management
2019-08-09 13:37:51 +05:30
Faris Ansari
66064c7827
fix: Add BOM Comparison Tool to module view
2019-07-30 17:11:18 +05:30
Michelle Alva
e666b882e7
fix: added payroll period in HR module ( #18500 )
2019-07-27 10:03:18 +05:30
Mangesh-Khairnar
5ca3e83a00
feat: add ledger link in hr config
2019-07-25 14:35:39 +05:30
Suraj Shetty
002474367b
Merge branch 'develop' into email-campaign
2019-07-22 13:20:06 +05:30
Mangesh-Khairnar
16a0458e29
fix(procurement-tracker): concatenate filter conditions with leading whitespaces ( #18440 )
2019-07-22 11:16:40 +05:30
Rucha Mahabal
324ab98b99
Merge branch 'email-campaign' of https://github.com/ruchamahabal/erpnext into email-campaign
2019-07-22 03:27:29 +05:30
Rucha Mahabal
b54459e588
dash: added Email Campaign to CRM dashboard
2019-07-22 03:23:40 +05:30
Suraj Shetty
e0d8cf1851
fix: Add Employee Skill Map to HR module page
2019-07-18 15:58:50 +05:30
Faris Ansari
1abd1e79a9
fix: Module Links ( #18318 )
...
* fix: Add Project Billing Summary link
* fix: Bank Guarantee shouldn't depend on Bank Guarantee
2019-07-15 14:34:10 +05:30
Michelle Alva
6abb63b445
refactor: Refactor module links of Accounting, HR, Project ( #18160 )
2019-07-15 14:00:00 +05:30
Jamsheer
5073ac4dcb
fix: Patient History (Patient Medical Record) ( #17972 )
...
* Page - Patient History
* Healthcare Utils - get patient vitals
* Healthcare Utils - render doc as html for patient history page
* Page - Patient History - prcatitioner image in time line
* Page - Patient History in menu
* fix - page medical history
* fix: page patient_history broken img, minor fixes
* fix: patient_history page, add pagination, show doc if fetched
* fix: Patient Medical Record to Patient History
* fix: patient history page - set route options
* fix: update to code standards
* fix: remove Eidt button form patient history
* fix: css update to code standards
* fix: Remove page medical_record
2019-07-12 12:28:34 +05:30
Himanshu
7d1d9aa46b
feat(Issue): Reset SLA ( #18244 )
...
* feat: reset sla
* fix: db.get_single_value
* feat: timeline entry for reset sla
* fix: remove communication from support config
* fix: reset sla on split_issue
2019-07-12 12:19:35 +05:30
Jignesh Greycube
870cbad5b2
fix: navigation link updated for Item Shortage Report
...
Item Shortage Report navigation link was incorrect , hence updated.
2019-07-11 13:56:43 +05:30
Himanshu
e7bb54ed76
feat(Issue): Settings to stop SLA tracking ( #18112 )
...
* fix: fix msgprint when creating new issues
* fix: use getdate
* fix: do not self save
* fix: test case
* fix: error due to comparing date and str
* fix: creation time for replicated issue
* feat: sla in support settings
* fix: remove sla settings
* feat: enable check in sla
* fix: throw if sla is disabled
* fix: enable sla
2019-07-10 17:15:59 +05:30
rohitwaghchaure
c1535a5542
Merge pull request #18167 from netchampfaris/manufacturing-module-sections
...
fix(UX): Move Bill of Materials section to first
2019-07-04 19:11:08 +05:30
Faris Ansari
1d3008750c
fix(UX): Move Bill of Materials section to first
2019-07-04 17:53:10 +05:30
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch ( #17997 )
...
* fix: merge conflict
* fix: restored missing set_gst_state_and_state_number function
* fix: style linting as per codacy
* fix: Fixes related to customer/lead merging
* fix: merge conflict
* fix: Fixes related to customer/lead merging
* fix: Assign isue/opportunity to user
* fix: Assign isue/opportunity to user
* fix: Replaced Invoice type by GST Category
* fix: merge conflict
* fix: merge conflict
* fix: test cases
* fix: test cases
2019-07-03 10:34:31 +05:30
Aditya Hase
d825ee57b7
fix(buying): Translate label for "Supplier Addresses And Contacts" Report
2019-06-28 14:40:59 +05:30
Himanshu
b134709aaf
Merge branch 'develop' into sla_fix
2019-06-26 16:36:51 +05:30
Faris Ansari
2ab8d3ebcc
fix: Move links to appropriate section ( #17999 )
...
* fix: Move links to appropriate section
* fix: New section Accounting Entries
2019-06-26 13:32:41 +05:30
