mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-06 06:46:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added financial year start date (#1141), various fixes on date & time

Browse Source
This commit is contained in:
FrancescoUK
2017-04-17 20:20:53 +01:00
parent 1738f76402
commit 938907fe20
24 changed files with 84 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
application/controllers/Config.php
View File

@@ -317,7 +317,8 @@ class Config extends Secure_Controller
'payment_options_order' => $this->input->post('payment_options_order'),
'date_or_time_format' => $this->input->post('date_or_time_format'),
'cash_decimals' => $this->input->post('cash_decimals'),
'cash_rounding_code' => $this->input->post('cash_rounding_code')
'cash_rounding_code' => $this->input->post('cash_rounding_code'),
'financial_year' => $this->input->post('financial_year')
);
$result = $this->Appconfig->batch_save($batch_save_data);

3
application/language/ar-EG/datepicker_lang.php
View File

@@ -10,9 +10,8 @@ $lang["datepicker_last_7"] = "أخر سبعة أيام";
$lang["datepicker_last_month"] = "أخر شهر";
$lang["datepicker_last_year"] = "السنة الماضية";
$lang["datepicker_same_month_to_same_day_last_year"] = "نفس الشهر حتى اليوم من السنة الماضية";
$lang["datepicker_same_month_to_today"] = "هذا الشهر حتى اليوم";
$lang["datepicker_this_month"] = "هذا الشهر";
$lang["datepicker_this_month_last_year"] = "نفس الشهر من العام الماضي";
$lang["datepicker_same_month_last_year"] = "نفس الشهر من العام الماضي";
$lang["datepicker_this_year"] = "السنة الحالية";
$lang["datepicker_to"] = "إلى";
$lang["datepicker_today"] = "اليوم";

3
application/language/de-CH/datepicker_lang.php
View File

@@ -10,9 +10,8 @@ $lang["datepicker_last_7"] = "Letzte 7 Tage";
$lang["datepicker_last_month"] = "Letzter Monat";
$lang["datepicker_last_year"] = "Letztes Jahr";
$lang["datepicker_same_month_to_same_day_last_year"] = "Dieser Monat bis Heute letzten Jahres";
$lang["datepicker_same_month_to_today"] = "Dieser Monat bis heute";
$lang["datepicker_this_month"] = "Dieser Monat";
$lang["datepicker_this_month_last_year"] = "Dieser Monat letzten Jahres";
$lang["datepicker_same_month_last_year"] = "Dieser Monat letzten Jahres";
$lang["datepicker_this_year"] = "Dieses Jahr";
$lang["datepicker_to"] = "To";
$lang["datepicker_today"] = "Heute";

3
application/language/de/datepicker_lang.php
View File

@@ -10,9 +10,8 @@ $lang["datepicker_last_7"] = "Letzte 7 Tage";
$lang["datepicker_last_month"] = "Letzter Monat";
$lang["datepicker_last_year"] = "Letztes Jahr";
$lang["datepicker_same_month_to_same_day_last_year"] = "Dieser Monat bis Heute letzten Jahres";
$lang["datepicker_same_month_to_today"] = "Dieser Monat bis heute";
$lang["datepicker_this_month"] = "Dieser Monat";
$lang["datepicker_this_month_last_year"] = "Dieser Monat letzten Jahres";
$lang["datepicker_same_month_last_year"] = "Dieser Monat letzten Jahres";
$lang["datepicker_this_year"] = "Dieses Jahr";
$lang["datepicker_to"] = "Bis";
$lang["datepicker_today"] = "Heute";

5
application/language/en/config_lang.php
View File

@@ -104,6 +104,11 @@ $lang["config_email_smtp_port"] = "SMTP Port";
$lang["config_email_smtp_timeout"] = "SMTP Timeout (s)";
$lang["config_email_smtp_user"] = "SMTP Username";
$lang["config_fax"] = "Fax";
$lang["config_financial_year"] = "Financial Year Start";
$lang["config_financial_year_jan"] = "1st of January";
$lang["config_financial_year_apr"] = "1st of April";
$lang["config_financial_year_jul"] = "1st of July";
$lang["config_financial_year_oct"] = "1st of October";
$lang["config_general"] = "General";
$lang["config_general_configuration"] = "General Configuration";
$lang["config_info"] = "Information";

5
application/language/en/datepicker_lang.php
View File

