rohitwaghchaure
d9faba962b
Merge pull request #13746 from Zlash65/supplier-group
...
[Enhance] Rename Supplier Type to Supplier Group - tree structure implemented
2018-05-14 20:40:30 +05:30
rohitwaghchaure
7c6bef4905
Merge branch 'enterprise_sprint' into supplier-group
2018-05-14 20:39:01 +05:30
rohitwaghchaure
8137f0402a
Merge pull request #13984 from manassolanki/employee-boarding
...
[feature] added the employee onboarding and separation doctype
2018-05-14 20:35:49 +05:30
Manas Solanki
094e1841e0
minor changes and fixed the conflicts
2018-05-14 20:33:28 +05:30
rohitwaghchaure
67da5f7671
Merge pull request #14023 from mntechnique/accounting_period
...
Accounting Period
2018-05-14 20:33:09 +05:30
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
Manas Solanki
b698846c30
[feature] added the employee onboarding and separation doctype
2018-05-14 20:27:00 +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
Jamsheer
70a998d428
Remove unused variable
2018-05-14 18:51:04 +05:30
rohitwaghchaure
17aec2d16c
Merge pull request #13808 from mntechnique/cost-center-number
...
Cost center number
2018-05-14 18:35:38 +05:30
Jamsheer
f5e67213fd
Attendance Request - half day check is enabled
2018-05-14 18:34:34 +05:30
rohitwaghchaure
044d6908cf
Merge pull request #13564 from sathishpy/develop
...
Bank Statement Import
2018-05-14 18:27:53 +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
Gaurav Naik
21b2df41ac
[Fix] len() instead of .length
2018-05-14 18:15:47 +05:30
Gaurav Naik
caaebb9d2a
[WIP] Accounting Period Test cases
2018-05-14 18:11:09 +05:30
Jamsheer
ead858b4de
Compensatory Leave Request - fix
2018-05-14 18:08:31 +05:30
Gaurav Naik
52571a80da
Bootstrap documents for closing (js)
2018-05-14 18:06:50 +05:30
Gaurav Naik
2fe38c3ff5
Bootstrap documents for closing
2018-05-14 18:06:34 +05:30
Gaurav Naik
32b3aa257c
[Fix] Indentation for accounting_period overlap
2018-05-14 18:02:24 +05:30
Jamsheer
b848c51592
Compensatory Leave Request - leave allocation create and update - fix
2018-05-14 17:56:22 +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
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
Faris Ansari
404f39d373
[fix] apply price list
...
in_apply_price_list flag remains true if server exception occurs
2018-05-14 15:46:45 +05:30
Zlash65
39097c7fbe
codacy fix
2018-05-14 15:34:45 +05:30
Shreya Shah
bbee9b6cc4
[Enhancement] Monthly Attendance Report ( #13970 )
...
* Update Attendance on Approval of Leave
* Separate out leaves on the basis of its type
* Remove commented code
* Make attendance records if not found
* Fix Codacy
* Replace bad code in attendance.py
2018-05-14 14:30:58 +05:30
Manas Solanki
661332dab5
[fix] honour the shopping cart setting when showing the stock and non-stock item ( #13988 )
2018-05-14 14:30:30 +05:30
Zarrar
8646ed45bc
button triggers not working in tasks table ( #13973 )
2018-05-14 14:29:01 +05:30
Faris Ansari
69b0535e10
[fix] Incorrect currency conversion in Itemised Tax Breakup ( #14006 )
2018-05-14 14:19:31 +05:30
