Merge branch 'master' of http://jperez@192.168.10.111:8383/SIG.git
This commit is contained in:
@@ -956,53 +956,6 @@
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
<Textbox Name="Textbox62">
|
||||
<CanGrow>true</CanGrow>
|
||||
<KeepTogether>true</KeepTogether>
|
||||
<Paragraphs>
|
||||
<Paragraph>
|
||||
<TextRuns>
|
||||
<TextRun>
|
||||
<Value>Condiciones de pago: </Value>
|
||||
<Style>
|
||||
<FontFamily>calibri</FontFamily>
|
||||
<FontSize>7pt</FontSize>
|
||||
</Style>
|
||||
</TextRun>
|
||||
<TextRun>
|
||||
<Value>=IIF(Parameters!CondicionPago.Value.ToString="","No Identificado",Parameters!CondicionPago.Value)</Value>
|
||||
<Style>
|
||||
<FontFamily>calibri</FontFamily>
|
||||
<FontSize>7pt</FontSize>
|
||||
</Style>
|
||||
</TextRun>
|
||||
<TextRun>
|
||||
<Value>; </Value>
|
||||
<Style>
|
||||
<FontFamily>calibri</FontFamily>
|
||||
<FontSize>7pt</FontSize>
|
||||
</Style>
|
||||
</TextRun>
|
||||
</TextRuns>
|
||||
<Style />
|
||||
</Paragraph>
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>Textbox62</rd:DefaultName>
|
||||
<Top>6.65199in</Top>
|
||||
<Left>1.5367in</Left>
|
||||
<Height>0.29498in</Height>
|
||||
<Width>6.38809in</Width>
|
||||
<ZIndex>24</ZIndex>
|
||||
<Style>
|
||||
<Border>
|
||||
<Style>None</Style>
|
||||
</Border>
|
||||
<PaddingLeft>2pt</PaddingLeft>
|
||||
<PaddingRight>2pt</PaddingRight>
|
||||
<PaddingTop>2pt</PaddingTop>
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
<Textbox Name="Textbox63">
|
||||
<CanGrow>true</CanGrow>
|
||||
<KeepTogether>true</KeepTogether>
|
||||
@@ -1024,7 +977,7 @@
|
||||
<Left>2.54119in</Left>
|
||||
<Height>0.25in</Height>
|
||||
<Width>3.69856in</Width>
|
||||
<ZIndex>25</ZIndex>
|
||||
<ZIndex>24</ZIndex>
|
||||
<Style>
|
||||
<Border>
|
||||
<Style>None</Style>
|
||||
@@ -1782,7 +1735,7 @@
|
||||
<Left>0.04398cm</Left>
|
||||
<Height>4.04843cm</Height>
|
||||
<Width>20.06179cm</Width>
|
||||
<ZIndex>26</ZIndex>
|
||||
<ZIndex>25</ZIndex>
|
||||
<Visibility>
|
||||
<Hidden>= (Parameters!AplicaPagare.Value="0" ORelse Parameters!AplicaPagare.Value="")</Hidden>
|
||||
</Visibility>
|
||||
@@ -2403,7 +2356,7 @@
|
||||
<Left>0.11468cm</Left>
|
||||
<Height>1.07241cm</Height>
|
||||
<Width>20.01064cm</Width>
|
||||
<ZIndex>27</ZIndex>
|
||||
<ZIndex>26</ZIndex>
|
||||
<Style>
|
||||
<Border>
|
||||
<Style>None</Style>
|
||||
@@ -2442,7 +2395,7 @@
|
||||
<Left>5.662in</Left>
|
||||
<Height>0.21567in</Height>
|
||||
<Width>2.26391in</Width>
|
||||
<ZIndex>28</ZIndex>
|
||||
<ZIndex>27</ZIndex>
|
||||
<Style>
|
||||
<Border>
|
||||
<Style>Solid</Style>
|
||||
@@ -2727,7 +2680,7 @@
|
||||
<Left>5.73412in</Left>
|
||||
<Height>0.34081in</Height>
|
||||
<Width>2.19818in</Width>
|
||||
<ZIndex>29</ZIndex>
|
||||
<ZIndex>28</ZIndex>
|
||||
<Style>
|
||||
<Border>
|
||||
<Style>None</Style>
|
||||
@@ -2841,7 +2794,7 @@
|
||||
<Left>14.56464cm</Left>
|
||||
<Height>0.6cm</Height>
|
||||
<Width>5.58343cm</Width>
|
||||
<ZIndex>30</ZIndex>
|
||||
<ZIndex>29</ZIndex>
|
||||
<Style>
|
||||
<Border>
|
||||
<Style>None</Style>
|
||||
@@ -2855,7 +2808,13 @@
|
||||
<Width>3.33888cm</Width>
|
||||
</TablixColumn>
|
||||
<TablixColumn>
|
||||
<Width>11.00525cm</Width>
|
||||
<Width>3.672cm</Width>
|
||||
</TablixColumn>
|
||||
<TablixColumn>
|
||||
<Width>3.83158cm</Width>
|
||||
</TablixColumn>
|
||||
<TablixColumn>
|
||||
<Width>3.48541cm</Width>
|
||||
</TablixColumn>
|
||||
</TablixColumns>
|
||||
<TablixRows>
|
||||
@@ -2907,10 +2866,58 @@
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
<ColSpan>2</ColSpan>
|
||||
<ColSpan>3</ColSpan>
|
||||
</CellContents>
|
||||
</TablixCell>
|
||||
<TablixCell />
|
||||
<TablixCell />
|
||||
<TablixCell>
|
||||
<CellContents>
|
||||
<Textbox Name="Textbox74">
|
||||
<CanGrow>true</CanGrow>
|
||||
<KeepTogether>true</KeepTogether>
|
||||
<Paragraphs>
|
||||
<Paragraph>
|
||||
<TextRuns>
|
||||
<TextRun>
|
||||
<Value />
|
||||
<Style>
|
||||
<FontFamily>calibri</FontFamily>
|
||||
<FontSize>9pt</FontSize>
|
||||
</Style>
|
||||
</TextRun>
|
||||
</TextRuns>
|
||||
<Style>
|
||||
<TextAlign>Left</TextAlign>
|
||||
</Style>
|
||||
</Paragraph>
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>Textbox74</rd:DefaultName>
|
||||
<Style>
|
||||
<Border>
|
||||
<Style>None</Style>
|
||||
</Border>
|
||||
<TopBorder>
|
||||
<Style>Solid</Style>
|
||||
</TopBorder>
|
||||
<BottomBorder>
|
||||
<Style>Solid</Style>
|
||||
</BottomBorder>
|
||||
<LeftBorder>
|
||||
<Style>Solid</Style>
|
||||
</LeftBorder>
|
||||
<RightBorder>
|
||||
<Style>Solid</Style>
|
||||
<Width>1pt</Width>
|
||||
</RightBorder>
|
||||
<PaddingLeft>2pt</PaddingLeft>
|
||||
<PaddingRight>2pt</PaddingRight>
|
||||
<PaddingTop>2pt</PaddingTop>
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
</CellContents>
|
||||
</TablixCell>
|
||||
</TablixCells>
|
||||
</TablixRow>
|
||||
<TablixRow>
|
||||
@@ -2965,7 +2972,7 @@
|
||||
</TablixCell>
|
||||
<TablixCell>
|
||||
<CellContents>
|
||||
<Textbox Name="Textbox127">
|
||||
<Textbox Name="Textbox67">
|
||||
<CanGrow>true</CanGrow>
|
||||
<KeepTogether>true</KeepTogether>
|
||||
<Paragraphs>
|
||||
@@ -2984,19 +2991,34 @@
|
||||
</Style>
|
||||
</Paragraph>
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>Textbox127</rd:DefaultName>
|
||||
<rd:DefaultName>Textbox67</rd:DefaultName>
|
||||
<Style>
|
||||
<Border>
|
||||
<Color>White</Color>
|
||||
<Style>None</Style>
|
||||
</Border>
|
||||
<BottomBorder>
|
||||
<Style>Solid</Style>
|
||||
</BottomBorder>
|
||||
<LeftBorder>
|
||||
<Style>Solid</Style>
|
||||
</LeftBorder>
|
||||
<RightBorder>
|
||||
<Style>Solid</Style>
|
||||
</RightBorder>
|
||||
<BackgroundColor>White</BackgroundColor>
|
||||
<VerticalAlign>Middle</VerticalAlign>
|
||||
<PaddingLeft>2pt</PaddingLeft>
|
||||
<PaddingRight>2pt</PaddingRight>
|
||||
<PaddingTop>2pt</PaddingTop>
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
<ColSpan>3</ColSpan>
|
||||
</CellContents>
|
||||
</TablixCell>
|
||||
<TablixCell />
|
||||
<TablixCell />
|
||||
</TablixCells>
|
||||
</TablixRow>
|
||||
<TablixRow>
|
||||
@@ -3028,7 +3050,7 @@
|
||||
<Style>
|
||||
<Border>
|
||||
<Color>White</Color>
|
||||
<Style>None</Style>
|
||||
<Style>Solid</Style>
|
||||
</Border>
|
||||
<TopBorder>
|
||||
<Style>Solid</Style>
|
||||
@@ -3058,7 +3080,7 @@
|
||||
</TablixCell>
|
||||
<TablixCell>
|
||||
<CellContents>
|
||||
<Textbox Name="Textbox131">
|
||||
<Textbox Name="Textbox70">
|
||||
<CanGrow>true</CanGrow>
|
||||
<KeepTogether>true</KeepTogether>
|
||||
<Paragraphs>
|
||||
@@ -3077,7 +3099,178 @@
|
||||
</Style>
|
||||
</Paragraph>
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>Textbox131</rd:DefaultName>
|
||||
<rd:DefaultName>Textbox70</rd:DefaultName>
|
||||
<Style>
|
||||
<Border>
|
||||
<Color>White</Color>
|
||||
<Style>Solid</Style>
|
||||
</Border>
|
||||
<BackgroundColor>White</BackgroundColor>
|
||||
<VerticalAlign>Middle</VerticalAlign>
|
||||
<PaddingLeft>2pt</PaddingLeft>
|
||||
<PaddingRight>2pt</PaddingRight>
|
||||
<PaddingTop>2pt</PaddingTop>
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
<ColSpan>3</ColSpan>
|
||||
</CellContents>
|
||||
</TablixCell>
|
||||
<TablixCell />
|
||||
<TablixCell />
|
||||
</TablixCells>
|
||||
</TablixRow>
|
||||
<TablixRow>
|
||||
<Height>0.6cm</Height>
|
||||
<TablixCells>
|
||||
<TablixCell>
|
||||
<CellContents>
|
||||
<Textbox Name="Textbox39">
|
||||
<CanGrow>true</CanGrow>
|
||||
<KeepTogether>true</KeepTogether>
|
||||
<Paragraphs>
|
||||
<Paragraph>
|
||||
<TextRuns>
|
||||
<TextRun>
|
||||
<Value>Orden de compra:</Value>
|
||||
<Style>
|
||||
<FontFamily>calibri</FontFamily>
|
||||
<FontSize>9pt</FontSize>
|
||||
<Color>White</Color>
|
||||
</Style>
|
||||
</TextRun>
|
||||
</TextRuns>
|
||||
<Style>
|
||||
<TextAlign>Center</TextAlign>
|
||||
</Style>
|
||||
</Paragraph>
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>Textbox39</rd:DefaultName>
|
||||
<Style>
|
||||
<Border>
|
||||
<Color>White</Color>
|
||||
<Style>Solid</Style>
|
||||
</Border>
|
||||
<TopBorder>
|
||||
<Style>Solid</Style>
|
||||
<Width>1pt</Width>
|
||||
</TopBorder>
|
||||
<BottomBorder>
|
||||
<Style>Solid</Style>
|
||||
<Width>1pt</Width>
|
||||
</BottomBorder>
|
||||
<LeftBorder>
|
||||
<Style>Solid</Style>
|
||||
<Width>1pt</Width>
|
||||
</LeftBorder>
|
||||
<RightBorder>
|
||||
<Style>Solid</Style>
|
||||
<Width>1pt</Width>
|
||||
</RightBorder>
|
||||
<BackgroundColor>#ff1037</BackgroundColor>
|
||||
<VerticalAlign>Middle</VerticalAlign>
|
||||
<PaddingLeft>2pt</PaddingLeft>
|
||||
<PaddingRight>2pt</PaddingRight>
|
||||
<PaddingTop>2pt</PaddingTop>
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
</CellContents>
|
||||
</TablixCell>
|
||||
<TablixCell>
|
||||
<CellContents>
|
||||
<Textbox Name="Textbox71">
|
||||
<CanGrow>true</CanGrow>
|
||||
<KeepTogether>true</KeepTogether>
|
||||
<Paragraphs>
|
||||
<Paragraph>
|
||||
<TextRuns>
|
||||
<TextRun>
|
||||
<Value>=IIF(Parameters!OrdenCompra.Value = "-1","",Parameters!OrdenCompra.Value)</Value>
|
||||
<Style>
|
||||
<FontFamily>calibri</FontFamily>
|
||||
<FontSize>8pt</FontSize>
|
||||
</Style>
|
||||
</TextRun>
|
||||
</TextRuns>
|
||||
<Style>
|
||||
<TextAlign>Left</TextAlign>
|
||||
</Style>
|
||||
</Paragraph>
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>Textbox71</rd:DefaultName>
|
||||
<Style>
|
||||
<Border>
|
||||
<Color>White</Color>
|
||||
<Style>Solid</Style>
|
||||
</Border>
|
||||
<VerticalAlign>Middle</VerticalAlign>
|
||||
<PaddingLeft>2pt</PaddingLeft>
|
||||
<PaddingRight>2pt</PaddingRight>
|
||||
<PaddingTop>2pt</PaddingTop>
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
</CellContents>
|
||||
</TablixCell>
|
||||
<TablixCell>
|
||||
<CellContents>
|
||||
<Textbox Name="Textbox40">
|
||||
<CanGrow>true</CanGrow>
|
||||
<KeepTogether>true</KeepTogether>
|
||||
<Paragraphs>
|
||||
<Paragraph>
|
||||
<TextRuns>
|
||||
<TextRun>
|
||||
<Value>fecha de vencimiento:</Value>
|
||||
<Style>
|
||||
<FontFamily>calibri</FontFamily>
|
||||
<FontSize>9pt</FontSize>
|
||||
<Color>White</Color>
|
||||
</Style>
|
||||
</TextRun>
|
||||
</TextRuns>
|
||||
<Style>
|
||||
<TextAlign>Center</TextAlign>
|
||||
</Style>
|
||||
</Paragraph>
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>Textbox40</rd:DefaultName>
|
||||
<Style>
|
||||
<Border>
|
||||
<Style>None</Style>
|
||||
</Border>
|
||||
<BackgroundColor>#ff1037</BackgroundColor>
|
||||
<PaddingLeft>2pt</PaddingLeft>
|
||||
<PaddingRight>2pt</PaddingRight>
|
||||
<PaddingTop>2pt</PaddingTop>
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
</CellContents>
|
||||
</TablixCell>
|
||||
<TablixCell>
|
||||
<CellContents>
|
||||
<Textbox Name="Textbox78">
|
||||
<CanGrow>true</CanGrow>
|
||||
<KeepTogether>true</KeepTogether>
|
||||
<Paragraphs>
|
||||
<Paragraph>
|
||||
<TextRuns>
|
||||
<TextRun>
|
||||
<Value>=Parameters!Vencimiento.Value</Value>
|
||||
<Style>
|
||||
<FontFamily>calibri</FontFamily>
|
||||
<FontSize>8pt</FontSize>
|
||||
</Style>
|
||||
</TextRun>
|
||||
</TextRuns>
|
||||
<Style>
|
||||
<TextAlign>Left</TextAlign>
|
||||
</Style>
|
||||
</Paragraph>
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>Textbox78</rd:DefaultName>
|
||||
<Style>
|
||||
<Border>
|
||||
<Style>None</Style>
|
||||
@@ -3122,7 +3315,7 @@
|
||||
<Style>
|
||||
<Border>
|
||||
<Color>White</Color>
|
||||
<Style>None</Style>
|
||||
<Style>Solid</Style>
|
||||
</Border>
|
||||
<TopBorder>
|
||||
<Style>Solid</Style>
|
||||
@@ -3152,7 +3345,7 @@
|
||||
</TablixCell>
|
||||
<TablixCell>
|
||||
<CellContents>
|
||||
<Textbox Name="Textbox133">
|
||||
<Textbox Name="Textbox72">
|
||||
<CanGrow>true</CanGrow>
|
||||
<KeepTogether>true</KeepTogether>
|
||||
<Paragraphs>
|
||||
@@ -3171,20 +3364,25 @@
|
||||
</Style>
|
||||
</Paragraph>
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>Textbox133</rd:DefaultName>
|
||||
<rd:DefaultName>Textbox72</rd:DefaultName>
|
||||
<Style>
|
||||
<Border>
|
||||
<Style>None</Style>
|
||||
<Color>White</Color>
|
||||
<Style>Solid</Style>
|
||||
</Border>
|
||||
<VerticalAlign>Top</VerticalAlign>
|
||||
<BackgroundColor>White</BackgroundColor>
|
||||
<VerticalAlign>Middle</VerticalAlign>
|
||||
<PaddingLeft>2pt</PaddingLeft>
|
||||
<PaddingRight>2pt</PaddingRight>
|
||||
<PaddingTop>2pt</PaddingTop>
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
<ColSpan>3</ColSpan>
|
||||
</CellContents>
|
||||
</TablixCell>
|
||||
<TablixCell />
|
||||
<TablixCell />
|
||||
</TablixCells>
|
||||
</TablixRow>
|
||||
<TablixRow>
|
||||
@@ -3216,7 +3414,7 @@
|
||||
<Style>
|
||||
<Border>
|
||||
<Color>White</Color>
|
||||
<Style>None</Style>
|
||||
<Style>Solid</Style>
|
||||
</Border>
|
||||
<TopBorder>
|
||||
<Style>Solid</Style>
|
||||
@@ -3246,7 +3444,7 @@
|
||||
</TablixCell>
|
||||
<TablixCell>
|
||||
<CellContents>
|
||||
<Textbox Name="Textbox135">
|
||||
<Textbox Name="Textbox73">
|
||||
<CanGrow>true</CanGrow>
|
||||
<KeepTogether>true</KeepTogether>
|
||||
<Paragraphs>
|
||||
@@ -3265,20 +3463,25 @@
|
||||
</Style>
|
||||
</Paragraph>
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>Textbox135</rd:DefaultName>
|
||||
<rd:DefaultName>Textbox73</rd:DefaultName>
|
||||
<Style>
|
||||
<Border>
|
||||
<Style>None</Style>
|
||||
<Color>White</Color>
|
||||
<Style>Solid</Style>
|
||||
</Border>
|
||||
<VerticalAlign>Top</VerticalAlign>
|
||||
<BackgroundColor>White</BackgroundColor>
|
||||
<VerticalAlign>Middle</VerticalAlign>
|
||||
<PaddingLeft>2pt</PaddingLeft>
|
||||
<PaddingRight>2pt</PaddingRight>
|
||||
<PaddingTop>2pt</PaddingTop>
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
<ColSpan>3</ColSpan>
|
||||
</CellContents>
|
||||
</TablixCell>
|
||||
<TablixCell />
|
||||
<TablixCell />
|
||||
</TablixCells>
|
||||
</TablixRow>
|
||||
<TablixRow>
|
||||
@@ -3333,10 +3536,12 @@
|
||||
<PaddingBottom>2pt</PaddingBottom>
|
||||
</Style>
|
||||
</Textbox>
|
||||
<ColSpan>2</ColSpan>
|
||||
<ColSpan>4</ColSpan>
|
||||
</CellContents>
|
||||
</TablixCell>
|
||||
<TablixCell />
|
||||
<TablixCell />
|
||||
<TablixCell />
|
||||
</TablixCells>
|
||||
</TablixRow>
|
||||
</TablixRows>
|
||||
@@ -3345,6 +3550,8 @@
|
||||
<TablixMembers>
|
||||
<TablixMember />
|
||||
<TablixMember />
|
||||
<TablixMember />
|
||||
<TablixMember />
|
||||
</TablixMembers>
|
||||
</TablixColumnHierarchy>
|
||||
<TablixRowHierarchy>
|
||||
@@ -3355,14 +3562,15 @@
|
||||
<TablixMember />
|
||||
<TablixMember />
|
||||
<TablixMember />
|
||||
<TablixMember />
|
||||
</TablixMembers>
|
||||
</TablixRowHierarchy>
|
||||
<DataSetName>DsOC</DataSetName>
|
||||
<Top>6.91306cm</Top>
|
||||
<Left>0.11468cm</Left>
|
||||
<Height>5.16188cm</Height>
|
||||
<Width>14.34413cm</Width>
|
||||
<ZIndex>31</ZIndex>
|
||||
<Height>5.76188cm</Height>
|
||||
<Width>14.32787cm</Width>
|
||||
<ZIndex>30</ZIndex>
|
||||
<Style>
|
||||
<Border>
|
||||
<Style>None</Style>
|
||||
@@ -3405,7 +3613,7 @@
|
||||
<Left>0.04404in</Left>
|
||||
<Height>0.36457in</Height>
|
||||
<Width>7.87931in</Width>
|
||||
<ZIndex>32</ZIndex>
|
||||
<ZIndex>31</ZIndex>
|
||||
<Style>
|
||||
<Border>
|
||||
<Style>None</Style>
|
||||
@@ -3907,7 +4115,7 @@
|
||||
<Left>0.05568cm</Left>
|
||||
<Height>2.97096cm</Height>
|
||||
<Width>20.1554cm</Width>
|
||||
<ZIndex>33</ZIndex>
|
||||
<ZIndex>32</ZIndex>
|
||||
<Visibility>
|
||||
<Hidden>=Microsoft.VisualBasic.Interaction.IIF(First(Fields!SerieFolio.Value, "DataSet4") <> "", False, True)</Hidden>
|
||||
</Visibility>
|
||||
@@ -3924,7 +4132,7 @@
|
||||
<Left>19.87567cm</Left>
|
||||
<Height>18.27471cm</Height>
|
||||
<Width>0.33541cm</Width>
|
||||
<ZIndex>34</ZIndex>
|
||||
<ZIndex>33</ZIndex>
|
||||
<Visibility>
|
||||
<Hidden>=IIf(Parameters!CveVenta.Value > 0, True,False)</Hidden>
|
||||
</Visibility>
|
||||
@@ -3942,7 +4150,7 @@
|
||||
<Left>0.14361cm</Left>
|
||||
<Height>1.22745cm</Height>
|
||||
<Width>4.7959cm</Width>
|
||||
<ZIndex>35</ZIndex>
|
||||
<ZIndex>34</ZIndex>
|
||||
<Style>
|
||||
<Border>
|
||||
<Style>None</Style>
|
||||
@@ -3988,7 +4196,7 @@
|
||||
<Left>0.04515in</Left>
|
||||
<Height>0.37389in</Height>
|
||||
<Width>4.70134in</Width>
|
||||
<ZIndex>36</ZIndex>
|
||||
<ZIndex>35</ZIndex>
|
||||
<Style>
|
||||
<Border>
|
||||
<Style>None</Style>
|
||||
@@ -4088,7 +4296,7 @@
|
||||
<Left>3.82301in</Left>
|
||||
<Height>0.62735in</Height>
|
||||
<Width>1.99164in</Width>
|
||||
<ZIndex>37</ZIndex>
|
||||
<ZIndex>36</ZIndex>
|
||||
<Style>
|
||||
<Border>
|
||||
<Style>None</Style>
|
||||
|
||||
@@ -340,7 +340,6 @@
|
||||
<FixedColumnHeaders>true</FixedColumnHeaders>
|
||||
<DataSetName>DataSet1</DataSetName>
|
||||
<Top>1.94937cm</Top>
|
||||
<Left>0cm</Left>
|
||||
<Height>1.09417cm</Height>
|
||||
<Width>19.82496cm</Width>
|
||||
<Style>
|
||||
@@ -384,7 +383,6 @@
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>Textbox2</rd:DefaultName>
|
||||
<Top>0.17639cm</Top>
|
||||
<Left>0cm</Left>
|
||||
<Height>0.52945cm</Height>
|
||||
<Width>477.16077pt</Width>
|
||||
<ZIndex>1</ZIndex>
|
||||
@@ -433,7 +431,6 @@
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>Textbox2</rd:DefaultName>
|
||||
<Top>1.34937cm</Top>
|
||||
<Left>0cm</Left>
|
||||
<Height>0.52945cm</Height>
|
||||
<Width>561.96737pt</Width>
|
||||
<ZIndex>2</ZIndex>
|
||||
@@ -785,7 +782,6 @@
|
||||
<FixedColumnHeaders>true</FixedColumnHeaders>
|
||||
<DataSetName>DataSet2</DataSetName>
|
||||
<Top>4.17187cm</Top>
|
||||
<Left>0cm</Left>
|
||||
<Height>1.09417cm</Height>
|
||||
<Width>19.82496cm</Width>
|
||||
<ZIndex>3</ZIndex>
|
||||
@@ -830,7 +826,6 @@
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>Textbox2</rd:DefaultName>
|
||||
<Top>3.57187cm</Top>
|
||||
<Left>0cm</Left>
|
||||
<Height>0.52945cm</Height>
|
||||
<Width>561.96737pt</Width>
|
||||
<ZIndex>4</ZIndex>
|
||||
@@ -1182,7 +1177,6 @@
|
||||
<FixedColumnHeaders>true</FixedColumnHeaders>
|
||||
<DataSetName>DataSet3</DataSetName>
|
||||
<Top>6.42083cm</Top>
|
||||
<Left>0cm</Left>
|
||||
<Height>1.12063cm</Height>
|
||||
<Width>19.82496cm</Width>
|
||||
<ZIndex>5</ZIndex>
|
||||
@@ -1227,7 +1221,6 @@
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>Textbox2</rd:DefaultName>
|
||||
<Top>5.82083cm</Top>
|
||||
<Left>0cm</Left>
|
||||
<Height>0.52945cm</Height>
|
||||
<Width>561.96737pt</Width>
|
||||
<ZIndex>6</ZIndex>
|
||||
@@ -1579,7 +1572,6 @@
|
||||
<FixedColumnHeaders>true</FixedColumnHeaders>
|
||||
<DataSetName>DataSet4</DataSetName>
|
||||
<Top>8.56395cm</Top>
|
||||
<Left>0cm</Left>
|
||||
<Height>1.12063cm</Height>
|
||||
<Width>19.82496cm</Width>
|
||||
<ZIndex>7</ZIndex>
|
||||
@@ -1624,7 +1616,6 @@
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>Textbox2</rd:DefaultName>
|
||||
<Top>7.96395cm</Top>
|
||||
<Left>0cm</Left>
|
||||
<Height>0.52945cm</Height>
|
||||
<Width>561.96737pt</Width>
|
||||
<ZIndex>8</ZIndex>
|
||||
@@ -1673,7 +1664,6 @@
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>Textbox2</rd:DefaultName>
|
||||
<Top>10.21319cm</Top>
|
||||
<Left>0cm</Left>
|
||||
<Height>0.42362cm</Height>
|
||||
<Width>477.16077pt</Width>
|
||||
<ZIndex>9</ZIndex>
|
||||
@@ -1722,7 +1712,6 @@
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>Textbox2</rd:DefaultName>
|
||||
<Top>10.63681cm</Top>
|
||||
<Left>0cm</Left>
|
||||
<Height>0.42362cm</Height>
|
||||
<Width>477.16077pt</Width>
|
||||
<ZIndex>10</ZIndex>
|
||||
@@ -1969,7 +1958,7 @@
|
||||
</Style>
|
||||
</TextRun>
|
||||
<TextRun>
|
||||
<Value>LCP Sara Eduwiges Ruíz Félix</Value>
|
||||
<Value>CP Sara Eduwiges Ruíz Félix</Value>
|
||||
<MarkupType>HTML</MarkupType>
|
||||
<Style />
|
||||
</TextRun>
|
||||
@@ -1981,7 +1970,6 @@
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>AgrupadoPor</rd:DefaultName>
|
||||
<Top>16.31254cm</Top>
|
||||
<Left>0cm</Left>
|
||||
<Height>0.6cm</Height>
|
||||
<Width>561.96737pt</Width>
|
||||
<ZIndex>15</ZIndex>
|
||||
@@ -2051,7 +2039,6 @@
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>AgrupadoPor</rd:DefaultName>
|
||||
<Top>15.6424cm</Top>
|
||||
<Left>0cm</Left>
|
||||
<Height>0.6cm</Height>
|
||||
<Width>561.96737pt</Width>
|
||||
<ZIndex>16</ZIndex>
|
||||
@@ -2108,7 +2095,6 @@
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>AgrupadoPor</rd:DefaultName>
|
||||
<Top>13.12403cm</Top>
|
||||
<Left>0cm</Left>
|
||||
<Height>0.6cm</Height>
|
||||
<Width>561.96737pt</Width>
|
||||
<ZIndex>17</ZIndex>
|
||||
@@ -2178,7 +2164,6 @@
|
||||
</Paragraphs>
|
||||
<rd:DefaultName>AgrupadoPor</rd:DefaultName>
|
||||
<Top>13.90042cm</Top>
|
||||
<Left>0cm</Left>
|
||||
<Height>1.25264cm</Height>
|
||||
<Width>561.96737pt</Width>
|
||||
<ZIndex>18</ZIndex>
|
||||
@@ -2230,6 +2215,9 @@
|
||||
<Height>0.42362cm</Height>
|
||||
<Width>477.16077pt</Width>
|
||||
<ZIndex>19</ZIndex>
|
||||
<Visibility>
|
||||
<Hidden>=IIF(Parameters!SaldoFinalContabilidadComplementaria.Value = 0,true,false)</Hidden>
|
||||
</Visibility>
|
||||
<Style>
|
||||
<Border>
|
||||
<Style>None</Style>
|
||||
@@ -2279,6 +2267,9 @@
|
||||
<Height>0.42362cm</Height>
|
||||
<Width>84.80665pt</Width>
|
||||
<ZIndex>20</ZIndex>
|
||||
<Visibility>
|
||||
<Hidden>=IIF(Parameters!SaldoFinalContabilidadComplementaria.Value = 0,true,false)</Hidden>
|
||||
</Visibility>
|
||||
<Style>
|
||||
<Border>
|
||||
<Style>None</Style>
|
||||
@@ -2351,7 +2342,6 @@
|
||||
<Source>External</Source>
|
||||
<Value>=Parameters!LogoPath.Value</Value>
|
||||
<Sizing>FitProportional</Sizing>
|
||||
<Left>0cm</Left>
|
||||
<Height>2.88508cm</Height>
|
||||
<Width>4.76205cm</Width>
|
||||
<ZIndex>1</ZIndex>
|
||||
|
||||
@@ -15374,6 +15374,7 @@ Partial Class Ventas
|
||||
If UsuarioActual.Empresa.Funcionalidad(575) = "1" Then
|
||||
CveConceptoSalidaAlmacen = 40
|
||||
CveAlmacenParaSalida = CveAlmacenSalida
|
||||
AplicaMovimientoDetalleEntrada = True
|
||||
''Le damos salida normal
|
||||
'If ConSalida Then
|
||||
' GeneroMovimientoAlmacen = GenerarMovimientoAlmacen(ObjInventario, MovDetalle, CveAlmacenSalida, 40, CveMoneda, CveVenta, AplicaMovimientoDetalleEntrada:=AplicaMovimientoDetalleEntrada, MovimientoPrePoliza:=True, ObjConta:=ObjConta) > 0
|
||||
@@ -15400,7 +15401,7 @@ Partial Class Ventas
|
||||
|
||||
'Le damos entrada al general por traspaso
|
||||
If Not OcurrioError Then
|
||||
GeneroMovimientoAlmacen = GenerarMovimientoAlmacen(ObjInventario, MovDetalle, CveAlmacenEntrada, 9, CveMoneda, CveRemision, CveMovimientoRelacionado:=CveMovimientoSalidaPorTraspaso) > 0
|
||||
GeneroMovimientoAlmacen = GenerarMovimientoAlmacen(ObjInventario, MovDetalle, CveAlmacenEntrada, 9, CveMoneda, CveRemision, CveMovimientoRelacionado:=CveMovimientoSalidaPorTraspaso, AplicaMovimientoDetalleEntrada:=AplicaMovimientoDetalleEntrada) > 0
|
||||
|
||||
If Not GeneroMovimientoAlmacen Then
|
||||
OcurrioError = True
|
||||
@@ -15418,7 +15419,7 @@ Partial Class Ventas
|
||||
End If
|
||||
|
||||
If Not OcurrioError Then
|
||||
GeneroMovimientoAlmacen = GenerarMovimientoAlmacen(ObjInventario, MovDetalle, CveAlmacenParaSalida, CveConceptoSalidaAlmacen, CveMoneda, ObjFactura.CveVenta, MovimientoPrePoliza:=True, ObjConta:=ObjConta) > 0
|
||||
GeneroMovimientoAlmacen = GenerarMovimientoAlmacen(ObjInventario, MovDetalle, CveAlmacenParaSalida, CveConceptoSalidaAlmacen, CveMoneda, ObjFactura.CveVenta, AplicaMovimientoDetalleEntrada:=AplicaMovimientoDetalleEntrada, MovimientoPrePoliza:=True, ObjConta:=ObjConta) > 0
|
||||
|
||||
If Not GeneroMovimientoAlmacen Then
|
||||
OcurrioError = True
|
||||
@@ -15543,6 +15544,12 @@ Partial Class Ventas
|
||||
Dim OcurrioError As Boolean = False
|
||||
Dim ContadorMovtosDetalles = 0
|
||||
|
||||
'If Not AplicaMovimientoDetalleEntrada Then
|
||||
' Dim rowa As DataRow = GlobalDTAlmacen(UsuarioActual.CveEmpresa).FiltroPrimero(String.Format("CveAlmacen={0}", CveAlmacen))
|
||||
' If Not IsNothing(rowa) AndAlso rowa("CveTipoAlmacen").ToString() = "10" Then
|
||||
' AplicaMovimientoDetalleEntrada = True
|
||||
' End If
|
||||
'End If
|
||||
'Creamos el movimiento
|
||||
Dim CveMovimientoInventario As Integer = ObjInventario.AddMovimiento(CveAlmacen, ConceptoEntrada, CveMoneda, Now, -1, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, -1, CveVenta, -1, -1,
|
||||
CveMovimientoRelacionado:=CveMovimientoRelacionado, Modulo:="Vta/E4")
|
||||
|
||||
Reference in New Issue
Block a user