Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Nabin Hait 2015-12-10 14:41:02 +05:30
commit 09e5306825
37 changed files with 602 additions and 568 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__version__.py
View File

@ -1,2 +1,2 @@
from __future__ import unicode_literals
__version__ = '6.12.8'
__version__ = '6.12.9'

2
erpnext/change_log/v6/v6_12_9.md Normal file
View File

@ -0,0 +1,2 @@
- Task status will be automatically set to "Overdue" when it crosses expected end date.
- Task notification will only be for overdue tasks, not open tasks.

2
erpnext/docs/current/api/controllers/erpnext.controllers.status_updater.html
View File

@ -75,7 +75,7 @@ Installation Note: Update Installed Qty, Update Percent Qty and Validate over in
<a name="set_status" href="#set_status" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
<b>set_status</b>
<i class="text-muted">(self, update=False, status=None)</i>
<i class="text-muted">(self, update=False, status=None, update_modified=True)</i>
</p>
<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
</div>

16
erpnext/docs/current/api/shopping_cart/erpnext.shopping_cart.cart.html
View File

@ -278,6 +278,22 @@
<p class="docs-attr-name">
<a name="erpnext.shopping_cart.cart.set_customer_in_address" href="#erpnext.shopping_cart.cart.set_customer_in_address" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
erpnext.shopping_cart.cart.<b>set_customer_in_address</b>
<i class="text-muted">(doc, method=None)</i>
</p>
<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
</div>
<br>
<p class="docs-attr-name">
<a name="erpnext.shopping_cart.cart.set_price_list_and_rate" href="#erpnext.shopping_cart.cart.set_price_list_and_rate" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>

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

@ -35,7 +35,7 @@
Version
</td>
<td>
<code>6.12.3</code>
<code>6.12.6</code>
</td>
</tr>
</table>

12
erpnext/docs/current/models/accounts/bank_reconciliation_detail.html
View File

@ -159,6 +159,18 @@
<td></td>
</tr>
<tr >
<td>10</td>
<td ><code>data_10</code></td>
<td >
Data</td>
<td >
</td>
<td></td>
</tr>
</tbody>
</table>

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

@ -429,20 +429,8 @@ PINV-RET-</pre>
</td>
</tr>
<tr >
<td>27</td>
<td ><code>get_items_from_product_bundle</code></td>
<td >
Button</td>
<td >
Get Items from Product Bundle
</td>
<td></td>
</tr>
<tr class="info">
<td>28</td>
<td>27</td>
<td ><code>section_break_26</code></td>
<td >
Section Break</td>
@ -454,7 +442,7 @@ PINV-RET-</pre>
</tr>
<tr >
<td>29</td>
<td>28</td>
<td ><code>base_total</code></td>
<td >
Currency</td>
@ -468,7 +456,7 @@ PINV-RET-</pre>
</tr>
<tr >
<td>30</td>
<td>29</td>
<td ><code>base_net_total</code></td>
<td >
Currency</td>
@ -482,7 +470,7 @@ PINV-RET-</pre>
</tr>
<tr >
<td>31</td>
<td>30</td>
<td ><code>column_break_28</code></td>
<td class="info">
Column Break</td>
@ -494,7 +482,7 @@ PINV-RET-</pre>
</tr>
<tr >
<td>32</td>
<td>31</td>
<td ><code>total</code></td>
<td >
Currency</td>
@ -508,7 +496,7 @@ PINV-RET-</pre>
</tr>
<tr >
<td>33</td>
<td>32</td>
<td ><code>net_total</code></td>
<td >
Currency</td>
@ -522,7 +510,7 @@ PINV-RET-</pre>
</tr>
<tr class="info">
<td>34</td>
<td>33</td>
<td ><code>taxes_section</code></td>
<td >
Section Break</td>
@ -536,7 +524,7 @@ PINV-RET-</pre>
</tr>
<tr >
<td>35</td>
<td>34</td>
<td ><code>taxes_and_charges</code></td>
<td >
Link</td>
@ -557,7 +545,7 @@ PINV-RET-</pre>
</tr>
<tr >
<td>36</td>
<td>35</td>
<td ><code>taxes</code></td>
<td >
Table</td>
@ -578,7 +566,7 @@ PINV-RET-</pre>
</tr>
<tr >
<td>37</td>
<td>36</td>
<td ><code>other_charges_calculation</code></td>
<td >
HTML</td>
@ -590,7 +578,7 @@ PINV-RET-</pre>
</tr>
<tr class="info">
<td>38</td>
<td>37</td>
<td ><code>totals</code></td>
<td >
Section Break</td>
@ -604,7 +592,7 @@ PINV-RET-</pre>
</tr>
<tr >
<td>39</td>
<td>38</td>
<td ><code>base_taxes_and_charges_added</code></td>
<td >
Currency</td>
@ -618,7 +606,7 @@ PINV-RET-</pre>
</tr>
<tr >
<td>40</td>
<td>39</td>
<td ><code>base_taxes_and_charges_deducted</code></td>
<td >
Currency</td>
@ -632,7 +620,7 @@ PINV-RET-</pre>
</tr>
<tr >
<td>41</td>
<td>40</td>
<td ><code>base_total_taxes_and_charges</code></td>
<td >
Currency</td>
@ -646,7 +634,7 @@ PINV-RET-</pre>
</tr>
<tr >
<td>42</td>
<td>41</td>
<td ><code>column_break_40</code></td>
<td class="info">
Column Break</td>
@ -658,7 +646,7 @@ PINV-RET-</pre>
</tr>
<tr >
<td>43</td>
<td>42</td>
<td ><code>taxes_and_charges_added</code></td>
<td >
Currency</td>
@ -672,7 +660,7 @@ PINV-RET-</pre>
</tr>
<tr >
<td>44</td>
<td>43</td>
<td ><code>taxes_and_charges_deducted</code></td>
<td >
Currency</td>
@ -686,7 +674,7 @@ PINV-RET-</pre>
</tr>
<tr >
<td>45</td>
<td>44</td>
<td ><code>total_taxes_and_charges</code></td>
<td >
Currency</td>
@ -700,7 +688,7 @@ PINV-RET-</pre>
</tr>
<tr class="info">
<td>46</td>
<td>45</td>
<td ><code>section_break_44</code></td>
<td >
Section Break</td>
@ -712,7 +700,7 @@ PINV-RET-</pre>
</tr>
<tr >
<td>47</td>
<td>46</td>
<td ><code>apply_discount_on</code></td>
<td >
Select</td>
@ -728,7 +716,7 @@ Net Total</pre>
</tr>
<tr >
<td>48</td>
<td>47</td>
<td ><code>column_break_46</code></td>
<td class="info">
Column Break</td>
@ -740,7 +728,7 @@ Net Total</pre>
</tr>
<tr >
<td>49</td>
<td>48</td>
<td ><code>discount_amount</code></td>
<td >
Currency</td>
@ -754,7 +742,7 @@ Net Total</pre>
</tr>
<tr >
<td>50</td>
<td>49</td>
<td ><code>base_discount_amount</code></td>
<td >
Currency</td>
@ -768,7 +756,7 @@ Net Total</pre>
</tr>
<tr class="info">
<td>51</td>
<td>50</td>
<td ><code>section_break_49</code></td>
<td >
Section Break</td>
@ -780,7 +768,7 @@ Net Total</pre>
</tr>
<tr >
<td>52</td>
<td>51</td>
<td ><code>base_grand_total</code></td>
<td >
Currency</td>
@ -794,7 +782,7 @@ Net Total</pre>
</tr>
<tr >
<td>53</td>
<td>52</td>
<td ><code>base_in_words</code></td>
<td >
Data</td>
@ -806,7 +794,7 @@ Net Total</pre>
</tr>
<tr >
<td>54</td>
<td>53</td>
<td ><code>column_break8</code></td>
<td class="info">
Column Break</td>
@ -818,7 +806,7 @@ Net Total</pre>
</tr>
<tr >
<td>55</td>
<td>54</td>
<td ><code>grand_total</code></td>
<td >
Currency</td>
@ -832,7 +820,7 @@ Net Total</pre>
</tr>
<tr >
<td>56</td>
<td>55</td>
<td ><code>in_words</code></td>
<td >
Data</td>
@ -844,7 +832,7 @@ Net Total</pre>
</tr>
<tr >
<td>57</td>
<td>56</td>
<td ><code>total_advance</code></td>
<td >
Currency</td>
@ -858,7 +846,7 @@ Net Total</pre>
</tr>
<tr >
<td>58</td>
<td>57</td>
<td ><code>outstanding_amount</code></td>
<td >
Currency</td>
@ -872,7 +860,7 @@ Net Total</pre>
</tr>
<tr class="info">
<td>59</td>
<td>58</td>
<td ><code>write_off</code></td>
<td >
Section Break</td>
@ -884,7 +872,7 @@ Net Total</pre>
</tr>
<tr >
<td>60</td>
<td>59</td>
<td ><code>write_off_amount</code></td>
<td >
Currency</td>
@ -898,7 +886,7 @@ Net Total</pre>
</tr>
<tr >
<td>61</td>
<td>60</td>
<td ><code>base_write_off_amount</code></td>
<td >
Currency</td>
@ -912,7 +900,7 @@ Net Total</pre>
</tr>
<tr >
<td>62</td>
<td>61</td>
<td ><code>column_break_61</code></td>
<td class="info">
Column Break</td>
@ -924,7 +912,7 @@ Net Total</pre>
</tr>
<tr >
<td>63</td>
<td>62</td>
<td ><code>write_off_account</code></td>
<td >
Link</td>
@ -945,7 +933,7 @@ Net Total</pre>
</tr>
<tr >
<td>64</td>
<td>63</td>
<td ><code>write_off_cost_center</code></td>
<td >
Link</td>
@ -966,7 +954,7 @@ Net Total</pre>
</tr>
<tr class="info">
<td>65</td>
<td>64</td>
<td ><code>advances_section</code></td>
<td >
Section Break</td>
@ -980,7 +968,7 @@ Net Total</pre>
</tr>
<tr >
<td>66</td>
<td>65</td>
<td ><code>get_advances_paid</code></td>
<td >
Button</td>
@ -994,7 +982,7 @@ Net Total</pre>
</tr>
<tr >
<td>67</td>
<td>66</td>
<td ><code>advances</code></td>
<td >
Table</td>
@ -1015,7 +1003,7 @@ Net Total</pre>
</tr>
<tr class="info">
<td>68</td>
<td>67</td>
<td ><code>terms_section_break</code></td>
<td >
Section Break</td>
@ -1029,7 +1017,7 @@ Net Total</pre>
</tr>
<tr >
<td>69</td>
<td>68</td>
<td ><code>tc_name</code></td>
<td >
Link</td>
@ -1050,7 +1038,7 @@ Net Total</pre>
</tr>
<tr >
<td>70</td>
<td>69</td>
<td ><code>terms</code></td>
<td >
Text Editor</td>
@ -1062,7 +1050,7 @@ Net Total</pre>
</tr>
<tr class="info">
<td>71</td>
<td>70</td>
<td ><code>contact_section</code></td>
<td >
Section Break</td>
@ -1076,7 +1064,7 @@ Net Total</pre>
</tr>
<tr >
<td>72</td>
<td>71</td>
<td ><code>supplier_address</code></td>
<td >
Link</td>
@ -1097,7 +1085,7 @@ Net Total</pre>
</tr>
<tr >
<td>73</td>
<td>72</td>
<td ><code>col_break23</code></td>
<td class="info">
Column Break</td>
@ -1109,7 +1097,7 @@ Net Total</pre>
</tr>
<tr >
<td>74</td>
<td>73</td>
<td ><code>contact_person</code></td>
<td >
Link</td>
@ -1130,7 +1118,7 @@ Net Total</pre>
</tr>
<tr class="info">
<td>75</td>
<td>74</td>
<td ><code>printing_settings</code></td>
<td >
Section Break</td>
@ -1142,7 +1130,7 @@ Net Total</pre>
</tr>
<tr >
<td>76</td>
<td>75</td>
<td ><code>letter_head</code></td>
<td >
Link</td>
@ -1163,7 +1151,7 @@ Net Total</pre>
</tr>
<tr >
<td>77</td>
<td>76</td>
<td ><code>select_print_heading</code></td>
<td >
Link</td>
@ -1184,7 +1172,7 @@ Net Total</pre>
</tr>
<tr class="info">
<td>78</td>
<td>77</td>
<td ><code>more_info</code></td>
<td >
Section Break</td>
@ -1198,7 +1186,7 @@ Net Total</pre>
</tr>
<tr >
<td>79</td>
<td>78</td>
<td class="danger" title="Mandatory"><code>credit_to</code></td>
<td >
Link</td>
@ -1219,7 +1207,7 @@ Net Total</pre>
</tr>
<tr >
<td>80</td>
<td>79</td>
<td ><code>party_account_currency</code></td>
<td >
Link</td>
@ -1240,7 +1228,7 @@ Net Total</pre>
</tr>
<tr >
<td>81</td>
<td>80</td>
<td ><code>is_opening</code></td>
<td >
Select</td>
@ -1255,7 +1243,7 @@ Yes</pre>
</tr>
<tr >
<td>82</td>
<td>81</td>
<td ><code>due_date</code></td>
<td >
Date</td>
@ -1267,7 +1255,7 @@ Yes</pre>
</tr>
<tr >
<td>83</td>
<td>82</td>
<td ><code>against_expense_account</code></td>
<td >
Small Text</td>
@ -1279,7 +1267,7 @@ Yes</pre>
</tr>
<tr >
<td>84</td>
<td>83</td>
<td ><code>column_break_63</code></td>
<td class="info">
Column Break</td>
@ -1291,7 +1279,7 @@ Yes</pre>
</tr>
<tr >
<td>85</td>
<td>84</td>
<td ><code>mode_of_payment</code></td>
<td >
Link</td>
@ -1312,7 +1300,7 @@ Yes</pre>
</tr>
<tr >
<td>86</td>
<td>85</td>
<td ><code>fiscal_year</code></td>
<td >
Link</td>
@ -1333,7 +1321,7 @@ Yes</pre>
</tr>
<tr >
<td>87</td>
<td>86</td>
<td ><code>remarks</code></td>
<td >
Small Text</td>
@ -1345,7 +1333,7 @@ Yes</pre>
</tr>
<tr class="info">
<td>88</td>
<td>87</td>
<td ><code>recurring_invoice</code></td>
<td >
Section Break</td>
@ -1359,7 +1347,7 @@ Yes</pre>
</tr>
<tr >
<td>89</td>
<td>88</td>
<td ><code>is_recurring</code></td>
<td >
Check</td>
@ -1371,7 +1359,7 @@ Yes</pre>
</tr>
<tr >
<td>90</td>
<td>89</td>
<td ><code>recurring_type</code></td>
<td >
Select</td>
@ -1389,7 +1377,7 @@ Yearly</pre>
</tr>
<tr >
<td>91</td>
<td>90</td>
<td ><code>from_date</code></td>
<td >
Date</td>
@ -1402,7 +1390,7 @@ Yearly</pre>
</tr>
<tr >
<td>92</td>
<td>91</td>
<td ><code>to_date</code></td>
<td >
Date</td>
@ -1415,7 +1403,7 @@ Yearly</pre>
</tr>
<tr >
<td>93</td>
<td>92</td>
<td ><code>repeat_on_day_of_month</code></td>
<td >
Int</td>
@ -1428,7 +1416,7 @@ Yearly</pre>
</tr>
<tr >
<td>94</td>
<td>93</td>
<td ><code>end_date</code></td>
<td >
Date</td>
@ -1441,7 +1429,7 @@ Yearly</pre>
</tr>
<tr >
<td>95</td>
<td>94</td>
<td ><code>column_break_82</code></td>
<td class="info">
Column Break</td>
@ -1453,7 +1441,7 @@ Yearly</pre>
</tr>
<tr >
<td>96</td>
<td>95</td>
<td ><code>next_date</code></td>
<td >
Date</td>
@ -1466,7 +1454,7 @@ Yearly</pre>
</tr>
<tr >
<td>97</td>
<td>96</td>
<td ><code>recurring_id</code></td>
<td >
Data</td>
@ -1479,7 +1467,7 @@ Yearly</pre>
</tr>
<tr >
<td>98</td>
<td>97</td>
<td ><code>notification_email_address</code></td>
<td >
Small Text</td>
@ -1492,7 +1480,7 @@ Yearly</pre>
</tr>
<tr >
<td>99</td>
<td>98</td>
<td ><code>recurring_print_format</code></td>
<td >
Link</td>

