nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 08:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rushabh Mehta
2013-02-11 11:55:24 +01:00
parent bf5c7b9db1 629c196606
commit 03118462aa
4 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
accounts/doctype/journal_voucher/journal_voucher.js
View File

@@ -161,8 +161,10 @@ cur_frm.cscript.voucher_type = function(doc, cdt, cdn) {
cur_frm.fields_dict['entries'].grid.get_field('account').get_query = function(doc) { cur_frm.fields_dict['entries'].grid.get_field('account').get_query = function(doc) {
return { return {
query: "accounts.utils.get_account_list", filters: {
filters: { company: doc.company } group_or_ledger: "Ledger",
company: doc.company
}
} }
} }

7
hr/doctype/job_applicant/get_job_applications.py
View File

@@ -23,11 +23,7 @@ from core.doctype.communication.communication import make
class JobsMailbox(POP3Mailbox): class JobsMailbox(POP3Mailbox):
def setup(self, args=None): def setup(self, args=None):
self.settings = args or webnotes.doc("Jobs Email Settings", "Jobs Email Settings") self.settings = args or webnotes.doc("Jobs Email Settings", "Jobs Email Settings")
def check_mails(self):
return webnotes.conn.sql("select user from tabSessions where \
time_to_sec(timediff(now(), lastupdate)) < 1800")
def process_message(self, mail): def process_message(self, mail):
if mail.from_email == self.settings.email_id: if mail.from_email == self.settings.email_id:
return return
@@ -43,6 +39,7 @@ class JobsMailbox(POP3Mailbox):
name = (mail.from_real_name and (mail.from_real_name + " - ") or "") \ name = (mail.from_real_name and (mail.from_real_name + " - ") or "") \
+ mail.from_email + mail.from_email
applicant = webnotes.model_wrapper({ applicant = webnotes.model_wrapper({
"creation": mail.date,
"doctype":"Job Applicant", "doctype":"Job Applicant",
"applicant_name": name, "applicant_name": name,
"email_id": mail.from_email, "email_id": mail.from_email,

13
selling/doctype/lead/get_leads.py
View File

@@ -20,7 +20,8 @@ from webnotes.utils import cstr, cint
from webnotes.utils.email_lib.receive import POP3Mailbox from webnotes.utils.email_lib.receive import POP3Mailbox
from core.doctype.communication.communication import make from core.doctype.communication.communication import make
def add_sales_communication(subject, content, sender, real_name, mail=None, status="Open"): def add_sales_communication(subject, content, sender, real_name, mail=None,
status="Open", date=None):
def set_status(doctype, name): def set_status(doctype, name):
w = webnotes.model_wrapper(doctype, name) w = webnotes.model_wrapper(doctype, name)
w.ignore_permissions = True w.ignore_permissions = True
@@ -47,7 +48,7 @@ def add_sales_communication(subject, content, sender, real_name, mail=None, stat
lead_name = lead.doc.name lead_name = lead.doc.name
make(content=content, sender=sender, subject=subject, make(content=content, sender=sender, subject=subject,
lead=lead_name, contact=contact_name) lead=lead_name, contact=contact_name, date=date)
if contact_name: if contact_name:
set_status("Contact", contact_name) set_status("Contact", contact_name)
@@ -58,17 +59,13 @@ def add_sales_communication(subject, content, sender, real_name, mail=None, stat
class SalesMailbox(POP3Mailbox): class SalesMailbox(POP3Mailbox):
def setup(self, args=None): def setup(self, args=None):
self.settings = args or webnotes.doc("Sales Email Settings", "Sales Email Settings") self.settings = args or webnotes.doc("Sales Email Settings", "Sales Email Settings")
def check_mails(self):
return webnotes.conn.sql("select user from tabSessions where \
time_to_sec(timediff(now(), lastupdate)) < 1800")
def process_message(self, mail): def process_message(self, mail):
if mail.from_email == self.settings.email_id: if mail.from_email == self.settings.email_id:
return return
add_sales_communication(mail.subject, mail.content, mail.form_email, add_sales_communication(mail.subject, mail.content, mail.form_email,
mail.from_real_name, mail) mail.from_real_name, mail=mail, date=mail.date)
def get_leads(): def get_leads():
if cint(webnotes.conn.get_value('Sales Email Settings', None, 'extract_emails')): if cint(webnotes.conn.get_value('Sales Email Settings', None, 'extract_emails')):

9
support/doctype/support_ticket/get_support_mails.py
View File

@@ -30,12 +30,7 @@ class SupportMailbox(POP3Mailbox):
"username": self.email_settings.support_username, "username": self.email_settings.support_username,
"password": self.email_settings.support_password "password": self.email_settings.support_password
}) })
def check_mails(self):
self.auto_close_tickets()
return webnotes.conn.sql("select user from tabSessions where \
time_to_sec(timediff(now(), lastupdate)) < 1800")
def process_message(self, mail): def process_message(self, mail):
if mail.from_email == self.email_settings.fields.get('support_email'): if mail.from_email == self.email_settings.fields.get('support_email'):
return return
@@ -66,7 +61,7 @@ class SupportMailbox(POP3Mailbox):
make(content=mail.content, sender=mail.from_email, make(content=mail.content, sender=mail.from_email,
doctype="Support Ticket", name=ticket.doc.name, doctype="Support Ticket", name=ticket.doc.name,
lead = ticket.doc.lead, contact=ticket.doc.contact) lead = ticket.doc.lead, contact=ticket.doc.contact, date=mail.date)
def send_auto_reply(self, d): def send_auto_reply(self, d):
signature = self.email_settings.fields.get('support_signature') or '' signature = self.email_settings.fields.get('support_signature') or ''