diff --git a/Ventas/Ventas.aspx b/Ventas/Ventas.aspx
index e11a85891..a079de52a 100644
--- a/Ventas/Ventas.aspx
+++ b/Ventas/Ventas.aspx
@@ -2218,328 +2218,332 @@
                     <ContentTemplate>
                         <asp:UpdatePanel ID="UPComplementosSAT" runat="server" UpdateMode="Conditional">
                             <ContentTemplate>
-                                <table border="0" cellpadding="0" cellspacing="0" class="TextTab" style="width: 100%">
+                                <%--                                <table border="0" cellpadding="0" cellspacing="0" class="TextTab" style="width: 100%">
                                     <tr valign="top">
-                                        <td rowspan="1" colspan="2">
-                                            <div class="row">
-                                                <div class="col-md-12">
-                                                    <div id="DivCartaPorte" runat="server" visible="false" class="portlet light xspadding bordered whitoutcol" style="width: 100%">
-                                                        <div class="portlet-title">
-                                                            <div class="caption font-green">
-                                                                <i class="icon-pin font-green"></i>
-                                                                <span class="caption-subject bold uppercase">CARTA PORTE</span>
-                                                            </div>
-                                                            <div class="actions">
-                                                                <div class="btn-group">
-                                                                </div>
-                                                            </div>
-
-                                                            <div class="tools">
-                                                                <a href="javascript:;" class="collapse"></a>
+                                        <td rowspan="1" colspan="2"></td>
+                                        <td rowspan="1" colspan="1"></td>
+                                        <td rowspan="1" colspan="1"></td>
+                                    </tr>
+                                </table>--%>
+                                <div class="row">
+                                    <div class="col-md-6">
+                                        <div class="row">
+                                            <div class="col-md-12">
+                                                <div id="DivCartaPorte" runat="server" visible="false" class="portlet light xspadding bordered whitoutcol" style="width: 100%">
+                                                    <div class="portlet-title">
+                                                        <div class="caption font-green">
+                                                            <i class="icon-pin font-green"></i>
+                                                            <span class="caption-subject bold uppercase">CARTA PORTE</span>
+                                                        </div>
+                                                        <div class="actions">
+                                                            <div class="btn-group">
                                                             </div>
                                                         </div>
-                                                        <div class="portlet-body ">
-                                                            <div class="rowpadding">
-                                                                <asp:UpdatePanel ID="UpEmitirTransitorio" runat="server" UpdateMode="Conditional">
-                                                                    <ContentTemplate>
-                                                                        <div class="row rowpadding">
-                                                                            <label class="col-md-2">Emitir:</label>
-                                                                            <div class="col-md-10">
-                                                                                <asp:CheckBox ID="ChkEmitirCartaPorte" runat="server" CssClass="chksino" Text=" " OnCheckedChanged="ChkEmitirCartaPorte_CheckedChanged" AutoPostBack="true" />
-                                                                            </div>
-                                                                        </div>
-                                                                        <br />
-                                                                        <div class="row rowpadding">
-                                                                            <label class="col-md-2">Origen:</label>
-                                                                            <div class="col-md-10">
-                                                                                <asp:DropDownList ID="DdlDireccionOrigen" runat="server" AutoPostBack="true" CssClass="form-control input-sm select2me" AppendDataBoundItems="true" DataTextField="SucursalClienteVentaDireccion" DataValueField="CveDireccionEnvio" Width="100%" OnSelectedIndexChanged="DdlDireccionOrigen_SelectedIndexChanged">
-                                                                                    <asp:ListItem Selected="true" Text="Seleccione" Value="-1"></asp:ListItem>
-                                                                                </asp:DropDownList>
-                                                                                <%--<asp:TextBox ID="TxtOrigenCP" runat="server" Enabled="false" Text="" CssClass="form-control input-sm"></asp:TextBox>--%>
-                                                                            </div>
-                                                                        </div>
-                                                                        <br />
-                                                                        <div class="row rowpadding">
-                                                                            <label class="col-md-2">Destino:</label>
-                                                                            <div class="col-md-10">
-                                                                                <asp:DropDownList ID="DdlDireccionDestino" runat="server" AutoPostBack="true" CssClass="form-control input-sm select2me" AppendDataBoundItems="true" DataTextField="SucursalClienteVentaDireccion" DataValueField="CveDireccionEnvio" Width="100%" OnSelectedIndexChanged="DdlDireccionDestino_SelectedIndexChanged">
-                                                                                    <asp:ListItem Selected="true" Text="Seleccione" Value="-1"></asp:ListItem>
-                                                                                </asp:DropDownList>
-                                                                                <%--<asp:TextBox ID="TxtDestinoCP" runat="server" Enabled="false" Text="" CssClass="form-control input-sm"></asp:TextBox>--%>
-                                                                            </div>
-                                                                        </div>
-                                                                        <br />
-                                                                        <div class="row rowpadding">
-                                                                            <label class="col-md-2">F. Llegada:</label>
-                                                                            <div class="col-md-4">
-                                                                                <ul class="list-inline" style="font-size: 12px; margin-top: -10px; margin-left: 0px; margin-bottom: 0px;">
-                                                                                    <li>
-                                                                                        <div class="input-group input-sm  date date-picker " data-date-format="dd/mm/yyyy hh:mm">
-                                                                                            <asp:TextBox ID="TxtFechaLlegadaCP" runat="server" CssClass="form-control input-sm ADDateTimePicker" CausesValidation="true" MaxLength="18" Width="132px "></asp:TextBox>
-                                                                                        </div>
-                                                                                    </li>
-                                                                                </ul>
-                                                                            </div>
-                                                                            <label class="col-md-2">F. Entrega:</label>
-                                                                            <div class="col-md-4">
-                                                                                <ul class="list-inline" style="font-size: 12px; margin-top: -10px; margin-left: 0px; margin-bottom: 0px;">
-                                                                                    <li>
-                                                                                        <div class="input-group input-sm  date date-picker " data-date-format="dd/mm/yyyy hh:mm">
-                                                                                            <asp:TextBox ID="TxtFechaEntregaCP" runat="server" CssClass="form-control input-sm ADDateTimePicker" CausesValidation="true" MaxLength="18" Width="132px "></asp:TextBox>
-                                                                                        </div>
-                                                                                    </li>
-                                                                                </ul>
-                                                                            </div>
-                                                                        </div>
-                                                                        <br />
-                                                                        <div class="row">
-                                                                            <div class="col-md-6">
-                                                                                <div class="row rowpadding">
-                                                                                    <label class="col-md-2">Unidad:</label>
-                                                                                    <div class="col-md-10">
-                                                                                        <asp:DropDownList runat="server" ID="DdlUnidadCamion" AutoPostBack="true" Width="100%" AppendDataBoundItems="true" CssClass="form-control input-sm select2me" DataValueField="CveCamion" DataTextField="CamionPlaca" OnSelectedIndexChanged="DdlUnidadCamionActivoFijo_SelectedIndexChanged"></asp:DropDownList>
-                                                                                        <asp:RequiredFieldValidator ID="RfvDdlUnidadCamion" runat="server" Enabled="false" ControlToValidate="DdlUnidadCamion" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Unidad''</b> es necesario, por favor seleccione uno." InitialValue="-1"></asp:RequiredFieldValidator>
-                                                                                        <ajax:ValidatorCalloutExtender ID="VceDdlUnidadCamion" runat="server" HighlightCssClass="vco" TargetControlID="RfvDdlUnidadCamion" Width="350px"></ajax:ValidatorCalloutExtender>
-                                                                                    </div>
-                                                                                </div>
-                                                                                <br />
-                                                                                <div class="row rowpadding" runat="server" id="DvConfiguracionVeiculo" visible="false">
-                                                                                    <label class="col-md-2">Configuración:</label>
-                                                                                    <div class="col-md-10">
-                                                                                        <asp:DropDownList ID="DdlConfigAuto" CssClass="form-control input-sm select2me" Width="100%" runat="server" AppendDataBoundItems="true" AutoPostBack="true" OnSelectedIndexChanged="DdlConfigAuto_SelectedIndexChanged" CausesValidation="true" DataTextField="ClaveConfigAutoTransporteDescripcion" DataValueField="CveConfigAutoTransporte" Style="padding: 0px">
-                                                                                        </asp:DropDownList>
-                                                                                        <asp:RequiredFieldValidator ID="RfvDdlConfigAuto" runat="server" Enabled="false" ControlToValidate="DdlConfigAuto" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Configuración Carta Porte''</b> es necesario, por favor seleccione uno." InitialValue="-1"></asp:RequiredFieldValidator>
-                                                                                        <ajax:ValidatorCalloutExtender ID="VCERfvDdlConfigAuto" runat="server" HighlightCssClass="vco" TargetControlID="RfvDdlConfigAuto" Width="350px"></ajax:ValidatorCalloutExtender>
-                                                                                    </div>
-                                                                                </div>
-                                                                                <br />
-                                                                                <div class="row rowpadding" runat="server" id="DvRemolque1" visible="false">
-                                                                                    <label class="col-md-2">Remolque 1:</label>
-                                                                                    <div class="col-md-10">
-                                                                                        <asp:DropDownList runat="server" ID="DdlRemolque1" AutoPostBack="true" Width="100%" AppendDataBoundItems="true" CssClass="form-control input-sm select2me" DataValueField="CveCamion" DataTextField="CamionPlaca" OnSelectedIndexChanged="DdlRemolque1_SelectedIndexChanged"></asp:DropDownList>
-                                                                                    </div>
-                                                                                </div>
-                                                                            </div>
-                                                                            <div class="col-md-6">
-                                                                                <div class="row rowpadding">
-                                                                                    <label class="col-md-2">Chofer:</label>
-                                                                                    <div class="col-md-10">
-                                                                                        <asp:DropDownList ID="DdlChofer" runat="server" DataTextField="ChoferLicencia" DataValueField="CveChofer" CssClass="form-control input-sm select2me" Width="100%"></asp:DropDownList>
-                                                                                        <asp:RequiredFieldValidator ID="RfvDdlChofer" runat="server" Enabled="false" ControlToValidate="DdlChofer" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Chofer''</b> es necesario, por favor seleccione uno." InitialValue="-1"></asp:RequiredFieldValidator>
-                                                                                        <ajax:ValidatorCalloutExtender ID="VceDdlChofer" runat="server" HighlightCssClass="vco" TargetControlID="RfvDdlChofer" Width="350px"></ajax:ValidatorCalloutExtender>
-                                                                                    </div>
-                                                                                </div>
-                                                                                <br />
-                                                                                <div class="row rowpadding">
-                                                                                    <label class="col-md-2">Distancia:</label>
-                                                                                    <div class="col-md-10">
-                                                                                        <asp:TextBox ID="TxtDistancia" runat="server" CssClass="form-control input-sm" type="number"></asp:TextBox>
-                                                                                    </div>
-                                                                                </div>
-                                                                                <br />
-                                                                                <div class="row rowpadding" runat="server" id="DvRemolque2" visible="false">
-                                                                                    <label class="col-md-2">Remolque 2:</label>
-                                                                                    <div class="col-md-10">
-                                                                                        <asp:DropDownList runat="server" ID="DdlRemolque2" AutoPostBack="true" Width="100%" CssClass="form-control input-sm select2me" DataValueField="CveCamion" DataTextField="CamionPlaca"></asp:DropDownList>
-                                                                                    </div>
-                                                                                </div>
-                                                                            </div>
-                                                                        </div>
-                                                                        <br />
-                                                                        <div class="row">
-                                                                            <div class="col-md-12">
-                                                                                <div class="portlet light xspadding bordered whitoutcol" style="width: 100%">
-                                                                                    <div class="portlet-title">
-                                                                                        <div class="caption font-green">
-                                                                                            <i class="icon-pin font-green"></i>
-                                                                                            <span class="caption-subject bold uppercase">Mercancias</span>
-                                                                                        </div>
-                                                                                        <div class="actions">
-                                                                                            <div class="btn-group">
-                                                                                                <asp:LinkButton ID="LnkAgregarMercancia" OnClick="LnkAgregarMercancia_Click" runat="server" data-toggle="tooltip" data-placement="right" title="Agregar Mercancía." CssClass="btn btn-circle btn-default" Text="<i class='fa fa-plus'></i> Agregar"></asp:LinkButton>
-                                                                                            </div>
-                                                                                        </div>
-                                                                                        <div class="tools">
-                                                                                            <a href="javascript:;" class="collapse"></a>
-                                                                                        </div>
-                                                                                    </div>
-                                                                                    <div class="portlet-body ">
-                                                                                        <div class="rowpadding">
-                                                                                            <asp:GridView ID="GvMercanciasCP" runat="server" GridLines="None" CssClass="table table-hover table-striped ScrollAD mysmallbtn" Width="100%" data-sort="true" AutoGenerateColumns="False"
-                                                                                                EmptyDataText="No hay datos disponibles" DataKeyNames="Consec">
-                                                                                                <Columns>
-                                                                                                    <asp:TemplateField ItemStyle-Font-Size="6pt" HeaderText="#" ItemStyle-Width="10%">
-                                                                                                        <ItemTemplate>
-                                                                                                            <asp:Literal ID="LtlConsecutivo" runat="server" Text='<%# Eval("Consec", "{0:N0}") %>'></asp:Literal>&nbsp;
-                                                                                                        </ItemTemplate>
-                                                                                                    </asp:TemplateField>
-                                                                                                    <asp:BoundField DataField="Cantidad" HeaderText="Cantidad" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="20%" />
-                                                                                                    <asp:BoundField DataField="CodigoPS" HeaderText="Producto" ItemStyle-HorizontalAlign="Left" ItemStyle-Width="60%" />
-                                                                                                    <asp:TemplateField ItemStyle-HorizontalAlign="Center" ItemStyle-Width="10%">
-                                                                                                        <ItemTemplate>
-                                                                                                            <asp:LinkButton ID="imgD" runat="server" AlternateText="Eliminar" CausesValidation="False" CommandName="Delete"
-                                                                                                                CssClass="btn btn-circle btn-sm red" Text="<i class='icon-trash'></i>" data-toggle="confirmation" data-popout="true" data-original-title="Esta seguro de eliminar la mercancía?" data-btn-ok-label="si" />
-                                                                                                        </ItemTemplate>
-                                                                                                    </asp:TemplateField>
-                                                                                                </Columns>
-                                                                                            </asp:GridView>
-                                                                                        </div>
-                                                                                    </div>
-                                                                                </div>
-                                                                            </div>
-                                                                        </div>
-                                                                    </ContentTemplate>
-                                                                </asp:UpdatePanel>
 
