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 'master' into production

Browse Source
This commit is contained in:
Nabin Hait
2012-12-18 13:49:07 +05:30
parent bf52eb08a6 92af22aa12
commit 5f175dfd00
41 changed files with 519 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
accounts/doctype/sales_invoice/sales_invoice.py
View File

@@ -322,8 +322,9 @@ class DocType(TransactionBase):
def pull_project_customer(self):
res = webnotes.conn.sql("select customer from `tabProject` where name = '%s'"%self.doc.project_name)
if res:
res = webnotes.conn.sql("select customer from `tabProject` where name = '%s'" %
self.doc.project_name)
if res and res[0][0]:
get_obj('DocType Mapper', 'Project-Sales Invoice').dt_map('Project', 'Sales Invoice', self.doc.project_name, self.doc, self.doclist, "[['Project', 'Sales Invoice']]")
def get_company_abbr(self):

2
accounts/page/trial_balance/trial_balance.js
View File

@@ -27,7 +27,7 @@ wn.pages['trial-balance'].onload = function(wrapper) {
var msgbox = msgprint('<p>Select To Download:</p>\
<p><input type="checkbox" name="with_groups" checked> Account Groups</p>\
<p><input type="checkbox" name="with_ledgers" checked> Account Ledgers</p>\
<p><button class="btn btn-info btn-small">Download</button>');
<p><button class="btn btn-info">Download</button>');
var me = this;

4
accounts/page/voucher_import_tool/voucher_import_tool.js
View File

@@ -9,11 +9,11 @@ wn.pages['voucher-import-tool'].onload = function(wrapper) {
<p class="help">Import multiple accounting entries via CSV (spreadsheet) file:</p>\
<h3>1. Download Template</h3><br>\
<div style="padding-left: 30px;">\
<button class="btn btn-small btn-download-two-accounts">Download</button>\
<button class="btn btn-download-two-accounts">Download</button>\
<p class="help">Import multiple vouchers with one debit and one credit entry</p>\
</div>\
<div style="padding-left: 30px;">\
<button class="btn btn-small btn-download-multiple-accounts">Download</button>\
<button class="btn btn-download-multiple-accounts">Download</button>\
<p class="help">Import multiple vouchers with multiple accounts</p>\
</div>\
<hr>\