You probably don't want that merge conflict marker in there.
On Fri, Mar 4, 2011 at 5:17 AM, Salvador Zaragoza Rubio <
salv...@masmedios.com> wrote:
> Modification of the intranet cataloguing plugin for 006/008 fields to allow
> select a type of material and change the positions available to enter the
> data.
> Data are hard stored in xml files to allow easy translation and processing
> through
> Javascript and AJAX.
>
> Follow-up fix for Bug 3013 - 006/008 Type of Material Display on
> cataloguing plugin for MARC21
>
> Add url functionality in the xml and updatedatabase
>
> Signed-off-by: Salvador Zaragoza Rubio <salv...@masmedios.com>
> ---
>
> ---
> a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
> +++
> b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
> @@ -287,5 +287,7 @@ INSERT INTO systempreferences
> (variable,value,explanation,options,type) VALUES('
> INSERT INTO systempreferences (variable,value,explanation,options,type)
> VALUES('ShelfBrowserUsesLocation','1','Use the item location when finding
> items for the shelf browser.','1','YesNo');
> INSERT INTO systempreferences (variable,value,explanation,options,type)
> VALUES ('ShelfBrowserUsesHomeBranch','1','Use the item home branch when
> finding items for the shelf browser.','1','YesNo');
> INSERT INTO systempreferences (variable,value,explanation,options,type)
> VALUES ('ShelfBrowserUsesCcode','1','Use the item collection code when
> finding items for the shelf browser.','0','YesNo');
> +<<<<<<<
> HEAD:installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
> INSERT INTO `systempreferences` (variable,value,explanation,options,type)
> VALUES ('AllowFineOverride','0','If on, staff will be able to issue books to
> patrons with fines greater than noissuescharge.','0','YesNo');
> INSERT INTO `systempreferences` (variable,value,explanation,options,type)
> VALUES ('AllFinesNeedOverride','1','If on, staff will be asked to override
> every fine, even if it is below noissuescharge.','0','YesNo');
> +INSERT INTO `systempreferences` (variable,value,explanation,options,type)
> VALUES ('TypeOfMaterialsView_006_008','0','Display Type of Materials for
> plugin of fields 006 and 008 when cataloguing','','YesNo');
> diff --git a/installer/data/mysql/it-IT/necessari/sysprefs.sql
> b/installer/data/mysql/it-IT/necessari/sysprefs.sql
>
>
_______________________________________________
Koha-patches mailing list
Koha-patches@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/
