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

updated sync

Browse Source
This commit is contained in:
Rushabh Mehta 2013-03-05 14:12:34 +05:30
parent 9bba9ed4d2
commit 5640a69e78
5 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
accounts/doctype/mode_of_payment/mode_of_payment.txt
View File

@ -59,7 +59,6 @@
},
{
"description": "Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.",
"colour": "White:FFF",
"doctype": "DocField",
"label": "Default Account",
"fieldname": "default_account",

3
patches/patch_list.py
View File

@ -204,5 +204,6 @@ patch_list = [
"patches.march_2013.update_po_prevdoc_doctype",
"patches.february_2013.p09_timesheets",
"execute:(not webnotes.conn.exists('UOM', 'Hour')) and webnotes.doc({'uom_name': 'Hour', 'doctype': 'UOM', 'name': 'Hour'}).insert()",
"patches.march_2013.p01_c_form"
"patches.march_2013.p01_c_form",
"execute:webnotes.conn.sql('update tabDocPerm set `submit`=1, `cancel`=1, `amend`=1 where parent=\"Time Log\"')"
]

58
projects/doctype/activity_type/activity_type.txt
View File

@ -1,60 +1,56 @@
[
{
"owner": "Administrator",
"creation": "2013-03-05 12:53:23",
"docstatus": 0,
"creation": "2012-07-03 13:30:51",
"modified": "2013-03-05 12:54:22",
"modified_by": "Administrator",
"modified": "2012-11-16 12:14:21"
"owner": "Administrator"
},
{
"section_style": "Simple",
"module": "Projects",
"server_code_error": " ",
"in_dialog": 1,
"document_type": "Master",
"autoname": "field:activity_type",
"name": "__common__",
"colour": "White:FFF",
"doctype": "DocType",
"version": 1
"document_type": "Master",
"in_dialog": 1,
"module": "Projects",
"name": "__common__"
},
{
"parent": "Activity Type",
"name": "__common__",
"doctype": "DocField",
"reqd": 1,
"parenttype": "DocType",
"fieldname": "activity_type",
"fieldtype": "Data",
"label": "Activity Type",
"permlevel": 0,
"parentfield": "fields"
},
{
"name": "__common__",
"parent": "Activity Type",
"read": 1,
"create": 1,
"doctype": "DocPerm",
"write": 1,
"parentfield": "fields",
"parenttype": "DocType",
"report": 1,
"permlevel": 0,
"parentfield": "permissions"
"reqd": 1
},
{
"name": "Activity Type",
"doctype": "DocType"
"create": 1,
"doctype": "DocPerm",
"name": "__common__",
"parent": "Activity Type",
"parentfield": "permissions",
"parenttype": "DocType",
"permlevel": 0,
"read": 1,
"report": 1,
"write": 1
},
{
"doctype": "DocType",
"name": "Activity Type"
},
{
"doctype": "DocField"
},
{
"role": "System Manager",
"doctype": "DocPerm"
"doctype": "DocPerm",
"role": "System Manager"
},
{
"role": "Projects User",
"doctype": "DocPerm"
"doctype": "DocPerm",
"role": "Projects User"
}
]

8
projects/doctype/time_log/time_log.txt
View File

@ -1,8 +1,8 @@
[
{
"creation": "2013-03-04 02:39:45",
"creation": "2013-03-05 10:52:02",
"docstatus": 0,
"modified": "2013-03-04 02:48:12",
"modified": "2013-03-05 10:54:07",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -24,6 +24,8 @@
"parenttype": "DocType"
},
{
"amend": 1,
"cancel": 1,
"doctype": "DocPerm",
"name": "__common__",
"parent": "Time Log",
@ -31,6 +33,8 @@
"parenttype": "DocType",
"permlevel": 0,
"read": 1,
"report": 1,
"submit": 1,
"write": 1
},
{

2
startup/install.py
View File

@ -162,7 +162,7 @@ def import_defaults():
# UOM
{'uom_name': 'Unit', 'doctype': 'UOM', 'name': 'Unit'},
{'uom_name': 'Unit', 'doctype': 'UOM', 'name': 'Hour'},
{'uom_name': 'Hour', 'doctype': 'UOM', 'name': 'Hour'},
{'uom_name': 'Box', 'doctype': 'UOM', 'name': 'Box'},
{'uom_name': 'Ft', 'doctype': 'UOM', 'name': 'Ft'},
{'uom_name': 'Kg', 'doctype': 'UOM', 'name': 'Kg'},