[docs] [minor] merge conflict fixed

docs/user/five_day_setup/docs.user.five_day_setup.day_1.md

@@ -1,6 +1,6 @@
 ---
 {
-	"_label": "Day-1: Setup Customer,Item, and Supplier"
+	"_label": "Day-1: Setup Customer, Item, and Supplier"
 }
 ---
 Login to your ERPNext account with the User ID and Password sent through the mail.

docs/user/five_day_setup/docs.user.five_day_setup.day_3.md

@@ -136,4 +136,4 @@ Payments made against Sales Invoices or Purchase Invoices can be made by clickin
 ![Payment Entry](img/thirddaysetup-payment-entry.png)
 <br>
 
-> To understand Payment Entry in detail, visit [Payment Entry](docs.user.accounts.payments.html).
+> To understand Payment Entry in detail, visit [Payment Entry](docs.user.accounts.payments.html).

docs/user/five_day_setup/docs.user.five_day_setup.day_4.md

@@ -83,4 +83,4 @@ To go to a Journal Voucher, click on Accounts. On the Accounts page, click on Jo
 
 Some of the major Accounting Reports are General Ledger, Trial Balance, Accounts  Payable and Accounts Receivables, and Sales and Purchase Register.
 
-> To be able to generate these accounts, visti [Accounting Reports](docs.user.accounts.report.html)
+> To be able to generate these accounts, visti [Accounting Reports](docs.user.accounts.report.html)

docs/user/five_day_setup/docs.user.five_day_setup.day_5.md

@@ -29,4 +29,4 @@ To create a Task, go to Project and click on Task.
 <br>
 #### Website
 
-> To understand Website in detail, visit [Website](docs.user.website.html)
+> To understand Website in detail, visit [Website](docs.user.website.html)

docs/user/intro/docs.user.implement.strategy.md

@@ -10,6 +10,7 @@ Before you start managing your Operations in EPRNext, you must first become fami
 ### Test Phase
 
 - Read the Manual
+- Follow the Five-Day-Setup Module or the instructions given below.
 - Create your first Customer, Supplier and Item. Add a few more so you get familiar with them.
 - Create Customer Groups, Item Groups, Warehouses, Supplier Groups, so that you can classify your Items.
 - Complete a standard sales cycle - Lead > Opportunity > Quotation > Sales Order > Delivery Note > Sales Invoice > Payment (Journal Voucher)

docs/user/stock/docs.user.stock.item.md

@@ -91,3 +91,59 @@ Inspection Criteria: If a Quality Inspection is prepared for this Item, then thi
 
 
 Visit [Manufacturing](docs.user.mfg.html) and [Website](docs.user.website.html) to understand these topics in detail.
+
+### Listing Item on Website
+
+To list your Item on the Website, fill the Item details and save the file. Once the file is saved, a plus (+) button will appear next to the Image icon. Click on the plus button and add your Item image. The html code will be generated automatically. 
+
+##### Step 1: Save Image
+
+![Webimage](img/item-webimage.png)
+
+<br>
+
+##### Step 2: Check the 'Show in Website' box.
+
+Under the Website section, please check the box that says 'show in Website'. Once the box is checked, the page will display other fields for entering information. 
+
+![Webimage](img/item-webimage-1.png)
+
+<br>
+
+
+##### Step 3: Enter Website Details
+
+![Webimage](img/item-webimage-2.png)
+
+
+The page name will be generated automatically. Mention the Item-Group under which the Item will be displayed.
+
+#### Item Groups
+
+Mention the Item Group under this column. If you wish to list your Item under the broad category products, name your Item Group as Products. In case you have various varieties of Item and want to classify them under different names, make Item Groups with those names and check the box that says 'show in Website'. For Example, if you wish to create a category called 'Bags', create a Item Group named Bags.
+
+
+![Item Group](img/itemgroup-webimage-bags.png)
+
+Once the Item Group is created go to the Website Settings page under Website. Enter the Label, Url, and Parent Label.
+
+
+![Item Group](img/itemgroup-website-settings.png)
+
+<br>
+
+#### Webpage labels
+
+![Webpage](img/webpage-labels.png)
+
+Add more Items under a particular Item Group.
+
+To add more Items under a certain Label, mention the Item Group on the Item Page. The Items will be added automatically on the Webpage, under the Item Group Label. For Example, To add Item-Kiddies Bag and Butterfly Print Bag, check the 'Show in Website'box. The Items will be placed under the Label Bags on the Webpage.
+
+![Item Group](img/itemgroup-websettings.png)
+
+<br>
+
+Item Group Display
+
+![Item Group Display](img/webpage-itemgroup-display.png)

