diff --git a/erpnext/docs/current/api/controllers/erpnext.controllers.status_updater.html b/erpnext/docs/current/api/controllers/erpnext.controllers.status_updater.html
index 05fd9ce..eb34f9b 100644
--- a/erpnext/docs/current/api/controllers/erpnext.controllers.status_updater.html
+++ b/erpnext/docs/current/api/controllers/erpnext.controllers.status_updater.html
@@ -75,7 +75,7 @@
         <a name="set_status" href="#set_status" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		<b>set_status</b>
-        <i class="text-muted">(self, update=False, status=None)</i>
+        <i class="text-muted">(self, update=False, status=None, update_modified=True)</i>
     </p>
 	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
 </div>
diff --git a/erpnext/docs/current/api/shopping_cart/erpnext.shopping_cart.cart.html b/erpnext/docs/current/api/shopping_cart/erpnext.shopping_cart.cart.html
index cc9dcd6..6de26bb 100644
--- a/erpnext/docs/current/api/shopping_cart/erpnext.shopping_cart.cart.html
+++ b/erpnext/docs/current/api/shopping_cart/erpnext.shopping_cart.cart.html
@@ -279,6 +279,22 @@
     
     
 	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.cart.set_customer_in_address" href="#erpnext.shopping_cart.cart.set_customer_in_address" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.cart.<b>set_customer_in_address</b>