9
erpnext/docs/current/models/accounts/purchase_taxes_and_charges_template.html
View File

@ -235,15 +235,6 @@ The tax rate you define here will be the standard tax rate for all **Items**. If
<li>
<a href="https://frappe.github.io/erpnext/current/models/buying/supplier">Supplier</a>
</li>
<li>

9
erpnext/docs/current/models/accounts/sales_taxes_and_charges_template.html
View File

@ -227,15 +227,6 @@ The tax rate you define here will be the standard tax rate for all **Items**. If
<li>
<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
</li>
<li>
<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note">Delivery Note</a>
</li>

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

@ -547,32 +547,8 @@ Yes</pre>
</td>
</tr>
<tr >
<td>35</td>
<td ><code>get_last_purchase_rate</code></td>
<td >
Button</td>
<td >
Get Last Purchase Rate
</td>
<td></td>
</tr>
<tr >
<td>36</td>
<td ><code>get_items_from_product_bundle</code></td>
<td >
Button</td>
<td >
Get Items from Product Bundle
</td>
<td></td>
</tr>
<tr class="info">
<td>37</td>
<td>35</td>
<td ><code>sb_last_purchase</code></td>
<td >
Section Break</td>
@ -584,7 +560,7 @@ Yes</pre>
</tr>
<tr >
<td>38</td>
<td>36</td>
<td ><code>base_total</code></td>
<td >
Currency</td>
@ -598,7 +574,7 @@ Yes</pre>
</tr>
<tr >
<td>39</td>
<td>37</td>
<td ><code>base_net_total</code></td>
<td >
Currency</td>
@ -612,7 +588,7 @@ Yes</pre>
</tr>
<tr >
<td>40</td>
<td>38</td>
<td ><code>column_break_26</code></td>
<td class="info">
Column Break</td>
@ -624,7 +600,7 @@ Yes</pre>
</tr>
<tr >
<td>41</td>
<td>39</td>
<td ><code>total</code></td>
<td >
Currency</td>
@ -638,7 +614,7 @@ Yes</pre>
</tr>
<tr >
<td>42</td>
<td>40</td>
<td ><code>net_total</code></td>
<td >
Currency</td>
@ -652,7 +628,7 @@ Yes</pre>
</tr>
<tr class="info">
<td>43</td>
<td>41</td>
<td ><code>taxes_section</code></td>
<td >
Section Break</td>
@ -666,7 +642,7 @@ Yes</pre>
</tr>
<tr >
<td>44</td>
<td>42</td>
<td ><code>taxes_and_charges</code></td>
<td >
Link</td>
@ -687,7 +663,7 @@ Yes</pre>
</tr>
<tr >
<td>45</td>
<td>43</td>
<td ><code>taxes</code></td>
<td >
Table</td>
@ -708,7 +684,7 @@ Yes</pre>
</tr>
<tr >
<td>46</td>
<td>44</td>
<td ><code>other_charges_calculation</code></td>
<td >
HTML</td>
@ -720,7 +696,7 @@ Yes</pre>
</tr>
<tr class="info">
<td>47</td>
<td>45</td>
<td ><code>totals</code></td>
<td >
Section Break</td>
@ -734,7 +710,7 @@ Yes</pre>
</tr>
<tr >
<td>48</td>
<td>46</td>
<td ><code>base_taxes_and_charges_added</code></td>
<td >
Currency</td>
@ -748,7 +724,7 @@ Yes</pre>
</tr>
<tr >
<td>49</td>
<td>47</td>
<td ><code>base_taxes_and_charges_deducted</code></td>
<td >
Currency</td>
@ -762,7 +738,7 @@ Yes</pre>
</tr>
<tr >
<td>50</td>
<td>48</td>
<td ><code>base_total_taxes_and_charges</code></td>
<td >
Currency</td>
@ -776,7 +752,7 @@ Yes</pre>
</tr>
<tr >
<td>51</td>
<td>49</td>
<td ><code>column_break_39</code></td>
<td class="info">
Column Break</td>
@ -788,7 +764,7 @@ Yes</pre>
</tr>
<tr >
<td>52</td>
<td>50</td>
<td ><code>taxes_and_charges_added</code></td>
<td >
Currency</td>
@ -802,7 +778,7 @@ Yes</pre>
</tr>
<tr >
<td>53</td>
<td>51</td>
<td ><code>taxes_and_charges_deducted</code></td>
<td >
Currency</td>
@ -816,7 +792,7 @@ Yes</pre>
</tr>
<tr >
<td>54</td>
<td>52</td>
<td ><code>total_taxes_and_charges</code></td>
<td >
Currency</td>
@ -830,7 +806,7 @@ Yes</pre>
</tr>
<tr class="info">
<td>55</td>
<td>53</td>
<td ><code>discount_section</code></td>
<td >
Section Break</td>
@ -842,7 +818,7 @@ Yes</pre>
</tr>
<tr >
<td>56</td>
<td>54</td>
<td ><code>apply_discount_on</code></td>
<td >
Select</td>
@ -858,7 +834,7 @@ Net Total</pre>
</tr>
<tr >
<td>57</td>
<td>55</td>
<td ><code>column_break_45</code></td>
<td class="info">
Column Break</td>
@ -870,7 +846,7 @@ Net Total</pre>
</tr>
<tr >
<td>58</td>
<td>56</td>
<td ><code>discount_amount</code></td>
<td >
Currency</td>
@ -884,7 +860,7 @@ Net Total</pre>
</tr>
<tr >
<td>59</td>
<td>57</td>
<td ><code>base_discount_amount</code></td>
<td >
Currency</td>
@ -898,7 +874,7 @@ Net Total</pre>
</tr>
<tr class="info">
<td>60</td>
<td>58</td>
<td ><code>totals_section</code></td>
<td >
Section Break</td>
@ -910,7 +886,7 @@ Net Total</pre>
</tr>
<tr >
<td>61</td>
<td>59</td>
<td ><code>base_grand_total</code></td>
<td >
Currency</td>
@ -924,7 +900,7 @@ Net Total</pre>
</tr>
<tr >
<td>62</td>
<td>60</td>
<td ><code>base_in_words</code></td>
<td >
Data</td>
@ -937,7 +913,7 @@ Net Total</pre>
</tr>
<tr >
<td>63</td>
<td>61</td>
<td ><code>base_rounded_total</code></td>
<td >
Currency</td>
@ -951,7 +927,7 @@ Net Total</pre>
</tr>
<tr >
<td>64</td>
<td>62</td>
<td ><code>advance_paid</code></td>
<td >
Currency</td>
@ -963,7 +939,7 @@ Net Total</pre>
</tr>
<tr >
<td>65</td>
<td>63</td>
<td ><code>column_break4</code></td>
<td class="info">
Column Break</td>
@ -975,7 +951,7 @@ Net Total</pre>
</tr>
<tr >
<td>66</td>
<td>64</td>
<td ><code>grand_total</code></td>
<td >
Currency</td>
@ -989,7 +965,7 @@ Net Total</pre>
</tr>
<tr >
<td>67</td>
<td>65</td>
<td ><code>in_words</code></td>
<td >
Data</td>
@ -1001,7 +977,7 @@ Net Total</pre>
</tr>
<tr class="info">
<td>68</td>
<td>66</td>
<td ><code>terms_section_break</code></td>
<td >
Section Break</td>
@ -1015,7 +991,7 @@ Net Total</pre>
</tr>
<tr >
<td>69</td>
<td>67</td>
<td ><code>tc_name</code></td>
<td >
Link</td>
@ -1036,7 +1012,7 @@ Net Total</pre>
</tr>
<tr >
<td>70</td>
<td>68</td>
<td ><code>terms</code></td>
<td >
Text Editor</td>
@ -1048,7 +1024,7 @@ Net Total</pre>
</tr>
<tr class="info">
<td>71</td>
<td>69</td>
<td ><code>contact_section</code></td>
<td >
Section Break</td>
@ -1062,7 +1038,7 @@ Net Total</pre>
</tr>
<tr >
<td>72</td>
<td>70</td>
<td ><code>supplier_address</code></td>
<td >
Link</td>
@ -1083,7 +1059,7 @@ Net Total</pre>
</tr>
<tr >
<td>73</td>
<td>71</td>
<td ><code>cb_contact</code></td>
<td class="info">
Column Break</td>
@ -1095,7 +1071,7 @@ Net Total</pre>
</tr>
<tr >
<td>74</td>
<td>72</td>
<td ><code>contact_person</code></td>
<td >
Link</td>
@ -1116,7 +1092,7 @@ Net Total</pre>
</tr>
<tr class="info">
<td>75</td>
<td>73</td>
<td ><code>more_info</code></td>
<td >
Section Break</td>
@ -1128,7 +1104,7 @@ Net Total</pre>
</tr>
<tr >
<td>76</td>
<td>74</td>
<td class="danger" title="Mandatory"><code>status</code></td>
<td >
Select</td>
@ -1151,7 +1127,7 @@ Delivered</pre>
</tr>
<tr >
<td>77</td>
<td>75</td>
<td class="danger" title="Mandatory"><code>fiscal_year</code></td>
<td >
Link</td>
@ -1172,7 +1148,7 @@ Delivered</pre>
</tr>
<tr >
<td>78</td>
<td>76</td>
<td ><code>ref_sq</code></td>
<td >
Data</td>
@ -1184,7 +1160,7 @@ Delivered</pre>
</tr>
<tr >
<td>79</td>
<td>77</td>
<td ><code>column_break_74</code></td>
<td class="info">
Column Break</td>
@ -1196,7 +1172,7 @@ Delivered</pre>
</tr>
<tr >
<td>80</td>
<td>78</td>
<td ><code>per_received</code></td>
<td >
Percent</td>
@ -1208,7 +1184,7 @@ Delivered</pre>
</tr>
<tr >
<td>81</td>
<td>79</td>
<td ><code>per_billed</code></td>
<td >
Percent</td>
@ -1220,7 +1196,7 @@ Delivered</pre>
</tr>
<tr class="info">
<td>82</td>
<td>80</td>
<td ><code>column_break5</code></td>
<td >
Section Break</td>
@ -1232,7 +1208,7 @@ Delivered</pre>
</tr>
<tr >
<td>83</td>
<td>81</td>
<td ><code>letter_head</code></td>
<td >
Link</td>
@ -1253,7 +1229,7 @@ Delivered</pre>
</tr>
<tr >
<td>84</td>
<td>82</td>
<td ><code>select_print_heading</code></td>
<td >
Link</td>
@ -1274,7 +1250,7 @@ Delivered</pre>
</tr>
<tr class="info">
<td>85</td>
<td>83</td>
<td ><code>raw_material_details</code></td>
<td >
Section Break</td>
@ -1288,7 +1264,7 @@ Delivered</pre>
</tr>
<tr >
<td>86</td>
<td>84</td>
<td ><code>supplied_items</code></td>
<td >
Table</td>
@ -1309,7 +1285,7 @@ Delivered</pre>
</tr>
<tr class="info">
<td>87</td>
<td>85</td>
<td ><code>recurring_order</code></td>
<td >
Section Break</td>
@ -1323,7 +1299,7 @@ Delivered</pre>
</tr>
<tr >
<td>88</td>
<td>86</td>
<td ><code>column_break</code></td>
<td class="info">
Column Break</td>
@ -1335,7 +1311,7 @@ Delivered</pre>
</tr>
<tr >
<td>89</td>
<td>87</td>
<td ><code>is_recurring</code></td>
<td >
Check</td>
@ -1347,7 +1323,7 @@ Delivered</pre>
</tr>
<tr >
<td>90</td>
<td>88</td>
<td ><code>recurring_type</code></td>
<td >
Select</td>
@ -1364,7 +1340,7 @@ Yearly</pre>
</tr>
<tr >
<td>91</td>
<td>89</td>
<td ><code>from_date</code></td>
<td >
Date</td>
@ -1377,7 +1353,7 @@ Yearly</pre>
</tr>
<tr >
<td>92</td>
<td>90</td>
<td ><code>to_date</code></td>
<td >
Date</td>
@ -1390,7 +1366,7 @@ Yearly</pre>
</tr>
<tr >
<td>93</td>
<td>91</td>
<td ><code>repeat_on_day_of_month</code></td>
<td >
Int</td>
@ -1403,7 +1379,7 @@ Yearly</pre>
</tr>
<tr >
<td>94</td>
<td>92</td>
<td ><code>end_date</code></td>
<td >
Date</td>
@ -1416,7 +1392,7 @@ Yearly</pre>
</tr>
<tr >
<td>95</td>
<td>93</td>
<td ><code>column_break83</code></td>
<td class="info">
Column Break</td>
@ -1428,7 +1404,7 @@ Yearly</pre>
</tr>
<tr >
<td>96</td>
<td>94</td>
<td ><code>next_date</code></td>
<td >
Date</td>
@ -1441,7 +1417,7 @@ Yearly</pre>
</tr>
<tr >
<td>97</td>
<td>95</td>
<td ><code>recurring_id</code></td>
<td >
Data</td>
@ -1453,7 +1429,7 @@ Yearly</pre>
</tr>
<tr >
<td>98</td>
<td>96</td>
<td ><code>notification_email_address</code></td>
<td >
Small Text</td>
@ -1466,7 +1442,7 @@ Yearly</pre>
</tr>
<tr >
<td>99</td>
<td>97</td>
<td ><code>recurring_print_format</code></td>
<td >
Link</td>

