[Koha-patches] Bug 3624 reopened

[Fridolyn SOMERS]

Bug 3624 reopened :

Patch for SQL structure  :

Index: acqui/basketgroup.pl
===================================================================
--- acqui/basketgroup.pl
+++ acqui/basketgroup.pl
@@ -431,6 +453,7 @@
             name            => $basketgroupname,
             booksellerid    => $booksellerid,
             basketlist      => \@baskets,
+            billingplace    => $billingplace,
             deliveryplace   => $deliveryplace,
             deliverycomment => $deliverycomment,
             closed          => $close,
Index: installer/data/mysql/kohastructure.sql
===================================================================
--- installer/data/mysql/kohastructure.sql
+++ installer/data/mysql/kohastructure.sql
@@ -2342,6 +2342,9 @@
   `name` varchar(50) default NULL,
   `closed` tinyint(1) default NULL,
   `booksellerid` int(11) NOT NULL,
+  `deliveryplace` varchar(10) default NULL,
+  `deliverycomment` varchar(255) default NULL,
+  `billingplace` varchar(10) default NULL,
   PRIMARY KEY  (`id`),
   KEY `booksellerid` (`booksellerid`),
   CONSTRAINT `aqbasketgroups_ibfk_1` FOREIGN KEY (`booksellerid`)
REFERENCES `aqbooksellers` (`id`) ON UPDATE CASCADE ON DELETE CASCADE

Patch for a few XHTML errors in template :

Index: koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tmpl
===================================================================
--- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tmpl
(revision 468)
+++ koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tmpl
(working copy)
@@ -222,14 +222,14 @@
                         <h3><label for="billingplace">Billing
Place:</label></h3>
                         <select name="billingplace" id="billingplace">
                             <!-- TMPL_LOOP name="billingplaceloop" -->
-                            <option value="<!-- TMPL_VAR name="value" -->"
<!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR
name="branchname" --></option>
+                            <option value="<!-- TMPL_VAR name="value"
-->"<!-- TMPL_IF name="selected" --> selected="selected"<!-- /TMPL_IF
-->><!-- TMPL_VAR name="branchname" --></option>
                             <!-- /TMPL_LOOP -->
                         </select>
                         <h3><label for="deliveryplace">Delivery
Place:</label></h3>
                         <select name="deliveryplace" id="deliveryplace">
                             <option value="">--</option>
                             <!-- TMPL_LOOP name="deliveryplaceloop" -->
-                            <option value="<!-- TMPL_VAR name="value" -->"
<!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR
name="branchname" --></option>
+                            <option value="<!-- TMPL_VAR name="value"
-->"<!-- TMPL_IF name="selected" --> selected="selected"<!-- /TMPL_IF
-->><!-- TMPL_VAR name="branchname" --></option>
                             <!-- /TMPL_LOOP -->
                         </select>
                         <h3><label for="deliverycomment">Delivery
comment:</label></h3>
@@ -253,7 +253,7 @@

                             </ul>
                         </div>
-                        <div><input type="checkbox" name="close">
Close</input></div>
+                        <div><input type="checkbox" name="close"
value="yes"> Close</input></div>
                         <input type="hidden" name="booksellerid"
value="<!-- TMPL_VAR name="booksellerid" -->" />
                         <!-- TMPL_IF NAME="basketgroupid" -->
                             <input type="hidden" name="basketgroupid"
value="<!-- TMPL_VAR name="basketgroupid" -->" />

-- 
Fridolyn SOMERS
ICT engineer
PROGILONE - Lyon - France
fridolyn.somers at gmail.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20101201/e906d755/attachment.htm>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bug3624_kohastructure.patch
Type: text/x-patch
Size: 1159 bytes
Desc: not available
URL: </pipermail/koha-patches/attachments/20101201/e906d755/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bug3624_xhtml.patch
Type: text/x-patch
Size: 1998 bytes
Desc: not available
URL: </pipermail/koha-patches/attachments/20101201/e906d755/attachment-0001.bin>