- cd9fa61 Merge pull request #25521 from ernestoruiz89/patch-4 by Deepesh Garg · 3 years, 9 months ago
- 76e1e68 fix: Make strings translatable by Ernesto Ruiz · 3 years, 9 months ago
- 7f1b2de feat: Employee Referral (#24997) by Anurag Mishra · 3 years, 9 months ago
- 6625035 fix: Add transtlation function to strings by Ernesto Ruiz · 3 years, 10 months ago
- c221682 fix: Bulk Salary Structure Assignment (#25389) by Rucha Mahabal · 3 years, 10 months ago
- 9c9907c fix: available employee for selection (#25377) by Afshan · 3 years, 10 months ago
- c0db286 fix: filter for employees in salary slip (#25360) by Afshan · 3 years, 10 months ago
- 39b1cd8 fix: Additional Salary component amount not getting set (#25355) by Rucha Mahabal · 3 years, 10 months ago
- 2535fe9 fix: Resolved merge conflict by Nabin Hait · 3 years, 10 months ago
- 10c6137 fix: Backport missing commits to develop branch (#25305) by Nabin Hait · 3 years, 10 months ago
- 82d0a1a style: Add missing semicolons - & make formatting consistent by Suraj Shetty · 3 years, 10 months ago
- 65f25c2 fix(minor): fix dynamically changing grid properties by Rushabh Mehta · 3 years, 10 months ago
- e2da3cb fix: payroll issues (#24540) by Afshan · 3 years, 10 months ago
- c39720d fix: frappe.whitelist for doc methods (#25231) by Walstan Baptista · 3 years, 10 months ago
- 90e240c fix: frappe.whitelist for doc methods (#25230) by Walstan Baptista · 3 years, 10 months ago
- a42194f Merge branch 'develop' of https://github.com/frappe/erpnext into loan_fixes_phase_2 by Deepesh Garg · 3 years, 10 months ago
- 2453b0c fix: component amount calculation based on formula with abbr not working (#25117) by Rucha Mahabal · 3 years, 10 months ago
- 6717773 fix: Travis (#25078) by Rucha Mahabal · 3 years, 10 months ago
- 7f7b360 fix: merge conflict by Nabin Hait · 3 years, 10 months ago
- 11eb30d fix: merge conflict by Nabin Hait · 3 years, 10 months ago
- 53a1aaf fix: Salary Structure object has no attribute set_totals (#25113) by Rucha Mahabal · 3 years, 10 months ago
- d765b21 fix: Salary Structure object has no attribute set_totals (#25114) by Rucha Mahabal · 3 years, 10 months ago
- 2fef245 fix: don't set Company:company:default_currency as default for currency link fields (#25111) by Afshan · 3 years, 10 months ago
- f3c34aa fix: don't set "Company:company:default_currency" as default for currency link fields (#25095) by Prssanna Desai · 3 years, 10 months ago
- d636075 chore: frappe.whitelist for doc methods (#25068) by Walstan Baptista · 3 years, 10 months ago
- 170d2ef fix(Payroll): Exchange Rate not getting set in Salary Slip (#25013) by Rucha Mahabal · 3 years, 10 months ago
- 2a39b74 fix: Fixes on job card and salary slip (#25011) by Nabin Hait · 3 years, 10 months ago
- b2b12f3 fix(Payroll): Exchange Rate not getting set in Salary Slip by Rucha Mahabal · 3 years, 10 months ago
- 0885518 test: fix test_loan for payroll module (#24946) by Jannat Patel · 3 years, 11 months ago
- 95e9b2f refactor(payroll): simplified logic for additional salary (#24907) by Sagar Vora · 3 years, 11 months ago
- cf3fc99 test: fix salary component not found; other optimisation (#24920) by Sagar Vora · 3 years, 11 months ago
- 23b6294 Merge pull request #24842 from resilient-tech/allow-duplicate-additional by Anurag Mishra · 3 years, 11 months ago
- a2e4564 fix: Prevent non sequential repayment entries by Deepesh Garg · 3 years, 11 months ago
- 6727792 test: fix syntax error by Sagar Vora · 3 years, 11 months ago
- 514122b refactor(payroll): simplified logic for additional salary by Sagar Vora · 3 years, 11 months ago
- fe3529b fix: merge conflict by Nabin Hait · 3 years, 11 months ago
- 6e3668d fix: merge conflict by Nabin Hait · 3 years, 11 months ago
- 5822b6d fix(payroll): allow duplicate additional salaries by Sagar Vora · 3 years, 11 months ago
- fa73074 fix: salary structure assign to employee (#24798) by Jannat Patel · 4 years ago
- 5accf8a Merge branch 'develop' into salary_slip_error by Marica · 4 years ago
- 9b4e5bf chore: improve error message for missing fields. by Ankush Menat · 4 years ago
- f1d13a4 Merge branch 'develop' into track_settings by Raffael Meyer · 4 years ago
- 11092d0 feat: Additon of leave details in Salary Slip (#24674) by Deepesh Garg · 4 years ago
- a5c4558 feat: Additon of leave details in Salary Slip (#24674) by Deepesh Garg · 4 years ago
- 7d89243 fix: track setting changes by Ankush Menat · 4 years ago
- b27d4f6 fix: salary slip working hours increment (#24784) by Jannat Patel · 4 years ago
- d46b236 fix: optimize reposting of gle and sle (#24702) by Nabin Hait · 4 years ago
- 4cef0f5 fix: salary slip attribute error (#24455) by Jannat Patel · 4 years ago
- 83768b6 fix: emp disappear (#24525) by Afshan · 4 years ago
- ef5c714 fix: salary slip attribute error (#24455) by Jannat Patel · 4 years ago
- c0f8f32 fix: fetch query for employee (#24529) by Afshan · 4 years ago
- 10b00f9 fix: separation of salary creation from payroll (#24528) by Afshan · 4 years ago
- 91a0286 fix: emp disappear (#24525) by Afshan · 4 years ago
- 8676089 fix: emp disappear (#24524) by Afshan · 4 years ago
- 0a8939e Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui by Suraj Shetty · 4 years ago
- a6213cc Merge branch 'develop' into version-13-beta-pre-release by Nabin Hait · 4 years ago
- 907e299 fix: remove function to get earning deduction components (#24465) by Afshan · 4 years ago
- 0c34a71 Merge branch 'develop' of github.com:frappe/erpnext into version-13-beta-pre-release by Suraj Shetty · 4 years ago
- 2174409 fix: slider by Afshan · 4 years ago
- 02d495f fix: added query for fetching salary component by Afshan · 4 years ago
- f0ff23e Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui by Suraj Shetty · 4 years ago
- 36e3e05 fix: query for salary componet in salary structure by Afshan · 4 years ago
- 912647f fix: allow statistical component in salary structure. by Afshan · 4 years ago
- c69ab6d fix: select sal comp while making sal struct by Afshan · 4 years ago
- 6fb66f9 Merge pull request #24362 from ruchamahabal/year-to-date-in-salary-components by Deepesh Garg · 4 years ago
- bbc6bfd Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui by Suraj Shetty · 4 years ago
- cbed6f9 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters by Deepesh Garg · 4 years, 1 month ago
- 6c90e26 feat: add descriptions for YTD and MTD fields by Rucha Mahabal · 4 years, 1 month ago
- 49702c1 test: year to date computation for salary slip components by Rucha Mahabal · 4 years, 1 month ago
- 2c315a7 feat: Salary Slip with Year to Date Print Format by Rucha Mahabal · 4 years, 1 month ago
- fdad94f feat(Payroll): compute Year to Date for Salary Slip components by Rucha Mahabal · 4 years, 1 month ago
- 33fac19 fix: calculation of remaining_sub_periods if relieving date before month start date (#24319) by Afshan · 4 years, 1 month ago
- a931515 fix: Components formulated from additional salary not being fetched in Payroll Entry by Rucha Mahabal · 4 years, 1 month ago
- 77ba72c Merge branch 'develop' into payroll_fixes2.0 by Anurag Mishra · 4 years, 1 month ago
- e7fa6f6 fix: edditable employee grid by Anurag Mishra · 4 years, 1 month ago
- 9fc44f1 Merge pull request #24182 from scmmishra/fix-dont-set-primary by Shivam Mishra · 4 years, 1 month ago
- ad8be7c fix: Consider only submitted salary slips by Deepesh Garg · 4 years, 1 month ago
- f7b9b06 fix: tax calculation on salary slip for the first month (#24272) by Nabin Hait · 4 years, 1 month ago
- b01b108 fix: do not consider current salary slip in sum by Deepesh Garg · 4 years, 1 month ago
- 994fa48 Merge branch 'develop' into fix-dont-set-primary by Saurabh · 4 years, 1 month ago
- b864b09 Merge branch 'develop' into gratuity by Anurag Mishra · 4 years, 1 month ago
- 517fd8b fix: Ignore customer and supplier while deleting company transactions (#24279) by Nabin Hait · 4 years, 1 month ago
- 797a742 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters by Deepesh Garg · 4 years, 1 month ago
- 47bc427 Merge branch 'develop' into fix-sal-struc-assign-payroll-acc by Afshan · 4 years, 1 month ago
- d7ea2bd Merge pull request #24177 from AfshanKhan/fix-perm-empl-sal-slip by Anurag Mishra · 4 years, 1 month ago
- 8b60fe6 fix: setting correct account for sal struct assignment if not specified. by Afshan · 4 years, 1 month ago
- 133ce28 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters by Deepesh Garg · 4 years, 1 month ago
- 5891b48 Merge pull request #24176 from GangaManoj/Year-to-Date by Deepesh Garg · 4 years, 1 month ago
- 66dcaf3 fix: Salary structure assignment in tests by Deepesh Garg · 4 years, 1 month ago
- 97d055d fix: Test Case by Deepesh Garg · 4 years, 1 month ago
- 8b7ebe5 fix: Test Case cleanup and fixes by Deepesh Garg · 4 years, 1 month ago
- 20133bd fix: Remove comments by Deepesh Garg · 4 years, 1 month ago
- 353f8f4 fix: Add test case for YTD by Deepesh Garg · 4 years, 1 month ago
- 60b77f9 Merge branch 'develop' of https://github.com/frappe/erpnext into Year-to-Date by Deepesh Garg · 4 years, 1 month ago
- 4a8c2c4 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters by Deepesh Garg · 4 years, 1 month ago
- 527a156 feat: validated employees whose salary has been already precessed by Anurag Mishra · 4 years, 1 month ago
- 3278d02 fix: sider by Anurag Mishra · 4 years, 1 month ago
- 1446749 fix: changes requested by Anurag Mishra · 4 years, 2 months ago
- eb065d6 fix: fixed gl entries by Nabin Hait · 4 years, 2 months ago
- b71611d feat: Added Form dashboard by Anurag Mishra · 4 years, 2 months ago