schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

video help page on report builder and shopping cart

Browse Source
This commit is contained in:
Umair Sayyed
2015-12-21 18:05:23 +05:30
parent c98d244af0
commit e1482f1acc
22 changed files with 728 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/docs/current/api/controllers/erpnext.controllers.taxes_and_totals.html
View File

@@ -335,6 +335,20 @@ from tax inclusive amount</p>
<p class="docs-attr-name">
<a name="set_discount_amount" href="#set_discount_amount" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
<b>set_discount_amount</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"> <p class="docs-attr-name">
<a name="set_item_wise_tax" href="#set_item_wise_tax" class="text-muted small"> <a name="set_item_wise_tax" href="#set_item_wise_tax" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a> <i class="icon-link small" style="color: #ccc;"></i></a>

2
erpnext/docs/current/index.html
View File

@@ -35,7 +35,7 @@
Version Version
</td> </td>
<td> <td>
<code>6.12.11</code> <code>6.13.1</code>
</td> </td>
</tr> </tr>
</table> </table>

5
erpnext/docs/current/models/accounts/account.html
View File

@@ -210,6 +210,7 @@ Profit and Loss</pre>
<pre> <pre>
Bank Bank
Cash Cash
Depreciation
Tax Tax
Chargeable Chargeable
Warehouse Warehouse
@@ -945,10 +946,6 @@ Credit</pre>
<li> <li>

162
erpnext/docs/current/models/accounts/purchase_invoice.html
View File

@@ -717,32 +717,6 @@ Net Total</pre>
<tr > <tr >
<td>47</td> <td>47</td>
<td ><code>column_break_46</code></td>
<td class="info">
Column Break</td>
<td >
</td>
<td></td>
</tr>
<tr >
<td>48</td>
<td ><code>discount_amount</code></td>
<td >
Currency</td>
<td >
Additional Discount Amount
</td>
<td>
<pre>currency</pre>
</td>
</tr>
<tr >
<td>49</td>
<td ><code>base_discount_amount</code></td> <td ><code>base_discount_amount</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -755,8 +729,46 @@ Net Total</pre>
</td> </td>
</tr> </tr>
<tr class="info"> <tr >
<td>48</td>
<td ><code>column_break_46</code></td>
<td class="info">
Column Break</td>
<td >
</td>
<td></td>
</tr>
<tr >
<td>49</td>
<td ><code>additional_discount_percentage</code></td>
<td >
Float</td>
<td >
Additional Discount Percentage
</td>
<td></td>
</tr>
<tr >
<td>50</td> <td>50</td>
<td ><code>discount_amount</code></td>
<td >
Currency</td>
<td >
Additional Discount Amount
</td>
<td>
<pre>currency</pre>
</td>
</tr>
<tr class="info">
<td>51</td>
<td ><code>section_break_49</code></td> <td ><code>section_break_49</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -768,7 +780,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>51</td> <td>52</td>
<td ><code>base_grand_total</code></td> <td ><code>base_grand_total</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -782,7 +794,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>52</td> <td>53</td>
<td ><code>base_in_words</code></td> <td ><code>base_in_words</code></td>
<td > <td >
Data</td> Data</td>
@@ -794,7 +806,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>53</td> <td>54</td>
<td ><code>column_break8</code></td> <td ><code>column_break8</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -806,7 +818,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>54</td> <td>55</td>
<td ><code>grand_total</code></td> <td ><code>grand_total</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -820,7 +832,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>55</td> <td>56</td>
<td ><code>in_words</code></td> <td ><code>in_words</code></td>
<td > <td >
Data</td> Data</td>
@@ -832,7 +844,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>56</td> <td>57</td>
<td ><code>total_advance</code></td> <td ><code>total_advance</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -846,7 +858,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>57</td> <td>58</td>
<td ><code>outstanding_amount</code></td> <td ><code>outstanding_amount</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -860,7 +872,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>58</td> <td>59</td>
<td ><code>write_off</code></td> <td ><code>write_off</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -872,7 +884,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>59</td> <td>60</td>
<td ><code>write_off_amount</code></td> <td ><code>write_off_amount</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -886,7 +898,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>60</td> <td>61</td>
<td ><code>base_write_off_amount</code></td> <td ><code>base_write_off_amount</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -900,7 +912,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>61</td> <td>62</td>
<td ><code>column_break_61</code></td> <td ><code>column_break_61</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -912,7 +924,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>62</td> <td>63</td>
<td ><code>write_off_account</code></td> <td ><code>write_off_account</code></td>
<td > <td >
Link</td> Link</td>
@@ -933,7 +945,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>63</td> <td>64</td>
<td ><code>write_off_cost_center</code></td> <td ><code>write_off_cost_center</code></td>
<td > <td >
Link</td> Link</td>
@@ -954,7 +966,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>64</td> <td>65</td>
<td ><code>advances_section</code></td> <td ><code>advances_section</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -968,7 +980,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>65</td> <td>66</td>
<td ><code>get_advances_paid</code></td> <td ><code>get_advances_paid</code></td>
<td > <td >
Button</td> Button</td>
@@ -982,7 +994,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>66</td> <td>67</td>
<td ><code>advances</code></td> <td ><code>advances</code></td>
<td > <td >
Table</td> Table</td>
@@ -1003,7 +1015,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>67</td> <td>68</td>
<td ><code>terms_section_break</code></td> <td ><code>terms_section_break</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1017,7 +1029,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>68</td> <td>69</td>
<td ><code>tc_name</code></td> <td ><code>tc_name</code></td>
<td > <td >
Link</td> Link</td>
@@ -1038,7 +1050,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>69</td> <td>70</td>
<td ><code>terms</code></td> <td ><code>terms</code></td>
<td > <td >
Text Editor</td> Text Editor</td>
@@ -1050,7 +1062,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>70</td> <td>71</td>
<td ><code>contact_section</code></td> <td ><code>contact_section</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1064,7 +1076,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>71</td> <td>72</td>
<td ><code>supplier_address</code></td> <td ><code>supplier_address</code></td>
<td > <td >
Link</td> Link</td>
@@ -1085,7 +1097,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>72</td> <td>73</td>
<td ><code>col_break23</code></td> <td ><code>col_break23</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1097,7 +1109,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>73</td> <td>74</td>
<td ><code>contact_person</code></td> <td ><code>contact_person</code></td>
<td > <td >
Link</td> Link</td>
@@ -1118,7 +1130,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>74</td> <td>75</td>
<td ><code>printing_settings</code></td> <td ><code>printing_settings</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1130,7 +1142,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>75</td> <td>76</td>
<td ><code>letter_head</code></td> <td ><code>letter_head</code></td>
<td > <td >
Link</td> Link</td>
@@ -1151,7 +1163,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>76</td> <td>77</td>
<td ><code>select_print_heading</code></td> <td ><code>select_print_heading</code></td>
<td > <td >
Link</td> Link</td>
@@ -1172,7 +1184,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>77</td> <td>78</td>
<td ><code>more_info</code></td> <td ><code>more_info</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1186,7 +1198,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>78</td> <td>79</td>
<td class="danger" title="Mandatory"><code>credit_to</code></td> <td class="danger" title="Mandatory"><code>credit_to</code></td>
<td > <td >
Link</td> Link</td>
@@ -1207,7 +1219,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>79</td> <td>80</td>
<td ><code>party_account_currency</code></td> <td ><code>party_account_currency</code></td>
<td > <td >
Link</td> Link</td>
@@ -1228,7 +1240,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>80</td> <td>81</td>
<td ><code>is_opening</code></td> <td ><code>is_opening</code></td>
<td > <td >
Select</td> Select</td>
@@ -1243,7 +1255,7 @@ Yes</pre>
</tr> </tr>
<tr > <tr >
<td>81</td> <td>82</td>
<td ><code>due_date</code></td> <td ><code>due_date</code></td>
<td > <td >
Date</td> Date</td>
@@ -1255,7 +1267,7 @@ Yes</pre>
</tr> </tr>
<tr > <tr >
<td>82</td> <td>83</td>
<td ><code>against_expense_account</code></td> <td ><code>against_expense_account</code></td>
<td > <td >
Small Text</td> Small Text</td>
@@ -1267,7 +1279,7 @@ Yes</pre>
</tr> </tr>
<tr > <tr >
<td>83</td> <td>84</td>
<td ><code>column_break_63</code></td> <td ><code>column_break_63</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1279,7 +1291,7 @@ Yes</pre>
</tr> </tr>
<tr > <tr >
<td>84</td> <td>85</td>
<td ><code>mode_of_payment</code></td> <td ><code>mode_of_payment</code></td>
<td > <td >
Link</td> Link</td>
@@ -1300,7 +1312,7 @@ Yes</pre>
</tr> </tr>
<tr > <tr >
<td>85</td> <td>86</td>
<td ><code>fiscal_year</code></td> <td ><code>fiscal_year</code></td>
<td > <td >
Link</td> Link</td>
@@ -1321,7 +1333,7 @@ Yes</pre>
</tr> </tr>
<tr > <tr >
<td>86</td> <td>87</td>
<td ><code>remarks</code></td> <td ><code>remarks</code></td>
<td > <td >
Small Text</td> Small Text</td>
@@ -1333,7 +1345,7 @@ Yes</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>87</td> <td>88</td>
<td ><code>recurring_invoice</code></td> <td ><code>recurring_invoice</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1347,7 +1359,7 @@ Yes</pre>
</tr> </tr>
<tr > <tr >
<td>88</td> <td>89</td>
<td ><code>is_recurring</code></td> <td ><code>is_recurring</code></td>
<td > <td >
Check</td> Check</td>
@@ -1359,7 +1371,7 @@ Yes</pre>
</tr> </tr>
<tr > <tr >
<td>89</td> <td>90</td>
<td ><code>recurring_type</code></td> <td ><code>recurring_type</code></td>
<td > <td >
Select</td> Select</td>
@@ -1377,7 +1389,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>90</td> <td>91</td>
<td ><code>from_date</code></td> <td ><code>from_date</code></td>
<td > <td >
Date</td> Date</td>
@@ -1390,7 +1402,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>91</td> <td>92</td>
<td ><code>to_date</code></td> <td ><code>to_date</code></td>
<td > <td >
Date</td> Date</td>
@@ -1403,7 +1415,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>92</td> <td>93</td>
<td ><code>repeat_on_day_of_month</code></td> <td ><code>repeat_on_day_of_month</code></td>
<td > <td >
Int</td> Int</td>
@@ -1416,7 +1428,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>93</td> <td>94</td>
<td ><code>end_date</code></td> <td ><code>end_date</code></td>
<td > <td >
Date</td> Date</td>
@@ -1429,7 +1441,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>94</td> <td>95</td>
<td ><code>column_break_82</code></td> <td ><code>column_break_82</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1441,7 +1453,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>95</td> <td>96</td>
<td ><code>next_date</code></td> <td ><code>next_date</code></td>
<td > <td >
Date</td> Date</td>
@@ -1454,7 +1466,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>96</td> <td>97</td>
<td ><code>recurring_id</code></td> <td ><code>recurring_id</code></td>
<td > <td >
Data</td> Data</td>
@@ -1467,7 +1479,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>97</td> <td>98</td>
<td ><code>notification_email_address</code></td> <td ><code>notification_email_address</code></td>
<td > <td >
Small Text</td> Small Text</td>
@@ -1480,7 +1492,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>98</td> <td>99</td>
<td ><code>recurring_print_format</code></td> <td ><code>recurring_print_format</code></td>
<td > <td >
Link</td> Link</td>

