Anand Doshi 67d6a4e3aa Merge remote-tracking branch 'frappe/develop' into model-cleanup ...

Conflicts:
	erpnext/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py
	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
	erpnext/controllers/stock_controller.py

2014-03-28 13:41:59 +05:30

..

js

#478

2014-03-27 14:17:33 +05:30

__init__.py

moved modules inside erpnext folder

2013-12-11 10:43:52 +05:30

accounts_controller.py

frappe/frappe#478

2014-03-27 17:51:41 +05:30

buying_controller.py

frappe/frappe#478

2014-03-27 17:51:41 +05:30

queries.py

Is_pl_account and debit_or_credit field removed and added report_type field in account

2014-03-21 11:35:59 +05:30

selling_controller.py

frappe/frappe#478

2014-03-27 17:51:41 +05:30

status_updater.py

frappe/frappe#478

2014-03-27 16:12:56 +05:30

stock_controller.py

Merge remote-tracking branch 'frappe/develop' into model-cleanup

2014-03-28 13:41:59 +05:30

trends.py

Changed frappe.conn to frappe.db

2014-02-26 12:35:33 +05:30