sync SVN r18107
This commit is contained in:
@@ -85,7 +85,7 @@ DEFINE CLASS cus_odata_catalog_articole AS _cusodatabase OF "_cus_odata_base.vcx
|
||||
IIF(Isnull(pnId_part),[NULL],Alltrim(Str(pnId_part)))+[,] + ;
|
||||
Alltrim(Str(pnTaxaReconditionare,18,4)) + [,] + ;
|
||||
Alltrim(Str(pnListareCodBare)) + [,?@pnIdAMS,] + ;
|
||||
alltrim(str(pnTip)) + [,0] + [, '] + m.pcCodNC8 + [',] + ALLTRIM(STR(NVL(m.pnGreutate, 0),12,4)) + [,] + ALLTRIM(STR(m.pnIdTaraOrigine)) + [, '] + m.pcCodCPV + [','] + m.pcCodUMISO + ['); end;]
|
||||
alltrim(str(pnTip)) + [,0] + [, '] + m.pcCodNC8 + [',] + ALLTRIM(STR(NVL(m.pnGreutate, 0),12,4)) + [,] + IIF(ISNULL(m.pnIdTaraOrigine), [NULL], ALLTRIM(STR(m.pnIdTaraOrigine))) + [, '] + m.pcCodCPV + [','] + m.pcCodUMISO + ['); end;]
|
||||
Case lcActiune = "UPDATE"
|
||||
lcSql = [begin pack_preturi.modifica_articol(?gnAn,]+Alltrim(Str(pnId))+[, ']+;
|
||||
pccodmat+ [', '] + pccodmatf + [', '] + pcconditii_pastrare + [','] + pcdenumire+[',] + ;
|
||||
@@ -707,6 +707,14 @@ DEFINE CLASS frm_catalog_articole_nou AS _frmbase OF "_frm_base.vcx"
|
||||
*< OBJECTDATA: ObjPath="_pageframe1.Page2.ct_tara_origine" UniqueID="" Timestamp="" />
|
||||
*< OBJECTDATA: ObjPath="_pageframe1.Page2.lblIntrastat" UniqueID="" Timestamp="" />
|
||||
*< OBJECTDATA: ObjPath="_pageframe1.Page2.Clb_tx_simplu2" UniqueID="" Timestamp="" />
|
||||
*< OBJECTDATA: ObjPath="_pageframe1.Page3.Clb_tx_pret_ftva" UniqueID="" Timestamp="" />
|
||||
*< OBJECTDATA: ObjPath="_pageframe1.Page3.Clb_tx_pret_ctva" UniqueID="" Timestamp="" />
|
||||
*< OBJECTDATA: ObjPath="_pageframe1.Page3.Cb_tx_proc_tvav" UniqueID="" Timestamp="" />
|
||||
*< OBJECTDATA: ObjPath="_pageframe1.Page3.Cb_tx_venit" UniqueID="" Timestamp="" />
|
||||
*< OBJECTDATA: ObjPath="_pageframe1.Page3.Clb_tx_scd" UniqueID="" Timestamp="" />
|
||||
*< OBJECTDATA: ObjPath="_pageframe1.Page3.Clb_tx_scc" UniqueID="" Timestamp="" />
|
||||
*< OBJECTDATA: ObjPath="_pageframe1.Page3.Clb_tx_cont_dedus" UniqueID="" Timestamp="" />
|
||||
*< OBJECTDATA: ObjPath="_pageframe1.Page3.Lb_info_conturi" UniqueID="" Timestamp="" />
|
||||
*< OBJECTDATA: ObjPath="Cus_odata_parteneri_articole_coduri" UniqueID="" Timestamp="" />
|
||||
|
||||
*<DefinedPropArrayMethod>
|
||||
@@ -720,6 +728,7 @@ DEFINE CLASS frm_catalog_articole_nou AS _frmbase OF "_frm_base.vcx"
|
||||
*p: nid
|
||||
*p: ogeneratorcodbare
|
||||
*p: ogeneratorcodmat
|
||||
*p: opretnom
|
||||
*p: orec
|
||||
*</DefinedPropArrayMethod>
|
||||
|
||||
@@ -731,10 +740,12 @@ DEFINE CLASS frm_catalog_articole_nou AS _frmbase OF "_frm_base.vcx"
|
||||
nid = 0
|
||||
ogeneratorcodbare = .NULL.
|
||||
ogeneratorcodmat = .NULL.
|
||||
opretnom = .NULL.
|
||||
Width = 610
|
||||
_memberdata = <VFPData>
|
||||
<memberdata name="ogeneratorcodmat" type="property" display="oGeneratorCodmat"/>
|
||||
<memberdata name="ogeneratorcodbare" type="property" display="oGeneratorCodBare"/>
|
||||
<memberdata name="opretnom" type="property" display="oPretNom"/>
|
||||
</VFPData>
|
||||
_shape1.Height = 29
|
||||
_shape1.Left = 0
|
||||
@@ -766,14 +777,16 @@ DEFINE CLASS frm_catalog_articole_nou AS _frmbase OF "_frm_base.vcx"
|
||||
Height = 415, ;
|
||||
Left = 1, ;
|
||||
Name = "_pageframe1", ;
|
||||
PageCount = 2, ;
|
||||
PageCount = 3, ;
|
||||
TabIndex = 1, ;
|
||||
Top = 27, ;
|
||||
Width = 610, ;
|
||||
Page1.Caption = "Articol", ;
|
||||
Page1.Name = "Page1", ;
|
||||
Page2.Caption = "Alte informatii", ;
|
||||
Page2.Name = "Page2"
|
||||
Page2.Name = "Page2", ;
|
||||
Page3.Caption = "Vanzare", ;
|
||||
Page3.Name = "Page3"
|
||||
*< END OBJECT: ClassLib="_baza.vcx" BaseClass="pageframe" />
|
||||
|
||||
ADD OBJECT '_pageframe1.Page1._checkbox1' AS _checkbox WITH ;
|
||||
@@ -1459,6 +1472,146 @@ DEFINE CLASS frm_catalog_articole_nou AS _frmbase OF "_frm_base.vcx"
|
||||
Top = 8
|
||||
*< END OBJECT: ClassLib="_baza.vcx" BaseClass="label" />
|
||||
|
||||
ADD OBJECT '_pageframe1.Page3.Cb_tx_proc_tvav' AS cb_tx_simplu WITH ;
|
||||
Height = 29, ;
|
||||
Left = 9, ;
|
||||
Name = "Cb_tx_proc_tvav", ;
|
||||
TabIndex = 3, ;
|
||||
Top = 82, ;
|
||||
Width = 380, ;
|
||||
ZOrderSet = 2, ;
|
||||
_cbbase1.Height = 23, ;
|
||||
_cbbase1.Left = 185, ;
|
||||
_cbbase1.Name = "_cbbase1", ;
|
||||
_cbbase1.Top = 3, ;
|
||||
_cbbase1.Width = 163, ;
|
||||
_lbbase1.Caption = "Cota TVA", ;
|
||||
_lbbase1.Name = "_lbbase1"
|
||||
*< END OBJECT: ClassLib="lb_tx.vcx" BaseClass="container" />
|
||||
|
||||
ADD OBJECT '_pageframe1.Page3.Cb_tx_venit' AS cb_tx_simplu WITH ;
|
||||
Height = 29, ;
|
||||
Left = 9, ;
|
||||
Name = "Cb_tx_venit", ;
|
||||
TabIndex = 4, ;
|
||||
Top = 118, ;
|
||||
Width = 380, ;
|
||||
ZOrderSet = 3, ;
|
||||
_cbbase1.BoundColumn = 2, ;
|
||||
_cbbase1.BoundTo = .T., ;
|
||||
_cbbase1.ColumnCount = 2, ;
|
||||
_cbbase1.ColumnLines = .F., ;
|
||||
_cbbase1.ColumnWidths = "184,0", ;
|
||||
_cbbase1.Height = 23, ;
|
||||
_cbbase1.Left = 185, ;
|
||||
_cbbase1.Name = "_cbbase1", ;
|
||||
_cbbase1.Top = 3, ;
|
||||
_cbbase1.Width = 184, ;
|
||||
_lbbase1.Caption = "Tip venit", ;
|
||||
_lbbase1.Name = "_lbbase1"
|
||||
*< END OBJECT: ClassLib="lb_tx.vcx" BaseClass="container" />
|
||||
|
||||
ADD OBJECT '_pageframe1.Page3.Clb_tx_cont_dedus' AS clb_tx_simplu WITH ;
|
||||
Height = 29, ;
|
||||
Left = 9, ;
|
||||
Name = "Clb_tx_cont_dedus", ;
|
||||
TabIndex = 7, ;
|
||||
Top = 226, ;
|
||||
Width = 380, ;
|
||||
ZOrderSet = 6, ;
|
||||
Text_simplu1.Height = 23, ;
|
||||
Text_simplu1.Left = 185, ;
|
||||
Text_simplu1.MaxLength = 12, ;
|
||||
Text_simplu1.Name = "Text_simplu1", ;
|
||||
Text_simplu1.ReadOnly = .T., ;
|
||||
Text_simplu1.Top = 3, ;
|
||||
Text_simplu1.Width = 113, ;
|
||||
Lb_simplu1.Caption = "Cont venit articol", ;
|
||||
Lb_simplu1.Name = "Lb_simplu1"
|
||||
*< END OBJECT: ClassLib="lb_tx.vcx" BaseClass="container" />
|
||||
|
||||
ADD OBJECT '_pageframe1.Page3.Clb_tx_pret_ctva' AS clb_tx_simplu WITH ;
|
||||
Height = 29, ;
|
||||
Left = 9, ;
|
||||
Name = "Clb_tx_pret_ctva", ;
|
||||
TabIndex = 2, ;
|
||||
Top = 46, ;
|
||||
Width = 380, ;
|
||||
ZOrderSet = 1, ;
|
||||
Text_simplu1.Format = "RK", ;
|
||||
Text_simplu1.Height = 23, ;
|
||||
Text_simplu1.InputMask = (GET_MASK(14,gnPC)), ;
|
||||
Text_simplu1.Left = 185, ;
|
||||
Text_simplu1.Name = "Text_simplu1", ;
|
||||
Text_simplu1.Top = 3, ;
|
||||
Text_simplu1.Width = 113, ;
|
||||
Lb_simplu1.Caption = "Pret cu TVA", ;
|
||||
Lb_simplu1.Name = "Lb_simplu1"
|
||||
*< END OBJECT: ClassLib="lb_tx.vcx" BaseClass="container" />
|
||||
|
||||
ADD OBJECT '_pageframe1.Page3.Clb_tx_pret_ftva' AS clb_tx_simplu WITH ;
|
||||
Height = 29, ;
|
||||
Left = 9, ;
|
||||
Name = "Clb_tx_pret_ftva", ;
|
||||
TabIndex = 1, ;
|
||||
Top = 10, ;
|
||||
Width = 380, ;
|
||||
ZOrderSet = 0, ;
|
||||
Text_simplu1.Format = "RK", ;
|
||||
Text_simplu1.Height = 23, ;
|
||||
Text_simplu1.InputMask = (GET_MASK(14,gnPC)), ;
|
||||
Text_simplu1.Left = 185, ;
|
||||
Text_simplu1.Name = "Text_simplu1", ;
|
||||
Text_simplu1.Top = 3, ;
|
||||
Text_simplu1.Width = 113, ;
|
||||
Lb_simplu1.Caption = "Pret fara TVA", ;
|
||||
Lb_simplu1.Name = "Lb_simplu1"
|
||||
*< END OBJECT: ClassLib="lb_tx.vcx" BaseClass="container" />
|
||||
|
||||
ADD OBJECT '_pageframe1.Page3.Clb_tx_scc' AS clb_tx_simplu WITH ;
|
||||
Height = 29, ;
|
||||
Left = 9, ;
|
||||
Name = "Clb_tx_scc", ;
|
||||
TabIndex = 6, ;
|
||||
Top = 190, ;
|
||||
Width = 380, ;
|
||||
ZOrderSet = 5, ;
|
||||
Text_simplu1.Height = 23, ;
|
||||
Text_simplu1.Left = 185, ;
|
||||
Text_simplu1.MaxLength = 12, ;
|
||||
Text_simplu1.Name = "Text_simplu1", ;
|
||||
Text_simplu1.Top = 3, ;
|
||||
Text_simplu1.Width = 113, ;
|
||||
Lb_simplu1.Caption = "Cont creditor", ;
|
||||
Lb_simplu1.Name = "Lb_simplu1"
|
||||
*< END OBJECT: ClassLib="lb_tx.vcx" BaseClass="container" />
|
||||
|
||||
ADD OBJECT '_pageframe1.Page3.Clb_tx_scd' AS clb_tx_simplu WITH ;
|
||||
Height = 29, ;
|
||||
Left = 9, ;
|
||||
Name = "Clb_tx_scd", ;
|
||||
TabIndex = 5, ;
|
||||
Top = 154, ;
|
||||
Width = 380, ;
|
||||
ZOrderSet = 4, ;
|
||||
Text_simplu1.Height = 23, ;
|
||||
Text_simplu1.Left = 185, ;
|
||||
Text_simplu1.MaxLength = 12, ;
|
||||
Text_simplu1.Name = "Text_simplu1", ;
|
||||
Text_simplu1.Top = 3, ;
|
||||
Text_simplu1.Width = 113, ;
|
||||
Lb_simplu1.Caption = "Cont debitor", ;
|
||||
Lb_simplu1.Name = "Lb_simplu1"
|
||||
*< END OBJECT: ClassLib="lb_tx.vcx" BaseClass="container" />
|
||||
|
||||
ADD OBJECT '_pageframe1.Page3.Lb_info_conturi' AS _label WITH ;
|
||||
Caption = "Necompletate: debit 4111, credit contul de venit al articolului", ;
|
||||
Left = 9, ;
|
||||
Name = "Lb_info_conturi", ;
|
||||
TabIndex = 8, ;
|
||||
Top = 262
|
||||
*< END OBJECT: ClassLib="_baza.vcx" BaseClass="label" />
|
||||
|
||||
ADD OBJECT 'But_renunt1' AS but_renunt WITH ;
|
||||
Left = 551, ;
|
||||
Name = "But_renunt1", ;
|
||||
@@ -1686,6 +1839,10 @@ DEFINE CLASS frm_catalog_articole_nou AS _frmbase OF "_frm_base.vcx"
|
||||
Endscan
|
||||
|
||||
Set Deleted &lcDeleted
|
||||
|
||||
If m.llReturn And Vartype(Thisform.oPretNom) = "O"
|
||||
llReturn = Thisform.oPretNom.salveaza(m.lnIdArticol)
|
||||
Endif
|
||||
Endif && cus_odata_catalog_articole
|
||||
|
||||
Thisform.do_inchide_tranzactie(Iif(m.llReturn, 1, 2))
|
||||
@@ -1767,8 +1924,65 @@ DEFINE CLASS frm_catalog_articole_nou AS _frmbase OF "_frm_base.vcx"
|
||||
If gnCodBareAutomat = 2
|
||||
This.oGeneratorCodBare= Createobject("oGeneratorNumere")
|
||||
lnRezultat2 = This.oGeneratorCodBare.creeaza_cursor_serii(15)
|
||||
EndIf
|
||||
EndIf
|
||||
*!* 07.09.2009 ^
|
||||
|
||||
If gcNumeProgram = [ROAFACTURARE]
|
||||
This.oPretNom = Createobject("cus_pret_nomenclator")
|
||||
This.oPretNom.incarca(Iif(Upper(Alltrim(m.tcActiune)) = [UPDATE], m.tnId, 0))
|
||||
This._pageframe1.Page3.Clb_tx_pret_ftva.Text_simplu1.ControlSource = "Thisform.oPretNom.nPretFtva"
|
||||
This._pageframe1.Page3.Clb_tx_pret_ctva.Text_simplu1.ControlSource = "Thisform.oPretNom.nPretCtva"
|
||||
This._pageframe1.Page3.Clb_tx_scd.Text_simplu1.ControlSource = "Thisform.oPretNom.cScd"
|
||||
This._pageframe1.Page3.Clb_tx_scc.Text_simplu1.ControlSource = "Thisform.oPretNom.cScc"
|
||||
This._pageframe1.Page3.Clb_tx_cont_dedus.Text_simplu1.ControlSource = "Thisform.oPretNom.cContDedus"
|
||||
If Used('crsvenchelt')
|
||||
Use In crsvenchelt
|
||||
Endif
|
||||
goExecutor.oExecute([select id_venchelt, explicatie as venchelt from vnom_venchel where inactiv = 0 order by explicatie],[crsvenchelt])
|
||||
This._pageframe1.Page3.Cb_tx_venit._cbbase1.RowSourceType = 6
|
||||
This._pageframe1.Page3.Cb_tx_venit._cbbase1.RowSource = "crsvenchelt.venchelt,id_venchelt"
|
||||
This._pageframe1.Page3.Cb_tx_venit._cbbase1.ControlSource = "Thisform.oPretNom.nIdVenchelt"
|
||||
If Used('crs_cote_tva')
|
||||
Use In crs_cote_tva
|
||||
Endif
|
||||
If Used('crs_cote_tva2')
|
||||
Use In crs_cote_tva2
|
||||
Endif
|
||||
goExecutor.oExecute([select procent, proc_tva from ] + gcS + [.vcote_tva where an = ?gnAn and luna = ?gnLuna order by proc_tva desc],[crs_cote_tva2])
|
||||
Create Cursor crs_cote_tva (procent C(100), proc_tva N(10,2) Null)
|
||||
If Used('crs_cote_tva2')
|
||||
Insert Into crs_cote_tva (procent, proc_tva) Select Alltrim(Str(procent,10,2)), proc_tva From crs_cote_tva2
|
||||
Use In crs_cote_tva2
|
||||
Endif
|
||||
Select crs_cote_tva
|
||||
Append Blank
|
||||
Replace procent With [<ALES LA FACTURARE>]
|
||||
This._pageframe1.Page3.Cb_tx_proc_tvav._cbbase1.RowSourceType = 2
|
||||
This._pageframe1.Page3.Cb_tx_proc_tvav._cbbase1.RowSource = "crs_cote_tva"
|
||||
If Isnull(This.oPretNom.nProcTvav)
|
||||
Locate For Isnull(proc_tva)
|
||||
Else
|
||||
Locate For !Isnull(proc_tva) And proc_tva = This.oPretNom.nProcTvav
|
||||
Endif
|
||||
If !Found()
|
||||
Go Bottom
|
||||
Endif
|
||||
This._pageframe1.Page3.Cb_tx_proc_tvav._cbbase1.ListIndex = Recno()
|
||||
If This.oPretNom.lPreturiCuTva
|
||||
This._pageframe1.Page3.Clb_tx_pret_ctva.Lb_simplu1.Caption = "Pret cu TVA (pret lista)"
|
||||
This._pageframe1.Page3.Clb_tx_pret_ctva.Lb_simplu1.FontBold = .T.
|
||||
This._pageframe1.Page3.Clb_tx_pret_ftva.Lb_simplu1.Caption = "Pret fara TVA"
|
||||
This._pageframe1.Page3.Clb_tx_pret_ftva.Lb_simplu1.FontBold = .F.
|
||||
Else
|
||||
This._pageframe1.Page3.Clb_tx_pret_ftva.Lb_simplu1.Caption = "Pret fara TVA (pret lista)"
|
||||
This._pageframe1.Page3.Clb_tx_pret_ftva.Lb_simplu1.FontBold = .T.
|
||||
This._pageframe1.Page3.Clb_tx_pret_ctva.Lb_simplu1.Caption = "Pret cu TVA"
|
||||
This._pageframe1.Page3.Clb_tx_pret_ctva.Lb_simplu1.FontBold = .F.
|
||||
Endif
|
||||
This._pageframe1.PageCount = 3
|
||||
Else
|
||||
This._pageframe1.PageCount = 2
|
||||
Endif
|
||||
ENDPROC
|
||||
|
||||
PROCEDURE Load
|
||||
@@ -1927,6 +2141,30 @@ DEFINE CLASS frm_catalog_articole_nou AS _frmbase OF "_frm_base.vcx"
|
||||
thisform.do_alege_partener()
|
||||
ENDPROC
|
||||
|
||||
PROCEDURE _pageframe1.Page3.Cb_tx_proc_tvav._cbbase1.InteractiveChange
|
||||
Select crs_cote_tva
|
||||
Thisform.oPretNom.nProcTvav = crs_cote_tva.proc_tva
|
||||
If Thisform.oPretNom.lPreturiCuTva
|
||||
Thisform.oPretNom.nPretFtva = Thisform.oPretNom.recalculeaza_pret(Thisform.oPretNom.nPretCtva, .F.)
|
||||
Thisform._pageframe1.Page3.Clb_tx_pret_ftva.Text_simplu1.Refresh()
|
||||
Else
|
||||
Thisform.oPretNom.nPretCtva = Thisform.oPretNom.recalculeaza_pret(Thisform.oPretNom.nPretFtva, .T.)
|
||||
Thisform._pageframe1.Page3.Clb_tx_pret_ctva.Text_simplu1.Refresh()
|
||||
Endif
|
||||
ENDPROC
|
||||
|
||||
PROCEDURE _pageframe1.Page3.Clb_tx_pret_ctva.Text_simplu1.Valid
|
||||
Thisform.oPretNom.nPretCtva = This.Value
|
||||
Thisform.oPretNom.nPretFtva = Thisform.oPretNom.recalculeaza_pret(This.Value, .F.)
|
||||
Thisform._pageframe1.Page3.Clb_tx_pret_ftva.Text_simplu1.Refresh()
|
||||
ENDPROC
|
||||
|
||||
PROCEDURE _pageframe1.Page3.Clb_tx_pret_ftva.Text_simplu1.Valid
|
||||
Thisform.oPretNom.nPretFtva = This.Value
|
||||
Thisform.oPretNom.nPretCtva = Thisform.oPretNom.recalculeaza_pret(This.Value, .T.)
|
||||
Thisform._pageframe1.Page3.Clb_tx_pret_ctva.Text_simplu1.Refresh()
|
||||
ENDPROC
|
||||
|
||||
ENDDEFINE
|
||||
|
||||
DEFINE CLASS frm_config_codbare AS frm_termin_renunt OF "_frm_child.vcx"
|
||||
|
||||
Reference in New Issue
Block a user