210
erpnext/docs/current/models/accounts/sales_invoice.html
View File

@@ -810,32 +810,6 @@ Net Total</pre>
<tr > <tr >
<td>53</td> <td>53</td>
<td ><code>column_break_51</code></td>
<td class="info">
Column Break</td>
<td >
</td>
<td></td>
</tr>
<tr >
<td>54</td>
<td ><code>discount_amount</code></td>
<td >
Currency</td>
<td >
Additional Discount Amount
</td>
<td>
<pre>currency</pre>
</td>
</tr>
<tr >
<td>55</td>
<td ><code>base_discount_amount</code></td> <td ><code>base_discount_amount</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -848,8 +822,46 @@ Net Total</pre>
</td> </td>
</tr> </tr>
<tr class="info"> <tr >
<td>54</td>
<td ><code>column_break_51</code></td>
<td class="info">
Column Break</td>
<td >
</td>
<td></td>
</tr>
<tr >
<td>55</td>
<td ><code>additional_discount_percentage</code></td>
<td >
Float</td>
<td >
Additional Discount Percentage
</td>
<td></td>
</tr>
<tr >
<td>56</td> <td>56</td>
<td ><code>discount_amount</code></td>
<td >
Currency</td>
<td >
Additional Discount Amount
</td>
<td>
<pre>currency</pre>
</td>
</tr>
<tr class="info">
<td>57</td>
<td ><code>totals</code></td> <td ><code>totals</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -863,7 +875,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>57</td> <td>58</td>
<td class="danger" title="Mandatory"><code>base_grand_total</code></td> <td class="danger" title="Mandatory"><code>base_grand_total</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -877,7 +889,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>58</td> <td>59</td>
<td ><code>base_rounded_total</code></td> <td ><code>base_rounded_total</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -891,7 +903,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>59</td> <td>60</td>
<td ><code>base_in_words</code></td> <td ><code>base_in_words</code></td>
<td > <td >
Data</td> Data</td>
@@ -904,7 +916,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>60</td> <td>61</td>
<td ><code>column_break5</code></td> <td ><code>column_break5</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -916,7 +928,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>61</td> <td>62</td>
<td class="danger" title="Mandatory"><code>grand_total</code></td> <td class="danger" title="Mandatory"><code>grand_total</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -930,7 +942,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>62</td> <td>63</td>
<td ><code>rounded_total</code></td> <td ><code>rounded_total</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -944,7 +956,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>63</td> <td>64</td>
<td ><code>in_words</code></td> <td ><code>in_words</code></td>
<td > <td >
Data</td> Data</td>
@@ -956,7 +968,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>64</td> <td>65</td>
<td ><code>total_advance</code></td> <td ><code>total_advance</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -970,7 +982,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>65</td> <td>66</td>
<td ><code>outstanding_amount</code></td> <td ><code>outstanding_amount</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -984,7 +996,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>66</td> <td>67</td>
<td ><code>advances_section</code></td> <td ><code>advances_section</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -998,7 +1010,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>67</td> <td>68</td>
<td ><code>get_advances_received</code></td> <td ><code>get_advances_received</code></td>
<td > <td >
Button</td> Button</td>
@@ -1012,7 +1024,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>68</td> <td>69</td>
<td ><code>advances</code></td> <td ><code>advances</code></td>
<td > <td >
Table</td> Table</td>
@@ -1033,7 +1045,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>69</td> <td>70</td>
<td ><code>payments_section</code></td> <td ><code>payments_section</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1047,7 +1059,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>70</td> <td>71</td>
<td ><code>mode_of_payment</code></td> <td ><code>mode_of_payment</code></td>
<td > <td >
Link</td> Link</td>
@@ -1068,7 +1080,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>71</td> <td>72</td>
<td ><code>cash_bank_account</code></td> <td ><code>cash_bank_account</code></td>
<td > <td >
Link</td> Link</td>
@@ -1089,7 +1101,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>72</td> <td>73</td>
<td ><code>column_break3</code></td> <td ><code>column_break3</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1101,7 +1113,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>73</td> <td>74</td>
<td ><code>paid_amount</code></td> <td ><code>paid_amount</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -1115,7 +1127,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>74</td> <td>75</td>
<td ><code>base_paid_amount</code></td> <td ><code>base_paid_amount</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -1129,7 +1141,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>75</td> <td>76</td>
<td ><code>column_break4</code></td> <td ><code>column_break4</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1141,7 +1153,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>76</td> <td>77</td>
<td ><code>write_off_amount</code></td> <td ><code>write_off_amount</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -1155,7 +1167,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>77</td> <td>78</td>
<td ><code>base_write_off_amount</code></td> <td ><code>base_write_off_amount</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -1169,7 +1181,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>78</td> <td>79</td>
<td ><code>write_off_outstanding_amount_automatically</code></td> <td ><code>write_off_outstanding_amount_automatically</code></td>
<td > <td >
Check</td> Check</td>
@@ -1181,7 +1193,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>79</td> <td>80</td>
<td ><code>column_break_74</code></td> <td ><code>column_break_74</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1193,7 +1205,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>80</td> <td>81</td>
<td ><code>write_off_account</code></td> <td ><code>write_off_account</code></td>
<td > <td >
Link</td> Link</td>
@@ -1214,7 +1226,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>81</td> <td>82</td>
<td ><code>write_off_cost_center</code></td> <td ><code>write_off_cost_center</code></td>
<td > <td >
Link</td> Link</td>
@@ -1235,7 +1247,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>82</td> <td>83</td>
<td ><code>terms_section_break</code></td> <td ><code>terms_section_break</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1247,7 +1259,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>83</td> <td>84</td>
<td ><code>tc_name</code></td> <td ><code>tc_name</code></td>
<td > <td >
Link</td> Link</td>
@@ -1268,7 +1280,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>84</td> <td>85</td>
<td ><code>terms</code></td> <td ><code>terms</code></td>
<td > <td >
Text Editor</td> Text Editor</td>
@@ -1280,7 +1292,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>85</td> <td>86</td>
<td ><code>edit_printing_settings</code></td> <td ><code>edit_printing_settings</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1292,7 +1304,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>86</td> <td>87</td>
<td ><code>letter_head</code></td> <td ><code>letter_head</code></td>
<td > <td >
Link</td> Link</td>
@@ -1313,7 +1325,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>87</td> <td>88</td>
<td ><code>column_break_84</code></td> <td ><code>column_break_84</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1325,7 +1337,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>88</td> <td>89</td>
<td ><code>select_print_heading</code></td> <td ><code>select_print_heading</code></td>
<td > <td >
Link</td> Link</td>
@@ -1346,7 +1358,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>89</td> <td>90</td>
<td ><code>contact_section</code></td> <td ><code>contact_section</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1360,7 +1372,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>90</td> <td>91</td>
<td ><code>project_name</code></td> <td ><code>project_name</code></td>
<td > <td >
Link</td> Link</td>
@@ -1381,7 +1393,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>91</td> <td>92</td>
<td class="danger" title="Mandatory"><code>territory</code></td> <td class="danger" title="Mandatory"><code>territory</code></td>
<td > <td >
Link</td> Link</td>
@@ -1402,7 +1414,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>92</td> <td>93</td>
<td ><code>customer_group</code></td> <td ><code>customer_group</code></td>
<td > <td >
Link</td> Link</td>
@@ -1423,7 +1435,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>93</td> <td>94</td>
<td ><code>col_break23</code></td> <td ><code>col_break23</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1435,7 +1447,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>94</td> <td>95</td>
<td ><code>customer_address</code></td> <td ><code>customer_address</code></td>
<td > <td >
Link</td> Link</td>
@@ -1456,7 +1468,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>95</td> <td>96</td>
<td ><code>contact_person</code></td> <td ><code>contact_person</code></td>
<td > <td >
Link</td> Link</td>
@@ -1477,7 +1489,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>96</td> <td>97</td>
<td ><code>campaign</code></td> <td ><code>campaign</code></td>
<td > <td >
Link</td> Link</td>
@@ -1498,7 +1510,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>97</td> <td>98</td>
<td ><code>source</code></td> <td ><code>source</code></td>
<td > <td >
Select</td> Select</td>
@@ -1521,7 +1533,7 @@ Campaign</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>98</td> <td>99</td>
<td ><code>more_info</code></td> <td ><code>more_info</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1535,7 +1547,7 @@ Campaign</pre>
</tr> </tr>
<tr > <tr >
<td>99</td> <td>100</td>
<td class="danger" title="Mandatory"><code>debit_to</code></td> <td class="danger" title="Mandatory"><code>debit_to</code></td>
<td > <td >
Link</td> Link</td>
@@ -1556,7 +1568,7 @@ Campaign</pre>
</tr> </tr>
<tr > <tr >
<td>100</td> <td>101</td>
<td ><code>party_account_currency</code></td> <td ><code>party_account_currency</code></td>
<td > <td >
Link</td> Link</td>
@@ -1577,7 +1589,7 @@ Campaign</pre>
</tr> </tr>
<tr > <tr >
<td>101</td> <td>102</td>
<td ><code>is_opening</code></td> <td ><code>is_opening</code></td>
<td > <td >
Select</td> Select</td>
@@ -1592,7 +1604,7 @@ Yes</pre>
</tr> </tr>
<tr > <tr >
<td>102</td> <td>103</td>
<td ><code>c_form_applicable</code></td> <td ><code>c_form_applicable</code></td>
<td > <td >
Select</td> Select</td>
@@ -1607,7 +1619,7 @@ Yes</pre>
</tr> </tr>
<tr > <tr >
<td>103</td> <td>104</td>
<td ><code>c_form_no</code></td> <td ><code>c_form_no</code></td>
<td > <td >
Link</td> Link</td>
@@ -1628,7 +1640,7 @@ Yes</pre>
</tr> </tr>
<tr > <tr >
<td>104</td> <td>105</td>
<td ><code>column_break8</code></td> <td ><code>column_break8</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1640,7 +1652,7 @@ Yes</pre>
</tr> </tr>
<tr > <tr >
<td>105</td> <td>106</td>
<td ><code>posting_time</code></td> <td ><code>posting_time</code></td>
<td > <td >
Time</td> Time</td>
@@ -1652,7 +1664,7 @@ Yes</pre>
</tr> </tr>
<tr > <tr >
<td>106</td> <td>107</td>
<td class="danger" title="Mandatory"><code>fiscal_year</code></td> <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
<td > <td >
Link</td> Link</td>
@@ -1673,7 +1685,7 @@ Yes</pre>
</tr> </tr>
<tr > <tr >
<td>107</td> <td>108</td>
<td ><code>remarks</code></td> <td ><code>remarks</code></td>
<td > <td >
Small Text</td> Small Text</td>
@@ -1685,7 +1697,7 @@ Yes</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>108</td> <td>109</td>
<td ><code>sales_team_section_break</code></td> <td ><code>sales_team_section_break</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1699,7 +1711,7 @@ Yes</pre>
</tr> </tr>
<tr > <tr >
<td>109</td> <td>110</td>
<td ><code>sales_partner</code></td> <td ><code>sales_partner</code></td>
<td > <td >
Link</td> Link</td>
@@ -1720,7 +1732,7 @@ Yes</pre>
</tr> </tr>
<tr > <tr >
<td>110</td> <td>111</td>
<td ><code>column_break10</code></td> <td ><code>column_break10</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1732,7 +1744,7 @@ Yes</pre>
</tr> </tr>
<tr > <tr >
<td>111</td> <td>112</td>
<td ><code>commission_rate</code></td> <td ><code>commission_rate</code></td>
<td > <td >
Float</td> Float</td>
@@ -1744,7 +1756,7 @@ Yes</pre>
</tr> </tr>
<tr > <tr >
<td>112</td> <td>113</td>
<td ><code>total_commission</code></td> <td ><code>total_commission</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -1758,7 +1770,7 @@ Yes</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>113</td> <td>114</td>
<td ><code>section_break2</code></td> <td ><code>section_break2</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1770,7 +1782,7 @@ Yes</pre>
</tr> </tr>
<tr > <tr >
<td>114</td> <td>115</td>
<td ><code>sales_team</code></td> <td ><code>sales_team</code></td>
<td > <td >
Table</td> Table</td>
@@ -1791,7 +1803,7 @@ Yes</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>115</td> <td>116</td>
<td ><code>recurring_invoice</code></td> <td ><code>recurring_invoice</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1805,7 +1817,7 @@ Yes</pre>
</tr> </tr>
<tr > <tr >
<td>116</td> <td>117</td>
<td ><code>column_break11</code></td> <td ><code>column_break11</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1817,7 +1829,7 @@ Yes</pre>
</tr> </tr>
<tr > <tr >
<td>117</td> <td>118</td>
<td ><code>is_recurring</code></td> <td ><code>is_recurring</code></td>
<td > <td >
Check</td> Check</td>
@@ -1830,7 +1842,7 @@ Yes</pre>
</tr> </tr>
<tr > <tr >
<td>118</td> <td>119</td>
<td ><code>recurring_type</code></td> <td ><code>recurring_type</code></td>
<td > <td >
Select</td> Select</td>
@@ -1849,7 +1861,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>119</td> <td>120</td>
<td ><code>from_date</code></td> <td ><code>from_date</code></td>
<td > <td >
Date</td> Date</td>
@@ -1862,7 +1874,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>120</td> <td>121</td>
<td ><code>to_date</code></td> <td ><code>to_date</code></td>
<td > <td >
Date</td> Date</td>
@@ -1875,7 +1887,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>121</td> <td>122</td>
<td ><code>repeat_on_day_of_month</code></td> <td ><code>repeat_on_day_of_month</code></td>
<td > <td >
Int</td> Int</td>
@@ -1888,7 +1900,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>122</td> <td>123</td>
<td ><code>end_date</code></td> <td ><code>end_date</code></td>
<td > <td >
Date</td> Date</td>
@@ -1901,7 +1913,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>123</td> <td>124</td>
<td ><code>column_break12</code></td> <td ><code>column_break12</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1913,7 +1925,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>124</td> <td>125</td>
<td ><code>next_date</code></td> <td ><code>next_date</code></td>
<td > <td >
Date</td> Date</td>
@@ -1927,7 +1939,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>125</td> <td>126</td>
<td ><code>recurring_id</code></td> <td ><code>recurring_id</code></td>
<td > <td >
Data</td> Data</td>
@@ -1940,7 +1952,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>126</td> <td>127</td>
<td ><code>notification_email_address</code></td> <td ><code>notification_email_address</code></td>
<td > <td >
Small Text</td> Small Text</td>
@@ -1953,7 +1965,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>127</td> <td>128</td>
<td ><code>recurring_print_format</code></td> <td ><code>recurring_print_format</code></td>
<td > <td >
Link</td> Link</td>
@@ -1974,7 +1986,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>128</td> <td>129</td>
<td ><code>against_income_account</code></td> <td ><code>against_income_account</code></td>
<td > <td >
Small Text</td> Small Text</td>