-                                                            </div>
+                                                        <div class="tools">
+                                                            <a href="javascript:;" class="collapse"></a>
+                                                        </div>
+                                                    </div>
+                                                    <div class="portlet-body ">
+                                                        <div class="rowpadding">
+                                                            <asp:UpdatePanel ID="UpEmitirTransitorio" runat="server" UpdateMode="Conditional">
+                                                                <ContentTemplate>
+                                                                    <div class="row rowpadding">
+                                                                        <label class="col-md-2">Emitir:</label>
+                                                                        <div class="col-md-10">
+                                                                            <asp:CheckBox ID="ChkEmitirCartaPorte" runat="server" CssClass="chksino" Text=" " OnCheckedChanged="ChkEmitirCartaPorte_CheckedChanged" AutoPostBack="true" />
+                                                                        </div>
+                                                                    </div>
+                                                                    <br />
+                                                                    <div class="row rowpadding">
+                                                                        <label class="col-md-2">Origen:</label>
+                                                                        <div class="col-md-10">
+                                                                            <asp:DropDownList ID="DdlDireccionOrigen" runat="server" CssClass="form-control input-sm select2me" AppendDataBoundItems="true" DataTextField="SucursalClienteVentaDireccion" DataValueField="CveDireccionEnvio" Width="100%">
+                                                                                <asp:ListItem Selected="true" Text="Seleccione" Value="-1"></asp:ListItem>
+                                                                            </asp:DropDownList>
+                                                                        </div>
+                                                                    </div>
+                                                                    <br />
+                                                                    <div class="row rowpadding">
+                                                                        <label class="col-md-2">Destino:</label>
+                                                                        <div class="col-md-10">
+                                                                            <asp:DropDownList ID="DdlDireccionDestino" runat="server" CssClass="form-control input-sm select2me" AppendDataBoundItems="true" DataTextField="SucursalClienteVentaDireccion" DataValueField="CveDireccionEnvio" Width="100%">
+                                                                                <asp:ListItem Selected="true" Text="Seleccione" Value="-1"></asp:ListItem>
+                                                                            </asp:DropDownList>
+                                                                        </div>
+                                                                    </div>
+                                                                    <br />
+                                                                    <div class="row rowpadding">
+                                                                        <label class="col-md-2">F. Salida:</label>
+                                                                        <div class="col-md-4">
+                                                                            <ul class="list-inline" style="font-size: 12px; margin-top: -10px; margin-left: 0px; margin-bottom: 0px;">
+                                                                                <li>
+                                                                                    <div class="input-group input-sm  date date-picker " data-date-format="dd/mm/yyyy hh:mm">
+                                                                                        <asp:TextBox ID="TxtFechaEntregaCP" runat="server" CssClass="form-control input-sm ADDateTimePicker" CausesValidation="true" MaxLength="18" Width="100%"></asp:TextBox>
+                                                                                    </div>
+                                                                                </li>
+                                                                            </ul>
+                                                                        </div>
+                                                                        <label class="col-md-2">F. Llegada:</label>
+                                                                        <div class="col-md-4">
+                                                                            <ul class="list-inline" style="font-size: 12px; margin-top: -10px; margin-left: 0px; margin-bottom: 0px;">
+                                                                                <li>
+                                                                                    <div class="input-group input-sm  date date-picker " data-date-format="dd/mm/yyyy hh:mm">
+                                                                                        <asp:TextBox ID="TxtFechaLlegadaCP" runat="server" CssClass="form-control input-sm ADDateTimePicker" CausesValidation="true" MaxLength="18" Width="100%"></asp:TextBox>
+                                                                                    </div>
+                                                                                </li>
+                                                                            </ul>
+                                                                        </div>
+                                                                    </div>
+                                                                    <br />
+                                                                    <div class="row">
+                                                                        <div class="col-md-6">
+                                                                            <div class="row rowpadding">
+                                                                                <label class="col-md-2">Unidad:</label>
+                                                                                <div class="col-md-10">
+                                                                                    <asp:DropDownList runat="server" ID="DdlUnidadCamion" AutoPostBack="true" Width="100%" AppendDataBoundItems="true" CssClass="form-control input-sm select2me" DataValueField="CveCamion" DataTextField="CamionPlaca" OnSelectedIndexChanged="DdlUnidadCamionActivoFijo_SelectedIndexChanged"></asp:DropDownList>
+                                                                                    <asp:RequiredFieldValidator ID="RfvDdlUnidadCamion" runat="server" Enabled="false" ControlToValidate="DdlUnidadCamion" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Unidad''</b> es necesario, por favor seleccione uno." InitialValue="-1"></asp:RequiredFieldValidator>
+                                                                                    <ajax:ValidatorCalloutExtender ID="VceDdlUnidadCamion" runat="server" HighlightCssClass="vco" TargetControlID="RfvDdlUnidadCamion" Width="350px"></ajax:ValidatorCalloutExtender>
+                                                                                </div>
+                                                                            </div>
+                                                                            <br />
+                                                                            <div class="row rowpadding" runat="server" id="DvConfiguracionVeiculo" visible="false">
+                                                                                <label class="col-md-2">Configuración:</label>
+                                                                                <div class="col-md-10">
+                                                                                    <asp:DropDownList ID="DdlConfigAuto" CssClass="form-control input-sm select2me" Width="100%" runat="server" AppendDataBoundItems="true" AutoPostBack="true" OnSelectedIndexChanged="DdlConfigAuto_SelectedIndexChanged" CausesValidation="true" DataTextField="ClaveConfigAutoTransporteDescripcion" DataValueField="CveConfigAutoTransporte" Style="padding: 0px">
+                                                                                    </asp:DropDownList>
+                                                                                    <asp:RequiredFieldValidator ID="RfvDdlConfigAuto" runat="server" Enabled="false" ControlToValidate="DdlConfigAuto" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Configuración Carta Porte''</b> es necesario, por favor seleccione uno." InitialValue="-1"></asp:RequiredFieldValidator>
+                                                                                    <ajax:ValidatorCalloutExtender ID="VCERfvDdlConfigAuto" runat="server" HighlightCssClass="vco" TargetControlID="RfvDdlConfigAuto" Width="350px"></ajax:ValidatorCalloutExtender>
+                                                                                </div>
+                                                                            </div>
+                                                                            <br />
+                                                                            <div class="row rowpadding" runat="server" id="DvRemolque1" visible="false">
+                                                                                <label class="col-md-2">Remolque 1:</label>
+                                                                                <div class="col-md-10">
+                                                                                    <asp:DropDownList runat="server" ID="DdlRemolque1" AutoPostBack="true" Width="100%" AppendDataBoundItems="true" CssClass="form-control input-sm select2me" DataValueField="CveCamion" DataTextField="CamionPlaca" OnSelectedIndexChanged="DdlRemolque1_SelectedIndexChanged"></asp:DropDownList>
+                                                                                </div>
+                                                                            </div>
+                                                                        </div>
+                                                                        <div class="col-md-6">
+                                                                            <div class="row rowpadding">
+                                                                                <label class="col-md-2">Chofer:</label>
+                                                                                <div class="col-md-10">
+                                                                                    <asp:DropDownList ID="DdlChofer" runat="server" DataTextField="ChoferLicencia" DataValueField="CveChofer" CssClass="form-control input-sm select2me" Width="100%"></asp:DropDownList>
+                                                                                    <asp:RequiredFieldValidator ID="RfvDdlChofer" runat="server" Enabled="false" ControlToValidate="DdlChofer" Display="None" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Chofer''</b> es necesario, por favor seleccione uno." InitialValue="-1"></asp:RequiredFieldValidator>
+                                                                                    <ajax:ValidatorCalloutExtender ID="VceDdlChofer" runat="server" HighlightCssClass="vco" TargetControlID="RfvDdlChofer" Width="350px"></ajax:ValidatorCalloutExtender>
+                                                                                </div>
+                                                                            </div>
+                                                                            <br />
+                                                                            <div class="row rowpadding">
+                                                                                <label class="col-md-2">Distancia:</label>
+                                                                                <div class="col-md-10">
+                                                                                    <asp:TextBox ID="TxtDistancia" runat="server" CssClass="form-control input-sm" type="number" Width="100%"></asp:TextBox>
+                                                                                </div>
+                                                                            </div>
+                                                                            <br />
+                                                                            <div class="row rowpadding" runat="server" id="DvRemolque2" visible="false">
+                                                                                <label class="col-md-2">Remolque 2:</label>
+                                                                                <div class="col-md-10">
+                                                                                    <asp:DropDownList runat="server" ID="DdlRemolque2" AutoPostBack="true" Width="100%" CssClass="form-control input-sm select2me" DataValueField="CveCamion" DataTextField="CamionPlaca"></asp:DropDownList>
+                                                                                </div>
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                    <br />
+                                                                    <div class="row">
+                                                                        <div class="col-md-12">
+                                                                            <div class="portlet light xspadding bordered whitoutcol" style="width: 100%">
+                                                                                <div class="portlet-title">
+                                                                                    <div class="caption font-green">
+                                                                                        <i class="icon-pin font-green"></i>
+                                                                                        <span class="caption-subject bold uppercase">Mercancias</span>
+                                                                                    </div>
+                                                                                    <div class="actions">
+                                                                                        <div class="btn-group">
+                                                                                            <asp:LinkButton ID="LnkAgregarMercancia" OnClick="LnkAgregarMercancia_Click" runat="server" data-toggle="tooltip" data-placement="right" title="Agregar Mercancía." CssClass="btn btn-circle btn-default" Text="<i class='fa fa-plus'></i> Agregar"></asp:LinkButton>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                    <div class="tools">
+                                                                                        <a href="javascript:;" class="collapse"></a>
+                                                                                    </div>
+                                                                                </div>
+                                                                                <div class="portlet-body ">
+                                                                                    <div class="rowpadding">
+                                                                                        <asp:GridView ID="GvMercanciasCP" runat="server" GridLines="None" CssClass="table table-hover table-striped ScrollAD mysmallbtn" Width="100%" data-sort="true" AutoGenerateColumns="False"
+                                                                                            EmptyDataText="No hay datos disponibles" DataKeyNames="Consec">
+                                                                                            <Columns>
+                                                                                                <asp:TemplateField ItemStyle-Font-Size="6pt" HeaderText="#" ItemStyle-Width="10%">
+                                                                                                    <ItemTemplate>
+                                                                                                        <asp:Literal ID="LtlConsecutivo" runat="server" Text='<%# Eval("Consec", "{0:N0}") %>'></asp:Literal>&nbsp;
+                                                                                                    </ItemTemplate>
+                                                                                                </asp:TemplateField>
+                                                                                                <asp:BoundField DataField="Cantidad" HeaderText="Cantidad" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="20%" />
+                                                                                                <asp:BoundField DataField="CodigoPS" HeaderText="Producto" ItemStyle-HorizontalAlign="Left" ItemStyle-Width="60%" />
+                                                                                                <asp:TemplateField ItemStyle-HorizontalAlign="Center" ItemStyle-Width="10%">
+                                                                                                    <ItemTemplate>
+                                                                                                        <asp:LinkButton ID="imgD" runat="server" AlternateText="Eliminar" CausesValidation="False" CommandName="Delete"
+                                                                                                            CssClass="btn btn-circle btn-sm red" Text="<i class='icon-trash'></i>" data-toggle="confirmation" data-popout="true" data-original-title="Esta seguro de eliminar la mercancía?" data-btn-ok-label="si" />
+                                                                                                    </ItemTemplate>
+                                                                                                </asp:TemplateField>
+                                                                                            </Columns>
+                                                                                        </asp:GridView>
+                                                                                    </div>
+                                                                                </div>
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </ContentTemplate>
+                                                            </asp:UpdatePanel>
+
                                                         </div>
                                                     </div>
                                                 </div>
                                             </div>
-                                            <div class="row">
-                                                <div class="col-md-12">
-                                                    <div class="portlet light xspadding bordered whitoutcol" style="width: 100%;">
-                                                        <div class="portlet-title">
-                                                            <div class="caption font-green">
-                                                                <i class="icon-pin font-green"></i>
-                                                                <span class="caption-subject bold uppercase">COMERCIO EXTERIOR</span>
-                                                            </div>
-                                                            <div class="actions">
-                                                                <div class="btn-group">
-                                                                </div>
-                                                            </div>
-
-                                                            <div class="tools">
-                                                                <a href="javascript:;" onclick="CargaComercioExterior()" class="expand"></a>
+                                        </div>
+                                        <div class="row">
+                                            <div class="col-md-12">
+                                                <div class="portlet light xspadding bordered whitoutcol" style="width: 100%;">
+                                                    <div class="portlet-title">
+                                                        <div class="caption font-green">
+                                                            <i class="icon-pin font-green"></i>
+                                                            <span class="caption-subject bold uppercase">COMERCIO EXTERIOR</span>
+                                                        </div>
+                                                        <div class="actions">
+                                                            <div class="btn-group">
                                                             </div>
                                                         </div>
-                                                        <div class="portlet-body form-horizontal form-row-sepe formnombottom" style="padding: 10px 20px 10px 30px; display: none">
-                                                            <asp:UpdatePanel ID="UpComercioExterior" runat="server" UpdateMode="Conditional">
-                                                                <ContentTemplate>
-                                                                    <div class="form-body">
-                                                                        <div class="row">
-                                                                            <label class="col-md-2 form-group form-md-line-input">Tipo Operación:</label>
-                                                                            <div class="col-md-3 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
-                                                                                <asp:Label ID="LblTipoOperacion" runat="server"></asp:Label>
-                                                                                <%--<asp:DropDownList ID="DdlTipoOperacion" CssClass="form-control select2me" AppendDataBoundItems="true" Style="width: 100%;" runat="server" DataTextField="ClaveSATTipoOperacionDescripcion" DataValueField="CveTipoOperacion"></asp:DropDownList>--%>
-                                                                            </div>
-                                                                            <label class="col-md-2 form-group form-md-line-input" style="padding-left: 20px;">Clave Pedimento:</label>
-                                                                            <div class="col-md-5 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
-                                                                                <asp:Label ID="LblClavePedimento" runat="server"></asp:Label>
-                                                                                <%--<asp:TextBox ID="TxtClavePedimento" CssClass="form-control input-sm" runat="server" Width="100%"></asp:TextBox>--%>
-                                                                            </div>
+
+                                                        <div class="tools">
+                                                            <a href="javascript:;" onclick="CargaComercioExterior()" class="expand"></a>
+                                                        </div>
+                                                    </div>
+                                                    <div class="portlet-body form-horizontal form-row-sepe formnombottom" style="padding: 10px 20px 10px 30px; display: none">
+                                                        <asp:UpdatePanel ID="UpComercioExterior" runat="server" UpdateMode="Conditional">
+                                                            <ContentTemplate>
+                                                                <div class="form-body">
+                                                                    <div class="row">
+                                                                        <label class="col-md-2 form-group form-md-line-input">Tipo Operación:</label>
+                                                                        <div class="col-md-3 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
+                                                                            <asp:Label ID="LblTipoOperacion" runat="server"></asp:Label>
+                                                                            <%--<asp:DropDownList ID="DdlTipoOperacion" CssClass="form-control select2me" AppendDataBoundItems="true" Style="width: 100%;" runat="server" DataTextField="ClaveSATTipoOperacionDescripcion" DataValueField="CveTipoOperacion"></asp:DropDownList>--%>
                                                                         </div>
