Attachment 92880 Details for Bug 23321 – Bug 23321: Add cash register preference

[patch] Bug 23321: Add cash register preference

Bug-23321-Add-cash-register-preference.patch (text/plain), 6.07 KB, created by Martin Renvoize (ashimema) on 2019-09-17 11:26:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2019-09-17 11:26:23 UTC

Size: 6.07 KB

patch

obsolete

>From db0c3ec5063b6421fc426be5f7937e91cf985b4e Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Thu, 18 Jul 2019 08:02:31 +0100
>Subject: [PATCH] Bug 23321: Add cash register preference
>
>Sponsored-by: PTFS Europe
>Signed-off-by: Maryse Simard <maryse.simard@inlibro.com>
>---
> .../atomicupdate/bug_23321_preferences.perl   | 11 ++++++++++
> installer/data/mysql/sysprefs.sql             |  1 +
> .../prog/en/includes/prefs-menu.inc           |  1 +
> .../modules/admin/preferences/accounts.pref   | 21 +++++++++++++++++++
> .../admin/preferences/circulation.pref        | 14 -------------
> 5 files changed, 34 insertions(+), 14 deletions(-)
> create mode 100644 installer/data/mysql/atomicupdate/bug_23321_preferences.perl
> create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/accounts.pref
>
>diff --git a/installer/data/mysql/atomicupdate/bug_23321_preferences.perl b/installer/data/mysql/atomicupdate/bug_23321_preferences.perl
>new file mode 100644
>index 0000000000..b757933d17
>--- /dev/null
>+++ b/installer/data/mysql/atomicupdate/bug_23321_preferences.perl
>@@ -0,0 +1,11 @@
>+$DBversion = 'XXX';    # will be replaced by the RM
>+if ( CheckVersion($DBversion) ) {
>+
>+    $dbh->do(qq{
>+        INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES
>+        ('UseCashRegisters','0','','Use cash registers with the accounting system and assign patron transactions to them.','YesNo')
>+    });
>+
>+    SetVersion($DBversion);
>+    print "Upgrade to $DBversion done (Bug 23321 - Add cash register system preference)\n";
>+}
>diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
>index 6ce6ee15e0..5b916426bf 100644
>--- a/installer/data/mysql/sysprefs.sql
>+++ b/installer/data/mysql/sysprefs.sql
>@@ -646,6 +646,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('UseACQFrameworkForBiblioRecords','0','','Use the ACQ framework for the catalog details','YesNo'),
> ('UseAuthoritiesForTracings','1','0','Use authority record numbers for subject tracings instead of heading strings.','YesNo'),
> ('UseBranchTransferLimits','0','','If ON, Koha will will use the rules defined in branch_transfer_limits to decide if an item transfer should be allowed.','YesNo'),
>+('UseCashRegisters','0','','Use cash registers with the accounting system and assign patron transactions to them.','YesNo'),
> ('UseControlNumber','0','','If ON, record control number (w subfields) and control number (001) are used for linking of bibliographic records.','YesNo'),
> ('UseCourseReserves','0',NULL,'Enable the course reserves feature.','YesNo'),
> ('useDaysMode','Calendar','Calendar|Days|Datedue','Choose the method for calculating due date: select Calendar to use the holidays module, and Days to ignore the holidays module','Choice'),
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc
>index 3b2e2f75ed..b337291cc1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc
>@@ -1,5 +1,6 @@
> <div id="menu">
> <ul>
>+[% IF ( accounts ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Accounts" href="/cgi-bin/koha/admin/preferences.pl?tab=accounts">Accounts</a></li>
> [% IF ( acquisitions ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Acquisitions" href="/cgi-bin/koha/admin/preferences.pl?tab=acquisitions">Acquisitions</a></li>
> [% IF ( admin ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Administration" href="/cgi-bin/koha/admin/preferences.pl?tab=admin">Administration</a></li>
> [% IF ( authorities ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Authority Control" href="/cgi-bin/koha/admin/preferences.pl?tab=authorities">Authorities</a></li>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/accounts.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/accounts.pref
>new file mode 100644
>index 0000000000..fb9ee5fbb5
>--- /dev/null
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/accounts.pref
>@@ -0,0 +1,21 @@
>+Accounts:
>+    Policy:
>+        -
>+            - pref: UseCashRegisters
>+              default: no
>+              choices:
>+                yes: "Use"
>+                no: "Don't use"
>+            - " cash registers with the accounting system to track payments."
>+        -
>+            - pref: AccountAutoReconcile
>+              choices:
>+                  yes: "Do"
>+                  no: "Do not"
>+            - reconcile patron balances automatically on each transaction adding debits or credits.
>+        -
>+            - pref: FinePaymentAutoPopup
>+              choices:
>+                  yes: "Do"
>+                  no: "Don't"
>+            - automatically display a print dialog for a payment receipt when making a payment..
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
>index 199809f139..d5ea2656cf 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
>@@ -158,14 +158,6 @@ Circulation:
>                   no: "Don't allow"
>             - patrons to submit notes about checked out items.
> 
>-    Accounts:
>-        -
>-            - pref: AccountAutoReconcile
>-              choices:
>-                  yes: "Do"
>-                  no: "Do not"
>-            - reconcile patron balances automatically on each transaction adding debits or credits.
>-
>     Checkout Policy:
>         -
>             - pref: AutoReturnCheckedOutItems
>@@ -889,12 +881,6 @@ Circulation:
>             - pref: ProcessingFeeNote
>               type: textarea
>               class: code
>-        -
>-            - pref: FinePaymentAutoPopup
>-              choices:
>-                  yes: "Do"
>-                  no: "Don't"
>-            - automatically display a print dialog for a payment receipt when making a payment..
>     Self check-in module:
>         -
>             - "Include the following HTML on the self check-in screen:"
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 23321: 91596 | 91597 | 91598 | 91599 | 91600 | 91601 | 91602 | 91621 | 92057 | 92058 | 92059 | 92060 | 92061 | 92062 | 92063 | 92064 | 92065 | 92083 | 92084 | 92085 | 92086 | 92087 | 92088 | 92089 | 92090 | 92091 | 92394 | 92395 | 92396 | 92397 | 92398 | 92399 | 92400 | 92401 | 92402 | 92467 | 92468 | 92469 | 92470 | 92471 | 92472 | 92473 | 92474 | 92475 | 92803 | 92804 | 92805 | 92806 | 92807 | 92808 | 92809 | 92810 | 92811 | 92812 | 92813 | 92814 | 92829 | 92879 | 92880 | 92881 | 92882 | 92883 | 92884 | 92885 | 92886 | 92887 | 92888 | 92889 | 93019 | 93020 | 93021 | 93022 | 93023 | 93024 | 93025 | 93026 | 93027 | 93028 | 93029 | 93030 | 93031 | 93032 | 93033 | 93034 | 93035 | 93188