[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Kyle M Hall  changed:

   What|Removed |Added

 Resolution|WONTFIX |DUPLICATE

--- Comment #53 from Kyle M Hall  ---


*** This bug has been marked as a duplicate of bug 19066 ***

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Kyle M Hall  changed:

   What|Removed |Added

 Resolution|--- |WONTFIX
 Status|Failed QA   |RESOLVED

--- Comment #52 from Kyle M Hall  ---
This is too old to rework. Closing out. Will start fresh.

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Nicole C. Engard  changed:

   What|Removed |Added

 CC|neng...@gmail.com   |

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

--- Comment #51 from Katrin Fischer  ---
Continued testing, but didn't get much further:

IV CIRCULATION
1) Checkout with rental fine
   OK
2) Renew with rental fine
   NOT OK - no rental fine recorded

>From the logs:

[Mon Aug 15 00:09:28.378180 2016] [cgi:error] [pid 20899] [client
127.0.0.1:48043] AH01215: [Mon Aug 15 00:09:28 2016] renew: DBD::mysql::st
execute failed: Unknown column 'branch' in 'field list' [for Statement "INSERT
INTO accountlines, referer:
http://localhost:8080/cgi-bin/koha/circ/circulation.pl?borrowernumber=1
[Mon Aug 15 00:09:28.378352 2016] [cgi:error] [pid 20899] [client
127.0.0.1:48043] AH01215: [Mon Aug 15 00:09:28 2016] renew:
(date, borrowernumber, accountno, amount, manager_id,, referer:
http://localhost:8080/cgi-bin/koha/circ/circulation.pl?borrowernumber=1
[Mon Aug 15 00:09:28.378447 2016] [cgi:error] [pid 20899] [client
127.0.0.1:48043] AH01215: [Mon Aug 15 00:09:28 2016] renew:
description,accounttype, amountoutstanding, itemnumber, branch), referer:
http://localhost:8080/cgi-bin/koha/circ/circulation.pl?borrowernumber=1
[Mon Aug 15 00:09:28.378810 2016] [cgi:error] [pid 20899] [client
127.0.0.1:48043] AH01215: [Mon Aug 15 00:09:28 2016] renew:
VALUES (now(),?,?,?,?,?,?,?,?,?)" with ParamValues: 0="1", 1='43', 2=0.1000,
3="1", 4="Renewal of Rental Item Something", 5='Rent', 6=0.1000, 7="751",
8="TPL"] at /home/katrin/kohaclone/C4/Circulation.pm line 3120., referer:
http://localhost:8080/cgi-bin/koha/circ/circulation.pl?borrowernumber=1

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Katrin Fischer  changed:

   What|Removed |Added

 Status|Signed Off  |Failed QA

--- Comment #50 from Katrin Fischer  ---
I am testing with a staff patron logged in at a different branch than their
homebranch. The problems spotted so far concern writing off fines.

Some first test results: 

I GENERAL
- Passes QA test tools
- Passes perl t/db_dependent/Accounts.t
- Database update ok

II API
1) Koha offline circulation
- Payment is correctly applied.
  Logged-in branch of the staff user is recorded.
2) SIP
-  ( To be tested )

III PATRON ACCOUNT - STAFF
1) Reverse payment
   OK
2) Create manual invoice
   OK
3) Create manual credit
   OK
4) Pay (single fine)
   OK
5) Pay selected
   OK
6) Write off (single fine)
   NOT OK - doesn't record a branchcode.
7) Pay an amount (partial)
   OK
8) Write off all
   NOT OK - doesn't record a branchcode.

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

--- Comment #49 from Kyle M Hall  ---
Created attachment 54264
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=54264=edit
Bug 7595 - Update Schema

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

--- Comment #48 from Kyle M Hall  ---
Created attachment 54263
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=54263=edit
Bug 7595 - Unit Tests

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Kyle M Hall  changed:

   What|Removed |Added

  Attachment #52909|0   |1
is obsolete||
  Attachment #52910|0   |1
is obsolete||
  Attachment #52911|0   |1
is obsolete||

--- Comment #47 from Kyle M Hall  ---
Created attachment 54262
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=54262=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 

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.

Signed-off-by: Marc Veron 

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

--- Comment #46 from Katrin Fischer  ---
Looking at this again. 

Passes tests and QA test tools. 

