parent
408c64df44
commit
d70ec3028a
|
|
@ -67,6 +67,7 @@ class Partner(models.Model):
|
||||||
collective_bill = fields.Boolean(string='Sammelrechnung', default=True)
|
collective_bill = fields.Boolean(string='Sammelrechnung', default=True)
|
||||||
country_id = fields.Many2one('res.country', string='Country', ondelete='restrict', default=_default_country_id)
|
country_id = fields.Many2one('res.country', string='Country', ondelete='restrict', default=_default_country_id)
|
||||||
commission_account_ids = fields.Many2many(comodel_name='commission.account', string='Provisionsempfänger')
|
commission_account_ids = fields.Many2many(comodel_name='commission.account', string='Provisionsempfänger')
|
||||||
|
partner_flash = fields.Char()
|
||||||
|
|
||||||
_sql_constraints = [
|
_sql_constraints = [
|
||||||
('ref_uniq', 'unique(ref)', 'Die Interne Referenz muss eindeutig sein'),
|
('ref_uniq', 'unique(ref)', 'Die Interne Referenz muss eindeutig sein'),
|
||||||
|
|
@ -281,7 +282,7 @@ class Partner(models.Model):
|
||||||
common_list.extend(
|
common_list.extend(
|
||||||
['name', 'ref', 'partner_sector_id', 'info_uid', 'comment', 'vat', 'property_payment_term_id',
|
['name', 'ref', 'partner_sector_id', 'info_uid', 'comment', 'vat', 'property_payment_term_id',
|
||||||
'date_vat_check', 'active', 'property_product_pricelist', 'retail_partner_id',
|
'date_vat_check', 'active', 'property_product_pricelist', 'retail_partner_id',
|
||||||
'is_retailer', 'name2', 'carrier_id', 'collective_bill', 'fiscal_position'])
|
'is_retailer', 'name2', 'carrier_id', 'collective_bill', 'fiscal_position', 'partner_flash'])
|
||||||
return common_list
|
return common_list
|
||||||
elif self.env.context.get('sst_14', False):
|
elif self.env.context.get('sst_14', False):
|
||||||
common_list = ['firstname', 'lastname', 'midname', 'email', 'company_odoo_id', 'portal_id', 'opt_out']
|
common_list = ['firstname', 'lastname', 'midname', 'email', 'company_odoo_id', 'portal_id', 'opt_out']
|
||||||
|
|
|
||||||
|
|
@ -65,6 +65,8 @@ class SaleOrder(models.Model):
|
||||||
# pg9_call = fields.Char(string='PG9-Auftrag', compute='_pg9_call', store=False)
|
# pg9_call = fields.Char(string='PG9-Auftrag', compute='_pg9_call', store=False)
|
||||||
pg9_call_D = fields.Char(string='PG9-Auftrag_D', compute='_pg9_call', store=False)
|
pg9_call_D = fields.Char(string='PG9-Auftrag_D', compute='_pg9_call', store=False)
|
||||||
pg9_call_T = fields.Char(string='PG9-Auftrag_T', compute='_pg9_call', store=False)
|
pg9_call_T = fields.Char(string='PG9-Auftrag_T', compute='_pg9_call', store=False)
|
||||||
|
partner_flash = fields.Text(compute='_get_partner_flash', store=False)
|
||||||
|
# partner_flash = fields.Char(store=False)
|
||||||
|
|
||||||
@api.multi
|
@api.multi
|
||||||
def _reset_sequence(self):
|
def _reset_sequence(self):
|
||||||
|
|
@ -87,10 +89,16 @@ class SaleOrder(models.Model):
|
||||||
|
|
||||||
# end def _pg9_call
|
# end def _pg9_call
|
||||||
|
|
||||||
|
@api.multi
|
||||||
|
def _get_partner_flash(self):
|
||||||
|
for record in self:
|
||||||
|
record.partner_flash = record.partner_id.partner_flash
|
||||||
|
|
||||||
@api.multi
|
@api.multi
|
||||||
@api.onchange('partner_invoice_id')
|
@api.onchange('partner_invoice_id')
|
||||||
def _onchange_partner_invoice_id(self):
|
def _onchange_partner_invoice_id(self):
|
||||||
for record in self:
|
for record in self:
|
||||||
|
# record.partner_flash = record.partner_id.partner_flash
|
||||||
if record.partner_invoice_id.is_retailer:
|
if record.partner_invoice_id.is_retailer:
|
||||||
record.payment_term_id = record.partner_invoice_id.property_payment_term_id
|
record.payment_term_id = record.partner_invoice_id.property_payment_term_id
|
||||||
|
|
||||||
|
|
@ -452,6 +460,9 @@ class SaleOrder(models.Model):
|
||||||
@api.multi
|
@api.multi
|
||||||
@api.onchange('partner_id')
|
@api.onchange('partner_id')
|
||||||
def onchange_partner_id(self):
|
def onchange_partner_id(self):
|
||||||
|
# for record in self:
|
||||||
|
# record.partner_flash = record.partner_id.partner_flash
|
||||||
|
|
||||||
if not self.partner_id:
|
if not self.partner_id:
|
||||||
self.update({
|
self.update({
|
||||||
'partner_invoice_id': False,
|
'partner_invoice_id': False,
|
||||||
|
|
@ -472,6 +483,10 @@ class SaleOrder(models.Model):
|
||||||
|
|
||||||
if self.partner_id.team_id:
|
if self.partner_id.team_id:
|
||||||
values['team_id'] = self.partner_id.team_id.id
|
values['team_id'] = self.partner_id.team_id.id
|
||||||
|
|
||||||
|
if self.partner_id:
|
||||||
|
values['partner_flash'] = self.partner_id.partner_flash
|
||||||
|
|
||||||
self.update(values)
|
self.update(values)
|
||||||
|
|
||||||
@api.multi
|
@api.multi
|
||||||
|
|
|
||||||
|
|
@ -31,6 +31,9 @@
|
||||||
</xpath>
|
</xpath>
|
||||||
|
|
||||||
<xpath expr="//page[@name='internal_notes']" position="inside">
|
<xpath expr="//page[@name='internal_notes']" position="inside">
|
||||||
|
<label for="partner_flash">Flash: </label>
|
||||||
|
<field name="partner_flash"/>
|
||||||
|
<div class="oe_clear"/>
|
||||||
<group name="general">
|
<group name="general">
|
||||||
<group name="portal_info" string="Portal Info">
|
<group name="portal_info" string="Portal Info">
|
||||||
<field name="info_kundennr"/>
|
<field name="info_kundennr"/>
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,10 @@
|
||||||
attrs="{'invisible':['|','|',('state','!=','draft'),('order_type','!=','T'),('assembly_state','not in',[False,'import_failed'])]}"/>
|
attrs="{'invisible':['|','|',('state','!=','draft'),('order_type','!=','T'),('assembly_state','not in',[False,'import_failed'])]}"/>
|
||||||
</header>
|
</header>
|
||||||
</xpath>
|
</xpath>
|
||||||
|
<field name="partner_id" position="before">
|
||||||
|
<field name="partner_flash" string="Flash: " class="oe_highlight" attrs="{'invisible':[('partner_flash','=',False)]}"/>
|
||||||
|
<div class="oe_clear"/>
|
||||||
|
</field>
|
||||||
<field name="client_order_ref" position="replace"/>
|
<field name="client_order_ref" position="replace"/>
|
||||||
<field name="origin" position="replace"/>
|
<field name="origin" position="replace"/>
|
||||||
<field name="payment_term_id" position="after">
|
<field name="payment_term_id" position="after">
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,11 @@
|
||||||
<span t-esc="o.partner_id.city"/>
|
<span t-esc="o.partner_id.city"/>
|
||||||
<br/>
|
<br/>
|
||||||
<span t-esc="o.partner_id.country_id.name"/>
|
<span t-esc="o.partner_id.country_id.name"/>
|
||||||
|
<br/>
|
||||||
|
<div>
|
||||||
|
<strong>Tel: </strong>
|
||||||
|
<span t-esc="o.partner_id.phone"/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-3">
|
<div class="col-xs-3">
|
||||||
|
|
@ -41,6 +46,11 @@
|
||||||
<span t-esc="o.sale_id.partner_id.city"/>
|
<span t-esc="o.sale_id.partner_id.city"/>
|
||||||
<br/>
|
<br/>
|
||||||
<span t-esc="o.sale_id.partner_id.country_id.name"/>
|
<span t-esc="o.sale_id.partner_id.country_id.name"/>
|
||||||
|
<br/>
|
||||||
|
<div>
|
||||||
|
<strong>Tel: </strong>
|
||||||
|
<span t-esc="o.sale_id.partner_id.phone"/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-3">
|
<div class="col-xs-3">
|
||||||
|
|
@ -101,6 +111,7 @@
|
||||||
<td t-if="o.origin">
|
<td t-if="o.origin">
|
||||||
<span t-field="o.origin"/>
|
<span t-field="o.origin"/>
|
||||||
</td>
|
</td>
|
||||||
|
<!--
|
||||||
<td name="td_sched_date">
|
<td name="td_sched_date">
|
||||||
<t t-if="o.state == 'done'">
|
<t t-if="o.state == 'done'">
|
||||||
<span t-field="o.date_done"/>
|
<span t-field="o.date_done"/>
|
||||||
|
|
@ -109,6 +120,10 @@
|
||||||
<span t-field="o.scheduled_date"/>
|
<span t-field="o.scheduled_date"/>
|
||||||
</t>
|
</t>
|
||||||
</td>
|
</td>
|
||||||
|
-->
|
||||||
|
<td name="td_sched_date">
|
||||||
|
<span t-field="o.scheduled_date"/>
|
||||||
|
</td>
|
||||||
<td t-if="o.picking_type_id.code == 'outgoing' and o.carrier_id">
|
<td t-if="o.picking_type_id.code == 'outgoing' and o.carrier_id">
|
||||||
<span t-field="o.carrier_id"/>
|
<span t-field="o.carrier_id"/>
|
||||||
</td>
|
</td>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue