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

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source 
Conflicts:
	version.num
This commit is contained in:
Anand Doshi 2012-03-01 19:28:36 +05:30
commit 1e9b15eb5d
14 changed files with 42 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.json
View File

@ -74,14 +74,12 @@
{
"js/all-web.js": [
"lib/js/lib/jquery.min.js:concat",
"lib/js/lib/history/history.min.js:concat",
"lib/js/lib/bootstrap.min.js:concat",
"lib/js/lib/sprintf.js",
"lib/js/core.min.js:concat",
"lib/js/legacy/globals.js",
"lib/js/legacy/utils/datatype.js",
"lib/js/legacy/utils/browser_detect.js",
"lib/js/legacy/utils/datetime.js",
"lib/js/legacy/utils/dom.js",
"lib/js/legacy/utils/handler.js",
@ -116,7 +114,6 @@
{
"js/all-app.js": [
"lib/js/lib/jquery.min.js:concat",
"lib/js/lib/history/history.min.js:concat",
"lib/js/legacy/jquery/jquery-ui.min.js:concat",
"lib/js/legacy/tiny_mce_33/jquery.tinymce.js:concat",
@ -125,7 +122,6 @@
"lib/js/core.min.js:concat",
"lib/js/legacy/globals.js",
"lib/js/legacy/utils/datatype.js",
"lib/js/legacy/utils/browser_detect.js",
"lib/js/legacy/utils/datetime.js",
"lib/js/legacy/utils/dom.js",
"lib/js/legacy/utils/handler.js",

1
css/all-app.css
View File

@ -2766,6 +2766,7 @@ span, div, td, input, textarea, button, select {
}
body {
background: url(../images/stripedbg.png) repeat;
}
.erpnext-footer {

1
css/all-web.css
View File

@ -1574,6 +1574,7 @@ span, div, td, input, textarea, button, select {
}
body {
background: url(../images/stripedbg.png) repeat;
}
.erpnext-footer {

4
erpnext/accounts/doctype/receivable_voucher/receivable_voucher.py
View File

@ -66,11 +66,11 @@ class DocType(TransactionBase):
for i in lst:
val = pos and pos[0][i] or ''
webnotes.conn.set(self.doc,i,val)
self.doc.fields[i] = val
self.set_pos_item_values()
val = pos and flt(pos[0]['conversion_rate']) or 0
webnotes.conn.set(self.doc,'conversion_rate',val)
self.doc.conversion_rate = val
#fetch terms
if self.doc.tc_name: self.get_tc_details()

6
erpnext/accounts/doctype/rv_detail/rv_detail.txt
View File

@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:20',
'docstatus': 0,
'modified': '2012-02-24 16:14:38',
'modified': '2012-03-01 18:43:30',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@ -22,7 +22,7 @@
'section_style': u'Tray',
'server_code_error': u' ',
'show_in_menu': 0,
'version': 25
'version': 26
},
# These values are common for all DocField
@ -264,7 +264,7 @@
'oldfieldname': u'serial_no',
'oldfieldtype': u'Small Text',
'permlevel': 0,
'print_hide': 1
'print_hide': 0
},
# DocField

6
erpnext/patches/patch_list.py
View File

@ -167,4 +167,10 @@ patch_list = [
'patch_file': 'add_roles_to_admin',
'description': 'Add Roles to Administrator'
},
{
'patch_module': 'patches.jan_mar_2012',
'patch_file': 'dt_map_fix',
'description': 'removed transaction date from dt_mapper'
},
]

1
erpnext/startup/startup.css
View File

@ -13,6 +13,7 @@ span, div, td, input, textarea, button, select {
}
body {
background: url(../images/stripedbg.png) repeat;
}
.erpnext-footer {

3
erpnext/startup/startup.js
View File

@ -46,6 +46,7 @@ erpnext.startup.set_globals = function() {
erpnext.startup.start = function() {
$('#startup_div').html('Starting up...').toggle(true);
erpnext.startup.set_globals();
if(wn.boot.custom_css) {
@ -149,8 +150,6 @@ erpnext.set_user_background = function(src) {
set_style(repl('body { background: url("files/%(src)s") repeat !important;}', {src:src}))
}
// =======================================
// start
$(document).bind('startup', function() {
erpnext.startup.start();

6
erpnext/stock/doctype/delivery_note_detail/delivery_note_detail.txt
View File

@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:08:58',
'docstatus': 0,
'modified': '2012-02-24 11:33:58',
'modified': '2012-03-01 19:22:16',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@ -23,7 +23,7 @@
'section_style': u'Tray',
'server_code_error': u' ',
'show_in_menu': 0,
'version': 53
'version': 54
},
# These values are common for all DocField
@ -245,7 +245,7 @@
'oldfieldname': u'serial_no',
'oldfieldtype': u'Text',
'permlevel': 0,
'print_hide': 1,
'print_hide': 0,
'trigger': u'Client'
},

BIN
images/stripedbg.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 251 B

18
js/all-app.js
View File

File diff suppressed because one or more lines are too long

18
js/all-web.js
View File

File diff suppressed because one or more lines are too long

19
unsupported.html Normal file
View File

@ -0,0 +1,19 @@
<html>
<head>
<title>ERPNext - Uprade your browser</title>
</head>
<body style="background-color: #eee">
<div style="width: 900px; margin: 20px auto; padding: 20px;
background-color: #fff; border: 2px solid #aaa; font-family: Arial">
<h3>Upgrade Your Browser</h3>
<p><i>ERPNext requires a modern web browser to function correctly</i></p>
<p>Supported browsers are:
<ul>
<li><a href="http://mozilla.com/firefox">Mozilla Firfox 4+</a>,
<li><a href="http://google.com/chrome">Google Chorme 14+</a>,
<li><a href="http://apple.com/safari">Apple Safari 5+</a>,
<li><a href="http://ie.microsoft.com">Microsoft Internet Explorer 9+</a>,
<li><a href="http://www.opera.com/">Opera</a>
</ul>
</p>
</body>

2
version.num
View File

@ -1 +1 @@
791
814