Saurabh
|
62a59301ef
|
[fix] resolved merge conflicts
|
2018-05-15 13:02:40 +05:30 |
|
Saurabh
|
f8c26bb778
|
bumped to version 10.1.32
|
2018-05-15 13:28:15 +06:00 |
|
Rohit Waghchaure
|
4a126947f5
|
Code cleaup
|
2018-05-15 12:43:21 +05:30 |
|
Saurabh
|
ccd0617e19
|
Merge pull request #14017 from netchampfaris/apply-price-list-hotfix
[fix] apply price list
|
2018-05-15 11:25:08 +05:30 |
|
Saurabh
|
12f708d155
|
Merge pull request #14035 from saurabh6790/v11_patch_fix
[fix] reload Leave Period and Staffing Plan doctypes
|
2018-05-15 10:49:53 +05:30 |
|
Rohit Waghchaure
|
3f02820384
|
[Fix] Global name 'Approved' is not defined
|
2018-05-15 10:30:06 +05:30 |
|
Saurabh
|
d217fbaa45
|
[fix] reload Leave Period and Staffing Plan doctypes
|
2018-05-15 08:35:25 +05:30 |
|
Shreya
|
dbb67fb4fd
|
Clear leave balance on changing leave type
|
2018-05-14 23:02:09 +05:30 |
|
Saurabh
|
99400bd958
|
remove duplicate fields occured due to merge conflicts
|
2018-05-14 22:11:17 +05:30 |
|
Rohit Waghchaure
|
9ba72f7897
|
[Fix] get_approved_leaves_for_period module import failed
|
2018-05-14 21:37:55 +05:30 |
|
Saurabh
|
2ca83d61ea
|
Resolve merge conflicts from enterprise_sprint branch
|
2018-05-14 21:15:46 +05:30 |
|
Saurabh
|
1f1dd96f57
|
Merge branch 'enterprise_sprint' into jam_enterprise_sprint
|
2018-05-14 20:57:40 +05:30 |
|
rohitwaghchaure
|
3f0c735e53
|
Merge branch 'enterprise_sprint' into tax_exemption
|
2018-05-14 20:47:35 +05:30 |
|
Saurabh
|
4ae089d6a1
|
Provision to deduct TDS on Advance
|
2018-05-14 20:42:08 +05:30 |
|
Saurabh
|
f3f438ad18
|
tds fixed for PI
|
2018-05-14 20:42:08 +05:30 |
|
Saurabh
|
b9d3385fec
|
calculate TDS on Sales Invoice Amount
|
2018-05-14 20:42:08 +05:30 |
|
Saurabh
|
3b4a6be4d0
|
Supplier Tax Withholding Config
|
2018-05-14 20:42:08 +05:30 |
|
Saurabh
|
2d8a7ee81f
|
Bootstrap 'TDS' via fixture
|
2018-05-14 20:41:38 +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 |
|
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 |
|