Commit Graph

25451 Commits

Author SHA1 Message Date
rohitwaghchaure
d95c8cfac3
Merge pull request #16621 from netchampfaris/fix-warehouse-currency
fix: Set company_currency for Warehouse Tree
2019-02-11 14:58:02 +05:30
Prateeksha Singh
01a045a488 feat(modules): Add getting started and help desk 2019-02-11 14:01:04 +05:30
Zlash65
a206f06af9 delete notification control's docctype entry 2019-02-11 12:01:01 +05:30
Nabin Hait
bb6438af5a
Merge pull request #16537 from nabinhait/stock-balance-fix
fix: Fixed error on stock balance report
2019-02-11 11:00:01 +05:30
Rushabh Mehta
c8018bdeb1 fix: refactored comments API. Depends on https://github.com/frappe/frappe/pull/6891 2019-02-09 21:10:29 +05:30
Faris Ansari
453964728d fix: Set company_currency for Warehouse Tree 2019-02-09 20:27:42 +05:30
Nabin Hait
17e0513270 fix: message if stock reco is enqueued 2019-02-08 16:56:26 +05:30
Nabin Hait
8d4bb3e327 fix: backflush only if transferred item is present in work order 2019-02-08 16:56:26 +05:30
Nabin Hait
450fe309d6 fix: allow updating title of material request 2019-02-08 16:56:26 +05:30
Nabin Hait
e3b0f4f9f6 fix: removed account type filter on employee advance account 2019-02-08 16:56:26 +05:30
Nabin Hait
27af6b377f fix: defered accounting fixes 2019-02-08 16:56:26 +05:30
Aditya Hase
1bfdceaf7e
Merge pull request #16605 from adityahase/fix-py3
fix(py3): Python 3 compatibility fixes
2019-02-08 12:51:34 +05:30
Aditya Hase
e53a6a6723
Merge branch 'develop' into fix-py3 2019-02-08 12:51:05 +05:30
Nabin Hait
208ce5dcea fix: removed module type for learn 2019-02-08 12:25:30 +05:30
Aditya Hase
13808b4cc9 fix(py3): Convert to float before comparison 2019-02-08 12:03:25 +05:30
Aditya Hase
2a3c39f38a fix(py3): Convert dict.values() to list for indexing 2019-02-08 12:02:57 +05:30
Aditya Hase
46d7456782 fix(py3): Convert list to filter for indexing 2019-02-08 12:02:14 +05:30
Prateeksha Singh
6d541605ca
Merge pull request #16603 from pratu16x7/explore-2.0
fix(modules): add ERPNext settings module
2019-02-08 08:10:08 +05:30
Prateeksha Singh
e31cdb5b85 fix(modules): add ERPNext settings module 2019-02-08 08:06:23 +05:30
Aditya Hase
c3f669d526
Merge pull request #16601 from frappe/py3-travis-fix
fix(py3): Python 3 compatibility fixes
2019-02-07 23:35:20 +05:30
Aditya Hase
a86a569787 fix(py3): Convert dict.values() to list for indexing 2019-02-07 22:21:06 +05:30
Aditya Hase
3e954734d0 fix(py3): Convert filter to list for indexing 2019-02-07 22:21:05 +05:30
Aditya Hase
6e1bb60b58 fix(py3): Convert filter to list for indexing 2019-02-07 22:21:05 +05:30
Aditya Hase
e1f867f29f fix(py3): Explicitly convert to float for comparison 2019-02-07 22:21:05 +05:30
Aditya Hase
d9ce732d3e fix(py3): Explicitly convert to float for comparison 2019-02-07 22:21:05 +05:30
Aditya Hase
a9f20d801d
Merge pull request #16599 from adityahase/python3-fix
fix(py3): Use six.text_type instead of unicode
2019-02-07 22:20:41 +05:30
Aditya Hase
691c166a56 fix(py3): Use six.text_type instead of unicode 2019-02-07 20:35:52 +05:30
Aditya Hase
0b1dc32fcb
Merge pull request #16597 from adityahase/python3-fix
fix(py3): Use range instead of xrange
2019-02-07 18:17:37 +05:30
Aditya Hase
b9dc031e86 fix(py3): Use range instead of xrange 2019-02-07 18:10:30 +05:30
Rushabh Mehta
665ee4ac33
Merge pull request #16480 from pratu16x7/explore-2.0
feat(explore_page): rearrange links
2019-02-07 12:20:27 +05:30
Prateeksha Singh
3423407314 feat(module_links): rearrange links 2019-02-07 09:58:22 +05:30
Prateeksha Singh
9b14d46c1d purge(modules): remove old desktop icon configs 2019-02-07 09:58:22 +05:30
Prateeksha Singh
063af4ed08 config(modules): Rearrange links 2019-02-07 09:58:22 +05:30
Prateeksha Singh
b5eb16faeb feat(config): add some onboarding cues 2019-02-07 09:58:22 +05:30
Prateeksha Singh
ce27cffaad refactor(desk_icon): Remove reference and patches to Desktop Icon 2019-02-07 09:58:21 +05:30
Prateeksha Singh
2c14704398 feat(modules): Add Retail module, update others 2019-02-07 09:57:10 +05:30
Prateeksha Singh
7cd6ebeb6d feat(explore_page): rearrange links 2019-02-07 09:57:10 +05:30
Raffael Meyer
ff878c0c1d fix formatting and names 2019-02-07 03:28:27 +01:00
Faris Ansari
504f317434 fix: BOM Stock Calculated Report (#16585)
- Cast null values to 0 to avoid mathematic errors
2019-02-07 07:15:38 +05:30
Faris Ansari
8ae5dbcac8 fix: Set barcode in Item row after scanning barcode (#16591) 2019-02-07 07:09:49 +05:30
Himanshu
088886e082 Remove illegal character after break (#16589) 2019-02-07 07:09:20 +05:30
Sagar Vora
da1dc7fa52 Merge branch 'master' into develop 2019-02-05 18:40:39 +05:30
Sagar Vora
76120309e3 Merge branch 'hotfix' 2019-02-05 18:40:38 +05:30
Sagar Vora
8aa34a0ce0 bumped to version 11.1.4 2019-02-05 19:00:38 +05:50
Prateeksha Singh
34df5d27a1
Merge pull request #16518 from karthikeyan5/staging-marketplace-features
fix(marketplace): bug in filtering menu_items
2019-02-05 18:09:57 +05:30
karthikeyan5
4cb0a250a0 fix(marketplace): bug in filtering menu_items
> UX improvment for incomplete feature
2019-02-05 18:07:48 +05:30
Nabin Hait
efff826e15
Merge pull request #16556 from nabinhait/payroll-cost-center
fix: Don't force fetch cost center from company in payroll entry
2019-02-05 13:32:16 +05:30
Nabin Hait
8a46df5c4b
Removed duplicate fields 2019-02-05 13:31:32 +05:30
Nabin Hait
38b05a1296 fix: Set default cost center in payroll entry 2019-02-05 10:46:41 +05:30
Nabin Hait
294319e71b fix: Don't force fetch cost center from company in payroll entry 2019-02-05 10:37:41 +05:30