nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-21 05:59:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

[conflicts] [merged]

Browse Source
This commit is contained in:
Rushabh Mehta
2013-05-02 16:02:59 +05:30
parent 3ddc524361 99181fa772
commit d3e00995db
71 changed files with 1249 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
buying/doctype/purchase_order/test_purchase_order.py
View File

@@ -27,6 +27,12 @@ class TestPurchaseOrder(unittest.TestCase):
po.insert()
self.assertEquals(len(po.doclist.get({"parentfield": "po_raw_material_details"})), 2)
def test_warehouse_company_validation(self):
from controllers.buying_controller import WrongWarehouseCompany
po = webnotes.bean(copy=test_records[0])
po.doc.company = "_Test Company 1"
self.assertRaises(WrongWarehouseCompany, po.insert)
test_dependencies = ["BOM"]

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

@@ -47,7 +47,7 @@ cur_frm.cscript.make_address = function() {
if(!cur_frm.address_list) {
cur_frm.address_list = new wn.ui.Listing({
parent: cur_frm.fields_dict['address_html'].wrapper,
page_length: 2,
page_length: 5,
new_doctype: "Address",
custom_new_doc: function(doctype) {
var address = wn.model.make_new_doc_and_get_name('Address');
@@ -78,7 +78,7 @@ cur_frm.cscript.make_contact = function() {
if(!cur_frm.contact_list) {
cur_frm.contact_list = new wn.ui.Listing({
parent: cur_frm.fields_dict['contact_html'].wrapper,
page_length: 2,
page_length: 5,
new_doctype: "Contact",
custom_new_doc: function(doctype) {
var contact = wn.model.make_new_doc_and_get_name('Contact');