Zlash65
|
d25a264e5b
|
create and update department records patch
|
2018-05-14 16:07:28 +05:30 |
|
Zlash65
|
03ad0f2f4a
|
set query for department based on company
|
2018-05-14 16:07:28 +05:30 |
|
Zlash65
|
9a8f5bd6c7
|
set department name with company abbr
|
2018-05-14 16:07:27 +05:30 |
|
Zlash65
|
39668609ce
|
improv department tree
|
2018-05-14 16:07:27 +05:30 |
|
Zlash65
|
366ca92ba7
|
move default_currency on top
|
2018-05-14 16:07:27 +05:30 |
|
Zlash65
|
513f13df27
|
patch fix
|
2018-05-14 16:05:16 +05:30 |
|
rohitwaghchaure
|
c7ccd3ca2e
|
Merge pull request #13985 from saurabh6790/leave_period_fix
add get leave period method
|
2018-05-14 15:47:15 +05:30 |
|
Zlash65
|
39097c7fbe
|
codacy fix
|
2018-05-14 15:34:45 +05:30 |
|
Jamsheer
|
236be22648
|
Payroll entry - get employee fix
|
2018-05-14 13:32:50 +05:30 |
|
Jamsheer
|
d0b0c87f40
|
get additional salary component in salary slip
|
2018-05-14 12:16:46 +05:30 |
|
Jamsheer
|
08b60a1a62
|
New Doctype - Additional Salary Component
|
2018-05-14 12:16:46 +05:30 |
|
Jamsheer
|
a5028c8e54
|
Salary Structure - filter updated, Salary Component - fields re-arranged
|
2018-05-14 12:16:45 +05:30 |
|
Jamsheer
|
b5c5c471b4
|
Formula on Salary Component Master
|
2018-05-14 12:16:45 +05:30 |
|
Jamsheer
|
4bd7cdb018
|
Salary Structure Assignment - filters applied
|
2018-05-14 12:13:47 +05:30 |
|
Zlash65
|
f665189ab3
|
tree based changes
|
2018-05-14 11:45:38 +05:30 |
|
Zlash65
|
93d6b555d7
|
added fixtures for supplier-group, changed analytics report accordingly
|
2018-05-14 11:45:38 +05:30 |
|
Zlash65
|
c88ce364ce
|
treeview implemented for supplier group
|
2018-05-14 11:45:38 +05:30 |
|
Zlash65
|
540d7aa635
|
patch to reload_doc and rename field
|
2018-05-14 11:45:38 +05:30 |
|
Zlash65
|
2e0809801d
|
controller and other changes
|
2018-05-14 11:45:38 +05:30 |
|
Zlash65
|
890707854d
|
config/utility level changes
|
2018-05-14 11:45:38 +05:30 |
|
Zlash65
|
0a50554417
|
doctype level changes
|
2018-05-14 11:45:38 +05:30 |
|
Zlash65
|
4437a5ed18
|
json level changes
|
2018-05-14 11:45:38 +05:30 |
|
Zlash65
|
3387a35fed
|
rename supplier-type to supplier-group
|
2018-05-14 11:42:30 +05:30 |
|
Saurabh
|
c1acbdfb69
|
[fix] overlapping dates
|
2018-05-12 17:45:39 +05:30 |
|
Saurabh
|
a35dad7610
|
add get leave period method
|
2018-05-12 17:45:39 +05:30 |
|
Jamsheer
|
46b23f8e6e
|
Salary Structure Refactor, Formula on Salary Component Master (#13967)
* Salary structure refactor
* Salary Structure Assignment - filters applied
* Formula on Salary Component Master
* Salary Structure - filter updated, Salary Component - fields re-arranged
* Payroll Entry - get_employee_list fix
* Salary Structure Assignment - Validate Duplicate Assignment
* Salary Structure Assignment - filters for salary structure
|
2018-05-11 21:05:24 +05:30 |
|
Pawan Mehta
|
c53e35368d
|
Shift Management - Documentation and Tests (#13997)
* [fix] #13996
* codacy fix
|
2018-05-11 21:03:50 +05:30 |
|
Gaurav Naik
|
9502476c67
|
Accounting Period overlap validation
|
2018-05-11 07:53:12 +05:30 |
|
Gaurav Naik
|
6c92cff226
|
Accounting Period autoname
|
2018-05-11 07:52:50 +05:30 |
|
Ranjith
|
ded636097e
|
Tax Declaration, Proof Submission tests
|
2018-05-10 15:42:04 +05:30 |
|
Ranjith
|
5a8e6427f4
|
Tax Declaration, Proof Submission, validation
|
2018-05-10 15:06:49 +05:30 |
|
Ranjith
|
85d2d571c5
|
update hr menu, field subcategory in child table
|
2018-05-10 15:04:32 +05:30 |
|
Ranjith
|
e1c556b7e0
|
Doctype Employee Tax Exemption Sub Category
|
2018-05-10 15:02:57 +05:30 |
|
Ranjith
|
96121c598e
|
Tax Declaration, Proof Submission, field company
|
2018-05-10 15:02:00 +05:30 |
|
Jamsheer
|
9032c9d91d
|
Documentation - updated
|
2018-05-09 19:19:34 +05:30 |
|
Nabin Hait
|
56f0328bed
|
Merge branch 'finance-book' into enterprise_sprint
|
2018-05-09 15:10:52 +05:30 |
|
Nabin Hait
|
b9fed2aa38
|
Removed company from Finance Book and related changes
|
2018-05-09 15:10:29 +05:30 |
|
Gaurav Naik
|
a78a0e241f
|
Added finance book filtering logic to financial_statements.py
|
2018-05-09 15:03:40 +05:30 |
|
Gaurav Naik
|
8cbbdfdf30
|
Added finance book filter to financial_statements.js
|
2018-05-09 15:03:05 +05:30 |
|
Gaurav Naik
|
40559d5f5c
|
Added finance book filter logic to ReceivablePayable
|
2018-05-09 15:02:55 +05:30 |
|
Gaurav Naik
|
70ac2d2c51
|
Added finance book filter in accounts_receivable.js
|
2018-05-09 15:02:23 +05:30 |
|
Gaurav Naik
|
cddda8ac5f
|
Added finance book filter in accounts_payable.js
|
2018-05-09 15:02:11 +05:30 |
|
Gaurav Naik
|
57856b475c
|
Added finance book filter logic in general_ledger.py
|
2018-05-09 14:58:15 +05:30 |
|
Gaurav Naik
|
460d96f16d
|
Added finance book filter to General Ledger
|
2018-05-09 14:57:36 +05:30 |
|
Gaurav Naik
|
a6d3cbfbc5
|
Added finance book field to GL Entry doctype
|
2018-05-09 14:56:52 +05:30 |
|
Gaurav Naik
|
30f9e0f547
|
Set finance book in make_gl_entries
|
2018-05-09 14:56:39 +05:30 |
|
Gaurav Naik
|
a948726ddd
|
Added Finance Book doctype
|
2018-05-09 14:53:51 +05:30 |
|
Jamsheer
|
63a8f83076
|
Leaves - Documentation
|
2018-05-08 18:45:41 +05:30 |
|
Nabin Hait
|
2b16712c83
|
Merge branch 'ESS-LLP-staffing' into enterprise_sprint
|
2018-05-08 18:36:53 +05:30 |
|
Nabin Hait
|
3881e98000
|
Staffing plan for group company
|
2018-05-08 18:36:14 +05:30 |
|