Egalware/C2P
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ancora update traduzione (mancava un paio di punti...)

Browse Source
This commit is contained in:
Samuele E. Locatelli
2015-09-16 10:14:05 +02:00
parent 96ecd46403
commit fe8e8a0573
11 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
C2P/RevisionHistory.aspx
+2 -1
View File
@@ -28,10 +28,11 @@
<div class="col-sm-2" style="padding: 0px 4px;">
<asp:DropDownList runat="server" ID="ddlTypeDoc" CssClass="btn btn-default dropdown-toggle" Font-Size="X-Small" DataSourceID="odsTipoDoc" DataTextField="label" datal="value" DataValueField="value" Enabled="false">
</asp:DropDownList>
<asp:ObjectDataSource ID="odsTipoDoc" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByTableField" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selListValTableAdapter">
<asp:ObjectDataSource ID="odsTipoDoc" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByTableFieldLang" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selListValTableAdapter">
<SelectParameters>
<asp:Parameter DefaultValue="All" Name="TableName" Type="String" />
<asp:Parameter DefaultValue="TipoDoc" Name="FieldName" Type="String" />
<asp:SessionParameter SessionField="Lingua" DefaultValue="IT" Name="Lingua" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
</div>
C2P/WebUserControls/mod_Q_Header.ascx
+7 -6
View File
@@ -1,6 +1,6 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_Q_Header.ascx.cs" Inherits="C2P.WebUserControls.mod_Q_Header" %>
<%if (false)
{ %>
{ %>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
<%} %>
@@ -21,7 +21,7 @@
</div>
<div class="col-xs-5 text-right">
<uc1:mod_display ID="mod_display2" runat="server" etichetta='<%# traduci("Customer") %>' toolTipVal='<%# Eval("CodClient") %>' valore='<%# Eval("ClientName") %>' />
<uc1:mod_autocompleteShort runat="server" ID="acCliente" contextKey="c" minCharAutocomplete="2" showKey="false" ServicePath='<%# serviceUrl("Clients") %>' placeholder="Ricerca Cliente" valore='<%# Bind("CodClient") %>' selezione='<%# Eval("ClientName") %>' show="false" />
<uc1:mod_autocompleteShort runat="server" ID="acCliente" contextKey="c" minCharAutocomplete="2" showKey="false" ServicePath='<%# serviceUrl("Clients") %>' placeholder="Ricerca Cliente" valore='<%# Bind("CodClient") %>' selezione='<%# Eval("ClientName") %>' show="false" />
</div>
</div>
<div class="row bottomLine">
@@ -244,20 +244,21 @@
<asp:ObjectDataSource ID="odsRawMat" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selRawMatTableAdapter"></asp:ObjectDataSource>
<asp:ObjectDataSource ID="odsIncoterms" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selIncotermsTableAdapter"></asp:ObjectDataSource>
<asp:ObjectDataSource ID="odsOfferResult" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByTableField" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selListValTableAdapter">
<asp:ObjectDataSource ID="odsOfferResult" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByTableFieldLang" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selListValTableAdapter">
<SelectParameters>
<asp:Parameter DefaultValue="QuoteList" Name="TableName" Type="String" />
<asp:Parameter DefaultValue="OfferResult" Name="FieldName" Type="String" />
<asp:SessionParameter SessionField="Lingua" DefaultValue="IT" Name="Lingua" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:ObjectDataSource ID="odsKoReason" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByTableField" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selListValTableAdapter">
<asp:ObjectDataSource ID="odsKoReason" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByTableFieldLang" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selListValTableAdapter">
<SelectParameters>
<asp:Parameter DefaultValue="QuoteList" Name="TableName" Type="String" />
<asp:Parameter DefaultValue="KoReason" Name="FieldName" Type="String" />
<asp:SessionParameter SessionField="Lingua" DefaultValue="IT" Name="Lingua" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:ObjectDataSource ID="odsAgente" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selAgentsTableAdapter">
</asp:ObjectDataSource>
<asp:ObjectDataSource ID="odsAgente" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selAgentsTableAdapter"></asp:ObjectDataSource>
<asp:Label runat="server" ID="Label1" CssClass="text-danger" Visible="false" />
C2P/WebUserControls/mod_S_ExtrPar.ascx
+5 -4
View File
@@ -1,6 +1,6 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_S_ExtrPar.ascx.cs" Inherits="C2P.WebUserControls.mod_S_ExtrPar" %>
<%if (false)
{ %>
{ %>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
<%} %>
@@ -34,7 +34,7 @@
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display5" runat="server" etichetta='<%# traduci("NumDiesExaustGroup") %>' valore='<%# Eval("NumDiesExaust", "{0:N0}") %>' Visible='<%# checkIsZero(Eval("DiesExpLife")) %>' />
<uc1:mod_display ID="mod_display22" runat="server" etichetta='<%# traduci("NumDiesExaust") %>' valore='<%# Eval("NumDiesExaust", "{0:N0}") %>' Visible='<%# !checkIsZero(Eval("DiesExpLife")) %>' />
</div>
<div class="col-xs-6 text-right">
@@ -206,9 +206,10 @@
</UpdateParameters>
</asp:ObjectDataSource>
<asp:ObjectDataSource ID="odsPlant" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selPlantTableAdapter"></asp:ObjectDataSource>
<asp:ObjectDataSource ID="odsTipoDies" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByTableField" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selListValTableAdapter">
<asp:ObjectDataSource ID="odsTipoDies" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByTableFieldLang" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selListValTableAdapter">
<SelectParameters>
<asp:Parameter DefaultValue="*" Name="TableName" Type="String" />
<asp:Parameter DefaultValue="All" Name="TableName" Type="String" />
<asp:Parameter DefaultValue="TipoDies" Name="FieldName" Type="String" />
<asp:SessionParameter SessionField="Lingua" DefaultValue="IT" Name="Lingua" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
C2P/WebUserControls/mod_S_Header.ascx
+7 -6
View File
@@ -1,6 +1,6 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_S_Header.ascx.cs" Inherits="C2P.WebUserControls.mod_S_Header" %>
<%if (false)
{ %>
{ %>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
<%} %>
@@ -125,7 +125,7 @@
</div>
<div class="col-xs-1">
<uc1:mod_display ID="mod_display15" runat="server" etichetta='<%# traduci("Agente") %>' />
<asp:DropDownList ID="DropDownList5" runat="server" DataSourceID="odsAgente" DataValueField="value" DataTextField="label" Enabled='<%# editEnabled %>' SelectedValue='<%# Bind("Agente") %>' CssClass="text-right" Width="97.5%" Font-Size="0.8em" />
<asp:DropDownList ID="DropDownList5" runat="server" DataSourceID="odsAgente" DataValueField="value" DataTextField="label" Enabled='<%# editEnabled %>' SelectedValue='<%# Bind("Agente") %>' CssClass="text-right" Width="97.5%" Font-Size="0.8em" />
</div>
</div>
<div class="row">
@@ -247,19 +247,20 @@
<asp:ObjectDataSource ID="odsCustomers" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selClientTableAdapter"></asp:ObjectDataSource>
<asp:ObjectDataSource ID="odsRawMat" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selRawMatTableAdapter"></asp:ObjectDataSource>
<asp:ObjectDataSource ID="odsIncoterms" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selIncotermsTableAdapter"></asp:ObjectDataSource>
<asp:ObjectDataSource ID="odsOfferResult" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByTableField" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selListValTableAdapter">
<asp:ObjectDataSource ID="odsOfferResult" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByTableFieldLang" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selListValTableAdapter">
<SelectParameters>
<asp:Parameter DefaultValue="QuoteList" Name="TableName" Type="String" />
<asp:Parameter DefaultValue="OfferResult" Name="FieldName" Type="String" />
<asp:SessionParameter SessionField="Lingua" DefaultValue="IT" Name="Lingua" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:ObjectDataSource ID="odsKoReason" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByTableField" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selListValTableAdapter">
<asp:ObjectDataSource ID="odsKoReason" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByTableFieldLang" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selListValTableAdapter">
<SelectParameters>
<asp:Parameter DefaultValue="QuoteList" Name="TableName" Type="String" />
<asp:Parameter DefaultValue="KoReason" Name="FieldName" Type="String" />
<asp:SessionParameter SessionField="Lingua" DefaultValue="IT" Name="Lingua" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:ObjectDataSource ID="odsAgente" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selAgentsTableAdapter">
</asp:ObjectDataSource>
<asp:ObjectDataSource ID="odsAgente" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selAgentsTableAdapter"></asp:ObjectDataSource>
<asp:Label runat="server" ID="lblError" CssClass="text-danger" Visible="false" />
C2P/bin/C2P.dll
BIN
View File
Binary file not shown.
C2P/bin/C2P_Data.dll
BIN
View File
Binary file not shown.
C2P/bin/SteamWare.dll
BIN
View File
Binary file not shown.
C2P_Report/bin/C2P_Data.dll
BIN
View File
Binary file not shown.
C2P_Report/bin/SteamWare.dll
BIN
View File
Binary file not shown.
VersGen/C2P.cs
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("2.3.221.653")]
[assembly: AssemblyFileVersion("2.3.221.653")]
[assembly: AssemblyVersion("2.3.222.654")]
[assembly: AssemblyFileVersion("2.3.222.654")]
[assembly: AssemblyCopyright("Proxima & Steamware © 2013-2015")]
[assembly: AssemblyCompany("Steamware")]
VersGen/C2P.tt
+2 -2
View File
@@ -6,8 +6,8 @@
using System.Reflection;
[assembly: AssemblyVersion("2.3.221.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("2.3.221.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("2.3.222.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("2.3.222.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+