http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5549
Paul Poulain <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA --- Comment #37 from Paul Poulain <[email protected]> 2012-01-20 16:38:12 UTC --- Testing & QAing at the same time (even if I won't signoff & passed QA myself) Here are the commands i've entered to do some test: git remote add libsysguy git://github.com/libsysguy/koha-hourly.git git remote update git checkout -b BZ5549 git merge libsysguy/hourly Auto-merging C4/Circulation.pm Auto-merging C4/Context.pm Auto-merging C4/Print.pm Auto-merging C4/SIP/ILS/Patron.pm Auto-merging catalogue/detail.pl Auto-merging catalogue/issuehistory.pl Auto-merging circ/circulation.pl Auto-merging circ/overdue.pl Auto-merging circ/returns.pl Auto-merging installer/data/mysql/kohastructure.sql Auto-merging installer/data/mysql/updatedatabase.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt Auto-merging misc/cronjobs/overdue_notices.pl Removing misc/translator/po/am-Ethi-i-opac-t-prog-v-3006000.po Removing misc/translator/po/am-Ethi-i-staff-t-prog-v-3006000.po Removing misc/translator/po/am-Ethi-pref.po Removing misc/translator/po/ar-Arab-i-opac-t-prog-v-3006000.po Removing misc/translator/po/ar-Arab-i-staff-t-prog-v-3006000.po Removing misc/translator/po/ar-Arab-pref.po Removing misc/translator/po/az-AZ-i-opac-t-prog-v-3006000.po Removing misc/translator/po/az-AZ-i-staff-t-prog-v-3006000.po Removing misc/translator/po/az-AZ-pref.po Removing misc/translator/po/ben-i-opac-t-prog-v-3006000.po Removing misc/translator/po/ben-i-staff-t-prog-v-3006000.po Removing misc/translator/po/ben-pref.po Removing misc/translator/po/bg-Cyrl-i-opac-t-prog-v-3006000.po Removing misc/translator/po/bg-Cyrl-i-staff-t-prog-v-3006000.po Removing misc/translator/po/bg-Cyrl-pref.po Removing misc/translator/po/ca-VA-i-opac-t-prog-v-3006000.po Removing misc/translator/po/ca-VA-i-staff-t-prog-v-3006000.po Removing misc/translator/po/ca-VA-pref.po Removing misc/translator/po/cs-CZ-i-opac-t-prog-v-3006000.po Removing misc/translator/po/cs-CZ-i-staff-t-prog-v-3006000.po Removing misc/translator/po/cs-CZ-pref.po Removing misc/translator/po/da-DK-i-opac-t-prog-v-3006000.po Removing misc/translator/po/da-DK-i-staff-t-prog-v-3006000.po Removing misc/translator/po/da-DK-pref.po Removing misc/translator/po/de-DE-i-opac-t-prog-v-3006000.po Removing misc/translator/po/de-DE-i-staff-t-prog-v-3006000.po Removing misc/translator/po/de-DE-pref.po Removing misc/translator/po/el-GR-i-opac-t-prog-v-3006000.po Removing misc/translator/po/el-GR-i-staff-t-prog-v-3006000.po Removing misc/translator/po/el-GR-pref.po Removing misc/translator/po/en-GB-i-opac-t-prog-v-3006000.po Removing misc/translator/po/en-GB-i-staff-t-prog-v-3006000.po Removing misc/translator/po/en-GB-pref.po Removing misc/translator/po/en-NZ-i-opac-t-prog-v-3006000.po Removing misc/translator/po/en-NZ-i-staff-t-prog-v-3006000.po Removing misc/translator/po/en-NZ-pref.po Removing misc/translator/po/en-USACADEMIC-i-opac-t-prog-v-3006000.po Removing misc/translator/po/es-ES-i-opac-t-prog-v-3006000.po Removing misc/translator/po/es-ES-i-staff-t-prog-v-3006000.po Removing misc/translator/po/es-ES-pref.po Removing misc/translator/po/eu-i-opac-t-prog-v-3006000.po Removing misc/translator/po/eu-pref.po Removing misc/translator/po/fa-Arab-i-opac-t-prog-v-3006000.po Removing misc/translator/po/fa-Arab-pref.po Removing misc/translator/po/fi-FI-i-opac-t-prog-v-3006000.po Removing misc/translator/po/fi-FI-i-staff-t-prog-v-3006000.po Removing misc/translator/po/fi-FI-pref.po Removing misc/translator/po/fr-CA-i-opac-t-prog-v-3006000.po Removing misc/translator/po/fr-CA-i-staff-t-prog-v-3006000.po Removing misc/translator/po/fr-CA-pref.po Removing misc/translator/po/fr-FR-i-opac-t-prog-v-3006000.po Removing misc/translator/po/fr-FR-i-staff-t-prog-v-3006000.po Removing misc/translator/po/fr-FR-pref.po Removing misc/translator/po/gl-i-opac-t-prog-v-3006000.po Removing misc/translator/po/gl-pref.po Removing misc/translator/po/he-Hebr-i-opac-t-prog-v-3006000.po Removing misc/translator/po/he-Hebr-pref.po Removing misc/translator/po/hi-i-opac-t-prog-v-3006000.po Removing misc/translator/po/hi-i-staff-t-prog-v-3006000.po Removing misc/translator/po/hi-pref.po Removing misc/translator/po/hr-HR-i-opac-t-prog-v-3006000.po Removing misc/translator/po/hr-HR-i-staff-t-prog-v-3006000.po Removing misc/translator/po/hr-HR-pref.po Removing misc/translator/po/hu-HU-i-opac-t-prog-v-3006000.po Removing misc/translator/po/hu-HU-i-staff-t-prog-v-3006000.po Removing misc/translator/po/hu-HU-pref.po Removing misc/translator/po/hy-Armn-i-opac-t-prog-v-3006000.po Removing misc/translator/po/hy-Armn-i-staff-prog-v-3006000.po Removing misc/translator/po/hy-Armn-i-staff-t-prog-v-3006000.po Removing misc/translator/po/hy-Armn-pref.po Removing misc/translator/po/id-ID-i-opac-t-prog-v-3006000.po Removing misc/translator/po/id-ID-i-staff-t-prog-v-3006000.po Removing misc/translator/po/id-ID-pref.po Removing misc/translator/po/is-IS-i-opac-t-prog-v-3006000.po Removing misc/translator/po/is-IS-pref.po Removing misc/translator/po/it-IT-i-opac-t-prog-v-3006000.po Removing misc/translator/po/it-IT-i-staff-t-prog-v-3006000.po Removing misc/translator/po/it-IT-pref.po Removing misc/translator/po/ja-Jpan-JP-i-opac-t-prog-v-3006000.po Removing misc/translator/po/ja-Jpan-JP-pref.po Removing misc/translator/po/kn-Knda-i-staff-t-prog-v-3006000.po Removing misc/translator/po/ko-Kore-KP-i-opac-t-prog-v-3006000.po Removing misc/translator/po/ko-Kore-KP-pref.po Removing misc/translator/po/lo-Laoo-i-opac-t-prog-v-3006000.po Removing misc/translator/po/lo-Laoo-i-staff-t-prog-v-3006000.po Removing misc/translator/po/lo-Laoo-pref.po Removing misc/translator/po/mi-NZ-i-opac-t-prog-v-3006000.po Removing misc/translator/po/mi-NZ-pref.po Removing misc/translator/po/mon-i-opac-t-prog-v-3006000.po Removing misc/translator/po/mon-i-staff-t-prog-v-3006000.po Removing misc/translator/po/mon-pref.po Removing misc/translator/po/mr-i-opac-t-prog-v-3006000.po Removing misc/translator/po/mr-i-staff-t-prog-v-3006000.po Removing misc/translator/po/mr-pref.po Removing misc/translator/po/ms-MY-i-opac-t-prog-v-3006000.po Removing misc/translator/po/ms-MY-i-staff-t-prog-v-3006000.po Removing misc/translator/po/ms-MY-pref.po Removing misc/translator/po/nb-NO-i-opac-t-prog-v-3006000.po Removing misc/translator/po/nb-NO-i-staff-t-prog-v-3006000.po Removing misc/translator/po/nb-NO-pref.po Removing misc/translator/po/ne-NE-i-opac-t-prog-v-3006000.po Removing misc/translator/po/ne-NE-i-staff-t-prog-v-3006000.po Removing misc/translator/po/ne-NE-pref.po Removing misc/translator/po/nl-BE-i-opac-t-prog-v-3006000.po Removing misc/translator/po/nl-BE-i-staff-t-prog-v-3006000.po Removing misc/translator/po/nl-BE-pref.po Removing misc/translator/po/nl-NL-i-opac-t-prog-v-3006000.po Removing misc/translator/po/nl-NL-i-staff-t-prog-v-3006000.po Removing misc/translator/po/nl-NL-pref.po Removing misc/translator/po/nn-NO-i-opac-t-prog-v-3006000.po Removing misc/translator/po/nn-NO-i-staff-prog-v-3006000.po Removing misc/translator/po/nn-NO-i-staff-t-prog-v-3006000.po Removing misc/translator/po/nn-NO-pref.po Removing misc/translator/po/pbr-i-opac-t-prog-v-3006000.po Removing misc/translator/po/pbr-i-staff-t-prog-v-3006000.po Removing misc/translator/po/pbr-pref.po Removing misc/translator/po/pl-PL-i-opac-t-prog-v-3006000.po Removing misc/translator/po/pl-PL-i-staff-t-prog-v-3006000.po Removing misc/translator/po/pl-PL-pref.po Removing misc/translator/po/prs-i-opac-t-prog-v-3006000.po Removing misc/translator/po/prs-i-staff-t-prog-v-3006000.po Removing misc/translator/po/prs-pref.po Removing misc/translator/po/pt-BR-i-opac-t-prog-v-3006000.po Removing misc/translator/po/pt-BR-i-staff-t-prog-v-3006000.po Removing misc/translator/po/pt-BR-pref.po Removing misc/translator/po/pt-PT-i-opac-t-prog-v-3006000.po Removing misc/translator/po/pt-PT-i-staff-t-prog-v-3006000.po Removing misc/translator/po/pt-PT-pref.po Removing misc/translator/po/ro-RO-i-opac-t-prog-v-3006000.po Removing misc/translator/po/ro-RO-i-staff-t-prog-v-3006000.po Removing misc/translator/po/ro-RO-pref.po Removing misc/translator/po/ru-RU-i-opac-t-prog-v-3006000.po Removing misc/translator/po/ru-RU-i-staff-t-prog-v-3006000.po Removing misc/translator/po/ru-RU-pref.po Removing misc/translator/po/sd-PK-i-opac-t-prog-v-3006000.po Removing misc/translator/po/sd-PK-i-staff-t-prog-v-3006000.po Removing misc/translator/po/sd-PK-pref.po Removing misc/translator/po/sk-SK-i-opac-t-prog-v-3006000.po Removing misc/translator/po/sk-SK-i-staff-t-prog-v-3006000.po Removing misc/translator/po/sk-SK-pref.po Removing misc/translator/po/sl-SI-i-opac-t-prog-v-3006000.po Removing misc/translator/po/sl-SI-i-staff-t-prog-v-3006000.po Removing misc/translator/po/sl-SI-pref.po Removing misc/translator/po/sq-AL-i-opac-t-prog-v-3006000.po Removing misc/translator/po/sq-AL-i-staff-t-prog-v-3006000.po Removing misc/translator/po/sq-AL-pref.po Removing misc/translator/po/sr-Cyrl-i-opac-t-prog-v-3006000.po Removing misc/translator/po/sr-Cyrl-i-staff-t-prog-v-3006000.po Removing misc/translator/po/sr-Cyrl-pref.po Removing misc/translator/po/sv-SE-i-opac-t-prog-v-3006000.po Removing misc/translator/po/sv-SE-i-staff-t-prog-v-3006000.po Removing misc/translator/po/sv-SE-pref.po Removing misc/translator/po/ta-LK-i-opac-t-prog-v-3006000.po Removing misc/translator/po/ta-LK-i-staff-t-prog-v-3006000.po Removing misc/translator/po/ta-LK-pref.po Removing misc/translator/po/tet-i-opac-t-prog-v-3006000.po Removing misc/translator/po/tet-i-staff-t-prog-v-3006000.po Removing misc/translator/po/tet-pref.po Removing misc/translator/po/th-THA-i-opac-t-prog-v-3006000.po Removing misc/translator/po/th-THA-i-staff-t-prog-v-3006000.po Removing misc/translator/po/th-THA-pref.po Removing misc/translator/po/tl-PH-i-opac-t-prog-v-3006000.po Removing misc/translator/po/tl-PH-pref.po Removing misc/translator/po/tr-TR-i-opac-t-prog-v-3006000.po Removing misc/translator/po/tr-TR-i-staff-t-prog-v-3006000.po Removing misc/translator/po/tr-TR-pref.po Removing misc/translator/po/uk-UA-i-opac-t-prog-v-3006000.po Removing misc/translator/po/uk-UA-i-staff-t-prog-v-3006000.po Removing misc/translator/po/uk-UA-pref.po Removing misc/translator/po/ur-Arab-i-opac-t-prog-v-3006000.po Removing misc/translator/po/ur-Arab-i-staff-t-prog-v-3006000.po Removing misc/translator/po/ur-Arab-pref.po Removing misc/translator/po/vi-VN-i-opac-t-prog-v-3006000.po Removing misc/translator/po/vi-VN-i-staff-t-prog-v-3006000.po Removing misc/translator/po/vi-VN-pref.po Removing misc/translator/po/zh-Hans-CN-i-opac-t-prog-v-3006000.po Removing misc/translator/po/zh-Hans-CN-i-staff-t-prog-v-3006000.po Removing misc/translator/po/zh-Hans-CN-pref.po Removing misc/translator/po/zh-Hans-TW-i-opac-t-prog-v-3006000.po Removing misc/translator/po/zh-Hans-TW-i-staff-t-prog-v-3006000.po Removing misc/translator/po/zh-Hans-TW-pref.po Auto-merging opac/opac-detail.pl Auto-merging opac/opac-user.pl CONFLICT (content): Merge conflict in opac/opac-user.pl Automatic merge failed; fix conflicts and then commit the result. => the conflict in opac-user.pl is trivial to solve (2 lines commented against no line at all. Just needed to remove those lines) QUESTION : why are translations removed ? QA comments: * indentation is 2 spaces in many places, should be 4 spaces * there is a "misc/release_notes/release_notes_3_4_1.txt that should not be here * there are some things that are not related to hourly loans at all, like, in members/member.pl: -#use warnings; FIXME - Bug 2505 +use warnings; same in members/deletemem.pl members/guarantor_search.pl, I did not make an exhaustive list, but there are many many many !!! Please investigate & fix, i'll check after you've made a 1st fix) * there is a lack of documentation. I see in a template "High demand item" => what's this ? some functionnal documentation would be usefull. I think the http://wiki.koha-community.org/wiki/Hourly_Loans_RFC is not what has been implemented. For example, the RFCs are speaking of fines in minuts, nothing about that in the branch/code. It's OK for me, but we must know what this patch does exactly ! A functionnal doc on the wiki, with screenshot would be perfect ! not a reason to failed QA, just for information: * there are (needed) reindentings in the middle of usefull code, making the result hard to read. For example - my $branch_count_query = "SELECT COUNT(*) FROM issues + my $branch_count_query = "SELECT COUNT(*) FROM issues * unit tests are provided, ++, once dependancies are provided, they are successfull * there are new dependancies, that are added in the related file, ++ that's enough for now. This comment may seem very long, but I think the cleaning & documentation won't be too hard to do. Keep on the good work, it's an interesting feature ! PS: could you explain the history of this ? it's been started by nicole, chris seems to have made things, then colin from PTFS-Europe, then Eliott, -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug. You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] 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/
