| commit | 0860865763bbef1c99c694cdacffd637187aa825 | [log] [tgz] |
|---|---|---|
| author | Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> | Thu Jan 30 15:12:33 2020 +0530 |
| committer | GitHub <noreply@github.com> | Thu Jan 30 15:12:33 2020 +0530 |
| tree | 275a499dab1a0db015b78a2607fbceba84600e8b | |
| parent | 8e131c7cad0524ec8d64b31c348286940e2e99a6 [diff] | |
| parent | 8f2481d702942714927a38dea83bba2f836d1e7e [diff] |
Merge branch 'develop' into fix-incorrect-translations
diff --git a/erpnext/public/js/conf.js b/erpnext/public/js/conf.js index 095e744..0f88f13 100644 --- a/erpnext/public/js/conf.js +++ b/erpnext/public/js/conf.js
@@ -50,7 +50,7 @@ "Territory": "Selling", "Sales Person": "Selling", "Sales Partner": "Selling", - "Brand": "Selling" + "Brand": "Stock" }); $.extend(frappe.breadcrumbs.module_map, {