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
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
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
be10cfed92
Merge branch 'shreyashah115-multi-company-transations' into enterprise_sprint
2018-05-07 16:12:23 +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
420c140c48
Merge branch 'ESS-LLP-employee_promotion_transfer' into enterprise_sprint
2018-05-07 12:23:22 +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
Zarrar
6f3594b2e4
[Enhance] GL Entry - ability to multiselect party ( #13769 )
...
* change dynamic link to multiselect field and improv
* print based fix
* refactor changes according to multiselect changes
2018-05-03 19:00:43 +05:30
Shreya
27e4e244b6
fix codacy
2018-05-02 14:34:14 +05:30
Shreya
ae0b31c31d
changes as per the reviews
2018-05-02 14:34:14 +05:30
Shreya
b47302dd52
unlink reference on cancellation of any invoice
2018-05-02 14:34:14 +05:30
Shreya
c804f424ab
update reference fields on both invoices
2018-05-02 14:34:14 +05:30
Shreya
79584b1cbd
validations to check price list and currencies
2018-05-02 14:34:14 +05:30
Shreya
99ae0439d7
mapping of relevant fields
2018-05-02 14:34:14 +05:30
Shreya
0bd987ab03
validations before routing to invoice
2018-05-02 14:34:14 +05:30
Shreya
ed80cf1f2e
Inter company invoice reference link field
2018-05-02 14:34:14 +05:30
Shreya
30b2480cfe
make inter company invoice button on Invoices
2018-05-02 14:34:14 +05:30
Shreya
462e18ad2e
Allowed To Transact With child table in Customer & Supplier
2018-05-02 14:34:14 +05:30
Shreya
59512aaaaa
Internal Supplier check in Supplier
2018-05-02 14:34:14 +05:30
Shreya
7946ca216e
Internal Customer check in Customer
2018-05-02 14:34:14 +05:30
Nabin Hait
d2861df939
Renamed Health Insurance to Employee Health Insurance
2018-05-02 14:34:14 +05:30
Nabin Hait
43274de5df
Removed employee table from Salary Structure and added employee name in all forms
2018-05-02 14:33:37 +05:30
Nabin Hait
e9ad03e23e
Documents order in hr page
2018-05-02 14:31:27 +05:30
Nabin Hait
501a64becd
Added links in HR module
2018-05-02 14:31:03 +05:30
Shreya Shah
24e8f31be1
[Enterprise] Patch and child table changes ( #13656 )
...
* [patch] rename field
* Employee Property History child table
* remove child tables
2018-05-02 14:29:44 +05:30
Nabin Hait
2f77ccce1b
New doctypes for HR and Accounting ( #13652 )
2018-05-02 14:27:19 +05:30
Nabin Hait
d39386bd55
Renamed some salary related fields
2018-04-30 16:21:37 +05:30
Nabin Hait
2f82bce387
minor fix
2018-04-26 16:32:17 +05:30
Nabin Hait
25ccd1acbb
minor fix in asset
2018-04-26 12:16:38 +05:30
