[Koha-patches] Bug 3624 reopened
Chris Cormack
chrisc at catalyst.net.nz
Wed Dec 1 20:27:57 CET 2010
Hi Fridolyn
How are you making your patches?
You might want to have a look at
http://wiki.koha-community.org/wiki/Version_Control_Using_Git#Share_with_the_rest_of_the_world
using git format-patch will make it easier for others to test and
signoff on them :)
Chris
* Fridolyn SOMERS (fridolyn.somers at gmail.com) wrote:
> 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
> 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
> 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" -->" />
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
> website : http://www.koha-community.org/
> git : http://git.koha-community.org/
> bugs : http://bugs.koha-community.org/
--
Chris Cormack
Catalyst IT Ltd.
+64 4 803 2238
PO Box 11-053, Manners St, Wellington 6142, New Zealand
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: </pipermail/koha-patches/attachments/20101202/234a337e/attachment.pgp>
More information about the Koha-patches
mailing list