From cf0b6d579fc7b3960ba6c14b34a35bd2fe616573 Mon Sep 17 00:00:00 2001 From: Akhilesh Darjee Date: Thu, 29 Aug 2013 19:21:03 +0530 Subject: [PATCH] [pos] POS Invoice print format done --- accounts/Print Format/POS Invoice/POS Invoice.txt | 4 ++-- accounts/doctype/sales_invoice/pos.js | 2 +- accounts/doctype/sales_invoice/sales_invoice.js | 5 +---- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/accounts/Print Format/POS Invoice/POS Invoice.txt b/accounts/Print Format/POS Invoice/POS Invoice.txt index 672c107b847..2d48fff4302 100644 --- a/accounts/Print Format/POS Invoice/POS Invoice.txt +++ b/accounts/Print Format/POS Invoice/POS Invoice.txt @@ -2,14 +2,14 @@ { "creation": "2011-12-21 11:08:55", "docstatus": 0, - "modified": "2013-08-16 16:15:46", + "modified": "2013-08-29 17:40:19", "modified_by": "Administrator", "owner": "Administrator" }, { "doc_type": "Sales Invoice", "doctype": "Print Format", - "html": "\n\n\n\n\n\n\n\n\n\n \n \n\n\n \n\n
NO: DATE:
M/s
\n\n
\n\n
\n\n

\n\n \n \n \n \n
For
 
Signatory
\n\n\n", + "html": "\n\n\n\n\n\n\n\n\n \n \n \n \n \n \n \n
RECEIPT NO: DATE:
M/s
\n\n
\n\n\n", "module": "Accounts", "name": "__common__", "print_format_type": "Client", diff --git a/accounts/doctype/sales_invoice/pos.js b/accounts/doctype/sales_invoice/pos.js index 1a9fb12424e..6ef48112af5 100644 --- a/accounts/doctype/sales_invoice/pos.js +++ b/accounts/doctype/sales_invoice/pos.js @@ -181,7 +181,7 @@ erpnext.POS = Class.extend({ $.each(r.message, function(index, obj) { if (obj.image) image = ''; + style="border:1px solid #eee;height:140px;width:100%;">'; else image = '
'; diff --git a/accounts/doctype/sales_invoice/sales_invoice.js b/accounts/doctype/sales_invoice/sales_invoice.js index 85550c48a8f..5cfc27105d3 100644 --- a/accounts/doctype/sales_invoice/sales_invoice.js +++ b/accounts/doctype/sales_invoice/sales_invoice.js @@ -26,7 +26,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte } } - if(this.frm.doc.is_pos && this.frm.doc.docstatus===0) { + if(this.frm.doc.is_pos) { cur_frm.cscript.toggle_pos(true); } }, @@ -93,9 +93,6 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte } }); }); - } else { - // hide shown pos for submitted records - if(cur_frm.pos_active) cur_frm.cscript.toggle_pos(false); } if(cint(sys_defaults.fs_pos_view)===1)