[Bug 12896] New: Move the bookseller-related code into its own module
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Bug ID: 12896 Summary: Move the bookseller-related code into its own module Change sponsored?: --- Product: Koha Version: master Hardware: All OS: All Status: NEW Severity: normal Priority: P5 - low Component: Architecture, internals, and plumbing Assignee: gmcharlt@gmail.com Reporter: jonathan.druart@biblibre.com QA Contact: testopia@bugs.koha-community.org The C4::Acquisition module should be exploded in order to add readability and maintainability to this part of the code. I propose to create a new Koha::Acquisition::Bookseller module and to put in it the code related to the bookseller management. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Blocks| |12826 Depends on| |12830, 5342 Assignee|gmcharlt@gmail.com |jonathan.druart@biblibre.co | |m -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 --- Comment #1 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 31491 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=31491&action=edit Bug 12896: Move the bookseller-related code into Koha::Acquisition::Bookseller The C4::Acquisition module should be exploded in order to add readability and maintainability to this part of the code. This patch is a POC, it introduces a new Koha::Acquisition::Bookseller module and put in it the code from GetBookSeller and GetBookSellerFromId. Test plan: 1/ Create a bookseller, modify it. 2/ Add contacts for this bookseller 3/ Create an order, receive it, transfer it 4/ Launch the prove command on all unit tests modified by this patch and verify that all pass. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Francois Charbonnier <francois.charbonnier@inlibro.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |francois.charbonnier@inlibr | |o.com -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Paola Rossi <paola.rossi@cineca.it> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA CC| |paola.rossi@cineca.it --- Comment #2 from Paola Rossi <paola.rossi@cineca.it> --- I've applied the (7) patches against master 3.17.00.023 I selected a vendor. On acqui/supplier.pl, I could select "+New" contract or "+New" vendor without errors. But, if I selected "+New" basket this Software error occurred: Can't use string ("") as a subroutine ref while "strict refs" in use at /var/root-koha/bug-XXXX/acqui/basketheader.pl line 109 Same error occurred selecting "+New basket" on the list of the vendors, on /acqui/booksellers.pl. So I pass the patch to "Failed QA". -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Jonathan Druart <jonathan.druart@biblibre.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=12896 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #31491|0 |1 is obsolete| | --- Comment #3 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 31595 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=31595&action=edit Bug 12896: Move the bookseller-related code into Koha::Acquisition::Bookseller -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Paola Rossi <paola.rossi@cineca.it> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA --- Comment #4 from Paola Rossi <paola.rossi@cineca.it> --- Today I've applied the patches against master 3.17.00.023 About step 4/ I tried: t/db_dependent/Letters.t t/db_dependent/Bookseller.t t/db_dependent/Acquisition/Invoices.t t/db_dependent/Acquisition.t t/db_dependent/Acquisition/NewOrder.t t/db_dependent/Budgets.t t/db_dependent/Acquisition/CancelReceipt.t t/db_dependent/Acquisition/GetBasketsInfosByBookseller.t t/db_dependent/Acquisition/GetOrdersByBiblionumber.t t/db_dependent/Acquisition/OrderFromSubscription.t t/db_dependent/Acquisition/TransferOrder.t t/db_dependent/Acquisition/close_reopen_basket.t t/db_dependent/Contract.t
perl t/db_dependent/Acquisition/OrderFromSubscription.t 1..13 ok 1 - use C4::Acquisition; ok 2 - use C4::Biblio; ok 3 - use C4::Budgets; ok 4 - use C4::Serials; Undefined subroutine &C4::Bookseller::AddBookseller called at t/db_dependent/Acquisition/OrderFromSubscription.t line 18. # Looks like you planned 13 tests but ran 4. # Looks like your test exited with 255 just after 4.
So I pass the patch to "Failed QA" status. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Jonathan Druart <jonathan.druart@biblibre.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=12896 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #31595|0 |1 is obsolete| | --- Comment #5 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 31691 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=31691&action=edit Bug 12896: Move the bookseller-related code into Koha::Acquisition::Bookseller The C4::Acquisition module should be exploded in order to add readability and maintainability to this part of the code. This patch is a POC, it introduces a new Koha::Acquisition::Bookseller module and put in it the code from GetBookSeller and GetBookSellerFromId. Test plan: 1/ Create a bookseller, modify it. 2/ Add contacts for this bookseller 3/ Create an order, receive it, transfer it 4/ Launch the prove command on all unit tests modified by this patch and verify that all pass. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Paola Rossi <paola.rossi@cineca.it> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #6 from Paola Rossi <paola.rossi@cineca.it> --- Thanks, Jonathan. Today I've tried to apply the patches against master 3.17.00.025 The first patch is 5342. Applying: Bug 5342: Serial claiming improvements: add a counter Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Acquisition/OrderFromSubscription.t Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging installer/data/mysql/kohastructure.sql Failed to merge in the changes. Patch failed at 0001 Bug 5342: Serial claiming improvements: add a counter I've resolved the conflict about updatedatabase.pl. Then , being in doubt, I immediately proved all the 5342's *.t. One error occurred: prove t/db_dependent/Acquisition/OrderFromSubscription.t t/db_dependent/Acquisition/OrderFromSubscription.t .. 1/13 # Looks like you planned 13 tests but ran 12. t/db_dependent/Acquisition/OrderFromSubscription.t .. Dubious, test returned 255 (wstat 65280, 0xff00) Failed 1/13 subtests Test Summary Report ------------------- t/db_dependent/Acquisition/OrderFromSubscription.t (Wstat: 65280 Tests: 12 Failed: 0) Non-zero exit status: 255 Parse errors: Bad plan. You planned 13 tests but ran 12. Files=1, Tests=12, 1 wallclock secs ( 0.00 usr 0.02 sys + 0.84 cusr 0.22 csys = 1.08 CPU) Result: FAIL ----------------------------------------------------------------------------- So I pass the patch to "Patch doesn't apply" status. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff --- Comment #7 from Jonathan Druart <jonathan.druart@biblibre.com> --- Bug 5342 rebased. Should be ok now. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- 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=12896 Jonathan Druart <jonathan.druart@biblibre.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=12896 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #31691|0 |1 is obsolete| | --- Comment #8 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 31695 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=31695&action=edit Bug 12896: Move the bookseller-related code into Koha::Acquisition::Bookseller The C4::Acquisition module should be exploded in order to add readability and maintainability to this part of the code. This patch is a POC, it introduces a new Koha::Acquisition::Bookseller module and put in it the code from GetBookSeller and GetBookSellerFromId. Test plan: 1/ Create a bookseller, modify it. 2/ Add contacts for this bookseller 3/ Create an order, receive it, transfer it 4/ Launch the prove command on all unit tests modified by this patch and verify that all pass. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Paola Rossi <paola.rossi@cineca.it> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #9 from Paola Rossi <paola.rossi@cineca.it> --- Now I've tried to apply the patches against master 3.17.00.025 again. The first patch was 5342, and it was OK, thanks. Having read: <http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12827#c22>, and having seen some errors occurred proving: prove t/db_dependent/Letters.t I applied the patch 12953, and so the t/db_dependent/Letters.t became OK. Next applied patch was then 12830: Applying: Bug 12830: Move the order-related code into Koha::Acquisition::Order Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Letters.t CONFLICT (content): Merge conflict in t/db_dependent/Letters.t Auto-merging t/db_dependent/Acquisition/OrderFromSubscription.t Failed to merge in the changes. Patch failed at 0001 Bug 12830: Move the order-related code into Koha::Acquisition::Order And so I pass the patch 12896 to "Patch doesn't apply" status. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 --- Comment #10 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to Paola Rossi from comment #9)
And so I pass the patch 12896 to "Patch doesn't apply" status.
Now bug 12830 depends on bug 12953. This one should apply correctly on top. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Jonathan Druart <jonathan.druart@biblibre.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=12896 Paola Rossi <paola.rossi@cineca.it> 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=12896 Paola Rossi <paola.rossi@cineca.it> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #31695|0 |1 is obsolete| | --- Comment #11 from Paola Rossi <paola.rossi@cineca.it> --- Created attachment 31730 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=31730&action=edit Bug 12896: Move the bookseller-related code into Koha::Acquisition::Bookseller I've applied against 3.17.00.025 Everything is OK. So I pass the patch to "Signed Off" status. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply CC| |kyle@bywatersolutions.com --- Comment #12 from Kyle M Hall <kyle@bywatersolutions.com> --- Looks like there are a number of merge conflicts with the unit test file. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Signed Off --- Comment #13 from Kyle M Hall <kyle@bywatersolutions.com> --- Forgot to apply the dependancies. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |12969 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on|5342 |12852 --- Comment #14 from Jonathan Druart <jonathan.druart@biblibre.com> --- Bug 12852 should be applied on top of bug 5342, and then this patch. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply CC| |katrin.fischer@bsz-bw.de --- Comment #15 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hi Paola, I have tried working my way through the dependencies here, but I must be missing something. Can you still get this to apply? Or maybe you still have your testing branch and could take a look at the sequence you applied the patches in? -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 --- Comment #16 from Paola Rossi <paola.rossi@cineca.it> --- (In reply to Katrin Fischer from comment #15)
Hi Paola, I have tried working my way through the dependencies here, but I must be missing something. Can you still get this to apply? Or maybe you still have your testing branch and could take a look at the sequence you applied the patches in?
Kind Katrin, I'm sorry, I'm not able to help you. I signed off on Sep the 19-th, against master 3.17.00.025, attaching to bugzilla an 0004* file. So I suppose I followed exactly the Jonathan's note of comment 10:
Now bug 12830 depends on bug 12953. This one should apply correctly on top.
Today [3.17.00.033] the patch 12953 (1) is already pushed to master, whilst the patch 12830 (2) not. So, applying against master, the two 12830 are OK, but this patch 12896 is not OK [as it should be expected after Sep 23-th]. This is the conflict: Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Acquisition/OrderFromSubscription.t CONFLICT (content): Merge conflict in t/db_dependent/Acquisition/OrderFromSubscription.t Auto-merging acqui/addorderiso2709.pl Failed to merge in the changes. Patch failed at 0001 Bug 12896: Move the bookseller-related code into Koha::Acquisition::Bookseller -------------------------------------------------------------------- The 5342's dependency was required later, on the 23-th. But I see conflict: 1) either applying 5342 soon after 12830, 2) or applying 12852/29-th [as Jonathan asked in comment 14] after 12830, 3) or applying 12852/PassedQA Oct 11 (after 12830 or without 12830) So I'm sorry, I can't help you. ---------------------------------------------- 5342's conflict after applying 12830: Applying: Bug 5342: Serial claiming improvements: add a counter Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... error: The following untracked working tree files would be overwritten by merge: t/db_dependent/Serials/Claims.t Please move or remove them before you can merge. Aborting Failed to merge in the changes. Patch failed at 0001 Bug 5342: Serial claiming improvements: add a counter ----------------------------- The conflict of the patch 12852, version of Sep, the 29-th, after applying 12830: Applying: Bug 12852: The "preview" param can be removed serials/claims.pl Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging serials/claims.pl CONFLICT (content): Merge conflict in serials/claims.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt Failed to merge in the changes. Patch failed at 0001 Bug 12852: The "preview" param can be removed serials/claims.pl ====================================================================== -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 --- Comment #17 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hi Paola, thx for trying. I think we will have to wait for Jonathan then to help. I have QA'd some of the other patches and will if I can do more without this one. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 --- Comment #18 from Paola Rossi <paola.rossi@cineca.it> --- I've tried to apply against master 3.17.00.035 (head bug 13088) At first I applied 12852 (OK). Then: Applying: Bug 12896: Move the bookseller-related code into Koha::Acquisition::Bookseller Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... error: The following untracked working tree files would be overwritten by merge: Koha/Acquisition/Bookseller.pm Please move or remove them before you can merge. Aborting Failed to merge in the changes. Patch failed at 0001 Bug 12896: Move the bookseller-related code into Koha::Acquisition::Bookseller I keep the patch in the "Patch doesn't apply" status. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #31730|0 |1 is obsolete| | --- Comment #19 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 33164 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=33164&action=edit Bug 12896: Move the bookseller-related code into Koha::Acquisition::Bookseller The C4::Acquisition module should be exploded in order to add readability and maintainability to this part of the code. This patch is a POC, it introduces a new Koha::Acquisition::Bookseller module and put in it the code from GetBookSeller and GetBookSellerFromId. Test plan: 1/ Create a bookseller, modify it. 2/ Add contacts for this bookseller 3/ Create an order, receive it, transfer it 4/ Launch the prove command on all unit tests modified by this patch and verify that all pass. Signed-off-by: Paola Rossi <paola.rossi@cineca.it> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Signed Off --- Comment #20 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to Paola Rossi from comment #18) There only was a small conflict on the number of unit tests.
Falling back to patching base and 3-way merge... error: The following untracked working tree files would be overwritten by merge: Koha/Acquisition/Bookseller.pm Please move or remove them before you can merge. Aborting Failed to merge in the changes. Patch failed at 0001 Bug 12896: Move the bookseller-related code into Koha::Acquisition::Bookseller
You should remove the file and retry to apply this patch. Back to needs signoff. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 --- Comment #21 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to Jonathan Druart from comment #20)
Back to needs signoff.
I meant to Signed off! -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 --- Comment #22 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Applies cleanly on master now :) But will have to continue tomorrow. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA --- Comment #23 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hi Jonathan, I tested all files included in the patch and they work fine... but: git grep GetBookSeller serials/claims.pl:use C4::Bookseller qw( GetBookSeller ); serials/claims.pl: @supplierinfo=GetBookSeller($supplierid); t/db_dependent/Bookseller.t:#Test GetBookSeller t/db_dependent/Bookseller.t: "Get Supplier1 (GetBookSellerFromId)" ); ... and serials claims actually explodes when you try to open it. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Signed Off --- Comment #24 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to Katrin Fischer from comment #23)
Hi Jonathan,
I tested all files included in the patch and they work fine... but:
git grep GetBookSeller serials/claims.pl:use C4::Bookseller qw( GetBookSeller ); serials/claims.pl: @supplierinfo=GetBookSeller($supplierid); t/db_dependent/Bookseller.t:#Test GetBookSeller t/db_dependent/Bookseller.t: "Get Supplier1 (GetBookSellerFromId)" );
... and serials claims actually explodes when you try to open it.
git remote update git checkout -b bug_12896 origin/master git bz apply 12852 git bz apply 12896 git grep GetBookSeller misc/release_notes/release_notes_3_10_0.txt: 8223 minor Properly format SQL query in C4::Bookseller::GetBookSeller t/db_dependent/Bookseller.t:#Test GetBookSeller t/db_dependent/Bookseller.t: "Get Supplier1 (GetBookSellerFromId)" ); You certainly forgot to apply 12852 before. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 --- Comment #25 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 33298 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=33298&action=edit Bug 12896: Remove 2 occurrences in comments -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 --- Comment #26 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- You are totally right... dependencies dependencies... will retest tonight. All other things I tested worked nicely, I am being carefully optimistic :) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 --- Comment #27 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- C4/Acquisition.pm | 4 +- C4/Bookseller.pm | 53 +-------- Koha/Acquisition/Bookseller.pm | 124 +++++++++++++++++++++ acqui/addorderiso2709.pl | No regression found. acqui/basket.pl | No regression found. acqui/basketgroup.pl | No regression found. acqui/basketheader.pl | No regression found. acqui/booksellers.pl | No regression found. acqui/finishreceive.pl | No regression found. acqui/invoice.pl | No regression found. acqui/invoices.pl | No regression found. acqui/modordernotes.pl | No regression found. acqui/neworderbiblio.pl | No regression found. acqui/neworderempty.pl | No regression found. acqui/newordersubscription.pl | No regression found. acqui/newordersuggestion.pl | No regression found. acqui/orderreceive.pl | No regression found. acqui/parcel.pl | No regression found. acqui/parcels.pl | No regression found. acqui/supplier.pl | No regression found. acqui/transferorder.pl | No regression found. acqui/uncertainprice.pl | No regression found. acqui/z3950_search.pl | No regression found. admin/aqcontract.pl | No regresison found. catalogue/moredetail.pl | No regression found. serials/acqui-search-result.pl | No regression found. serials/subscription-detail.pl | No regression found. t/db_dependent/Acquisition.t | Pass t/db_dependent/Acquisition/Invoices.t | Pass t/db_dependent/Acquisition/OrderFromSubscription.t | Pass t/db_dependent/Bookseller.t | Pass t/db_dependent/Letters.t | Pass Serials - Subscription search - Subscription detail - vendor shows - Subscription edit - vendor can be searched and linked Acquisitons - vendors - searching for vendors - vendor details, editing a vendors Acquisitions - baskets & basket groups - adding a new basket group - printing PDF Acquisitons - uncertain prices - viewing uncertain prices list Acquisitions - contracts - adding, editing, deleting a contract Acquisition - baskets - adding a new basket - changing basket header details - order from z39.50 - order from 'new' - order from existing - order from staged - order from subscription - order from suggestion - transferring an order - adding vendor and internal note Acquisition - receive shipment - receive a new shipment - reveiving orders - undo receipt - canceling an order - giving a reason (new) - finish receiving Acquisitions - invoices - Searching for invoices - Closing an invoice - Viewing an invoice Catalog - detail page - Acquisition tab - Items tab - display of bookseller and acquisition information Also: git grep GetBookSeller - no references found. git grep GetBookSellerFromId - no references found. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA Patch complexity|--- |Medium patch -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #33164|0 |1 is obsolete| | Attachment #33298|0 |1 is obsolete| | --- Comment #28 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 33332 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=33332&action=edit [PASSED QA] Bug 12896: Move the bookseller-related code into Koha::Acquisition::Bookseller The C4::Acquisition module should be exploded in order to add readability and maintainability to this part of the code. This patch is a POC, it introduces a new Koha::Acquisition::Bookseller module and put in it the code from GetBookSeller and GetBookSellerFromId. Test plan: 1/ Create a bookseller, modify it. 2/ Add contacts for this bookseller 3/ Create an order, receive it, transfer it 4/ Launch the prove command on all unit tests modified by this patch and verify that all pass. Signed-off-by: Paola Rossi <paola.rossi@cineca.it> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 --- Comment #29 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 33333 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=33333&action=edit [PASSED QA] Bug 12896: Remove 2 occurrences in comments Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Passes tests and QA script. Full test report on the bug report. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #33332|0 |1 is obsolete| | Attachment #33333|0 |1 is obsolete| | --- Comment #30 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 33855 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=33855&action=edit Bug 12896: Move the bookseller-related code into Koha::Acquisition::Bookseller The C4::Acquisition module should be exploded in order to add readability and maintainability to this part of the code. This patch is a POC, it introduces a new Koha::Acquisition::Bookseller module and put in it the code from GetBookSeller and GetBookSellerFromId. Test plan: 1/ Create a bookseller, modify it. 2/ Add contacts for this bookseller 3/ Create an order, receive it, transfer it 4/ Launch the prove command on all unit tests modified by this patch and verify that all pass. Signed-off-by: Paola Rossi <paola.rossi@cineca.it> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 --- Comment #31 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 33856 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=33856&action=edit Bug 12896: Remove 2 occurrences in comments Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Passes tests and QA script. Full test report on the bug report. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 --- Comment #32 from Jonathan Druart <jonathan.druart@biblibre.com> --- Patches rebased. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #33855|0 |1 is obsolete| | Attachment #33856|0 |1 is obsolete| | --- Comment #33 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 34730 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=34730&action=edit [PASSED QA] Bug 12969: Add a subroutine to calculate VAT and prices This patch adds a new subroutine populate_order_with_prices in the C4::Acquisition module. Its goal is to refactore the VAT and prices calculation into Koha. All scripts will use this subroutine. Test plan: Verify that the prices in t/Prices.t are consistent with the values listed in the file "Prices and VAT calculation - before" submit on bug 12964. Verify that prove t/Prices.t returns green Signed-off-by: Paola Rossi <paola.rossi@cineca.it> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #34730|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=12896 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #33855|1 |0 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #33856|1 |0 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to Master CC| |tomascohen@gmail.com --- Comment #34 from Tomás Cohen Arazi <tomascohen@gmail.com> --- Patches pushed to master. Thanks Jonathan! -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |chris@bigballofwax.co.nz --- Comment #35 from Chris Cormack <chris@bigballofwax.co.nz> --- Major refactoring, and moving of code, so I wont be pushing this to a stable branch. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Jacek Ablewicz <abl@biblos.pk.edu.pl> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |http://bugs.koha-community. | |org/bugzilla3/show_bug.cgi? | |id=13645 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |13726 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |http://bugs.koha-community. | |org/bugzilla3/show_bug.cgi? | |id=15293 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |http://bugs.koha-community. | |org/bugzilla3/show_bug.cgi? | |id=15379 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |15449 Referenced Bugs: http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15449 [Bug 15449] Move stuffs to the Koha namespace -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also|http://bugs.koha-community. | |org/bugzilla3/show_bug.cgi? | |id=15379 | -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12896 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also|http://bugs.koha-community. | |org/bugzilla3/show_bug.cgi? | |id=15293 | -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org