53
erpnext/docs/current/models/buying/supplier.html
View File

@ -179,39 +179,6 @@ Supplier of Goods or Services.
<tr >
<td>10</td>
<td ><code>column_break_10</code></td>
<td class="info">
Column Break</td>
<td >
</td>
<td></td>
</tr>
<tr >
<td>11</td>
<td ><code>default_taxes_and_charges</code></td>
<td >
Link</td>
<td >
Taxes and Charges
</td>
<td>
<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_taxes_and_charges_template">Purchase Taxes and Charges Template</a>
</td>
</tr>
<tr >
<td>12</td>
<td ><code>credit_days</code></td>
<td >
Int</td>
@ -223,7 +190,7 @@ Supplier of Goods or Services.
</tr>
<tr class="info">
<td>13</td>
<td>11</td>
<td ><code>address_contacts</code></td>
<td >
Section Break</td>
@ -237,7 +204,7 @@ Supplier of Goods or Services.
</tr>
<tr >
<td>14</td>
<td>12</td>
<td ><code>address_html</code></td>
<td >
HTML</td>
@ -249,7 +216,7 @@ Supplier of Goods or Services.
</tr>
<tr >
<td>15</td>
<td>13</td>
<td ><code>column_break1</code></td>
<td class="info">
Column Break</td>
@ -261,7 +228,7 @@ Supplier of Goods or Services.
</tr>
<tr >
<td>16</td>
<td>14</td>
<td ><code>contact_html</code></td>
<td >
HTML</td>
@ -273,7 +240,7 @@ Supplier of Goods or Services.
</tr>
<tr class="info">
<td>17</td>
<td>15</td>
<td ><code>default_payable_accounts</code></td>
<td >
Section Break</td>
@ -285,7 +252,7 @@ Supplier of Goods or Services.
</tr>
<tr >
<td>18</td>
<td>16</td>
<td ><code>accounts</code></td>
<td >
Table</td>
@ -307,7 +274,7 @@ Supplier of Goods or Services.
</tr>
<tr class="info">
<td>19</td>
<td>17</td>
<td ><code>column_break2</code></td>
<td >
Section Break</td>
@ -319,7 +286,7 @@ Supplier of Goods or Services.
</tr>
<tr >
<td>20</td>
<td>18</td>
<td ><code>website</code></td>
<td >
Data</td>
@ -331,7 +298,7 @@ Supplier of Goods or Services.
</tr>
<tr >
<td>21</td>
<td>19</td>
<td ><code>supplier_details</code></td>
<td >
Text</td>
@ -344,7 +311,7 @@ Supplier of Goods or Services.
</tr>
<tr >
<td>22</td>
<td>20</td>
<td ><code>communications</code></td>
<td >
Table</td>

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