@@ -7,12 +7,13 @@ $lang["datepicker_custom"] = "Custom";
$lang["datepicker_from"] = "From";
$lang["datepicker_last_30"] = "Last 30 Days";
$lang["datepicker_last_7"] = "Last 7 Days";
$lang["datepicker_last_financial_year"] = "Last Financial Year";
$lang["datepicker_last_month"] = "Last Month";
$lang["datepicker_last_year"] = "Last Year";
$lang["datepicker_same_month_last_year"] = "Same Month Last Year";
$lang["datepicker_same_month_to_same_day_last_year"] = "Same Month To Same Day Last Year";
$lang["datepicker_same_month_to_today"] = "This Month To Today";
$lang["datepicker_this_financial_year"] = "This Financial Year";
$lang["datepicker_this_month"] = "This Month";
$lang["datepicker_this_month_last_year"] = "Same Month Last Year";
$lang["datepicker_this_year"] = "This Year";
$lang["datepicker_to"] = "To";
$lang["datepicker_today"] = "Today";

3
application/language/es/datepicker_lang.php
View File

@@ -10,9 +10,8 @@ $lang["datepicker_last_7"] = "Últimos 7 Días";
$lang["datepicker_last_month"] = "Mes Anterior";
$lang["datepicker_last_year"] = "Año Anterior";
$lang["datepicker_same_month_to_same_day_last_year"] = "Este mes hasta hoy, del año pasado";
$lang["datepicker_same_month_to_today"] = "Este Mes hasta hoy";
$lang["datepicker_this_month"] = "Este Mes";
$lang["datepicker_this_month_last_year"] = "Este Mes hace un año";
$lang["datepicker_same_month_last_year"] = "Este Mes hace un año";
$lang["datepicker_this_year"] = "Este Año";
$lang["datepicker_to"] = "Hasta";
$lang["datepicker_today"] = "Hoy";

3
application/language/fr/datepicker_lang.php
View File

@@ -10,9 +10,8 @@ $lang["datepicker_last_7"] = "Ces 7 derniers jours";
$lang["datepicker_last_month"] = "Le mois dernier";
$lang["datepicker_last_year"] = "L'année passée";
$lang["datepicker_same_month_to_same_day_last_year"] = "Même mois au même jour que l'an dernier";
$lang["datepicker_same_month_to_today"] = "Ce mois-ci à aujourd'hui";
$lang["datepicker_this_month"] = "Ce mois";
$lang["datepicker_this_month_last_year"] = "Même mois de l'Année Dernière";
$lang["datepicker_same_month_last_year"] = "Même mois de l'Année Dernière";
$lang["datepicker_this_year"] = "Cette Année";
$lang["datepicker_to"] = "To";
$lang["datepicker_today"] = "Aujourd'hui";

3
application/language/hr-HR/datepicker_lang.php
View File

@@ -10,9 +10,8 @@ $lang["datepicker_last_7"] = "Zadnjih 7 dana";
$lang["datepicker_last_month"] = "Zadnji mjesec";
$lang["datepicker_last_year"] = "Zadnja godina";
$lang["datepicker_same_month_to_same_day_last_year"] = "Ovaj mjesec do danas prošle godine";
$lang["datepicker_same_month_to_today"] = "Ovaj mjesec do danas";
$lang["datepicker_this_month"] = "Ovaj mjesec";
$lang["datepicker_this_month_last_year"] = "Ovaj mjesec prošle godine";
$lang["datepicker_same_month_last_year"] = "Ovaj mjesec prošle godine";
$lang["datepicker_this_year"] = "Ova godina";
$lang["datepicker_to"] = "Do";
$lang["datepicker_today"] = "Danas";

3
application/language/hu-HU/datepicker_lang.php
View File

@@ -10,9 +10,8 @@ $lang["datepicker_last_7"] = "Utolsó 7 nap";
$lang["datepicker_last_month"] = "Múlt hónap";
$lang["datepicker_last_year"] = "Múlt év";
$lang["datepicker_same_month_to_same_day_last_year"] = "Ez a hónap, mai nap, múlt évben";
$lang["datepicker_same_month_to_today"] = "Ez a hónap, mai napig";
$lang["datepicker_this_month"] = "Ez a hónap";
$lang["datepicker_this_month_last_year"] = "Ez a hónap, múlt évben";
$lang["datepicker_same_month_last_year"] = "Ez a hónap, múlt évben";
$lang["datepicker_this_year"] = "Ezév";
$lang["datepicker_to"] = "Ig";
$lang["datepicker_today"] = "Ma";

