sync SVN r18102

programe/coada_contabilizare_ef.prg

@@ -295,6 +295,28 @@ DEFINE CLASS CoadaContabilizareEF AS Custom
 		RETURN IIF(m.lnGestionabile > 0, 2, 1)
 	ENDPROC
 
+	*!* Cate randuri ajung efectiv in rulaje: articol ROA, gestiune (proprie sau implicita) si cont completate
+	PROCEDURE NrRanduriGestiune
+		LPARAMETERS tcAliasDetalii, tnGestiuneImplicita
+
+		LOCAL lcSelect, llGestImplicita, lnRanduri, lnRecno
+		lcSelect = SELECT()
+		lnRanduri = 0
+		llGestImplicita = !EMPTY(NVL(m.tnGestiuneImplicita, 0))
+		SELECT (m.tcAliasDetalii)
+		lnRecno = RECNO()
+		COUNT FOR NVL(in_stoc, 0) = 1 AND !EMPTY(NVL(id_articol, 0)) AND ;
+			(m.llGestImplicita OR !EMPTY(NVL(id_gestiune, 0))) AND ;
+			!EMPTY(ALLTRIM(NVL(cont, ''))) TO lnRanduri
+		TRY
+			GO m.lnRecno
+		CATCH
+			GO TOP
+		ENDTRY
+		SELECT (m.lcSelect)
+		RETURN m.lnRanduri
+	ENDPROC
+
 	*!* Textul antetului permanent afisat cat ruleaza coada
 	PROCEDURE AntetProgres
 		LPARAMETERS tnCurent, tnTotal, tcFurnizor, tcNrAct, tnSuma

programe/import_efactura.prg

@@ -18,8 +18,9 @@ PROCEDURE importEfacturaTrimise
 ENDPROC 
 
 PROCEDURE vizImportEFactura
-	LPARAMETERS tcTip
+	LPARAMETERS tcTip, tlDoarGestiune
 	* tcTIP: PRIMITE/TRIMISE
+	* tlDoarGestiune: import doar in gestiune, fara alegerea rutei (apel din aplicatia de gestiune)
 	
 	Private poFacturi, poFacturiDetalii
 	Local loFrmFacturi As "frm_efactura_import", lcTip, llPrimite
@@ -164,7 +165,7 @@ select 0 as distribuie, CAST(0 as number(10)) as id_tip, id_articol, id_gestiune
 	INDEX on id TAG id
 
 	Select crsFacturi
-	loFrmFacturi = Createobject("frm_import_efactura", m.llPrimite)
+	loFrmFacturi = Createobject("frm_import_efactura", m.llPrimite, m.tlDoarGestiune)
 	* Do Form frm_import_efactura Name loFrmFacturi Linked With m.llPrimite Noshow
 
 	loFrmFacturi.Show(1)