From af3709aea8b63a33904f5dcb11066220847cf4d0 Mon Sep 17 00:00:00 2001 From: tgarip1957 Date: Wed, 20 Sep 2006 21:40:41 +0000 Subject: [PATCH] A new acquisition to handle multiple tax values, and marc creation of biblios and items --- .../prog/en/acqui/acqui-home.tmpl | 11 +- .../intranet-tmpl/prog/en/acqui/basket.tmpl | 70 +++--- .../prog/en/acqui/booksellers.tmpl | 47 ++-- .../prog/en/acqui/finishreceive.tmpl | 41 ++++ .../prog/en/acqui/histsearch.tmpl | 4 +- .../prog/en/acqui/neworderbiblio.tmpl | 69 ------ .../prog/en/acqui/neworderempty.tmpl | 133 +++++------ .../prog/en/acqui/newordersuggestion.tmpl | 2 +- .../prog/en/acqui/orderreceive.tmpl | 100 --------- .../intranet-tmpl/prog/en/acqui/parcel.tmpl | 206 +++++++++++++----- .../intranet-tmpl/prog/en/acqui/parcels.tmpl | 30 +-- .../intranet-tmpl/prog/en/acqui/supplier.tmpl | 4 +- 12 files changed, 345 insertions(+), 372 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/acqui/finishreceive.tmpl delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/acqui/neworderbiblio.tmpl delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/acqui/orderreceive.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl index bc7f480e18..329d978439 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl @@ -20,7 +20,7 @@

Exchange rates

-
+ @@ -92,10 +92,11 @@ Committed figures are approximate only, as exchange rates will affect the amount actually paid.

Help

-