3
application/language/id/datepicker_lang.php
View File

@@ -10,9 +10,8 @@ $lang["datepicker_last_7"] = "7 Hari Terakhir";
$lang["datepicker_last_month"] = "Bulan lalu";
$lang["datepicker_last_year"] = "Tahun lalu";
$lang["datepicker_same_month_to_same_day_last_year"] = "Bulan yang sama untuk hari yang sama tahun yang lalu";
$lang["datepicker_same_month_to_today"] = "Bulan ini sampai hari ini";
$lang["datepicker_this_month"] = "Bulan ini";
$lang["datepicker_this_month_last_year"] = "Bulan yang sama tahun kemarin";
$lang["datepicker_same_month_last_year"] = "Bulan yang sama tahun kemarin";
$lang["datepicker_this_year"] = "Tahun ini";
$lang["datepicker_to"] = "sampai";
$lang["datepicker_today"] = "Hari ini";

3
application/language/nl-BE/datepicker_lang.php
View File

@@ -10,9 +10,8 @@ $lang["datepicker_last_7"] = "Vorige 7 Dagen";
$lang["datepicker_last_month"] = "Vorige Maand";
$lang["datepicker_last_year"] = "Vorig Jaar";
$lang["datepicker_same_month_to_same_day_last_year"] = "Dezelfde maand op dezelfde dag vorig jaar";
$lang["datepicker_same_month_to_today"] = "Deze maand tot vandaag";
$lang["datepicker_this_month"] = "Deze Maand";
$lang["datepicker_this_month_last_year"] = "Dezelfde maand vorig jaar";
$lang["datepicker_same_month_last_year"] = "Dezelfde maand vorig jaar";
$lang["datepicker_this_year"] = "Dit Jaar";
$lang["datepicker_to"] = "To";
$lang["datepicker_today"] = "Vandaag";

3
application/language/pt-BR/datepicker_lang.php
View File

@@ -10,9 +10,8 @@ $lang["datepicker_last_7"] = "Últimos 7 Dias";
$lang["datepicker_last_month"] = "Último Mês";
$lang["datepicker_last_year"] = "Último ano";
$lang["datepicker_same_month_to_same_day_last_year"] = "Este mês Para Hoje Último Ano";
$lang["datepicker_same_month_to_today"] = "Deste mês para hoje";
$lang["datepicker_this_month"] = "Este Mês";
$lang["datepicker_this_month_last_year"] = "Este mês último ano";
$lang["datepicker_same_month_last_year"] = "Este mês último ano";
$lang["datepicker_this_year"] = "Este Ano";
$lang["datepicker_to"] = "Para";
$lang["datepicker_today"] = "Hoje";

3
application/language/ru/datepicker_lang.php
View File

@@ -10,9 +10,8 @@ $lang["datepicker_last_7"] = "Последние 7 дней";
$lang["datepicker_last_month"] = "Последний месяц";
$lang["datepicker_last_year"] = "в прошлом году";
$lang["datepicker_same_month_to_same_day_last_year"] = "Same Month To Same Day Last Year";
$lang["datepicker_same_month_to_today"] = "This Month To Today";
$lang["datepicker_this_month"] = "В этом месяце";
$lang["datepicker_this_month_last_year"] = "Same Month Last Year";
$lang["datepicker_same_month_last_year"] = "Same Month Last Year";
$lang["datepicker_this_year"] = "В этом году";
$lang["datepicker_to"] = "To";
$lang["datepicker_today"] = "сегодня";

3
application/language/sv/datepicker_lang.php
View File

@@ -10,9 +10,8 @@ $lang["datepicker_last_7"] = "";
$lang["datepicker_last_month"] = "";
$lang["datepicker_last_year"] = "";
$lang["datepicker_same_month_to_same_day_last_year"] = "";
$lang["datepicker_same_month_to_today"] = "";
$lang["datepicker_same_month_last_year"] = "";
$lang["datepicker_this_month"] = "";
$lang["datepicker_this_month_last_year"] = "";
$lang["datepicker_this_year"] = "";
$lang["datepicker_to"] = "";
$lang["datepicker_today"] = "";

3
application/language/th/datepicker_lang.php
View File

