http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Nicole C. Engard <nengard@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |nengard@gmail.com -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 claire.hernandez@biblibre.com <claire.hernandez@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Priority|P5 - low |PATCH-Sent Patch Status|--- |Needs Signoff -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |chris@bigballofwax.co.nz Patch Status|Needs Signoff |--- -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #1 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 13019 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=13019&action=edit Bug 7180: Order from staged file improvements This patch adds: - 1 syspref MarcFieldsToOrder - 1 ajax script acqui/ajax-getauthvaluedropbox.pl - 1 routine C4::Budgets::GetBudgetByCode Before this patch you were not able to order 1 or all the records from your staged file. You were allowed to specify some information ("Import All" and "Accounting details" areas) for the order. With this patch, the previous behaviours still exist. But now you can *select* which records you want to ordered. For these ones you can specify independently informations (Quantity, price, budget, sort1 and sort2). The cherry on the cake is that you can pre-fill these information with values Test plan: 1. Fill the new syspref MarcFieldsToOrder with something like: ==BEGIN== price: 947$c quantity: 969$h budget_code: 922$a rrp: 010$d discount: 969$d sort1: 923$a sort2: 924$a ==END== The empty line at the end is mandatory! The budget (corresponding to your budget_code) can be filled with authorized value categories (statistic 1 and 2). The sort1 and sort2 values can be filled with the an authorized value (of the category previously selected) 2. Choose randomly one or more biblio(s) and fill fields with what is relevant. 3. Export the biblio and import it (with the "Stage MARC records for import" tool). 4. Go on a basket and add an order from a staged file. Select your staged file. 5. Well. Now you can see your biblio (or biblios if your had exported more than one). For each one, informations should be pre-filled with the biblio values. The budget should be selected on the budget corresponding to the budget_code (in the field 922$a) and the "planning values" too (with fields 923$a and 924$a). You can modify these values (or not) and choose a default value for budget and planning values (in the "Accounting details" area). 6. Save and check the prices values. Modify the order and check that budget and sort* are good Prices are calculated following some parameters: if there is no price => listprice = 0 else => - the gstrate value for your order is the gstrate value of the bookseller - discount = if filled : the discount value / 100 else: the discount value of the bookseller - if the bookseller includes tax( List item price includes tax: Yes ) if a discount exists: ecost = price rrp = ecost / ( 1 - discount ) else: # a discount does not exist ecost = price * ( 1 - discount ) rrp = price else # the bookseller does not include tax if a discount exists: ecost = price / ( 1 + gstrate ) rrp = ecost / ( 1 - discount ) else: # a discount does not exist rrp = price / ( 1 + gstrate ) ecost = rrp * ( 1 - discount ) - in all cases: listprice = rrp / currency rate unitprice = ecost total = ecost * quantity 7. Retry with different parameters 8. Check the 'Import all' action still works -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 mathieu saby <mathieu.saby@univ-rennes2.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |mathieu.saby@univ-rennes2.f | |r --- Comment #2 from mathieu saby <mathieu.saby@univ-rennes2.fr> --- Hello I tried to test your patch but it does not apply : Applying: Bug 7180: Order from staged file improvements Using index info to reconstruct a base tree... <stdin>:357: new blank line at EOF. + warning: 1 line adds whitespace errors. Falling back to patching base and 3-way merge... error: The following untracked working tree files would be overwritten by merge: acqui/ajax-getauthvaluedropbox.pl Please move or remove them before you can merge. Aborting Failed to merge in the changes. Patch failed at 0001 Bug 7180: Order from staged file improvements M. Saby -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 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=7180 mathieu saby <mathieu.saby@univ-rennes2.fr> 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=7180 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=7180 --- Comment #6 from mathieu saby <mathieu.saby@univ-rennes2.fr> --- I want to test this afternoon, but new error : Could you please rebase it again? <stdin>:347: new blank line at EOF. + warning: 1 line adds whitespace errors. Falling back to patching base and 3-way merge... error: The following untracked working tree files would be overwritten by merge: acqui/ajax-getauthvaluedropbox.pl Please move or remove them before you can merge. Aborting Failed to merge in the changes. Patch failed at 0001 Bug 7180: Order from staged file improvements 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". Patch left in /tmp/Bug-7180-Order-from-staged-file-improvements-CiHSV3.patch M. Saby -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #8 from mathieu saby <mathieu.saby@univ-rennes2.fr> --- new conflit, but maybe my VM is not clean... CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css M. saby -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #10 from mathieu saby <mathieu.saby@univ-rennes2.fr> --- In some tests it seems to work, and in others, not :( I have not yet find why... (I tried to change the syspref, and tested different records. and maybe my acq framework was not including the fields mapped in the syspref...) But I can already make some remarks : What happens if a non numeric value is defined for quantity or discount? In particulary for discount. I believe there is no warn. So, as discount is invisible, it could be a problem. If is is imported, maybe the discount value should be visible for each record? What happens if a different value for fund, sort1, sort2, is defined in some records and in the Accounting details bloc at the bottom of the page? What happens if one field mapped in the syspref does not exist in the imported record? (eg : no 947$c in the record). I suppose all the other fields will be imported, but I am not sure... What happens if one field mapped in the syspref does not exist in the default/acq framework? In the syspref description, librarians will need the list of the usable values (in your example you give price, quantitity, budget_code, rrp, discout, sort1, sort2, but maybe there are others?) For example, is it possible to use the syspref for importing - gst rate - acquisition notes? I won't be able to make an other test until March 6h. M Saby -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #11 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to comment #10)

But I can already make some remarks : What happens if a non numeric value is defined for quantity or discount? In particulary for discount. I believe there is no warn. So, as discount is invisible, it could be a problem. If is is imported, maybe the discount value should be visible for each record?

Will be displayed in a followup.

What happens if a different value for fund, sort1, sort2, is defined in some records and in the Accounting details bloc at the bottom of the page?

If a specific value is filled for a record, we take this one. Else the value will be the "default value" (value in the Accounting details).

What happens if one field mapped in the syspref does not exist in the imported record? (eg : no 947$c in the record). I suppose all the other fields will be imported, but I am not sure...

Yes, It should work like that.

What happens if one field mapped in the syspref does not exist in the default/acq framework?

The mapping is not based on a framework. So the field will be updated with the given value.

In the syspref description, librarians will need the list of the usable values (in your example you give price, quantitity, budget_code, rrp, discout, sort1, sort2, but maybe there are others?)

