[Koha-bugs] [Bug 20318] Merge invoices can lead to an merged invoice without Invoice number

[bugzilla-daemon]

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

Martin Renvoize  changed:

   What|Removed |Added

 Status|Pushed to Stable|RESOLVED
 Resolution|--- |FIXED

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

[Koha-bugs] [Bug 20318] Merge invoices can lead to an merged invoice without Invoice number

[bugzilla-daemon]

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

Fridolin SOMERS  changed:

   What|Removed |Added

   Patch complexity|--- |Small patch

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

[Koha-bugs] [Bug 20318] Merge invoices can lead to an merged invoice without Invoice number

[bugzilla-daemon]

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

Fridolin SOMERS  changed:

   What|Removed |Added

 CC||fridolin.som...@biblibre.co
   ||m

--- Comment #18 from Fridolin SOMERS  ---
Pushed to 17.05.x for v17.05.12

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

[Koha-bugs] [Bug 20318] Merge invoices can lead to an merged invoice without Invoice number

[bugzilla-daemon]

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

Nick Clemens  changed:

   What|Removed |Added

 Status|Pushed to Master|Pushed to Stable
 CC||n...@bywatersolutions.com

--- Comment #17 from Nick Clemens  ---
Pushed to stable for 17.11.06

Awesome work all!

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

[Koha-bugs] [Bug 20318] Merge invoices can lead to an merged invoice without Invoice number

[bugzilla-daemon]

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

Jonathan Druart  changed:

   What|Removed |Added

 Status|Passed QA   |Pushed to Master

--- Comment #16 from Jonathan Druart  
---
Pushed to master for 18.05, thanks to everybody involved!

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

[Koha-bugs] [Bug 20318] Merge invoices can lead to an merged invoice without Invoice number

[bugzilla-daemon]

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

--- Comment #15 from Jonathan Druart  
---
Created attachment 73532
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=73532=edit
Bug 20318: Add class 'required' to the label

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

[Koha-bugs] [Bug 20318] Merge invoices can lead to an merged invoice without Invoice number

[bugzilla-daemon]

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

Jonathan Druart  changed:

   What|Removed |Added

 CC||jonathan.dru...@bugs.koha-c
   ||ommunity.org
  Attachment #72969|0   |1
is obsolete||

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

[Koha-bugs] [Bug 20318] Merge invoices can lead to an merged invoice without Invoice number

[bugzilla-daemon]

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

Jonathan Druart  changed:

   What|Removed |Added

  Attachment #72975|0   |1
is obsolete||

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

[Koha-bugs] [Bug 20318] Merge invoices can lead to an merged invoice without Invoice number

[bugzilla-daemon]

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

Josef Moravec  changed:

   What|Removed |Added

 Status|Signed Off  |Passed QA

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

[Koha-bugs] [Bug 20318] Merge invoices can lead to an merged invoice without Invoice number

[bugzilla-daemon]

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

--- Comment #14 from Josef Moravec  ---
Created attachment 73415
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=73415=edit
Bug 20318: Merge invoices can lead to an merged invoice without Invoice number

Signed-off-by: Séverine QUEUNE 

Signed-off-by: Josef Moravec 

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

[Koha-bugs] [Bug 20318] Merge invoices can lead to an merged invoice without Invoice number

[bugzilla-daemon]

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

--- Comment #13 from Séverine Queune  ---
Thanks Josef and Christophe, the onclick feature is a great idea !

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

[Koha-bugs] [Bug 20318] Merge invoices can lead to an merged invoice without Invoice number

[bugzilla-daemon]

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

--- Comment #12 from Séverine Queune  ---
Created attachment 72975
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=72975=edit
Bug 20318: Merge invoices can lead to an merged invoice without Invoice number

Signed-off-by: Séverine QUEUNE 

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

[Koha-bugs] [Bug 20318] Merge invoices can lead to an merged invoice without Invoice number

[bugzilla-daemon]

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

Séverine Queune  changed:

   What|Removed |Added

 Status|Needs Signoff   |Signed Off

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

[Koha-bugs] [Bug 20318] Merge invoices can lead to an merged invoice without Invoice number

[bugzilla-daemon]

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

Christophe Croullebois  changed:

   What|Removed |Added

  Attachment #72958|0   |1
is obsolete||

--- Comment #11 from Christophe Croullebois 
 ---
Created attachment 72969
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=72969=edit
Merge invoices can lead to an merged invoice without Invoice number

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

[Koha-bugs] [Bug 20318] Merge invoices can lead to an merged invoice without Invoice number

[bugzilla-daemon]

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

--- Comment #10 from Christophe Croullebois 
 ---
