Index: /tags/BazaReklam_1.1.28/BazaReklam/ProductionForm.resx
===================================================================
--- /tags/BazaReklam_1.1.28/BazaReklam/ProductionForm.resx (revision 824)
+++ /tags/BazaReklam_1.1.28/BazaReklam/ProductionForm.resx (revision 831)
@@ -214,18 +214,18 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAuBJREFUOE910mlI
- VFEcBfDrkppL4pJSappbomSSJRRBIiEURB+kvpSYRVAWTs6MueVMpmY2C8oMriimzagNZZkQaCWMDgSZ
- uYfLDJbJpGkumUvlnP4PTBDzwY/L491z3n3vXjO2dpWeZY7mLqzY1pZFM7AlCyu2+muFjbV1s5TyVtZF
- 05YI/s3fNNYkMuWjJHPoZPuhlexDo4iho5Shksc6afJhYrtlmHtQcZUN/mnlAx/uA1356C2LRnMeQ6GY
- meysWBJN8SJmW5Zos93G0C0FBooAYxtM4zoM68rRVCE2pacLKykYTrZtWTBVfVyFjmxgqhOa2iqIxGIk
- p6UjLi7ud3x8fCsFY4jzlgUGeYgQ+kZoVJVoHzJgHsC7JUBtBPKKa2eo6AWFg4nVf0uSopw95ntUP0VZ
- WZik8IwJ0E6voGpoEUVD4FYyTMFY4rapQM1YaFOgQ59eo4IgNQOvvwMtX5dRr1+AsmsWBf2AQChcpqCI
- +GwokDLm2h7paIQ6Ap/ry5CRIUKxHijpn0fB+xncfTuHikETeDwedw4kJHDDbiiodVkehmX5Aaw050Jd
- JIdC04KcbiC3y4SSARMkyjJIZDL0yRMNFD5KbNZX8cTPQTuXE4JpcTAm04Lw4005ahQPkJkigIDPR2ay
- ABKpDAM6KUZyDq4+PO3DbWnQ+pa+DNvxZZwfgDGeP0Zv+EF/xQfGihRMPFXC2FCGsboifFEkYjUzFPiU
- hFlx8OKzk+6lVOBNLFmdk/XzklBH02iCL4Yu+eDjBS/0xHii49Qu6CJd8eqQEzozhZiSX8dwbPgqDGKk
- 3iucpvA54sJ9inskY7cSrM0aFLttetXeVt80vnYLKnfrGYWzxQh/u7n2BGN1txMSHl8Ltq9Oy8qdiDhy
- rI5yQuLJFXAHYw+JIpdJOslb++P5NN4hN8lFcp7EEz45Q9ZPpgXd2HOrWfs2fxoDCDfuJR5kJ3El3EHi
- 3swt3/IvfLZ1pakuz8oAAAAASUVORK5CYII=
+ YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAuBJREFUOE910ntI
+ U1EcB/DjIzUfiY+UUtN8JZNMsoQiSCSEgugPqX8ybEVQFi63ma/cMjWz6TAmPlNM29RGWRoEWgnTQZCZ
+ 73A2sVSWpvnIfFTbt98FE8S88OFwuef7vefec8zY6lV6mjmau7BiW1sWxcCWLKyY8dcKG23rZknlrayL
+ pi0R/Ju/YayJZ4WPEsyhzd8LjWwPGiUMHaUMlQLWSZMPEttNw9yDists8E+rEPhwF+jKRW9ZFJpzGAqk
+ zGRnxRJoihcx27REk+k2iu48YKAIMLTBNK7FkLYcTQ+kptRUcSUFw8iWTQumqo8q0ZEJTHVCXVsFiVSK
+ xJRUxMbG/ubz+a0UjCbOmxYMy4PF0DdCraxEu24Y8wDeLQEqA5BTXDtDRU0U5hGr/5YkRDp7zPcof0oy
+ MjBJ4RkToJleQZVuEUU6cCsZouA54rahQMVYyItAhz69WglRchpefwdavi6jXr+Awq5ZFPQDIrF4mYIS
+ 4rOuII8x1/YIRwNU4fhSX4a0NAmK9UBJ/zwK3s/g9ts5VAyaIBAIuHMgI4HrdkNBrcvyUCzL92GlORuq
+ IjkU6hZkdQPZXSaUDJggKyyDLD8fffL4YQofJjZrq3ji56CZywrGtJSHyZQg/HhTjhrFPaQniSASCpGe
+ KIIsLx8D2jwMZe03Pjzpw21p0NqWvgzdNjYuDMCowB8j1/ygv+QDQ0USJp4WwtBQhtG6Iowp4mFMDwE+
+ J2BWylt8dty9lAq8iSWrc7J+XhziaBqJ84Xugg8+xnihJ9oTHSd2QBvhilcHnNCZLsaU/Cp0MWFGDEuR
+ fOf+NIXPEBfuU9wjGLsRZ23WoNhp06vytvqm9rVbULpbzyicLT4Jt5prjjFWdzMu7vEVnn11Skb2RPih
+ I3WUExNProA7GLtIJLlIUknO6h/PpfEWuU7Ok7OET4TkFFk7mRZ0Y8+tZvXb/GkMINy4m3iQ7cSVcAeJ
+ ezO3fMu/bu11njP/MAsAAAAASUVORK5CYII=
@@ -290,18 +290,18 @@
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
- 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
+ YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAvVJREFUOE9tk3tM
+ jXEYx7+J1NoqhdY0beIsFnOZZZg/MFuY1NxmLjtmboXTRZs7yWRGGEr6h9AyNte5DBkLy3JJhxzXVKNw
+ 2qwLHZ2v7++cmDbv9tn7vuc8n+f3/J7f8/rg3yvpVhTQbgsIDYoPdPlHu4Ma2Pq1u+NHY/1V1N8+huqi
+ GoW3C3bxPC/WKmtgpr05/mI7Z5SSsSUdjChoZZ8DTQze+o7dkq45EZe9TJGhwrdrAutLa/TWR25rGWk5
+ R8L2isFrKhicaWfgegexsZZY/4GYe9qFmGSb5HDRzZskqSwqMON585L7ZNgJyflKsuEJ3c73dDXV8uyj
+ OiKzRrwh0l4RU4q/ICAiQWaI8AFmXs2deq6VsWfcxJEO4WZ0toOu741s+97Ekhctkj8SGapkrZ1YcJcY
+ MP+Y5GHCD/6L7lTPv/GLyFXg/jbd2zho70fyVzPJDl7UI9apgtSXREolseQhMTSrXPJsTz96Ly53jS9u
+ JXKaiN1il5Mxh79Idgny+iclSH3rXT35GbHwHjE6r15yuohE2IrSn0OOfiO2fyZ2NHjuffOaeaiazLWT
+ Sx+YBK+98orHauRNYtTBOslZYgD8Z1+uGnhA4ibt04M6vtrBkJRyDt/5glhVTayUvLzCW37CFcKS8UDy
+ dk8CTCjY02+LupupMk2nM94wPruc/PlVG2ih3anmrtb/Rp51g5h8hggde0qyOc5IIGapxS/prNMnXUGe
+ Rtk5M98h2TSRrGnXFlL0+9xbxLQLxIh9dfDxLZSc2HmU6ImRWcuQWOTCmiqV/FTlVnJw3jcmnP+hE3hP
+ JF4jpp4nxhS2IKD/cYmbxRDR3YyShkHHYbHaMLGoEfNuE4vLtGKpxOvE9EvEpBKtnFOHgMgTis0RE0Ww
+ dxK9l5ntcPhpwqLmFCB2y0PEHarFyL21sKTdR+i4k51lm5WNHCY6R7lrkl56NRNmhsScs+n0NmETZs+m
+ 7KD/yX/SmO34CfPFqcPmmDyYZ5O8hzAxf6/feAWZMxstRzEAAAAASUVORK5CYII=
@@ -309,18 +309,18 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAtpJREFUOE9dk21M
- jXEYxq/zdGJJTnXS+1FrlUpaQvRysqxCTXFqomK0LErjg5fZGNls5oPJsFlIGcbGTDYZFjOzfLFsNKyx
- mXlbW9o0ndTlepKzw7Pn9+W+/9d93//7vv+A19cD5N0FLp0BcmX2E5a/7m6grtOCBy1ARRBgk93HW4s3
- wIkeV/b46KFK3rNYnso5X/ibhxR4+auIEDerEvkhzcbrhqVX5jgx1RPkdbT9Pc82kEcq+aloDjcCR+WM
- vw0sehblN8TN6eTqGPZnhXAP0CmfjiDME6ALaHHvc5HNq8j9JewKnvKtAtjeHTTjCxsWk2viOVQcyXar
- 8XEKcF7CDWKmJ4Dunf0wN3GcBxVgVyHdtZm8EhIwzqZcsjqFY+Wx7Hb4j6UAHRIdFOn/XMFs2l3DeMJ9
- JeSOfLIxh9yWRW6YS65NYF+mnVv/lH5SrBCB3k02KzGOAzXvliSQTRLXLZA4jVw3m1+LonjMgpdq+wWd
- qxXR4t8pPAIcN4H7n0ol2pI5KU4iK+L41RnKZg3DFzgsYcb/pVseA/WPI4IHRxucZP1Ccn2qMktcHkeW
- OsiVkRxwBvO0gd5MoEgBpnvKvwO4+hfFkNuzlVXCqmSyMpG/XLFkWTTHiiPoLgqluzCEQ04br/oanzcB
- +id6YJjzWPY2I1ydVkaNysz6vSSKbQG+o/3pNo4Xh3KkwM7h/EAO583gYO406h7moi2ZqOSGtmpktYQu
- VVHm4OeCMHZMtQ44gIuNwK3+tACOLA3iD2cAB3P8eT/SyiygTWKzilC0aoWHC8L5c2UEX8wL5HHD8kq7
- bs7abFjVAeByX5If+9L82Gn3obbnluynRLGwwQUktBvG8zarz4dS4Jpmc06O3SJHmKuauBNorZZPa6d8
- OCZqxCxhNedvPohUoT3BXrFWJHt1Wps78XDKRKXIFpFCU/3zmU/WfLqmMUbYvZ2TZ8xMuhmCJ896nvlv
- 7Qwpp/0kvtMAAAAASUVORK5CYII=
+ YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAtxJREFUOE9dk1tI
+ VGEUhdccR8VMRx2zvEyKpJmV2M3yMoqhVkqao6RpSYlRWWEPXQiKNAiih9CoIKzsQkFBERmUVEhIdHkJ
+ g5IKKYjIDMGEJMd0tY7ZMHY438ve/9p7/3vvH/D6XgDZHcC1c0CWzAHC8s/dCdS1W/C4BSgPBWyy+3hr
+ 8R449dyVMT56tIIPLZZnci4RgeYhBV79NjLczapEfk6x8ZZh6ZY5Xvh7gryLsX/i+XryeAW/FsznZuCE
+ nHPuActfRgcMcWsqWRrL3vRwHgDa5dMRzPQEeAC0uA+5yKZ15OEiPgjz+14ONHSGBn9j/Qpy/RwOFUbx
+ stX44gdclLBGzPAE0L0zOrMSx9moAPvy6a5N4/XwoHHuziKrkzlWFsdOR+BYMnBFokaROuUKZtM6DOMp
+ DxWRe3LJnZnkrnSyZiFZmcCeNDt3/C39tFgjQrybbFZiNAMbP+YkkLslrlsqcQq5YS77C6J50oI3avsl
+ nasVMWLqFJ4AjjvAo6/FEm1PmxQnkeXx7HdGsEnD8AWOSbj4/9ItXcC2rsiwwdF6J7ltGblpgTJLXBZP
+ FjvItVEccIbxrIHuNKBAAaZ7yr8PuHqXx5INGcoqYdU8siKRv11xZEkMxwoj6S6IoDs/nENOG2/4Gn1b
+ AP0TPTDMeaz6sHiWOq2MGpWZ9UdRNNuCfEd7U20cL4zgSJ6dw7khHM4O5mDWNOoe5qLlTFRyW1s1Uiqh
+ S1WUONiXN5NX/K0DDuDqTuBub0oQR1aG8qcziIOZgXwUZWU60CaxWUUEWrXCw3mz+GttJF8vCmGzYXmr
+ XTdnbTas6ghwvScpgD0pAWy3+1Dbc1f2M6JQ2OACEi4bxqs2q8/nYuCmZnNBjv0iU5irmrgXaK2WT2un
+ fDgpNorZwmrO33wQC4T2BAdFpZjn1Wlt7sTDKREVIkNECU3172c+WfPpmsZYYfd2Tp4xM+lmCJs863nm
+ fwDjXCmkRGMXkAAAAABJRU5ErkJggg==
@@ -345,16 +345,16 @@
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
- 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
+ k2EUx9+Vy1YXEZRFVIIrbSGK3ozooihXd4Ig7aY1RkStwstIbJutzAuntpi8a35gLaUtCErwq6xWSYjT
+ EFGJll/bbPNrLVtTt/nvPMMETXvgx8t7nnP+7/88z3kF3PpLsEGchbHhXmVlZUFZWUWLxWIJ6nS66MOa
+ 2pjBYAjdLS11FhcXV1PhLkL4j4DNZhNVV9e90pcYl7C8YqNfAWUm5pvtYEESXCKRvqSkpAwS2LoiYrfb
+ N/O82cnq/H0nMGDjMDTgwFxtGaCSACcT4c3ajiDt+3w+aDQal1AozCIBUVxEr9fzoXAMwRkvJno5uJo4
+ 9Lx+gKlAGEGpCAExh4/y0wgv/ADm/Bjq/4xz+fk2Kj1KbOHMZrOffd3ZkIAuezI6n5xCu02HmV+L8PwM
+ YdA3jfmFOXCaKRwon0B79wgKCwv9VHyB2M2x3iJRwD0RQk1dIxqfPkcgGCa7k/B6vfB4PIjMjmNT0Qg4
+ bQCZRV3x82DmiRSuqqpqPhqNwmQyxSQSSUN6eno93UZ4dmYWnjEvfG4/fk+6ISl0glMM4syNl9Bpby1S
+ cQWRymm12laHwwGVSvWeAhbiolwut7K2vriGYOzSY3Lcjba3LvDWDgz2fIBSqeynvDLiMJeRkZGqVqub
+ BAKBkQJXxGJxtqHU0IdFIP9dGsQvEnDw8U7UdJow7f0ety+TyVoot4hIZheRyE5UKpWqrVZrL7WyEAlH
+ UdttxCG6kT3PaPJ4DiXWOzAZTcjNze2g/FrifPwQabGxTczLy8vmeT7I7np0ZAzD34Zxs6kArW3NuG+s
+ YLYjlNNJufXMadz+mqncQi5kCoXiEw3LJLOqLdIuXr10bTwn5+wbkUj0iApYm5eJI8vOmYGVxZzsII4R
+ 14l7RCVRTtxeLjxOz/3rFf9VYSLbiH2EmEgjUokUYi/Bxvd/f+oqNyxxLasss5c/LmiRWnlKHxcAAAAA
SUVORK5CYII=
@@ -878,28 +878,28 @@
iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAABS5JREFUSEuVlltM
- k2ccxmFiYGaZm9Msbrh5mG4XeuMyl124xAtutowsLmZXeoEzkUXtFpeQzWxdo9tUHIdSQEQRFETBCBKx
- gpxLsRSQUlpAyqngLIfWUgotFeiz5/1qWXVb1C/55fu+fu//ef7v/z01POwZV0aG9fXJydm9ERH4Kioq
- bJ3DMWVwuy0Xk5IO3AgLc84wfP5ZGv/5XS5HhEo1/r1KZXGUldnQ1ORCc7MXer0PcrnKr1Dc1MbGJnzK
- 4GUk/IVM8vN9W1JS+tuKioZRXz8GjcaBxsYpmszSYB4GA2i2gJMnm91xcek/UHwliXguk9zcR/GZmSMe
- tdqKqiobamvtNHFR3AOdbg6trcDdu0B7O9DZCfbmuD8+/sy5yMjItTRY+r8mWVmty8+erS6Wy+X+S5eq
- cOWKBlev6lBSYkBZmRlqdR8qK4dRVzeOhgan1COtdkYq2eXLFuzbl14eHb1uCw0i/2WSmeldm5RkNZSU
- FMI2OoKBwT5Yeu+hu6cbZpMRHcZ2tBtaoG/RQdesRaO2Hg2aWtTVVKKqugI1NRUoLy/FkSOJTatXb/iQ
- Bi8vmqSnT3yUnHzPduFiM9Q3SwEsAP5Z3oP4+BzKI74/zQImRoeQdeYG4uNTm1asiN62aKJSeRw5OUYU
- FGhQXpIDzNsBz4MXwzeGv/rbWNZqXLt2j+U61UiDQLmSk53etjY/lGkjuFmUweQswFQP4HoBPBaMWaqh
- TL6C1NRmKBQlXorHk9WSAfsMt9vPwXKh446J4neAh3rA/gwc/D6lh2tIhwxlHSpv9wspHD0qGRwn79HA
- LhkEL4NhBvl5PZjqqwEmKoCx27xXAo5bwDjfHWRC/EbGKlFaUIPsc0Z4vPOLGjJZoTBIIptoMPqEgWg1
- yzEtvjqC+vI6wFaE2uvVUKUZcf58H9KVGrRXXYepXo2U1FYMWadC85OeZbILQYP3aTCyaLDACeTl2xRj
- PB6gscnJehpg7npSRKd/gIQfb2F6WswmJsQJ52NSc3MBL5ksOdTAKhkI8elpVsDBno8BJpMPSmUXA//p
- emiqc3PzSExUc8u4D6czEGPnBBQ6Txm0SwYzM4EGNpvYBmaRlsbBfo4rK6uCK96EoSFgYIBz46EwSAzt
- QcBAfBDinZ3zSEnpWJT2+wOPIrNHrIhAlFEgyii+5+XdJi0wmwGrVRj8/qSBCB4fBwYHgVOnDAxckISE
- gNsdGJPJSUilECWcmAi0Hx0NJCV+P326DDk5rejtBQ4d+jXU4K5XDI4ISk3tZDe9kpgol6irEHjAhX3/
- PjA8HMhQJCLK0dcHSdDCtSlKdOJEPlfyAHsgCzVokUpUWNjPXdIuCQbr2c91I4KFSA8XdlcX0N0NqRQm
- DpFAbNlBRBuFIhv79y8aiHVwx2s2u5Cba5GyCgoJEYEIFkJGI6SDRqv1ceseR3FxL0uiY6/VPBPk/oSE
- P5xxcbLunTv3aHbsiCnlIlOQDTRo8Kanm6TM2trA/X6WAnZuXINcWB1SsFxe7jl8OHtw9+6f9LGx31Rs
- 3/5F8ebNH+etWbM+e/nylZlLlizNoJiSnCC/kO/Il2RV2LFj1S65vGr84MFs465dP9fGxMSVbtv2ecHG
- jVvPrVoVnRUVtSwjPDw8jY3/JEdJAvmW7CE7SQz55PHuuYn3dSSavEGkY3QNOUB+I0ceu+/l/WvyGREH
- +1byAVlP3iFvSdmFhb1GXiHiFBNi4vAPIrSlS3wUJhvIu+Rt8iZZQV4l4nQSZ+1LTwk81z+JvwH7K4T0
- YRBpxAAAAABJRU5ErkJggg==
+ YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAABS1JREFUSEuVll1M
+ U2ccxsvEwMwyN6dZ3HDzY7pd6I3LXHbhEi+42TKyuJhd6QXORBa1W1xCNrN1jW5OcXyUFkQUQUEUjCAR
+ K8h3KZYCUkoLSPnGCRRqoYWWCvTZ855aVt0W9SS/nHN63v/z/N//+9Uw2TOutLTB1ycnZ/eGh+OryEjZ
+ OofDZXK7bRcTEw/ckMmcMwyff5bGf35XKBCuVtu/V6ttjpKSETQ0TKGx0Quj0QeFItWvVN7Ux8TEf8rg
+ ZSTshUxyc31bkpN7WwoKhlBbOwadzoH6ehdNZmkwD5MJNFvAyZON7thYzQ8UX0nCn8skO/tRXHr6sEer
+ HURFxQiqqydoMkVxDwyGOTQ3A3fvAq2tQHs72Jvj/ri4M+ciIiLW0mDp/5pkZDQvP3u2slChUPgvXarA
+ lSs6XL1qQFGRCSUlVmi1PSgvH0JNjR11dU6pR3r9jFSyy5dt2LdPUxoVtW4LDSL+ZZKe7l2bmDhoKirK
+ x8joMPr6e2DrvofOrk5YLWa0mVvRamqCsckAQ6Me9fpa1OmqUVNVjorKMlRVlaG0tBhHjiQ0rF694UMa
+ vLxootGMf5SUdG/kwsVGaG8WA1gA/LO8B/HxOZRHfH+aBYyPDiDjzA3ExaU0rFgRtW3RRK32OLKyzMjL
+ 06G0KAuYnwA8D14M3xj+6m1hWStx7do9lutUPQ0C5UpKcnpbWvxQpQ7jZkEak7MBri5g6gXw2DBmq4Qq
+ 6QpSUhqhVBZ5KR5HVksG7DPcbj8HawptdywUvwM8NAITz8DB7y4jpgYMSFPVoPx2r5DC0aOSwR/kPRpM
+ SAbBy2SaQW5OF1w9VcB4GTB2m/dywHELsPPdQcbFb2SsHMV5Vcg8Z4bHO7+oIZfnC4NEsokGo08YiFaz
+ HNPCq8OoLa0BRgpQfb0S6lQzzp/vgUalQ2vFdVhqtUhOacbAoCs0P+lZLr8QNHifBsOLBgucQF6+uRjj
+ 8QD1DU7W0wRrx5MiBuMDxP94C9PTYjYxIU44H5Oamwt4yeVJoQaDkoEQn55mBRzs+RhgsfigUnUw8J+u
+ h6Y6NzePhAQtt4z7cDoDMROcgELnKYNWyWBmJtBgZERsA7NITeVgP8eVkVHGFW/BwADQ18e58VAYJIT2
+ IGAgPgjx9vZ5JCe3LUr7/YFHkdkjVkQgyigQZRTfc3JukyZYrcDgoDD4/UkDEWy3A/39wKlTJgYuSEJC
+ wO0OjMnkJKRSiBKOjwfaj44GkhK/nz5dgqysZnR3A4cO/RpqcNcrBkcEpaS0s5teSUyUS9RVCDzgwr5/
+ HxgaCmQoEhHl6OmBJGjj2hQlOnEilyu5jz2Qhxo0SSXKz+/lLjkhCQbr2ct1I4KFSBcXdkcH0NkJqRQW
+ DpFAbNlBRBulMhP79y8aiHVwx2u1TiE72yZlFRQSIgIRLITMZkgHjV7v49ZtR2FhN0tiYK+1PBMU/vj4
+ 487YWHnnzp17dDt2RBdzkSnJBhrUeTUai5RZSwu4389SYIIbVz8XVpsUrFCUeg4fzuzfvfsnY0zMN2Xb
+ t39RuHnzxzlr1qzPXL58ZfqSJUvTKKYiJ8gv5DvyJVklO3asckqhqLAfPJhp3rXr5+ro6Njibds+z9u4
+ ceu5VauiMiIjl6WFhYWlsvGf5CiJJ9+SPWQniSafPN49N/G+jkSRN4h0jK4hB8hv5Mhj9728f00+I+Jg
+ 30o+IOvJO+QtKTuZ7DXyChGnmBATh38QoS1d4qMw2UDeJW+TN8kK8ioRp5M4a196SuC5/kn8Der5hPJz
+ M/cpAAAAAElFTkSuQmCC
@@ -907,31 +907,31 @@
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
- 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
- 9/KNrU+yuWkAAAAASUVORK5CYII=
+ YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAABeVJREFUSEuNlQlM
+ VEccxt8KXghKrC2ICmpjUVNjFa1SrNiqrVZsjIbGWEjTJlJr00KtQtXIilIRxeXQBVyOvcRFEFFRixyC
+ AmXlUm4oyCE3LNfCrrsc+/X/FqQS6zHJL/OOed838828GQ7zFiW8SLWqr7HbqVM9ZNuiGpqjVWlgOKBp
+ 1vYo5Irmurhkwb5cktESureQ+6+JXKWaK6vpu+l6IVdnLy7GCqkQC/jVeI/3FJNOV8HYuxQ23Fjdtt+T
+ Eubbfb+cvpxCcN7KJKtfu0JQnt/s9HA+vk13xaESWxwutcNvhUuwOrwVVoE1MDpdCYZbisnu+bDZn9g4
+ b9UPX5P49DeaxHeq5/k/ym/ZkzMHrmW28Mh8DL/ieFxs+hFnSs/BOb6PTBpgzquBgXcdmCNVZPQzVrqE
+ NBmZ23z1RhPBI+Wdw2XbIKzwxeXUZtzJH8D9p8AtRSzE/2ThSIoKO660wSqgBbMjHWHoLQPj5QpL7l4s
+ cghNJAOb0bheTiu5Sb3uRJxUxxflQRyuQML1TkRJGnGBX4qSukHcrdXiVIYSTnEdsOa3YqF0F0xEDBj3
+ VEw48Rnsd+0enmK+8iApzyUmjHNwdIwxkMa03g4NbkByUjsyM3shlz9Dfr4OuTk6nA94jIS0BkQUaeB4
+ tQ0f8J/C2KcNHK+/wRwLAsNjsClwGUyX/hJNwnbE1DGDqCjlLD+/5mSZrB6pKS1IT+8mAzUePtShoAAo
+ LARKS0GjeYLQ6BK43VPCjOZgik8TpobYgAmmUZxlYBtiirn2Z/JJ2JmYpTcIDdUuCw4WNsTExEImu4JL
+ UTGQSKIhFl/RIxJfpfoqRKJrkF5KAO9sOPiX7mJ7XCcYzxpwjiWBCTAFc3IOVnu5wGq7dwPJHiLmMTxe
+ x+c8XmVXRKQEI2X4FQzS8yFiQP8+OCgMx89nYH3MHTAXqfdBhJsH1rheg+Wmc6zBCWIhExCg7hGJShAR
+ 4g/o2gFV4+tRN1G7NkgjhQgLzoG3OBW7Ur4E4zMTk/eUYT1vOUxXeeaNGUilCk1BgQ6BfpmAsoQoArpf
+ QQ897yOUxfA8KoUsqhCe/nLsjo0As1cAi+MfY8PpReBYOMaNRcQasMH09ILybUR1XjYZpAKKdKArja7v
+ EVR30X1vGvLS0sDzz0Z7hxpD2kEc9knBN8L7MDjFYPX5ibC2dxhmJr0TTgZO+kkWi9v0Bs9LRlY3bsTI
+ 0VtxA9GiDAgExRDw01CcfpPqDGRmtYy17etV4eDJW9gdcQ3WtEQ3+lqD875bEgkHEJ/ol6lI1Kg3GKa5
+ 7e+n+FVARmYX/APK0K9mJ3ykXL9RDqFIrr/W0BcDNNc93WTgFQ2PyFx84XEQxp961DGcqSISdhn90Tg0
+ gnq9gVIJdHSA1n0fhMLKFwc1dl1V1Qxf3wQ0NACtrcCT6l4c94mErygF02zO1DKG08UkfJT4iJis/wdE
+ IrlGp6PIFaAfSoOwsLJx4uy7QVqhLOx1bW03vLwuo7wcePxICfdj3CHLde53Gc4k4ag4G40JMbJtC4Vy
+ DTvk2tphBAYW6oWePaPF0kcR9NDcdo2Yt9MKZnvN1oWFCnh6Ruq3kS1bdrKZRxI/jfbceEz8+Qi0WpB4
+ EQ19QC/QREudjaG+njWmKJ4A1dUjVFJ67H0q7bJcbii2bt3B7p5/EB8SLx84Eolcc/t2PdLSOlFXB1RV
+ jYhUVEAfQxklVlwMZGcPIDGxFbGx5QgPf4CgoJs4cIA7tHnztuskvI+YPa7n+nyoBAVlaCSSWspfh5SU
+ HsTHN0IqLaPeSXWExsMjos7Z+UiOg8N3iXZ2W2OXLl0ptrCwEpiYzAjhcAwukMSfxA5i5nPNcTWX+5fc
+ xSX0gYPDr7fWrt0pW7x4rdDMbMFFIyOTYA6Hw6fGPOIk4U7sJ9hdkhXcSKwhFhPvEob/a0APLUY/cqOa
+ Xb97iO3EBoI9mZYQCwlLgo2B3YJNiWkEuxQNiNce9GwjM4I9gcxHBWZQbURMJNhTiRV4kVd19qXn/wK1
+ o42j5+17ugAAAABJRU5ErkJggg==
@@ -1112,18 +1112,18 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAuFJREFUOE910ntI
- U1EcB/DjIzUfiY+UUtN8JZNMsoQiSCSEguiPqH8szCIoC5fbzFdumZrZdBmT+UIxbVMbZVkQaCVMB0Fm
- 8xnOJpbK0jQfmY9q+/a7YIKYFz4cLvd8v/fce44FW7nKTjFnSzdWYm/PYhjYopUNM/1aZiNtXSylopXp
- aNoiwb/568baRFb8MMkS2sLd0Eh3oUnM0FHGUMVnnTR5P7HfMMw9qLzEBv60CoAPdwBdPnrKY9Ccx3BP
- wswONiyJpvgQiw1LNNkeI+gqAPoVgLEN5jEtBrUVaKqQmNPTRVUUjCCbNiyYrDmsREc2MNkJdV01xBIJ
- ktPSERcX9zs+Pr6VgieJ64YFQ7JQEQxNUCur0K4fwhyAd4uAygjkldRNU9FzCvOIzX9LkqJdvea6lT/F
- WVmYoPC0GdBMLaNavwCFHtxKBil4lnisK1AxFvYi2KnXoFZCmJqB19+Blq9LaDDMo1g3g6I+QCgSLVFQ
- TPzWFBQw5t4e5WyEKhJfGsqRkSFGiQEo7ZtD0ftp3Ho7i8oBM/h8PncOpCR4zW7IqXVJFo4l2R4sN+dC
- pZBBrm5BTheQqzOjtN8MaXE5pIWF6JUlDlH4ILFbXcXjACfNbE4opiQ8TKSF4MebCtTK7yIzRQihQIDM
- ZCGkBYXo1xZAn7PX9OC4H7elIatb+jJ8y+iYIAgj/EAMXw2A4aIfjJUpGH9SDGNjOUbqFRiVJ8KUGQZ8
- TsKMhLfw9KhnGRX4EmtW72L7TBHmbB5O8If+vB8+nvFB90lvdBzbBm2UO17tc0FnpgiTsisYiI0wYUiC
- 1Nv3pyh8mrhxn+IZxdj1BFuLRvl2ux6Vr803tb/DvNLTdlruavVJsNlSc4Sx+hsJCY8u8xxr0rJyxyMP
- HKqnnIh4cwXcwdhBoskFkk7yVv54Po03yTVyjsSSeCIgJ8jqybSiG0duNSvfFkhjEOHGncSLbCXuhDtI
- 3Ju55Vv/BWEkdZfasqCYAAAAAElFTkSuQmCC
+ YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAuJJREFUOE910ntI
+ U1EcB/DjIzUfiY+UUtN8JUoWWUIRJBJCQfSH1B89MIugLFxuM1+5ZWpm02Fs+Zgopm1qo0wLAq2E6SDI
+ zHepTawpS9OmZj4q9+13wQQxL3w4XO75fu+59xwztnyVnGCO5i6syNaWRTGweQsrtvRrkelbOllSaTPr
+ oGnzBP/mrxmr4pn8YYI5tPk7oZHsQIOIoa2EoZzH2mnyPmK7bph7UHaJ9f9p5gPv7wAduehWRKExh0Eq
+ ZiY7K5ZAU7yI2bolmkw3PTrzgL5CwNAC06gWg9pS1CvEptRUYTkFw8iGdQsmKg8p0ZYJTLRDXV0BkViM
+ xJRUxMTE/I6NjW2mYDRxXrdgSBoihK4BamU5WgeGMAPg7TygMgA5RdVGKnpG4WBi9d+ShEhnj5ku5U9R
+ RgbGKWw0AZrJRVQMzKFwANxKBil4lritKVAxFvo80KFHp1ZCkJyGV9+Bpq8LqNXNQt4xhYJeQCAULlBQ
+ RHxWFeQx5toa4WiAKhxfahVISxOhSAcU986g4J0Rt95Mo6zfBB6Px50DCQlctRsyal2Q7saCdBcWG7Oh
+ KpRCpm5CVieQ3WFCcZ8JErkCkvx89Ejjhyh8gNisrOKxn4NmOisEk+JgjKcE4cfrUlTJ7iI9SQABn4/0
+ RAEkefno0+ahP2vP0oNjPtyWBq1s6Yvdm0ZG+QHQ8/wxfNUPuos+MJQlYeyJHIY6BfQ1hRiRxWMpPRT4
+ nIApcfDc0yPuJVTgTSxZjZN1/f1QR9NwnC8GzvvgwxkvdEV7ou3oFmgjXPFyrxPa04WYkF7Bx1NhSxgS
+ I/n2vUkKnyQu3Ke4RzB2Pc7arE621aZb5W31Te1rN6t0tzbKnC0+8Teaaw4zVnMjLu7R5WD7ypSM7LHw
+ /QdrKCcknlwBdzC2kUhygaSSnOU/nkvjTXKNnCOnSSzhk+Nk5WRa0I09t5rlb/OnMYBw43biQTYTV8Id
+ JO7N3PIt/wJTW3WQCG7O2wAAAABJRU5ErkJggg==
Index: /tags/BazaReklam_1.1.28/BazaReklam/Classes/Produkcja.cs
===================================================================
--- /tags/BazaReklam_1.1.28/BazaReklam/Classes/Produkcja.cs (revision 732)
+++ /tags/BazaReklam_1.1.28/BazaReklam/Classes/Produkcja.cs (revision 831)
@@ -73,4 +73,7 @@
case "EXPO":
return idReklamy.Substring(0, 7);
+ case "AS-GD":
+ case "AS-WA":
+ return idReklamy.Substring(0, 7);
}
return "";
@@ -78,5 +81,5 @@
- public static string GetReklamaFileName(string idReklamy, string tytul, int grzbiet, string miasto, byte staryNowyArchiwum, string fileRoz)
+ public static string GetReklamaFileName(string idReklamy, string tytul, int grzbiet, string miasto, byte staryNowyArchiwum, string fileRoz, string agencja)
{
string F_ROZ;
@@ -88,5 +91,5 @@
if (miasto.ToLower() == "s³upsk")
{
- miasto = "redakcja";
+ miasto = agencja.ToLower() == "redakcja" ? "redakcja" : "adMoto";
}
if (miasto.ToLower() == "gdañsk")
@@ -174,4 +177,9 @@
if (staryNowyArchiwum == CONST_NOWE_NAZWY_PLIKOW)
{
+ if (tytul.StartsWith("AS-"))
+ {
+ tytul = "GS";
+ }
+
if (Reklama_PathName == "")
{
@@ -223,5 +231,5 @@
}
- public static void ArgumentyDoSciezki(int reklamaId, string idReklamy, out string tytul, out int grzbiet, out string miasto, out byte staryNowyArchiwum)
+ public static void ArgumentyDoSciezki(int reklamaId, string idReklamy, out string tytul, out int grzbiet, out string miasto, out byte staryNowyArchiwum, out string agencja)
{
tytul = "";
@@ -229,7 +237,8 @@
miasto = "";
staryNowyArchiwum = 1;
+ agencja = string.Empty;
SqlCommand cmd = new SqlCommand();
- cmd.CommandText = "select R.TYTU£,datepart(year,R.[DATA ZAMÓWIENIA]),R.GRZBIET,dbo.AGENCJE.miasto " +
+ cmd.CommandText = "select R.TYTU£,datepart(year,R.[DATA ZAMÓWIENIA]),R.GRZBIET,dbo.AGENCJE.miasto, dbo.Agencje.Symbol " +
" from REKLAMA R left join dbo.AGENCI on dbo.AGENCI.symbol = R.[SYMBOL AKWIZYTORA] left join dbo.AGENCJE " +
" on dbo.AGENCI.ID_AGENCJI=dbo.AGENCJE.Id_agencji where reklamaId=@rekID";
@@ -250,5 +259,6 @@
: TypNazwy(Convert.ToInt32(reader.GetValue(1)));
grzbiet = reader.IsDBNull(2) ? grzbiet : Convert.ToInt32(reader.GetValue(2));
- miasto = reader.IsDBNull(3) ? miasto : reader.GetValue(3).ToString();
+ miasto = reader.IsDBNull(3) ? miasto : reader.GetValue(3).ToString();
+ agencja = reader.IsDBNull(4) ? agencja : reader.GetValue(4).ToString();
}
Index: /tags/BazaReklam_1.1.28/BazaReklam/ProductionForm.cs
===================================================================
--- /tags/BazaReklam_1.1.28/BazaReklam/ProductionForm.cs (revision 824)
+++ /tags/BazaReklam_1.1.28/BazaReklam/ProductionForm.cs (revision 831)
@@ -585,10 +585,11 @@
int idGrzbietu = Convert.ToInt32(row["GRZBIET"]);
string miasto = row["miasto"].ToString();
+ string agencja = row["agencja"].ToString();
byte staryNowyArchiwum = 0;
- string plikJPG = Produkcja.GetReklamaFileName(idReklamy, tytul, idGrzbietu, miasto, staryNowyArchiwum, "jpg");
- string plikPDF = Produkcja.GetReklamaFileName(idReklamy, tytul, idGrzbietu, miasto, staryNowyArchiwum, "pdf");
- string plikEPS = Produkcja.GetReklamaFileName(idReklamy, tytul, idGrzbietu, miasto, staryNowyArchiwum, "eps");
- string plikCDR = Produkcja.GetReklamaFileName(idReklamy, tytul, idGrzbietu, miasto, staryNowyArchiwum, "cdr");
+ string plikJPG = Produkcja.GetReklamaFileName(idReklamy, tytul, idGrzbietu, miasto, staryNowyArchiwum, "jpg", agencja);
+ string plikPDF = Produkcja.GetReklamaFileName(idReklamy, tytul, idGrzbietu, miasto, staryNowyArchiwum, "pdf", agencja);
+ string plikEPS = Produkcja.GetReklamaFileName(idReklamy, tytul, idGrzbietu, miasto, staryNowyArchiwum, "eps", agencja);
+ string plikCDR = Produkcja.GetReklamaFileName(idReklamy, tytul, idGrzbietu, miasto, staryNowyArchiwum, "cdr", agencja);
@@ -659,4 +660,5 @@
string idReklamy = row["Id Reklamy"].ToString();
string tytul = row["TYTU£"].ToString();
+ string agencja = row["agencja"].ToString();
int idGrzbietu = 0;
@@ -671,11 +673,11 @@
string plikJPG = Produkcja.GetReklamaFileName(idReklamy, tytul, idGrzbietu, miasto,
- staryNowyArchiwum, "jpg");
+ staryNowyArchiwum, "jpg", agencja);
string plikPDF = Produkcja.GetReklamaFileName(idReklamy, tytul, idGrzbietu, miasto,
- staryNowyArchiwum, "pdf");
+ staryNowyArchiwum, "pdf", agencja);
string plikEPS = Produkcja.GetReklamaFileName(idReklamy, tytul, idGrzbietu, miasto,
- staryNowyArchiwum, "eps");
+ staryNowyArchiwum, "eps", agencja);
string plikCDR = Produkcja.GetReklamaFileName(idReklamy, tytul, idGrzbietu, miasto,
- staryNowyArchiwum, "cdr");
+ staryNowyArchiwum, "cdr", agencja);
if (File.Exists(plikCDR))
@@ -1029,21 +1031,25 @@
{
case "AMT":
- //gRZBIETYBindingSource.Filter = "TytulId=1";
grzbietyProdukcjaBindingSource.Filter = "TitleId=1";
grzbietyComboBox.SelectedIndex = -1;
break;
case "GS":
- //gRZBIETYBindingSource.Filter = "TytulId=2";
grzbietyProdukcjaBindingSource.Filter = "TitleId=2";
grzbietyComboBox.SelectedIndex = -1;
break;
case "adMot":
- //gRZBIETYBindingSource.Filter = "TytulId=6";
grzbietyProdukcjaBindingSource.Filter = "TitleId=6";
grzbietyComboBox.SelectedIndex = -1;
break;
case "truck":
- //gRZBIETYBindingSource.Filter = "TytulId=36";
grzbietyProdukcjaBindingSource.Filter = "TitleId=36";
+ grzbietyComboBox.SelectedIndex = -1;
+ break;
+ case "AS-GD":
+ grzbietyProdukcjaBindingSource.Filter = "TitleId=37";
+ grzbietyComboBox.SelectedIndex = -1;
+ break;
+ case "AS-WA":
+ grzbietyProdukcjaBindingSource.Filter = "TitleId=38";
grzbietyComboBox.SelectedIndex = -1;
break;
@@ -1286,15 +1292,17 @@
string idReklamy = row["NAZWA_ZAMOWIENIA"].ToString();
int reklamaId = Convert.ToInt32(row["reklamaId"]);
+
string tytul;
int grzbiet;
string miasto;
+ string agencja;
byte staryNowyArchiwum;
Produkcja.ArgumentyDoSciezki(reklamaId, idReklamy, out tytul, out grzbiet, out miasto,
- out staryNowyArchiwum);
+ out staryNowyArchiwum, out agencja);
string sciezka = Produkcja.GetReklamaFileName(idReklamy, tytul, grzbiet, miasto, staryNowyArchiwum,
- "jpg");
+ "jpg", agencja);
if (File.Exists(sciezka))