Skip to content

Commit 5b2d835

Browse files
danilobredadanilobreda
committed
merge feito com master e resolvido conflitos nfecoreport
2 parents 9253dd4 + cb5a454 commit 5b2d835

File tree

95 files changed

+1021
-961
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+1021
-961
lines changed

‎CTe.AppTeste/CTeTesteModel.cs

+9-8
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
using CTe.Classes.Servicos.Evento;
5757
using CTe.Classes.Servicos.Recepcao;
5858
using CTe.Classes.Servicos.Tipos;
59+
using CTe.CTeOSClasses;
5960
using CTe.Servicos.ConsultaProtocolo;
6061
using CTe.Servicos.ConsultaRecibo;
6162
using CTe.Servicos.ConsultaStatus;
@@ -67,14 +68,14 @@
6768
using CTe.Utils.CTe;
6869
using DFe.Classes.Entidades;
6970
using DFe.Classes.Flags;
70-
using DFe.DocumentosEletronicos.CTe.Classes.Informacoes.Emitente;
71-
using DFe.DocumentosEletronicos.CTe.Classes.Informacoes.Valores;
72-
using DFe.DocumentosEletronicos.CTe.CTeOS;
73-
using DFe.DocumentosEletronicos.CTe.CTeOS.Informacoes;
74-
using DFe.DocumentosEletronicos.CTe.CTeOS.Informacoes.Identificacao;
75-
using DFe.DocumentosEletronicos.CTe.CTeOS.Informacoes.Impostos;
76-
using DFe.DocumentosEletronicos.CTe.CTeOS.Informacoes.InfCTeNormal;
77-
using DFe.DocumentosEletronicos.CTe.CTeOS.Informacoes.Tomador;
71+
using CTe.CTeOSDocumento.CTe.Classes.Informacoes.Emitente;
72+
using CTe.CTeOSDocumento.CTe.Classes.Informacoes.Valores;
73+
using CTe.CTeOSDocumento.CTe.CTeOS;
74+
using CTe.CTeOSDocumento.CTe.CTeOS.Informacoes;
75+
using CTe.CTeOSDocumento.CTe.CTeOS.Informacoes.Identificacao;
76+
using CTe.CTeOSDocumento.CTe.CTeOS.Informacoes.Impostos;
77+
using CTe.CTeOSDocumento.CTe.CTeOS.Informacoes.InfCTeNormal;
78+
using CTe.CTeOSDocumento.CTe.CTeOS.Informacoes.Tomador;
7879
using DFe.Utils;
7980
using CteEletronico = CTe.Classes.CTe;
8081
using dest = CTe.Classes.Informacoes.Destinatario.dest;

‎CTe.AppTeste/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@
4848
//
4949
// You can specify all the values or you can default the Build and Revision Numbers
5050
// by using the '*' as shown below:
51-
// [assembly: AssemblyVersion("1.0.0.756")]
52-
[assembly: AssemblyVersion("1.0.0.756")]
53-
[assembly: AssemblyFileVersion("1.0.0.756")]
51+
// [assembly: AssemblyVersion("1.0.0.758")]
52+
[assembly: AssemblyVersion("1.0.0.758")]
53+
[assembly: AssemblyFileVersion("1.0.0.758")]

‎CTe.Classes/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
//
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
33-
// [assembly: AssemblyVersion("1.0.0.756")]
34-
[assembly: AssemblyVersion("1.0.0.756")]
35-
[assembly: AssemblyFileVersion("1.0.0.756")]
33+
// [assembly: AssemblyVersion("1.0.0.758")]
34+
[assembly: AssemblyVersion("1.0.0.758")]
35+
[assembly: AssemblyFileVersion("1.0.0.758")]

‎CTe.Dacte.AppTeste/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
//
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
33-
// [assembly: AssemblyVersion("1.0.0.756")]
34-
[assembly: AssemblyVersion("1.0.0.756")]
35-
[assembly: AssemblyFileVersion("1.0.0.756")]
33+
// [assembly: AssemblyVersion("1.0.0.758")]
34+
[assembly: AssemblyVersion("1.0.0.758")]
35+
[assembly: AssemblyFileVersion("1.0.0.758")]