-                                                                        <div class="row">
-                                                                            <label class="col-md-2 form-group form-md-line-input">Incoterm:</label>
-                                                                            <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
-                                                                                <asp:DropDownList ID="DdlIncoterm" CssClass="form-control select2me" AppendDataBoundItems="true" Style="width: 100%;" runat="server" DataTextField="ClaveSATIncotermDescripcion" DataValueField="CveIncoterm">
-                                                                                </asp:DropDownList>
-                                                                            </div>
-                                                                        </div>
-                                                                        <div class="row">
-                                                                            <label class="col-md-2 form-group form-md-line-input">Motivo Traslado:</label>
-                                                                            <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
-                                                                                <asp:DropDownList ID="DdlSATMotivoTraslado" Width="100%" runat="server" CssClass="select2me" DataTextField="ClaveSATMotivoTrasladoDescripcion" DataValueField="CveMotivoTraslado"></asp:DropDownList>
-                                                                            </div>
-                                                                            <label class="col-md-2 form-group form-md-line-input" style="padding-left: 20px;">Num Reg IdTrib:</label>
-                                                                            <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
-                                                                                <asp:TextBox ID="TxtNumRegIdTrib" CssClass="form-control input-sm" runat="server" Width="100%"></asp:TextBox>
-                                                                            </div>
-                                                                            <%--   <label class="col-md-1"></label>
-                                                                <div class="col-md-1">
-                                                                </div>--%>
-                                                                        </div>
-                                                                        <div class="row">
-                                                                            <div class="col-md-12">
-                                                                                <asp:UpdatePanel ID="UPPDestina" runat="server" UpdateMode="Conditional">
-                                                                                    <ContentTemplate>
-                                                                                        <div class="row">
-
-                                                                                            <div class="col-md-2  form-group form-md-line-input"><span>Nombre:</span></div>
-
-                                                                                            <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
-                                                                                                <asp:TextBox ID="TxtDestinatarioNombre" CssClass="form-control input-sm" runat="server" Width="100%"></asp:TextBox>
-                                                                                            </div>
-
-                                                                                        </div>
-                                                                                        <div class="row">
-
-                                                                                            <div class="col-md-2  form-group form-md-line-input"><span>Calle:</span></div>
-
-                                                                                            <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
-                                                                                                <asp:TextBox ID="TxtComExtCalle" CssClass="form-control input-sm" runat="server" Width="100%"></asp:TextBox>
-                                                                                            </div>
-                                                                                            <div class="col-md-1  form-group form-md-line-input"><span>Núm.</span></div>
-                                                                                            <div class="col-md-2 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
-                                                                                                <asp:TextBox ID="TxtComExtNumero" CssClass="form-control input-sm" runat="server" Width="55px"></asp:TextBox>
-                                                                                            </div>
-                                                                                            <div class="col-md-1  form-group form-md-line-input"><span>CP.</span></div>
-                                                                                            <div class="col-md-2 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
-                                                                                                <asp:TextBox ID="TxtComExtCP" CssClass="form-control input-sm" runat="server" Width="65px"></asp:TextBox>
-                                                                                            </div>
-                                                                                        </div>
-                                                                                        <div class="row">
-                                                                                            <div class="col-md-2  form-group form-md-line-input"><span>Pais:</span></div>
-
-                                                                                            <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
-                                                                                                <asp:DropDownList ID="DdlComExtPais" AutoPostBack="true" OnSelectedIndexChanged="DdlPais_SelectedIndexChanged" CssClass="form-control select2me" AppendDataBoundItems="true" Style="width: 100%;" runat="server" DataTextField="ClaveSATPaisDescripcion" DataValueField="CvePais"></asp:DropDownList>
-                                                                                                <asp:TextBox ID="TxtComExtPais" CssClass="form-control input-sm" runat="server" Width="100%" Visible="false"></asp:TextBox>
-                                                                                            </div>
-
-
-                                                                                            <div class="col-md-2  form-group form-md-line-input" style="padding-left: 20px;"><span>Estado:</span></div>
-
-                                                                                            <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
-                                                                                                <asp:DropDownList ID="DdlComExtEstado" AutoPostBack="true" OnSelectedIndexChanged="DdlEstado_SelectedIndexChanged" Visible="false" CssClass="form-control select2me" AppendDataBoundItems="true" Style="width: 100%;" runat="server" DataTextField="ClaveSATEstadoNombreEstado" DataValueField="CveEstado"></asp:DropDownList>
-                                                                                                <asp:TextBox ID="TxtComExtEstado" CssClass="form-control input-sm" runat="server" Width="100%" Visible="false"></asp:TextBox>
-                                                                                            </div>
-
-                                                                                        </div>
-                                                                                        <div class="row">
-                                                                                            <div class="col-md-2  form-group form-md-line-input"><span>Municipio:</span></div>
-
-                                                                                            <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
-                                                                                                <asp:DropDownList ID="DdlComExtMunicipio" AutoPostBack="true" OnSelectedIndexChanged="DdlMunicipio_SelectedIndexChanged" Visible="false" CssClass="form-control select2me" AppendDataBoundItems="true" Style="width: 100%;" runat="server" DataTextField="ClaveSATMunicipioDescripcion" DataValueField="CveMunicipio"></asp:DropDownList>
-                                                                                                <asp:TextBox ID="TxtComExtMunicipio" CssClass="form-control input-sm" runat="server" Width="100%" Visible="false"></asp:TextBox>
-                                                                                            </div>
-
-                                                                                            <div class="col-md-2 form-group form-md-line-input" style="padding-left: 20px;"><span>Colonia:</span></div>
-
-                                                                                            <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
-                                                                                                <asp:DropDownList ID="DdlComExtColonia" CssClass="form-control select2me" AppendDataBoundItems="true" Style="width: 100%;" Visible="false" runat="server" DataTextField="ClaveSATColoniaNombreAsentamiento" DataValueField="CveColonia"></asp:DropDownList>
-                                                                                                <asp:TextBox ID="TxtComExtColonia" CssClass="form-control input-sm" runat="server" Width="100%" Visible="false"></asp:TextBox>
-                                                                                            </div>
-
-                                                                                        </div>
-
-                                                                                    </ContentTemplate>
-
-                                                                                </asp:UpdatePanel>
-
-                                                                            </div>
+                                                                        <label class="col-md-2 form-group form-md-line-input" style="padding-left: 20px;">Clave Pedimento:</label>
+                                                                        <div class="col-md-5 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
+                                                                            <asp:Label ID="LblClavePedimento" runat="server"></asp:Label>
+                                                                            <%--<asp:TextBox ID="TxtClavePedimento" CssClass="form-control input-sm" runat="server" Width="100%"></asp:TextBox>--%>
                                                                         </div>
                                                                     </div>
+                                                                    <div class="row">
+                                                                        <label class="col-md-2 form-group form-md-line-input">Incoterm:</label>
+                                                                        <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
+                                                                            <asp:DropDownList ID="DdlIncoterm" CssClass="form-control select2me" AppendDataBoundItems="true" Style="width: 100%;" runat="server" DataTextField="ClaveSATIncotermDescripcion" DataValueField="CveIncoterm">
+                                                                            </asp:DropDownList>
+                                                                        </div>
+                                                                    </div>
+                                                                    <div class="row">
+                                                                        <label class="col-md-2 form-group form-md-line-input">Motivo Traslado:</label>
+                                                                        <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
+                                                                            <asp:DropDownList ID="DdlSATMotivoTraslado" Width="100%" runat="server" CssClass="select2me" DataTextField="ClaveSATMotivoTrasladoDescripcion" DataValueField="CveMotivoTraslado"></asp:DropDownList>
+                                                                        </div>
+                                                                        <label class="col-md-2 form-group form-md-line-input" style="padding-left: 20px;">Num Reg IdTrib:</label>
+                                                                        <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
+                                                                            <asp:TextBox ID="TxtNumRegIdTrib" CssClass="form-control input-sm" runat="server" Width="100%"></asp:TextBox>
+                                                                        </div>
+                                                                        <%--   <label class="col-md-1"></label>
+                                                                <div class="col-md-1">
+                                                                </div>--%>
+                                                                    </div>
                                                                     <div class="row">
                                                                         <div class="col-md-12">
-                                                                            Convertir a unidad Aduana
+                                                                            <asp:UpdatePanel ID="UPPDestina" runat="server" UpdateMode="Conditional">
+                                                                                <ContentTemplate>
+                                                                                    <div class="row">
+
+                                                                                        <div class="col-md-2  form-group form-md-line-input"><span>Nombre:</span></div>
+
+                                                                                        <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
+                                                                                            <asp:TextBox ID="TxtDestinatarioNombre" CssClass="form-control input-sm" runat="server" Width="100%"></asp:TextBox>
+                                                                                        </div>
+
+                                                                                    </div>
+                                                                                    <div class="row">
+
+                                                                                        <div class="col-md-2  form-group form-md-line-input"><span>Calle:</span></div>
+
+                                                                                        <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
+                                                                                            <asp:TextBox ID="TxtComExtCalle" CssClass="form-control input-sm" runat="server" Width="100%"></asp:TextBox>
+                                                                                        </div>
+                                                                                        <div class="col-md-1  form-group form-md-line-input"><span>Núm.</span></div>
+                                                                                        <div class="col-md-2 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
+                                                                                            <asp:TextBox ID="TxtComExtNumero" CssClass="form-control input-sm" runat="server" Width="55px"></asp:TextBox>
+                                                                                        </div>
+                                                                                        <div class="col-md-1  form-group form-md-line-input"><span>CP.</span></div>
+                                                                                        <div class="col-md-2 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
+                                                                                            <asp:TextBox ID="TxtComExtCP" CssClass="form-control input-sm" runat="server" Width="65px"></asp:TextBox>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                    <div class="row">
+                                                                                        <div class="col-md-2  form-group form-md-line-input"><span>Pais:</span></div>
+
+                                                                                        <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
+                                                                                            <asp:DropDownList ID="DdlComExtPais" AutoPostBack="true" OnSelectedIndexChanged="DdlPais_SelectedIndexChanged" CssClass="form-control select2me" AppendDataBoundItems="true" Style="width: 100%;" runat="server" DataTextField="ClaveSATPaisDescripcion" DataValueField="CvePais"></asp:DropDownList>
+                                                                                            <asp:TextBox ID="TxtComExtPais" CssClass="form-control input-sm" runat="server" Width="100%" Visible="false"></asp:TextBox>
+                                                                                        </div>
+
+
+                                                                                        <div class="col-md-2  form-group form-md-line-input" style="padding-left: 20px;"><span>Estado:</span></div>
+
+                                                                                        <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
+                                                                                            <asp:DropDownList ID="DdlComExtEstado" AutoPostBack="true" OnSelectedIndexChanged="DdlEstado_SelectedIndexChanged" Visible="false" CssClass="form-control select2me" AppendDataBoundItems="true" Style="width: 100%;" runat="server" DataTextField="ClaveSATEstadoNombreEstado" DataValueField="CveEstado"></asp:DropDownList>
+                                                                                            <asp:TextBox ID="TxtComExtEstado" CssClass="form-control input-sm" runat="server" Width="100%" Visible="false"></asp:TextBox>
+                                                                                        </div>
+
+                                                                                    </div>
+                                                                                    <div class="row">
+                                                                                        <div class="col-md-2  form-group form-md-line-input"><span>Municipio:</span></div>
+
+                                                                                        <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
+                                                                                            <asp:DropDownList ID="DdlComExtMunicipio" AutoPostBack="true" OnSelectedIndexChanged="DdlMunicipio_SelectedIndexChanged" Visible="false" CssClass="form-control select2me" AppendDataBoundItems="true" Style="width: 100%;" runat="server" DataTextField="ClaveSATMunicipioDescripcion" DataValueField="CveMunicipio"></asp:DropDownList>
+                                                                                            <asp:TextBox ID="TxtComExtMunicipio" CssClass="form-control input-sm" runat="server" Width="100%" Visible="false"></asp:TextBox>
+                                                                                        </div>
+
+                                                                                        <div class="col-md-2 form-group form-md-line-input" style="padding-left: 20px;"><span>Colonia:</span></div>
+
+                                                                                        <div class="col-md-4 form-group form-md-line-input" style="margin-top: 0px; padding-top: 0px; display: inline-block;">
+                                                                                            <asp:DropDownList ID="DdlComExtColonia" CssClass="form-control select2me" AppendDataBoundItems="true" Style="width: 100%;" Visible="false" runat="server" DataTextField="ClaveSATColoniaNombreAsentamiento" DataValueField="CveColonia"></asp:DropDownList>
+                                                                                            <asp:TextBox ID="TxtComExtColonia" CssClass="form-control input-sm" runat="server" Width="100%" Visible="false"></asp:TextBox>
+                                                                                        </div>
+
+                                                                                    </div>
+
+                                                                                </ContentTemplate>
+
+                                                                            </asp:UpdatePanel>
+
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                                <div class="row">
+                                                                    <div class="col-md-12">
+                                                                        Convertir a unidad Aduana
                                                                     <asp:TextBox ID="TxtComExtConvertir" runat="server" Width="60px"></asp:TextBox><asp:Button ID="BtnComExtConvertirUnidad" runat="server" Text="Convertir" />
