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 2017-12-26 18:35:50 +05:30
commit ff2fb653be
7 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
from frappe.utils import getdate from frappe.utils import getdate
__version__ = '10.0.1' __version__ = '10.0.2'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

1
erpnext/accounts/doctype/payment_entry/test_payment_entry.py
View File

@ -94,6 +94,7 @@ class TestPaymentEntry(unittest.TestCase):
pe.reference_no = "1" pe.reference_no = "1"
pe.reference_date = "2016-01-01" pe.reference_date = "2016-01-01"
pe.source_exchange_rate = 1 pe.source_exchange_rate = 1
pe.paid_to = payable
pe.insert() pe.insert()
pe.submit() pe.submit()

1
erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
View File

@ -27,6 +27,7 @@ class TestPurchaseInvoice(unittest.TestCase):
unlink_payment_on_cancel_of_invoice(0) unlink_payment_on_cancel_of_invoice(0)
def test_gl_entries_without_perpetual_inventory(self): def test_gl_entries_without_perpetual_inventory(self):
frappe.db.set_value("Company", "_Test Company", "round_off_account", "Round Off - _TC")
wrapper = frappe.copy_doc(test_records[0]) wrapper = frappe.copy_doc(test_records[0])
set_perpetual_inventory(0, wrapper.company) set_perpetual_inventory(0, wrapper.company)
self.assertTrue(not cint(erpnext.is_perpetual_inventory_enabled(wrapper.company))) self.assertTrue(not cint(erpnext.is_perpetual_inventory_enabled(wrapper.company)))

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

@ -941,8 +941,8 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2017-08-31 16:10:44.049915", "modified": "2017-12-26 04:50:15.317590",
"modified_by": "tundebabzy@gmail.com", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Supplier", "name": "Supplier",
"name_case": "Title Case", "name_case": "Title Case",

1
erpnext/crm/doctype/lead/lead.py
View File

@ -129,7 +129,6 @@ def _make_customer(source_name, target_doc=None, ignore_permissions=False):
} }
}}, target_doc, set_missing_values, ignore_permissions=ignore_permissions) }}, target_doc, set_missing_values, ignore_permissions=ignore_permissions)
print(doclist)
return doclist return doclist
@frappe.whitelist() @frappe.whitelist()

1
erpnext/public/js/utils.js
View File

@ -245,6 +245,7 @@ erpnext.utils.map_current_doc = function(opts) {
callback: function(r) { callback: function(r) {
if(!r.exc) { if(!r.exc) {
var doc = frappe.model.sync(r.message); var doc = frappe.model.sync(r.message);
cur_frm.dirty();
cur_frm.refresh(); cur_frm.refresh();
} }
} }

15
erpnext/stock/doctype/item/test_item.py
View File

@ -5,13 +5,14 @@ from __future__ import unicode_literals
import unittest import unittest
import frappe import frappe
from frappe.test_runner import make_test_records from frappe.test_runner import make_test_objects
from erpnext.controllers.item_variant import (create_variant, ItemVariantExistsError, from erpnext.controllers.item_variant import (create_variant, ItemVariantExistsError,
InvalidItemAttributeValueError, get_variant) InvalidItemAttributeValueError, get_variant)
from erpnext.stock.doctype.item.item import StockExistsForTemplate from erpnext.stock.doctype.item.item import StockExistsForTemplate
from frappe.model.rename_doc import rename_doc from frappe.model.rename_doc import rename_doc
from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
from erpnext.stock.get_item_details import get_item_details
test_ignore = ["BOM"] test_ignore = ["BOM"]
test_dependencies = ["Warehouse"] test_dependencies = ["Warehouse"]
@ -53,7 +54,9 @@ class TestItem(unittest.TestCase):
return item return item
def test_get_item_details(self): def test_get_item_details(self):
from erpnext.stock.get_item_details import get_item_details # delete modified item price record and make as per test_records
frappe.db.sql("""delete from `tabItem Price`""")
to_check = { to_check = {
"item_code": "_Test Item", "item_code": "_Test Item",
"item_name": "_Test Item", "item_name": "_Test Item",
@ -76,7 +79,8 @@ class TestItem(unittest.TestCase):
"conversion_factor": 1.0, "conversion_factor": 1.0,
} }
make_test_records("Item Price") make_test_objects("Item Price")
print(frappe.get_all("Item Price"))
details = get_item_details({ details = get_item_details({
"item_code": "_Test Item", "item_code": "_Test Item",
@ -88,7 +92,10 @@ class TestItem(unittest.TestCase):
"price_list_currency": "_Test Currency", "price_list_currency": "_Test Currency",
"plc_conversion_rate": 1, "plc_conversion_rate": 1,
"order_type": "Sales", "order_type": "Sales",
"customer": "_Test Customer" "customer": "_Test Customer",
"conversion_factor": 1,
"price_list_uom_dependant": 1,
"ignore_pricing_rule": 1
}) })
for key, value in to_check.iteritems(): for key, value in to_check.iteritems():