April 2025 - Evergreen-commits

[GIT] Evergreen ILS branch rel_3_14 updated. 8e64a75b9dd259eba55f350802ffb821700b09dd
by Git User 07 Apr '25

07 Apr '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, rel_3_14 has been updated via 8e64a75b9dd259eba55f350802ffb821700b09dd (commit) from 79c5da33f60b8ee63abc7892c5b8f0a2a75fcabe (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8e64a75b9dd259eba55f350802ffb821700b09dd Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Tue Mar 11 15:03:40 2025 +0000 LP2101886 MARC editor: allow right arrow in inputs In the MARC rich editor, the right arrow key is used to move from a selected subfield group to the first input in the group (the subfield code). This event listener was not specific enough, so that people using the right arrow key within a text input to move the cursor would unexpectedly find their focus moved backwards to the subfield code of the field data they were trying to edit. We now check whether the event target is an input or textarea field before moving focus. Release-note: Right arrow in MARC subfield data no longer moves focus Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Llewellyn Marshall <llewellyn.marshall(a)dncr.nc.gov> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts index 1728ed645f..4f39697306 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts @@ -210,6 +210,13 @@ export class MarcRichEditorComponent implements OnInit { onKeyDown(evt: KeyboardEvent, field: MarcField, subfield?: MarcSubfield) { switch (evt.key) { case 'ArrowRight': + // console.debug("ArrowRight: ", evt, field, subfield); + let el = evt.target as HTMLElement; + // do nothing if we are in a text input + if (el.nodeName && (el.nodeName.toLowerCase() === 'input' || el.nodeName.toLowerCase() === 'textarea')) { + return; + } + // otherwise, move focus from the group to its first input (the subfield code) evt.preventDefault(); evt.stopPropagation(); this.context.focusSubfield(field, subfield[2], false); ----------------------------------------------------------------------- Summary of changes: .../src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts | 7 +++++++ 1 file changed, 7 insertions(+) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_15 updated. 21f7dddd8377d6173f2038180a052fd903ffafa0
by Git User 07 Apr '25

07 Apr '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, rel_3_15 has been updated via 21f7dddd8377d6173f2038180a052fd903ffafa0 (commit) from ea8ae780dbc842f75c78ac858723427d8c03a958 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 21f7dddd8377d6173f2038180a052fd903ffafa0 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Tue Mar 11 15:03:40 2025 +0000 LP2101886 MARC editor: allow right arrow in inputs In the MARC rich editor, the right arrow key is used to move from a selected subfield group to the first input in the group (the subfield code). This event listener was not specific enough, so that people using the right arrow key within a text input to move the cursor would unexpectedly find their focus moved backwards to the subfield code of the field data they were trying to edit. We now check whether the event target is an input or textarea field before moving focus. Release-note: Right arrow in MARC subfield data no longer moves focus Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Llewellyn Marshall <llewellyn.marshall(a)dncr.nc.gov> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts index 1c0c58da05..655156c8bb 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts @@ -214,6 +214,13 @@ export class MarcRichEditorComponent implements OnInit { onKeyDown(evt: KeyboardEvent, field: MarcField, subfield?: MarcSubfield) { switch (evt.key) { case 'ArrowRight': + // console.debug("ArrowRight: ", evt, field, subfield); + let el = evt.target as HTMLElement; + // do nothing if we are in a text input + if (el.nodeName && (el.nodeName.toLowerCase() === 'input' || el.nodeName.toLowerCase() === 'textarea')) { + return; + } + // otherwise, move focus from the group to its first input (the subfield code) evt.preventDefault(); evt.stopPropagation(); this.context.focusSubfield(field, subfield[2], false); ----------------------------------------------------------------------- Summary of changes: .../src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts | 7 +++++++ 1 file changed, 7 insertions(+) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. 7e312a090065fb7f96ae0fb79861e16e169fdde4
by Git User 07 Apr '25

07 Apr '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, main has been updated via 7e312a090065fb7f96ae0fb79861e16e169fdde4 (commit) from 750bc317aa3a20247b1e9f6b7cba701a4e94b10c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7e312a090065fb7f96ae0fb79861e16e169fdde4 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Tue Mar 11 15:03:40 2025 +0000 LP2101886 MARC editor: allow right arrow in inputs In the MARC rich editor, the right arrow key is used to move from a selected subfield group to the first input in the group (the subfield code). This event listener was not specific enough, so that people using the right arrow key within a text input to move the cursor would unexpectedly find their focus moved backwards to the subfield code of the field data they were trying to edit. We now check whether the event target is an input or textarea field before moving focus. Release-note: Right arrow in MARC subfield data no longer moves focus Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Llewellyn Marshall <llewellyn.marshall(a)dncr.nc.gov> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts index 1c0c58da05..655156c8bb 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts @@ -214,6 +214,13 @@ export class MarcRichEditorComponent implements OnInit { onKeyDown(evt: KeyboardEvent, field: MarcField, subfield?: MarcSubfield) { switch (evt.key) { case 'ArrowRight': + // console.debug("ArrowRight: ", evt, field, subfield); + let el = evt.target as HTMLElement; + // do nothing if we are in a text input + if (el.nodeName && (el.nodeName.toLowerCase() === 'input' || el.nodeName.toLowerCase() === 'textarea')) { + return; + } + // otherwise, move focus from the group to its first input (the subfield code) evt.preventDefault(); evt.stopPropagation(); this.context.focusSubfield(field, subfield[2], false); ----------------------------------------------------------------------- Summary of changes: .../src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts | 7 +++++++ 1 file changed, 7 insertions(+) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. 750bc317aa3a20247b1e9f6b7cba701a4e94b10c
by Git User 07 Apr '25