-                                                                            <asp:GridView ID="GvComercioExterior" runat="server" GridLines="None" CssClass="table table-hover table-striped ScrollAD mysmallbtn" Width="100%" data-sort="true" AutoGenerateColumns="False"
-                                                                                EmptyDataText="No hay datos disponibles" DataKeyNames="Cantidad,Codigo,ClaveSATFraccionArancelaria,ClaveSATUnidadAduana" OnRowDataBound="GvComercioExterior_RowDataBound">
-                                                                                <Columns>
-                                                                                    <asp:TemplateField HeaderText="Cantidad">
-                                                                                        <ItemTemplate>
-                                                                                            <asp:TextBox ID="TxtCantidad" runat="server" Text='<%# Eval("Cantidad", "{0:#,##0.##}") %>' Width="50px"></asp:TextBox>
-                                                                                        </ItemTemplate>
-                                                                                    </asp:TemplateField>
-                                                                                    <asp:BoundField DataField="CodigoPS" HeaderText="Producto ó Servicio" />
-                                                                                    <asp:TemplateField HeaderText="Valor Unitario">
-                                                                                        <ItemTemplate>
-                                                                                            <asp:TextBox ID="TxtValorUnitario" runat="server" Text='<%# Eval("PU", "{0:N2}") %>' Width="60px"></asp:TextBox>
-                                                                                        </ItemTemplate>
-                                                                                    </asp:TemplateField>
-                                                                                    <asp:BoundField DataField="ClaveSATFraccionArancelariaDescripcion" HeaderText="Fracción Arancelaria" />
-                                                                                    <asp:BoundField DataField="ClaveSATUnidadAduanaDescripcion" HeaderText="Unidad Aduana" />
-                                                                                    <%--                                                                            <asp:TemplateField HeaderText="Unidad Aduana">
+                                                                        <asp:GridView ID="GvComercioExterior" runat="server" GridLines="None" CssClass="table table-hover table-striped ScrollAD mysmallbtn" Width="100%" data-sort="true" AutoGenerateColumns="False"
+                                                                            EmptyDataText="No hay datos disponibles" DataKeyNames="Cantidad,Codigo,ClaveSATFraccionArancelaria,ClaveSATUnidadAduana" OnRowDataBound="GvComercioExterior_RowDataBound">
+                                                                            <Columns>
+                                                                                <asp:TemplateField HeaderText="Cantidad">
+                                                                                    <ItemTemplate>
+                                                                                        <asp:TextBox ID="TxtCantidad" runat="server" Text='<%# Eval("Cantidad", "{0:#,##0.##}") %>' Width="50px"></asp:TextBox>
+                                                                                    </ItemTemplate>
+                                                                                </asp:TemplateField>
+                                                                                <asp:BoundField DataField="CodigoPS" HeaderText="Producto ó Servicio" />
+                                                                                <asp:TemplateField HeaderText="Valor Unitario">
+                                                                                    <ItemTemplate>
+                                                                                        <asp:TextBox ID="TxtValorUnitario" runat="server" Text='<%# Eval("PU", "{0:N2}") %>' Width="60px"></asp:TextBox>
+                                                                                    </ItemTemplate>
+                                                                                </asp:TemplateField>
+                                                                                <asp:BoundField DataField="ClaveSATFraccionArancelariaDescripcion" HeaderText="Fracción Arancelaria" />
+                                                                                <asp:BoundField DataField="ClaveSATUnidadAduanaDescripcion" HeaderText="Unidad Aduana" />
+                                                                                <%--                                                                            <asp:TemplateField HeaderText="Unidad Aduana">
                                                                                 <ItemTemplate>
                                                                                     <asp:DropDownList ID="DdlUnidadAduana" runat="server" AppendDataBoundItems="true" CssClass="select2me" DataTextField="ClaveSATUnidadAduanaDescripcion" DataValueField="CveUnidadAduana"></asp:DropDownList>
                                                                                 </ItemTemplate>
@@ -2549,408 +2553,411 @@
                                                                                     <ADS:Dropdownlost ID="DdlFraccionArancelaria" runat="server" CssClassDdl="selecthidden" CssStyle="width: 100%;" DataTextField="ClaveSATFraccionArancelariaDescripcion" DataValueField="CveFraccionArancelaria"></ADS:Dropdownlost>
                                                                                 </ItemTemplate>
                                                                             </asp:TemplateField>--%>
-                                                                                    <asp:TemplateField HeaderText="Total USD">
-                                                                                        <ItemTemplate>
-                                                                                            <asp:Label ID="LblTotalUSD" Text='<%# (CDbl(Eval("Cantidad").ToString) * CDbl(Eval("PU").ToString)).ToString("N2") %>' runat="server"></asp:Label>
-                                                                                        </ItemTemplate>
-                                                                                    </asp:TemplateField>
-                                                                                    <asp:TemplateField HeaderText="Marca">
-                                                                                        <ItemTemplate>
-                                                                                            <asp:TextBox ID="TxtMarca" runat="server" Text="" Width="70px"></asp:TextBox>
-                                                                                        </ItemTemplate>
-                                                                                    </asp:TemplateField>
-                                                                                </Columns>
-                                                                            </asp:GridView>
-                                                                        </div>
-                                                                    </div>
-                                                                </ContentTemplate>
-                                                            </asp:UpdatePanel>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </td>
-                                        <td rowspan="2" colspan="1">
-                                            <div class="portlet light xspadding bordered whitoutcol" style="width: 330px;">
-                                                <div class="portlet-title">
-                                                    <div class="caption font-green">
-                                                        <i class="icon-pin font-green"></i>
-                                                        <span class="caption-subject bold uppercase">FEMSA</span>
-
-                                                    </div>
-                                                    <div class="actions">
-                                                        <div class="btn-group">
-                                                        </div>
-                                                    </div>
-
-                                                    <div class="tools">
-                                                        <a href="javascript:;" class="expand"></a>
-                                                    </div>
-                                                </div>
-
-                                                <div class="portlet-body form-horizontal form-row-sepe formnombottom" style="display: none;">
-                                                    <div class="form-body">
-                                                        <table border="0">
-                                                            <tr align="left">
-                                                                <td>Versión:&nbsp;</td>
-                                                                <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 90%">
-                                                                        <asp:TextBox ID="TxtFEMSA_Version" CssClass="form-control input-sm" runat="server" CausesValidation="true" MaxLength="2" Text="1" ValidationGroup="GrpEmitirImprimir"></asp:TextBox><label></label><i></i>
-                                                                    </div>
-                                                                    <%--Validar--%>
-                                                                </td>
-                                                            </tr>
-                                                            <tr align="left">
-                                                                <td>Número de Sociedad:&nbsp;</td>
-                                                                <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 90%">
-                                                                        <asp:TextBox ID="TxtFEMSA_NumSociedad" CssClass="form-control input-sm" runat="server" MaxLength="4"></asp:TextBox><label></label><i></i>
-                                                                    </div>
-                                                                </td>
-                                                            </tr>
-                                                            <tr align="left">
-                                                                <td>Número de Proveedor:&nbsp;</td>
-                                                                <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 90%">
-                                                                        <asp:TextBox ID="TxtFEMSA_NumProveedor" CssClass="form-control input-sm" runat="server" MaxLength="10"></asp:TextBox><label></label><i></i>
-                                                                    </div>
-                                                                </td>
-                                                            </tr>
-                                                            <tr align="left">
-                                                                <td>Número de Pedido:&nbsp;</td>
-                                                                <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 90%">
-                                                                        <asp:TextBox ID="TxtFEMSA_NumPedido" CssClass="form-control input-sm" runat="server" MaxLength="10"></asp:TextBox><label></label><i></i>
-                                                                    </div>
-                                                                </td>
-                                                            </tr>
-                                                            <tr align="left">
-                                                                <td>Número de Entrada:&nbsp;</td>
-                                                                <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 90%">
-                                                                        <asp:TextBox ID="TxtFEMSA_NumEntrada" CssClass="form-control input-sm" runat="server" MaxLength="10"></asp:TextBox><label></label><i></i>
-                                                                    </div>
-                                                                    <%--Validar Numerico--%>
-                                                                </td>
-                                                            </tr>
-                                                            <tr align="left">
-                                                                <td>Número de Remisión:&nbsp;</td>
-                                                                <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 90%">
-                                                                        <asp:TextBox ID="TxtFEMSA_NumRemision" CssClass="form-control input-sm" runat="server" MaxLength="10"></asp:TextBox><label></label><i></i>
-                                                                    </div>
-                                                                </td>
-                                                            </tr>
-                                                            <tr align="left">
-                                                                <td>Número de Socio:&nbsp;</td>
-                                                                <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 90%">
-                                                                        <asp:TextBox ID="TxtFEMSA_NumSocio" CssClass="form-control input-sm" runat="server" MaxLength="5">  </asp:TextBox><label></label><i></i>
-                                                                    </div>
-                                                                </td>
-                                                            </tr>
-                                                            <tr align="left">
-                                                                <td>Centro de Costo:&nbsp;</td>
-                                                                <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 90%">
-                                                                        <asp:TextBox ID="TxtFEMSA_CentroCosto" CssClass="form-control input-sm" runat="server" MaxLength="4"></asp:TextBox><label></label><i></i>
-                                                                    </div>
-                                                                </td>
-                                                            </tr>
-                                                            <tr align="left">
-                                                                <td>Inicio Periodo Liquidación:&nbsp;</td>
-                                                                <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 90%">
-                                                                        <asp:TextBox ID="TxtFEMSA_IPeriodoLiquidacion" CssClass="form-control input-sm" runat="server" MaxLength="10"></asp:TextBox><label></label><i></i>
-                                                                    </div>
-                                                                </td>
-                                                            </tr>
-                                                            <tr align="left">
-                                                                <td>Fin Periodo Liquidación:&nbsp;</td>
-                                                                <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 90%">
-                                                                        <asp:TextBox ID="TxtFEMSA_FPeriodoLiquidacion" CssClass="form-control input-sm" runat="server" MaxLength="10"></asp:TextBox><label></label><i></i>
-                                                                    </div>
-                                                                </td>
-                                                            </tr>
-                                                            <tr align="left">
-                                                                <td>Código Retención 1:&nbsp;</td>
-                                                                <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 90%">
-                                                                        <asp:TextBox ID="TxtFEMSA_CodRetencion1" CssClass="form-control input-sm" runat="server" MaxLength="15"></asp:TextBox><label></label><i></i>
-                                                                    </div>
-                                                                </td>
-                                                            </tr>
-                                                            <tr align="left">
-                                                                <td>Código Retención 2:&nbsp;</td>
-                                                                <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 90%">
-                                                                        <asp:TextBox ID="TxtFEMSA_CodRetencion2" CssClass="form-control input-sm" runat="server" MaxLength="15"></asp:TextBox><label></label><i></i>
-                                                                    </div>
-                                                                </td>
-                                                            </tr>
-                                                            <tr align="left">
-                                                                <td>Mail:&nbsp;</td>
-                                                                <td>
-                                                                    <div class="form-group form-md-line-input" style="width: 90%">
-                                                                        <asp:TextBox ID="TxtFEMSA_Mail" CssClass="form-control input-sm" runat="server" MaxLength="50"></asp:TextBox><label></label><i></i>
-                                                                    </div>
-                                                                </td>
-                                                            </tr>
-                                                        </table>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="row">
-                                                <div class="col-md-12">
-                                                    <div class="row">
-                                                        <div class="col-md-12">
-                                                            <div class="portlet light xspadding bordered whitoutcol" style="width: 330px;">
-                                                                <div class="portlet-title">
-                                                                    <div class="caption font-green">
-                                                                        <i class="icon-pin font-green"></i>
-                                                                        <span class="caption-subject bold uppercase">FORD</span>
-
-                                                                    </div>
-                                                                    <div class="actions">
-                                                                        <div class="btn-group">
-                                                                        </div>
-                                                                    </div>
-
-                                                                    <div class="tools">
-                                                                        <a href="javascript:;" class="expand"></a>
+                                                                                <asp:TemplateField HeaderText="Total USD">
+                                                                                    <ItemTemplate>
+                                                                                        <asp:Label ID="LblTotalUSD" Text='<%# (CDbl(Eval("Cantidad").ToString) * CDbl(Eval("PU").ToString)).ToString("N2") %>' runat="server"></asp:Label>
+                                                                                    </ItemTemplate>
+                                                                                </asp:TemplateField>
+                                                                                <asp:TemplateField HeaderText="Marca">
+                                                                                    <ItemTemplate>
+                                                                                        <asp:TextBox ID="TxtMarca" runat="server" Text="" Width="70px"></asp:TextBox>
+                                                                                    </ItemTemplate>
+                                                                                </asp:TemplateField>
+                                                                            </Columns>
+                                                                        </asp:GridView>
                                                                     </div>
                                                                 </div>
