Merge branch 'hub-multiuser' of https://github.com/frappe/erpnext into hub-multiuser

This commit is contained in:
Prateeksha Singh
2018-09-03 17:32:17 +05:30
3 changed files with 13 additions and 41 deletions

View File

@@ -1,28 +1,15 @@
const ProfileDialog = (title = __('Edit Profile'), action={}) => {
const fields = [
{
fieldname: 'company_email',
label: __('Email'),
fieldtype: 'Read Only'
},
{
fieldtype: 'Link',
fieldname: 'company',
label: __('Company'),
options: 'Company',
onchange: () => {
const value = dialog.get_value('company');
if (value) {
frappe.db.get_doc('Company', value)
.then(company => {
console.log(company.company_logo);
dialog.set_values({
company_logo: company.company_logo,
company_description: company.company_description
});
});
}
}
options: 'Company'
},
{
fieldtype: 'Read Only',
fieldname: 'email',
label: __('Email')
},
{
label: __('About your company'),

View File

@@ -22,7 +22,7 @@
</section-header>
<item-cards-container
:container_name="page_title"
:container_name="__('Published Items')"
:items="items"
:item_id_fieldname="item_id_fieldname"
:on_click="go_to_item_details_page"