‎CTe.Dacte.Base/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
//
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
33-
// [assembly: AssemblyVersion("1.0.0.756")]
34-
[assembly: AssemblyVersion("1.0.0.756")]
35-
[assembly: AssemblyFileVersion("1.0.0.756")]
33+
// [assembly: AssemblyVersion("1.0.0.758")]
34+
[assembly: AssemblyVersion("1.0.0.758")]
35+
[assembly: AssemblyFileVersion("1.0.0.758")]

‎CTe.Dacte.Fast/DacteFrCte.cs

+12-1
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,24 @@ public void Imprimir(bool exibirDialogo = true, string impressora = "")
116116
}
117117

118118
/// <summary>
119-
/// Converte o DAMDFe para PDF e salva-o no caminho/arquivo indicado
119+
/// Converte o DACTe para PDF e salva-o no caminho/arquivo indicado
120120
/// </summary>
121121
/// <param name="arquivo">Caminho/arquivo onde deve ser salvo o PDF do DACTe</param>
122122
public void ExportarPdf(string arquivo)
123123
{
124124
Relatorio.Prepare();
125125
Relatorio.Export(new PDFExport(), arquivo);
126126
}
127+
128+
/// <summary>
129+
/// Converte o DACTe para PDF e copia para o stream
130+
/// </summary>
131+
/// <param name="outputStream">Variável do tipo Stream para output</param>
132+
public void ExportarPdf(Stream outputStream)
133+
{
134+
Relatorio.Prepare();
135+
Relatorio.Export(new PDFExport(), outputStream);
136+
outputStream.Position = 0;
137+
}
127138
}
128139
}

‎CTe.Dacte.Fast/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
//
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
33-
// [assembly: AssemblyVersion("1.0.0.756")]
34-
[assembly: AssemblyVersion("1.0.0.756")]
35-
[assembly: AssemblyFileVersion("1.0.0.756")]
33+
// [assembly: AssemblyVersion("1.0.0.758")]
34+
[assembly: AssemblyVersion("1.0.0.758")]
35+
[assembly: AssemblyFileVersion("1.0.0.758")]

‎CTe.Dacte.Fast/Resources/CTeEvento.frx

+214-190
Large diffs are not rendered by default.

‎CTe.Dacte.Fast/Resources/CTeRetrato.frx

+188-163
Large diffs are not rendered by default.

‎CTe.Servicos/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
//
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
33-
// [assembly: AssemblyVersion("1.0.0.756")]
34-
[assembly: AssemblyVersion("1.0.0.756")]
35-
[assembly: AssemblyFileVersion("1.0.0.756")]
33+
// [assembly: AssemblyVersion("1.0.0.758")]
34+
[assembly: AssemblyVersion("1.0.0.758")]
35+
[assembly: AssemblyFileVersion("1.0.0.758")]

‎CTe.Utils/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
//
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
33-
// [assembly: AssemblyVersion("1.0.0.756")]
34-
[assembly: AssemblyVersion("1.0.0.756")]
35-
[assembly: AssemblyFileVersion("1.0.0.756")]
33+
// [assembly: AssemblyVersion("1.0.0.758")]
34+
[assembly: AssemblyVersion("1.0.0.758")]
35+
[assembly: AssemblyFileVersion("1.0.0.758")]

‎CTe.Wsdl/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
//
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
33-
// [assembly: AssemblyVersion("1.0.0.756")]
34-
[assembly: AssemblyVersion("1.0.0.756")]
35-
[assembly: AssemblyFileVersion("1.0.0.756")]
33+
// [assembly: AssemblyVersion("1.0.0.758")]
34+
[assembly: AssemblyVersion("1.0.0.758")]
35+
[assembly: AssemblyFileVersion("1.0.0.758")]

‎CTeRefatorar/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
//
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
34-
// [assembly: AssemblyVersion("1.0.0.756")]
35-
[assembly: AssemblyVersion("1.0.0.756")]
36-
[assembly: AssemblyFileVersion("1.0.0.756")]
34+
// [assembly: AssemblyVersion("1.0.0.758")]
35+
[assembly: AssemblyVersion("1.0.0.758")]
36+
[assembly: AssemblyFileVersion("1.0.0.758")]

‎DFe.Classes/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
//
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
33-
// [assembly: AssemblyVersion("1.0.0.756")]
34-
[assembly: AssemblyVersion("1.0.0.756")]
35-
[assembly: AssemblyFileVersion("1.0.0.756")]
33+
// [assembly: AssemblyVersion("1.0.0.758")]
34+
[assembly: AssemblyVersion("1.0.0.758")]
35+
[assembly: AssemblyFileVersion("1.0.0.758")]