The list is exhaustive for this development. But the syspref could be used by another development (using some others fields).

For example, is it possible to use the syspref for importing - gst rate - acquisition notes?

No, but it could be possible later. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #13 from mathieu saby <mathieu.saby@univ-rennes2.fr> --- I tested again on my VM and sandbox 3 => Failed Budget, sort1 and sort2 are not imported from records. Here is the detail : connected to Koha with a bib user (not the admin user) no acq framework default framework includes 947$c, 969$h, 922$a, 010$d, 969$d, 923$a, 924$a currency : EUR vendor with - gst = 0 - discount = 5 - list price include tax budget : "test", with fund code "budgetok" (fund name "budgetok") No importing matching rule parameters for MarcFieldsToOrder : price: 947$c quantity: 969$h budget_code: 922$a rrp: 010$d discount: 969$d sort1: 923$a sort2: 924$a ------ Batch of 7 records 200 1 $a Eudora Welty $b Texte imprimé $f edited and with an introduction by Harold Bloom,... 010 $d 11 EUR 922 $a budgetok 947 $c 10.00 969 $a 3 $h 3 200 1 $a Le théâtre du Marais $h 1 $i La période de gloire et de fortune, 1634(1629)-1648 $b Texte imprimé $f S. Wilma Deierkauf-Holsboer 010 $d 10,50 EUR 922 $a budgetbidon 923 $a stat1 924 $a stat2 947 $c 10.50 969 $a 2 $h 2 200 1 $a Paul Valéry et Pascal $b Texte imprimé $f Antonio G. Rodriguez 010 $d 23,70 EUR 923 $a stat1 947 $c 23.70 969 $a 1 $h 1 200 1 $a Arthur Miller's "Death of a salesman" $f ed. and with an introd. by Harold Bloom 010 $d 100.00 EUR 922 $a budgetok 923 $a stat1 924 $a stat2 947 $c 90.00 969 $a 3 $d 50 $h 3 200 1 $a Didactique de l'orthographe française $b Texte imprimé $e méthode, expériences et exercices pédagogiques $f Michel Gey 010 $d 12.50 EUR 922 $a budgetok 923 $a tri1 969 $a 1 $h 1 $d 10.50 200 1 $a Histoire de la sculpture $b Texte imprimé $f par Luc Benoist 922 $a budgetok 923 $a tri1 947 $c 15.50 969 $a 1 $h 1 $d 10 200 1 $a Premiers exercices de grammaire $f Sabine Dupré la Tour et Geneviève-Dominique de Salins 010 $d $ 10.00 922 $a budgetok 923 $a tri1 947 $c 10.50 969 $a 2 $d 20.50 $h 2 M. Saby -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #15 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 15935 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=15935&action=edit Bug 7180: FIX ergonomic issue on selecting record Before this patch, all labels were active for the first checkbox. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 mathieu saby <mathieu.saby@univ-rennes2.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA --- Comment #17 from mathieu saby <mathieu.saby@univ-rennes2.fr> --- I cannot test. Conflit : CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css Auto-merging installer/data/mysql/updatedatabase.pl Failed to merge in the changes. M. Saby -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #15617|0 |1 is obsolete| | Attachment #15677|0 |1 is obsolete| | Attachment #15934|0 |1 is obsolete| | Attachment #15935|0 |1 is obsolete| | --- Comment #18 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 16014 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=16014&action=edit Bug 7180: Order from staged file improvements Rebased and squashed patch -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 mathieu saby <mathieu.saby@univ-rennes2.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA --- Comment #19 from mathieu saby <mathieu.saby@univ-rennes2.fr> --- Patch not working when a matching rule is selected. M. Saby & P. Angot -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #21 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 16505 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=16505&action=edit Bug 7180: FIX getAuthValueDropbox should display the selected value If the no AV match the name/category or if no category is defined, the input field should contain the value. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off CC| |paul.poulain@biblibre.com --- Comment #22 from Paul Poulain <paul.poulain@biblibre.com> --- Patch tested with a sandbox, by Pierre Angot <tredok.pierre@gmail.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #24 from mathieu saby <mathieu.saby@univ-rennes2.fr> --- We tested with other values in syspref (using subfields of unimarc 920 field). We changed our default framework to make visible subfields of 920, so we were able to check in MARC view. In syspref we had : - 920c mapped to sort1. In Koha, for our budget, sort1 was mapped with LOC authorized values. - 920d mapped to sort2. In Koha, for our budget, sort2 was free In our record, we put : - in 920c a value present in LOC. - in 920d a free value, (tested with and without an accent) Both 920c and 920d were imported in DB as sort1 and sort2. We tested with AND without using a matching rule (by ISBN) when staging record, and verything is correct : il the imported record match a record already in Koha, the existing record is used for order, and the values of 920 are used to fill the order. P. Angot & M. Saby -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Version|3.8 |master -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #26 from Pierre Angot <tredok.pierre@gmail.com> --- Created attachment 16544 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=16544&action=edit Test -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #28 from Paul Poulain <paul.poulain@biblibre.com> --- Created attachment 16566 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=16566&action=edit Bug 7180: FIX getAuthValueDropbox should display the selected value If the no AV match the name/category or if no category is defined, the input field should contain the value. Signed-off-by: Pierre Angot <tredok.pierre@gmail.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #16505|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=7180 --- Comment #30 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 16613 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=16613&action=edit Bug 7180: Add UT for C4::Budgets::GetBudgetByCode -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #16014|0 |1 is obsolete| | Attachment #16566|0 |1 is obsolete| | Attachment #16613|0 |1 is obsolete| | --- Comment #32 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 19066 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=19066&action=edit Bug 7180: Order from staged file improvements This patch adds: - 1 syspref MarcFieldsToOrder - 1 ajax script acqui/ajax-getauthvaluedropbox.pl - 1 routine C4::Budgets::GetBudgetByCode Before this patch you were not able to order 1 or all the records from your staged file. You were allowed to specify some information ("Import All" and "Accounting details" areas) for the order. With this patch, the previous behaviours still exist. But now you can *select* which records you want to ordered. For these ones you can specify independently informations (Quantity, price, budget, sort1 and sort2). The cherry on the cake is that you can pre-fill these information with values Test plan: 1. Fill the new syspref MarcFieldsToOrder with something like: ==BEGIN== price: 947$c quantity: 969$h budget_code: 922$a rrp: 010$d discount: 969$d sort1: 923$a sort2: 924$a ==END== The empty line at the end is mandatory! The budget (corresponding to your budget_code) can be filled with authorized value categories (statistic 1 and 2). The sort1 and sort2 values can be filled with the an authorized value (of the category previously selected) 2. Choose randomly one or more biblio(s) and fill fields with what is relevant. 3. Export the biblio and import it (with the "Stage MARC records for import" tool). 4. Go on a basket and add an order from a staged file. Select your staged file. 5. Well. Now you can see your biblio (or biblios if your had exported more than one). For each one, informations should be pre-filled with the biblio values. The budget should be selected on the budget corresponding to the budget_code (in the field 922$a) and the "planning values" too (with fields 923$a and 924$a). You can modify these values (or not) and choose a default value for budget and planning values (in the "Accounting details" area). 6. Save and check the prices values. Modify the order and check that budget and sort* are good Prices are calculated following some parameters: if there is no price => listprice = 0 else => - the gstrate value for your order is the gstrate value of the bookseller - discount = if filled : the discount value / 100 else: the discount value of the bookseller - if the bookseller includes tax( List item price includes tax: Yes ) if a discount exists: ecost = price rrp = ecost / ( 1 - discount ) else: # a discount does not exist ecost = price * ( 1 - discount ) rrp = price else # the bookseller does not include tax if a discount exists: ecost = price / ( 1 + gstrate ) rrp = ecost / ( 1 - discount ) else: # a discount does not exist rrp = price / ( 1 + gstrate ) ecost = rrp * ( 1 - discount ) - in all cases: listprice = rrp / currency rate unitprice = ecost total = ecost * quantity 7. Retry with different parameters 8. Check the 'Import all' action still works -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #34 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 19068 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=19068&action=edit Bug 7180: Add UT for C4::Budgets::GetBudgetByCode -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA --- Comment #36 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- I have tested this, but there are a lot of small and bigger things I am not quite happy with. I really feel like this needs a bit more work. 1) The green color for selected lines seems debatable given the overall look and feel of the Koha GUI. Can you please reconsider? 2) The form has a few design issues - the labels and fields are not properly aligned in a smaller window, making it hard to figure out what goes where. It might fit a bit better into 2 columns and smaller fields for quantity, price and discount. I think the fields should ideally match the formatting on the normal order page. Also required fields should be highlighted and the input should be validated. Like there is no complaint if you don't input the quantity. 3) The label budget is wrong and should be fund instead. Also the list shows funds from inactive budgets. 4) In comparison to the normal form we are missing the option to set the currency in the form. I think it might be safe to assume that all records in that list will be one and the same currency, but it's not clear how to indicate the currency to be used. 5) When you select a fund that is connected to an authorised value list and then undo the selection, you end up with the string "undefined" in the input field. Some ideas: - I think instead of having the full form on each entry it would save a lot of space if we could only display it for selected records and keep the smaller layout for when now records are selected. - There is no option to see more about the record and we are only displaying 245$a it seems, which is not really helpful if you have lots of similar records. Showing a link to the ISBD/MARC preview might help that. - Instead of no_match we should be displaying a nicer text for the librarian. - It might be worth adding an option to pick the right tax rate. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #37 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 19316 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=19316&action=edit Bug 7180: QA followup Ergonomic improvements: - Remove the green color the selected record. - Use fieldset.rows (and legend). - Use the required css class for quantity inputs. - Replace "budget" with "fund". - fix the "undefined" string - Add a "show MARC" link - replace "no_match" with a text. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #38 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to Katrin Fischer from comment #36) Thanks Katrin for this helpful feedback!

