pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] product: pricelist option in label printing

Browse Source 
before this commit, on printing product labels there
is no option to select the price list, always the
printed price is the default product price

after this commit, in the label printing wizard
the price list field is introduced and user can
select the price list before printing the labels

closes odoo/odoo#137190

Signed-off-by: Victor Feyens (vfe) <vfe@odoo.com>
This commit is contained in:
niyasraphy
2023-10-13 21:11:55 +00:00
parent 3c72683aac
commit 168b56e069
4 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/product/report/product_label_report.py
+1
View File
@@ -43,6 +43,7 @@ def _prepare_data(env, data):
'page_numbers': (total - 1) // (layout_wizard.rows * layout_wizard.columns) + 1, 'page_numbers': (total - 1) // (layout_wizard.rows * layout_wizard.columns) + 1,
'price_included': data.get('price_included'), 'price_included': data.get('price_included'),
'extra_html': layout_wizard.extra_html, 'extra_html': layout_wizard.extra_html,
'pricelist': layout_wizard.pricelist_id,
} }
class ReportProductTemplateLabel(models.AbstractModel): class ReportProductTemplateLabel(models.AbstractModel):
addons/product/report/product_product_templates.xml
+8 -24
View File
@@ -21,12 +21,8 @@
<div class="o_label_extra_data"> <div class="o_label_extra_data">
<t t-out="extra_html"/> <t t-out="extra_html"/>
</div> </div>
<t t-if="product.is_product_variant"> <strong class="o_label_price" t-out="pricelist._get_product_price(product, 1, pricelist.currency_id or product.currency_id)"
<strong class="o_label_price" t-field="product.lst_price" t-options="{'widget': 'monetary', 'label_price': True}"/> t-options="{'widget': 'monetary', 'display_currency': pricelist.currency_id or product.currency_id, 'label_price': True}"/>
</t>
<t t-else="">
<strong class="o_label_price" t-field="product.list_price" t-options="{'widget': 'monetary', 'label_price': True}"/>
</t>
</div> </div>
<div class="o_label_clear"></div> <div class="o_label_clear"></div>
</div> </div>
@@ -43,12 +39,8 @@
<strong t-field="product.display_name"/> <strong t-field="product.display_name"/>
</div> </div>
<div class="text-end" style="padding-top:0;padding-bottom:0"> <div class="text-end" style="padding-top:0;padding-bottom:0">
<t t-if="product.is_product_variant"> <strong class="o_label_price_medium" t-out="pricelist._get_product_price(product, 1, pricelist.currency_id or product.currency_id)"
<strong class="o_label_price_medium" t-field="product.lst_price" t-options="{'widget': 'monetary', 'label_price': True}"/> t-options="{'widget': 'monetary', 'display_currency': pricelist.currency_id or product.currency_id, 'label_price': True}"/>
</t>
<t t-else="">
<strong class="o_label_price_medium" t-field="product.list_price" t-options="{'widget': 'monetary', 'label_price': True}"/>
</t>
</div> </div>
<div class= "text-center o_label_small_barcode"> <div class= "text-center o_label_small_barcode">
<span class="text-nowrap" t-field="product.default_code"/> <span class="text-nowrap" t-field="product.default_code"/>
@@ -74,12 +66,8 @@
<span class="text-nowrap" t-field="product.default_code"/> <span class="text-nowrap" t-field="product.default_code"/>
</div> </div>
<div class="o_label_price_medium text-end"> <div class="o_label_price_medium text-end">
<t t-if="product.is_product_variant"> <strong t-out="pricelist._get_product_price(product, 1, pricelist.currency_id or product.currency_id)"
<strong t-field="product.lst_price" t-options="{'widget': 'monetary', 'label_price': True}"/> t-options="{'widget': 'monetary', 'display_currency': pricelist.currency_id or product.currency_id, 'label_price': True}"/>
</t>
<t t-else="">
<strong t-field="product.list_price" t-options="{'widget': 'monetary', 'label_price': True}"/>
</t>
</div> </div>
</t> </t>
<t t-else=""> <t t-else="">
@@ -117,12 +105,8 @@
<small class="text-nowrap" t-field="product.default_code"/> <small class="text-nowrap" t-field="product.default_code"/>
</div> </div>
<div class="text-end" style="padding: 0 4px;"> <div class="text-end" style="padding: 0 4px;">
<t t-if="product.is_product_variant"> <strong class="o_label_price_small" t-out="pricelist._get_product_price(product, 1, pricelist.currency_id or product.currency_id)"
<strong class="o_label_price_small" t-field="product.lst_price" t-options="{'widget': 'monetary', 'label_price': True}"/> t-options="{'widget': 'monetary', 'display_currency': pricelist.currency_id or product.currency_id, 'label_price': True}"/>
</t>
<t t-else="">
<strong class="o_label_price_small" t-field="product.list_price" t-options="{'widget': 'monetary', 'label_price': True}"/>
</t>
<div class="o_label_extra_data"> <div class="o_label_extra_data">
<t t-out="extra_html"/> <t t-out="extra_html"/>
</div> </div>
addons/product/wizard/product_label_layout.py
+1
View File
@@ -22,6 +22,7 @@ class ProductLabelLayout(models.TransientModel):
extra_html = fields.Html('Extra Content', default='') extra_html = fields.Html('Extra Content', default='')
rows = fields.Integer(compute='_compute_dimensions') rows = fields.Integer(compute='_compute_dimensions')
columns = fields.Integer(compute='_compute_dimensions') columns = fields.Integer(compute='_compute_dimensions')
pricelist_id = fields.Many2one('product.pricelist', string="Pricelist")
@api.depends('print_format') @api.depends('print_format')
def _compute_dimensions(self): def _compute_dimensions(self):
addons/product/wizard/product_label_layout_views.xml
+1
View File
@@ -14,6 +14,7 @@
<field name="print_format" widget="radio"/> <field name="print_format" widget="radio"/>
</group> </group>
<group> <group>
<field name="pricelist_id" groups="product.group_product_pricelist"/>
<field name="extra_html" widget="html" invisible="print_format not in ('dymo', '2x7xprice')"/> <field name="extra_html" widget="html" invisible="print_format not in ('dymo', '2x7xprice')"/>
</group> </group>
</group> </group>