-                                                                <div class="portlet-body form-horizontal form-row-sepe formnombottom" style="display: none;">
-                                                                    <div class="form-body">
-                                                                        <table border="0">
-                                                                            <tr align="left">
-                                                                                <td>GSDB:&nbsp;&nbsp;</td>
-                                                                                <td>
-                                                                                    <div class="form-group form-md-line-input">
-                                                                                        <asp:TextBox ID="TxtFordGSDB" CssClass="form-control input-sm" runat="server" MaxLength="5"></asp:TextBox><label></label><i></i>
-                                                                                    </div>
-                                                                                </td>
-                                                                            </tr>
-                                                                            <tr align="left">
-                                                                                <td>ASN :&nbsp;&nbsp;</td>
-                                                                                <td>
-                                                                                    <div class="form-group form-md-line-input" style="width: 120px; display: inline-block">
-                                                                                        <asp:TextBox ID="TxtFordASN" CssClass="form-control input-sm" size="15" runat="server" MaxLength="20"></asp:TextBox><label></label>
-                                                                                    </div>
-                                                                                    &nbsp;
+                                                            </ContentTemplate>
+                                                        </asp:UpdatePanel>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="col-md-3">
+                                        <div class="row">
+                                            <div class="col-md-12">
+                                                <div class="portlet light xspadding bordered whitoutcol">
+                                                    <div class="portlet-title">
+                                                        <div class="caption font-green">
+                                                            <i class="icon-pin font-green"></i>
+                                                            <span class="caption-subject bold uppercase">FEMSA</span>
+
+                                                        </div>
+                                                        <div class="actions">
+                                                            <div class="btn-group">
+                                                            </div>
+                                                        </div>
+
+                                                        <div class="tools">
+                                                            <a href="javascript:;" class="expand"></a>
+                                                        </div>
+                                                    </div>
+
+                                                    <div class="portlet-body form-horizontal form-row-sepe formnombottom" style="display: none;">
+                                                        <div class="form-body">
+                                                            <table border="0">
+                                                                <tr align="left">
+                                                                    <td>Versión:&nbsp;</td>
+                                                                    <td>
+                                                                        <div class="form-group form-md-line-input" style="width: 90%">
+                                                                            <asp:TextBox ID="TxtFEMSA_Version" CssClass="form-control input-sm" runat="server" CausesValidation="true" MaxLength="2" Text="1" ValidationGroup="GrpEmitirImprimir"></asp:TextBox><label></label><i></i>
+                                                                        </div>
+                                                                        <%--Validar--%>
+                                                                    </td>
+                                                                </tr>
+                                                                <tr align="left">
+                                                                    <td>Número de Sociedad:&nbsp;</td>
+                                                                    <td>
+                                                                        <div class="form-group form-md-line-input" style="width: 90%">
+                                                                            <asp:TextBox ID="TxtFEMSA_NumSociedad" CssClass="form-control input-sm" runat="server" MaxLength="4"></asp:TextBox><label></label><i></i>
+                                                                        </div>
+                                                                    </td>
+                                                                </tr>
+                                                                <tr align="left">
+                                                                    <td>Número de Proveedor:&nbsp;</td>
+                                                                    <td>
+                                                                        <div class="form-group form-md-line-input" style="width: 90%">
+                                                                            <asp:TextBox ID="TxtFEMSA_NumProveedor" CssClass="form-control input-sm" runat="server" MaxLength="10"></asp:TextBox><label></label><i></i>
+                                                                        </div>
+                                                                    </td>
+                                                                </tr>
+                                                                <tr align="left">
+                                                                    <td>Número de Pedido:&nbsp;</td>
+                                                                    <td>
+                                                                        <div class="form-group form-md-line-input" style="width: 90%">
+                                                                            <asp:TextBox ID="TxtFEMSA_NumPedido" CssClass="form-control input-sm" runat="server" MaxLength="10"></asp:TextBox><label></label><i></i>
+                                                                        </div>
+                                                                    </td>
+                                                                </tr>
+                                                                <tr align="left">
+                                                                    <td>Número de Entrada:&nbsp;</td>
+                                                                    <td>
+                                                                        <div class="form-group form-md-line-input" style="width: 90%">
+                                                                            <asp:TextBox ID="TxtFEMSA_NumEntrada" CssClass="form-control input-sm" runat="server" MaxLength="10"></asp:TextBox><label></label><i></i>
+                                                                        </div>
+                                                                        <%--Validar Numerico--%>
+                                                                    </td>
+                                                                </tr>
+                                                                <tr align="left">
+                                                                    <td>Número de Remisión:&nbsp;</td>
+                                                                    <td>
+                                                                        <div class="form-group form-md-line-input" style="width: 90%">
+                                                                            <asp:TextBox ID="TxtFEMSA_NumRemision" CssClass="form-control input-sm" runat="server" MaxLength="10"></asp:TextBox><label></label><i></i>
+                                                                        </div>
+                                                                    </td>
+                                                                </tr>
+                                                                <tr align="left">
+                                                                    <td>Número de Socio:&nbsp;</td>
+                                                                    <td>
+                                                                        <div class="form-group form-md-line-input" style="width: 90%">
+                                                                            <asp:TextBox ID="TxtFEMSA_NumSocio" CssClass="form-control input-sm" runat="server" MaxLength="5">  </asp:TextBox><label></label><i></i>
+                                                                        </div>
+                                                                    </td>
+                                                                </tr>
+                                                                <tr align="left">
+                                                                    <td>Centro de Costo:&nbsp;</td>
+                                                                    <td>
+                                                                        <div class="form-group form-md-line-input" style="width: 90%">
+                                                                            <asp:TextBox ID="TxtFEMSA_CentroCosto" CssClass="form-control input-sm" runat="server" MaxLength="4"></asp:TextBox><label></label><i></i>
+                                                                        </div>
+                                                                    </td>
+                                                                </tr>
+                                                                <tr align="left">
+                                                                    <td>Inicio Periodo Liquidación:&nbsp;</td>
+                                                                    <td>
+                                                                        <div class="form-group form-md-line-input" style="width: 90%">
+                                                                            <asp:TextBox ID="TxtFEMSA_IPeriodoLiquidacion" CssClass="form-control input-sm" runat="server" MaxLength="10"></asp:TextBox><label></label><i></i>
+                                                                        </div>
+                                                                    </td>
+                                                                </tr>
+                                                                <tr align="left">
+                                                                    <td>Fin Periodo Liquidación:&nbsp;</td>
+                                                                    <td>
+                                                                        <div class="form-group form-md-line-input" style="width: 90%">
+                                                                            <asp:TextBox ID="TxtFEMSA_FPeriodoLiquidacion" CssClass="form-control input-sm" runat="server" MaxLength="10"></asp:TextBox><label></label><i></i>
+                                                                        </div>
+                                                                    </td>
+                                                                </tr>
+                                                                <tr align="left">
+                                                                    <td>Código Retención 1:&nbsp;</td>
+                                                                    <td>
+                                                                        <div class="form-group form-md-line-input" style="width: 90%">
+                                                                            <asp:TextBox ID="TxtFEMSA_CodRetencion1" CssClass="form-control input-sm" runat="server" MaxLength="15"></asp:TextBox><label></label><i></i>
+                                                                        </div>
+                                                                    </td>
+                                                                </tr>
+                                                                <tr align="left">
+                                                                    <td>Código Retención 2:&nbsp;</td>
+                                                                    <td>
+                                                                        <div class="form-group form-md-line-input" style="width: 90%">
+                                                                            <asp:TextBox ID="TxtFEMSA_CodRetencion2" CssClass="form-control input-sm" runat="server" MaxLength="15"></asp:TextBox><label></label><i></i>
+                                                                        </div>
+                                                                    </td>
+                                                                </tr>
+                                                                <tr align="left">
+                                                                    <td>Mail:&nbsp;</td>
+                                                                    <td>
+                                                                        <div class="form-group form-md-line-input" style="width: 90%">
+                                                                            <asp:TextBox ID="TxtFEMSA_Mail" CssClass="form-control input-sm" runat="server" MaxLength="50"></asp:TextBox><label></label><i></i>
+                                                                        </div>
+                                                                    </td>
+                                                                </tr>
+                                                            </table>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="row">
+                                            <div class="col-md-12">
+                                                <div class="row">
+                                                    <div class="col-md-12">
+                                                        <div class="portlet light xspadding bordered whitoutcol">
+                                                            <div class="portlet-title">
+                                                                <div class="caption font-green">
+                                                                    <i class="icon-pin font-green"></i>
+                                                                    <span class="caption-subject bold uppercase">FORD</span>
+
+                                                                </div>
+                                                                <div class="actions">
+                                                                    <div class="btn-group">
+                                                                    </div>
+                                                                </div>
+
+                                                                <div class="tools">
+                                                                    <a href="javascript:;" class="expand"></a>
+                                                                </div>
+                                                            </div>
+                                                            <div class="portlet-body form-horizontal form-row-sepe formnombottom" style="display: none;">
+                                                                <div class="form-body">
+                                                                    <table border="0">
+                                                                        <tr align="left">
+                                                                            <td>GSDB:&nbsp;&nbsp;</td>
+                                                                            <td>
+                                                                                <div class="form-group form-md-line-input">
+                                                                                    <asp:TextBox ID="TxtFordGSDB" CssClass="form-control input-sm" runat="server" MaxLength="5" Width="90%"></asp:TextBox><label></label><i></i>
+                                                                                </div>
+                                                                            </td>
+                                                                        </tr>
+                                                                        <tr align="left">
+                                                                            <td>ASN :&nbsp;&nbsp;</td>
+                                                                            <td>
+                                                                                <div class="form-group form-md-line-input" style="width: 120px; display: inline-block">
+                                                                                    <asp:TextBox ID="TxtFordASN" CssClass="form-control input-sm" size="15" runat="server" MaxLength="20"></asp:TextBox><label></label>
+                                                                                </div>
+                                                                                &nbsp;
                                                             <asp:LinkButton ID="LnkASN" runat="server" CssClass="fa fa-plus" ValidationGroup="GrpFordASN"></asp:LinkButton>
-                                                                                    <asp:RequiredFieldValidator ID="RFVFordASN" runat="server" ControlToValidate="TxtFordASN" ErrorMessage="Ingrese ASN" ValidationGroup="GrpFordASN"></asp:RequiredFieldValidator>
-                                                                                </td>
-                                                                            </tr>
-                                                                            <tr>
-                                                                                <td></td>
-                                                                                <td>
-                                                                                    <asp:ListBox ID="LstFordASN" Width="130px" runat="server"></asp:ListBox>
-                                                                                    <asp:LinkButton ID="LnkFordQuitar" runat="server" CssClass="fa fa-minus"></asp:LinkButton>
-                                                                                </td>
-                                                                            </tr>
-                                                                        </table>
-                                                                    </div>
+                                                                                <asp:RequiredFieldValidator ID="RFVFordASN" runat="server" ControlToValidate="TxtFordASN" ErrorMessage="Ingrese ASN" ValidationGroup="GrpFordASN"></asp:RequiredFieldValidator>
+                                                                            </td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td></td>
+                                                                            <td>
+                                                                                <asp:ListBox ID="LstFordASN" Width="130px" runat="server"></asp:ListBox>
+                                                                                <asp:LinkButton ID="LnkFordQuitar" runat="server" CssClass="fa fa-minus"></asp:LinkButton>
+                                                                            </td>
+                                                                        </tr>
+                                                                    </table>
                                                                 </div>
                                                             </div>
                                                         </div>
                                                     </div>
-                                                    <div class="row">
-                                                        <div class="col-md-12">
-
-                                                            <div class="portlet light xspadding bordered whitoutcol" style="width: 330px;">
-                                                                <div class="portlet-title">
-                                                                    <div class="caption font-green">
-                                                                        <i class="icon-pin font-green"></i>
-                                                                        <span class="caption-subject bold uppercase">7Eleven</span>
+                                                </div>
+                                                <div class="row">
+                                                    <div class="col-md-12">
+                                                        <div class="portlet light xspadding bordered whitoutcol">
+                                                            <div class="portlet-title">
+                                                                <div class="caption font-green">
+                                                                    <i class="icon-pin font-green"></i>
+                                                                    <span class="caption-subject bold uppercase">7Eleven</span>
 
+                                                                </div>
+                                                                <div class="actions">
+                                                                    <div class="btn-group">
                                                                     </div>
-                                                                    <div class="actions">
-                                                                        <div class="btn-group">
+                                                                </div>
+
+                                                                <div class="tools">
+                                                                    <a href="javascript:;" class="expand"></a>
+                                                                </div>
+                                                            </div>
+
+                                                            <div class="portlet-body form-horizontal form-row-sepe formnombottom" style="display: none;">
+                                                                <div class="form-body">
+                                                                    <table border="0">
+                                                                        <tr align="left">
+                                                                            <td>Proveedor:&nbsp;</td>
+                                                                            <td>
+                                                                                <div class="form-group form-md-line-input">
+                                                                                    <asp:TextBox ID="Txt7ElevenNumProveedor" CssClass="form-control input-sm" runat="server" Enabled="False" Width="90%"></asp:TextBox><label></label><i></i>
+                                                                                </div>
+                                                                            </td>
+                                                                        </tr>
+                                                                        <tr align="left">
+                                                                            <td>Folio:&nbsp;</td>
+                                                                            <td>
+                                                                                <div class="form-group form-md-line-input">
+                                                                                    <asp:TextBox ID="Txt7ElevenFolio" CssClass="form-control input-sm" runat="server" Width="90%"></asp:TextBox><label></label><i></i>
+                                                                                </div>
+                                                                            </td>
+                                                                        </tr>
+                                                                        <tr align="left">
+                                                                            <td>Tienda:&nbsp;</td>
+                                                                            <td>
+                                                                                <div class="form-group form-md-line-input">
+                                                                                    <asp:TextBox type="number" CssClass="form-control input-sm" ID="Txt7ElevenTienda" runat="server" Width="90%"></asp:TextBox><label></label><i></i>
+                                                                                </div>
+                                                                                <%--<ajax:MaskedEditExtender runat="server" ID="MEE7ElevenTienda" TargetControlID="Txt7ElevenTienda" MaskType="Number"  Mask="999999" AcceptNegative="Left" MessageValidatorTip="true"></ajax:MaskedEditExtender>--%>
+                                                                            </td>
+                                                                        </tr>
+                                                                        <tr align="left">
+                                                                            <td>Fecha:&nbsp;</td>
+                                                                            <td>
+
+                                                                                <div class="input-group input-small date date-picker" data-date-format="dd/mm/yyyy">
+                                                                                    <asp:TextBox ID="Txt7ElevenFecha" CssClass="form-control" runat="server" CausesValidation="true" MaxLength="10"></asp:TextBox>
+                                                                                    <span class="input-group-btn ">
+                                                                                        <asp:HyperLink ID="ImgCalendario7ElevenFecha" class="btn default" runat="server"><i class="fa fa-calendar"></i></asp:HyperLink>
+                                                                                    </span>
+                                                                                    <ajax:MaskedEditExtender ID="MEE7ElevenFecha" runat="server" TargetControlID="Txt7ElevenFecha" Mask="99/99/9999" MaskType="Date" DisplayMoney="Left" AcceptNegative="Left"></ajax:MaskedEditExtender>
+                                                                                    <ajax:CalendarExtender ID="Calendario7ElevenFecha" runat="server" TargetControlID="Txt7ElevenFecha" PopupButtonID="ImgCalendario7ElevenFecha" PopupPosition="BottomRight" Enabled="True"></ajax:CalendarExtender>
+                                                                                    <asp:CompareValidator ID="CVFecha7Eleven" runat="server" ControlToValidate="Txt7ElevenFecha" Display="None" ErrorMessage="El campo <b>''Fecha de Orden de Compra''</b> no tiene el formato correcto, por favor intente de nuevo con el siguiente formato: (dd/mm/yyyy)." Operator="DataTypeCheck" Type="Date" ValidationGroup="GrpEmitirImprimir"></asp:CompareValidator>
+                                                                                    <ajax:ValidatorCalloutExtender ID="VCORFV7Eleven1Fecha" runat="server" HighlightCssClass="vco" TargetControlID="CVFecha7Eleven" Width="350px"></ajax:ValidatorCalloutExtender>
+                                                                                </div>
+                                                                            </td>
+                                                                        </tr>
+                                                                    </table>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="col-md-3">
+                                        <div class="row">
+                                            <div class="col-md-12">
+                                                <div class="portlet light xspadding bordered whitoutcol">
+                                                    <div class="portlet-title">
+                                                        <div class="caption font-green">
+                                                            <i class="icon-pin font-green"></i>
+                                                            <span class="caption-subject bold uppercase">Detallista</span>
+                                                        </div>
+                                                        <div class="actions">
+                                                            <div class="btn-group">
+                                                            </div>
+                                                        </div>
+
+                                                        <div class="tools">
+                                                            <a href="javascript:;" class="expand"></a>
+                                                        </div>
+                                                    </div>
+
+                                                    <div class="portlet-body form-horizontal form-row-sepe formnombottom" style="display: none;">
+                                                        <div class="form-body">
+                                                            <table border="0">
+
+                                                                <tr align="left">
+                                                                    <td>Orden de Compra:&nbsp;</td>
+                                                                    <td>
+                                                                        <div class="form-group form-md-line-input" style="width: 90%">
+                                                                            <asp:TextBox ID="TxtDet_OrdenCompra" CssClass="form-control input-sm" runat="server"></asp:TextBox><label></label><i></i>
                                                                         </div>