+        <i class="text-muted">(doc, method=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
         <a name="erpnext.shopping_cart.cart.set_price_list_and_rate" href="#erpnext.shopping_cart.cart.set_price_list_and_rate" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		erpnext.shopping_cart.cart.<b>set_price_list_and_rate</b>
diff --git a/erpnext/docs/current/index.html b/erpnext/docs/current/index.html
index 338ec01..26f1b23 100644
--- a/erpnext/docs/current/index.html
+++ b/erpnext/docs/current/index.html
@@ -35,7 +35,7 @@
 			Version
 		</td>
 		<td>
-			<code>6.12.3</code>
+			<code>6.12.6</code>
 		</td>
 	</tr>
 </table>
diff --git a/erpnext/docs/current/models/accounts/bank_reconciliation_detail.html b/erpnext/docs/current/models/accounts/bank_reconciliation_detail.html
index e5cf539..ee40e68 100644
--- a/erpnext/docs/current/models/accounts/bank_reconciliation_detail.html
+++ b/erpnext/docs/current/models/accounts/bank_reconciliation_detail.html
@@ -159,6 +159,18 @@
             <td></td>
         </tr>
         
+        <tr >
+            <td>10</td>
+            <td ><code>data_10</code></td>
+            <td >
+                Data</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
     </tbody>
 </table>
 
diff --git a/erpnext/docs/current/models/accounts/purchase_invoice.html b/erpnext/docs/current/models/accounts/purchase_invoice.html
index 912bed9..5f8c3e1 100644
--- a/erpnext/docs/current/models/accounts/purchase_invoice.html
+++ b/erpnext/docs/current/models/accounts/purchase_invoice.html
@@ -429,20 +429,8 @@
             </td>
         </tr>
         
-        <tr >
-            <td>27</td>
-            <td ><code>get_items_from_product_bundle</code></td>
-            <td >
-                Button</td>
-            <td >
-                Get Items from Product Bundle
-                
-            </td>
-            <td></td>
-        </tr>
-        
         <tr class="info">
-            <td>28</td>
+            <td>27</td>
             <td ><code>section_break_26</code></td>
             <td >
                 Section Break</td>
@@ -454,7 +442,7 @@
         </tr>
         
         <tr >
-            <td>29</td>
+            <td>28</td>
             <td ><code>base_total</code></td>
             <td >
                 Currency</td>
@@ -468,7 +456,7 @@
         </tr>
         
         <tr >
-            <td>30</td>
+            <td>29</td>
             <td ><code>base_net_total</code></td>
             <td >
                 Currency</td>
@@ -482,7 +470,7 @@
         </tr>
         
         <tr >
-            <td>31</td>
+            <td>30</td>
             <td ><code>column_break_28</code></td>
             <td class="info">
                 Column Break</td>
@@ -494,7 +482,7 @@
         </tr>
         
         <tr >
-            <td>32</td>
+            <td>31</td>
             <td ><code>total</code></td>
             <td >
                 Currency</td>
@@ -508,7 +496,7 @@
         </tr>
         
         <tr >
-            <td>33</td>
+            <td>32</td>
             <td ><code>net_total</code></td>
             <td >
                 Currency</td>
@@ -522,7 +510,7 @@
         </tr>
         
         <tr class="info">
-            <td>34</td>
+            <td>33</td>
             <td ><code>taxes_section</code></td>
             <td >
                 Section Break</td>
@@ -536,7 +524,7 @@
         </tr>
         
         <tr >
-            <td>35</td>
+            <td>34</td>
             <td ><code>taxes_and_charges</code></td>
             <td >
                 Link</td>
@@ -557,7 +545,7 @@
         </tr>
         
         <tr >
-            <td>36</td>
+            <td>35</td>
             <td ><code>taxes</code></td>
             <td >
                 Table</td>
@@ -578,7 +566,7 @@
         </tr>
         
         <tr >
-            <td>37</td>
+            <td>36</td>
             <td ><code>other_charges_calculation</code></td>
             <td >
                 HTML</td>
@@ -590,7 +578,7 @@
         </tr>
         
         <tr class="info">
-            <td>38</td>
+            <td>37</td>
             <td ><code>totals</code></td>
             <td >
                 Section Break</td>
@@ -604,7 +592,7 @@
         </tr>
         
         <tr >
-            <td>39</td>
+            <td>38</td>
             <td ><code>base_taxes_and_charges_added</code></td>
             <td >
                 Currency</td>
@@ -618,7 +606,7 @@
         </tr>
         
         <tr >
-            <td>40</td>
+            <td>39</td>
             <td ><code>base_taxes_and_charges_deducted</code></td>
             <td >
                 Currency</td>
@@ -632,7 +620,7 @@
         </tr>
         
         <tr >
-            <td>41</td>
+            <td>40</td>
             <td ><code>base_total_taxes_and_charges</code></td>
             <td >
                 Currency</td>
@@ -646,7 +634,7 @@
         </tr>
         
         <tr >
-            <td>42</td>
+            <td>41</td>
             <td ><code>column_break_40</code></td>
             <td class="info">
                 Column Break</td>
@@ -658,7 +646,7 @@
         </tr>
         
         <tr >
-            <td>43</td>
+            <td>42</td>
             <td ><code>taxes_and_charges_added</code></td>
             <td >
                 Currency</td>
@@ -672,7 +660,7 @@
         </tr>
         
         <tr >
-            <td>44</td>
+            <td>43</td>
             <td ><code>taxes_and_charges_deducted</code></td>
             <td >
                 Currency</td>
@@ -686,7 +674,7 @@
         </tr>
         
         <tr >
-            <td>45</td>
+            <td>44</td>
             <td ><code>total_taxes_and_charges</code></td>
             <td >
                 Currency</td>
@@ -700,7 +688,7 @@
         </tr>
         
         <tr class="info">
-            <td>46</td>
+            <td>45</td>
             <td ><code>section_break_44</code></td>
             <td >
                 Section Break</td>
@@ -712,7 +700,7 @@
         </tr>
         
         <tr >
-            <td>47</td>
+            <td>46</td>
             <td ><code>apply_discount_on</code></td>
             <td >
                 Select</td>
@@ -728,7 +716,7 @@
         </tr>
         
         <tr >
-            <td>48</td>
+            <td>47</td>
             <td ><code>column_break_46</code></td>
             <td class="info">
                 Column Break</td>
@@ -740,7 +728,7 @@
         </tr>
         
         <tr >
-            <td>49</td>
+            <td>48</td>
             <td ><code>discount_amount</code></td>
             <td >
                 Currency</td>
@@ -754,7 +742,7 @@
         </tr>
         
         <tr >
-            <td>50</td>
+            <td>49</td>
             <td ><code>base_discount_amount</code></td>
             <td >
                 Currency</td>
@@ -768,7 +756,7 @@
         </tr>
         
         <tr class="info">
-            <td>51</td>
+            <td>50</td>
             <td ><code>section_break_49</code></td>
             <td >
                 Section Break</td>
@@ -780,7 +768,7 @@
         </tr>
         
         <tr >
-            <td>52</td>
+            <td>51</td>
             <td ><code>base_grand_total</code></td>
             <td >
                 Currency</td>
@@ -794,7 +782,7 @@
         </tr>
         
         <tr >
-            <td>53</td>
+            <td>52</td>
             <td ><code>base_in_words</code></td>
             <td >
                 Data</td>
@@ -806,7 +794,7 @@
         </tr>
         
         <tr >
-            <td>54</td>
+            <td>53</td>
             <td ><code>column_break8</code></td>
             <td class="info">
                 Column Break</td>
@@ -818,7 +806,7 @@
         </tr>
         
         <tr >
-            <td>55</td>
+            <td>54</td>
             <td ><code>grand_total</code></td>
             <td >
                 Currency</td>
@@ -832,7 +820,7 @@
         </tr>
         
         <tr >
-            <td>56</td>
+            <td>55</td>
             <td ><code>in_words</code></td>
             <td >
                 Data</td>
@@ -844,7 +832,7 @@
         </tr>
         
         <tr >
-            <td>57</td>
+            <td>56</td>
             <td ><code>total_advance</code></td>
             <td >
                 Currency</td>
@@ -858,7 +846,7 @@
         </tr>
         
         <tr >
-            <td>58</td>
+            <td>57</td>
             <td ><code>outstanding_amount</code></td>
             <td >
                 Currency</td>
@@ -872,7 +860,7 @@
         </tr>
         
         <tr class="info">
-            <td>59</td>
+            <td>58</td>
             <td ><code>write_off</code></td>
             <td >
                 Section Break</td>
@@ -884,7 +872,7 @@
         </tr>
         
         <tr >
-            <td>60</td>
+            <td>59</td>
             <td ><code>write_off_amount</code></td>
             <td >
                 Currency</td>
@@ -898,7 +886,7 @@
         </tr>
         
         <tr >
-            <td>61</td>
+            <td>60</td>
             <td ><code>base_write_off_amount</code></td>
             <td >
                 Currency</td>
@@ -912,7 +900,7 @@
         </tr>
         
         <tr >
-            <td>62</td>
+            <td>61</td>
             <td ><code>column_break_61</code></td>
             <td class="info">
                 Column Break</td>
@@ -924,7 +912,7 @@
         </tr>
         
         <tr >
-            <td>63</td>
+            <td>62</td>
             <td ><code>write_off_account</code></td>
             <td >
                 Link</td>
@@ -945,7 +933,7 @@
         </tr>
         
         <tr >
-            <td>64</td>
+            <td>63</td>
             <td ><code>write_off_cost_center</code></td>
             <td >
                 Link</td>
@@ -966,7 +954,7 @@
         </tr>
         
         <tr class="info">
-            <td>65</td>
+            <td>64</td>
             <td ><code>advances_section</code></td>
             <td >
                 Section Break</td>
@@ -980,7 +968,7 @@
         </tr>
         
         <tr >
-            <td>66</td>
+            <td>65</td>
             <td ><code>get_advances_paid</code></td>
             <td >
                 Button</td>
@@ -994,7 +982,7 @@
         </tr>
         
         <tr >
-            <td>67</td>
+            <td>66</td>
             <td ><code>advances</code></td>
             <td >
                 Table</td>
@@ -1015,7 +1003,7 @@
         </tr>
         
         <tr class="info">
-            <td>68</td>
+            <td>67</td>
             <td ><code>terms_section_break</code></td>
             <td >
                 Section Break</td>
@@ -1029,7 +1017,7 @@
         </tr>
         
         <tr >
-            <td>69</td>
+            <td>68</td>
             <td ><code>tc_name</code></td>
             <td >
                 Link</td>
@@ -1050,7 +1038,7 @@
         </tr>
         
         <tr >
-            <td>70</td>
+            <td>69</td>
             <td ><code>terms</code></td>
             <td >
                 Text Editor</td>
@@ -1062,7 +1050,7 @@
         </tr>
         
         <tr class="info">
-            <td>71</td>
+            <td>70</td>
             <td ><code>contact_section</code></td>
             <td >
                 Section Break</td>
@@ -1076,7 +1064,7 @@
         </tr>
         
         <tr >
-            <td>72</td>
+            <td>71</td>
             <td ><code>supplier_address</code></td>
             <td >
                 Link</td>
@@ -1097,7 +1085,7 @@
         </tr>
         
         <tr >
-            <td>73</td>
+            <td>72</td>
             <td ><code>col_break23</code></td>
             <td class="info">
                 Column Break</td>
@@ -1109,7 +1097,7 @@
         </tr>
         
         <tr >
-            <td>74</td>
+            <td>73</td>
             <td ><code>contact_person</code></td>
             <td >
                 Link</td>
@@ -1130,7 +1118,7 @@
         </tr>
         
         <tr class="info">
-            <td>75</td>
+            <td>74</td>
             <td ><code>printing_settings</code></td>
             <td >
                 Section Break</td>
@@ -1142,7 +1130,7 @@
         </tr>
         
         <tr >
-            <td>76</td>
+            <td>75</td>
             <td ><code>letter_head</code></td>
             <td >
                 Link</td>
@@ -1163,7 +1151,7 @@
         </tr>
         
         <tr >
-            <td>77</td>
+            <td>76</td>
             <td ><code>select_print_heading</code></td>
             <td >
                 Link</td>
@@ -1184,7 +1172,7 @@
         </tr>
         
         <tr class="info">
-            <td>78</td>
+            <td>77</td>
             <td ><code>more_info</code></td>
             <td >
                 Section Break</td>
@@ -1198,7 +1186,7 @@
         </tr>
         
         <tr >
-            <td>79</td>
+            <td>78</td>
             <td class="danger" title="Mandatory"><code>credit_to</code></td>
             <td >
                 Link</td>
@@ -1219,7 +1207,7 @@
         </tr>
         
         <tr >
-            <td>80</td>
+            <td>79</td>
             <td ><code>party_account_currency</code></td>
             <td >
                 Link</td>
@@ -1240,7 +1228,7 @@
         </tr>
         
         <tr >
-            <td>81</td>
+            <td>80</td>
             <td ><code>is_opening</code></td>
             <td >
                 Select</td>
@@ -1255,7 +1243,7 @@
         </tr>
         
         <tr >
-            <td>82</td>
+            <td>81</td>
             <td ><code>due_date</code></td>
             <td >
                 Date</td>
@@ -1267,7 +1255,7 @@
         </tr>
         
         <tr >
-            <td>83</td>
+            <td>82</td>
             <td ><code>against_expense_account</code></td>
             <td >
                 Small Text</td>
@@ -1279,7 +1267,7 @@
         </tr>
         
         <tr >
-            <td>84</td>
+            <td>83</td>
             <td ><code>column_break_63</code></td>
             <td class="info">
                 Column Break</td>
@@ -1291,7 +1279,7 @@
         </tr>
         
         <tr >
-            <td>85</td>
+            <td>84</td>
             <td ><code>mode_of_payment</code></td>
             <td >
                 Link</td>
@@ -1312,7 +1300,7 @@
         </tr>
         
         <tr >
-            <td>86</td>
+            <td>85</td>
             <td ><code>fiscal_year</code></td>
             <td >
                 Link</td>
@@ -1333,7 +1321,7 @@
         </tr>
         
         <tr >
-            <td>87</td>
+            <td>86</td>
             <td ><code>remarks</code></td>
             <td >
                 Small Text</td>
@@ -1345,7 +1333,7 @@
         </tr>
         
         <tr class="info">
-            <td>88</td>
+            <td>87</td>
             <td ><code>recurring_invoice</code></td>
             <td >
                 Section Break</td>
@@ -1359,7 +1347,7 @@
         </tr>
         
         <tr >
-            <td>89</td>
+            <td>88</td>
             <td ><code>is_recurring</code></td>
             <td >
                 Check</td>
@@ -1371,7 +1359,7 @@
         </tr>
         
         <tr >
-            <td>90</td>
+            <td>89</td>
             <td ><code>recurring_type</code></td>
             <td >
                 Select</td>
@@ -1389,7 +1377,7 @@
         </tr>
         
         <tr >
-            <td>91</td>
+            <td>90</td>
             <td ><code>from_date</code></td>
             <td >
                 Date</td>
@@ -1402,7 +1390,7 @@
         </tr>
         
         <tr >
-            <td>92</td>
+            <td>91</td>
             <td ><code>to_date</code></td>
             <td >
                 Date</td>
@@ -1415,7 +1403,7 @@
         </tr>
         
         <tr >
-            <td>93</td>
+            <td>92</td>
             <td ><code>repeat_on_day_of_month</code></td>
             <td >
                 Int</td>
@@ -1428,7 +1416,7 @@
         </tr>
         
         <tr >
-            <td>94</td>
+            <td>93</td>
             <td ><code>end_date</code></td>
             <td >
                 Date</td>
@@ -1441,7 +1429,7 @@
         </tr>
         
         <tr >
-            <td>95</td>
+            <td>94</td>
             <td ><code>column_break_82</code></td>
             <td class="info">
                 Column Break</td>
@@ -1453,7 +1441,7 @@
         </tr>
         
         <tr >
-            <td>96</td>
+            <td>95</td>
             <td ><code>next_date</code></td>
             <td >
                 Date</td>
@@ -1466,7 +1454,7 @@
         </tr>
         
         <tr >
-            <td>97</td>
+            <td>96</td>
             <td ><code>recurring_id</code></td>
             <td >
                 Data</td>
@@ -1479,7 +1467,7 @@
         </tr>
         
         <tr >
-            <td>98</td>
+            <td>97</td>
             <td ><code>notification_email_address</code></td>
             <td >
                 Small Text</td>
@@ -1492,7 +1480,7 @@
         </tr>
         
         <tr >
-            <td>99</td>
+            <td>98</td>
             <td ><code>recurring_print_format</code></td>
             <td >
                 Link</td>
diff --git a/erpnext/docs/current/models/accounts/purchase_taxes_and_charges_template.html b/erpnext/docs/current/models/accounts/purchase_taxes_and_charges_template.html
index 3ab1d49..d82047e 100644
--- a/erpnext/docs/current/models/accounts/purchase_taxes_and_charges_template.html
+++ b/erpnext/docs/current/models/accounts/purchase_taxes_and_charges_template.html
@@ -238,15 +238,6 @@
             <li>
 
 
-<a href="https://frappe.github.io/erpnext/current/models/buying/supplier">Supplier</a>
-
-</li>
-			
-        
-			
-            <li>
-
-
 <a href="https://frappe.github.io/erpnext/current/models/buying/supplier_quotation">Supplier Quotation</a>
 
 </li>
diff --git a/erpnext/docs/current/models/accounts/sales_taxes_and_charges_template.html b/erpnext/docs/current/models/accounts/sales_taxes_and_charges_template.html
index 21e82f2..828f795 100644
--- a/erpnext/docs/current/models/accounts/sales_taxes_and_charges_template.html
+++ b/erpnext/docs/current/models/accounts/sales_taxes_and_charges_template.html
@@ -227,15 +227,6 @@
             <li>
 
 
-<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
-
-</li>
-			
-        
-			
-            <li>
-
-
 <a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note">Delivery Note</a>
 
 </li>
diff --git a/erpnext/docs/current/models/buying/purchase_order.html b/erpnext/docs/current/models/buying/purchase_order.html
index 87a0773..2c0e072 100644
--- a/erpnext/docs/current/models/buying/purchase_order.html
+++ b/erpnext/docs/current/models/buying/purchase_order.html
@@ -547,32 +547,8 @@
             </td>
         </tr>
         
-        <tr >
-            <td>35</td>
-            <td ><code>get_last_purchase_rate</code></td>
-            <td >
-                Button</td>
-            <td >
-                Get Last Purchase Rate
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>36</td>
-            <td ><code>get_items_from_product_bundle</code></td>
-            <td >
-                Button</td>
-            <td >
-                Get Items from Product Bundle
-                
-            </td>
-            <td></td>
-        </tr>
-        
         <tr class="info">
-            <td>37</td>
+            <td>35</td>
             <td ><code>sb_last_purchase</code></td>
             <td >
                 Section Break</td>
@@ -584,7 +560,7 @@
         </tr>
         
         <tr >
-            <td>38</td>
+            <td>36</td>
             <td ><code>base_total</code></td>
             <td >
                 Currency</td>
@@ -598,7 +574,7 @@
         </tr>
         
         <tr >
-            <td>39</td>
+            <td>37</td>
             <td ><code>base_net_total</code></td>
             <td >
                 Currency</td>
@@ -612,7 +588,7 @@
         </tr>
         
         <tr >
-            <td>40</td>
+            <td>38</td>
             <td ><code>column_break_26</code></td>
             <td class="info">
                 Column Break</td>
@@ -624,7 +600,7 @@
         </tr>
         
         <tr >
-            <td>41</td>
+            <td>39</td>
             <td ><code>total</code></td>
             <td >
                 Currency</td>
@@ -638,7 +614,7 @@
         </tr>
         
         <tr >
-            <td>42</td>
+            <td>40</td>
             <td ><code>net_total</code></td>
             <td >
                 Currency</td>
@@ -652,7 +628,7 @@
         </tr>
         
         <tr class="info">
-            <td>43</td>
+            <td>41</td>
             <td ><code>taxes_section</code></td>
             <td >
                 Section Break</td>
@@ -666,7 +642,7 @@
         </tr>
         
         <tr >
-            <td>44</td>
+            <td>42</td>
             <td ><code>taxes_and_charges</code></td>
             <td >
                 Link</td>
@@ -687,7 +663,7 @@
         </tr>
         
         <tr >
-            <td>45</td>
+            <td>43</td>
             <td ><code>taxes</code></td>
             <td >
                 Table</td>
@@ -708,7 +684,7 @@
         </tr>
         
         <tr >
-            <td>46</td>
+            <td>44</td>
             <td ><code>other_charges_calculation</code></td>
             <td >
                 HTML</td>
@@ -720,7 +696,7 @@
         </tr>
         
         <tr class="info">
-            <td>47</td>
+            <td>45</td>
             <td ><code>totals</code></td>
             <td >
                 Section Break</td>
@@ -734,7 +710,7 @@
         </tr>
         
         <tr >
-            <td>48</td>
+            <td>46</td>
             <td ><code>base_taxes_and_charges_added</code></td>
             <td >
                 Currency</td>
@@ -748,7 +724,7 @@
         </tr>
         
         <tr >
-            <td>49</td>
+            <td>47</td>
             <td ><code>base_taxes_and_charges_deducted</code></td>
             <td >
                 Currency</td>
@@ -762,7 +738,7 @@
         </tr>
         
         <tr >
-            <td>50</td>
+            <td>48</td>
             <td ><code>base_total_taxes_and_charges</code></td>
             <td >
                 Currency</td>
@@ -776,7 +752,7 @@
         </tr>
         
         <tr >
-            <td>51</td>
+            <td>49</td>
             <td ><code>column_break_39</code></td>
             <td class="info">
                 Column Break</td>
@@ -788,7 +764,7 @@
         </tr>
         
         <tr >
-            <td>52</td>
+            <td>50</td>
             <td ><code>taxes_and_charges_added</code></td>
             <td >
                 Currency</td>
@@ -802,7 +778,7 @@
         </tr>
         
         <tr >
-            <td>53</td>
+            <td>51</td>
             <td ><code>taxes_and_charges_deducted</code></td>
             <td >
                 Currency</td>
@@ -816,7 +792,7 @@
         </tr>
         
         <tr >
-            <td>54</td>
+            <td>52</td>
             <td ><code>total_taxes_and_charges</code></td>
             <td >
                 Currency</td>
@@ -830,7 +806,7 @@
         </tr>
         
         <tr class="info">
-            <td>55</td>
+            <td>53</td>
             <td ><code>discount_section</code></td>
             <td >
                 Section Break</td>
@@ -842,7 +818,7 @@
         </tr>
         
         <tr >
-            <td>56</td>
+            <td>54</td>
             <td ><code>apply_discount_on</code></td>
             <td >
                 Select</td>
@@ -858,7 +834,7 @@
         </tr>
         
         <tr >
-            <td>57</td>
+            <td>55</td>
             <td ><code>column_break_45</code></td>
             <td class="info">
                 Column Break</td>
@@ -870,7 +846,7 @@
         </tr>
         
         <tr >
-            <td>58</td>
+            <td>56</td>
             <td ><code>discount_amount</code></td>
             <td >
                 Currency</td>
@@ -884,7 +860,7 @@
         </tr>
         
         <tr >
-            <td>59</td>
+            <td>57</td>
             <td ><code>base_discount_amount</code></td>
             <td >
                 Currency</td>
@@ -898,7 +874,7 @@
         </tr>
         
         <tr class="info">
-            <td>60</td>
+            <td>58</td>
             <td ><code>totals_section</code></td>
             <td >
                 Section Break</td>
@@ -910,7 +886,7 @@
         </tr>
         
         <tr >
-            <td>61</td>
+            <td>59</td>
             <td ><code>base_grand_total</code></td>
             <td >
                 Currency</td>
@@ -924,7 +900,7 @@
         </tr>
         
         <tr >
-            <td>62</td>
+            <td>60</td>
             <td ><code>base_in_words</code></td>
             <td >
                 Data</td>
@@ -937,7 +913,7 @@
         </tr>
         
         <tr >
-            <td>63</td>
+            <td>61</td>
             <td ><code>base_rounded_total</code></td>
             <td >
                 Currency</td>
@@ -951,7 +927,7 @@
         </tr>
         
         <tr >
-            <td>64</td>
+            <td>62</td>
             <td ><code>advance_paid</code></td>
             <td >
                 Currency</td>
@@ -963,7 +939,7 @@
         </tr>
         
         <tr >
-            <td>65</td>
+            <td>63</td>
             <td ><code>column_break4</code></td>
             <td class="info">
                 Column Break</td>
@@ -975,7 +951,7 @@
         </tr>
         
         <tr >
-            <td>66</td>
+            <td>64</td>
             <td ><code>grand_total</code></td>
             <td >
                 Currency</td>
@@ -989,7 +965,7 @@
         </tr>
         
         <tr >
-            <td>67</td>
+            <td>65</td>
             <td ><code>in_words</code></td>
             <td >
                 Data</td>
@@ -1001,7 +977,7 @@
         </tr>
         
         <tr class="info">
-            <td>68</td>
+            <td>66</td>
             <td ><code>terms_section_break</code></td>
             <td >
                 Section Break</td>
@@ -1015,7 +991,7 @@
         </tr>
         
         <tr >
-            <td>69</td>
+            <td>67</td>
             <td ><code>tc_name</code></td>
             <td >
                 Link</td>
@@ -1036,7 +1012,7 @@
         </tr>
         
         <tr >
-            <td>70</td>
+            <td>68</td>
             <td ><code>terms</code></td>
             <td >
                 Text Editor</td>
@@ -1048,7 +1024,7 @@
         </tr>
         
         <tr class="info">
-            <td>71</td>
+            <td>69</td>
             <td ><code>contact_section</code></td>
             <td >
                 Section Break</td>
@@ -1062,7 +1038,7 @@
         </tr>
         
         <tr >
-            <td>72</td>
+            <td>70</td>
             <td ><code>supplier_address</code></td>
             <td >
                 Link</td>
@@ -1083,7 +1059,7 @@
         </tr>
         
         <tr >
-            <td>73</td>
+            <td>71</td>
             <td ><code>cb_contact</code></td>
             <td class="info">
                 Column Break</td>
@@ -1095,7 +1071,7 @@
         </tr>
         
         <tr >
-            <td>74</td>
+            <td>72</td>
             <td ><code>contact_person</code></td>
             <td >
                 Link</td>
@@ -1116,7 +1092,7 @@
         </tr>
         
         <tr class="info">
-            <td>75</td>
+            <td>73</td>
             <td ><code>more_info</code></td>
             <td >
                 Section Break</td>
@@ -1128,7 +1104,7 @@
         </tr>
         
         <tr >
-            <td>76</td>
+            <td>74</td>
             <td class="danger" title="Mandatory"><code>status</code></td>
             <td >
                 Select</td>
@@ -1151,7 +1127,7 @@
         </tr>
         
         <tr >
-            <td>77</td>
+            <td>75</td>
             <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
             <td >
                 Link</td>
@@ -1172,7 +1148,7 @@
         </tr>
         
         <tr >
-            <td>78</td>
+            <td>76</td>
             <td ><code>ref_sq</code></td>
             <td >
                 Data</td>
@@ -1184,7 +1160,7 @@
         </tr>
         
         <tr >
-            <td>79</td>
+            <td>77</td>
             <td ><code>column_break_74</code></td>
             <td class="info">
                 Column Break</td>
@@ -1196,7 +1172,7 @@
         </tr>
         
         <tr >
-            <td>80</td>
+            <td>78</td>
             <td ><code>per_received</code></td>
             <td >
                 Percent</td>
@@ -1208,7 +1184,7 @@
         </tr>
         
         <tr >
-            <td>81</td>
+            <td>79</td>
             <td ><code>per_billed</code></td>
             <td >
                 Percent</td>
@@ -1220,7 +1196,7 @@
         </tr>
         
         <tr class="info">
-            <td>82</td>
+            <td>80</td>
             <td ><code>column_break5</code></td>
             <td >
                 Section Break</td>
@@ -1232,7 +1208,7 @@
         </tr>
         
         <tr >
-            <td>83</td>
+            <td>81</td>
             <td ><code>letter_head</code></td>
             <td >
                 Link</td>
@@ -1253,7 +1229,7 @@
         </tr>
         
         <tr >
-            <td>84</td>
+            <td>82</td>
             <td ><code>select_print_heading</code></td>
             <td >
                 Link</td>
@@ -1274,7 +1250,7 @@
         </tr>
         
         <tr class="info">
-            <td>85</td>
+            <td>83</td>
             <td ><code>raw_material_details</code></td>
             <td >
                 Section Break</td>
@@ -1288,7 +1264,7 @@
         </tr>
         
         <tr >
-            <td>86</td>
+            <td>84</td>
             <td ><code>supplied_items</code></td>
             <td >
                 Table</td>
@@ -1309,7 +1285,7 @@
         </tr>
         
         <tr class="info">
-            <td>87</td>
+            <td>85</td>
             <td ><code>recurring_order</code></td>
             <td >
                 Section Break</td>
@@ -1323,7 +1299,7 @@
         </tr>
         
         <tr >
-            <td>88</td>
+            <td>86</td>
             <td ><code>column_break</code></td>
             <td class="info">
                 Column Break</td>
@@ -1335,7 +1311,7 @@
         </tr>
         
         <tr >
-            <td>89</td>
+            <td>87</td>
             <td ><code>is_recurring</code></td>
             <td >
                 Check</td>
@@ -1347,7 +1323,7 @@
         </tr>
         
         <tr >
-            <td>90</td>
+            <td>88</td>
             <td ><code>recurring_type</code></td>
             <td >
                 Select</td>
@@ -1364,7 +1340,7 @@
         </tr>
         
         <tr >
-            <td>91</td>
+            <td>89</td>
             <td ><code>from_date</code></td>
             <td >
                 Date</td>
@@ -1377,7 +1353,7 @@
         </tr>
         
         <tr >
-            <td>92</td>
+            <td>90</td>
             <td ><code>to_date</code></td>
             <td >
                 Date</td>
@@ -1390,7 +1366,7 @@
         </tr>
         
         <tr >
-            <td>93</td>
+            <td>91</td>
             <td ><code>repeat_on_day_of_month</code></td>
             <td >
                 Int</td>
@@ -1403,7 +1379,7 @@
         </tr>
         
         <tr >
-            <td>94</td>
+            <td>92</td>
             <td ><code>end_date</code></td>
             <td >
                 Date</td>
@@ -1416,7 +1392,7 @@
         </tr>
         
         <tr >
-            <td>95</td>
+            <td>93</td>
             <td ><code>column_break83</code></td>
             <td class="info">
                 Column Break</td>
@@ -1428,7 +1404,7 @@
         </tr>
         
         <tr >
-            <td>96</td>
+            <td>94</td>
             <td ><code>next_date</code></td>
             <td >
                 Date</td>
@@ -1441,7 +1417,7 @@
         </tr>
         
         <tr >
-            <td>97</td>
+            <td>95</td>
             <td ><code>recurring_id</code></td>
             <td >
                 Data</td>
@@ -1453,7 +1429,7 @@
         </tr>
         
         <tr >
-            <td>98</td>
+            <td>96</td>
             <td ><code>notification_email_address</code></td>
             <td >
                 Small Text</td>
@@ -1466,7 +1442,7 @@
         </tr>
         
         <tr >
-            <td>99</td>
+            <td>97</td>
             <td ><code>recurring_print_format</code></td>
             <td >
                 Link</td>
diff --git a/erpnext/docs/current/models/buying/supplier.html b/erpnext/docs/current/models/buying/supplier.html
index 5bf98b3..444623d 100644
--- a/erpnext/docs/current/models/buying/supplier.html
+++ b/erpnext/docs/current/models/buying/supplier.html
@@ -179,39 +179,6 @@
         
         <tr >
             <td>10</td>
-            <td ><code>column_break_10</code></td>
-            <td class="info">
-                Column Break</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>11</td>
-            <td ><code>default_taxes_and_charges</code></td>
-            <td >
-                Link</td>
-            <td >
-                Taxes and Charges
-                
-            </td>
-            <td>
-                
-                
-
-
-<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_taxes_and_charges_template">Purchase Taxes and Charges Template</a>
-
-
-                
-            </td>
-        </tr>
-        
-        <tr >
-            <td>12</td>
             <td ><code>credit_days</code></td>
             <td >
                 Int</td>
@@ -223,7 +190,7 @@
         </tr>
         
         <tr class="info">
-            <td>13</td>
+            <td>11</td>
             <td ><code>address_contacts</code></td>
             <td >
                 Section Break</td>
@@ -237,7 +204,7 @@
         </tr>
         
         <tr >
-            <td>14</td>
+            <td>12</td>
             <td ><code>address_html</code></td>
             <td >
                 HTML</td>
@@ -249,7 +216,7 @@
         </tr>
         
         <tr >
-            <td>15</td>
+            <td>13</td>
             <td ><code>column_break1</code></td>
             <td class="info">
                 Column Break</td>
@@ -261,7 +228,7 @@
         </tr>
         
         <tr >
-            <td>16</td>
+            <td>14</td>
             <td ><code>contact_html</code></td>
             <td >
                 HTML</td>
@@ -273,7 +240,7 @@
         </tr>
         
         <tr class="info">
-            <td>17</td>
+            <td>15</td>
             <td ><code>default_payable_accounts</code></td>
             <td >
                 Section Break</td>
@@ -285,7 +252,7 @@
         </tr>
         
         <tr >
-            <td>18</td>
+            <td>16</td>
             <td ><code>accounts</code></td>
             <td >
                 Table</td>
@@ -307,7 +274,7 @@
         </tr>
         
         <tr class="info">
-            <td>19</td>
+            <td>17</td>
             <td ><code>column_break2</code></td>
             <td >
                 Section Break</td>
@@ -319,7 +286,7 @@
         </tr>
         
         <tr >
-            <td>20</td>
+            <td>18</td>
             <td ><code>website</code></td>
             <td >
                 Data</td>
@@ -331,7 +298,7 @@
         </tr>
         
         <tr >
-            <td>21</td>
+            <td>19</td>
             <td ><code>supplier_details</code></td>
             <td >
                 Text</td>
@@ -344,7 +311,7 @@
         </tr>
         
         <tr >
-            <td>22</td>
+            <td>20</td>
             <td ><code>communications</code></td>
             <td >
                 Table</td>
diff --git a/erpnext/docs/current/models/buying/supplier_quotation.html b/erpnext/docs/current/models/buying/supplier_quotation.html
index 1bb1c2f..8f4e2c7 100644
--- a/erpnext/docs/current/models/buying/supplier_quotation.html
+++ b/erpnext/docs/current/models/buying/supplier_quotation.html
@@ -385,20 +385,8 @@
             </td>
         </tr>
         
-        <tr >
-            <td>24</td>
-            <td ><code>get_items_from_product_bundle</code></td>
-            <td >
-                Button</td>
-            <td >
-                Get Items from Product Bundle
-                
-            </td>
-            <td></td>
-        </tr>
-        
         <tr class="info">
-            <td>25</td>
+            <td>24</td>
             <td ><code>section_break_22</code></td>
             <td >
                 Section Break</td>
@@ -410,7 +398,7 @@
         </tr>
         
         <tr >
-            <td>26</td>
+            <td>25</td>
             <td ><code>base_total</code></td>
             <td >
                 Currency</td>
@@ -424,7 +412,7 @@
         </tr>
         
         <tr >
-            <td>27</td>
+            <td>26</td>
             <td ><code>base_net_total</code></td>
             <td >
                 Currency</td>
@@ -438,7 +426,7 @@
         </tr>
         
         <tr >
-            <td>28</td>
+            <td>27</td>
             <td ><code>column_break_24</code></td>
             <td class="info">
                 Column Break</td>
@@ -450,7 +438,7 @@
         </tr>
         
         <tr >
-            <td>29</td>
+            <td>28</td>
             <td ><code>total</code></td>
             <td >
                 Currency</td>
@@ -464,7 +452,7 @@
         </tr>
         
         <tr >
-            <td>30</td>
+            <td>29</td>
             <td ><code>net_total</code></td>
             <td >
                 Currency</td>
@@ -478,7 +466,7 @@
         </tr>
         
         <tr class="info">
-            <td>31</td>
+            <td>30</td>
             <td ><code>taxes_section</code></td>
             <td >
                 Section Break</td>
@@ -492,7 +480,7 @@
         </tr>
         
         <tr >
-            <td>32</td>
+            <td>31</td>
             <td ><code>taxes_and_charges</code></td>
             <td >
                 Link</td>
@@ -513,7 +501,7 @@
         </tr>
         
         <tr >
-            <td>33</td>
+            <td>32</td>
             <td ><code>taxes</code></td>
             <td >
                 Table</td>
@@ -534,7 +522,7 @@
         </tr>
         
         <tr >
-            <td>34</td>
+            <td>33</td>
             <td ><code>other_charges_calculation</code></td>
             <td >
                 HTML</td>
@@ -546,7 +534,7 @@
         </tr>
         
         <tr class="info">
-            <td>35</td>
+            <td>34</td>
             <td ><code>totals</code></td>
             <td >
                 Section Break</td>
@@ -560,7 +548,7 @@
         </tr>
         
         <tr >
-            <td>36</td>
+            <td>35</td>
             <td ><code>base_taxes_and_charges_added</code></td>
             <td >
                 Currency</td>
@@ -574,7 +562,7 @@
         </tr>
         
         <tr >
-            <td>37</td>
+            <td>36</td>
             <td ><code>base_taxes_and_charges_deducted</code></td>
             <td >
                 Currency</td>
@@ -588,7 +576,7 @@
         </tr>
         
         <tr >
-            <td>38</td>
+            <td>37</td>
             <td ><code>base_total_taxes_and_charges</code></td>
             <td >
                 Currency</td>
@@ -602,7 +590,7 @@
         </tr>
         
         <tr >
-            <td>39</td>
+            <td>38</td>
             <td ><code>column_break_37</code></td>
             <td class="info">
                 Column Break</td>
@@ -614,7 +602,7 @@
         </tr>
         
         <tr >
-            <td>40</td>
+            <td>39</td>
             <td ><code>taxes_and_charges_added</code></td>
             <td >
                 Currency</td>
@@ -628,7 +616,7 @@
         </tr>
         
         <tr >
-            <td>41</td>
+            <td>40</td>
             <td ><code>taxes_and_charges_deducted</code></td>
             <td >
                 Currency</td>
@@ -642,7 +630,7 @@
         </tr>
         
         <tr >
-            <td>42</td>
+            <td>41</td>
             <td ><code>total_taxes_and_charges</code></td>
             <td >
                 Currency</td>
@@ -656,7 +644,7 @@
         </tr>
         
         <tr class="info">
-            <td>43</td>
+            <td>42</td>
             <td ><code>section_break_41</code></td>
             <td >
                 Section Break</td>
@@ -668,7 +656,7 @@
         </tr>
         
         <tr >
-            <td>44</td>
+            <td>43</td>
             <td ><code>apply_discount_on</code></td>
             <td >
                 Select</td>
@@ -684,7 +672,7 @@
         </tr>
         
         <tr >
-            <td>45</td>
+            <td>44</td>
             <td ><code>column_break_43</code></td>
             <td class="info">
                 Column Break</td>
@@ -696,7 +684,7 @@
         </tr>
         
         <tr >
-            <td>46</td>
+            <td>45</td>
             <td ><code>discount_amount</code></td>
             <td >
                 Currency</td>
@@ -710,7 +698,7 @@
         </tr>
         
         <tr >
-            <td>47</td>
+            <td>46</td>
             <td ><code>base_discount_amount</code></td>
             <td >
                 Currency</td>
@@ -724,7 +712,7 @@
         </tr>
         
         <tr class="info">
-            <td>48</td>
+            <td>47</td>
             <td ><code>section_break_46</code></td>
             <td >
                 Section Break</td>
@@ -736,7 +724,7 @@
         </tr>
         
         <tr >
-            <td>49</td>
+            <td>48</td>
             <td ><code>base_grand_total</code></td>
             <td >
                 Currency</td>
@@ -750,7 +738,7 @@
         </tr>
         
         <tr >
-            <td>50</td>
+            <td>49</td>
             <td ><code>base_in_words</code></td>
             <td >
                 Data</td>
@@ -762,7 +750,7 @@
         </tr>
         
         <tr >
-            <td>51</td>
+            <td>50</td>
             <td ><code>base_rounded_total</code></td>
             <td >
                 Currency</td>
@@ -776,7 +764,7 @@
         </tr>
         
         <tr >
-            <td>52</td>
+            <td>51</td>
             <td ><code>column_break4</code></td>
             <td class="info">
                 Column Break</td>
@@ -788,7 +776,7 @@
         </tr>
         
         <tr >
-            <td>53</td>
+            <td>52</td>
             <td ><code>grand_total</code></td>
             <td >
                 Currency</td>
@@ -802,7 +790,7 @@
         </tr>
         
         <tr >
-            <td>54</td>
+            <td>53</td>
             <td ><code>in_words</code></td>
             <td >
                 Data</td>
@@ -814,7 +802,7 @@
         </tr>
         
         <tr class="info">
-            <td>55</td>
+            <td>54</td>
             <td ><code>terms_section_break</code></td>
             <td >
                 Section Break</td>
@@ -828,7 +816,7 @@
         </tr>
         
         <tr >
-            <td>56</td>
+            <td>55</td>
             <td ><code>tc_name</code></td>
             <td >
                 Link</td>
@@ -849,7 +837,7 @@
         </tr>
         
         <tr >
-            <td>57</td>
+            <td>56</td>
             <td ><code>terms</code></td>
             <td >
                 Text Editor</td>
@@ -861,7 +849,7 @@
         </tr>
         
         <tr class="info">
-            <td>58</td>
+            <td>57</td>
             <td ><code>contact_section</code></td>
             <td >
                 Section Break</td>
@@ -875,7 +863,7 @@
         </tr>
         
         <tr >
-            <td>59</td>
+            <td>58</td>
             <td ><code>supplier_address</code></td>
             <td >
                 Link</td>
@@ -896,7 +884,7 @@
         </tr>
         
         <tr >
-            <td>60</td>
+            <td>59</td>
             <td ><code>contact_person</code></td>
             <td >
                 Link</td>
@@ -917,7 +905,7 @@
         </tr>
         
         <tr class="info">
-            <td>61</td>
+            <td>60</td>
             <td ><code>printing_settings</code></td>
             <td >
                 Section Break</td>
@@ -929,7 +917,7 @@
         </tr>
         
         <tr >
-            <td>62</td>
+            <td>61</td>
             <td ><code>select_print_heading</code></td>
             <td >
                 Link</td>
@@ -950,7 +938,7 @@
         </tr>
         
         <tr >
-            <td>63</td>
+            <td>62</td>
             <td ><code>letter_head</code></td>
             <td >
                 Link</td>
@@ -971,7 +959,7 @@
         </tr>
         
         <tr class="info">
-            <td>64</td>
+            <td>63</td>
             <td ><code>more_info</code></td>
             <td >
                 Section Break</td>
@@ -985,7 +973,7 @@
         </tr>
         
         <tr >
-            <td>65</td>
+            <td>64</td>
             <td class="danger" title="Mandatory"><code>status</code></td>
             <td >
                 Select</td>
@@ -1003,7 +991,7 @@
         </tr>
         
         <tr >
-            <td>66</td>
+            <td>65</td>
             <td ><code>is_subcontracted</code></td>
             <td >
                 Select</td>
@@ -1019,7 +1007,7 @@
         </tr>
         
         <tr >
-            <td>67</td>
+            <td>66</td>
             <td ><code>column_break_57</code></td>
             <td class="info">
                 Column Break</td>
@@ -1031,7 +1019,7 @@
         </tr>
         
         <tr >
-            <td>68</td>
+            <td>67</td>
             <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
             <td >
                 Link</td>
diff --git a/erpnext/docs/current/models/selling/customer.html b/erpnext/docs/current/models/selling/customer.html
index 50587a7..5e1326e 100644
--- a/erpnext/docs/current/models/selling/customer.html
+++ b/erpnext/docs/current/models/selling/customer.html
@@ -247,41 +247,8 @@
             </td>
         </tr>
         
-        <tr >
-            <td>14</td>
-            <td ><code>column_break_14</code></td>
-            <td class="info">
-                Column Break</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>15</td>
-            <td ><code>default_taxes_and_charges</code></td>
-            <td >
-                Link</td>
-            <td >
-                Default Taxes and Charges
-                
-            </td>
-            <td>
-                
-                
-
-
-<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_taxes_and_charges_template">Sales Taxes and Charges Template</a>
-
-
-                
-            </td>
-        </tr>
-        
         <tr class="info">
-            <td>16</td>
+            <td>14</td>
             <td ><code>address_contacts</code></td>
             <td >
                 Section Break</td>
@@ -295,7 +262,7 @@
         </tr>
         
         <tr >
-            <td>17</td>
+            <td>15</td>
             <td ><code>address_html</code></td>
             <td >
                 HTML</td>
@@ -307,7 +274,7 @@
         </tr>
         
         <tr >
-            <td>18</td>
+            <td>16</td>
             <td ><code>column_break1</code></td>
             <td class="info">
                 Column Break</td>
@@ -319,7 +286,7 @@
         </tr>
         
         <tr >
-            <td>19</td>
+            <td>17</td>
             <td ><code>contact_html</code></td>
             <td >
                 HTML</td>
@@ -331,7 +298,7 @@
         </tr>
         
         <tr class="info">
-            <td>20</td>
+            <td>18</td>
             <td ><code>default_receivable_accounts</code></td>
             <td >
                 Section Break</td>
@@ -343,7 +310,7 @@
         </tr>
         
         <tr >
-            <td>21</td>
+            <td>19</td>
             <td ><code>accounts</code></td>
             <td >
                 Table</td>
@@ -365,7 +332,7 @@
         </tr>
         
         <tr class="info">
-            <td>22</td>
+            <td>20</td>
             <td ><code>column_break2</code></td>
             <td >
                 Section Break</td>
@@ -377,7 +344,7 @@
         </tr>
         
         <tr >
-            <td>23</td>
+            <td>21</td>
             <td ><code>credit_days_based_on</code></td>
             <td >
                 Select</td>
@@ -393,7 +360,7 @@
         </tr>
         
         <tr >
-            <td>24</td>
+            <td>22</td>
             <td ><code>credit_days</code></td>
             <td >
                 Int</td>
@@ -405,7 +372,7 @@
         </tr>
         
         <tr >
-            <td>25</td>
+            <td>23</td>
             <td ><code>credit_limit</code></td>
             <td >
                 Currency</td>
@@ -417,7 +384,7 @@
         </tr>
         
         <tr class="info">
-            <td>26</td>
+            <td>24</td>
             <td ><code>more_info</code></td>
             <td >
                 Section Break</td>
@@ -431,7 +398,7 @@
         </tr>
         
         <tr >
-            <td>27</td>
+            <td>25</td>
             <td ><code>customer_details</code></td>
             <td >
                 Text</td>
@@ -444,7 +411,7 @@
         </tr>
         
         <tr >
-            <td>28</td>
+            <td>26</td>
             <td ><code>website</code></td>
             <td >
                 Data</td>
@@ -456,7 +423,7 @@
         </tr>
         
         <tr class="info">
-            <td>29</td>
+            <td>27</td>
             <td ><code>sales_team_section_break</code></td>
             <td >
                 Section Break</td>
@@ -470,7 +437,7 @@
         </tr>
         
         <tr >
-            <td>30</td>
+            <td>28</td>
             <td ><code>default_sales_partner</code></td>
             <td >
                 Link</td>
@@ -491,7 +458,7 @@
         </tr>
         
         <tr >
-            <td>31</td>
+            <td>29</td>
             <td ><code>default_commission_rate</code></td>
             <td >
                 Float</td>
@@ -503,7 +470,7 @@
         </tr>
         
         <tr class="info">
-            <td>32</td>
+            <td>30</td>
             <td ><code>sales_team_section</code></td>
             <td >
                 Section Break</td>
@@ -515,7 +482,7 @@
         </tr>
         
         <tr >
-            <td>33</td>
+            <td>31</td>
             <td ><code>sales_team</code></td>
             <td >
                 Table</td>
@@ -536,7 +503,7 @@
         </tr>
         
         <tr >
-            <td>34</td>
+            <td>32</td>
             <td ><code>communications</code></td>
             <td >
                 Table</td>
diff --git a/erpnext/docs/current/models/selling/sales_order.html b/erpnext/docs/current/models/selling/sales_order.html
index 708b37a..2c97687 100644
--- a/erpnext/docs/current/models/selling/sales_order.html
+++ b/erpnext/docs/current/models/selling/sales_order.html
@@ -1837,7 +1837,7 @@
         <a name="update_delivery_status" href="#update_delivery_status" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		<b>update_delivery_status</b>
-        <i class="text-muted">(self, po_name)</i>
+        <i class="text-muted">(self)</i>
     </p>
 	<div class="docs-attr-desc"><p>Update delivery status from Purchase Order for drop shipping</p>
 </div>
diff --git a/erpnext/docs/current/models/stock/material_request.html b/erpnext/docs/current/models/stock/material_request.html
index 2751fe8..c87b5c1 100644
--- a/erpnext/docs/current/models/stock/material_request.html
+++ b/erpnext/docs/current/models/stock/material_request.html
@@ -183,20 +183,8 @@
             </td>
         </tr>
         
-        <tr >
-            <td>10</td>
-            <td ><code>get_items_from_product_bundle</code></td>
-            <td >
-                Button</td>
-            <td >
-                Get Items from Product Bundle
-                
-            </td>
-            <td></td>
-        </tr>
-        
         <tr class="info">
-            <td>11</td>
+            <td>10</td>
             <td ><code>more_info</code></td>
             <td >
                 Section Break</td>
@@ -210,7 +198,7 @@
         </tr>
         
         <tr >
-            <td>12</td>
+            <td>11</td>
             <td ><code>requested_by</code></td>
             <td >
                 Data</td>
@@ -222,7 +210,7 @@
         </tr>
         
         <tr >
-            <td>13</td>
+            <td>12</td>
             <td class="danger" title="Mandatory"><code>transaction_date</code></td>
             <td >
                 Date</td>
@@ -234,7 +222,7 @@
         </tr>
         
         <tr >
-            <td>14</td>
+            <td>13</td>
             <td ><code>column_break2</code></td>
             <td class="info">
                 Column Break</td>
@@ -246,7 +234,7 @@
         </tr>
         
         <tr >
-            <td>15</td>
+            <td>14</td>
             <td ><code>status</code></td>
             <td >
                 Select</td>
@@ -264,7 +252,7 @@
         </tr>
         
         <tr >
-            <td>16</td>
+            <td>15</td>
             <td ><code>per_ordered</code></td>
             <td >
                 Percent</td>
@@ -276,7 +264,7 @@
         </tr>
         
         <tr class="info">
-            <td>17</td>
+            <td>16</td>
             <td ><code>printing_details</code></td>
             <td >
                 Section Break</td>
@@ -288,7 +276,7 @@
         </tr>
         
         <tr >
-            <td>18</td>
+            <td>17</td>
             <td ><code>letter_head</code></td>
             <td >
                 Link</td>
@@ -309,7 +297,7 @@
         </tr>
         
         <tr >
-            <td>19</td>
+            <td>18</td>
             <td ><code>select_print_heading</code></td>
             <td >
                 Link</td>
@@ -330,7 +318,7 @@
         </tr>
         
         <tr class="info">
-            <td>20</td>
+            <td>19</td>
             <td ><code>terms_section_break</code></td>
             <td >
                 Section Break</td>
@@ -344,7 +332,7 @@
         </tr>
         
         <tr >
-            <td>21</td>
+            <td>20</td>
             <td ><code>tc_name</code></td>
             <td >
                 Link</td>
@@ -365,7 +353,7 @@
         </tr>
         
         <tr >
-            <td>22</td>
+            <td>21</td>
             <td ><code>terms</code></td>
             <td >
                 Text Editor</td>
diff --git a/erpnext/docs/current/models/stock/purchase_receipt.html b/erpnext/docs/current/models/stock/purchase_receipt.html
index 4dac156..7481641 100644
--- a/erpnext/docs/current/models/stock/purchase_receipt.html
+++ b/erpnext/docs/current/models/stock/purchase_receipt.html
@@ -417,20 +417,8 @@
             </td>
         </tr>
         
-        <tr >
-            <td>27</td>
-            <td ><code>get_items_from_product_bundle</code></td>
-            <td >
-                Button</td>
-            <td >
-                Get Items from Product Bundle
-                
-            </td>
-            <td></td>
-        </tr>
-        
         <tr class="info">
-            <td>28</td>
+            <td>27</td>
             <td ><code>section_break0</code></td>
             <td >
                 Section Break</td>
@@ -442,7 +430,7 @@
         </tr>
         
         <tr >
-            <td>29</td>
+            <td>28</td>
             <td ><code>base_total</code></td>
             <td >
                 Currency</td>
@@ -456,7 +444,7 @@
         </tr>
         
         <tr >
-            <td>30</td>
+            <td>29</td>
             <td class="danger" title="Mandatory"><code>base_net_total</code></td>
             <td >
                 Currency</td>
@@ -470,7 +458,7 @@
         </tr>
         
         <tr >
-            <td>31</td>
+            <td>30</td>
             <td ><code>column_break_27</code></td>
             <td class="info">
                 Column Break</td>
@@ -482,7 +470,7 @@
         </tr>
         
         <tr >
-            <td>32</td>
+            <td>31</td>
             <td ><code>total</code></td>
             <td >
                 Currency</td>
@@ -496,7 +484,7 @@
         </tr>
         
         <tr >
-            <td>33</td>
+            <td>32</td>
             <td ><code>net_total</code></td>
             <td >
                 Currency</td>
@@ -510,7 +498,7 @@
         </tr>
         
         <tr class="info">
-            <td>34</td>
+            <td>33</td>
             <td ><code>taxes_section</code></td>
             <td >
                 Section Break</td>
@@ -525,7 +513,7 @@
         </tr>
         
         <tr >
-            <td>35</td>
+            <td>34</td>
             <td ><code>taxes_and_charges</code></td>
             <td >
                 Link</td>
@@ -546,7 +534,7 @@
         </tr>
         
         <tr >
-            <td>36</td>
+            <td>35</td>
             <td ><code>taxes</code></td>
             <td >
                 Table</td>
@@ -567,7 +555,7 @@
         </tr>
         
         <tr >
-            <td>37</td>
+            <td>36</td>
             <td ><code>other_charges_calculation</code></td>
             <td >
                 HTML</td>
@@ -579,7 +567,7 @@
         </tr>
         
         <tr class="info">
-            <td>38</td>
+            <td>37</td>
             <td ><code>totals</code></td>
             <td >
                 Section Break</td>
@@ -593,7 +581,7 @@
         </tr>
         
         <tr >
-            <td>39</td>
+            <td>38</td>
             <td ><code>base_taxes_and_charges_added</code></td>
             <td >
                 Currency</td>
@@ -607,7 +595,7 @@
         </tr>
         
         <tr >
-            <td>40</td>
+            <td>39</td>
             <td ><code>base_taxes_and_charges_deducted</code></td>
             <td >
                 Currency</td>
@@ -621,7 +609,7 @@
         </tr>
         
         <tr >
-            <td>41</td>
+            <td>40</td>
             <td ><code>base_total_taxes_and_charges</code></td>
             <td >
                 Currency</td>
@@ -635,7 +623,7 @@
         </tr>
         
         <tr >
-            <td>42</td>
+            <td>41</td>
             <td ><code>column_break3</code></td>
             <td class="info">
                 Column Break</td>
@@ -647,7 +635,7 @@
         </tr>
         
         <tr >
-            <td>43</td>
+            <td>42</td>
             <td ><code>taxes_and_charges_added</code></td>
             <td >
                 Currency</td>
@@ -661,7 +649,7 @@
         </tr>
         
         <tr >
-            <td>44</td>
+            <td>43</td>
             <td ><code>taxes_and_charges_deducted</code></td>
             <td >
                 Currency</td>
@@ -675,7 +663,7 @@
         </tr>
         
         <tr >
-            <td>45</td>
+            <td>44</td>
             <td ><code>total_taxes_and_charges</code></td>
             <td >
                 Currency</td>
@@ -689,7 +677,7 @@
         </tr>
         
         <tr class="info">
-            <td>46</td>
+            <td>45</td>
             <td ><code>section_break_42</code></td>
             <td >
                 Section Break</td>
@@ -701,7 +689,7 @@
         </tr>
         
         <tr >
-            <td>47</td>
+            <td>46</td>
             <td ><code>apply_discount_on</code></td>
             <td >
                 Select</td>
@@ -717,7 +705,7 @@
         </tr>
         
         <tr >
-            <td>48</td>
+            <td>47</td>
             <td ><code>column_break_44</code></td>
             <td class="info">
                 Column Break</td>
@@ -729,7 +717,7 @@
         </tr>
         
         <tr >
-            <td>49</td>
+            <td>48</td>
             <td ><code>discount_amount</code></td>
             <td >
                 Currency</td>
@@ -743,7 +731,7 @@
         </tr>
         
         <tr >
-            <td>50</td>
+            <td>49</td>
             <td ><code>base_discount_amount</code></td>
             <td >
                 Currency</td>
@@ -757,7 +745,7 @@
         </tr>
         
         <tr class="info">
-            <td>51</td>
+            <td>50</td>
             <td ><code>section_break_46</code></td>
             <td >
                 Section Break</td>
@@ -769,7 +757,7 @@
         </tr>
         
         <tr >
-            <td>52</td>
+            <td>51</td>
             <td ><code>base_grand_total</code></td>
             <td >
                 Currency</td>
@@ -783,7 +771,7 @@
         </tr>
         
         <tr >
-            <td>53</td>
+            <td>52</td>
             <td ><code>base_in_words</code></td>
             <td >
                 Data</td>
@@ -795,7 +783,7 @@
         </tr>
         
         <tr >
-            <td>54</td>
+            <td>53</td>
             <td ><code>base_rounded_total</code></td>
             <td >
                 Currency</td>
@@ -809,7 +797,7 @@
         </tr>
         
         <tr >
-            <td>55</td>
+            <td>54</td>
             <td ><code>column_break_50</code></td>
             <td class="info">
                 Column Break</td>
@@ -821,7 +809,7 @@
         </tr>
         
         <tr >
-            <td>56</td>
+            <td>55</td>
             <td ><code>grand_total</code></td>
             <td >
                 Currency</td>
@@ -835,7 +823,7 @@
         </tr>
         
         <tr >
-            <td>57</td>
+            <td>56</td>
             <td ><code>in_words</code></td>
             <td >
                 Data</td>
@@ -847,7 +835,7 @@
         </tr>
         
         <tr class="info">
-            <td>58</td>
+            <td>57</td>
             <td ><code>terms_section_break</code></td>
             <td >
                 Section Break</td>
@@ -861,7 +849,7 @@
         </tr>
         
         <tr >
-            <td>59</td>
+            <td>58</td>
             <td ><code>tc_name</code></td>
             <td >
                 Link</td>
@@ -882,7 +870,7 @@
         </tr>
         
         <tr >
-            <td>60</td>
+            <td>59</td>
             <td ><code>terms</code></td>
             <td >
                 Text Editor</td>
@@ -894,7 +882,7 @@
         </tr>
         
         <tr class="info">
-            <td>61</td>
+            <td>60</td>
             <td ><code>contact_section</code></td>
             <td >
                 Section Break</td>
@@ -908,7 +896,7 @@
         </tr>
         
         <tr >
-            <td>62</td>
+            <td>61</td>
             <td ><code>supplier_address</code></td>
             <td >
                 Link</td>
@@ -929,7 +917,7 @@
         </tr>
         
         <tr >
-            <td>63</td>
+            <td>62</td>
             <td ><code>column_break_57</code></td>
             <td class="info">
                 Column Break</td>
@@ -941,7 +929,7 @@
         </tr>
         
         <tr >
-            <td>64</td>
+            <td>63</td>
             <td ><code>contact_person</code></td>
             <td >
                 Link</td>
@@ -962,7 +950,7 @@
         </tr>
         
         <tr class="info">
-            <td>65</td>
+            <td>64</td>
             <td ><code>raw_material_details</code></td>
             <td >
                 Section Break</td>
@@ -976,7 +964,7 @@
         </tr>
         
         <tr >
-            <td>66</td>
+            <td>65</td>
             <td ><code>is_subcontracted</code></td>
             <td >
                 Select</td>
@@ -991,7 +979,7 @@
         </tr>
         
         <tr >
-            <td>67</td>
+            <td>66</td>
             <td ><code>supplier_warehouse</code></td>
             <td >
                 Link</td>
@@ -1012,7 +1000,7 @@
         </tr>
         
         <tr >
-            <td>68</td>
+            <td>67</td>
             <td ><code>supplied_items</code></td>
             <td >
                 Table</td>
@@ -1033,7 +1021,7 @@
         </tr>
         
         <tr >
-            <td>69</td>
+            <td>68</td>
             <td ><code>bill_no</code></td>
             <td >
                 Data</td>
@@ -1045,7 +1033,7 @@
         </tr>
         
         <tr >
-            <td>70</td>
+            <td>69</td>
             <td ><code>bill_date</code></td>
             <td >
                 Date</td>
@@ -1057,7 +1045,7 @@
         </tr>
         
         <tr class="info">
-            <td>71</td>
+            <td>70</td>
             <td ><code>more_info</code></td>
             <td >
                 Section Break</td>
@@ -1071,7 +1059,7 @@
         </tr>
         
         <tr >
-            <td>72</td>
+            <td>71</td>
             <td class="danger" title="Mandatory"><code>status</code></td>
             <td >
                 Select</td>
@@ -1089,7 +1077,7 @@
         </tr>
         
         <tr >
-            <td>73</td>
+            <td>72</td>
             <td ><code>rejected_warehouse</code></td>
             <td >
                 Link</td>
@@ -1111,7 +1099,7 @@
         </tr>
         
         <tr >
-            <td>74</td>
+            <td>73</td>
             <td ><code>amended_from</code></td>
             <td >
                 Link</td>
@@ -1132,7 +1120,7 @@
         </tr>
         
         <tr >
-            <td>75</td>
+            <td>74</td>
             <td ><code>range</code></td>
             <td >
                 Data</td>
@@ -1144,7 +1132,7 @@
         </tr>
         
         <tr >
-            <td>76</td>
+            <td>75</td>
             <td ><code>column_break4</code></td>
             <td class="info">
                 Column Break</td>
@@ -1156,7 +1144,7 @@
         </tr>
         
         <tr >
-            <td>77</td>
+            <td>76</td>
             <td class="danger" title="Mandatory"><code>company</code></td>
             <td >
                 Link</td>
@@ -1177,7 +1165,7 @@
         </tr>
         
         <tr >
-            <td>78</td>
+            <td>77</td>
             <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
             <td >
                 Link</td>
@@ -1198,7 +1186,7 @@
         </tr>
         
         <tr class="info">
-            <td>79</td>
+            <td>78</td>
             <td ><code>printing_settings</code></td>
             <td >
                 Section Break</td>
@@ -1210,7 +1198,7 @@
         </tr>
         
         <tr >
-            <td>80</td>
+            <td>79</td>
             <td ><code>letter_head</code></td>
             <td >
                 Link</td>
@@ -1231,7 +1219,7 @@
         </tr>
         
         <tr >
-            <td>81</td>
+            <td>80</td>
             <td ><code>select_print_heading</code></td>
             <td >
                 Link</td>
@@ -1252,7 +1240,7 @@
         </tr>
         
         <tr >
-            <td>82</td>
+            <td>81</td>
             <td ><code>other_details</code></td>
             <td >
                 HTML</td>
@@ -1264,7 +1252,7 @@
         </tr>
         
         <tr >
-            <td>83</td>
+            <td>82</td>
             <td ><code>instructions</code></td>
             <td >
                 Small Text</td>
@@ -1276,7 +1264,7 @@
         </tr>
         
         <tr >
-            <td>84</td>
+            <td>83</td>
             <td ><code>remarks</code></td>
             <td >
                 Small Text</td>
@@ -1288,7 +1276,7 @@
         </tr>
         
         <tr class="info">
-            <td>85</td>
+            <td>84</td>
             <td ><code>transporter_info</code></td>
             <td >
                 Section Break</td>
@@ -1302,7 +1290,7 @@
         </tr>
         
         <tr >
-            <td>86</td>
+            <td>85</td>
             <td ><code>transporter_name</code></td>
             <td >
                 Data</td>
@@ -1314,7 +1302,7 @@
         </tr>
         
         <tr >
-            <td>87</td>
+            <td>86</td>
             <td ><code>column_break5</code></td>
             <td class="info">
                 Column Break</td>
@@ -1326,7 +1314,7 @@
         </tr>
         
         <tr >
-            <td>88</td>
+            <td>87</td>
             <td ><code>lr_no</code></td>
             <td >
                 Data</td>
@@ -1338,7 +1326,7 @@
         </tr>
         
         <tr >
-            <td>89</td>
+            <td>88</td>
             <td ><code>lr_date</code></td>
             <td >
                 Date</td>
diff --git a/erpnext/docs/current/models/utilities/address.html b/erpnext/docs/current/models/utilities/address.html
index 22c349e..d02b36a 100644
--- a/erpnext/docs/current/models/utilities/address.html
+++ b/erpnext/docs/current/models/utilities/address.html
@@ -413,6 +413,20 @@
     
     
 	<p class="docs-attr-name">
+        <a name="__setup__" href="#__setup__" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>__setup__</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
         <a name="_unset_other" href="#_unset_other" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		<b>_unset_other</b>
@@ -441,6 +455,20 @@
     
     
 	<p class="docs-attr-name">
+        <a name="check_if_linked" href="#check_if_linked" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_if_linked</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
         <a name="get_display" href="#get_display" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		<b>get_display</b>
diff --git a/erpnext/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js
index c139f8a..ec70bbb 100644
--- a/erpnext/public/js/setup_wizard.js
+++ b/erpnext/public/js/setup_wizard.js
@@ -109,7 +109,7 @@
 				{"fieldname": "password", "label": __("Password"), "fieldtype": "Password",
 					reqd:1},
 				{fieldtype:"Attach Image", fieldname:"attach_user",
-					label: __("Attach Your Picture")},
+					label: __("Attach Your Picture"), is_private: 0},
 			],
 			help: __('The first user will become the System Manager (you can change this later).'),
 			onload: function(slide) {
@@ -254,12 +254,15 @@
 			fields: [
 				{fieldtype:"Attach Image", fieldname:"attach_letterhead",
 					label: __("Attach Letterhead"),
-					description: __("Keep it web friendly 900px (w) by 100px (h)")
+					description: __("Keep it web friendly 900px (w) by 100px (h)"),
+					is_private: 0
 				},
 				{fieldtype: "Column Break"},
 				{fieldtype:"Attach Image", fieldname:"attach_logo",
 					label:__("Attach Logo"),
-					description: __("100px by 100px")},
+					description: __("100px by 100px"),
+					is_private: 0
+				},
 			],
 
 			css_class: "two-column"
@@ -381,7 +384,7 @@
 						{fieldtype: "Check", fieldname: "is_purchase_item_" + i, label:__("We buy this Item")},
 						{fieldtype:"Column Break"},
 						{fieldtype:"Currency", fieldname:"item_price_" + i, label:__("Rate")},
-						{fieldtype:"Attach Image", fieldname:"item_img_" + i, label:__("Attach Image")},
+						{fieldtype:"Attach Image", fieldname:"item_img_" + i, label:__("Attach Image"), is_private: 0},
 					])
 				}
 				slide.fields[1].reqd = 1;