‎DFe.Utils/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
//
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
33-
// [assembly: AssemblyVersion("1.0.0.756")]
34-
[assembly: AssemblyVersion("1.0.0.756")]
35-
[assembly: AssemblyFileVersion("1.0.0.756")]
33+
// [assembly: AssemblyVersion("1.0.0.758")]
34+
[assembly: AssemblyVersion("1.0.0.758")]
35+
[assembly: AssemblyFileVersion("1.0.0.758")]

‎DFe.Wsdl/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
//
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
34-
// [assembly: AssemblyVersion("1.0.0.756")]
35-
[assembly: AssemblyVersion("1.0.0.756")]
36-
[assembly: AssemblyFileVersion("1.0.0.756")]
34+
// [assembly: AssemblyVersion("1.0.0.758")]
35+
[assembly: AssemblyVersion("1.0.0.758")]
36+
[assembly: AssemblyFileVersion("1.0.0.758")]

‎Dev.VersaoAssemblies/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@
2828
// Build Number
2929
// Revision
3030
//
31-
[assembly: AssemblyVersion("1.0.0.756")]
32-
[assembly: AssemblyFileVersion("1.0.0.756")]
31+
[assembly: AssemblyVersion("1.0.0.758")]
32+
[assembly: AssemblyFileVersion("1.0.0.758")]

‎GraphicsPrinter/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
//
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
33-
// [assembly: AssemblyVersion("1.0.0.756")]
34-
[assembly: AssemblyVersion("1.0.0.756")]
35-
[assembly: AssemblyFileVersion("1.0.0.756")]
33+
// [assembly: AssemblyVersion("1.0.0.758")]
34+
[assembly: AssemblyVersion("1.0.0.758")]
35+
[assembly: AssemblyFileVersion("1.0.0.758")]

‎MDFe.AppTeste/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@
4848
//
4949
// You can specify all the values or you can default the Build and Revision Numbers
5050
// by using the '*' as shown below:
51-
// [assembly: AssemblyVersion("1.0.0.756")]
52-
[assembly: AssemblyVersion("1.0.0.756")]
53-
[assembly: AssemblyFileVersion("1.0.0.756")]
51+
// [assembly: AssemblyVersion("1.0.0.758")]
52+
[assembly: AssemblyVersion("1.0.0.758")]
53+
[assembly: AssemblyFileVersion("1.0.0.758")]

‎MDFe.Classes/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
//
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
33-
// [assembly: AssemblyVersion("1.0.0.756")]
34-
[assembly: AssemblyVersion("1.0.0.756")]
35-
[assembly: AssemblyFileVersion("1.0.0.756")]
33+
// [assembly: AssemblyVersion("1.0.0.758")]
34+
[assembly: AssemblyVersion("1.0.0.758")]
35+
[assembly: AssemblyFileVersion("1.0.0.758")]

‎MDFe.Damdfe.AppTeste/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
//
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
33-
// [assembly: AssemblyVersion("1.0.0.756")]
34-
[assembly: AssemblyVersion("1.0.0.756")]
35-
[assembly: AssemblyFileVersion("1.0.0.756")]
33+
// [assembly: AssemblyVersion("1.0.0.758")]
34+
[assembly: AssemblyVersion("1.0.0.758")]
35+
[assembly: AssemblyFileVersion("1.0.0.758")]

‎MDFe.Damdfe.Base/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
//
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
33-
// [assembly: AssemblyVersion("1.0.0.756")]
34-
[assembly: AssemblyVersion("1.0.0.756")]
35-
[assembly: AssemblyFileVersion("1.0.0.756")]
33+
// [assembly: AssemblyVersion("1.0.0.758")]
34+
[assembly: AssemblyVersion("1.0.0.758")]
35+
[assembly: AssemblyFileVersion("1.0.0.758")]

‎MDFe.Damdfe.Fast/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
//
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
33-
// [assembly: AssemblyVersion("1.0.0.756")]
34-
[assembly: AssemblyVersion("1.0.0.756")]
35-
[assembly: AssemblyFileVersion("1.0.0.756")]
33+
// [assembly: AssemblyVersion("1.0.0.758")]
34+
[assembly: AssemblyVersion("1.0.0.758")]
35+
[assembly: AssemblyFileVersion("1.0.0.758")]

