nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-23 06:59:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[minor] repost future gl entries only for current voucher items

Browse Source
This commit is contained in:
Nabin Hait
2013-09-04 17:55:45 +05:30
parent 20a6f93612 df1854f0b5
commit bf4d27ecf1
32 changed files with 293 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
selling/doctype/customer/customer.py
View File

@@ -40,8 +40,7 @@ class DocType(TransactionBase):
def validate_values(self):
if webnotes.defaults.get_global_default('cust_master_name') == 'Naming Series' and not self.doc.naming_series:
msgprint("Series is Mandatory.")
raise Exception
webnotes.throw("Series is Mandatory.", webnotes.MandatoryError)
def validate(self):
self.validate_values()

4
selling/doctype/lead/lead.js
View File

@@ -14,12 +14,12 @@ erpnext.LeadController = wn.ui.form.Controller.extend({
onload: function() {
if(cur_frm.fields_dict.lead_owner.df.options.match(/^Profile/)) {
cur_frm.fields_dict.lead_owner.get_query = function(doc,cdt,cdn) {
return { query:"controllers.queries.profile_query" } }
return { query:"core.doctype.profile.profile.profile_query" } }
}
if(cur_frm.fields_dict.contact_by.df.options.match(/^Profile/)) {
cur_frm.fields_dict.contact_by.get_query = function(doc,cdt,cdn) {
return { query:"controllers.queries.profile_query" } }
return { query:"core.doctype.profile.profile.profile_query" } }
}
if(in_list(user_roles,'System Manager')) {

6
selling/doctype/quotation/quotation.py
View File

@@ -7,7 +7,7 @@ import webnotes
from webnotes.utils import cstr, getdate
from webnotes.model.bean import getlist
from webnotes.model.code import get_obj
from webnotes import msgprint
from webnotes import _, msgprint
sql = webnotes.conn.sql
@@ -278,3 +278,7 @@ def _make_customer(source_name, ignore_permissions=False):
return customer
else:
raise e
except webnotes.MandatoryError:
from webnotes.utils import get_url_to_form
webnotes.throw(_("Before proceeding, please create Customer from Lead") + \
(" - %s" % get_url_to_form("Lead", lead_name)))

2
selling/utils.py
View File

@@ -161,7 +161,7 @@ def _get_item_discount(item_group, customer):
FROM `tabItem Group` AS node, `tabItem Group` AS parent
WHERE parent.lft <= node.lft and parent.rgt >= node.rgt and node.name = %s
GROUP BY parent.name
ORDER BY parent.lft desc""", item_group)]
ORDER BY parent.lft desc""", (item_group,))]
discount = 0
for d in parent_item_groups: