commit 966c9f6a8ebc9433084c7892311f5b2b34327b28
author Rushabh Mehta <rmehta@gmail.com> Thu Jul 25 16:19:22 2013 +0530
committer Rushabh Mehta <rmehta@gmail.com> Thu Jul 25 16:19:22 2013 +0530
tree 575ad34bbbe1ec13fdfc0731fbb766b8da8c7a51
parent 60117d6d625fe35538540fcc14d5d4583f2127e4
parent 54caa864373c633ab6f3c5a8a160a784bb45ab06

Merge branch 'master' of github.com:webnotes/erpnext

accounts/doctype/purchase_invoice/purchase_invoice.txt

diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.txt b/accounts/doctype/purchase_invoice/purchase_invoice.txt
index 8d65281..6ed049e 100755
--- a/accounts/doctype/purchase_invoice/purchase_invoice.txt
+++ b/accounts/doctype/purchase_invoice/purchase_invoice.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-05-21 16:16:39", 
   "docstatus": 0, 
-  "modified": "2013-07-24 21:44:41", 
+  "modified": "2013-07-25 16:08:44", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -70,21 +70,6 @@
   "reqd": 1
  }, 
  {
-  "description": "Supplier (Payable) Account", 
-  "doctype": "DocField", 
-  "fieldname": "credit_to", 
-  "fieldtype": "Link", 
-  "in_filter": 1, 
-  "label": "Credit To", 
-  "oldfieldname": "credit_to", 
-  "oldfieldtype": "Link", 
-  "options": "Account", 
-  "print_hide": 1, 
-  "read_only": 0, 
-  "reqd": 1, 
-  "search_index": 1
- }, 
- {
   "doctype": "DocField", 
   "fieldname": "supplier", 
   "fieldtype": "Link", 
@@ -676,6 +661,21 @@
   "read_only": 0
  }, 
  {
+  "description": "Supplier (Payable) Account", 
+  "doctype": "DocField", 
+  "fieldname": "credit_to", 
+  "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Credit To", 
+  "oldfieldname": "credit_to", 
+  "oldfieldtype": "Link", 
+  "options": "Account", 
+  "print_hide": 1, 
+  "read_only": 0, 
+  "reqd": 1, 
+  "search_index": 1
+ }, 
+ {
   "default": "No", 
   "description": "Considered as Opening Balance", 
   "doctype": "DocField", 

accounts/doctype/sales_invoice/sales_invoice.txt

diff --git a/accounts/doctype/sales_invoice/sales_invoice.txt b/accounts/doctype/sales_invoice/sales_invoice.txt
index 480f9fe..625d2c9 100644
--- a/accounts/doctype/sales_invoice/sales_invoice.txt
+++ b/accounts/doctype/sales_invoice/sales_invoice.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-05-24 19:29:05", 
   "docstatus": 0, 
-  "modified": "2013-07-24 21:44:15", 
+  "modified": "2013-07-25 16:08:10", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -62,21 +62,6 @@
   "reqd": 1
  }, 
  {
-  "description": "Customer (Receivable) Account", 
-  "doctype": "DocField", 
-  "fieldname": "debit_to", 
-  "fieldtype": "Link", 
-  "in_filter": 1, 
-  "label": "Debit To", 
-  "oldfieldname": "debit_to", 
-  "oldfieldtype": "Link", 
-  "options": "Account", 
-  "print_hide": 1, 
-  "read_only": 0, 
-  "reqd": 1, 
-  "search_index": 1
- }, 
- {
   "doctype": "DocField", 
   "fieldname": "customer", 
   "fieldtype": "Link", 
@@ -822,6 +807,21 @@
   "read_only": 0
  }, 
  {
+  "description": "Customer (Receivable) Account", 
+  "doctype": "DocField", 
+  "fieldname": "debit_to", 
+  "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Debit To", 
+  "oldfieldname": "debit_to", 
+  "oldfieldtype": "Link", 
+  "options": "Account", 
+  "print_hide": 1, 
+  "read_only": 0, 
+  "reqd": 1, 
+  "search_index": 1
+ }, 
+ {
   "description": "Track this Sales Invoice against any Project", 
   "doctype": "DocField", 
   "fieldname": "project_name",