Saurabh
393dd4286a
[resolved] merge-conflicts
2018-09-12 14:48:30 +05:30
Ahmed Madi
20d8c52d2a
Update salary_slip.js ( #15200 )
2018-09-12 11:02:57 +05:30
Rushabh Mehta
a2288ff8e7
fix(assessment_result): student must be in group ( #15255 )
...
* fix(assessment_result): student must be in group
* fix(test_student_group): raise correct exception
* fix(unused-import): assessment-plan.py
* fix(tests)
* fix(tests)
* fix(test)
* fix(tests)
2018-08-31 16:12:49 +05:30
Shreya Shah
ee8f8281b4
[py3] Convert filter object to list ( #15260 )
2018-08-30 19:22:22 +05:30
Charles-Henri Decultot
7e86d7b014
Add default payable account for expense claims ( #15246 )
2018-08-30 19:18:26 +05:30
Nabin Hait
f6b784e39e
Test fixes
2018-08-30 18:42:35 +05:30
Shreya Shah
68348d4130
[Attendance-Tool] Filter employees based on date of joining ( #15262 )
2018-08-30 17:25:58 +05:30
Rushabh Mehta
20fd2ddd1c
ux(hr): module listing and quick entry for employee
2018-08-30 09:21:54 +05:30
Rushabh Mehta
13bcc4e27e
perms: fix default import, export perms
2018-08-29 17:10:27 +05:30
Aditya Hase
e3ac5ff9e3
erpnext: refactor async to is_async ( #15231 )
2018-08-28 14:11:58 +05:30
Nabin Hait
01b2a6549c
minor fix
2018-08-28 14:09:36 +05:30
Shreya Shah
a5add289bb
Refactor Naming Series ( #15070 )
...
* Patch to create Property Setter for existing naming series
* Update existing naming series options with new
* Add patch link to patches.txt
* Update patch
* Fix codacy
* Fix as per suggestions
* Remove old patch for property setter
* Improve as per suggested
- Modified the naming
- Also refactored naming for doctypes having autoname with series
- Added a patch to make property setter for autoname
* Fix Travis
* Rebase with develop
2018-08-28 13:44:48 +05:30
Nabin Hait
c95153f83b
Offer date mandatory in job offer
2018-08-20 16:58:06 +05:30
Rushabh Mehta
8705371ef0
fix(product-listing): fix variant selection in website
2018-08-16 09:22:45 +05:30
Faris Ansari
4809f86035
fix(report): field -> fieldname, dateutil -> frappe.datetime ( #15106 )
2018-08-14 10:56:18 +05:30
Zarrar
a4d06fc881
replace cur_frm with frm
2018-08-12 17:48:04 +05:30
ahmad zaqout
7df03a4b5b
replace department group to department
2018-08-11 22:10:24 +03:00
ahmad zaqout
0fd562e0d9
replace customer to department
2018-08-11 21:54:56 +03:00
Saurabh
20fb443f0c
[Resolved] merge conflicts
2018-08-10 17:11:30 +05:30
rohitwaghchaure
a0b846fb88
[Minor] Added condition for get_bank_cash_account ( #15112 )
2018-08-09 15:51:38 +05:30
rohitwaghchaure
59de1dae6a
[Fix] Math domain error ( #15107 )
2018-08-09 10:58:37 +05:30
Rushabh Mehta
708e47aadf
optimize(various)
2018-08-08 16:37:31 +05:30
ahmad zaqout
63a741e5c8
fix throw_overlap_error in Shift Assignment ( #15103 )
...
fix throw_overlap_error in Shift Assignment
2018-08-08 10:36:40 +05:30
Saurabh
824b388631
Resolved merge conflicts
2018-08-07 13:01:11 +05:30
Faris Ansari
796ca56f85
Use frappe.utils.md_to_html instead of manual import ( #15087 )
2018-08-07 11:53:36 +05:30
rohitwaghchaure
0452b405f4
[Fix] Not able to submit the expense claim ( #15057 )
2018-08-01 17:45:51 +05:30
Nabin Hait
14ad9f70b5
Patch fixes
2018-07-31 17:33:14 +05:30
Nabin Hait
d53c2c031d
more payroll improvements and tests fixes
2018-07-30 20:17:15 +05:30
Nabin Hait
d305a7a959
Made leave application importable
2018-07-30 17:12:32 +05:30
Nabin Hait
4f135c9805
Payroll entry ux improvements and processing via background jobs
2018-07-30 16:37:07 +05:30
Nabin Hait
04d5412754
Fixed conflict
2018-07-30 16:37:07 +05:30
Nabin Hait
9c735e43b0
Grant leaves via modal and backgroud jobs ( #15026 )
2018-07-30 10:58:49 +05:30
Zarrar
6004b66797
[Minor] Job Offer UX improvise ( #15042 )
...
* job offer ux improv
* Update job_offer.js
2018-07-30 10:57:13 +05:30
Ranjith Kurungadam
e555b5bcf2
Salary Slip tests for tax calc on benefits, additional salary ( #14985 )
...
* tests for tax calc on benefits, additional salary
* fix tests - remove created additional salary
2018-07-26 14:39:59 +05:30
Nabin Hait
8173d9f17a
Update additional_salary.json
2018-07-26 12:20:05 +05:30
Nabin Hait
22fa99d040
Payroll Fixes
2018-07-25 18:21:39 +05:30
Ranjith Kurungadam
1e90dafef8
fixes Benefit Application, Additional Salary ( #14971 )
...
* fix - add Additional Salary if multiple in one slip
* fix - Benefit Appication, None comparison
2018-07-23 11:32:58 +05:30
Ranjith Kurungadam
68abe25371
fix - assigned Salary Structure query ( #14965 )
2018-07-23 11:31:46 +05:30
Ranjith Kurungadam
dff2ba72d3
test TDS calculation ( #14919 )
...
* test TDS calculation
* fix failing test cases
* fix codacy
2018-07-19 14:34:05 +05:30
Saurabh
d7897f1c53
Resolved merge conflicts
2018-07-18 17:08:16 +05:30
Faris Ansari
9e874af9ba
Query report print ( #14935 )
...
* QueryReport
- Only print visible columns in report
- Use get_columns_for_print method instead of directly
accessing report.columns
* Query Report
- Replace frappe.query_report_filters_by_name with new API
2018-07-18 09:28:44 +05:30
Shreya Shah
fbeab5bf73
Show opening balance of leaves ( #14925 )
...
* Show opening balance of leaves
* Update employee_leave_balance.py
2018-07-17 11:59:51 +05:30
KanchanChauhan
09e680b4aa
[Fix] Should not get approvers for disabled Departments ( #14868 )
2018-07-13 12:26:56 +05:30
Zarrar
9a3b785a03
[Minor] Employee Separation Fix ( #14867 )
...
* delete associated task & project forcefully
in Employee Seapration cancel trigger
* remove leftover print statement
* remove console statements
2018-07-11 14:34:55 +05:30
Saurabh
db7324890f
Merge branch 'master' into develop
2018-07-09 15:53:51 +05:30
Ranjith Kurungadam
ea089d67ce
Employee Benefit Application - fix ( #14837 )
2018-07-09 14:01:18 +05:30
rohitwaghchaure
8179bcbabd
[Fix] Code cleanup ( #14843 )
2018-07-09 09:29:40 +05:30
rohitwaghchaure
e4a53f961a
[Fix] Unable to print Salary Register ( #14844 )
2018-07-09 09:28:56 +05:30
Ranjith Kurungadam
6429ba9ed9
Payroll Entry - fix query, get assignment by end date ( #14827 )
2018-07-06 13:30:40 +05:30
Saurabh
1cfcf70905
Resolved merge conflicts
2018-07-06 13:18:44 +05:30