d35354cc06
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 |
||
|---|---|---|
| .. | ||
| campaign | ||
| customer | ||
| industry_type | ||
| installation_note | ||
| installation_note_item | ||
| opportunity_item | ||
| quotation | ||
| quotation_item | ||
| sales_bom | ||
| sales_bom_item | ||
| sales_order | ||
| sales_order_item | ||
| sales_team | ||
| selling_settings | ||
| sms_center | ||
| __init__.py | ||