1) The green color for selected lines seems debatable given the overall look and feel of the Koha GUI. Can you please reconsider?

I removed the green color.

2) The form has a few design issues - the labels and fields are not properly aligned in a smaller window, making it hard to figure out what goes where. It might fit a bit better into 2 columns and smaller fields for quantity, price and discount.

Done, now I use the fieldset with the "rows" css class.

Also required fields should be highlighted and the input should be validated. Like there is no complaint if you don't input the quantity.

The quantity label now use the "required" css class. I added a javascript check too.

3) The label budget is wrong and should be fund instead. Fixed.

Also the list shows funds from inactive budgets. Yes but since the record select a value in the dropdown list, the fix is not quite easy. I prefer to do it later.

4) In comparison to the normal form we are missing the option to set the currency in the form. I think it might be safe to assume that all records in that list will be one and the same currency, but it's not clear how to indicate the currency to be used.

The currency used, for all records, is the default currency. Which is the one selected in the "Accounting details" block. I don't know how to make that much clearer.

5) When you select a fund that is connected to an authorised value list and then undo the selection, you end up with the string "undefined" in the input field.

Fixed.

Some ideas:

- I think instead of having the full form on each entry it would save a lot of space if we could only display it for selected records and keep the smaller layout for when now records are selected.

Hum, I tried something, but I am not a great ergonomist...

- There is no option to see more about the record and we are only displaying 245$a it seems, which is not really helpful if you have lots of similar records. Showing a link to the ISBD/MARC preview might help that.

Done.

- Instead of no_match we should be displaying a nicer text for the librarian.

Done.

- It might be worth adding an option to pick the right tax rate.

