additional fields in res_company for display in menu-line & send_deliver_sheet (email)
parent
7eac3ef783
commit
61b994a550
|
|
@ -30,6 +30,8 @@ class Company(models.Model):
|
||||||
eori_nr = fields.Char(string='EORI-Nr')
|
eori_nr = fields.Char(string='EORI-Nr')
|
||||||
fax = fields.Char(related='partner_id.fax')
|
fax = fields.Char(related='partner_id.fax')
|
||||||
portal_prefix = fields.Char(string='Portal-Prefix')
|
portal_prefix = fields.Char(string='Portal-Prefix')
|
||||||
|
partner_description = fields.Char(string='Partner-Beschreibung')
|
||||||
|
partner_email = fields.Char(string='E-Mail (Partner)')
|
||||||
|
|
||||||
@api.model
|
@api.model
|
||||||
def set_company_logo(self, company, logo):
|
def set_company_logo(self, company, logo):
|
||||||
|
|
|
||||||
|
|
@ -260,6 +260,7 @@ class SaleOrder(models.Model):
|
||||||
record.weight_total = _sum
|
record.weight_total = _sum
|
||||||
|
|
||||||
@api.multi
|
@api.multi
|
||||||
|
# @api.depends('assembly_state')
|
||||||
def _compute_positions(self):
|
def _compute_positions(self):
|
||||||
for record in self:
|
for record in self:
|
||||||
pg_complete = True
|
pg_complete = True
|
||||||
|
|
|
||||||
|
|
@ -9,10 +9,14 @@
|
||||||
<field name="company_registry" position="after">
|
<field name="company_registry" position="after">
|
||||||
<field name="eori_nr"/>
|
<field name="eori_nr"/>
|
||||||
<field name="portal_prefix"/>
|
<field name="portal_prefix"/>
|
||||||
|
<field name="partner_description"/>
|
||||||
</field>
|
</field>
|
||||||
<field name="email" position="before">
|
<field name="email" position="before">
|
||||||
<field name="fax" string="Fax"/>
|
<field name="fax" string="Fax"/>
|
||||||
</field>
|
</field>
|
||||||
|
<field name="email" position="after">
|
||||||
|
<field name="partner_email"/>
|
||||||
|
</field>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -287,6 +287,11 @@
|
||||||
<filter string="Quotations Sent" name="sent" domain="[('state','=','sent')]"/>
|
<filter string="Quotations Sent" name="sent" domain="[('state','=','sent')]"/>
|
||||||
<filter string="Sales" name="sales" domain="[('state','in',('sale','done'))]"/>
|
<filter string="Sales" name="sales" domain="[('state','in',('sale','done'))]"/>
|
||||||
</search>
|
</search>
|
||||||
|
<group expand="0" string="Group By">
|
||||||
|
<filter name="company" string="Company" domain="[]" context="{'group_by':'company_id'}"/>
|
||||||
|
<filter name="customer" string="Customer" domain="[]" context="{'group_by':'partner_id'}"/>
|
||||||
|
<filter name="assembly_state" string="PG Status" domain="[]" context="{'group_by':'assembly_state'}"/>
|
||||||
|
</group>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -30,9 +30,9 @@ odoo.define('dp_show_company.ShowCompanyMenu', function (require) {
|
||||||
var records = rpc.query({
|
var records = rpc.query({
|
||||||
model: 'res.company',
|
model: 'res.company',
|
||||||
method: 'search_read',
|
method: 'search_read',
|
||||||
args: [[['id', '=', session.company_id]], ['name']],
|
args: [[['id', '=', session.company_id]], ['partner_description']],
|
||||||
}).then(function (companies){
|
}).then(function (companies){
|
||||||
self.$('.oe_topbar_name').text(companies[0].name);
|
self.$('.oe_topbar_name').text(companies[0].partner_description);
|
||||||
});
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue