Merge branch 'v7.2.0-beta' into develop

This commit is contained in:
Rushabh Mehta 2016-12-19 12:02:14 +05:30
commit e80208e6e5
8 changed files with 45 additions and 39 deletions

View File

@ -64,7 +64,7 @@ class Opportunity(TransactionBase):
lead = frappe.get_doc({
"doctype": "Lead",
"email_id": self.contact_email,
"lead_name": sender_name
"lead_name": sender_name or 'Unknown'
})
lead.flags.ignore_email_validation = True

View File

@ -60,7 +60,8 @@ def simulate(domain='Manufacturing'):
fixed_asset.work()
for i in xrange(runs_for):
sys.stdout.write("\rSimulating {0}".format(current_date.strftime("%Y-%m-%d")))
sys.stdout.write("\rSimulating {0}: Day {1}".format(
current_date.strftime("%Y-%m-%d"), i))
sys.stdout.flush()
frappe.flags.current_date = current_date
if current_date.weekday() in (5, 6):

View File

@ -75,7 +75,7 @@ def work():
frappe.db.commit()
# make purchase orders
if random.random() < 0.3:
if random.random() < 0.5:
from erpnext.stock.doctype.material_request.material_request import make_purchase_order
report = "Requested Items To Be Ordered"
for row in query_report.run(report)["result"][:how_many("Purchase Order")]:

View File

@ -36,6 +36,7 @@ def make_purchase_receipt():
try:
pr.submit()
except NegativeStockError:
print 'Negative stock for {0}'.format(po)
pass
frappe.db.commit()
@ -101,23 +102,25 @@ def submit_draft_stock_entries():
frappe.db.rollback()
def make_sales_return_records():
for data in frappe.get_all('Delivery Note', fields=["name"], filters={"docstatus": 1}):
if random.random() < 0.1:
try:
dn = make_sales_return(data.name)
dn.insert()
dn.submit()
frappe.db.commit()
except Exception:
frappe.db.rollback()
if random.random() < 0.1:
for data in frappe.get_all('Delivery Note', fields=["name"], filters={"docstatus": 1}):
if random.random() < 0.1:
try:
dn = make_sales_return(data.name)
dn.insert()
dn.submit()
frappe.db.commit()
except Exception:
frappe.db.rollback()
def make_purchase_return_records():
for data in frappe.get_all('Purchase Receipt', fields=["name"], filters={"docstatus": 1}):
if random.random() < 0.1:
try:
pr = make_purchase_return(data.name)
pr.insert()
pr.submit()
frappe.db.commit()
except Exception:
frappe.db.rollback()
if random.random() < 0.1:
for data in frappe.get_all('Purchase Receipt', fields=["name"], filters={"docstatus": 1}):
if random.random() < 0.1:
try:
pr = make_purchase_return(data.name)
pr.insert()
pr.submit()
frappe.db.commit()
except Exception:
frappe.db.rollback()

View File

@ -68,7 +68,7 @@ class ItemGroup(NestedSet, WebsiteGenerator):
start = 0
context.update({
"items": get_product_list_for_group(product_group = self.name, start=start,
limit=context.page_length, search=frappe.form_dict.get("search")),
limit=context.page_length + 1, search=frappe.form_dict.get("search")),
"parent_groups": get_parent_item_groups(self.name),
"title": self.name,
"products_as_list": cint(frappe.db.get_single_value('Website Settings', 'products_as_list'))

View File

@ -3052,7 +3052,7 @@
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"collapsible": 1,
"collapsible_depends_on": "sales_team",
"columns": 0,
"fieldname": "section_break1",
@ -3120,7 +3120,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
"modified": "2016-11-07 05:52:12.783914",
"modified": "2016-12-16 03:56:08.745185",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note",

View File

@ -28,7 +28,7 @@ def get_data():
{
'label': _('Buy'),
'items': ['Material Request', 'Supplier Quotation', 'Request for Quotation',
'Purchase Order', 'Purchase Invoice']
'Purchase Order', 'Purchase Receipt', 'Purchase Invoice']
},
{
'label': _('Traceability'),

View File

@ -25,15 +25,17 @@
<div>
{% if items %}
<div id="search-list" {% if not products_as_list -%} class="row" {%- endif %}>
{% for item in items %}
{{ item }}
{% for i in range(0, page_length) %}
{% if items[i] %}
{{ items[i] }}
{% endif %}
{% endfor %}
</div>
<div class="text-center item-group-nav-buttons">
{% if frappe.form_dict.start|int > 0 %}
<a class="btn btn-default" href="/{{ pathname }}?start={{ frappe.form_dict.start|int - page_length }}">Prev</a>
{% endif %}
{% if items|length == page_length %}
{% if items|length > page_length %}
<a class="btn btn-default" href="/{{ pathname }}?start={{ frappe.form_dict.start|int + page_length }}">Next</a>
{% endif %}
</div>