Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2383 from neilLasrado/pos

Browse Source 
POS feature #2305
This commit is contained in:
Nabin Hait 2014-11-14 18:12:26 +05:30
commit 601fcde31c
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/accounts/doctype/sales_invoice/sales_invoice.js
View File

@ -387,13 +387,15 @@ cur_frm.cscript.cost_center = function(doc, cdt, cdn) {
}
cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
if(cint(frappe.boot.notification_settings.sales_invoice)) {
cur_frm.email_doc(frappe.boot.notification_settings.sales_invoice_message);
}
$.each(doc["entries"], function(i, row) {
if(row.delivery_note) frappe.model.clear_doc("Delivery Note", row.delivery_note)
})
if(cint(frappe.boot.notification_settings.sales_invoice)) {
cur_frm.email_doc(frappe.boot.notification_settings.sales_invoice_message);
} else if(cur_frm.doc.is_pos) {
new_doc("Sales Invoice");
}
}
cur_frm.cscript.send_sms = function() {

2
erpnext/public/js/transaction.js
View File

@ -66,7 +66,7 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
make_pos_btn: function() {
var me = this;
if(this.frm.doc.docstatus===0) {
if(this.frm.doc.docstatus <= 1) {
if(!this.pos_active) {
var btn_label = __("POS View"),
icon = "icon-th";