diff --git a/odex25_sales/membership_card_odoo/__manifest__.py b/odex25_sales/membership_card_odoo/__manifest__.py index 8eb120c19..8dfe1323f 100644 --- a/odex25_sales/membership_card_odoo/__manifest__.py +++ b/odex25_sales/membership_card_odoo/__manifest__.py @@ -37,6 +37,7 @@ 'data': [ 'report/membership_card_reports.xml', 'data/ir_actions_server_data.xml', + 'views/product_template.xml', ], 'images': ['static/description/banner.png'], 'license': 'AGPL-3', diff --git a/odex25_sales/membership_card_odoo/models/__init__.py b/odex25_sales/membership_card_odoo/models/__init__.py index 58da2885c..5475b626b 100644 --- a/odex25_sales/membership_card_odoo/models/__init__.py +++ b/odex25_sales/membership_card_odoo/models/__init__.py @@ -20,3 +20,4 @@ # ############################################################################### from . import res_partner +from . import product_template \ No newline at end of file diff --git a/odex25_sales/membership_card_odoo/models/product_template.py b/odex25_sales/membership_card_odoo/models/product_template.py new file mode 100644 index 000000000..6f34853b9 --- /dev/null +++ b/odex25_sales/membership_card_odoo/models/product_template.py @@ -0,0 +1,11 @@ +# -*- coding: utf-8 -*- + +from odoo import fields,api, models,_ + + +class ProductTemplate(models.Model): + _inherit = "product.template" + + card_background_image = fields.Binary(string="Background Image") + + diff --git a/odex25_sales/membership_card_odoo/models/res_partner.py b/odex25_sales/membership_card_odoo/models/res_partner.py index c03382fd9..7130e6a6d 100644 --- a/odex25_sales/membership_card_odoo/models/res_partner.py +++ b/odex25_sales/membership_card_odoo/models/res_partner.py @@ -44,15 +44,16 @@ class ResPartner(models.Model): if self.is_member: data = { 'name': partner_id.name, - 'product_id': partner_id.product_id.name, - 'membrship_level':partner_id.membrship_level.name, - 'membrship_level_color':partner_id.membrship_level.color, 'membrship_no':partner_id.membrship_no, - 'image': partner_id.image_1920, 'start_date': partner_id.join_date, 'end_date': partner_id.memebership_end_date, 'company_name': company_id.name, } + if partner_id.product_id.card_background_image: + param_obj = self.env['ir.config_parameter'].sudo() + base_url = param_obj.get_param('web.base.url') + image_url = base_url + '/web/image?' + 'model=product.product&id=' + str(partner_id.product_id.id) + '&field=card_background_image' + data['background_src'] = image_url or '' return self.env.ref('membership_card_odoo.action_membership' '_card').report_action(None, data=data) raise ValidationError( diff --git a/odex25_sales/membership_card_odoo/report/membership_card_reports.xml b/odex25_sales/membership_card_odoo/report/membership_card_reports.xml index 7ae91f7d7..72ba45af0 100644 --- a/odex25_sales/membership_card_odoo/report/membership_card_reports.xml +++ b/odex25_sales/membership_card_odoo/report/membership_card_reports.xml @@ -5,16 +5,16 @@ Custom Paper custom - 110 - 70 + 85 + 54 Landscape - 5.00 - 5.00 - 7.0 - 7.0 + 0 + 0 + 0 + 0 - 35 - 125 + 0 + 300 @@ -26,10 +26,9 @@ - + + diff --git a/odex25_sales/membership_card_odoo/views/product_template.xml b/odex25_sales/membership_card_odoo/views/product_template.xml new file mode 100644 index 000000000..32b4783a1 --- /dev/null +++ b/odex25_sales/membership_card_odoo/views/product_template.xml @@ -0,0 +1,17 @@ + + + + view.membership.product.form.inherit.background.image + product.template + + + + + + + + + +