Skip to content

Commit 0d0d3ba

Browse files
nabinhaitnabinhait
committed
Merge branch 'develop'
2 parents 3f7fff0 + 70e1778 commit 0d0d3ba

File tree

6 files changed

+45
-10
lines changed

6 files changed

+45
-10
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.23'
5+
__version__ = '8.0.24'
66

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

‎erpnext/accounts/doctype/payment_request/payment_request.json

+27-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"allow_copy": 0,
3+
"allow_guest_to_view": 0,
34
"allow_import": 0,
45
"allow_rename": 0,
56
"autoname": "naming_series:",
@@ -13,6 +14,7 @@
1314
"engine": "InnoDB",
1415
"fields": [
1516
{
17+
"allow_bulk_edit": 0,
1618
"allow_on_submit": 0,
1719
"bold": 0,
1820
"collapsible": 0,
@@ -43,6 +45,7 @@
4345
"unique": 0
4446
},
4547
{
48+
"allow_bulk_edit": 0,
4649
"allow_on_submit": 0,
4750
"bold": 0,
4851
"collapsible": 0,
@@ -72,6 +75,7 @@
7275
"unique": 0
7376
},
7477
{
78+
"allow_bulk_edit": 0,
7579
"allow_on_submit": 0,
7680
"bold": 0,
7781
"collapsible": 0,
@@ -103,6 +107,7 @@
103107
"unique": 0
104108
},
105109
{
110+
"allow_bulk_edit": 0,
106111
"allow_on_submit": 0,
107112
"bold": 0,
108113
"collapsible": 0,
@@ -132,6 +137,7 @@
132137
"unique": 0
133138
},
134139
{
140+
"allow_bulk_edit": 0,
135141
"allow_on_submit": 0,
136142
"bold": 0,
137143
"collapsible": 0,
@@ -161,6 +167,7 @@
161167
"unique": 0
162168
},
163169
{
170+
"allow_bulk_edit": 0,
164171
"allow_on_submit": 0,
165172
"bold": 0,
166173
"collapsible": 0,
@@ -189,6 +196,7 @@
189196
"unique": 0
190197
},
191198
{
199+
"allow_bulk_edit": 0,
192200
"allow_on_submit": 0,
193201
"bold": 0,
194202
"collapsible": 0,
@@ -219,6 +227,7 @@
219227
"unique": 0
220228
},
221229
{
230+
"allow_bulk_edit": 0,
222231
"allow_on_submit": 0,
223232
"bold": 0,
224233
"collapsible": 0,
@@ -249,6 +258,7 @@
249258
"unique": 0
250259
},
251260
{
261+
"allow_bulk_edit": 0,
252262
"allow_on_submit": 0,
253263
"bold": 0,
254264
"collapsible": 0,
@@ -280,6 +290,7 @@
280290
"unique": 0
281291
},
282292
{
293+
"allow_bulk_edit": 0,
283294
"allow_on_submit": 0,
284295
"bold": 0,
285296
"collapsible": 0,
@@ -311,6 +322,7 @@
311322
"unique": 0
312323
},
313324
{
325+
"allow_bulk_edit": 0,
314326
"allow_on_submit": 0,
315327
"bold": 0,
316328
"collapsible": 0,
@@ -341,6 +353,7 @@
341353
"unique": 0
342354
},
343355
{
356+
"allow_bulk_edit": 0,
344357
"allow_on_submit": 0,
345358
"bold": 0,
346359
"collapsible": 0,
@@ -369,6 +382,7 @@
369382
"unique": 0
370383
},
371384
{
385+
"allow_bulk_edit": 0,
372386
"allow_on_submit": 0,
373387
"bold": 0,
374388
"collapsible": 0,
@@ -398,6 +412,7 @@
398412
"unique": 0
399413
},
400414
{
415+
"allow_bulk_edit": 0,
401416
"allow_on_submit": 0,
402417
"bold": 0,
403418
"collapsible": 0,
@@ -428,6 +443,7 @@
428443
"unique": 0
429444
},
430445
{
446+
"allow_bulk_edit": 0,
431447
"allow_on_submit": 0,
432448
"bold": 0,
433449
"collapsible": 0,
@@ -457,6 +473,7 @@
457473
"unique": 0
458474
},
459475
{
476+
"allow_bulk_edit": 0,
460477
"allow_on_submit": 0,
461478
"bold": 0,
462479
"collapsible": 0,
@@ -486,6 +503,7 @@
486503
"unique": 0
487504
},
488505
{
506+
"allow_bulk_edit": 0,
489507
"allow_on_submit": 0,
490508
"bold": 0,
491509
"collapsible": 1,
@@ -516,6 +534,7 @@
516534
"unique": 0
517535
},
518536
{
537+
"allow_bulk_edit": 0,
519538
"allow_on_submit": 0,
520539
"bold": 0,
521540
"collapsible": 0,
@@ -546,6 +565,7 @@
546565
"unique": 0
547566
},
548567
{
568+
"allow_bulk_edit": 0,
549569
"allow_on_submit": 0,
550570
"bold": 0,
551571
"collapsible": 0,
@@ -576,6 +596,7 @@
576596
"unique": 0
577597
},
578598
{
599+
"allow_bulk_edit": 0,
579600
"allow_on_submit": 0,
580601
"bold": 0,
581602
"collapsible": 0,
@@ -605,6 +626,7 @@
605626
"unique": 0
606627
},
607628
{
629+
"allow_bulk_edit": 0,
608630
"allow_on_submit": 0,
609631
"bold": 0,
610632
"collapsible": 0,
@@ -635,6 +657,7 @@
635657
"unique": 0
636658
},
637659
{
660+
"allow_bulk_edit": 0,
638661
"allow_on_submit": 0,
639662
"bold": 0,
640663
"collapsible": 0,
@@ -665,6 +688,7 @@
665688
"unique": 0
666689
},
667690
{
691+
"allow_bulk_edit": 0,
668692
"allow_on_submit": 0,
669693
"bold": 0,
670694
"collapsible": 0,
@@ -694,17 +718,17 @@
694718
"unique": 0
695719
}
696720
],
721+
"has_web_view": 0,
697722
"hide_heading": 0,
698723
"hide_toolbar": 0,
699724
"idx": 0,
700725
"image_view": 0,
701-
"in_create": 0,
702-
"in_dialog": 0,
726+
"in_create": 1,
703727
"is_submittable": 1,
704728
"issingle": 0,
705729
"istable": 0,
706730
"max_attachments": 0,
707-
"modified": "2017-02-23 05:03:37.464863",
731+
"modified": "2017-05-08 12:09:25.759145",
708732
"modified_by": "Administrator",
709733
"module": "Accounts",
710734
"name": "Payment Request",

