[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha acqui/parcel.pl koha-tmpl/intranet-tmpl/pr... [rel_3_0]
From: |
Antoine Farnault |
Subject: |
[Koha-cvs] koha acqui/parcel.pl koha-tmpl/intranet-tmpl/pr... [rel_3_0] |
Date: |
Tue, 09 Jan 2007 09:42:40 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Antoine Farnault <toins> 07/01/09 09:42:40
Modified files:
acqui : parcel.pl
koha-tmpl/intranet-tmpl/prog/en/acqui: parcel.tmpl
Log message:
sync with dev_week.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/parcel.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.3&r2=1.3.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/parcel.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
Patches:
Index: acqui/parcel.pl
===================================================================
RCS file: /sources/koha/koha/acqui/parcel.pl,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -b -r1.3.2.3 -r1.3.2.4
--- acqui/parcel.pl 22 Dec 2006 17:17:39 -0000 1.3.2.3
+++ acqui/parcel.pl 9 Jan 2007 09:42:40 -0000 1.3.2.4
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: parcel.pl,v 1.3.2.3 2006/12/22 17:17:39 hdl Exp $
+# $Id: parcel.pl,v 1.3.2.4 2007/01/09 09:42:40 toins Exp $
#script to recieve orders
#written by address@hidden 24/2/2000
@@ -62,7 +62,7 @@
use C4::Output;
use CGI;
use C4::Interface::CGI::Output;
-
+use C4::Date;
use strict;
@@ -87,7 +87,6 @@
});
# warn "$code : $invoice : $date";
my @parcelitems=GetParcel($supplierid,$invoice,$date);
-# use Data::Dumper; warn Dumper(@parcelitems);
my $countlines = scalar @parcelitems;
my $totalprice=0;
@@ -146,7 +145,8 @@
$tototal=$tototal+$freight;
$template->param(invoice => $invoice,
- date => $date,
+ datereceived => $date,
+ formatteddatereceived =>
format_date($date),
name => $booksellers[0]->{'name'},
supplierid => $supplierid,
gst => $gst,
Index: koha-tmpl/intranet-tmpl/prog/en/acqui/parcel.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/parcel.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- koha-tmpl/intranet-tmpl/prog/en/acqui/parcel.tmpl 9 Jan 2007 08:29:27
-0000 1.1.2.2
+++ koha-tmpl/intranet-tmpl/prog/en/acqui/parcel.tmpl 9 Jan 2007 09:42:40
-0000 1.1.2.3
@@ -13,7 +13,7 @@
<div id="acqui_recieve_summary">
<p>Invoice: <!-- TMPL_VAR NAME="invoice" --></p>
<p>Received By: <!-- TMPL_VAR NAME="user" --></p>
- <p>On: <!-- TMPL_VAR NAME="date" --></p>
+ <p>On: <!-- TMPL_VAR NAME="datereceived" --></p>
</div>
<div id="acqui_recieve_recievelist">
<h2>Recieve list</h2>
@@ -32,7 +32,7 @@
<!-- TMPL_LOOP NAME="loop_received" -->
<tr>
<td><!-- TMPL_VAR NAME="basketno" --></td>
- <td><a href="orderreceive.pl?recieve=<!-- TMPL_VAR
NAME="ordernumber" -->&biblio=<!-- TMPL_VAR NAME="biblionumber"
-->&daterecieved=<!-- TMPL_VAR NAME="date" -->&invoice=<!-- TMPL_VAR
NAME="invoice" -->&gst=<!-- TMPL_VAR NAME="gst" -->&freight=<!--
TMPL_VAR NAME="freight" -->&supplierid=<!-- TMPL_VAR NAME="supplierid"
-->"><!-- TMPL_VAR NAME="title" --></a>
+ <td><a href="orderreceive.pl?recieve=<!-- TMPL_VAR
NAME="ordernumber" -->&biblio=<!-- TMPL_VAR NAME="biblionumber"
-->&daterecieved=<!-- TMPL_VAR NAME="datereceived" -->&invoice=<!--
TMPL_VAR NAME="invoice" -->&gst=<!-- TMPL_VAR NAME="gst"
-->&freight=<!-- TMPL_VAR NAME="freight" -->&supplierid=<!-- TMPL_VAR
NAME="supplierid" -->"><!-- TMPL_VAR NAME="title" --></a>
<!-- TMPL_IF NAME="isbn" --><br />ISBN: <!-- TMPL_VAR
NAME="isbn" --><!--/TMPL_IF-->
<!-- TMPL_IF NAME="author" --><br />author :<!-- TMPL_VAR
NAME="author" --><!--/TMPL_IF-->
<!-- TMPL_IF NAME="publishercode" --><br />Publisher :<!--
TMPL_VAR NAME="publishercode" --><!--/TMPL_IF-->
@@ -92,7 +92,7 @@
<tr>
<td><!-- TMPL_VAR NAME="basketno" --></td>
<td>
- <a href="orderreceive.pl?recieve=<!-- TMPL_VAR
NAME="ordernumber" -->&biblio=<!-- TMPL_VAR NAME="biblionumber"
-->&daterecieved=<!-- TMPL_VAR NAME="date" -->&invoice=<!-- TMPL_VAR
NAME="invoice" -->&gst=<!-- TMPL_VAR NAME="gst" -->&freight=<!--
TMPL_VAR NAME="freight" -->&supplierid=<!-- TMPL_VAR NAME="supplierid"
-->"><!-- TMPL_VAR NAME="title" --></a>
+ <a href="orderreceive.pl?recieve=<!-- TMPL_VAR
NAME="ordernumber" -->&biblio=<!-- TMPL_VAR NAME="biblionumber"
-->&daterecieved=<!-- TMPL_VAR NAME="datereceived" -->&invoice=<!--
TMPL_VAR NAME="invoice" -->&gst=<!-- TMPL_VAR NAME="gst"
-->&freight=<!-- TMPL_VAR NAME="freight" -->&supplierid=<!-- TMPL_VAR
NAME="supplierid" -->"><!-- TMPL_VAR NAME="title" --></a>
<!-- TMPL_IF NAME="isbn" --><br />ISBN: <!-- TMPL_VAR
NAME="isbn" --><!--/TMPL_IF-->
<!-- TMPL_IF NAME="author" --><br />author :<!-- TMPL_VAR
NAME="author" --><!--/TMPL_IF-->
<!-- TMPL_IF NAME="publishercode" --><br />Publisher :<!--
TMPL_VAR NAME="publishercode" --><!--/TMPL_IF-->
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha acqui/parcel.pl koha-tmpl/intranet-tmpl/pr... [rel_3_0],
Antoine Farnault <=