brotherton-erpnext/accounts/doctype
Anand Doshi fa228e9c9b Merge branch 'master' of github.com:webnotes/erpnext into wsgi
Conflicts:
	accounts/doctype/purchase_invoice/purchase_invoice.py
	accounts/doctype/sales_invoice/sales_invoice.txt
	selling/doctype/lead/lead.txt
	selling/doctype/opportunity/opportunity.txt
	stock/doctype/warehouse/warehouse.py
2013-10-02 16:52:52 +05:30
..
account Merge branch 'master' of github.com:webnotes/erpnext into wsgi 2013-09-25 19:55:41 +05:30
accounts_settings [minor] perpetual inventory fix 2013-09-24 15:16:01 +05:30
bank_reconciliation mass replace sql with webnotes.conn.sql 2013-09-18 12:20:53 +05:30
bank_reconciliation_detail [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
budget_detail [cleanup] [minor] deprecated budget control and rewritten budget related code 2013-08-22 18:25:43 +05:30
budget_distribution [cleanup] [minor] budget code cleaned up with testcases 2013-08-23 10:46:41 +05:30
budget_distribution_detail [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
c_form [rename] Naming Series is now Document Numbering Series and updated translations 2013-08-08 16:00:40 +05:30
c_form_invoice_detail [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
cost_center [cleanup] [minor] deprecated budget control and rewritten budget related code 2013-08-22 18:25:43 +05:30
fiscal_year [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
gl_entry Reduce ordered qty in Purchase Receipt based on PO warehouse 2013-09-25 19:58:32 +05:30
journal_voucher [minor] fixed conflict while merging perpetual branch into master 2013-09-24 14:36:55 +05:30
journal_voucher_detail [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
mis_control mass replace sql with webnotes.conn.sql 2013-09-18 12:20:53 +05:30
mode_of_payment [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
payment_to_invoice_matching_tool item-wise price list rate, editable report 2013-09-25 10:32:51 +05:30
payment_to_invoice_matching_tool_detail [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
period_closing_voucher Merge branch 'master' of github.com:webnotes/erpnext into wsgi 2013-09-25 19:55:41 +05:30
pos_setting [minor] merged with master branch 2013-09-17 10:30:24 +05:30
purchase_invoice Merge branch 'master' of github.com:webnotes/erpnext into wsgi 2013-10-02 16:52:52 +05:30
purchase_invoice_advance [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
purchase_invoice_item [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
purchase_taxes_and_charges [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
purchase_taxes_and_charges_master remove sql = 2013-09-18 11:10:59 +05:30
sales_invoice Merge branch 'master' of github.com:webnotes/erpnext into wsgi 2013-10-02 16:52:52 +05:30
sales_invoice_advance [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
sales_invoice_item [fix] [minor] auto accounting for stock transactions 2013-08-29 18:19:37 +05:30
sales_taxes_and_charges [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
sales_taxes_and_charges_master [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
shipping_rule [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
shipping_rule_condition [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
__init__.py moved directory structure 2012-09-24 19:13:42 +05:30