Merge branch 'master' into edge

Conflicts:
	setup/doctype/backup_manager/backup_dropbox.py

accounts/doctype/journal_voucher/journal_voucher.txt

@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-01-30 12:49:46", 
+  "creation": "2013-03-07 12:35:57", 
   "docstatus": 0, 
-  "modified": "2013-02-01 10:50:16", 
+  "modified": "2013-03-21 13:02:27", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -24,6 +24,9 @@
   "permlevel": 0
  }, 
  {
+  "amend": 1, 
+  "cancel": 1, 
+  "create": 1, 
   "doctype": "DocPerm", 
   "name": "__common__", 
   "parent": "Journal Voucher", 
@@ -31,7 +34,9 @@
   "parenttype": "DocType", 
   "permlevel": 0, 
   "read": 1, 
-  "report": 1
+  "report": 1, 
+  "submit": 1, 
+  "write": 1
  }, 
  {
   "doctype": "DocType", 
@@ -278,6 +283,7 @@
  }, 
  {
   "default": "No", 
+  "description": "Considered as Opening Balance", 
   "doctype": "DocField", 
   "fieldname": "is_opening", 
   "fieldtype": "Select", 
@@ -290,7 +296,7 @@
   "search_index": 1
  }, 
  {
-  "description": "For opening invoice entry, this date will reflect in the period-wise aging report.", 
+  "description": "Actual Posting Date", 
   "doctype": "DocField", 
   "fieldname": "aging_date", 
   "fieldtype": "Date", 
@@ -444,30 +450,11 @@
   "read_only": 1
  }, 
  {
-  "amend": 1, 
-  "cancel": 1, 
-  "create": 1, 
   "doctype": "DocPerm", 
-  "role": "Accounts User", 
-  "submit": 1, 
-  "write": 1
+  "role": "Accounts Manager"
  }, 
  {
-  "amend": 1, 
-  "cancel": 1, 
-  "create": 1, 
   "doctype": "DocPerm", 
-  "role": "Accounts Manager", 
-  "submit": 1, 
-  "write": 1
- }, 
- {
-  "amend": 0, 
-  "cancel": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "role": "Auditor", 
-  "submit": 0, 
-  "write": 0
+  "role": "Accounts User"
  }
 ]

accounts/doctype/purchase_invoice/purchase_invoice.txt

@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-01-29 17:54:09", 
+  "creation": "2013-03-07 13:16:13", 
   "docstatus": 0, 
-  "modified": "2013-01-29 18:25:24", 
+  "modified": "2013-03-22 18:17:14", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -636,6 +636,7 @@
  }, 
  {
   "default": "No", 
+  "description": "Considered as Opening Balance", 
   "doctype": "DocField", 
   "fieldname": "is_opening", 
   "fieldtype": "Select", 
@@ -648,6 +649,7 @@
   "search_index": 1
  }, 
  {
+  "description": "Actual Invoice Date", 
   "doctype": "DocField", 
   "fieldname": "aging_date", 
   "fieldtype": "Date", 
@@ -774,40 +776,8 @@
   "write": 1
  }, 
  {
-  "amend": 0, 
-  "cancel": 0, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "role": "Purchase User", 
-  "submit": 0, 
-  "write": 1
- }, 
- {
-  "amend": 0, 
-  "cancel": 0, 
-  "create": 0, 
   "doctype": "DocPerm", 
   "match": "supplier", 
-  "role": "Supplier", 
-  "submit": 0, 
-  "write": 0
- }, 
- {
-  "amend": 1, 
-  "cancel": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "role": "Accounts Manager", 
-  "submit": 1, 
-  "write": 1
- }, 
- {
-  "amend": 0, 
-  "cancel": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "role": "Auditor", 
-  "submit": 0, 
-  "write": 0
+  "role": "Supplier"
  }
 ]

accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.txt

@@ -1,10 +1,10 @@
 [
  {
-  "creation": "2013-02-22 01:27:40", 
+  "creation": "2013-03-08 15:36:47", 
   "docstatus": 0, 
-  "modified": "2013-03-07 07:03:29", 
+  "modified": "2013-03-22 16:45:28", 
   "modified_by": "Administrator", 
-  "owner": "wasim@webnotestech.com"
+  "owner": "Administrator"
  }, 
  {
   "autoname": "PVTD.######", 
@@ -26,6 +26,17 @@
   "doctype": "DocType", 
   "name": "Purchase Taxes and Charges"
  }, 
+ {
+  "default": "Valuation and Total", 
+  "doctype": "DocField", 
+  "fieldname": "category", 
+  "fieldtype": "Select", 
+  "label": "Consider Tax or Charge for", 
+  "oldfieldname": "category", 
+  "oldfieldtype": "Select", 
+  "options": "Valuation and Total\nValuation\nTotal", 
+  "reqd": 1
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "charge_type", 
@@ -105,17 +116,6 @@
   "oldfieldname": "row_id", 
   "oldfieldtype": "Data"
  }, 
- {
-  "default": "Valuation and Total", 
-  "doctype": "DocField", 
-  "fieldname": "category", 
-  "fieldtype": "Select", 
-  "label": "Consider Tax or Charge for", 
-  "oldfieldname": "category", 
-  "oldfieldtype": "Select", 
-  "options": "Valuation and Total\nValuation\nTotal", 
-  "reqd": 1
- }, 
  {
   "default": "Add", 
   "doctype": "DocField", 

accounts/doctype/sales_invoice/sales_invoice.txt

@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-03-20 17:01:58", 
+  "creation": "2013-03-22 18:37:25", 
   "docstatus": 0, 
-  "modified": "2013-03-20 19:17:38", 
+  "modified": "2013-03-22 18:38:13", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -750,11 +750,12 @@
  }, 
  {
   "default": "No", 
+  "description": "Considered as an Opening Balance", 
   "doctype": "DocField", 
   "fieldname": "is_opening", 
   "fieldtype": "Select", 
   "in_filter": 1, 
-  "label": "Is Opening", 
+  "label": "Is Opening Entry", 
   "oldfieldname": "is_opening", 
   "oldfieldtype": "Select", 
   "options": "No\nYes", 
@@ -762,6 +763,7 @@
   "search_index": 0
  }, 
  {
+  "description": "Actual Invoice Date", 
   "doctype": "DocField", 
   "fieldname": "aging_date", 
   "fieldtype": "Date",