‎MDFe.Servicos/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
//
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
33-
// [assembly: AssemblyVersion("1.0.0.756")]
34-
[assembly: AssemblyVersion("1.0.0.756")]
35-
[assembly: AssemblyFileVersion("1.0.0.756")]
33+
// [assembly: AssemblyVersion("1.0.0.758")]
34+
[assembly: AssemblyVersion("1.0.0.758")]
35+
[assembly: AssemblyFileVersion("1.0.0.758")]

‎MDFe.Utils/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
//
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
33-
// [assembly: AssemblyVersion("1.0.0.756")]
34-
[assembly: AssemblyVersion("1.0.0.756")]
35-
[assembly: AssemblyFileVersion("1.0.0.756")]
33+
// [assembly: AssemblyVersion("1.0.0.758")]
34+
[assembly: AssemblyVersion("1.0.0.758")]
35+
[assembly: AssemblyFileVersion("1.0.0.758")]

‎MDFe.Wsdl/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
//
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
33-
// [assembly: AssemblyVersion("1.0.0.756")]
34-
[assembly: AssemblyVersion("1.0.0.756")]
35-
[assembly: AssemblyFileVersion("1.0.0.756")]
33+
// [assembly: AssemblyVersion("1.0.0.758")]
34+
[assembly: AssemblyVersion("1.0.0.758")]
35+
[assembly: AssemblyFileVersion("1.0.0.758")]

‎NFe.AppTeste/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
//
8383
// É possível especificar todos os valores ou usar o padrão de Números de Compilação e Revisão
8484
// utilizando o '*' como mostrado abaixo:
85-
// [assembly: AssemblyVersion("1.0.0.756")]
85+
// [assembly: AssemblyVersion("1.0.0.758")]
8686

87-
[assembly: AssemblyVersion("1.0.0.756")]
88-
[assembly: AssemblyFileVersion("1.0.0.756")]
87+
[assembly: AssemblyVersion("1.0.0.758")]
88+
[assembly: AssemblyFileVersion("1.0.0.758")]

‎NFe.Classes/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
//
6666
// É possível especificar todos os valores ou usar o padrão de Números de Compilação e Revisão
6767
// utilizando o '*' como mostrado abaixo:
68-
// [assembly: AssemblyVersion("1.0.0.756")]
68+
// [assembly: AssemblyVersion("1.0.0.758")]
6969

70-
[assembly: AssemblyVersion("1.0.0.756")]
71-
[assembly: AssemblyFileVersion("1.0.0.756")]
70+
[assembly: AssemblyVersion("1.0.0.758")]
71+
[assembly: AssemblyFileVersion("1.0.0.758")]

‎NFe.Danfe.AppTeste/MainWindow.xaml.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,9 @@ private void BtnNfeDanfeA4_Click(object sender, RoutedEventArgs e)
223223
desenvolvedor: "NOME DA SOFTWARE HOUSE",
224224
arquivoRelatorio: string.Empty);
225225

226-
danfe.Visualizar();
226+
//danfe.Visualizar();
227227
//danfe.Imprimir();
228-
//danfe.ExibirDesign();
228+
danfe.ExibirDesign();
229229
//danfe.ExportarPdf(@"d:\teste.pdf");
230230

231231
#endregion

‎NFe.Danfe.AppTeste/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@
4848
//
4949
// You can specify all the values or you can default the Build and Revision Numbers
5050
// by using the '*' as shown below:
51-
// [assembly: AssemblyVersion("1.0.0.756")]
52-
[assembly: AssemblyVersion("1.0.0.756")]
53-
[assembly: AssemblyFileVersion("1.0.0.756")]
51+
// [assembly: AssemblyVersion("1.0.0.758")]
52+
[assembly: AssemblyVersion("1.0.0.758")]
53+
[assembly: AssemblyFileVersion("1.0.0.758")]

‎NFe.Danfe.Base/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
//
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
33-
// [assembly: AssemblyVersion("1.0.0.756")]
34-
[assembly: AssemblyVersion("1.0.0.756")]
35-
[assembly: AssemblyFileVersion("1.0.0.756")]
33+
// [assembly: AssemblyVersion("1.0.0.758")]
34+
[assembly: AssemblyVersion("1.0.0.758")]
35+
[assembly: AssemblyFileVersion("1.0.0.758")]

0 commit comments

Comments
 (0)