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

fixed conflict and aii check in global defaults

Browse Source
This commit is contained in:
Nabin Hait
2013-03-28 15:54:11 +05:30
parent e2fe8de637 9d601d593d
commit 41fe3567bb
21 changed files with 595 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
stock/doctype/delivery_note_item/delivery_note_item.txt
View File

@@ -1,8 +1,8 @@
[
{
"creation": "2013-03-25 11:55:16",
"creation": "2013-03-26 11:03:09",
"docstatus": 0,
"modified": "2013-03-25 15:43:04",
"modified": "2013-03-28 15:42:41",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -248,7 +248,7 @@
"doctype": "DocField",
"fieldname": "expense_account",
"fieldtype": "Link",
"hidden": 1,
"hidden": 0,
"label": "Expense Account",
"no_copy": 1,
"options": "Account",
@@ -260,11 +260,12 @@
"doctype": "DocField",
"fieldname": "cost_center",
"fieldtype": "Link",
"hidden": 1,
"hidden": 0,
"label": "Cost Center",
"no_copy": 1,
"options": "Cost Center",
"print_hide": 1,
"read_only": 0,
"width": "120px"
},
{

12
stock/doctype/material_request/test_material_request.py
View File

@@ -24,7 +24,8 @@ class TestMaterialRequest(unittest.TestCase):
"doctype": "Stock Entry",
"posting_date": "2013-03-01",
"posting_time": "00:00:00",
"purpose": "Material Receipt"
"purpose": "Material Receipt",
"fiscal_year": "_Test Fiscal Year 2013",
},
{
"conversion_factor": 1.0,
@@ -125,7 +126,8 @@ class TestMaterialRequest(unittest.TestCase):
["Material Request Item", "Stock Entry Detail"]], mr.doc.name)
se_doclist[0].fields.update({
"posting_date": "2013-03-01",
"posting_time": "01:00"
"posting_time": "01:00",
"fiscal_year": "_Test Fiscal Year 2013",
})
se_doclist[1].fields.update({
"qty": 27.0,
@@ -186,7 +188,8 @@ class TestMaterialRequest(unittest.TestCase):
["Material Request Item", "Stock Entry Detail"]], mr.doc.name)
se_doclist[0].fields.update({
"posting_date": "2013-03-01",
"posting_time": "00:00"
"posting_time": "00:00",
"fiscal_year": "_Test Fiscal Year 2013",
})
se_doclist[1].fields.update({
"qty": 60.0,
@@ -239,7 +242,8 @@ class TestMaterialRequest(unittest.TestCase):
["Material Request Item", "Stock Entry Detail"]], mr.doc.name)
se_doclist[0].fields.update({
"posting_date": "2013-03-01",
"posting_time": "00:00"
"posting_time": "00:00",
"fiscal_year": "_Test Fiscal Year 2013",
})
se_doclist[1].fields.update({
"qty": 60.0,