Commit graph

1014 commits

Author SHA1 Message Date
Rushabh Mehta
50c1efc21f [minor] added frappe.boot.user.can_be_listed_in_module 2017-04-18 11:44:22 +05:30
Nabin Hait
60572affbf Merge branch 'decimal-precision' of https://github.com/rmehta/frappe into rmehta-decimal-precision 2017-04-13 16:30:48 +05:30
Rushabh Mehta
a1e31ed20b [feature] set decimal precision for currency in currency settings and currency formatting will be global 2017-04-13 12:39:01 +05:30
Saurabh
91a40435b4 [fix] read apps dir if setting up global help else get installed apps from respective site 2017-04-12 20:11:54 +05:30
Rushabh Mehta
1983549833 [minor] show last commit ref in about, fixes #3048 2017-04-12 17:06:32 +05:30
Rushabh Mehta
befb3a31f0 [fix] feedback trigger on delete #2988 (#3027) 2017-04-07 13:52:28 +05:30
Faris Ansari
08da14996f Enhance multi file upload (#2912)
* Allow multiple file upload, show progress while uploading

* Enhance multi file upload

You can now upload files programmatically like
```
frappe.upload.make({
  ...
  files: fileobj_array,
  ...
})
```
No need to use `multifile_upload` method.
Multiple file upload is enabled by default on all Attach dialogs.

* Don't `allow_multiple` in data import tool

* ControlAttach don't allow_multiple

* Show files in a table view

* Narrow width for Is Private column
2017-04-07 13:37:08 +05:30
Prateeksha Singh
f2df24803c Search refactor (#2983)
* [start] basic sidebar function

* remove flicker on fetch

* use promises for global and help results

* add summary view

* single modal, sidebar keyboard selection

* Placeholder and no_results state, result render prep

* Specific empty states, results template no longer special: thus remove reset(), forum results trial

* Add loading state

* more results working

* commonify more results, added images

* All nav results in modal, with recents

* use common utils in awesome bar

* UI fixes

* Remove forum results

* frappe/erpnext#8222 frappe/erpnext#8264
2017-04-03 13:28:37 +05:30
mbauskar
54384c774f [minor] exception handling in get_app_branch if git is not initialized for app 2017-03-30 12:14:19 +05:30
pratu16x7
09bf08ca9b sanitize and trim search result description 2017-03-29 17:10:48 +05:30
Valmik
145fa3196b [fix] only show help for installed apps (#2924) 2017-03-27 11:08:54 +05:30
Saurabh
7620bb3789 Deprecate Integration Broker (#2831)
* [fix] remove razorpay from integration service

* [fix] clean-up js side integration service dependancies

* [fix] remove integration service, .py cleanup, move integration request to integration

* [fix] move oauth to integrations and deprecate integration broker

* [fix] mark services enabled and update integrations listing

* [fix] V7.1 and V7.2 integration service related pathch fixes and move payment gateway dotype to core module

* [fix] create payment gateway records if not exists

* [fix] module page for integrations

* [minor][fix] minor checks

* [fix] remove integration broker module only if not allocated to any doctype
2017-03-14 11:24:26 +05:30
pratu16x7
39e4952ccf Title case, use gs title column, exclude docstatus 2 2017-03-13 10:12:25 +05:30
Rushabh Mehta
7a735739e1 [minor] show develop_version in branch 2017-03-10 09:38:19 +05:30
pratu16x7
5a62375ee5 generic doctype check 2017-03-09 15:55:28 +05:30
pratu16x7
82c122ecea child table (__) exclusion 2017-03-09 15:54:18 +05:30
pratu16x7
1f6e2d93aa child tables not in search, diminish placeholder 2017-03-09 15:54:07 +05:30
Nabin Hait
7fe50c885a Merge branch 'master' into develop 2017-03-09 14:59:02 +05:30
Rushabh Mehta
2e1d0fe71e [minor] html_utils.py, bleach.linkify remove tokenizer 2017-03-09 14:02:26 +05:30
Rushabh Mehta
8a83a9bfed [fix] fix html5lib compatibility issue 2017-03-09 13:20:40 +05:30
Nabin Hait
0e85e30789 Merge pull request #2833 from rmehta/grid-mandatory
[fixes] mandatory css in grids, better welcome email
2017-03-09 11:04:22 +05:30
Rushabh Mehta
614098a84a [fixes] mandatory css in grids, better welcome email 2017-03-08 22:52:54 +05:30
Nabin Hait
54af579e09 Merge pull request #2823 from wshurafa/fix-query-condition-case-sensitivity
Fix query condition case sensitivity
2017-03-08 14:03:06 +05:30
Wael AlShurafa
d3c6ac6d8a Fix operator validation 2017-03-07 21:53:43 +02:00
Rushabh Mehta
1e7229c45f [enhance] global search in website (#2810)
* [enhance] global search in website

* [fix] create table query

* [website] navbar search in header if set

* [minor] navbar_search in website settings
2017-03-07 16:37:50 +05:30
Nabin Hait
e3d4e8b108 Merge pull request #2699 from rohitwaghchaure/role_based_reports
[Enhancement] Provision to add roles in the report
2017-03-06 18:34:39 +05:30
Nabin Hait
b9d79fbb82 Minor fix 2017-03-06 17:33:49 +05:30
Rohit Waghchaure
e996fd0c55 Changed tabUserRoel to tabHas Role 2017-03-06 14:42:14 +05:30
Rohit Waghchaure
8a2c83918b changed user_roles to roles 2017-03-06 14:42:13 +05:30
Rohit Waghchaure
e57e9f170b [Enhancement] Provision to add roles in the report 2017-03-06 14:38:54 +05:30
Rushabh Mehta
6962962211 [fix] contact us to create communication and blog list 2017-03-02 13:06:45 +05:30
Nabin Hait
2e0ef33647 Merge branch 'master' into develop 2017-02-28 18:42:07 +05:30
Rushabh Mehta
488cff68bc [minor] update mixpanel analytics 2017-02-28 18:41:16 +05:30
Rushabh Mehta
75855de5bb [minor] fixes to web form, listview, add portal items via hooks 2017-02-28 17:49:45 +05:30
Prateeksha Singh
e9f2aadd38 Search fixes (#2746)
* GS in awesome bar, UI fixes: scroll nav,lists

* awesome bar specificity

* Add fuzzy search in awesome bar

* Add fuzzy specific boldening

* List subtype buttons

* Update global_search.py
2017-02-22 11:08:36 +05:30
Nabin Hait
6601710465 Fixed merge conflict 2017-02-20 14:50:28 +05:30
mbauskar
6d9eab7f6e [minor] added method get_timestamp from date 2017-02-16 16:40:50 +05:30
Manas Solanki
a9d5715f8a Fix for opening the file in mac and some styling in excel file 2017-02-14 18:34:35 +05:30
Manas Solanki
8bcd479831 Add binary mime type in response.py 2017-02-14 18:34:35 +05:30
Rushabh Mehta
86ceb21005 [feature] Global Search (again) (#2710)
* [start] global search frappe/erpnext#6674

* [fix] setup before running test

* [start] global search frappe/erpnext#6674

* Display result as rudimentary list, rebuild old doctypes

* Media view, child tables, delete document updates, searchable fields

* More results UI

* Code clean up

* remove msgprint from document.py to resolve merge conflict

* Modularization stage 1, get show more to work with it

* Dedicated modal Search bar works, some clean up needed

* Can't data-dismiss on links, Bootstrap issue, use hashchange

* Accomodate missing field content syndrome

* Search in boolean mode, make GS default in awesome bar, fix double modal bug and cleanup

* Add in Meta

* Add in customize form

* Modularise Global Search

* Search object

* Commonify Search UI: Stage I

* II: save list state, UI, default condensed view, refactor

* Fix SQL bug, Refactor awesome bar, Fix unicode bug, add nav results

* Refactor using separate search objects, some async issues

* Fix async flow

* Fix preceding more list bug

* UI additions

* another async fix, back link

* Help: Stage I

* Help: Stage II

* Background jobs, fix route options bug

* Fix GS syncing on install

* Add GS options in awesome bar: test

* Input now remembers search type state

* More UI updates

* Add description for GS results in awesome bar

* Fix help modal bug

* Fix: not commit during install

* Test cases, some fixes

* Update in_test flag in enqueue

* Disable GS sync when not install_db

* Add flag check

* Disable field in child tables

* Cleanups

* Create table fix

* Fix redis exception, remove commit enqueue, add gs in migrate

* Fix tests

* Single enqueue

* cleanups

* Fix tests

* Fix event test

* Fix duplication, search as first option

* Add show name in global search

* fix event tests and desk.less

* Fix communication.json

* [fixes] wip

* [fix] tests

* [minor] for tests

* [minor] for tests

* [minor] for tests

* [minor] for tests
2017-02-13 14:50:54 +05:30
Rushabh Mehta
0af6de61bf [fix] email validate 2017-02-07 15:02:04 +05:30
Rushabh Mehta
53f12a8b75 [fix] email validate 2017-02-07 14:31:41 +05:30
Rushabh Mehta
5bc3473184 [minor] cleanups, allow comma in email validation 2017-02-07 14:01:18 +05:30
Rushabh Mehta
33d8db6d88 [fix] minor fixes 2017-02-03 16:42:23 +05:30
Makarand Bauskar
e422e16953 [WIP] Feedback Triggers (#2643)
* [wip] feedback

* [WIP] Feedback Trigger, Feedback Request, Feedback & Rating Timeline and Form Sidebar

* [minor] minor fixes in feedback trigger

* [Test Cases] Test Cases for Feedback Trigger

* [minor] replaced sql_list by get_all changed the button label

* [minor] removed whitespaces, fixed spelling mistakes
2017-02-02 15:15:23 +05:30
Rushabh Mehta
3add8e8a39 [minor] pass now in enqueue 2017-02-02 11:24:54 +05:30
krnkris
dc527f12cd Update __init.py__ to master (#2641)
It is stable now only issue is the emoji use
2017-01-30 15:20:49 +05:30
schilgod
f228d462d2 Add or_filters filter for export_fixtures, to filter by doctype or fieldnames (#2616)
Eg:
fixtures = [
        {
        "doctype": "Custom Field",
        "or_filters": {
            "dt": ["in", [
                "Process Payroll",
                "Journal Entry Account"
            ]],
            "name": ["in", [
                "Print Settings-compact_item_print",
                "Account-account_id",
                "Account-some_bank_name"
            ]]
        }
    }
]
2017-01-24 11:01:41 +05:30
Rushabh Mehta
e223c5b740 Merge branch 'develop' into custom-perms-1 2017-01-13 19:04:49 +05:30
robert schouten
48dc91a59f Email inbox (#2485)
* Communication_reconciliation

* Email inbox

* added collapsed timeline for communication

* new email prefill from when only one address

* timeline duplication and notifcation and stability fixs

* add subject to timeline

* email system v7 fixes

* added password required validation

* use proper email datetime

* email inbox v7.1 fixes

* email inbox communication_date used instead of created

* email inbox communication data cleanup

* remove old patch

* email inbox permit unlinking

* [fix] duplication queue and rename domain to email domain

* fix rename domain

* email inbox index optimisation

* email inbox relink doctype query usability fix

* email_inbox Set attachment variable for forwards and replies based on whether it exists or not

* uidnext fixes and cleanup

* email inbox fix tests

* fix rebase timeline issue

* email inbox threading and cleanup

* email inbox cleanup

* bring inbox into frappe and cleanup

* fix missed path

* inbox cleanup

* email-inbox move service back to account

* separate to erpnext contact match

* email inbox cleanup and move relink and timeline fix

* relink optimisation

* inbox fix footer

* keep email drafts on pages not just forms

* email inbox add sent items

* email inbox allow not save list settings on query

* email inbox cleanup and remove communications recon

* add suspend sending button in email queue

* fix rebase error

* email inbox assorted fixes

* email inbox fixes and relink option only when linked otherwise link;

* email inbox fix sender fullname as administrator

* create user email to custom button

* email inbox sent no match and seen

* email inbox fix unicode issues with subject recipient and sender
2017-01-13 14:45:11 +05:30