@ -385,20 +385,8 @@
</td>
</tr>
<tr >
<td>24</td>
<td ><code>get_items_from_product_bundle</code></td>
<td >
Button</td>
<td >
Get Items from Product Bundle
</td>
<td></td>
</tr>
<tr class="info">
<td>25</td>
<td>24</td>
<td ><code>section_break_22</code></td>
<td >
Section Break</td>
@ -410,7 +398,7 @@
</tr>
<tr >
<td>26</td>
<td>25</td>
<td ><code>base_total</code></td>
<td >
Currency</td>
@ -424,7 +412,7 @@
</tr>
<tr >
<td>27</td>
<td>26</td>
<td ><code>base_net_total</code></td>
<td >
Currency</td>
@ -438,7 +426,7 @@
</tr>
<tr >
<td>28</td>
<td>27</td>
<td ><code>column_break_24</code></td>
<td class="info">
Column Break</td>
@ -450,7 +438,7 @@
</tr>
<tr >
<td>29</td>
<td>28</td>
<td ><code>total</code></td>
<td >
Currency</td>
@ -464,7 +452,7 @@
</tr>
<tr >
<td>30</td>
<td>29</td>
<td ><code>net_total</code></td>
<td >
Currency</td>
@ -478,7 +466,7 @@
</tr>
<tr class="info">
<td>31</td>
<td>30</td>
<td ><code>taxes_section</code></td>
<td >
Section Break</td>
@ -492,7 +480,7 @@
</tr>
<tr >
<td>32</td>
<td>31</td>
<td ><code>taxes_and_charges</code></td>
<td >
Link</td>
@ -513,7 +501,7 @@
</tr>
<tr >
<td>33</td>
<td>32</td>
<td ><code>taxes</code></td>
<td >
Table</td>
@ -534,7 +522,7 @@
</tr>
<tr >
<td>34</td>
<td>33</td>
<td ><code>other_charges_calculation</code></td>
<td >
HTML</td>
@ -546,7 +534,7 @@
</tr>
<tr class="info">
<td>35</td>
<td>34</td>
<td ><code>totals</code></td>
<td >
Section Break</td>
@ -560,7 +548,7 @@
</tr>
<tr >
<td>36</td>
<td>35</td>
<td ><code>base_taxes_and_charges_added</code></td>
<td >
Currency</td>
@ -574,7 +562,7 @@
</tr>
<tr >
<td>37</td>
<td>36</td>
<td ><code>base_taxes_and_charges_deducted</code></td>
<td >
Currency</td>
@ -588,7 +576,7 @@
</tr>
<tr >
<td>38</td>
<td>37</td>
<td ><code>base_total_taxes_and_charges</code></td>
<td >
Currency</td>
@ -602,7 +590,7 @@
</tr>
<tr >
<td>39</td>
<td>38</td>
<td ><code>column_break_37</code></td>
<td class="info">
Column Break</td>
@ -614,7 +602,7 @@
</tr>
<tr >
<td>40</td>
<td>39</td>
<td ><code>taxes_and_charges_added</code></td>
<td >
Currency</td>
@ -628,7 +616,7 @@
</tr>
<tr >
<td>41</td>
<td>40</td>
<td ><code>taxes_and_charges_deducted</code></td>
<td >
Currency</td>
@ -642,7 +630,7 @@
</tr>
<tr >
<td>42</td>
<td>41</td>
<td ><code>total_taxes_and_charges</code></td>
<td >
Currency</td>
@ -656,7 +644,7 @@
</tr>
<tr class="info">
<td>43</td>
<td>42</td>
<td ><code>section_break_41</code></td>
<td >
Section Break</td>
@ -668,7 +656,7 @@
</tr>
<tr >
<td>44</td>
<td>43</td>
<td ><code>apply_discount_on</code></td>
<td >
Select</td>
@ -684,7 +672,7 @@ Net Total</pre>
</tr>
<tr >
<td>45</td>
<td>44</td>
<td ><code>column_break_43</code></td>
<td class="info">
Column Break</td>
@ -696,7 +684,7 @@ Net Total</pre>
</tr>
<tr >
<td>46</td>
<td>45</td>
<td ><code>discount_amount</code></td>
<td >
Currency</td>
@ -710,7 +698,7 @@ Net Total</pre>
</tr>
<tr >
<td>47</td>
<td>46</td>
<td ><code>base_discount_amount</code></td>
<td >
Currency</td>
@ -724,7 +712,7 @@ Net Total</pre>
</tr>
<tr class="info">
<td>48</td>
<td>47</td>
<td ><code>section_break_46</code></td>
<td >
Section Break</td>
@ -736,7 +724,7 @@ Net Total</pre>
</tr>
<tr >
<td>49</td>
<td>48</td>
<td ><code>base_grand_total</code></td>
<td >
Currency</td>
@ -750,7 +738,7 @@ Net Total</pre>
</tr>
<tr >
<td>50</td>
<td>49</td>
<td ><code>base_in_words</code></td>
<td >
Data</td>
@ -762,7 +750,7 @@ Net Total</pre>
</tr>
<tr >
<td>51</td>
<td>50</td>
<td ><code>base_rounded_total</code></td>
<td >
Currency</td>
@ -776,7 +764,7 @@ Net Total</pre>
</tr>
<tr >
<td>52</td>
<td>51</td>
<td ><code>column_break4</code></td>
<td class="info">
Column Break</td>
@ -788,7 +776,7 @@ Net Total</pre>
</tr>
<tr >
<td>53</td>
<td>52</td>
<td ><code>grand_total</code></td>
<td >
Currency</td>
@ -802,7 +790,7 @@ Net Total</pre>
</tr>
<tr >
<td>54</td>
<td>53</td>
<td ><code>in_words</code></td>
<td >
Data</td>
@ -814,7 +802,7 @@ Net Total</pre>
</tr>
<tr class="info">
<td>55</td>
<td>54</td>
<td ><code>terms_section_break</code></td>
<td >
Section Break</td>
@ -828,7 +816,7 @@ Net Total</pre>
</tr>
<tr >
<td>56</td>
<td>55</td>
<td ><code>tc_name</code></td>
<td >
Link</td>
@ -849,7 +837,7 @@ Net Total</pre>
</tr>
<tr >
<td>57</td>
<td>56</td>
<td ><code>terms</code></td>
<td >
Text Editor</td>
@ -861,7 +849,7 @@ Net Total</pre>
</tr>
<tr class="info">
<td>58</td>
<td>57</td>
<td ><code>contact_section</code></td>
<td >
Section Break</td>
@ -875,7 +863,7 @@ Net Total</pre>
</tr>
<tr >
<td>59</td>
<td>58</td>
<td ><code>supplier_address</code></td>
<td >
Link</td>
@ -896,7 +884,7 @@ Net Total</pre>
</tr>
<tr >
<td>60</td>
<td>59</td>
<td ><code>contact_person</code></td>
<td >
Link</td>
@ -917,7 +905,7 @@ Net Total</pre>
</tr>
<tr class="info">
<td>61</td>
<td>60</td>
<td ><code>printing_settings</code></td>
<td >
Section Break</td>
@ -929,7 +917,7 @@ Net Total</pre>
</tr>
<tr >
<td>62</td>
<td>61</td>
<td ><code>select_print_heading</code></td>
<td >
Link</td>
@ -950,7 +938,7 @@ Net Total</pre>
</tr>
<tr >
<td>63</td>
<td>62</td>
<td ><code>letter_head</code></td>
<td >
Link</td>
@ -971,7 +959,7 @@ Net Total</pre>
</tr>
<tr class="info">
<td>64</td>
<td>63</td>
<td ><code>more_info</code></td>
<td >
Section Break</td>
@ -985,7 +973,7 @@ Net Total</pre>
</tr>
<tr >
<td>65</td>
<td>64</td>
<td class="danger" title="Mandatory"><code>status</code></td>
<td >
Select</td>
@ -1003,7 +991,7 @@ Cancelled</pre>
</tr>
<tr >
<td>66</td>
<td>65</td>
<td ><code>is_subcontracted</code></td>
<td >
Select</td>
@ -1019,7 +1007,7 @@ No</pre>
</tr>
<tr >
<td>67</td>
<td>66</td>
<td ><code>column_break_57</code></td>
<td class="info">
Column Break</td>
@ -1031,7 +1019,7 @@ No</pre>
</tr>
<tr >
<td>68</td>
<td>67</td>
<td class="danger" title="Mandatory"><code>fiscal_year</code></td>
<td >
Link</td>

