Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,290 Commits 3 Branches 0 Tags 1 GiB
6f2dacc60c
Commit Graph

213 Commits

Author SHA1 Message Date
Nabin Hait
d46b23699c
fix: optimize reposting of gle and sle (#24702) 
* fix(india): escape for special characters in JSON (#24695)

JSON does not accept special whitespace characters like tab, carriage
return, line feed

Ref: https://www.ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf

Related issue: ISS-20-21-09811

* fix: Accounting Dimension creation background job timeout

* fix(regional): vehicle no is mandatory for ewaybill generation (#24679)

* fix: vehicle no required for e-invoice

* fix: ewaybill generation dialog condition

* fix: excluding unidentified accounts from gstr-1

* fix: optimize reposting of sle and gle (#24694)

* fix: optimize update_gl_entries_after method

* fix: Optimized reposting patch

* fix: accounting dimensions

* added reload_doc in patch

* Update item_reposting_for_incorrect_sl_and_gl.py

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>

* fix: Replaced spaces with tabs

* fix: merge conflict

* fix: test cases

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: pateljannat <pateljannat2308@gmail.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2021-02-23 16:38:52 +05:30
Jannat Patel
4cef0f5983 fix: salary slip attribute error (#24455) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-02-18 21:30:13 +05:30
Afshan
83768b68c1 fix: emp disappear (#24525) 
* fix: emp disappear

* fix: renamed set_totals_call to set_totals

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-18 21:20:14 +05:30
Jannat Patel
ef5c714de2
fix: salary slip attribute error (#24455) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-02-18 15:52:29 +05:30
Afshan
c0f8f32801
fix: fetch query for employee (#24529) 2021-02-02 20:27:23 +05:30
Afshan
10b00f9d0d
fix: separation of salary creation from payroll (#24528) 
* fix: separation of salary creation from payroll

* fix: removed unnecessary veriable

* fix: check existing sal slips

* fix: existing checks

* style: refactoring query
 2021-02-02 16:24:01 +05:30
Afshan
91a02868cb
fix: emp disappear (#24525) 
* fix: emp disappear

* fix: renamed set_totals_call to set_totals

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-02 11:04:25 +05:30
Afshan
8676089794
fix: emp disappear (#24524) 
* fix: emp disappear

* fix: renamed set_totals_call to set_totals

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-02 11:02:22 +05:30
Suraj Shetty
0a8939e1c1 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-29 08:56:22 +05:30
Nabin Hait
a6213ccd61 Merge branch 'develop' into version-13-beta-pre-release 2021-01-28 17:36:08 +05:30
Afshan
907e2990d0
fix: remove function to get earning deduction components (#24465) 
* fix: remove function to get earning deduction components

* fix: slider
 2021-01-27 15:34:42 +05:30
Suraj Shetty
0c34a711eb Merge branch 'develop' of github.com:frappe/erpnext into version-13-beta-pre-release 2021-01-25 16:06:38 +05:30
Afshan
217440952f fix: slider 2021-01-22 15:39:59 +05:30
Afshan
02d495f1fb fix: added query for fetching salary component 2021-01-22 15:39:59 +05:30
Suraj Shetty
f0ff23eac3 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-21 19:07:57 +05:30
Afshan
36e3e05a0e fix: query for salary componet in salary structure 2021-01-20 16:48:42 +05:30
Afshan
912647f4f2 fix: allow statistical component in salary structure. 2021-01-20 13:58:32 +05:30
Afshan
c69ab6d184 fix: select sal comp while making sal struct 2021-01-19 19:29:31 +05:30
Deepesh Garg
6fb66f9428
Merge pull request #24362 from ruchamahabal/year-to-date-in-salary-components 
feat(Payroll): compute Year to Date for Salary Slip components
 2021-01-19 09:40:47 +05:30
Suraj Shetty
bbc6bfd3c3 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-19 09:34:06 +05:30
Deepesh Garg
cbed6f970a Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2021-01-15 15:43:59 +05:30
Rucha Mahabal
6c90e26982 feat: add descriptions for YTD and MTD fields 2021-01-14 13:42:40 +05:30
Rucha Mahabal
49702c1487 test: year to date computation for salary slip components 2021-01-14 11:57:24 +05:30
Rucha Mahabal
2c315a738e feat: Salary Slip with Year to Date Print Format 2021-01-14 10:06:24 +05:30
Rucha Mahabal
fdad94f983 feat(Payroll): compute Year to Date for Salary Slip components 2021-01-14 00:40:58 +05:30
Afshan
33fac19bce
fix: calculation of remaining_sub_periods if relieving date before month start date (#24319) 2021-01-13 21:06:04 +05:30
Rucha Mahabal
a93151502c fix: Components formulated from additional salary not being fetched in Payroll Entry 2021-01-08 12:10:26 +05:30
Anurag Mishra
77ba72c4ff
Merge branch 'develop' into payroll_fixes2.0 2021-01-06 14:23:53 +05:30
Anurag Mishra
e7fa6f6a1c fix: edditable employee grid 2021-01-06 13:25:09 +05:30
Shivam Mishra
9fc44f1606
Merge pull request #24182 from scmmishra/fix-dont-set-primary 2021-01-06 12:52:44 +05:30
Deepesh Garg
ad8be7c1fe fix: Consider only submitted salary slips 2021-01-06 09:29:03 +05:30
Nabin Hait
f7b9b0687e
fix: tax calculation on salary slip for the first month (#24272) 
* fix: tax calculation on salary slip for the first month

* fix: net pay precision issue

* fix: net pay precision issue

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2021-01-05 20:43:11 +05:30
Deepesh Garg
b01b108dfa fix: do not consider current salary slip in sum 2021-01-05 17:34:16 +05:30
Saurabh
994fa48cd4
Merge branch 'develop' into fix-dont-set-primary 2021-01-05 16:32:56 +05:30
Anurag Mishra
b864b09d40
Merge branch 'develop' into gratuity 2021-01-05 14:47:38 +05:30
Nabin Hait
517fd8b9e6
fix: Ignore customer and supplier while deleting company transactions (#24279) 
* fix: Ignore customer and supplier while deleting company transactions

* fix: Test cases fixed based on Travis
 2021-01-05 09:23:39 +05:30
Deepesh Garg
797a742cb2 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2021-01-04 14:24:00 +05:30
Afshan
47bc42740b
Merge branch 'develop' into fix-sal-struc-assign-payroll-acc 2020-12-31 17:41:44 +05:30
Anurag Mishra
d7ea2bd705
Merge pull request #24177 from AfshanKhan/fix-perm-empl-sal-slip 
fix: error popup for submitted doc
 2020-12-31 17:07:30 +05:30
Afshan
8b60fe6125 fix: setting correct account for sal struct assignment if not specified. 2020-12-31 16:10:39 +05:30
Deepesh Garg
133ce286f9 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2020-12-31 11:24:14 +05:30
Deepesh Garg
5891b48cf6
Merge pull request #24176 from GangaManoj/Year-to-Date 
feat: Add year_to_date field (cumulative salary for a fiscal year)
 2020-12-30 16:53:47 +05:30
Deepesh Garg
66dcaf3ab2 fix: Salary structure assignment in tests 2020-12-30 15:47:22 +05:30
Deepesh Garg
97d055dfc3 fix: Test Case 2020-12-30 14:06:13 +05:30
Deepesh Garg
8b7ebe5044 fix: Test Case cleanup and fixes 2020-12-30 12:45:46 +05:30
Deepesh Garg
20133bd1df fix: Remove comments 2020-12-29 22:19:12 +05:30
Deepesh Garg
353f8f4d85 fix: Add test case for YTD 2020-12-29 22:13:40 +05:30
Deepesh Garg
60b77f9865 Merge branch 'develop' of https://github.com/frappe/erpnext into Year-to-Date 2020-12-29 18:26:32 +05:30
Deepesh Garg
4a8c2c4cb5 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2020-12-29 15:10:36 +05:30
Anurag Mishra
527a156512 feat: validated employees whose salary has been already precessed 2020-12-24 13:59:12 +05:30
Anurag Mishra
3278d02cd2 fix: sider 2020-12-23 18:07:54 +05:30
Anurag Mishra
1446749b63 fix: changes requested 2020-12-23 18:07:54 +05:30
Nabin Hait
eb065d6d40 fix: fixed gl entries 2020-12-23 18:07:54 +05:30
Anurag Mishra
b71611dd3d feat: Added Form dashboard 2020-12-23 18:07:54 +05:30
Anurag Mishra
4cc333996c fix: test 2020-12-23 18:07:54 +05:30
Anurag Mishra
ba6ff6e227 fix: conflict 2020-12-23 18:07:53 +05:30
Anurag Mishra
708065cb85 fix: test cases 2020-12-23 18:07:53 +05:30
Anurag Mishra
af9f172be8 fix: requested changes and sider 2020-12-23 18:07:53 +05:30
Anurag Mishra
66b697cd05 feat: fix test for Gratuity 2020-12-23 18:07:53 +05:30
Anurag Mishra
550e60a69d feat: fix test for Gratuity 2020-12-23 18:07:53 +05:30
Anurag Mishra
b88af3a3f7 feat: Accrural Entry for Gratuity beafore Payment 2020-12-23 18:07:53 +05:30
Anurag Mishra
78fdd5d9b4 fix: update status on salary Slip submission 2020-12-23 18:07:53 +05:30
Anurag Mishra
46e1c09b45 style: Broken into smaller function 2020-12-23 18:07:53 +05:30
Anurag Mishra
4d6c3c9449 Fix: Changes Requested, Sider, codacy, Transalation 2020-12-23 18:07:53 +05:30
Anurag Mishra
493eea19e8 feat: added link from desk page and some minor fixes 2020-12-23 18:07:53 +05:30
Anurag Mishra
25c356894d test: gratuity 2020-12-23 18:07:53 +05:30
Anurag Mishra
34a7250a2d fix: Some enhancements and better validation 2020-12-23 18:07:06 +05:30
Anurag Mishra
47f3a3a5bd feat: validation for if no slab found 2020-12-23 18:07:06 +05:30
Anurag Mishra
6f1538026a feat: added minimum year for gratuity and condition utilisation 2020-12-23 18:07:06 +05:30
Anurag Mishra
30299c6f49 feat: validating and ordeing the rule slabr 2020-12-23 18:07:06 +05:30
Anurag Mishra
dedc0015c0 feat(HR): Working day calulation based on attendance or Leave 2020-12-23 18:07:06 +05:30
Anurag Mishra
49b326fc08 feat(HR): Gratuity Payment 2020-12-23 18:07:05 +05:30
Anurag Mishra
fc2cb3a85e Feat: gratuity 2020-12-23 18:07:05 +05:30
Anurag Mishra
d556847fca fix: allow addition and removal of employee in payroll Entry 2020-12-23 12:59:48 +05:30
Afshan
adf9b49e14 fix: sal slip popup error 2020-12-23 11:39:38 +05:30
Ganga Manoj
090783804b fix: Improve month_to_date computation 2020-12-21 23:52:05 +05:30
Ganga Manoj
c36cab81f2 fix: Update year_to_date and month_to_date field labels to show company currency 2020-12-21 23:46:02 +05:30
Shivam Mishra
0e222173ea fix: don't set primary action if workflow is set 2020-12-21 13:44:03 +05:30
Ganga Manoj
ddd9fe49fc feat: Add month_to_date field 2020-12-18 23:58:05 +05:30
Ganga Manoj
59fbf702da feat: Compute month_to_date 2020-12-18 23:52:11 +05:30
Ganga Manoj
1b1df6b6bc feat: Add month_to_date field 2020-12-18 23:51:05 +05:30
Ganga Manoj
89a02d7d3f feat: Changed Fiscal Year to Payroll Period 2020-12-18 15:31:45 +05:30
Afshan
a81519f557 fix: error popup for submitted doc 2020-12-18 11:16:01 +05:30
Ganga Manoj
9f1e018e4f feat: Compute year_to_date 2020-12-18 01:35:27 +05:30
Ganga Manoj
04f48a011d feat: Add year_to_date field 2020-12-18 01:31:00 +05:30
Your Name
3ebe511eb9 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-12-16 08:19:47 +00:00
Shivam Mishra
fd044b032f Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into desk-enhancements 2020-12-16 13:21:10 +05:30
Afshan
89d14fdf68
fix: minor ui changes (#24125) 
* fix: minor ui changes

* fix: slider
 2020-12-15 09:31:30 +05:30
Afshan
58e8e06ab7
fix: retention filters (#24123) 
* fix: retention filters

* fix: slider
 2020-12-15 09:17:17 +05:30
Afshan
e64718b2ae
fix: selecting salary component (#24121) 2020-12-15 09:16:27 +05:30
Nabin Hait
3423d94145 fix: Fixed merge conflict 2020-12-12 21:12:56 +05:30
Rushabh Mehta
fec8dba16c fix(merge): merge develop 2020-12-08 16:23:09 +05:30
Afshan
749d36a4dd
fix: double exception in payroll (#24078) 2020-12-08 09:32:04 +05:30
Shivam Mishra
2fa3cac814 feat: update workspace folders 2020-12-03 15:48:57 +05:30
Shivam Mishra
2895645f86 feat: rename desk page to workspace 2020-12-03 15:39:53 +05:30
marination
523c464a92 fix: Test Payment Based on Leave Application (Travis) 2020-12-02 16:01:35 +05:30
Deepesh Garg
12b45b3f2a Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2020-12-02 12:46:23 +05:30
Shivam Mishra
9aaca25edb feat: update desk page json 2020-12-01 13:39:54 +05:30
Shivam Mishra
de68f74b4c chore: update all desk pages 2020-12-01 12:51:38 +05:30
Afshan
ccf5dc66e2
feat: multi-currency payroll (#23519) 
* feat: multi-currency payroll

* fix: refactor and added conditions

* fix: uncommented code

* style: removed comments

* fix: missing argument

* style: styling changes

* fix: test cases

* Update asset_value_adjustment.py

* patch: update columns

* style: formating

* style: formatting

* fix: 1st review

* fix: refactor

* Revert "fix: refactor"

This reverts commit eca0e17d11a192d60f249b2af992971c625aec46.

reverting to previous state

* Revert "fix: 1st review"

This reverts commit 7eac48b102157df4353598f73b2ea97308af436a.

reverting before 1st review

* fix: 2nd review changes

* fix: test cases

* fix: added call to fetch exchange rate

* fix: remove unnecessary code

* fix: refactor

* fix: refactor patch

* fix: refactor

* fix: refactor

* fix: clear test data

* fix: slider

* feat: multi-currency payroll

* fix: refactor and added conditions

* fix: uncommented code

* style: removed comments

* fix: missing argument

* style: styling changes

* fix: test cases

* patch: update columns

* Update asset_value_adjustment.py

* style: formating

* style: formatting

* fix: 1st review

* fix: refactor

* Revert "fix: refactor"

This reverts commit eca0e17d11a192d60f249b2af992971c625aec46.

reverting to previous state

* Revert "fix: 1st review"

This reverts commit 7eac48b102157df4353598f73b2ea97308af436a.

reverting before 1st review

* fix: 2nd review changes

* fix: test cases

* fix: added call to fetch exchange rate

* fix: remove unnecessary code

* fix: refactor

* fix: refactor patch

* fix: refactor

* fix: refactor

* fix: clear test data

* fix: slider

* feat: Added company field in leave encashment and employee benefit

* refactor: Refactored multi-currency payroll patch

* fix: currency column in salary register

* refactor: Refactored code for making bank and return entry against employee advance

* fix: minor cleanup

* fix: fixed translation

* fix: removed salary component type

* fix: fixed sider issues

* fix: translation and slider

* style: formatted msg

* fix: fixed slider

* fix: travis

* fix: refactor

* fix: slider

* fix: slider

* fix: slider

* fix: travis

* fix: patch

* fix: patch

* fix: travis

* fix: travis

* fix: travis

* fix: travis

* fix: travis

* fix: travis

* fix: re-run travis

* fix: rerun travis

* fix: rerun travis

* fix: rerun travis

* fix: travis rerun

* fix: increased throttle_user_limit from 60 to 100

* fix: patch

* fix: patch

* fix: assign payroll payable account as default payroll payable account in SSA

* fix: removed debugger

* fix: slider

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-12-01 09:11:05 +05:30