07 Apr '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, main has been updated via 750bc317aa3a20247b1e9f6b7cba701a4e94b10c (commit) from d90309de2583d04f5cd3202d6b15ad0009a475a2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 750bc317aa3a20247b1e9f6b7cba701a4e94b10c Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Sat Mar 15 21:54:08 2025 +0000 LP1940867 Avoid error when reimporting vandelay queue Avoids checking nonexistent combobox freetext value when reimporting Vandelay queue. Release-note: Avoid freetext error when reimporting MARC import queue Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Jane Sandberg <sandbergja(a)gmail.com> diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts index c7b6474842..902d1e1635 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts @@ -472,7 +472,7 @@ export class ImportComponent implements OnInit, AfterViewInit, OnDestroy { // Extract selected queue ID or create a new queue when requested. resolveQueue(): Promise<number> { - if (this.selectedQueue.freetext) { + if (this.selectedQueue?.freetext) { // Free text queue selector means create a new entry. // TODO: first check for name dupes ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_15 updated. ea8ae780dbc842f75c78ac858723427d8c03a958
by Git User 07 Apr '25

07 Apr '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, rel_3_15 has been updated via ea8ae780dbc842f75c78ac858723427d8c03a958 (commit) from fd59101aea24d3f2427089f0261c87319a1b647f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ea8ae780dbc842f75c78ac858723427d8c03a958 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Sat Mar 15 21:54:08 2025 +0000 LP1940867 Avoid error when reimporting vandelay queue Avoids checking nonexistent combobox freetext value when reimporting Vandelay queue. Release-note: Avoid freetext error when reimporting MARC import queue Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Jane Sandberg <sandbergja(a)gmail.com> diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts index c7b6474842..902d1e1635 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts @@ -472,7 +472,7 @@ export class ImportComponent implements OnInit, AfterViewInit, OnDestroy { // Extract selected queue ID or create a new queue when requested. resolveQueue(): Promise<number> { - if (this.selectedQueue.freetext) { + if (this.selectedQueue?.freetext) { // Free text queue selector means create a new entry. // TODO: first check for name dupes ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. 79c5da33f60b8ee63abc7892c5b8f0a2a75fcabe
by Git User 07 Apr '25

07 Apr '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, rel_3_14 has been updated via 79c5da33f60b8ee63abc7892c5b8f0a2a75fcabe (commit) from 3fb6de0ee65db7cbc44819ea7f402f53e40c4cce (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 79c5da33f60b8ee63abc7892c5b8f0a2a75fcabe Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Sat Mar 15 21:54:08 2025 +0000 LP1940867 Avoid error when reimporting vandelay queue Avoids checking nonexistent combobox freetext value when reimporting Vandelay queue. Release-note: Avoid freetext error when reimporting MARC import queue Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Jane Sandberg <sandbergja(a)gmail.com> diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts index c7b6474842..902d1e1635 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts @@ -472,7 +472,7 @@ export class ImportComponent implements OnInit, AfterViewInit, OnDestroy { // Extract selected queue ID or create a new queue when requested. resolveQueue(): Promise<number> { - if (this.selectedQueue.freetext) { + if (this.selectedQueue?.freetext) { // Free text queue selector means create a new entry. // TODO: first check for name dupes ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_13 updated. f91846eb2e21aa91a263d6c4beb1c47576520f9c
by Git User 07 Apr '25

07 Apr '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, rel_3_13 has been updated via f91846eb2e21aa91a263d6c4beb1c47576520f9c (commit) from cd6f36548152cab1203bbb9dcd64aab9bded6fc2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f91846eb2e21aa91a263d6c4beb1c47576520f9c Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Sat Mar 15 21:54:08 2025 +0000 LP1940867 Avoid error when reimporting vandelay queue Avoids checking nonexistent combobox freetext value when reimporting Vandelay queue. Release-note: Avoid freetext error when reimporting MARC import queue Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Jane Sandberg <sandbergja(a)gmail.com> diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts index c7b6474842..902d1e1635 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts @@ -472,7 +472,7 @@ export class ImportComponent implements OnInit, AfterViewInit, OnDestroy { // Extract selected queue ID or create a new queue when requested. resolveQueue(): Promise<number> { - if (this.selectedQueue.freetext) { + if (this.selectedQueue?.freetext) { // Free text queue selector means create a new entry. // TODO: first check for name dupes ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. 3fb6de0ee65db7cbc44819ea7f402f53e40c4cce
by Git User 04 Apr '25

