From b11bf919af4163fed34dee6b2ced77e7cf38d5f0 Mon Sep 17 00:00:00 2001 From: jekkos-t520 Date: Tue, 24 Feb 2015 17:08:46 +0100 Subject: [PATCH] Automatically resize report columns Remove text-transform for invoice header --- application/controllers/reports.php | 1 + css/invoice.css | 2 +- css/invoice_email.css | 2 +- translations/reports_lang.csv | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/application/controllers/reports.php b/application/controllers/reports.php index e9cdd4173..e83d7b6a9 100644 --- a/application/controllers/reports.php +++ b/application/controllers/reports.php @@ -904,6 +904,7 @@ class Reports extends Secure_area "title" =>$this->lang->line('reports_detailed_receivings_report'), "subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)), "headers" => $model->getDataColumns(), + "header_width" => intval(100 / count($headers['summary'])), "editable" => "receivings", "summary_data" => $summary_data, "details_data" => $details_data, diff --git a/css/invoice.css b/css/invoice.css index 19907fc87..14f932e13 100755 --- a/css/invoice.css +++ b/css/invoice.css @@ -12,7 +12,7 @@ #page-wrap table { border-collapse: collapse; } #page-wrap table td, #page-wrap table th { border: 1px solid black; padding: 5px; } -#header { height: 30px; width: 100%; margin: 20px 0; background: #222; text-align: center; color: white; font: bold 26px Helvetica, Sans-Serif; text-transform: uppercase; letter-spacing: 4px; padding: 8px 0px; } +#header { height: 30px; width: 100%; margin: 20px 0; background: #222; text-align: center; color: white; font: bold 26px Helvetica, Sans-Serif; letter-spacing: 4px; padding: 8px 0px; } /* first row */ #logo { text-align: right; margin-top: 15px; float: left; position: relative; border: 1px solid #fff; max-width: 150px; max-height: 150px; overflow: hidden; } diff --git a/css/invoice_email.css b/css/invoice_email.css index 5c3f14278..131bdfdb7 100755 --- a/css/invoice_email.css +++ b/css/invoice_email.css @@ -13,7 +13,7 @@ pre { font-family: Helvetica; font-size: 13px; } #page-wrap table { border-collapse: collapse; } #page-wrap table#items td { padding: 10px; } #page-wrap #meta table td, #page-wrap table th { border: 1px solid black; padding: 5px; } -#header { height: 30px; width: 100%; margin: 20px 0; background-color: #222222; text-align: center; color: white; font-weight: bold; font-size: 26px; letter-spacing: 4px; padding: 8px 0px; text-transform: uppercase; } +#header { height: 30px; width: 100%; margin: 20px 0; background-color: #222222; text-align: center; color: white; font-weight: bold; font-size: 26px; letter-spacing: 4px; padding: 8px 0px; } /* first row */ #info { width: 100%; margin: 10px 0 30px 0; } diff --git a/translations/reports_lang.csv b/translations/reports_lang.csv index d5bcd6f09..60eea73ca 100644 --- a/translations/reports_lang.csv +++ b/translations/reports_lang.csv @@ -35,7 +35,7 @@ "reports_item_number","Productnummer","Número de Artículo","Item Number","Numéro d\'Item","產品數量","Номер Товара","เลขสินค้า","Ürün Kodu","Nomor Barang" "reports_items","Producten","Artículos","Items","Items","產品","товары","สินค้า","Ürünler","Produk/Item" "reports_items_purchased","Hoeveelheid","Artículos Comprados","Items Purchased","Éléments Achetés","銷售產品","купенный товары","สินค้าที่ถูกซื้อ","Satın Alınan Ürünler","Produk Dibeli" -"reports_items_received","Items Ontvangen","Artículos Recibidos","Items Received","Éléments Arrivés","進貨產品","полученные Товары","สินค้าเข้า","Alınan Ürünler","Barang Masuk" +"reports_items_received","Aantal","Artículos Recibidos","Items Received","Éléments Arrivés","進貨產品","полученные Товары","สินค้าเข้า","Alınan Ürünler","Barang Masuk" "reports_items_summary_report","Rapport Overzicht Producten","Reporte de Resumen de Artículos","Items Summary Report","Rapport: Résumé Items","產品摘要報告","Сводный отчет товары","รายงานสรุปสินค้า","Ürün Özet Raporu","Laporan Ringkasan Produk/Item" "reports_last_7","Vorige 7 Dagen","Últimos 7 Días","Last 7 Days","Ces 7 derniers jours","過去七天","Последние 7 дней","7 วันสุดท้าย","Son 7 Gün","7 Hari Terakhir" "reports_last_month","Vorige Maand","Último Mes","Last Month","Le mois dernier","上個月","Последний месяц","เดือนที่แล้ว","Geçen Ay","Bulan lalu" @@ -48,7 +48,7 @@ "reports_payments_summary_report","Overzicht Betalingen","Reporte de Resumen de Pagos","Payments Summary Report","Rapport: Résumé des Paiements","收入報告摘要","Платежей Сводный отчет","รายงานสรุปการจ่าย","Ödeme Özet Raporu","Laporan Ringkasan Pembayaran" "reports_profit","Winst","Ganancia","Profit","Bénéfice","利潤","прибыль","กำไร","Kâr","Keuntungan/Laba" "reports_quantity_purchased","Aangekochte Hoeveelheid","Cantidad Comprada","Quantity Purchased","Quantité Achetée","銷售金額","купенный количество","จำนวนการช์้อ","Satın Alınan Adet","Jumlah Dibeli" -"reports_received_by","Ontvangen door","Recibido por","Received By","Recu par","收款人","получило за","รับโดย","Alım Yapan","Diterima Oleh" +"reports_received_by","Werknemer","Recibido por","Received By","Recu par","收款人","получило за","รับโดย","Alım Yapan","Diterima Oleh" "reports_receiving_id","","","Receiving ID","","","","IDรับสินค้า","Alım No","Id Penerima" "reports_receiving_type","","","Receiving Type","","","","รูปแบบการรับสินค้า","Alım Türü","Type Diterima" "reports_receivings","Orders","Entradas","Receivings","Arrivages","應付款","Получении","รับสินค้า","Alımlar","Barang Masuk"