Index: /Baza Reklam 2 - Faktury/OrderDetails.cs
===================================================================
--- /Baza Reklam 2 - Faktury/OrderDetails.cs (revision 30)
+++ /Baza Reklam 2 - Faktury/OrderDetails.cs (revision 31)
@@ -351,16 +351,24 @@
private void OrderDetails_Shown(object sender, EventArgs e)
{
+ // BindingSource sa resetowane, by ustawily sie wszytskie filtry
+ kurs = null;
+
+ obslugaZdarzen = true;
+
tYTULComboBox.SelectedIndex = -1;
+ rEKLAMABindingSource.ResetBindings(false);
+
mOD_TYPComboBox.SelectedIndex = -1;
+ rEKLAMABindingSource.ResetBindings(false);
+
ogl_dzialComboBox.SelectedIndex = -1;
+ rEKLAMABindingSource.ResetBindings(false);
+
ogl_rozdzialComboBox.SelectedIndex = -1;
- // walutyComboBox.SelectedIndex = 0;
- kurs = null;
- obslugaZdarzen = true;
-
rEKLAMABindingSource.ResetBindings(false);
+
blokowanieZrealizowanychEmisji();
zmiany();
-
+ init();
}
@@ -1007,4 +1015,5 @@
liczbaEmisjiLabel.Text = "-";
this.nettoBezBOTextBox.Clear();
+ this.kurs = null;
this.DialogResult = bylyZmiany ? DialogResult.OK : DialogResult.Cancel;
}
@@ -1053,8 +1062,6 @@
}
-
private void ukazeSieDataGridView_KeyUp(object sender, KeyEventArgs e)
{
-
if (e.Control && e.KeyCode == Keys.C)
{
@@ -1129,23 +1136,25 @@
{
DataRowView row = (DataRowView)lISTATYTULOWBindingSource.Current;
- oglrozdzialyBindingSource.Filter = "dzial=" + ogl_dzialComboBox.SelectedValue.ToString();
+ string filter = "dzial=" + ogl_dzialComboBox.SelectedValue.ToString();
switch (tYTULComboBox.SelectedValue.ToString())
{
case "AMT":
- oglrozdzialyBindingSource.Filter += " AND TYTU£='2'";
+ filter += " AND TYTU£='2'";
break;
case "GS":
- oglrozdzialyBindingSource.Filter += " AND TYTU£='1'";
+ filter += " AND TYTU£='1'";
break;
case "AGRO":
- oglrozdzialyBindingSource.Filter += " AND TYTU£='7'";
+ filter += " AND TYTU£='7'";
break;
case "adMot":
- oglrozdzialyBindingSource.Filter += " AND TYTU£='6'";
+ filter += " AND TYTU£='6'";
break;
default:
break;
}
+
+ oglrozdzialyBindingSource.Filter = filter;
DataRowView Rekrow = (DataRowView)rEKLAMABindingSource.Current;
@@ -1450,5 +1459,5 @@
kurs = PobierzKurs(walutyComboBox.SelectedItem.ToString());
- if (kurs != null)
+ if (kurs == null)
{
MessageBox.Show("Wyst¹pi³ b³¹d!");
@@ -1554,5 +1563,5 @@
}
- private void rEKLAMABindingSource_BindingComplete(object sender, BindingCompleteEventArgs e)
+ private void init()
{
if (rEKLAMABindingSource.Current != null)
@@ -1587,5 +1596,4 @@
{
walutyComboBox.SelectedItem = reklama.Brutto_Euro_Miano;
- kurs = PobierzKurs(walutyComboBox.SelectedItem.ToString());
}
else
Index: /Baza Reklam 2 - Faktury/OrderDetails.Designer.cs
===================================================================
--- /Baza Reklam 2 - Faktury/OrderDetails.Designer.cs (revision 17)
+++ /Baza Reklam 2 - Faktury/OrderDetails.Designer.cs (revision 31)
@@ -64,5 +64,5 @@
System.Windows.Forms.Label ogl_dzialLabel;
System.Windows.Forms.Label ogl_rozdzialLabel;
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OrderDetails));
this.rEKLAMADataSet = new Baza_Reklam.REKLAMADataSet();
@@ -559,5 +559,4 @@
this.rEKLAMABindingSource.DataMember = "REKLAMA";
this.rEKLAMABindingSource.DataSource = this.rEKLAMADataSet;
- this.rEKLAMABindingSource.BindingComplete += new System.Windows.Forms.BindingCompleteEventHandler(this.rEKLAMABindingSource_BindingComplete);
//
// rEKLAMATableAdapter
@@ -909,6 +908,6 @@
//
this.nrWydaniaDataGridViewTextBoxColumn.DataPropertyName = "Nr Wydania";
- dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- this.nrWydaniaDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1;
+ dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ this.nrWydaniaDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle2;
this.nrWydaniaDataGridViewTextBoxColumn.FillWeight = 149.2386F;
this.nrWydaniaDataGridViewTextBoxColumn.HeaderText = "Nr wyd.";
Index: /Baza Reklam 2 - Faktury/Raporty/fakturaKorekta.rdlc
===================================================================
--- /Baza Reklam 2 - Faktury/Raporty/fakturaKorekta.rdlc (revision 29)
+++ /Baza Reklam 2 - Faktury/Raporty/fakturaKorekta.rdlc (revision 31)
@@ -2284,5 +2284,5 @@
5.5873cm
0.50793cm
- ="RE/" & Fields!RejestrFaktur_Symbol.Value & "/" & Fields!NUMER.Value & "/" & Fields!NUMER_ROZ.Value & "/" & Fields!NUMER_ROK.Value
+ ="KREK/" & Fields!NUMER.Value & "/" & Fields!NUMER_ROK.Value
@@ -2416,5 +2416,5 @@
0.63492cm
="Faktura korygujÄ
-ca nr: " & " " & Fields!NUMER.Value & "/" & Fields!NUMER_ROZ.Value & "/" & Fields!NUMER_ROK.Value
+ca nr: " & " " & Fields!NUMER.Value & "/" & Fields!NUMER_ROK.Value
Index: /Baza Reklam 2 - Faktury/KalendarzEmisji.cs
===================================================================
--- /Baza Reklam 2 - Faktury/KalendarzEmisji.cs (revision 23)
+++ /Baza Reklam 2 - Faktury/KalendarzEmisji.cs (revision 31)
@@ -106,11 +106,5 @@
this.nRTableAdapter.FillByTytulData(this.sLOWNIKDataSet.NR, Tytul, startDay);
-
- foreach (DataGridViewRow row in nRDataGridView.Rows)
- {
- row.Cells[2].Value = System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.DayNames
- [(int)Convert.ToDateTime(row.Cells[1].Value).DayOfWeek];
- }
-
+
short nr = Emisje.MaxZafakturowanyNrWydania();
@@ -222,4 +216,7 @@
{
row.DefaultCellStyle.BackColor = Color.White;
+
+ row.Cells[2].Value = System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.DayNames
+ [(int)Convert.ToDateTime(row.Cells[1].Value).DayOfWeek];
DataRow[] table = emisje.Select("[Nr Wydania]=" + row.Cells[0].Value);
Index: /Baza Reklam 2 - Faktury/OrderDetails.resx
===================================================================
--- /Baza Reklam 2 - Faktury/OrderDetails.resx (revision 17)
+++ /Baza Reklam 2 - Faktury/OrderDetails.resx (revision 31)
@@ -232,12 +232,18 @@
445, 101
+
+ 445, 101
+
610, 62
+
+ 610, 62
+
439, 140
- 946, 44
+ 946, 23
@@ -262,4 +268,10 @@
211, 21
+
+ True
+
+
+ 211, 21
+
17, 218
@@ -268,4 +280,7 @@
17, 101
+
+ 17, 101
+
17, 140
@@ -274,6 +289,15 @@
732, 218
+
+ 732, 218
+
380, 257
+
+
+ 380, 257
+
+
+ 17, 257
@@ -348,4 +372,10 @@
True
+
+ True
+
+
+ 460, 218
+
460, 218