@@ -10,9 +10,8 @@ $lang["datepicker_last_7"] = "7 วันสุดท้าย";
$lang["datepicker_last_month"] = "เดือนที่แล้ว";
$lang["datepicker_last_year"] = "ปีที่แล้ว";
$lang["datepicker_same_month_to_same_day_last_year"] = "Same Month To Same Day Last Year";
$lang["datepicker_same_month_to_today"] = "This Month To Today";
$lang["datepicker_this_month"] = "เดือนนี้";
$lang["datepicker_this_month_last_year"] = "Same Month Last Year";
$lang["datepicker_same_month_last_year"] = "Same Month Last Year";
$lang["datepicker_this_year"] = "ปีนี้";
$lang["datepicker_to"] = "To";
$lang["datepicker_today"] = "วันนี้";

3
application/language/tr/datepicker_lang.php
View File

@@ -10,9 +10,8 @@ $lang["datepicker_last_7"] = "Son 7 Gün";
$lang["datepicker_last_month"] = "Geçen Ay";
$lang["datepicker_last_year"] = "Geçen Yıl";
$lang["datepicker_same_month_to_same_day_last_year"] = "Geçen Sene Aynı Aydan Aynı Güne";
$lang["datepicker_same_month_to_today"] = "Bu Aydan Bugüne";
$lang["datepicker_this_month"] = "Bu Ay";
$lang["datepicker_this_month_last_year"] = "Geçen Sene Aynı Ay";
$lang["datepicker_same_month_last_year"] = "Geçen Sene Aynı Ay";
$lang["datepicker_this_year"] = "Bu Yıl";
$lang["datepicker_to"] = "To";
$lang["datepicker_today"] = "Bugün";

3
application/language/zh/datepicker_lang.php
View File

@@ -10,9 +10,8 @@ $lang["datepicker_last_7"] = "過去七天";
$lang["datepicker_last_month"] = "上個月";
$lang["datepicker_last_year"] = "去年";
$lang["datepicker_same_month_to_same_day_last_year"] = "Same Month To Same Day Last Year";
$lang["datepicker_same_month_to_today"] = "This Month To Today";
$lang["datepicker_this_month"] = "這個月";
$lang["datepicker_this_month_last_year"] = "Same Month Last Year";
$lang["datepicker_same_month_last_year"] = "Same Month Last Year";
$lang["datepicker_this_year"] = "今年";
$lang["datepicker_to"] = "To";
$lang["datepicker_today"] = "今天";

16
application/views/configs/locale_config.php
View File

