diff --git a/product_print_category_food_report/__manifest__.py b/product_print_category_food_report/__manifest__.py index 60c9e55a..30378414 100644 --- a/product_print_category_food_report/__manifest__.py +++ b/product_print_category_food_report/__manifest__.py @@ -33,6 +33,7 @@ "report/qweb_template_pricetag_02.xml", "report/qweb_template_pricetag_10.xml", "report/qweb_template_pricetag_11.xml", + "report/qweb_template_pricetag_12.xml", # "report/qweb_pricetag_bulk_long.xml", # "report/qweb_pricetag_bulk_square.xml", # "report/qweb_pricetag_counter.xml", diff --git a/product_print_category_food_report/data/product_print_category.xml b/product_print_category_food_report/data/product_print_category.xml index d97cd687..64c6e9a1 100644 --- a/product_print_category_food_report/data/product_print_category.xml +++ b/product_print_category_food_report/data/product_print_category.xml @@ -8,7 +8,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - 01 - Shelf Square Middle - 40x36mm + 01 - Shelf Square Middle - 42x38mm - 02 - Shelf Square Small - 30x30mm + 02 - Shelf Square Small - 32x32mm - 10 - Shelf Rectangular - 76x31mm + 10 - Shelf Rectangular - 79x32mm + + 11 - Shelf Rectangular Litle Margin - 79x37mm + + + + 12 - Shelf Rectangular Middle Margin - 79x44mm + + + diff --git a/product_print_category_food_report/demo/product_product.xml b/product_print_category_food_report/demo/product_product.xml index e16e57ab..4f77df95 100644 --- a/product_print_category_food_report/demo/product_product.xml +++ b/product_print_category_food_report/demo/product_product.xml @@ -71,10 +71,30 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). ]"/> eu_no_eu - + Le jardinier Glacier + + Pricetag 12 - Antisèche blonde (75cl) + + 3770022113008 + VEV-000044 + 6.30 + 0.75 + + + + + eu_no_eu + + + + L'écume du Guiers + diff --git a/product_print_category_food_report/report/qweb_pricetag_normal_large.xml b/product_print_category_food_report/report/qweb_pricetag_normal_large.xml deleted file mode 100644 index dba242f2..00000000 --- a/product_print_category_food_report/report/qweb_pricetag_normal_large.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - Imprimée le - - - - - - - Internal code: [] - - Origine : - - Producteur·rice : - - - - - - - - - - - - - - - - - - - - - - - - - - - - € - - - le kilo - la pièce - - - - Volume L - Poids net kg - - - - - - € - - - - - - - € - - - - Au L : - Au kg : - Pièce : - € - - - - - - - - - - diff --git a/product_print_category_food_report/report/qweb_reports.xml b/product_print_category_food_report/report/qweb_reports.xml index b11f095f..7a0c3c78 100644 --- a/product_print_category_food_report/report/qweb_reports.xml +++ b/product_print_category_food_report/report/qweb_reports.xml @@ -17,6 +17,8 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + + diff --git a/product_print_category_food_report/report/qweb_template_pricetag_12.xml b/product_print_category_food_report/report/qweb_template_pricetag_12.xml new file mode 100644 index 00000000..0aca328b --- /dev/null +++ b/product_print_category_food_report/report/qweb_template_pricetag_12.xml @@ -0,0 +1,15 @@ + + + + + + + + + + diff --git a/product_print_category_food_report/report/qweb_template_pricetag_template_B.xml b/product_print_category_food_report/report/qweb_template_pricetag_template_B.xml index 8c6ece35..54144404 100644 --- a/product_print_category_food_report/report/qweb_template_pricetag_template_B.xml +++ b/product_print_category_food_report/report/qweb_template_pricetag_template_B.xml @@ -11,7 +11,8 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - + + @@ -94,6 +95,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + diff --git a/product_print_category_food_report/static/css/common.scss b/product_print_category_food_report/static/css/common.scss index e516578c..fb90b96f 100644 --- a/product_print_category_food_report/static/css/common.scss +++ b/product_print_category_food_report/static/css/common.scss @@ -5,6 +5,12 @@ overflow: hidden; + .margin_top, .margin_bottom { + margin : 0.0cm; + padding : 0.00cm; + overflow: hidden; + } + .pricetag_left, .pricetag_right, { margin : 0.0cm; padding : 0.00cm; diff --git a/product_print_category_food_report/static/css/debug.scss b/product_print_category_food_report/static/css/debug.scss index bf68a19b..aef17485 100644 --- a/product_print_category_food_report/static/css/debug.scss +++ b/product_print_category_food_report/static/css/debug.scss @@ -2,6 +2,15 @@ border-style: dotted; border-color: black; + + .margin_top, .margin_bottom { + background-image: repeating-linear-gradient( + -45deg, + transparent 0 5px, + black 5px 10px + ); + } + .pricetag_left { background-color: #ACF; } diff --git a/product_print_category_food_report/static/css/pricetag_01.scss b/product_print_category_food_report/static/css/pricetag_01.scss index c72cae40..267bc734 100644 --- a/product_print_category_food_report/static/css/pricetag_01.scss +++ b/product_print_category_food_report/static/css/pricetag_01.scss @@ -1,6 +1,7 @@ .pricetag_01 { border: 1px solid grey; - width:4.91cm; height:4.42cm; + width: 4.91cm; + height: 4.42cm; .product_name{ font-size:17px; diff --git a/product_print_category_food_report/static/css/pricetag_02.scss b/product_print_category_food_report/static/css/pricetag_02.scss index 4d1fa75d..c76bc2d4 100644 --- a/product_print_category_food_report/static/css/pricetag_02.scss +++ b/product_print_category_food_report/static/css/pricetag_02.scss @@ -1,6 +1,7 @@ .pricetag_02 { border: 1px solid grey; - width:3.8cm; height:3.8cm; + width: 3.8cm; + height: 3.8cm; .product_name{ font-size:13px; diff --git a/product_print_category_food_report/static/css/pricetag_10.scss b/product_print_category_food_report/static/css/pricetag_10.scss index f1d2adad..d93d0a17 100644 --- a/product_print_category_food_report/static/css/pricetag_10.scss +++ b/product_print_category_food_report/static/css/pricetag_10.scss @@ -1,11 +1,15 @@ .pricetag_10 { border: 1px solid black; - width:9.3cm; - height:3.8cm; + width: 9.3cm; + height: 3.8cm; + + .margin_top, .margin_bottom { + display: none; + } .pricetag_left { - width : 5.50cm; - height:3.8cm; + width: 5.50cm; + height: 3.8cm; .product_name{ height: 1.2cm; diff --git a/product_print_category_food_report/static/css/pricetag_11.scss b/product_print_category_food_report/static/css/pricetag_11.scss index f1d2adad..a238d2df 100644 --- a/product_print_category_food_report/static/css/pricetag_11.scss +++ b/product_print_category_food_report/static/css/pricetag_11.scss @@ -1,7 +1,17 @@ -.pricetag_10 { +.pricetag_11 { border: 1px solid black; - width:9.3cm; - height:3.8cm; + width: 9.3cm; + height: 4.4cm; + + .margin_top, .margin_bottom { + width: 9.3cm; + height: 0.3cm; + } + + .margin_bottom { + width:9.3cm; + height: 0.3cm; + } .pricetag_left { width : 5.50cm; diff --git a/product_print_category_food_report/static/css/pricetag_12.scss b/product_print_category_food_report/static/css/pricetag_12.scss new file mode 100644 index 00000000..1e191780 --- /dev/null +++ b/product_print_category_food_report/static/css/pricetag_12.scss @@ -0,0 +1,102 @@ +.pricetag_12 { + border: 1px solid black; + width: 9.3cm; + height: 5.22cm; + + .margin_top, .margin_bottom { + width: 9.3cm; + height: 0.71cm; + } + + .margin_bottom { + width:9.3cm; + height: 0.3cm; + } + + .pricetag_left { + width : 5.50cm; + height:3.8cm; + + .product_name{ + height: 1.2cm; + font-size:15px; + font-weight:bold; + } + + .product_origin { + height: 0.5cm; + font-size:8px; + } + + .maker_description { + height: 0.5cm; + font-size:8px; + } + + .product_labels { + height: 0.7cm; + + img.product_label { + width:0.6cm; + height:0.6cm; + margin: 0.1cm; + } + } + + .organic_text { + height: 0.6cm; + font-size: 6px; + } + + .shop_information { + font-size: 6px; + height: 0.4cm; + } + + } + .pricetag_right { + width : 3.78cm; + height:3.8cm; + + .main_price { + height: 1.7cm; + + .main_price_text { + font-size: 28px; + font-weight:bold; + } + .main_uom_text { + font-size: 14px; + } + } + + .per_unit_quantity { + width : 1.89cm; + height: 0.8cm; + font-size: 9px; + float:left; + + } + + .secondary_price { + width : 1.89cm; + height: 0.8cm; + font-size: 9px; + float:left; + } + + .zone_barcode { + height: 1.3cm; + + .wrap_barcode_image{ + height: 1.2cm; + width: 3.78cm; + } + .wrap_barcode_image > img{ + height: 1.2cm; + width: 3.78cm; + } + } + + } +} diff --git a/product_print_category_food_report/static/css/pricetag_normal_base.scss b/product_print_category_food_report/static/css/pricetag_normal_base.scss deleted file mode 100644 index 55a3d8d7..00000000 --- a/product_print_category_food_report/static/css/pricetag_normal_base.scss +++ /dev/null @@ -1,87 +0,0 @@ -.normal_pricetag { - border: 1px solid grey; - background-color:white; - margin : 0 -0.2cm -0.1cm 0; - padding : 5px; - - .pricetag_right { - overflow: hidden; - } - .product_informations { - text-align:left; - white-space: nowrap; - overflow : hidden; - } - .product_name{ - font-size:15px; font-weight:bold; - height: 1.3cm; - padding-bottom : 5px; - padding-top : 5px; - overflow: hidden; - } - .pricetag_second_product_price { - font-weight: bold; - text-align: center; - overflow: hidden; - } - .pricetag_second_price_uom_text { - font-weight: bold; - text-align: center; line-height: 0.5em; - } - .product_price { - font-size: 26px; font-weight: bold; - height: 1cm; line-height: 1cm; - text-align: center; - overflow: hidden; - } - .product_price_per_uom_qty, .product_price_per_uom_price { - width : 40%; - position : relative; - left: 0.5em; bottom: 1em; - text-align : center; - font-size:7px; - overflow : hidden; - word-wrap : normal; - } - .product_price_per_uom_price_only { - font-size: 9px; line-height: 3em; - width: 100%; text-align: center; - } - .product_sell_by_weight { - font-weight: bold; - font-size: 8px; - text-align: center; - position: relative; - right: 0.2em; - } - .pricetag_bottom_right { - margin-top:0.2cm; - text-align:center; font-size:7px; - overflow:hidden; - font-family:monospace; - position: relative; top: 6px; - } - .product_labels, .organic_text{ - float:left; - text-align:left; - padding-top: 2px; - } - .product_labels{ - padding-left : 2px; overflow: hidden; - font-size:9px; max-width: 4.8cm; height: 0.9cm; - } - .organic_text{ - white-space: nowrap; - } - .wrap_barcode_image{ - width:4.0cm; - height:1.0cm; - } - .wrap_barcode_image > img{ - width:3.0cm; - height:1.0cm; - } - .barcode_digits { - font-size: 4px; - } -} diff --git a/product_print_category_food_report/static/css/pricetag_normal_large.scss b/product_print_category_food_report/static/css/pricetag_normal_large.scss deleted file mode 100644 index 68ae7c94..00000000 --- a/product_print_category_food_report/static/css/pricetag_normal_large.scss +++ /dev/null @@ -1,52 +0,0 @@ -.normal_pricetag_large { - width:9.3cm; height:5.22cm; - padding: 0.8cm 5px; - - .pricetag_left { - width : 5.5cm; - } - .pricetag_right { - width : 3.1cm; - height: 3.6cm; - padding-top: 30px; - } - .product_informations { - font-size:8px; - } - .pricetag_second_product_price { - font-size: 33px - } - .pricetag_second_price_uom_text { - font-size: 13px; - } - .product_price { - font-size: 29px; - height: 1cm; line-height: 1cm; - white-space: nowrap; - } - .product_sell_by_weight { - position: relative; - bottom: 0.8em; - } - .product_labels, .organic_text{ - height:0.8cm; - } - img.product_label{ - width:0.6cm; height:0.6cm; margin: 0.1cm 0.1cm 0.1cm -0.1cm; - } - .organic_text{ - max-width: 3.5cm; - position: relative; top: 0.1cm; - font-size: 7px; - } - .wrap_barcode_image{ - position: relative; - height: 1.1cm; - bottom: 0; - left: 5px; - } - .write_date{ - font-size: 5px; - white-space: nowrap; - } -} diff --git a/product_print_category_food_report/static/css/pricetag_normal_small.scss b/product_print_category_food_report/static/css/pricetag_normal_small.scss deleted file mode 100644 index 3811e171..00000000 --- a/product_print_category_food_report/static/css/pricetag_normal_small.scss +++ /dev/null @@ -1,46 +0,0 @@ -.normal_pricetag_small { - width:9.3cm; height:4.4cm; - padding: 0.4cm 0.15cm; - - .pricetag_left { - width : 5.8cm; - } - .pricetag_right { - width : 2.7cm; - height: 3.6cm; - padding-top: 30px; - } - .product_informations { - font-size:9px; - } - .pricetag_second_product_price { - font-size: 33px; - } - .pricetag_second_price_uom_text { - font-size: 13px; - } - .product_price { - font-size: 26px; - } - .product_sell_by_weight { - bottom: 0.8em; - } - img.product_label{ - width:0.8cm; height:0.8cm; margin: 0.1cm 0.1cm 0.1cm 0cm; - } - .organic_text{ - position: relative; top: 0.2cm; - font-size: 7px; - } - .wrap_barcode_image{ - position: relative; - height: 1.1cm; - bottom: 0px; - left: 5px; - } - .write_date{ - font-size: 5px; - white-space: nowrap; - position: relative; bottom: 10px; - } -}