144
erpnext/docs/current/models/buying/purchase_order.html
View File

@@ -835,32 +835,6 @@ Net Total</pre>
<tr > <tr >
<td>55</td> <td>55</td>
<td ><code>column_break_45</code></td>
<td class="info">
Column Break</td>
<td >
</td>
<td></td>
</tr>
<tr >
<td>56</td>
<td ><code>discount_amount</code></td>
<td >
Currency</td>
<td >
Additional Discount Amount
</td>
<td>
<pre>currency</pre>
</td>
</tr>
<tr >
<td>57</td>
<td ><code>base_discount_amount</code></td> <td ><code>base_discount_amount</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -873,8 +847,46 @@ Net Total</pre>
</td> </td>
</tr> </tr>
<tr class="info"> <tr >
<td>56</td>
<td ><code>column_break_45</code></td>
<td class="info">
Column Break</td>
<td >
</td>
<td></td>
</tr>
<tr >
<td>57</td>
<td ><code>additional_discount_percentage</code></td>
<td >
Float</td>
<td >
Additional Discount Percentage
</td>
<td></td>
</tr>
<tr >
<td>58</td> <td>58</td>
<td ><code>discount_amount</code></td>
<td >
Currency</td>
<td >
Additional Discount Amount
</td>
<td>
<pre>currency</pre>
</td>
</tr>
<tr class="info">
<td>59</td>
<td ><code>totals_section</code></td> <td ><code>totals_section</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -886,7 +898,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>59</td> <td>60</td>
<td ><code>base_grand_total</code></td> <td ><code>base_grand_total</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -900,7 +912,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>60</td> <td>61</td>
<td ><code>base_in_words</code></td> <td ><code>base_in_words</code></td>
<td > <td >
Data</td> Data</td>
@@ -913,7 +925,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>61</td> <td>62</td>
<td ><code>base_rounded_total</code></td> <td ><code>base_rounded_total</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -927,7 +939,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>62</td> <td>63</td>
<td ><code>advance_paid</code></td> <td ><code>advance_paid</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -939,7 +951,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>63</td> <td>64</td>
<td ><code>column_break4</code></td> <td ><code>column_break4</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -951,7 +963,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>64</td> <td>65</td>
<td ><code>grand_total</code></td> <td ><code>grand_total</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -965,7 +977,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>65</td> <td>66</td>
<td ><code>in_words</code></td> <td ><code>in_words</code></td>
<td > <td >
Data</td> Data</td>
@@ -977,7 +989,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>66</td> <td>67</td>
<td ><code>terms_section_break</code></td> <td ><code>terms_section_break</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -991,7 +1003,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>67</td> <td>68</td>
<td ><code>tc_name</code></td> <td ><code>tc_name</code></td>
<td > <td >
Link</td> Link</td>
@@ -1012,7 +1024,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>68</td> <td>69</td>
<td ><code>terms</code></td> <td ><code>terms</code></td>
<td > <td >
Text Editor</td> Text Editor</td>
@@ -1024,7 +1036,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>69</td> <td>70</td>
<td ><code>contact_section</code></td> <td ><code>contact_section</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1038,7 +1050,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>70</td> <td>71</td>
<td ><code>supplier_address</code></td> <td ><code>supplier_address</code></td>
<td > <td >
Link</td> Link</td>
@@ -1059,7 +1071,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>71</td> <td>72</td>
<td ><code>cb_contact</code></td> <td ><code>cb_contact</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1071,7 +1083,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>72</td> <td>73</td>
<td ><code>contact_person</code></td> <td ><code>contact_person</code></td>
<td > <td >
Link</td> Link</td>
@@ -1092,7 +1104,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>73</td> <td>74</td>
<td ><code>more_info</code></td> <td ><code>more_info</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1104,7 +1116,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>74</td> <td>75</td>
<td class="danger" title="Mandatory"><code>status</code></td> <td class="danger" title="Mandatory"><code>status</code></td>
<td > <td >
Select</td> Select</td>
@@ -1127,7 +1139,7 @@ Delivered</pre>
</tr> </tr>
<tr > <tr >
<td>75</td> <td>76</td>
<td class="danger" title="Mandatory"><code>fiscal_year</code></td> <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
<td > <td >
Link</td> Link</td>
@@ -1148,7 +1160,7 @@ Delivered</pre>
</tr> </tr>
<tr > <tr >
<td>76</td> <td>77</td>
<td ><code>ref_sq</code></td> <td ><code>ref_sq</code></td>
<td > <td >
Data</td> Data</td>
@@ -1160,7 +1172,7 @@ Delivered</pre>
</tr> </tr>
<tr > <tr >
<td>77</td> <td>78</td>
<td ><code>column_break_74</code></td> <td ><code>column_break_74</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1172,7 +1184,7 @@ Delivered</pre>
</tr> </tr>
<tr > <tr >
<td>78</td> <td>79</td>
<td ><code>per_received</code></td> <td ><code>per_received</code></td>
<td > <td >
Percent</td> Percent</td>
@@ -1184,7 +1196,7 @@ Delivered</pre>
</tr> </tr>
<tr > <tr >
<td>79</td> <td>80</td>
<td ><code>per_billed</code></td> <td ><code>per_billed</code></td>
<td > <td >
Percent</td> Percent</td>
@@ -1196,7 +1208,7 @@ Delivered</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>80</td> <td>81</td>
<td ><code>column_break5</code></td> <td ><code>column_break5</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1208,7 +1220,7 @@ Delivered</pre>
</tr> </tr>
<tr > <tr >
<td>81</td> <td>82</td>
<td ><code>letter_head</code></td> <td ><code>letter_head</code></td>
<td > <td >
Link</td> Link</td>
@@ -1229,7 +1241,7 @@ Delivered</pre>
</tr> </tr>
<tr > <tr >
<td>82</td> <td>83</td>
<td ><code>select_print_heading</code></td> <td ><code>select_print_heading</code></td>
<td > <td >
Link</td> Link</td>
@@ -1250,7 +1262,7 @@ Delivered</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>83</td> <td>84</td>
<td ><code>raw_material_details</code></td> <td ><code>raw_material_details</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1264,7 +1276,7 @@ Delivered</pre>
</tr> </tr>
<tr > <tr >
<td>84</td> <td>85</td>
<td ><code>supplied_items</code></td> <td ><code>supplied_items</code></td>
<td > <td >
Table</td> Table</td>
@@ -1285,7 +1297,7 @@ Delivered</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>85</td> <td>86</td>
<td ><code>recurring_order</code></td> <td ><code>recurring_order</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1299,7 +1311,7 @@ Delivered</pre>
</tr> </tr>
<tr > <tr >
<td>86</td> <td>87</td>
<td ><code>column_break</code></td> <td ><code>column_break</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1311,7 +1323,7 @@ Delivered</pre>
</tr> </tr>
<tr > <tr >
<td>87</td> <td>88</td>
<td ><code>is_recurring</code></td> <td ><code>is_recurring</code></td>
<td > <td >
Check</td> Check</td>
@@ -1323,7 +1335,7 @@ Delivered</pre>
</tr> </tr>
<tr > <tr >
<td>88</td> <td>89</td>
<td ><code>recurring_type</code></td> <td ><code>recurring_type</code></td>
<td > <td >
Select</td> Select</td>
@@ -1340,7 +1352,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>89</td> <td>90</td>
<td ><code>from_date</code></td> <td ><code>from_date</code></td>
<td > <td >
Date</td> Date</td>
@@ -1353,7 +1365,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>90</td> <td>91</td>
<td ><code>to_date</code></td> <td ><code>to_date</code></td>
<td > <td >
Date</td> Date</td>
@@ -1366,7 +1378,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>91</td> <td>92</td>
<td ><code>repeat_on_day_of_month</code></td> <td ><code>repeat_on_day_of_month</code></td>
<td > <td >
Int</td> Int</td>
@@ -1379,7 +1391,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>92</td> <td>93</td>
<td ><code>end_date</code></td> <td ><code>end_date</code></td>
<td > <td >
Date</td> Date</td>
@@ -1392,7 +1404,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>93</td> <td>94</td>
<td ><code>column_break83</code></td> <td ><code>column_break83</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1404,7 +1416,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>94</td> <td>95</td>
<td ><code>next_date</code></td> <td ><code>next_date</code></td>
<td > <td >
Date</td> Date</td>
@@ -1417,7 +1429,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>95</td> <td>96</td>
<td ><code>recurring_id</code></td> <td ><code>recurring_id</code></td>
<td > <td >
Data</td> Data</td>
@@ -1429,7 +1441,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>96</td> <td>97</td>
<td ><code>notification_email_address</code></td> <td ><code>notification_email_address</code></td>
<td > <td >
Small Text</td> Small Text</td>
@@ -1442,7 +1454,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>97</td> <td>98</td>
<td ><code>recurring_print_format</code></td> <td ><code>recurring_print_format</code></td>
<td > <td >
Link</td> Link</td>

