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

Merge pull request #1359 from akhileshdarjee/4.0-hotfix

Browse Source 
POS Invoice print format showing inclusive taxes and discount amount
This commit is contained in:
Nabin Hait
2014-01-27 04:09:36 -08:00
parent db7901ec49 ffa4769b51
commit 4b97811941
3 changed files with 48 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/Print Format/POS Invoice/POS Invoice.txt
View File

File diff suppressed because one or more lines are too long

3
erpnext/selling/doctype/sms_center/sms_center.py
View File

@@ -10,9 +10,6 @@ from webnotes.model.bean import copy_doclist
from webnotes.model.code import get_obj from webnotes.model.code import get_obj
from webnotes import msgprint from webnotes import msgprint
# ----------
class DocType: class DocType:
def __init__(self, doc, doclist=[]): def __init__(self, doc, doclist=[]):
self.doc = doc self.doc = doc

8
erpnext/utilities/doctype/sms_control/sms_control.py
View File

@@ -7,7 +7,7 @@ import webnotes, json
from webnotes.utils import nowdate, cstr from webnotes.utils import nowdate, cstr
from webnotes.model.code import get_obj from webnotes.model.code import get_obj
from webnotes.model.doc import Document from webnotes.model.doc import Document
from webnotes import msgprint from webnotes import msgprint, throw, _
from webnotes.model.bean import getlist, copy_doclist from webnotes.model.bean import getlist, copy_doclist
class DocType: class DocType:
@@ -26,7 +26,7 @@ class DocType:
validated_receiver_list.append(d) validated_receiver_list.append(d)
if not validated_receiver_list: if not validated_receiver_list:
msgprint("Please enter valid mobile nos", raise_exception=1) throw(_("Please enter valid mobile nos"))
return validated_receiver_list return validated_receiver_list
@@ -37,12 +37,12 @@ class DocType:
'ERPNXT' 'ERPNXT'
if len(sender_name) > 6 and \ if len(sender_name) > 6 and \
webnotes.conn.get_value("Control Panel", None, "country") == "India": webnotes.conn.get_value("Control Panel", None, "country") == "India":
msgprint(""" throw(_("""
As per TRAI rule, sender name must be exactly 6 characters. As per TRAI rule, sender name must be exactly 6 characters.
Kindly change sender name in Setup --> Global Defaults. Kindly change sender name in Setup --> Global Defaults.
Note: Hyphen, space, numeric digit, special characters are not allowed. Note: Hyphen, space, numeric digit, special characters are not allowed.
""", raise_exception=1) """))
return sender_name return sender_name
def get_contact_number(self, arg): def get_contact_number(self, arg):