Attachment 60690 Details for Bug 18110 – BUG 18110 : Modified the adresses in order to fit the french standards

[patch] BUG 18110 : Modified the adresses in order to fit the french standards

BUG-18110--Modified-the-adresses-in-order-to-fit-t.patch (text/plain), 5.29 KB, created by Baptiste Wojtkowski (bwoj) on 2017-02-27 09:00:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Baptiste Wojtkowski (bwoj)

Created: 2017-02-27 09:00:50 UTC

Size: 5.29 KB

patch

obsolete

>From 3304e029d8d506d52032572a6f7647f6fd8f1581 Mon Sep 17 00:00:00 2001
>From: Baptiste Wojtkowski <baptiste.wojtkowski@biblibre.com>
>Date: Mon, 27 Feb 2017 08:58:05 +0000
>Subject: [PATCH] BUG 18110 : Modified the adresses in order to fit the french
> standards
>
>---
> .../prog/en/modules/admin/preferences/acquisitions.pref      |  4 ++++
> .../prog/en/modules/admin/preferences/opac.pref              | 12 ++++++++++++
> .../prog/en/modules/admin/preferences/patrons.pref           |  8 ++++++++
> 3 files changed, 24 insertions(+)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
>index cf23628..cb8c2ac 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
>@@ -9,7 +9,11 @@ Acquisitions:
>                   receiving: receiving an order.
>                   cataloguing: cataloging the record.
>         -
>+<<<<<<< Updated upstream
>             - "The following <a href='http://schema.koha-community.org/__VERSION__/tables/items.html' target='blank'>database columns</a> should be unique in an item:"
>+=======
>+            - "The following <a href='http://schema.koha-community.org/master/tables/items.html' target='blank'>database columns</a> should be unique in an item:"
>+>>>>>>> Stashed changes
>             - pref: UniqueItemFields
>             - (separated by a space)
>         -
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
>index e64cb43..e86cb78 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
>@@ -728,17 +728,29 @@ OPAC:
>               class: integer
>             - "days."
>         -
>+<<<<<<< Updated upstream
>             - "The following <a href='http://schema.koha-community.org/__VERSION__/tables/borrowers.html' target='blank'>database columns</a> must be filled in on the patron entry screen:"
>+=======
>+            - "The following <a href='http://schema.koha-community.org/master/tables/borrowers.html' target='blank'>database columns</a> must be filled in on the patron entry screen:"
>+>>>>>>> Stashed changes
>             - pref: PatronSelfRegistrationBorrowerMandatoryField
>               class: multi
>             - (separate columns with |)
>         -
>+<<<<<<< Updated upstream
>             - "The following <a href='http://schema.koha-community.org/__VERSION__/tables/borrowers.html' target='blank'>database columns</a> will not appear on the patron self-registration screen:"
>+=======
>+            - "The following <a href='http://schema.koha-community.org/master/tables/borrowers.html' target='blank'>database columns</a> will not appear on the patron self-registration screen:"
>+>>>>>>> Stashed changes
>             - pref: PatronSelfRegistrationBorrowerUnwantedField
>               class: multi
>             - (separate columns with |)
>         -
>+<<<<<<< Updated upstream
>             - "The following <a href='http://schema.koha-community.org/__VERSION__/tables/borrowers.html' target='blank'>database columns</a> will not appear on the patron self-modification screen:"
>+=======
>+            - "The following <a href='http://schema.koha-community.org/master/tables/borrowers.html' target='blank'>database columns</a> will not appear on the patron self-modification screen:"
>+>>>>>>> Stashed changes
>             - pref: PatronSelfModificationBorrowerUnwantedField
>               class: multi
>             - (separate columns with |)
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
>index 4a85957..16f3858 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
>@@ -24,12 +24,20 @@ Patrons:
>                no: "Don't"
>          - default the card number field on the patron addition screen to the next available card number (for example, if the largest currently used card number is 26345000012941, then this field will default to 26345000012942).
>      -
>+<<<<<<< Updated upstream
>          - "The following <a href='http://schema.koha-community.org/__VERSION__/tables/borrowers.html' target='blank'>database columns</a> must be filled in on the patron entry screen:"
>+=======
>+         - "The following <a href='http://schema.koha-community.org/master/tables/borrowers.html' target='blank'>database columns</a> must be filled in on the patron entry screen:"
>+>>>>>>> Stashed changes
>          - pref: BorrowerMandatoryField
>            class: multi
>          - (separate columns with |)
>      -
>+<<<<<<< Updated upstream
>          - "The following <a href='http://schema.koha-community.org/__VERSION__/tables/borrowers.html' target='blank'>database columns</a> will not appear on the patron entry screen:"
>+=======
>+         - "The following <a href='http://schema.koha-community.org/master/tables/borrowers.html' target='blank'>database columns</a> will not appear on the patron entry screen:"
>+>>>>>>> Stashed changes
>          - pref: BorrowerUnwantedField
>            class: multi
>          - (separate columns with |)
>-- 
>2.7.4

Actions: View | Diff | Splinter Review

Attachments on bug 18110: 60176 | 60214 | 60215 | 60426 | 60657 | 60689 | 60690 | 60694 | 60695 | 61610 | 61639 | 61650 | 61651 | 61652 | 61656 | 61796 | 62651 | 62652 | 62664 | 62740 | 62741 | 62742 | 62743 | 62744 | 62745