Index: Baza Reklam 2 - Faktury/OrderDetails.cs =================================================================== --- Baza Reklam 2 - Faktury/OrderDetails.cs (revision 37) +++ Baza Reklam 2 - Faktury/OrderDetails.cs (revision 41) @@ -1041,6 +1041,4 @@ ZDpanel.BackColor = zatwiedzonoDoDruku ? Color.LightGreen : Color.Red; - - //UPRAWnienia kier_notatkaTextBox.ReadOnly = !User.getUser().St_kierownik; @@ -1410,5 +1408,4 @@ } } - } } Index: Baza Reklam 2 - Faktury/ZamowieniaForm.cs =================================================================== --- Baza Reklam 2 - Faktury/ZamowieniaForm.cs (revision 39) +++ Baza Reklam 2 - Faktury/ZamowieniaForm.cs (revision 41) @@ -1099,4 +1099,5 @@ { ReklamyBezZamowienia = rEKLAMATableAdapter.GetDataByCustomerIdandIdZamowienia(klient.CustomerID); + rEKLAMABindingSource1.DataSource = ReklamyBezZamowienia; rEKLAMABindingSource1.Position = rEKLAMABindingSource1.Find("reklamaId", id); } Index: Baza Reklam 2 - Faktury/ZestawienieZamowienForm.cs =================================================================== --- Baza Reklam 2 - Faktury/ZestawienieZamowienForm.cs (revision 19) +++ Baza Reklam 2 - Faktury/ZestawienieZamowienForm.cs (revision 41) @@ -298,5 +298,5 @@ } - command.CommandText += " AND NR=@nr"; + command.CommandText += " AND nrZamowienia=@nr"; command.Parameters.AddWithValue("@nr", nrZamToolStripTextBox.Text.Trim()); } Index: Baza Reklam 2 - Faktury/KorektyForm.resx =================================================================== --- Baza Reklam 2 - Faktury/KorektyForm.resx (revision 33) +++ Baza Reklam 2 - Faktury/KorektyForm.resx (revision 41) @@ -193,47 +193,47 @@ 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 - mVwAAAAASUVORK5CYII= + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAACaFJREFUWEellwlU + lOUax19AwwVScYmkEFxCQQS83YtLat5cTlGWp4yyyDQ0DVEyFB3QGVlkhxEQEXBDDAoIIwoRZRnWYRcY + UGAYFlklBEREQP73eYG695yr515ozvmf75vvm3l//+d5t+dVYs/5RO5nG7oG2B5lFWasqsImqaiyjsGn + rHzSJDZFVZnNGVJmjYNK7NrHjiyOmuglPX1eW2N+Hn+EiYVWbCjqKEP8SYbrLgw3XBkSTzHc8mBIFzNk + nGYQCtnQLU92hQDapIljBj3rD7GHmeVFK4ZrxxmiBQw/2DHE2JMRR4ab7v+GSwMZ8s8xZJERBwvmQm3N + I034SyawjakE72V139synLFkCLOehHRPfWR66ePmKS3EClSHTUlGM5Dlz5AdwHBVxOpUVNj7BJ/+lwxc + sWYrQvYy+O9kKPRfDRQ4A7kiQErKEQJ5jig+a4JrJ0a6gHdFpt9IVxgtYI4EX0hSHreJiANs/5mvKN0n + tIFCgmedALJJHJ5D1ywHuooQeYTGgidDms+I+NjYtpqFEHg1afK4DYRZMVcfC4a+G99Q5CcpYjJR6AYU + uVM2ThGcnuU6ItfPEHFChmQykerN8JsTg8UGFk7g90jTxm3g8n4mDvuaEdCVQE509QBKxUCZP3Dbe8SE + 1AmNUR/iyrcjg5TPkl9EDOZrhmfDxySNcRsIsmTuWQINippA3ACHlgcCd0NGTBSQsXwXQHYR5b/aoTrF + FSXXBSi8tgcHd66PIPAnf8nAoXUvLC4T6g8ij+BcxZ4EDgAqyESJL4FD0a9IRllGHKIun4PY8xS8nIUI + 8hXBy9WlYNq0aXvIwEskpXFlYd48NqnXV78T2cdp8NHA4ynnJoq8gMoIPKzLQcTlC7gQFY3EsjvIaOvG + RYVi4HJW0WO3c+c77GwONpq9/fYXo+NgXLNBufeCSSmSD9CItx8xIaWBVxqIRwQPDQ2GVFGP1oFetPT1 + oqqzE9cb2nrPSO5UeUhqqtwSiu8dFxztXmlqupNMzBzPlFRqPW8SjFhzIO0wILEDMu0xWJOISIpcIleg + beAxegefoP1xD6ofdCBdoXgYJJFV+SQVVzmlVMqdE4ua9++2kKuqqr5FBtTH3BWZYoN3/YWrhpBiA9yi + TOT7oirnZwRFRKG27xG6+vvQP9CPh2REKDo5JKlrfhCQVlLpkySrckksr3ZJq68VBgb2GC5d6klwvfEs + z1ObA43SEbUVSKL1oPQSfo0MwY95MlR390Le/RD3e3tQ29mF7Mb7vVelFVXcgFdyefXJhDK52y15vefN + sjazzRsTCP426cWxZkFZsFVrRY94cSuittAMiEToaXfE13Qiv7UDsvudKG77nZZf4VDM7YauiOKmdl9K + /6lEWbX9b2Vyr9TqBufE+mbLXRbFBN5N0hyTgceuejryb3Rjy/bpDvZ7L6GB6I4gLydE3W3FLUULkmua + kF7TjKSKBvxS2oCLhYqBC/l13ScTSuV2v5TV+EmqmoSpDS27PjcvIvB3JL5V/3+fXrdlb7Qd0m1/IDJA + l1AP+babUFRchCvn/BCaWYGI8nZEyu7jx/xaRBfX4YeiOlyl+5CMGghTa/qEqfWdF6QNLV4SefvaVabX + x2SAR87hfb5GGPA3xkPnJSiwWYOY1DzExsXDOywWwSUPcTG7FpfzFAjLrcXFnFoEZyoQIKmB6w05fVcM + CLPqur2uXH2kqakZOqYu6D+md63TeSkQ/DcMnjFBn7ch6i3nIuXQFpTER8LT8TgCk+8iMLsRZzMUCCQF + SBTwSiV4Ug0uSxsRmtuK4LjGfnN9/cEpU6YEGBoaWpKJWf9zZXzisMAgZd3Cp0/Exnhy2gh9vsZ45LEM + XU76aDqggwa7VSgN94Sr6Dj8UqrgndkKsaQBfql1OJfZgPDCFnimtSBE2grrPV8hNCSYD9Jej6DzT5dr + zVw/ujI+f3nustJ1bPruNfS4G+KRmyF6XJei08kAHcIlaBPoofnwa2jxNUcxmXA+ehAB4TEISlfAJ6MV + PultuCRtQ1hMArZvNYOfWIz23ztwp64NP9qYIceESZdMYGvJxJTnZqJl1zxJ61E9PHA0wIOT+ugQ6aOd + w48tRpPta6g/sBA1e+ejVvAW6r53Q7T7UXgesYaXvS08BIcg2rcT549YIcdbBDfRCZTcrcev4cfQ9/N7 + gOcq1KxXy/+7Olv5TBPbGFO5u332722CxWg9pkcRLx4Gt9jpoYkibzi4EAqr+ai21EHFF9oos1iASvut + UPjaQBHoAPlpAWSifZB+uRkyv1NwFwfg7KHP0BP1Dm3j1kCyBeC9BnXr1YpWq7E3/stE+QfqM4UfaA3x + SJu+W4RGW9KhRbhnswj11gTfR/DduqjcMQ+y7a/i9kdaKNjyMnI2v4SM9bORumomkl6fjgTDF5G4Uhe5 + 3i6oN1uCQYExkLid6on9QMoXgM9a3NuoXrJebbg7pv7ZHYX/1NDPM9NEnfUCyHfPp+tC1FotGAbLv9ZF + 1Vc6uDMKL9mmhcIP5iL3HU1kbZgDydpZSF0xA9eNXsRvBur4eeFUxBlroej4EbR/YtQNeyMg4dMRE6k7 + AN/VaDCbXb7lo08PkoEZJBVWvG7G0pR1s57KtmsPR6PYR9DdOqjcpYO7X85DhQWl/dNX8Qecm83eOAfp + b85CyioNJK+cgbOM6kLKADcQ8+pkhGtMhuTw4fpoI6WbOLYMiP+Yipm9tLl9hp9++gmHHRwqCM53y+H6 + ceL3Ruo2iSaTu5P/oYHKnTqo4vAdOij/XBsy81dQTGkvev9l5L2rCenmOch8aw7S1lD0KzWQskID5ycq + I26RGsKnT4RQWWnImbFCExWVSzTvvG+aTIjHEX0gxgz3mmqRnVeE5cuX8/LtG9JcboDPz1nLJimbi7RV + I6L1XrifZDIdaW/MhHSTJgreexkFlPaC9+cin6LnqU+lyBOWTkO0NkU7g6CMDfkzpqBS6JoWY+epvQCS + LWkT1eimWcYsNtzfA5LsAri6uUFPTy+M3u0gzf5jk1ChG17BvE4HvJ0mk5U8zNUmXLFVm3DDVV35tu9U + lVrxRJVWT2XW5sZYvQNjsv2MpX/IWOzrjF2iMvjcKFREV14NrSHpkvhWPNnA1PTNowJRs7GxSbiuru4l + JSUlXitsGn3/h4fhTKiS5pCWkN4k8SqXWExAciK5jorfkw/27SiQnwdMSfxkxP/PDyf/WRPy7+SV7SXx + yHn/8/Q/8yzJjfAXfOXiWeE/5AfP+aMADuH3OqRXRoF8MHHzHPqsJZc/41OPt8XTzku1Yfi/AMb6B4xS + hfuwAAAAAElFTkSuQmCC @@ -242,28 +242,28 @@ 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 - xvqvthh5/jdSgLrund1b1QAAAABJRU5ErkJggg== + VFUYx10VG1ptyTRkIIGZdCrLwcnHWIZKbEGhRjAyPkJSUUMzKwxwXS6ww0NBB0UCV1aGZRFQiJGXqJGK + CZIoEgjyEkSXBSRZXN4s++87zFIqC9aZ+c3de+49//89337fd3gTxhnbth03EgiMjsycaeTa0vKkTaV6 + kDc42J2Vlhb1By3rJ6BnPJmxnwUH54Y0NraCDZ0OqKxsAsdJdN7eR+s3bPA74uy8w45Wv0xMJHj/yyU8 + XM6XSi91Dqs/N5hZVdUDMuN0O3dKGlxdvY6tWuUhJAM+Mek/GQUF5TnduFFrSH/UXGhoNFxctutcXDyb + HBy+CuHz+aZkYjSukb9/WrBa3fVCg9jYBOzaFYmiIiA19SFEohTMn28bT+LW45r4+KSk/6tOMTEwBgb6 + sW6dGH5+SVi48GMUFw+iuhpwcHBvIfF1xIwxdxESknGTaQ4MDEGrNWyQkXEOW7ZEIDw8H2KxFM3NwKNH + wKJFy6pIWExYjmXAi47ObRkaAnp7B9HRocapJAUkAQEICgqATCqFUvkQaWl5/bNmzU5eunRFw8aN3+Li + RTWWL48YEghelZPwXsLCoMH58+f5HPertq9vCM3KFpxMTEJhUwvKtUDBE+DMnVYck8mRrEjpIoEEylJv + MzPTw5aW1qnTpplIae4g4UAIDBokJFx4WyKJ1rW3dyJOrkA7haqXUPYPoeRxP3If9OLUfQynqbm5eRSJ + 2BLvEp8SrsRHxOtjpmxMTLqwrOwezp7NxLXmDqhJXEvJX9ujRVF7L7Lu90BRpYHibhc8PTbdIiFHYjox + TX9l9cCK75nBKnG4GiWS2E337qko3hJc1wB13VpUagZwncTzVT1Ir9PgZLkaCdU6eHt7a2jJD/p4j67m + Q4cqpsfH1yYqFOU3xeKMEHt7jzk7doj2NTQ8AhcYiJwW4DdlDy6repHX1I2z9RokVXYi+rYaipoh7Nsv + Zv9DGPGmwXgHB2elaDQswkBbGy2MTu9ycdlTV1HRjKjIo5BTGE7Xd+N0bSdSCXmFGjG3OyC9pUZijQ5b + t26+Q8IH9AajdxAZmalWqTqgUqnR10dpQkOjIcHTecjNycdRRTqkVVqcKOvEcRI+cvMxYkrViK8aAJeZ + r7WxscmytLaW6A1GxX2Cv39CTWFhDVVhHcrLm9DY2Aa1unvYSKsdhDQ2BlHJmTh2uxtRf9J9+SBkZBif + dQUHJAG4ePl3cD4+T+xeM16lT8tnd+HlFerBcWcG0tOLqVAqUFBQhZKSety9qwSdAcNGBVeuIIgTw1e0 + H377ORwMCR1OUUZB0WW0SlcCa2fAydSwiWDJEqevN28WX2ULkpKuISenDPn5FbSrejKrgZfXProvwaVL + xRS6X1Bbq0FmVraGZdD9iA+B+t1A9lpggxnczAVfPr8T1r9ZU7KdO9fG39l5+zVfX04nkxUgO7sCYWEy + rFnzDRwdN2Lv3mjY2TkhLu4WVq4UXjXm8eRw5ANyR6D6O+CcG7BeAMf5c9z19fDPf8J+sOKwIuytrN7y + FwrdCvfs4XQi0c/Ujg9QQ8uFs7MnPD0DERiYDFNT00R6V2RmNHE9PpsKxH1Cp9BWtMo84eMT2EHP2GnH + Cu+ZwXYzlWC93N7Cwopbtszuhp2dg87P7wRCQzNx+PAF2oVQxePxTtA7X7ACs3xp0goIp6A5eDVKa5RY + 7+5eTfM/EbMN1gZNPm0ktLCYHTZv3nulixev7luw4P0aY2NjdqCIiHeIKeyjZk2eYOvl6/uXm5tbqYmJ + iYzmvmfmYxmMzI8YsSr9nPAmQogfCdbQXiFGWgwL8RK98G66fqCPxos8hp9PJljrfYNgZuzKQvl0YTEj + Y/1Xm488/xsf+rrm0PHvyQAAAABJRU5ErkJggg== @@ -272,28 +272,28 @@ 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 @@ -319,32 +319,32 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAABiVJREFUSEuVlgtM - k1cUx7+qOCUmOkemRpMZncMpbiwGnLK5JW5EnQ9A3WRO1IGgjqgwpIg6QAQEEWiFjseAigoqoLyhPKuI - IDIVhhgeAuJ4FKit0JaKwn/nfiOLCprsJr/cr1/T///cc+49twLutZGXl7ewv79/2/jx4xdMmDBh/sSJ - E+fq9Xrt4OBgt1arVahUKoVSqeweGBhQ6HQ6BYAujUbTeevWrdampqZBksPrmq98Li4uPtDQ0IC4uDhk - ZmaisrISra2tUKvVGNDpMDQ0RJoAGaCvrw8VFRXw8vIatrW13UdC7xHj32qQm5t7ICsrC56enjh06BAc - HR2xfft2bNu2DXv27OHficVi1NfXQygUMnH4+vrCxMTkFAmvIAzfapCdne1cVlaG3bt3w8nJCfb29tix - YwcoQtjY2MDS0hIuLi4oLS3F4cOHceLECZ5Zs2ZJSPhbYsobDSiacRT9mcaGeohFIhw5coSP2srKChYW - FjA3N8fixYt5YZY+Fn1AQAD8/f0xffr0CBL+ipg8pkFtbe2UysryvEdtj1He9AQvtCro+56gt6sdj1oe - oramGulpVxEREYH09HTEx8fDx8cHgYGB8PPzg6GhITNgKXpnLANBdXV15nO9FsJCLb6MaMNR6R245GsR - mVWH6jY1MqsV0DxV4vHjNjQ2NiI1NZWPPDg4mC+ygYFBOAkvJQxGGVD0m5W9vfzucE5uh6VXEXzyFTAO - aMbSg9nYL9PB2PsB8q/dpd2jhbykBMe9jyH0lD8k4tPMYFAgEIhJeAkxYZTB7du3C5m4emCYN2Hjqe4F - 0spb8Hx4CMtPN2GpSxYwrEcD1ScoMABVNY0wOfonfjglx1aPKP3cndFZ34Q3FpiH1UvmfO9nQiaTCAEX - FRVlQCvQFTYP4afUJ9gnvY/cxheoaNb8Z/byQ2hoKC4nncf+oHxwP+ZgxuEmmIU8xo4kFXxL9IisBJYJ - C++S+Cd8wSmXc5obHiCioh8rJa1Y6FmLgwUazBZW4febKthfVSGf8s9GS0sLgoKCEBMdidCoLHCfBoNb - eRbcxnSMcyqHkfABVojascg+T0fizsRsLiEh4cO6+7Xo7O7GMYkc0rwarCKjyesuwLVwAKvjO2Dtm88b - 5OTkQCKRICwsDEkXzkJ0OgiiIB+sXOeh5D7y005aGweDLang5jlfI/HjxDwuPDz8g3tVlVD3tEOj7ka/ - qhttFGlLfR3CrnXhXZsk5BZV8AYxMTGIjY2Fg4MD2GkXi0Vwc3PFz7tsr3OCyVJuskUcN+XrBE7A7yh7 - YiZ3PikpMVpWB1PHWLie+AM3ruVDreyEsqcTqu4O9D3pQm9PF6jBITIyEufOneNbBDMKCQnB3r17sWHD - ehmJeRNrifUj80f8mYhOlt0PvwN4ZKnwufAWuAXBeP+z/XA7egplpcXoUXSgo/1vPHz4EFKpFImJifzM - +g/D29sba9asSR/J+Vyap44wkd9FEWcv3wi8Cfhd1+Nk2TOIbw/CUXIPxhvPgJu5CcZLN+C3ABHq/qrh - xS9duoSUlBTehJ3mK1eusDaSTGIOxAxe9OUhiozPPF4KHCvUQCjrw8EcNZyzn8KrdAAn5T3wTCiHue91 - VNBq2OllgmlpaTysDmw2NTU9T5rbCaNRhywkJOysV5EG7oXP4JLbh18ylNh9tQd2KQpsvqjAoYxOzNiZ - gptyGTIyMvgmx4QLCgr4FmFtbS2nS4l1UpZ7lp5Xh4Od3WI31wNxvtHJT11SW2Gf0Q+71F7YXu7CpsQO - 2MU1YJr1edwozgHdFZDJZCihVsHaA0V+idSiiT0EK+roPsRXmuMWTZ06ddf671bHuPuL2pykVbC6qMS6 - xG6sCqyB4IsoFMsyIJfLUVRUBA8Pj3YjI6ME+l0YsZWYT/zbGsYY7CUzYQUypa5oa7F8WYiz+9G7O718 - hpe4l8LVOxY3rpfw6dmyZUsFpYSJexOWxCxidIN7gxHbWuxe/Zjl1HjBguNrLFddXrbMLNHd3b3NzMws - mbpmLH13kDAjphHjxor6be/YilhErGDzCHZLsTSwk/nryDPLN7u5xkzJ/zFk/xDYJc5WxVI4Z+R5zGKO - JfwPq5cLGVmuLTAAAAAASUVORK5CYII= + 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 + /geozQsXvpx68QAAAABJRU5ErkJggg== @@ -372,29 +372,29 @@ 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 @@ -441,4 +441,7 @@ True + + True + True Index: Baza Reklam 2 - Faktury/AddZamowienieForm.Designer.cs =================================================================== --- Baza Reklam 2 - Faktury/AddZamowienieForm.Designer.cs (revision 37) +++ Baza Reklam 2 - Faktury/AddZamowienieForm.Designer.cs (revision 41) @@ -377,5 +377,7 @@ this.procentProwizjiTextBox.Size = new System.Drawing.Size(62, 20); this.procentProwizjiTextBox.TabIndex = 18; + this.procentProwizjiTextBox.Text = "0"; this.procentProwizjiTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + this.procentProwizjiTextBox.Leave += new System.EventHandler(this.procentProwizjiTextBox_TextChanged); // // zPCheckBox Index: Baza Reklam 2 - Faktury/AddZamowienieForm.cs =================================================================== --- Baza Reklam 2 - Faktury/AddZamowienieForm.cs (revision 21) +++ Baza Reklam 2 - Faktury/AddZamowienieForm.cs (revision 41) @@ -42,4 +42,6 @@ procentProwizjiTextBox.DataBindings[0].Parse += new ConvertEventHandler(ProcentToDecimal); + //rABATTextBox.DataBindings[0].Format += new ConvertEventHandler(DecimalToProcent); + //rABATTextBox.DataBindings[0].Parse += new ConvertEventHandler(ProcentToDecimal); REKLAMADataSet.zamowieniaRow row; @@ -126,4 +128,9 @@ cevent.Value = p.ToString(); } + + private void procentProwizjiTextBox_TextChanged(object sender, EventArgs e) + { + this.zamowieniaBindingSource.EndEdit(); + } } } Index: Baza Reklam 2 - Faktury/REKLAMADataSet.xsd =================================================================== --- Baza Reklam 2 - Faktury/REKLAMADataSet.xsd (revision 40) +++ Baza Reklam 2 - Faktury/REKLAMADataSet.xsd (revision 41) @@ -1873,13 +1873,14 @@ (FAKTURY.NUMER_ROZ <> 'KAT') UNION ALL -SELECT FAKTURA_DETAILS_1.ID_FAKTURA_DETAILS, FAKTURA_DETAILS_1.ID_FAKTURY, FAKTURA_DETAILS_1.ROK, FAKTURA_DETAILS_1.MIESIAC, - FAKTURA_DETAILS_1.NAZWA_USLUGI, FAKTURA_DETAILS_1.SYMBOL_SWW, FAKTURA_DETAILS_1.JM, FAKTURA_DETAILS_1.ILOSC, - FAKTURA_DETAILS_1.CENA_JEDN, FAKTURA_DETAILS_1.UPUST_PR, FAKTURA_DETAILS_1.UPUST_NETTO, FAKTURA_DETAILS_1.NETTO, - FAKTURA_DETAILS_1.S_VAT, FAKTURA_DETAILS_1.VAT, FAKTURA_DETAILS_1.BRUTTO, FAKTURA_DETAILS_1.TYTUL, - FAKTURA_DETAILS_1.NR_WYDANIA, FAKTURA_DETAILS_1.TYP, FAKTURA_DETAILS_1.PODTYP, FAKTURA_DETAILS_1.wyroznienie, - FAKTURA_DETAILS_1.reklamaId -FROM FAKTURA_DETAILS AS FAKTURA_DETAILS_1 LEFT OUTER JOIN - FAKTURY AS FAKTURY_1 ON FAKTURA_DETAILS_1.ID_FAKTURY = FAKTURY_1.ID_FAKTURY LEFT OUTER JOIN - FAKTURY AS KOREKTY ON FAKTURY_1.ID_FK_KOR = KOREKTY.ID_FAKTURY +SELECT FAKTURA_DETAILS_KOREKTY.ID_FAKTURA_DETAILS, FAKTURA_DETAILS_KOREKTY.ID_FAKTURY, FAKTURA_DETAILS_KOREKTY.ROK, + FAKTURA_DETAILS_KOREKTY.MIESIAC, FAKTURA_DETAILS_KOREKTY.NAZWA_USLUGI, FAKTURA_DETAILS_KOREKTY.SYMBOL_SWW, + FAKTURA_DETAILS_KOREKTY.JM, FAKTURA_DETAILS_KOREKTY.ILOSC, FAKTURA_DETAILS_KOREKTY.CENA_JEDN, + FAKTURA_DETAILS_KOREKTY.UPUST_PR, FAKTURA_DETAILS_KOREKTY.UPUST_NETTO, FAKTURA_DETAILS_KOREKTY.NETTO, + FAKTURA_DETAILS_KOREKTY.S_VAT, FAKTURA_DETAILS_KOREKTY.VAT, FAKTURA_DETAILS_KOREKTY.BRUTTO, + FAKTURA_DETAILS_KOREKTY.TYTUL, FAKTURA_DETAILS_KOREKTY.NR_WYDANIA, FAKTURA_DETAILS_KOREKTY.TYP, + FAKTURA_DETAILS_KOREKTY.PODTYP, FAKTURA_DETAILS_KOREKTY.wyroznienie, FAKTURA_DETAILS_KOREKTY.reklamaId +FROM FAKTURY AS FAKTURY_1 LEFT OUTER JOIN + FAKTURY AS KOREKTY ON FAKTURY_1.ID_FK_KOR = KOREKTY.ID_FAKTURY LEFT OUTER JOIN + FAKTURA_DETAILS AS FAKTURA_DETAILS_KOREKTY ON KOREKTY.ID_FAKTURY = FAKTURA_DETAILS_KOREKTY.ID_FAKTURY WHERE (KOREKTY.ID_FAKTURY IS NOT NULL) AND (FAKTURY_1.ID_FK_KOR IS NOT NULL) AND (YEAR(FAKTURY_1.DATA_WYSTAWIENIA) = @rok) AND (DATEPART(week, FAKTURY_1.DATA_WYSTAWIENIA) = @nrTygodnia) AND (FAKTURY_1.ID_SPRZEDAWCY = @agencja) AND @@ -4462,5 +4463,6 @@ DATA_WYSTAWIENIA, DATA_SPRZEDAZY, TERMIN_ZAPLATY, zaplata_data, zaplata_opis, idZamowienia, KOREKTA, idFakturyKorekta, agent, waluta_brutto, waluta_miano, idFakturyVAT, ID_FK_KOR, NR_FAKTURY_KOREKTY, NUMER_F, NUMER_ROZ_F, NUMER_ROK_F, netto_F, brutto_F, - vat_F, suma_zapłat_F, data_wystawienia_F, NR_FAKTURY, roznica_netto, roznica_vat, roznica_brutto, agencja, waluta_roznica_brutto + vat_F, suma_zapłat_F, data_wystawienia_F, NR_FAKTURY, roznica_netto, roznica_vat, roznica_brutto, agencja, waluta_roznica_brutto, + NR_FAKTURY_KORYGOWANEJ_1, nr_korygowanej FROM VIEW_KOREKTY @@ -4512,4 +4514,6 @@ + + @@ -4528,4 +4532,786 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4533,9 +5319,9 @@ - - - - - + + + + + @@ -4544,5 +5330,5 @@ - + @@ -4551,5 +5337,5 @@ - + @@ -4566,6 +5352,6 @@ - - + + @@ -4584,7 +5370,7 @@ - - - + + + @@ -4593,9 +5379,9 @@ - - - - - + + + + + @@ -4613,11 +5399,11 @@ - - - - - - - + + + + + + + @@ -4634,10 +5420,10 @@ - + - + @@ -4682,5 +5468,5 @@ - + @@ -4690,9 +5476,9 @@ - - + + - + @@ -4703,5 +5489,5 @@ - + @@ -4711,810 +5497,28 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -5523,6 +5527,6 @@ - - + + @@ -5531,5 +5535,5 @@ - + @@ -5538,21 +5542,21 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -5561,20 +5565,20 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -5583,15 +5587,15 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -5600,5 +5604,5 @@ - + @@ -5613,10 +5617,10 @@ - - - - - - + + + + + + @@ -5625,5 +5629,5 @@ - + @@ -5632,37 +5636,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5671,47 +5675,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5720,15 +5724,15 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -5737,6 +5741,6 @@ - - + + @@ -5745,5 +5749,5 @@ - + @@ -5752,23 +5756,23 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -5777,5 +5781,5 @@ - + @@ -5784,26 +5788,26 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -5812,16 +5816,16 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -5836,15 +5840,15 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -5859,20 +5863,20 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -5881,5 +5885,5 @@ - + @@ -5888,6 +5892,6 @@ - - + + @@ -5902,25 +5906,66 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + @@ -5939,50 +5984,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -5991,5 +5995,5 @@ - + @@ -5998,7 +6002,7 @@ - - - + + + @@ -6007,12 +6011,12 @@ - - - - - - - - + + + + + + + + @@ -6021,6 +6025,6 @@ - - + + @@ -6029,16 +6033,16 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -6047,17 +6051,17 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -6066,9 +6070,9 @@ - - - - - + + + + + @@ -6077,5 +6081,5 @@ - + @@ -6084,5 +6088,5 @@ - + @@ -6091,5 +6095,5 @@ - + @@ -6098,8 +6102,8 @@ - - - - + + + + @@ -6114,6 +6118,6 @@ - - + + @@ -6122,6 +6126,6 @@ - - + + @@ -6130,5 +6134,5 @@ - + @@ -6137,21 +6141,21 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -6160,9 +6164,9 @@ - - - - - + + + + + @@ -6171,10 +6175,10 @@ - - - - - - + + + + + + @@ -6183,14 +6187,14 @@ - - - - - - - - - - + + + + + + + + + + @@ -6199,6 +6203,6 @@ - - + + @@ -6207,5 +6211,5 @@ - + @@ -6214,7 +6218,7 @@ - - - + + + @@ -6223,8 +6227,8 @@ - - - - + + + + @@ -6233,22 +6237,22 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -6257,10 +6261,10 @@ - - - - - - + + + + + + @@ -6269,5 +6273,5 @@ - + @@ -6282,10 +6286,10 @@ - - - - - - + + + + + + @@ -6294,5 +6298,5 @@ - + @@ -6301,43 +6305,43 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6352,9 +6356,9 @@ - - - - - + + + + + @@ -6363,5 +6367,5 @@ - + @@ -6370,7 +6374,7 @@ - - - + + + @@ -6385,6 +6389,6 @@ - - + + @@ -6393,5 +6397,5 @@ - + @@ -6400,7 +6404,7 @@ - - - + + + @@ -6409,6 +6413,6 @@ - - + + @@ -6417,7 +6421,7 @@ - - - + + + @@ -6426,8 +6430,8 @@ - - - - + + + + @@ -6436,6 +6440,6 @@ - - + + @@ -6444,24 +6448,24 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -6470,6 +6474,6 @@ - - + + @@ -6478,11 +6482,11 @@ - - - - - - - + + + + + + + @@ -6491,23 +6495,23 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -6516,9 +6520,17 @@ - - - - - + + + + + + + + + + + + + Index: Baza Reklam 2 - Faktury/REKLAMADataSet.xss =================================================================== --- Baza Reklam 2 - Faktury/REKLAMADataSet.xss (revision 40) +++ Baza Reklam 2 - Faktury/REKLAMADataSet.xss (revision 41) @@ -5,5 +5,5 @@ the code is regenerated. --> - + @@ -14,5 +14,5 @@ - + @@ -40,5 +40,5 @@ - + Index: Baza Reklam 2 - Faktury/REKLAMADataSet.Designer.cs =================================================================== --- Baza Reklam 2 - Faktury/REKLAMADataSet.Designer.cs (revision 40) +++ Baza Reklam 2 - Faktury/REKLAMADataSet.Designer.cs (revision 41) @@ -17923,4 +17923,8 @@ private global::System.Data.DataColumn columnID_FK_KOR; + private global::System.Data.DataColumn columnNR_FAKTURY_KORYGOWANEJ_1; + + private global::System.Data.DataColumn columnnr_korygowanej; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public VIEW_KOREKTYDataTable() { @@ -18237,4 +18241,18 @@ get { return this.columnID_FK_KOR; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public global::System.Data.DataColumn NR_FAKTURY_KORYGOWANEJ_1Column { + get { + return this.columnNR_FAKTURY_KORYGOWANEJ_1; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public global::System.Data.DataColumn nr_korygowanejColumn { + get { + return this.columnnr_korygowanej; } } @@ -18309,5 +18327,7 @@ double waluta_brutto, int idFakturyVAT, - int ID_FK_KOR) { + int ID_FK_KOR, + string NR_FAKTURY_KORYGOWANEJ_1, + int nr_korygowanej) { VIEW_KOREKTYRow rowVIEW_KOREKTYRow = ((VIEW_KOREKTYRow)(this.NewRow())); object[] columnValuesArray = new object[] { @@ -18352,5 +18372,7 @@ waluta_brutto, idFakturyVAT, - ID_FK_KOR}; + ID_FK_KOR, + NR_FAKTURY_KORYGOWANEJ_1, + nr_korygowanej}; rowVIEW_KOREKTYRow.ItemArray = columnValuesArray; this.Rows.Add(rowVIEW_KOREKTYRow); @@ -18418,4 +18440,6 @@ this.columnidFakturyVAT = base.Columns["idFakturyVAT"]; this.columnID_FK_KOR = base.Columns["ID_FK_KOR"]; + this.columnNR_FAKTURY_KORYGOWANEJ_1 = base.Columns["NR_FAKTURY_KORYGOWANEJ_1"]; + this.columnnr_korygowanej = base.Columns["nr_korygowanej"]; } @@ -18504,4 +18528,8 @@ this.columnID_FK_KOR = new global::System.Data.DataColumn("ID_FK_KOR", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnID_FK_KOR); + this.columnNR_FAKTURY_KORYGOWANEJ_1 = new global::System.Data.DataColumn("NR_FAKTURY_KORYGOWANEJ_1", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNR_FAKTURY_KORYGOWANEJ_1); + this.columnnr_korygowanej = new global::System.Data.DataColumn("nr_korygowanej", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnnr_korygowanej); this.columnID_FAKTURY.AutoIncrement = true; this.columnID_FAKTURY.AllowDBNull = false; @@ -18523,4 +18551,6 @@ this.columnwaluta_miano.MaxLength = 4; this.columnKOREKTA.AllowDBNull = false; + this.columnNR_FAKTURY_KORYGOWANEJ_1.ReadOnly = true; + this.columnNR_FAKTURY_KORYGOWANEJ_1.MaxLength = 92; } @@ -33373,4 +33403,35 @@ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public string NR_FAKTURY_KORYGOWANEJ_1 { + get { + try { + return ((string)(this[this.tableVIEW_KOREKTY.NR_FAKTURY_KORYGOWANEJ_1Column])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'NR_FAKTURY_KORYGOWANEJ_1\' in table \'VIEW_KOREKTY\' is DBNull" + + ".", e); + } + } + set { + this[this.tableVIEW_KOREKTY.NR_FAKTURY_KORYGOWANEJ_1Column] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public int nr_korygowanej { + get { + try { + return ((int)(this[this.tableVIEW_KOREKTY.nr_korygowanejColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'nr_korygowanej\' in table \'VIEW_KOREKTY\' is DBNull.", e); + } + } + set { + this[this.tableVIEW_KOREKTY.nr_korygowanejColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public bool IsCustomerIdNull() { return this.IsNull(this.tableVIEW_KOREKTY.CustomerIdColumn); @@ -33760,4 +33821,24 @@ public void SetID_FK_KORNull() { this[this.tableVIEW_KOREKTY.ID_FK_KORColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public bool IsNR_FAKTURY_KORYGOWANEJ_1Null() { + return this.IsNull(this.tableVIEW_KOREKTY.NR_FAKTURY_KORYGOWANEJ_1Column); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public void SetNR_FAKTURY_KORYGOWANEJ_1Null() { + this[this.tableVIEW_KOREKTY.NR_FAKTURY_KORYGOWANEJ_1Column] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public bool Isnr_korygowanejNull() { + return this.IsNull(this.tableVIEW_KOREKTY.nr_korygowanejColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public void Setnr_korygowanejNull() { + this[this.tableVIEW_KOREKTY.nr_korygowanejColumn] = global::System.Convert.DBNull; } } @@ -41072,16 +41153,18 @@ "L) AND (FAKTURY.ID_SPRZEDAWCY = @agencja) AND (FAKTURY.NUMER_ROZ <> \'POZ\') AND \r" + "\n (FAKTURY.NUMER_ROZ <> \'KAT\')\r\nUNION ALL\r\nSELECT FAKTU" + - "RA_DETAILS_1.ID_FAKTURA_DETAILS, FAKTURA_DETAILS_1.ID_FAKTURY, FAKTURA_DETAILS_1" + - ".ROK, FAKTURA_DETAILS_1.MIESIAC, \r\n FAKTURA_DETAILS_1.NAZWA" + - "_USLUGI, FAKTURA_DETAILS_1.SYMBOL_SWW, FAKTURA_DETAILS_1.JM, FAKTURA_DETAILS_1.I" + - "LOSC, \r\n FAKTURA_DETAILS_1.CENA_JEDN, FAKTURA_DETAILS_1.UPU" + - "ST_PR, FAKTURA_DETAILS_1.UPUST_NETTO, FAKTURA_DETAILS_1.NETTO, \r\n " + - " FAKTURA_DETAILS_1.S_VAT, FAKTURA_DETAILS_1.VAT, FAKTURA_DETAILS_1.BRUTTO," + - " FAKTURA_DETAILS_1.TYTUL, \r\n FAKTURA_DETAILS_1.NR_WYDANIA, " + - "FAKTURA_DETAILS_1.TYP, FAKTURA_DETAILS_1.PODTYP, FAKTURA_DETAILS_1.wyroznienie, " + - "\r\n FAKTURA_DETAILS_1.reklamaId\r\nFROM FAKTURA_DETAIL" + - "S AS FAKTURA_DETAILS_1 LEFT OUTER JOIN\r\n FAKTURY AS FAKTURY" + - "_1 ON FAKTURA_DETAILS_1.ID_FAKTURY = FAKTURY_1.ID_FAKTURY LEFT OUTER JOIN\r\n " + - " FAKTURY AS KOREKTY ON FAKTURY_1.ID_FK_KOR = KOREKTY.ID_FAKTURY\r" + + "RA_DETAILS_KOREKTY.ID_FAKTURA_DETAILS, FAKTURA_DETAILS_KOREKTY.ID_FAKTURY, FAKTU" + + "RA_DETAILS_KOREKTY.ROK, \r\n FAKTURA_DETAILS_KOREKTY.MIESIAC," + + " FAKTURA_DETAILS_KOREKTY.NAZWA_USLUGI, FAKTURA_DETAILS_KOREKTY.SYMBOL_SWW, \r\n " + + " FAKTURA_DETAILS_KOREKTY.JM, FAKTURA_DETAILS_KOREKTY.ILOSC, FA" + + "KTURA_DETAILS_KOREKTY.CENA_JEDN, \r\n FAKTURA_DETAILS_KOREKTY" + + ".UPUST_PR, FAKTURA_DETAILS_KOREKTY.UPUST_NETTO, FAKTURA_DETAILS_KOREKTY.NETTO, \r" + + "\n FAKTURA_DETAILS_KOREKTY.S_VAT, FAKTURA_DETAILS_KOREKTY.VA" + + "T, FAKTURA_DETAILS_KOREKTY.BRUTTO, \r\n FAKTURA_DETAILS_KOREK" + + "TY.TYTUL, FAKTURA_DETAILS_KOREKTY.NR_WYDANIA, FAKTURA_DETAILS_KOREKTY.TYP, \r\n " + + " FAKTURA_DETAILS_KOREKTY.PODTYP, FAKTURA_DETAILS_KOREKTY.wyroz" + + "nienie, FAKTURA_DETAILS_KOREKTY.reklamaId\r\nFROM FAKTURY AS FAKTURY_1 LEF" + + "T OUTER JOIN\r\n FAKTURY AS KOREKTY ON FAKTURY_1.ID_FK_KOR = " + + "KOREKTY.ID_FAKTURY LEFT OUTER JOIN\r\n FAKTURA_DETAILS AS FAK" + + "TURA_DETAILS_KOREKTY ON KOREKTY.ID_FAKTURY = FAKTURA_DETAILS_KOREKTY.ID_FAKTURY\r" + "\nWHERE (KOREKTY.ID_FAKTURY IS NOT NULL) AND (FAKTURY_1.ID_FK_KOR IS NOT NULL" + ") AND (YEAR(FAKTURY_1.DATA_WYSTAWIENIA) = @rok) AND \r\n (DAT" + @@ -50050,4 +50133,6 @@ tableMapping.ColumnMappings.Add("idFakturyVAT", "idFakturyVAT"); tableMapping.ColumnMappings.Add("ID_FK_KOR", "ID_FK_KOR"); + tableMapping.ColumnMappings.Add("NR_FAKTURY_KORYGOWANEJ_1", "NR_FAKTURY_KORYGOWANEJ_1"); + tableMapping.ColumnMappings.Add("nr_korygowanej", "nr_korygowanej"); this._adapter.TableMappings.Add(tableMapping); } @@ -50067,5 +50152,6 @@ DATA_WYSTAWIENIA, DATA_SPRZEDAZY, TERMIN_ZAPLATY, zaplata_data, zaplata_opis, idZamowienia, KOREKTA, idFakturyKorekta, agent, waluta_brutto, waluta_miano, idFakturyVAT, ID_FK_KOR, NR_FAKTURY_KOREKTY, NUMER_F, NUMER_ROZ_F, NUMER_ROK_F, netto_F, brutto_F, - vat_F, suma_zapłat_F, data_wystawienia_F, NR_FAKTURY, roznica_netto, roznica_vat, roznica_brutto, agencja, waluta_roznica_brutto + vat_F, suma_zapłat_F, data_wystawienia_F, NR_FAKTURY, roznica_netto, roznica_vat, roznica_brutto, agencja, waluta_roznica_brutto, + NR_FAKTURY_KORYGOWANEJ_1, nr_korygowanej FROM VIEW_KOREKTY"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; Index: Baza Reklam 2 - Faktury/Raporty/fakturaKorekta.rdlc =================================================================== --- Baza Reklam 2 - Faktury/Raporty/fakturaKorekta.rdlc (revision 36) +++ Baza Reklam 2 - Faktury/Raporty/fakturaKorekta.rdlc (revision 41) @@ -1642,4 +1642,200 @@ 1cm + + 7 + FakturaDetailsKorekty + 19.1746cm + 9.91743cm +
+ + + + + + + + 5 + true + =First(Fields!FAKTURY_DRUK_DETAILS_INTERNATIONALlabel_razem_do_zaplaty.Value, "tlumaczenia") + + + + + + + + 4 + true + =Abs(Sum(Fields!BRUTTO.Value, "FakturaDetails2") - Sum(Fields!BRUTTO.Value, "FakturaDetailsKorekty")) + + + + + + + + 3 + true + =iif(Abs(First(Fields!waluta_brutto.Value, "Korekta")-First(Fields!waluta_brutto.Value, "Faktura"))<>0,Abs(First(Fields!waluta_brutto.Value, "Korekta")-First(Fields!waluta_brutto.Value, "Faktura")) & " " & First(Fields!waluta_miano.Value, "Korekta"),"") + + + + + + + + 2 + true + + + + + + 0.50794cm + + +
+ + + 2.04441cm + + + 2.53968cm + + + 1.77778cm + + + 3.55556cm + + + 1.01588cm +
+ + + + + + + + 1 + true + =First(Fields!FAKTURY_DRUK_DETAILS_INTERNATIONALlabel_razem_slownie.Value, "tlumaczenia") + + + + + 3 + + + + true + =Code.Slownie(Abs(Sum(Fields!BRUTTO.Value, "FakturaDetails2") - Sum(Fields!BRUTTO.Value, "FakturaDetailsKorekty"))) + + + + + 0.50794cm + + +
+ 0.38095cm +
0.12698cm @@ -2057,8 +2253,7 @@ - 24.25397cm + 25.52381cm 18.49207cm true - 2.66667cm @@ -2400,5 +2595,5 @@ 8true - =Sum(Fields!NETTO.Value, "FakturaDetails2") - Sum(Fields!NETTO.Value, "FakturaDetailsKorekty") + =Abs(Sum(Fields!NETTO.Value, "FakturaDetails2") - Sum(Fields!NETTO.Value, "FakturaDetailsKorekty")) @@ -2459,5 +2654,5 @@ 6true - =iif(IsNothing(Fields!waluta_miano.Value),0.22*(Sum(Fields!NETTO.Value, "FakturaDetails2") - Sum(Fields!NETTO.Value, "FakturaDetailsKorekty")),"-") + =iif(IsNothing(Fields!waluta_miano.Value),Abs(0.22*(Sum(Fields!NETTO.Value, "FakturaDetails2") - Sum(Fields!NETTO.Value, "FakturaDetailsKorekty"))),"-") @@ -2488,5 +2683,5 @@ 5true - =Sum(Fields!BRUTTO.Value, "FakturaDetails2") - Sum(Fields!BRUTTO.Value, "FakturaDetailsKorekty") + =Abs(Sum(Fields!BRUTTO.Value, "FakturaDetails2") - Sum(Fields!BRUTTO.Value, "FakturaDetailsKorekty")) @@ -5337,5 +5532,5 @@ - 19.04762cm + 20.31746cm18.53968cm3.42857cm @@ -5381,10 +5576,10 @@ - 22.60318cm + 23.87302cm18.53968cm1.52381cm - 27.17461cm + 28.19048cmpl Index: Baza Reklam 2 - Faktury/KorektyForm.Designer.cs =================================================================== --- Baza Reklam 2 - Faktury/KorektyForm.Designer.cs (revision 33) +++ Baza Reklam 2 - Faktury/KorektyForm.Designer.cs (revision 41) @@ -42,4 +42,5 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); this.bindingNavigator1 = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); @@ -78,9 +79,4 @@ this.treeView1 = new System.Windows.Forms.TreeView(); this.fakturyDataGridView = new System.Windows.Forms.DataGridView(); - this.vIEWKOREKTYBindingSource = new System.Windows.Forms.BindingSource(this.components); - this.panel = new System.Windows.Forms.Panel(); - this.bruttoTextBox = new System.Windows.Forms.TextBox(); - this.zaplataTextBox = new System.Windows.Forms.TextBox(); - this.vIEW_KOREKTYTableAdapter = new Baza_Reklam.REKLAMADataSetTableAdapters.VIEW_KOREKTYTableAdapter(); this.agencja = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.agent = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -90,4 +86,5 @@ this.nRFAKTURYDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.datawystawieniaFDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.NR_FAKTURY_KORYGOWANEJ_1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.roznicanettoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.roznicavatDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -95,4 +92,11 @@ this.waluta_roznica_brutto = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.waluta_miano = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.vIEWKOREKTYBindingSource = new System.Windows.Forms.BindingSource(this.components); + this.panel = new System.Windows.Forms.Panel(); + this.bruttoTextBox = new System.Windows.Forms.TextBox(); + this.zaplataTextBox = new System.Windows.Forms.TextBox(); + this.vIEW_KOREKTYTableAdapter = new Baza_Reklam.REKLAMADataSetTableAdapters.VIEW_KOREKTYTableAdapter(); + this.toolStripLabel6 = new System.Windows.Forms.ToolStripLabel(); + this.nrKorygowanejToolStripTextBox = new System.Windows.Forms.ToolStripTextBox(); ((System.ComponentModel.ISupportInitialize)(this.bindingNavigator1)).BeginInit(); this.bindingNavigator1.SuspendLayout(); @@ -304,4 +308,6 @@ this.toolStripLabel1, this.nrFakturyToolStripTextBox, + this.toolStripLabel6, + this.nrKorygowanejToolStripTextBox, this.toolStripLabel2, this.kodRozliczeniowyToolStripTextBox, @@ -323,11 +329,11 @@ // this.toolStripLabel1.Name = "toolStripLabel1"; - this.toolStripLabel1.Size = new System.Drawing.Size(24, 22); - this.toolStripLabel1.Text = "nr: "; + this.toolStripLabel1.Size = new System.Drawing.Size(63, 22); + this.toolStripLabel1.Text = "nr korekty: "; // // nrFakturyToolStripTextBox // this.nrFakturyToolStripTextBox.Name = "nrFakturyToolStripTextBox"; - this.nrFakturyToolStripTextBox.Size = new System.Drawing.Size(100, 25); + this.nrFakturyToolStripTextBox.Size = new System.Drawing.Size(40, 25); this.nrFakturyToolStripTextBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.kryteriumWyszukiwania_KeyPress); // @@ -455,4 +461,5 @@ this.nRFAKTURYDataGridViewTextBoxColumn, this.datawystawieniaFDataGridViewTextBoxColumn, + this.NR_FAKTURY_KORYGOWANEJ_1, this.roznicanettoDataGridViewTextBoxColumn, this.roznicavatDataGridViewTextBoxColumn, @@ -473,43 +480,4 @@ this.fakturyDataGridView.DataBindingComplete += new System.Windows.Forms.DataGridViewBindingCompleteEventHandler(this.fakturyDataGridView_DataBindingComplete); // - // vIEWKOREKTYBindingSource - // - this.vIEWKOREKTYBindingSource.DataMember = "VIEW_KOREKTY"; - this.vIEWKOREKTYBindingSource.DataSource = this.rEKLAMADataSet; - // - // panel - // - this.panel.Controls.Add(this.bruttoTextBox); - this.panel.Controls.Add(this.zaplataTextBox); - this.panel.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel.Location = new System.Drawing.Point(0, 630); - this.panel.Name = "panel"; - this.panel.Size = new System.Drawing.Size(979, 34); - this.panel.TabIndex = 4; - // - // bruttoTextBox - // - this.bruttoTextBox.BackColor = System.Drawing.Color.White; - this.bruttoTextBox.Location = new System.Drawing.Point(710, 6); - this.bruttoTextBox.Name = "bruttoTextBox"; - this.bruttoTextBox.ReadOnly = true; - this.bruttoTextBox.Size = new System.Drawing.Size(125, 20); - this.bruttoTextBox.TabIndex = 1; - this.bruttoTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; - // - // zaplataTextBox - // - this.zaplataTextBox.BackColor = System.Drawing.Color.White; - this.zaplataTextBox.Location = new System.Drawing.Point(851, 6); - this.zaplataTextBox.Name = "zaplataTextBox"; - this.zaplataTextBox.ReadOnly = true; - this.zaplataTextBox.Size = new System.Drawing.Size(116, 20); - this.zaplataTextBox.TabIndex = 0; - this.zaplataTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; - // - // vIEW_KOREKTYTableAdapter - // - this.vIEW_KOREKTYTableAdapter.ClearBeforeFill = true; - // // agencja // @@ -531,5 +499,5 @@ this.kodKlienta.HeaderText = "Kod klienta"; this.kodKlienta.Name = "kodKlienta"; - this.kodKlienta.Width = 85; + this.kodKlienta.Width = 79; // // nRFAKTURYKOREKTYDataGridViewTextBoxColumn @@ -541,4 +509,5 @@ this.nRFAKTURYKOREKTYDataGridViewTextBoxColumn.Name = "nRFAKTURYKOREKTYDataGridViewTextBoxColumn"; this.nRFAKTURYKOREKTYDataGridViewTextBoxColumn.ReadOnly = true; + this.nRFAKTURYKOREKTYDataGridViewTextBoxColumn.Width = 92; // // dATAWYSTAWIENIADataGridViewTextBoxColumn @@ -558,8 +527,8 @@ dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.nRFAKTURYDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle5; - this.nRFAKTURYDataGridViewTextBoxColumn.HeaderText = "Nr FV"; + this.nRFAKTURYDataGridViewTextBoxColumn.HeaderText = "Poprzednia korekta lub FV"; this.nRFAKTURYDataGridViewTextBoxColumn.Name = "nRFAKTURYDataGridViewTextBoxColumn"; this.nRFAKTURYDataGridViewTextBoxColumn.ReadOnly = true; - this.nRFAKTURYDataGridViewTextBoxColumn.Width = 55; + this.nRFAKTURYDataGridViewTextBoxColumn.Width = 116; // // datawystawieniaFDataGridViewTextBoxColumn @@ -570,14 +539,24 @@ dataGridViewCellStyle6.Format = "d"; this.datawystawieniaFDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle6; - this.datawystawieniaFDataGridViewTextBoxColumn.HeaderText = "Data wyst. FV"; + this.datawystawieniaFDataGridViewTextBoxColumn.HeaderText = "Data wyst. pop. korekty/FV"; this.datawystawieniaFDataGridViewTextBoxColumn.Name = "datawystawieniaFDataGridViewTextBoxColumn"; this.datawystawieniaFDataGridViewTextBoxColumn.Width = 80; // + // NR_FAKTURY_KORYGOWANEJ_1 + // + this.NR_FAKTURY_KORYGOWANEJ_1.DataPropertyName = "NR_FAKTURY_KORYGOWANEJ_1"; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.NR_FAKTURY_KORYGOWANEJ_1.DefaultCellStyle = dataGridViewCellStyle7; + this.NR_FAKTURY_KORYGOWANEJ_1.HeaderText = "Faktura VAT"; + this.NR_FAKTURY_KORYGOWANEJ_1.Name = "NR_FAKTURY_KORYGOWANEJ_1"; + this.NR_FAKTURY_KORYGOWANEJ_1.ReadOnly = true; + this.NR_FAKTURY_KORYGOWANEJ_1.Width = 85; + // // roznicanettoDataGridViewTextBoxColumn // this.roznicanettoDataGridViewTextBoxColumn.DataPropertyName = "roznica_netto"; - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle7.Format = "C2"; - this.roznicanettoDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle8.Format = "C2"; + this.roznicanettoDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle8; this.roznicanettoDataGridViewTextBoxColumn.HeaderText = "Ró¿nica netto"; this.roznicanettoDataGridViewTextBoxColumn.Name = "roznicanettoDataGridViewTextBoxColumn"; @@ -588,7 +567,7 @@ // this.roznicavatDataGridViewTextBoxColumn.DataPropertyName = "roznica_vat"; - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle8.Format = "C2"; - this.roznicavatDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle9.Format = "C2"; + this.roznicavatDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle9; this.roznicavatDataGridViewTextBoxColumn.HeaderText = "Ró¿nica VAT"; this.roznicavatDataGridViewTextBoxColumn.Name = "roznicavatDataGridViewTextBoxColumn"; @@ -599,7 +578,7 @@ // this.roznicabruttoDataGridViewTextBoxColumn.DataPropertyName = "roznica_brutto"; - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle9.Format = "C2"; - this.roznicabruttoDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle10.Format = "C2"; + this.roznicabruttoDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle10; this.roznicabruttoDataGridViewTextBoxColumn.HeaderText = "Ró¿nica brutto"; this.roznicabruttoDataGridViewTextBoxColumn.Name = "roznicabruttoDataGridViewTextBoxColumn"; @@ -610,6 +589,6 @@ // this.waluta_roznica_brutto.DataPropertyName = "waluta_roznica_brutto"; - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.waluta_roznica_brutto.DefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.waluta_roznica_brutto.DefaultCellStyle = dataGridViewCellStyle11; this.waluta_roznica_brutto.HeaderText = "Ró¿nica w walucie"; this.waluta_roznica_brutto.Name = "waluta_roznica_brutto"; @@ -621,9 +600,59 @@ this.waluta_miano.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.waluta_miano.DataPropertyName = "waluta_miano"; - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.waluta_miano.DefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.waluta_miano.DefaultCellStyle = dataGridViewCellStyle12; this.waluta_miano.HeaderText = "Waluta"; this.waluta_miano.Name = "waluta_miano"; this.waluta_miano.Width = 60; + // + // vIEWKOREKTYBindingSource + // + this.vIEWKOREKTYBindingSource.DataMember = "VIEW_KOREKTY"; + this.vIEWKOREKTYBindingSource.DataSource = this.rEKLAMADataSet; + // + // panel + // + this.panel.Controls.Add(this.bruttoTextBox); + this.panel.Controls.Add(this.zaplataTextBox); + this.panel.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panel.Location = new System.Drawing.Point(0, 630); + this.panel.Name = "panel"; + this.panel.Size = new System.Drawing.Size(979, 34); + this.panel.TabIndex = 4; + // + // bruttoTextBox + // + this.bruttoTextBox.BackColor = System.Drawing.Color.White; + this.bruttoTextBox.Location = new System.Drawing.Point(710, 6); + this.bruttoTextBox.Name = "bruttoTextBox"; + this.bruttoTextBox.ReadOnly = true; + this.bruttoTextBox.Size = new System.Drawing.Size(125, 20); + this.bruttoTextBox.TabIndex = 1; + this.bruttoTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + // + // zaplataTextBox + // + this.zaplataTextBox.BackColor = System.Drawing.Color.White; + this.zaplataTextBox.Location = new System.Drawing.Point(851, 6); + this.zaplataTextBox.Name = "zaplataTextBox"; + this.zaplataTextBox.ReadOnly = true; + this.zaplataTextBox.Size = new System.Drawing.Size(116, 20); + this.zaplataTextBox.TabIndex = 0; + this.zaplataTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + // + // vIEW_KOREKTYTableAdapter + // + this.vIEW_KOREKTYTableAdapter.ClearBeforeFill = true; + // + // toolStripLabel6 + // + this.toolStripLabel6.Name = "toolStripLabel6"; + this.toolStripLabel6.Size = new System.Drawing.Size(104, 22); + this.toolStripLabel6.Text = "nr korygowanej FV: "; + // + // nrKorygowanejToolStripTextBox + // + this.nrKorygowanejToolStripTextBox.Name = "nrKorygowanejToolStripTextBox"; + this.nrKorygowanejToolStripTextBox.Size = new System.Drawing.Size(40, 25); // // KorektyForm @@ -710,4 +739,5 @@ private System.Windows.Forms.DataGridViewTextBoxColumn nRFAKTURYDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn datawystawieniaFDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn NR_FAKTURY_KORYGOWANEJ_1; private System.Windows.Forms.DataGridViewTextBoxColumn roznicanettoDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn roznicavatDataGridViewTextBoxColumn; @@ -715,4 +745,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn waluta_roznica_brutto; private System.Windows.Forms.DataGridViewTextBoxColumn waluta_miano; + private System.Windows.Forms.ToolStripLabel toolStripLabel6; + private System.Windows.Forms.ToolStripTextBox nrKorygowanejToolStripTextBox; } Index: Baza Reklam 2 - Faktury/KalendarzEmisji.cs =================================================================== --- Baza Reklam 2 - Faktury/KalendarzEmisji.cs (revision 31) +++ Baza Reklam 2 - Faktury/KalendarzEmisji.cs (revision 41) @@ -44,5 +44,6 @@ int index = -1; - public DateTime dataOstatatniejZafakturowanejEmisji = DateTime.Today; + //TODO: tu trzeba bedzie wymyslec cos lepszego + public DateTime dataOstatatniejZafakturowanejEmisji = DateTime.Parse("2008-12-30"); #region properties Index: Baza Reklam 2 - Faktury/KorektyForm.cs =================================================================== --- Baza Reklam 2 - Faktury/KorektyForm.cs (revision 34) +++ Baza Reklam 2 - Faktury/KorektyForm.cs (revision 41) @@ -309,7 +309,21 @@ } - command.CommandText += " AND NUMER=@nr"; + command.CommandText += " AND nr_korygowanej=@nr"; command.Parameters.AddWithValue("@nr", nrFakturyToolStripTextBox.Text.Trim()); } + + if (nrKorygowanejToolStripTextBox.Text.Trim() != "") + { + int i; + if (!Int32.TryParse(nrKorygowanejToolStripTextBox.Text, out i)) + { + MessageBox.Show("Podaj prawid³owy numer faktury."); + return; + } + + command.CommandText += " AND nr_korygowanej=@nr2"; + command.Parameters.AddWithValue("@nr2", nrKorygowanejToolStripTextBox.Text.Trim()); + } + if (kodRozliczeniowyToolStripTextBox.Text.Trim() != "") @@ -405,4 +419,5 @@ nrFakturyToolStripTextBox.Clear(); + nrKorygowanejToolStripTextBox.Clear(); kodRozliczeniowyToolStripTextBox.Clear(); rokToolStripTextBox.Clear(); Index: Baza Reklam 2 - Faktury/FacturesFormNEW.cs =================================================================== --- Baza Reklam 2 - Faktury/FacturesFormNEW.cs (revision 40) +++ Baza Reklam 2 - Faktury/FacturesFormNEW.cs (revision 41) @@ -534,5 +534,5 @@ != Convert.ToDecimal(r.Cells["sumaNettoZEmisji"].Value)) { - r.DefaultCellStyle.ForeColor = Color.DarkSlateBlue; + r.DefaultCellStyle.ForeColor = Color.Crimson; } }