Skip to content

Commit 398f144

Browse files
nabinhaitnabinhait
committed
Merge branch 'develop'
2 parents e713a7d + e2741e8 commit 398f144

File tree

43 files changed

+4194
-3285
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+4194
-3285
lines changed

‎erpnext/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from __future__ import unicode_literals
33
import frappe
44

5-
__version__ = '8.0.15'
5+
__version__ = '8.0.16'
66

77
def get_default_company(user=None):
88
'''Get default company for user'''

‎erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33

44
frappe.ui.form.on("Bank Reconciliation", {
55
setup: function(frm) {
6-
frm.get_docfield("payment_entries").allow_bulk_edit = 1;
76
frm.add_fetch("bank_account", "account_currency", "account_currency");
87
},
98

109
onload: function(frm) {
11-
var default_bank_account = locals[":Company"][frappe.defaults.get_user_default("Company")]["default_bank_account"];
1210

11+
let default_bank_account = frappe.defaults.get_user_default("Company")?
12+
locals[":Company"][frappe.defaults.get_user_default("Company")]["default_bank_account"]: "";
1313
frm.set_value("bank_account", default_bank_account);
1414

1515
frm.set_query("bank_account", function() {

‎erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json

+53-4
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,32 @@
11
{
22
"allow_copy": 1,
3+
"allow_guest_to_view": 0,
34
"allow_import": 0,
45
"allow_rename": 0,
56
"beta": 0,
67
"creation": "2013-01-10 16:34:05",
78
"custom": 0,
89
"docstatus": 0,
910
"doctype": "DocType",
11+
"document_type": "Document",
12+
"editable_grid": 0,
1013
"fields": [
1114
{
15+
"allow_bulk_edit": 0,
1216
"allow_on_submit": 0,
1317
"bold": 0,
1418
"collapsible": 0,
19+
"columns": 0,
1520
"description": "Select account head of the bank where cheque was deposited.",
1621
"fieldname": "bank_account",
1722
"fieldtype": "Link",
1823
"hidden": 0,
1924
"ignore_user_permissions": 0,
2025
"ignore_xss_filter": 0,
2126
"in_filter": 0,
27+
"in_global_search": 0,
2228
"in_list_view": 1,
29+
"in_standard_filter": 0,
2330
"label": "Bank Account",
2431
"length": 0,
2532
"no_copy": 0,
@@ -28,23 +35,28 @@
2835
"print_hide": 0,
2936
"print_hide_if_no_value": 0,
3037
"read_only": 0,
38+
"remember_last_selected_value": 0,
3139
"report_hide": 0,
3240
"reqd": 1,
3341
"search_index": 0,
3442
"set_only_once": 0,
3543
"unique": 0
3644
},
3745
{
46+
"allow_bulk_edit": 0,
3847
"allow_on_submit": 0,
3948
"bold": 0,
4049
"collapsible": 0,
50+
"columns": 0,
4151
"fieldname": "account_currency",
4252
"fieldtype": "Link",
4353
"hidden": 1,
4454
"ignore_user_permissions": 0,
4555
"ignore_xss_filter": 0,
4656
"in_filter": 0,
57+
"in_global_search": 0,
4758
"in_list_view": 0,
59+
"in_standard_filter": 0,
4860
"label": "Account Currency",
4961
"length": 0,
5062
"no_copy": 0,
@@ -53,95 +65,115 @@
5365
"print_hide": 1,
5466
"print_hide_if_no_value": 0,
5567
"read_only": 0,
68+
"remember_last_selected_value": 0,
5669
"report_hide": 0,
5770
"reqd": 0,
5871
"search_index": 0,
5972
"set_only_once": 0,
6073
"unique": 0
6174
},
6275
{
76+
"allow_bulk_edit": 0,
6377
"allow_on_submit": 0,
6478
"bold": 0,
6579
"collapsible": 0,
80+
"columns": 0,
6681
"fieldname": "from_date",
6782
"fieldtype": "Date",
6883
"hidden": 0,
6984
"ignore_user_permissions": 0,
7085
"ignore_xss_filter": 0,
7186
"in_filter": 0,
87+
"in_global_search": 0,
7288
"in_list_view": 1,
89+
"in_standard_filter": 0,
7390
"label": "From Date",
7491
"length": 0,
7592
"no_copy": 0,
7693
"permlevel": 0,
7794
"print_hide": 0,
7895
"print_hide_if_no_value": 0,
7996
"read_only": 0,
97+
"remember_last_selected_value": 0,
8098
"report_hide": 0,
8199
"reqd": 1,
82100
"search_index": 0,
83101
"set_only_once": 0,
84102
"unique": 0
85103
},
86104
{
105+
"allow_bulk_edit": 0,
87106
"allow_on_submit": 0,
88107
"bold": 0,
89108
"collapsible": 0,
109+
"columns": 0,
90110
"fieldname": "to_date",
91111
"fieldtype": "Date",
92112
"hidden": 0,
93113
"ignore_user_permissions": 0,
94114
"ignore_xss_filter": 0,
95115
"in_filter": 0,
116+
"in_global_search": 0,
96117
"in_list_view": 1,
118+
"in_standard_filter": 0,
97119
"label": "To Date",
98120
"length": 0,
99121
"no_copy": 0,
100122
"permlevel": 0,
101123
"print_hide": 0,
102124
"print_hide_if_no_value": 0,
103125
"read_only": 0,
126+
"remember_last_selected_value": 0,
104127
"report_hide": 0,
105128
"reqd": 1,
106129
"search_index": 0,
107130
"set_only_once": 0,
108131
"unique": 0
109132
},
110133
{
134+
"allow_bulk_edit": 0,
111135
"allow_on_submit": 0,
112136
"bold": 0,
113137
"collapsible": 0,
138+
"columns": 0,
114139
"fieldname": "include_reconciled_entries",
115140
"fieldtype": "Check",
116141
"hidden": 0,
117142
"ignore_user_permissions": 0,
118143
"ignore_xss_filter": 0,
119144
"in_filter": 0,
145+
"in_global_search": 0,
120146
"in_list_view": 1,
147+
"in_standard_filter": 0,
121148
"label": "Include Reconciled Entries",
122149
"length": 0,
123150
"no_copy": 0,
124151
"permlevel": 0,
125152
"print_hide": 0,
126153
"print_hide_if_no_value": 0,
127154
"read_only": 0,
155+
"remember_last_selected_value": 0,
128156
"report_hide": 0,
129157
"reqd": 0,
130158
"search_index": 0,
131159
"set_only_once": 0,
132160
"unique": 0
133161
},
134162
{
163+
"allow_bulk_edit": 0,
135164
"allow_on_submit": 0,
136165
"bold": 0,
137166
"collapsible": 0,
167+
"columns": 0,
138168
"fieldname": "get_payment_entries",
139169
"fieldtype": "Button",
140170
"hidden": 0,
141171
"ignore_user_permissions": 0,
142172
"ignore_xss_filter": 0,
143173
"in_filter": 0,
174+
"in_global_search": 0,
144175
"in_list_view": 0,
176+
"in_standard_filter": 0,
145177
"label": "Get Payment Entries",
146178
"length": 0,
147179
"no_copy": 0,
@@ -150,23 +182,28 @@
150182
"print_hide": 0,
151183
"print_hide_if_no_value": 0,
152184
"read_only": 0,
185+
"remember_last_selected_value": 0,
153186
"report_hide": 0,
154187
"reqd": 0,
155188
"search_index": 0,
156189
"set_only_once": 0,
157190
"unique": 0
158191
},
159192
{
193+
"allow_bulk_edit": 1,
160194
"allow_on_submit": 0,
161195
"bold": 0,
162196
"collapsible": 0,
197+
"columns": 0,
163198
"fieldname": "payment_entries",
164199
"fieldtype": "Table",
165200
"hidden": 0,
166201
"ignore_user_permissions": 0,
167202
"ignore_xss_filter": 0,
168203
"in_filter": 0,
204+
"in_global_search": 0,
169205
"in_list_view": 0,
206+
"in_standard_filter": 0,
170207
"label": "Payment Entries",
171208
"length": 0,
172209
"no_copy": 0,
@@ -175,23 +212,28 @@
175212
"print_hide": 0,
176213
"print_hide_if_no_value": 0,
177214
"read_only": 0,
215+
"remember_last_selected_value": 0,
178216
"report_hide": 0,
179217
"reqd": 0,
180218
"search_index": 0,
181219
"set_only_once": 0,
182220
"unique": 0
183221
},
184222
{
223+
"allow_bulk_edit": 0,
185224
"allow_on_submit": 0,
186225
"bold": 0,
187226
"collapsible": 0,
227+
"columns": 0,
188228
"fieldname": "update_clearance_date",
189229
"fieldtype": "Button",
190230
"hidden": 0,
191231
"ignore_user_permissions": 0,
192232
"ignore_xss_filter": 0,
193233
"in_filter": 0,
234+
"in_global_search": 0,
194235
"in_list_view": 0,
236+
"in_standard_filter": 0,
195237
"label": "Update Clearance Date",
196238
"length": 0,
197239
"no_copy": 0,
@@ -200,23 +242,28 @@
200242
"print_hide": 0,
201243
"print_hide_if_no_value": 0,
202244
"read_only": 0,
245+
"remember_last_selected_value": 0,
203246
"report_hide": 0,
204247
"reqd": 0,
205248
"search_index": 0,
206249
"set_only_once": 0,
207250
"unique": 0
208251
},
209252
{
253+
"allow_bulk_edit": 0,
210254
"allow_on_submit": 0,
211255
"bold": 0,
212256
"collapsible": 0,
257+
"columns": 0,
213258
"fieldname": "total_amount",
214259
"fieldtype": "Currency",
215260
"hidden": 0,
216261
"ignore_user_permissions": 0,
217262
"ignore_xss_filter": 0,
218263
"in_filter": 0,
264+
"in_global_search": 0,
219265
"in_list_view": 0,
266+
"in_standard_filter": 0,
220267
"label": "Total Amount",
221268
"length": 0,
222269
"no_copy": 0,
@@ -225,26 +272,27 @@
225272
"print_hide": 0,
226273
"print_hide_if_no_value": 0,
227274
"read_only": 1,
275+
"remember_last_selected_value": 0,
228276
"report_hide": 0,
229277
"reqd": 0,
230278
"search_index": 0,
231279
"set_only_once": 0,
232280
"unique": 0
233281
}
234282
],
283+
"has_web_view": 0,
235284
"hide_heading": 1,
236285
"hide_toolbar": 1,
237286
"icon": "fa fa-check",
238287
"idx": 1,
239288
"image_view": 0,
240289
"in_create": 0,
241-
"in_dialog": 0,
242290
"is_submittable": 0,
243291
"issingle": 1,
244292
"istable": 0,
245293
"max_attachments": 0,
246294
"menu_index": 0,
247-
"modified": "2016-06-28 13:11:09.396353",
295+
"modified": "2017-04-21 16:58:26.902732",
248296
"modified_by": "Administrator",
249297
"module": "Accounts",
250298
"name": "Bank Reconciliation",
@@ -274,7 +322,8 @@
274322
"quick_entry": 1,
275323
"read_only": 1,
276324
"read_only_onload": 0,
325+
"show_name_in_global_search": 0,
277326
"sort_order": "ASC",
278-
"track_seen": 0,
279-
"version": 0
327+
"track_changes": 0,
328+
"track_seen": 0
280329
}

‎erpnext/accounts/report/accounts_receivable/accounts_receivable.html

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
{% var letterhead= filters.letter_head || frappe.get_doc(":Company", filters.company).default_letter_head || frappe.defaults.get_default("letter_head"); %}
2+
{% if(letterhead) { %}
13
<div style="margin-bottom: 7px;" class="text-center">
2-
{%= frappe.boot.letter_heads[frappe.get_doc(":Company", filters.company).default_letter_head || frappe.defaults.get_default("letter_head")] %}
4+
{%= frappe.boot.letter_heads[letterhead].header %}
35
</div>
6+
{% } %}
47
<h2 class="text-center">{%= __(report.report_name) %}</h2>
58
<h4 class="text-center">{%= filters.customer || filters.supplier %} </h4>
69
<h5 class="text-center">

‎erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ frappe.query_reports["Bank Clearance Summary"] = {
2222
"fieldtype": "Link",
2323
"options": "Account",
2424
"reqd": 1,
25-
"default": locals[":Company"][frappe.defaults.get_user_default("Company")]["default_bank_account"],
25+
"default": frappe.defaults.get_user_default("Company")?
26+
locals[":Company"][frappe.defaults.get_user_default("Company")]["default_bank_account"]: "",
2627
"get_query": function() {
2728
return {
2829
"query": "erpnext.controllers.queries.get_account_list",

‎erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ frappe.query_reports["Bank Reconciliation Statement"] = {
88
"label": __("Bank Account"),
99
"fieldtype": "Link",
1010
"options": "Account",
11-
"default": locals[":Company"][frappe.defaults.get_user_default("Company")]["default_bank_account"],
11+
"default": frappe.defaults.get_user_default("Company")?
12+
locals[":Company"][frappe.defaults.get_user_default("Company")]["default_bank_account"]: "",
1213
"reqd": 1,
1314
"get_query": function() {
1415
return {

‎erpnext/accounts/report/financial_statements.html

+8-4
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,16 @@
1313
height: 37px;
1414
}
1515
</style>
16+
{% var letterhead= filters.letter_head || frappe.get_doc(":Company", filters.company).default_letter_head || frappe.defaults.get_default("letter_head"); %}
17+
{% if(letterhead) { %}
1618
<div style="margin-bottom: 7px;" class="text-center">
17-
{%= frappe.boot.letter_heads[frappe.get_doc(":Company", filters.company).default_letter_head || frappe.defaults.get_default("letter_head")] %}
19+
{%= frappe.boot.letter_heads[letterhead].header %}
1820
</div>
21+
{% } %}
1922
<h2 class="text-center">{%= __(report.report_name) %}</h2>
20-
<h4 class="text-center">{%= filters.company %}</h3>
21-
<h4 class="text-center">{%= filters.fiscal_year %}</h3>
23+
<h3 class="text-center">{%= filters.company %}</h3>
24+
<h3 class="text-center">{%= filters.fiscal_year %}</h3>
25+
<h5 class="text-center">{%= __("Currency") %} : {%= erpnext.get_currency(filters.company) %} </h4>
2226
{% if (filters.from_date) { %}
2327
<h4 class="text-center">{%= dateutil.str_to_user(filters.from_date) %} - {%= dateutil.str_to_user(filters.to_date) %}</h3>
2428
{% } %}
@@ -47,7 +51,7 @@ <h4 class="text-center">{%= dateutil.str_to_user(filters.from_date) %} - {%= dat
4751
<td class="text-right">
4852
{% var fieldname = report.columns[i].field; %}
4953
{% if (!is_null(row[fieldname])) { %}
50-
{%= format_currency(row[fieldname], row.currency) %}
54+
{%= format_number(row[fieldname], null)%}
5155
{% } %}
5256
</td>
5357
{% } %}

0 commit comments

Comments
 (0)