Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14077 from manassolanki/travel-request

Browse Source 
[rename] Photo ID -> Identification Document
This commit is contained in:
Manas Solanki 2018-05-16 14:13:13 +05:30 committed by GitHub
commit 9b53b93e37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
erpnext/hr/doctype/photo_id_type/__init__.py → erpnext/hr/doctype/identification_document_type/__init__.py
View File

2
erpnext/hr/doctype/photo_id_type/photo_id_type.js → erpnext/hr/doctype/identification_document_type/identification_document_type.js
View File

@ -1,7 +1,7 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors // Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt // For license information, please see license.txt
frappe.ui.form.on('Photo ID Type', { frappe.ui.form.on('Identification Document Type', {
refresh: function(frm) { refresh: function(frm) {
} }

10
erpnext/hr/doctype/photo_id_type/photo_id_type.json → erpnext/hr/doctype/identification_document_type/identification_document_type.json
View File

@ -3,7 +3,7 @@
"allow_guest_to_view": 0, "allow_guest_to_view": 0,
"allow_import": 0, "allow_import": 0,
"allow_rename": 0, "allow_rename": 0,
"autoname": "field:photo_id_type", "autoname": "field:identification_document_type",
"beta": 0, "beta": 0,
"creation": "2018-05-15 07:13:28.620570", "creation": "2018-05-15 07:13:28.620570",
"custom": 0, "custom": 0,
@ -19,7 +19,7 @@
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "photo_id_type", "fieldname": "identification_document_type",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
@ -28,7 +28,7 @@
"in_global_search": 0, "in_global_search": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0, "in_standard_filter": 0,
"label": "Photo ID Type", "label": "Identification Document Type",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
@ -55,10 +55,10 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-05-15 07:13:43.616618", "modified": "2018-05-16 04:34:00.448680",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Photo ID Type", "name": "Identification Document Type",
"name_case": "", "name_case": "",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [

2
erpnext/hr/doctype/photo_id_type/photo_id_type.py → erpnext/hr/doctype/identification_document_type/identification_document_type.py
View File

@ -6,5 +6,5 @@ from __future__ import unicode_literals
import frappe import frappe
from frappe.model.document import Document from frappe.model.document import Document
class PhotoIDType(Document): class IdentificationDocumentType(Document):
pass pass

6
erpnext/hr/doctype/photo_id_type/test_photo_id_type.js → erpnext/hr/doctype/identification_document_type/test_identification_document_type.js
View File

@ -2,15 +2,15 @@
// rename this file from _test_[name] to test_[name] to activate // rename this file from _test_[name] to test_[name] to activate
// and remove above this line // and remove above this line
QUnit.test("test: Photo ID Type", function (assert) { QUnit.test("test: Identification Document Type", function (assert) {
let done = assert.async(); let done = assert.async();
// number of asserts // number of asserts
assert.expect(1); assert.expect(1);
frappe.run_serially([ frappe.run_serially([
// insert a new Photo ID Type // insert a new Identification Document Type
() => frappe.tests.make('Photo ID Type', [ () => frappe.tests.make('Identification Document Type', [
// values to be set // values to be set
{key: 'value'} {key: 'value'}
]), ]),

2
erpnext/hr/doctype/photo_id_type/test_photo_id_type.py → erpnext/hr/doctype/identification_document_type/test_identification_document_type.py
View File

@ -6,5 +6,5 @@ from __future__ import unicode_literals
import frappe import frappe
import unittest import unittest
class TestPhotoIDType(unittest.TestCase): class TestIdentificationDocumentType(unittest.TestCase):
pass pass

12
erpnext/hr/doctype/travel_request/travel_request.json
View File

@ -490,7 +490,7 @@
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "photo_id_type", "fieldname": "personal_id_type",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
@ -499,10 +499,10 @@
"in_global_search": 0, "in_global_search": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0, "in_standard_filter": 0,
"label": "Photo ID Type", "label": "Identification Document Type",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Photo ID Type", "options": "Identification Document Type",
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
"print_hide": 0, "print_hide": 0,
@ -522,7 +522,7 @@
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "photo_id_number", "fieldname": "personal_id_number",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
@ -531,7 +531,7 @@
"in_global_search": 0, "in_global_search": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0, "in_standard_filter": 0,
"label": "Photo ID Number", "label": "Identification Document Number",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
@ -871,7 +871,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-05-15 10:47:54.215916", "modified": "2018-05-16 04:35:56.819570",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Travel Request", "name": "Travel Request",