Commit Graph

30759 Commits

Author SHA1 Message Date
Rucha Mahabal
d76908d757 fix: Clinical Procedure Template code refactor 2020-02-28 13:30:43 +05:30
marination
24f4683999 chore: Rearranged Buying Module Dashboard 2020-02-28 12:58:41 +05:30
Deepesh Garg
5707c9a731
fix: Item Wise report query fix (#20760) 2020-02-28 12:28:54 +05:30
Karthikeyan S
0db423ed5f
fix(auto attendance): bug in marking absent (#20759)
This bug was introduces in the commit bd6e8b9cec

i.e. The mark_absent function was renamed to mark_attendance, but there is a miss match in the order of the parameters.
2020-02-28 12:27:21 +05:30
Saqib
8cf841ce60
fix: wrong calculation of depreciation eliminated for a period (#20502) 2020-02-27 19:09:34 +05:30
Lokesh Waingankar
b252f5851d Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-02-27 19:09:14 +05:30
Lokesh Waingankar
efb6482ef6 fix: user is not able to do 'Set as Lost' for Quotation (#20689) 2020-02-27 19:08:58 +05:30
Shivam Mishra
d20e36f3fd
feat: ignore permission when deleting linked emails (#20751)
* feat: ignore permission when deleting linked emails

* fix: uncommented important snippet
2020-02-27 19:07:58 +05:30
Saqib
fb35a54bee
perf: improve gl entry submission (#20676)
* perf: improve gl entry submission

* perf: add indexes

* fix: replace **kwargs with *args

* fix: syntax error

* fix: remove cypress

* fix: travis

* chore: remove purchase invoice from status updater

* fix: set_staus args

Co-Authored-By: Nabin Hait <nabinhait@gmail.com>

* fix: only update status for invoices & fees

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-27 18:32:19 +05:30
Anurag Mishra
d42a4a6234
fix: deductions calculation based on gross pay (#20727)
* fix: deductions calculation based on gross pay

* test: salary structure deduction based on gross pay

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-27 18:31:18 +05:30
rohitwaghchaure
b5a670cdb9
fix: serial no material transfer performance issue (#20747) 2020-02-27 18:18:10 +05:30
Rucha Mahabal
8c5725c799 fix: change item_code from Link to Data to avoid item not found error 2020-02-27 17:18:52 +05:30
Deepesh Garg
d8d453d7d4
Merge pull request #20748 from deepeshgarg007/bank_reco_jv
fix: Journal Entry not being fetched in Bank Reconciliation
2020-02-27 16:18:27 +05:30
Deepesh Garg
f444f451ac fix: Remove debug statement 2020-02-27 16:04:01 +05:30
Deepesh Garg
50b3472eba fix: Journal Entry not being fetched in Bank Reconciliation 2020-02-27 16:01:47 +05:30
Rucha Mahabal
61203b8701 fix: disabled Procedure Template shown as enabled in List View 2020-02-27 13:47:54 +05:30
Rucha Mahabal
211d6e4fa9 fix: conflicts 2020-02-27 13:22:02 +05:30
Lokesh Waingankar
2866617c82
fix: 'Last Purchase Rate' taking wrong on BOM (#20689)
* fix: 'Last Purchase Rate' taking wrong on BOM. #20228

* fix: Added condition for None purchase order and purchase receipt (#20689)

* fix: fetch last purchase rate

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-27 13:21:14 +05:30
Rucha Mahabal
99321cd538 fix: conflicts 2020-02-27 13:16:53 +05:30
Rucha Mahabal
e29d5c1d5b fix: Schedule Admission button not visible 2020-02-27 12:57:38 +05:30
Saqib
dd374ff77b
fix: only update items if rate or qty changed (#20742) 2020-02-27 12:51:31 +05:30
Rohan
d40a5d92c2
fix: sort Issues chronologically (#20741) 2020-02-26 18:54:14 +05:30
Marica
62ba320f5b
fix: Lock stock ledger entries that are being reposted. (#20737)
- If stock ledger entries are being reposted, don't let any other transaction apply itself on the same.
2020-02-26 18:51:13 +05:30
Deepesh Garg
fe18b92b61
fix: Mandatory bank account error fix (#20733)
* fix: Mandatory bank account error fix

* fix: SQL condition
2020-02-26 17:17:02 +05:30
Rucha Mahabal
a61bf44328 feat: capture symptoms, diagnosis in Table Multiselect instead of Small Text 2020-02-26 17:11:19 +05:30
Deepesh Garg
55078faec4
Merge pull request #20736 from deepeshgarg007/loan_repayment_perm
fix: User permission for Loan repayment doctype
2020-02-26 16:51:34 +05:30
Deepesh Garg
c88a7f8317 fix: User permission for Loan repayment doctype 2020-02-26 16:49:58 +05:30
Rucha Mahabal
22351adac5 refactor: Patient Encounter 2020-02-26 16:05:43 +05:30
Anurag Mishra
773e7debb9
fix: validated leave allocation (#20636)
* fix: validated leave allocation

* fix: changes requested

* Update erpnext/hr/doctype/leave_encashment/leave_encashment.py

Co-Authored-By: Nabin Hait <nabinhait@gmail.com>

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-26 14:50:57 +05:30
Nabin Hait
2bd6ac56c6
Merge branch 'develop' into develop 2020-02-26 13:21:38 +05:30
Deepesh Garg
9f4b46050f
Merge pull request #20732 from deepeshgarg007/loan_security_pledge_api
fix: API fix for loan security pledge creation
2020-02-26 12:59:13 +05:30
Deepesh Garg
b5c5bdd671 fix: API fix for loan security pledge creation 2020-02-26 12:57:05 +05:30
rohitwaghchaure
aa3ba41e83
fix: same free item not working for pricing rule (#20712) 2020-02-26 12:51:46 +05:30
abhijitkumbharInd
ba8840727a
Create a new item on Material Request showing error Item None not found. #20608 (#20731) 2020-02-26 12:48:36 +05:30
Deepesh Garg
5a2f22258a
Merge pull request #20592 from byugandhara/develop
fix: Changes done to get valid customer and employee list on payment entry form(#20498)
2020-02-26 12:17:47 +05:30
abhijitkumbharInd
12bc43e495
fix: Education | Quiz accepting duplicate question #20622 (#20708) 2020-02-26 12:04:41 +05:30
sharmatripti
08fa7590ef
fix: Employee field should be filtered based on department on doctype Instructor (#20705)
* Fix: Filtered Employee based on Department on Instructor doctype (#20598)

* Fix: Syntax error (#20598)

* Fix: Syntax error (#20598)

* Fix: Syntax error (#20598)

* Fix: Syntax error (#20598)

* fix :  Filtered Employee based on Department on Instructor doctype (#20704)
2020-02-26 12:02:37 +05:30
Rucha Mahabal
63d987f345 fix: fields fetched incosistently from appointment and patient 2020-02-26 11:59:37 +05:30
RJPvT
10aab65338
fix: smaller then instead of bigger then :-( dumb mistake vdevelop #20693 (#20702) 2020-02-26 11:59:10 +05:30
Saqib
3957ac1408
perf: search for customer's return invoices then filter out gl_entries (#20709)
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-26 11:36:55 +05:30
rohitwaghchaure
7229f694ea
fix: rate and amount in material request copying from sales order (#20717) 2020-02-26 11:28:08 +05:30
Mangesh-Khairnar
99d89d6cb8
fix(HR): show correct closing leave balance (#20723) 2020-02-26 11:26:07 +05:30
rohitwaghchaure
1e6788b028
fix: reorder material request not created if doctype has custom mandatory field (#20719) 2020-02-26 11:25:34 +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
7f2ad5dd82
Merge pull request #20714 from rohitwaghchaure/account_dashboard_not_working_issue
fix: account dashboard not working
2020-02-26 10:18:03 +05:30
Deepesh Garg
6e170e16e2
Merge pull request #20730 from AndyOverLord/patch-1
fix: missing selected item's expense_account
2020-02-26 10:16:30 +05:30
Andy Zhu
75d9d79fac
fix: missing assign item's expense_account
As in dict object "ret", missing assign item's expense_account will cause it then fetches the default stock_adjustment_account in 'Company'.
2020-02-26 10:49:48 +13:00
Rucha Mahabal
41bd317e25 refactor: Patient Appointment status 2020-02-25 13:51:36 +05:30
Deepesh Garg
0ebace5da2
fix: Update paid amount for pos return (#20543)
* fix: Paid amount updation for pos return

* fix: Remove console

* fix: Styling

* fix: get  default mode of payment from POS profile

* fix: Add test cases

* fix: Codacy
2020-02-25 13:21:16 +05:30
Rucha Mahabal
7c66975040 feat: validate Customer creation for Patient during Appointment booking 2020-02-25 12:43:33 +05:30