Anand Doshi d35354cc06 Merge remote-tracking branch 'frappe/develop' into v5.0 ...

Conflicts:
	erpnext/__version__.py
	erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
	erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py
	erpnext/hooks.py
	erpnext/patches.txt
	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
	erpnext/stock/get_item_details.py
	erpnext/translations/ar.csv
	erpnext/translations/bs.csv
	erpnext/translations/ca.csv
	erpnext/translations/el.csv
	erpnext/translations/es.csv
	erpnext/translations/fr.csv
	erpnext/translations/hr.csv
	erpnext/translations/id.csv
	erpnext/translations/is.csv
	erpnext/translations/ja.csv
	erpnext/translations/nl.csv
	erpnext/translations/pl.csv
	erpnext/translations/pt-BR.csv
	erpnext/translations/ru.csv
	erpnext/translations/tr.csv
	erpnext/translations/zh-cn.csv
	erpnext/translations/zh-tw.csv
	setup.py

2015-02-24 18:12:17 +05:30

..

__init__.py

[fix] Merge permission roles to modify frozen entries/set frozen accounts

2014-09-30 10:40:39 +05:30

capacity_planning.py

fixed capacilty planning patch

2014-12-24 10:41:55 +05:30

convert_stock_reconciliation.py

[patch] [fix]

2015-02-20 15:28:50 +05:30

item_patches.py

[patch] added item patch

2015-02-23 14:43:15 +05:30

manufacturing_activity_type.py

listview indicator fix

2015-02-18 12:23:18 +05:30

new_crm_module.py

[fixes] production, added qty transferred, fix gantt, fiscal year (set fiscal year, instead of validation

2015-02-19 14:53:31 +05:30

recalculate_total_amount_in_jv.py

patch fixes

2015-01-02 12:46:49 +05:30

remove_birthday_events.py

[fix] fixes birthday reminders #2021

2015-01-23 15:22:30 +05:30

remove_shopping_cart_app.py

Merge remote-tracking branch 'frappe/develop' into v5.0

2015-02-24 18:12:17 +05:30

rename_customer_issue.py

fixed patches

2015-02-18 11:54:08 +05:30

rename_table_fieldnames.py

fixed patches

2015-02-18 11:54:08 +05:30

rename_total_fields.py

[cleanup] SMS, and added item filter in stock balance

2015-02-18 19:51:48 +05:30

replace_renamed_fields_in_custom_scripts_and_print_formats.py

Patch: taxes and totals in party currency

2015-02-24 10:04:00 +05:30

set_default_company_in_bom.py

add reload doc to patch

2014-12-18 12:41:09 +05:30

stock_entry_update_value.py

[usability] [fixes] stock entry and production order

2015-02-19 16:28:35 +05:30

taxes_and_totals_in_party_currency.py

Patch: taxes and totals in party currency

2015-02-24 10:04:00 +05:30

update_companywise_payment_account.py

[minor] fixed patch update_companywise_payment_account

2015-01-19 16:20:26 +05:30

update_dn_against_doc_fields.py

[#2164] New field names in DN, fix field name refs, Patch added

2014-10-09 17:31:46 +05:30

update_frozen_accounts_permission_role.py

[shopping-cart] i'm back

2014-10-21 16:16:30 +05:30

update_item_description_and_image.py

patch renamed

2015-02-18 20:48:26 +05:30

update_item_name_in_bom.py

[minor] fixed update item name in bom patch, removed filter from sales invoice list, show tax calculation only if tax exists

2015-02-04 18:53:24 +05:30

update_journal_entry_title.py

reload journal entry on patch

2015-02-24 13:12:13 +05:30

update_material_transfer_for_manufacture.py

[refactor] Material Transfer for Manufacture

2015-02-17 11:50:45 +05:30

update_material_transferred_for_qty.py

[fixes] production, added qty transferred, fix gantt, fiscal year (set fiscal year, instead of validation

2015-02-19 14:53:31 +05:30

update_projects.py

project milestone patch fix

2015-02-24 13:05:49 +05:30