106
erpnext/docs/current/models/buying/supplier_quotation.html
View File

@@ -673,32 +673,6 @@ Net Total</pre>
<tr > <tr >
<td>44</td> <td>44</td>
<td ><code>column_break_43</code></td>
<td class="info">
Column Break</td>
<td >
</td>
<td></td>
</tr>
<tr >
<td>45</td>
<td ><code>discount_amount</code></td>
<td >
Currency</td>
<td >
Additional Discount Amount
</td>
<td>
<pre>currency</pre>
</td>
</tr>
<tr >
<td>46</td>
<td ><code>base_discount_amount</code></td> <td ><code>base_discount_amount</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -711,8 +685,46 @@ Net Total</pre>
</td> </td>
</tr> </tr>
<tr class="info"> <tr >
<td>45</td>
<td ><code>column_break_43</code></td>
<td class="info">
Column Break</td>
<td >
</td>
<td></td>
</tr>
<tr >
<td>46</td>
<td ><code>additional_discount_percentage</code></td>
<td >
Float</td>
<td >
Additional Discount Percentage
</td>
<td></td>
</tr>
<tr >
<td>47</td> <td>47</td>
<td ><code>discount_amount</code></td>
<td >
Currency</td>
<td >
Additional Discount Amount
</td>
<td>
<pre>currency</pre>
</td>
</tr>
<tr class="info">
<td>48</td>
<td ><code>section_break_46</code></td> <td ><code>section_break_46</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -724,7 +736,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>48</td> <td>49</td>
<td ><code>base_grand_total</code></td> <td ><code>base_grand_total</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -738,7 +750,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>49</td> <td>50</td>
<td ><code>base_in_words</code></td> <td ><code>base_in_words</code></td>
<td > <td >
Data</td> Data</td>
@@ -750,7 +762,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>50</td> <td>51</td>
<td ><code>base_rounded_total</code></td> <td ><code>base_rounded_total</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -764,7 +776,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>51</td> <td>52</td>
<td ><code>column_break4</code></td> <td ><code>column_break4</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -776,7 +788,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>52</td> <td>53</td>
<td ><code>grand_total</code></td> <td ><code>grand_total</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -790,7 +802,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>53</td> <td>54</td>
<td ><code>in_words</code></td> <td ><code>in_words</code></td>
<td > <td >
Data</td> Data</td>
@@ -802,7 +814,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>54</td> <td>55</td>
<td ><code>terms_section_break</code></td> <td ><code>terms_section_break</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -816,7 +828,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>55</td> <td>56</td>
<td ><code>tc_name</code></td> <td ><code>tc_name</code></td>
<td > <td >
Link</td> Link</td>
@@ -837,7 +849,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>56</td> <td>57</td>
<td ><code>terms</code></td> <td ><code>terms</code></td>
<td > <td >
Text Editor</td> Text Editor</td>
@@ -849,7 +861,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>57</td> <td>58</td>
<td ><code>contact_section</code></td> <td ><code>contact_section</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -863,7 +875,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>58</td> <td>59</td>
<td ><code>supplier_address</code></td> <td ><code>supplier_address</code></td>
<td > <td >
Link</td> Link</td>
@@ -884,7 +896,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>59</td> <td>60</td>
<td ><code>contact_person</code></td> <td ><code>contact_person</code></td>
<td > <td >
Link</td> Link</td>
@@ -905,7 +917,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>60</td> <td>61</td>
<td ><code>printing_settings</code></td> <td ><code>printing_settings</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -917,7 +929,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>61</td> <td>62</td>
<td ><code>select_print_heading</code></td> <td ><code>select_print_heading</code></td>
<td > <td >
Link</td> Link</td>
@@ -938,7 +950,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>62</td> <td>63</td>
<td ><code>letter_head</code></td> <td ><code>letter_head</code></td>
<td > <td >
Link</td> Link</td>
@@ -959,7 +971,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>63</td> <td>64</td>
<td ><code>more_info</code></td> <td ><code>more_info</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -973,7 +985,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>64</td> <td>65</td>
<td class="danger" title="Mandatory"><code>status</code></td> <td class="danger" title="Mandatory"><code>status</code></td>
<td > <td >
Select</td> Select</td>
@@ -991,7 +1003,7 @@ Cancelled</pre>
</tr> </tr>
<tr > <tr >
<td>65</td> <td>66</td>
<td ><code>is_subcontracted</code></td> <td ><code>is_subcontracted</code></td>
<td > <td >
Select</td> Select</td>
@@ -1007,7 +1019,7 @@ No</pre>
</tr> </tr>
<tr > <tr >
<td>66</td> <td>67</td>
<td ><code>column_break_57</code></td> <td ><code>column_break_57</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1019,7 +1031,7 @@ No</pre>
</tr> </tr>
<tr > <tr >
<td>67</td> <td>68</td>
<td class="danger" title="Mandatory"><code>fiscal_year</code></td> <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
<td > <td >
Link</td> Link</td>

6
erpnext/docs/current/models/hr/department.html
View File

@@ -106,6 +106,8 @@
<ul> <ul>
<li> <li>
@@ -124,6 +126,8 @@
<li> <li>
@@ -142,6 +146,8 @@
<li> <li>

2
erpnext/docs/current/models/hr/employee.html
View File

@@ -1622,6 +1622,8 @@ Health Concerns</pre>
<li> <li>

124
erpnext/docs/current/models/selling/quotation.html
View File

