nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 10:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,752 Commits 469 Branches 1,748 Tags
f31e358df90af5f38f4efd8ac0aab607a1d3c258
Commit Graph

1925 Commits

Author SHA1 Message Date
Anupam
f31e358df9 fix: leave application status fix 2020-09-23 19:14:31 +05:30
rohitwaghchaure
dad5bbdaa2 Merge pull request #23131 from Anurag810/leave_application_form_dashboard_fixes 
fix: Form dashboard showing wrong balance
 2020-09-08 16:58:11 +05:30
Anurag Mishra
e5fbebf946 fix: update filters 2020-09-08 15:55:07 +05:30
Anurag Mishra
053fdd91da fix: data was not properly maped 2020-09-03 17:11:59 +05:30
Rucha Mahabal
b574353c00 fix(Payroll Entry): Set cost center for payroll payable account (#23223) 2020-08-31 20:09:48 +05:30
Anurag Mishra
69bb85d1d0 fix: Form dashboard showing wrong balance 2020-08-25 06:55:02 +05:30
Nabin Hait
fa36a06188 fix:Validate Job offer against vacancies (#23107) 2020-08-20 19:38:55 +05:30
Suraj Shetty
bf7adb8b38 refactor: Format and sanitise user inputs to search queries. (#23064) 
* refactor: Sanitize whitelisted method inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Format and sanitize tax_account_query inputs

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Validate and sanitize search inputs via decorator

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* style: Minor formatting fix

* refactor: Validate and sanitize search inputs using decorator

* fix: Typo

* fix: Remove unwanted import statement

* refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-08-20 11:17:30 +05:30
Anupam Kumar
09b6628e53 fix: Leave application status (#23043) 
* fix: leave application status update fix

* fix:adding patch
 2020-08-18 14:43:34 +05:30
Deepesh Garg
693bf1309a Merge pull request #23021 from prssanna/expense-claim-list-currency-v12 
fix: add company in list fields to fetch for Expense Claim
 2020-08-17 23:08:27 +05:30
Afshan
df42df5246 fix: handled condition if staffing isn't created (#23057) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-08-17 13:48:07 +05:30
prssanna
c28e37781a fix: add company in list fields to fetch for Expense Claim 2020-08-13 11:56:30 +05:30
Deepesh Garg
a979fcc25b fix: Project link not set in accounts other than profit and loss accounts (#22049) 
* fix: project link not set in accounts other than profilt and loss accounts

* fix: cannot find get_allow_cost_center_in_entry_of_bs_account

* fix: remove enable_allow_cost_center_in_entry_of_bs_account

* chore: add tests and remove test based on allow_cost_center_for_bs_accounts

* fix: travis

* fix: Test Cases

* fix: Patch to remove Property Setter

* fix: Test Cases

* fix: Remove v13 patch

* fix: Procurement Tracker test case

* fix: Proccurement tracker report test

* fix: Codacy

* fix: Remove duplicate project field

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2020-08-12 21:06:25 +05:30
Anurag Mishra
d2593f0af5 fix: set half day date None if half day is unchecked (#22905) 2020-08-04 19:29:56 +05:30
bhavesh95863
ca6ec72ade fix: Add missing translation function for freeze message (#22812) 
* fix[missing translation function]

missing translation function

* fix[missing translation function for message]

missing translation function for message

* fix[add missing translation function]

add missing translation function

* Update payroll_entry.js

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-07-26 14:03:03 +05:30
Nabin Hait
e62da1455c fix: Other charges on income tax (#22798) 2020-07-24 09:20:41 +05:30
Anurag Mishra
b3041ea7cd fix: fix: not working without from_amount and percentage_deduction (#22399) 2020-07-10 13:09:21 +05:30
Rohan
817040b986 fix: setup status indicators for Job Offer and Job Applicant (#22444) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-08 15:59:44 +05:30
Chinmay D. Pai
75c2e28788 fix: whitelist all query functions for search widget 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-07-07 16:46:04 +05:30
Anurag Mishra
bf8a26c31e fix: take parent cost center for child if no cost center at child (#22496) 
(cherry picked from commit ba5f571b0d)
 2020-07-01 11:07:57 +00:00
mergify[bot]
4e17c40589 fix: Refactor dashboard links in leave policy (bp #22519) (#22529) 
* fix: Refactor dashboard links in leave policy (#22519)

* fix: refactor dashboard links in leave policy

* fx: code fix

* fix: add labels to links

* fix: code change

(cherry picked from commit ec84afa86d)

* fix: remove extra lines

Co-authored-by: Michelle Alva <50285544+michellealva@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-06-30 18:12:47 +05:30
mergify[bot]
3c18669057 fix: staffing Plan validation (#22379) (#22396) 
(cherry picked from commit 36560c8406)

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2020-06-23 10:49:48 +05:30
Anurag Mishra
1039079e37 fix: set cost center in child table (#22373) 2020-06-22 17:25:53 +05:30
Kenneth Sequeira
af6a0f3a9d fix(HR): typo in error message in Employee Balance Report (#22306) 
* fix: typo in date error message

* fix: error message cleanup in Leave Balance report
 2020-06-18 14:34:11 +05:30
rohitwaghchaure
087278baba Merge pull request #22209 from frappe/michellealva-expense-claim 
fix: add filter for cost center in expense table
 2020-06-15 10:36:31 +05:30
Abhishek Balam
486be1049c fix(HR): Rename due_advance_amount field in Employee Advance for v12 (#22216) 
* added patch for moving data

* changed fieldname and references for easier debugging

* style: Added EOF

* reload doc for patch
 2020-06-13 01:18:29 +05:30
Michelle Alva
d6cdc3378a fix: add filter for cost center in expense table 
Added filter for cost center in expense table (company and group_node filter)
 2020-06-12 10:30:32 +05:30
Anurag Mishra
9ad46f7487 fix: Added column Expired Leave (#21859) 2020-05-26 18:08:08 +05:30
Anurag Mishra
a3ec869c58 fix: showing Wrong balance on allocation boundary dates (#21908) 2020-05-26 18:00:27 +05:30
Anurag Mishra
bbec37f713 fix: Validation for dates (#21887) 2020-05-25 18:39:26 +05:30
Anurag Mishra
4c779300fd fix: convert goals point to flt (#21840) 2020-05-21 18:47:30 +05:30
Anurag Mishra
1045dc49f5 fix: Future date half day validation (#21719) 
* fix: Future date half day validation

* fix: Allow half day attendance only via leave application

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-05-17 20:17:39 +05:30
Nabin Hait
78f69e448b fix: Added submit permission in employee other income 
(cherry picked from commit 200f80c3d3)
 2020-05-15 11:28:08 +00:00
Deepesh Garg
8ed066ba1f fix: Add misssing dimensions in GL entries (#21691) 
* fix: Add misssing dimensions in GL entries

* fix: expnese_taxes_and_charges.json

* fix: Add project filter in trial balance report

* fix: Use current dimensions instead of dimensions from asset
 2020-05-15 12:58:19 +05:30
Mangesh-Khairnar
71d9a52a07 fix: duplicate leave expiry creation (#21506) 
* fix: validate existing ledger entries to avoid duplicates

* patch: remove duplicate ledger entries created

* fix: consider only submitted ledger entries

* fix: delete duplicate leaves from the ledger

* fix: check if duplicate ledger entry exists

* chore: formatting changes

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-05-15 11:55:36 +05:30
mergify[bot]
426f0bc168 fix: only check for payment_account on bank entry (#21445) (#21518) 
* fix: only check for payment_account on bank entry

Since all the fields (company, start and end date are mandatory before form submission, there is no need to check for them again after submission.

* fix: cur_frm to frm

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
(cherry picked from commit 95b186268c)

Co-authored-by: Michelle Alva <50285544+michellealva@users.noreply.github.com>
 2020-04-30 19:53:59 +05:30
Nabin Hait
2620ac31f9 fix: Desk links for Income Tax Slab and Employee Other Income (#21511) 2020-04-30 11:03:57 +05:30
Nabin Hait
22c4f82fc6 fix: Tax calcualtion based on slab (#21497) 2020-04-30 11:03:01 +05:30
Nabin Hait
ae5414fced fix: Consider any kind of exemptions only if tax exemptions are allowed on tax slab (#21475) 2020-04-30 11:02:45 +05:30
Anurag Mishra
e33c44ae33 fix: Permission issue Employee Tax exemption (#21492) 2020-04-29 12:13:26 +05:30
Nabin Hait
2b5bca4ce6 fix: Procurement tracker report (#21422) 
* fix: procurement report data was not coming

* fix: leave allocation minor issue
 2020-04-26 23:28:54 +05:30
Anurag Mishra
1f3584b9a8 refactor: employee leave balance report v12 (#21282) 
* fix: Employee Balance repor fixes

* refactor: Employee Leave Balance report For Version-12

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-04-26 21:05:09 +05:30
Nabin Hait
1d5ea4feee feat: Income tax slab (#21406) 
* Feat: Multiple tax as per new taxation rule

* patch:for multiple tax slab, fix: payroll and exemption validation

* Test: Fixture

* feat: income tax slab with other charges and tax exempted deduction components

* fix: added missing init file

* fix: Patch fixed

* fix: Patch fixed

* fix: test fixes

* fix: validate duplicate exemption declaration

* fix: payment entry test case

Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>
 2020-04-26 12:37:52 +05:30
Saqib
7fedff260d fix: (ux) set jv voucher type depending on mode of payment (#21412) 2020-04-26 09:41:02 +05:30
Nabin Hait
49b653b444 fix: merge conflict 2020-04-14 19:34:48 +05:30
Nabin Hait
107229de04 fix: Fixed expense claim payment status 2020-04-14 19:33:05 +05:30
Mangesh-Khairnar
8b31e3ec2a fix: consider revereted expired leaves entry (#21256) 2020-04-14 09:33:53 +05:30
Nabin Hait
95b6e8afda fix: Replace newlines with spaces before evaluation of condition and formula (#21166) 2020-04-08 09:34:39 +05:30
Nabin Hait
5da9663ae4 Merge branch 'version-12-hotfix' into expense-claim-fix-v12 2020-04-06 12:14:27 +05:30
Nabin Hait
322660c644 fix: Merge conflict 2020-04-06 11:16:31 +05:30