Anand Doshi 05aaae33ae Merge branch 'master' of github.com:webnotes/erpnext into 1209 ... Conflicts: accounts/doctype/account/account.py erpnext/accounts/doctype/journal_voucher/journal_voucher.py patches/patch_list.py startup/event_handlers.py		2012-10-02 14:35:20 +05:30
..
account	merged deprecate account balance	2012-10-01 11:30:00 +05:30
bank_reconciliation	dont save duplicate files	2012-09-25 18:20:36 +05:30
bank_reconciliation_detail	moved directory structure	2012-09-24 19:13:42 +05:30
budget_control	dont save duplicate files	2012-09-25 18:20:36 +05:30
budget_detail	moved directory structure	2012-09-24 19:13:42 +05:30
budget_distribution	moved directory structure	2012-09-24 19:13:42 +05:30
budget_distribution_detail	moved directory structure	2012-09-24 19:13:42 +05:30
c_form	moved directory structure	2012-09-24 19:13:42 +05:30
c_form_invoice_detail	moved directory structure	2012-09-24 19:13:42 +05:30
cost_center	moved directory structure	2012-09-24 19:13:42 +05:30
fiscal_year	merged deprecate account balance	2012-10-01 11:30:00 +05:30
form_16a	dont save duplicate files	2012-09-25 18:20:36 +05:30
form_16a_ack_detail	moved directory structure	2012-09-24 19:13:42 +05:30
form_16a_tax_detail	moved directory structure	2012-09-24 19:13:42 +05:30
gl_control	merged deprecate account balance	2012-10-01 11:30:00 +05:30
gl_entry	merged deprecate account balance	2012-10-01 11:30:00 +05:30
journal_voucher	Merge branch 'master' of github.com:webnotes/erpnext into 1209	2012-10-02 14:35:20 +05:30
journal_voucher_detail	moved directory structure	2012-09-24 19:13:42 +05:30
mis_control	merged deprecate account balance	2012-10-01 11:30:00 +05:30
mode_of_payment	moved directory structure	2012-09-24 19:13:42 +05:30
multi_ledger_report_detail	moved directory structure	2012-09-24 19:13:42 +05:30
payment_to_invoice_matching_tool	dont save duplicate files	2012-09-25 18:20:36 +05:30
payment_to_invoice_matching_tool_detail	moved directory structure	2012-09-24 19:13:42 +05:30
period_closing_voucher	merged deprecate account balance	2012-10-01 11:30:00 +05:30
pos_setting	dont save duplicate files	2012-09-25 18:20:36 +05:30
purchase_invoice	Merge branch 'master' of github.com:webnotes/erpnext into 1209	2012-10-02 14:35:20 +05:30
purchase_invoice_advance	moved directory structure	2012-09-24 19:13:42 +05:30
purchase_invoice_item	moved directory structure	2012-09-24 19:13:42 +05:30
purchase_taxes_and_charges	Merge branch 'master' of github.com:webnotes/erpnext into 1209	2012-10-02 14:35:20 +05:30
purchase_taxes_and_charges_master	dont save duplicate files	2012-09-25 18:20:36 +05:30
sales_invoice	Merge branch 'master' of github.com:webnotes/erpnext into 1209	2012-10-02 14:35:20 +05:30
sales_invoice_advance	moved directory structure	2012-09-24 19:13:42 +05:30
sales_invoice_item	moved directory structure	2012-09-24 19:13:42 +05:30
sales_taxes_and_charges	moved directory structure	2012-09-24 19:13:42 +05:30
sales_taxes_and_charges_master	moved directory structure	2012-09-24 19:13:42 +05:30
tds_category	dont save duplicate files	2012-09-25 18:20:36 +05:30
tds_category_account	moved directory structure	2012-09-24 19:13:42 +05:30
tds_control	dont save duplicate files	2012-09-25 18:20:36 +05:30
tds_detail	moved directory structure	2012-09-24 19:13:42 +05:30
tds_payment	dont save duplicate files	2012-09-25 18:20:36 +05:30
tds_payment_detail	moved directory structure	2012-09-24 19:13:42 +05:30
tds_rate_chart	moved directory structure	2012-09-24 19:13:42 +05:30
tds_rate_detail	moved directory structure	2012-09-24 19:13:42 +05:30
tds_return_acknowledgement	moved directory structure	2012-09-24 19:13:42 +05:30
trend_analyzer_control	dont save duplicate files	2012-09-25 18:20:36 +05:30
__init__.py	moved directory structure	2012-09-24 19:13:42 +05:30