@@ -728,32 +728,6 @@ Net Total</pre>
<tr > <tr >
<td>47</td> <td>47</td>
<td ><code>column_break_46</code></td>
<td class="info">
Column Break</td>
<td >
</td>
<td></td>
</tr>
<tr >
<td>48</td>
<td ><code>discount_amount</code></td>
<td >
Currency</td>
<td >
Additional Discount Amount
</td>
<td>
<pre>currency</pre>
</td>
</tr>
<tr >
<td>49</td>
<td ><code>base_discount_amount</code></td> <td ><code>base_discount_amount</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -766,8 +740,46 @@ Net Total</pre>
</td> </td>
</tr> </tr>
<tr class="info"> <tr >
<td>48</td>
<td ><code>column_break_46</code></td>
<td class="info">
Column Break</td>
<td >
</td>
<td></td>
</tr>
<tr >
<td>49</td>
<td ><code>additional_discount_percentage</code></td>
<td >
Float</td>
<td >
Additional Discount Percentage
</td>
<td></td>
</tr>
<tr >
<td>50</td> <td>50</td>
<td ><code>discount_amount</code></td>
<td >
Currency</td>
<td >
Additional Discount Amount
</td>
<td>
<pre>currency</pre>
</td>
</tr>
<tr class="info">
<td>51</td>
<td ><code>totals</code></td> <td ><code>totals</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -781,7 +793,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>51</td> <td>52</td>
<td ><code>base_grand_total</code></td> <td ><code>base_grand_total</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -795,7 +807,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>52</td> <td>53</td>
<td ><code>base_rounded_total</code></td> <td ><code>base_rounded_total</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -809,7 +821,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>53</td> <td>54</td>
<td ><code>base_in_words</code></td> <td ><code>base_in_words</code></td>
<td > <td >
Data</td> Data</td>
@@ -822,7 +834,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>54</td> <td>55</td>
<td ><code>column_break3</code></td> <td ><code>column_break3</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -834,7 +846,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>55</td> <td>56</td>
<td ><code>grand_total</code></td> <td ><code>grand_total</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -848,7 +860,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>56</td> <td>57</td>
<td ><code>rounded_total</code></td> <td ><code>rounded_total</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -862,7 +874,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>57</td> <td>58</td>
<td ><code>in_words</code></td> <td ><code>in_words</code></td>
<td > <td >
Data</td> Data</td>
@@ -874,7 +886,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>58</td> <td>59</td>
<td ><code>terms_section_break</code></td> <td ><code>terms_section_break</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -888,7 +900,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>59</td> <td>60</td>
<td ><code>tc_name</code></td> <td ><code>tc_name</code></td>
<td > <td >
Link</td> Link</td>
@@ -909,7 +921,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>60</td> <td>61</td>
<td ><code>terms</code></td> <td ><code>terms</code></td>
<td > <td >
Text Editor</td> Text Editor</td>
@@ -921,7 +933,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>61</td> <td>62</td>
<td ><code>contact_section</code></td> <td ><code>contact_section</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -935,7 +947,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>62</td> <td>63</td>
<td class="danger" title="Mandatory"><code>territory</code></td> <td class="danger" title="Mandatory"><code>territory</code></td>
<td > <td >
Link</td> Link</td>
@@ -956,7 +968,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>63</td> <td>64</td>
<td ><code>customer_group</code></td> <td ><code>customer_group</code></td>
<td > <td >
Link</td> Link</td>
@@ -977,7 +989,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>64</td> <td>65</td>
<td ><code>shipping_address_name</code></td> <td ><code>shipping_address_name</code></td>
<td > <td >
Link</td> Link</td>
@@ -998,7 +1010,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>65</td> <td>66</td>
<td ><code>shipping_address</code></td> <td ><code>shipping_address</code></td>
<td > <td >
Small Text</td> Small Text</td>
@@ -1010,7 +1022,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>66</td> <td>67</td>
<td ><code>col_break98</code></td> <td ><code>col_break98</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1022,7 +1034,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>67</td> <td>68</td>
<td ><code>customer_address</code></td> <td ><code>customer_address</code></td>
<td > <td >
Link</td> Link</td>
@@ -1043,7 +1055,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>68</td> <td>69</td>
<td ><code>contact_person</code></td> <td ><code>contact_person</code></td>
<td > <td >
Link</td> Link</td>
@@ -1064,7 +1076,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>69</td> <td>70</td>
<td ><code>print_settings</code></td> <td ><code>print_settings</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1076,7 +1088,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>70</td> <td>71</td>
<td ><code>letter_head</code></td> <td ><code>letter_head</code></td>
<td > <td >
Link</td> Link</td>
@@ -1097,7 +1109,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>71</td> <td>72</td>
<td ><code>select_print_heading</code></td> <td ><code>select_print_heading</code></td>
<td > <td >
Link</td> Link</td>
@@ -1118,7 +1130,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>72</td> <td>73</td>
<td ><code>more_info</code></td> <td ><code>more_info</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1132,7 +1144,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>73</td> <td>74</td>
<td ><code>campaign</code></td> <td ><code>campaign</code></td>
<td > <td >
Link</td> Link</td>
@@ -1153,7 +1165,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>74</td> <td>75</td>
<td ><code>source</code></td> <td ><code>source</code></td>
<td > <td >
Select</td> Select</td>
@@ -1176,7 +1188,7 @@ Campaign</pre>
</tr> </tr>
<tr > <tr >
<td>75</td> <td>76</td>
<td ><code>order_lost_reason</code></td> <td ><code>order_lost_reason</code></td>
<td > <td >
Small Text</td> Small Text</td>
@@ -1188,7 +1200,7 @@ Campaign</pre>
</tr> </tr>
<tr > <tr >
<td>76</td> <td>77</td>
<td ><code>column_break4</code></td> <td ><code>column_break4</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1200,7 +1212,7 @@ Campaign</pre>
</tr> </tr>
<tr > <tr >
<td>77</td> <td>78</td>
<td class="danger" title="Mandatory"><code>status</code></td> <td class="danger" title="Mandatory"><code>status</code></td>
<td > <td >
Select</td> Select</td>
@@ -1220,7 +1232,7 @@ Replied</pre>
</tr> </tr>
<tr > <tr >
<td>78</td> <td>79</td>
<td class="danger" title="Mandatory"><code>fiscal_year</code></td> <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
<td > <td >
Link</td> Link</td>
@@ -1241,7 +1253,7 @@ Replied</pre>
</tr> </tr>
<tr > <tr >
<td>79</td> <td>80</td>
<td ><code>enq_det</code></td> <td ><code>enq_det</code></td>
<td > <td >
Text</td> Text</td>

178
erpnext/docs/current/models/selling/sales_order.html
View File