Mathieu Saby already asked for that (comment 10), but it is not planned for now. Note: This patch is impacted by the bug 10522, it introduces side-effects with this feature. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 mathieu saby <mathieu.saby@univ-rennes2.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #40 from mathieu saby <mathieu.saby@univ-rennes2.fr> --- I wanted to test this patch to check if it solved the problem raised in BZ 7129, but it does not apply on sandbox CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref Failed to merge in the changes. Mathieu -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #19067|0 |1 is obsolete| | --- Comment #42 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 19588 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=19588&action=edit Bug 7180: FIX getAuthValueDropbox should display the selected value If the no AV match the name/category or if no category is defined, the input field should contain the value. Signed-off-by: Pierre Angot <tredok.pierre@gmail.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #19316|0 |1 is obsolete| | --- Comment #44 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 19590 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=19590&action=edit Bug 7180: QA followup Ergonomic improvements: - Remove the green color the selected record. - Use fieldset.rows (and legend). - Use the required css class for quantity inputs. - Replace "budget" with "fund". - fix the "undefined" string - Add a "show MARC" link - replace "no_match" with a text. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #46 from mathieu saby <mathieu.saby@univ-rennes2.fr> --- This patch has evolved since I tested it during Hackfest. I am a bit surprised, because when I selected all the records and tried to add them all in a batch ("Save button"), Koha asked me to define a quantity for each book of my imported MARC file. I think "1" should be the default quantity. Maybe I did something wrong? Mathieu -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #48 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hi Mathieu, I think maybe we could have a default of 1 but display that in the quantity field? Having empty default to 1 might be unexpected behaviour and a bit confusing. About the other - yes, I think it's a problem. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #50 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hi, I think we are not disagreeing :) I meant as we have a quantity field now, maybe we should put the 1 in there by default, but so it can be changed before you create the orders. But we will need Jonathan to take a look to tell us what can be done - maybe I was wrong in my tests when I assumed that you have to fill in quantity, I don't remember if it created the order when I had left it empty, but I thought it had not. Hm. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #52 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 19641 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=19641&action=edit Bug 7180: The default quantity is 1 -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #54 from mathieu saby <mathieu.saby@univ-rennes2.fr> --- Hello Jonathan, hello Katrin This is working better, but I think small improvements can still be made to improve usability : - Question for Jonathan : I suppose the value in () after the title is the isbn. I found strange to see "Titre01 (2845622201)", as the ISBN for my record is "9782845622203". Why do you "translate" my isbn13 in isbn 10 ? - This page needs a little text explaing to the average librarian how to use it, especially the use of the "Accounting detail bloc" : as the fund, and the 2 planning values can be defined either in each orders or in "Accounting detail bloc", the librarians needs to know what to do, and what behavior to expect if the value for a fund in an order is NOT the same as the one in "Accounting detail bloc". I have made a try with Planning value 1 : the value defined in the order seems to have a greater priority than the value defined in the precise order. If it is normal, we could add a text in the beggining of the page. The following remarks could be the core of further improvements AFTER this patch is pushed, so the page would be the more "librarian friendly" possible. Could you give me an opinion ? - When I click on "check all", my 19 orders are "unfolded", but if I use the "Acounting detail" block at the end of the page, I dont need to put information in each order, but only in the "Acounting detail" at the end of the page. So, maybe the simple fact of checking a order should not unfold the bloc for this order? Maybe we show the order informations in a compact way, in 1 line, just after "( Show MARC | Card )". So there would be no need to unfold the bloc, except if we want to change some of these informations. For example, we could have for each line : "Title01 (2845622201) ( Show MARC | Card ) Quantity: Price: Discount: Fund: Planning value1: Planning value2: " and a little button to change those values if we want Or maybe we could replace the folding/unfolding block with a table structure like that : Selected | Title (show marc) | Qty | Price | Discount | Fund | Planning 1 | Planning 2 With an INPUT in each cell of the table, so we could directly put information into the table I don't know if I am clear enough? Mathieu -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #56 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hm, not sure a table layout without using datatables or similar would work well for bigger lists or smaller screens. The labels in each line might be a bit much in that case. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #58 from mathieu saby <mathieu.saby@univ-rennes2.fr> --- READ : "- the isbn13 changed to isbn10 after the Title. need a little fix ?" -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #60 from mathieu saby <mathieu.saby@univ-rennes2.fr> ---

It is the same behavior with or without these patchs: If a value is given for a biblio, it is kept. Else the "default value" (i.e. the value in the "Accounting detail bloc) is used.

Ok, so it may be outside the scope of this patch, and fixed later with a followup, but I still think more explainations are needed, with or without your patch... This is not obvious at all that the Accounting details are "default value" and are not overriding specific values of each line. This kind of behavior can be explained in detail in online help, but some basic information must be provided in the page itself. That's my librarian-point-of-view ;-) IMO, that's the case in some other pages of staff interface, where the use of some parameters is not "obvious" for the average end-user and could deserve 1 or 2 lines of explanations (not to speak of the inventory tool...). If I have time enough I will propose patches. Mathieu -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #62 from mathieu saby <mathieu.saby@univ-rennes2.fr> --- (In reply to Katrin Fischer from comment #61)

Hm, I agree that we shoudl try to have interfaces as intuitive as possible, but I am not sure adding lots of text to the templates will help the case. I woud rather see something like a tooltip

I like the idea of tooltips. or reference to the help files. Maybe you are true for help files, but we don't use them in my library : they are not very well written (often very verbose), not very well translated in french (and not completely), not always up to date, and more important, sometime they don't fit our workflow, or our Marc flavor :( I know we can edit them. Maybe one day...

When you work in acquisitions every day you might get tired of the explanations and the space they take up pretty soon.

Some colleagues are working with some module everyday. Other colleagues only a few time a year. Some colleagues understand everything very quickly and don't like to see too much explanations, whereas other need a lot of explanations and still make big mistakes... My job as admin is to make it possible to prevent mistakes, improve speed of work, and reduce headaches. Not always easy, but I hope the evolution of Koha will be towards this goal! But that's a general discussion, whose scope is too large for this bug ;-) Mathieu -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #19587|0 |1 is obsolete| | --- Comment #64 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 20900 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=20900&action=edit Bug 7180: Order from staged file improvements This patch adds: - 1 syspref MarcFieldsToOrder - 1 ajax script acqui/ajax-getauthvaluedropbox.pl - 1 routine C4::Budgets::GetBudgetByCode Before this patch you were not able to order 1 or all the records from your staged file. You were allowed to specify some information ("Import All" and "Accounting details" areas) for the order. With this patch, the previous behaviours still exist. But now you can *select* which records you want to ordered. For these ones you can specify independently informations (Quantity, price, budget, sort1 and sort2). The cherry on the cake is that you can pre-fill these information with values Test plan: 1. Fill the new syspref MarcFieldsToOrder with something like: ==BEGIN== price: 947$c quantity: 969$h budget_code: 922$a rrp: 010$d discount: 969$d sort1: 923$a sort2: 924$a ==END== The empty line at the end is mandatory! The budget (corresponding to your budget_code) can be filled with authorized value categories (statistic 1 and 2). The sort1 and sort2 values can be filled with the an authorized value (of the category previously selected) 2. Choose randomly one or more biblio(s) and fill fields with what is relevant. 3. Export the biblio and import it (with the "Stage MARC records for import" tool). 4. Go on a basket and add an order from a staged file. Select your staged file. 5. Well. Now you can see your biblio (or biblios if your had exported more than one). For each one, informations should be pre-filled with the biblio values. The budget should be selected on the budget corresponding to the budget_code (in the field 922$a) and the "planning values" too (with fields 923$a and 924$a). You can modify these values (or not) and choose a default value for budget and planning values (in the "Accounting details" area). 6. Save and check the prices values. Modify the order and check that budget and sort* are good Prices are calculated following some parameters: if there is no price => listprice = 0 else => - the gstrate value for your order is the gstrate value of the bookseller - discount = if filled : the discount value / 100 else: the discount value of the bookseller - if the bookseller includes tax( List item price includes tax: Yes ) if a discount exists: ecost = price rrp = ecost / ( 1 - discount ) else: # a discount does not exist ecost = price * ( 1 - discount ) rrp = price else # the bookseller does not include tax if a discount exists: ecost = price / ( 1 + gstrate ) rrp = ecost / ( 1 - discount ) else: # a discount does not exist rrp = price / ( 1 + gstrate ) ecost = rrp * ( 1 - discount ) - in all cases: listprice = rrp / currency rate unitprice = ecost total = ecost * quantity 7. Retry with different parameters 8. Check the 'Import all' action still works -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #19589|0 |1 is obsolete| | --- Comment #66 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 20902 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=20902&action=edit Bug 7180: Add UT for C4::Budgets::GetBudgetByCode -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #19641|0 |1 is obsolete| | --- Comment #68 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 20904 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=20904&action=edit Bug 7180: The default quantity is 1 -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #70 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Currently working on this. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA --- Comment #72 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hi Jonathan, I have started with a code review and fixed some minor issues in a follow-up patch. Could you take a look at the patch please and add your sign-off if the changes are ok? 2 concerns so far: 1) I think the use of the new system preference is not clear from the description, can we give an example maybe? I am also not so happy about the blank line requirement. Not sure, but could it be handled similar to opachiddenitems? 2) I started with regression testing: When I add a new order by searching for a record from the catalog (neworderempty.pl) and choose my fund, the statistic values are not updated. There is a Javascript error on the page: ReferenceError: fetchSortDropbox is not defined fetchSortDropbox(this.form) I tried refreshing the page multiple times. Failed for 2). -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #74 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 20934 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=20934&action=edit Bug 7180: Change syspref description - the blank line is now useless - add an example for the syspref value -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Signed Off --- Comment #76 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to Katrin Fischer from comment #72)

Hi Jonathan,

Hi Katrin,

I have started with a code review and fixed some minor issues in a follow-up patch. Could you take a look at the patch please and add your sign-off if the changes are ok?

Yep, thank you for this patch!

1) I think the use of the new system preference is not clear from the description, can we give an example maybe? I am also not so happy about the blank line requirement. Not sure, but could it be handled similar to opachiddenitems?

