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

merged with master

Browse Source
This commit is contained in:
Nabin Hait
2012-12-14 10:43:56 +05:30
parent df011dbfa5 72d2a627f5
commit f8de5b9878
67 changed files with 447 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utilities/doctype/contact/contact.js
View File

@@ -27,7 +27,7 @@ cur_frm.cscript.refresh = function() {
list: wn.model.get("Communication", {"contact": doc.name}),
parent: cur_frm.fields_dict.communication_html.wrapper,
doc: doc,
email: doc.email_id
recipients: doc.email_id
})
}

2
utilities/doctype/sms_control/sms_control.js
View File

@@ -31,7 +31,6 @@ function SMSManager() {
this.show = function(contact, key, value, mobile_nos, message) {
this.message = message;
if (mobile_nos) {
me.number = mobile_nos;
me.show_dialog();
} else if (contact){
@@ -59,7 +58,6 @@ function SMSManager() {
{fieldname:'send', fieldtype:'Button', label:'Send'}
]
})
d.make();
d.fields_dict.send.input.onclick = function() {
var btn = d.fields_dict.send.input;
var v = me.dialog.get_values();

15
utilities/page/calendar/calendar.js
View File

@@ -85,7 +85,7 @@ Calendar.prototype.show_event = function(ev, cal_ev) {
,['Text','Description']
,['HTML', 'Ref Link']
,['Check', 'Public Event']
,['Check', 'Cancel Event']
,['Check', 'Cancelled Event']
,['HTML', 'Event Link']
,['Button', 'Save']
])
@@ -106,7 +106,7 @@ Calendar.prototype.show_event = function(ev, cal_ev) {
this.widgets['Description'].value = cstr(this.ev.description);
this.widgets['Public Event'].checked = false;
this.widgets['Cancel Event'].checked = false;
this.widgets['Cancelled Event'].checked = false;
if(this.ev.event_type=='Public')
this.widgets['Public Event'].checked = true;
@@ -134,7 +134,7 @@ Calendar.prototype.show_event = function(ev, cal_ev) {
// save values
d.ev.description = d.widgets['Description'].value;
if(d.widgets['Cancel Event'].checked)
if(d.widgets['Cancelled Event'].checked)
d.ev.event_type='Cancel';
else if(d.widgets['Public Event'].checked)
d.ev.event_type='Public';
@@ -154,7 +154,8 @@ Calendar.prototype.show_event = function(ev, cal_ev) {
Calendar.prototype.save_event = function(doc) {
var me = this;
save_doclist('Event', doc.name, 'Save', function(r) {
var doclist = new wn.model.DocList("Event", doc.name);
doclist.save("Save", function(r) {
var doc = locals['Event'][r.docname];
var cal = erpnext.calendar;
cal.cur_view.refresh();
@@ -162,15 +163,15 @@ Calendar.prototype.save_event = function(doc) {
// if cancelled, hide
if(doc.event_type=='Cancel') {
$(cal.events_by_name[doc.name].body).toggle(false);
}
});
}
})
}
//------------------------------------------------------
Calendar.prototype.add_event = function() {
var ev = LocalDB.create('Event');
var ev = wn.model.make_new_doc_and_get_name('Event');
ev = locals['Event'][ev];
ev.event_date = dateutil.obj_to_str(this.selected_date);