From 5640a69e78a9d1ffdbaebffaa03de331535129df Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Tue, 5 Mar 2013 14:12:34 +0530
Subject: [PATCH] updated sync

---
 .../mode_of_payment/mode_of_payment.txt       |  1 -
 patches/patch_list.py                         |  3 +-
 .../doctype/activity_type/activity_type.txt   | 58 +++++++++----------
 projects/doctype/time_log/time_log.txt        |  8 ++-
 startup/install.py                            |  2 +-
 5 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/accounts/doctype/mode_of_payment/mode_of_payment.txt b/accounts/doctype/mode_of_payment/mode_of_payment.txt
index 902ab37cc32..2d019964fca 100644
--- a/accounts/doctype/mode_of_payment/mode_of_payment.txt
+++ b/accounts/doctype/mode_of_payment/mode_of_payment.txt
@@ -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", 
diff --git a/patches/patch_list.py b/patches/patch_list.py
index dd7ff06e647..ed4e82e964a 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -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\"')"
 ]
\ No newline at end of file
diff --git a/projects/doctype/activity_type/activity_type.txt b/projects/doctype/activity_type/activity_type.txt
index 3bde64786b5..028db2bd4d3 100644
--- a/projects/doctype/activity_type/activity_type.txt
+++ b/projects/doctype/activity_type/activity_type.txt
@@ -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"
  }
 ]
\ No newline at end of file
diff --git a/projects/doctype/time_log/time_log.txt b/projects/doctype/time_log/time_log.txt
index cf815db57fc..838d3f178a2 100644
--- a/projects/doctype/time_log/time_log.txt
+++ b/projects/doctype/time_log/time_log.txt
@@ -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
  }, 
  {
diff --git a/startup/install.py b/startup/install.py
index f584769bebd..dfbd2899d00 100644
--- a/startup/install.py
+++ b/startup/install.py
@@ -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'},