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:
Anand Doshi 2016-01-05 19:09:36 +05:30
commit 570d1783f9
38 changed files with 333 additions and 339 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.16.1'
__version__ = '6.16.2'

28
erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
View File

@ -82,24 +82,26 @@ def get_charts_for_country(country):
def _get_chart_name(content):
if content:
content = json.loads(content)
if content and content.get("is_active", "No") == "Yes" and content.get("disabled", "No") == "No":
if frappe.local.flags.allow_unverified_charts:
charts.append(content["name"])
elif content and content.get("is_active", "No") == "Yes" and content.get("disabled", "No") == "No":
charts.append(content["name"])
country_code = frappe.db.get_value("Country", country, "code")
if country_code:
path = os.path.join(os.path.dirname(__file__), "verified")
for fname in os.listdir(path):
if fname.startswith(country_code) and fname.endswith(".json"):
with open(os.path.join(path, fname), "r") as f:
_get_chart_name(f.read())
folders = ("verified",)
if frappe.local.flags.allow_unverified_charts:
folders = ("verified", "unverified")
# countries_use_OHADA_system = ["Benin", "Burkina Faso", "Cameroon", "Central African Republic", "Comoros",
# "Congo", "Ivory Coast", "Gabon", "Guinea", "Guinea Bissau", "Equatorial Guinea", "Mali", "Niger",
# "Replica of Democratic Congo", "Senegal", "Chad", "Togo"]
#
# if country in countries_use_OHADA_system:
# with open(os.path.join(os.path.dirname(__file__), "syscohada_syscohada_chart_template.json"), "r") as f:
# _get_chart_name(f.read())
for folder in folders:
path = os.path.join(os.path.dirname(__file__), folder)
for fname in os.listdir(path):
if fname.startswith(country_code) and fname.endswith(".json"):
with open(os.path.join(path, fname), "r") as f:
_get_chart_name(f.read())
if len(charts) != 1:
charts.append("Standard")

9
erpnext/accounts/report/budget_variance_report/budget_variance_report.js
View File

@ -14,7 +14,12 @@ frappe.query_reports["Budget Variance Report"] = {
fieldname: "period",
label: __("Period"),
fieldtype: "Select",
options: "Monthly\nQuarterly\nHalf-Yearly\nYearly",
options: [
{ "value": "Monthly", "label": __("Monthly") },
{ "value": "Quarterly", "label": __("Quarterly") },
{ "value": "Half-Yearly", "label": __("Half-Yearly") },
{ "value": "Yearly", "label": __("Yearly") }
],
default: "Monthly"
},
{
@ -25,4 +30,4 @@ frappe.query_reports["Budget Variance Report"] = {
default: frappe.defaults.get_user_default("Company")
},
]
}
}

4
erpnext/buying/doctype/supplier/supplier.js
View File