71
erpnext/docs/current/models/selling/customer.html
View File

@ -244,44 +244,11 @@ Individual</pre>
</td>
</tr>
<tr >
<td>14</td>
<td ><code>column_break_14</code></td>
<td class="info">
Column Break</td>
<td >
</td>
<td></td>
</tr>
<tr >
<td>15</td>
<td ><code>default_taxes_and_charges</code></td>
<td >
Link</td>
<td >
Default Taxes and Charges
</td>
<td>
<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_taxes_and_charges_template">Sales Taxes and Charges Template</a>
</td>
</tr>
<tr class="info">
<td>16</td>
<td>14</td>
<td ><code>address_contacts</code></td>
<td >
Section Break</td>
@ -295,7 +262,7 @@ Individual</pre>
</tr>
<tr >
<td>17</td>
<td>15</td>
<td ><code>address_html</code></td>
<td >
HTML</td>
@ -307,7 +274,7 @@ Individual</pre>
</tr>
<tr >
<td>18</td>
<td>16</td>
<td ><code>column_break1</code></td>
<td class="info">
Column Break</td>
@ -319,7 +286,7 @@ Individual</pre>
</tr>
<tr >
<td>19</td>
<td>17</td>
<td ><code>contact_html</code></td>
<td >
HTML</td>
@ -331,7 +298,7 @@ Individual</pre>
</tr>
<tr class="info">
<td>20</td>
<td>18</td>
<td ><code>default_receivable_accounts</code></td>
<td >
Section Break</td>
@ -343,7 +310,7 @@ Individual</pre>
</tr>
<tr >
<td>21</td>
<td>19</td>
<td ><code>accounts</code></td>
<td >
Table</td>
@ -365,7 +332,7 @@ Individual</pre>
</tr>
<tr class="info">
<td>22</td>
<td>20</td>
<td ><code>column_break2</code></td>
<td >
Section Break</td>
@ -377,7 +344,7 @@ Individual</pre>
</tr>
<tr >
<td>23</td>
<td>21</td>
<td ><code>credit_days_based_on</code></td>
<td >
Select</td>
@ -393,7 +360,7 @@ Last Day of the Next Month</pre>
</tr>
<tr >
<td>24</td>
<td>22</td>
<td ><code>credit_days</code></td>
<td >
Int</td>
@ -405,7 +372,7 @@ Last Day of the Next Month</pre>
</tr>
<tr >
<td>25</td>
<td>23</td>
<td ><code>credit_limit</code></td>
<td >
Currency</td>
@ -417,7 +384,7 @@ Last Day of the Next Month</pre>
</tr>
<tr class="info">
<td>26</td>
<td>24</td>
<td ><code>more_info</code></td>
<td >
Section Break</td>
@ -431,7 +398,7 @@ Last Day of the Next Month</pre>
</tr>
<tr >
<td>27</td>
<td>25</td>
<td ><code>customer_details</code></td>
<td >
Text</td>
@ -444,7 +411,7 @@ Last Day of the Next Month</pre>
</tr>
<tr >
<td>28</td>
<td>26</td>
<td ><code>website</code></td>
<td >
Data</td>
@ -456,7 +423,7 @@ Last Day of the Next Month</pre>
</tr>
<tr class="info">
<td>29</td>
<td>27</td>
<td ><code>sales_team_section_break</code></td>
<td >
Section Break</td>
@ -470,7 +437,7 @@ Last Day of the Next Month</pre>
</tr>
<tr >
<td>30</td>
<td>28</td>
<td ><code>default_sales_partner</code></td>
<td >
Link</td>
@ -491,7 +458,7 @@ Last Day of the Next Month</pre>
</tr>
<tr >
<td>31</td>
<td>29</td>
<td ><code>default_commission_rate</code></td>
<td >
Float</td>
@ -503,7 +470,7 @@ Last Day of the Next Month</pre>
</tr>
<tr class="info">
<td>32</td>
<td>30</td>
<td ><code>sales_team_section</code></td>
<td >
Section Break</td>
@ -515,7 +482,7 @@ Last Day of the Next Month</pre>
</tr>
<tr >
<td>33</td>
<td>31</td>
<td ><code>sales_team</code></td>
<td >
Table</td>
@ -536,7 +503,7 @@ Last Day of the Next Month</pre>
</tr>
<tr >
<td>34</td>
<td>32</td>
<td ><code>communications</code></td>
<td >
Table</td>

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

@ -1837,7 +1837,7 @@ Yearly</pre>
<a name="update_delivery_status" href="#update_delivery_status" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
<b>update_delivery_status</b>
<i class="text-muted">(self, po_name)</i>
<i class="text-muted">(self)</i>
</p>
<div class="docs-attr-desc"><p>Update delivery status from Purchase Order for drop shipping</p>
</div>

36
erpnext/docs/current/models/stock/material_request.html
View File

@ -183,20 +183,8 @@ Material Issue</pre>
</td>
</tr>
<tr >
<td>10</td>
<td ><code>get_items_from_product_bundle</code></td>
<td >
Button</td>
<td >
Get Items from Product Bundle
</td>
<td></td>
</tr>
<tr class="info">
<td>11</td>
<td>10</td>
<td ><code>more_info</code></td>
<td >
Section Break</td>
@ -210,7 +198,7 @@ Material Issue</pre>
</tr>
<tr >
<td>12</td>
<td>11</td>
<td ><code>requested_by</code></td>
<td >
Data</td>
@ -222,7 +210,7 @@ Material Issue</pre>
</tr>
<tr >
<td>13</td>
<td>12</td>
<td class="danger" title="Mandatory"><code>transaction_date</code></td>
<td >
Date</td>
@ -234,7 +222,7 @@ Material Issue</pre>
</tr>
<tr >
<td>14</td>
<td>13</td>
<td ><code>column_break2</code></td>
<td class="info">
Column Break</td>
@ -246,7 +234,7 @@ Material Issue</pre>
</tr>
<tr >
<td>15</td>
<td>14</td>
<td ><code>status</code></td>
<td >
Select</td>
@ -264,7 +252,7 @@ Cancelled</pre>
</tr>
<tr >
<td>16</td>
<td>15</td>
<td ><code>per_ordered</code></td>
<td >
Percent</td>
@ -276,7 +264,7 @@ Cancelled</pre>
</tr>
<tr class="info">
<td>17</td>
<td>16</td>
<td ><code>printing_details</code></td>
<td >
Section Break</td>
@ -288,7 +276,7 @@ Cancelled</pre>
</tr>
<tr >
<td>18</td>
<td>17</td>
<td ><code>letter_head</code></td>
<td >
Link</td>
@ -309,7 +297,7 @@ Cancelled</pre>
</tr>
<tr >
<td>19</td>
<td>18</td>
<td ><code>select_print_heading</code></td>
<td >
Link</td>
@ -330,7 +318,7 @@ Cancelled</pre>
</tr>
<tr class="info">
<td>20</td>
<td>19</td>
<td ><code>terms_section_break</code></td>
<td >
Section Break</td>
@ -344,7 +332,7 @@ Cancelled</pre>
</tr>
<tr >
<td>21</td>
<td>20</td>
<td ><code>tc_name</code></td>
<td >
Link</td>
@ -365,7 +353,7 @@ Cancelled</pre>
</tr>
<tr >
<td>22</td>
<td>21</td>
<td ><code>terms</code></td>
<td >
Text Editor</td>

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

