refactored defaults, bin material request wip

accounts/doctype/mis_control/mis_control.py

@@ -17,11 +17,13 @@
 from __future__ import unicode_literals
 import webnotes
 
-from webnotes.utils import cint, cstr, flt, get_defaults, get_first_day, get_last_day, has_common
+from webnotes.utils import cint, cstr, flt, get_first_day, get_last_day, has_common
 from webnotes.model import db_exists
 from webnotes.model.bean import copy_doclist
 from webnotes import session, msgprint
 
+import webnotes.defaults
+
 sql = webnotes.conn.sql
 
 from accounts.utils import get_balance_on, get_fiscal_year
@@ -65,7 +67,7 @@ class DocType:
 			
 		#--- from month and to month (for MIS - Comparison Report) -------
 		month_list = ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec']
-		fiscal_start_month = sql("select MONTH(year_start_date) from `tabFiscal Year` where name = %s",(get_defaults()['fiscal_year']))
+		fiscal_start_month = sql("select MONTH(year_start_date) from `tabFiscal Year` where name = %s",(webnotes.defaults.get_global_value("fiscal_year")))
 		fiscal_start_month = fiscal_start_month and fiscal_start_month[0][0] or 1
 		mon = ['']
 		for i in range(fiscal_start_month,13): mon.append(month_list[i-1])

accounts/doctype/purchase_invoice/purchase_invoice.py

@@ -17,12 +17,14 @@
 from __future__ import unicode_literals
 import webnotes
 
-from webnotes.utils import add_days, cint, cstr, flt, formatdate, get_defaults
+from webnotes.utils import add_days, cint, cstr, flt, formatdate
 from webnotes.model.bean import getlist
 from webnotes.model.code import get_obj
 from webnotes import msgprint, _
 from setup.utils import get_company_currency
 
+import webnotes.defaults
+
 sql = webnotes.conn.sql
 	
 from controllers.buying_controller import BuyingController
@@ -32,10 +34,6 @@ class DocType(BuyingController):
 		self.tname = 'Purchase Invoice Item'
 		self.fname = 'entries'
 
-# ************************** Trigger Functions ****************************
-
-	# Credit To
-	# ----------
 	def get_credit_to(self):
 		acc_head = sql("select name, credit_days from `tabAccount` where (name = %s or (master_name = %s and master_type = 'supplier')) and docstatus != 2", (cstr(self.doc.supplier) + " - " + self.get_company_abbr(),self.doc.supplier))		
 
@@ -57,9 +55,6 @@ class DocType(BuyingController):
 			
 		return ret
 
-
-	# Get Default Cost Center and Expense Head from Item Master
-	# ----------------------------------------------------------
 	def get_default_values(self,args):
 		import json
 		args = json.loads(args)
@@ -73,9 +68,6 @@ class DocType(BuyingController):
 				ret['cost_center'] = cost_center and cost_center[0][0] or ''
 		return ret
 		 
-		
-	# Get Items based on PO or PR
-	# ----------------------------
 	def pull_details(self):
 		if self.doc.purchase_receipt_main:
 			self.validate_duplicate_docname('purchase_receipt')
@@ -118,16 +110,9 @@ class DocType(BuyingController):
 		ret={'add_tax_rate' :rate and flt(rate[0][0]) or 0 }
 		return ret
 
-
-
-# *************************** Server Utility Functions *****************************
-	# Get Company abbr
-	# -----------------
 	def get_company_abbr(self):
 		return sql("select abbr from tabCompany where name=%s", self.doc.company)[0][0]
 
-	# Check whether PO or PR is already fetched
-	# ------------------------------------------
 	def validate_duplicate_docname(self,doctype):
 		for d in getlist(self.doclist, 'entries'): 
 			if doctype == 'purchase_receipt' and cstr(self.doc.purchase_receipt_main) == cstr(d.purchase_receipt):
@@ -138,11 +123,6 @@ class DocType(BuyingController):
 				msgprint(cstr(self.doc.purchase_order_main) + " purchase order details have already been pulled.")
 				raise Exception , " Validation Error. "
 
-		
-# **************************** VALIDATE ********************************
-
-	# Check for Item.is_Purchase_item = 'Yes' and Item is active
-	# ------------------------------------------------------------------
 	def check_active_purchase_items(self):
 		for d in getlist(self.doclist, 'entries'):
 			if d.item_code:		# extra condn coz item_code is not mandatory in PV