-                                                                    </div>
+                                                                    </td>
+                                                                </tr>
+                                                                <tr align="left">
+                                                                    <td>Fecha de Orden de Compra:&nbsp;</td>
+                                                                    <td>
+                                                                        <div class="input-group input-small date date-picker" data-date-format="dd/mm/yyyy">
+                                                                            <asp:TextBox ID="TxtDet_FechaOrdenCompra" CssClass="form-control" runat="server" CausesValidation="true" MaxLength="10"></asp:TextBox>
+                                                                            <span class="input-group-btn ">
+                                                                                <asp:HyperLink ID="ImgCalendarioOCDet" class="btn default" runat="server"><i class="fa fa-calendar"></i></asp:HyperLink>
 
-                                                                    <div class="tools">
-                                                                        <a href="javascript:;" class="expand"></a>
-                                                                    </div>
-                                                                </div>
-
-                                                                <div class="portlet-body form-horizontal form-row-sepe formnombottom" style="display: none;">
-                                                                    <div class="form-body">
-                                                                        <table border="0">
-                                                                            <tr align="left">
-                                                                                <td>Proveedor:&nbsp;</td>
-                                                                                <td>
-                                                                                    <div class="form-group form-md-line-input">
-                                                                                        <asp:TextBox ID="Txt7ElevenNumProveedor" CssClass="form-control input-sm" runat="server" Enabled="False"></asp:TextBox><label></label><i></i>
-                                                                                    </div>
-                                                                                </td>
-                                                                            </tr>
-                                                                            <tr align="left">
-                                                                                <td>Folio:&nbsp;</td>
-                                                                                <td>
-                                                                                    <div class="form-group form-md-line-input">
-                                                                                        <asp:TextBox ID="Txt7ElevenFolio" CssClass="form-control input-sm" runat="server"></asp:TextBox><label></label><i></i>
-                                                                                    </div>
-                                                                                </td>
-                                                                            </tr>
-                                                                            <tr align="left">
-                                                                                <td>Tienda:&nbsp;</td>
-                                                                                <td>
-                                                                                    <div class="form-group form-md-line-input">
-                                                                                        <asp:TextBox type="number" CssClass="form-control input-sm" ID="Txt7ElevenTienda" runat="server"></asp:TextBox><label></label><i></i>
-                                                                                    </div>
-                                                                                    <%--<ajax:MaskedEditExtender runat="server" ID="MEE7ElevenTienda" TargetControlID="Txt7ElevenTienda" MaskType="Number"  Mask="999999" AcceptNegative="Left" MessageValidatorTip="true"></ajax:MaskedEditExtender>--%>
-                                                                                </td>
-                                                                            </tr>
-                                                                            <tr align="left">
-                                                                                <td>Fecha:&nbsp;</td>
-                                                                                <td>
-
-                                                                                    <div class="input-group input-small date date-picker" data-date-format="dd/mm/yyyy">
-                                                                                        <asp:TextBox ID="Txt7ElevenFecha" CssClass="form-control" runat="server" CausesValidation="true" MaxLength="10"></asp:TextBox>
-                                                                                        <span class="input-group-btn ">
-                                                                                            <asp:HyperLink ID="ImgCalendario7ElevenFecha" class="btn default" runat="server"><i class="fa fa-calendar"></i></asp:HyperLink>
-                                                                                        </span>
-                                                                                        <ajax:MaskedEditExtender ID="MEE7ElevenFecha" runat="server" TargetControlID="Txt7ElevenFecha" Mask="99/99/9999" MaskType="Date" DisplayMoney="Left" AcceptNegative="Left"></ajax:MaskedEditExtender>
-                                                                                        <ajax:CalendarExtender ID="Calendario7ElevenFecha" runat="server" TargetControlID="Txt7ElevenFecha" PopupButtonID="ImgCalendario7ElevenFecha" PopupPosition="BottomRight" Enabled="True"></ajax:CalendarExtender>
-                                                                                        <asp:CompareValidator ID="CVFecha7Eleven" runat="server" ControlToValidate="Txt7ElevenFecha" Display="None" ErrorMessage="El campo <b>''Fecha de Orden de Compra''</b> no tiene el formato correcto, por favor intente de nuevo con el siguiente formato: (dd/mm/yyyy)." Operator="DataTypeCheck" Type="Date" ValidationGroup="GrpEmitirImprimir"></asp:CompareValidator>
-                                                                                        <ajax:ValidatorCalloutExtender ID="VCORFV7Eleven1Fecha" runat="server" HighlightCssClass="vco" TargetControlID="CVFecha7Eleven" Width="350px"></ajax:ValidatorCalloutExtender>
-                                                                                    </div>
-                                                                                </td>
-                                                                            </tr>
-                                                                        </table>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
+                                                                            </span>
+                                                                            <ajax:MaskedEditExtender ID="MEEFechaOCDet" runat="server" TargetControlID="TxtDet_FechaOrdenCompra" Mask="99/99/9999" MaskType="Date" DisplayMoney="Left" AcceptNegative="Left"></ajax:MaskedEditExtender>
+                                                                            <ajax:CalendarExtender ID="CalendarioOCDet" runat="server" TargetControlID="TxtDet_FechaOrdenCompra" PopupButtonID="ImgCalendarioOCDet" PopupPosition="BottomRight" Enabled="True"></ajax:CalendarExtender>
+                                                                            <asp:CompareValidator ID="CVFechaOCDet" runat="server" ControlToValidate="TxtDet_FechaOrdenCompra" Display="None" ErrorMessage="El campo <b>''Fecha de Orden de Compra''</b> no tiene el formato correcto, por favor intente de nuevo con el siguiente formato: (dd/mm/yyyy)." Operator="DataTypeCheck" Type="Date" ValidationGroup="GrpEmitirImprimir"></asp:CompareValidator>
+                                                                            <ajax:ValidatorCalloutExtender ID="VCORFVOCDet2" runat="server" HighlightCssClass="vco" TargetControlID="CVFechaOCDet" Width="350px"></ajax:ValidatorCalloutExtender>
+                                                                        </div>
+                                                                    </td>
+                                                                </tr>
+                                                                <tr align="left">
+                                                                    <td>Contra Recibo:&nbsp;</td>
+                                                                    <td>
+                                                                        <div class="form-group form-md-line-input" style="width: 90%">
+                                                                            <asp:TextBox ID="TxtDet_ContraRecibo" CssClass="form-control input-sm" runat="server"></asp:TextBox><label></label><i></i>
+                                                                        </div>
+                                                                    </td>
+                                                                </tr>
+                                                                <tr align="left">
+                                                                    <td>GLN-Comprador:&nbsp;</td>
+                                                                    <td>
+                                                                        <div class="form-group form-md-line-input" style="width: 90%">
+                                                                            <asp:TextBox ID="TxtDet_GLNComprador" CssClass="form-control input-sm" runat="server"></asp:TextBox><label></label><i></i>
+                                                                        </div>
+                                                                    </td>
+                                                                </tr>
+                                                                <tr align="left">
+                                                                    <td>Departamento:&nbsp;</td>
+                                                                    <td>
+                                                                        <div class="form-group form-md-line-input" style="width: 90%">
+                                                                            <asp:TextBox ID="TxtDet_Departamento" CssClass="form-control input-sm" runat="server"></asp:TextBox><label></label><i></i>
+                                                                        </div>
+                                                                    </td>
+                                                                </tr>
+                                                                <tr align="left">
+                                                                    <td>GLN-Vendedor:&nbsp;</td>
+                                                                    <td>
+                                                                        <div class="form-group form-md-line-input" style="width: 90%">
+                                                                            <asp:TextBox ID="TxtDet_GLNVendedor" CssClass="form-control input-sm" runat="server"></asp:TextBox><label></label><i></i>
+                                                                        </div>
+                                                                    </td>
+                                                                </tr>
+                                                                <tr align="left">
+                                                                    <td>Número de Proveedor:&nbsp;</td>
+                                                                    <td>
+                                                                        <div class="form-group form-md-line-input" style="width: 90%">
+                                                                            <asp:TextBox ID="TxtDet_NumProv" CssClass="form-control input-sm" runat="server"></asp:TextBox><label></label><i></i>
+                                                                        </div>
+                                                                    </td>
+                                                                </tr>
+                                                            </table>
                                                         </div>
                                                     </div>
                                                 </div>
                                             </div>
-                                        </td>
-                                        <td rowspan="1" colspan="1">
-                                            <div class="row">
-                                                <div class="col-md-12">
-                                                    <div class="portlet light xspadding bordered whitoutcol" style="width: 330px;">
-                                                        <div class="portlet-title">
-                                                            <div class="caption font-green">
-                                                                <i class="icon-pin font-green"></i>
-                                                                <span class="caption-subject bold uppercase">Detallista</span>
-
-                                                            </div>
-                                                            <div class="actions">
-                                                                <div class="btn-group">
-                                                                </div>
-                                                            </div>
-
-                                                            <div class="tools">
-                                                                <a href="javascript:;" class="expand"></a>
+                                        </div>
+                                        <div class="row">
+                                            <div class="col-md-12">
+                                                <div class="portlet light xspadding bordered whitoutcol">
+                                                    <div class="portlet-title">
+                                                        <div class="caption font-green">
+                                                            <i class="icon-pin font-green"></i>
+                                                            <span class="caption-subject bold uppercase">Complementos INE</span>
+                                                        </div>
+                                                        <div class="actions">
+                                                            <div class="btn-group">
                                                             </div>
                                                         </div>
-
-                                                        <div class="portlet-body form-horizontal form-row-sepe formnombottom" style="display: none;">
-                                                            <div class="form-body">
-                                                                <table border="0">
-
-                                                                    <tr align="left">
-                                                                        <td>Orden de Compra:&nbsp;</td>
-                                                                        <td>
-                                                                            <div class="form-group form-md-line-input" style="width: 90%">
-                                                                                <asp:TextBox ID="TxtDet_OrdenCompra" CssClass="form-control input-sm" runat="server"></asp:TextBox><label></label><i></i>
-                                                                            </div>
-                                                                        </td>
-                                                                    </tr>
-                                                                    <tr align="left">
-                                                                        <td>Fecha de Orden de Compra:&nbsp;</td>
-                                                                        <td>
-                                                                            <div class="input-group input-small date date-picker" data-date-format="dd/mm/yyyy">
-                                                                                <asp:TextBox ID="TxtDet_FechaOrdenCompra" CssClass="form-control" runat="server" CausesValidation="true" MaxLength="10"></asp:TextBox>
-                                                                                <span class="input-group-btn ">
-                                                                                    <asp:HyperLink ID="ImgCalendarioOCDet" class="btn default" runat="server"><i class="fa fa-calendar"></i></asp:HyperLink>
-
-                                                                                </span>
-                                                                                <ajax:MaskedEditExtender ID="MEEFechaOCDet" runat="server" TargetControlID="TxtDet_FechaOrdenCompra" Mask="99/99/9999" MaskType="Date" DisplayMoney="Left" AcceptNegative="Left"></ajax:MaskedEditExtender>
-                                                                                <ajax:CalendarExtender ID="CalendarioOCDet" runat="server" TargetControlID="TxtDet_FechaOrdenCompra" PopupButtonID="ImgCalendarioOCDet" PopupPosition="BottomRight" Enabled="True"></ajax:CalendarExtender>
-                                                                                <asp:CompareValidator ID="CVFechaOCDet" runat="server" ControlToValidate="TxtDet_FechaOrdenCompra" Display="None" ErrorMessage="El campo <b>''Fecha de Orden de Compra''</b> no tiene el formato correcto, por favor intente de nuevo con el siguiente formato: (dd/mm/yyyy)." Operator="DataTypeCheck" Type="Date" ValidationGroup="GrpEmitirImprimir"></asp:CompareValidator>
-                                                                                <ajax:ValidatorCalloutExtender ID="VCORFVOCDet2" runat="server" HighlightCssClass="vco" TargetControlID="CVFechaOCDet" Width="350px"></ajax:ValidatorCalloutExtender>
-                                                                            </div>
-                                                                        </td>
-                                                                    </tr>
-                                                                    <tr align="left">
-                                                                        <td>Contra Recibo:&nbsp;</td>
-                                                                        <td>
-                                                                            <div class="form-group form-md-line-input" style="width: 90%">
-                                                                                <asp:TextBox ID="TxtDet_ContraRecibo" CssClass="form-control input-sm" runat="server"></asp:TextBox><label></label><i></i>
-                                                                            </div>
-                                                                        </td>
-                                                                    </tr>
-                                                                    <tr align="left">
-                                                                        <td>GLN-Comprador:&nbsp;</td>
-                                                                        <td>
-                                                                            <div class="form-group form-md-line-input" style="width: 90%">
-                                                                                <asp:TextBox ID="TxtDet_GLNComprador" CssClass="form-control input-sm" runat="server"></asp:TextBox><label></label><i></i>
-                                                                            </div>
-                                                                        </td>
-                                                                    </tr>
-                                                                    <tr align="left">
-                                                                        <td>Departamento:&nbsp;</td>
-                                                                        <td>
-                                                                            <div class="form-group form-md-line-input" style="width: 90%">
-                                                                                <asp:TextBox ID="TxtDet_Departamento" CssClass="form-control input-sm" runat="server"></asp:TextBox><label></label><i></i>
-                                                                            </div>
-                                                                        </td>
-                                                                    </tr>
-                                                                    <tr align="left">
-                                                                        <td>GLN-Vendedor:&nbsp;</td>
-                                                                        <td>
-                                                                            <div class="form-group form-md-line-input" style="width: 90%">
-                                                                                <asp:TextBox ID="TxtDet_GLNVendedor" CssClass="form-control input-sm" runat="server"></asp:TextBox><label></label><i></i>
-                                                                            </div>
-                                                                        </td>
-                                                                    </tr>
-                                                                    <tr align="left">
-                                                                        <td>Número de Proveedor:&nbsp;</td>
-                                                                        <td>
-                                                                            <div class="form-group form-md-line-input" style="width: 90%">
-                                                                                <asp:TextBox ID="TxtDet_NumProv" CssClass="form-control input-sm" runat="server"></asp:TextBox><label></label><i></i>
-                                                                            </div>
-                                                                        </td>
-                                                                    </tr>
-                                                                </table>
-                                                            </div>
+                                                        <div class="tools">
+                                                            <a href="javascript:;" class="expand"></a>
                                                         </div>
                                                     </div>