@ -25,7 +25,7 @@ cur_frm.cscript.make_dashboard = function(doc) {
if(doc.__islocal)
return;
if (in_list(user_roles, "Accounts User") || in_list(user_roles, "Accounts Manager"))
cur_frm.dashboard.set_headline('<span class="text-muted">Loading...</span>')
cur_frm.dashboard.set_headline('<span class="text-muted">' + __('Loading') + '</span>')
cur_frm.dashboard.add_doctype_badge("Supplier Quotation", "supplier");
cur_frm.dashboard.add_doctype_badge("Purchase Order", "supplier");
@ -41,7 +41,7 @@ cur_frm.cscript.make_dashboard = function(doc) {
callback: function(r) {
if (in_list(user_roles, "Accounts User") || in_list(user_roles, "Accounts Manager")) {
cur_frm.dashboard.set_headline(
__("Total Billing This Year: ") + "<b>"
__("Total billing this year") + ": <b>"
+ format_currency(r.message.billing_this_year, cur_frm.doc.party_account_currency)
+ '</b> / <span class="text-muted">' + __("Total Unpaid") + ": <b>"
+ format_currency(r.message.total_unpaid, cur_frm.doc.party_account_currency)

6
erpnext/config/desktop.py
View File

@ -32,7 +32,8 @@ def get_data():
"icon": "icon-th",
"icon": "octicon octicon-credit-card",
"type": "page",
"link": "pos"
"link": "pos",
"label": _("POS")
},
"Projects": {
"color": "#8e44ad",
@ -68,6 +69,7 @@ def get_data():
"force_show": True,
"icon": "octicon octicon-device-camera-video",
"type": "module",
"is_help": True
"is_help": True,
"label": _("Learn")
}
}

4
erpnext/crm/doctype/opportunity/opportunity.js
View File

@ -90,12 +90,12 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) {
var frm = cur_frm;
if(frm.perm[0].write && doc.docstatus==0) {
if(frm.doc.status==="Open") {
frm.add_custom_button("Close", function() {
frm.add_custom_button(__("Close"), function() {
frm.set_value("status", "Closed");
frm.save();
});
} else {
frm.add_custom_button("Reopen", function() {
frm.add_custom_button(__("Reopen"), function() {
frm.set_value("status", "Open");
frm.save();
});

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

@ -35,7 +35,7 @@
Version
</td>
<td>
<code>6.15.1</code>
<code>6.16.1</code>
</td>
</tr>
</table>

8
erpnext/docs/current/models/accounts/payment_reconciliation.html
View File

@ -152,7 +152,7 @@
<td >
Date</td>
<td >
From Date
From Invoice Date
</td>
<td></td>
@ -164,7 +164,7 @@
<td >
Date</td>
<td >
To Date
To Invoice Date
</td>
<td></td>
@ -176,7 +176,7 @@
<td >
Currency</td>
<td >
Minimum Amount
Minimum Invoice Amount
</td>
<td></td>
@ -188,7 +188,7 @@
<td >
Currency</td>
<td >
Maximum Amount
Maximum Invoice Amount
</td>
<td></td>

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

@ -413,15 +413,6 @@ Net Weight</pre>
</li>
<li>
<a href="https://frappe.github.io/erpnext/current/models/shopping_cart/shopping_cart_shipping_rule">Shopping Cart Shipping Rule</a>
</li>
</ul>

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

@ -679,18 +679,6 @@ Cheque</pre>
<tr >
<td>45</td>
<td ><code>emergency_contact_details</code></td>
<td >
HTML</td>
<td >
Emergency Contact Details
</td>
<td></td>
</tr>
<tr >
<td>46</td>
<td ><code>person_to_be_contacted</code></td>
<td >
Data</td>
@ -702,7 +690,7 @@ Cheque</pre>
</tr>
<tr >
<td>47</td>
<td>46</td>
<td ><code>relation</code></td>
<td >
Data</td>
@ -714,7 +702,7 @@ Cheque</pre>
</tr>
<tr >
<td>48</td>
<td>47</td>
<td ><code>emergency_phone_number</code></td>
<td >
Data</td>
@ -726,7 +714,7 @@ Cheque</pre>
</tr>
<tr >
<td>49</td>
<td>48</td>
<td ><code>column_break4</code></td>
<td class="info">
Column Break</td>
@ -738,7 +726,7 @@ Cheque</pre>
</tr>
<tr >
<td>50</td>
<td>49</td>
<td ><code>permanent_accommodation_type</code></td>
<td >
Select</td>
@ -754,7 +742,7 @@ Owned</pre>
</tr>
<tr >
<td>51</td>
<td>50</td>
<td ><code>permanent_address</code></td>
<td >
Small Text</td>
@ -766,7 +754,7 @@ Owned</pre>
</tr>
<tr >
<td>52</td>
<td>51</td>
<td ><code>current_accommodation_type</code></td>
<td >
Select</td>
@ -782,7 +770,7 @@ Owned</pre>
</tr>
<tr >
<td>53</td>
<td>52</td>
<td ><code>current_address</code></td>
<td >
Small Text</td>
@ -794,7 +782,7 @@ Owned</pre>
</tr>
<tr class="info">
<td>54</td>
<td>53</td>
<td ><code>sb53</code></td>
<td >
Section Break</td>
@ -806,7 +794,7 @@ Owned</pre>
</tr>
<tr >
<td>55</td>
<td>54</td>
<td ><code>bio</code></td>
<td >
Text Editor</td>
@ -819,7 +807,7 @@ Owned</pre>
</tr>
<tr class="info">
<td>56</td>
<td>55</td>
<td ><code>personal_details</code></td>
<td >
Section Break</td>
@ -831,7 +819,7 @@ Owned</pre>
</tr>
<tr >
<td>57</td>
<td>56</td>
<td ><code>column_break5</code></td>
<td class="info">
Column Break</td>
@ -843,7 +831,7 @@ Owned</pre>
</tr>
<tr >
<td>58</td>
<td>57</td>
<td ><code>passport_number</code></td>
<td >
Data</td>
@ -855,7 +843,7 @@ Owned</pre>
</tr>
<tr >
<td>59</td>
<td>58</td>
<td ><code>date_of_issue</code></td>
<td >
Date</td>
@ -867,7 +855,7 @@ Owned</pre>
</tr>
<tr >
<td>60</td>
<td>59</td>
<td ><code>valid_upto</code></td>
<td >
Date</td>
@ -879,7 +867,7 @@ Owned</pre>
</tr>
<tr >
<td>61</td>
<td>60</td>
<td ><code>place_of_issue</code></td>
<td >
Data</td>
@ -891,7 +879,7 @@ Owned</pre>
</tr>
<tr >
<td>62</td>
<td>61</td>
<td ><code>column_break6</code></td>
<td class="info">
Column Break</td>
@ -903,7 +891,7 @@ Owned</pre>
</tr>
<tr >
<td>63</td>
<td>62</td>
<td ><code>marital_status</code></td>
<td >
Select</td>
@ -921,7 +909,7 @@ Widowed</pre>
</tr>
<tr >
<td>64</td>
<td>63</td>
<td ><code>blood_group</code></td>
<td >
Select</td>
@ -943,7 +931,7 @@ O-</pre>
</tr>
<tr >
<td>65</td>
<td>64</td>
<td ><code>family_background</code></td>
<td >
Small Text</td>
@ -956,7 +944,7 @@ O-</pre>
</tr>
<tr >
<td>66</td>
<td>65</td>
<td ><code>health_details</code></td>
<td >
Small Text</td>
@ -969,7 +957,7 @@ O-</pre>
</tr>
<tr class="info">
<td>67</td>
<td>66</td>
<td ><code>educational_qualification</code></td>
<td >
Section Break</td>
@ -981,7 +969,7 @@ O-</pre>
</tr>
<tr >
<td>68</td>
<td>67</td>
<td ><code>education</code></td>
<td >
Table</td>
@ -1002,7 +990,7 @@ O-</pre>
</tr>
<tr class="info">
<td>69</td>
<td>68</td>
<td ><code>previous_work_experience</code></td>
<td >
Section Break</td>
@ -1016,7 +1004,7 @@ O-</pre>
</tr>
<tr >
<td>70</td>
<td>69</td>
<td ><code>external_work_history</code></td>
<td >
Table</td>
@ -1037,7 +1025,7 @@ O-</pre>
</tr>
<tr class="info">
<td>71</td>
<td>70</td>
<td ><code>history_in_company</code></td>
<td >
Section Break</td>
@ -1051,7 +1039,7 @@ O-</pre>
</tr>
<tr >
<td>72</td>
<td>71</td>
<td ><code>internal_work_history</code></td>
<td >
Table</td>
@ -1072,7 +1060,7 @@ O-</pre>
</tr>
<tr class="info">
<td>73</td>
<td>72</td>
<td ><code>exit</code></td>
<td >
Section Break</td>
@ -1084,7 +1072,7 @@ O-</pre>
</tr>
<tr >
<td>74</td>
<td>73</td>
<td ><code>column_break7</code></td>
<td class="info">
Column Break</td>
@ -1096,7 +1084,7 @@ O-</pre>
</tr>
<tr >
<td>75</td>
<td>74</td>
<td ><code>resignation_letter_date</code></td>
<td >
Date</td>
@ -1108,7 +1096,7 @@ O-</pre>
</tr>
<tr >
<td>76</td>
<td>75</td>
<td ><code>relieving_date</code></td>
<td >
Date</td>
@ -1120,7 +1108,7 @@ O-</pre>
</tr>
<tr >
<td>77</td>
<td>76</td>
<td ><code>reason_for_leaving</code></td>
<td >
Data</td>
@ -1132,7 +1120,7 @@ O-</pre>
</tr>
<tr >
<td>78</td>
<td>77</td>
<td ><code>leave_encashed</code></td>
<td >
Select</td>
@ -1148,7 +1136,7 @@ No</pre>
</tr>
<tr >
<td>79</td>
<td>78</td>
<td ><code>encashment_date</code></td>
<td >
Date</td>
@ -1160,7 +1148,7 @@ No</pre>
</tr>
<tr >
<td>80</td>
<td>79</td>
<td ><code>exit_interview_details</code></td>
<td class="info">
Column Break</td>
@ -1172,7 +1160,7 @@ No</pre>
</tr>
<tr >
<td>81</td>
<td>80</td>
<td ><code>held_on</code></td>
<td >
Date</td>
@ -1184,7 +1172,7 @@ No</pre>
</tr>
<tr >
<td>82</td>
<td>81</td>
<td ><code>reason_for_resignation</code></td>
<td >
Select</td>
@ -1200,7 +1188,7 @@ Health Concerns</pre>
</tr>
<tr >
<td>83</td>
<td>82</td>
<td ><code>new_workplace</code></td>
<td >
Data</td>
@ -1212,7 +1200,7 @@ Health Concerns</pre>
</tr>
<tr >
<td>84</td>
<td>83</td>
<td ><code>feedback</code></td>
<td >
Small Text</td>

48
erpnext/docs/current/models/hr/salary_slip.html
View File

@ -366,18 +366,6 @@
<tr >
<td>21</td>
<td ><code>html_21</code></td>
<td >
HTML</td>
<td >
</td>
<td></td>
</tr>
<tr >
<td>22</td>
<td ><code>earnings</code></td>
<td >
Table</td>
@ -398,7 +386,7 @@
</tr>
<tr >
<td>23</td>
<td>22</td>
<td ><code>deduction</code></td>
<td class="info">
Column Break</td>
@ -410,19 +398,7 @@
</tr>
<tr >
<td>24</td>
<td ><code>html_24</code></td>
<td >
HTML</td>
<td >
</td>
<td></td>
</tr>
<tr >
<td>25</td>
<td>23</td>
<td ><code>deductions</code></td>
<td >
Table</td>
@ -443,7 +419,7 @@
</tr>
<tr class="info">
<td>26</td>
<td>24</td>
<td ><code>totals</code></td>
<td >
Section Break</td>
@ -455,7 +431,7 @@
</tr>
<tr >
<td>27</td>
<td>25</td>
<td ><code>column_break_25</code></td>
<td class="info">
Column Break</td>
@ -467,7 +443,7 @@
</tr>
<tr >
<td>28</td>
<td>26</td>
<td ><code>column_break_26</code></td>
<td class="info">
Column Break</td>
@ -479,7 +455,7 @@
</tr>
<tr >
<td>29</td>
<td>27</td>
<td ><code>arrear_amount</code></td>
<td >
Currency</td>
@ -493,7 +469,7 @@
</tr>
<tr >
<td>30</td>
<td>28</td>
<td ><code>leave_encashment_amount</code></td>
<td >
Currency</td>
@ -507,7 +483,7 @@
</tr>
<tr >
<td>31</td>
<td>29</td>
<td ><code>gross_pay</code></td>
<td >
Currency</td>
@ -521,7 +497,7 @@
</tr>
<tr >
<td>32</td>
<td>30</td>
<td ><code>total_deduction</code></td>
<td >
Currency</td>
@ -535,7 +511,7 @@
</tr>
<tr >
<td>33</td>
<td>31</td>
<td ><code>net_pay</code></td>
<td >
Currency</td>
@ -550,7 +526,7 @@
</tr>
<tr >
<td>34</td>
<td>32</td>
<td ><code>rounded_total</code></td>
<td >
Currency</td>
@ -564,7 +540,7 @@
</tr>
<tr >
<td>35</td>
<td>33</td>
<td ><code>total_in_words</code></td>
<td >
Data</td>

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

@ -1316,20 +1316,8 @@ Campaign</pre>
</td>
</tr>
<tr >
<td>86</td>
<td ><code>per_billed</code></td>
<td >
Currency</td>
<td >
% Amount Billed
</td>
<td></td>
</tr>
<tr class="info">
<td>87</td>
<td>86</td>
<td ><code>printing_details</code></td>
<td >
Section Break</td>
@ -1341,7 +1329,7 @@ Campaign</pre>
</tr>
<tr >
<td>88</td>
<td>87</td>
<td ><code>letter_head</code></td>
<td >
Link</td>
@ -1362,7 +1350,7 @@ Campaign</pre>
</tr>
<tr >
<td>89</td>
<td>88</td>
<td ><code>select_print_heading</code></td>
<td >
Link</td>
@ -1383,7 +1371,7 @@ Campaign</pre>
</tr>
<tr >
<td>90</td>
<td>89</td>
<td ><code>column_break_88</code></td>
<td class="info">
Column Break</td>
@ -1395,7 +1383,7 @@ Campaign</pre>
</tr>
<tr >
<td>91</td>
<td>90</td>
<td ><code>print_without_amount</code></td>
<td >
Check</td>
@ -1407,7 +1395,7 @@ Campaign</pre>
</tr>
<tr class="info">
<td>92</td>
<td>91</td>
<td ><code>section_break_83</code></td>
<td >
Section Break</td>
@ -1419,7 +1407,7 @@ Campaign</pre>
</tr>
<tr >
<td>93</td>
<td>92</td>
<td class="danger" title="Mandatory"><code>status</code></td>
<td >
Select</td>
@ -1430,15 +1418,14 @@ Campaign</pre>
<td>
<pre>
Draft
To Bill
Completed
Submitted
Cancelled
Closed</pre>
</td>
</tr>
<tr >
<td>94</td>
<td>93</td>
<td ><code>per_installed</code></td>
<td >
Percent</td>
@ -1451,7 +1438,7 @@ Closed</pre>
</tr>
<tr >
<td>95</td>
<td>94</td>
<td ><code>installation_status</code></td>
<td >
Select</td>
@ -1463,7 +1450,7 @@ Closed</pre>
</tr>
<tr >
<td>96</td>
<td>95</td>
<td ><code>column_break_89</code></td>
<td class="info">
Column Break</td>
@ -1475,7 +1462,7 @@ Closed</pre>
</tr>
<tr >
<td>97</td>
<td>96</td>
<td ><code>to_warehouse</code></td>
<td >
Link</td>
@ -1497,7 +1484,7 @@ Closed</pre>
</tr>
<tr >
<td>98</td>
<td>97</td>
<td ><code>excise_page</code></td>
<td >
Data</td>
@ -1509,7 +1496,7 @@ Closed</pre>
</tr>
<tr >
<td>99</td>
<td>98</td>
<td ><code>instructions</code></td>
<td >
Text</td>
@ -1521,7 +1508,7 @@ Closed</pre>
</tr>
<tr class="info">
<td>100</td>
<td>99</td>
<td ><code>sales_team_section_break</code></td>
<td >
Section Break</td>
@ -1535,7 +1522,7 @@ Closed</pre>
</tr>
<tr >
<td>101</td>
<td>100</td>
<td ><code>sales_partner</code></td>
<td >
Link</td>
@ -1556,7 +1543,7 @@ Closed</pre>
</tr>
<tr >
<td>102</td>
<td>101</td>
<td ><code>column_break7</code></td>
<td class="info">
Column Break</td>
@ -1568,7 +1555,7 @@ Closed</pre>
</tr>
<tr >
<td>103</td>
<td>102</td>
<td ><code>commission_rate</code></td>
<td >
Float</td>
@ -1580,7 +1567,7 @@ Closed</pre>
</tr>
<tr >
<td>104</td>
<td>103</td>
<td ><code>total_commission</code></td>
<td >
Currency</td>
@ -1594,7 +1581,7 @@ Closed</pre>
</tr>
<tr class="info">
<td>105</td>
<td>104</td>
<td ><code>section_break1</code></td>
<td >
Section Break</td>
@ -1606,7 +1593,7 @@ Closed</pre>
</tr>
<tr >
<td>106</td>
<td>105</td>
<td ><code>sales_team</code></td>
<td >
Table</td>

14
erpnext/docs/current/models/stock/delivery_note_item.html
View File

@ -746,20 +746,6 @@
<tr >
<td>49</td>
<td ><code>billed_amt</code></td>
<td >
Currency</td>
<td >
Billed Amt
</td>
<td>
<pre>currency</pre>
</td>
</tr>
<tr >
<td>50</td>
<td ><code>page_break</code></td>
<td >
Check</td>

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

@ -1082,8 +1082,7 @@ Yes</pre>
<td>
<pre>
Draft
To Bill
Completed
Submitted
Cancelled
Closed</pre>
</td>
@ -1158,18 +1157,6 @@ Closed</pre>
<tr >
<td>77</td>
<td ><code>per_billed</code></td>
<td >
Percent</td>
<td >
% Amount Billed
</td>
<td></td>
</tr>
<tr >
<td>78</td>
<td class="danger" title="Mandatory"><code>company</code></td>
<td >
Link</td>
@ -1190,7 +1177,7 @@ Closed</pre>
</tr>
<tr >
<td>79</td>
<td>78</td>
<td class="danger" title="Mandatory"><code>fiscal_year</code></td>
<td >
Link</td>
@ -1211,7 +1198,7 @@ Closed</pre>
</tr>
<tr class="info">
<td>80</td>
<td>79</td>
<td ><code>printing_settings</code></td>
<td >
Section Break</td>
@ -1223,7 +1210,7 @@ Closed</pre>
</tr>
<tr >
<td>81</td>
<td>80</td>
<td ><code>letter_head</code></td>
<td >
Link</td>
@ -1244,7 +1231,7 @@ Closed</pre>
</tr>
<tr >
<td>82</td>
<td>81</td>
<td ><code>select_print_heading</code></td>
<td >
Link</td>
@ -1265,7 +1252,7 @@ Closed</pre>
</tr>
<tr >
<td>83</td>
<td>82</td>
<td ><code>other_details</code></td>
<td >
HTML</td>
@ -1277,7 +1264,7 @@ Closed</pre>
</tr>
<tr >
<td>84</td>
<td>83</td>
<td ><code>instructions</code></td>
<td >
Small Text</td>
@ -1289,7 +1276,7 @@ Closed</pre>
</tr>
<tr >
<td>85</td>
<td>84</td>
<td ><code>remarks</code></td>
<td >
Small Text</td>
@ -1301,7 +1288,7 @@ Closed</pre>
</tr>
<tr class="info">
<td>86</td>
<td>85</td>
<td ><code>transporter_info</code></td>
<td >
Section Break</td>
@ -1315,7 +1302,7 @@ Closed</pre>
</tr>
<tr >
<td>87</td>
<td>86</td>
<td ><code>transporter_name</code></td>
<td >
Data</td>
@ -1327,7 +1314,7 @@ Closed</pre>
</tr>
<tr >
<td>88</td>
<td>87</td>
<td ><code>column_break5</code></td>
<td class="info">
Column Break</td>
@ -1339,7 +1326,7 @@ Closed</pre>
</tr>
<tr >
<td>89</td>
<td>88</td>
<td ><code>lr_no</code></td>
<td >
Data</td>
@ -1351,7 +1338,7 @@ Closed</pre>
</tr>
<tr >
<td>90</td>
<td>89</td>
<td ><code>lr_date</code></td>
<td >
Date</td>

26
erpnext/docs/current/models/stock/purchase_receipt_item.html
View File

@ -794,18 +794,6 @@
<tr >
<td>53</td>
<td ><code>billed_amt</code></td>
<td >
Currency</td>
<td >
Billed Amt
</td>
<td></td>
</tr>
<tr >
<td>54</td>
<td ><code>brand</code></td>
<td >
Link</td>
@ -826,7 +814,7 @@
</tr>
<tr >
<td>55</td>
<td>54</td>
<td ><code>item_group</code></td>
<td >
Link</td>
@ -847,7 +835,7 @@
</tr>
<tr >
<td>56</td>
<td>55</td>
<td ><code>rm_supp_cost</code></td>
<td >
Currency</td>
@ -861,7 +849,7 @@
</tr>
<tr >
<td>57</td>
<td>56</td>
<td ><code>item_tax_amount</code></td>
<td >
Currency</td>
@ -875,7 +863,7 @@
</tr>
<tr >
<td>58</td>
<td>57</td>
<td ><code>landed_cost_voucher_amount</code></td>
<td >
Currency</td>
@ -887,7 +875,7 @@
</tr>
<tr >
<td>59</td>
<td>58</td>
<td ><code>valuation_rate</code></td>
<td >
Currency</td>
@ -901,7 +889,7 @@
</tr>
<tr >
<td>60</td>
<td>59</td>
<td ><code>item_tax_rate</code></td>
<td >
Small Text</td>
@ -915,7 +903,7 @@ Used for Taxes and Charges</p>
</tr>
<tr >
<td>61</td>
<td>60</td>
<td ><code>page_break</code></td>
<td >
Check</td>

2
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.16.1"
app_version = "6.16.2"
app_email = "info@erpnext.com"
app_license = "GNU General Public License (v3)"
source_link = "https://github.com/frappe/erpnext"

112
erpnext/hr/doctype/employee/employee.json
View File

@ -25,6 +25,7 @@
"oldfieldtype": "Section Break",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -46,6 +47,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -69,6 +71,7 @@
"no_copy": 1,
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 1,
"reqd": 0,
@ -94,6 +97,7 @@
"options": "EMP/",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -119,6 +123,7 @@
"options": "\nMr\nMs",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -143,6 +148,7 @@
"oldfieldtype": "Data",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 1,
@ -166,6 +172,7 @@
"options": "",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -189,6 +196,7 @@
"options": "image",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -210,6 +218,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -235,6 +244,7 @@
"options": "User",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -259,6 +269,7 @@
"oldfieldtype": "Data",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -283,6 +294,7 @@
"oldfieldtype": "Date",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 1,
@ -308,6 +320,7 @@
"oldfieldtype": "Date",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 1,
@ -333,6 +346,7 @@
"options": "\nMale\nFemale",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 1,
@ -356,6 +370,7 @@
"options": "Company",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 1,
@ -378,6 +393,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -399,6 +415,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -425,6 +442,7 @@
"options": "\nActive\nLeft",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 1,
@ -450,6 +468,7 @@
"options": "Employment Type",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -476,6 +495,7 @@
"options": "Holiday List",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -497,6 +517,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -521,6 +542,7 @@
"oldfieldtype": "Date",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -545,6 +567,7 @@
"oldfieldtype": "Date",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -569,6 +592,7 @@
"oldfieldtype": "Date",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -593,6 +617,7 @@
"oldfieldtype": "Date",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -615,6 +640,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -636,6 +662,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -662,6 +689,7 @@
"options": "Branch",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -687,6 +715,7 @@
"options": "Department",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -712,6 +741,7 @@
"options": "Designation",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -738,6 +768,7 @@
"options": "Email",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -762,6 +793,7 @@
"oldfieldtype": "Int",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -785,6 +817,7 @@
"oldfieldtype": "Section Break",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -811,6 +844,7 @@
"options": "\nBank\nCash\nCheque",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -836,6 +870,7 @@
"oldfieldtype": "Link",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -861,6 +896,7 @@
"oldfieldtype": "Data",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -883,6 +919,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -908,6 +945,7 @@
"options": "Employee",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -932,6 +970,7 @@
"options": "Employee Leave Approver",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -954,6 +993,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -975,6 +1015,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -998,6 +1039,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1021,6 +1063,7 @@
"options": "Email",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1043,6 +1086,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1052,30 +1096,7 @@
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "emergency_contact_details",
"fieldtype": "HTML",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Emergency Contact Details",
"length": 0,
"no_copy": 0,
"options": "<h4 class=\"text-muted\">Emergency Contact Details</h4>",
"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,
"bold": 1,
"collapsible": 0,
"fieldname": "person_to_be_contacted",
"fieldtype": "Data",
@ -1088,6 +1109,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1110,6 +1132,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1119,7 +1142,7 @@
},
{
"allow_on_submit": 0,
"bold": 0,
"bold": 1,
"collapsible": 0,
"fieldname": "emergency_phone_number",
"fieldtype": "Data",
@ -1132,6 +1155,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1153,6 +1177,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1177,6 +1202,7 @@
"options": "\nRented\nOwned",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1199,6 +1225,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1222,6 +1249,7 @@
"options": "\nRented\nOwned",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1244,6 +1272,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1266,6 +1295,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1289,6 +1319,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1311,6 +1342,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1332,6 +1364,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1355,6 +1388,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1377,6 +1411,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1399,6 +1434,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1421,6 +1457,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1442,6 +1479,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1466,6 +1504,7 @@
"options": "\nSingle\nMarried\nDivorced\nWidowed",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1489,6 +1528,7 @@
"options": "\nA+\nA-\nB+\nB-\nAB+\nAB-\nO+\nO-",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1512,6 +1552,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1535,6 +1576,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1557,6 +1599,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1580,6 +1623,7 @@
"options": "Employee Education",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1603,6 +1647,7 @@
"options": "Simple",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1626,6 +1671,7 @@
"options": "Employee External Work History",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1649,6 +1695,7 @@
"options": "Simple",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1672,6 +1719,7 @@
"options": "Employee Internal Work History",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1695,6 +1743,7 @@
"oldfieldtype": "Section Break",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1716,6 +1765,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1741,6 +1791,7 @@
"oldfieldtype": "Date",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1765,6 +1816,7 @@
"oldfieldtype": "Date",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1789,6 +1841,7 @@
"oldfieldtype": "Data",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1814,6 +1867,7 @@
"options": "\nYes\nNo",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1838,6 +1892,7 @@
"oldfieldtype": "Date",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1862,6 +1917,7 @@
"oldfieldtype": "Column Break",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1887,6 +1943,7 @@
"oldfieldtype": "Date",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1912,6 +1969,7 @@
"options": "\nBetter Prospects\nHealth Concerns",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1936,6 +1994,7 @@
"oldfieldtype": "Data",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1960,6 +2019,7 @@
"oldfieldtype": "Text",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -1978,7 +2038,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"modified": "2015-11-16 06:29:46.290512",
"modified": "2016-01-04 05:37:04.262434",
"modified_by": "Administrator",
"module": "HR",
"name": "Employee",

6
erpnext/hr/doctype/process_payroll/process_payroll.py
View File

@ -80,9 +80,9 @@ class ProcessPayroll(Document):
def create_log(self, ss_list):
log = "<p>No employee for the above selected criteria OR salary slip already created</p>"
log = "<p>" + _("No employee for the above selected criteria OR salary slip already created") + "</p>"
if ss_list:
log = "<b>Salary Slip Created For</b>\
log = "<b>" + _("Salary Slip Created") + "</b>\
<br><br>%s" % '<br>'.join(self.format_as_links(ss_list))
return log
@ -205,4 +205,4 @@ def get_month_details(year, month):
'month_start_date': msd,
'month_end_date': med,
'month_days': month_days
})
})

79
erpnext/hr/doctype/salary_slip/salary_slip.json
View File

@ -22,6 +22,7 @@
"oldfieldtype": "Column Break",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -48,6 +49,7 @@
"options": "Employee",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 1,
@ -72,6 +74,7 @@
"oldfieldtype": "Data",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"report_hide": 0,
"reqd": 1,
@ -97,6 +100,7 @@
"options": "Department",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"report_hide": 0,
"reqd": 0,
@ -122,6 +126,7 @@
"options": "Designation",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"report_hide": 0,
"reqd": 0,
@ -147,6 +152,7 @@
"options": "Branch",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"report_hide": 0,
"reqd": 0,
@ -170,6 +176,7 @@
"options": "Letter Head",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -193,6 +200,7 @@
"options": "Company",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 1,
@ -215,6 +223,7 @@
"oldfieldtype": "Column Break",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -241,6 +250,7 @@
"options": "\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 1,
@ -267,6 +277,7 @@
"options": "Fiscal Year",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 1,
@ -291,6 +302,7 @@
"oldfieldtype": "Int",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"report_hide": 0,
"reqd": 1,
@ -315,6 +327,7 @@
"oldfieldtype": "Currency",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -339,6 +352,7 @@
"oldfieldtype": "Float",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"report_hide": 0,
"reqd": 1,
@ -363,6 +377,7 @@
"oldfieldtype": "Data",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"report_hide": 0,
"reqd": 0,
@ -387,6 +402,7 @@
"oldfieldtype": "Data",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"report_hide": 0,
"reqd": 0,
@ -411,6 +427,7 @@
"oldfieldtype": "Check",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 1,
"reqd": 0,
@ -436,6 +453,7 @@
"options": "Salary Slip",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -459,6 +477,7 @@
"oldfieldtype": "Section Break",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -482,6 +501,7 @@
"oldfieldtype": "Column Break",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -490,28 +510,6 @@
"unique": 0,
"width": "50%"
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "html_21",
"fieldtype": "HTML",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"length": 0,
"no_copy": 0,
"options": "<label>Earnings</label>",
"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,
@ -530,6 +528,7 @@
"options": "Salary Slip Earning",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -553,6 +552,7 @@
"oldfieldtype": "Column Break",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -561,28 +561,6 @@
"unique": 0,
"width": "50%"
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "html_24",
"fieldtype": "HTML",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"length": 0,
"no_copy": 0,
"options": "<label>Deductions</label>",
"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,
@ -601,6 +579,7 @@
"options": "Salary Slip Deduction",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -624,6 +603,7 @@
"oldfieldtype": "Section Break",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -645,6 +625,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -666,6 +647,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -691,6 +673,7 @@
"options": "Company:company:default_currency",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -716,6 +699,7 @@
"options": "Company:company:default_currency",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -741,6 +725,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,
@ -766,6 +751,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,
@ -792,6 +778,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,
@ -815,6 +802,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,
@ -840,6 +828,7 @@
"oldfieldtype": "Data",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"report_hide": 0,
"reqd": 0,
@ -858,7 +847,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"modified": "2015-11-16 06:29:55.474041",
"modified": "2016-01-04 05:31:35.363767",
"modified_by": "Administrator",
"module": "HR",
"name": "Salary Slip",

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

@ -31,12 +31,12 @@ frappe.ui.form.on("Task", {
if(frm.perm[0].write) {
if(frm.doc.status!=="Closed" && frm.doc.status!=="Cancelled") {
frm.add_custom_button("Close", function() {
frm.add_custom_button(__("Close"), function() {
frm.set_value("status", "Closed");
frm.save();
});
} else {
frm.add_custom_button("Reopen", function() {
frm.add_custom_button(__("Reopen"), function() {
frm.set_value("status", "Open");
frm.save();
});

18
erpnext/public/js/controllers/transaction.js
View File

@ -489,7 +489,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
if(docfield) {
var label = __(docfield.label || "").replace(/\([^\)]*\)/g, "");
field_label_map[grid_doctype + "-" + fname] =
label.trim() + " (" + currency + ")";
label.trim() + " (" + __(currency) + ")";
}
});
}
@ -876,36 +876,36 @@ frappe.ui.form.on(cur_frm.doctype, "additional_discount_percentage", function(fr
if (frm.via_discount_amount) {
return;
}
if(!frm.doc.apply_discount_on) {
frappe.msgprint(__("Please set 'Apply Additional Discount On'"));
return
}
frm.via_discount_percentage = true;
if(frm.doc.additional_discount_percentage && frm.doc.discount_amount) {
// Reset discount amount and net / grand total
frm.set_value("discount_amount", 0);
}
var total = flt(frm.doc[frappe.model.scrub(frm.doc.apply_discount_on)]);
var discount_amount = flt(total*flt(frm.doc.additional_discount_percentage) / 100,
var discount_amount = flt(total*flt(frm.doc.additional_discount_percentage) / 100,
precision("discount_amount"));
frm.set_value("discount_amount", discount_amount);
delete frm.via_discount_percentage;
});
frappe.ui.form.on(cur_frm.doctype, "discount_amount", function(frm) {
frm.cscript.set_dynamic_labels();
if (!frm.via_discount_percentage) {
frm.via_discount_amount = true;
frm.set_value("additional_discount_percentage", 0);
delete frm.via_discount_amount;
}
frm.cscript.calculate_taxes_and_totals();
});

7
erpnext/public/js/financial_statements.js
View File

@ -22,7 +22,12 @@ erpnext.financial_statements = {
"fieldname": "periodicity",
"label": __("Periodicity"),
"fieldtype": "Select",
"options": "Yearly\nHalf-yearly\nQuarterly\nMonthly",
"options": [
{ "value": "Monthly", "label": __("Monthly") },
{ "value": "Quarterly", "label": __("Quarterly") },
{ "value": "Half-Yearly", "label": __("Half-Yearly") },
{ "value": "Yearly", "label": __("Yearly") }
],
"default": "Yearly",
"reqd": 1
}

10
erpnext/public/js/stock_analytics.js
View File

@ -51,7 +51,7 @@ erpnext.StockAnalytics = erpnext.StockGridReport.extend({
},
filters: [
{fieldtype:"Select", label: __("Value or Qty"), fieldname: "value_or_qty",
options:["Value", "Quantity"],
options:[{label:__("Value"), value:"Value"}, {label:__("Quantity"), value:"Quantity"}],
filter: function(val, item, opts, me) {
return me.apply_zero_filter(val, item, opts, me);
}},
@ -64,7 +64,13 @@ erpnext.StockAnalytics = erpnext.StockGridReport.extend({
{fieldtype:"Date", label: __("From Date"), fieldname: "from_date"},
{fieldtype:"Date", label: __("To Date"), fieldname: "to_date"},
{fieldtype:"Select", label: __("Range"), fieldname: "range",
options:["Daily", "Weekly", "Monthly", "Quarterly", "Yearly"]}
options:[
{label:__("Daily"), value:"Daily"},
{label:__("Weekly"), value:"Weekly"},
{label:__("Monthly"), value:"Monthly"},
{label:__("Quarterly"), value:"Quarterly"},
{label:__("Yearly"), value:"Yearly"},
]}
],
setup_filters: function() {
var me = this;

2
erpnext/public/js/templates/address_list.html
View File

@ -1,4 +1,4 @@
<p><button class="btn btn-xs btn-default btn-address">New Address</button></p>
<p><button class="btn btn-xs btn-default btn-address">{{ __("New Address") }}</button></p>
<div class="clearfix"></div>
{% for(var i=0, l=addr_list.length; i<l; i++) { %}
<p class="h6">

2
erpnext/public/js/templates/contact_list.html
View File

@ -1,5 +1,5 @@
<p><button class="btn btn-xs btn-default btn-contact">
New Contact</button></p>
{{ __("New Contact") }}</button></p>
<div class="clearfix"></div>
{% for(var i=0, l=contact_list.length; i<l; i++) { %}

2
erpnext/selling/doctype/customer/customer.js
View File

@ -66,7 +66,7 @@ cur_frm.cscript.setup_dashboard = function(doc) {
callback: function(r) {
if (in_list(user_roles, "Accounts User") || in_list(user_roles, "Accounts Manager")) {
cur_frm.dashboard.set_headline(
__("Total Billing This Year: ") + "<b>"
__("Total billing this year") + ": <b>"
+ format_currency(r.message.billing_this_year, cur_frm.doc.party_account_currency)
+ '</b> / <span class="text-muted">' + __("Unpaid") + ": <b>"
+ format_currency(r.message.total_unpaid, cur_frm.doc.party_account_currency)

16
erpnext/selling/doctype/customer/customer.py
View File

@ -229,9 +229,15 @@ def get_customer_outstanding(customer, company):
def get_credit_limit(customer, company):
credit_limit, customer_group = frappe.db.get_value("Customer", customer, ["credit_limit", "customer_group"])
if not credit_limit:
credit_limit = frappe.db.get_value("Customer Group", customer_group, "credit_limit") or \
frappe.db.get_value("Company", company, "credit_limit")
credit_limit = None
return credit_limit
if customer:
credit_limit, customer_group = frappe.db.get_value("Customer", customer, ["credit_limit", "customer_group"])
if not credit_limit:
credit_limit = frappe.db.get_value("Customer Group", customer_group, "credit_limit")
if not credit_limit:
credit_limit = frappe.db.get_value("Company", company, "credit_limit")
return flt(credit_limit)

2
erpnext/selling/page/sales_funnel/sales_funnel.js
View File

@ -180,6 +180,6 @@ erpnext.SalesFunnel = Class.extend({
context.fillStyle = "black";
context.textBaseline = "middle";
context.font = "1.1em sans-serif";
context.fillText(title, width + 20, y_mid);
context.fillText(__(title), width + 20, y_mid);
}
});

10
erpnext/selling/page/sales_funnel/sales_funnel.py
View File

@ -4,6 +4,8 @@
from __future__ import unicode_literals
import frappe
from frappe import _
@frappe.whitelist()
def get_funnel_data(from_date, to_date):
active_leads = frappe.db.sql("""select count(*) from `tabLead`
@ -26,8 +28,8 @@ def get_funnel_data(from_date, to_date):
where docstatus = 1 and (date(`creation`) between %s and %s)""", (from_date, to_date))[0][0]
return [
{ "title": "Active Leads / Customers", "value": active_leads, "color": "#B03B46" },
{ "title": "Opportunities", "value": opportunities, "color": "#F09C00" },
{ "title": "Quotations", "value": quotations, "color": "#006685" },
{ "title": "Sales Orders", "value": sales_orders, "color": "#00AD65" }
{ "title": _("Active Leads / Customers"), "value": active_leads, "color": "#B03B46" },
{ "title": _("Opportunities"), "value": opportunities, "color": "#F09C00" },
{ "title": _("Quotations"), "value": quotations, "color": "#006685" },
{ "title": _("Sales Orders"), "value": sales_orders, "color": "#00AD65" }
]

9
erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js
View File

@ -14,7 +14,12 @@ frappe.query_reports["Sales Person Target Variance Item Group-Wise"] = {
fieldname: "period",
label: __("Period"),
fieldtype: "Select",
options: "Monthly\nQuarterly\nHalf-Yearly\nYearly",
options: [
{ "value": "Monthly", "label": __("Monthly") },
{ "value": "Quarterly", "label": __("Quarterly") },
{ "value": "Half-Yearly", "label": __("Half-Yearly") },
{ "value": "Yearly", "label": __("Yearly") }
],
default: "Monthly"
},
{
@ -25,4 +30,4 @@ frappe.query_reports["Sales Person Target Variance Item Group-Wise"] = {
default: "Quantity"
},
]
}
}

9
erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.js
View File

@ -14,7 +14,12 @@ frappe.query_reports["Territory Target Variance Item Group-Wise"] = {
fieldname: "period",
label: __("Period"),
fieldtype: "Select",
options: "Monthly\nQuarterly\nHalf-Yearly\nYearly",
options: [
{ "value": "Monthly", "label": __("Monthly") },
{ "value": "Quarterly", "label": __("Quarterly") },
{ "value": "Half-Yearly", "label": __("Half-Yearly") },
{ "value": "Yearly", "label": __("Yearly") }
],
default: "Monthly"
},
{
@ -25,4 +30,4 @@ frappe.query_reports["Territory Target Variance Item Group-Wise"] = {
default: "Quantity"
},
]
}
}

14
erpnext/setup/doctype/company/company.py
View File

@ -216,13 +216,15 @@ class Company(Document):
frappe.db.sql("""delete from `tabItem Reorder` where warehouse in (%s)"""
% ', '.join(['%s']*len(warehouses)), tuple(warehouses))
for f in ["income_account", "expense_account"]:
frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)"""
% (f, f, ', '.join(['%s']*len(accounts))), tuple(accounts))
if accounts:
for f in ["income_account", "expense_account"]:
frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)"""
% (f, f, ', '.join(['%s']*len(accounts))), tuple(accounts))
for f in ["selling_cost_center", "buying_cost_center"]:
frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)"""
% (f, f, ', '.join(['%s']*len(cost_centers))), tuple(cost_centers))
if cost_centers:
for f in ["selling_cost_center", "buying_cost_center"]:
frappe.db.sql("""update tabItem set %s=NULL where %s in (%s)"""
% (f, f, ', '.join(['%s']*len(cost_centers))), tuple(cost_centers))
# reset default company
frappe.db.sql("""update `tabSingles` set value=""

6
erpnext/stock/doctype/delivery_note/delivery_note.js
View File

@ -46,13 +46,13 @@ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend(
if (cint(frappe.defaults.get_default("auto_accounting_for_stock"))) {
this.show_general_ledger();
}
if (this.frm.has_perm("submit") && (doc.status !== "Closed")
if (this.frm.has_perm("submit") && (doc.status !== "Closed")
&& this.frm.doc.__onload && this.frm.doc.__onload.has_return_entry) {
cur_frm.add_custom_button(__("Close"), this.close_delivery_note)
}
}
if(doc.__onload && !doc.__onload.billing_complete && doc.docstatus==1
if(doc.__onload && !doc.__onload.billing_complete && doc.docstatus==1
&& !doc.is_return && doc.status!="Closed") {
// show Make Invoice button only if Delivery Note is not created from Sales Invoice
var from_sales_invoice = false;
@ -65,7 +65,7 @@ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend(
}
if(doc.docstatus==1 && doc.status === "Closed" && this.frm.has_perm("submit")) {
cur_frm.add_custom_button(__('Re-open'), this.reopen_delivery_note)
cur_frm.add_custom_button(__('Reopen'), this.reopen_delivery_note)
}
erpnext.stock.delivery_note.set_print_hide(doc, dt, dn);

4
erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
View File

@ -60,7 +60,7 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend
cur_frm.add_custom_button(__('Invoice'),
this.make_purchase_invoice).addClass("btn-primary");
}
if (this.frm.has_perm("submit") &&
if (this.frm.has_perm("submit") &&
this.frm.doc.__onload && this.frm.doc.__onload.has_return_entry) {
cur_frm.add_custom_button(__("Close"), this.close_purchase_receipt)
}
@ -69,7 +69,7 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend
if(this.frm.doc.docstatus==1 && this.frm.doc.status === "Closed" && this.frm.has_perm("submit")) {
cur_frm.add_custom_button(__('Re-open'), this.reopen_purchase_receipt)
cur_frm.add_custom_button(__('Reopen'), this.reopen_purchase_receipt)
}
this.frm.toggle_reqd("supplier_warehouse", this.frm.doc.is_subcontracted==="Yes");

2
erpnext/stock/get_item_details.py
View File

@ -246,7 +246,7 @@ def insert_item_price(args):
"price_list_rate": price_list_rate
})
item_price.insert()
frappe.msgprint("Item Price added for {0} in Price List {1}".format(args.item_code,
frappe.msgprint(_("Item Price added for {0} in Price List {1}").format(args.item_code,
args.price_list))
def get_price_list_rate_for(args, item_code):

8
erpnext/stock/report/stock_projected_qty/stock_projected_qty.py
View File

@ -50,10 +50,12 @@ def get_data(filters):
if d.warehouse == bin.warehouse:
re_order_level = d.warehouse_reorder_level
re_order_qty = d.warehouse_reorder_qty
shortage_qty = re_order_level - flt(bin.projected_qty) if re_order_level else 0
data.append([item.name, item.item_name, item.description, item.item_group, item.brand, bin.warehouse,
item.stock_uom, bin.actual_qty, bin.planned_qty, bin.indented_qty, bin.ordered_qty, bin.reserved_qty,
bin.projected_qty, re_order_level, re_order_qty, re_order_level - flt(bin.projected_qty)])
data.append([item.name, item.item_name, item.description, item.item_group, item.brand, bin.warehouse,
item.stock_uom, bin.actual_qty, bin.planned_qty, bin.indented_qty, bin.ordered_qty,
bin.reserved_qty, bin.projected_qty, re_order_level, re_order_qty, shortage_qty])
return data

4
erpnext/support/doctype/issue/issue.js
View File

@ -5,12 +5,12 @@ frappe.ui.form.on("Issue", {
"refresh": function(frm) {
if(frm.doc.status==="Open") {
frm.add_custom_button("Close", function() {
frm.add_custom_button(__("Close"), function() {
frm.set_value("status", "Closed");
frm.save();
});
} else {
frm.add_custom_button("Reopen", function() {
frm.add_custom_button(__("Reopen"), function() {
frm.set_value("status", "Open");
frm.save();
});

2
setup.py
View File

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