http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5356
Paul Poulain <paul.poul...@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #20 from Paul Poulain <paul.poul...@biblibre.com> --- This patch does not apply on C4/Acquisition.pm: <<<<<<< HEAD ModBasketHeader($basket, $basketname || '', $basketnote || '', $basketbooksellernote || '', $basketcontractnumber || undef, $booksellerid); ======= ModBasketHeader( $basket, $basketname || '', $basketnote || '', $basketbooksellernote || '', $basketcontractnumber || undef, $deliveryplace || undef, $billingplace || undef ); >>>>>>> Bug 5356: delivery place and billing place centralised in basket >>>>>>> management It seems it's a consequence of bug 8247 patch. I think the solution is to have: ModBasketHeader( $basket, $basketname || '', $basketnote || '', $basketbooksellernote || '', $basketcontractnumber || undef, $deliveryplace || undef, $billingplace || undef, $booksellerid ); and rewrite ModBasketHeader accordingly (ie = reintroduce booksellerid at the end of the API) QA comments: perlcritic does not pass: perlcritic acqui/basket.pl acqui/basketheader.pl acqui/basket.pl source OK acqui/basketheader.pl: Variable declared in conditional statement at line 135, column 9. Declare variables outside of the condition. (Severity: 5) acqui/basketheader.pl: Variable declared in conditional statement at line 159, column 9. Declare variables outside of the condition. (Severity: 5) (they were OK before the patch valid_tt.t, xt/author/translatable-templates.t and xt/author/valid-templates.t ar OK It would be better to specify where the fields should be added in the table: + $dbh->do("ALTER TABLE aqbasket ADD deliveryplace VARCHAR(10) default NULL;"); + $dbh->do("ALTER TABLE aqbasket ADD billingplace VARCHAR(10) default NULL;"); + $dbh->do("ALTER TABLE aqbasket ADD freedeliveryplace VARCHAR(10) default NULL;"); add a "AFTER anotherfieldname" to the declaration. I would not have requested that only, but as the patch does not apply and I have other concerns... -- You are receiving this mail because: You are the QA Contact for the bug. 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/