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' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Anand Doshi
2012-11-30 12:48:53 +05:30
parent b2293c48e8 71d6a0ce1d
commit f991fe3997
34 changed files with 1395 additions and 1834 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
accounts/doctype/sales_invoice/sales_invoice.js
View File

@@ -25,7 +25,6 @@ cur_frm.pformat.print_heading = 'Invoice';
wn.require('app/selling/doctype/sales_common/sales_common.js');
wn.require('app/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js');
wn.require('app/utilities/doctype/sms_control/sms_control.js');
wn.require('app/setup/doctype/notification_control/notification_control.js');
// On Load
// -------
@@ -498,11 +497,9 @@ cur_frm.cscript.view_ledger_entry = function(){
}
cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
var args = {
type: 'Sales Invoice',
doctype: 'Sales Invoice'
if(cint(wn.boot.notification_settings.sales_invoice)) {
cur_frm.email_doc(wn.boot.notification_settings.sales_invoice);
}
cur_frm.cscript.notify(doc, args);
}
cur_frm.cscript.convert_into_recurring_invoice = function(doc, dt, dn) {

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

@@ -125,7 +125,6 @@ class DocType(TransactionBase):
def on_update_after_submit(self):
self.convert_into_recurring()
def set_pos_fields(self):
"""Set retail related fields from pos settings"""
pos = webnotes.conn.sql("select * from `tabPOS Setting` where ifnull(user,'') = '%s' and company = '%s'" % (session['user'], self.doc.company), as_dict=1)