From 2fc3a5501ee55bcf92c826e20dc766f9bc49bae2 Mon Sep 17 00:00:00 2001 From: rsi-odoo Date: Fri, 17 Oct 2014 15:03:31 +0530 Subject: [PATCH] [IMP] product: Convert product label xsl report in qweb report --- addons/product/__openerp__.py | 1 + addons/product/product_report.xml | 8 +- addons/product/report/product_label.xml | 11 --- addons/product/report/product_label.xsl | 87 -------------------- addons/product/views/report_productlabel.xml | 38 +++++++++ 5 files changed, 46 insertions(+), 99 deletions(-) delete mode 100644 addons/product/report/product_label.xml delete mode 100644 addons/product/report/product_label.xsl create mode 100644 addons/product/views/report_productlabel.xml diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py index 16124d1eff3..8735d1ab020 100644 --- a/addons/product/__openerp__.py +++ b/addons/product/__openerp__.py @@ -61,6 +61,7 @@ Print product labels with barcode. 'pricelist_view.xml', 'partner_view.xml', 'views/report_pricelist.xml', + 'views/report_productlabel.xml' ], 'test': [ 'product_pricelist_demo.yml', diff --git a/addons/product/product_report.xml b/addons/product/product_report.xml index 9c7ca7e390c..d14d9f471e9 100644 --- a/addons/product/product_report.xml +++ b/addons/product/product_report.xml @@ -1,7 +1,13 @@ - + - - - - - - - - - - diff --git a/addons/product/report/product_label.xsl b/addons/product/report/product_label.xsl deleted file mode 100644 index 2edb6113901..00000000000 --- a/addons/product/report/product_label.xsl +++ /dev/null @@ -1,87 +0,0 @@ - - - 24.5 - 0.5 - 4.8 - 10 - 3cm - 9.3cm - 2 - 16 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - cm - - - - cm - - - - - - - - - - - - - - - - - - - - - - - , - - - - - - - diff --git a/addons/product/views/report_productlabel.xml b/addons/product/views/report_productlabel.xml new file mode 100644 index 00000000000..0a4de330327 --- /dev/null +++ b/addons/product/views/report_productlabel.xml @@ -0,0 +1,38 @@ + + + + + + \ No newline at end of file