To start an acquisition, whether an order, local purchase or donation first search on the supplier, you will be asked to check their details, and enter your name which will set up a "shopping basket" for you. (Why is this you might ask... well because we want to know that it's really you ordering things - not just your computer).

-

To order an item you need to establish whether a biblio already exists for it, and either add an item, or set up a new biblio then add the item.

-

To start a new shopping basket with a new supplier return to this page and just start a new supplier search.

-

To close off a shopping basket click on "view shopping baskets" or search above, and the click on "confirm basket".

+

To start an acquisition, whether an order, local purchase or donation first search on the supplier, (set donations as a supplier if you wish), and click add order which will set up a "shopping basket" for you.

+

To place an order you need to establish whether a biblio already exists for it, or set up a new biblio from scratch or from a suggestion.

+

To close a shopping basket click on "confirm Close Basket". After closing a basket it can not be modified or deleted

+

To receive an order (a parcel) search for the supplier and click receive. After confirming invoice details you will be asked to create items for the order

+ diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl index 066362c5b2..962e567e05 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl @@ -1,9 +1,14 @@ Koha -- New Shopping Basket () for + - - -

New Shopping Basket for ">

+ +

New Shopping Basket for ">

Basket Details

Currency
@@ -12,14 +17,18 @@ +
Open On:
For:Supplier Id
Invoice Number:
Purchase Order Number:
Closed On:
+ + " /> " /> - +
+
@@ -29,13 +38,12 @@ - - + + - - + @@ -46,7 +54,7 @@ - + - - + + - + + @@ -90,24 +99,25 @@ " /> " /> - + - - - + + - - - - + + + + - + + + + + + - -
Order&order=biblioitems.publishercode">PublisherTitlePublisher&order=biblio.title">Title RRPEst. Qty. Total&order=aqorderbreakdown.bookfundid,biblioitems.publishercode">Fund&order=aqorderbreakdown.bookfundid">Fund Remove


@@ -64,24 +72,25 @@

" /> " /> - " /> + " />
SubTotalSubTotal -  
GST Discount-
TOTAL ()Tax
TOTAL  
@@ -120,12 +130,14 @@

Add To Order

-
+ " /> " /> -
  • From an existing record: -
    • -
  • &basketno=">From a Suggestion
    • + To add from an existing record: +
  • Enter an existing biblionumber: +
    • +
  • or Search for an existing Biblio
    • + diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/booksellers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/booksellers.tmpl index 3a53315d87..ff3cdbde0b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/acqui/booksellers.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/booksellers.tmpl @@ -2,14 +2,14 @@ -

    You searched on supplier , results found

    +

    You searched on supplier: , baskets found

    - + @@ -21,23 +21,27 @@ Inactive - + - +
    OrderReceive Company  
    - Recieve order - - - - - - - - - + + + + + + - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/neworderbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/neworderbiblio.tmpl deleted file mode 100644 index d48fa31947..0000000000 --- a/koha-tmpl/intranet-tmpl/prog/en/acqui/neworderbiblio.tmpl +++ /dev/null @@ -1,69 +0,0 @@ -Koha -- Shopping Basket For: - - - - -

    Shopping Basket For:

    - -
    - &basket=&sub=">Add New Biblio - | ">View Basket | - - " /> - " /> - New Search: -
    - -
    -

    You searched for - - - -

    -

    Results to of results displayed.

    - -
    BasketItemsCreated byDate 
    + ">Recieve All orders + + + + + + + + - + +
    BasketPurchase orderCreated byDate 
    @@ -46,15 +50,22 @@ closed on - " class="button acquisition">View + " class="button acquisition">View - " class="button acquisition">modify + " class="button acquisition">modify - " class="button acquisition">View + " class="button acquisition">View + + + &basketno=">Recieve this order + + +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/finishreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/finishreceive.tmpl new file mode 100644 index 0000000000..761f8b4a66 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/finishreceive.tmpl @@ -0,0 +1,41 @@ +Koha -- Receipt Summary for : Invoice, + + + + + +

    Finish Receiveing Order

    + + + + + +
    + + + + + + + + + + "/> + + + + + + + +
    Use these values to create the items for this order
    TitleSupplierReplacementQty
    " READONLY/>
    ">)">Add item
    +
    + + + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl index 892e20f7da..77ebdd64e9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl @@ -1,9 +1,9 @@ Koha -- Search order + -

    Order search

    @@ -89,7 +89,7 @@
     ">">
    - - - - - - - - - - - - - - - - - - - -
    TitleAuthor©CountLocation
    - &author=&copyright=&id=&basket=&biblio=&title="> - - - - &type="> - - - - - - - - -
    - - - &offset=&type=&id=&basket=&search=&author="> - Next - - - - - - \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/neworderempty.tmpl index d8b7a5eb01..ba101dc3b0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/acqui/neworderempty.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/neworderempty.tmpl @@ -4,7 +4,7 @@

    @@ -83,6 +99,7 @@ function check(f) {

    Open On:
    For:Supplier Id
    Invoice Number:
    Purchase Order Number:
    Closed On:
    @@ -91,15 +108,13 @@ function check(f) {

    catalogue details

    - + " /> " /> " /> - " /> - " /> + " /> " /> - " /> " /> " /> " /> @@ -107,59 +122,45 @@ function check(f) { " value="" /> -

    + +

    - - " /> - - " /> - + + " READONLY/>Auto filled

    +

    - " /> - - " /> -

    - " /> - - " /> -

    - " /> - - " /> - +

    - +

    - " /> - - " /> - +

    - " /> - - " /> -

    -

    + +

    First Create a Biblio for this order

    + + +

    Accounting details

    +

    - -

    Accounting details

    - - " /> - - " onchange="update(this.form);" /> - + + " onchange="update(this.form);" readonly - " /> + " />

    + Note: All figures are in local currency, except the suppliers list price which is indicated.Currency conversion is done automatically + +

    + + " onchange="update(this.form)" />% +

    +

    - - " /> - - " onchange="update(this.form)" /> - + + " onchange="update(this.form)" readonly/> +

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

    +

    + + " onchange="update(this.form)" readonly />%

    - "readonly /> + " readonly />

    +

    - readonly /> + " readonly />

    +

    - readonly /> + " readonly />

    - - " readonly /> + + " readonly />includes any applicable tax less any discount

    - - " /> + + " readonly /> (using recommended!)

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/newordersuggestion.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/newordersuggestion.tmpl index cc649638a6..48798305da 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/acqui/newordersuggestion.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/newordersuggestion.tmpl @@ -52,7 +52,7 @@ - &basketno=&suggestionid=&biblio=" class="button acquisition">Order + &basketno=&suggestionid=&biblionumber=" class="button acquisition">Order &basketno=&suggestionid=" class="button acquisition">Order diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/orderreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/orderreceive.tmpl deleted file mode 100644 index 0d8a3be47e..0000000000 --- a/koha-tmpl/intranet-tmpl/prog/en/acqui/orderreceive.tmpl +++ /dev/null @@ -1,100 +0,0 @@ -Koha -- Receipt Summary for : Invoice, - - - - - -

    Receipt Summary for : Invoice,

    - -
    - Invoice:

    -

    Received By:

    -

    Date:

    -
    - - -
    - - -

    - Receive Order

    -
    • Shopping Basket For:
      • -
    • Order placed on:
      • -
    - -

    Catalogue Details

    -

    " />

    -

    " />

    -

    " />

    -

    -

    " />

    -

    " />

    -

    - -

    -

    " />

    -

    - " /> - " /> - " /> - " /> - " /> - " /> - - - - &id=">Edit - -

    Accounting Details

    -

    -

    " />

    -

    " />

    -

    " />

    -

    " />

    -

    " />

    -

    " />

    -

    " />

    - -
    - -
    - - - - - - - - - - - - - - - - - - - -
    BasketISBNTitleAuthorQtyReceived
    &biblio=&invoice=&freight=&gst=&id=">
    -
    - - - - diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/parcel.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/parcel.tmpl index 8fd9ca4260..ed1c8ee8cc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/acqui/parcel.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/parcel.tmpl @@ -2,79 +2,171 @@ - +

    - - Receipt Summary for Invoice - - orders not yet recieved for - + Orders being recieved from +

    -
    -

    Invoice:

    -

    Received By:

    -

    On:

    +
    +" /> +
    +

    Received By:

    +

    Suppliers Invoice No: " /> + + Date received: " />

    -
    +

    Recieve list

    - - - - - - - - - - - + " /> + " /> +
    BASKETISBNTITLEAUTHORACTUALP&PQTYTOTAL
    + Rate of tax used for P&P:" />% + + + + + + + + + - - + " /> + " /> + " /> + - - - - - - + + + + + + + " /> + " /> - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + - - - + + + + + + + + + + + + +
    Basket/OrderISBNTitlePriceActual P&P QtyReceived
    / &biblio=&invoice=&gst=&freight=&supplierid="> " onChange="docalculate();"/> " onChange="docalculate();"/>
    SUBTOTALSSubTotals" /> + " READONLY />
      - Discount" onChange="updatetotal();"/>
      Tax"/>
    - HELP -

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

    -     		GST  Totals" onChange="updatetotal();"/>
    TOTAL
      Invoice Total
      Invoice Total
    +Note: P&P is per item. If you have a total freight fill the Total P&P only.! +

    - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/parcels.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/parcels.tmpl index 8c66394671..ba67cf9ecc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/acqui/parcels.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/parcels.tmpl @@ -28,7 +28,7 @@
    - +
    @@ -56,10 +56,10 @@
    Sort by :
    Results per page :
    - -
    -

    Receive a new Parcel

    -
    -

    - > - - -

    -

    - - -

    -

    - - -

    -

    - -

    -
    -
    + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl index 6cb2b49372..6b8668b9a1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl @@ -122,7 +122,7 @@

    - + Yes No @@ -135,7 +135,7 @@ " /> %

    - + -- 2.20.1