Commit graph

12741 commits

Author SHA1 Message Date
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
d499ab619c [optimize] make things faster, lots of low hanging fruits fixed (#3495)
* [optimize] make things faster, lots of low hanging fruits fixed

* [fix] dont set gravatar for administrator and guest

* [fix] autocommit

* [fix] clear doctype cache
2017-06-19 09:04:25 +05:30
ci2014
f3998a1cca Add jinja support to leader_head.content and letter_head.footer (#3493)
* Add jinja support to leader_head.content and letter_head.footer

Add jinja support to leader_head.content and letter_head.footer

* Fix

convert_markdown(doc, meta) was missing my mistake

* Update printview.py

Considering that letter_head could be empty and cleaner code

* Update printview.py

* Update printview.py

* Update printview.py

* Update printview.py

Remove trailing whitespace
2017-06-19 09:03:41 +05:30
Faris Ansari
83c535652d Kanban cleanup (#3501)
* Kanban empty state frappe/erpnext#8849

* Add card UX
2017-06-19 09:03:18 +05:30
Rushabh Mehta
63ed486bfc [hot] fix grid display bug 2017-06-17 13:57:24 +05:30
Makarand Bauskar
5a1c6ddec8 [minor] removed write, create, delete permission from Domain doctype (#3492) 2017-06-16 15:11:43 +05:30
mbauskar
cc5f94367c Merge branch 'master' into develop 2017-06-16 11:43:05 +05:30
mbauskar
39a1496ccf Merge branch 'hotfix' 2017-06-16 11:43:04 +05:30
mbauskar
c29027245b bumped to version 8.0.69 2017-06-16 12:13:04 +06:00
Mohammed R Abukhamseen
f5a904a897 Exception translatable (#3473)
* Add persian right to left

* Update locale-all.js

Add Arabic translation for datepicker

* Make Exception translatabl with better UI

* Update desk.js
2017-06-16 11:11:56 +05:30
Rushabh Mehta
13ac31a823 [minor] print output if login fails 2017-06-16 11:09:36 +05:30
Prateeksha Singh
d8fb2c2c0d [fix] Enqueue syncing global search (#3455)
* [fix] Enqueue syncing global search

* make passing flags optional

* Create global_search.py
2017-06-16 11:02:22 +05:30
Britlog
00786178e5 Jinja translations for website (#3483) 2017-06-16 10:53:37 +05:30
Prateeksha Singh
41a7f7b3e1 Batch/Serial Number entry modal (#3298)
* [WIP] add and remove sort of working

* format fields and persistent values

* set available qty

* set editable for non-frm context

* add grid change event and in_place_edit condition

* add set_new_description

* wip soft refresh fields

* [minor] cleanup
2017-06-16 10:52:43 +05:30
Makarand Bauskar
6b28e1b9e0 [hot] fixed ValueError: need more than 1 value to unpack for vnd currency (#3489) 2017-06-15 19:40:49 +05:30
mbauskar
19d46d92fc Merge branch 'master' into develop 2017-06-15 16:04:52 +05:30
mbauskar
ac89473d52 Merge branch 'hotfix' 2017-06-15 16:04:51 +05:30
mbauskar
68a8f2b954 bumped to version 8.0.68 2017-06-15 16:34:51 +06:00
Makarand Bauskar
7bc97cbf36 Merge pull request #3488 from nabinhait/in_words_fix
get correct number format info in in_words function
2017-06-15 15:57:52 +05:30
Makarand Bauskar
1ba3d14977 Merge pull request #3487 from sagarvora/gh-9286
[minor] Add icon for Deleted Documents
2017-06-15 15:43:19 +05:30
Nabin Hait
85851d10d5 get correct number format info in in_words function 2017-06-15 15:36:54 +05:30
Sagar Vora
5c81b899a9 Add icon for Deleted Documents 2017-06-15 15:31:41 +05:30
Makarand Bauskar
80ce9d7393 Merge pull request #3486 from netchampfaris/pdf-fixes
[PDF] Wrap long text (frappe/erpnext#9107)
2017-06-15 15:10:25 +05:30
Nabin Hait
aa2a8a9c3c fixed module for address 2017-06-15 14:25:44 +05:30
mbauskar
3f320db64c Merge branch 'master' into develop 2017-06-15 13:27:13 +05:30
mbauskar
861a28d429 Merge branch 'hotfix' 2017-06-15 13:27:12 +05:30
mbauskar
eaebdfcd73 bumped to version 8.0.67 2017-06-15 13:57:12 +06:00
Faris Ansari
537efca4de [PDF] Wrap long text (frappe/erpnext#9107) 2017-06-15 13:25:37 +05:30
Makarand Bauskar
db324bd8a6 Merge pull request #3485 from saurabh6790/number_format_fix
[minor][fix] check boot.systemdefaults too
2017-06-15 12:28:17 +05:30
Saurabh
bf0198f08b [minor][fix] check boot.systemdefaults too 2017-06-15 12:22:26 +05:30
Makarand Bauskar
c044f9034c Merge pull request #3482 from rohitwaghchaure/deleted_document_issue
[Fix] System manager not able to restore the deleted document
2017-06-15 12:02:29 +05:30
Makarand Bauskar
eda35fbe6e Merge pull request #3484 from tundebabzy/issue-9239
Can't delete TAG #9239
2017-06-15 11:34:07 +05:30
tunde
f9d461e28a removes culprit print statement 2017-06-15 00:32:20 +01:00
Rohit Waghchaure
db928600da [Fix] System manager not able to restore the deleted document 2017-06-14 18:38:44 +05:30
Makarand Bauskar
fdd6873c5e [minor] print_template and frappe.render_grid fixes (#3476) 2017-06-14 16:08:27 +05:30
rohitwaghchaure
e5dc0af0e1 [Fix] Email digest email by document field's value not refreshing on change of document type (#3479) 2017-06-14 15:45:39 +05:30
Manas Solanki
b6cb70d232 Minor issue when generating the pdf for the reports having html format (#3478) 2017-06-14 15:44:20 +05:30
Nabin Hait
f7b16fc56a Prepare email message only if there is message (#3477) 2017-06-14 15:43:03 +05:30
Rushabh Mehta
1d38a4ae2f [fix] genders patch 2017-06-13 15:55:31 +05:30
Manas Solanki
0ce499e13d Configurable error traceback (#3464)
* Configurable error traceback

* Create system_settings.json
2017-06-13 15:33:08 +05:30
Frappe PR Bot
070cd0029f [translation] translation updates (#3471) 2017-06-13 15:30:39 +05:30
KanchanChauhan
f52e389d4f Salutation and Gender in Contact (#3079) 2017-06-13 15:25:53 +05:30
Saurabh
9b8d020ace Merge branch 'master' into develop 2017-06-13 15:16:34 +05:30
Saurabh
93a4decbb8 Merge branch 'hotfix' 2017-06-13 15:16:33 +05:30
Saurabh
a9c3ee978f bumped to version 8.0.66 2017-06-13 15:46:33 +06:00
almeidapaulopt
b17b73c4f3 GSuite integration (#3252)
* GSuite initial commit

* GSuite initial commit

* cleanups

* exception handle

* gsuite script: add doGet

* Add GSuite integration to the upload popup

* hide dialog fields if gsuite disabled

* move gsuite code to gsuite.js from upload.js

* documentation

* change name format

* typo on GSuite

* copy paste the file .gs

* fix:don't show gsuite when creating a file in filemanager

* add version to webapp

* add webapp default url

* move webapp to html fied

* fix rebase

* fixes for codecy
2017-06-13 14:55:07 +05:30
Sagar Vora
67ac93201a Added columns field (#3469) 2017-06-13 14:50:15 +05:30
Makarand Bauskar
17a09e4b70 [feature] domainification for frappe (#3227)
* [feature] domainify doctype, pages and roles

* [minor] added get active domain method to __init__

* [fixes] minor fixes in domainification and added test cases

* [minor] added checkbox-editor class to render the domains

* [minor] added checkbox_selector option

* [minor] added or_filters to filter restrict to domain doctype and roles

* [minor] fixed codacy errors
2017-06-13 14:36:01 +05:30
almeidapaulopt
374f85bfd6 several throw translations (#3441)
* several throw translations

* small fix

* codacy fixes

* fix import _

* Create file_list.js

* Create feedback.py
2017-06-13 14:32:47 +05:30