Commit graph

141 commits

Author SHA1 Message Date
Saurabh
507e05181a Merge branch 'master' into develop 2018-01-22 15:31:04 +05:30
Rohit Waghchaure
452d9042fc [Fix] Showing today's date as communication date for old emails in the popup 2018-01-19 18:04:53 +05:30
Achilles Rasquinha
e28d497724 delete references of deprecated chat 2017-12-29 10:08:15 +05:30
Faris Ansari
5358f3d927
[fix] Edit Comment (#4648)
fixes frappe/erpnext#12012
2017-12-18 15:02:02 +05:30
Rushabh Mehta
92c62a1c31
[fix] comment paging and count (#4459) 2017-11-10 18:42:07 +05:30
Faris Ansari
d20f9e2895 Data Migration Tool (for hub) (#4144)
* migration tool

* custom field for primary key added

* foreign key and multiple linking F_key issue resolved

* refined code

* many-to-one mapping temp fix

* added support for pre-process + cleaned up code

* [various] fixes to setup wizard for developer mode, frappe.enqueue_doc, share with assign

* Refactor data migration module

* added migration for hub

* Add "Skip errors" in data import tool

* move db_set to document.py

* Add Data Migration Run

* Dynamic Migration ID

* move run() from Mapping to Run

* Push Deleted Documents

* fixes

* [migration] doc operation counts

* insert and update instead of push in connection

* fix count and total_pages, skip sync if total_pages is 0

* [migration] child tables

* fix complete()

* [page] remove required libs

* Add sidebar.js, rename old sidebar.js to form_sidebar.js

* [minor] get_empty_state fixes

* svg in icon

* remove image check

* fix codacy

* fix is_child_table check

* [connector] add get_list()

* Add test for Data Migration Run

* fix test

* truncate tabNote

* fix test

* sync todo with event to fix test

* fix db count

* [mapping] export Mapping to json

* Add docs for Data Migration Tool

* [migration] pull data as list, test case

* [hub] remove mapping export to files

* Pull refactor

* [test]

* Add comments

* [mapping] exec in mapping formula

* fix codacy

* fix codacy

* Remove exec for pre-process and post-process

* Add pre and post process for Push

* Remove formula

* fixes

* [refactor] add failed_log to pull, handle error in pull

* [test] Push, pull, update

* Fix codacy, fix insert_doc for pull

* Set migration id on successful insert

* fix update_doc

* fix update_doc

* method is a function

* child table mapping

* Refactor logging

* fix update_doc again

* fix hostname, password

* update docs, minors

* Remove assign_if_none

* Remove error handling from connection methods

* [refactor] Data migration run

* Break push stages into methods

* Migration run refactor

- fix test
- add separate fields for logging

* fix codacy

* fix hostname password

* fix test
2017-10-05 11:15:35 +05:30
Aditya Hase
f7da376279 Convert dict.keys() to list explicitly for deleting elems while iterating 2017-09-27 01:08:07 +05:30
Aditya Hase
769338f136 Replaced all instances of basestring with six.string_types 2017-08-11 00:10:11 +05:30
Aditya Hase
e6bd1e4995 Replaced all instances of 'unicode' with 'six.text_type' (#3825) 2017-08-02 16:57:39 +05:30
Aditya Hase
d3395dfd28 Replaced StringIO and cStringIO imports with six.StringIO (#3810)
StringIO and cStringIO modules are replaced with io.StringIO in
Python 3. six.StringIO is an alias for StringIO.StringIO in
Python 2 and io.StringIO in Python 3
2017-07-31 10:54:17 +05:30
Rushabh Mehta
f609a478ae [refactor] user permissions (#3713)
* [refactor] user permissions

* [fix] tests

* [ux] user-permissions

* [minor] cleanup system settings

* [minor] end progress
2017-07-28 14:33:31 +05:30
Manas Solanki
d0857f8013 Apply User Permissions is being ignored for blank field values (#3496)
* issue where Apply User Permissions is being ignored for blank field values

* configurable settings and added test case

* Update system_settings.json

* save and use locally stored value for strict user permission
2017-07-06 10:48:12 +05:30
Revant Nandgaonkar
36a54e29e8 Add js to doctype calendar view (#3599) 2017-07-05 11:08:09 +05:30
Rushabh Mehta
1ba6e32508 [fix] system_country can be none 2017-06-27 17:45:09 +05:30
Rushabh Mehta
f5b975305d [regional] ability to load country-wise js for forms 2017-06-27 17:30:50 +05:30
tundebabzy
bbde2ec4cf rewrite use of dict.iteritems (#3498)
* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility
2017-06-19 09:10:21 +05:30
tundebabzy
702e52e665 Change raise syntax to python 3 compatible style (#3497)
* python 3 compatible raise statement

* python 3 compatible raise statement

* python 3 compatible raise statement

* python 3 compatible raise statement

* python 3 compatible raise statement

* python 3 compatible raise statement

* python 3 compatible raise statement

* python 3 compatible raise statement

* python 3 compatible raise statement

* python 3 compatible raise statement

* python 3 compatible raise statement

* python 3 compatible raise statement
2017-06-19 09:07:19 +05:30
Rushabh Mehta
0a5df4fb4d [debug] show where permission is failing (#3264)
* [debug] show where permission is failing

* [fix] document.py
2017-05-11 11:46:47 +05:30
tundebabzy
6fbe20caaa Except and raise statement python 3 compatible style (#3216)
* changes exception and raise statements to python 3 style

* changes except statement to python 3 style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* adds six.reraise to fix python 3 style raise statements with traceback

* fixes indentation
2017-05-11 10:51:59 +05:30
rohitwaghchaure
73af73c2e7 [fix] When user clicks on link in invoice there are duplicate DNs are showing against it (#3204) 2017-05-01 14:14:32 +05:30
Makarand Bauskar
3581ad8db7 [fixes] assignment should work witout saving documents (#3163)
* [fixes] assignment should work witout saving documents

* [minor] check if document is __local before assignement
2017-04-27 15:52:18 +05:30
Rushabh Mehta
15d97471fe [fix] communications in user, fixes frappe/erpnext#8459 2017-04-18 12:36:06 +05:30
Faris Ansari
0fa716c56d [kanban] private kanban board for Note, create new project for Task 2017-03-15 09:59:24 +05:30
Rushabh Mehta
697a85f88d [fix] error message for custom script 2017-03-07 16:20:48 +05:30
Faris Ansari
1a76d64781 ListView refactor (#2715)
* [list_settings] save last_view, kanban_board, gantt_mode

* listview.js cleanup

* image_view refactor

* image_view done

* wip

* [photoswipe] wip

* show view for calendar, kanban even if no results

* [gantt_view] refactor into separate file

* [imageview] 3 column border fix

* [imageview] gallery working

* delete old libs

* indentation to tabs

* [gantt] update lib, custom popup html

* custom fontawesome checkbox

* reset gantt state when not permitted

* checkbox styling fix

* working commit

* image, calendar, gantt view working

* more refactoring, kanban view

* minor

* removed old files

* user settings improved

* filters and sort selector de-coupling

* wip

* [imageview] white pswp background

* kanban filters saving fixed

* fixed reportview

* minor

* removed listing.js

* minor fixes and cleanup

* patch for UserSettings table

* patch fix
2017-03-06 11:32:27 +05:30
mbauskar
2373cb7f1f [enhancement] auto feedback request should be triggered only once 2017-03-03 10:32:49 +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
a93294ce75 [minor] fixes to tag delete, added viewer in tree and other cleanups 2017-02-01 18:15:01 +05:30
Rushabh Mehta
1dc69da96f [cleanup] revert email fixes 2017-01-20 16:12:13 +05:30
Faris Ansari
9ddecfb14b Kanban enhancements (#2609)
* quick kb, some styling

* card ordering fixed

* AssignTo code cleanup

* card ordering fixed

* Empty column_name validation

* filter autosave

* column ordering

* column indicator color

* KB based on custom field

* added add_custom_field method
2017-01-20 11:57:40 +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
Faris Ansari
21a2b88d71 Kanban Board #2172 (#2542)
* [kanban] wip

* [kanban] refresh views on kanban change, add kanban board to title, kanban cards draggable

* update field on column change, open form when clicked

* [kanban] refactor into new view KanbanView

* [kanban] minor

* [kanban] refactor into classes

* [kanban] refactor wip

* [kanban] Show Board button in kanban board

* [kanban] add card, move card

* [kanban] wip

* [kanban] filters wip

* [kanban] add new column wip

* [kanban] filters sort-of working

* [kanban] filters still not working, ugh

* another failed attempt :(

* [kanban] filters working, added quick edit for cards

* [kanban] add column partially working

* added assign to

* kanban using stores wip

* wip

* add card, add column working without refresh

* save filter button

* show card meta

* delete column

* fluxify data flow

* change:cards working

* delete changed to archive

* removed old store implementation

* restore column option

* edit card title, api cleanup

* kanban_column_order wip

* kanban column order wip2

* order save finished

* fix new card sorting

* cleanups

* fixed undefined card

* fixed refresh on list view change

* cleanups
2017-01-10 15:06:06 +05:30
Rushabh Mehta
d989a95472 [feature] document versioning #2469 (#2523)
* [feature] document versioning #2469

* [minor] remove on_update from WebsiteGenerator

* [fix] delete shares when deleting user

* [test] don't run delete in background if test

* [fix] test_db

* [added] Deleted Document

* [fix] added track_changes in all documents

* [fix] add to deleted only if exists

* [fix] in_install flag in deleted documents

* [minor] name will always be reset
2016-12-29 18:01:42 +05:30
Rushabh Mehta
5ce11a8cb7 Merge branch 'v7.2.0-beta' into develop 2016-12-23 09:42:41 +05:30
Rushabh Mehta
6b637203f9 [minor] remove document_flow.py, use _sidebar.json and fix frappe/erpnext#7300 2016-12-23 09:42:15 +05:30
Nabin Hait
5330158d65 Merge branch 'master' into develop 2016-12-21 11:40:53 +05:30
Rushabh Mehta
68e14d40c2 [security] fixed 2016-12-21 11:17:24 +05:30
Rushabh Mehta
225e4a172a [minor] removed linked_with caching - what a terrible idea!, fixes #4936 2016-12-16 14:51:40 +05:30
OluyomiKay
eb97b2a739 Create link to task from assigned owner (#2449) 2016-12-15 15:12:26 +05:30
robert schouten
5cfe9c70c1 [fix] show timeline_emails on timeline_docname (#2238) 2016-11-14 12:09:46 +05:30
Neil Trini Lasrado
e60c19862c Some fixes for web forms (#2043)
* moved position of desc for a field of type text in webforms

* Fixed Link field in Web Forms

* [Fix] - comments in js must be /* */
2016-09-12 16:07:36 +05:30
Rushabh Mehta
9e3b5cd3cc [fix] comments for debugging js fixes #1961 2016-09-12 13:06:04 +05:30
Rushabh Mehta
171c69677f [fix] apply read permlevel before sending doc to desk. Fixes #1904 2016-08-08 14:07:38 +05:30
Rushabh Mehta
7c870d6ba4 [fix] dont update modified timestamp if called from post save methods 2016-07-20 12:55:19 +05:30
Rushabh Mehta
22c3f7966d [enhance] run actions in background doc.queue_action("submit") 2016-07-19 17:12:37 +05:30
Rushabh Mehta
90673954c7 [cleanup] dashboard automation 2016-07-07 14:02:07 +05:30
Rushabh Mehta
58caa7bbca [cleanup] [style] links cleanups and form-css 2016-07-04 11:38:31 +05:30
Saurabh
ece803c00b [fix] check previous doc with limit 1 2016-06-27 14:47:18 +05:30
Saurabh
768d39ae4d [fix] set status to document flow 2016-06-27 12:29:22 +05:30
Saurabh
c740c96931 [fixes] get previous doc links from respective doctype 2016-06-27 12:29:22 +05:30