- ''' % (fb_sender[0][0], args['feedback'])
-
- sendmail('info@webnotestech.com', fb_sender[0][1], msg = fb_msg, subject=args['subject'],parts=[], cc=[], attach=[])
-
def get_dt_help(self,dt):
return sql("select description from tabDocType where name=%s",dt)[0][0] or ''
diff --git a/erpnext/patches/july_2012/auth_table.py b/erpnext/patches/july_2012/auth_table.py
index ef99a317de..9700495fd3 100644
--- a/erpnext/patches/july_2012/auth_table.py
+++ b/erpnext/patches/july_2012/auth_table.py
@@ -9,5 +9,6 @@ def execute():
webnotes.conn.begin()
for user, password in webnotes.conn.sql("""select name, password from tabProfile"""):
- webnotes.conn.sql("""insert into __Auth (user, `password`) values (%s, %s)""",
- (user, password))
+ if password:
+ webnotes.conn.sql("""insert into __Auth (user, `password`) values (%s, %s)""",
+ (user, password))
diff --git a/erpnext/patches/july_2012/bin_permission.py b/erpnext/patches/july_2012/bin_permission.py
index e1d0ea6f95..d48460cd94 100644
--- a/erpnext/patches/july_2012/bin_permission.py
+++ b/erpnext/patches/july_2012/bin_permission.py
@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
def execute():
import webnotes
webnotes.conn.sql("update `tabDocPerm` set permlevel = 0 where parent = 'Bin'")
\ No newline at end of file
diff --git a/erpnext/patches/july_2012/blog_guest_permission.py b/erpnext/patches/july_2012/blog_guest_permission.py
index eb254b1fbd..bc42a9d05c 100644
--- a/erpnext/patches/july_2012/blog_guest_permission.py
+++ b/erpnext/patches/july_2012/blog_guest_permission.py
@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
def execute():
"""allocate read write permission to guest for doctype 'Blog'"""
import webnotes
diff --git a/erpnext/patches/july_2012/project_patch_repeat.py b/erpnext/patches/july_2012/project_patch_repeat.py
new file mode 100644
index 0000000000..bd52522938
--- /dev/null
+++ b/erpnext/patches/july_2012/project_patch_repeat.py
@@ -0,0 +1,19 @@
+from __future__ import unicode_literals
+def execute():
+ import webnotes
+ webnotes.conn.sql("""update `tabPurchase Order Item` t1, `tabPurchase Order` t2
+ set t1.project_name = t2.project_name where t1.parent = t2.name
+ and ifnull(t1.project_name, '') = ''""")
+ webnotes.conn.sql("""update `tabPurchase Invoice Item` t1, `tabPurchase Invoice` t2
+ set t1.project_name = t2.project_name where t1.parent = t2.name
+ and ifnull(t1.project_name, '') = ''""")
+ webnotes.conn.sql("""update `tabPurchase Receipt Item` t1, `tabPurchase Receipt` t2
+ set t1.project_name = t2.project_name where t1.parent = t2.name
+ and ifnull(t1.project_name, '') = ''""")
+
+ webnotes.conn.commit()
+ from webnotes.model.sync import sync
+ sync("buying", "purchase_order")
+ sync("buying", "purchase_request")
+ sync("accounts", "purchase_invoice")
+ webnotes.conn.begin()
\ No newline at end of file
diff --git a/erpnext/patches/july_2012/repost_stock_due_to_wrong_packing_list.py b/erpnext/patches/july_2012/repost_stock_due_to_wrong_packing_list.py
index 95a0bea29a..ba818ecf25 100644
--- a/erpnext/patches/july_2012/repost_stock_due_to_wrong_packing_list.py
+++ b/erpnext/patches/july_2012/repost_stock_due_to_wrong_packing_list.py
@@ -1,31 +1,30 @@
from __future__ import unicode_literals
def repost_reserved_qty():
import webnotes
+ from webnotes.utils import flt
bins = webnotes.conn.sql("select item_code, warehouse, name, reserved_qty from `tabBin`")
for d in bins:
reserved_qty = webnotes.conn.sql("""
- select sum((dnpi.qty/so_item.qty)*(so_item.qty - ifnull(so_item.delivered_qty, 0))), so.transaction_date
+ select sum((dnpi.qty/so_item.qty)*(so_item.qty - ifnull(so_item.delivered_qty, 0)))
from `tabDelivery Note Packing Item` dnpi, `tabSales Order Item` so_item, `tabSales Order` so
- where dnpi.parent = so.name
+ where dnpi.item_code = %s
+ and dnpi.warehouse = %s
+ and dnpi.parent = so.name
and so_item.parent = so.name
and dnpi.parenttype = 'Sales Order'
and dnpi.parent_detail_docname = so_item.name
and dnpi.parent_item = so_item.item_code
and so.docstatus = 1
and so.status != 'Stopped'
- and dnpi.item_code = %s
- and dnpi.warehouse = %s
""", (d[0], d[1]))
if flt(d[3]) != flt(reserved_qty[0][0]):
- print d, reserved_qty
- #webnotes.conn.sql("""
- # update `tabBin` set reserved_qty = %s where name = %s
- #""", (reserved_qty and reserved_qty[0][0] or 0, d[2]))
+ print d[3], reserved_qty[0][0]
+ webnotes.conn.sql("""
+ update `tabBin` set reserved_qty = %s where name = %s
+ """, (reserved_qty and reserved_qty[0][0] or 0, d[2]))
-repost_reserved_qty()
-
def cleanup_wrong_sle():
sle = webnotes.conn.sql("""
select item_code, warehouse, voucher_no, name
@@ -45,10 +44,10 @@ def cleanup_wrong_sle():
""")
if sle:
print sle
- # for d in sle:
- # webnotes.conn.sql("update `tabStock Ledger Entry` set is_cancelled = 'Yes' where name = %s", d[3])
- # create_comment(d[3])
- # repost_bin(d[0], d[1])
+ for d in sle:
+ webnotes.conn.sql("update `tabStock Ledger Entry` set is_cancelled = 'Yes' where name = %s", d[3])
+ create_comment(d[3])
+ repost_bin(d[0], d[1])
def create_comment(dn):
from webnotes.model.doc import Document
diff --git a/erpnext/patches/patch_list.py b/erpnext/patches/patch_list.py
index 14d56a0e93..38b22e8166 100644
--- a/erpnext/patches/patch_list.py
+++ b/erpnext/patches/patch_list.py
@@ -529,4 +529,8 @@ patch_list = [
'patch_module': 'patches.july_2012',
'patch_file': 'bin_permission',
},
+ {
+ 'patch_module': 'patches.july_2012',
+ 'patch_file': 'project_patch_repeat',
+ },
]
\ No newline at end of file
diff --git a/erpnext/projects/doctype/project_control/project_control.py b/erpnext/projects/doctype/project_control/project_control.py
index 5ebc19ee4b..8369aabbf1 100644
--- a/erpnext/projects/doctype/project_control/project_control.py
+++ b/erpnext/projects/doctype/project_control/project_control.py
@@ -156,7 +156,6 @@ def sent_reminder_task():
If you have already completed this task, please update the system
Good Luck!
(This notification is autogenerated)
""" % i
- sendmail(i['allocated_to'], sender='automail@webnotestech.com', msg=msg2,send_now=1, \
- subject='A task has been assigned')
+ sendmail(i['allocated_to'], msg=msg2, subject='A task has been assigned')
sql("update `tabTask` set sent_reminder='1' where name='%(name)s' and allocated_to= '%(allocated_to)s'" % i)
diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py
index 52ba36037c..5cc5270229 100644
--- a/erpnext/projects/doctype/task/task.py
+++ b/erpnext/projects/doctype/task/task.py
@@ -116,10 +116,7 @@ class DocType:
Expected End Date: %(exp_end_date)s
Details: %(description)s
(This notification is autogenerated)
""" % i
- sendmail(self.doc.allocated_to, sender='automail@webnotestech.com', msg=msg2,send_now=1,\
- subject= task_label + self.doc.subject)
-
-
+ sendmail(self.doc.allocated_to, msg=msg2,subject= task_label + self.doc.subject)
#validate before closing task
def validate_for_closed(self):
diff --git a/erpnext/selling/doctype/lead/lead.js b/erpnext/selling/doctype/lead/lead.js
index 57f2bee185..504b0bdc7a 100644
--- a/erpnext/selling/doctype/lead/lead.js
+++ b/erpnext/selling/doctype/lead/lead.js
@@ -110,16 +110,6 @@ cur_frm.cscript['Create Customer'] = function(){
);
}
-// send email
-// ===============================================================
-cur_frm.cscript.send_email = function(doc,cdt,cdn){
- if(doc.__islocal != 1){
- $c_obj(make_doclist(doc.doctype, doc.name),'send_mail','',function(r,rt){});
- }else{
- msgprint("Please save lead first before sending email")
- }
-}
-
// Create New Opportunity
// ===============================================================
cur_frm.cscript['Create Opportunity'] = function(){
diff --git a/erpnext/selling/doctype/lead/lead.py b/erpnext/selling/doctype/lead/lead.py
index f0e85e92e6..ddccbc1d7f 100644
--- a/erpnext/selling/doctype/lead/lead.py
+++ b/erpnext/selling/doctype/lead/lead.py
@@ -83,15 +83,9 @@ class DocType:
def on_update(self):
- # Add to calendar
- # ========================================================================
if self.doc.contact_by:
self.add_calendar_event()
- if session['user'] == 'Guest':
- if self.doc.email_id:
- self.send_email_notification()
-
if not self.doc.naming_series:
if session['user'] == 'Guest':
import webnotes.model.doctype
@@ -103,37 +97,6 @@ class DocType:
else:
msgprint("Please specify naming series")
raise Exception
-
- def send_email_notification(self):
- if not validate_email_add(self.doc.email_id.strip(' ')):
- msgprint('error:%s is not a valid email id' % self.doc.email_id.strip(' '))
- raise Exception
- else:
- subject = 'Thank you for interest in erpnext'
-
- sendmail([self.doc.email_id.strip(' ')], sender = sender_email[0][0], subject = subject , parts = [['text/html', self.get_notification_msg()]])
- msgprint("Mail Sent")
-
- def get_notification_msg(self):
- t = """
-
-
- Dear %s,
-
- Thank you for contacting us.
-
- You have left following message for us,
- %s
-
-
- You will receive reply on this shortly.
-
- Cheers!
-
-
- """ % (self.doc.lead_name, self.doc.remark)
-
- return t
# Add to Calendar
# ===========================================================================
@@ -158,25 +121,6 @@ class DocType:
ev.ref_name = self.doc.name
ev.save(1)
-
-#-----------------Email--------------------------------------------
- def send_emails(self, email=[], subject='', message=''):
- if email:
- sendmail(email, sender = webnotes.user.name, subject = subject , parts = [['text/html', message]])
- msgprint("Mail Sent")
- self.add_in_follow_up(message,'Email')
-
-#-------------------------Checking Sent Mails Details----------------------------------------------
- def send_mail(self):
- if not self.doc.subject or not self.doc.message:
- msgprint("Please enter subject & message in their respective fields.")
- elif not self.doc.email_id:
- msgprint("Recipient not specified. Please add email id of lead in 'Email id' field provided in 'Contact Info' section.")
- raise Exception
- else :
- self.send_emails([self.doc.email_id.strip(' ')], subject = self.doc.subject ,message = self.doc.message)
-
-#---------------------- Add details in follow up table----------------
def add_in_follow_up(self,message,type):
import datetime
child = addchild( self.doc, 'follow_up', 'Communication Log', 1, self.doclist)
diff --git a/erpnext/selling/doctype/lead/lead.txt b/erpnext/selling/doctype/lead/lead.txt
index b6aa8397d7..056fc16bae 100644
--- a/erpnext/selling/doctype/lead/lead.txt
+++ b/erpnext/selling/doctype/lead/lead.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2012-05-15 12:14:52',
+ 'creation': '2012-06-05 20:03:20',
'docstatus': 0,
- 'modified': '2012-05-30 12:43:03',
+ 'modified': '2012-08-03 10:49:22',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -505,23 +505,6 @@
'permlevel': 0
},
- # DocField
- {
- 'colour': u'White:FFF',
- 'description': u'Probability of lead converting to customer',
- 'doctype': u'DocField',
- 'fieldname': u'rating',
- 'fieldtype': u'Select',
- 'in_filter': 1,
- 'label': u'Rating',
- 'oldfieldname': u'rating',
- 'oldfieldtype': u'Select',
- 'options': u'\nHot\nWarm\nCold',
- 'permlevel': 0,
- 'reqd': 0,
- 'search_index': 0
- },
-
# DocField
{
'default': u'__user',
@@ -694,5 +677,23 @@
'oldfieldtype': u'Small Text',
'permlevel': 1,
'print_hide': 1
+ },
+
+ # DocField
+ {
+ 'doctype': u'DocField',
+ 'fieldname': u'unsubscribed',
+ 'fieldtype': u'Check',
+ 'label': u'Unsubscribed',
+ 'permlevel': 0
+ },
+
+ # DocField
+ {
+ 'doctype': u'DocField',
+ 'fieldname': u'blog_subscriber',
+ 'fieldtype': u'Check',
+ 'label': u'Blog Subscriber',
+ 'permlevel': 0
}
]
\ No newline at end of file
diff --git a/erpnext/selling/doctype/lead/lead_list.js b/erpnext/selling/doctype/lead/lead_list.js
index ca18dc6941..b876d52cbb 100644
--- a/erpnext/selling/doctype/lead/lead_list.js
+++ b/erpnext/selling/doctype/lead/lead_list.js
@@ -4,8 +4,7 @@ wn.doclistviews['Lead'] = wn.views.ListView.extend({
this.fields = this.fields.concat([
'tabLead.lead_name',
'tabLead.status',
- 'tabLead.source',
- 'tabLead.rating'
+ 'tabLead.source'
]);
this.stats = this.stats.concat(['status', 'source', 'rating', 'company']);
},
diff --git a/erpnext/selling/doctype/opportunity/opportunity.py b/erpnext/selling/doctype/opportunity/opportunity.py
index 0a53cf0bc3..c3a6fb7596 100644
--- a/erpnext/selling/doctype/opportunity/opportunity.py
+++ b/erpnext/selling/doctype/opportunity/opportunity.py
@@ -198,118 +198,7 @@ class DocType(TransactionBase):
set(self.doc, 'status', 'Opportunity Lost')
set(self.doc, 'order_lost_reason', arg)
return 'true'
-
-
- # On Send Email
- # ====================================================================================================================
- #def send_emails(self,email,sender,subject,message):
- # if email:
- # sendmail(email,sender,subject=subject or 'Opportunity',parts=[['text/plain',message or self.get_enq_summary()]])
-
- # Prepare HTML Table and Enter Opportunity Items in it, which will be added in enq summary
- # ====================================================================================================================
- def quote_table(self):
- if getlist(self.doclist,'enq_details'):
- header_lbl = ['Item Code','Item Name','Description','Reqd Qty','UOM']
- item_tbl = '''
'''
- return item_tbl
-
- # Prepare HTML Page containing summary of Opportunity, which will be sent as message in E-mail
- # ====================================================================================================================
- def get_enq_summary(self):
-
- t = """
-
-
-
- RSS Feed
-