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

10534 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nabin Hait
c8ca79bda5 Merge pull request #2072 from saurabh6790/razorpay_payment_page 
[minor][fix] razorpay payment
 2016-09-19 18:20:47 +05:30
Saurabh
550ea2258d [minor][fix] razorpay payment 2016-09-19 18:11:27 +05:30
Rushabh Mehta
72ed223d41 [minor] more options for frappe.set_query and set_indicator in dashboard 2016-09-19 16:08:34 +05:30
Sujit Maharjan
9dc3bec1a5 Fixed password decryption for outgoing email (#2067) 
Since the password was not decrypted, there was error in outgoing email (not from default). 
Added 
email_account.password = email_account.get_password() 
to decrypt the password.
 2016-09-19 14:25:59 +05:30
Faris Ansari
5e577c6ea4 [mobile][fixes] (frappe/frappe#2048) (frappe/erpnext#6386) (#2053) 
* [mobile][fix] uploaded images not visible

* [mobile][fix] overflow title
 2016-09-19 13:16:00 +05:30
RobertSchouten
5a4d093cfe [feature] opt out of workflow status override in list view (#2040) 
* [feature] opt out of workflow status override in list view

* [feature] opt out of workflow status override in list view
 2016-09-19 13:13:55 +05:30
paurosello
72fa048088 Change colspan in listview (#2058) 
* Change colspan in listview

Closed last PR as I messed up with my repo.

Sometimes the fields have too much space or it is really small, this solutions allows the users to modify the field colspan per field using the following syntax in frappe.listview_settings

`column_colspan: {"fieldname":2},`

* Update docfield.json
 2016-09-19 13:13:11 +05:30
Makarand Bauskar
ac616e1e3e [minor] spelling fixes (#2066) 2016-09-19 13:09:03 +05:30
akshay83
14b8e5cee4 [fix] workflow message (#2056) 2016-09-19 13:08:36 +05:30
Nabin Hait
f350578f5c Merge pull request #2068 from rohitwaghchaure/spelling 
[Fix] print_cess to print_css
 2016-09-19 12:40:16 +05:30
Rohit Waghchaure
efc02f6ffc [Fix] print_cess to print_css 2016-09-19 11:42:33 +05:30
Nabin Hait
763fda8a5c Merge pull request #2064 from saurabh6790/patch_fix_ib 
[fix] dropbox service fix
 2016-09-16 21:45:32 +05:30
Saurabh
ce91426302 [fix] dropbox service fix 2016-09-16 17:47:55 +05:30
Rushabh Mehta
059b7d7b70 [fix] change subject in email alert, fixes frappe/erpnext#6361 2016-09-16 15:59:57 +05:30
Rushabh Mehta
3726aacb8a [fix] reportview click on edit features 2016-09-16 15:57:50 +05:30
Nabin Hait
55a92e6554 Merge branch 'integration_broker_patch' into develop 2016-09-16 15:40:47 +05:30
Nabin Hait
cb54017f4f [fix] integration broker patch 2016-09-16 15:40:28 +05:30
Neil Trini Lasrado
e804cd56e4 Fixes for web forms (#2060) 2016-09-15 17:12:44 +05:30
Saurabh
31868bf060 [patch][fix] 2016-09-15 16:49:25 +05:30
Rushabh Mehta
7166bc3e61 [translation] [fixes] frappe/erpnext#5860 and docs 2016-09-15 15:16:22 +05:30
Rushabh Mehta
2e66bd044b [docs] and other minor fixes 2016-09-15 13:55:37 +05:30
Nabin Hait
5b6a8cdc26 Fixed version conflict 2016-09-14 17:25:49 +05:30
Nabin Hait
21aaca48ed Merge branch 'hotfix' 2016-09-14 17:24:00 +05:30
Nabin Hait
c619c0f9fb bumped to version 7.0.32 2016-09-14 17:54:00 +06:00
Nabin Hait
64e178f6e0 Update cleanup_list_settings.py 2016-09-14 17:22:33 +05:30
Nabin Hait
c1e5e5dabe Fixed version conflict 2016-09-14 15:52:32 +05:30
Nabin Hait
6c41ae3fd9 Merge branch 'hotfix' 2016-09-14 15:51:52 +05:30
Nabin Hait
5eac10a5c7 bumped to version 7.0.31 2016-09-14 16:21:52 +06:00
Nabin Hait
9c785cdbce Merge pull request #2050 from manqala/patch-1 
Update sites.md
 2016-09-14 15:34:04 +05:30
Nabin Hait
197805cd48 Merge pull request #2051 from strixaluco/patch-3 
Update country_info.json
 2016-09-14 15:33:54 +05:30
Rushabh Mehta
541d8be95f [complete] auto email report 2016-09-14 12:00:52 +05:30
Rushabh Mehta
5cdab8da3f [fix] language for zh and zh-TW (#2052) 2016-09-14 10:27:32 +05:30
strixaluco
bb07efa4f0 Update country_info.json 
Ukrainian hryvnia added
 2016-09-14 09:00:14 +08:00
manqala
29c7203fe8 Update sites.md 2016-09-13 21:37:30 +01:00
Rushabh Mehta
37eb4eaffc [wip] grid in web form (#2044) 
* [wip] grid in web form

* [complete] webform in grid

* [minor] configurable sidebar items in web form

* [fix] tests

* [style]
 2016-09-13 14:38:38 +05:30
KanchanChauhan
8b78f70b43 Option to send email from Data Import Tool where applicable (#2026) 2016-09-13 13:13:02 +05:30
Shreyas Patil
a5b0b4211a [Fix] Increment the failed attempts for email account failure (#2045) 2016-09-13 10:34:54 +05:30
RobertSchouten
0422311fb6 print format show default heading for editing (#2039) 
* print format show default heading for editing

* print format show default heading for editing
 2016-09-12 16:15:39 +05:30
RobertSchouten
ac63c720b8 [feature] print only what is expanded in reports (#2038) 
ie balance report will print like is visable not all items
 2016-09-12 16:12:22 +05:30
RobertSchouten
17e2dff613 [fix] creating doc from link updates fetch fields (#2037) 
* fix creating doc from link updates fetch fields

allows the updating of fetch fields from a full page creation

* Update save.js
 2016-09-12 16:09:38 +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
Shreyas Patil
e5bb0bb283 [Fix] Social login not allowed for a disabled user (#2032) 2016-09-12 16:06:35 +05:30
Rushabh Mehta
345d310fe3 [fix] name case for doctype, fixes #2029 2016-09-12 16:02:18 +05:30
Faris Ansari
6baef1073d [ui] fixes (frappe/erpnext#6252) (frappe/erpnext#6275) (#2023) 
* [ui] fix navbar overlap

* [ui][mobile] fix user-background-image
 2016-09-12 15:51:03 +05:30
Rushabh Mehta
22dbaafb4d [fix] email account disabling after 3 tries #2018 2016-09-12 15:45:22 +05:30
KaterinaR
e06b750c00 [Documentation update] - Update documentation for XML Report (#2010) 
* !U Update documentation dor XML Report

* !F Fix empty log information in output (Message: None)
 2016-09-12 15:29:52 +05:30
RobertSchouten
02a7c0dc73 allow creation of user permissions on site creation (#2006) 2016-09-12 15:29:14 +05:30
Nabin Hait
51169eb7bc Merge pull request #2027 from shreyasp/reinstall-site 
[Minor] Added '--admin-password' to bypass admin password prompt on reinstalling the site
 2016-09-12 13:06:19 +05:30
Rushabh Mehta
9e3b5cd3cc [fix] comments for debugging js fixes #1961 2016-09-12 13:06:04 +05:30
Nabin Hait
87d458907a Merge pull request #2028 from nabinhait/list_settings_fix 
Fixed list settings
 2016-09-12 13:05:26 +05:30