vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
21342 commits 1 branch 0 tags 587 MiB
Commit graph

21342 commits

This branch
This branch
All branches
Author SHA1 Message Date
mergify[bot]
b901fe4ffc
Merge pull request #8289 from surajshetty3416/fix-language-code 
fix: Use sr_BA instead of sr_SP since sr_SP is not supported by Babel
 2019-08-29 06:24:08 +00:00
Suraj Shetty
b3f2fc98b5
fix: When autoname is not set, treat it as hash (#8260) 
fix: When autoname is not set, treat it as hash
 2019-08-29 11:07:58 +05:30
mergify[bot]
89f29a7a10
Merge pull request #8107 from ernestoruiz89/patch-2 
feat: Add color red and green to form-message for alert or success
 2019-08-29 05:34:46 +00:00
mergify[bot]
e039167dc1
Merge pull request #8122 from danielmorlock/develop 
feat: properly support multiple email values in ldap entries.
 2019-08-29 05:31:11 +00:00
Suraj Shetty
488049f25d fix: Use sr_BA instead of sr_SP since sr_SP is not supported by Babel 2019-08-29 10:58:30 +05:30
mergify[bot]
b26ff3c512
Merge pull request #8271 from ernestoruiz89/patch-7 
fix: Add translation function to string (develop)
 2019-08-29 05:15:14 +00:00
mergify[bot]
fe4b4b1c1f
Merge pull request #8286 from ruchamahabal/auto-repeat-fix 
fix: Email Notification in Auto Repeat
 2019-08-29 05:12:40 +00:00
mergify[bot]
98c2a402dd
Merge pull request #8261 from hrwX/escape_docname_goal 
fix(Customer): Escape quotes
 2019-08-28 20:36:29 +00:00
Rucha Mahabal
adf662a3f8 fix: codacy fix 2019-08-28 22:05:35 +05:30
Rucha Mahabal
e97a5e1b41 Merge branch 'develop' of https://github.com/frappe/frappe into auto-repeat-fixes 2019-08-28 20:30:04 +05:30
Rucha Mahabal
25874573e1 fix: email notification in auto repeat 2019-08-28 20:29:36 +05:30
mergify[bot]
270b67fb67
Merge pull request #8247 from frappe/clarkejj-patch-1 
fix: Change El Salvador currency to USD
 2019-08-28 10:27:16 +00:00
Shivam Mishra
2e4991ba1a
Merge pull request #8281 from scmmishra/logged-in 
refactor: added logged in status in body tag
 2019-08-28 15:41:49 +05:30
Aditya Hase
1eee1baa12 fix(requirements): Use googlemaps 3.0.2 (#8282) 
MANIFEST.IN for googlemaps doesn't include CHANGELOG.md
https://travis-ci.org/frappe/frappe/jobs/577721078
 2019-08-28 15:39:51 +05:30
mergify[bot]
4a79ffd6bb
Merge pull request #8272 from deepeshgarg007/multi_print 
fix: Error while printing multiple docs
 2019-08-28 09:52:00 +00:00
Shivam Mishra
e4c009c514 refactor: added logged in status in body tag 2019-08-28 13:20:00 +05:30
Himanshu
880b2559f2
Update frappe/utils/goal.py 
Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2019-08-28 10:06:13 +05:30
Suraj Shetty
84c3eb3d62 fix: Disable caching for respond_as_web_page response (#8276) 
* fix: Do not cache workflow approval confirmation page

* fix: Make it readable

* fix: Disable caching for respond_as_web_page

* fix: Remove info about no_cache from docstring
 2019-08-27 19:36:44 +05:30
mergify[bot]
2eebc463db
Merge pull request #8267 from gavindsouza/doctype-fix 
refactor: improvement to doctype API
 2019-08-27 11:44:50 +00:00
Gavin D'souza
b21223ab64 fix: delete controller code when doctype is deleted 2019-08-27 12:35:33 +05:30
deepeshgarg007
fb98887cd4 fix: Error while pritning mutiple docs 2019-08-27 12:31:52 +05:30
mergify[bot]
421f070e78
Merge pull request #8262 from netchampfaris/timeline-escape-html 
fix: Escape html in timeline
 2019-08-27 04:42:15 +00:00
Ernesto Ruiz
05cc0dfd4d
fix: Add translation function to string 
fix: Add translation function to string
 2019-08-26 17:53:46 -06:00
Gavin D'souza
235b89331b fix: added lost renaming code 2019-08-26 18:29:16 +05:30
Gavin D'souza
f52d35ad1e style: added consistent spacing for readability 
chore: removed dead code 'init_list'
 2019-08-26 18:07:59 +05:30
sahil28297
d568d8e2d5
Merge pull request #8265 from saurabh6790/fix_date_check_condition 
fix: do not check empty string check for date type fields
 2019-08-26 17:51:48 +05:30
Gavin D'souza
c514dbfb29 fix: doctype renaming 
controller fixes and toolbar refresh
 2019-08-26 17:07:45 +05:30
Deepesh Garg
0f60698513 feat: Ignore certain linked documents on cancellation of document (#8255) 
* fix: Allow cancellation of doctype if linked with certain doctypes

* fix: Consider docstatus

* fix: Do not allow to delete canceled doc
 2019-08-26 17:05:35 +05:30
Saurabh
b435095d3b fix: do not check empty check for date type fields 2019-08-26 16:08:46 +05:30
Faris Ansari
6aebe0f522 fix: Escape html in timeline 2019-08-26 14:54:52 +05:30
Himanshu Warekar
d4bf775c08 fix: escape docname for quotes 2019-08-26 14:04:56 +05:30
Faris Ansari
54f2e25687 fix: When autoname is not set, treat it as hash 
During collision it only checks for 'hash', but it can be unset too.
 2019-08-26 13:45:38 +05:30
mergify[bot]
5f389b8db1
Merge pull request #8249 from hrwX/gs_dashboard 
fix(Integrations): UX fixes for google integrations
 2019-08-24 06:51:12 +00:00
Shivam Mishra
535c349f9a
Merge pull request #8097 from prssanna/user-profile 
feat(User Profile): New User Profile Pages with Energy Points Insights
 2019-08-24 10:51:31 +05:30
Himanshu
eb9b034c2b
Update frappe/integrations/doctype/google_settings/google_settings.js 
Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2019-08-23 15:34:01 +05:30
Himanshu
b320318878
Update frappe/integrations/doctype/google_contacts/google_contacts.js 
Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2019-08-23 15:33:54 +05:30
mergify[bot]
4fe992bcb6
Merge pull request #8217 from netchampfaris/activity-feed-null-bug 
fix: Activity Feed
 2019-08-23 09:23:06 +00:00
sahil28297
266aa83741
Merge pull request #8227 from scmmishra/sidebar-toggle 
feat: allow toggle sidebar to be persistent using local storage
 2019-08-23 13:59:07 +05:30
Faris Ansari
f89d842d00 fix: Remove declaration 2019-08-23 13:56:05 +05:30
Himanshu Warekar
43ce576e49 chore: rename drive to contacts 2019-08-23 13:54:43 +05:30
Himanshu Warekar
a8ff36ec0b fix: ux fixes for google integrations 2019-08-23 13:51:29 +05:30
Faris Ansari
87987a0dde fix: Use single quotes for Postgres 
Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2019-08-23 13:44:06 +05:30
mergify[bot]
05f8a8da46
Merge pull request #8246 from prssanna/notifications-fix 
fix: fix energy point notifications date range
 2019-08-23 06:57:44 +00:00
prssanna
876c4aa4db fix: fix string translation and rename function 2019-08-23 12:15:05 +05:30
rohitwaghchaure
5c7d1fd1ae
Merge pull request #8182 from rohitwaghchaure/fix_using_custom_script_barcode_not_working 
fix: using custom script barcode is not generated
 2019-08-23 11:48:07 +05:30
mergify[bot]
57dd1757ef
Merge pull request #8203 from prssanna/created-by 
feat: Add 'Created By' to default sidebar filters
 2019-08-23 05:53:40 +00:00
mergify[bot]
3b104f593d
Merge pull request #8242 from netchampfaris/website-theme-font-awesome 
fix: Include font-awesome in website.scss
 2019-08-23 04:56:37 +00:00
John Clarke
ccaee408d0
Change El Salvador currency to USD syntax error fix 
Change double quotes character - on my initial submit PR # 8247 I did not notice the syntax checker flagged this error :-)
 2019-08-22 16:04:46 -06:00
John Clarke
3fb6475639
Change El Salvador currency to USD 
See user request here https://discuss.erpnext.com/t/el-salvador-default-currency-change-to-usd-please/52070

These proposed changes appear to agree with https://en.wikipedia.org/wiki/Salvadoran_col%C3%B3n
 2019-08-22 14:44:37 -06:00
mergify[bot]
7a1da3a9bd
Merge pull request #8245 from scmmishra/webform-payment-redirect 
fix: redirect after payment
 2019-08-22 17:18:41 +00:00