Yaltik/docx_report_generation
2
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

[IMP] working with date

Browse Source
This commit is contained in:
Stepan Savelyev 2019-12-12 20:01:33 +05:00
parent d9bb974f81
commit 918623d277
2 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/fields_default.xml
View File

@ -27,7 +27,7 @@ ctx = {
"amount_fractional": 0, "amount_fractional": 0,
"seller_company_name": seller.name, "seller_company_name": seller.name,
"seller_business_address": seller.full_adress, "seller_business_address": seller.full_address,
"seller_representer_name": seller.representative_id.name, "seller_representer_name": seller.representative_id.name,
"seller_representer_name_parent": seller.representative_id.name_parent_case, "seller_representer_name_parent": seller.representative_id.name_parent_case,
"seller_representer_name_initials": seller.representative_id.name_initials_case, "seller_representer_name_initials": seller.representative_id.name_initials_case,
@ -42,7 +42,7 @@ ctx = {
"seller_phone": partner.phone, "seller_phone": partner.phone,
"partner_company_name": partner.name, "partner_company_name": partner.name,
"partner_business_address": partner.full_adress, "partner_business_address": partner.full_address,
"partner_representer_name": partner.representative_id.name, "partner_representer_name": partner.representative_id.name,
"partner_representer_name_parent": partner.representative_id.name_parent_case, "partner_representer_name_parent": partner.representative_id.name_parent_case,
"partner_representer_name_initials": partner.representative_id.name_initials_case, "partner_representer_name_initials": partner.representative_id.name_initials_case,

31
models/res_partner.py
View File

@ -22,8 +22,8 @@ class ResPartner(models.Model):
compute='_compute_contract_count', compute='_compute_contract_count',
string='# of contracts' string='# of contracts'
) )
full_adress = fields.Char( full_address = fields.Char(
compute='_compute_full_adress' compute='_compute_full_address'
) # Check for res.partner.contact_address in base/res ) # Check for res.partner.contact_address in base/res
street_actual = fields.Many2one( street_actual = fields.Many2one(
'res.partner', 'res.partner',
@ -56,23 +56,18 @@ class ResPartner(models.Model):
string='Client signature' string='Client signature'
) )
@api.one
@api.depends('street', 'street2', 'city', 'state_id', 'zip', 'country_id') @api.depends('street', 'street2', 'city', 'state_id', 'zip', 'country_id')
def _compute_full_adress(self): def _compute_full_address(self):
address = "" for record in self:
full_street = "{} {}".format( data = filter(None,
self.street or "", self.street2 or "").strip() map(lambda s: s and s.strip(), [
record.zip,
if self.zip: record.street,
address += "{}, ".format(self.zip) record.street2,
record.country_id.name,
address += ", ".join(map(lambda el: el, record.city
( ]))
self.country_id.name or "", record.full_address = ', '.join(data)
self.city or "",
full_street or ""
)))
self.full_adress = address
@api.one @api.one
@api.depends('self.client_contract_ids') @api.depends('self.client_contract_ids')