@@ -772,32 +772,6 @@ Net Total</pre>
<tr > <tr >
<td>51</td> <td>51</td>
<td ><code>column_break_50</code></td>
<td class="info">
Column Break</td>
<td >
</td>
<td></td>
</tr>
<tr >
<td>52</td>
<td ><code>discount_amount</code></td>
<td >
Currency</td>
<td >
Additional Discount Amount
</td>
<td>
<pre>currency</pre>
</td>
</tr>
<tr >
<td>53</td>
<td ><code>base_discount_amount</code></td> <td ><code>base_discount_amount</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -810,8 +784,46 @@ Net Total</pre>
</td> </td>
</tr> </tr>
<tr class="info"> <tr >
<td>52</td>
<td ><code>column_break_50</code></td>
<td class="info">
Column Break</td>
<td >
</td>
<td></td>
</tr>
<tr >
<td>53</td>
<td ><code>additional_discount_percentage</code></td>
<td >
Float</td>
<td >
Additional Discount Percentage
</td>
<td></td>
</tr>
<tr >
<td>54</td> <td>54</td>
<td ><code>discount_amount</code></td>
<td >
Currency</td>
<td >
Additional Discount Amount
</td>
<td>
<pre>currency</pre>
</td>
</tr>
<tr class="info">
<td>55</td>
<td ><code>totals</code></td> <td ><code>totals</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -825,7 +837,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>55</td> <td>56</td>
<td ><code>base_grand_total</code></td> <td ><code>base_grand_total</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -839,7 +851,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>56</td> <td>57</td>
<td ><code>base_rounded_total</code></td> <td ><code>base_rounded_total</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -853,7 +865,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>57</td> <td>58</td>
<td ><code>base_in_words</code></td> <td ><code>base_in_words</code></td>
<td > <td >
Data</td> Data</td>
@@ -866,7 +878,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>58</td> <td>59</td>
<td ><code>column_break3</code></td> <td ><code>column_break3</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -878,7 +890,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>59</td> <td>60</td>
<td ><code>grand_total</code></td> <td ><code>grand_total</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -892,7 +904,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>60</td> <td>61</td>
<td ><code>rounded_total</code></td> <td ><code>rounded_total</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -906,7 +918,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>61</td> <td>62</td>
<td ><code>in_words</code></td> <td ><code>in_words</code></td>
<td > <td >
Data</td> Data</td>
@@ -918,7 +930,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>62</td> <td>63</td>
<td ><code>advance_paid</code></td> <td ><code>advance_paid</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -932,7 +944,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>63</td> <td>64</td>
<td ><code>packing_list</code></td> <td ><code>packing_list</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -946,7 +958,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>64</td> <td>65</td>
<td ><code>packed_items</code></td> <td ><code>packed_items</code></td>
<td > <td >
Table</td> Table</td>
@@ -967,7 +979,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>65</td> <td>66</td>
<td ><code>terms_section_break</code></td> <td ><code>terms_section_break</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -981,7 +993,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>66</td> <td>67</td>
<td ><code>tc_name</code></td> <td ><code>tc_name</code></td>
<td > <td >
Link</td> Link</td>
@@ -1002,7 +1014,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>67</td> <td>68</td>
<td ><code>terms</code></td> <td ><code>terms</code></td>
<td > <td >
Text Editor</td> Text Editor</td>
@@ -1014,7 +1026,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>68</td> <td>69</td>
<td ><code>contact_info</code></td> <td ><code>contact_info</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1028,7 +1040,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>69</td> <td>70</td>
<td ><code>col_break45</code></td> <td ><code>col_break45</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1040,7 +1052,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>70</td> <td>71</td>
<td class="danger" title="Mandatory"><code>territory</code></td> <td class="danger" title="Mandatory"><code>territory</code></td>
<td > <td >
Link</td> Link</td>
@@ -1061,7 +1073,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>71</td> <td>72</td>
<td class="danger" title="Mandatory"><code>customer_group</code></td> <td class="danger" title="Mandatory"><code>customer_group</code></td>
<td > <td >
Link</td> Link</td>
@@ -1082,7 +1094,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>72</td> <td>73</td>
<td ><code>col_break46</code></td> <td ><code>col_break46</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1094,7 +1106,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>73</td> <td>74</td>
<td ><code>customer_address</code></td> <td ><code>customer_address</code></td>
<td > <td >
Link</td> Link</td>
@@ -1115,7 +1127,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>74</td> <td>75</td>
<td ><code>contact_person</code></td> <td ><code>contact_person</code></td>
<td > <td >
Link</td> Link</td>
@@ -1136,7 +1148,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>75</td> <td>76</td>
<td ><code>more_info</code></td> <td ><code>more_info</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1150,7 +1162,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>76</td> <td>77</td>
<td ><code>project_name</code></td> <td ><code>project_name</code></td>
<td > <td >
Link</td> Link</td>
@@ -1172,7 +1184,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>77</td> <td>78</td>
<td class="danger" title="Mandatory"><code>fiscal_year</code></td> <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
<td > <td >
Link</td> Link</td>
@@ -1193,7 +1205,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>78</td> <td>79</td>
<td ><code>column_break_77</code></td> <td ><code>column_break_77</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1205,7 +1217,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>79</td> <td>80</td>
<td ><code>source</code></td> <td ><code>source</code></td>
<td > <td >
Select</td> Select</td>
@@ -1228,7 +1240,7 @@ Campaign</pre>
</tr> </tr>
<tr > <tr >
<td>80</td> <td>81</td>
<td ><code>campaign</code></td> <td ><code>campaign</code></td>
<td > <td >
Link</td> Link</td>
@@ -1249,7 +1261,7 @@ Campaign</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>81</td> <td>82</td>
<td ><code>printing_details</code></td> <td ><code>printing_details</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1261,7 +1273,7 @@ Campaign</pre>
</tr> </tr>
<tr > <tr >
<td>82</td> <td>83</td>
<td ><code>letter_head</code></td> <td ><code>letter_head</code></td>
<td > <td >
Link</td> Link</td>
@@ -1282,7 +1294,7 @@ Campaign</pre>
</tr> </tr>
<tr > <tr >
<td>83</td> <td>84</td>
<td ><code>column_break4</code></td> <td ><code>column_break4</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1294,7 +1306,7 @@ Campaign</pre>
</tr> </tr>
<tr > <tr >
<td>84</td> <td>85</td>
<td ><code>select_print_heading</code></td> <td ><code>select_print_heading</code></td>
<td > <td >
Link</td> Link</td>
@@ -1315,7 +1327,7 @@ Campaign</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>85</td> <td>86</td>
<td ><code>section_break_78</code></td> <td ><code>section_break_78</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1327,7 +1339,7 @@ Campaign</pre>
</tr> </tr>
<tr > <tr >
<td>86</td> <td>87</td>
<td class="danger" title="Mandatory"><code>status</code></td> <td class="danger" title="Mandatory"><code>status</code></td>
<td > <td >
Select</td> Select</td>
@@ -1349,7 +1361,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>87</td> <td>88</td>
<td ><code>delivery_status</code></td> <td ><code>delivery_status</code></td>
<td > <td >
Select</td> Select</td>
@@ -1367,7 +1379,7 @@ Not Applicable</pre>
</tr> </tr>
<tr > <tr >
<td>88</td> <td>89</td>
<td ><code>per_delivered</code></td> <td ><code>per_delivered</code></td>
<td > <td >
Percent</td> Percent</td>
@@ -1380,7 +1392,7 @@ Not Applicable</pre>
</tr> </tr>
<tr > <tr >
<td>89</td> <td>90</td>
<td ><code>column_break_81</code></td> <td ><code>column_break_81</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1392,7 +1404,7 @@ Not Applicable</pre>
</tr> </tr>
<tr > <tr >
<td>90</td> <td>91</td>
<td ><code>per_billed</code></td> <td ><code>per_billed</code></td>
<td > <td >
Percent</td> Percent</td>
@@ -1405,7 +1417,7 @@ Not Applicable</pre>
</tr> </tr>
<tr > <tr >
<td>91</td> <td>92</td>
<td ><code>billing_status</code></td> <td ><code>billing_status</code></td>
<td > <td >
Select</td> Select</td>
@@ -1422,7 +1434,7 @@ Closed</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>92</td> <td>93</td>
<td ><code>sales_team_section_break</code></td> <td ><code>sales_team_section_break</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1436,7 +1448,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>93</td> <td>94</td>
<td ><code>sales_partner</code></td> <td ><code>sales_partner</code></td>
<td > <td >
Link</td> Link</td>
@@ -1457,7 +1469,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>94</td> <td>95</td>
<td ><code>column_break7</code></td> <td ><code>column_break7</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1469,7 +1481,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>95</td> <td>96</td>
<td ><code>commission_rate</code></td> <td ><code>commission_rate</code></td>
<td > <td >
Float</td> Float</td>
@@ -1481,7 +1493,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>96</td> <td>97</td>
<td ><code>total_commission</code></td> <td ><code>total_commission</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -1495,7 +1507,7 @@ Closed</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>97</td> <td>98</td>
<td ><code>section_break1</code></td> <td ><code>section_break1</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1507,7 +1519,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>98</td> <td>99</td>
<td ><code>sales_team</code></td> <td ><code>sales_team</code></td>
<td > <td >
Table</td> Table</td>
@@ -1528,7 +1540,7 @@ Closed</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>99</td> <td>100</td>
<td ><code>recurring_order</code></td> <td ><code>recurring_order</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1542,7 +1554,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>100</td> <td>101</td>
<td ><code>is_recurring</code></td> <td ><code>is_recurring</code></td>
<td > <td >
Check</td> Check</td>
@@ -1555,7 +1567,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>101</td> <td>102</td>
<td ><code>recurring_type</code></td> <td ><code>recurring_type</code></td>
<td > <td >
Select</td> Select</td>
@@ -1574,7 +1586,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>102</td> <td>103</td>
<td ><code>from_date</code></td> <td ><code>from_date</code></td>
<td > <td >
Date</td> Date</td>
@@ -1587,7 +1599,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>103</td> <td>104</td>
<td ><code>to_date</code></td> <td ><code>to_date</code></td>
<td > <td >
Date</td> Date</td>
@@ -1600,7 +1612,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>104</td> <td>105</td>
<td ><code>repeat_on_day_of_month</code></td> <td ><code>repeat_on_day_of_month</code></td>
<td > <td >
Int</td> Int</td>
@@ -1613,7 +1625,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>105</td> <td>106</td>
<td ><code>end_date</code></td> <td ><code>end_date</code></td>
<td > <td >
Date</td> Date</td>
@@ -1626,7 +1638,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>106</td> <td>107</td>
<td ><code>column_break83</code></td> <td ><code>column_break83</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1638,7 +1650,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>107</td> <td>108</td>
<td ><code>next_date</code></td> <td ><code>next_date</code></td>
<td > <td >
Date</td> Date</td>
@@ -1651,7 +1663,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>108</td> <td>109</td>
<td ><code>recurring_id</code></td> <td ><code>recurring_id</code></td>
<td > <td >
Data</td> Data</td>
@@ -1663,7 +1675,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>109</td> <td>110</td>
<td ><code>notification_email_address</code></td> <td ><code>notification_email_address</code></td>
<td > <td >
Small Text</td> Small Text</td>
@@ -1676,7 +1688,7 @@ Yearly</pre>
</tr> </tr>
<tr > <tr >
<td>110</td> <td>111</td>
<td ><code>recurring_print_format</code></td> <td ><code>recurring_print_format</code></td>
<td > <td >
Link</td> Link</td>

160
erpnext/docs/current/models/stock/delivery_note.html
View File

