[Stacomir-commits] r305 - pkg/stacomir/R

[noreply at r-forge.r-project.org]

Author: briand
Date: 2017-03-16 11:05:15 +0100 (Thu, 16 Mar 2017)
New Revision: 305

Modified:
   pkg/stacomir/R/BilanAnnuels.r
   pkg/stacomir/R/BilanMigrationInterAnnuelle.r
Log:


Modified: pkg/stacomir/R/BilanAnnuels.r
===================================================================
--- pkg/stacomir/R/BilanAnnuels.r	2017-03-16 09:34:57 UTC (rev 304)
+++ pkg/stacomir/R/BilanAnnuels.r	2017-03-16 10:05:15 UTC (rev 305)
@@ -100,7 +100,7 @@
 							(select *, extract(year  from ope_date_debut) as annee FROM ",get("sch",envir=envir_stacomi),"t_operation_ope ",
 					" join ",get("sch",envir=envir_stacomi),"t_lot_lot on lot_ope_identifiant=ope_identifiant where ope_dic_identifiant in",dc,
 					" and extract(year from ope_date_debut)>=", anneedebut,
-					" and extract(year from ope_date_debut)<=", anneefin,	
+					" and extract(year from ope_date_fin)<=", anneefin,	
 					" and ope_dic_identifiant in ", dc,
 					" and lot_tax_code in ", tax,
 					" and lot_std_code in ",std,

Modified: pkg/stacomir/R/BilanMigrationInterAnnuelle.r
===================================================================
--- pkg/stacomir/R/BilanMigrationInterAnnuelle.r	2017-03-16 09:34:57 UTC (rev 304)
+++ pkg/stacomir/R/BilanMigrationInterAnnuelle.r	2017-03-16 10:05:15 UTC (rev 305)
@@ -210,7 +210,8 @@
 						#==================================
 						
 						if (!silent){
-							choice2<-gWidgets::gconfirm(gettextf("Some data differ between t_bilanjournalier_bjo table, this probably means that they have been changed after the last bilanmigration was run, do you want to load them again for calculation ?"),
+							choice2<-gWidgets::gconfirm(gettextf("Some data differ between t_bilanjournalier_bjo table, this means that they have been changed after the last bilanmigration was run,  
+						do you want to load them again for calculation ?"),
 									handler=reload_years_with_error)
 						} else {
 							reload_years_with_error(h=NULL)