[Bug 7595] New: Add branchcode to accountlines
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Bug #: 7595 Summary: Add branchcode to accountlines Classification: Unclassified Change sponsored?: --- Product: Koha Version: rel_3_8 Platform: All OS/Version: All Status: NEW Severity: enhancement Priority: P5 - low Component: Patrons AssignedTo: kyle.m.hall@gmail.com ReportedBy: kyle.m.hall@gmail.com QAContact: koha.sekjal@gmail.com CC: gmcharlt@gmail.com For the purposes of statistics, it appears that it would help many libraries to have branchcode recorded in the accountlines table. For payments, the field would contain the code for the branch the payment was made at. For manual invoices, it would be the code of the library that created the invoice. -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 --- Comment #1 from Kyle M Hall <kyle.m.hall@gmail.com> 2012-02-24 20:23:37 UTC --- Created attachment 7866 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=7866 Bug 7595 - Add branchcode to accountlines Adds a branchcode column to the accountlines table. For payments, this inserts the branchcode of the library where the payment was recorded. For manual invoices, it insert the branchcode of the library where the manual invoice was created. -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Kyle M Hall <kyle.m.hall@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |Needs Signoff -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Kyle M Hall <kyle.m.hall@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #7866|0 |1 is obsolete| | --- Comment #2 from Kyle M Hall <kyle.m.hall@gmail.com> 2012-02-24 20:43:59 UTC --- Created attachment 7867 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=7867 Bug 7595 - Add branchcode to accountlines Adds a branchcode column to the accountlines table. For payments, this inserts the branchcode of the library where the payment was recorded. For manual invoices, it insert the branchcode of the library where the manual invoice was created. -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Kyle M Hall <kyle.m.hall@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #7867|0 |1 is obsolete| | --- Comment #3 from Kyle M Hall <kyle.m.hall@gmail.com> 2012-02-24 21:02:38 UTC --- Created attachment 7868 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=7868 Bug 7595 - Add branchcode to accountlines Adds a branchcode column to the accountlines table. For payments, this inserts the branchcode of the library where the payment was recorded. For manual invoices, it insert the branchcode of the library where the manual invoice was created. -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Kyle M Hall <kyle.m.hall@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #7868|0 |1 is obsolete| | --- Comment #4 from Kyle M Hall <kyle.m.hall@gmail.com> 2012-02-24 21:05:14 UTC --- Created attachment 7869 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=7869 Bug 7595 - Add branchcode to accountlines Adds a branchcode column to the accountlines table. For payments, this inserts the branchcode of the library where the payment was recorded. For manual invoices, it insert the branchcode of the library where the manual invoice was created. -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Nicole C. Engard <nengard@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #7869|0 |1 is obsolete| | --- Comment #5 from Nicole C. Engard <nengard@gmail.com> 2012-02-24 21:13:53 UTC --- Created attachment 7870 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=7870 [SIGNED-OFF] Bug 7595 - Add branchcode to accountlines Adds a branchcode column to the accountlines table. For payments, this inserts the branchcode of the library where the payment was recorded. For manual invoices, it insert the branchcode of the library where the manual invoice was created. Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> I tested with creating manual invoices, and paying partial fines, entire fine lines, and writing off fines. All actions record the branch where the action took place properly. -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Nicole C. Engard <nengard@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off CC| |nengard@gmail.com -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Ian Walls <koha.sekjal@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA --- Comment #6 from Ian Walls <koha.sekjal@gmail.com> 2012-03-01 20:09:46 UTC --- Patch failed to apply, most likely due to a minor merge issue in updatedatabase.pl. Easy rebase to do. recordpayment() SQL is missing the branchcode column in the INSERT statement. updatedatabase line should explicitly include where to insert the new branchcode column in accountlines (after manager_id). Otherwise column order in kohastructure could mismatch with structure in DB after updatedatabase.pl -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Kyle M Hall <kyle.m.hall@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #7870|0 |1 is obsolete| | --- Comment #7 from Kyle M Hall <kyle.m.hall@gmail.com> --- Created attachment 8037 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=8037&action=edit Bug 7595 - Add branchcode to accountlines Adds a branchcode column to the accountlines table. For payments, this inserts the branchcode of the library where the payment was recorded. For manual invoices, it insert the branchcode of the library where the manual invoice was created. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Kyle M Hall <kyle.m.hall@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Nicole C. Engard <nengard@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #8037|0 |1 is obsolete| | --- Comment #8 from Nicole C. Engard <nengard@gmail.com> --- Created attachment 8162 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=8162&action=edit [SIGNED-OFF] Bug 7595 - Add branchcode to accountlines Adds a branchcode column to the accountlines table. For payments, this inserts the branchcode of the library where the payment was recorded. For manual invoices, it insert the branchcode of the library where the manual invoice was created. Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> I tested with creating manual invoices, and paying partial fines, entire fine lines, and writing off fines. All actions record the branch where the action took place properly. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Nicole C. Engard <nengard@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Ian Walls <koha.sekjal@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA --- Comment #9 from Ian Walls <koha.sekjal@gmail.com> --- There are also calls of "INSERT INTO accountlines..." in C4/Circulation.pm, C4/Reserves.pm and C4/Overdues.pm, as well as in members/pay.pl (for writeoffs). Branchcode will need to be added to these areas, as well, in order to achieve complete and consistent coverage. That is, unless under these circumstances, the branchcode should always be NULL. If that's the use case, please let me know. Otherwise, I'm going to mark this as Failed QA for now until those other 3 modules can be covered -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #8162|0 |1 is obsolete| | --- Comment #10 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 12394 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=12394&action=edit [SIGNED-OFF] Bug 7595 - Add branchcode to accountlines Adds a branchcode column to the accountlines table. For payments, this inserts the branchcode of the library where the payment was recorded. For manual invoices, it insert the branchcode of the library where the manual invoice was created. Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> I tested with creating manual invoices, and paying partial fines, entire fine lines, and writing off fines. All actions record the branch where the action took place properly. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 --- Comment #11 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 12395 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=12395&action=edit Bug 7595 - Add branchcode to accountlines - Followup -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Needs Signoff CC| |kyle@bywatersolutions.com -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 --- Comment #12 from M. Tompsett <mtompset@hotmail.com> --- Created attachment 12717 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=12717&action=edit fredericd fixed 2 perlcritic errors Originally posted on bug 8849, but unrelated to it. Wajasu suggested putting it here. Hope I transferred it okay. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 wajasu <matted-34813@mypacks.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #12717|0 |1 is obsolete| | --- Comment #13 from wajasu <matted-34813@mypacks.net> --- Created attachment 12719 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=12719&action=edit frediric patch already applied to master 2012-10-05 obsoleted, since the perlcritic change has been done on master already -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 M. Tompsett <mtompset@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #12719|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |chris@bigballofwax.co.nz -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #12394|0 |1 is obsolete| | --- Comment #14 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 14814 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=14814&action=edit [SIGNED-OFF] Bug 7595 - Add branchcode to accountlines Adds a branchcode column to the accountlines table. For payments, this inserts the branchcode of the library where the payment was recorded. For manual invoices, it insert the branchcode of the library where the manual invoice was created. Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> I tested with creating manual invoices, and paying partial fines, entire fine lines, and writing off fines. All actions record the branch where the action took place properly. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #12395|0 |1 is obsolete| | --- Comment #15 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 14815 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=14815&action=edit Bug 7595 - Add branchcode to accountlines - Followup -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 cedric.vita@dracenie.com changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |cedric.vita@dracenie.com --- Comment #16 from cedric.vita@dracenie.com --- Something went wrong ! Applying: Bug 7595 - Add branchcode to accountlines Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Accounts.pm CONFLICT (content): Merge conflict in C4/Accounts.pm Auto-merging installer/data/mysql/kohastructure.sql Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Failed to merge in the changes. Patch failed at 0001 Bug 7595 - Add branchcode to accountlines When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Bug 7595 - Add branchcode to accountlines [SIGNED-OFF] Bug 7595 - Add branchcode to accountlines Apply? [yn] Patch left in /tmp/SIGNED-OFF-Bug-7595---Add-branchcode-to-accountlin-ViMI8t.patch -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #14814|0 |1 is obsolete| | --- Comment #17 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 20808 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=20808&action=edit Bug 7595 - Add branchcode to accountlines Adds a branchcode column to the accountlines table. For payments, this inserts the branchcode of the library where the payment was recorded. For manual invoices, it insert the branchcode of the library where the manual invoice was created. Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> I tested with creating manual invoices, and paying partial fines, entire fine lines, and writing off fines. All actions record the branch where the action took place properly. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Signed Off -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #14815|0 |1 is obsolete| | --- Comment #18 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 20809 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=20809&action=edit Bug 7595 - Add branchcode to accountlines - Followup -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Version|3.8 |master -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |katrin.fischer@bsz-bw.de QA Contact|koha.sekjal@gmail.com | -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA --- Comment #19 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- I have 2 problems with this: 1) (blocker) fines.pl is not applying fines for me after the patch was applied. Running the script with -l it indicates there should be a fines for the patron I used for testing, but the fine is not created. Even the FINES log in action_logs show that there should be a fine entry on the account. After running it repeatedly with different options an wondering why the fine would not appear on the patron account, it gave me an error: Can't use an undefined value as a HASH reference at /home/katrin/kohaclone/C4/Overdues.pm line 598. Which is the line changed by the patch. 2) I think we already track that information in the branch column of action_logs. But after applying the patch and paying a fine, I have an entry with an empty branchcode there. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 --- Comment #20 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hm, the follow up was never signed off, but touches a lot of sensitive areas. Please switch back to "Needs Signoff" later. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #20808|0 |1 is obsolete| | --- Comment #21 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 23306 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=23306&action=edit Bug 7595 - Add branchcode to accountlines Adds a branchcode column to the accountlines table. For payments, this inserts the branchcode of the library where the payment was recorded. For manual invoices, it insert the branchcode of the library where the manual invoice was created. Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> I tested with creating manual invoices, and paying partial fines, entire fine lines, and writing off fines. All actions record the branch where the action took place properly. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #20809|0 |1 is obsolete| | Attachment #23306|0 |1 is obsolete| | --- Comment #22 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 23308 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=23308&action=edit Bug 7595 - Add branchcode to accountlines Adds a branchcode column to the accountlines table. For payments, this inserts the branchcode of the library where the payment was recorded. For manual invoices, it insert the branchcode of the library where the manual invoice was created. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 wajasu <matted-34813@mypacks.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |matted-34813@mypacks.net -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 M. Tompsett <mtompset@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 M. Tompsett <mtompset@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #23308|0 |1 is obsolete| | --- Comment #23 from M. Tompsett <mtompset@hotmail.com> --- Created attachment 27337 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27337&action=edit Bug 7595 - Add branchcode to accountlines Adds a branchcode column to the accountlines table. For payments, this inserts the branchcode of the library where the payment was recorded. For manual invoices, it insert the branchcode of the library where the manual invoice was created. NOTE: Rebased -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 --- Comment #24 from M. Tompsett <mtompset@hotmail.com> --- Comment on attachment 27337 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27337 Bug 7595 - Add branchcode to accountlines Review of attachment 27337: --> (http://bugs.koha-community.org/bugzilla3/page.cgi?id=splinter.html&bug=7595&attachment=27337) ----------------------------------------------------------------- ::: C4/Accounts.pm @@ +407,4 @@
my ( $borrowernumber, $itemnum, $desc, $type, $amount, $note ) = @_; my $manager_id = 0; $manager_id = C4::Context->userenv->{'number'} if C4::Context->userenv; + my $branchcode = C4::Context->userenv->{'branch'};
Why does this differ than line 359? my $branchcode = C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef; -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #27337|0 |1 is obsolete| | --- Comment #25 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 30946 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=30946&action=edit Bug 7595 - Add branchcode to accountlines Adds a branchcode column to the accountlines table. For payments, this inserts the branchcode of the library where the payment was recorded. For manual invoices, it insert the branchcode of the library where the manual invoice was created. NOTE: Rebased -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #30946|0 |1 is obsolete| | --- Comment #26 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 30947 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=30947&action=edit Bug 7595 - Add branchcode to accountlines Adds a branchcode column to the accountlines table. For payments, this inserts the branchcode of the library where the payment was recorded. For manual invoices, it insert the branchcode of the library where the manual invoice was created. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 --- Comment #27 from Kyle M Hall <kyle@bywatersolutions.com> --- Good catch. I've updated all references to branchcode to check for the existance of userenv first. (In reply to M. Tompsett from comment #24)
Comment on attachment 27337 [details] [review] Bug 7595 - Add branchcode to accountlines
Review of attachment 27337 [details] [review]: -----------------------------------------------------------------
::: C4/Accounts.pm @@ +407,4 @@
my ( $borrowernumber, $itemnum, $desc, $type, $amount, $note ) = @_; my $manager_id = 0; $manager_id = C4::Context->userenv->{'number'} if C4::Context->userenv; + my $branchcode = C4::Context->userenv->{'branch'};
Why does this differ than line 359? my $branchcode = C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef;
-- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #30947|0 |1 is obsolete| | --- Comment #28 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 30950 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=30950&action=edit Bug 7595 - Add branchcode to accountlines Adds a branchcode column to the accountlines table. For payments, this inserts the branchcode of the library where the payment was recorded. For manual invoices, it insert the branchcode of the library where the manual invoice was created. NOTE: Rebased -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Marc Véron <veron@veron.ch> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |veron@veron.ch --- Comment #29 from Marc Véron <veron@veron.ch> --- Does not apply. Applying: Bug 7595 - Add branchcode to accountlines Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging installer/data/mysql/updatedatabase.pl Auto-merging installer/data/mysql/kohastructure.sql Auto-merging C4/Reserves.pm CONFLICT (content): Merge conflict in C4/Reserves.pm Auto-merging C4/Overdues.pm Auto-merging C4/Circulation.pm Auto-merging C4/Accounts.pm CONFLICT (content): Merge conflict in C4/Accounts.pm Failed to merge in the changes. Patch failed at 0001 Bug 7595 - Add branchcode to accountlines -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jonathan.druart@biblibre.co | |m Status|Needs Signoff |Patch doesn't apply -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 M. Tompsett <mtompset@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |ASSIGNED -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 M. Tompsett <mtompset@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #30950|0 |1 is obsolete| | --- Comment #30 from M. Tompsett <mtompset@hotmail.com> --- Created attachment 38150 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=38150&action=edit Bug 7595 - Add branchcode to accountlines Adds a branchcode column to the accountlines table. For payments, this inserts the branchcode of the library where the payment was recorded. For manual invoices, it insert the branchcode of the library where the manual invoice was created. NOTE: Rebased -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 M. Tompsett <mtompset@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |mtompset@hotmail.com --- Comment #31 from M. Tompsett <mtompset@hotmail.com> --- I'll triple check I didn't miss anything in the fix later. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 M. Tompsett <mtompset@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #38150|0 |1 is obsolete| | --- Comment #32 from M. Tompsett <mtompset@hotmail.com> --- Created attachment 38225 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=38225&action=edit Bug 7595 - Add branchcode to accountlines Adds a branchcode column to the accountlines table. For payments, this inserts the branchcode of the library where the payment was recorded. For manual invoices, it insert the branchcode of the library where the manual invoice was created. NOTE: Rebased -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 M. Tompsett <mtompset@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |Needs Signoff --- Comment #33 from M. Tompsett <mtompset@hotmail.com> --- There. Should be like it was. :) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 --- Comment #34 from Marc Véron <veron@veron.ch> --- Created attachment 38235 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=38235&action=edit [Signed-off] Bug 7595 - Add branchcode to accountlines Adds a branchcode column to the accountlines table. For payments, this inserts the branchcode of the library where the payment was recorded. For manual invoices, it insert the branchcode of the library where the manual invoice was created. NOTE: Rebased --- How I tested: - Apply patch - Do payments, create manual invoices, create credits for patrons and verified result using mysql. Note: Resolved easy conflict in updatedatabase.pl Signed-off-by: Marc Véron <veron@veron.ch> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Marc Véron <veron@veron.ch> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #38225|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Marc Véron <veron@veron.ch> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA --- Comment #35 from Jonathan Druart <jonathan.druart@biblibre.com> --- Please provide tests for changes in modules. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 --- Comment #36 from M. Tompsett <mtompset@hotmail.com> --- (In reply to Jonathan Druart from comment #35)
Please provide tests for changes in modules.
True, most is covered: t/db_dependent/Accounts.t t/db_dependent/Circulation.t t/db_dependent/Circulation_issue.t t/db_dependent/Reserves.t However, the makepayment, chargelostitem, manualinvoice, recordpayment_selectaccts, and makepartialpayment need test coverage. I'm also not certain how to trigger _FixAccountForLostAndReturned, except that AddIssue does call it. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595 Marc Véron <veron@veron.ch> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |http://bugs.koha-community. | |org/bugzilla3/show_bug.cgi? | |id=3054 -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org