Anand Doshi 0c26f8116d Merge branch '1310' of github.com:webnotes/erpnext ... Conflicts: accounts/doctype/account/account.py controllers/accounts_controller.py patches/patch_list.py selling/doctype/sales_common/sales_common.py stock/doctype/purchase_receipt/purchase_receipt.py		2013-11-15 19:12:09 +05:30
..
accounts_payable	Update accounts_payable.py	2013-11-11 18:42:22 +05:30
accounts_receivable	Merge remote-tracking branch 'origin/1310'	2013-11-11 13:45:19 +05:30
bank_clearance_summary	Fix translate bank_clearance_summary.js	2013-09-30 18:07:42 -03:00
bank_reconciliation_statement	Fix translate bank_reconciliation_statement.js	2013-09-30 18:08:50 -03:00
budget_variance_report	Merge branch '1310' of github.com:webnotes/erpnext	2013-11-15 19:12:09 +05:30
customer_account_head	[license] [minor] Updated License Text in all js and py files	2013-08-05 14:59:54 +05:30
delivered_items_to_be_billed	[fix] [minor] delivered items to be billed	2013-09-05 12:41:16 +05:30
gross_profit	Merge branch 'i18n' of git://github.com/bperretti/erpnext into bperretti-i18n	2013-10-24 11:40:32 +05:30
item_wise_purchase_register	Merge branch '1310' of github.com:webnotes/erpnext	2013-11-04 13:14:39 +05:30
item_wise_sales_register	Merge branch '1310' of github.com:webnotes/erpnext	2013-11-04 13:14:39 +05:30
ordered_items_to_be_billed	new employee_leave_balance_report	2013-02-22 17:54:50 +05:30
payment_collection_with_ageing	Fix translate payment_collection_with_ageing.js	2013-09-30 18:17:35 -03:00
payment_made_with_ageing	Fix translate payment_made_with_ageing.js	2013-09-30 18:19:03 -03:00
purchase_invoice_trends	[license] [minor] Updated License Text in all js and py files	2013-08-05 14:59:54 +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	Fix translate purchase_register.js	2013-09-30 18:19:58 -03:00
received_items_to_be_billed	[fix] [minor] [report]	2013-07-31 11:47:54 +05:30
sales_invoice_trends	[license] [minor] Updated License Text in all js and py files	2013-08-05 14:59:54 +05:30
sales_partners_commission	[report] sales partners commission	2013-05-06 12:46:07 +05:30
sales_register	Fix translate sales_register.js	2013-09-30 18:21:02 -03:00
supplier_account_head	[license] [minor] Updated License Text in all js and py files	2013-08-05 14:59:54 +05:30
__init__.py	moved delivered_items_to_be_billed from stock to accounts	2012-11-23 17:56:30 +05:30