(In reply to Josef Moravec from comment #8)
> Failed QA means I need answer here.

Hi Josef,

you'r right, so I have added this functionality.

Thx

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

[Koha-bugs] [Bug 20318] Merge invoices can lead to an merged invoice without Invoice number

[bugzilla-daemon]

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

Christophe Croullebois  changed:

   What|Removed |Added

 Status|Failed QA   |Needs Signoff

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

[Koha-bugs] [Bug 20318] Merge invoices can lead to an merged invoice without Invoice number

[bugzilla-daemon]

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

Christophe Croullebois  changed:

   What|Removed |Added

  Attachment #72873|0   |1
is obsolete||
  Attachment #72881|0   |1
is obsolete||

--- Comment #9 from Christophe Croullebois 
 ---
Created attachment 72958
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=72958=edit
Merge invoices can lead to an merged invoice without Invoice number

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

[Koha-bugs] [Bug 20318] Merge invoices can lead to an merged invoice without Invoice number

[bugzilla-daemon]

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

Josef Moravec  changed:

   What|Removed |Added

 Status|Signed Off  |Failed QA
 QA Contact|testo...@bugs.koha-communit |josef.mora...@gmail.com
   |y.org   |
 CC||josef.mora...@gmail.com

--- Comment #8 from Josef Moravec  ---
Failed QA means I need answer here.

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

[Koha-bugs] [Bug 20318] Merge invoices can lead to an merged invoice without Invoice number

[bugzilla-daemon]

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

--- Comment #7 from Josef Moravec  ---
Comment on attachment 72881
  --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=72881
Bug 20318: Merge invoices can lead to an merged invoice without Invoice number

Review of attachment 72881:
 --> 
(https://bugs.koha-community.org/bugzilla3/page.cgi?id=splinter.html=20318=72881)
-

::: koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
@@ -351,4 @@
>  $(row).click(function () {
>  $('#merge_table tbody tr').removeClass('active');
>  $(this).addClass('active');
> -
> $('#merge_invoicenumber').text(invoice.invoicenumber);

Why do you remove this? The functionality of using one of merged invoices
number just by clicking on it could be still useful.

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

[Koha-bugs] [Bug 20318] Merge invoices can lead to an merged invoice without Invoice number

[bugzilla-daemon]

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

--- Comment #6 from Christophe Croullebois 
 ---
Thx Séverine,

in fact this message is not coded in koha but depend of your language, I
presume it is French on your machine.
Maybe someone can test with English to validate.

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

[Koha-bugs] [Bug 20318] Merge invoices can lead to an merged invoice without Invoice number

[bugzilla-daemon]

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

--- Comment #5 from Séverine Queune  ---
Thanks for quick rebase !
One thing though : if I try to merge without choosing a name for the new
invoice, the alerte message is in french "Veuillez compléter ce champ.".

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

[Koha-bugs] [Bug 20318] Merge invoices can lead to an merged invoice without Invoice number

[bugzilla-daemon]

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

Séverine Queune  changed:

   What|Removed |Added

 Status|Patch doesn't apply |Signed Off

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

[Koha-bugs] [Bug 20318] Merge invoices can lead to an merged invoice without Invoice number

[bugzilla-daemon]

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

--- Comment #4 from Séverine Queune  ---
Created attachment 72881
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=72881=edit
Bug 20318: Merge invoices can lead to an merged invoice without Invoice number

Signed-off-by: Séverine QUEUNE 

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

[Koha-bugs] [Bug 20318] Merge invoices can lead to an merged invoice without Invoice number

[bugzilla-daemon]

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

Christophe Croullebois  changed:

   What|Removed |Added

  Attachment #72306|0   |1
is obsolete||

--- Comment #3 from Christophe Croullebois 
 ---
Created attachment 72873
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=72873=edit
rebased patch

rebased thx fot the tests

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

[Koha-bugs] [Bug 20318] Merge invoices can lead to an merged invoice without Invoice number

[bugzilla-daemon]

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

Séverine Queune  changed:

   What|Removed |Added

 Status|Failed QA   |Patch doesn't apply

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

[Koha-bugs] [Bug 20318] Merge invoices can lead to an merged invoice without Invoice number

[bugzilla-daemon]

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

Séverine Queune  changed:

   What|Removed |Added

 CC||severine.que...@bulac.fr
 Status|Needs Signoff   |Failed QA

--- Comment #2 from Séverine Queune  ---
Applying: Bug 20318: Merge invoices can lead to an merged invoice without
Invoice number
Using index info to reconstruct a base tree...
M   koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
Failed to merge in the changes.
Patch failed at 0001 Bug 20318: Merge invoices can lead to an merged invoice
without Invoice number
The copy of the patch that failed is found in:
   /var/repositories/koha/.git/rebase-apply/patch
When you have resolved this problem run "git bz apply --continue".
If you would prefer to skip this patch, instead run "git bz apply --skip".
To restore the original branch and stop patching run "git bz apply --abort".
Patch left in
/tmp/Merge-invoices-can-lead-to-an-merged-invoice-witho-SIyTfk.patch

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

[Koha-bugs] [Bug 20318] Merge invoices can lead to an merged invoice without Invoice number

[bugzilla-daemon]

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

Christophe Croullebois  changed:

   What|Removed |Added

 Status|NEW |Needs Signoff
 CC||christophe.croullebois@bibl
   ||ibre.com
   Assignee|koha-b...@lists.koha-commun |christophe.croullebois@bibl
   |ity.org |ibre.com

--- Comment #1 from Christophe Croullebois 
 ---
Created attachment 72306
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=72306=edit
Merge invoices can lead to an merged invoice without Invoice number

thx to test

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