Log - 4adaf7ed2efb0b8936ff9d74df2599c0ba6fcb9b - Clicks/Forks/ERPNext

e8c2fdf Merge branch 'master' into staging-fixes by Frappe Bot · 6 years ago
53a38e8 Merge pull request #16257 from surajshetty3416/permission-fixes by rohitwaghchaure · 6 years ago
deb96da [Fix] Salary structure not saving (#16275) by rohitwaghchaure · 6 years ago
146be9f Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes by Suraj Shetty · 6 years ago
c4d38c0 Fix the disappears of image bug after uploading and saving the employee (#16217) by Navdeep Ghai · 6 years ago
b296500 Replace 'Make' with 'Create' by Suraj Shetty · 6 years ago
1b7c583 Merge branch 'staging' into develop by Frappe Bot · 6 years ago
7ae2d59 Merge branch 'staging-fixes' into permission-fixes by Suraj Shetty · 6 years ago
0543f03 fix: Remove date_of_joining from field list by shreyashah115@gmail.com · 6 years ago
c8337c6 fix check for leave on holiday for half day by Zlash65 · 6 years ago
e165fc0 Merge branch 'staging' into develop by Saurabh · 6 years ago
eeab3ee fix(test): use frappe.db.rollback to revert deletion of fixture data (#16192) by Rushabh Mehta · 6 years ago
07e5786 Fix user permission checks by Suraj Shetty · 6 years ago
fe1f532 Merge branch 'staging' into develop by Ameya Shenoy · 6 years ago
dde952d Merge pull request #16092 from deepeshgarg007/salary_slip by Nabin Hait · 6 years ago
9a06543 Merge branch 'staging-fixes' into indicators-in-leave-applications by Nabin Hait · 6 years ago
2d0b788 [Minor] Indicators in Leave Application by Kanchan Chauhan · 6 years ago
36f2663 Merge branch 'staging-fixes' into fixed_holiday_list_not_working by Nabin Hait · 6 years ago
bd87903 Added condition for default amount by deepeshgarg007 · 6 years ago
533066e Salary slip bug fix by deepeshgarg007 · 6 years ago
48e0e19 fix(test): Fixed salary slip and sales analytics test cases by Nabin Hait · 6 years ago
037a151 [Fix] New holiday list form is not working by Rohit Waghchaure · 6 years ago
eb4969d Merge branch 'staging' into develop by Frappe Bot · 6 years ago
98b4a1b Merge branch 'master' into staging-fixes by Frappe Bot · 6 years ago
98a2348 Merge branch 'staging' into develop by Frappe Bot · 6 years ago
047a712 Claimed amount is not reset on cancel by Rohit Waghchaure · 6 years ago
e04a753 assign-sa-to-group-of-employees by alsum · 6 years ago
c856794 fix(hr): Delete salary slip when cancel payroll entry (#15757) by TaiLouis · 6 years ago
8075a57 Merge branch 'staging' into develop by Ameya Shenoy · 6 years ago
4a75d58 Merge branch 'master' into staging-fixes by Ameya Shenoy · 6 years ago
598d344 [Fix] Column ‘claimed_amount’ cannot be null by Rohit Waghchaure · 6 years ago
f3f997f Merge branch 'staging' into develop by Ameya Shenoy · 6 years ago
78b273a [Bug-Fix] Cannot Save Bank Statement Transaction Entry (#15793) by deepeshgarg007 · 6 years ago
df62296 Merge branch 'staging' into develop by Ameya Shenoy · 6 years ago
4d47c63 Update employee_advance.py by ashish-greycube · 6 years ago
7658bdc Merge branch 'staging' into develop by Ameya Shenoy · 6 years ago
1b105e2 Add test case by Shreya · 6 years ago
60d8a0d fix(leave-status): Do not consider current leave application while submitting by Shreya · 6 years ago
606c504 Merge branch 'staging' into develop by Ameya Shenoy · 6 years ago
3c29967 Fixed merge conflict by Nabin Hait · 6 years ago
94fcb0e [Enhance] Add user image in the employee from the user (#15680) by rohitwaghchaure · 6 years ago
3362d6b [Fix] Precision issue in the expense claim (#15678) by rohitwaghchaure · 6 years ago
8c62ab4 [Enhancement] Email birthday reminder (#15559) by Mangesh-Khairnar · 6 years ago
50447b1 Compatibility with Py2 (#15653) by Charles-Henri Decultot · 6 years ago
f90af80 Merge branch 'staging' into develop by Ameya Shenoy · 6 years ago
d92f3ac Fix 'transporter info' section in Delivery Note (#15565) by Sagar Vora · 6 years ago
da10f6e Merge branch 'staging' into develop by Ameya Shenoy · 6 years ago
7d929c5 Merge branch 'master' into staging-fixes by Ameya Shenoy · 6 years ago
efd776d Events in timeline (#15485) by Charles-Henri Decultot · 6 years ago
c0b684d Attendance - Unique check based on Employee and Date excluding cancelled docs (#15556) by Sharath C · 6 years ago
8976ad5 Merge pull request #15523 from rohitwaghchaure/fix_attendance_tool_issue by rohitwaghchaure · 6 years ago
c7f8b82 [Fix] Attendance tool by Rohit Waghchaure · 6 years ago
8fbf856 [Fix] Salary slip by Rohit Waghchaure · 6 years ago
1e7c32b Payroll fixes and more (#15475) by Nabin Hait · 6 years ago
b9228fa show only submitted salary_structure and leave_policy in Employee Grade app (#15434) by Mohamed_Alsum · 6 years ago
bfc195d Changes to support refactor in frappe pg-poc branch (#15287) by Suraj Shetty · 6 years ago
75d90b9 a[resolved] merge-conflicts by Saurabh · 6 years ago
772dc6e Various permission fixes (#15448) by Saif · 6 years ago
a60ab1a [Fix] Salary slip is not saving (#15449) by rohitwaghchaure · 6 years ago
393dd42 [resolved] merge-conflicts by Saurabh · 6 years ago
20d8c52 Update salary_slip.js (#15200) by Ahmed Madi · 6 years ago
a2288ff fix(assessment_result): student must be in group (#15255) by Rushabh Mehta · 6 years ago
ee8f828 [py3] Convert filter object to list (#15260) by Shreya Shah · 6 years ago
7e86d7b Add default payable account for expense claims (#15246) by Charles-Henri Decultot · 6 years ago
f6b784e Test fixes by Nabin Hait · 6 years ago
68348d4 [Attendance-Tool] Filter employees based on date of joining (#15262) by Shreya Shah · 6 years ago
20fd2dd ux(hr): module listing and quick entry for employee by Rushabh Mehta · 6 years ago
13bcc4e perms: fix default import, export perms by Rushabh Mehta · 6 years ago
e3ac5ff erpnext: refactor async to is_async (#15231) by Aditya Hase · 6 years ago
01b2a65 minor fix by Nabin Hait · 6 years ago
a5add28 Refactor Naming Series (#15070) by Shreya Shah · 6 years ago
c95153f Offer date mandatory in job offer by Nabin Hait · 6 years ago
8705371 fix(product-listing): fix variant selection in website by Rushabh Mehta · 6 years ago
4809f86 fix(report): field -> fieldname, dateutil -> frappe.datetime (#15106) by Faris Ansari · 6 years ago
a4d06fc replace cur_frm with frm by Zarrar · 6 years ago
7df03a4 replace department group to department by ahmad zaqout · 6 years ago
0fd562e replace customer to department by ahmad zaqout · 6 years ago
20fb443 [Resolved] merge conflicts by Saurabh · 6 years ago
a0b846f [Minor] Added condition for get_bank_cash_account (#15112) by rohitwaghchaure · 6 years ago
59de1da [Fix] Math domain error (#15107) by rohitwaghchaure · 6 years ago
708e47a optimize(various) by Rushabh Mehta · 6 years ago
63a741e fix throw_overlap_error in Shift Assignment (#15103) by ahmad zaqout · 6 years ago
824b388 Resolved merge conflicts by Saurabh · 6 years ago
796ca56 Use frappe.utils.md_to_html instead of manual import (#15087) by Faris Ansari · 6 years ago
0452b40 [Fix] Not able to submit the expense claim (#15057) by rohitwaghchaure · 6 years ago
14ad9f7 Patch fixes by Nabin Hait · 6 years ago
d53c2c0 more payroll improvements and tests fixes by Nabin Hait · 6 years ago
d305a7a Made leave application importable by Nabin Hait · 6 years ago
4f135c9 Payroll entry ux improvements and processing via background jobs by Nabin Hait · 6 years ago
04d5412 Fixed conflict by Nabin Hait · 6 years ago
9c735e4 Grant leaves via modal and backgroud jobs (#15026) by Nabin Hait · 6 years ago
6004b66 [Minor] Job Offer UX improvise (#15042) by Zarrar · 6 years ago
e555b5b Salary Slip tests for tax calc on benefits, additional salary (#14985) by Ranjith Kurungadam · 6 years ago
8173d9f Update additional_salary.json by Nabin Hait · 6 years ago
22fa99d Payroll Fixes by Nabin Hait · 6 years ago
1e90daf fixes Benefit Application, Additional Salary (#14971) by Ranjith Kurungadam · 6 years ago
68abe25 fix - assigned Salary Structure query (#14965) by Ranjith Kurungadam · 6 years ago
dff2ba7 test TDS calculation (#14919) by Ranjith Kurungadam · 6 years ago
d7897f1 Resolved merge conflicts by Saurabh · 6 years ago
9e874af Query report print (#14935) by Faris Ansari · 6 years ago