nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 10:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate

Browse Source 
Conflicts:
	version.num
This commit is contained in:
Anand Doshi
2012-03-01 14:54:01 +05:30
parent 08c8edb87f b95ad21208
commit 48ca42beb9
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/doctype/gl_entry/gl_entry.py
View File

@@ -152,8 +152,12 @@ class DocType:
amt = flt(self.doc.debit) - flt(self.doc.credit) amt = flt(self.doc.debit) - flt(self.doc.credit)
if det[0][2] == 'Credit': amt = -amt if det[0][2] == 'Credit': amt = -amt
debit = cancel and -1 * flt(self.doc.credit) or flt(self.doc.debit) if cancel:
credit = cancel and -1 * flt(self.doc.debit) or flt(self.doc.credit) debit = -1 * flt(self.doc.credit)
credit = -1 * flt(self.doc.debit)
else:
debit = flt(self.doc.debit)
credit = flt(self.doc.credit)
self.create_new_balances(det) self.create_new_balances(det)
@@ -197,7 +201,7 @@ class DocType:
and ifnull(a.is_pl_account, 'No') = 'No' and ifnull(a.is_pl_account, 'No') = 'No'
and ab.period = ab.fiscal_year and ab.period = ab.fiscal_year
and fy.name = ab.fiscal_year and fy.name = ab.fiscal_year
and fy.year_start_date > %(posting_date)s""" % p) and fy.year_start_date > '%(posting_date)s'""" % p)
# Update balance for all period for future years # Update balance for all period for future years
sql("""update `tabAccount Balance` ab, `tabAccount` a, `tabFiscal Year` fy sql("""update `tabAccount Balance` ab, `tabAccount` a, `tabFiscal Year` fy
@@ -209,7 +213,7 @@ class DocType:
and ab.account = a.name and ab.account = a.name
and ifnull(a.is_pl_account, 'No') = 'No' and ifnull(a.is_pl_account, 'No') = 'No'
and fy.name = ab.fiscal_year and fy.name = ab.fiscal_year
and fy.year_start_date > %(posting_date)s""" % p) and fy.year_start_date > '%(posting_date)s'""" % p)

6
erpnext/startup/js/modules.js
View File

@@ -32,7 +32,7 @@ erpnext.module_page.hide_links = function(wrapper) {
$(wrapper).find('[href*="List/"]').each(function() { $(wrapper).find('[href*="List/"]').each(function() {
var href = $(this).attr('href'); var href = $(this).attr('href');
var dt = href.split('/')[1]; var dt = href.split('/')[1];
if(wn.boot.profile.can_read.indexOf(get_label_doctype(dt))==-1) { if(wn.boot.profile.all_read.indexOf(get_label_doctype(dt))==-1) {
var txt = $(this).text(); var txt = $(this).text();
$(this).parent().css('color', '#999').html(txt); $(this).parent().css('color', '#999').html(txt);
} }
@@ -41,7 +41,7 @@ erpnext.module_page.hide_links = function(wrapper) {
// reports // reports
$(wrapper).find('[data-doctype]').each(function() { $(wrapper).find('[data-doctype]').each(function() {
var dt = $(this).attr('data-doctype'); var dt = $(this).attr('data-doctype');
if(wn.boot.profile.can_read.indexOf(dt)==-1) { if(wn.boot.profile.all_read.indexOf(dt)==-1) {
var txt = $(this).text(); var txt = $(this).text();
$(this).parent().css('color', '#999').html(txt); $(this).parent().css('color', '#999').html(txt);
} }
@@ -51,7 +51,7 @@ erpnext.module_page.hide_links = function(wrapper) {
$(wrapper).find('[href*="Form/"]').each(function() { $(wrapper).find('[href*="Form/"]').each(function() {
var href = $(this).attr('href'); var href = $(this).attr('href');
var dt = href.split('/')[1]; var dt = href.split('/')[1];
if(wn.boot.profile.can_read.indexOf(get_label_doctype(dt))==-1) { if(wn.boot.profile.all_read.indexOf(get_label_doctype(dt))==-1) {
var txt = $(this).text(); var txt = $(this).text();
$(this).parent().css('color', '#999').html(txt); $(this).parent().css('color', '#999').html(txt);
} }

2
js/all-app.js
View File

@@ -2253,7 +2253,7 @@ $(document).bind('startup',function(){erpnext.startup.start();});
erpnext.startup.set_periodic_updates=function(){wn.updates={};if(wn.updates.id){clearInterval(wn.updates.id);} erpnext.startup.set_periodic_updates=function(){wn.updates={};if(wn.updates.id){clearInterval(wn.updates.id);}
wn.updates.id=setInterval(update_messages,60000);} wn.updates.id=setInterval(update_messages,60000);}
erpnext.set_user_background=function(src){set_style(repl('body { background: url("files/%(src)s") repeat !important;}',{src:src}))} erpnext.set_user_background=function(src){set_style(repl('body { background: url("files/%(src)s") repeat !important;}',{src:src}))}
$(document).bind('startup',function(){erpnext.startup.start();}); $(document).bind('startup',function(){erpnext.startup.start();});
/* /*
* erpnext/startup/js/modules.js * erpnext/startup/js/modules.js
*/ */