Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes in support ticket overflow, desktop gradients and shadows, setup control fiscal defaults

Browse Source
This commit is contained in:
Anand Doshi 2012-03-01 12:16:02 +05:30
parent b4a2f4c98f
commit 0e140962b8
7 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css/all-app.css
View File

@ -1043,7 +1043,7 @@ div.dialog_head {
}
div.dialog_body {
padding: 8px 4px 16px 4px;
padding: 8px 8px 16px;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;

2
css/all-web.css
View File

@ -362,7 +362,7 @@ div.dialog_head {
}
div.dialog_body {
padding: 8px 4px 16px 4px;
padding: 8px 8px 16px;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;

13
erpnext/home/page/desktop/desktop.css
View File

@ -41,10 +41,15 @@
.case-border {
border-radius: 10px;
-moz-border-radius: 10px;
-webkit-border-radius: 10px;
width: 56px;
height: 56px;
border: 4px solid white;
box-shadow: 0 0 10px 1px black;
-moz-box-shadow: 0 0 10px 1px black;
-webkit-box-shadow: 0 0 10px 1px black;
-o-box-shadow: 0 0 10px 1px black;
margin: auto;
}
@ -66,6 +71,9 @@
/* Hover and click effects */
.case-border:hover, .circle:hover {
box-shadow: 0 0 2px 0px black, 0 0 10px 1px white;
-moz-box-shadow: 0 0 2px 0px black, 0 0 10px 1px white;
-webkit-box-shadow: 0 0 2px 0px black, 0 0 10px 1px white;
-o-box-shadow: 0 0 2px 0px black, 0 0 10px 1px white;
}
.case-border:active, .case-border:focus, .circle:active, .circle:focus {
@ -78,6 +86,8 @@
.circle {
border-radius: 100%;
-moz-border-radius: 100%;
-webkit-border-radius: 100%;
height: 15px;
min-width: 15px;
background: #B00D07;
@ -88,6 +98,9 @@
margin-right: 10px;
border: 2px solid white;
box-shadow: 0 0 10px 1px black;
-moz-box-shadow: 0 0 10px 1px black;
-webkit-box-shadow: 0 0 10px 1px black;
-o-box-shadow: 0 0 10px 1px black;
}
.circle-text {

12
erpnext/home/page/desktop/desktop.js
View File

@ -3,12 +3,12 @@ wn.provide('erpnext.desktop');
erpnext.desktop.gradient = "<style>\
.case-%(name)s {\
background: %(start)s; /* Old browsers */\
background: -moz-radial-gradient(center, ellipse cover, %(start)s 0%%, %(middle)s 44%%, %(end)s 100%%); /* FF3.6+ */\
background: -webkit-gradient(radial, center center, 0px, center center, 100%%, color-stop(0%%,%(start)s), color-stop(44%%,%(middle)s), color-stop(100%%,%(end)s)); /* Chrome,Safari4+ */\
background: -webkit-radial-gradient(center, ellipse cover, %(start)s 0%%,%(middle)s 44%%,%(end)s 100%%); /* Chrome10+,Safari5.1+ */\
background: -o-radial-gradient(center, ellipse cover, %(start)s 0%%,%(middle)s 44%%,%(end)s 100%%); /* Opera 12+ */\
background: -ms-radial-gradient(center, ellipse cover, %(start)s 0%%,%(middle)s 44%%,%(end)s 100%%); /* IE10+ */\
background: radial-gradient(center, ellipse cover, %(start)s 0%%,%(middle)s 44%%,%(end)s 100%%); /* W3C */\
background: -moz-radial-gradient(center, ellipse cover, %(start)s 0%, %(middle)s 44%, %(end)s 100%); /* FF3.6+ */\
background: -webkit-gradient(radial, center center, 0px, center center, 100%, color-stop(0%,%(start)s), color-stop(44%,%(middle)s), color-stop(100%,%(end)s)); /* Chrome,Safari4+ */\
background: -webkit-radial-gradient(center, ellipse cover, %(start)s 0%,%(middle)s 44%,%(end)s 100%); /* Chrome10+,Safari5.1+ */\
background: -o-radial-gradient(center, ellipse cover, %(start)s 0%,%(middle)s 44%,%(end)s 100%); /* Opera 12+ */\
background: -ms-radial-gradient(center, ellipse cover, %(start)s 0%,%(middle)s 44%,%(end)s 100%); /* IE10+ */\
background: radial-gradient(center, ellipse cover, %(start)s 0%,%(middle)s 44%,%(end)s 100%); /* W3C */\
}\
</style>"

13
erpnext/setup/doctype/setup_control/setup_control.py
View File

@ -69,7 +69,7 @@ class DocType:
import webnotes, json
args = json.loads(args)
curr_fiscal_year, fy_start_date = self.get_fy_details(args.get('fy_start'))
curr_fiscal_year, fy_start_date, fy_abbr = self.get_fy_details(args.get('fy_start'))
args['name'] = webnotes.session.get('user')
@ -82,7 +82,12 @@ class DocType:
# Fiscal Year
master_dict = {'Fiscal Year':{'year':curr_fiscal_year, 'year_start_date':fy_start_date}}
master_dict = {'Fiscal Year':{
'year': curr_fiscal_year,
'year_start_date': fy_start_date,
'abbreviation': fy_abbr,
'company': args.get('company_name'),
'is_fiscal_year_closed': 'No'}}
self.create_records(master_dict)
# Company
@ -163,9 +168,11 @@ class DocType:
#eddt = sql("select DATE_FORMAT(DATE_SUB(DATE_ADD('%s', INTERVAL 1 YEAR), INTERVAL 1 DAY),'%%d-%%m-%%Y')" % (stdt.split('-')[2]+ '-' + stdt.split('-')[1] + '-' + stdt.split('-')[0]))
if(fy_start == '1st Jan'):
fy = cstr(getdate(nowdate()).year)
abbr = cstr(fy)[-2:]
else:
fy = cstr(curr_year) + '-' + cstr(curr_year+1)
return fy,stdt
abbr = cstr(curr_year)[-2:] + '-' + cstr(curr_year+1)[-2:]
return fy, stdt, abbr
# Create Company and Fiscal Year

3
erpnext/support/doctype/support_ticket/support_ticket.js
View File

@ -178,7 +178,8 @@ EmailMessage = function(parent, args, list, idx) {
// email text
this.message = $a(w, 'div', '',
// style
{lineHeight:'1.7em', display:'none', padding: '7px'},
{lineHeight:'1.7em', display:'none', padding: '7px', width: '575px',
wordWrap: 'break-word', textWrap: 'normal', overflowX: 'auto'},
// newlines for text email
(this.content_type=='text/plain' ? this.mail

2
version.num
View File

@ -1 +1 @@
776
781