@@ -82,7 +82,7 @@
'2' => '2',
'3' => '3'
),
$this->config->item('quantity_decimals'), array('class' => 'form-control input-sm'));
$this->config->item('quantity_decimals'), array('class' => 'form-control input-sm'));
?>
</div>
</div>
@@ -298,6 +298,20 @@
</div>
</div>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('config_financial_year'), 'financial_year', array('class' => 'control-label col-xs-2')); ?>
<div class='col-xs-2'>
<?php echo form_dropdown('financial_year', array(
'1' => $this->lang->line('config_financial_year_jan'),
'4' => $this->lang->line('config_financial_year_apr'),
'7' => $this->lang->line('config_financial_year_jul'),
'10' => $this->lang->line('config_financial_year_oct')
),
$this->config->item('financial_year'), array('class' => 'form-control input-sm'));
?>
</div>
</div>
<?php echo form_submit(array(
'name' => 'submit_form',
'id' => 'submit_form',

50
application/views/partial/daterangepicker.php
View File

@@ -36,7 +36,7 @@
"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),1,date("Y")-1));?>",
"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y")-1)-1);?>"
],
"<?php echo $this->lang->line("datepicker_this_month_last_year"); ?>": [
"<?php echo $this->lang->line("datepicker_same_month_last_year"); ?>": [
"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),1,date("Y")-1));?>",
"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m")+1,1,date("Y")-1)-1);?>"
],
@@ -52,8 +52,16 @@
"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,1,1,date("Y")-1));?>",
"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,1,1,date("Y"))-1);?>"
],
"<?php echo $this->lang->line("datepicker_this_financial_year"); ?>": [
"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,$this->config->item('financial_year'),1,date("Y")));?>",
"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),1,date("Y")+1)-1);?>"
],
"<?php echo $this->lang->line("datepicker_last_financial_year"); ?>": [
"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,$this->config->item('financial_year'),1,date("Y")-1));?>",
"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,$this->config->item('financial_year'),1,date("Y"))-1);?>"
],
"<?php echo $this->lang->line("datepicker_all_time"); ?>": [
"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,01,01,2010));?>",
"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,1,1,2010));?>",
"<?php echo date($this->config->item('dateformat'), mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1);?>"
],
},
@@ -112,51 +120,59 @@
"ranges": {
"<?php echo $this->lang->line("datepicker_today"); ?>": [
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'), mktime(0,0,0,date("m"),date("d"),date("Y")));?>",
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y"))-1);?>"
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y")));?>"
],
"<?php echo $this->lang->line("datepicker_today_last_year"); ?>": [
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,date("m"),date("d"),date("Y")-1));?>",
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y")-1)-1);?>"
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y")-1));?>"
],
"<?php echo $this->lang->line("datepicker_yesterday"); ?>": [
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,date("m"),date("d")-1,date("Y")));?>",
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d")-1,date("Y"))-1);?>"
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d")-1,date("Y")));?>"
],
"<?php echo $this->lang->line("datepicker_last_7"); ?>": [
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,date("m"),date("d")-6,date("Y")));?>",
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y"))-1);?>"
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y")));?>"
],
"<?php echo $this->lang->line("datepicker_last_30"); ?>": [
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,date("m"),date("d")-29,date("Y")));?>",
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y"))-1);?>"
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y")));?>"
],
"<?php echo $this->lang->line("datepicker_this_month"); ?>": [
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,date("m"),1,date("Y")));?>",
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m")+1,0,date("Y"))-1);?>"
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y")));?>"
],
"<?php echo $this->lang->line("datepicker_same_month_to_same_day_last_year"); ?>": [
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,date("m"),1,date("Y")-1));?>",
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y")-1)-1);?>"
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y")-1));?>"
],
"<?php echo $this->lang->line("datepicker_this_month_last_year"); ?>": [
"<?php echo $this->lang->line("datepicker_same_month_last_year"); ?>": [
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,date("m"),1,date("Y")-1));?>",
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m")+1,0,date("Y")-1)-1);?>"
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m")+1,0,date("Y")-1));?>"
],
"<?php echo $this->lang->line("datepicker_last_month"); ?>": [
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,date("m")-1,1,date("Y")));?>",
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),0,date("Y"))-1);?>"
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),0,date("Y")));?>"
],
"<?php echo $this->lang->line("datepicker_this_year"); ?>": [
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,1,1,date("Y")));?>",
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),1,date("Y")+1)-1);?>"
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m")+1,0,date("Y")));?>"
],
"<?php echo $this->lang->line("datepicker_last_year"); ?>": [
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,1,1,date("Y")-1));?>",
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,1,0,date("Y"))-1);?>"
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,12,31,date("Y")-1));?>"
],
"<?php echo $this->lang->line("datepicker_this_financial_year"); ?>": [
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,$this->config->item('financial_year'),1,date("Y")));?>",
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m")+1,0,date("Y")));?>"
],
"<?php echo $this->lang->line("datepicker_last_financial_year"); ?>": [
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,$this->config->item('financial_year'),1,date("Y")-1));?>",
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,$this->config->item('financial_year'),0,date("Y")));?>"
],
"<?php echo $this->lang->line("datepicker_all_time"); ?>": [
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,01,01,2010));?>",
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y"))-1);?>"
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(0,0,0,1,1,2010));?>",
"<?php echo date($this->config->item('dateformat')." ".$this->config->item('timeformat'),mktime(23,59,59,date("m"),date("d"),date("Y")));?>"
],
},
"locale": {
@@ -206,4 +222,4 @@
});
<?php
}
?>
?>

5
database/3.0.2_to_3.1.0.sql
View File

@@ -211,3 +211,8 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
ALTER TABLE `ospos_people`
ADD INDEX `email` (`email`);
-- add financial year start into config
INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
('financial_year','1');

3
database/database.sql
View File

@@ -93,7 +93,8 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
('date_or_time_format',''),
('customer_reward_enable',''),
('default_origin_tax_code', ''),
('cash_decimals', '2');
('cash_decimals', '2'),
('financial_year','1');
-- --------------------------------------------------------

3
database/migrate_phppos_dist.sql
View File

@@ -93,7 +93,8 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
('date_or_time_format',''),
('customer_reward_enable',''),
('default_origin_tax_code', ''),
('cash_decimals', '2');
('cash_decimals', '2'),
('financial_year','1');
-- --------------------------------------------------------

3
database/tables.sql
View File

@@ -93,7 +93,8 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
('date_or_time_format',''),
('customer_reward_enable',''),
('default_origin_tax_code', ''),
('cash_decimals', '2');
('cash_decimals', '2'),
('financial_year','1');
-- --------------------------------------------------------