introducing model 3.0, refactored import module

stock/doctype/bin/bin.py

@@ -21,7 +21,7 @@ import webnotes
 from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, set_default, str_esc_quote, user_format, validate_email_add
 from webnotes.model import db_exists
 from webnotes.model.doc import Document, addchild, getchildren, make_autoname
-from webnotes.model.doclist import getlist, copy_doclist
+from webnotes.model.wrapper import getlist, copy_doclist
 from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax
 from webnotes import msgprint, errprint
 sql = webnotes.conn.sql

stock/doctype/delivery_note/delivery_note.py

@@ -21,7 +21,7 @@ import webnotes
 from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add
 from webnotes.model import db_exists
 from webnotes.model.doc import Document, addchild, getchildren, make_autoname
-from webnotes.model.doclist import getlist, copy_doclist
+from webnotes.model.wrapper import getlist, copy_doclist
 from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax
 from webnotes import session, form, msgprint, errprint
 
@@ -332,9 +332,9 @@ class DocType(TransactionBase):
 			""", self.doc.name)
 
 		if res and res[0][1]>0:
-			from webnotes.model.doclist import DocList
+			from webnotes.model.wrapper import ModelWrapper
 			for r in res:
-				ps = DocList(dt='Packing Slip', dn=r[0])
+				ps = ModelWrapper(dt='Packing Slip', dn=r[0])
 				ps.cancel()
 			webnotes.msgprint("%s Packing Slip(s) Cancelled" % res[0][1])
 

stock/doctype/item/item.py

@@ -21,7 +21,7 @@ import webnotes
 from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add
 from webnotes.model import db_exists
 from webnotes.model.doc import Document, addchild, getchildren, make_autoname
-from webnotes.model.doclist import getlist, copy_doclist
+from webnotes.model.wrapper import getlist, copy_doclist
 from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax
 from webnotes import session, form, msgprint, errprint
 

stock/doctype/item/test_item.py

@@ -19,7 +19,7 @@ import unittest
 import webnotes
 import copy
 
-from webnotes.model.doclist import DocList
+from webnotes.model.wrapper import ModelWrapper
 from webnotes.model.doc import Document
 from webnotes.model.code import get_obj
 from webnotes.utils import flt
@@ -35,7 +35,7 @@ class TestItem(unittest.TestCase):
 		webnotes.conn.rollback()
 		
 	def testInsert(self):
-		d = DocList()
+		d = ModelWrapper()
 
 		count_before =  flt(sql("select count(*) from tab"+_doctype)[0][0])
 		if docok:
@@ -50,7 +50,7 @@ class TestItem(unittest.TestCase):
 	def testFailAssert(self):
 		if docnotok:
 			with self.assertRaises(Exception) as context:
-				d = DocList()
+				d = ModelWrapper()
 				d.doc = docnotok[0]
 				d.children = None
 				d.doc.fields['__islocal']=1

stock/doctype/landed_cost_wizard/landed_cost_wizard.py

@@ -18,7 +18,7 @@ from __future__ import unicode_literals
 import webnotes
 from webnotes.utils import cint, cstr, flt
 from webnotes.model.doc import addchild, getchildren
-from webnotes.model.doclist import getlist
+from webnotes.model.wrapper import getlist
 from webnotes.model.code import get_obj
 from webnotes import msgprint
 

stock/doctype/purchase_receipt/purchase_receipt.py

@@ -21,7 +21,7 @@ import webnotes
 from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add
 from webnotes.model import db_exists
 from webnotes.model.doc import Document, addchild, getchildren, make_autoname
-from webnotes.model.doclist import getlist, copy_doclist
+from webnotes.model.wrapper import getlist, copy_doclist
 from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax
 from webnotes import session, form, msgprint, errprint
 

stock/doctype/sales_and_purchase_return_tool/sales_and_purchase_return_tool.py

@@ -21,7 +21,7 @@ import webnotes
 from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add
 from webnotes.model import db_exists
 from webnotes.model.doc import Document, addchild, getchildren, make_autoname
-from webnotes.model.doclist import getlist, copy_doclist
+from webnotes.model.wrapper import getlist, copy_doclist
 from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax
 from webnotes import session, form, msgprint, errprint
 

stock/doctype/stock_entry/stock_entry.py

@@ -21,7 +21,7 @@ import webnotes
 from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add
 from webnotes.model import db_exists, delete_doc
 from webnotes.model.doc import Document, addchild, getchildren, make_autoname
-from webnotes.model.doclist import getlist, copy_doclist
+from webnotes.model.wrapper import getlist, copy_doclist
 from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax
 from webnotes import session, form, msgprint, errprint
 

stock/doctype/stock_ledger/stock_ledger.py

@@ -21,7 +21,7 @@ import webnotes
 from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add
 from webnotes.model import db_exists
 from webnotes.model.doc import Document, addchild, getchildren, make_autoname
-from webnotes.model.doclist import getlist, copy_doclist
+from webnotes.model.wrapper import getlist, copy_doclist
 from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax
 from webnotes import session, form, msgprint, errprint
 

stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py

@@ -21,7 +21,7 @@ import webnotes
 from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add
 from webnotes.model import db_exists
 from webnotes.model.doc import Document, addchild, getchildren, make_autoname
-from webnotes.model.doclist import getlist, copy_doclist
+from webnotes.model.wrapper import getlist, copy_doclist
 from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax
 from webnotes import session, form, msgprint, errprint
 

stock/doctype/warehouse/warehouse.py

@@ -20,7 +20,7 @@ import webnotes
 
 from webnotes.utils import add_days, add_months, add_years, cint, cstr, flt, get_defaults, getdate, has_common, month_name, now, nowdate, set_default, validate_email_add
 from webnotes.model.doc import Document, addchild, getchildren
-from webnotes.model.doclist import getlist
+from webnotes.model.wrapper import getlist
 from webnotes.model.code import get_obj
 from webnotes import msgprint, errprint
 

stock/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt

@@ -0,0 +1,20 @@
+[
+ {
+  "owner": "Administrator", 
+  "docstatus": 0, 
+  "creation": "2012-11-23 16:46:22", 
+  "modified_by": "Administrator", 
+  "modified": "2012-11-23 17:41:03"
+ }, 
+ {
+  "name": "__common__", 
+  "ref_doctype": "Delivery Note", 
+  "doctype": "Report", 
+  "is_standard": "Yes", 
+  "query": "select \n `tabDelivery Note`.`name` as \"Delivery Note:Link/Delivery Note:120\",\n `tabDelivery Note`.`status` as \"Status\",\n `tabDelivery Note`.`posting_date` as \"Date:Date\",\n `tabDelivery Note Item`.item_code as \"Item:Link/Item:120\",\n `tabDelivery Note Item`.description as \"Description\",\n `tabDelivery Note Item`.qty as \"Qty:Float\",\n `tabDelivery Note Item`.billed_qty as \"Billed Qty:Float\"\nfrom\n `tabDelivery Note`, `tabDelivery Note Item`\nwhere\n `tabDelivery Note Item`.`parent` = `tabDelivery Note`.`name`\n and `tabDelivery Note`.docstatus = 1\n and `tabDelivery Note Item`.billed_qty < `tabDelivery Note Item`.qty\norder by `tabDelivery Note`.posting_date asc"
+ }, 
+ {
+  "name": "Delivered Items To Be Billed", 
+  "doctype": "Report"
+ }
+]