nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-02 08:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,568 Commits 622 Branches 1,806 Tags
256b6950f57ad13b4010fc715fda037c928eb3ca
Commit Graph

1911 Commits

Author SHA1 Message Date
Sahil Khan
b6c6406206 Merge branch 'version-12-hotfix' of https://github.com/frappe/erpnext into v12-pre-release 2020-06-15 16:58:22 +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
mergify[bot]
d2491e403b fix: convert goals point to flt (#21840) (#21858) 
(cherry picked from commit 4c779300fd)

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2020-05-22 11:43:14 +05:30
Anurag Mishra
4c779300fd fix: convert goals point to flt (#21840) 2020-05-21 18:47:30 +05:30
Nabin Hait
70ab59f473 fix: merge conflict 2020-05-18 17:10:36 +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
Nabin Hait
2d430ec077 feat: Income tax slab (#21631) 
* 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>

* fix: Income tax slab patch (#21448)

* fix: reload income_tax_slab_other_charges in patch

* fix: reload lower_deduction_certificate in patch

* fix: Consider any kind of exemptions only if tax exemptions are allowed on tax slab (#21475)

* fix: Tax calcualtion based on slab (#21497)

* fix: Desk links for Income Tax Slab and Employee Other Income (#21511)

* fix: patch

Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>
 2020-05-07 18:57:01 +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
1fc8de32f1 fix: merge conflict 2020-04-14 20:31:50 +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
Nabin Hait
2378572e1b fix: update attendace from leave application (#21154) 2020-04-06 10:15:50 +05:30
Deepesh Garg
7c0398c8e3 fix: Update is_tree field in Tree doctypes (#20983) 2020-03-19 11:01:40 +05:30
Deepesh Garg
71e9f23d77 fix: Update is_tree field in Tree doctypes (#20982) 2020-03-19 11:00:55 +05:30
Nabin Hait
7b45ae1f2d fix: Multiple fixes during pre-release testing (#20985) 2020-03-19 10:58:41 +05:30
Nabin Hait
bf0f9c5cb4 fix: Multiple fixes during pre-release testing (#20986) 2020-03-19 10:58:07 +05:30
Nabin Hait
8a7ecebc03 fix: merge conflict 2020-03-17 19:49:25 +05:30
Anurag Mishra
7f58f6af39 fix: leave based on multiple holiday list (#20849) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-03-17 10:58:17 +05:30
Anurag Mishra
b9e1d9ad7d Deduction based on earnins/gross pay (#20935) 
* fix: deductions calculation based on gross pay

* test: salary structure deduction based on gross pay

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-03-16 22:44:17 +05:30
Don-Leopardo
0dcd5a0f34 fix: sql injection (#20817) 2020-03-16 22:35:01 +05:30
Anurag Mishra
22a069d4b0 fix: Wrong status 2020-03-16 19:15:33 +05:30
Vishal Dhayagude
37886a72ef fix(HR): Leave application company field made read-only and filter in Monthly attendance sheet (#20911) 
* fix(HR): Leave application company field made Readonly

* fix: in monthly report attandance employee filter based on company

* fix: minor typo
 2020-03-16 15:57:42 +05:30
Prssanna Desai
46053f6c8f fix: fix options of currency fieldtype in Expense Taxes and Charges (#20910) 2020-03-16 15:52:00 +05:30
Anurag Mishra
97dfe2ac32 fix: local variable 'benefit_amount' referenced before assignment (#20948) 2020-03-16 13:47:47 +05:30
Anurag Mishra
5475b5f562 fix: validated leave allocation (#20635) 
* 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:52 +05:30
Anurag Mishra
df15c758f6 fix: Additional salary can be created only for active employee 2020-02-20 15:29:09 +05:30
Mangesh-Khairnar
c74343531f fix: skip earned leaves check for max leaves set to zero or less (#20536) 
* fix: skip earned leaves check for max leaves set to zero or less

* test: earned leaves creation
 2020-02-20 13:25:45 +05:30
Deepesh Garg
a257189c77 Merge pull request #20451 from Anurag810/fleet-management_v12 
fix: odometer value was not syncing properly
 2020-02-20 13:20:21 +05:30
Anurag Mishra
ab8aa43ffb fix: changed field type which was affecting filters (#20670) 2020-02-20 12:52:37 +05:30
Saqib
2d2aa7d664 fix: check for available stock in product bundle's website warehouse (#20679) 
* fix: check for available stock in product bundle's website warehouse

* test: earned leaves creation

* fix: minor change

Co-authored-by: Mangesh-Khairnar <mkhairnar10@gmail.com>
 2020-02-20 12:22:01 +05:30