From cbfcffc4f72c5a0f1c7ce47329df31618c05f4e8 Mon Sep 17 00:00:00 2001 From: oleonard Date: Tue, 7 Mar 2006 16:56:04 +0000 Subject: [PATCH] Synching with default template --- .../intranet-tmpl/npl/en/acqui/order.tmpl | 2 +- .../intranet-tmpl/npl/en/acqui/recieve.tmpl | 148 +++++++++++------- .../npl/en/acqui/recieveorder.tmpl | 103 +++++++++--- .../intranet-tmpl/npl/en/acqui/supplier.tmpl | 123 ++++++++++++++- 4 files changed, 292 insertions(+), 84 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui/order.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui/order.tmpl index 2432b92191..da226de7f0 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/acqui/order.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/acqui/order.tmpl @@ -20,7 +20,7 @@ ">Receive - "> + &op=display">
diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui/recieve.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui/recieve.tmpl index f0d1ee38f4..5ca0659b3a 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/acqui/recieve.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/acqui/recieve.tmpl @@ -4,71 +4,103 @@
-

Receipt Summary for : , Invoice

+

+ Receipt Summary for Invoice +

+
  • Invoice:
  • Received By:
  • Date:
- -
-" /> -" /> -" /> -" /> - -Search ISBN or Title: - - -
-
- - - - - - - - - - - + +

Items in parcel

+
+ bibliographic record(s) received +
+
BasketISBNTitleAuthorActualP&PQtyTotal
- - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - -
&biblio=&invoice=&gst=&freight=&id=">$ $BasketISBNTitleAuthorEst. costQty orderedP&PActualQtyTotal
   Subtotals$$
- HELP -

- The total at the bottom of the page should be within a few cents of the total for the invoice.

-
GST$
 TOTAL$
+ + + + + &biblio=&invoice=&gst=&freight=&supplierid=&catview=yes"> + + + +   + + + + + + +   +   +   +   +   +   +   +   +   + + + + +

HELP

+

The total at the bottom of the page should be within a few cents of the total for the invoice.

+ + GST + + + + TOTAL + + + + +
+

Pending orders

+ + "> + "> + "> + "> + + Search ISBN or Title: + +
+ + + + + + + + + + + "> + + + + + + +
BasketISBNTitleAuthor
&biblio=&invoice=&gst=&freight=&supplierid=">
+
diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui/recieveorder.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui/recieveorder.tmpl index b8704dd8f1..81bfb3704b 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/acqui/recieveorder.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/acqui/recieveorder.tmpl @@ -3,28 +3,91 @@
-

Receive Orders From Supplier

-
-" /> -
- - - - - +

Receive Orders From Supplier ">

+ +

parcels found

+ + +
+ + + +
Supplier Invoice Information
Supplier Invoice Number -
+ + - - - + + + - - - - -
NumberCodeDate ReceivedItem CountBiblio countItems expected
GST -
 " />" />From :" />

To :" />

 Sort by :
+Results per page : +
+
Freight -
+ + + + + &datereceived=&code="> + + + + + + + + + + + + + + + + + +
+

Receive a new Parcel

+
+ + + + + + + + + +
" /> +
+

+ +
+
+ +
diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui/supplier.tmpl index 1c27bea770..e3802846af 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/acqui/supplier.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/acqui/supplier.tmpl @@ -2,8 +2,9 @@ -
- +
+ + " /> @@ -12,7 +13,7 @@

Add supplier

-
+
Company Details
@@ -46,7 +47,7 @@
-
+
@@ -84,7 +85,7 @@
Contact Details
-
+
@@ -150,6 +151,118 @@ + + + +

Information for :

+" /> + +" /> + +" /> + +
+
Current Status
+ + + + + + + +
Company Details
+ Company Name: + +
+ Postal Address: + +
+ Physical Address: + +
+ Phone: + +
+ Fax: + +
+ Website: + +
+ + + + + + + + + +
Contact Dtails
+ Contact Name: + +
+ Position: + +
+ Phone: + +
+ Alternative phone: + +
+ Fax: + +
+ E-mail: + +
+ Notes: + +
+ + + +
Current Status
+ Supplier is: + + Active + + Inactive + +
+ + + + + + + + + +
Ordering Information
+ Publishers and Imprints: + +
+ List Prices are: +
+ Invoice Prices are: +
+ GST Registered: + YesNo +
+ List Item Price Includes GST: + YesNo +
+ Invoice Item Price Includes GST: + YesNo +
+ Discount: + % +
+
+ +