I'd have preferred smaller steps here, it will take a while to work through
this as it touches all of the fines and fee related features:

  - recordpayment
  - makepayment
  - chargelostitem
  - manualinvoice
  - recordpayment_selectaccts
  - FixAccountForLostAndReturned
  - AddRenewal (rentals)
  - AddIssuingCharge (rentals)
  - UpdateFine (overdues)
  - AddReserve (hold fee)

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

--- Comment #45 from Kyle M Hall  ---
(In reply to Katrin Fischer from comment #44)
> I have done some first tests - not so bad so far, but I worry about paying
> via SIP. Can you please verify that this works still as well?
> Which branch should be logged? The branch of the SIP user from the config
> file?

Yes, it should be the branch of the SIP user from the config file.

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

--- Comment #44 from Katrin Fischer  ---
I have done some first tests - not so bad so far, but I worry about paying via
SIP. Can you please verify that this works still as well?
Which branch should be logged? The branch of the SIP user from the config file?

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

--- Comment #43 from Katrin Fischer  ---
There are no sign-off lines on these patches - Kyle & Marc, can you please
check?

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

--- Comment #41 from Kyle M Hall  ---
Created attachment 52911
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=52911=edit
Bug 7595 - Update Schema

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

--- Comment #42 from Kyle M Hall  ---
> If 15894 will include testing for
> > makepayment,
> > recordpayment_selectaccts,
> > makepartialpayment
> then that would seem acceptable to me.

Yes, that bug will remove those subs and unify them into one easily testable
sub.

For the other subs, I've added a decent amount of testing above the branchcode
testing alone, as none of them have unit tests yet!

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

--- Comment #40 from Kyle M Hall  ---
Created attachment 52910
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=52910=edit
Bug 7595 - Unit Tests

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Kyle M Hall  changed:

   What|Removed |Added

 Status|Failed QA   |Signed Off

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Kyle M Hall  changed:

   What|Removed |Added

  Attachment #38235|0   |1
is obsolete||

--- Comment #39 from Kyle M Hall  ---
Created attachment 52909
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=52909=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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

--- Comment #38 from M. Tompsett  ---
[SEVERELY EDIT'D AND REORDERED]
(In reply to Kyle M Hall from comment #37)
> (In reply to M. Tompsett from comment #36)
> > chargelostitem,
> > manualinvoice,
> > _FixAccountForLostAndReturned
> > makepayment,
> > recordpayment_selectaccts,
> > makepartialpayment

> payment handling subroutines... unified by bug 15894.
> Bug 15894 will include unit testing for payments.
...
> chargelostitem,
> manualinvoice,
> _FixAccountForLostAndReturned
...
> How does that sound?

If 15894 will include testing for
> makepayment,
> recordpayment_selectaccts,
> makepartialpayment
then that would seem acceptable to me.

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

--- Comment #37 from Kyle M Hall  ---
(In reply to M. Tompsett from comment #36)
> (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.

I'm going to argue that we should for the time being, pass on tests for the
three payment handling subroutines, as they will be unified by bug 15894. If
this is agreeable, I will write tests for chargelostitem, manualinvoice, and
_FixAccountForLostAndReturned. Bug 15894 will include unit testing for
payments.

How does that sound?

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Nicole C. Engard  changed:

   What|Removed |Added

   See Also||https://bugs.koha-community
   ||.org/bugzilla3/show_bug.cgi
   ||?id=10708

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Marc Véron  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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Marc Véron ve...@veron.ch changed:

   What|Removed |Added

  Attachment #38225|0   |1
is obsolete||

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Marc Véron ve...@veron.ch changed:

   What|Removed |Added

 Status|Needs Signoff   |Signed Off

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

--- Comment #34 from Marc Véron ve...@veron.ch ---
Created attachment 38235
  --
http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=38235action=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 ve...@veron.ch

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

--- Comment #36 from M. Tompsett mtomp...@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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Jonathan Druart jonathan.dru...@biblibre.com changed:

   What|Removed |Added

 Status|Signed Off  |Failed QA

--- Comment #35 from Jonathan Druart jonathan.dru...@biblibre.com ---
Please provide tests for changes in modules.

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

M. Tompsett mtomp...@hotmail.com changed:

   What|Removed |Added

  Attachment #38150|0   |1
is obsolete||

--- Comment #32 from M. Tompsett mtomp...@hotmail.com ---
Created attachment 38225
  --
http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=38225action=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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

M. Tompsett mtomp...@hotmail.com changed:

   What|Removed |Added

 Status|ASSIGNED|Needs Signoff

--- Comment #33 from M. Tompsett mtomp...@hotmail.com ---
There. Should be like it was. :)

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

M. Tompsett mtomp...@hotmail.com changed:

   What|Removed |Added

 Status|Patch doesn't apply |ASSIGNED

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

M. Tompsett mtomp...@hotmail.com changed:

   What|Removed |Added

  Attachment #30950|0   |1
is obsolete||

--- Comment #30 from M. Tompsett mtomp...@hotmail.com ---
Created attachment 38150
  --
http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=38150action=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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

M. Tompsett mtomp...@hotmail.com changed:

   What|Removed |Added

 CC||mtomp...@hotmail.com

--- Comment #31 from M. Tompsett mtomp...@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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Jonathan Druart jonathan.dru...@biblibre.com changed:

   What|Removed |Added

 CC||jonathan.dru...@biblibre.co
   ||m
 Status|Needs Signoff   |Patch doesn't apply

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Marc Véron ve...@veron.ch changed:

   What|Removed |Added

 CC||ve...@veron.ch

--- Comment #29 from Marc Véron ve...@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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Kyle M Hall k...@bywatersolutions.com changed:

   What|Removed |Added

  Attachment #27337|0   |1
is obsolete||

--- Comment #25 from Kyle M Hall k...@bywatersolutions.com ---
Created attachment 30946
  --
http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=30946action=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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Kyle M Hall k...@bywatersolutions.com changed:

   What|Removed |Added

  Attachment #30946|0   |1
is obsolete||

--- Comment #26 from Kyle M Hall k...@bywatersolutions.com ---
Created attachment 30947
  --
http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=30947action=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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

--- Comment #27 from Kyle M Hall k...@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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Kyle M Hall k...@bywatersolutions.com changed:

   What|Removed |Added

  Attachment #30947|0   |1
is obsolete||

--- Comment #28 from Kyle M Hall k...@bywatersolutions.com ---
Created attachment 30950
  --
http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=30950action=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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

M. Tompsett mtomp...@hotmail.com changed:

   What|Removed |Added

  Attachment #23308|0   |1
is obsolete||

--- Comment #23 from M. Tompsett mtomp...@hotmail.com ---
Created attachment 27337
  --
http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27337action=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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

M. Tompsett mtomp...@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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

--- Comment #24 from M. Tompsett mtomp...@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.htmlbug=7595attachment=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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

wajasu matted-34...@mypacks.net changed:

   What|Removed |Added

 Status|Needs Signoff   |Patch doesn't apply
 CC||matted-34...@mypacks.net

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Kyle M Hall k...@bywatersolutions.com changed:

   What|Removed |Added

  Attachment #20808|0   |1
is obsolete||

--- Comment #21 from Kyle M Hall k...@bywatersolutions.com ---
Created attachment 23306
  --
http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=23306action=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 neng...@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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Kyle M Hall k...@bywatersolutions.com changed:

   What|Removed |Added

 Status|Failed QA   |Needs Signoff

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Kyle M Hall k...@bywatersolutions.com changed:

   What|Removed |Added

  Attachment #20809|0   |1
is obsolete||
  Attachment #23306|0   |1
is obsolete||

--- Comment #22 from Kyle M Hall k...@bywatersolutions.com ---
Created attachment 23308
  --
http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=23308action=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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

--- Comment #20 from Katrin Fischer katrin.fisc...@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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Katrin Fischer katrin.fisc...@bsz-bw.de changed:

   What|Removed |Added

 CC||katrin.fisc...@bsz-bw.de
 QA Contact|koha.sek...@gmail.com   |

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Kyle M Hall k...@bywatersolutions.com changed:

   What|Removed |Added

  Attachment #14815|0   |1
is obsolete||

--- Comment #18 from Kyle M Hall k...@bywatersolutions.com ---
Created attachment 20809
  --
http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=20809action=edit
Bug 7595 - Add branchcode to accountlines - Followup

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Kyle M Hall k...@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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Kyle M Hall k...@bywatersolutions.com changed:

   What|Removed |Added

  Attachment #14814|0   |1
is obsolete||

--- Comment #17 from Kyle M Hall k...@bywatersolutions.com ---
Created attachment 20808
  --
http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=20808action=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 neng...@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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Kyle M Hall k...@bywatersolutions.com changed:

   What|Removed |Added

Version|3.8 |master

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

cedric.v...@dracenie.com changed:

   What|Removed |Added

 Status|Needs Signoff   |Patch doesn't apply
 CC||cedric.v...@dracenie.com

--- Comment #16 from cedric.v...@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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Kyle M Hall k...@bywatersolutions.com changed:

   What|Removed |Added

  Attachment #12394|0   |1
is obsolete||

--- Comment #14 from Kyle M Hall k...@bywatersolutions.com ---
Created attachment 14814
  --
http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=14814action=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 neng...@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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Kyle M Hall k...@bywatersolutions.com changed:

   What|Removed |Added

  Attachment #12395|0   |1
is obsolete||

--- Comment #15 from Kyle M Hall k...@bywatersolutions.com ---
Created attachment 14815
  --
http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=14815action=edit
Bug 7595 - Add branchcode to accountlines - Followup

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Kyle M Hall k...@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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Chris Cormack ch...@bigballofwax.co.nz changed:

   What|Removed |Added

 Status|Needs Signoff   |Patch doesn't apply
 CC||ch...@bigballofwax.co.nz

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

M. Tompsett mtomp...@hotmail.com changed:

   What|Removed |Added

  Attachment #12719|0   |1
is obsolete||

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

--- Comment #12 from M. Tompsett mtomp...@hotmail.com ---
Created attachment 12717
  --
http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=12717action=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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

wajasu matted-34...@mypacks.net changed:

   What|Removed |Added

  Attachment #12717|0   |1
is obsolete||

--- Comment #13 from wajasu matted-34...@mypacks.net ---
Created attachment 12719
  --
http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=12719action=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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Kyle M Hall k...@bywatersolutions.com changed:

   What|Removed |Added

   Attachment #8162|0   |1
is obsolete||

--- Comment #10 from Kyle M Hall k...@bywatersolutions.com ---
Created attachment 12394
  --
http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=12394action=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 neng...@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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

--- Comment #11 from Kyle M Hall k...@bywatersolutions.com ---
Created attachment 12395
  --
http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=12395action=edit
Bug 7595 - Add branchcode to accountlines - Followup

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Kyle M Hall k...@bywatersolutions.com changed:

   What|Removed |Added

 Status|Failed QA   |Needs Signoff
 CC||k...@bywatersolutions.com

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Ian Walls koha.sek...@gmail.com changed:

   What|Removed |Added

 Status|Signed Off  |Failed QA

--- Comment #9 from Ian Walls koha.sek...@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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Nicole C. Engard neng...@gmail.com changed:

   What|Removed |Added

   Attachment #8037|0   |1
is obsolete||

--- Comment #8 from Nicole C. Engard neng...@gmail.com ---
Created attachment 8162
  --
http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=8162action=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 neng...@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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Nicole C. Engard neng...@gmail.com changed:

   What|Removed |Added

 Status|Needs Signoff   |Signed Off

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Kyle M Hall kyle.m.h...@gmail.com changed:

   What|Removed |Added

   Attachment #7870|0   |1
is obsolete||

--- Comment #7 from Kyle M Hall kyle.m.h...@gmail.com ---
Created attachment 8037
  --
http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=8037action=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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Kyle M Hall kyle.m.h...@gmail.com changed:

   What|Removed |Added

 Status|Failed QA   |Needs Signoff

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Ian Walls koha.sek...@gmail.com changed:

   What|Removed |Added

 Status|Signed Off  |Failed QA

--- Comment #6 from Ian Walls koha.sek...@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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

--- Comment #1 from Kyle M Hall kyle.m.h...@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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Kyle M Hall kyle.m.h...@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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Kyle M Hall kyle.m.h...@gmail.com changed:

   What|Removed |Added

   Attachment #7866|0   |1
is obsolete||

--- Comment #2 from Kyle M Hall kyle.m.h...@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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Kyle M Hall kyle.m.h...@gmail.com changed:

   What|Removed |Added

   Attachment #7868|0   |1
is obsolete||

--- Comment #4 from Kyle M Hall kyle.m.h...@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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Nicole C. Engard neng...@gmail.com changed:

   What|Removed |Added

   Attachment #7869|0   |1
is obsolete||

--- Comment #5 from Nicole C. Engard neng...@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 neng...@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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 7595] Add branchcode to accountlines

[bugzilla-daemon]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7595

Nicole C. Engard neng...@gmail.com changed:

   What|Removed |Added

 Status|Needs Signoff   |Signed Off
 CC||neng...@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.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/