@ -417,20 +417,8 @@ PREC-RET-</pre>
</td>
</tr>
<tr >
<td>27</td>
<td ><code>get_items_from_product_bundle</code></td>
<td >
Button</td>
<td >
Get Items from Product Bundle
</td>
<td></td>
</tr>
<tr class="info">
<td>28</td>
<td>27</td>
<td ><code>section_break0</code></td>
<td >
Section Break</td>
@ -442,7 +430,7 @@ PREC-RET-</pre>
</tr>
<tr >
<td>29</td>
<td>28</td>
<td ><code>base_total</code></td>
<td >
Currency</td>
@ -456,7 +444,7 @@ PREC-RET-</pre>
</tr>
<tr >
<td>30</td>
<td>29</td>
<td class="danger" title="Mandatory"><code>base_net_total</code></td>
<td >
Currency</td>
@ -470,7 +458,7 @@ PREC-RET-</pre>
</tr>
<tr >
<td>31</td>
<td>30</td>
<td ><code>column_break_27</code></td>
<td class="info">
Column Break</td>
@ -482,7 +470,7 @@ PREC-RET-</pre>
</tr>
<tr >
<td>32</td>
<td>31</td>
<td ><code>total</code></td>
<td >
Currency</td>
@ -496,7 +484,7 @@ PREC-RET-</pre>
</tr>
<tr >
<td>33</td>
<td>32</td>
<td ><code>net_total</code></td>
<td >
Currency</td>
@ -510,7 +498,7 @@ PREC-RET-</pre>
</tr>
<tr class="info">
<td>34</td>
<td>33</td>
<td ><code>taxes_section</code></td>
<td >
Section Break</td>
@ -525,7 +513,7 @@ PREC-RET-</pre>
</tr>
<tr >
<td>35</td>
<td>34</td>
<td ><code>taxes_and_charges</code></td>
<td >
Link</td>
@ -546,7 +534,7 @@ PREC-RET-</pre>
</tr>
<tr >
<td>36</td>
<td>35</td>
<td ><code>taxes</code></td>
<td >
Table</td>
@ -567,7 +555,7 @@ PREC-RET-</pre>
</tr>
<tr >
<td>37</td>
<td>36</td>
<td ><code>other_charges_calculation</code></td>
<td >
HTML</td>
@ -579,7 +567,7 @@ PREC-RET-</pre>
</tr>
<tr class="info">
<td>38</td>
<td>37</td>
<td ><code>totals</code></td>
<td >
Section Break</td>
@ -593,7 +581,7 @@ PREC-RET-</pre>
</tr>
<tr >
<td>39</td>
<td>38</td>
<td ><code>base_taxes_and_charges_added</code></td>
<td >
Currency</td>
@ -607,7 +595,7 @@ PREC-RET-</pre>
</tr>
<tr >
<td>40</td>
<td>39</td>
<td ><code>base_taxes_and_charges_deducted</code></td>
<td >
Currency</td>
@ -621,7 +609,7 @@ PREC-RET-</pre>
</tr>
<tr >
<td>41</td>
<td>40</td>
<td ><code>base_total_taxes_and_charges</code></td>
<td >
Currency</td>
@ -635,7 +623,7 @@ PREC-RET-</pre>
</tr>
<tr >
<td>42</td>
<td>41</td>
<td ><code>column_break3</code></td>
<td class="info">
Column Break</td>
@ -647,7 +635,7 @@ PREC-RET-</pre>
</tr>
<tr >
<td>43</td>
<td>42</td>
<td ><code>taxes_and_charges_added</code></td>
<td >
Currency</td>
@ -661,7 +649,7 @@ PREC-RET-</pre>
</tr>
<tr >
<td>44</td>
<td>43</td>
<td ><code>taxes_and_charges_deducted</code></td>
<td >
Currency</td>
@ -675,7 +663,7 @@ PREC-RET-</pre>
</tr>
<tr >
<td>45</td>
<td>44</td>
<td ><code>total_taxes_and_charges</code></td>
<td >
Currency</td>
@ -689,7 +677,7 @@ PREC-RET-</pre>
</tr>
<tr class="info">
<td>46</td>
<td>45</td>
<td ><code>section_break_42</code></td>
<td >
Section Break</td>
@ -701,7 +689,7 @@ PREC-RET-</pre>
</tr>
<tr >
<td>47</td>
<td>46</td>
<td ><code>apply_discount_on</code></td>
<td >
Select</td>
@ -717,7 +705,7 @@ Net Total</pre>
</tr>
<tr >
<td>48</td>
<td>47</td>
<td ><code>column_break_44</code></td>
<td class="info">
Column Break</td>
@ -729,7 +717,7 @@ Net Total</pre>
</tr>
<tr >
<td>49</td>
<td>48</td>
<td ><code>discount_amount</code></td>
<td >
Currency</td>
@ -743,7 +731,7 @@ Net Total</pre>
</tr>
<tr >
<td>50</td>
<td>49</td>
<td ><code>base_discount_amount</code></td>
<td >
Currency</td>
@ -757,7 +745,7 @@ Net Total</pre>
</tr>
<tr class="info">
<td>51</td>
<td>50</td>
<td ><code>section_break_46</code></td>
<td >
Section Break</td>
@ -769,7 +757,7 @@ Net Total</pre>
</tr>
<tr >
<td>52</td>
<td>51</td>
<td ><code>base_grand_total</code></td>
<td >
Currency</td>
@ -783,7 +771,7 @@ Net Total</pre>
</tr>
<tr >
<td>53</td>
<td>52</td>
<td ><code>base_in_words</code></td>
<td >
Data</td>
@ -795,7 +783,7 @@ Net Total</pre>
</tr>
<tr >
<td>54</td>
<td>53</td>
<td ><code>base_rounded_total</code></td>
<td >
Currency</td>
@ -809,7 +797,7 @@ Net Total</pre>
</tr>
<tr >
<td>55</td>
<td>54</td>
<td ><code>column_break_50</code></td>
<td class="info">
Column Break</td>
@ -821,7 +809,7 @@ Net Total</pre>
</tr>
<tr >
<td>56</td>
<td>55</td>
<td ><code>grand_total</code></td>
<td >
Currency</td>
@ -835,7 +823,7 @@ Net Total</pre>
</tr>
<tr >
<td>57</td>
<td>56</td>
<td ><code>in_words</code></td>
<td >
Data</td>
@ -847,7 +835,7 @@ Net Total</pre>
</tr>
<tr class="info">
<td>58</td>
<td>57</td>
<td ><code>terms_section_break</code></td>
<td >
Section Break</td>
@ -861,7 +849,7 @@ Net Total</pre>
</tr>
<tr >
<td>59</td>
<td>58</td>
<td ><code>tc_name</code></td>
<td >
Link</td>
@ -882,7 +870,7 @@ Net Total</pre>
</tr>
<tr >
<td>60</td>
<td>59</td>
<td ><code>terms</code></td>
<td >
Text Editor</td>
@ -894,7 +882,7 @@ Net Total</pre>
</tr>
<tr class="info">
<td>61</td>
<td>60</td>
<td ><code>contact_section</code></td>
<td >
Section Break</td>
@ -908,7 +896,7 @@ Net Total</pre>
</tr>
<tr >
<td>62</td>
<td>61</td>
<td ><code>supplier_address</code></td>
<td >
Link</td>
@ -929,7 +917,7 @@ Net Total</pre>
</tr>
<tr >
<td>63</td>
<td>62</td>
<td ><code>column_break_57</code></td>
<td class="info">
Column Break</td>
@ -941,7 +929,7 @@ Net Total</pre>
</tr>
<tr >
<td>64</td>
<td>63</td>
<td ><code>contact_person</code></td>
<td >
Link</td>
@ -962,7 +950,7 @@ Net Total</pre>
</tr>
<tr class="info">
<td>65</td>
<td>64</td>
<td ><code>raw_material_details</code></td>
<td >
Section Break</td>
@ -976,7 +964,7 @@ Net Total</pre>
</tr>
<tr >
<td>66</td>
<td>65</td>
<td ><code>is_subcontracted</code></td>
<td >
Select</td>
@ -991,7 +979,7 @@ Yes</pre>
</tr>
<tr >
<td>67</td>
<td>66</td>
<td ><code>supplier_warehouse</code></td>
<td >
Link</td>
@ -1012,7 +1000,7 @@ Yes</pre>
</tr>
<tr >
<td>68</td>
<td>67</td>
<td ><code>supplied_items</code></td>
<td >
Table</td>
@ -1033,7 +1021,7 @@ Yes</pre>
</tr>
<tr >
<td>69</td>
<td>68</td>
<td ><code>bill_no</code></td>
<td >
Data</td>
@ -1045,7 +1033,7 @@ Yes</pre>
</tr>
<tr >
<td>70</td>
<td>69</td>
<td ><code>bill_date</code></td>
<td >
Date</td>
@ -1057,7 +1045,7 @@ Yes</pre>
</tr>
<tr class="info">
<td>71</td>
<td>70</td>
<td ><code>more_info</code></td>
<td >
Section Break</td>
@ -1071,7 +1059,7 @@ Yes</pre>
</tr>
<tr >
<td>72</td>
<td>71</td>
<td class="danger" title="Mandatory"><code>status</code></td>
<td >
Select</td>
@ -1089,7 +1077,7 @@ Closed</pre>
</tr>
<tr >
<td>73</td>
<td>72</td>
<td ><code>rejected_warehouse</code></td>
<td >
Link</td>
@ -1111,7 +1099,7 @@ Closed</pre>
</tr>
<tr >
<td>74</td>
<td>73</td>
<td ><code>amended_from</code></td>
<td >
Link</td>
@ -1132,7 +1120,7 @@ Closed</pre>
</tr>
<tr >
<td>75</td>
<td>74</td>
<td ><code>range</code></td>
<td >
Data</td>
@ -1144,7 +1132,7 @@ Closed</pre>
</tr>
<tr >
<td>76</td>
<td>75</td>
<td ><code>column_break4</code></td>
<td class="info">
Column Break</td>
@ -1156,7 +1144,7 @@ Closed</pre>
</tr>
<tr >
<td>77</td>
<td>76</td>
<td class="danger" title="Mandatory"><code>company</code></td>
<td >
Link</td>
@ -1177,7 +1165,7 @@ Closed</pre>
</tr>
<tr >
<td>78</td>
<td>77</td>
<td class="danger" title="Mandatory"><code>fiscal_year</code></td>
<td >
Link</td>
@ -1198,7 +1186,7 @@ Closed</pre>
</tr>
<tr class="info">
<td>79</td>
<td>78</td>
<td ><code>printing_settings</code></td>
<td >
Section Break</td>
@ -1210,7 +1198,7 @@ Closed</pre>
</tr>
<tr >
<td>80</td>
<td>79</td>
<td ><code>letter_head</code></td>
<td >
Link</td>
@ -1231,7 +1219,7 @@ Closed</pre>
</tr>
<tr >
<td>81</td>
<td>80</td>
<td ><code>select_print_heading</code></td>
<td >
Link</td>
@ -1252,7 +1240,7 @@ Closed</pre>
</tr>
<tr >
<td>82</td>
<td>81</td>
<td ><code>other_details</code></td>
<td >
HTML</td>
@ -1264,7 +1252,7 @@ Closed</pre>
</tr>
<tr >
<td>83</td>
<td>82</td>
<td ><code>instructions</code></td>
<td >
Small Text</td>
@ -1276,7 +1264,7 @@ Closed</pre>
</tr>
<tr >
<td>84</td>
<td>83</td>
<td ><code>remarks</code></td>
<td >
Small Text</td>
@ -1288,7 +1276,7 @@ Closed</pre>
</tr>
<tr class="info">
<td>85</td>
<td>84</td>
<td ><code>transporter_info</code></td>
<td >
Section Break</td>
@ -1302,7 +1290,7 @@ Closed</pre>
</tr>
<tr >
<td>86</td>
<td>85</td>
<td ><code>transporter_name</code></td>
<td >
Data</td>
@ -1314,7 +1302,7 @@ Closed</pre>
</tr>
<tr >
<td>87</td>
<td>86</td>
<td ><code>column_break5</code></td>
<td class="info">
Column Break</td>
@ -1326,7 +1314,7 @@ Closed</pre>
</tr>
<tr >
<td>88</td>
<td>87</td>
<td ><code>lr_no</code></td>
<td >
Data</td>
@ -1338,7 +1326,7 @@ Closed</pre>
</tr>
<tr >
<td>89</td>
<td>88</td>
<td ><code>lr_date</code></td>
<td >
Date</td>

