Rohit Waghchaure
0ea6fe4397
Added new doctype Finance Book Detail in asset, asset category
2018-05-14 19:07:40 +05:30
Rohit Waghchaure
f2684ae83a
Commonify get_asset_category_account and get_fixed_asset_account method
2018-05-14 19:07:40 +05:30
Rohit Waghchaure
f41e1ed191
Added default asset accounts in COA, CWIP account in asset category
2018-05-14 19:07:40 +05:30
Rohit Waghchaure
255cd44aba
Treeview for Location
2018-05-14 19:07:39 +05:30
Rohit Waghchaure
af05995418
Asset accounting
2018-05-14 19:07:39 +05:30
Rohit Waghchaure
c6deb13fb4
Added account fields in the company, fixes in auto creation of the asset from PR
2018-05-14 19:07:39 +05:30
Rohit Waghchaure
ab84254188
Asset linked to purchase receipt and serial no
2018-05-14 19:07:39 +05:30
rohitwaghchaure
17aec2d16c
Merge pull request #13808 from mntechnique/cost-center-number
...
Cost center number
2018-05-14 18:35:38 +05:30
Zlash65
06fd51bf69
patch fix for instructor
2018-05-14 17:16:27 +05:30
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
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
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
Nabin Hait
3881e98000
Staffing plan for group company
2018-05-08 18:36:14 +05:30
Nabin Hait
247bd94824
Merge branch 'staffing' of https://github.com/ESS-LLP/erpnext-healthcare into ESS-LLP-staffing
2018-05-08 16:30:18 +05:30
Nabin Hait
3e47fbb2f0
assign salary structure custom button
2018-05-08 16:05:04 +05:30
Nabin Hait
b7613af73c
Merge branch 'enterprise_sprint' of https://github.com/frappe/erpnext into enterprise_sprint
2018-05-07 16:13:33 +05:30
Nabin Hait
330fae8652
minor fixes
2018-05-07 16:11:35 +05:30
Ranjith
c36578e8d3
Job Opening - display vacancies only on staffing plan
2018-05-07 14:19:40 +05:30
Ranjith
f220e89d9f
Job Opening - get planned opening, validate vacancies by Staffing Plan
2018-05-07 13:58:54 +05:30
Ranjith
e4cda0380a
Staffing Plan - validations, get employee count on designation change, calc estimated cost
2018-05-07 13:54:49 +05:30
Nabin Hait
fdc67a577f
Merge branch 'multi-company-transations' of https://github.com/shreyashah115/erpnext into shreyashah115-multi-company-transations
2018-05-07 13:12:16 +05:30
Ranjith Kurungadam
95c5c055f8
Optional leave ( #13931 )
...
* Optional Holiday - move holiday list from leave type to leave period
* Optional Leave - validate on Leave Application
* test Optional Leaves
2018-05-07 12:43:08 +05:30
Nabin Hait
d5220c0ff4
minor fix
2018-05-07 12:22:57 +05:30
Nabin Hait
01f5df72cc
Merge branch 'employee_promotion_transfer' of https://github.com/ESS-LLP/erpnext-healthcare into ESS-LLP-employee_promotion_transfer
2018-05-07 11:55:52 +05:30
Nabin Hait
ba70ff0904
Exchange rate revaluation ( #13932 )
...
* Added account data on child table
* Added Journal Entry button and functionality
* Add docs
* Refactoring and cleanup of Exchange Rate Revaluation
2018-05-05 18:22:56 +05:30
Ranjith
86b81e99e5
codacy fixes
2018-05-05 16:49:51 +05:30
Ranjith
9505ea93cf
codacy fixes
2018-05-05 14:32:42 +05:30
Ranjith
715780b78b
Employee Promotion, Transfer - documentation
2018-05-05 13:51:34 +05:30
Ranjith
a68a108234
Employee Promotion, Transfer - test submit before date, create new employee
2018-05-05 13:43:15 +05:30
Ranjith
56b58017d1
Employee Promotion, Transfer - validate, submit, cancel workflow
2018-05-05 13:41:48 +05:30
Ranjith
fddfffd3e6
Employee Promotion, Transfer - modal to add details to child table
2018-05-05 13:27:26 +05:30
Ranjith
ea60225760
Employee Promotion, Transfer - update child table, added fields
2018-05-05 13:25:46 +05:30
Shreya Shah
ecb9315ea1
Inter Company Journal Entry ( #13683 )
...
* rebase with enterprise_sprint
* Add Inter company account checkbox in Account master
* Add Inter Company Journal Entry Voucher Type in Journal Entry
* Make Inter Company Journal Entry button
* Dialog to select company for Inter Company Journal Entry
* Map relevant fields in the Inter Company Journal Entry and reference links
* Rebase
* Add Documentation
2018-05-03 19:04:36 +05:30
