nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 11:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'i18n' of git://github.com/bperretti/erpnext into bperretti-i18n

Browse Source
This commit is contained in:
Nabin Hait
2013-10-24 11:40:32 +05:30
parent 3eb901f47d 8833c52c02
commit ca8ad210d2
112 changed files with 677 additions and 617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
selling/doctype/quotation/quotation.js
View File

@@ -25,12 +25,19 @@ erpnext.selling.QuotationController = erpnext.selling.SellingController.extend({
refresh: function(doc, dt, dn) {
this._super(doc, dt, dn);
<<<<<<< HEAD
if(doc.docstatus == 1 && doc.status!=='Order Lost') {
cur_frm.add_custom_button(wn._('Make Sales Order'), cur_frm.cscript['Make Sales Order']);
if(doc.status!=="Order Confirmed") {
cur_frm.add_custom_button(wn._('Set as Lost'), cur_frm.cscript['Declare Order Lost']);
=======
if(doc.docstatus == 1 && doc.status!=='Lost') {
cur_frm.add_custom_button('Make Sales Order', cur_frm.cscript['Make Sales Order']);
if(doc.status!=="Ordered") {
cur_frm.add_custom_button('Set as Lost', cur_frm.cscript['Declare Order Lost']);
>>>>>>> f146e8b7f52a3e46e335c0fefd92c347717b370b
}
cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms);
cur_frm.add_custom_button(wn._('Send SMS'), cur_frm.cscript.send_sms);
}
if (this.frm.doc.docstatus===0) {
@@ -122,9 +129,9 @@ cur_frm.cscript['Declare Order Lost'] = function(){
var dialog = new wn.ui.Dialog({
title: "Set as Lost",
fields: [
{"fieldtype": "Text", "label": "Reason for losing", "fieldname": "reason",
{"fieldtype": "Text", "label": wn._("Reason for losing"), "fieldname": "reason",
"reqd": 1 },
{"fieldtype": "Button", "label": "Update", "fieldname": "update"},
{"fieldtype": "Button", "label": wn._("Update"), "fieldname": "update"},
]
});
@@ -137,7 +144,7 @@ cur_frm.cscript['Declare Order Lost'] = function(){
args: args.reason,
callback: function(r) {
if(r.exc) {
msgprint("There were errors.");
msgprint(wn._("There were errors."));
return;
}
dialog.hide();