28
erpnext/docs/current/models/utilities/address.html
View File

@ -412,6 +412,20 @@ Other</pre>
<p class="docs-attr-name">
<a name="__setup__" href="#__setup__" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
<b>__setup__</b>
<i class="text-muted">(self)</i>
</p>
<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
</div>
<br>
<p class="docs-attr-name">
<a name="_unset_other" href="#_unset_other" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
@ -440,6 +454,20 @@ Other</pre>
<p class="docs-attr-name">
<a name="check_if_linked" href="#check_if_linked" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
<b>check_if_linked</b>
<i class="text-muted">(self)</i>
</p>
<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
</div>
<br>
<p class="docs-attr-name">
<a name="get_display" href="#get_display" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>

5
erpnext/hooks.py
View File

@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd."
app_description = """ERP made simple"""
app_icon = "icon-th"
app_color = "#e74c3c"
app_version = "6.12.8"
app_version = "6.12.9"
app_email = "info@erpnext.com"
app_license = "GNU General Public License (v3)"
source_link = "https://github.com/frappe/erpnext"
@ -125,7 +125,8 @@ scheduler_events = {
"erpnext.setup.doctype.email_digest.email_digest.send",
"erpnext.support.doctype.issue.issue.auto_close_tickets",
"erpnext.accounts.doctype.fiscal_year.fiscal_year.auto_create_fiscal_year",
"erpnext.hr.doctype.employee.employee.send_birthday_reminders"
"erpnext.hr.doctype.employee.employee.send_birthday_reminders",
"erpnext.projects.doctype.task.task.set_tasks_as_overdue"
]
}

2
erpnext/hr/doctype/salary_slip/salary_slip.js
View File

