Merge branch 'master' of github.com:webnotes/erpnext into responsive

Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.py
	accounts/doctype/sales_invoice_item/sales_invoice_item.txt
	buying/doctype/supplier_quotation/supplier_quotation.js
	patches/patch_list.py
This commit is contained in:
Anand Doshi
2013-07-02 11:50:32 +05:30
16 changed files with 43 additions and 45 deletions

View File

@@ -243,10 +243,9 @@ patch_list = [
"execute:webnotes.delete_doc('DocType', 'System Console')",
"patches.june_2013.p03_buying_selling_for_price_list",
"patches.june_2013.p04_fix_event_for_lead_oppty_project",
"patches.june_2013.p05_remove_search_criteria_reports",
"patches.june_2013.p05_remove_unused_doctypes",
"patches.june_2013.p06_drop_unused_tables",
"patches.june_2013.p08_shopping_cart_settings",
"patches.june_2013.p05_remove_search_criteria_reports",
"patches.june_2013.p07_taxes_price_list_for_territory",
"patches.june_2013.p08_shopping_cart_settings",
"patches.june_2013.p09_update_global_defaults",