-                                                </div>
-                                            </div>
-                                            <div class="row">
-                                                <div class="col-md-12">
-                                                    <div class="portlet light xspadding bordered whitoutcol" style="width: 450px;">
-                                                        <div class="portlet-title">
-                                                            <div class="caption font-green">
-                                                                <i class="icon-pin font-green"></i>
-                                                                <span class="caption-subject bold uppercase">Complementos INE</span>
-                                                            </div>
-                                                            <div class="actions">
-                                                                <div class="btn-group">
-                                                                </div>
-                                                            </div>
-                                                            <div class="tools">
-                                                                <a href="javascript:;" class="expand"></a>
-                                                            </div>
-                                                        </div>
-                                                        <div class="portlet-body form-horizontal form-row-sepe formnombottom" style="display: none;">
-                                                            <div class="form-body">
+                                                    <div class="portlet-body form-horizontal form-row-sepe formnombottom" style="display: none;">
+                                                        <div class="form-body">
+                                                            <div class="modal-body">
                                                                 <div class="row">
-                                                                    <div class="modal-body col-md-6" style="border-right: 1px solid lightgray;">
+                                                                    <div class="col-md-6" style="border-right: 1px solid lightgray;">
                                                                         <asp:UpdatePanel runat="server" ID="UpComplementos" UpdateMode="Conditional">
                                                                             <ContentTemplate>
-                                                                                <asp:RadioButtonList ID="RblComplementos" runat="server" AutoPostBack="true" CssClass="rbl" DataValueField="CveVentaComplemento" DataTextField="VentaComplemento" RepeatLayout="Table">
+                                                                                <asp:RadioButtonList ID="RblComplementos" runat="server" AutoPostBack="true" CssClass="rbl" DataValueField="CveVentaComplemento" DataTextField="VentaComplemento" RepeatLayout="Table" Width="95%">
                                                                                 </asp:RadioButtonList>
                                                                             </ContentTemplate>
                                                                         </asp:UpdatePanel>
                                                                     </div>
-                                                                    <div class="modal-body col-md-6">
+                                                                    <div class="col-md-6">
                                                                         <asp:UpdatePanel runat="server" ID="UpDatosComplementos" UpdateMode="Conditional">
                                                                             <ContentTemplate>
                                                                                 <table>
@@ -3014,7 +3021,7 @@
                                                                                     <tr id="trContaComplementos" runat="Server" visible="False">
                                                                                         <td>Id Conta:</td>
                                                                                         <td>
-                                                                                            <asp:TextBox ID="TxtIdConta" runat="server" MaxLength="6" Width="100px"></asp:TextBox>
+                                                                                            <asp:TextBox ID="TxtIdConta" runat="server" MaxLength="6" Width="90%"></asp:TextBox>
                                                                                             <asp:RegularExpressionValidator ID="REVIdConta" runat="server" ControlToValidate="TxtIdConta" Display="None" ErrorMessage="El campo <b>''Id Conta''</b> no tiene el formato correcto, por favor corrija e intente de nuevo (Solo formato numérico)." ValidationExpression="^([1-9]{1}[\d]{0,2}(\,[\d]{3})*(\.[\d]{0,4})?|[1-9]{1}[\d]{0,}(\.[\d]{0,4})?|0(\.[\d]{0,2})?|(\.[\d]{1,4})?)$" ValidationGroup="GrpComplementosTimbrado"></asp:RegularExpressionValidator>
                                                                                             <ajax:ValidatorCalloutExtender ID="VCEIdConta" runat="server" HighlightCssClass="vco" TargetControlID="REVIdConta" Width="300px"></ajax:ValidatorCalloutExtender>
                                                                                         </td>
@@ -3029,13 +3036,9 @@
                                                     </div>
                                                 </div>
                                             </div>
-                                        </td>
-                                    </tr>
-                                    <tr valign="top">
-                                        <td rowspan="1" colspan="2"></td>
-                                        <td rowspan="1" colspan="1"></td>
-                                    </tr>
-                                </table>
+                                        </div>
+                                    </div>
+                                </div>
                             </ContentTemplate>
                         </asp:UpdatePanel>
                     </ContentTemplate>
diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb
index 363fd8033..5299b19cd 100644
--- a/Ventas/Ventas.aspx.vb
+++ b/Ventas/Ventas.aspx.vb
@@ -31425,6 +31425,10 @@ Partial Class Ventas
             DdlTipoRetencion.Visible = True
         End If
 
+        If DivCartaPorte.Visible Then
+            HabilitarControlesCartaPorte(True)
+        End If
+
         UpnTools.Update()
         UpCliente.Update()
         UpParametros.Update()
@@ -31438,7 +31442,7 @@ Partial Class Ventas
         UpParametros.Update()
         UpINV.Update()
         UpFacturasRelacionadas.Update()
-
+        UpEmitirTransitorio.Update()
     End Sub
 #End Region
 
@@ -34062,12 +34066,12 @@ Partial Class Ventas
         ValidaConfiguracionVehiculo()
     End Sub
     Public Sub CargaVentaCortePorte(CveVenta As Integer)
-        TxtFechaEntregaCP.Enabled = False
-        TxtFechaLlegadaCP.Enabled = False
-
         Dim CveEntregaAlmacen As Integer = -1
         Dim CveDireccionOrigen As Integer = -1
         Dim CveDireccionDestino As Integer = -1
+        Dim CveCamionRemolque1 As Integer = -1
+        Dim CveCamionRemolque2 As Integer = -1
+        Dim CveConfigAutoTransporte As Integer = -1
 
         Using ObjGral As New ClsGenerales
             If ObjGral.GetGralTimbre(-1, "Ing", MinFecha, MaxFecha, 0, UsuarioActual.CveEmpresa, -1, CveVenta:=CveVenta) AndAlso ObjGral.DtResultados.Rows.Count > 0 Then
@@ -34076,20 +34080,24 @@ Partial Class Ventas
                 Me.CveTimbreCartaPorteVenta = RowCP("CveTimbre").ToString().ToEntero()
                 If CveTimbreCartaPorteVenta > 0 Then
                     ChkEmitirCartaPorte.Checked = True
-                    ChkEmitirCartaPorte.Enabled = False
-
 
                     CveEntregaAlmacen = RowCP("CveEntregaAlmacen").ToString().ToEntero()
 
                     CveDireccionOrigen = RowCP("CveDireccionOrigen").ToString().ToEntero()
                     CveDireccionDestino = RowCP("CveDireccionDestino").ToString().ToEntero()
 
-                    TxtFechaEntregaCP.Text = RowCP("FechaEntrega").ToString()
-                    TxtFechaLlegadaCP.Text = RowCP("FechaLlegada").ToString()
+                    TxtFechaEntregaCP.Text = RowCP("FechaEntrega").ToString().ToDateTime().ToString("dd/MM/yyyy HH:mm")
+                    TxtFechaLlegadaCP.Text = RowCP("FechaLlegada").ToString().ToDateTime().ToString("dd/MM/yyyy HH:mm")
                     TxtDistancia.Text = RowCP("Distancia").ToString()
 
                     DdlChofer.SelectedValueExist(RowCP("CveChofer").ToString())
                     DdlUnidadCamion.SelectedValueExist(RowCP("CveCamion").ToString())
+
+                    CveCamionRemolque1 = RowCP("CveCamionRemolque1").ToString().ToEntero()
+                    CveCamionRemolque2 = RowCP("CveCamionRemolque2").ToString().ToEntero()
+
+                    CveConfigAutoTransporte = RowCP("CveConfigAutoTransporte").ToString().ToEntero()
+
                 End If
 
             End If
@@ -34098,7 +34106,6 @@ Partial Class Ventas
                 DtMercancias = ObjGral.DtResultados
             End If
 
-
         End Using
 
         If ChkEmitirCartaPorte.Checked AndAlso CveCliente > 0 Then
@@ -34119,18 +34126,54 @@ Partial Class Ventas
 
             GvMercanciasCP.DataSource = DtMercancias
             GvMercanciasCP.DataBind()
+
+            If DdlUnidadCamion.SelectedValue.ToEntero() > 0 Then
+                If CveConfigAutoTransporte > 0 Then
+                    DvRemolque1.Visible = False
+                    DvRemolque2.Visible = False
+
+                    DdlRemolque1.SelectedValueExist(-1)
+                    DdlRemolque2.SelectedValueExist(-1)
+
+                    DdlConfigAuto.SelectedValueExist(CveConfigAutoTransporte.ToString())
+                    DdlConfigAuto_SelectedIndexChanged(DdlConfigAuto, EventArgs.Empty)
+
+                    If CveCamionRemolque1 > 0 Then
+                        DdlRemolque1.SelectedValueExist(CveCamionRemolque1.ToString())
+                        DdlRemolque1_SelectedIndexChanged(DdlRemolque1, EventArgs.Empty)
+
+                        If CveCamionRemolque2 > 0 Then
+                            DdlRemolque2.SelectedValueExist(CveCamionRemolque2.ToString())
+                        End If
+                    End If
+                End If
+            End If
+
         Else
             TmpDTDireccionCP = Nothing
         End If
 
-        DdlChofer.Enabled = False
-        DdlUnidadCamion.Enabled = False
-        DdlDireccionOrigen.Enabled = False
-        DdlDireccionDestino.Enabled = False
+        HabilitarControlesCartaPorte(False)
 
         UpEmitirTransitorio.Update()
     End Sub
 
+    Private Sub HabilitarControlesCartaPorte(Habilitar As Boolean)
+        ChkEmitirCartaPorte.Enabled = Habilitar
+        TxtFechaEntregaCP.Enabled = Habilitar
+        TxtFechaLlegadaCP.Enabled = Habilitar
+        DdlChofer.Enabled = Habilitar
+        DdlUnidadCamion.Enabled = Habilitar
+        DdlConfigAuto.Enabled = Habilitar
+        DdlRemolque1.Enabled = Habilitar
+        DdlRemolque2.Enabled = Habilitar
+        DdlDireccionOrigen.Enabled = Habilitar
+        DdlDireccionDestino.Enabled = Habilitar
+        TxtDistancia.Enabled = Habilitar
+        LnkAgregarMercancia.Enabled = Habilitar
+        GvMercanciasCP.Columns(3).Visible = Habilitar
+    End Sub
+
     Private Sub ValidaConfiguracionVehiculo()
         DvRemolque1.Visible = False
         DvRemolque2.Visible = False
@@ -34288,93 +34331,93 @@ Partial Class Ventas
         End Set
     End Property
 
-    Property SucursalOrigenCP As Modelos.SucursalModel
-        Get
-            If ViewState("SucursalOrigenCP") Is Nothing Then
-                Return Nothing
-            End If
-            Return DirectCast(ViewState("SucursalOrigenCP"), Modelos.SucursalModel)
-        End Get
-        Set(value As Modelos.SucursalModel)
-            ViewState("SucursalOrigenCP") = value
-        End Set
-    End Property
-    Property SucursalDestinoCP As Modelos.SucursalModel
-        Get
-            If ViewState("SucursalDestinoCP") Is Nothing Then
-                Return Nothing
-            End If
-            Return DirectCast(ViewState("SucursalDestinoCP"), Modelos.SucursalModel)
-        End Get
-        Set(value As Modelos.SucursalModel)
-            ViewState("SucursalDestinoCP") = value
-        End Set
-    End Property
+    'Property SucursalOrigenCP As Modelos.SucursalModel
+    '    Get
+    '        If ViewState("SucursalOrigenCP") Is Nothing Then
+    '            Return Nothing
+    '        End If
+    '        Return DirectCast(ViewState("SucursalOrigenCP"), Modelos.SucursalModel)
+    '    End Get
+    '    Set(value As Modelos.SucursalModel)
+    '        ViewState("SucursalOrigenCP") = value
+    '    End Set
+    'End Property
+    'Property SucursalDestinoCP As Modelos.SucursalModel
+    '    Get
+    '        If ViewState("SucursalDestinoCP") Is Nothing Then
+    '            Return Nothing
+    '        End If
+    '        Return DirectCast(ViewState("SucursalDestinoCP"), Modelos.SucursalModel)
+    '    End Get
+    '    Set(value As Modelos.SucursalModel)
+    '        ViewState("SucursalDestinoCP") = value
+    '    End Set
+    'End Property
 
-    Private Sub CargaDireccionSucursalOrigen(Row As DataRow)
-        If SucursalOrigenCP Is Nothing Then
-            SucursalOrigenCP = New Modelos.SucursalModel
-        Else
-            SucursalOrigenCP = Nothing
-            SucursalOrigenCP = New Modelos.SucursalModel
-        End If
+    'Private Sub CargaDireccionSucursalOrigen(Row As DataRow)
+    '    If SucursalOrigenCP Is Nothing Then
+    '        SucursalOrigenCP = New Modelos.SucursalModel
+    '    Else
+    '        SucursalOrigenCP = Nothing
+    '        SucursalOrigenCP = New Modelos.SucursalModel
+    '    End If
 
-        Dim SBDomicilioSucursal As New StringBuilder()
-        Try
-            If Row IsNot Nothing Then
+    '    Dim SBDomicilioSucursal As New StringBuilder()
+    '    Try
+    '        If Row IsNot Nothing Then
 