@@ -154,8 +134,6 @@ class DocType(BuyingController):
 					msgprint("Item : '%s' is not Purchase Item"%(d.item_code))
 					raise Exception
 						
-	# Check Conversion Rate
-	# ----------------------
 	def check_conversion_rate(self):
 		default_currency = get_company_currency(self.doc.company)		
 		if not default_currency:
@@ -259,7 +237,7 @@ class DocType(BuyingController):
 				raise Exception
 			# import_rate
 			rate = flt(sql('select import_rate from `tabPurchase Order Item` where item_code=%s and parent=%s and name = %s', (d.item_code, d.purchase_order, d.po_detail))[0][0])
-			if abs(rate - flt(d.import_rate)) > 1 and cint(get_defaults('maintain_same_rate')):
+			if abs(rate - flt(d.import_rate)) > 1 and cint(webnotes.defaults.get_global_default('maintain_same_rate')):
 				msgprint("Import Rate for %s in the Purchase Order is %s. Rate must be same as Purchase Order Rate" % (d.item_code,rate))
 				raise Exception
 									
@@ -277,9 +255,6 @@ class DocType(BuyingController):
 			msgprint("Aging Date is mandatory for opening entry")
 			raise Exception
 			
-
-	# Set against account for debit to account
-	#------------------------------------------
 	def set_against_expense_account(self):
 		against_acc = []
 		for d in getlist(self.doclist, 'entries'):
@@ -287,8 +262,6 @@ class DocType(BuyingController):
 				against_acc.append(d.expense_account)
 		self.doc.against_expense_account = ','.join(against_acc)
 
-	#check in manage account if purchase order required or not.
-	# ====================================================================================
 	def po_required(self):
 		res = sql("select value from `tabSingles` where doctype = 'Global Defaults' and field = 'po_required'")
 		if res and res[0][0] == 'Yes':
@@ -297,8 +270,6 @@ class DocType(BuyingController):
 					 msgprint("Purchse Order No. required against item %s"%d.item_code)
 					 raise Exception
 
-	#check in manage account if purchase receipt required or not.
-	# ====================================================================================
 	def pr_required(self):
 		res = sql("select value from `tabSingles` where doctype = 'Global Defaults' and field = 'pr_required'")
 		if res and res[0][0] == 'Yes':

accounts/page/accounts_browser/accounts_browser.py

@@ -1,6 +1,7 @@
 from __future__ import unicode_literals
 import webnotes
-from webnotes.utils import get_defaults
+import webnotes.defaults
+
 from accounts.utils import get_balance_on
 
 @webnotes.whitelist()
@@ -16,8 +17,8 @@ def get_companies():
 		if r["role"] in roles and r["match"]=="company"))
 	
 	# if match == company is specified and companies are specified in user defaults
-	if match and webnotes.user.get_defaults().get("company"):
-		return webnotes.user.get_defaults().get("company")
+	if match:
+		return webnotes.defaults.get_user_defaults("company")
 	else:
 		return [r[0] for r in webnotes.conn.sql("""select name from tabCompany
 			where docstatus!=2""")]

accounts/search_criteria/bank_reconciliation_statement/bank_reconciliation_statement.py

@@ -16,7 +16,9 @@
 
 #get company
 from __future__ import unicode_literals
-company = filter_values.get('company') or get_defaults()['company']
+
+import webnotes.defaults
+company = filter_values.get('company') or webnotes.defaults.get_user_default('company')
 
 # To date
 if not filter_values.get('clearance_date1'):

accounts/search_criteria/creditors_ledger/creditors_ledger.py

@@ -16,7 +16,9 @@
 
 #get company
 from __future__ import unicode_literals
-company = filter_values.get('company') or get_defaults()['company']
+
+import webnotes.defaults
+company = filter_values.get('company') or webnotes.defaults.get_user_default('company')
 
 #get company letter head
 l_head = sql("select letter_head from `tabCompany` where name='%s'" % company)

accounts/search_criteria/debtors_ledger/debtors_ledger.py

@@ -16,7 +16,9 @@
 
 #get company
 from __future__ import unicode_literals
-company = filter_values.get('company') or get_defaults()['company']
+
+import webnotes.defaults
+company = filter_values.get('company') or webnotes.defaults.get_user_default('company')
 
 #get company letter head
 l_head = sql("select letter_head from `tabCompany` where name='%s'" % company)