04 Apr '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, rel_3_14 has been updated via 3fb6de0ee65db7cbc44819ea7f402f53e40c4cce (commit) from 35819857ef82a3f58e60546dd96475906aa65345 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3fb6de0ee65db7cbc44819ea7f402f53e40c4cce Author: Tiffany Little <tlittle(a)georgialibraries.org> Date: Wed Feb 5 11:05:55 2025 -0500 LP2094859 Batch receive count on invoices Release-note: Fixes a regression where the count of receivable items on acq invoices was always zero. Signed-off-by: Tiffany Little <tlittle(a)georgialibraries.org> Signed-off-by: Christine Burns <christine.burns(a)bc.libraries.coop> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html index 9c191fbee9..b6e89e0b9e 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html @@ -582,7 +582,7 @@ placeholder='#' i18n-placeholder min="0" max="{{(li.lineitem_details()||[]).length}}" [disabled]="li.state() === 'received'" - [(ngModel)]="lineitemDetailCountMap[li.id()]" + [ngModel]="countReceivableItems(li)" (ngModelChange)="adjustSelectedLids(li.id(),$event)"/> </div> </ng-container> diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.ts index 936999c029..2aa6c850b2 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.ts @@ -1458,6 +1458,12 @@ export class LineitemListComponent implements OnInit, OnDestroy, OnChanges { return total; } + countReceivableItems(li: IdlObject) : Number { + const sum = li.order_summary(); + + return sum.item_count() - (sum.cancel_count() + sum.recv_count()); + } + receiveSelected() { /* lineitems*/ this.markReceived(this.selectedIds()); } ----------------------------------------------------------------------- Summary of changes: .../src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html | 2 +- .../src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.ts | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_15 updated. fd59101aea24d3f2427089f0261c87319a1b647f
by Git User 04 Apr '25

04 Apr '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, rel_3_15 has been updated via fd59101aea24d3f2427089f0261c87319a1b647f (commit) from 8d4417cb7f9a65c3b5eacfbbd6e4d1073999d906 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit fd59101aea24d3f2427089f0261c87319a1b647f Author: Tiffany Little <tlittle(a)georgialibraries.org> Date: Wed Feb 5 11:05:55 2025 -0500 LP2094859 Batch receive count on invoices Release-note: Fixes a regression where the count of receivable items on acq invoices was always zero. Signed-off-by: Tiffany Little <tlittle(a)georgialibraries.org> Signed-off-by: Christine Burns <christine.burns(a)bc.libraries.coop> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html index 9c191fbee9..b6e89e0b9e 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html @@ -582,7 +582,7 @@ placeholder='#' i18n-placeholder min="0" max="{{(li.lineitem_details()||[]).length}}" [disabled]="li.state() === 'received'" - [(ngModel)]="lineitemDetailCountMap[li.id()]" + [ngModel]="countReceivableItems(li)" (ngModelChange)="adjustSelectedLids(li.id(),$event)"/> </div> </ng-container> diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.ts index 936999c029..2aa6c850b2 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.ts @@ -1458,6 +1458,12 @@ export class LineitemListComponent implements OnInit, OnDestroy, OnChanges { return total; } + countReceivableItems(li: IdlObject) : Number { + const sum = li.order_summary(); + + return sum.item_count() - (sum.cancel_count() + sum.recv_count()); + } + receiveSelected() { /* lineitems*/ this.markReceived(this.selectedIds()); } ----------------------------------------------------------------------- Summary of changes: .../src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html | 2 +- .../src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.ts | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. d90309de2583d04f5cd3202d6b15ad0009a475a2
by Git User 04 Apr '25

04 Apr '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, main has been updated via d90309de2583d04f5cd3202d6b15ad0009a475a2 (commit) from bd12167bcd1a363ddd5c80780fb5e70feaf60aeb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d90309de2583d04f5cd3202d6b15ad0009a475a2 Author: Tiffany Little <tlittle(a)georgialibraries.org> Date: Wed Feb 5 11:05:55 2025 -0500 LP2094859 Batch receive count on invoices Release-note: Fixes a regression where the count of receivable items on acq invoices was always zero. Signed-off-by: Tiffany Little <tlittle(a)georgialibraries.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html index 9c191fbee9..b6e89e0b9e 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html @@ -582,7 +582,7 @@ placeholder='#' i18n-placeholder min="0" max="{{(li.lineitem_details()||[]).length}}" [disabled]="li.state() === 'received'" - [(ngModel)]="lineitemDetailCountMap[li.id()]" + [ngModel]="countReceivableItems(li)" (ngModelChange)="adjustSelectedLids(li.id(),$event)"/> </div> </ng-container> diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.ts index 936999c029..2aa6c850b2 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.ts @@ -1458,6 +1458,12 @@ export class LineitemListComponent implements OnInit, OnDestroy, OnChanges { return total; } + countReceivableItems(li: IdlObject) : Number { + const sum = li.order_summary(); + + return sum.item_count() - (sum.cancel_count() + sum.recv_count()); + } + receiveSelected() { /* lineitems*/ this.markReceived(this.selectedIds()); } ----------------------------------------------------------------------- Summary of changes: .../src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html | 2 +- .../src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.ts | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0