public/js/stock_grid_report.js

@@ -28,9 +28,7 @@ erpnext.StockGridReport = wn.views.TreeGridReport.extend({
 			var value_diff = (rate * add_qty);
 		
 			if(add_qty)
-				wh.fifo_stack.push([add_qty, sl.incoming_rate, sl.posting_date]);
-				
-			if(sl.serial_no) value_diff = this.get_serialized_value_diff(sl);
+				wh.fifo_stack.push([add_qty, sl.incoming_rate, sl.posting_date]);				
 		} else {
 			// outgoing
 			if(sl.serial_no) {
@@ -113,7 +111,8 @@ erpnext.StockGridReport = wn.views.TreeGridReport.extend({
 		$.each(wn.report_dump.data["Stock Ledger Entry"], function(i, sle) {
 			if(sle.qty > 0 && sle.serial_no) {
 				$.each(sle.serial_no.trim().split("\n"), function(i, sr) {
-					if(sr && sle.incoming_rate !== undefined) {
+					if(sr && sle.incoming_rate !== undefined 
+							&& !serialized_buying_rates[sr.trim().toLowerCase()]) {
 						serialized_buying_rates[sr.trim().toLowerCase()] = flt(sle.incoming_rate);
 					}
 				});

utilities/repost_stock.py

@@ -76,29 +76,29 @@ def get_reserved_qty(item_code, warehouse):
 	return flt(reserved_qty[0][0]) if reserved_qty else 0
 	
 def get_indented_qty(item_code, warehouse):
-	indented_qty = webnotes.conn.sql("""select sum(pr_item.qty - pr_item.ordered_qty)
+	indented_qty = webnotes.conn.sql("""select sum(pr_item.qty - ifnull(pr_item.ordered_qty, 0))
 		from `tabMaterial Request Item` pr_item, `tabMaterial Request` pr
 		where pr_item.item_code=%s and pr_item.warehouse=%s 
-		and pr_item.qty > pr_item.ordered_qty and pr_item.parent=pr.name 
+		and pr_item.qty > ifnull(pr_item.ordered_qty, 0) and pr_item.parent=pr.name 
 		and pr.status!='Stopped' and pr.docstatus=1""", (item_code, warehouse))
 		
 	return flt(indented_qty[0][0]) if indented_qty else 0
 
 def get_ordered_qty(item_code, warehouse):
 	ordered_qty = webnotes.conn.sql("""
-		select sum((po_item.qty - po_item.received_qty)*po_item.conversion_factor)
+		select sum((po_item.qty - ifnull(po_item.received_qty, 0))*po_item.conversion_factor)
 		from `tabPurchase Order Item` po_item, `tabPurchase Order` po
 		where po_item.item_code=%s and po_item.warehouse=%s 
-		and po_item.qty > po_item.received_qty and po_item.parent=po.name 
+		and po_item.qty > ifnull(po_item.received_qty, 0) and po_item.parent=po.name 
 		and po.status!='Stopped' and po.docstatus=1""", (item_code, warehouse))
 		
 	return flt(ordered_qty[0][0]) if ordered_qty else 0
 			
 def get_planned_qty(item_code, warehouse):
 	planned_qty = webnotes.conn.sql("""
-		select sum(qty - produced_qty) from `tabProduction Order` 
+		select sum(ifnull(qty, 0) - ifnull(produced_qty, 0)) from `tabProduction Order` 
 		where production_item = %s and fg_warehouse = %s and status != "Stopped"
-		and docstatus=1 and qty > produced_qty""", (item_code, warehouse))
+		and docstatus=1 and ifnull(qty, 0) > ifnull(produced_qty, 0)""", (item_code, warehouse))
 
 	return flt(planned_qty[0][0]) if planned_qty else 0