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

Merge branch 'develop' into profitability-report

Browse Source
This commit is contained in:
Jannat Patel
2021-04-02 10:15:28 +05:30
committed by GitHub
parent c0b4eea415 ace4ce64a0
commit 0353b0f5f6
199 changed files with 3261 additions and 2600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/projects/doctype/project/project.js
View File

@@ -18,8 +18,8 @@ frappe.ui.form.on("Project", {
};
},
onload: function (frm) {
var so = frappe.meta.get_docfield("Project", "sales_order");
so.get_route_options_for_new_doc = function (field) {
const so = frm.get_docfield("sales_order");
so.get_route_options_for_new_doc = () => {
if (frm.is_new()) return;
return {
"customer": frm.doc.customer,

11
erpnext/projects/doctype/project/test_project.py
View File

@@ -4,12 +4,14 @@ from __future__ import unicode_literals
import frappe, unittest
test_records = frappe.get_test_records('Project')
test_ignore = ["Sales Order"]
from frappe.utils import getdate, nowdate, add_days
from erpnext.projects.doctype.project_template.test_project_template import make_project_template
from erpnext.projects.doctype.task.test_task import create_task
from frappe.utils import getdate, nowdate, add_days
test_records = frappe.get_test_records('Project')
test_ignore = ["Sales Order"]
class TestProject(unittest.TestCase):
def test_project_with_template_having_no_parent_and_depend_tasks(self):
@@ -112,7 +114,8 @@ def make_project(args):
doctype = 'Project',
project_name = args.project_name,
status = 'Open',
expected_start_date = args.start_date
expected_start_date = args.start_date,
company= args.company or '_Test Company'
))
if args.project_template_name: