Merge branch 'master' of github.com:webnotes/erpnext

website/doctype/contact_us_settings/contact_us_settings.py

@@ -14,7 +14,7 @@ class DocType:
 		else:
 			self.doc.query_options = ["Sales", "Support", "General"]
 		if self.doc.address:
-			self.address = webnotes.model_wrapper("Address", self.doc.address).doc
+			self.address = webnotes.bean("Address", self.doc.address).doc
 			
 	def on_update(self):
 		from website.utils import clear_cache

website/doctype/product/locale/_messages_doc.json

@@ -1,5 +0,0 @@
-[
- "Website", 
- "Product", 
- "A Product is shown on the website and is linked to an item."
-]

website/doctype/product/locale/ar-doc.json

@@ -1,5 +0,0 @@
-{
- "A Product is shown on the website and is linked to an item.": "\u0648\u064a\u0631\u062f \u0627\u0644\u0645\u0646\u062a\u062c \u0639\u0644\u0649 \u0627\u0644\u0645\u0648\u0642\u0639 \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a\u060c \u0648\u064a\u0631\u062a\u0628\u0637 \u0625\u0644\u0649 \u0639\u0646\u0635\u0631.", 
- "Product": "\u0646\u062a\u0627\u062c", 
- "Website": "\u0627\u0644\u0645\u0648\u0642\u0639"
-}

website/doctype/product/locale/es-doc.json

@@ -1,5 +0,0 @@
-{
- "A Product is shown on the website and is linked to an item.": "Un producto se muestra en la p\u00e1gina web y est\u00e1 vinculada a un elemento.", 
- "Product": "Producto", 
- "Website": "Sitio web"
-}

website/doctype/product/locale/fr-doc.json

@@ -1,5 +0,0 @@
-{
- "A Product is shown on the website and is linked to an item.": "Un produit est indiqu\u00e9 sur le site et il est li\u00e9 \u00e0 un \u00e9l\u00e9ment.", 
- "Product": "Produit", 
- "Website": "Site Web"
-}

website/doctype/product/locale/hi-doc.json

@@ -1,5 +0,0 @@
-{
- "A Product is shown on the website and is linked to an item.": "\u090f\u0915 \u0909\u0924\u094d\u092a\u093e\u0926 \u0915\u0940 \u0935\u0947\u092c\u0938\u093e\u0907\u091f \u092a\u0930 \u0926\u093f\u0916\u093e\u092f\u093e \u091c\u093e\u0924\u093e \u0939\u0948 \u0914\u0930 \u090f\u0915 \u0906\u0907\u091f\u092e \u0915\u0947 \u0932\u093f\u090f \u091c\u0941\u0921\u093c\u093e \u0939\u0941\u0906 \u0939\u0948.", 
- "Product": "\u0909\u0924\u094d\u092a\u093e\u0926", 
- "Website": "\u0935\u0947\u092c\u0938\u093e\u0907\u091f"
-}

website/doctype/product/locale/hr-doc.json

@@ -1,5 +0,0 @@
-{
- "A Product is shown on the website and is linked to an item.": "Proizvod je prikazan na web stranici, a povezana je s to\u010dkom.", 
- "Product": "Proizvod", 
- "Website": "Website"
-}

website/doctype/product/locale/nl-doc.json

@@ -1,5 +0,0 @@
-{
- "A Product is shown on the website and is linked to an item.": "Een product wordt getoond op de website en is gekoppeld aan een item.", 
- "Product": "Product", 
- "Website": "Website"
-}

website/doctype/product/locale/pt-doc.json

@@ -1,5 +0,0 @@
-{
- "A Product is shown on the website and is linked to an item.": "Um produto \u00e9 mostrado no site e est\u00e1 ligada a um item.", 
- "Product": "Produto", 
- "Website": "Site"
-}

website/doctype/product/locale/sr-doc.json

@@ -1,5 +0,0 @@
-{
- "A Product is shown on the website and is linked to an item.": "\u041f\u0440\u043e\u0438\u0437\u0432\u043e\u0434 \u0441\u0435 \u043f\u0440\u0438\u043a\u0430\u0437\u0443\u0458\u0435 \u043d\u0430 \u0441\u0430\u0458\u0442\u0443 \u0438 \u043f\u043e\u0432\u0435\u0437\u0430\u043d \u0441\u0430 \u0441\u0442\u0430\u0432\u043a\u043e\u043c.", 
- "Product": "\u041f\u0440\u043e\u0438\u0437\u0432\u043e\u0434", 
- "Website": "\u0412\u0435\u0431\u0441\u0430\u0458\u0442"
-}

website/doctype/product/locale/ta-doc.json

@@ -1,5 +0,0 @@
-{
- "A Product is shown on the website and is linked to an item.": "\u0b92\u0bb0\u0bc1 \u0ba4\u0baf\u0bbe\u0bb0\u0bbf\u0baa\u0bcd\u0baa\u0bc1 \u0b87\u0ba3\u0bc8\u0baf\u0ba4\u0bb3\u0ba4\u0bcd\u0ba4\u0bbf\u0bb2\u0bcd \u0b95\u0bbe\u0ba3\u0bb2\u0bbe\u0bae\u0bcd \u0bae\u0bb1\u0bcd\u0bb1\u0bc1\u0bae\u0bcd \u0b89\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0b9f\u0bbf \u0b87\u0ba3\u0bc8\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0bc1\u0bb3\u0bcd\u0bb3\u0ba4\u0bc1.", 
- "Product": "\u0bb5\u0bbf\u0bb3\u0bc8\u0baa\u0bc6\u0bbe\u0bb0\u0bc1\u0bb3\u0bcd", 
- "Website": "\u0b87\u0ba3\u0bc8\u0baf\u0ba4\u0bb3\u0bae\u0bcd"
-}

website/doctype/product_settings/product_settings.py

@@ -13,5 +13,5 @@ class DocType:
 		clear_cache()
 		
 		if self.doc.default_product_category:
-			webnotes.model_wrapper("Item Group", 
+			webnotes.bean("Item Group", 
 				self.doc.default_product_category).save()

website/helpers/slideshow.py

@@ -17,7 +17,7 @@
 import webnotes
 
 def get_slideshow(obj):
-	slideshow = webnotes.model_wrapper("Website Slideshow", obj.doc.slideshow)
+	slideshow = webnotes.bean("Website Slideshow", obj.doc.slideshow)
 	obj.slides = slideshow.doclist.get({"doctype":"Website Slideshow Item"})
 	obj.doc.slideshow_header = slideshow.doc.header or ""
 	for s in obj.slides:

website/utils.py

@@ -155,7 +155,7 @@ def prepare_args(page_name):
 			'name': page_name,
 		})
 		if page_name in page_settings_map:
-			args.obj = webnotes.model_wrapper(page_settings_map[page_name]).obj
+			args.obj = webnotes.bean(page_settings_map[page_name]).obj
 	else:
 		args = get_doc_fields(page_name)