Commit graph

12873 commits

Author SHA1 Message Date
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
Mohammed R Abukhamseen
a09fa6f769 Add Arabic translation for datepicker (#3453)
* Add persian right to left

* Update locale-all.js

Add Arabic translation for datepicker
2017-06-13 14:26:53 +05:30
Makarand Bauskar
b72a93dc9e Merge pull request #3468 from faztp12/patch-1
Update hooks.md
2017-06-13 12:39:59 +05:30
Faris Ansari
bf11a1a3fd Better error message for duplicate desktop icon (#3446)
* Better error message for duplicate desktop icon

* remove trailing whitespace
2017-06-13 12:13:15 +05:30
tundebabzy
ff4c86089c Make "Amount in words" spell three decimals (#3358)
* fixes frappe/erpnext#8895

* checks for non-numeric type

* makes words translatable
2017-06-13 12:09:35 +05:30
Fahim Ali Zain TP
ceec4af9c6 Create hooks.md 2017-06-13 05:45:05 +05:30
Makarand Bauskar
5341ac535a Merge pull request #3382 from tundebabzy/issue_erpnext#8965
fixes frappe/erpnext#8965: Get item inside Request for Quote
2017-06-12 17:07:24 +05:30
Makarand Bauskar
836ad397a9 Merge pull request #3462 from saurabh6790/dropbox_backup
[fix] move dropbox backup upload from short queue to long queue to avoid timeout exceptions
2017-06-12 16:57:31 +05:30
Saurabh
7e2972dee8 a[fix] move dropbox backup upload from short queue to long queue to avoid timeout exceptions 2017-06-12 16:14:12 +05:30
Revant Nandgaonkar
5a0eb81340 [fix] OAuth2 Frappe Server URL Validation (#3397)
* [fix] OAuth2 Frappe Server URL Validation

Only request and validate the frappe_server_url if hostname is not equal to frappe_server_hostname
request.get to localhost by using hostname results into timeout

* check domains in local.conf.domains as well

* removed unused variable as per codacy
2017-06-12 16:12:49 +05:30
Rushabh Mehta
4203ebdfc7 [enhance] make bench commands extensible by apps (#3457) 2017-06-12 09:15:55 +05:30
Makarand Bauskar
0ee6f103af Merge pull request #3447 from mr-karan/patch-1
dialogs-types.md: Missing `+` operator
2017-06-09 17:06:00 +05:30
Faris Ansari
8d2bb6bc95 Fix frappe/erpnext#9115 (#3449) 2017-06-09 17:01:52 +05:30
Charles-Henri Decultot
21d720923e Make 'By' translatable in blog posts (#3450) 2017-06-09 17:01:08 +05:30
Makarand Bauskar
2912132984 Merge pull request #3454 from netchampfaris/globals.js
Add proxy variables for removed globals
2017-06-09 16:56:33 +05:30
Faris Ansari
bcf060dba0 Add inList 2017-06-09 16:32:09 +05:30
Faris Ansari
cd0aa8fa6a Add proxy variables for removed globals 2017-06-09 15:05:42 +05:30
Karan Sharma
1d0c98c265 Missing + operator
`msgprint` has a missing `+` operator, which is syntactically incorrect.
2017-06-08 11:58:04 +05:30
Ayush Shukla
e2de37b090 Email parse addr fix. (#3371)
* Added name fix

* Removed print

* Changed method name

* Added test  case for name

* Codacy fix

* Codacy Exception fix
2017-06-07 15:49:27 +05:30