sync SVN r18064

clase/ointroduceri.vc2

@@ -8650,6 +8650,7 @@ DEFINE CLASS import_nota AS frm_termin_renunt OF "_frm_child.vcx"
 		PRIVATE pcCont,pcAct,pcRul,pParamP,pParamS
 		STORE 0 TO pParamP,pParamS
 		lcAnalitic = ''
+		llDinNomenclator = .F.
 		lcAlias = ALIAS()
 		
 		pcCont = ALLTRIM(tcCont)
@@ -8662,14 +8663,22 @@ DEFINE CLASS import_nota AS frm_termin_renunt OF "_frm_child.vcx"
 			RETURN
 		ENDIF
 		
+		*!* fara regula de analitic pe cont, se incearca analiticul propriu al articolului
 		IF lnSucces > 0
 			IF RECCOUNT('crs_cfg_ana')=0
 				USE IN crs_cfg_ana
-				lnSucces = -1
+				IF TYPE('&pcRul..acont') # 'U'
+					lcAnalitic = ALLTRIM(NVL(&pcRul..acont,''))
+				ENDIF
+				IF EMPTY(lcAnalitic)
+					lnSucces = -1
+				ELSE
+					llDinNomenclator = .T.
+				ENDIF
 			ENDIF
 		ENDIF
 		
-		IF lnSucces > 0
+		IF lnSucces > 0 AND !llDinNomenclator
 			SELECT crs_cfg_ana
 			SCATTER NAME ocfg
 			lcCampPrefix = NVL(ALLTRIM(ocfg.camp_leg_prefix),'')
@@ -8705,7 +8714,7 @@ DEFINE CLASS import_nota AS frm_termin_renunt OF "_frm_child.vcx"
 		ENDIF
 		
 		&& iau Primul Simbol Analitic din Tabel - ordonat pt ca e selectat cu Distinct
-		IF lnSucces > 0
+		IF lnSucces > 0 AND !llDinNomenclator
 			SELECT crs_analitice
 			GO top
 			lcAnalitic = ALLTRIM(acont)
@@ -12253,6 +12262,12 @@ DEFINE CLASS import_nota AS frm_termin_renunt OF "_frm_child.vcx"
 		thisform.grid1.cFDoc.DynamicBackColor = "Iif(introdc.tip_rand = 'D', Rgb(229,229,229), introdc.doc_color)"
 	ENDPROC
 
+	PROCEDURE GridArt.cAcont.Text1.LostFocus
+		*!* editare manuala a analiticului articolului - armeaza sincronizarea amanata
+		Thisform.lSyncPending = .T.
+		Thisform.tmrSync.Interval = 1
+	ENDPROC
+
 	PROCEDURE GridArt.cCant.Text1.GotFocus
 		Thisform.nOldVal = This.Value
 		Dodefault()
@@ -12276,6 +12291,12 @@ DEFINE CLASS import_nota AS frm_termin_renunt OF "_frm_child.vcx"
 		thisform.do_executa_pret(3,lnRec,this.value)
 	ENDPROC
 
+	PROCEDURE GridArt.cCont.Text1.LostFocus
+		*!* editare manuala a contului articolului - armeaza sincronizarea amanata
+		Thisform.lSyncPending = .T.
+		Thisform.tmrSync.Interval = 1
+	ENDPROC
+
 	PROCEDURE GridArt.cCotaTva.Text1.GotFocus
 		*!* valoarea la intrarea in celula - Valid rearmeaza sincronizarea doar daca s-a modificat
 		Thisform.nOldVal = This.Value