Attachment #44717 for bug #14946

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




use C4::Auth;    # get_template_and_user
use C4::Output;
use C4::Acquisition;
use C4::Dates;
use C4::Debug;
use C4::Branch;
use C4::Koha;
use Koha::DateUtils;

my $input = new CGI;
my $title                   = $input->param( 'title');

my $basketgroupname             = $input->param('basketgroupname');
my $booksellerinvoicenumber = $input->param( 'booksellerinvoicenumber' );
my $do_search               = $input->param('do_search') || 0;
my $from_placed_on          = C4::Dates->new($input->param('from'));
my $to_placed_on            = C4::Dates->new($input->param('to'));
my $budget                  = $input->param( 'budget' );
my $orderstatus             = $input->param( 'orderstatus' );
my $ordernumber             = $input->param( 'ordernumber' );
my $search_children_too     = $input->param( 'search_children_too' );
my @created_by              = $input->param('created_by');

my $from_placed_on = eval { dt_from_string( $input->param('from') ) } || dt_from_string;
my $to_placed_on   = eval { dt_from_string( $input->param('to')   ) } || dt_from_string;
unless ( $input->param('from') ) {
    # Fill the form with year-1
    $from_placed_on->subtract( years => 1 );
}

my $dbh = C4::Context->dbh;

    }
);

my ( $from_iso, $to_iso, $d );
if ( $d = $input->param('from') ) {
    $from_iso = C4::Dates->new($d)->output('iso');
}
if ( $d = $input->param('iso') ) {
    $to_iso = C4::Dates->new($d)->output('iso');
}

my $order_loop;
# If we're supplied any value then we do a search. Otherwise we don't.
if ($do_search) {

        isbn   => $isbn,
        ean   => $ean,
        name => $name,
        from_placed_on => output_pref( { dt => $from_placed_on, dateformat => 'iso', dateonly => 1 } ),
        to_placed_on   => output_pref( { dt => $to_placed_on,   dateformat => 'iso', dateonly => 1 } ),
        basket => $basket,
        booksellerinvoicenumber => $booksellerinvoicenumber,
        basketgroupname => $basketgroupname,

    );
}

my $from_date = $from_placed_on ? $from_placed_on->output('syspref') : undef;
my $to_date = $to_placed_on ? $to_placed_on->output('syspref') : undef;

