Anand Doshi 70902da4da Merge branch 'master' of github.com:webnotes/erpnext into responsive ...

Conflicts:
	patches/december_2012/deprecate_tds.py
	patches/june_2012/reports_list_permission.py
	selling/doctype/sales_bom/locale/_messages_doc.json
	selling/doctype/sales_bom/locale/ar-doc.json
	selling/doctype/sales_bom/locale/de-doc.json
	selling/doctype/sales_bom/locale/es-doc.json
	selling/doctype/sales_bom/locale/fr-doc.json
	selling/doctype/sales_bom/locale/hi-doc.json
	selling/doctype/sales_bom/locale/hr-doc.json
	selling/doctype/sales_bom/locale/nl-doc.json
	selling/doctype/sales_bom/locale/pt-BR-doc.json
	selling/doctype/sales_bom/locale/pt-doc.json
	selling/doctype/sales_bom/locale/sr-doc.json
	selling/doctype/sales_bom/locale/ta-doc.json
	selling/doctype/sales_bom/locale/th-doc.json
	selling/doctype/sales_bom_item/locale/_messages_doc.json
	selling/doctype/sales_bom_item/locale/ar-doc.json
	selling/doctype/sales_bom_item/locale/de-doc.json
	selling/doctype/sales_bom_item/locale/es-doc.json
	selling/doctype/sales_bom_item/locale/fr-doc.json
	selling/doctype/sales_bom_item/locale/hi-doc.json
	selling/doctype/sales_bom_item/locale/hr-doc.json
	selling/doctype/sales_bom_item/locale/nl-doc.json
	selling/doctype/sales_bom_item/locale/pt-BR-doc.json
	selling/doctype/sales_bom_item/locale/pt-doc.json
	selling/doctype/sales_bom_item/locale/sr-doc.json
	selling/doctype/sales_bom_item/locale/ta-doc.json
	selling/doctype/sales_bom_item/locale/th-doc.json

2013-06-26 14:07:29 +05:30

..

accounts_payable

[script report] payments made with ageing

2013-05-02 15:19:00 +05:30

accounts_receivable

[report] filter added base on territory in sales personwise transaction summary

2013-05-28 12:32:21 +05:30

bank_clearance_summary

[script report] bank clearance summary

2013-05-01 12:23:07 +05:30

bank_reconciliation_statement

[script report] bank clearance summary

2013-05-01 12:23:07 +05:30

budget_variance_report

[Fixed] Merge conflict fixed

2013-06-21 13:09:18 +05:30

customer_account_head

[report] customer account head

2013-06-03 16:18:24 +05:30

delivered_items_to_be_billed

[script report] bank clearance summary

2013-05-01 12:23:07 +05:30

gross_profit

[sales invoice] [update stock] allow update stock in sales invoice, without it being a pos invoice

2013-05-30 17:43:30 +05:30

item_wise_purchase_register

[Report] Completed Budget variance Report and corrections in Territory Target Varinace & Sales Person Target Variance Report

2013-06-19 18:15:20 +05:30

item_wise_sales_register

[report] listing on home page

2013-06-06 17:18:38 +05:30

ordered_items_to_be_billed

new employee_leave_balance_report

2013-02-22 17:54:50 +05:30

payment_collection_with_ageing

[script report] payments made with ageing

2013-05-02 15:19:00 +05:30

payment_made_with_ageing

[script report] payments made with ageing

2013-05-02 15:19:00 +05:30

purchase_invoice_trends

[trends analyzer] cleanup completed

2013-06-20 18:52:31 +05:30

purchase_order_items_to_be_billed

[report] po and pr items to be billed based on amount

2013-06-05 13:02:16 +05:30

purchase_register

[Report] Added rounded_total & outstanding_amount to Sales & Purchase Register

2013-06-26 11:28:53 +05:30

received_items_to_be_billed

[report] po and pr items to be billed based on amount

2013-06-05 13:02:16 +05:30

sales_invoice_trends

[trends analyzer] cleanup completed

2013-06-20 18:52:31 +05:30

sales_partners_commission

[report] sales partners commission

2013-05-06 12:46:07 +05:30

sales_register

[Report] Added rounded_total & outstanding_amount to Sales & Purchase Register

2013-06-26 11:28:53 +05:30

supplier_account_head

[Reports][Supplier Account Head -> Account] and [Project wise Stock Tracking -> Project]

2013-06-04 15:51:16 +05:30

__init__.py

moved delivered_items_to_be_billed from stock to accounts

2012-11-23 17:56:30 +05:30