Yes, I added a followup for that: an example is added to the syspref description and the blank line is useless (added by the script).

2) I started with regression testing: When I add a new order by searching for a record from the catalog (neworderempty.pl) and choose my fund, the statistic values are not updated. There is a Javascript error on the page:

ReferenceError: fetchSortDropbox is not defined fetchSortDropbox(this.form)

Fixed in the last patch. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA --- Comment #78 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Sorry, found something bigger: - Create 2 funds - use 2 authorized values for the first, none for the other. - Create an order, switch to first fund first. - The pull downs now show up correctly - don't touch them. - Realize you have picked the wrong fund, change it to the second. - Notice that the authorized value codes remain and the fields are not cleared. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Signed Off -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #81 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 20979 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=20979&action=edit Bug 7180: FIX License version Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |10877 -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |http://bugs.koha-community. | |org/bugzilla3/show_bug.cgi? | |id=9063 -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA --- Comment #84 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- When selecting a batch to import from, there are lots of warns in the logs: [Wed Sep 11 23:10:05 2013] [error] [client 127.0.0.1] [Wed Sep 11 23:10:05 2013] addorderiso2709.pl: Use of uninitialized value in split at /home/katrin/kohaclone/acqui/addorderiso2709.pl line 505., referer: http://localhost:8080/cgi-bin/koha/acqui/addorderiso2709.pl?booksellerid=11&basketno=33 When I import a single record, by only updating the quantity from 1 to 2, not changing any other value (relying on the fact that it might take the default from the bottom?) - no warning is issued, but the order line is not added to my basket. The logs show lots of unhappiness with me trying that. Should the selections at the bottom be taken into account if you don't select anything for the single record? I think we need to warn that you have to select a budget on the single record or take the global into account? -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #86 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 21004 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=21004&action=edit Bug 7180: QA followup - fix unit tests (use a transaction). - add 3 tabs on the page in order to be more understandable. - fix a warn in logs -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |kyle@bywatersolutions.com --- Comment #88 from Kyle M Hall <kyle@bywatersolutions.com> --- A couple questions: 1) Should the "Fund" pulldown still be in the "Default accounting details" section, since it's now defined per-record? 2) There doesn't seem to be a link to neworderempty.pl anymore, which is still useful if you are ordering multiple items from a single record. It would make sense to re-add this after the Show MARC / Show Card links. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #90 from Paul Poulain <paul.poulain@biblibre.com> --- (In reply to Jonathan Druart from comment #89)

(In reply to Kyle M Hall from comment #88)

...

A couple questions:

1) Should the "Fund" pulldown still be in the "Default accounting details" section, since it's now defined per-record?

Yes, if you have 100 records and you want to set the same fund for each, it is easy to select 1 value rather than 100 times the same one :) And the behaviour is that, if you don't enter anything in one line, it's filled with the default accounting details.

Maybe it's worth a line of comment on the screen. Something like: "values entered here will be used for all selected lines that don't have accounting details specified" ? (kyle, you can fix the spelling before joubu's patch :D ) -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #92 from mathieu saby <mathieu.saby@univ-rennes2.fr> --- Hello I did not read all the last comments, but I pointed out some UX issue in previous comments (54...) The behavior of this page in current master is not obvious, and my collegues had to take some time to learn how to use the different fields. I would appreciate the enhancement, but I don't want it to become more difficult for them to understand what to do on this page. So adding a few lines in the online help or in the page itself may help ;-) I will test the patch again this week end. Mathieu -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #94 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Mathieu, thank you for testing. I had done mostly regression tests until now and didn't get to the import configuration. We have changed quite a lot on this patch since I started testing and I feel it would be good if it got another sign off before I continue QA - would you be able to continue working on this with Jonathan? I will still keep my eyes on this waiting for it to be ready. I think having the link and the checkbox should be no big problem - and I really like the link restored - it was something I had been thinking about and was not sure. I think it always imported the price and that this has been improved lately - so maybe we shouldn't change it as it could be seen as a regression? Or maybe we could have it as default mapping in the system preference? -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #96 from mathieu saby <mathieu.saby@univ-rennes2.fr> --- To be clear : my main concern is the fact that Koha calculates a RRP price > 20 EUR from a record with "20.00 EUR" in 010$d field. Mathieu -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #98 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 21117 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=21117&action=edit Bug 7180: Remove useless rrp variable -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #100 from Jonathan Druart <jonathan.druart@biblibre.com> --- Katrin wants a second signoff on this feature. 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=7180 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff --- Comment #102 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to I'm just a bot from comment #101)

CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl easy to solve.

-- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #20901|0 |1 is obsolete| | --- Comment #104 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 21463 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=21463&action=edit Bug 7180: FIX getAuthValueDropbox should display the selected value If the no AV match the name/category or if no category is defined, the input field should contain the value. Signed-off-by: Pierre Angot <tredok.pierre@gmail.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #20903|0 |1 is obsolete| | Attachment #21004|0 |1 is obsolete| | --- Comment #106 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 21465 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=21465&action=edit Bug 7180: QA followup Ergonomic improvements: - Remove the green color the selected record. - Use fieldset.rows (and legend). - Use the required css class for quantity inputs. - Replace "budget" with "fund". - fix the "undefined" string - Add a "show MARC" link - replace "no_match" with a text. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #20933|0 |1 is obsolete| | --- Comment #108 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 21467 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=21467&action=edit Bug 7180: Follow-up fixing minor issues - Fixed some labels from Budget to Fund - Added the system preference to sysprefs.sql - Fixed some untranslatable Javascript strings Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #20978|0 |1 is obsolete| | --- Comment #110 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 21469 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=21469&action=edit Bug 7180: Adapt neworderempty code (js function moved). The js function fetchSortDropbox has been deleted in previous patch. The new function is getAuthValueDropbox. Test plan: - link some av to some funds - open an existing order and verify value are correctly filled in the sort1 and sort2 values - create a new order and verify behavior is the same as before Note: This patch generates 2 ajax queries (max) if the budget is linked to 2 av categories for sort1 and sort2. This could be improved using a template plugin for values display on load. Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #112 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 21471 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=21471&action=edit Bug 7180: QA followup - fix unit tests (use a transaction). - add 3 tabs on the page in order to be more understandable. - fix a warn in logs -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #21017|0 |1 is obsolete| | --- Comment #114 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 21473 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=21473&action=edit Bug 7180: Restore the "Add order" link -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #116 from mathieu saby <mathieu.saby@univ-rennes2.fr> --- I am testing it on sandbox 3, thank you for the rebasing. Mathieu -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #118 from mathieu saby <mathieu.saby@univ-rennes2.fr> --- Discount are not taken into account. I put "10" in 966$d field and map it with "discount" in syspref. In the table for this record in "addorderiso2709.pl", I see "discount: 10" I saved the form In the resulting order, the discount is "9.00000" So the standard discount for the vendor applied, instead of the discount defined in the record. Is it normal or not (I suppose not)? Mathieu -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #120 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to mathieu saby from comment #118)

Discount are not taken into account. Is it normal or not (I suppose not)? No, there is a bug, the discount value was divided by 100 twice. A followup coming.