-                SucursalOrigenCP.Direccion = Row("Calle").ToString()
-                SucursalOrigenCP.NoExt = Row("NoExt").ToString()
-                SucursalOrigenCP.NoInt = Row("NoInt").ToString()
-                SucursalOrigenCP.Colonia = Row("Colonia").ToString()
-                SucursalOrigenCP.CP = Row("CP").ToString()
-                SucursalOrigenCP.Municipio = Row("Municipio").ToString()
-                SucursalOrigenCP.CveEstado = Row("CveEstado").ToString().ToEntero()
-                SucursalOrigenCP.Estado = Row("Estado").ToString()
-                SucursalOrigenCP.CvePais = Row("CvePais").ToString().ToEntero()
-                SucursalOrigenCP.Pais = Row("Pais").ToString()
+    '            SucursalOrigenCP.Direccion = Row("Calle").ToString()
+    '            SucursalOrigenCP.NoExt = Row("NoExt").ToString()
+    '            SucursalOrigenCP.NoInt = Row("NoInt").ToString()
+    '            SucursalOrigenCP.Colonia = Row("Colonia").ToString()
+    '            SucursalOrigenCP.CP = Row("CP").ToString()
+    '            SucursalOrigenCP.Municipio = Row("Municipio").ToString()
+    '            SucursalOrigenCP.CveEstado = Row("CveEstado").ToString().ToEntero()
+    '            SucursalOrigenCP.Estado = Row("Estado").ToString()
+    '            SucursalOrigenCP.CvePais = Row("CvePais").ToString().ToEntero()
+    '            SucursalOrigenCP.Pais = Row("Pais").ToString()
 
-                SBDomicilioSucursal.AppendFormat("{0}", Row("Calle").ToString())
+    '            SBDomicilioSucursal.AppendFormat("{0}", Row("Calle").ToString())
 
-                If Row("NoInt").ToString().Length > 0 Then
-                    SBDomicilioSucursal.AppendFormat(", No.Int: {0}", Row("NoInt").ToString())
-                End If
+    '            If Row("NoInt").ToString().Length > 0 Then
+    '                SBDomicilioSucursal.AppendFormat(", No.Int: {0}", Row("NoInt").ToString())
+    '            End If
 
-                If Row("Colonia").ToString().Length > 0 Then
-                    SBDomicilioSucursal.AppendFormat(", Col: {0}", Row("Colonia").ToString())
-                End If
+    '            If Row("Colonia").ToString().Length > 0 Then
+    '                SBDomicilioSucursal.AppendFormat(", Col: {0}", Row("Colonia").ToString())
+    '            End If
 
-                If Row("CP").ToString().ToEntero > 0 Then
-                    SBDomicilioSucursal.AppendFormat(", CP: {0}", Row("CP").ToString())
-                End If
+    '            If Row("CP").ToString().ToEntero > 0 Then
+    '                SBDomicilioSucursal.AppendFormat(", CP: {0}", Row("CP").ToString())
+    '            End If
 
-                If Row("NoExt").ToString().Length > 0 Then
-                    SBDomicilioSucursal.AppendFormat(" No.Ext: {0}", Row("NoExt").ToString())
-                End If
+    '            If Row("NoExt").ToString().Length > 0 Then
+    '                SBDomicilioSucursal.AppendFormat(" No.Ext: {0}", Row("NoExt").ToString())
+    '            End If
 
-                Dim CiudadSucursal As String = String.Format("{0},{1}", Row("Municipio").ToString(), Row("Estado").ToString())
-                If CiudadSucursal.Length > 0 Then
-                    SBDomicilioSucursal.AppendFormat(", {0}", CiudadSucursal)
-                End If
+    '            Dim CiudadSucursal As String = String.Format("{0},{1}", Row("Municipio").ToString(), Row("Estado").ToString())
+    '            If CiudadSucursal.Length > 0 Then
+    '                SBDomicilioSucursal.AppendFormat(", {0}", CiudadSucursal)
+    '            End If
 
-                If Row("Pais").ToString().Length > 0 Then
-                    SBDomicilioSucursal.AppendFormat(", {0}", Row("Pais").ToString())
-                End If
+    '            If Row("Pais").ToString().Length > 0 Then
+    '                SBDomicilioSucursal.AppendFormat(", {0}", Row("Pais").ToString())
+    '            End If
 
-                If Not String.IsNullOrEmpty(Row("Telefono").ToString()) Then
-                    SucursalOrigenCP.TelefonoSucursal = Row("Telefono").ToString()
-                End If
-            End If
+    '            If Not String.IsNullOrEmpty(Row("Telefono").ToString()) Then
+    '                SucursalOrigenCP.TelefonoSucursal = Row("Telefono").ToString()
+    '            End If
+    '        End If
 
-        Catch ex As Exception
-            SBDomicilioSucursal.Clear()
-            GuardaLog(ex.ToString())
-        End Try
+    '    Catch ex As Exception
+    '        SBDomicilioSucursal.Clear()
+    '        GuardaLog(ex.ToString())
+    '    End Try
 
-        'TxtOrigenCP.Text = SBDomicilioSucursal.ToString
+    '    'TxtOrigenCP.Text = SBDomicilioSucursal.ToString
 
-        UpEmitirTransitorio.Update()
-    End Sub
+    '    UpEmitirTransitorio.Update()
+    'End Sub
 
     Protected Sub DdlDireccionEnvio_SelectedIndexChanged(sender As Object, e As EventArgs)
         'If SucursalDestinoCP Is Nothing Then
@@ -34410,73 +34453,73 @@ Partial Class Ventas
         UpEmitirTransitorio.Update()
     End Sub
 
-    Protected Sub DdlDireccionOrigen_SelectedIndexChanged(sender As Object, e As EventArgs)
-        If SucursalOrigenCP Is Nothing Then
-            SucursalOrigenCP = New Modelos.SucursalModel
-        Else
-            SucursalOrigenCP = Nothing
-            SucursalOrigenCP = New Modelos.SucursalModel
-        End If
+    'Protected Sub DdlDireccionOrigen_SelectedIndexChanged(sender As Object, e As EventArgs)
+    '    If SucursalOrigenCP Is Nothing Then
+    '        SucursalOrigenCP = New Modelos.SucursalModel
+    '    Else
+    '        SucursalOrigenCP = Nothing
+    '        SucursalOrigenCP = New Modelos.SucursalModel
+    '    End If
 
 
-        If TmpDTDireccionCP IsNot Nothing AndAlso TmpDTDireccionCP.FiltraParametros(String.Format("CveDireccionEnvio = {0}", DdlDireccionOrigen.SelectedValue.ToEntero())).Rows.Count > 0 Then
+    '    If TmpDTDireccionCP IsNot Nothing AndAlso TmpDTDireccionCP.FiltraParametros(String.Format("CveDireccionEnvio = {0}", DdlDireccionOrigen.SelectedValue.ToEntero())).Rows.Count > 0 Then
 
-            Dim Row As DataRow = TmpDTDireccionCP.FiltroPrimero(String.Format("CveDireccionEnvio = {0}", DdlDireccionOrigen.SelectedValue.ToEntero()))
-            If Row IsNot Nothing Then
+    '        Dim Row As DataRow = TmpDTDireccionCP.FiltroPrimero(String.Format("CveDireccionEnvio = {0}", DdlDireccionOrigen.SelectedValue.ToEntero()))
+    '        If Row IsNot Nothing Then
 
-                SucursalOrigenCP.Direccion = Row("EnvioDireccion").ToString()
-                SucursalOrigenCP.Colonia = Row("EnvioColonia").ToString()
-                SucursalOrigenCP.Municipio = Row("EnvioCiudad").ToString()
-                SucursalOrigenCP.CveEstado = Row("CveEstado").ToString().ToEntero()
-                SucursalOrigenCP.Estado = Row("EnvioEstado").ToString()
-                SucursalOrigenCP.CvePais = Row("CvePais").ToString().ToEntero()
-                SucursalOrigenCP.Pais = Row("Pais").ToString()
-                SucursalOrigenCP.CP = Row("EnvioCP").ToString()
+    '            SucursalOrigenCP.Direccion = Row("EnvioDireccion").ToString()
+    '            SucursalOrigenCP.Colonia = Row("EnvioColonia").ToString()
+    '            SucursalOrigenCP.Municipio = Row("EnvioCiudad").ToString()
+    '            SucursalOrigenCP.CveEstado = Row("CveEstado").ToString().ToEntero()
+    '            SucursalOrigenCP.Estado = Row("EnvioEstado").ToString()
+    '            SucursalOrigenCP.CvePais = Row("CvePais").ToString().ToEntero()
+    '            SucursalOrigenCP.Pais = Row("Pais").ToString()
+    '            SucursalOrigenCP.CP = Row("EnvioCP").ToString()
 
-                'TxtDestinoCP.Text = String.Format("{0} col. {1},CP:{2}, {3},{4},{5}", SucursalDestinoCP.Direccion, SucursalDestinoCP.Colonia, SucursalDestinoCP.CP, SucursalDestinoCP.Municipio, SucursalDestinoCP.Estado, SucursalDestinoCP.Pais)
-            Else
-                'TxtDestinoCP.Text = ""
-            End If
-        Else
-            'TxtDestinoCP.Text = ""
-        End If
+    '            'TxtDestinoCP.Text = String.Format("{0} col. {1},CP:{2}, {3},{4},{5}", SucursalDestinoCP.Direccion, SucursalDestinoCP.Colonia, SucursalDestinoCP.CP, SucursalDestinoCP.Municipio, SucursalDestinoCP.Estado, SucursalDestinoCP.Pais)
+    '        Else
+    '            'TxtDestinoCP.Text = ""
+    '        End If
+    '    Else
+    '        'TxtDestinoCP.Text = ""
+    '    End If
 
-        UpEmitirTransitorio.Update()
-    End Sub
+    '    UpEmitirTransitorio.Update()
+    'End Sub
 
-    Protected Sub DdlDireccionDestino_SelectedIndexChanged(sender As Object, e As EventArgs)
-        If SucursalDestinoCP Is Nothing Then
-            SucursalDestinoCP = New Modelos.SucursalModel
-        Else
-            SucursalDestinoCP = Nothing
-            SucursalDestinoCP = New Modelos.SucursalModel
-        End If
+    'Protected Sub DdlDireccionDestino_SelectedIndexChanged(sender As Object, e As EventArgs)
+    '    If SucursalDestinoCP Is Nothing Then
+    '        SucursalDestinoCP = New Modelos.SucursalModel
+    '    Else
+    '        SucursalDestinoCP = Nothing
+    '        SucursalDestinoCP = New Modelos.SucursalModel
+    '    End If
 
 
-        If TmpDTDireccionCP IsNot Nothing AndAlso TmpDTDireccionCP.FiltraParametros(String.Format("CveDireccionEnvio = {0}", DdlDireccionDestino.SelectedValue.ToEntero())).Rows.Count > 0 Then
+    '    If TmpDTDireccionCP IsNot Nothing AndAlso TmpDTDireccionCP.FiltraParametros(String.Format("CveDireccionEnvio = {0}", DdlDireccionDestino.SelectedValue.ToEntero())).Rows.Count > 0 Then
 
-            Dim Row As DataRow = TmpDTDireccionCP.FiltroPrimero(String.Format("CveDireccionEnvio = {0}", DdlDireccionDestino.SelectedValue.ToEntero()))
-            If Row IsNot Nothing Then
+    '        Dim Row As DataRow = TmpDTDireccionCP.FiltroPrimero(String.Format("CveDireccionEnvio = {0}", DdlDireccionDestino.SelectedValue.ToEntero()))
+    '        If Row IsNot Nothing Then
 
-                SucursalDestinoCP.Direccion = Row("EnvioDireccion").ToString()
-                SucursalDestinoCP.Colonia = Row("EnvioColonia").ToString()
-                SucursalDestinoCP.Municipio = Row("EnvioCiudad").ToString()
-                SucursalDestinoCP.CveEstado = Row("CveEstado").ToString().ToEntero()
-                SucursalDestinoCP.Estado = Row("EnvioEstado").ToString()
-                SucursalDestinoCP.CvePais = Row("CvePais").ToString().ToEntero()
-                SucursalDestinoCP.Pais = Row("Pais").ToString()
-                SucursalDestinoCP.CP = Row("EnvioCP").ToString()
+    '            SucursalDestinoCP.Direccion = Row("EnvioDireccion").ToString()
+    '            SucursalDestinoCP.Colonia = Row("EnvioColonia").ToString()
+    '            SucursalDestinoCP.Municipio = Row("EnvioCiudad").ToString()
+    '            SucursalDestinoCP.CveEstado = Row("CveEstado").ToString().ToEntero()
+    '            SucursalDestinoCP.Estado = Row("EnvioEstado").ToString()
+    '            SucursalDestinoCP.CvePais = Row("CvePais").ToString().ToEntero()
+    '            SucursalDestinoCP.Pais = Row("Pais").ToString()
+    '            SucursalDestinoCP.CP = Row("EnvioCP").ToString()
 
-                'TxtDestinoCP.Text = String.Format("{0} col. {1},CP:{2}, {3},{4},{5}", SucursalDestinoCP.Direccion, SucursalDestinoCP.Colonia, SucursalDestinoCP.CP, SucursalDestinoCP.Municipio, SucursalDestinoCP.Estado, SucursalDestinoCP.Pais)
-            Else
-                'TxtDestinoCP.Text = ""
-            End If
-        Else
-            'TxtDestinoCP.Text = ""
-        End If
+    '            'TxtDestinoCP.Text = String.Format("{0} col. {1},CP:{2}, {3},{4},{5}", SucursalDestinoCP.Direccion, SucursalDestinoCP.Colonia, SucursalDestinoCP.CP, SucursalDestinoCP.Municipio, SucursalDestinoCP.Estado, SucursalDestinoCP.Pais)
+    '        Else
+    '            'TxtDestinoCP.Text = ""
+    '        End If
+    '    Else
+    '        'TxtDestinoCP.Text = ""
+    '    End If
 
-        UpEmitirTransitorio.Update()
-    End Sub
+    '    UpEmitirTransitorio.Update()
+    'End Sub
     Protected Sub LnkAgregarMercancia_Click(sender As Object, e As EventArgs)
         TxtCantidadMercancia.Text = ""
         'DdlPSMercancia.SelectedValue = ""