Prateeksha Singh
|
bcbe32ce7c
|
Merge pull request #14169 from pratu16x7/hotfix
[hotfix][charts] update, without new build system
|
2018-05-21 18:31:39 +05:30 |
|
Prateeksha Singh
|
b434f2687e
|
[charts] update, without new build system
|
2018-05-21 18:04:50 +05:30 |
|
Manas Solanki
|
6488d740c6
|
Merge pull request #14167 from frappe/manassolanki-patch-7
Remove the debugger from the material_request.js
|
2018-05-21 17:29:03 +05:30 |
|
Manas Solanki
|
a96421279d
|
Remove the debugger from the material_request.js
|
2018-05-21 17:27:01 +05:30 |
|
rohitwaghchaure
|
734b874f3e
|
Merge pull request #14166 from rohitwaghchaure/version_11_patch_budget
[Fix] Patch, default cost center, expense account for the item
|
2018-05-21 17:18:58 +05:30 |
|
Faris Ansari
|
d2b4ec5044
|
[fix] Set null values to '0' before changing column type
|
2018-05-21 16:55:31 +05:30 |
|
Zlash65
|
004bf218a0
|
remove changes for max_days_allowed patch
|
2018-05-21 16:52:08 +05:30 |
|
Rohit Waghchaure
|
0ca7ba3247
|
[Fix] Patch, default cost center, expense account for the item
|
2018-05-21 16:43:50 +05:30 |
|
Faris Ansari
|
e479057148
|
Merge pull request #14165 from codingCoffee/min
relieving_date wasnt of type datetime
|
2018-05-21 16:42:41 +05:30 |
|
Ameya Shenoy
|
35984daf72
|
relieving_date wasnt of type datetime
|
2018-05-21 16:37:27 +05:30 |
|
Manas Solanki
|
a752eca82c
|
Merge pull request #14163 from manassolanki/fix-20
[fix] don't update the modified of item price while updating item
|
2018-05-21 16:37:01 +05:30 |
|
rohitwaghchaure
|
22619a8e0c
|
Merge pull request #14164 from rohitwaghchaure/fixed_alias_issue
[Fix] Unknown column 'i.stock_uom' in 'field list'
|
2018-05-21 16:22:23 +05:30 |
|
Rohit Waghchaure
|
abc6cf0aa5
|
[Fix] Unknown column 'i.stock_uom' in 'field list'
|
2018-05-21 16:18:37 +05:30 |
|
rohitwaghchaure
|
37da7d7d05
|
Merge pull request #14162 from rohitwaghchaure/permissions_issue_leave_application
[Fix] Permission issue while saving leave application
|
2018-05-21 16:02:58 +05:30 |
|
Manas Solanki
|
b5d9b38dee
|
don't update the modified of the item price
|
2018-05-21 15:40:51 +05:30 |
|
Rohit Waghchaure
|
11e2a9ac90
|
[Fix] Permission issue while saving leave application
|
2018-05-21 15:39:38 +05:30 |
|
Faris Ansari
|
44528cb618
|
Merge pull request #14161 from Zlash65/travis-fix
[Minor] Department patch fix
|
2018-05-21 15:13:55 +05:30 |
|
Zlash65
|
41cb6cc491
|
patch fix - skip query if no when_then case
|
2018-05-21 15:10:06 +05:30 |
|
Shreya
|
70f9d07df8
|
Fix patches for Travis
|
2018-05-21 15:04:13 +05:30 |
|
Faris Ansari
|
6d2dfac44e
|
[fix][patch] Shopify (#14159)
|
2018-05-21 14:41:11 +05:30 |
|
rohitwaghchaure
|
1275ea5123
|
Merge pull request #14154 from rohitwaghchaure/set_default_leave_approver
Set leave approver in the leave application
|
2018-05-21 11:58:41 +05:30 |
|
Nabin Hait
|
19ce904030
|
Report added in Selling module
|
2018-05-21 11:07:04 +05:30 |
|
Nabin Hait
|
8d1f1765a9
|
Merge branch 'asbasawaraj-erpnext_issue_13818' into develop
|
2018-05-21 11:03:22 +05:30 |
|
Nabin Hait
|
2cfc247d88
|
customers without any sales transactions
|
2018-05-21 11:03:02 +05:30 |
|
Nabin Hait
|
1bf2576e0e
|
Merge branch 'erpnext_issue_13818' of https://github.com/asbasawaraj/erpnext into asbasawaraj-erpnext_issue_13818
|
2018-05-21 10:47:40 +05:30 |
|
Valmik
|
bfb8a73377
|
Append company after (#14119)
|
2018-05-21 10:44:35 +05:30 |
|
asbasawaraj
|
5f6b44e142
|
Formatted chapter member display (#14128)
|
2018-05-21 10:31:45 +05:30 |
|
Shridhar Patil
|
4c790488ea
|
job opening designation made mandatory (#14153)
|
2018-05-21 10:30:17 +05:30 |
|
Valmik
|
c28378f448
|
[fix] get barcode string instead of dict (#14139)
* [fix] get barcode string instead of dict
* Update pos.py
|
2018-05-21 10:06:05 +05:30 |
|
Rohit Waghchaure
|
812224e56e
|
Set leave approver in the leave application
|
2018-05-20 21:21:33 +05:30 |
|
Manas Solanki
|
f87762887a
|
fetch defualt supplier from the item table (#14113)
|
2018-05-20 10:58:26 +05:30 |
|
Zarrar
|
42231df33a
|
[Minor] Supplier Group test fix & default supplier in item fix (#14150)
* fix supplier group test
* item - default_supplier fix
|
2018-05-20 10:46:10 +05:30 |
|
Zarrar
|
1f3f18534b
|
[Fix] Leave Application & Expense Claim query fix | Leave Balance Report fix (#14149)
* move set_query to setup function
* rectify leave balance report according to deparmtent changes
|
2018-05-20 10:45:14 +05:30 |
|
Gaurav Naik
|
8f17281011
|
Initialized dynamic link on Warehouse (#14135)
* Initialized dynamic link for Warehouse
* Codacy Fixes
|
2018-05-20 10:39:14 +05:30 |
|
rohitwaghchaure
|
d08ac1fe79
|
Merge pull request #14136 from rohitwaghchaure/multiple_fixes_for_v11
Fixes in material request, asset maintenance
|
2018-05-18 16:39:48 +05:30 |
|
Rohit Waghchaure
|
73a99441ca
|
Fixed get_query for default data in item
|
2018-05-18 16:39:08 +05:30 |
|
Rohit Waghchaure
|
6cdaa6e861
|
Fixes in material request, asset maintenance
|
2018-05-18 16:30:14 +05:30 |
|
Manas Solanki
|
d976c04b69
|
Merge pull request #14134 from manassolanki/fix-salary-patch
[fix] patch for the salary structure assignment for old employees
|
2018-05-18 15:47:14 +05:30 |
|
Manas Solanki
|
33c1a38dc8
|
[fix] patch for the salary structure assignment for old employees
|
2018-05-18 15:46:35 +05:30 |
|
rohitwaghchaure
|
7d834b946f
|
Merge pull request #14117 from shreyashah115/fixes
Fix patch
|
2018-05-18 12:45:06 +05:30 |
|
rohitwaghchaure
|
f445298e7a
|
Merge pull request #14132 from rohitwaghchaure/asset_finance_book_enhance
Changed condition of finance book in reports
|
2018-05-18 09:10:53 +05:30 |
|
Rohit Waghchaure
|
f61e94e162
|
Changed condition of finance book in reports
|
2018-05-18 09:10:07 +05:30 |
|
rohitwaghchaure
|
7d6cad2c67
|
Merge pull request #14130 from rohitwaghchaure/fixed_financial_report
Added finance book in Asset Depreciation Ledger report, fixed asset issue
|
2018-05-17 23:31:17 +05:30 |
|
Rohit Waghchaure
|
f689d01a0c
|
Added finance book in Asset Depreciation Ledger report, fixed asset issue
|
2018-05-17 23:29:37 +05:30 |
|
Prateeksha Singh
|
8233cb11ed
|
Merge pull request #14124 from pratu16x7/hotfix
[item-query] change order of description terms, name first
|
2018-05-17 17:32:54 +05:30 |
|
Prateeksha Singh
|
984a7a7e61
|
[item-query] change order of description terms, name first
|
2018-05-17 17:29:36 +05:30 |
|
rohitwaghchaure
|
b5cc946771
|
Merge pull request #14122 from shreyashah115/fixes
Fix in marking attendance from Leave Application
|
2018-05-17 17:16:57 +05:30 |
|
Shreya
|
65dd1f6b4c
|
Mark attendance only if to_date <= nowdate in Leave Application
|
2018-05-17 17:13:56 +05:30 |
|
Basawaraj
|
6d334b8135
|
Added Report : Customers Without Any Sales Transactions
|
2018-05-17 16:54:03 +05:30 |
|
Shreya
|
362e0a9f6e
|
Fix patch
|
2018-05-17 15:43:03 +05:30 |
|