From 3fbb44a5adbf4358b87d8d2ec6d999f6354149c9 Mon Sep 17 00:00:00 2001
From: tec <tec@alfie.codedinternet.com>
Date: Wed, 5 Nov 2014 16:26:27 +0000
Subject: [PATCH] Fixed issues with importer and datetime conversion

Fixed issue with models.VatRate.__unicode__() with datetime and decimal fields

Imported VatRates
---
 RIGS/importer.py |   7 ++++---
 RIGS/models.py   |   2 +-
 db.sqlite3       | Bin 875520 -> 875520 bytes
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/RIGS/importer.py b/RIGS/importer.py
index 9d6f86da..6c72c807 100644
--- a/RIGS/importer.py
+++ b/RIGS/importer.py
@@ -12,7 +12,7 @@ from django.db.utils import ConnectionDoesNotExist
 from django.db import transaction
 from RIGS import models
 import reversion
-
+from datetime import datetime
 
 def setup_cursor():
     try:
@@ -79,7 +79,8 @@ def import_vat_rates():
     sql = """SELECT `id`, `start_date`, `start_time`, `comment`, `rate` FROM `vat_rates`"""
     cursor.execute(sql)
     for row in cursor.fetchall():
-        object, created = models.VatRate.objects.get_or_create(pk=row[0], start_at=row[1] + " " + row[2],
+	start_at = datetime.combine(row[1], row[2])
+        object, created = models.VatRate.objects.get_or_create(pk=row[0], start_at=start_at,
                                                                comment=row[3], rate=row[4])
         if created:
             print("Created: " + object.__unicode__())
@@ -96,4 +97,4 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main()
diff --git a/RIGS/models.py b/RIGS/models.py
index d86c8e07..dca98de2 100644
--- a/RIGS/models.py
+++ b/RIGS/models.py
@@ -69,4 +69,4 @@ class VatRate(models.Model, RevisionMixin):
     comment = models.CharField(max_length=255)
 
     def __unicode__(self):
-        return self.comment + " " + self.start_at + " @ " + self.rate
\ No newline at end of file
+        return self.comment + " " + str(self.start_at) + " @ " + str(self.rate)
diff --git a/db.sqlite3 b/db.sqlite3
index b454e20b5e9ff600345d1925f53a3cdf6d81e1e9..55d16369c1f239ff53ba8282d5aafdaad9a29ec1 100644
GIT binary patch
delta 2135
zcmaJ?4Qv!u5Z;;DyS?6SOKWL>w2jLFwiWK!`|BS<+q*MRv_K1D!B%><S5xVK52Z9s
zDHtG83wY>)nxIh=B_#fw_Asdlu|`Cpw5CyvmSRE)1`<O^!=H)1-J?Gg+R45*``(+G
zZ@-&2b30GCcb;$`NQSFlq+Ai^n(-z_$LMbwq*8j5n#e{ml#e&V361?2x@H#V#K+Pi
zC@EaIe#^`LV6#6M;1`Hg6cgHSkwZ4o1HMp`n9b&6Vrp#6WV`U7sN{DvK_Ul<Fb7g#
z0Xz<N$b#kIgQuVvN?{8GpcY!76?Vd2cmoc>yYK;g0-wRx&;z}28v5Zk7=lZ16|TcA
z_zw*zVIs~$8Pm{;E?kBMxC+<eGgyX|Sc8rD3bx~`_!=I>!*~=sKE~r1#&7T>p2D*@
zh=1T;cm@B#QT&&PagC=rlu8R}G1)1b^5{u=n%2`Ms-PFCj)K%iowSek(_8c&eMq0u
z=M<rD>3jN_2IxEu(+FLo8+4m4>-r8C6(a$X;5E`xKomR-D2AsPKm)<}yJo}A#!Ufv
z!55A%I)`7b!>YJZE|C(6<KP!sOQ*u|UwOzhTQgp4I2+m=sTJ87r?P-hTof9Jq=6W|
z9kGeChK<7<hi3&sH106&*qzxM$?S!`L$ezog=1N;Kn5s~sb^ueYAVA%^>Qg@&etL>
zN!I|D@R_<Y^l5w63~gcMvmy&NVK2s;8SGZb<R*tWrw*6lv&ouaF<-7L!>Hz5vPN5!
z@XzlpE=M+q4W11H8^%a+xe(qg@s!F@KfO)ml*+DMEOo5l4V+UbbSQSaRbh`yR+L=*
z$vb^SlXo`ygK}YgWplva5|FE#8|q|xmd(9L4mQXRWl<Js{>zxZqWjw?{C}v{#pAEs
zsu|ZeG}rlS<&6a!<PvtZvr%)bTJBJkY^&YDoF_bcow}3+s<u@Is^pf&KxNG&R~u-q
z8TOo<EUV(SDvk-yam<#Q%5kVYJ;I(I)1ID~?jAEAGzPfy9CuzdN#?%DMMad!q$jY|
z*xKz9`NJx&h`*~tXGBwE^o%G{ynZ@l9Mbg#<Av^ik>5`3kfaK$r0YvzJ|sgD-K4wP
zU>P$IheEzS=jpRgpS}9*iKG=uLyr;r2vv~GKh0v_qKOt<@Cm+%sY$wp>H0EH$kTPc
zkgw|kp+MIj!J})h;O!1dd>OwCfK#7%9X;yme#vHJ-xCKADo)?69tlcPvQMI9tO`{7
zx77v(@8pFil0G2)`3PSGBb-`Mg^lX=OVUCk+<<E^!Y+sxlC(<|EBK;{RhhQ(MDC18
z<~V*Xu(FU3U`iru5*%EFlkh%kFBOmvGK3NuPpcKB=J<7)xej-(E63(k6o=C-_#UMK
zWEaL|)$W{IwvU}VvU42HY{5J2d6vWFbTIUaQR$;Nk*89Qex>8Ii`0a<xH2p^B2ikG
zPd)gfX<ouu)F^6Nm-qhdC|FvTXUevYk=9k99vqY`>Rll=M&h}n9Ie0?U>|ps{i^#r
zIs;ukk(&icyWE`upo@R0rJ?@0HcNF)pth>Tk}J1aDjVwR0`)=mZkf4&EK6jI*6KA&
z#m1_EiMH1g^fw2$`1J@A)ww|{O=3fZ0e*JJy}t>~zHuvy;A$_Q8I6_f1BEW<%VWSS
z(VZK+yk?zSS}UNFW}>#nGEH&cPs*O<emJRnEkh?YEhlGt`7|gRnW<ezCldvX6}+9L
zU7jeJj5a_A&P2u%Z8xhP>^D=`Xk;FeqOmr1ADg178FI9jPuJEMov|3>4J}GXN7Tx0
Kg&6zYy8i*+EfCoN

delta 1152
zcmcgr|7%rc9DYBa=iGC4?t3=xwq|Cxx^B{qoVQ!dHOPHUVwr1S!q~>04mJ`>WU@hX
zL5>O*B<eiUyS_kDA|Zk0l^uy8;td1c+*O7xV%tU5m^8?emCdN$bNiwGfqEaF=XrU*
zpXcxyJiBS|?54x_)BG3VMQe=>Ti_&aVhXJ|g1v~rMh!0|^Gnn0E(PUqeL<i^qQQ0#
z6-V5dtfN|YudL8|Qa+F?{@s#OGG4R4mn=aRNea<w3R4L^N^yFUs%Q&6M=jJ!JLx6b
zO}#WggET}3=_q|bAJeCFibiRSQgn&Z^bO6@JpDjF(;fPgO?J4D*K&lT9OE*6itD(Z
z8~H^}a2LPKJ^U)a&TsKMe1u;a;g9$Pf5u7vlF#$ke1)g@JHEk-{3HLuzXJ#&gnRKI
z)?)*nKn1Gt47T9~w4)Qdum^p34R7FW9KyT!5TEFHK8J^M_zIVC4bzyz0+w(aE5o(-
z*??^uu!)n8H%zi+f_Ot<LWSFS?dc}&&bufIQOH8jH7uhs89Gyk9ObWSF?P7^-fpQA
zlopt2j@+wWl<rCX=EdZy8FNMmp73YPedfM5%Tr!?imn{pzlTc1|DNhUp?3Y}sbWDb
zv~sy>YGcc*Y~vIc2SC)^;HTDXbYv~C?2olPAJp;fqGq8&37&K(w}sX11V63Z4t{88
zdk1Sm)6fiPn%?#f>r{Kv=wV~X9J4fYG;Plu3;xlojB)ub)|u<P>9~wwv`iW!MweI=
z%8AR1j9V%_E{jydgv`N!IpAf+WeB5bY4l@&qROgwetHbQ;w}}@Dzg2aep~>8t(vS>
zXSFJ;m08{FMW1zM9yYo~Mt?zErYdjg>oQ{c@3QiLzE!E=d##4=H5$HGYiKuT&DpHa
znR8yI$GO9!eU6bZD(DfRHXq<RwKeU;R6&`s+KrUHuioo(9Ix!ElP)l}(uz=>-Q1)4
z=biPs;&+g@^1TzxGm5BFsK{Xs=jxghl%ex<OjoPQKW;VZQ!=V^#98C@FFObFOu}`6
m>w5P%5ItC{hNqljb=S(Z1B5C8m7kCslabOKcvUj@LepQnCM?hZ