Merged develop into v5

2015-03-17 10:50:47 +05:30
parent d3fd8965de 7b4b31fdf7
commit a1bf43b1a6
15 changed files with 161 additions and 13 deletions
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -109,7 +109,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 							order_type: me.frm.doc.order_type,
 							is_pos: cint(me.frm.doc.is_pos),
 							is_subcontracted: me.frm.doc.is_subcontracted,
-							transaction_date: me.frm.doc.transaction_date,
+							transaction_date: me.frm.doc.transaction_date || me.frm.doc.posting_date,
 							ignore_pricing_rule: me.frm.doc.ignore_pricing_rule,
 							doctype: item.doctype,
 							name: item.name,