Index: /trunk/SQL/StoredProcedures/PROC_WYLICZ_I_ZAPISZ_PROWIZJE_DO_REKLAM.txt
===================================================================
--- /trunk/SQL/StoredProcedures/PROC_WYLICZ_I_ZAPISZ_PROWIZJE_DO_REKLAM.txt (revision 241)
+++ /trunk/SQL/StoredProcedures/PROC_WYLICZ_I_ZAPISZ_PROWIZJE_DO_REKLAM.txt (revision 242)
@@ -8,14 +8,33 @@
@ROK INTEGER = 2003,
@MS INTEGER = 2
-As
+AS
+
+DECLARE @Reklama TABLE
+(
+ID INT,
+Rok INT,
+Miesiac INT,
+Agent NVARCHAR(4000),
+DataWplaty DATETIME
+)
+
+INSERT INTO @Reklama(ID, Rok, Miesiac, Agent, DataWplaty)
+SELECT ReklamaID, YEAR(W.DataWplaty), MONTH(W.DataWplaty), [SYMBOL AKWIZYTORA], W.DataWplaty
+FROM dbo.REKLAMA R LEFT OUTER JOIN dbo.Wplaty W on R.[ID_Faktury] = W.idFaktury
+WHERE
+([ZATWIERDZONO DO DRUKU] = 1)
+AND ([FAKTURA WYSTAWIONO] = 1)
+AND (YEAR(W.DataWplaty) = @ROK)
+AND (MONTH(W.DataWplaty) = @MS)
+AND (zablokuj_prowizje = 0)
+AND W.rodzajPotwierdzenia <> 'ECARD'
+AND R.Typ NOT IN ('BARTER', 'BEZP£ATNA')
+
+
--WYZEROWANIE PROWIZJI (POZBYCIE SIÊ BZDUR)
UPDATE REKLAMA SET [PROCENT PROWIZJI]=0, PROWIZJA=0
WHERE
- ([ZATWIERDZONO DO DRUKU] = 1) AND
- (ZAP£ACONO = 1) AND
- ([FAKTURA WYSTAWIONO] = 1) AND
- ({ fn YEAR([DATA ZAP£ATY]) } = @ROK) AND
- ({ fn MONTH([DATA ZAP£ATY]) } = @MS) AND
- (zablokuj_prowizje = 0)
+ReklamaID IN (SELECT ID FROM @Reklama)
+
--NANIESIENIE PROWIZJI
UPDATE REKLAMA SET
@@ -25,20 +44,14 @@
(
--WYBRANIE REKORDÓW DO PROWIZJI
-SELECT R.ReklamaID, R.ROK, R.MS, R.[SYMBOL AKWIZYTORA] AS AGENT, dbo.[PLAN].PR_PROWIZJI
- FROM
- (SELECT ReklamaID, { fn YEAR([DATA ZAP£ATY]) } AS ROK, { fn MONTH([DATA ZAP£ATY]) } AS MS, [SYMBOL AKWIZYTORA]
- FROM dbo.REKLAMA
- WHERE
- ([ZATWIERDZONO DO DRUKU] = 1) AND
- (ZAP£ACONO = 1) AND
- ([FAKTURA WYSTAWIONO] = 1) AND
- ({ fn YEAR([DATA ZAP£ATY]) } = @ROK) AND
- ({ fn MONTH([DATA ZAP£ATY]) } = @MS) AND
- (zablokuj_prowizje = 0)) R
- INNER JOIN dbo.[PLAN] ON R.[SYMBOL AKWIZYTORA] = dbo.[PLAN].SYMBOL AND R.ROK = dbo.[PLAN].ROK AND R.MS = dbo.[PLAN].MS
+SELECT R.ID, R.ROK, R.Miesiac, R.Agent, dbo.[PLAN].PR_PROWIZJI
+FROM
+(
+ SELECT ID, Rok, Miesiac, Agent FROM @Reklama
+)
+R INNER JOIN dbo.[PLAN] ON R.Agent = dbo.[PLAN].SYMBOL COLLATE DATABASE_DEFAULT
+AND R.Rok = dbo.[PLAN].ROK AND R.Miesiac = dbo.[PLAN].MS
) RR
--Koñcówka instrukcji Update
-inner join REKLAMA on
- REKLAMA.ReklamaID = rr.ReklamaID
+INNER JOIN REKLAMA ON REKLAMA.ReklamaID = rr.ID
return
GO
Index: /trunk/RaportySQL/RozliczenieWplywowWgDatyWplaty2009.rdl
===================================================================
--- /trunk/RaportySQL/RozliczenieWplywowWgDatyWplaty2009.rdl (revision 231)
+++ /trunk/RaportySQL/RozliczenieWplywowWgDatyWplaty2009.rdl (revision 242)
@@ -242,5 +242,5 @@
kwotaProwizji
- System.Decimal
+ System.Double
@@ -270,5 +270,6 @@
AGENCJE.Symbol AS Agencja, Wplaty.dataWplaty, DATEDIFF(day, FAKTURY.TERMIN_ZAPLATY, Wplaty.dataWplaty) AS roznica_nowa,
FAKTURY.suma_zaplat, FAKTURY.zaplata_data, DATEDIFF(day, FAKTURY.TERMIN_ZAPLATY, FAKTURY.zaplata_data) AS roznica_stara,
- P.procentProwizji, P.kwotaProwizji
+ CASE WHEN FAKTURY.idZamowienia IS NULL THEN R.[Procent Prowizji] ELSE P.procentProwizji END AS procentProwizji,
+ CASE WHEN FAKTURY.idZamowienia IS NULL THEN R.[Prowizja] ELSE P.kwotaProwizji END AS kwotaProwizji
FROM FAKTURY LEFT OUTER JOIN
FAKTURA_DETAILS ON FAKTURY.ID_FAKTURY = FAKTURA_DETAILS.ID_FAKTURY LEFT OUTER JOIN
@@ -278,5 +279,6 @@
KLIENCI ON FAKTURY.ID_NABYWCY = KLIENCI.CustomerID LEFT OUTER JOIN
PROWIZJE AS P ON P.idFaktury = FAKTURY.ID_FAKTURY LEFT OUTER JOIN
- VIEW_KOREKTY AS Korekta ON Korekta.idFakturyKorekta = FAKTURY.ID_FAKTURY
+ VIEW_KOREKTY AS Korekta ON Korekta.idFakturyKorekta = FAKTURY.ID_FAKTURY LEFT OUTER JOIN
+ REKLAMA AS R ON R.ID_FAKTURY = FAKTURY.ID_FAKTURY
WHERE (FAKTURY.KOREKTA <> 1) AND (YEAR(Wplaty.dataWplaty) = @rok) AND (MONTH(Wplaty.dataWplaty) = @miesiac)
GROUP BY FAKTURY.DATA_WYSTAWIENIA, FAKTURY.ID_FAKTURY, AGENCI.Symbol, CONVERT(VARCHAR, FAKTURY.NUMER) + '/' + CONVERT(VARCHAR,
@@ -284,5 +286,6 @@
Wplaty.rodzajPotwierdzenia, FAKTURY.DATA_WYSTAWIENIA, FAKTURY.TERMIN_ZAPLATY, FAKTURY.SPOSOB_ZAPLATY, AGENCJE.Symbol,
Wplaty.dataWplaty, DATEDIFF(day, FAKTURY.TERMIN_ZAPLATY, Wplaty.dataWplaty), FAKTURY.suma_zaplat, FAKTURY.zaplata_data, DATEDIFF(day,
- FAKTURY.TERMIN_ZAPLATY, FAKTURY.zaplata_data), P.procentProwizji, P.kwotaProwizji, Korekta.netto, Korekta.brutto, Korekta.vat
+ FAKTURY.TERMIN_ZAPLATY, FAKTURY.zaplata_data), P.procentProwizji, P.kwotaProwizji, Korekta.netto, Korekta.brutto, Korekta.vat,
+ FAKTURY.idZamowienia, R.[PROCENT PROWIZJI], R.PROWIZJA
@@ -683,5 +686,5 @@
3
true
- =Fields!kwotaProwizji.Value
+ =Fields!procentProwizji.Value*Fields!NETTO.Value
Index: /trunk/BazaReklam/ProvisionForm.resx
===================================================================
--- /trunk/BazaReklam/ProvisionForm.resx (revision 114)
+++ /trunk/BazaReklam/ProvisionForm.resx (revision 242)
@@ -218,29 +218,29 @@
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
- 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
+ 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
@@ -283,22 +283,22 @@
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
- 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
+ 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
AElFTkSuQmCC
@@ -369,35 +369,35 @@
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
- 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
+ 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
gg==
@@ -406,29 +406,29 @@
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
- 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
+ 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
Index: /trunk/BazaReklam/ProvisionForm.Designer.cs
===================================================================
--- /trunk/BazaReklam/ProvisionForm.Designer.cs (revision 114)
+++ /trunk/BazaReklam/ProvisionForm.Designer.cs (revision 242)
@@ -93,4 +93,5 @@
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.pobierzDaneToolStripButton = new System.Windows.Forms.ToolStripButton();
+ this.stareProwizjeToolStripButton = new System.Windows.Forms.ToolStripButton();
this.zapiszToolStripButton = new System.Windows.Forms.ToolStripButton();
this.przeliczStripButton = new System.Windows.Forms.ToolStripButton();
@@ -109,5 +110,4 @@
this.agencjeTableAdapter1 = new Baza_Reklam.SLOWNIKDataSetTableAdapters.AGENCJETableAdapter();
this.ukrytyLabel = new System.Windows.Forms.Label();
- this.stareProwizjeToolStripButton = new System.Windows.Forms.ToolStripButton();
((System.ComponentModel.ISupportInitialize)(this.aGENCIBindingSource)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.sLOWNIKDataSet)).BeginInit();
@@ -633,4 +633,14 @@
this.pobierzDaneToolStripButton.Click += new System.EventHandler(this.pobierzDaneToolStripButton_Click);
//
+ // stareProwizjeToolStripButton
+ //
+ this.stareProwizjeToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.stareProwizjeToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("stareProwizjeToolStripButton.Image")));
+ this.stareProwizjeToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.stareProwizjeToolStripButton.Name = "stareProwizjeToolStripButton";
+ this.stareProwizjeToolStripButton.Size = new System.Drawing.Size(23, 28);
+ this.stareProwizjeToolStripButton.Text = "SP";
+ this.stareProwizjeToolStripButton.Click += new System.EventHandler(this.stareProwizjeToolStripButton_Click);
+ //
// zapiszToolStripButton
//
@@ -758,14 +768,4 @@
this.ukrytyLabel.Text = "ukrytyLabel";
this.ukrytyLabel.Visible = false;
- //
- // stareProwizjeToolStripButton
- //
- this.stareProwizjeToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
- this.stareProwizjeToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("stareProwizjeToolStripButton.Image")));
- this.stareProwizjeToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.stareProwizjeToolStripButton.Name = "stareProwizjeToolStripButton";
- this.stareProwizjeToolStripButton.Size = new System.Drawing.Size(23, 28);
- this.stareProwizjeToolStripButton.Text = "SP";
- this.stareProwizjeToolStripButton.Click += new System.EventHandler(this.stareProwizjeToolStripButton_Click);
//
// ProvisionForm
Index: /trunk/BazaReklam/ProvisionForm.cs
===================================================================
--- /trunk/BazaReklam/ProvisionForm.cs (revision 114)
+++ /trunk/BazaReklam/ProvisionForm.cs (revision 242)
@@ -4,6 +4,4 @@
using System.Data;
using System.Data.SqlClient;
-using System.Drawing;
-using System.Text;
using System.Windows.Forms;
@@ -13,8 +11,7 @@
{
- private short rok = 0;
- private short miesiac = 0;
- private int agencja = 0;
-
+ private short rok;
+ private short miesiac;
+ private int agencja;
@@ -25,4 +22,5 @@
{
private int label;
+ private Single value;
public int Label
@@ -31,9 +29,8 @@
set { label = value; }
}
- private Single value;
public Single Value
{
- get { return this.value; }
+ get { return value; }
set { this.value = value; }
}
@@ -46,8 +43,5 @@
}
- ///
- /// List do databindings
- ///
- List oceny = new List();
+
@@ -63,9 +57,9 @@
}
- public ProvisionForm(MDIBazaReklam parent)
+ public ProvisionForm(Form parent)
{
InitializeComponent();
- this.MdiParent = parent;
+ MdiParent = parent;
pLANTableAdapter.Connection.ConnectionString = ConnString.getConnString().Value;
@@ -74,4 +68,5 @@
//bindowanie ocen z comboBoxColumn
+ List oceny = new List();
oceny.Add(new Ocena(0, 0));
oceny.Add(new Ocena(1, 50));
@@ -104,4 +99,5 @@
}
+/*
private void treeView1_AfterExpand(object sender, TreeViewEventArgs e)
{
@@ -146,4 +142,5 @@
}
}
+*/
///
@@ -152,5 +149,5 @@
private void pobierzDaneToolStripButton_Click(object sender, EventArgs e)
{
- this.Cursor = Cursors.WaitCursor;
+ Cursor = Cursors.WaitCursor;
SqlCommand command = new SqlCommand();
@@ -190,7 +187,7 @@
command.Connection.Close();
- this.rEKLAMADataSet.PLAN.Clear();
- this.pLANTableAdapter.FillByAgencja(this.rEKLAMADataSet.PLAN, rok, miesiac, agencja);
- this.Cursor = Cursors.Default;
+ rEKLAMADataSet.PLAN.Clear();
+ pLANTableAdapter.FillByAgencja(rEKLAMADataSet.PLAN, rok, miesiac, agencja);
+ Cursor = Cursors.Default;
}
@@ -200,5 +197,5 @@
private void zapiszToolStripButton_Click(object sender, EventArgs e)
{
- this.Cursor = Cursors.WaitCursor;
+ Cursor = Cursors.WaitCursor;
SqlCommand command = new SqlCommand();
@@ -240,14 +237,14 @@
command.Connection.Close();
- this.rEKLAMADataSet.PLAN.Clear();
-
- this.pLANTableAdapter.FillByAgencja(this.rEKLAMADataSet.PLAN, rok, miesiac, agencja);
-
- this.Cursor = Cursors.Default;
+ rEKLAMADataSet.PLAN.Clear();
+
+ pLANTableAdapter.FillByAgencja(rEKLAMADataSet.PLAN, rok, miesiac, agencja);
+
+ Cursor = Cursors.Default;
}
private void naniesNaReklamyToolStripButton_Click(object sender, EventArgs e)
{
- this.Cursor = Cursors.WaitCursor;
+ Cursor = Cursors.WaitCursor;
SqlCommand command = new SqlCommand();
@@ -259,6 +256,6 @@
// command.CommandText = "PROC_WYLICZ_I_ZAPISZ_PROWIZJE_DO_REKLAM";
command.CommandText = "PROC_WYLICZ_I_ZAPISZ_PROWIZJE";
- command.Parameters.AddWithValue("@rok", this.rok);
- command.Parameters.AddWithValue("@ms", this.miesiac);
+ command.Parameters.AddWithValue("@rok", rok);
+ command.Parameters.AddWithValue("@ms", miesiac);
command.Parameters.AddWithValue("@idAgencji", agencja);
@@ -291,5 +288,5 @@
command.Connection.Close();
- this.Cursor = Cursors.Default;
+ Cursor = Cursors.Default;
MessageBox.Show("Prowizja naniesiona na zlecenia");
@@ -407,5 +404,5 @@
pLANBindingSource.RemoveCurrent();
pLANBindingSource.EndEdit();
- pLANTableAdapter.Update(this.rEKLAMADataSet.PLAN);
+ pLANTableAdapter.Update(rEKLAMADataSet.PLAN);
}
}
@@ -414,16 +411,17 @@
private void zapiszDaneToolStripButton_Click(object sender, EventArgs e)
{
- this.Cursor = Cursors.WaitCursor;
+ Cursor = Cursors.WaitCursor;
if (Validate())
{
pLANBindingSource.EndEdit();
- pLANTableAdapter.Update(this.rEKLAMADataSet.PLAN);
- }
- this.Cursor = Cursors.Default;
+ pLANTableAdapter.Update(rEKLAMADataSet.PLAN);
+ }
+ Cursor = Cursors.Default;
MessageBox.Show("Zmiany zapisane");
}
+/*
private void ukryjKolumnyToolStripButton_Click(object sender, EventArgs e)
{
@@ -432,4 +430,5 @@
mSDataGridViewTextBoxColumn.Visible = mSDataGridViewTextBoxColumn.Visible ? false : true;
}
+*/
private void prowizjeDataGridView_Leave(object sender, EventArgs e)
@@ -447,5 +446,5 @@
{
pLANBindingSource.EndEdit();
- pLANTableAdapter.Update(this.rEKLAMADataSet.PLAN);
+ pLANTableAdapter.Update(rEKLAMADataSet.PLAN);
}
}
@@ -502,5 +501,5 @@
{
pLANBindingSource.EndEdit();
- pLANTableAdapter.Update(this.rEKLAMADataSet.PLAN);
+ pLANTableAdapter.Update(rEKLAMADataSet.PLAN);
}
}
@@ -521,5 +520,5 @@
{
MessageBox.Show("Podaj prawid³owy rok.");
- this.Cursor = Cursors.Default;
+ Cursor = Cursors.Default;
return;
}
@@ -528,5 +527,5 @@
{
MessageBox.Show("Podaj prawid³owy rok.");
- this.Cursor = Cursors.Default;
+ Cursor = Cursors.Default;
return;
}
@@ -538,5 +537,5 @@
{
MessageBox.Show("Podaj prawid³owy miesi¹c.");
- this.Cursor = Cursors.Default;
+ Cursor = Cursors.Default;
return;
}
@@ -545,5 +544,5 @@
{
MessageBox.Show("Podaj prawid³owy miesi¹c.");
- this.Cursor = Cursors.Default;
+ Cursor = Cursors.Default;
return;
}
@@ -555,15 +554,15 @@
}
- this.rok = Convert.ToInt16(rokToolStripTextBox.Text);
- this.miesiac = Convert.ToInt16(msToolStripTextBox.Text);
- this.agencja = Convert.ToInt32(((ComboBox)agencjaToolStripComboBox.Control).SelectedValue);
+ rok = Convert.ToInt16(rokToolStripTextBox.Text);
+ miesiac = Convert.ToInt16(msToolStripTextBox.Text);
+ agencja = Convert.ToInt32(((ComboBox)agencjaToolStripComboBox.Control).SelectedValue);
uprawnienia();
- this.sLOWNIKDataSet.AGENCI.Clear();
- this.rEKLAMADataSet.PLAN.Clear();
-
- this.aGENCITableAdapter.FillByIdAgencji(this.sLOWNIKDataSet.AGENCI, this.agencja);
- this.pLANTableAdapter.FillByAgencja(this.rEKLAMADataSet.PLAN, this.rok, this.miesiac, this.agencja);
+ sLOWNIKDataSet.AGENCI.Clear();
+ rEKLAMADataSet.PLAN.Clear();
+
+ aGENCITableAdapter.FillByIdAgencji(sLOWNIKDataSet.AGENCI, agencja);
+ pLANTableAdapter.FillByAgencja(rEKLAMADataSet.PLAN, rok, miesiac, agencja);
}
@@ -661,7 +660,7 @@
{
- if (!((this.rok > DateTime.Today.Year) |
- ((this.rok == DateTime.Today.Year) & (this.miesiac >= DateTime.Today.Month - 1)) |
- ((this.rok == DateTime.Today.Year - 1) & (this.miesiac == 12) & (DateTime.Today.Month == 1))))
+ if (!((rok > DateTime.Today.Year) |
+ ((rok == DateTime.Today.Year) & (miesiac >= DateTime.Today.Month - 1)) |
+ ((rok == DateTime.Today.Year - 1) & (miesiac == 12) & (DateTime.Today.Month == 1))))
{
OCENAComboCoxColumn.Visible = false;
@@ -711,5 +710,5 @@
{
pLANBindingSource.EndEdit();
- pLANTableAdapter.Update(this.rEKLAMADataSet.PLAN);
+ pLANTableAdapter.Update(rEKLAMADataSet.PLAN);
}
}
@@ -733,5 +732,5 @@
private void stareProwizjeToolStripButton_Click(object sender, EventArgs e)
{
- this.Cursor = Cursors.WaitCursor;
+ Cursor = Cursors.WaitCursor;
SqlCommand command = new SqlCommand();
@@ -742,6 +741,6 @@
command.CommandText = "PROC_WYLICZ_I_ZAPISZ_PROWIZJE_DO_REKLAM";
- command.Parameters.AddWithValue("@rok", this.rok);
- command.Parameters.AddWithValue("@ms", this.miesiac);
+ command.Parameters.AddWithValue("@rok", rok);
+ command.Parameters.AddWithValue("@ms", miesiac);
command.Connection.Open();
@@ -773,5 +772,5 @@
command.Connection.Close();
- this.Cursor = Cursors.Default;
+ Cursor = Cursors.Default;
MessageBox.Show("Prowizja naniesiona na zlecenia");