From 7f37ebf87ee967b18682ece1ab060debb19db017 Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Sun, 6 Mar 2016 21:30:54 +0000 Subject: [PATCH] proper support of date range in reports input leveraging all the features, translations and fixed some bugs (#116) --- application/controllers/Reports.php | 30 +--- application/helpers/report_helper.php | 75 --------- .../language/de-CH/datepicker_lang.php | 18 +++ application/language/de-CH/reports_lang.php | 12 -- application/language/en/datepicker_lang.php | 18 +++ application/language/en/reports_lang.php | 12 -- application/language/es/datepicker_lang.php | 18 +++ application/language/es/reports_lang.php | 12 -- application/language/fr/datepicker_lang.php | 18 +++ application/language/fr/reports_lang.php | 12 -- application/language/id/datepicker_lang.php | 18 +++ application/language/id/reports_lang.php | 14 +- .../language/nl-BE/datepicker_lang.php | 18 +++ application/language/nl-BE/reports_lang.php | 12 -- application/language/ru/datepicker_lang.php | 18 +++ application/language/ru/reports_lang.php | 12 -- application/language/th/datepicker_lang.php | 18 +++ application/language/th/reports_lang.php | 12 -- application/language/tr/datepicker_lang.php | 18 +++ application/language/tr/reports_lang.php | 12 -- application/language/zh/datepicker_lang.php | 18 +++ application/language/zh/reports_lang.php | 12 -- application/views/partial/daterangepicker.php | 96 ++++++++++++ application/views/reports/date_input.php | 142 +++++++----------- .../views/reports/date_input_excel_export.php | 63 +++----- application/views/reports/specific_input.php | 61 ++------ translations/datepicker_lang.csv | 18 +++ translations/reports_lang.csv | 12 -- 28 files changed, 389 insertions(+), 410 deletions(-) create mode 100644 application/views/partial/daterangepicker.php diff --git a/application/controllers/Reports.php b/application/controllers/Reports.php index d2d7c0ebd..14b8458c1 100644 --- a/application/controllers/Reports.php +++ b/application/controllers/Reports.php @@ -31,25 +31,11 @@ class Reports extends Secure_area $this->load->view("reports/listing",$data); } - function _get_common_report_data() - { - $data = array(); - $data['report_date_range_simple'] = get_simple_date_ranges(); - $data['months'] = get_months(); - $data['days'] = get_days(); - $data['years'] = get_years(); - $data['selected_month']=date('n'); - $data['selected_day']=date('d'); - $data['selected_year']=date('Y'); - - return $data; - } - //Input for reports that require only a date range and an export to excel. (see routes.php to see that all summary reports route here) function date_input_excel_export() { - $data = $this->_get_common_report_data(); - $this->load->view("reports/date_input_excel_export",$data); + $data = array(); + $this->load->view("reports/date_input_excel_export", $data); } function get_detailed_sales_row($sale_id) @@ -337,7 +323,7 @@ class Reports extends Secure_area //Input for reports that require only a date range. (see routes.php to see that all graphical summary reports route here) function date_input() { - $data = $this->_get_common_report_data(); + $data = array(); $data['mode'] = 'sale'; $this->load->view("reports/date_input",$data); } @@ -345,7 +331,7 @@ class Reports extends Secure_area //Input for reports that require only a date range. (see routes.php to see that all graphical summary reports route here) function date_input_sales() { - $data = $this->_get_common_report_data(); + $data = array(); $stock_locations = $this->Stock_location->get_allowed_locations('sales'); $stock_locations['all'] = $this->lang->line('reports_all'); $data['stock_locations'] = array_reverse($stock_locations, TRUE); @@ -355,7 +341,7 @@ class Reports extends Secure_area function date_input_recv() { - $data = $this->_get_common_report_data(); + $data = array(); $stock_locations = $this->Stock_location->get_allowed_locations('receivings'); $stock_locations['all'] = $this->lang->line('reports_all'); $data['stock_locations'] = array_reverse($stock_locations, TRUE); @@ -709,7 +695,7 @@ class Reports extends Secure_area function specific_customer_input() { - $data = $this->_get_common_report_data(); + $data = array(); $data['specific_input_name'] = $this->lang->line('reports_customer'); $customers = array(); @@ -759,7 +745,7 @@ class Reports extends Secure_area function specific_employee_input() { - $data = $this->_get_common_report_data(); + $data = array(); $data['specific_input_name'] = $this->lang->line('reports_employee'); $employees = array(); @@ -809,7 +795,7 @@ class Reports extends Secure_area function specific_discount_input() { - $data = $this->_get_common_report_data(); + $data = array(); $data['specific_input_name'] = $this->lang->line('reports_discount'); $discounts = array(); diff --git a/application/helpers/report_helper.php b/application/helpers/report_helper.php index dc6ecf872..716ef7e9b 100644 --- a/application/helpers/report_helper.php +++ b/application/helpers/report_helper.php @@ -1,79 +1,4 @@ load->language('reports'); - - $today = date('Y-m-d'); - $today_last_year = date('Y-m-d', mktime(0,0,0,date("m"),date("d"),date("Y")-1)); - $yesterday = date('Y-m-d', mktime(0,0,0,date("m"),date("d")-1,date("Y"))); - $six_days_ago = date('Y-m-d', mktime(0,0,0,date("m"),date("d")-6,date("Y"))); - $start_of_this_month = date('Y-m-d', mktime(0,0,0,date("m"),1,date("Y"))); - $end_of_this_month = date('Y-m-d',strtotime('-1 second',strtotime('+1 month',strtotime(date('m').'/01/'.date('Y').' 00:00:00')))); - $start_of_this_month_last_year = date('Y-m-d', mktime(0,0,0,date("m"),1,date("Y")-1)); - $end_of_this_month_last_year = date('Y-m-d',strtotime('-1 second',strtotime('+1 month',strtotime(date('m').'/01/'.(date('Y')-1).' 00:00:00')))); - $start_of_last_month = date('Y-m-d', mktime(0,0,0,date("m")-1,1,date("Y"))); - $end_of_last_month = date('Y-m-d',strtotime('-1 second',strtotime('+1 month',strtotime((date('m') - 1).'/01/'.date('Y').' 00:00:00')))); - $start_of_this_year = date('Y-m-d', mktime(0,0,0,1,1,date("Y"))); - $end_of_this_year = date('Y-m-d', mktime(0,0,0,12,31,date("Y"))); - $start_of_last_year = date('Y-m-d', mktime(0,0,0,1,1,date("Y")-1)); - $end_of_last_year = date('Y-m-d', mktime(0,0,0,12,31,date("Y")-1)); - $start_of_time = date('Y-m-d', 0); - - return array( - $today . '/' . $today => $CI->lang->line('reports_today'), - $today_last_year . '/' . $today_last_year => $CI->lang->line('reports_today_last_year'), - $yesterday . '/' . $yesterday => $CI->lang->line('reports_yesterday'), - $six_days_ago . '/' . $today => $CI->lang->line('reports_last_7'), - $start_of_this_month . '/' . $today => $CI->lang->line('reports_this_month_to_today'), - $start_of_this_month . '/' . $end_of_this_month => $CI->lang->line('reports_this_month'), - $start_of_this_month_last_year . '/' . $today_last_year => $CI->lang->line('reports_this_month_to_today_last_year'), - $start_of_this_month_last_year . '/' . $end_of_this_month_last_year => $CI->lang->line('reports_this_month_last_year'), - $start_of_last_month . '/' . $end_of_last_month => $CI->lang->line('reports_last_month'), - $start_of_this_year . '/' . $end_of_this_year => $CI->lang->line('reports_this_year'), - $start_of_last_year . '/' . $end_of_last_year => $CI->lang->line('reports_last_year'), - $start_of_time . '/' . $today => $CI->lang->line('reports_all_time') - ); -} - -function get_months() -{ - $months = array(); - - for($k=1;$k<=12;$k++) - { - $cur_month = mktime(0, 0, 0, $k, 1, 2000); - $months[date("m", $cur_month)] = date("M",$cur_month); - } - - return $months; -} - -function get_days() -{ - $days = array(); - - for($k=1;$k<=31;$k++) - { - $cur_day = mktime(0, 0, 0, 1, $k, 2000); - $days[date('d',$cur_day)] = date('j',$cur_day); - } - - return $days; -} - -function get_years() -{ - $years = array(); - - for($k=0;$k<10;$k++) - { - $years[date("Y")-$k] = date("Y")-$k; - } - - return $years; -} - function get_random_colors($how_many) { $colors = array(); diff --git a/application/language/de-CH/datepicker_lang.php b/application/language/de-CH/datepicker_lang.php index ddf39879e..045b2d114 100644 --- a/application/language/de-CH/datepicker_lang.php +++ b/application/language/de-CH/datepicker_lang.php @@ -47,3 +47,21 @@ $lang["datepicker_monthsshort_november"] = "Nov"; $lang["datepicker_monthsshort_december"] = "Dez"; $lang["datepicker_today"] = "Heute"; $lang["datepicker_weekstart"] = "1"; +$lang["datepicker_all_time"] = "Von Beginn weg"; +$lang["datepicker_last_7"] = "Letzte 7 Tage"; +$lang["datepicker_last_30"] = "Letzte 30 Tage"; +$lang["datepicker_last_month"] = "Letzter Monat"; +$lang["datepicker_last_year"] = "Letztes Jahr"; +$lang["datepicker_this_month"] = "Dieser Monat"; +$lang["datepicker_this_month_last_year"] = "Dieser Monat letzten Jahres"; +$lang["datepicker_this_month_to_today"] = "Dieser Monat bis heute"; +$lang["datepicker_this_month_to_today_last_year"] = "Dieser Monat bis Heute letzten Jahres"; +$lang["datepicker_this_year"] = "Dieses Jahr"; +$lang["datepicker_today"] = "Heute"; +$lang["datepicker_today_last_year"] = "Heute letzten Jahres"; +$lang["datepicker_yesterday"] = "Gestern"; +$lang["datepicker_apply"] = "Apply"; +$lang["datepicker_cancel"] = "Cancel"; +$lang["datepicker_from"] = "From"; +$lang["datepicker_to"] = "To"; +$lang["datepicker_custom"] = "Custom"; diff --git a/application/language/de-CH/reports_lang.php b/application/language/de-CH/reports_lang.php index 99f5b64a3..d487f68b0 100644 --- a/application/language/de-CH/reports_lang.php +++ b/application/language/de-CH/reports_lang.php @@ -1,7 +1,6 @@ ; +var end_date = ; + +$('#daterangepicker').daterangepicker({ + "ranges": { + "lang->line("datepicker_today"); ?>": [ + "config->item('dateformat'), time());?>", + "config->item('dateformat'), time());?>" + ], + "lang->line("datepicker_today_last_year"); ?>": [ + "config->item('dateformat'), mktime(0,0,0,date("m"),date("d"),date("Y")-1));?>", + "config->item('dateformat'), mktime(0,0,0,date("m"),date("d"),date("Y")-1));?>" + ], + "lang->line("datepicker_yesterday"); ?>": [ + "config->item('dateformat'), mktime(0,0,0,date("m"),date("d")-1,date("Y")));?>", + "config->item('dateformat'), mktime(0,0,0,date("m"),date("d")-1,date("Y")));?>" + ], + "lang->line("datepicker_last_7"); ?>": [ + "config->item('dateformat'), mktime(0,0,0,date("m"),date("d")-6,date("Y")));?>", + "config->item('dateformat'), time());?>" + ], + "lang->line("datepicker_last_30"); ?>": [ + "config->item('dateformat'), mktime(0,0,0,date("m"),date("d")-29,date("Y")));?>", + "config->item('dateformat'), time());?>" + ], + "lang->line("datepicker_this_month"); ?>": [ + "config->item('dateformat'), mktime(0,0,0,date("m"),1,date("Y")));?>", + "config->item('dateformat'), mktime(0,0,0,date("m")+1,1,date("Y"))-1);?>" + ], + "lang->line("datepicker_this_month_to_today_last_year"); ?>": [ + "config->item('dateformat'), mktime(0,0,0,date("m"),1,date("Y")-1));?>", + "config->item('dateformat'), mktime(0,0,0,date("m"),date("d"),date("Y")-1));?>" + ], + "lang->line("datepicker_this_month_last_year"); ?>": [ + "config->item('dateformat'), mktime(0,0,0,date("m"),1,date("Y")-1));?>", + "config->item('dateformat'), mktime(0,0,0,date("m")+1,1,date("Y")-1)-1);?>" + ], + "lang->line("datepicker_last_month"); ?>": [ + "config->item('dateformat'), mktime(0,0,0,date("m")-1,1,date("Y")));?>", + "config->item('dateformat'), mktime(0,0,0,date("m"),1,date("Y"))-1);?>" + ], + "lang->line("datepicker_this_year"); ?>": [ + "config->item('dateformat'), mktime(0,0,0,1,1,date("Y")));?>", + "config->item('dateformat'), mktime(0,0,0,date("m"),1,date("Y")+1)-1);?>" + ], + "lang->line("datepicker_last_year"); ?>": [ + "config->item('dateformat'), mktime(0,0,0,1,1,date("Y")-1));?>", + "config->item('dateformat'), mktime(0,0,0,1,1,date("Y"))-1);?>" + ], + "lang->line("datepicker_all_time"); ?>": [ + "config->item('dateformat'), mktime(0,0,0,01,01,2010));?>", + "config->item('dateformat'), time());?>" + ], + }, + "locale": { + "format": 'config->item("dateformat"))?>', + "separator": " - ", + "applyLabel": "lang->line("datepicker_apply"); ?>", + "cancelLabel": "lang->line("datepicker_cancel"); ?>", + "fromLabel": "lang->line("datepicker_from"); ?>", + "toLabel": "lang->line("datepicker_to"); ?>", + "customRangeLabel": "lang->line("datepicker_custom"); ?>", + "daysOfWeek": [ + "lang->line("datepicker_daysmin_sunday"); ?>", + "lang->line("datepicker_daysmin_monday"); ?>", + "lang->line("datepicker_daysmin_tueday"); ?>", + "lang->line("datepicker_daysmin_wednesday"); ?>", + "lang->line("datepicker_daysmin_thursday"); ?>", + "lang->line("datepicker_daysmin_friday"); ?>", + "lang->line("datepicker_daysmin_saturday"); ?>", + "lang->line("datepicker_daysmin_sunday"); ?>" + ], + "monthNames": [ + "lang->line("datepicker_months_january"); ?>", + "lang->line("datepicker_months_february"); ?>", + "lang->line("datepicker_months_march"); ?>", + "lang->line("datepicker_months_april"); ?>", + "lang->line("datepicker_months_may"); ?>", + "lang->line("datepicker_months_june"); ?>", + "lang->line("datepicker_months_july"); ?>", + "lang->line("datepicker_months_august"); ?>", + "lang->line("datepicker_months_september"); ?>", + "lang->line("datepicker_months_october"); ?>", + "lang->line("datepicker_months_november"); ?>", + "lang->line("datepicker_months_december"); ?>" + ], + "firstDay": lang->line("datepicker_weekstart"); ?> + }, + "startDate": "config->item('dateformat'), time());?>", + "endDate": "config->item('dateformat'), time());?>", + "minDate": "config->item('dateformat'), mktime(0,0,0,01,01,2010));?>", + "maxDate": "config->item('dateformat'), time());?>" +}, function(start, end, label) { + start_date = start.format('YYYY-MM-DD'); + end_date = end.format('YYYY-MM-DD'); +}); \ No newline at end of file diff --git a/application/views/reports/date_input.php b/application/views/reports/date_input.php index c8c6a2f2d..053a01d26 100644 --- a/application/views/reports/date_input.php +++ b/application/views/reports/date_input.php @@ -1,81 +1,72 @@ load->view("partial/header"); ?> +
lang->line('reports_report_input'); ?>
+ ".$error.""; } ?> -'item_form', 'enctype'=>'multipart/form-data', 'class' => 'form-horizontal')); ?> +'item_form', 'enctype'=>'multipart/form-data', 'class' => 'form-horizontal')); ?>
lang->line('reports_date_range'), 'report_date_range_label', array('class'=>'control-label col-xs-2 required')); ?> - -
-
- -
-
- -
+
+ 'daterangepicker', 'class'=>'form-control input-sm', 'id'=>'daterangepicker')); ?>
- - + + lang->line('reports_sale_type'), 'reports_sale_type_label', array('class'=>'required control-label col-xs-2')); ?> +
+ $this->lang->line('reports_all'), + 'sales' => $this->lang->line('reports_sales'), + 'returns' => $this->lang->line('reports_returns')), 'all', array('id'=>'input_type', 'class'=>'form-control')); ?> +
+ + lang->line('reports_receiving_type'), 'reports_receiving_type_label', array('class'=>'required control-label col-xs-2')); ?> +
+ $this->lang->line('reports_all'), + 'receiving' => $this->lang->line('reports_receivings'), + 'returns' => $this->lang->line('reports_returns'), + 'requisitions' => $this->lang->line('reports_requisitions')), 'all', array('id'=>'input_type', 'class'=>'form-control')); ?> +
+ +
+ + 1) { -?> -
- lang->line('reports_sale_type'), 'reports_sale_type_label', array('class'=>'required control-label col-xs-2')); ?> -
- $this->lang->line('reports_all'), - 'sales' => $this->lang->line('reports_sales'), - 'returns' => $this->lang->line('reports_returns')), 'all', 'id="input_type" class="form-control"'); ?> + ?> +
+ lang->line('reports_stock_location'), 'reports_stock_location_label', array('class'=>'required control-label col-xs-2')); ?> +
+ 'location_id', 'class'=>'form-control')); ?> +
-
- -
- lang->line('reports_receiving_type'), 'reports_receiving_type_label', array('class'=>'required control-label col-xs-2')); ?> -
- $this->lang->line('reports_all'), - 'receiving' => $this->lang->line('reports_receivings'), - 'returns' => $this->lang->line('reports_returns'), - 'requisitions' => $this->lang->line('reports_requisitions')), 'all', 'id="input_type" class="form-control"'); ?> -
-
- 1) -{ -?> -
- lang->line('reports_stock_location'), 'reports_stock_location_label', array('class'=>'required control-label col-xs-2')); ?> -
- -
-
- + -'generate_report', 'id'=>'generate_report', 'content'=>$this->lang->line('common_submit'), 'class'=>'btn btn-primary btn-sm') ); -?> - + ?> load->view("partial/footer"); ?> @@ -83,50 +74,25 @@ if (!empty($stock_locations) && count($stock_locations) > 1) \ No newline at end of file diff --git a/application/views/reports/date_input_excel_export.php b/application/views/reports/date_input_excel_export.php index 6558747fc..cd0fb2754 100644 --- a/application/views/reports/date_input_excel_export.php +++ b/application/views/reports/date_input_excel_export.php @@ -1,28 +1,19 @@ load->view("partial/header"); ?> +
lang->line('reports_report_input'); ?>
+ ".$error."
"; } ?> -'item_form', 'enctype'=>'multipart/form-data', 'class' => 'form-horizontal')); ?> +'item_form', 'enctype'=>'multipart/form-data', 'class' => 'form-horizontal')); ?>
lang->line('reports_date_range'), 'report_date_range_label', array('class'=>'control-label col-xs-2 required')); ?> - -
-
- -
-
- -
+
+ 'daterangepicker', 'class'=>'form-control input-sm', 'id'=>'daterangepicker')); ?>
@@ -30,14 +21,14 @@ if(isset($error)) lang->line('reports_sale_type'), 'reports_sale_type_label', array('class'=>'required control-label col-xs-2')); ?>
$this->lang->line('reports_all'), - 'sales' => $this->lang->line('reports_sales'), - 'returns' => $this->lang->line('reports_returns')), 'all', 'id="input_type" class="form-control"'); ?> + 'sales' => $this->lang->line('reports_sales'), + 'returns' => $this->lang->line('reports_returns')), 'all', array('id'=>'input_type', 'class'=>'form-control')); ?>
lang->line('common_export_excel'), 'export_excel', !empty($basic_version) ? array('class'=>'control-label required col-xs-3') : array('class'=>'control-label col-xs-2')); ?> -
+
@@ -47,15 +38,14 @@ if(isset($error))
-'generate_report', 'id'=>'generate_report', 'content'=>$this->lang->line('common_submit'), 'class'=>'btn btn-primary btn-sm') ); -?> - + ?> load->view("partial/footer"); ?> @@ -63,42 +53,23 @@ if(isset($error)) \ No newline at end of file diff --git a/application/views/reports/specific_input.php b/application/views/reports/specific_input.php index 1640badbb..79bf18520 100644 --- a/application/views/reports/specific_input.php +++ b/application/views/reports/specific_input.php @@ -1,5 +1,7 @@ load->view("partial/header"); ?> +
lang->line('reports_report_input'); ?>
+ 'item_form', 'enctype'=>'multipart/form-data', 'class' => 'form-horizontal')); ?> -
lang->line('reports_date_range'), 'report_date_range_label', array('class'=>'control-label col-xs-2 required')); ?> - -
-
- -
-
- -
+
+ 'daterangepicker', 'class'=>'form-control input-sm', 'id'=>'daterangepicker')); ?>
- +
'required control-label col-xs-2')); ?>
@@ -45,7 +35,7 @@ if(isset($error))
lang->line('common_export_excel'), 'export_excel', !empty($basic_version) ? array('class'=>'control-label required col-xs-3') : array('class'=>'control-label col-xs-2')); ?> -
+
@@ -55,15 +45,14 @@ if(isset($error))
-'generate_report', 'id'=>'generate_report', 'content'=>$this->lang->line('common_submit'), 'class'=>'btn btn-primary btn-sm') ); -?> - + ?> load->view("partial/footer"); ?> @@ -71,43 +60,23 @@ if(isset($error)) \ No newline at end of file diff --git a/translations/datepicker_lang.csv b/translations/datepicker_lang.csv index a9c1b823d..0966b5db2 100644 --- a/translations/datepicker_lang.csv +++ b/translations/datepicker_lang.csv @@ -46,3 +46,21 @@ datepicker_monthsshort_november,Nov,Nov,Nov,Nov,Nov,,,,, datepicker_monthsshort_december,Dez,Dec,Dic,Dec,Dec,,,,, datepicker_today,Heute,Vandaag,Hoy,Today,Aujourd'hui,,,,, datepicker_weekstart,1,0,0,0,1,,,,, +datepicker_all_time,Von Beginn weg,Alle,Todos,All Time,Depuis le début,全部,за все время,เวลาทั้งหมด,Tüm Zamanlar,Semua Waktu +datepicker_last_7,Letzte 7 Tage,Vorige 7 Dagen,Últimos 7 Días,Last 7 Days,Ces 7 derniers jours,過去七天,Последние 7 дней,7 วันสุดท้าย,Son 7 Gün,7 Hari Terakhir +datepicker_last_30,Letzte 30 Tage,Vorige 30 Dagen,Últimos 30 Días,Last 30 Days,Ces 30 derniers jours,過去七天,Последние 30 дней,30 วันสุดท้าย,Son 30 Gün,30 Hari Terakhir +datepicker_last_month,Letzter Monat,Vorige Maand,Último Mes,Last Month,Le mois dernier,上個月,Последний месяц,เดือนที่แล้ว,Geçen Ay,Bulan lalu +datepicker_last_year,Letztes Jahr,Vorig Jaar,Último Año,Last Year,L\'année passée,去年,в прошлом году,ปีที่แล้ว,Geçen Yıl,Tahun lalu +datepicker_this_month,Dieser Monat,Deze Maand,Este Mes,This Month,Ce mois,這個月,В этом месяце,เดือนนี้,Bu Ay,Bulan ini +datepicker_this_month_last_year,Dieser Monat letzten Jahres,This Month Last Year,This Month Last Year,This Month Last Year,This Month Last Year,This Month Last Year,This Month Last Year,This Month Last Year,This Month Last Year,This Month Last Year +datepicker_this_month_to_today,Dieser Monat bis heute,This Month To Today,This Month To Today,This Month To Today,This Month To Today,This Month To Today,This Month To Today,This Month To Today,This Month To Today,This Month To Today +datepicker_this_month_to_today_last_year,Dieser Monat bis Heute letzten Jahres,This Month To Today Last Year,This Month To Today Last Year,This Month To Today Last Year,This Month To Today Last Year,This Month To Today Last Year,This Month To Today Last Year,This Month To Today Last Year,This Month To Today Last Year,This Month To Today Last Year +datepicker_this_year,Dieses Jahr,Dit Jaar,Este Año,This Year,Cette Année,今年,В этом году,ปีนี้,Bu Yıl,Tahun ini +datepicker_today,Heute,Vandaag,Hoy,Today,Aujourd\'hui,今天,сегодня,วันนี้,Bugün,Hari ini +datepicker_today_last_year,Heute letzten Jahres,Today Last Year,Today Last Year,Today Last Year,Today Last Year,Today Last Year,Today Last Year,Today Last Year,Today Last Year,Today Last Year +datepicker_yesterday,Gestern,Gisteren,Ayer,Yesterday,Hier,昨天,вчера,เมื่อวานนี้,Dün,Kemarin +datepicker_apply,Apply,Apply,Apply,Apply,Apply,Apply,Apply,Apply,Apply,Apply +datepicker_cancel,Cancel,Cancel,Cancel,Cancel,Cancel,Cancel,Cancel,Cancel,Cancel,Cancel +datepicker_from,From,From,From,From,From,From,From,From,From,From +datepicker_to,To,To,To,To,To,To,To,To,To,To +datepicker_custom,Custom,Custom,Custom,Custom,Custom,Custom,Custom,Custom,Custom,Custom diff --git a/translations/reports_lang.csv b/translations/reports_lang.csv index fb4ccf250..adae09256 100644 --- a/translations/reports_lang.csv +++ b/translations/reports_lang.csv @@ -1,6 +1,5 @@ label,de-CH,nl-BE,es,en,fr,zh,ru,th,tr,id reports_all,Alle,Alle,Todo,All,Tous,全部,все,ทั้งหมด,Hepsi,Semua -reports_all_time,Von Beginn weg,Alle,Todos,All Time,Depuis le début,全部,за все время,เวลาทั้งหมด,Tüm Zamanlar,Semua Waktu reports_categories,Kategorien,Categorieën,Categorías,Categories,Catégories,類別,Категории,หมวดหมู่,Kategoriler,Kategori reports_categories_summary_report,Bericht: Kategorien (summarisch),Rapport Overzicht Categorieën,Reporte de Resumen de Categorías,Categories Summary Report,Rapport: Résumé des Catégories,分類摘要報告,Сводный отчет Категории,รายงานสรุปหมวดหมู่,Kategori Özet Raporu,Laporan Ringkasan Kategori reports_category,Kategorie,Categorie,Categoría,Category,Catégorie,類別,категория,หมวดหมู่,Kategori,Kategori @@ -37,9 +36,6 @@ reports_items,Artikel,Producten,Artículos,Items,Items,產品,товары,ส reports_items_purchased,Gekaufte Artikel,Hoeveelheid,Artículos Comprados,Items Purchased,Éléments Achetés,銷售產品,купенный товары,สินค้าที่ถูกซื้อ,Satın Alınan Ürünler,Produk Dibeli reports_items_received,Erhaltene Artikel,Items Ontvangen,Artículos Recibidos,Items Received,Éléments Arrivés,進貨產品,полученные Товары,สินค้าเข้า,Alınan Ürünler,Barang Masuk reports_items_summary_report,Bericht: Artikel (summarisch),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,Letzte 7 Tage,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,Letzter Monat,Vorige Maand,Último Mes,Last Month,Le mois dernier,上個月,Последний месяц,เดือนที่แล้ว,Geçen Ay,Bulan lalu -reports_last_year,Letztes Jahr,Vorig Jaar,Último Año,Last Year,L\'année passée,去年,в прошлом году,ปีที่แล้ว,Geçen Yıl,Tahun lalu reports_low_inventory,Lager mit Unterbestand,,Inventario Bajo,,,,,,Düşük Stok,Kurang Persediaan reports_low_inventory_report,Bericht: Inventar,,Reporte de Inventario Bajo,,,,,,Düşük Stok Raporu,Laporan Persediaan Kurang reports_name,Name,Naam,Nombre,Name,Nom,名稱,название,ชื่อ,İsim,Nama @@ -87,17 +83,9 @@ reports_tax,MWSt,VAT,Impuesto,Tax,Taxe,稅額,налог,ภาษี,Vergi,Paja reports_tax_percent,MWSt %,VAT Percentage,Porcentaje de Impuestos,Tax Percent,Pourcentage d\'imposition,稅率,процент налога,เปอร์เซ็นภาษี,Vergi Oranı,Persentase Pajak reports_taxes,Steuern,Belastingen,Impuestos,Taxes,Taxes,稅額,Налоги,ภาษี,Vergiler,Pajak reports_taxes_summary_report,Bericht: Steuern (summarisch),Rapport Overzicht Belastingen,Reporte de Resumen de Impuestos,Taxes Summary Report,Rapport: Résumé Taxes,稅金摘要報告,Сводный отчет налоги,รายงานสรุปภาษี,Vergi Özet Raporu,Laporan Ringkasan Pajak -reports_this_month,Dieser Monat,Deze Maand,Este Mes,This Month,Ce mois,這個月,В этом месяце,เดือนนี้,Bu Ay,Bulan ini -reports_this_month_last_year,Dieser Monat letzten Jahres,This Month Last Year,This Month Last Year,This Month Last Year,This Month Last Year,This Month Last Year,This Month Last Year,This Month Last Year,This Month Last Year,This Month Last Year -reports_this_month_to_today,Dieser Monat bis heute,This Month To Today,This Month To Today,This Month To Today,This Month To Today,This Month To Today,This Month To Today,This Month To Today,This Month To Today,This Month To Today -reports_this_month_to_today_last_year,Dieser Monat bis Heute letzten Jahres,This Month To Today Last Year,This Month To Today Last Year,This Month To Today Last Year,This Month To Today Last Year,This Month To Today Last Year,This Month To Today Last Year,This Month To Today Last Year,This Month To Today Last Year,This Month To Today Last Year -reports_this_year,Dieses Jahr,Dit Jaar,Este Año,This Year,Cette Année,今年,В этом году,ปีนี้,Bu Yıl,Tahun ini -reports_today,Heute,Vandaag,Hoy,Today,Aujourd\'hui,今天,сегодня,วันนี้,Bugün,Hari ini -reports_today_last_year,Heute letzten Jahres,Today Last Year,Today Last Year,Today Last Year,Today Last Year,Today Last Year,Today Last Year,Today Last Year,Today Last Year,Today Last Year reports_total,Total,Totaal,Total,Total,Total,總計,сумма,ยอดรวม,Toplam,Total reports_type,Typ,Type,Tipo,Type,Type,類型,тип,ชนิด,Tür,Tipe reports_welcome_message,Willkommen bei Berichtsmodul,Welkom bij de rapporten. Selecteer hier een rapport.,Bienvenido(a) al panel de reportes. Selecciona un reporte para verlo.,Welcome to the reports panel. Please select a report to view.,Bienvenue à la page des rapports. Veuillez sélectionner un rapport à visualiser.,歡迎使用報表系統。請選擇要查看的報表。,"Добро пожаловать в панель отчетов. Пожалуйста, выберите отчет для просмотра.",ยินดีต้อนรับเข้าสู่รายงาน. โปรดเลือกชนิดของรายงาน.,Rapor paneline hoş geldiniz. Görmek istediğiniz raporu seçiniz.,Selamat Datang ke panel laporan. Silakan pilih laporan untuk melihat/cetak. -reports_yesterday,Gestern,Gisteren,Ayer,Yesterday,Hier,昨天,вчера,เมื่อวานนี้,Dün,Kemarin reports_item_count,Filter nach Artikelzahl,Filter Item Count,Filter Item Count,Filter Item Count,Filter Item Count,Filter Item Count,Filter Item Count,Filter Item Count,Filter Stok Habis/Belum Habis/Minus, reports_cost_price,Einstandspreis,Aankoopprijs,Precio de Compra,Cost Price,Prix de Gros,成本價,Оптовая Цена,ราคาทุน,Maliyet Fiyatı,Harga Pokok reports_unit_price,Verkaufspreis,Verkoopprijs,Precio de Venta,Retail Price,Prix au Détail,單價,Розничная Цена,ราคาขาย,Satış Fiyatı,Harga Jual