removed duplicate function from sales invoice
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index 97848a3..29fde39 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -636,49 +636,6 @@
self.make_gl_entries(is_cancel=1)
- # Get Warehouse
- def get_warehouse(self):
- w = webnotes.conn.sql("select warehouse from `tabPOS Setting` where ifnull(user,'') = '%s' and company = '%s'" % (session['user'], self.doc.company))
- w = w and w[0][0] or ''
- if not w:
- ps = webnotes.conn.sql("select name, warehouse from `tabPOS Setting` where ifnull(user,'') = '' and company = '%s'" % self.doc.company)
- if not ps:
- msgprint("To make POS entry, please create POS Setting from Setup --> Accounts --> POS Setting and refresh the system.")
- raise Exception
- elif not ps[0][1]:
- msgprint("Please enter warehouse in POS Setting")
- else:
- w = ps[0][1]
- return w
-
- # on update
- def on_update(self):
- # Set default warehouse from pos setting
- #----------------------------------------
- if cint(self.doc.is_pos) == 1:
- self.set_actual_qty()
- w = self.get_warehouse()
- if w:
- for d in getlist(self.doclist, 'entries'):
- if not d.warehouse:
- d.warehouse = cstr(w)
-
- if flt(self.doc.paid_amount) == 0:
- if self.doc.cash_bank_account:
- webnotes.conn.set(self.doc, 'paid_amount',
- (flt(self.doc.grand_total) - flt(self.doc.write_off_amount)))
- else:
- # show message that the amount is not paid
- webnotes.conn.set(self.doc,'paid_amount',0)
- webnotes.msgprint("Note: Payment Entry not created since 'Cash/Bank Account' was not specified.")
-
- else:
- webnotes.conn.set(self.doc,'paid_amount',0)
-
- webnotes.conn.set(self.doc,'outstanding_amount',flt(self.doc.grand_total) - flt(self.doc.total_advance) - flt(self.doc.paid_amount) - flt(self.doc.write_off_amount))
-
- #-------------------------------------------------------------------------------------
-
def set_default_recurring_values(self):
from webnotes.utils import cstr
diff --git a/erpnext/accounts/page/financial_analytics/__init__.py b/erpnext/accounts/page/financial_analytics/__init__.py
index e69de29..baffc48 100644
--- a/erpnext/accounts/page/financial_analytics/__init__.py
+++ b/erpnext/accounts/page/financial_analytics/__init__.py
@@ -0,0 +1 @@
+from __future__ import unicode_literals
diff --git a/erpnext/accounts/page/general_ledger/__init__.py b/erpnext/accounts/page/general_ledger/__init__.py
index e69de29..baffc48 100644
--- a/erpnext/accounts/page/general_ledger/__init__.py
+++ b/erpnext/accounts/page/general_ledger/__init__.py
@@ -0,0 +1 @@
+from __future__ import unicode_literals
diff --git a/erpnext/accounts/page/trial_balance/__init__.py b/erpnext/accounts/page/trial_balance/__init__.py
index e69de29..baffc48 100644
--- a/erpnext/accounts/page/trial_balance/__init__.py
+++ b/erpnext/accounts/page/trial_balance/__init__.py
@@ -0,0 +1 @@
+from __future__ import unicode_literals
diff --git a/erpnext/patches/september_2012/__init__.py b/erpnext/patches/september_2012/__init__.py
index e69de29..baffc48 100644
--- a/erpnext/patches/september_2012/__init__.py
+++ b/erpnext/patches/september_2012/__init__.py
@@ -0,0 +1 @@
+from __future__ import unicode_literals
diff --git a/erpnext/patches/september_2012/all_permissions_patch.py b/erpnext/patches/september_2012/all_permissions_patch.py
index eea4345..ab06b71 100644
--- a/erpnext/patches/september_2012/all_permissions_patch.py
+++ b/erpnext/patches/september_2012/all_permissions_patch.py
@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
import webnotes
def execute():
web_cache_perms()
diff --git a/erpnext/patches/september_2012/communication_delete_permission.py b/erpnext/patches/september_2012/communication_delete_permission.py
index 68aea40..a1a7f66 100644
--- a/erpnext/patches/september_2012/communication_delete_permission.py
+++ b/erpnext/patches/september_2012/communication_delete_permission.py
@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
def execute():
import webnotes
from webnotes.model.doc import addchild
diff --git a/erpnext/patches/september_2012/customer_permission_patch.py b/erpnext/patches/september_2012/customer_permission_patch.py
index d8d0eab..a820cbe 100644
--- a/erpnext/patches/september_2012/customer_permission_patch.py
+++ b/erpnext/patches/september_2012/customer_permission_patch.py
@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
def execute():
from webnotes.model.doc import Document
perms = []
diff --git a/erpnext/patches/september_2012/reload_criteria_stock_ledger.py b/erpnext/patches/september_2012/reload_criteria_stock_ledger.py
index 4e2e71a..4766151 100644
--- a/erpnext/patches/september_2012/reload_criteria_stock_ledger.py
+++ b/erpnext/patches/september_2012/reload_criteria_stock_ledger.py
@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
def execute():
import webnotes
from webnotes.modules import reload_doc
diff --git a/erpnext/patches/september_2012/stock_report_permissions_for_accounts.py b/erpnext/patches/september_2012/stock_report_permissions_for_accounts.py
index 26af06b..07efc46 100644
--- a/erpnext/patches/september_2012/stock_report_permissions_for_accounts.py
+++ b/erpnext/patches/september_2012/stock_report_permissions_for_accounts.py
@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
def execute():
import webnotes
from webnotes.model.doc import addchild
diff --git a/erpnext/startup/report_data_map.py b/erpnext/startup/report_data_map.py
index 38c2dd2..3c3fa4b 100644
--- a/erpnext/startup/report_data_map.py
+++ b/erpnext/startup/report_data_map.py
@@ -14,6 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import unicode_literals
data_map = {
"Account": {
"columns": ["name", "parent_account", "lft", "rgt", "debit_or_credit", "is_pl_account",
diff --git a/erpnext/startup/startup.py b/erpnext/startup/startup.py
index 3d30492..b761225 100644
--- a/erpnext/startup/startup.py
+++ b/erpnext/startup/startup.py
@@ -14,6 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import unicode_literals
import webnotes
def get_unread_messages():
diff --git a/erpnext/stock/search_criteria/stock_ledger/__init__.py b/erpnext/stock/search_criteria/stock_ledger/__init__.py
index e69de29..baffc48 100644
--- a/erpnext/stock/search_criteria/stock_ledger/__init__.py
+++ b/erpnext/stock/search_criteria/stock_ledger/__init__.py
@@ -0,0 +1 @@
+from __future__ import unicode_literals