my $budgetperiods = C4::Budgets::GetBudgetPeriods;
my $bp_loop = $budgetperiods;
for my $bp ( @{$budgetperiods} ) {

    basketgroupname         => $basketgroupname,
    ordernumber             => $ordernumber,
    search_children_too     => $search_children_too,
    from_placed_on          => $from_placed_on,
    to_placed_on            => $to_placed_on,
    orderstatus             => $orderstatus,
    budget_id               => $budget,
    bp_loop                 => $bp_loop,




use C4::Budgets;

use Koha::Acquisition::Bookseller;
use Koha::DateUtils;
use Koha::Misc::Files;

my $input = new CGI;

    }
}
elsif ( $op && $op eq 'mod' ) {
    my $shipmentdate       = $input->param('shipmentdate');
    my $billingdate        = $input->param('billingdate');
    my $shipmentcost       = $input->param('shipmentcost');
    my $shipment_budget_id = $input->param('shipment_budget_id');
    ModInvoice(
        invoiceid             => $invoiceid,
        shipmentdate          => output_pref( { str => $input->param('shipmentdate'), dateformat => 'iso', dateonly => 1 } ),
        billingdate           => output_pref( { str => $input->param('billingdate'),  dateformat => 'iso', dateonly => 1 } ),
        shipmentcost          => $shipmentcost,
        shipmentcost_budgetid => $shipment_budget_id
    );




use C4::Acquisition qw/GetInvoices/;
use C4::Branch qw/GetBranches/;
use C4::Budgets;
use Koha::DateUtils;

my $input = CGI->new;
my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(

my $branch           = $input->param('branch');
my $op               = $input->param('op');

$shipmentdatefrom and $shipmentdatefrom = eval { dt_from_string( $shipmentdatefrom ) };
$shipmentdateto   and $shipmentdateto   = eval { dt_from_string( $shipmentdateto ) };
$billingdatefrom  and $billingdatefrom  = eval { dt_from_string( $billingdatefrom ) };
$billingdateto    and $billingdateto    = eval { dt_from_string( $billingdateto ) };

my $invoices = [];
if ( $op and $op eq 'do_search' ) {
    my $shipmentdatefrom_iso = C4::Dates->new($shipmentdatefrom)->output('iso');
    my $shipmentdateto_iso   = C4::Dates->new($shipmentdateto)->output('iso');
    my $billingdatefrom_iso  = C4::Dates->new($billingdatefrom)->output('iso');
    my $billingdateto_iso    = C4::Dates->new($billingdateto)->output('iso');
    @{$invoices} = GetInvoices(
        invoicenumber    => $invoicenumber,
        supplierid       => $supplierid,
        shipmentdatefrom => $shipmentdatefrom ? output_pref( { str => $shipmentdatefrom, dateformat => 'iso' } ) : undef,
        shipmentdateto   => $shipmentdateto   ? output_pref( { str => $shipmentdateto,   dateformat => 'iso' } ) : undef,
        billingdatefrom  => $billingdatefrom  ? output_pref( { str => $billingdatefrom,  dateformat => 'iso' } ) : undef,
        billingdateto    => $billingdateto    ? output_pref( { str => $billingdateto,    dateformat => 'iso' } ) : undef,
        isbneanissn      => $isbneanissn,
        title            => $title,
        author           => $author,

    invoicenumber   => $invoicenumber,
    booksellerid    => $supplierid,
    suppliername    => $suppliername,
    shipmentdatefrom => $shipmentdatefrom,
    shipmentdateto   => $shipmentdateto,
    billingdatefrom => $billingdatefrom,
    billingdateto   => $billingdateto,
    isbneanissn     => $isbneanissn,




use C4::Items;
use CGI qw ( -utf8 );
use C4::Output;
use C4::Dates qw/format_date format_date_in_iso/;
use C4::Suggestions;
use C4::Reserves qw/GetReservesFromBiblionumber/;

use Koha::Acquisition::Bookseller;
use Koha::DateUtils;

use JSON;


my $booksellerid = $invoice->{booksellerid};
my $bookseller = Koha::Acquisition::Bookseller->fetch({ id => $booksellerid });
my $gst = $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
my $datereceived = C4::Dates->new();

my @orders        = @{ $invoice->{orders} };
my $countlines    = scalar @orders;

    invoiceid             => $invoice->{invoiceid},
    invoice               => $invoice->{invoicenumber},
    invoiceclosedate      => $invoice->{closedate},
    datereceived          => dt_from_string,
    invoicedatereceived   => $datereceived->output('iso'),
    formatteddatereceived => $datereceived->output(),
    name                  => $bookseller->{'name'},
    booksellerid          => $bookseller->{id},
    loop_received         => \@loop_received,




);

my $invoicenumber = $input->param('invoice');
my $shipmentdate = $input->param('shipmentdate');
my $shipmentcost = $input->param('shipmentcost');
my $shipmentcost_budgetid = $input->param('shipmentcost_budgetid');
my $shipmentdate = $input->param('shipmentdate');
$shipmentdate and $shipmentdate = output_pref({ str => $shipmentdate, dateformat => 'iso', dateonly => 1 });
}

if ( $op and $op eq 'new' ) {
    if ( C4::Context->preference('AcqWarnOnDuplicateInvoice') ) {

    dateto                   => $dateto,
    resultsperpage           => $resultsperpage,
    name                     => $bookseller->{'name'},
    shipmentdate_today       => dt_from_string,
    booksellerid             => $booksellerid,
    GST                      => C4::Context->preference('gist'),
    budgets                  => $budget_loop,

Lines 27-34 use C4::Output; Link Here

(-)a/acqui/transferorder.pl (-2 lines)
27	use C4::Context;	27	use C4::Context;
28	use C4::Acquisition;	28	use C4::Acquisition;
29	use C4::Members;	29	use C4::Members;
30	use C4::Dates qw/format_date_in_iso/;
31	use Date::Calc qw/Today/;
32		30
33	my $input = new CGI;	31	my $input = new CGI;
34	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(	32	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(

Lines 137-147 var MSG_REMOVE_PATRON = _("Remove"); Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt (-2 / +2 lines)
137	</li>	137	</li>
138		138
139	<li><label for="from">From: </label>	139	<li><label for="from">From: </label>
140	<input type="text" size="10" id="from" name="from" value="[% from_placed_on %]" class="datepickerfrom" />	140	<input type="text" size="10" id="from" name="from" value="[% from_placed_on \| $KohaDates %]" class="datepickerfrom" />
141	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>	141	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
142	</li>	142	</li>
143	<li><label for="to">To: </label>	143	<li><label for="to">To: </label>
144	<input type="text" size="10" id="to" name="to" value="[% to_placed_on %]" class="datepickerto" />	144	<input type="text" size="10" id="to" name="to" value="[% to_placed_on \| $KohaDates %]" class="datepickerto" />
145	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>	145	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
146	</li>	146	</li>
147	</ol>	147	</ol>




                          <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="invoiceactions[% invoice.invoiceid %]">
                              <li><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid %]"><i class="fa fa-search"></i> Details</a></li>
                            [% IF invoice.closedate %]
                                <li><a href="invoice.pl?op=reopen&amp;invoiceid=[% invoice.invoiceid %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% booksellerid %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]"><i class="fa fa-refresh"></i> Reopen</a></li>
                            [% ELSE %]
                                <li><a href="invoice.pl?op=close&amp;invoiceid=[% invoice.invoiceid %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% booksellerid %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]"><i class="fa fa-times-circle"></i> Close</a></li>
                            [% END %]
                            [% UNLESS invoice.receivedbiblios || invoice.receiveditems %]
                                <li><a href="invoice.pl?op=delete&amp;invoiceid=[% invoice.invoiceid %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% booksellerid %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]"><i class="fa fa-remove"></i> Delete</a></li>
                            [% END %]
                          </ul>
                      </div>

              [% IF booksellerid %]
                <li>Vendor: [% suppliername %]</li>
              [% END %]
              [% IF shipmentdatefrom %]
                <li>Shipment date:
                [% IF shipmentdateto %]
                  From [% shipmentdatefrom | $KohaDates %]
                  To [% shipmentdateto | $KohaDates %]
                [% ELSE %]
                  All since [% shipmentdatefrom | $KohaDates %]
                [% END %]
                </li>
              [% ELSE %]
                [% IF shipmentdateto %]
                  <li>Shipment date:
                    All until [% shipmentdateto | $KohaDates %]
                  </li>
                [% END %]
              [% END %]
              [% IF billingdatefrom %]
                <li>Billing date:
                [% IF billingdateto %]
                  From [% billingdatefrom | $KohaDates %]
                  To [% billingdateto | $KohaDates %]
                [% ELSE %]
                  All since [% billingdatefrom | $KohaDates %]
                [% END %]
                </li>
              [% ELSE %]
                [% IF billingdateto %]
                  <li>Billing date:
                    All until [% billingdateto | $KohaDates %]
                  </li>
                [% END %]
              [% END %]

              <ol>
                <li>
                  <label for="shipmentdatefrom">From:</label>
                  <input type="text" id="shipmentdatefrom" name="shipmentdatefrom" size="10" value="[% shipmentdatefrom | $KohaDates %]" class="datepicker" />
                </li>
                <li>
                  <label for="shipmentdateto">To:</label>
                  <input type="text" id="shipmentdateto" name="shipmentdateto" size="10" value="[% shipmentdateto | $KohaDates %]" class="datepicker" />
                </li>
              </ol>
            </fieldset>

              <ol>
                <li>
                  <label for="billingdatefrom">From:</label>
                  <input type="text" id="billingdatefrom" name="billingdatefrom" size="10" value="[% billingdatefrom | $KohaDates %]" class="datepicker" />
                </li>
                <li>
                  <label for="billingdateto">To:</label>
                  <input type="text" id="billingdateto" name="billingdateto" size="10" value="[% billingdateto | $KohaDates %]" class="datepicker" />
                </li>
              </ol>
            </fieldset>




[% USE Koha %]
[% USE KohaDates %]
[% USE Price %]
[% USE currency = format('%.2f') -%]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( date ) %]
            Receipt summary for [% name %] [% IF ( invoice ) %]invoice [% invoice %][% END %] on [% datereceived | $KohaDates %][% ELSE %]Receive orders from [% name %][% END %]</title>
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
[% INCLUDE 'doc-head-close.inc' %]
[% INCLUDE 'datatables.inc' %]

[% INCLUDE 'acquisitions-search.inc' %]

<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;
    [% IF datereceived %]
        Receipt summary for <i>[% name %]</i>
        [% IF ( invoice ) %]
            <i>[ [% invoice %] ]</i>
        [% END %]
        on <i>[% datereceived | $KohaDates %]</i>
    [% ELSE %]
        Receive orders from [% name %]
    [% END %]

	</div>
	[% END %]
    <h1>
        [% IF datereceived %]
            Receipt summary for <i>[% name %]</i> [% IF ( invoice ) %] <i> [ [% invoice %] ] </i>[% END %] on <i>[% datereceived | $KohaDates %]</i>
        [% ELSE %]
            Receive orders from [% name %]
        [% END %]


[% UNLESS no_orders_to_display %]
<div id="acqui_receive_summary">
<p><strong>Invoice number:</strong> [% invoice %] <strong>Received by:</strong> [% loggedinusername %] <strong>On:</strong> [% datereceived | $KohaDates %]</p>
</div>
[% UNLESS (invoiceclosedate) %]
  <div id="acqui_receive_search">

Lines 172-178 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt (-2 / +1 lines)
172	</li> -->	172	</li> -->
173	<li>	173	<li>
174	<label for="shipmentdate">Shipment date: </label>	174	<label for="shipmentdate">Shipment date: </label>
175	<input type="text" id="shipmentdate" name="shipmentdate" maxlength="10" size="10" value="[% shipmentdate_today %]" class="datepicker" />	175	<input type="text" id="shipmentdate" name="shipmentdate" maxlength="10" size="10" value="[% shipmentdate_today \| $KohaDates %]" class="datepicker" />
176	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>	176	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
177	</li>	177	</li>
178	<li>	178	<li>
179	-

Return to bug 14946

Lines 100-111 our ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( Link Here

(-)a/acqui/parcels.pl (-5 / +3 lines)
100	);	100	);
101		101
102	my $invoicenumber = $input->param('invoice');	102	my $invoicenumber = $input->param('invoice');
103	my $shipmentdate = $input->param('shipmentdate');
104	my $shipmentcost = $input->param('shipmentcost');	103	my $shipmentcost = $input->param('shipmentcost');
105	my $shipmentcost_budgetid = $input->param('shipmentcost_budgetid');	104	my $shipmentcost_budgetid = $input->param('shipmentcost_budgetid');
106	if($shipmentdate) {	105	my $shipmentdate = $input->param('shipmentdate');
107	$shipmentdate = C4::Dates->new($shipmentdate)->output('iso');	106	$shipmentdate and $shipmentdate = output_pref({ str => $shipmentdate, dateformat => 'iso', dateonly => 1 });
108	}
109		107
110	if ( $op and $op eq 'new' ) {	108	if ( $op and $op eq 'new' ) {
111	if ( C4::Context->preference('AcqWarnOnDuplicateInvoice') ) {	109	if ( C4::Context->preference('AcqWarnOnDuplicateInvoice') ) {
Lines 206-212 $template->param( Link Here
206	dateto => $dateto,	204	dateto => $dateto,
207	resultsperpage => $resultsperpage,	205	resultsperpage => $resultsperpage,
208	name => $bookseller->{'name'},	206	name => $bookseller->{'name'},
209	shipmentdate_today => C4::Dates->new()->output(),	207	shipmentdate_today => dt_from_string,
210	booksellerid => $booksellerid,	208	booksellerid => $booksellerid,
211	GST => C4::Context->preference('gist'),	209	GST => C4::Context->preference('gist'),
212	budgets => $budget_loop,	210	budgets => $budget_loop,

Lines 153-164 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt (-14 / +30 lines)
153	<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="invoiceactions[% invoice.invoiceid %]">	153	<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="invoiceactions[% invoice.invoiceid %]">
154	<li><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid %]"><i class="fa fa-search"></i> Details</a></li>	154	<li><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid %]"><i class="fa fa-search"></i> Details</a></li>
155	[% IF invoice.closedate %]	155	[% IF invoice.closedate %]
156	<li><a href="invoice.pl?op=reopen&invoiceid=[% invoice.invoiceid %]&referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% booksellerid %]%26billingdatefrom=[% billingdatefrom %]%26billingdateto=[% billingdateto %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]"><i class="fa fa-refresh"></i> Reopen</a></li>	156	<li><a href="invoice.pl?op=reopen&invoiceid=[% invoice.invoiceid %]&referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% booksellerid %]%26shipmentdatefrom=[% shipmentdatefrom \| $KohaDates %]%26shipmentdateto=[% shipmentdateto \| $KohaDates %]%26billingdatefrom=[% billingdatefrom \| $KohaDates %]%26billingdateto=[% billingdateto \| $KohaDates %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]"><i class="fa fa-refresh"></i> Reopen</a></li>
157	[% ELSE %]	157	[% ELSE %]
158	<li><a href="invoice.pl?op=close&invoiceid=[% invoice.invoiceid %]&referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% booksellerid %]%26billingdatefrom=[% billingdatefrom %]%26billingdateto=[% billingdateto %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]"><i class="fa fa-times-circle"></i> Close</a></li>	158	<li><a href="invoice.pl?op=close&invoiceid=[% invoice.invoiceid %]&referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% booksellerid %]%26shipmentdatefrom=[% shipmentdatefrom \| $KohaDates %]%26shipmentdateto=[% shipmentdateto \| $KohaDates %]%26billingdatefrom=[% billingdatefrom \| $KohaDates %]%26billingdateto=[% billingdateto \| $KohaDates %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]"><i class="fa fa-times-circle"></i> Close</a></li>
159	[% END %]	159	[% END %]
160	[% UNLESS invoice.receivedbiblios \|\| invoice.receiveditems %]	160	[% UNLESS invoice.receivedbiblios \|\| invoice.receiveditems %]
161	<li><a href="invoice.pl?op=delete&invoiceid=[% invoice.invoiceid %]&referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% booksellerid %]%26billingdatefrom=[% billingdatefrom %]%26billingdateto=[% billingdateto %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]"><i class="fa fa-remove"></i> Delete</a></li>	161	<li><a href="invoice.pl?op=delete&invoiceid=[% invoice.invoiceid %]&referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% booksellerid %]%26shipmentdatefrom=[% shipmentdatefrom \| $KohaDates %]%26shipmentdateto=[% shipmentdateto \| $KohaDates %]%26billingdatefrom=[% billingdatefrom \| $KohaDates %]%26billingdateto=[% billingdateto \| $KohaDates %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]"><i class="fa fa-remove"></i> Delete</a></li>
162	[% END %]	162	[% END %]
163	</ul>	163	</ul>
164	</div>	164	</div>
Lines 214-232 $(document).ready(function() { Link Here
214	[% IF booksellerid %]	214	[% IF booksellerid %]
215	<li>Vendor: [% suppliername %]</li>	215	<li>Vendor: [% suppliername %]</li>
216	[% END %]	216	[% END %]
217	[% IF ( billingdatefrom ) %]	217	[% IF shipmentdatefrom %]
		218	<li>Shipment date:
		219	[% IF shipmentdateto %]
		220	From [% shipmentdatefrom \| $KohaDates %]
		221	To [% shipmentdateto \| $KohaDates %]
		222	[% ELSE %]
		223	All since [% shipmentdatefrom \| $KohaDates %]
		224	[% END %]
		225	</li>
		226	[% ELSE %]
		227	[% IF shipmentdateto %]
		228	<li>Shipment date:
		229	All until [% shipmentdateto \| $KohaDates %]
		230	</li>
		231	[% END %]
		232	[% END %]
		233	[% IF billingdatefrom %]
218	<li>Billing date:	234	<li>Billing date:
219	[% IF ( billingdateto ) %]	235	[% IF billingdateto %]
220	From [% billingdatefrom %]	236	From [% billingdatefrom \| $KohaDates %]
221	To [% billingdateto %]	237	To [% billingdateto \| $KohaDates %]
222	[% ELSE %]	238	[% ELSE %]
223	All since [% billingdatefrom %]	239	All since [% billingdatefrom \| $KohaDates %]
224	[% END %]	240	[% END %]
225	</li>	241	</li>
226	[% ELSE %]	242	[% ELSE %]
227	[% IF ( billingdateto ) %]	243	[% IF billingdateto %]
228	<li>Billing date:	244	<li>Billing date:
229	All until [% billingdateto %]	245	All until [% billingdateto \| $KohaDates %]
230	</li>	246	</li>
231	[% END %]	247	[% END %]
232	[% END %]	248	[% END %]
Lines 284-294 $(document).ready(function() { Link Here
284	<ol>	300	<ol>
285	<li>	301	<li>
286	<label for="shipmentdatefrom">From:</label>	302	<label for="shipmentdatefrom">From:</label>
287	<input type="text" id="shipmentdatefrom" name="shipmentdatefrom" size="10" value="[% shipmentdatefrom %]" class="datepicker" />	303	<input type="text" id="shipmentdatefrom" name="shipmentdatefrom" size="10" value="[% shipmentdatefrom \| $KohaDates %]" class="datepicker" />
288	</li>	304	</li>
289	<li>	305	<li>
290	<label for="shipmentdateto">To:</label>	306	<label for="shipmentdateto">To:</label>
291	<input type="text" id="shipmentdateto" name="shipmentdateto" size="10" value="[% shipmentdateto %]" class="datepicker" />	307	<input type="text" id="shipmentdateto" name="shipmentdateto" size="10" value="[% shipmentdateto \| $KohaDates %]" class="datepicker" />
292	</li>	308	</li>
293	</ol>	309	</ol>
294	</fieldset>	310	</fieldset>
Lines 299-309 $(document).ready(function() { Link Here
299	<ol>	315	<ol>
300	<li>	316	<li>
301	<label for="billingdatefrom">From:</label>	317	<label for="billingdatefrom">From:</label>
302	<input type="text" id="billingdatefrom" name="billingdatefrom" size="10" value="[% billingdatefrom %]" class="datepicker" />	318	<input type="text" id="billingdatefrom" name="billingdatefrom" size="10" value="[% billingdatefrom \| $KohaDates %]" class="datepicker" />
303	</li>	319	</li>
304	<li>	320	<li>
305	<label for="billingdateto">To:</label>	321	<label for="billingdateto">To:</label>
306	<input type="text" id="billingdateto" name="billingdateto" size="10" value="[% billingdateto %]" class="datepicker" />	322	<input type="text" id="billingdateto" name="billingdateto" size="10" value="[% billingdateto \| $KohaDates %]" class="datepicker" />
307	</li>	323	</li>
308	</ol>	324	</ol>
309	</fieldset>	325	</fieldset>

Lines 55-64 use CGI qw ( -utf8 ); Link Here

(-)a/acqui/histsearch.pl (-22 / +10 lines)
55	use C4::Auth; # get_template_and_user	55	use C4::Auth; # get_template_and_user
56	use C4::Output;	56	use C4::Output;
57	use C4::Acquisition;	57	use C4::Acquisition;
58	use C4::Dates;
59	use C4::Debug;	58	use C4::Debug;
60	use C4::Branch;	59	use C4::Branch;
61	use C4::Koha;	60	use C4::Koha;
		61	use Koha::DateUtils;
62		62
63	my $input = new CGI;	63	my $input = new CGI;
64	my $title = $input->param( 'title');	64	my $title = $input->param( 'title');
Lines 70-87 my $basket = $input->param( 'basket' ); Link Here
70	my $basketgroupname = $input->param('basketgroupname');	70	my $basketgroupname = $input->param('basketgroupname');
71	my $booksellerinvoicenumber = $input->param( 'booksellerinvoicenumber' );	71	my $booksellerinvoicenumber = $input->param( 'booksellerinvoicenumber' );
72	my $do_search = $input->param('do_search') \|\| 0;	72	my $do_search = $input->param('do_search') \|\| 0;
73	my $from_placed_on = C4::Dates->new($input->param('from'));
74	my $to_placed_on = C4::Dates->new($input->param('to'));
75	my $budget = $input->param( 'budget' );	73	my $budget = $input->param( 'budget' );
76	my $orderstatus = $input->param( 'orderstatus' );	74	my $orderstatus = $input->param( 'orderstatus' );
77	my $ordernumber = $input->param( 'ordernumber' );	75	my $ordernumber = $input->param( 'ordernumber' );
78	my $search_children_too = $input->param( 'search_children_too' );	76	my $search_children_too = $input->param( 'search_children_too' );
79	my @created_by = $input->param('created_by');	77	my @created_by = $input->param('created_by');
80		78
81	if ( not $input->param('from') ) {	79	my $from_placed_on = eval { dt_from_string( $input->param('from') ) } \|\| dt_from_string;
82	# FIXME Dirty but we can't sent a Date::Calc to C4::Dates ?	80	my $to_placed_on = eval { dt_from_string( $input->param('to') ) } \|\| dt_from_string;
83	# We would use a function like Add_Delta_YM(-1, 0, 0);	81	unless ( $input->param('from') ) {
84	$$from_placed_on{dmy_arrayref}[5] -= 1;	82	# Fill the form with year-1
		83	$from_placed_on->subtract( years => 1 );
85	}	84	}
86		85
87	my $dbh = C4::Context->dbh;	86	my $dbh = C4::Context->dbh;
Lines 96-109 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
96	}	95	}
97	);	96	);
98		97
99	my ( $from_iso, $to_iso, $d );
100	if ( $d = $input->param('from') ) {
101	$from_iso = C4::Dates->new($d)->output('iso');
102	}
103	if ( $d = $input->param('iso') ) {
104	$to_iso = C4::Dates->new($d)->output('iso');
105	}
106
107	my $order_loop;	98	my $order_loop;
108	# If we're supplied any value then we do a search. Otherwise we don't.	99	# If we're supplied any value then we do a search. Otherwise we don't.
109	if ($do_search) {	100	if ($do_search) {
Lines 113-120 if ($do_search) { Link Here
113	isbn => $isbn,	104	isbn => $isbn,
114	ean => $ean,	105	ean => $ean,
115	name => $name,	106	name => $name,
116	from_placed_on => $from_iso,	107	from_placed_on => output_pref( { dt => $from_placed_on, dateformat => 'iso', dateonly => 1 } ),
117	to_placed_on => $to_iso,	108	to_placed_on => output_pref( { dt => $to_placed_on, dateformat => 'iso', dateonly => 1 } ),
118	basket => $basket,	109	basket => $basket,
119	booksellerinvoicenumber => $booksellerinvoicenumber,	110	booksellerinvoicenumber => $booksellerinvoicenumber,
120	basketgroupname => $basketgroupname,	111	basketgroupname => $basketgroupname,
Lines 126-134 if ($do_search) { Link Here
126	);	117	);
127	}	118	}
128		119
129	my $from_date = $from_placed_on ? $from_placed_on->output('syspref') : undef;
130	my $to_date = $to_placed_on ? $to_placed_on->output('syspref') : undef;
131
132	my $budgetperiods = C4::Budgets::GetBudgetPeriods;	120	my $budgetperiods = C4::Budgets::GetBudgetPeriods;
133	my $bp_loop = $budgetperiods;	121	my $bp_loop = $budgetperiods;
134	for my $bp ( @{$budgetperiods} ) {	122	for my $bp ( @{$budgetperiods} ) {
Lines 152-159 $template->param( Link Here
152	basketgroupname => $basketgroupname,	140	basketgroupname => $basketgroupname,
153	ordernumber => $ordernumber,	141	ordernumber => $ordernumber,
154	search_children_too => $search_children_too,	142	search_children_too => $search_children_too,
155	from_placed_on => $from_date,	143	from_placed_on => $from_placed_on,
156	to_placed_on => $to_date,	144	to_placed_on => $to_placed_on,
157	orderstatus => $orderstatus,	145	orderstatus => $orderstatus,
158	budget_id => $budget,	146	budget_id => $budget,
159	bp_loop => $bp_loop,	147	bp_loop => $bp_loop,

Lines 36-41 use C4::Acquisition; Link Here

(-)a/acqui/invoice.pl (-4 / +3 lines)
36	use C4::Budgets;	36	use C4::Budgets;
37		37
38	use Koha::Acquisition::Bookseller;	38	use Koha::Acquisition::Bookseller;
		39	use Koha::DateUtils;
39	use Koha::Misc::Files;	40	use Koha::Misc::Files;
40		41
41	my $input = new CGI;	42	my $input = new CGI;
Lines 76-89 elsif ( $op && $op eq 'reopen' ) { Link Here
76	}	77	}
77	}	78	}
78	elsif ( $op && $op eq 'mod' ) {	79	elsif ( $op && $op eq 'mod' ) {
79	my $shipmentdate = $input->param('shipmentdate');
80	my $billingdate = $input->param('billingdate');
81	my $shipmentcost = $input->param('shipmentcost');	80	my $shipmentcost = $input->param('shipmentcost');
82	my $shipment_budget_id = $input->param('shipment_budget_id');	81	my $shipment_budget_id = $input->param('shipment_budget_id');
83	ModInvoice(	82	ModInvoice(
84	invoiceid => $invoiceid,	83	invoiceid => $invoiceid,
85	shipmentdate => C4::Dates->new($shipmentdate)->output("iso"),	84	shipmentdate => output_pref( { str => $input->param('shipmentdate'), dateformat => 'iso', dateonly => 1 } ),
86	billingdate => C4::Dates->new($billingdate)->output("iso"),	85	billingdate => output_pref( { str => $input->param('billingdate'), dateformat => 'iso', dateonly => 1 } ),
87	shipmentcost => $shipmentcost,	86	shipmentcost => $shipmentcost,
88	shipmentcost_budgetid => $shipment_budget_id	87	shipmentcost_budgetid => $shipment_budget_id
89	);	88	);

Lines 36-41 use C4::Output; Link Here

(-)a/acqui/invoices.pl (-8 / +12 lines)
36	use C4::Acquisition qw/GetInvoices/;	36	use C4::Acquisition qw/GetInvoices/;
37	use C4::Branch qw/GetBranches/;	37	use C4::Branch qw/GetBranches/;
38	use C4::Budgets;	38	use C4::Budgets;
		39	use Koha::DateUtils;
39		40
40	my $input = CGI->new;	41	my $input = CGI->new;
41	my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(	42	my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
Lines 63-81 my $publicationyear = $input->param('publicationyear'); Link Here
63	my $branch = $input->param('branch');	64	my $branch = $input->param('branch');
64	my $op = $input->param('op');	65	my $op = $input->param('op');
65		66
		67	$shipmentdatefrom and $shipmentdatefrom = eval { dt_from_string( $shipmentdatefrom ) };
		68	$shipmentdateto and $shipmentdateto = eval { dt_from_string( $shipmentdateto ) };
		69	$billingdatefrom and $billingdatefrom = eval { dt_from_string( $billingdatefrom ) };
		70	$billingdateto and $billingdateto = eval { dt_from_string( $billingdateto ) };
		71
66	my $invoices = [];	72	my $invoices = [];
67	if ( $op and $op eq 'do_search' ) {	73	if ( $op and $op eq 'do_search' ) {
68	my $shipmentdatefrom_iso = C4::Dates->new($shipmentdatefrom)->output('iso');
69	my $shipmentdateto_iso = C4::Dates->new($shipmentdateto)->output('iso');
70	my $billingdatefrom_iso = C4::Dates->new($billingdatefrom)->output('iso');
71	my $billingdateto_iso = C4::Dates->new($billingdateto)->output('iso');
72	@{$invoices} = GetInvoices(	74	@{$invoices} = GetInvoices(
73	invoicenumber => $invoicenumber,	75	invoicenumber => $invoicenumber,
74	supplierid => $supplierid,	76	supplierid => $supplierid,
75	shipmentdatefrom => $shipmentdatefrom_iso,	77	shipmentdatefrom => $shipmentdatefrom ? output_pref( { str => $shipmentdatefrom, dateformat => 'iso' } ) : undef,
76	shipmentdateto => $shipmentdateto_iso,	78	shipmentdateto => $shipmentdateto ? output_pref( { str => $shipmentdateto, dateformat => 'iso' } ) : undef,
77	billingdatefrom => $billingdatefrom_iso,	79	billingdatefrom => $billingdatefrom ? output_pref( { str => $billingdatefrom, dateformat => 'iso' } ) : undef,
78	billingdateto => $billingdateto_iso,	80	billingdateto => $billingdateto ? output_pref( { str => $billingdateto, dateformat => 'iso' } ) : undef,
79	isbneanissn => $isbneanissn,	81	isbneanissn => $isbneanissn,
80	title => $title,	82	title => $title,
81	author => $author,	83	author => $author,
Lines 135-140 $template->param( Link Here
135	invoicenumber => $invoicenumber,	137	invoicenumber => $invoicenumber,
136	booksellerid => $supplierid,	138	booksellerid => $supplierid,
137	suppliername => $suppliername,	139	suppliername => $suppliername,
		140	shipmentdatefrom => $shipmentdatefrom,
		141	shipmentdateto => $shipmentdateto,
138	billingdatefrom => $billingdatefrom,	142	billingdatefrom => $billingdatefrom,
139	billingdateto => $billingdateto,	143	billingdateto => $billingdateto,
140	isbneanissn => $isbneanissn,	144	isbneanissn => $isbneanissn,

Lines 64-74 use C4::Biblio; Link Here

(-)a/acqui/parcel.pl (-5 / +2 lines)
64	use C4::Items;	64	use C4::Items;
65	use CGI qw ( -utf8 );	65	use CGI qw ( -utf8 );
66	use C4::Output;	66	use C4::Output;
67	use C4::Dates qw/format_date format_date_in_iso/;
68	use C4::Suggestions;	67	use C4::Suggestions;
69	use C4::Reserves qw/GetReservesFromBiblionumber/;	68	use C4::Reserves qw/GetReservesFromBiblionumber/;
70		69
71	use Koha::Acquisition::Bookseller;	70	use Koha::Acquisition::Bookseller;
		71	use Koha::DateUtils;
72		72
73	use JSON;	73	use JSON;
74		74
Lines 112-118 unless( $invoiceid and $invoice->{invoiceid} ) { Link Here
112	my $booksellerid = $invoice->{booksellerid};	112	my $booksellerid = $invoice->{booksellerid};
113	my $bookseller = Koha::Acquisition::Bookseller->fetch({ id => $booksellerid });	113	my $bookseller = Koha::Acquisition::Bookseller->fetch({ id => $booksellerid });
114	my $gst = $bookseller->{gstrate} // C4::Context->preference("gist") // 0;	114	my $gst = $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
115	my $datereceived = C4::Dates->new();
116		115
117	my @orders = @{ $invoice->{orders} };	116	my @orders = @{ $invoice->{orders} };
118	my $countlines = scalar @orders;	117	my $countlines = scalar @orders;
Lines 282-290 $template->param( Link Here
282	invoiceid => $invoice->{invoiceid},	281	invoiceid => $invoice->{invoiceid},
283	invoice => $invoice->{invoicenumber},	282	invoice => $invoice->{invoicenumber},
284	invoiceclosedate => $invoice->{closedate},	283	invoiceclosedate => $invoice->{closedate},
285	datereceived => $datereceived->output('iso'),	284	datereceived => dt_from_string,
286	invoicedatereceived => $datereceived->output('iso'),
287	formatteddatereceived => $datereceived->output(),
288	name => $bookseller->{'name'},	285	name => $bookseller->{'name'},
289	booksellerid => $bookseller->{id},	286	booksellerid => $bookseller->{id},
290	loop_received => \@loop_received,	287	loop_received => \@loop_received,

Lines 1-9 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-6 / +7 lines)
1	[% USE Koha %]	1	[% USE Koha %]
		2	[% USE KohaDates %]
2	[% USE Price %]	3	[% USE Price %]
3	[% USE currency = format('%.2f') -%]	4	[% USE currency = format('%.2f') -%]
4	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( date ) %]	6	<title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( date ) %]
6	Receipt summary for [% name %] [% IF ( invoice ) %]invoice [% invoice %][% END %] on [% formatteddatereceived %][% ELSE %]Receive orders from [% name %][% END %]</title>	7	Receipt summary for [% name %] [% IF ( invoice ) %]invoice [% invoice %][% END %] on [% datereceived \| $KohaDates %][% ELSE %]Receive orders from [% name %][% END %]</title>
7	<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />	8	<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
8	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]
9	[% INCLUDE 'datatables.inc' %]	10	[% INCLUDE 'datatables.inc' %]
Lines 133-144 Link Here
133	[% INCLUDE 'acquisitions-search.inc' %]	134	[% INCLUDE 'acquisitions-search.inc' %]
134		135
135	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;	136	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;
136	[% IF ( datereceived ) %]	137	[% IF datereceived %]
137	Receipt summary for <i>[% name %]</i>	138	Receipt summary for <i>[% name %]</i>
138	[% IF ( invoice ) %]	139	[% IF ( invoice ) %]
139	<i>[ [% invoice %] ]</i>	140	<i>[ [% invoice %] ]</i>
140	[% END %]	141	[% END %]
141	on <i>[% formatteddatereceived %]</i>	142	on <i>[% datereceived \| $KohaDates %]</i>
142	[% ELSE %]	143	[% ELSE %]
143	Receive orders from [% name %]	144	Receive orders from [% name %]
144	[% END %]	145	[% END %]
Lines 160-167 Link Here
160	</div>	161	</div>
161	[% END %]	162	[% END %]
162	<h1>	163	<h1>
163	[% IF ( datereceived ) %]	164	[% IF datereceived %]
164	Receipt summary for <i>[% name %]</i> [% IF ( invoice ) %] <i> [ [% invoice %] ] </i>[% END %] on <i>[% formatteddatereceived %]</i>	165	Receipt summary for <i>[% name %]</i> [% IF ( invoice ) %] <i> [ [% invoice %] ] </i>[% END %] on <i>[% datereceived \| $KohaDates %]</i>
165	[% ELSE %]	166	[% ELSE %]
166	Receive orders from [% name %]	167	Receive orders from [% name %]
167	[% END %]	168	[% END %]
Lines 204-210 Link Here
204		205
205	[% UNLESS no_orders_to_display %]	206	[% UNLESS no_orders_to_display %]
206	<div id="acqui_receive_summary">	207	<div id="acqui_receive_summary">
207	<p><strong>Invoice number:</strong> [% invoice %] <strong>Received by:</strong> [% loggedinusername %] <strong>On:</strong> [% formatteddatereceived %]</p>	208	<p><strong>Invoice number:</strong> [% invoice %] <strong>Received by:</strong> [% loggedinusername %] <strong>On:</strong> [% datereceived \| $KohaDates %]</p>
208	</div>	209	</div>
209	[% UNLESS (invoiceclosedate) %]	210	[% UNLESS (invoiceclosedate) %]
210	<div id="acqui_receive_search">	211	<div id="acqui_receive_search">