nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 11:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed conflict

Browse Source
This commit is contained in:
Nabin Hait
2012-11-30 15:02:20 +05:30
parent b18c7738d1 71d6a0ce1d
commit 3e0612db83
50 changed files with 1414 additions and 2671 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
// -------
@@ -506,11 +505,9 @@ cur_frm.cscript.convert_into_recurring_invoice = function(doc, dt, dn) {
}
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.invoice_period_from_date = function(doc, dt, dn) {

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

@@ -40,11 +40,9 @@ class DocType(TransactionBase):
self.tname = 'Sales Invoice Item'
self.fname = 'entries'
def autoname(self):
self.doc.name = make_autoname(self.doc.naming_series+ '.#####')
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)

6
accounts/page/voucher_import_tool/voucher_import_tool.py
View File

@@ -6,9 +6,9 @@ from webnotes.utils import formatdate, flt
def get_template():
"""download template"""
template_type = webnotes.form_dict.get('type')
from webnotes.model.doctype import get_field_property
naming_options = get_field_property("Journal Voucher", "naming_series", "options")
voucher_type = get_field_property("Journal Voucher", "voucher_type", "options")
from webnotes.model.doctype import get_property
naming_options = get_property("Journal Voucher", "naming_series", "options")
voucher_type = get_property("Journal Voucher", "voucher_type", "options")
if template_type=="Two Accounts":
extra_note = ""
columns = '''"Naming Series","Voucher Type","Posting Date","Amount","Debit Account","Credit Account","Cost Center","Against Sales Invoice","Against Purchase Invoice","Against Journal Voucher","Remarks","Due Date","Ref Number","Ref Date"'''