Merge remote-tracking branch 'origin/new/bug_8209'

[koha_fer] / koha-tmpl / intranet-tmpl / prog / en / modules / acqui / basketheader.tt
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt

index 160c5f6..e1061da 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt
@@ -13,8 +13,8 @@
  // to check if the data are correctly entered.
  function Check(ff) {
      var ok=0;
-    var _alertString="Form not submitted because of the following problem(s)\n";
-    _alertString +="-------------------------------------------------------------------\n\n";
+    var _alertString="Form not submitted because of the following problem(s)";
+    _alertString +="\n-------------------------------------------------------------------\n\n";
      if (!(isNotNull(ff.basketname,0))){
          ok=1;
          _alertString += "- name missing\n";
@@ -84,7 +84,7 @@ li.list2 {
  </style>
  
  </head>
-<body>
+<body id="acq_basketheader" class="acq">
  [% INCLUDE 'header.inc' %]
  [% INCLUDE 'acquisitions-search.inc' %]
  
@@ -125,6 +125,48 @@ li.list2 {
                      <label for="basketname" class="required">Basket name</label> &nbsp;
                          <input type="text" name="basketname" id="basketname" size="40" maxlength="80" value="[% basketname %]" />
                  </li>
+                 <li>
+                    <label for="billingplace">Billing Place:</label>
+                    <select name="billingplace" id="billingplace">
+                        <option value="">--</option>
+                        [% FOREACH billingplace IN billingplaceloop %]
+                            [% IF ( billingplace.selected ) %]
+                                <option value="[% billingplace.value %]" selected="selected">
+                            [% ELSE %]
+                                <option value="[% billingplace.value %]">
+                            [% END %]
+                                [% billingplace.branchname %]
+                            </option>
+                        [% END %]
+                    </select>
+                </li>
+                <li>
+                    <label for="deliveryplace">Delivery  Place:</label>
+                    <select name="deliveryplace" id="deliveryplace">
+                        <option value="">--</option>
+                        [% FOREACH deliveryplace IN deliveryplaceloop %]
+                            [% IF ( deliveryplace.selected ) %]
+                                <option value="[% deliveryplace.value %]" selected="selected">
+                            [% ELSE %]
+                                <option value="[% deliveryplace.value %]">
+                            [% END %]
+                                [% deliveryplace.branchname %]
+                            </option>
+                        [% END %]
+                    </select>
+                </li>
+                <li>
+                    <label for="basketbooksellerid">Vendor</label> &nbsp;
+                    <select name="basketbooksellerid" id="basketbooksellerid">
+                    [% FOREACH b IN booksellers %]
+                        [% IF booksellerid == b.id %]
+                           <option value="[% b.id %]" selected="selected">[% b.name %]</option>
+                        [% ELSE %]
+                           <option value="[% b.id %]">[% b.name %]</option>
+                        [% END %]
+                    [% END %]
+            </select>
+                </li>
                  <li>
                      <label for="basketnote">Internal note</label> &nbsp;
                      <textarea name="basketnote" id="basketnote" rows="5" cols="40">[% basketnote %]</textarea>