@@ -834,32 +834,6 @@ Net Total</pre>
<tr > <tr >
<td>54</td> <td>54</td>
<td ><code>column_break_51</code></td>
<td class="info">
Column Break</td>
<td >
</td>
<td></td>
</tr>
<tr >
<td>55</td>
<td ><code>discount_amount</code></td>
<td >
Currency</td>
<td >
Additional Discount Amount
</td>
<td>
<pre>currency</pre>
</td>
</tr>
<tr >
<td>56</td>
<td ><code>base_discount_amount</code></td> <td ><code>base_discount_amount</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -872,8 +846,46 @@ Net Total</pre>
</td> </td>
</tr> </tr>
<tr class="info"> <tr >
<td>55</td>
<td ><code>column_break_51</code></td>
<td class="info">
Column Break</td>
<td >
</td>
<td></td>
</tr>
<tr >
<td>56</td>
<td ><code>additional_discount_percentage</code></td>
<td >
Float</td>
<td >
Additional Discount Percentage
</td>
<td></td>
</tr>
<tr >
<td>57</td> <td>57</td>
<td ><code>discount_amount</code></td>
<td >
Currency</td>
<td >
Additional Discount Amount
</td>
<td>
<pre>currency</pre>
</td>
</tr>
<tr class="info">
<td>58</td>
<td ><code>totals</code></td> <td ><code>totals</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -887,7 +899,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>58</td> <td>59</td>
<td ><code>base_grand_total</code></td> <td ><code>base_grand_total</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -901,7 +913,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>59</td> <td>60</td>
<td ><code>base_rounded_total</code></td> <td ><code>base_rounded_total</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -915,7 +927,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>60</td> <td>61</td>
<td ><code>base_in_words</code></td> <td ><code>base_in_words</code></td>
<td > <td >
Data</td> Data</td>
@@ -928,7 +940,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>61</td> <td>62</td>
<td ><code>column_break3</code></td> <td ><code>column_break3</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -940,7 +952,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>62</td> <td>63</td>
<td ><code>grand_total</code></td> <td ><code>grand_total</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -954,7 +966,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>63</td> <td>64</td>
<td ><code>rounded_total</code></td> <td ><code>rounded_total</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -968,7 +980,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>64</td> <td>65</td>
<td ><code>in_words</code></td> <td ><code>in_words</code></td>
<td > <td >
Data</td> Data</td>
@@ -981,7 +993,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>65</td> <td>66</td>
<td ><code>terms_section_break</code></td> <td ><code>terms_section_break</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -995,7 +1007,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>66</td> <td>67</td>
<td ><code>tc_name</code></td> <td ><code>tc_name</code></td>
<td > <td >
Link</td> Link</td>
@@ -1016,7 +1028,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>67</td> <td>68</td>
<td ><code>terms</code></td> <td ><code>terms</code></td>
<td > <td >
Text Editor</td> Text Editor</td>
@@ -1028,7 +1040,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>68</td> <td>69</td>
<td ><code>transporter_info</code></td> <td ><code>transporter_info</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1042,7 +1054,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>69</td> <td>70</td>
<td ><code>transporter_name</code></td> <td ><code>transporter_name</code></td>
<td > <td >
Data</td> Data</td>
@@ -1054,7 +1066,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>70</td> <td>71</td>
<td ><code>col_break34</code></td> <td ><code>col_break34</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1066,7 +1078,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>71</td> <td>72</td>
<td ><code>lr_no</code></td> <td ><code>lr_no</code></td>
<td > <td >
Data</td> Data</td>
@@ -1078,7 +1090,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>72</td> <td>73</td>
<td ><code>lr_date</code></td> <td ><code>lr_date</code></td>
<td > <td >
Date</td> Date</td>
@@ -1090,7 +1102,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>73</td> <td>74</td>
<td ><code>contact_info</code></td> <td ><code>contact_info</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1104,7 +1116,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>74</td> <td>75</td>
<td class="danger" title="Mandatory"><code>territory</code></td> <td class="danger" title="Mandatory"><code>territory</code></td>
<td > <td >
Link</td> Link</td>
@@ -1125,7 +1137,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>75</td> <td>76</td>
<td ><code>customer_group</code></td> <td ><code>customer_group</code></td>
<td > <td >
Link</td> Link</td>
@@ -1146,7 +1158,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>76</td> <td>77</td>
<td ><code>col_break21</code></td> <td ><code>col_break21</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1158,7 +1170,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>77</td> <td>78</td>
<td ><code>contact_person</code></td> <td ><code>contact_person</code></td>
<td > <td >
Link</td> Link</td>
@@ -1179,7 +1191,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>78</td> <td>79</td>
<td ><code>more_info</code></td> <td ><code>more_info</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1193,7 +1205,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>79</td> <td>80</td>
<td ><code>project_name</code></td> <td ><code>project_name</code></td>
<td > <td >
Link</td> Link</td>
@@ -1215,7 +1227,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>80</td> <td>81</td>
<td ><code>campaign</code></td> <td ><code>campaign</code></td>
<td > <td >
Link</td> Link</td>
@@ -1236,7 +1248,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>81</td> <td>82</td>
<td ><code>source</code></td> <td ><code>source</code></td>
<td > <td >
Select</td> Select</td>
@@ -1259,7 +1271,7 @@ Campaign</pre>
</tr> </tr>
<tr > <tr >
<td>82</td> <td>83</td>
<td ><code>column_break5</code></td> <td ><code>column_break5</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1271,7 +1283,7 @@ Campaign</pre>
</tr> </tr>
<tr > <tr >
<td>83</td> <td>84</td>
<td class="danger" title="Mandatory"><code>posting_time</code></td> <td class="danger" title="Mandatory"><code>posting_time</code></td>
<td > <td >
Time</td> Time</td>
@@ -1284,7 +1296,7 @@ Campaign</pre>
</tr> </tr>
<tr > <tr >
<td>84</td> <td>85</td>
<td class="danger" title="Mandatory"><code>fiscal_year</code></td> <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
<td > <td >
Link</td> Link</td>
@@ -1305,7 +1317,7 @@ Campaign</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>85</td> <td>86</td>
<td ><code>printing_details</code></td> <td ><code>printing_details</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1317,7 +1329,7 @@ Campaign</pre>
</tr> </tr>
<tr > <tr >
<td>86</td> <td>87</td>
<td ><code>letter_head</code></td> <td ><code>letter_head</code></td>
<td > <td >
Link</td> Link</td>
@@ -1338,7 +1350,7 @@ Campaign</pre>
</tr> </tr>
<tr > <tr >
<td>87</td> <td>88</td>
<td ><code>select_print_heading</code></td> <td ><code>select_print_heading</code></td>
<td > <td >
Link</td> Link</td>
@@ -1359,7 +1371,7 @@ Campaign</pre>
</tr> </tr>
<tr > <tr >
<td>88</td> <td>89</td>
<td ><code>column_break_88</code></td> <td ><code>column_break_88</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1371,7 +1383,7 @@ Campaign</pre>
</tr> </tr>
<tr > <tr >
<td>89</td> <td>90</td>
<td ><code>print_without_amount</code></td> <td ><code>print_without_amount</code></td>
<td > <td >
Check</td> Check</td>
@@ -1383,7 +1395,7 @@ Campaign</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>90</td> <td>91</td>
<td ><code>section_break_83</code></td> <td ><code>section_break_83</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1395,7 +1407,7 @@ Campaign</pre>
</tr> </tr>
<tr > <tr >
<td>91</td> <td>92</td>
<td class="danger" title="Mandatory"><code>status</code></td> <td class="danger" title="Mandatory"><code>status</code></td>
<td > <td >
Select</td> Select</td>
@@ -1413,7 +1425,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>92</td> <td>93</td>
<td ><code>per_installed</code></td> <td ><code>per_installed</code></td>
<td > <td >
Percent</td> Percent</td>
@@ -1426,7 +1438,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>93</td> <td>94</td>
<td ><code>installation_status</code></td> <td ><code>installation_status</code></td>
<td > <td >
Select</td> Select</td>
@@ -1438,7 +1450,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>94</td> <td>95</td>
<td ><code>column_break_89</code></td> <td ><code>column_break_89</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1450,7 +1462,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>95</td> <td>96</td>
<td ><code>to_warehouse</code></td> <td ><code>to_warehouse</code></td>
<td > <td >
Link</td> Link</td>
@@ -1472,7 +1484,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>96</td> <td>97</td>
<td ><code>excise_page</code></td> <td ><code>excise_page</code></td>
<td > <td >
Data</td> Data</td>
@@ -1484,7 +1496,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>97</td> <td>98</td>
<td ><code>instructions</code></td> <td ><code>instructions</code></td>
<td > <td >
Text</td> Text</td>
@@ -1496,7 +1508,7 @@ Closed</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>98</td> <td>99</td>
<td ><code>sales_team_section_break</code></td> <td ><code>sales_team_section_break</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1510,7 +1522,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>99</td> <td>100</td>
<td ><code>sales_partner</code></td> <td ><code>sales_partner</code></td>
<td > <td >
Link</td> Link</td>
@@ -1531,7 +1543,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>100</td> <td>101</td>
<td ><code>column_break7</code></td> <td ><code>column_break7</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1543,7 +1555,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>101</td> <td>102</td>
<td ><code>commission_rate</code></td> <td ><code>commission_rate</code></td>
<td > <td >
Float</td> Float</td>
@@ -1555,7 +1567,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>102</td> <td>103</td>
<td ><code>total_commission</code></td> <td ><code>total_commission</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -1569,7 +1581,7 @@ Closed</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>103</td> <td>104</td>
<td ><code>section_break1</code></td> <td ><code>section_break1</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1581,7 +1593,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>104</td> <td>105</td>
<td ><code>sales_team</code></td> <td ><code>sales_team</code></td>
<td > <td >
Table</td> Table</td>

2
erpnext/docs/current/models/stock/price_list.html
View File

@@ -391,8 +391,6 @@ Price List Master
<li> <li>

142
erpnext/docs/current/models/stock/purchase_receipt.html
View File

