[docs]
diff --git a/erpnext/docs/current/index.html b/erpnext/docs/current/index.html
index 10582be..fd23de4 100644
--- a/erpnext/docs/current/index.html
+++ b/erpnext/docs/current/index.html
@@ -35,7 +35,7 @@
Version
</td>
<td>
- <code>6.15.1</code>
+ <code>6.16.1</code>
</td>
</tr>
</table>
diff --git a/erpnext/docs/current/models/accounts/payment_reconciliation.html b/erpnext/docs/current/models/accounts/payment_reconciliation.html
index 25a1ede..02e9dae 100644
--- a/erpnext/docs/current/models/accounts/payment_reconciliation.html
+++ b/erpnext/docs/current/models/accounts/payment_reconciliation.html
@@ -152,7 +152,7 @@
<td >
Date</td>
<td >
- From Date
+ From Invoice Date
</td>
<td></td>
@@ -164,7 +164,7 @@
<td >
Date</td>
<td >
- To Date
+ To Invoice Date
</td>
<td></td>
@@ -176,7 +176,7 @@
<td >
Currency</td>
<td >
- Minimum Amount
+ Minimum Invoice Amount
</td>
<td></td>
@@ -188,7 +188,7 @@
<td >
Currency</td>
<td >
- Maximum Amount
+ Maximum Invoice Amount
</td>
<td></td>
diff --git a/erpnext/docs/current/models/accounts/shipping_rule.html b/erpnext/docs/current/models/accounts/shipping_rule.html
index 8f859cb..beadc90 100644
--- a/erpnext/docs/current/models/accounts/shipping_rule.html
+++ b/erpnext/docs/current/models/accounts/shipping_rule.html
@@ -413,15 +413,6 @@
</li>
-
- <li>
-
-
-<a href="https://frappe.github.io/erpnext/current/models/shopping_cart/shopping_cart_shipping_rule">Shopping Cart Shipping Rule</a>
-
-</li>
-
-
</ul>
diff --git a/erpnext/docs/current/models/hr/employee.html b/erpnext/docs/current/models/hr/employee.html
index 75d2d3d..5b76c2b 100644
--- a/erpnext/docs/current/models/hr/employee.html
+++ b/erpnext/docs/current/models/hr/employee.html
@@ -679,18 +679,6 @@
<tr >
<td>45</td>
- <td ><code>emergency_contact_details</code></td>
- <td >
- HTML</td>
- <td >
- Emergency Contact Details
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>46</td>
<td ><code>person_to_be_contacted</code></td>
<td >
Data</td>
@@ -702,7 +690,7 @@
</tr>
<tr >
- <td>47</td>
+ <td>46</td>
<td ><code>relation</code></td>
<td >
Data</td>
@@ -714,7 +702,7 @@
</tr>
<tr >
- <td>48</td>
+ <td>47</td>
<td ><code>emergency_phone_number</code></td>
<td >
Data</td>
@@ -726,7 +714,7 @@
</tr>
<tr >
- <td>49</td>
+ <td>48</td>
<td ><code>column_break4</code></td>
<td class="info">
Column Break</td>
@@ -738,7 +726,7 @@
</tr>
<tr >
- <td>50</td>
+ <td>49</td>
<td ><code>permanent_accommodation_type</code></td>
<td >
Select</td>
@@ -754,7 +742,7 @@
</tr>
<tr >
- <td>51</td>
+ <td>50</td>
<td ><code>permanent_address</code></td>
<td >
Small Text</td>
@@ -766,7 +754,7 @@
</tr>
<tr >
- <td>52</td>
+ <td>51</td>
<td ><code>current_accommodation_type</code></td>
<td >
Select</td>
@@ -782,7 +770,7 @@
</tr>
<tr >
- <td>53</td>
+ <td>52</td>
<td ><code>current_address</code></td>
<td >
Small Text</td>
@@ -794,7 +782,7 @@
</tr>
<tr class="info">
- <td>54</td>
+ <td>53</td>
<td ><code>sb53</code></td>
<td >
Section Break</td>
@@ -806,7 +794,7 @@
</tr>
<tr >
- <td>55</td>
+ <td>54</td>
<td ><code>bio</code></td>
<td >
Text Editor</td>
@@ -819,7 +807,7 @@
</tr>
<tr class="info">
- <td>56</td>
+ <td>55</td>
<td ><code>personal_details</code></td>
<td >
Section Break</td>
@@ -831,7 +819,7 @@
</tr>
<tr >
- <td>57</td>
+ <td>56</td>
<td ><code>column_break5</code></td>
<td class="info">
Column Break</td>
@@ -843,7 +831,7 @@
</tr>
<tr >
- <td>58</td>
+ <td>57</td>
<td ><code>passport_number</code></td>
<td >
Data</td>
@@ -855,7 +843,7 @@
</tr>
<tr >
- <td>59</td>
+ <td>58</td>
<td ><code>date_of_issue</code></td>
<td >
Date</td>
@@ -867,7 +855,7 @@
</tr>
<tr >
- <td>60</td>
+ <td>59</td>
<td ><code>valid_upto</code></td>
<td >
Date</td>
@@ -879,7 +867,7 @@
</tr>
<tr >
- <td>61</td>
+ <td>60</td>
<td ><code>place_of_issue</code></td>
<td >
Data</td>
@@ -891,7 +879,7 @@
</tr>
<tr >
- <td>62</td>
+ <td>61</td>
<td ><code>column_break6</code></td>
<td class="info">
Column Break</td>
@@ -903,7 +891,7 @@
</tr>
<tr >
- <td>63</td>
+ <td>62</td>
<td ><code>marital_status</code></td>
<td >
Select</td>
@@ -921,7 +909,7 @@
</tr>
<tr >
- <td>64</td>
+ <td>63</td>
<td ><code>blood_group</code></td>
<td >
Select</td>
@@ -943,7 +931,7 @@
</tr>
<tr >
- <td>65</td>
+ <td>64</td>
<td ><code>family_background</code></td>
<td >
Small Text</td>
@@ -956,7 +944,7 @@
</tr>
<tr >
- <td>66</td>
+ <td>65</td>
<td ><code>health_details</code></td>
<td >
Small Text</td>
@@ -969,7 +957,7 @@
</tr>
<tr class="info">
- <td>67</td>
+ <td>66</td>
<td ><code>educational_qualification</code></td>
<td >
Section Break</td>
@@ -981,7 +969,7 @@
</tr>
<tr >
- <td>68</td>
+ <td>67</td>
<td ><code>education</code></td>
<td >
Table</td>
@@ -1002,7 +990,7 @@
</tr>
<tr class="info">
- <td>69</td>
+ <td>68</td>
<td ><code>previous_work_experience</code></td>
<td >
Section Break</td>
@@ -1016,7 +1004,7 @@
</tr>
<tr >
- <td>70</td>
+ <td>69</td>
<td ><code>external_work_history</code></td>
<td >
Table</td>
@@ -1037,7 +1025,7 @@
</tr>
<tr class="info">
- <td>71</td>
+ <td>70</td>
<td ><code>history_in_company</code></td>
<td >
Section Break</td>
@@ -1051,7 +1039,7 @@
</tr>
<tr >
- <td>72</td>
+ <td>71</td>
<td ><code>internal_work_history</code></td>
<td >
Table</td>
@@ -1072,7 +1060,7 @@
</tr>
<tr class="info">
- <td>73</td>
+ <td>72</td>
<td ><code>exit</code></td>
<td >
Section Break</td>
@@ -1084,7 +1072,7 @@
</tr>
<tr >
- <td>74</td>
+ <td>73</td>
<td ><code>column_break7</code></td>
<td class="info">
Column Break</td>
@@ -1096,7 +1084,7 @@
</tr>
<tr >
- <td>75</td>
+ <td>74</td>
<td ><code>resignation_letter_date</code></td>
<td >
Date</td>
@@ -1108,7 +1096,7 @@
</tr>
<tr >
- <td>76</td>
+ <td>75</td>
<td ><code>relieving_date</code></td>
<td >
Date</td>
@@ -1120,7 +1108,7 @@
</tr>
<tr >
- <td>77</td>
+ <td>76</td>
<td ><code>reason_for_leaving</code></td>
<td >
Data</td>
@@ -1132,7 +1120,7 @@
</tr>
<tr >
- <td>78</td>
+ <td>77</td>
<td ><code>leave_encashed</code></td>
<td >
Select</td>
@@ -1148,7 +1136,7 @@
</tr>
<tr >
- <td>79</td>
+ <td>78</td>
<td ><code>encashment_date</code></td>
<td >
Date</td>
@@ -1160,7 +1148,7 @@
</tr>
<tr >
- <td>80</td>
+ <td>79</td>
<td ><code>exit_interview_details</code></td>
<td class="info">
Column Break</td>
@@ -1172,7 +1160,7 @@
</tr>
<tr >
- <td>81</td>
+ <td>80</td>
<td ><code>held_on</code></td>
<td >
Date</td>
@@ -1184,7 +1172,7 @@
</tr>
<tr >
- <td>82</td>
+ <td>81</td>
<td ><code>reason_for_resignation</code></td>
<td >
Select</td>
@@ -1200,7 +1188,7 @@
</tr>
<tr >
- <td>83</td>
+ <td>82</td>
<td ><code>new_workplace</code></td>
<td >
Data</td>
@@ -1212,7 +1200,7 @@
</tr>
<tr >
- <td>84</td>
+ <td>83</td>
<td ><code>feedback</code></td>
<td >
Small Text</td>
diff --git a/erpnext/docs/current/models/hr/salary_slip.html b/erpnext/docs/current/models/hr/salary_slip.html
index 742ee94..07b1f83 100644
--- a/erpnext/docs/current/models/hr/salary_slip.html
+++ b/erpnext/docs/current/models/hr/salary_slip.html
@@ -366,18 +366,6 @@
<tr >
<td>21</td>
- <td ><code>html_21</code></td>
- <td >
- HTML</td>
- <td >
-
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>22</td>
<td ><code>earnings</code></td>
<td >
Table</td>
@@ -398,7 +386,7 @@
</tr>
<tr >
- <td>23</td>
+ <td>22</td>
<td ><code>deduction</code></td>
<td class="info">
Column Break</td>
@@ -410,19 +398,7 @@
</tr>
<tr >
- <td>24</td>
- <td ><code>html_24</code></td>
- <td >
- HTML</td>
- <td >
-
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>25</td>
+ <td>23</td>
<td ><code>deductions</code></td>
<td >
Table</td>
@@ -443,7 +419,7 @@
</tr>
<tr class="info">
- <td>26</td>
+ <td>24</td>
<td ><code>totals</code></td>
<td >
Section Break</td>
@@ -455,7 +431,7 @@
</tr>
<tr >
- <td>27</td>
+ <td>25</td>
<td ><code>column_break_25</code></td>
<td class="info">
Column Break</td>
@@ -467,7 +443,7 @@
</tr>
<tr >
- <td>28</td>
+ <td>26</td>
<td ><code>column_break_26</code></td>
<td class="info">
Column Break</td>
@@ -479,7 +455,7 @@
</tr>
<tr >
- <td>29</td>
+ <td>27</td>
<td ><code>arrear_amount</code></td>
<td >
Currency</td>
@@ -493,7 +469,7 @@
</tr>
<tr >
- <td>30</td>
+ <td>28</td>
<td ><code>leave_encashment_amount</code></td>
<td >
Currency</td>
@@ -507,7 +483,7 @@
</tr>
<tr >
- <td>31</td>
+ <td>29</td>
<td ><code>gross_pay</code></td>
<td >
Currency</td>
@@ -521,7 +497,7 @@
</tr>
<tr >
- <td>32</td>
+ <td>30</td>
<td ><code>total_deduction</code></td>
<td >
Currency</td>
@@ -535,7 +511,7 @@
</tr>
<tr >
- <td>33</td>
+ <td>31</td>
<td ><code>net_pay</code></td>
<td >
Currency</td>
@@ -550,7 +526,7 @@
</tr>
<tr >
- <td>34</td>
+ <td>32</td>
<td ><code>rounded_total</code></td>
<td >
Currency</td>
@@ -564,7 +540,7 @@
</tr>
<tr >
- <td>35</td>
+ <td>33</td>
<td ><code>total_in_words</code></td>
<td >
Data</td>
diff --git a/erpnext/docs/current/models/stock/delivery_note.html b/erpnext/docs/current/models/stock/delivery_note.html
index 2213e24..64a872b 100644
--- a/erpnext/docs/current/models/stock/delivery_note.html
+++ b/erpnext/docs/current/models/stock/delivery_note.html
@@ -1316,20 +1316,8 @@
</td>
</tr>
- <tr >
- <td>86</td>
- <td ><code>per_billed</code></td>
- <td >
- Currency</td>
- <td >
- % Amount Billed
-
- </td>
- <td></td>
- </tr>
-
<tr class="info">
- <td>87</td>
+ <td>86</td>
<td ><code>printing_details</code></td>
<td >
Section Break</td>
@@ -1341,7 +1329,7 @@
</tr>
<tr >
- <td>88</td>
+ <td>87</td>
<td ><code>letter_head</code></td>
<td >
Link</td>
@@ -1362,7 +1350,7 @@
</tr>
<tr >
- <td>89</td>
+ <td>88</td>
<td ><code>select_print_heading</code></td>
<td >
Link</td>
@@ -1383,7 +1371,7 @@
</tr>
<tr >
- <td>90</td>
+ <td>89</td>
<td ><code>column_break_88</code></td>
<td class="info">
Column Break</td>
@@ -1395,7 +1383,7 @@
</tr>
<tr >
- <td>91</td>
+ <td>90</td>
<td ><code>print_without_amount</code></td>
<td >
Check</td>
@@ -1407,7 +1395,7 @@
</tr>
<tr class="info">
- <td>92</td>
+ <td>91</td>
<td ><code>section_break_83</code></td>
<td >
Section Break</td>
@@ -1419,7 +1407,7 @@
</tr>
<tr >
- <td>93</td>
+ <td>92</td>
<td class="danger" title="Mandatory"><code>status</code></td>
<td >
Select</td>
@@ -1430,15 +1418,14 @@
<td>
<pre>
Draft
-To Bill
-Completed
+Submitted
Cancelled
Closed</pre>
</td>
</tr>
<tr >
- <td>94</td>
+ <td>93</td>
<td ><code>per_installed</code></td>
<td >
Percent</td>
@@ -1451,7 +1438,7 @@
</tr>
<tr >
- <td>95</td>
+ <td>94</td>
<td ><code>installation_status</code></td>
<td >
Select</td>
@@ -1463,7 +1450,7 @@
</tr>
<tr >
- <td>96</td>
+ <td>95</td>
<td ><code>column_break_89</code></td>
<td class="info">
Column Break</td>
@@ -1475,7 +1462,7 @@
</tr>
<tr >
- <td>97</td>
+ <td>96</td>
<td ><code>to_warehouse</code></td>
<td >
Link</td>
@@ -1497,7 +1484,7 @@
</tr>
<tr >
- <td>98</td>
+ <td>97</td>
<td ><code>excise_page</code></td>
<td >
Data</td>
@@ -1509,7 +1496,7 @@
</tr>
<tr >
- <td>99</td>
+ <td>98</td>
<td ><code>instructions</code></td>
<td >
Text</td>
@@ -1521,7 +1508,7 @@
</tr>
<tr class="info">
- <td>100</td>
+ <td>99</td>
<td ><code>sales_team_section_break</code></td>
<td >
Section Break</td>
@@ -1535,7 +1522,7 @@
</tr>
<tr >
- <td>101</td>
+ <td>100</td>
<td ><code>sales_partner</code></td>
<td >
Link</td>
@@ -1556,7 +1543,7 @@
</tr>
<tr >
- <td>102</td>
+ <td>101</td>
<td ><code>column_break7</code></td>
<td class="info">
Column Break</td>
@@ -1568,7 +1555,7 @@
</tr>
<tr >
- <td>103</td>
+ <td>102</td>
<td ><code>commission_rate</code></td>
<td >
Float</td>
@@ -1580,7 +1567,7 @@
</tr>
<tr >
- <td>104</td>
+ <td>103</td>
<td ><code>total_commission</code></td>
<td >
Currency</td>
@@ -1594,7 +1581,7 @@
</tr>
<tr class="info">
- <td>105</td>
+ <td>104</td>
<td ><code>section_break1</code></td>
<td >
Section Break</td>
@@ -1606,7 +1593,7 @@
</tr>
<tr >
- <td>106</td>
+ <td>105</td>
<td ><code>sales_team</code></td>
<td >
Table</td>
diff --git a/erpnext/docs/current/models/stock/delivery_note_item.html b/erpnext/docs/current/models/stock/delivery_note_item.html
index 1c48c11..c7abefe 100644
--- a/erpnext/docs/current/models/stock/delivery_note_item.html
+++ b/erpnext/docs/current/models/stock/delivery_note_item.html
@@ -746,20 +746,6 @@
<tr >
<td>49</td>
- <td ><code>billed_amt</code></td>
- <td >
- Currency</td>
- <td >
- Billed Amt
-
- </td>
- <td>
- <pre>currency</pre>
- </td>
- </tr>
-
- <tr >
- <td>50</td>
<td ><code>page_break</code></td>
<td >
Check</td>
diff --git a/erpnext/docs/current/models/stock/purchase_receipt.html b/erpnext/docs/current/models/stock/purchase_receipt.html
index 0a3cc11..ee9ed27 100644
--- a/erpnext/docs/current/models/stock/purchase_receipt.html
+++ b/erpnext/docs/current/models/stock/purchase_receipt.html
@@ -1082,8 +1082,7 @@
<td>
<pre>
Draft
-To Bill
-Completed
+Submitted
Cancelled
Closed</pre>
</td>
@@ -1158,18 +1157,6 @@
<tr >
<td>77</td>
- <td ><code>per_billed</code></td>
- <td >
- Percent</td>
- <td >
- % Amount Billed
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>78</td>
<td class="danger" title="Mandatory"><code>company</code></td>
<td >
Link</td>
@@ -1190,7 +1177,7 @@
</tr>
<tr >
- <td>79</td>
+ <td>78</td>
<td class="danger" title="Mandatory"><code>fiscal_year</code></td>
<td >
Link</td>
@@ -1211,7 +1198,7 @@
</tr>
<tr class="info">
- <td>80</td>
+ <td>79</td>
<td ><code>printing_settings</code></td>
<td >
Section Break</td>
@@ -1223,7 +1210,7 @@
</tr>
<tr >
- <td>81</td>
+ <td>80</td>
<td ><code>letter_head</code></td>
<td >
Link</td>
@@ -1244,7 +1231,7 @@
</tr>
<tr >
- <td>82</td>
+ <td>81</td>
<td ><code>select_print_heading</code></td>
<td >
Link</td>
@@ -1265,7 +1252,7 @@
</tr>
<tr >
- <td>83</td>
+ <td>82</td>
<td ><code>other_details</code></td>
<td >
HTML</td>
@@ -1277,7 +1264,7 @@
</tr>
<tr >
- <td>84</td>
+ <td>83</td>
<td ><code>instructions</code></td>
<td >
Small Text</td>
@@ -1289,7 +1276,7 @@
</tr>
<tr >
- <td>85</td>
+ <td>84</td>
<td ><code>remarks</code></td>
<td >
Small Text</td>
@@ -1301,7 +1288,7 @@
</tr>
<tr class="info">
- <td>86</td>
+ <td>85</td>
<td ><code>transporter_info</code></td>
<td >
Section Break</td>
@@ -1315,7 +1302,7 @@
</tr>
<tr >
- <td>87</td>
+ <td>86</td>
<td ><code>transporter_name</code></td>
<td >
Data</td>
@@ -1327,7 +1314,7 @@
</tr>
<tr >
- <td>88</td>
+ <td>87</td>
<td ><code>column_break5</code></td>
<td class="info">
Column Break</td>
@@ -1339,7 +1326,7 @@
</tr>
<tr >
- <td>89</td>
+ <td>88</td>
<td ><code>lr_no</code></td>
<td >
Data</td>
@@ -1351,7 +1338,7 @@
</tr>
<tr >
- <td>90</td>
+ <td>89</td>
<td ><code>lr_date</code></td>
<td >
Date</td>
diff --git a/erpnext/docs/current/models/stock/purchase_receipt_item.html b/erpnext/docs/current/models/stock/purchase_receipt_item.html
index 1ee6b14..025f291 100644
--- a/erpnext/docs/current/models/stock/purchase_receipt_item.html
+++ b/erpnext/docs/current/models/stock/purchase_receipt_item.html
@@ -794,18 +794,6 @@
<tr >
<td>53</td>
- <td ><code>billed_amt</code></td>
- <td >
- Currency</td>
- <td >
- Billed Amt
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>54</td>
<td ><code>brand</code></td>
<td >
Link</td>
@@ -826,7 +814,7 @@
</tr>
<tr >
- <td>55</td>
+ <td>54</td>
<td ><code>item_group</code></td>
<td >
Link</td>
@@ -847,7 +835,7 @@
</tr>
<tr >
- <td>56</td>
+ <td>55</td>
<td ><code>rm_supp_cost</code></td>
<td >
Currency</td>
@@ -861,7 +849,7 @@
</tr>
<tr >
- <td>57</td>
+ <td>56</td>
<td ><code>item_tax_amount</code></td>
<td >
Currency</td>
@@ -875,7 +863,7 @@
</tr>
<tr >
- <td>58</td>
+ <td>57</td>
<td ><code>landed_cost_voucher_amount</code></td>
<td >
Currency</td>
@@ -887,7 +875,7 @@
</tr>
<tr >
- <td>59</td>
+ <td>58</td>
<td ><code>valuation_rate</code></td>
<td >
Currency</td>
@@ -901,7 +889,7 @@
</tr>
<tr >
- <td>60</td>
+ <td>59</td>
<td ><code>item_tax_rate</code></td>
<td >
Small Text</td>
@@ -915,7 +903,7 @@
</tr>
<tr >
- <td>61</td>
+ <td>60</td>
<td ><code>page_break</code></td>
<td >
Check</td>