(In reply to mathieu saby from comment #119)

2 other issues (the same as when I tested some days ago)

- Koha is still adding VAT to price taken in the order, even if the vendor is defined with "list price include tax"

with the following: - syspref: price: 947$c - a biblio with 947$c=100 - a supplier with "list price include tax = 0", I got a rrp (include tax) = 94.79 (gst is 5.5%). - a supplier with "list price include tax = 1", I got a rrp (include tax) = 100 It is what is expected. See the test plan, step 6.

- a unitcost is still calculated. It must not be. Everywhere in Koha unitcost is the real cost define at receipt, never when ordering.

The unitcosts can be filled when ordering, so I don't considered that as an issue. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #121 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 21514 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=21514&action=edit Bug 7180: FIX: discount was divided by 100 twice. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 I'm just a bot <gitbot@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- When did the bot| |2013-09-29 last check this| | --- Comment #123 from I'm just a bot <gitbot@bugs.koha-community.org> --- Patch applied cleanly, go forth and signoff -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 I'm just a bot <gitbot@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply When did the bot|2013-09-29 00:00:00 |2013-10-30 last check this| | --- Comment #125 from I'm just a bot <gitbot@bugs.koha-community.org> --- Applying: Bug 7180: Order from staged file improvements Using index info to reconstruct a base tree... M installer/data/mysql/updatedatabase.pl M koha-tmpl/intranet-tmpl/prog/en/js/acq.js Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/js/acq.js Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Patch failed at 0001 Bug 7180: Order from staged file improvements The copy of the patch that failed is found in: /home/christopher/git/koha/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #21462|0 |1 is obsolete| | Attachment #21463|0 |1 is obsolete| | Attachment #21464|0 |1 is obsolete| | Attachment #21465|0 |1 is obsolete| | Attachment #21466|0 |1 is obsolete| | Attachment #21467|0 |1 is obsolete| | Attachment #21468|0 |1 is obsolete| | Attachment #21469|0 |1 is obsolete| | Attachment #21470|0 |1 is obsolete| | Attachment #21471|0 |1 is obsolete| | Attachment #21472|0 |1 is obsolete| | Attachment #21473|0 |1 is obsolete| | Attachment #21474|0 |1 is obsolete| | Attachment #21514|0 |1 is obsolete| | --- Comment #126 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 22546 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=22546&action=edit Bug 7180: Order from staged file improvements This patch adds: - 1 syspref MarcFieldsToOrder - 1 ajax script acqui/ajax-getauthvaluedropbox.pl - 1 routine C4::Budgets::GetBudgetByCode Before this patch you were not able to order 1 or all the records from your staged file. You were allowed to specify some information ("Import All" and "Accounting details" areas) for the order. With this patch, the previous behaviours still exist. But now you can *select* which records you want to ordered. For these ones you can specify independently informations (Quantity, price, budget, sort1 and sort2). The cherry on the cake is that you can pre-fill these information with values Test plan: 1. Fill the new syspref MarcFieldsToOrder with something like: ==BEGIN== price: 947$c quantity: 969$h budget_code: 922$a rrp: 010$d discount: 969$d sort1: 923$a sort2: 924$a ==END== The empty line at the end is mandatory! The budget (corresponding to your budget_code) can be filled with authorized value categories (statistic 1 and 2). The sort1 and sort2 values can be filled with the an authorized value (of the category previously selected) 2. Choose randomly one or more biblio(s) and fill fields with what is relevant. 3. Export the biblio and import it (with the "Stage MARC records for import" tool). 4. Go on a basket and add an order from a staged file. Select your staged file. 5. Well. Now you can see your biblio (or biblios if your had exported more than one). For each one, informations should be pre-filled with the biblio values. The budget should be selected on the budget corresponding to the budget_code (in the field 922$a) and the "planning values" too (with fields 923$a and 924$a). You can modify these values (or not) and choose a default value for budget and planning values (in the "Accounting details" area). 6. Save and check the prices values. Modify the order and check that budget and sort* are good Prices are calculated following some parameters: if there is no price => listprice = 0 else => - the gstrate value for your order is the gstrate value of the bookseller - discount = if filled : the discount value / 100 else: the discount value of the bookseller - if the bookseller includes tax( List item price includes tax: Yes ) if a discount exists: ecost = price rrp = ecost / ( 1 - discount ) else: # a discount does not exist ecost = price * ( 1 - discount ) rrp = price else # the bookseller does not include tax if a discount exists: ecost = price / ( 1 + gstrate ) rrp = ecost / ( 1 - discount ) else: # a discount does not exist rrp = price / ( 1 + gstrate ) ecost = rrp * ( 1 - discount ) - in all cases: listprice = rrp / currency rate unitprice = ecost total = ecost * quantity 7. Retry with different parameters 8. Check the 'Import all' action still works -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #128 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 22548 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=22548&action=edit Bug 7180: Add UT for C4::Budgets::GetBudgetByCode -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #130 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 22550 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=22550&action=edit Bug 7180: The default quantity is 1 -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #132 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 22552 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=22552&action=edit Bug 7180: Change syspref description - the blank line is now useless - add an example for the syspref value -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #134 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 22554 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=22554&action=edit Bug 7180: FIX License version Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #136 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 22556 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=22556&action=edit Bug 7180 - QA Followup - Correct minor language issues -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #138 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 22558 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=22558&action=edit Bug 7180: Remove useless rrp variable -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |http://bugs.koha-community. | |org/bugzilla3/show_bug.cgi? | |id=10501 -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Needs Signoff --- Comment #141 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to mathieu saby from comment #122)

Thank you for corecting the discount

...

with the following: - syspref: price: 947$c - a biblio with 947$c=100 - a supplier with "list price include tax = 0", I got a rrp (include tax) = 94.79 (gst is 5.5%). - a supplier with "list price include tax = 1", I got a rrp (include tax) = 100

It is what is expected. See the test plan, step 6.

I continue to find that strange. For me, if the vendor price in 947c is 100 EUR and this price "does NOT include tax", it means the book price is 100 EUR without tax, so 105.5 with tax. I cannot understand it in an other way...

The value in 947$c *includes* the tax. The rrp and ecost values are calculated depending on the supplier configuration. I rewrite the algorithm: So, the imported file always contains: price = include tax with the discount discount = the discount ecost : unit price with discount RRP : unit price If the supplier includes tax: ecost = unit price with discount, tax include RRP = unit price, tax include If a discount exists in the file: ecost = price RRP = ecost/(1-discount) If no discount in the file: RRP = price ecost = price*(1-discount [from supplier]) If the supplier does not include tax: ecost = unit price with discount, tax exclude RRP = unit price, tax exclude If a discount exists in the file: ecost = price/(1+tax) RRP = ecost/1-discount If no discount in the file: RRP = price/(1+tax) ecost = RRP(1-discount [from supplier]) -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #22546|0 |1 is obsolete| | Attachment #22547|0 |1 is obsolete| | Attachment #22548|0 |1 is obsolete| | Attachment #22549|0 |1 is obsolete| | Attachment #22550|0 |1 is obsolete| | Attachment #22551|0 |1 is obsolete| | Attachment #22552|0 |1 is obsolete| | Attachment #22553|0 |1 is obsolete| | Attachment #22554|0 |1 is obsolete| | Attachment #22555|0 |1 is obsolete| | Attachment #22556|0 |1 is obsolete| | Attachment #22557|0 |1 is obsolete| | Attachment #22558|0 |1 is obsolete| | Attachment #22559|0 |1 is obsolete| | --- Comment #143 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 24052 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24052&action=edit Bug 7180: Order from staged file improvements This patch adds: - 1 syspref MarcFieldsToOrder - 1 ajax script acqui/ajax-getauthvaluedropbox.pl - 1 routine C4::Budgets::GetBudgetByCode Before this patch you were not able to order 1 or all the records from your staged file. You were allowed to specify some information ("Import All" and "Accounting details" areas) for the order. With this patch, the previous behaviours still exist. But now you can *select* which records you want to ordered. For these ones you can specify independently informations (Quantity, price, budget, sort1 and sort2). The cherry on the cake is that you can pre-fill these information with values Test plan: 1. Fill the new syspref MarcFieldsToOrder with something like: ==BEGIN== price: 947$c quantity: 969$h budget_code: 922$a rrp: 010$d discount: 969$d sort1: 923$a sort2: 924$a ==END== The empty line at the end is mandatory! The budget (corresponding to your budget_code) can be filled with authorized value categories (statistic 1 and 2). The sort1 and sort2 values can be filled with the an authorized value (of the category previously selected) 2. Choose randomly one or more biblio(s) and fill fields with what is relevant. 3. Export the biblio and import it (with the "Stage MARC records for import" tool). 4. Go on a basket and add an order from a staged file. Select your staged file. 5. Well. Now you can see your biblio (or biblios if your had exported more than one). For each one, informations should be pre-filled with the biblio values. The budget should be selected on the budget corresponding to the budget_code (in the field 922$a) and the "planning values" too (with fields 923$a and 924$a). You can modify these values (or not) and choose a default value for budget and planning values (in the "Accounting details" area). 6. Save and check the prices values. Modify the order and check that budget and sort* are good Prices are calculated following some parameters: if there is no price => listprice = 0 else => - the gstrate value for your order is the gstrate value of the bookseller - discount = if filled : the discount value / 100 else: the discount value of the bookseller - if the bookseller includes tax( List item price includes tax: Yes ) if a discount exists: ecost = price rrp = ecost / ( 1 - discount ) else: # a discount does not exist ecost = price * ( 1 - discount ) rrp = price else # the bookseller does not include tax if a discount exists: ecost = price / ( 1 + gstrate ) rrp = ecost / ( 1 - discount ) else: # a discount does not exist rrp = price / ( 1 + gstrate ) ecost = rrp * ( 1 - discount ) - in all cases: listprice = rrp / currency rate unitprice = ecost total = ecost * quantity 7. Retry with different parameters 8. Check the 'Import all' action still works -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #145 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 24054 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24054&action=edit Bug 7180: Add UT for C4::Budgets::GetBudgetByCode -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #147 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 24056 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24056&action=edit Bug 7180: The default quantity is 1 -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #149 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 24058 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24058&action=edit Bug 7180: Change syspref description - the blank line is now useless - add an example for the syspref value -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #151 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 24060 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24060&action=edit Bug 7180: FIX License version Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #153 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 24062 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24062&action=edit Bug 7180 - QA Followup - Correct minor language issues -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #155 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 24064 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24064&action=edit Bug 7180: Remove useless rrp variable -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #157 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=7180 Pierre Angot <tredok.pierre@gmail.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=7180 --- Comment #159 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 24637 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24637&action=edit Bug 7180: FIX getAuthValueDropbox should display the selected value If the no AV match the name/category or if no category is defined, the input field should contain the value. Signed-off-by: Pierre Angot <tredok.pierre@gmail.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #161 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 24639 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24639&action=edit Bug 7180: QA followup Ergonomic improvements: - Remove the green color the selected record. - Use fieldset.rows (and legend). - Use the required css class for quantity inputs. - Replace "budget" with "fund". - fix the "undefined" string - Add a "show MARC" link - replace "no_match" with a text. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #163 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 24641 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24641&action=edit Bug 7180: Follow-up fixing minor issues - Fixed some labels from Budget to Fund - Added the system preference to sysprefs.sql - Fixed some untranslatable Javascript strings Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #165 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 24643 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24643&action=edit Bug 7180: Adapt neworderempty code (js function moved). The js function fetchSortDropbox has been deleted in previous patch. The new function is getAuthValueDropbox. Test plan: - link some av to some funds - open an existing order and verify value are correctly filled in the sort1 and sort2 values - create a new order and verify behavior is the same as before Note: This patch generates 2 ajax queries (max) if the budget is linked to 2 av categories for sort1 and sort2. This could be improved using a template plugin for values display on load. Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #167 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 24645 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24645&action=edit Bug 7180: QA followup - fix unit tests (use a transaction). - add 3 tabs on the page in order to be more understandable. - fix a warn in logs -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #169 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 24647 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24647&action=edit Bug 7180: Restore the "Add order" link -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #171 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 24649 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24649&action=edit Bug 7180: FIX: discount was divided by 100 twice. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #24636|0 |1 is obsolete| | Attachment #24637|0 |1 is obsolete| | Attachment #24638|0 |1 is obsolete| | Attachment #24639|0 |1 is obsolete| | Attachment #24640|0 |1 is obsolete| | Attachment #24641|0 |1 is obsolete| | Attachment #24642|0 |1 is obsolete| | Attachment #24643|0 |1 is obsolete| | Attachment #24644|0 |1 is obsolete| | Attachment #24645|0 |1 is obsolete| | Attachment #24646|0 |1 is obsolete| | Attachment #24647|0 |1 is obsolete| | Attachment #24648|0 |1 is obsolete| | Attachment #24649|0 |1 is obsolete| | --- Comment #173 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 24708 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24708&action=edit Bug 7180: Order from staged file improvements This patch adds: - 1 syspref MarcFieldsToOrder - 1 ajax script acqui/ajax-getauthvaluedropbox.pl - 1 routine C4::Budgets::GetBudgetByCode Before this patch you were not able to order 1 or all the records from your staged file. You were allowed to specify some information ("Import All" and "Accounting details" areas) for the order. With this patch, the previous behaviours still exist. But now you can *select* which records you want to ordered. For these ones you can specify independently informations (Quantity, price, budget, sort1 and sort2). The cherry on the cake is that you can pre-fill these information with values Test plan: 1. Fill the new syspref MarcFieldsToOrder with something like: ==BEGIN== price: 947$c quantity: 969$h budget_code: 922$a rrp: 010$d discount: 969$d sort1: 923$a sort2: 924$a ==END== The empty line at the end is mandatory! The budget (corresponding to your budget_code) can be filled with authorized value categories (statistic 1 and 2). The sort1 and sort2 values can be filled with the an authorized value (of the category previously selected) 2. Choose randomly one or more biblio(s) and fill fields with what is relevant. 3. Export the biblio and import it (with the "Stage MARC records for import" tool). 4. Go on a basket and add an order from a staged file. Select your staged file. 5. Well. Now you can see your biblio (or biblios if your had exported more than one). For each one, informations should be pre-filled with the biblio values. The budget should be selected on the budget corresponding to the budget_code (in the field 922$a) and the "planning values" too (with fields 923$a and 924$a). You can modify these values (or not) and choose a default value for budget and planning values (in the "Accounting details" area). 6. Save and check the prices values. Modify the order and check that budget and sort* are good Prices are calculated following some parameters: if there is no price => listprice = 0 else => - the gstrate value for your order is the gstrate value of the bookseller - discount = if filled : the discount value / 100 else: the discount value of the bookseller - if the bookseller includes tax( List item price includes tax: Yes ) if a discount exists: ecost = price rrp = ecost / ( 1 - discount ) else: # a discount does not exist ecost = price * ( 1 - discount ) rrp = price else # the bookseller does not include tax if a discount exists: ecost = price / ( 1 + gstrate ) rrp = ecost / ( 1 - discount ) else: # a discount does not exist rrp = price / ( 1 + gstrate ) ecost = rrp * ( 1 - discount ) - in all cases: listprice = rrp / currency rate unitprice = ecost total = ecost * quantity 7. Retry with different parameters 8. Check the 'Import all' action still works Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #175 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 24710 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24710&action=edit Bug 7180: Add UT for C4::Budgets::GetBudgetByCode Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #177 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 24712 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24712&action=edit Bug 7180: The default quantity is 1 Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #179 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 24714 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24714&action=edit Bug 7180: Change syspref description - the blank line is now useless - add an example for the syspref value Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #181 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 24716 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24716&action=edit Bug 7180: FIX License version Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #183 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 24718 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24718&action=edit Bug 7180 - QA Followup - Correct minor language issues Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180 --- Comment #185 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 24720 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24720&action=edit Bug 7180: Remove useless rrp variable Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.