@@ -706,32 +706,6 @@ Net Total</pre>
<tr > <tr >
<td>47</td> <td>47</td>
<td ><code>column_break_44</code></td>
<td class="info">
Column Break</td>
<td >
</td>
<td></td>
</tr>
<tr >
<td>48</td>
<td ><code>discount_amount</code></td>
<td >
Currency</td>
<td >
Additional Discount Amount
</td>
<td>
<pre>currency</pre>
</td>
</tr>
<tr >
<td>49</td>
<td ><code>base_discount_amount</code></td> <td ><code>base_discount_amount</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -744,8 +718,46 @@ Net Total</pre>
</td> </td>
</tr> </tr>
<tr class="info"> <tr >
<td>48</td>
<td ><code>column_break_44</code></td>
<td class="info">
Column Break</td>
<td >
</td>
<td></td>
</tr>
<tr >
<td>49</td>
<td ><code>additional_discount_percentage</code></td>
<td >
Float</td>
<td >
Additional Discount Percentage
</td>
<td></td>
</tr>
<tr >
<td>50</td> <td>50</td>
<td ><code>discount_amount</code></td>
<td >
Currency</td>
<td >
Additional Discount Amount
</td>
<td>
<pre>currency</pre>
</td>
</tr>
<tr class="info">
<td>51</td>
<td ><code>section_break_46</code></td> <td ><code>section_break_46</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -757,7 +769,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>51</td> <td>52</td>
<td ><code>base_grand_total</code></td> <td ><code>base_grand_total</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -771,7 +783,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>52</td> <td>53</td>
<td ><code>base_in_words</code></td> <td ><code>base_in_words</code></td>
<td > <td >
Data</td> Data</td>
@@ -783,7 +795,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>53</td> <td>54</td>
<td ><code>base_rounded_total</code></td> <td ><code>base_rounded_total</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -797,7 +809,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>54</td> <td>55</td>
<td ><code>column_break_50</code></td> <td ><code>column_break_50</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -809,7 +821,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>55</td> <td>56</td>
<td ><code>grand_total</code></td> <td ><code>grand_total</code></td>
<td > <td >
Currency</td> Currency</td>
@@ -823,7 +835,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>56</td> <td>57</td>
<td ><code>in_words</code></td> <td ><code>in_words</code></td>
<td > <td >
Data</td> Data</td>
@@ -835,7 +847,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>57</td> <td>58</td>
<td ><code>terms_section_break</code></td> <td ><code>terms_section_break</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -849,7 +861,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>58</td> <td>59</td>
<td ><code>tc_name</code></td> <td ><code>tc_name</code></td>
<td > <td >
Link</td> Link</td>
@@ -870,7 +882,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>59</td> <td>60</td>
<td ><code>terms</code></td> <td ><code>terms</code></td>
<td > <td >
Text Editor</td> Text Editor</td>
@@ -882,7 +894,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>60</td> <td>61</td>
<td ><code>contact_section</code></td> <td ><code>contact_section</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -896,7 +908,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>61</td> <td>62</td>
<td ><code>supplier_address</code></td> <td ><code>supplier_address</code></td>
<td > <td >
Link</td> Link</td>
@@ -917,7 +929,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>62</td> <td>63</td>
<td ><code>column_break_57</code></td> <td ><code>column_break_57</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -929,7 +941,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>63</td> <td>64</td>
<td ><code>contact_person</code></td> <td ><code>contact_person</code></td>
<td > <td >
Link</td> Link</td>
@@ -950,7 +962,7 @@ Net Total</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>64</td> <td>65</td>
<td ><code>raw_material_details</code></td> <td ><code>raw_material_details</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -964,7 +976,7 @@ Net Total</pre>
</tr> </tr>
<tr > <tr >
<td>65</td> <td>66</td>
<td ><code>is_subcontracted</code></td> <td ><code>is_subcontracted</code></td>
<td > <td >
Select</td> Select</td>
@@ -979,7 +991,7 @@ Yes</pre>
</tr> </tr>
<tr > <tr >
<td>66</td> <td>67</td>
<td ><code>supplier_warehouse</code></td> <td ><code>supplier_warehouse</code></td>
<td > <td >
Link</td> Link</td>
@@ -1000,7 +1012,7 @@ Yes</pre>
</tr> </tr>
<tr > <tr >
<td>67</td> <td>68</td>
<td ><code>supplied_items</code></td> <td ><code>supplied_items</code></td>
<td > <td >
Table</td> Table</td>
@@ -1021,7 +1033,7 @@ Yes</pre>
</tr> </tr>
<tr > <tr >
<td>68</td> <td>69</td>
<td ><code>bill_no</code></td> <td ><code>bill_no</code></td>
<td > <td >
Data</td> Data</td>
@@ -1033,7 +1045,7 @@ Yes</pre>
</tr> </tr>
<tr > <tr >
<td>69</td> <td>70</td>
<td ><code>bill_date</code></td> <td ><code>bill_date</code></td>
<td > <td >
Date</td> Date</td>
@@ -1045,7 +1057,7 @@ Yes</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>70</td> <td>71</td>
<td ><code>more_info</code></td> <td ><code>more_info</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1059,7 +1071,7 @@ Yes</pre>
</tr> </tr>
<tr > <tr >
<td>71</td> <td>72</td>
<td class="danger" title="Mandatory"><code>status</code></td> <td class="danger" title="Mandatory"><code>status</code></td>
<td > <td >
Select</td> Select</td>
@@ -1077,7 +1089,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>72</td> <td>73</td>
<td ><code>rejected_warehouse</code></td> <td ><code>rejected_warehouse</code></td>
<td > <td >
Link</td> Link</td>
@@ -1099,7 +1111,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>73</td> <td>74</td>
<td ><code>amended_from</code></td> <td ><code>amended_from</code></td>
<td > <td >
Link</td> Link</td>
@@ -1120,7 +1132,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>74</td> <td>75</td>
<td ><code>range</code></td> <td ><code>range</code></td>
<td > <td >
Data</td> Data</td>
@@ -1132,7 +1144,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>75</td> <td>76</td>
<td ><code>column_break4</code></td> <td ><code>column_break4</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1144,7 +1156,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>76</td> <td>77</td>
<td class="danger" title="Mandatory"><code>company</code></td> <td class="danger" title="Mandatory"><code>company</code></td>
<td > <td >
Link</td> Link</td>
@@ -1165,7 +1177,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>77</td> <td>78</td>
<td class="danger" title="Mandatory"><code>fiscal_year</code></td> <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
<td > <td >
Link</td> Link</td>
@@ -1186,7 +1198,7 @@ Closed</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>78</td> <td>79</td>
<td ><code>printing_settings</code></td> <td ><code>printing_settings</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1198,7 +1210,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>79</td> <td>80</td>
<td ><code>letter_head</code></td> <td ><code>letter_head</code></td>
<td > <td >
Link</td> Link</td>
@@ -1219,7 +1231,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>80</td> <td>81</td>
<td ><code>select_print_heading</code></td> <td ><code>select_print_heading</code></td>
<td > <td >
Link</td> Link</td>
@@ -1240,7 +1252,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>81</td> <td>82</td>
<td ><code>other_details</code></td> <td ><code>other_details</code></td>
<td > <td >
HTML</td> HTML</td>
@@ -1252,7 +1264,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>82</td> <td>83</td>
<td ><code>instructions</code></td> <td ><code>instructions</code></td>
<td > <td >
Small Text</td> Small Text</td>
@@ -1264,7 +1276,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>83</td> <td>84</td>
<td ><code>remarks</code></td> <td ><code>remarks</code></td>
<td > <td >
Small Text</td> Small Text</td>
@@ -1276,7 +1288,7 @@ Closed</pre>
</tr> </tr>
<tr class="info"> <tr class="info">
<td>84</td> <td>85</td>
<td ><code>transporter_info</code></td> <td ><code>transporter_info</code></td>
<td > <td >
Section Break</td> Section Break</td>
@@ -1290,7 +1302,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>85</td> <td>86</td>
<td ><code>transporter_name</code></td> <td ><code>transporter_name</code></td>
<td > <td >
Data</td> Data</td>
@@ -1302,7 +1314,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>86</td> <td>87</td>
<td ><code>column_break5</code></td> <td ><code>column_break5</code></td>
<td class="info"> <td class="info">
Column Break</td> Column Break</td>
@@ -1314,7 +1326,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>87</td> <td>88</td>
<td ><code>lr_no</code></td> <td ><code>lr_no</code></td>
<td > <td >
Data</td> Data</td>
@@ -1326,7 +1338,7 @@ Closed</pre>
</tr> </tr>
<tr > <tr >
<td>88</td> <td>89</td>
<td ><code>lr_date</code></td> <td ><code>lr_date</code></td>
<td > <td >
Date</td> Date</td>

21
erpnext/docs/current/models/stock/serial_no.html
View File

@@ -353,17 +353,20 @@ Distinct unit of an Item
<td>22</td> <td>22</td>
<td ><code>delivery_document_type</code></td> <td ><code>delivery_document_type</code></td>
<td > <td >
Select</td> Link</td>
<td > <td >
Delivery Document Type Delivery Document Type
</td> </td>
<td> <td>
<pre>
Delivery Note
Sales Invoice
Stock Entry
Purchase Receipt</pre> <a href="https://frappe.github.io/erpnext/current/models/core/doctype">DocType</a>
</td> </td>
</tr> </tr>
@@ -371,12 +374,14 @@ Purchase Receipt</pre>
<td>23</td> <td>23</td>
<td ><code>delivery_document_no</code></td> <td ><code>delivery_document_no</code></td>
<td > <td >
Data</td> Dynamic Link</td>
<td > <td >
Delivery Document No Delivery Document No
</td> </td>
<td></td> <td>
<pre>delivery_document_type</pre>
</td>
</tr> </tr>
<tr > <tr >

2
erpnext/docs/current/models/stock/warehouse.html
View File

@@ -629,8 +629,6 @@ A logical Warehouse against which stock entries are made.
<li> <li>

4
erpnext/docs/current/models/utilities/contact.html
View File

@@ -588,6 +588,10 @@ Replied</pre>
<li> <li>

8
erpnext/docs/user/videos/learn/index.md
View File

@@ -223,8 +223,12 @@
<li><a href="{{docs_base_url}}/user/videos/learn/publish-items-on-website.html"> <li><a href="{{docs_base_url}}/user/videos/learn/publish-items-on-website.html">
Publish Items on Website</a> Publish Items on Website</a>
<span class="text-muted pull-right">5:14</span> <span class="text-muted pull-right">5:14</span>
</li><li><a href="{{docs_base_url}}/user/videos/learn/shopping-cart.html">
Shopping Cart</a>
<span class="text-muted pull-right">6:32</span>
</li> </li>
</ul> </ul>
<br>
<h3>Customization</h3> <h3>Customization</h3>
<ul class="list-unstyled video-list"> <ul class="list-unstyled video-list">
<li><a href="{{docs_base_url}}/user/videos/learn/field-customization.html"> <li><a href="{{docs_base_url}}/user/videos/learn/field-customization.html">
@@ -235,6 +239,10 @@
Workflow</a> Workflow</a>
<span class="text-muted pull-right">3:38</span> <span class="text-muted pull-right">3:38</span>
</li> </li>
<li><a href="{{docs_base_url}}/user/videos/learn/report-builder.html">
Report Builder</a>
<span class="text-muted pull-right">4:27</span>
</li>
</ul> </ul>
</div> </div>
<div style="height: 70px;"></div> <div style="height: 70px;"></div>

2
erpnext/docs/user/videos/learn/index.txt
View File

@@ -38,3 +38,5 @@ advance-payments
drop-ship drop-ship
file-manager file-manager
publish-items-on-website publish-items-on-website
shopping-cart
report-builder

2
erpnext/docs/user/videos/learn/publish-items-on-website.md
View File

@@ -1,4 +1,4 @@
# Publish Item on Website # Publish Items on Website
<iframe width="660" height="371" src="https://www.youtube.com/embed/W31LBBNzbgc" frameborder="0" allowfullscreen></iframe> <iframe width="660" height="371" src="https://www.youtube.com/embed/W31LBBNzbgc" frameborder="0" allowfullscreen></iframe>

7
erpnext/docs/user/videos/learn/report-builder.md Normal file
View File

@@ -0,0 +1,7 @@
# Report Builder
<iframe width="660" height="371" src="https://www.youtube.com/embed/y0o5iYZOioU" frameborder="0" allowfullscreen></iframe>
**Duration: 4:27**
This tutorial covers creating custom reports in ERPNext using Report Builder.

7
erpnext/docs/user/videos/learn/shopping-cart.md Normal file
View File

@@ -0,0 +1,7 @@
# Shopping Cart
<iframe width="660" height="371" src="https://www.youtube.com/embed/xkrYO-KFukM" frameborder="0" allowfullscreen></iframe>
**Duration: 6:32**
ERPNext has Customers Portal. It allos Customer to login, and place new orderes using shopping cart. From Customer Portal, customer can also track progress on their existing orders, view history of transactions and communicate via Issues.