@ -32,7 +32,7 @@ cur_frm.cscript.month = cur_frm.cscript.employee = cur_frm.cscript.fiscal_year;
cur_frm.cscript.leave_without_pay = function(doc,dt,dn){
if (doc.employee && doc.fiscal_year && doc.month) {
return $c_obj(doc, 'get_leave_details',doc.leave_without_pay,function(r, rt) {
return $c_obj(doc, 'get_leave_details', {"lwp": doc.leave_without_pay}, function(r, rt) {
var doc = locals[dt][dn];
cur_frm.refresh();
calculate_all(doc, dt, dn);

8
erpnext/hr/doctype/salary_slip/salary_slip.py
View File

@ -90,14 +90,14 @@ class SalarySlip(TransactionBase):
start_date = joining_date
elif joining_date > month['month_end_date']:
return
end_date = month['month_end_date']
if relieving_date:
if relieving_date > start_date and relieving_date < month['month_end_date']:
end_date = relieving_date
elif relieving_date < month['month_start_date']:
frappe.throw(_("Employee relieved on {0} must be set as 'Left'").format(relieving_date))
else:
end_date = month['month_end_date']
frappe.throw(_("Employee relieved on {0} must be set as 'Left'")
.format(relieving_date))
payment_days = date_diff(end_date, start_date) + 1

33
erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
View File

@ -19,10 +19,12 @@
"in_filter": 0,
"in_list_view": 0,
"label": "Capacity Planning",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -34,7 +36,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"description": "Disables creation of time logs against Production Orders.\nOperations shall not be tracked against Production Order",
"description": "Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order",
"fieldname": "disable_capacity_planning",
"fieldtype": "Check",
"hidden": 0,
@ -42,10 +44,12 @@
"in_filter": 0,
"in_list_view": 0,
"label": "Disable Capacity Planning and Time Tracking",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -65,10 +69,12 @@
"in_filter": 0,
"in_list_view": 0,
"label": "Allow Overtime",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -88,11 +94,13 @@
"in_filter": 0,
"in_list_view": 1,
"label": "Allow Production on Holidays",
"length": 0,
"no_copy": 0,
"options": "",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -110,10 +118,12 @@
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -134,10 +144,12 @@
"in_filter": 0,
"in_list_view": 0,
"label": "Capacity Planning For (Days)",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -157,10 +169,12 @@
"in_filter": 0,
"in_list_view": 0,
"label": "Time Between Operations (in mins)",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -178,10 +192,12 @@
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -200,10 +216,12 @@
"in_filter": 0,
"in_list_view": 0,
"label": "Over Production Allowance Percentage",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -223,11 +241,13 @@
"in_filter": 0,
"in_list_view": 0,
"label": "Backflush Raw Materials Based On",
"length": 0,
"no_copy": 0,
"options": "BOM\nMaterial Transferred for Manufacture",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -245,10 +265,12 @@
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -267,11 +289,13 @@
"in_filter": 0,
"in_list_view": 0,
"label": "Default Work In Progress Warehouse",
"length": 0,
"no_copy": 0,
"options": "Warehouse",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -290,11 +314,13 @@
"in_filter": 0,
"in_list_view": 0,
"label": "Default Finished Goods Warehouse",
"length": 0,
"no_copy": 0,
"options": "Warehouse",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -306,12 +332,15 @@
"hide_heading": 0,
"hide_toolbar": 0,
"icon": "icon-wrench",
"idx": 0,
"in_create": 0,
"in_dialog": 0,
"is_submittable": 0,
"issingle": 1,
"istable": 0,
"modified": "2015-08-21 08:27:03.794133",
"max_attachments": 0,
"menu_index": 0,
"modified": "2015-12-10 00:03:20.895790",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Manufacturing Settings",

1
erpnext/patches.txt
View File

@ -239,3 +239,4 @@ erpnext.patches.v6_10.email_digest_default_quote
erpnext.patches.v6_10.fix_billed_amount_in_drop_ship_po
erpnext.patches.v6_10.fix_delivery_status_of_drop_ship_item #2015-12-08
erpnext.patches.v5_8.tax_rule #2015-12-08
erpnext.patches.v6_12.set_overdue_tasks

1
erpnext/patches/v6_10/fix_delivery_status_of_drop_ship_item.py
View File

@ -2,6 +2,7 @@ from __future__ import unicode_literals
import frappe
def execute():
frappe.reload_doctype("Sales Order Item")
for so_name in frappe.db.sql("""select distinct parent from `tabSales Order Item`
where delivered_by_supplier=1 and docstatus=1"""):
so = frappe.get_doc("Sales Order", so_name[0])

0
erpnext/patches/v6_12/__init__.py Normal file
View File

7
erpnext/patches/v6_12/set_overdue_tasks.py Normal file
View File

@ -0,0 +1,7 @@
import frappe
def execute():
frappe.reload_doctype("Task")
from erpnext.projects.doctype.task.task import set_tasks_as_overdue
set_tasks_as_overdue()

2
erpnext/projects/doctype/activity_type/activity_type.js
View File

@ -1,6 +1,6 @@
frappe.ui.form.on("Activity Type", {
refresh: function(frm) {
frm.add_custom_button("Activity Cost per Employee", function() {
frm.add_custom_button(__("Activity Cost per Employee"), function() {
frappe.route_options = {"activity_type": frm.doc.name};
frappe.set_route("List", "Activity Cost");
});

7
erpnext/projects/doctype/task/task.js
View File

@ -8,6 +8,13 @@ cur_frm.add_fetch("project", "company", "company");
frappe.ui.form.on("Task", {
refresh: function(frm) {
var doc = frm.doc;
if(doc.__islocal) {
if(!frm.doc.exp_end_date) {
frm.set_value("exp_end_date", frappe.datetime.add_days(new Date(), 7));
}
}
if(!doc.__islocal) {
if(frappe.model.can_read("Time Log")) {
frm.add_custom_button(__("Time Logs"), function() {

230
erpnext/projects/doctype/task/task.json
View File

@ -26,6 +26,7 @@
"oldfieldtype": "Data",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 1,
@ -51,6 +52,7 @@
"options": "Project",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -73,6 +75,7 @@
"oldfieldtype": "Column Break",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"print_width": "50%",
"read_only": 0,
"report_hide": 0,
@ -84,7 +87,7 @@
},
{
"allow_on_submit": 0,
"bold": 0,
"bold": 1,
"collapsible": 0,
"fieldname": "status",
"fieldtype": "Select",
@ -97,9 +100,10 @@
"no_copy": 1,
"oldfieldname": "status",
"oldfieldtype": "Select",
"options": "Open\nWorking\nPending Review\nClosed\nCancelled",
"options": "Open\nWorking\nPending Review\nOverdue\nClosed\nCancelled",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -125,6 +129,7 @@
"options": "Low\nMedium\nHigh\nUrgent",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -132,102 +137,6 @@
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "section_break0",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
"options": "Simple",
"permlevel": 0,
"print_hide": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "description",
"fieldtype": "Text Editor",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Details",
"length": 0,
"no_copy": 0,
"oldfieldname": "description",
"oldfieldtype": "Text Editor",
"permlevel": 0,
"print_hide": 0,
"print_width": "300px",
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0,
"width": "300px"
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "section_break",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Depends On",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
"permlevel": 0,
"print_hide": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "depends_on",
"fieldtype": "Table",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "depends_on",
"length": 0,
"no_copy": 0,
"options": "Task Depends On",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
@ -243,6 +152,7 @@
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -267,6 +177,7 @@
"oldfieldtype": "Date",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -293,6 +204,7 @@
"oldfieldtype": "Data",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -315,6 +227,7 @@
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -324,7 +237,7 @@
},
{
"allow_on_submit": 0,
"bold": 0,
"bold": 1,
"collapsible": 0,
"fieldname": "exp_end_date",
"fieldtype": "Date",
@ -339,6 +252,7 @@
"oldfieldtype": "Date",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -346,6 +260,106 @@
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "section_break0",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
"options": "Simple",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "description",
"fieldtype": "Text Editor",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Details",
"length": 0,
"no_copy": 0,
"oldfieldname": "description",
"oldfieldtype": "Text Editor",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"print_width": "300px",
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0,
"width": "300px"
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "section_break",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Depends On",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "depends_on",
"fieldtype": "Table",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "depends_on",
"length": 0,
"no_copy": 0,
"options": "Task Depends On",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
@ -363,6 +377,7 @@
"oldfieldtype": "Column Break",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"print_width": "50%",
"read_only": 0,
"report_hide": 0,
@ -389,6 +404,7 @@
"oldfieldtype": "Date",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"report_hide": 0,
"reqd": 0,
@ -415,6 +431,7 @@
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"report_hide": 0,
"reqd": 0,
@ -437,6 +454,7 @@
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -461,6 +479,7 @@
"oldfieldtype": "Date",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"report_hide": 0,
"reqd": 0,
@ -483,6 +502,7 @@
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -508,6 +528,7 @@
"options": "Company:company:default_currency",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"report_hide": 0,
"reqd": 0,
@ -532,6 +553,7 @@
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"report_hide": 0,
"reqd": 0,
@ -554,6 +576,7 @@
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -577,6 +600,7 @@
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"report_hide": 0,
"reqd": 0,
@ -599,6 +623,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -624,6 +649,7 @@
"oldfieldtype": "Date",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -649,6 +675,7 @@
"oldfieldtype": "Date",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -670,6 +697,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -693,6 +721,7 @@
"options": "Company",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -711,7 +740,8 @@
"issingle": 0,
"istable": 0,
"max_attachments": 5,
"modified": "2015-11-16 06:29:59.063379",
"menu_index": 0,
"modified": "2015-12-10 01:43:16.137084",
"modified_by": "Administrator",
"module": "Projects",
"name": "Task",

6
erpnext/projects/doctype/task/task.py
View File

@ -144,3 +144,9 @@ def set_multiple_status(names, status):
task = frappe.get_doc("Task", name)
task.status = status
task.save()
def set_tasks_as_overdue():
frappe.db.sql("""update tabTask set `status`='Overdue'
where exp_end_date is not null
and exp_end_date < CURDATE()
and `status` not in ('Closed', 'Cancelled')""")

15
erpnext/projects/doctype/task/task_list.js
View File

@ -1,10 +1,6 @@
frappe.listview_settings['Task'] = {
add_fields: ["project", "status", "priority", "exp_end_date"],
onload: function(listview) {
frappe.route_options = {
"status": "Open"
};
var method = "erpnext.projects.doctype.task.task.set_multiple_status";
listview.page.add_menu_item(__("Set as Open"), function() {
@ -14,6 +10,17 @@ frappe.listview_settings['Task'] = {
listview.page.add_menu_item(__("Set as Closed"), function() {
listview.call_for_selected_items(method, {"status": "Closed"});
});
},
get_indicator: function(doc) {
var colors = {
"Open": "orange",
"Overdue": "red",
"Pending Review": "orange",
"Working": "orange",
"Closed": "green",
"Cancelled": "dark grey"
}
return [__(doc.status), colors[doc.status], "status,=," + doc.status];
}
};

17
erpnext/projects/doctype/task/test_task.py
View File

@ -3,7 +3,7 @@
from __future__ import unicode_literals
import frappe
import unittest
from frappe.utils import getdate
from frappe.utils import getdate, nowdate, add_days
# test_records = frappe.get_test_records('Task')
@ -177,3 +177,18 @@ class TestTask(unittest.TestCase):
todo = get_owner_and_status()
self.assertEquals(todo.owner, "test@example.com")
self.assertEquals(todo.status, "Closed")
def test_overdue(self):
task = frappe.get_doc({
"doctype":"Task",
"subject": "Testing Overdue",
"status": "Open",
"exp_end_date": add_days(nowdate(), -1)
})
task.insert()
from erpnext.projects.doctype.task.task import set_tasks_as_overdue
set_tasks_as_overdue()
self.assertEquals(frappe.db.get_value("Task", task.name, "status"), "Overdue")

11
erpnext/public/js/setup_wizard.js
View File

@ -109,7 +109,7 @@ function load_erpnext_slides() {
{"fieldname": "password", "label": __("Password"), "fieldtype": "Password",
reqd:1},
{fieldtype:"Attach Image", fieldname:"attach_user",
label: __("Attach Your Picture")},
label: __("Attach Your Picture"), is_private: 0},
],
help: __('The first user will become the System Manager (you can change this later).'),
onload: function(slide) {
@ -254,12 +254,15 @@ function load_erpnext_slides() {
fields: [
{fieldtype:"Attach Image", fieldname:"attach_letterhead",
label: __("Attach Letterhead"),
description: __("Keep it web friendly 900px (w) by 100px (h)")
description: __("Keep it web friendly 900px (w) by 100px (h)"),
is_private: 0
},
{fieldtype: "Column Break"},
{fieldtype:"Attach Image", fieldname:"attach_logo",
label:__("Attach Logo"),
description: __("100px by 100px")},
description: __("100px by 100px"),
is_private: 0
},
],
css_class: "two-column"
@ -381,7 +384,7 @@ function load_erpnext_slides() {
{fieldtype: "Check", fieldname: "is_purchase_item_" + i, label:__("We buy this Item")},
{fieldtype:"Column Break"},
{fieldtype:"Currency", fieldname:"item_price_" + i, label:__("Rate")},
{fieldtype:"Attach Image", fieldname:"item_img_" + i, label:__("Attach Image")},
{fieldtype:"Attach Image", fieldname:"item_img_" + i, label:__("Attach Image"), is_private: 0},
])
}
slide.fields[1].reqd = 1;

4
erpnext/setup/doctype/email_digest/templates/default.html
View File

@ -76,7 +76,7 @@
<table style="width: 100%;">
<tr>
<td>
<a style="{{ link_css }}" href="{{ t.link }}">{{ t.description }}</a>
<a style="{{ link_css }}" href="{{ t.link }}">{{ _(t.description) }}</a>
</td>
<td style="width: 25%; text-align: right">
<span style="{{ label_css }}">
@ -99,7 +99,7 @@
<table style="width: 100%;">
<tr>
<td>
<a style="{{ link_css }}" href="{{ n.link }}">{{ n.key }}</a>
<a style="{{ link_css }}" href="{{ n.link }}">{{ _(n.key) }}</a>
</td>
<td style="width: 25%; text-align: right">
<span style="{{ label_css }}">

2
erpnext/startup/notifications.py
View File

@ -8,7 +8,7 @@ def get_notification_config():
{
"Issue": {"status": "Open"},
"Warranty Claim": {"status": "Open"},
"Task": {"status": "Open"},
"Task": {"status": "Overdue"},
"Project": {"status": "Open"},
"Lead": {"status": "Open"},
"Contact": {"status": "Open"},

3
erpnext/stock/doctype/item/item.js
View File

@ -10,6 +10,9 @@ frappe.ui.form.on("Item", {
frm.fields_dict["attributes"].grid.set_column_disp("attribute_value", true);
}
// should never check Private
frm.fields_dict["website_image"].df.is_private = 0;
},
refresh: function(frm) {

28
erpnext/stock/doctype/item/item.py
View File

@ -47,8 +47,6 @@ class Item(WebsiteGenerator):
if not self.stock_uom:
msgprint(_("Please enter default Unit of Measure"), raise_exception=1)
if self.image and not self.website_image:
self.website_image = self.image
self.check_warehouse_is_set_for_stock_item()
self.validate_uom()
@ -68,6 +66,7 @@ class Item(WebsiteGenerator):
self.validate_has_variants()
self.validate_attributes()
self.validate_variant_attributes()
self.validate_website_image()
self.make_thumbnail()
if not self.get("__islocal"):
@ -83,6 +82,29 @@ class Item(WebsiteGenerator):
self.update_variants()
self.update_template_item()
def validate_website_image(self):
"""Validate if the website image is a public file"""
auto_set_website_image = False
if not self.website_image and self.image:
auto_set_website_image = True
self.website_image = self.image
file = frappe.db.get_value("File", filters={
"file_url": self.website_image,
"attached_to_doctype": self.doctype,
"attached_to_name": self.name
}, fieldname=["name", "is_private"], as_dict=True)
if not file:
self.website_image = None
if not auto_set_website_image:
frappe.msgprint(_("Website Image {0} attached to Item {1} cannot be found").format(self.website_image, self.name))
elif file.is_private:
self.website_image = None
if not auto_set_website_image:
frappe.msgprint(_("Website Image should be a public file or website URL"))
def make_thumbnail(self):
"""Make a thumbnail of `website_image`"""
import requests.exceptions
@ -383,7 +405,7 @@ class Item(WebsiteGenerator):
for d in self.get("reorder_levels"):
if d.warehouse_reorder_level and not d.warehouse_reorder_qty:
frappe.throw(_("Row #{0}: Please set reorder quantity").format(d.idx))
def validate_warehouse_for_reorder(self):
warehouse = []

2
setup.py
View File

@ -1,7 +1,7 @@
from setuptools import setup, find_packages
from pip.req import parse_requirements
version = "6.12.8"
version = "6.12.9"
requirements = parse_requirements("requirements.txt", session="")
setup(