From 5a50a53b7a2214222847d568d496ab39f247b943 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= <soutade@gmail.com>
Date: Thu, 2 Dec 2010 19:12:27 +0100
Subject: [PATCH] Fix Bug : find meta operations when search previous
 operations (same description) Fix Bug : Don't update meta amount when
 removing one operation Update locales

---
 ressources/po/french.mo       | Bin 7404 -> 7454 bytes
 ressources/po/french.po       | 191 +++++++++++++++++-----------------
 ressources/po/kisscount.pot   | 150 +++++++++++++-------------
 src/controller/KissCount.cpp  |  11 +-
 src/view/grid/GridAccount.cpp |   2 +
 5 files changed, 186 insertions(+), 168 deletions(-)

diff --git a/ressources/po/french.mo b/ressources/po/french.mo
index 1a83bcdb85d0ac71377a0a44302751d00a765371..c503e56824e33e979b769251208c7ba410a29257 100644
GIT binary patch
delta 2820
zcmYk;eN5F=9LMp)Mbvw_2$Gi+R4yV48bj2K3$_$p(349=Q@Tbxia>x@5y|2wq2%Uj
z%R88xtJZXtp{;>yEmq5HE?pbWtz{4JPg!%C(u292%-)}Sk6XX-y{~i5{r%3v_naSa
zE$~*MGnzc1*KqA4W)jOM7&C~$$$W5S#~TxiIhcsKI0YZZY4{{2U?sY-1xv8Qwx7m0
z>ccn*zeRODg52+zUnzKL7(;bDZg23?NYVIE9cQ2>xDeB^)V9}S67>*jfNq?K2XPi2
zLf!undhh~j0zaag@y#z3G|+X_3U6CIEKBXFs0Zhv2FS;$7(fmD1Zuz_>b`2!gqx8c
zvzrf+YI<z@K~z7z7{~bLP1|r3)lomHqXE<eK0~GO9QtwCwvVB<<_>BArB4%zL)BAI
z&!r(hCW8-6Y>{m*L`O4OL4iI@Dc*-0QG45fTB(D{_=c??Ly}}ZM%{M?HSi_W^H(qf
z$5E+IC#@Ri5!3`qP+PDzk^HNJavB2If|~hp)Bqpa8;4L6{0ep7MWk=zWmI*XhRReX
zDua3G!eyxE0;mO)Adi}IRE8Up$iGt5MuTRy2l+Ak`RKtuOvPEGK?4+^I#`XGXc_AM
z&8Ueqpe7Kq^$yf?U8n(HLrv^3YU_?T6tvQ}Q8%7Ib@U0|k6)l3yky&dMh$osHGw;*
z1;nsCISKWA0%oDlwilr$wi1>4QmeC;f*vSGby#KHit4ZlHPaC4!Ck2P9aP3%#b69)
z19jhZ4uH1iPt;k6VSly7K0egG0QFn|%k=)QqQJA}FlvB))J#vIRz76g&!YBn7+JI#
zK~3ZaDs#82u|8wwQcuMBxD+*D5S7t7)N`E?+5a92O4aL_ji*o@j-V!R1vT@(t+6T5
zj*_hlkgrTJY9X6Y&o`pZPCIJgL#Tm2u-^}$NALgV6m+Q0p|;?AR3=8Pzo9ZRhU(xJ
zYDITZXU9$N8ZZTQ-yAH&98|_?Q2mDN_w7isOeZ=zjbRGvs1LQ$qo{!fte;xHL{0QO
zs)HZUk2h>RX?pZmbQUTT#i)Ka*!C(^rW{-EozDJiuLfw)FN*IlvO<ik5Va!rjObxX
z!Zp<Aq7K^*)XLjY19qbZ=)+Pxfh5V?MD^!oKeT`p)ESzWO8%9B0vfcUB2)&RMs-wy
z8lVj|kuFq951{Vv!volljA53hMZaHzG?^f3LG7rw!Lju)YKxDkL4{+ej!&XeHiW!Y
z=4;ezc;0@0!G1rAI-FN=KK^6dXY(gg11>~mbO~w!>rwqySesB8aXKgzQ|Lwwbk_Qf
zz2PEif<K`;zHI#+b*OGyZ=<&4F6#bR{`TsAFKVD^s0HmKW)sT@nsol7S2J`Ht8M)r
z6%^F*y~|Hw5Aith5TQ$%D<PgG^eXErjbe7<5@HomO=vQY5>-TGQ=X3$>@N$I!+%W9
z-0~uYT0+M&L}<4;=8<b7pXA%T5UrXn)Mhji1w=lfODEtlqE!`p6=HjMyE}7R6Qu^C
z#(uL2_Y%vA4a62=8=(~C60Z=tc1MXE`1O?Ah;AZ-$R-{nbm^d161&3V?zE}(YT^nK
zn~6E$98Y@f4mELYCCVZt{s^Ov%yy!Vc!1EAN$8~Loa@qy^-QG1e|y%KQ7`BUThGIn
z!Y4g>fpSVKZL3&EJZI}Vs810tTQ5Srg}nV{=AbXWE+)L!``*O*+UmyIn!&7uYc5aA
zPJgwnCnmk`@+{6>wAh~?D9q0vJe~ZmE8Ob49KWuzwKddIU4Q0y?O<8TJF!z*n*E{w
Kwf!~YU)O&`B>t=b

delta 2773
zcmX}teN5F=9LMp)1r!kEAyENQ5D989MMdFa&7cBPN<zRCLP-$H5&;v!yr8p;)keGN
z=wU=_sdN3IyX$FL{*kQyh_bO<wc#AKEGE>Nv$?tI{keSUH@^3Ee&?RwdHA05y9|1-
z7y7OwgdKNWM~Fql>M-X5xG91Uu7z`)3&kXi#Z;V&xi}BkVGLGaB-Udowpjf+4Cnp=
z&c<O>*CR-KpSw&Unu@Eajwh|bZRF2|^QAhDM@=vVmtcX_Z^bz78&CtZBWrNoI176)
z6<<U>_Z~*!Fh(%GyF@_){D>OxXVgmnF#omsSeB^=Q!pOyL=9Yk8fb%kzZuovcI3}B
z@}UW}TYV>LqK7e@@m-%)^rJc&Kn?UZYC>mFDf|%A@VwQJp|<9C)BuyH3H@dFp`=sK
zMW8Y}mk&)W)#|g*r<vqZ;2D>XcVG!>Z);F1-Gd2u$nIZ7lH%S)wL6O%co_BkWlYBj
zRLY}Cr^d-aO<*<Z4BQ(_{?$P#6@^%fTFD920B>5u)2IoaL$$kr^zCk;I*wp;WiAdq
zxB%5Y88z{2q^T=HWp*PfGu3hAUo)zuf<M>9#|wA>lkp$a79^1db&!dgU_Pq77d3&6
zs0mcs{WjEd4X6R1K~1a+wPgoU3+(YxP{UVH9leeV@Ez2HpIH4x)PP^3CNPFt!MOPw
z>iH?m#G6*Xh~;ZyOHnDm%Up?S?<=C94ol23RLAA0nO346tU*1n1C_C6tPOFl4b|>j
zHeOpYiaG=1d}wQLTKybu^jtD-!DYy!KG#J-1H6oy>2cJ`-?I8ssJ%RkEXsY3n#d(o
z=6*1L!DZb4iCLJKI6dG!sEn4Po~uWVw>x;x{<l(4$~rL{2T>h=iJHhLYGqf<NmPfo
z&3W?~jQbp9MXnficB)YAT2TWZL-pH_!3AQh-v3h+v;`lbW_I2jMrGt1R0rRqQaFY>
zJl9Yi-axg}XkM6&%2+X~-_5A+tB~ZlTGV0Ohdy=GK|w3*MGe$%4wyrz(|;P(!N-_}
zBX&Q9`e_bbIGuqsRKKfG_3Kd?s<Zoc)K>K`WdHR8@c|XV6=HCOs2N{F9i}OK7(GeT
zhphs&@+wryccKR9z%uMZlHx{D{Y{|G&JEPcXR$w8NMthk*UA@Dp$>9U9haac@CYiE
z)u;z{;W6w&`f{F>>F*aIRqk%oLLNX(yxi`0qPDihY(w?i?W3Sny@b3??gZ-f8?Xk0
z_Wk=9{5`-dzQ1Vo*HHuBLS-_9d}{&esD5)zFDetISd0~@aeS{?;SFmrgqrCYRL24H
zQ`BMl!u$&L-jAT#e}`)S6KbGw)Pjx>n%Ej*F)?#JP2qXH|M$<-n7ycuXRdS#&k+w1
zYpqhLD<!rOdUbV`P2<{e6;VPo5Sq+`#7;t2{WQTWuGUCt{*cIwx-P1B5jvOq2<<k<
z`u~gNxIK2)gW8NIi2@>z(8V6O4a8pE*yY7%{k@SHEl*KuA)c^rYLMgS))7@iEzwLI
zB65kD>wpz>&?|`!;xMt4$R_d$U3x=z5c~ZxQ7Q4eDe2lyY$Y=Mg;7fy+f>EXL~IF`
z_}_#&GOa`-kwfTuoX}Cxxz?o@sybNWx6(X_dNJ4A{c`N~e-^d8@G(mFS*>`KsIz<C
zW>-#l?7j%~7V3>k4P?$~3JELT+tKXri#{Fj#!PquE8<RiqVjTAu1L#U>&;sexSDX%
d6S1kWJ#AOx{!ahV#9spk<`0DivXcMy{0Bp2>_Pwl

diff --git a/ressources/po/french.po b/ressources/po/french.po
index 00fa3bf..182001b 100644
--- a/ressources/po/french.po
+++ b/ressources/po/french.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-20 17:16+0100\n"
+"POT-Creation-Date: 2010-12-02 19:11+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Soutadé <soutade@gmail.com>\n"
 "Language-Team: \n"
@@ -20,20 +20,20 @@ msgstr ""
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #: src/view/StatsPanel.cpp:327
-#: src/view/PreferencesPanel.cpp:764
+#: src/view/PreferencesPanel.cpp:775
 msgid " - "
 msgstr " - "
 
 #: src/view/UsersDialog.cpp:118
-#: src/view/PreferencesPanel.cpp:417
-#: src/view/PreferencesPanel.cpp:436
-#: src/view/PreferencesPanel.cpp:657
-#: src/view/PreferencesPanel.cpp:676
-#: src/view/PreferencesPanel.cpp:722
+#: src/view/PreferencesPanel.cpp:456
+#: src/view/PreferencesPanel.cpp:476
+#: src/view/PreferencesPanel.cpp:677
+#: src/view/PreferencesPanel.cpp:696
+#: src/view/PreferencesPanel.cpp:733
 msgid " already exists"
 msgstr " existe déjà"
 
-#: src/view/SearchPanel.cpp:222
+#: src/view/SearchPanel.cpp:226
 msgid " entries found"
 msgstr " entrées trouvées"
 
@@ -41,11 +41,11 @@ msgstr " entrées trouvées"
 msgid " not found, aborting"
 msgstr " non trouvé, arrêt"
 
-#: src/view/AccountPanel.cpp:733
+#: src/view/AccountPanel.cpp:742
 msgid " operations ?"
 msgstr " opérations ?"
 
-#: src/view/PreferencesPanel.cpp:771
+#: src/view/PreferencesPanel.cpp:782
 msgid " profil ?"
 msgstr " profil ?"
 
@@ -53,7 +53,7 @@ msgstr " profil ?"
 msgid "!! Warning !! If there was a bug, the old database will be suppressed !"
 msgstr "!! Attention !! S'il y a eu un bug, l'ancienne base de donnée va être supprimée !"
 
-#: src/view/SearchPanel.cpp:224
+#: src/view/SearchPanel.cpp:228
 msgid "1 entry found"
 msgstr "1 entrée trouvée"
 
@@ -61,17 +61,17 @@ msgstr "1 entrée trouvée"
 msgid "About"
 msgstr "A propos"
 
-#: src/view/SearchPanel.cpp:89
-#: src/view/grid/GridAccount.cpp:63
+#: src/view/SearchPanel.cpp:90
+#: src/view/grid/GridAccount.cpp:64
 msgid "Account"
 msgstr "Compte"
 
-#: src/view/PreferencesPanel.cpp:417
-#: src/view/PreferencesPanel.cpp:436
+#: src/view/PreferencesPanel.cpp:456
+#: src/view/PreferencesPanel.cpp:476
 msgid "Account "
 msgstr "Le compte "
 
-#: src/controller/KissCount.cpp:337
+#: src/controller/KissCount.cpp:343
 msgid "Account 1"
 msgstr "Compte 1"
 
@@ -88,30 +88,30 @@ msgstr "Numéro de compte"
 msgid "Accounts"
 msgstr "Comptes"
 
-#: src/view/SearchPanel.cpp:86
+#: src/view/SearchPanel.cpp:87
 msgid "Amount from"
 msgstr "Montant min"
 
-#: src/view/SearchPanel.cpp:87
+#: src/view/SearchPanel.cpp:88
 msgid "Amount to"
 msgstr "Montant max"
 
-#: src/view/PreferencesPanel.cpp:398
-#: src/view/PreferencesPanel.cpp:771
-#: src/view/AccountPanel.cpp:728
+#: src/view/PreferencesPanel.cpp:408
+#: src/view/PreferencesPanel.cpp:782
+#: src/view/AccountPanel.cpp:737
 msgid "Are you sure want to delete "
 msgstr "Etes vous sûr de vouloir supprimer "
 
-#: src/view/PreferencesPanel.cpp:638
-#: src/view/grid/GridAccount.cpp:783
+#: src/view/PreferencesPanel.cpp:657
+#: src/view/grid/GridAccount.cpp:814
 msgid "Are you sure want to delete : \n"
 msgstr "Etes vous sûr de vouloir supprimer : \n"
 
-#: src/view/PreferencesPanel.cpp:315
+#: src/view/PreferencesPanel.cpp:343
 msgid "Ascending"
 msgstr "Croissant"
 
-#: src/view/PreferencesPanel.cpp:254
+#: src/view/PreferencesPanel.cpp:267
 msgid "Background color"
 msgstr "Couleur d'arrière plan"
 
@@ -119,23 +119,19 @@ msgstr "Couleur d'arrière plan"
 msgid "Blocked"
 msgstr "Bloqué"
 
-#: src/view/SearchPanel.cpp:76
-msgid "Both"
-msgstr "Les deux"
-
 #: src/view/UsersDialog.cpp:51
 #: src/view/GenerateDialog.cpp:60
 #: src/view/PasswordDialog.cpp:56
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/view/grid/GridAccount.cpp:1190
-#: src/view/grid/GridAccount.cpp:1197
+#: src/view/grid/GridAccount.cpp:1245
+#: src/view/grid/GridAccount.cpp:1252
 msgid "Cannot group these operations"
 msgstr "Impossible de grouper ces opérations"
 
-#: src/view/grid/GridAccount.cpp:1316
-#: src/view/grid/GridAccount.cpp:1322
+#: src/view/grid/GridAccount.cpp:1371
+#: src/view/grid/GridAccount.cpp:1377
 msgid "Cannot ungroup these operations"
 msgstr "Impossible de dégrouper ces opérations"
 
@@ -143,13 +139,13 @@ msgstr "Impossible de dégrouper ces opérations"
 msgid "Categories"
 msgstr "Catégories"
 
-#: src/view/SearchPanel.cpp:88
-#: src/view/grid/GridAccount.cpp:63
+#: src/view/SearchPanel.cpp:89
+#: src/view/grid/GridAccount.cpp:64
 msgid "Category"
 msgstr "Catégorie"
 
-#: src/view/PreferencesPanel.cpp:657
-#: src/view/PreferencesPanel.cpp:676
+#: src/view/PreferencesPanel.cpp:677
+#: src/view/PreferencesPanel.cpp:696
 msgid "Category "
 msgstr "La catégorie "
 
@@ -173,6 +169,10 @@ msgstr "Changer d'utilisateur"
 msgid "Check mode"
 msgstr "Mode rapprochement"
 
+#: src/view/SearchPanel.cpp:76
+msgid "Checked"
+msgstr "Rapprochée"
+
 #: src/view/PasswordDialog.cpp:46
 msgid "Confirm password "
 msgstr "Confirmer le mot de passe "
@@ -182,7 +182,7 @@ msgstr "Confirmer le mot de passe "
 msgid "Cost repartition"
 msgstr "Répartition des coûts"
 
-#: src/view/grid/GridAccount.cpp:63
+#: src/view/grid/GridAccount.cpp:64
 msgid "Credit"
 msgstr "Crédit"
 
@@ -198,7 +198,7 @@ msgstr "Cur Débit"
 msgid "Current value"
 msgstr "Valeur courante"
 
-#: src/view/grid/GridAccount.cpp:63
+#: src/view/grid/GridAccount.cpp:64
 msgid "Date"
 msgstr "Date"
 
@@ -210,7 +210,7 @@ msgstr "Date min"
 msgid "Date to"
 msgstr "Date max"
 
-#: src/view/grid/GridAccount.cpp:63
+#: src/view/grid/GridAccount.cpp:64
 msgid "Debit"
 msgstr "Débit"
 
@@ -219,40 +219,40 @@ msgid "Default"
 msgstr "Défaut"
 
 #: src/view/PreferencesPanel.cpp:188
-#: src/view/PreferencesPanel.cpp:257
-#: src/view/AccountPanel.cpp:587
+#: src/view/PreferencesPanel.cpp:270
+#: src/view/AccountPanel.cpp:596
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/view/PreferencesPanel.cpp:316
+#: src/view/PreferencesPanel.cpp:344
 msgid "Descending"
 msgstr "Décroissant"
 
-#: src/view/SearchPanel.cpp:85
-#: src/view/grid/GridAccount.cpp:63
+#: src/view/SearchPanel.cpp:86
+#: src/view/grid/GridAccount.cpp:64
 msgid "Description"
 msgstr "Description"
 
 #: src/view/UsersDialog.cpp:88
 #: src/view/UsersDialog.cpp:118
-#: src/view/SearchPanel.cpp:140
-#: src/view/SearchPanel.cpp:150
-#: src/view/SearchPanel.cpp:164
-#: src/view/SearchPanel.cpp:175
-#: src/view/PreferencesPanel.cpp:394
-#: src/view/PreferencesPanel.cpp:417
-#: src/view/PreferencesPanel.cpp:436
-#: src/view/PreferencesPanel.cpp:657
-#: src/view/PreferencesPanel.cpp:676
-#: src/view/PreferencesPanel.cpp:716
-#: src/view/PreferencesPanel.cpp:722
+#: src/view/SearchPanel.cpp:141
+#: src/view/SearchPanel.cpp:151
+#: src/view/SearchPanel.cpp:165
+#: src/view/SearchPanel.cpp:176
+#: src/view/PreferencesPanel.cpp:404
+#: src/view/PreferencesPanel.cpp:456
+#: src/view/PreferencesPanel.cpp:476
+#: src/view/PreferencesPanel.cpp:677
+#: src/view/PreferencesPanel.cpp:696
+#: src/view/PreferencesPanel.cpp:727
+#: src/view/PreferencesPanel.cpp:733
 #: src/view/PasswordDialog.cpp:72
 #: src/view/PasswordDialog.cpp:78
-#: src/view/AccountPanel.cpp:724
-#: src/view/grid/GridAccount.cpp:1190
-#: src/view/grid/GridAccount.cpp:1197
-#: src/view/grid/GridAccount.cpp:1316
-#: src/view/grid/GridAccount.cpp:1322
+#: src/view/AccountPanel.cpp:733
+#: src/view/grid/GridAccount.cpp:1245
+#: src/view/grid/GridAccount.cpp:1252
+#: src/view/grid/GridAccount.cpp:1371
+#: src/view/grid/GridAccount.cpp:1377
 #: src/view/grid/wxGridCellFormulaEditor.cpp:69
 #: src/model/Database.cpp:38
 #: src/model/Database.cpp:55
@@ -274,17 +274,17 @@ msgid "Final value"
 msgstr "Valeur finale"
 
 #: src/view/SearchPanel.cpp:76
-#: src/view/grid/GridAccount.cpp:307
+#: src/view/grid/GridAccount.cpp:323
 #: src/model/Database.cpp:331
-#: src/controller/KissCount.cpp:353
+#: src/controller/KissCount.cpp:359
 msgid "Fix"
 msgstr "Fixe"
 
-#: src/view/PreferencesPanel.cpp:256
+#: src/view/PreferencesPanel.cpp:269
 msgid "Font"
 msgstr "Police"
 
-#: src/view/PreferencesPanel.cpp:255
+#: src/view/PreferencesPanel.cpp:268
 msgid "Foreground color"
 msgstr "Couleur d'avant plan"
 
@@ -297,11 +297,11 @@ msgid "From "
 msgstr "A partir de "
 
 #: src/view/GenerateDialog.cpp:31
-#: src/view/AccountPanel.cpp:584
+#: src/view/AccountPanel.cpp:593
 msgid "Generate month"
 msgstr "Générer mois"
 
-#: src/controller/KissCount.cpp:355
+#: src/controller/KissCount.cpp:361
 msgid "Groceries"
 msgstr "Courses"
 
@@ -309,7 +309,7 @@ msgstr "Courses"
 msgid "Group"
 msgstr "Grouper"
 
-#: src/controller/KissCount.cpp:357
+#: src/controller/KissCount.cpp:363
 msgid "Hobbies"
 msgstr "Loisirs"
 
@@ -317,19 +317,19 @@ msgstr "Loisirs"
 msgid "Initial value"
 msgstr "Valeur initiale"
 
-#: src/view/SearchPanel.cpp:150
+#: src/view/SearchPanel.cpp:151
 msgid "Invalid amount from"
 msgstr "Montant min invalide"
 
-#: src/view/SearchPanel.cpp:175
+#: src/view/SearchPanel.cpp:176
 msgid "Invalid amount range"
 msgstr "Intervalle des montants invalide"
 
-#: src/view/SearchPanel.cpp:164
+#: src/view/SearchPanel.cpp:165
 msgid "Invalid amount to"
 msgstr "Montant max invalide"
 
-#: src/view/SearchPanel.cpp:140
+#: src/view/SearchPanel.cpp:141
 msgid "Invalid date range"
 msgstr "Intervalle de temps invalide"
 
@@ -337,7 +337,7 @@ msgstr "Intervalle de temps invalide"
 msgid "Invalid formula !"
 msgstr "Formule invalide !"
 
-#: src/view/PreferencesPanel.cpp:716
+#: src/view/PreferencesPanel.cpp:727
 msgid "Invalid name"
 msgstr "Nom invalide"
 
@@ -353,11 +353,11 @@ msgstr "Mot de passe invalide"
 msgid "Invalide date range"
 msgstr "Intervalle de temps invalide"
 
-#: src/view/PreferencesPanel.cpp:394
+#: src/view/PreferencesPanel.cpp:404
 msgid "It must be at least one account !"
 msgstr "Il doit y avoir au moins un compte !"
 
-#: src/view/AccountPanel.cpp:724
+#: src/view/AccountPanel.cpp:733
 msgid "It must be at least one month !"
 msgstr "Il doit rester au moins un mois"
 
@@ -366,8 +366,8 @@ msgid "Kill me"
 msgstr "Kill me"
 
 #: src/view/StatsPanel.cpp:346
-#: src/view/PreferencesPanel.cpp:756
-#: src/view/PreferencesPanel.cpp:759
+#: src/view/PreferencesPanel.cpp:767
+#: src/view/PreferencesPanel.cpp:770
 msgid "KissCount"
 msgstr "KissCount"
 
@@ -375,21 +375,21 @@ msgstr "KissCount"
 msgid "Language"
 msgstr "Langue"
 
-#: src/view/PreferencesPanel.cpp:759
+#: src/view/PreferencesPanel.cpp:770
 msgid "Language not changed"
 msgstr "Langue non changée"
 
-#: src/view/PreferencesPanel.cpp:756
+#: src/view/PreferencesPanel.cpp:767
 msgid "Language successfully changed, please go to another panel"
 msgstr "Langue changée, allez sur un autre panneau pour rendre le changement effectif"
 
 #: src/view/PreferencesPanel.cpp:71
 #: src/view/PreferencesPanel.cpp:184
-#: src/view/PreferencesPanel.cpp:253
+#: src/view/PreferencesPanel.cpp:266
 msgid "Name"
 msgstr "Nom"
 
-#: src/view/PreferencesPanel.cpp:728
+#: src/view/PreferencesPanel.cpp:739
 msgid "Name changed"
 msgstr "Nom changé"
 
@@ -410,7 +410,7 @@ msgstr ""
 "Aucune base de données trouvée, voulez vous en créer une nouvelle ?\n"
 "\n"
 
-#: src/view/SearchPanel.cpp:227
+#: src/view/SearchPanel.cpp:231
 msgid "No entry found"
 msgstr "Pas d'entrée trouvée"
 
@@ -418,6 +418,10 @@ msgstr "Pas d'entrée trouvée"
 msgid "Non fix"
 msgstr "Courantes"
 
+#: src/view/SearchPanel.cpp:76
+msgid "Not checked"
+msgstr "Non rapprochée"
+
 #: src/view/PreferencesPanel.cpp:185
 msgid "Number"
 msgstr "Numéro de compte"
@@ -432,7 +436,7 @@ msgstr "OK"
 msgid "Old password "
 msgstr "Ancien mot de passe "
 
-#: src/controller/KissCount.cpp:359
+#: src/controller/KissCount.cpp:365
 msgid "Operating exepense"
 msgstr "Fonctionnement"
 
@@ -440,12 +444,11 @@ msgstr "Fonctionnement"
 msgid "Operation order"
 msgstr "Ordre des opérations"
 
-#: src/view/SearchPanel.cpp:77
 #: src/view/ButtonPanel.cpp:69
 msgid "Operations"
 msgstr "Opérations"
 
-#: src/controller/KissCount.cpp:363
+#: src/controller/KissCount.cpp:369
 msgid "Other"
 msgstr "Autres"
 
@@ -479,8 +482,8 @@ msgstr ""
 msgid "Please retype new password"
 msgstr "Re entrez le mot de passe"
 
-#: src/view/PreferencesPanel.cpp:730
-#: src/view/PreferencesPanel.cpp:764
+#: src/view/PreferencesPanel.cpp:741
+#: src/view/PreferencesPanel.cpp:775
 #: src/view/ButtonPanel.cpp:72
 msgid "Preferences"
 msgstr "Préférences"
@@ -501,8 +504,8 @@ msgstr "Quitter KissCount ?"
 msgid "Remains"
 msgstr "Restant"
 
-#: src/view/SearchPanel.cpp:83
-#: src/view/SearchPanel.cpp:238
+#: src/view/SearchPanel.cpp:84
+#: src/view/SearchPanel.cpp:242
 #: src/view/ButtonPanel.cpp:71
 msgid "Search"
 msgstr "Chercher"
@@ -548,7 +551,7 @@ msgstr "Dégrouper"
 msgid "Unable to open Database"
 msgstr "Impossible d'ouvrir la base de données"
 
-#: src/controller/KissCount.cpp:361
+#: src/controller/KissCount.cpp:367
 msgid "Unexpected"
 msgstr "Exceptionnel"
 
@@ -568,7 +571,7 @@ msgstr "Utilisateur"
 
 #: src/view/UsersDialog.cpp:38
 #: src/view/UsersDialog.cpp:118
-#: src/view/PreferencesPanel.cpp:722
+#: src/view/PreferencesPanel.cpp:733
 msgid "User "
 msgstr "Utilisateur "
 
@@ -576,11 +579,11 @@ msgstr "Utilisateur "
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: src/view/grid/GridAccount.cpp:993
+#: src/view/grid/GridAccount.cpp:1022
 msgid "Warning"
 msgstr "Attention"
 
-#: src/view/grid/GridAccount.cpp:993
+#: src/view/grid/GridAccount.cpp:1022
 msgid "You made a debit on a blocked account"
 msgstr "Vous avez effectué une opération de débit sur un compte bloqué"
 
@@ -632,6 +635,8 @@ msgstr "octobre"
 msgid "september"
 msgstr "septembre"
 
+#~ msgid "Both"
+#~ msgstr "Les deux"
 #~ msgid "Color"
 #~ msgstr "Couleur"
 #~ msgid "Fixe"
diff --git a/ressources/po/kisscount.pot b/ressources/po/kisscount.pot
index 34ddd37..7bd4551 100644
--- a/ressources/po/kisscount.pot
+++ b/ressources/po/kisscount.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-20 17:16+0100\n"
+"POT-Creation-Date: 2010-12-02 19:11+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,17 +17,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/view/StatsPanel.cpp:327 src/view/PreferencesPanel.cpp:764
+#: src/view/StatsPanel.cpp:327 src/view/PreferencesPanel.cpp:775
 msgid " - "
 msgstr ""
 
-#: src/view/UsersDialog.cpp:118 src/view/PreferencesPanel.cpp:417
-#: src/view/PreferencesPanel.cpp:436 src/view/PreferencesPanel.cpp:657
-#: src/view/PreferencesPanel.cpp:676 src/view/PreferencesPanel.cpp:722
+#: src/view/UsersDialog.cpp:118 src/view/PreferencesPanel.cpp:456
+#: src/view/PreferencesPanel.cpp:476 src/view/PreferencesPanel.cpp:677
+#: src/view/PreferencesPanel.cpp:696 src/view/PreferencesPanel.cpp:733
 msgid " already exists"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:222
+#: src/view/SearchPanel.cpp:226
 msgid " entries found"
 msgstr ""
 
@@ -35,11 +35,11 @@ msgstr ""
 msgid " not found, aborting"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:733
+#: src/view/AccountPanel.cpp:742
 msgid " operations ?"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:771
+#: src/view/PreferencesPanel.cpp:782
 msgid " profil ?"
 msgstr ""
 
@@ -47,7 +47,7 @@ msgstr ""
 msgid "!! Warning !! If there was a bug, the old database will be suppressed !"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:224
+#: src/view/SearchPanel.cpp:228
 msgid "1 entry found"
 msgstr ""
 
@@ -55,15 +55,15 @@ msgstr ""
 msgid "About"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:89 src/view/grid/GridAccount.cpp:63
+#: src/view/SearchPanel.cpp:90 src/view/grid/GridAccount.cpp:64
 msgid "Account"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:417 src/view/PreferencesPanel.cpp:436
+#: src/view/PreferencesPanel.cpp:456 src/view/PreferencesPanel.cpp:476
 msgid "Account "
 msgstr ""
 
-#: src/controller/KissCount.cpp:337
+#: src/controller/KissCount.cpp:343
 msgid "Account 1"
 msgstr ""
 
@@ -79,28 +79,28 @@ msgstr ""
 msgid "Accounts"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:86
+#: src/view/SearchPanel.cpp:87
 msgid "Amount from"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:87
+#: src/view/SearchPanel.cpp:88
 msgid "Amount to"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:398 src/view/PreferencesPanel.cpp:771
-#: src/view/AccountPanel.cpp:728
+#: src/view/PreferencesPanel.cpp:408 src/view/PreferencesPanel.cpp:782
+#: src/view/AccountPanel.cpp:737
 msgid "Are you sure want to delete "
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:638 src/view/grid/GridAccount.cpp:783
+#: src/view/PreferencesPanel.cpp:657 src/view/grid/GridAccount.cpp:814
 msgid "Are you sure want to delete : \n"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:315
+#: src/view/PreferencesPanel.cpp:343
 msgid "Ascending"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:254
+#: src/view/PreferencesPanel.cpp:267
 msgid "Background color"
 msgstr ""
 
@@ -108,20 +108,16 @@ msgstr ""
 msgid "Blocked"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:76
-msgid "Both"
-msgstr ""
-
 #: src/view/UsersDialog.cpp:51 src/view/GenerateDialog.cpp:60
 #: src/view/PasswordDialog.cpp:56
 msgid "Cancel"
 msgstr ""
 
-#: src/view/grid/GridAccount.cpp:1190 src/view/grid/GridAccount.cpp:1197
+#: src/view/grid/GridAccount.cpp:1245 src/view/grid/GridAccount.cpp:1252
 msgid "Cannot group these operations"
 msgstr ""
 
-#: src/view/grid/GridAccount.cpp:1316 src/view/grid/GridAccount.cpp:1322
+#: src/view/grid/GridAccount.cpp:1371 src/view/grid/GridAccount.cpp:1377
 msgid "Cannot ungroup these operations"
 msgstr ""
 
@@ -129,11 +125,11 @@ msgstr ""
 msgid "Categories"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:88 src/view/grid/GridAccount.cpp:63
+#: src/view/SearchPanel.cpp:89 src/view/grid/GridAccount.cpp:64
 msgid "Category"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:657 src/view/PreferencesPanel.cpp:676
+#: src/view/PreferencesPanel.cpp:677 src/view/PreferencesPanel.cpp:696
 msgid "Category "
 msgstr ""
 
@@ -157,6 +153,10 @@ msgstr ""
 msgid "Check mode"
 msgstr ""
 
+#: src/view/SearchPanel.cpp:76
+msgid "Checked"
+msgstr ""
+
 #: src/view/PasswordDialog.cpp:46
 msgid "Confirm password "
 msgstr ""
@@ -165,7 +165,7 @@ msgstr ""
 msgid "Cost repartition"
 msgstr ""
 
-#: src/view/grid/GridAccount.cpp:63
+#: src/view/grid/GridAccount.cpp:64
 msgid "Credit"
 msgstr ""
 
@@ -181,7 +181,7 @@ msgstr ""
 msgid "Current value"
 msgstr ""
 
-#: src/view/grid/GridAccount.cpp:63
+#: src/view/grid/GridAccount.cpp:64
 msgid "Date"
 msgstr ""
 
@@ -193,7 +193,7 @@ msgstr ""
 msgid "Date to"
 msgstr ""
 
-#: src/view/grid/GridAccount.cpp:63
+#: src/view/grid/GridAccount.cpp:64
 msgid "Debit"
 msgstr ""
 
@@ -201,29 +201,29 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:188 src/view/PreferencesPanel.cpp:257
-#: src/view/AccountPanel.cpp:587
+#: src/view/PreferencesPanel.cpp:188 src/view/PreferencesPanel.cpp:270
+#: src/view/AccountPanel.cpp:596
 msgid "Delete"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:316
+#: src/view/PreferencesPanel.cpp:344
 msgid "Descending"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:85 src/view/grid/GridAccount.cpp:63
+#: src/view/SearchPanel.cpp:86 src/view/grid/GridAccount.cpp:64
 msgid "Description"
 msgstr ""
 
 #: src/view/UsersDialog.cpp:88 src/view/UsersDialog.cpp:118
-#: src/view/SearchPanel.cpp:140 src/view/SearchPanel.cpp:150
-#: src/view/SearchPanel.cpp:164 src/view/SearchPanel.cpp:175
-#: src/view/PreferencesPanel.cpp:394 src/view/PreferencesPanel.cpp:417
-#: src/view/PreferencesPanel.cpp:436 src/view/PreferencesPanel.cpp:657
-#: src/view/PreferencesPanel.cpp:676 src/view/PreferencesPanel.cpp:716
-#: src/view/PreferencesPanel.cpp:722 src/view/PasswordDialog.cpp:72
-#: src/view/PasswordDialog.cpp:78 src/view/AccountPanel.cpp:724
-#: src/view/grid/GridAccount.cpp:1190 src/view/grid/GridAccount.cpp:1197
-#: src/view/grid/GridAccount.cpp:1316 src/view/grid/GridAccount.cpp:1322
+#: src/view/SearchPanel.cpp:141 src/view/SearchPanel.cpp:151
+#: src/view/SearchPanel.cpp:165 src/view/SearchPanel.cpp:176
+#: src/view/PreferencesPanel.cpp:404 src/view/PreferencesPanel.cpp:456
+#: src/view/PreferencesPanel.cpp:476 src/view/PreferencesPanel.cpp:677
+#: src/view/PreferencesPanel.cpp:696 src/view/PreferencesPanel.cpp:727
+#: src/view/PreferencesPanel.cpp:733 src/view/PasswordDialog.cpp:72
+#: src/view/PasswordDialog.cpp:78 src/view/AccountPanel.cpp:733
+#: src/view/grid/GridAccount.cpp:1245 src/view/grid/GridAccount.cpp:1252
+#: src/view/grid/GridAccount.cpp:1371 src/view/grid/GridAccount.cpp:1377
 #: src/view/grid/wxGridCellFormulaEditor.cpp:69 src/model/Database.cpp:38
 #: src/model/Database.cpp:55 src/model/Database.cpp:95
 #: src/model/Database.cpp:102 src/model/Database.cpp:120
@@ -240,16 +240,16 @@ msgstr ""
 msgid "Final value"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:76 src/view/grid/GridAccount.cpp:307
-#: src/model/Database.cpp:331 src/controller/KissCount.cpp:353
+#: src/view/SearchPanel.cpp:76 src/view/grid/GridAccount.cpp:323
+#: src/model/Database.cpp:331 src/controller/KissCount.cpp:359
 msgid "Fix"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:256
+#: src/view/PreferencesPanel.cpp:269
 msgid "Font"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:255
+#: src/view/PreferencesPanel.cpp:268
 msgid "Foreground color"
 msgstr ""
 
@@ -261,11 +261,11 @@ msgstr ""
 msgid "From "
 msgstr ""
 
-#: src/view/GenerateDialog.cpp:31 src/view/AccountPanel.cpp:584
+#: src/view/GenerateDialog.cpp:31 src/view/AccountPanel.cpp:593
 msgid "Generate month"
 msgstr ""
 
-#: src/controller/KissCount.cpp:355
+#: src/controller/KissCount.cpp:361
 msgid "Groceries"
 msgstr ""
 
@@ -273,7 +273,7 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
-#: src/controller/KissCount.cpp:357
+#: src/controller/KissCount.cpp:363
 msgid "Hobbies"
 msgstr ""
 
@@ -281,19 +281,19 @@ msgstr ""
 msgid "Initial value"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:150
+#: src/view/SearchPanel.cpp:151
 msgid "Invalid amount from"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:175
+#: src/view/SearchPanel.cpp:176
 msgid "Invalid amount range"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:164
+#: src/view/SearchPanel.cpp:165
 msgid "Invalid amount to"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:140
+#: src/view/SearchPanel.cpp:141
 msgid "Invalid date range"
 msgstr ""
 
@@ -301,7 +301,7 @@ msgstr ""
 msgid "Invalid formula !"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:716
+#: src/view/PreferencesPanel.cpp:727
 msgid "Invalid name"
 msgstr ""
 
@@ -317,11 +317,11 @@ msgstr ""
 msgid "Invalide date range"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:394
+#: src/view/PreferencesPanel.cpp:404
 msgid "It must be at least one account !"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:724
+#: src/view/AccountPanel.cpp:733
 msgid "It must be at least one month !"
 msgstr ""
 
@@ -329,8 +329,8 @@ msgstr ""
 msgid "Kill me"
 msgstr ""
 
-#: src/view/StatsPanel.cpp:346 src/view/PreferencesPanel.cpp:756
-#: src/view/PreferencesPanel.cpp:759
+#: src/view/StatsPanel.cpp:346 src/view/PreferencesPanel.cpp:767
+#: src/view/PreferencesPanel.cpp:770
 msgid "KissCount"
 msgstr ""
 
@@ -338,20 +338,20 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:759
+#: src/view/PreferencesPanel.cpp:770
 msgid "Language not changed"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:756
+#: src/view/PreferencesPanel.cpp:767
 msgid "Language successfully changed, please go to another panel"
 msgstr ""
 
 #: src/view/PreferencesPanel.cpp:71 src/view/PreferencesPanel.cpp:184
-#: src/view/PreferencesPanel.cpp:253
+#: src/view/PreferencesPanel.cpp:266
 msgid "Name"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:728
+#: src/view/PreferencesPanel.cpp:739
 msgid "Name changed"
 msgstr ""
 
@@ -369,7 +369,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:227
+#: src/view/SearchPanel.cpp:231
 msgid "No entry found"
 msgstr ""
 
@@ -377,6 +377,10 @@ msgstr ""
 msgid "Non fix"
 msgstr ""
 
+#: src/view/SearchPanel.cpp:76
+msgid "Not checked"
+msgstr ""
+
 #: src/view/PreferencesPanel.cpp:185
 msgid "Number"
 msgstr ""
@@ -390,7 +394,7 @@ msgstr ""
 msgid "Old password "
 msgstr ""
 
-#: src/controller/KissCount.cpp:359
+#: src/controller/KissCount.cpp:365
 msgid "Operating exepense"
 msgstr ""
 
@@ -398,11 +402,11 @@ msgstr ""
 msgid "Operation order"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:77 src/view/ButtonPanel.cpp:69
+#: src/view/ButtonPanel.cpp:69
 msgid "Operations"
 msgstr ""
 
-#: src/controller/KissCount.cpp:363
+#: src/controller/KissCount.cpp:369
 msgid "Other"
 msgstr ""
 
@@ -429,7 +433,7 @@ msgstr ""
 msgid "Please retype new password"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:730 src/view/PreferencesPanel.cpp:764
+#: src/view/PreferencesPanel.cpp:741 src/view/PreferencesPanel.cpp:775
 #: src/view/ButtonPanel.cpp:72
 msgid "Preferences"
 msgstr ""
@@ -450,7 +454,7 @@ msgstr ""
 msgid "Remains"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:83 src/view/SearchPanel.cpp:238
+#: src/view/SearchPanel.cpp:84 src/view/SearchPanel.cpp:242
 #: src/view/ButtonPanel.cpp:71
 msgid "Search"
 msgstr ""
@@ -492,7 +496,7 @@ msgstr ""
 msgid "Unable to open Database"
 msgstr ""
 
-#: src/controller/KissCount.cpp:361
+#: src/controller/KissCount.cpp:367
 msgid "Unexpected"
 msgstr ""
 
@@ -509,7 +513,7 @@ msgid "User"
 msgstr ""
 
 #: src/view/UsersDialog.cpp:38 src/view/UsersDialog.cpp:118
-#: src/view/PreferencesPanel.cpp:722
+#: src/view/PreferencesPanel.cpp:733
 msgid "User "
 msgstr ""
 
@@ -517,11 +521,11 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: src/view/grid/GridAccount.cpp:993
+#: src/view/grid/GridAccount.cpp:1022
 msgid "Warning"
 msgstr ""
 
-#: src/view/grid/GridAccount.cpp:993
+#: src/view/grid/GridAccount.cpp:1022
 msgid "You made a debit on a blocked account"
 msgstr ""
 
diff --git a/src/controller/KissCount.cpp b/src/controller/KissCount.cpp
index 5f4ee28..18203a5 100644
--- a/src/controller/KissCount.cpp
+++ b/src/controller/KissCount.cpp
@@ -412,6 +412,7 @@ bool KissCount::SearchPreviousOperation(Operation* res, Operation& op, int month
     wxDateTime* date ;
     //wxDateSpan threeMonths(0, 3); Not working :(
     std::vector<wxString> v;
+    int i;
 
     month -= 3;
     if (month < 0)
@@ -432,11 +433,17 @@ bool KissCount::SearchPreviousOperation(Operation* res, Operation& op, int month
         return false;
     }
 
-    *res = (*operations)[operations->size()-1];
+    for(i=operations->size()-1; i>=0; i--)
+	if (!(*operations)[i].meta)
+	{
+	    *res = (*operations)[i];
+	    delete operations;
+	    return true;
+	}
 
     delete operations;
 
-    return true;
+    return false;
 }
 
 void KissCount::GetStats(int monthFrom, int yearFrom, int monthTo, int yearTo, 
diff --git a/src/view/grid/GridAccount.cpp b/src/view/grid/GridAccount.cpp
index 7bee286..8bec55e 100644
--- a/src/view/grid/GridAccount.cpp
+++ b/src/view/grid/GridAccount.cpp
@@ -1440,6 +1440,8 @@ removeLastGroup:
 		    op2.childs.erase(op2.childs.begin()+a);
 		    break;
 		}
+	    UpdateMeta(op2);
+	    UpdateOperation(op2);
 	}
 
 	line = GetDisplayedRow(parent);