Attachment #102913 for bug #25139

View | Details | Raw Unified | Return to bug 25139
Collapse All | Expand All

Lines 126-134 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt (-2 / +2 lines)
126	<ol>	126	<ol>
127	<li>	127	<li>
128	<label for="trange_f">From: </label>	128	<label for="trange_f">From: </label>
129	<input type="text" size="10" id="from" name="trange_f" value="[% trange_f \| html %]"/>	129	<input type="text" size="10" id="from" class="datepickerfrom" name="trange_f" value="[% trange_f \| html %]"/>
130	<label class="inline" for="trange_t">To: </label>	130	<label class="inline" for="trange_t">To: </label>
131	<input size="10" id="to" name="trange_t" value="[% trange_t \| $KohaDates with_hours => 0%]" type="text"/>	131	<input type="text" size="10" id="to" class="datepickerto" name="trange_t" value="[% trange_t \| html %]" />
132	<span class="hint">[% INCLUDE 'date-format.inc' %]</span>	132	<span class="hint">[% INCLUDE 'date-format.inc' %]</span>
133	</li>	133	</li>
134	</ol>	134	</ol>




        $input->param('trange_t') ? $input->param('trange_t')
      : $last_cashup              ? $last_cashup->timestamp
      :                             '';
    my $end               = dt_from_string($transactions_range_to);

    if ($transactions_range_from) {
        $template->param( trange_f => $transactions_range_from );

        my $dtf               = $schema->storage->datetime_parser;
        my $start             = dt_from_string($transactions_range_from);
        my $end               = dt_from_string($transactions_range_to);
        my $past_accountlines = Koha::Account::Lines->search(
            {
                register_id => $registerid,

            }
        );
        $template->param( past_accountlines => $past_accountlines );
        $template->param( trange_f => output_pref({dt => $start, dateonly => 1}));
    }
    $template->param( trange_t => output_pref({dt => $end, dateonly => 1}));

    my $op = $input->param('op') // '';
    if ( $op eq 'cashup' ) {
- 

Return to bug 25139

Lines 78-90 else { Link Here

(-)a/pos/register.pl (-4 / +4 lines)
78	$input->param('trange_t') ? $input->param('trange_t')	78	$input->param('trange_t') ? $input->param('trange_t')
79	: $last_cashup ? $last_cashup->timestamp	79	: $last_cashup ? $last_cashup->timestamp
80	: '';	80	: '';
81	$template->param( trange_t => $transactions_range_to );	81	my $end = dt_from_string($transactions_range_to);
		82
82	if ($transactions_range_from) {	83	if ($transactions_range_from) {
83	$template->param( trange_f => $transactions_range_from );
84		84
85	my $dtf = $schema->storage->datetime_parser;	85	my $dtf = $schema->storage->datetime_parser;
86	my $start = dt_from_string($transactions_range_from);	86	my $start = dt_from_string($transactions_range_from);
87	my $end = dt_from_string($transactions_range_to);
88	my $past_accountlines = Koha::Account::Lines->search(	87	my $past_accountlines = Koha::Account::Lines->search(
89	{	88	{
90	register_id => $registerid,	89	register_id => $registerid,
Lines 97-103 else { Link Here
97	}	96	}
98	);	97	);
99	$template->param( past_accountlines => $past_accountlines );	98	$template->param( past_accountlines => $past_accountlines );
		99	$template->param( trange_f => output_pref({dt => $start, dateonly => 1}));
100	}	100	}
		101	$template->param( trange_t => output_pref({dt => $end, dateonly => 1}));
101		102
102	my $op = $input->param('op') // '';	103	my $op = $input->param('op') // '';
103	if ( $op eq 'cashup' ) {	104	if ( $op eq 'cashup' ) {
104	-