commit c204775fe278c988116259e0896a50c64027e769
author jof2jc <jof2jc@gmail.com> Thu Feb 11 01:14:06 2016 +0700
committer Nabin Hait <nabinhait@gmail.com> Mon Apr 18 15:57:55 2016 +0530
tree 0a0ce4f13f84c757f3a4f7b594f7bf53b1071778
parent 821f57164060b2f71635834ba045c35eaa25955b

Added posting_time in purchase invoice

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json

diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index dc21b3f..b2657e1 100755
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -3004,6 +3004,11 @@
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "supplier", 
+<<<<<<< f2ba6af60b37b968f1aff340a88765a917c3f133
  "title_field": "title", 
  "track_seen": 0
-}
\ No newline at end of file
+}
+=======
+ "title_field": "title"
+}
+>>>>>>> Added posting_time in purchase invoice