rohitwaghchaure
|
3282191aae
|
Merge pull request #14025 from shreyashah115/html-table
Show pending leaves as an HTML table in leave application
|
2018-05-14 20:32:26 +05:30 |
|
rohitwaghchaure
|
48199842aa
|
Merge pull request #13750 from rohitwaghchaure/asset_purchase_link
Asset linked to purchase and serial no
|
2018-05-14 20:24:37 +05:30 |
|
rohitwaghchaure
|
8d626e6888
|
Merge pull request #14024 from ESS-LLP/jam_additional_sal_comp
Additional Salary Component
|
2018-05-14 20:24:10 +05:30 |
|
Shreya
|
4bd5583e11
|
Make Available Leave HTML Table
|
2018-05-14 19:32:59 +05:30 |
|
Jamsheer
|
75c53e5022
|
Fix - missing semicolon
|
2018-05-14 19:17:16 +05:30 |
|
Rohit Waghchaure
|
d644e6da16
|
Code cleanup
|
2018-05-14 19:09:44 +05:30 |
|
Rohit Waghchaure
|
11679884e4
|
Patch to move asset fields to Asset Finance Book table
|
2018-05-14 19:08:57 +05:30 |
|
Rohit Waghchaure
|
352df95976
|
Patch to make location
|
2018-05-14 19:08:56 +05:30 |
|
Rohit Waghchaure
|
16bc853f6a
|
Reschedule for future depreciations and booked difference amount in accumulated depreciation account
|
2018-05-14 19:07:40 +05:30 |
|
Rohit Waghchaure
|
aa7b434270
|
Create asset adjustment doctype, post gl entry for the asset
|
2018-05-14 19:07:40 +05:30 |
|
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 |
|
Jamsheer
|
47039e801e
|
Remove unused import
|
2018-05-14 18:54:10 +05:30 |
|
rohitwaghchaure
|
17aec2d16c
|
Merge pull request #13808 from mntechnique/cost-center-number
Cost center number
|
2018-05-14 18:35:38 +05:30 |
|
rohitwaghchaure
|
3069943bce
|
Merge pull request #13718 from Zlash65/enterprise
Department tree improv and moved Currency field up the list in Company
|
2018-05-14 18:26:37 +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 |
|
rohitwaghchaure
|
c7ccd3ca2e
|
Merge pull request #13985 from saurabh6790/leave_period_fix
add get leave period method
|
2018-05-14 15:47:15 +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 |
|
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
|
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 |
|
Nabin Hait
|
2b16712c83
|
Merge branch 'ESS-LLP-staffing' into enterprise_sprint
|
2018-05-08 18:36:53 +05:30 |
|