‎erpnext/accounts/doctype/payment_request/payment_request.py

+5
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,14 @@
1414

1515
class PaymentRequest(Document):
1616
def validate(self):
17+
self.validate_reference_document()
1718
self.validate_payment_request()
1819
self.validate_currency()
1920

21+
def validate_reference_document(self):
22+
if not self.reference_doctype or not self.reference_name:
23+
frappe.throw(_("To create a Payment Request reference document is required"))
24+
2025
def validate_payment_request(self):
2126
if frappe.db.get_value("Payment Request", {"reference_name": self.reference_name,
2227
"name": ("!=", self.name), "status": ("not in", ["Initiated", "Paid"]), "docstatus": 1}, "name"):

‎erpnext/controllers/queries.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -360,8 +360,8 @@ def warehouse_query(doctype, txt, searchfield, start, page_len, filters):
360360
sub_query = """ select round(`tabBin`.actual_qty, 2) from `tabBin`
361361
where `tabBin`.warehouse = `tabWarehouse`.name
362362
{bin_conditions} """.format(
363-
bin_conditions=get_filters_cond(doctype, filter_dict.get("Bin"), bin_conditions),
364-
ignore_permissions=True)
363+
bin_conditions=get_filters_cond(doctype, filter_dict.get("Bin"),
364+
bin_conditions, ignore_permissions=True))
365365

366366
response = frappe.db.sql("""select `tabWarehouse`.name,
367367
CONCAT_WS(" : ", "Actual Qty", ifnull( ({sub_query}), 0) ) as actual_qty

‎erpnext/projects/doctype/timesheet/timesheet.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -382,9 +382,13 @@ def get_events(start, end, filters=None):
382382

383383
def get_conditions(filters):
384384
conditions = []
385-
abbr = {'employee': 'tabTimesheet', 'project': 'tabTimesheet Detail'}
386385
for key in filters:
387386
if filters.get(key):
388-
conditions.append("`%s`.%s = '%s'"%(abbr.get(key), key, filters.get(key)))
387+
if frappe.get_meta("Timesheet").has_field(key):
388+
dt = 'tabTimesheet'
389+
elif frappe.get_meta("Timesheet Detail").has_field(key):
390+
dt = 'tabTimesheet Detail'
391+
392+
conditions.append("`%s`.%s = '%s'"%(dt, key, filters.get(key)))
389393

390394
return " and {}".format(" and ".join(conditions)) if conditions else ""

‎erpnext/stock/doctype/item/item.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
import json
88
import itertools
99
from frappe import msgprint, _
10-
from frappe.utils import cstr, flt, cint, getdate, now_datetime, formatdate, strip, get_timestamp
10+
from frappe.utils import (cstr, flt, cint, getdate, now_datetime, formatdate,
11+
strip, get_timestamp, random_string)
1112
from frappe.website.website_generator import WebsiteGenerator
1213
from erpnext.setup.doctype.item_group.item_group import invalidate_cache_for, get_parent_item_groups
1314
from frappe.website.render import clear_cache
@@ -142,7 +143,8 @@ def set_opening_stock(self):
142143

143144
def make_route(self):
144145
if not self.route:
145-
return cstr(frappe.db.get_value('Item Group', self.item_group, 'route')) + '/' + self.scrub(self.name)
146+
return cstr(frappe.db.get_value('Item Group', self.item_group,
147+
'route')) + '/' + self.scrub(self.item_name + '-' + random_string(5))
146148

147149
def get_parents(self, context):
148150
item_group, route = frappe.db.get_value('Item Group', self.item_group, ['name', 'route'])

0 commit comments

Comments
 (0)