diff --git a/fusolab2_0/apps/bar/models.py b/fusolab2_0/apps/bar/models.py
index 1aabca3..b137408 100644
--- a/fusolab2_0/apps/bar/models.py
+++ b/fusolab2_0/apps/bar/models.py
@@ -142,10 +142,10 @@ def get_bar_summary(closing):
     d['expected_balance']+=d['opening_amount']
 
     if Receipt.objects.total_between(closing.parent.date,closing.date):
-        d['receipt_count'] = Receipt.objects.total_between(closing.parent.date,closing.date)
+        d['receipt_amount'] = Receipt.objects.total_between(closing.parent.date,closing.date)
     else:
-        d['receipt_count'] = 0
-    d['expected_balance']+=d['receipt_count']
+        d['receipt_amount'] = 0
+    d['expected_balance']+=d['receipt_amount']
 
     try:
         opening_transactions = BarBalance.objects.get_transactions_for(closing.parent)
@@ -229,11 +229,11 @@ def get_small_summary(checkpoint):
         receipts = receipts.exclude(date__range=[o[0],o[1]])
         
     if receipts:
-        d['receipt_count'] = receipts.aggregate(Sum('total'))['total__sum']
+        d['receipt_amount'] = receipts.aggregate(Sum('total'))['total__sum']
     else:
-        d['receipt_count'] = 0      
+        d['receipt_amount'] = 0      
     
-    d['expected_checkpoint'] += d['receipt_count']
+    d['expected_checkpoint'] += d['receipt_amount']
        
     d[DEPOSIT] = 0
     d[PAYMENT] = 0
@@ -243,7 +243,7 @@ def get_small_summary(checkpoint):
             d[transaction.operation]+=transaction.amount
             notes.append(transaction.get_operation_display() + " " + str(transaction.amount))
             if transaction.operation in [DEPOSIT]:
-                d['expected_balance']+=transaction.amount
+                d['expected_checkpoint']+=transaction.amount
                 if transaction.subtype:
                     notes.append(" "+get_deposit_display(transaction.subtype))
                 if transaction.note:
@@ -251,7 +251,7 @@ def get_small_summary(checkpoint):
                 else:
                     notes.append("\n")
             elif transaction.operation in [PAYMENT]:
-                d['expected_balance']-=transaction.amount
+                d['expected_checkpoint']-=transaction.amount
                 if transaction.subtype:
                     notes.append(" "+get_payment_display(transaction.subtype))
                 if transaction.note:
@@ -259,7 +259,7 @@ def get_small_summary(checkpoint):
                 else:
                     notes.append("\n")
             elif transaction.operation in [WITHDRAW]:
-                d['expected_balance']-=transaction.amount
+                d['expected_checkpoint']-=transaction.amount
                 if transaction.note:
                     notes.append(" "+transaction.note.replace("\r\n"," ")+"\n")
                 else:
diff --git a/fusolab2_0/apps/bar/signals.py b/fusolab2_0/apps/bar/signals.py
index d66bcf4..c6c110c 100644
--- a/fusolab2_0/apps/bar/signals.py
+++ b/fusolab2_0/apps/bar/signals.py
@@ -19,7 +19,7 @@ def bar_handler(sender, **kwargs):
     if saved_balance.operation == CLOSING:
         d = get_bar_summary(saved_balance)
         if ('warning' in d):
-            template = get_template('closing_mail.html')
+            template = get_template('base/bar_mail.html')
             context = Context(d)
             content = template.render(context)
             subject = 'WARNING riepilogo bar '+saved_balance.parent.date.strftime("%d/%m/%Y")
diff --git a/fusolab2_0/apps/base/utils.py b/fusolab2_0/apps/base/utils.py
index e158aa9..27555b8 100644
--- a/fusolab2_0/apps/base/utils.py
+++ b/fusolab2_0/apps/base/utils.py
@@ -4,7 +4,19 @@ def is_polite(txt):
     """
     Search for profanities
     """
-    r = re.compile(r'porco\s?d\w+|madonna|coop|cazzo|culo|stronz|puttana|troia|coglion',  re.IGNORECASE)
-    return not r.search(txt)
+    text_to_check = txt 
+    # parole da controllare senza gli spazi
+    r1 = re.compile(r'porc\s?d\w+|madonna|coop|cazzo|culo|stronz|puttana|troia|coglion|piscio|cacca|merda|frocio|puppa|succhi|mortacci',  re.IGNORECASE) #profanities
+    # parole da controllare con gli spazi
+    r2 = re.compile(r'fica|sorca|pene|vagin|anal|pussy|cock|cumshot|cum',  re.IGNORECASE) #profanities
+    # 3l33t speech
+    text_to_check = text_to_check.replace("1", "i") #
+    text_to_check = text_to_check.replace("0", "o") #
+    text_to_check = text_to_check.replace("3", "e") #
+    text_to_check = text_to_check.replace("2", "l") #
+    text_to_check = text_to_check.replace("5", "s") #
+    text_to_check = text_to_check.replace("8", "otto") #
+
+    return (not r1.search(text_to_check) ) and (not r2.search(text_to_check.replace(" ", "")))
 
 
diff --git a/fusolab2_0/apps/ingresso/models.py b/fusolab2_0/apps/ingresso/models.py
index def72a4..594f147 100644
--- a/fusolab2_0/apps/ingresso/models.py
+++ b/fusolab2_0/apps/ingresso/models.py
@@ -83,11 +83,14 @@ def get_entrance_summary(closing):
     except(IndexError, EntranceBalance.DoesNotExist):
         pass
         #send_mail('allarme chiusura bar', 'errore tragico #1', 'cassafusolab@gmail.com',NOTIFICATION_ADDRESS_LIST, fail_silently=False)
-    if Entrance.objects.total_between(closing.parent.date,closing.date):
-        d['receipt_count'] = Entrance.objects.total_between(closing.parent.date,closing.date)
+    
+    if Entrance.objects.count_between(closing.parent.date,closing.date) > 0:
+        d['receipt_count'] = Entrance.objects.count_between(closing.parent.date,closing.date)
+        d['receipt_amount'] = Entrance.objects.total_between(closing.parent.date,closing.date)
     else:
         d['receipt_count'] = 0
-    d['expected_balance']+=d['receipt_count']
+        d['receipt_amount'] = 0
+    d['expected_balance']+=d['receipt_amount']
     
     d[DEPOSIT] = 0
     d[PAYMENT] = 0
diff --git a/fusolab2_0/apps/ingresso/signals.py b/fusolab2_0/apps/ingresso/signals.py
index bb76575..08ed7fd 100644
--- a/fusolab2_0/apps/ingresso/signals.py
+++ b/fusolab2_0/apps/ingresso/signals.py
@@ -20,7 +20,7 @@ def entrance_handler(sender, **kwargs):
         d = get_entrance_summary(saved_balance)
         if ('warning' in d):
             subject = ''           
-            template = get_template('closing_mail.html')
+            template = get_template('base/entrance_mail.html')
             context = Context(d)
             content = template.render(context)
             subject = 'WARNING riepilogo ingresso '+saved_balance.parent.date.strftime("%d/%m/%Y")
diff --git a/fusolab2_0/apps/ingresso/templatetags/ingressotags.py b/fusolab2_0/apps/ingresso/templatetags/ingressotags.py
index 96c0f95..b00a5bc 100644
--- a/fusolab2_0/apps/ingresso/templatetags/ingressotags.py
+++ b/fusolab2_0/apps/ingresso/templatetags/ingressotags.py
@@ -58,7 +58,7 @@ def alcoholic_l():
         alcoholic_lt = 0.0
         for alcholic in alcoholic_list:
             alcoholic_lt += PurchasedProduct.objects.filter(receipt__date__gte=open_date, name__icontains=alcholic['name'] ).count() * alcholic['lt']
-        return alcohol_lt
+        return alcoholic_lt 
     else:
         return 0
 
diff --git a/fusolab2_0/apps/reports/stats.py b/fusolab2_0/apps/reports/stats.py
index 754626b..ef64bca 100644
--- a/fusolab2_0/apps/reports/stats.py
+++ b/fusolab2_0/apps/reports/stats.py
@@ -75,7 +75,7 @@ def get_stats(request,what,yyyy=None,mm=None,dd=None):
             counter_serie.append( [ int(e.date.strftime('%s')+'000') , counter ] )
             amount_serie.append( [ int(e.date.strftime('%s')+'000') , e.cost ] )
         
-        data.append( {"key" : "Euro" ,"bar": true, "values" : amount_serie } )
+        data.append( {"key" : "Euro" ,"bar": True, "values" : amount_serie } )
         data.append( {"key" : "Numerico" , "values" : counter_serie } )
          
         buffer = simplejson.dumps( data, cls=FuckYeahEncoder )
@@ -83,10 +83,11 @@ def get_stats(request,what,yyyy=None,mm=None,dd=None):
     
     if what == "total":
         
+        
         values = []
         values.append( {"label": "Bar", "value" : Receipt.objects.total_between(start_time,end_time)})
         values.append( {"label": "Ingresso", "value" : Entrance.objects.total_between(start_time,end_time)})
-        data = { "key" : "Cumulative Return" , "values" : values }
+        data.append({ "key" : "Cumulative Return" , "values" : values })
         buffer = simplejson.dumps( data, cls=FuckYeahEncoder )
         return HttpResponse(buffer, mimetype = "application/json" )       
     else:
diff --git a/fusolab2_0/apps/reports/views.py b/fusolab2_0/apps/reports/views.py
index 4424e43..3a5fc8c 100644
--- a/fusolab2_0/apps/reports/views.py
+++ b/fusolab2_0/apps/reports/views.py
@@ -65,7 +65,7 @@ def excel(request, what, from_day, from_month, from_year, to_day, to_month, to_y
                 sheet.write(rowx, 4, data['pa'],money_format)
             sheet.write(rowx, 5, data['closing_amount'],money_format)
             
-            sheet.write(rowx, 6, data['receipt_count'],money_format)
+            sheet.write(rowx, 6, data['receipt_amount'],money_format)
             if rowx > 1:
                 sheet.write(rowx,7,'=B'+str(rowx+1)+'-F'+str(rowx),money_format)    
             sheet.write(rowx,8,'=K'+str(rowx+1)+'-J'+str(rowx+1),money_format)
@@ -146,7 +146,7 @@ def excel(request, what, from_day, from_month, from_year, to_day, to_month, to_y
                 sheet.write(rowx, 4, data['pa'],money_format)
             sheet.write(rowx, 5, data['closing_amount'],money_format)
             
-            sheet.write(rowx, 6, data['receipt_count'],money_format)
+            sheet.write(rowx, 6, data['receipt_amount'],money_format)
             if rowx > 1:
                 sheet.write(rowx,7,'=B'+str(rowx+1)+'-F'+str(rowx),money_format)    
             sheet.write(rowx,8,'=K'+str(rowx+1)+'-J'+str(rowx+1),money_format)
@@ -225,7 +225,7 @@ def excel(request, what, from_day, from_month, from_year, to_day, to_month, to_y
             sheet.write(rowx, 2, data['wi'],money_format)
             sheet.write(rowx, 3, data['de'],money_format)
             sheet.write(rowx, 4, data['pa'],money_format)        
-            sheet.write(rowx, 5, data['receipt_count'],money_format)
+            sheet.write(rowx, 5, data['receipt_amount'],money_format)
             sheet.write(rowx, 6, data['expected_checkpoint'],money_format)
             sheet.write(rowx, 7, data['checkpoint'],money_format)
             sheet.write(rowx, 8, data['check'],money_format)
diff --git a/fusolab2_0/common/templates/base.html b/fusolab2_0/common/templates/base.html
index c33a5ae..6bca5b2 100644
--- a/fusolab2_0/common/templates/base.html
+++ b/fusolab2_0/common/templates/base.html
@@ -162,7 +162,9 @@ <h4><a href="index.html">Fusolab<strong>2.0</strong></a></h4>
     <script src="{{ STATIC_URL }}light-blue/lib/nvd3/src/models/lineChart.js"></script>
     <script src="{{ STATIC_URL }}light-blue/lib/nvd3/stream_layers.js"></script>
     <script src="{{ STATIC_URL }}light-blue/lib/nvd3/src/models/pie.js"></script>
-    <script src="{{ STATIC_URL }}light-blue/lib/nvd3/src/models/pieChartTotal.js"></script>
+    <script src="{{ STATIC_URL }}light-blue/lib/nvd3/src/models/linePlusBarChart.js"></script>
+    <script src="{{ STATIC_URL }}light-blue/lib/nvd3/src/models/historicalBar.js"></script>
+    <script src="{{ STATIC_URL }}light-blue/lib/nvd3/src/models/pieChart.js"></script>
 
 
     <!--backbone and friends -->
diff --git a/fusolab2_0/common/templates/closing_mail.html b/fusolab2_0/common/templates/base/bar_mail.html
similarity index 96%
rename from fusolab2_0/common/templates/closing_mail.html
rename to fusolab2_0/common/templates/base/bar_mail.html
index 63b2b02..03323e0 100644
--- a/fusolab2_0/common/templates/closing_mail.html
+++ b/fusolab2_0/common/templates/base/bar_mail.html
@@ -39,7 +39,7 @@
         <td>{{ date }}</td>
         <td>{{ cashier }}</td>
         <td>{{ opening_amount }}</td>
-        <td>{{ receipt_count }}</td>
+        <td>{{ receipt_amount }}</td>
         <td>{{ de }}</td>
         <td>{{ wi }}</td>
         <td>{{ pa }}</td>
diff --git a/fusolab2_0/common/templates/base/entrance_mail.html b/fusolab2_0/common/templates/base/entrance_mail.html
new file mode 100644
index 0000000..03323e0
--- /dev/null
+++ b/fusolab2_0/common/templates/base/entrance_mail.html
@@ -0,0 +1,54 @@
+<html>
+<body>
+<table>
+    <tr>
+        <th></th>
+        <th>ultima chiusura</th>
+        <th>apertura</th>
+    </tr>
+    <tr>
+        <td>{% if opening_warning %}WARNING{% endif %}
+        </td>
+        <td>{{ last_closing_amount }}</td>
+        <td>{{ opening_amount }}</td>
+    </tr>
+    <tr>
+        <th></th>
+        <th>chiusura attesa</th>
+        <th>in cassa</th>
+    </tr>
+    <tr>
+        <td>{% if closing_warning %}WARNING{% endif %}
+        </td>
+        <td>{{ expected_balance }}</td>
+        <td>{{ closing_amount }}</td>
+    </tr>
+</table>
+<table>
+    <tr>
+        <th>data</th>
+        <th>cassiere</th>
+        <th>apertura</th>
+        <th>ricevute</th>
+        <th>depositi</th>
+        <th>prelievi</th>
+        <th>pagamenti</th>
+        <th>chiusura</th>
+    </tr>
+    <tr>
+        <td>{{ date }}</td>
+        <td>{{ cashier }}</td>
+        <td>{{ opening_amount }}</td>
+        <td>{{ receipt_amount }}</td>
+        <td>{{ de }}</td>
+        <td>{{ wi }}</td>
+        <td>{{ pa }}</td>
+        <td>{{ closing_amount }}</td>
+    </tr>
+</table>
+{% for i in notes %}
+<div>{{ i }}</div>
+{% endfor %}
+
+</body>
+</html>
diff --git a/fusolab2_0/common/templates/base/smallbalance_mail.html b/fusolab2_0/common/templates/base/smallbalance_mail.html
index c07470f..360d0f0 100644
--- a/fusolab2_0/common/templates/base/smallbalance_mail.html
+++ b/fusolab2_0/common/templates/base/smallbalance_mail.html
@@ -28,7 +28,7 @@
         <td>{{ date }}</td>
         <td>{{ cashier }}</td>
         <td>{{ last_checkpoint }}</td>
-        <td>{{ receipt_count }}</td>
+        <td>{{ receipt_amount }}</td>
         <td>{{ de }}</td>
         <td>{{ wi }}</td>
         <td>{{ pa }}</td>
diff --git a/fusolab2_0/common/templates/registration/registration_form.html b/fusolab2_0/common/templates/registration/registration_form.html
index 0ea542f..6c0e01d 100644
--- a/fusolab2_0/common/templates/registration/registration_form.html
+++ b/fusolab2_0/common/templates/registration/registration_form.html
@@ -56,7 +56,8 @@ <h4>
                                 <label class="control-label" for="normal-field">{{ form.born_date.label }}</label>
                                 <div class="controls form-group">
                                     <div class="col-sm-8">
-                                        <input type="text" id="{{ form.born_date.id_for_label }}" name="{{ form.born_date.html_name }}" value="{{ form.born_date.value |default_if_none:"" }}" class="form-control date-picker parsley-validated {% if form.born_date.errors %}parsley-error{% endif %}" placeholder="Ad es. 31/01/1987" pattern="[0-9]{2}\/[0-9]{2}\/[0-9]{4}" data-trigger="change" {% if form.born_date.field.required %}required="required"{% endif %} readonly="" data-date-minviewmode="days" data-date-viewmode="years" data-date-format="dd/mm/yyyy">
+                                        <!-- input type="text" id="{{ form.born_date.id_for_label }}" name="{{ form.born_date.html_name }}" value="{{ form.born_date.value |default_if_none:"" }}" class="form-control date-picker parsley-validated {% if form.born_date.errors %}parsley-error{% endif %}" placeholder="Ad es. 31/01/1987" pattern="[0-9]{2}\/[0-9]{2}\/[0-9]{4}" data-trigger="change" {% if form.born_date.field.required %}required="required"{% endif %} readonly="" data-date-minviewmode="days" data-date-viewmode="years" data-date-format="dd/mm/yyyy" -->
+                                        <input type="text" id="{{ form.born_date.id_for_label }}" name="{{ form.born_date.html_name }}" value="{{ form.born_date.value |default_if_none:"" }}" class="form-control parsley-validated {% if form.born_date.errors %}parsley-error{% endif %}" placeholder="Ad es. 31/01/1987" pattern="[0-9]{2}\/[0-9]{2}\/[0-9]{4}" data-trigger="change" {% if form.born_date.field.required %}required="required"{% endif %}>
                                         {% if form.born_date.errors %}
                                         <ul class="parsley-error-list" style="display: block;">
                                             <li class="type" style="display: list-item;">{{ form.born_date.errors.as_text }}</li>
diff --git a/fusolab2_0/common/templates/reports/daily_stats.html b/fusolab2_0/common/templates/reports/daily_stats.html
index 4e3818f..ed68b6b 100644
--- a/fusolab2_0/common/templates/reports/daily_stats.html
+++ b/fusolab2_0/common/templates/reports/daily_stats.html
@@ -28,7 +28,7 @@ <h2 class="page-title">Statistiche</h2>
                     <h4><i class="icon-bar-chart"></i> Incassi<small class="hidden-xs">Riepilogo serata</small></h4>
                 </header>
                 <div class="body">
-                    <div id="sources-chart-pie" class="chart pie-chart">
+                    <div id="sources-chart-pie" class="body chart">
                         <svg></svg>
                     </div>
                 </div>
@@ -62,7 +62,7 @@ <h4><i class="icon-retweet"></i> Cambia Serata</h4>
                                 <label for="btn-enabled-date" class="control-label">Seleziona una data</label>
 
                                 <div class="input-group">
-                                    <input id="btn-enabled-date" class="form-control" type="text" name="btn-enabled-date" value="">
+                                    <input id="new-date" class="form-control date-picker" type="text" name="btn-enabled-date" data-date-format="yyyy/mm/dd" value="">
 
                                 <span class="input-group-btn"><a href="#" id="btn-select-calendar" class="btn btn-danger"
                                                                  data-date-format="yyyy/mm/dd" data-date="2013/02/25">
@@ -99,9 +99,9 @@ <h4><i class="icon-group"></i> Entrata</h4>
 {% block 'page_scripts' %}
 <script type="text/javascript">
 
-var url_bar_product = "http://soci.fusolab.net/reports/2013/10/25/bar.json";
-var url_total_income = "http://soci.fusolab.net/reports/2013/10/25/total.json";
-var url_entrance = "http://soci.fusolab.net/reports/2013/10/25/ingresso.json";
+var url_bar_product = "http://soci.fusolab.net/reports/2013/11/16/bar.json";
+var url_total_income = "http://soci.fusolab.net/reports/2013/11/16/total.json";
+var url_entrance = "http://soci.fusolab.net/reports/2013/11/16/ingresso.json";
 
 var lineResize;
 
@@ -175,43 +175,17 @@ <h4><i class="icon-group"></i> Entrata</h4>
 //     d3.select("#sources-chart-pie svg").transition().call(pieChart);
 // }
 
-//grafico totale incassi
+
+// //grafico totale incassi
 // d3.json(url_total_income, function(data){
 // 
 //     nv.addGraph(function() {   
 //       
-//           var chart = nv.models.pieChart()
-//             .x(function(d) { return d.label })
-//             .y(function(d) { return d.value })
-//             .margin({top: 0, right: 20, bottom: 20, left: 20})
-//             .showLabels(true)
-//             .color(COLOR_VALUES)
-//             .donut(true);
-//         
-//         
-// //         pieFooter
-// //             .append("div")
-// //             .classed("controls", true)
-// //             .selectAll("div")
-// //             .data(data)
-// //             .enter().append("div")
-// //             .classed("control", true)
-// //             .style("border-top", function(d, i){
-// //                 return "3px solid " + COLOR_VALUES[i];
-// //             })
-// //             .html(function(d) {
-// //                 return "<div class='key'>" + d.key + "</div>"
-// //                     + "<div class='value'>" + d.value + "%</div>";
-// //             })
-// //             .on('click', function(d) {
-// //                 pieChartUpdate.apply(this, [d]);
-// //                 setTimeout(function() {
-// //                     stackedChart.update();
-// //                     lineChart.update();
-// //                     barChart.update();
-// //                     lineChartOperaHack();
-// //                 }, 100);
-// //             });
+//   var chart = nv.models.pieChart()
+//       .x(function(d) { return d.label })
+//       .y(function(d) { return d.value })
+//       .color(keyColor)
+//       .showLabels(true);        
 // 
 //         d3.select("#sources-chart-pie svg")
 //             .datum(data)
@@ -226,40 +200,40 @@ <h4><i class="icon-group"></i> Entrata</h4>
 // });
 
 //sources-chart-line
+// ingressi
 d3.json(url_entrance, function(data){
     nv.addGraph(function() {
-        var chart = nv.models.lineChart()
-            .x(function(d) { return d[0] })
-            .y(function(d) { return d[1] })
-            .margin({top: 0, bottom: 25, left: 30, right: 0})
-            .showLegend(false)
-            .color(keyColor);
-
-        chart.yAxis
-            .showMaxMin(false)
-            .tickFormat(d3.format(',.f'));
+        var chart = nv.models.linePlusBarChart()
+              .margin({top: 30, right: 60, bottom: 50, left: 70})
+              .x(function(d,i) { return i })
+              .y(function(d) { return d[1] })
+              .color(d3.scale.category10().range());
 
         chart.xAxis
-            .showMaxMin(false)
-            .tickFormat(function(d) { return d3.time.format('%b %d')(new Date(d)) });
+          .showMaxMin(false)
+          .tickFormat(function(d) {
+            var dx = data[0].values[d] && data[0].values[d][0];// || 0;
+            return d3.time.format('%H:%M')(new Date(dx))
+          });
+
+        chart.y1Axis
+            .tickFormat(function(d) { return '$' + d3.format(',f')(d) });
 
-        //just to make it look different
-        //data[0].area = true;
-        //data[3].area = true;
+        chart.y2Axis
+            .tickFormat(function(d) { return  d3.format(',f')(d) });
+
+        chart.bars.forceY([0]);
 
         d3.select('#sources-chart-line svg')
-            //.datum(sinAndCos())
             .datum(data)
-            .transition().duration(500)
-            .call(chart);
+          .transition().duration(500).call(chart);
 
         nv.utils.windowResize(chart.update);
-        lineChart = chart;
-
-        lineChartOperaHack();
 
+        lineChart = chart;
         return chart;
-    });   
+    });
+
 });
 
 $(document).ready(function() {
@@ -278,23 +252,51 @@ <h4><i class="icon-group"></i> Entrata</h4>
         var dateInput = $(this).parent().parent().find('input.date-picker');
         dateInput.datepicker('show');
     });
-    $('#change-date').submit(function() {
+    $('#change-date').submit(function(e) {
+        e.preventDefault();
         var new_date = $('#new-date').val();    
-        /*
+        var chart;
 
         //change the urls
 
-        url_bar_product = "TODO";
-        url_total_income = "TODO";
-        url_entrance = "TODO";
-
+        url_bar_product = "http://soci.fusolab.net/reports/" + new_date + "/bar.json";
+        url_total_income = "http://soci.fusolab.net/reports/" + new_date + "/total.json";
+        url_entrance = "http://soci.fusolab.net/reports/" + new_date + "/ingresso.json";
+        
         // update all the graphs
-        stackedChart.update();
-        lineChart.update();
-        barChart.update();
-        lineChartOperaHack();
 
-        */
+        // consumazioni - stacked bar
+        //chart = stackedChart;
+        d3.json(url_bar_product, function(data){
+
+            $("#sources-chart-stacked svg").empty();
+            d3.select("#sources-chart-stacked svg")
+                .datum(data)
+                .transition().duration(1000).call(stackedChart);
+                
+            nv.utils.windowResize(stackedChart.update);
+        });
+
+
+        //chart = lineChart;
+        d3.json(url_entrance, function(data){
+            $("#sources-chart-line svg").empty();
+            d3.select('#sources-chart-line svg')
+                .datum(data)
+              .transition().duration(1000).call(lineChart);
+
+            nv.utils.windowResize(lineChart.update);
+
+
+        });
+        
+        
+        //stackedChart.update();
+        //lineChart.update();
+        //barChart.update();
+        // lineChartOperaHack();
+         
+
 
         return false;
     });
diff --git a/fusolab2_0/settings.tmpl.py b/fusolab2_0/settings.tmpl.py
index 7c3d8db..1226cac 100644
--- a/fusolab2_0/settings.tmpl.py
+++ b/fusolab2_0/settings.tmpl.py
@@ -5,7 +5,7 @@
 TEMPLATE_DEBUG = DEBUG
 
 ADMINS = (
-     ('XXXX', 'xxx@xxx.org'),
+     ('OrazioPirataDelloSpazio', 'ziducaixao@autistici.org'),
 )
 
 MANAGERS = ADMINS
@@ -13,9 +13,9 @@
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-        'NAME': 'xxx',                      # Or path to database file if using sqlite3.
-        'USER': 'xxx',                      # Not used with sqlite3.
-        'PASSWORD': 'xxxxx',                  # Not used with sqlite3.
+        'NAME': 'fusoci',                      # Or path to database file if using sqlite3.
+        'USER': 'fusoci',                      # Not used with sqlite3.
+        'PASSWORD': 'secret',                  # Not used with sqlite3.
         'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
         'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
     }
@@ -94,7 +94,7 @@
 )
 
 # Make this unique, and don't share it with anybody.
-SECRET_KEY = 'gzw==4hc32u9f9h8saddsddas$0cqc#dfsdfds@7pf*9nzj'
+SECRET_KEY = 'secret'
 
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
@@ -208,35 +208,29 @@
     },
 }
 
-#Password normale
-EMAIL_HOST='smtp.xxx.it'
-EMAIL_PORT=25
-EMAIL_HOST_USER='xxx'
-EMAIL_HOST_PASSWORD='xxxx'
-#EMAIL_USE_TLS=True
-#EMAIL_HOST = 'localhost'
+EMAIL_HOST='localhost'
 DEFAULT_FROM_EMAIL = 'noreply@fusolab.net'
 #url tessera
 URL_CARD = 'http://127.0.0.1/cgi-bin/fusocard.cgi'
 
 #lista indirizzi email per i conrolli apertura/chiusura
-EMAIL_NOTIFICATION_LIST = ['xxxx@fusolab.net','xxxx.com']
+EMAIL_NOTIFICATION_LIST = ['amministrazione@fusolab.net','dario.luzzi@gmail.com']
 MONEY_DELTA = 10.0
 
 # password aperture cancello
-OPEN_GATE_PW = "xxxx" 
-OPEN_DOOR_PW = "xxxx"
-IP_OPENER = "xxx"
+OPEN_GATE_PW = "secret" 
+OPEN_DOOR_PW = "secret"
+IP_OPENER = "10.172.0.16"
 PORT_OPENER = 8888
 
 # arduini bar
-BAR_SOPRA_IP = "10.172.0.X"
+BAR_SOPRA_IP = "10.172.0.14"
 BAR_SOPRA_PORT = 10000
 
-BAR_SOTTO_IP = "10.172.0.X"
+BAR_SOTTO_IP = "10.172.0.17"
 BAR_SOTTO_PORT = 10000
 
 #bara di led
-BARALED_IP = "10.172.0.X"
+BARALED_IP = "10.172.0.18"
 BARALED_PORT = 8888 
 
diff --git a/importa_data.py b/importa_data.py
new file mode 100755
index 0000000..9843e35
--- /dev/null
+++ b/importa_data.py
@@ -0,0 +1,275 @@
+#!/usr/bin/env python
+
+import sys, os
+from json import dumps, loads, JSONEncoder
+
+sys.path.append('/var/www/fusolab/')
+os.environ['DJANGO_SETTINGS_MODULE'] = 'fusolab2_0.settings'
+from django.contrib.auth.models import User, Group
+from bar.models import *
+from base.models import *
+from ingresso.models import *
+from registration.models import *
+from reports.models import *
+from bar.managers import *
+from salutatore.models import *
+import time
+import iso8601
+from copy import deepcopy
+musers = {}
+# USERS
+def import_user():
+    print "Importo USER"
+    f = open('users.json', 'r')
+    for o in loads(f.read()):
+        u = User()
+        #u.pk = o['pk']
+        musers[o['pk']] = {'old_fields':  o['fields']}
+        print "PK:", o['pk']
+        print "nome:", o['fields']['first_name'],  o['fields']['last_name']
+
+        try:
+            g = Group.objects.get(name = "turnisti")
+        except:
+            g = None
+        if not g:
+            g = Group.objects.create(name = "turnisti")
+            g.save()
+
+        for k,v in o['fields'].items():
+            toadd = False 
+            if (k == "is_superuser" or k == 'is_staff') and v == True:
+                v = False
+                toadd = True
+                #add user in turnisti
+            # problema con 3584
+            #if k== "user_permissions" and o['pk'] == 3584:
+            #    v = []
+            print k,v
+            if k != 'groups' and k != "user_permissions":
+                setattr(u, k, v)
+        print "Aggiungo: " , u
+        if u.username == 'fusoci':
+            u.is_superuser = u.is_staff = True
+        if u.username != 'root':
+            #u.save()
+            u = User.objects.get(username = o['fields']['username'])
+            musers[o['pk']]['new_pk'] = u.pk
+            if toadd:
+                #u.groups.add(g) 
+                #u.save()
+                pass
+
+    f.close()
+
+muserprofile = {}
+#USERPROFILES
+def import_userprofile():
+    print "Importo USERPROFILE"
+    f = open('userprofiles.json', 'r')
+    for o in loads(f.read()):
+        print "pk: " , o['pk']
+        try:
+            u =  UserProfile.objects.get(user__pk = musers[o['fields']['user']]['new_pk'])
+        except:
+            u =  UserProfile()
+        for k,v in o['fields'].items():
+            if k == 'user':
+                #k = 'user_id'
+                v = User.objects.get(pk = musers[v]['new_pk'] )
+            setattr(u, k, v)
+        print "Aggiungo: " , u
+        #u.full_clean()
+        #u.save()
+        muserprofile[o['pk']] = u.pk
+    f.close()
+
+
+#CARD
+def import_card():
+    print "Importo CARD"
+    f = open('cards.json', 'r')
+    for o in loads(f.read()):
+        u =  Card()
+        for k,v in o['fields'].items():
+            if k == 'user':
+                v = UserProfile.objects.get(pk = muserprofile[v])
+                #k = 'user_id'
+            setattr(u, k, v)
+        print "Aggiungo card: "# , u
+        #u.full_clean()
+        u.save()
+    f.close()
+
+#GREETINGS
+def import_greeting():
+    print "Importo GREETING"
+    f = open('greetings.json', 'r')
+    for o in loads(f.read()):
+        u =  Greeting()
+        for k,v in o['fields'].items():
+            if k == 'user':
+                #k = 'user_id'
+                v = UserProfile.objects.get(pk = muserprofile[v])
+            setattr(u, k, v)
+        print "Aggiungo greeting: "# , u
+        #u.full_clean()
+        u.save()
+    f.close()
+
+#PRODUCT
+def import_product():
+    print "Importo PRODUCTS"
+    f = open('products.json', 'r')
+    for o in loads(f.read()):
+        u =  Product()
+        for k,v in o['fields'].items():
+            if k != 'internal_cost':
+                setattr(u, k, v)
+        print "Aggiungo products: "# , u
+        #u.full_clean()
+        u.save()
+    f.close()
+
+#RECEIPT
+mreceipts = {}
+def import_receipt():
+    print "Importo RECEIPT"
+    f = open('receipts.json', 'r')
+    for o in loads(f.read()):
+        u =  Receipt()
+        for k,v in o['fields'].items():
+            if k == 'cashier':
+                v = UserProfile.objects.get(pk = muserprofile[v])
+                #k = 'cashier_id'
+            setattr(u, k, v)
+        print "Aggiungo purchased products: "# , u
+        #u.full_clean()
+        u.save()
+        mreceipts[o['pk']] = u.pk
+    f.close()
+
+
+
+#PURCHASEDPRODUCT
+def import_purchasedproduct():
+    print "Importo PURCHASEDPRODUCTS"
+    f = open('purchasedproducts.json', 'r')
+    for o in loads(f.read()):
+        u =  PurchasedProduct()
+        for k,v in o['fields'].items():
+            if k == 'receipt':
+                v = Receipt.objects.get(pk = mreceipts[v])
+                #k = 'receipt_id'
+            setattr(u, k, v)
+        print "Aggiungo purchased products: "# , u
+        #u.full_clean()
+        u.save()
+    f.close()
+
+#BarCashBalance
+def import_barcashbalance():
+    print "Importo BARCASHBALANCE"
+    f = open('barcashbalances.json', 'r')
+    for o in loads(f.read()):
+        u =  BarBalance()
+        print o
+        fields = o['fields']
+        #u.date = iso8601.parse_date(fields['date']) if type(fields['date']) is unicode else fields['date']
+        u.date = datetime.strptime(fields['date'], "%Y-%m-%d %H:%M:%S" ) #2012-11-10 02:44:51
+        u.date.replace(tzinfo=None)
+        u.cashier = UserProfile.objects.get(pk = muserprofile[fields['cashier']])
+        u.note = fields['note']
+        # opening
+        u.operation = OPENING #OPENING, CLOSING, PAYMENT, DEPOSIT, WITHDRAW, CASHPOINT
+        u.amount = fields['initial_cash']
+        u.save()
+        u.parent = u
+        u.save()
+        #withdraw
+        if fields['withdraw'] > 0:
+            u2 = deepcopy(u)
+            u2.operation = WITHDRAW
+            u2.pk = None
+            u2.parent = u
+            u2.amount = fields['withdraw']
+            u2.save()
+        #deposit
+        if fields['deposit'] >0:
+            u3 = deepcopy(u)
+            u3.operation = DEPOSIT
+            u3.pk = None
+            u3.parent = u
+            u3.amount = fields['deposit']
+            u3.save()
+        # closing
+        u4 = deepcopy(u)
+        u4.operation = CLOSING
+        u4.pk = None
+        u4.parent = u
+        u4.amount = fields['final_cash']
+        u4.save()
+        print "Aggiungo bar balance : "# , u
+    f.close()
+
+
+#EntranceCashBalance
+def import_entrancecashbalance():
+    f = open('entrancecashbalances.json', 'r')
+    for o in loads(f.read()):
+        u =  EntranceBalance()
+        fields = o['fields']
+        u.date = datetime.strptime(fields['date'], "%Y-%m-%d %H:%M:%S" ) #2012-11-10 02:44:51
+        u.date.replace(tzinfo=None)
+        u.cashier = UserProfile.objects.get(pk = muserprofile[fields['cashier']])
+        u.note = fields['note']
+        # opening
+        u.operation = OPENING #OPENING, CLOSING, PAYMENT, DEPOSIT, WITHDRAW, CASHPOINT
+        u.amount = fields['initial_cash']
+        u.save()
+        u.parent = u
+        u.save()
+        #withdraw
+        if fields['withdraw'] > 0:
+            u2 = deepcopy(u)
+            u2.operation = WITHDRAW
+            u2.pk = None
+            u2.parent = u
+            u2.amount = fields['withdraw']
+            u2.save()
+        #deposit
+        if fields['deposit'] >0:
+            u3 = deepcopy(u)
+            u3.operation = DEPOSIT
+            u3.pk = None
+            u3.parent = u
+            u3.amount = fields['deposit']
+            u3.save()
+        # closing
+        u4 = deepcopy(u)
+        u4.operation = CLOSING
+        u4.pk = None
+        u4.parent = u
+        u4.amount = fields['final_cash']
+        u4.save()
+        print "Aggiungo entrance balance : "# , u
+        #u.full_clean()
+        #u.save()
+    f.close()
+
+def main():
+    import_user()
+    import_userprofile()
+    #import_card()
+    #import_product()
+    #import_greeting()
+    #import_receipt()
+    #import_purchasedproduct()
+    # problemi sul parent dei primi valori
+    import_barcashbalance()
+    import_entrancecashbalance()
+
+if  __name__ =='__main__':main()
+
+#TODO ripristinare add now in receipt
+# ripristinare email tesoriere
diff --git a/importa_data_solo_utenti.py b/importa_data_solo_utenti.py
new file mode 100755
index 0000000..b6767db
--- /dev/null
+++ b/importa_data_solo_utenti.py
@@ -0,0 +1,275 @@
+#!/usr/bin/env python
+
+import sys, os
+from json import dumps, loads, JSONEncoder
+
+sys.path.append('/var/www/fusolab/')
+os.environ['DJANGO_SETTINGS_MODULE'] = 'fusolab2_0.settings'
+from django.contrib.auth.models import User, Group
+from bar.models import *
+from base.models import *
+from ingresso.models import *
+from registration.models import *
+from reports.models import *
+from bar.managers import *
+from salutatore.models import *
+import time
+import iso8601
+from copy import deepcopy
+musers = {}
+# USERS
+def import_user():
+    print "Importo USER"
+    f = open('users.json', 'r')
+    for o in loads(f.read()):
+        u = User()
+        #u.pk = o['pk']
+        musers[o['pk']] = {'old_fields':  o['fields']}
+        print "PK:", o['pk']
+        print "nome:", o['fields']['first_name'],  o['fields']['last_name']
+
+        try:
+            g = Group.objects.get(name = "turnisti")
+        except:
+            g = None
+        if not g:
+            g = Group.objects.create(name = "turnisti")
+            g.save()
+
+        for k,v in o['fields'].items():
+            toadd = False 
+            if (k == "is_superuser" or k == 'is_staff') and v == True:
+                v = False
+                toadd = True
+                #add user in turnisti
+            # problema con 3584
+            #if k== "user_permissions" and o['pk'] == 3584:
+            #    v = []
+            print k,v
+            if k != 'groups' and k != "user_permissions":
+                setattr(u, k, v)
+        print "Aggiungo: " , u
+        if u.username == 'fusoci':
+            u.is_superuser = u.is_staff = True
+        if u.username != 'root':
+            u.save()
+            #u = User.objects.get(username = o['fields']['username'])
+            musers[o['pk']]['new_pk'] = u.pk
+            if toadd:
+                u.groups.add(g) 
+                u.save()
+                pass
+
+    f.close()
+
+muserprofile = {}
+#USERPROFILES
+def import_userprofile():
+    print "Importo USERPROFILE"
+    f = open('userprofiles.json', 'r')
+    for o in loads(f.read()):
+        print "pk: " , o['pk']
+        try:
+            u =  UserProfile.objects.get(user__pk = musers[o['fields']['user']]['new_pk'])
+        except:
+            u =  UserProfile()
+        for k,v in o['fields'].items():
+            if k == 'user':
+                #k = 'user_id'
+                v = User.objects.get(pk = musers[v]['new_pk'] )
+            setattr(u, k, v)
+        print "Aggiungo: " , u
+        #u.full_clean()
+        u.save()
+        muserprofile[o['pk']] = u.pk
+    f.close()
+
+
+#CARD
+def import_card():
+    print "Importo CARD"
+    f = open('cards.json', 'r')
+    for o in loads(f.read()):
+        u =  Card()
+        for k,v in o['fields'].items():
+            if k == 'user':
+                v = UserProfile.objects.get(pk = muserprofile[v])
+                #k = 'user_id'
+            setattr(u, k, v)
+        print "Aggiungo card: "# , u
+        #u.full_clean()
+        u.save()
+    f.close()
+
+#GREETINGS
+def import_greeting():
+    print "Importo GREETING"
+    f = open('greetings.json', 'r')
+    for o in loads(f.read()):
+        u =  Greeting()
+        for k,v in o['fields'].items():
+            if k == 'user':
+                #k = 'user_id'
+                v = UserProfile.objects.get(pk = muserprofile[v])
+            setattr(u, k, v)
+        print "Aggiungo greeting: "# , u
+        #u.full_clean()
+        u.save()
+    f.close()
+
+#PRODUCT
+def import_product():
+    print "Importo PRODUCTS"
+    f = open('products.json', 'r')
+    for o in loads(f.read()):
+        u =  Product()
+        for k,v in o['fields'].items():
+            if k != 'internal_cost':
+                setattr(u, k, v)
+        print "Aggiungo products: "# , u
+        #u.full_clean()
+        u.save()
+    f.close()
+
+#RECEIPT
+mreceipts = {}
+def import_receipt():
+    print "Importo RECEIPT"
+    f = open('receipts.json', 'r')
+    for o in loads(f.read()):
+        u =  Receipt()
+        for k,v in o['fields'].items():
+            if k == 'cashier':
+                v = UserProfile.objects.get(pk = muserprofile[v])
+                #k = 'cashier_id'
+            setattr(u, k, v)
+        print "Aggiungo purchased products: "# , u
+        #u.full_clean()
+        u.save()
+        mreceipts[o['pk']] = u.pk
+    f.close()
+
+
+
+#PURCHASEDPRODUCT
+def import_purchasedproduct():
+    print "Importo PURCHASEDPRODUCTS"
+    f = open('purchasedproducts.json', 'r')
+    for o in loads(f.read()):
+        u =  PurchasedProduct()
+        for k,v in o['fields'].items():
+            if k == 'receipt':
+                v = Receipt.objects.get(pk = mreceipts[v])
+                #k = 'receipt_id'
+            setattr(u, k, v)
+        print "Aggiungo purchased products: "# , u
+        #u.full_clean()
+        u.save()
+    f.close()
+
+#BarCashBalance
+def import_barcashbalance():
+    print "Importo BARCASHBALANCE"
+    f = open('barcashbalances.json', 'r')
+    for o in loads(f.read()):
+        u =  BarBalance()
+        print o
+        fields = o['fields']
+        #u.date = iso8601.parse_date(fields['date']) if type(fields['date']) is unicode else fields['date']
+        u.date = datetime.strptime(fields['date'], "%Y-%m-%d %H:%M:%S" ) #2012-11-10 02:44:51
+        u.date.replace(tzinfo=None)
+        u.cashier = UserProfile.objects.get(pk = muserprofile[fields['cashier']])
+        u.note = fields['note']
+        # opening
+        u.operation = OPENING #OPENING, CLOSING, PAYMENT, DEPOSIT, WITHDRAW, CASHPOINT
+        u.amount = fields['initial_cash']
+        u.save()
+        u.parent = u
+        u.save()
+        #withdraw
+        if fields['withdraw'] > 0:
+            u2 = deepcopy(u)
+            u2.operation = WITHDRAW
+            u2.pk = None
+            u2.parent = u
+            u2.amount = fields['withdraw']
+            u2.save()
+        #deposit
+        if fields['deposit'] >0:
+            u3 = deepcopy(u)
+            u3.operation = DEPOSIT
+            u3.pk = None
+            u3.parent = u
+            u3.amount = fields['deposit']
+            u3.save()
+        # closing
+        u4 = deepcopy(u)
+        u4.operation = CLOSING
+        u4.pk = None
+        u4.parent = u
+        u4.amount = fields['final_cash']
+        u4.save()
+        print "Aggiungo bar balance : "# , u
+    f.close()
+
+
+#EntranceCashBalance
+def import_entrancecashbalance():
+    f = open('entrancecashbalances.json', 'r')
+    for o in loads(f.read()):
+        u =  EntranceBalance()
+        fields = o['fields']
+        u.date = datetime.strptime(fields['date'], "%Y-%m-%d %H:%M:%S" ) #2012-11-10 02:44:51
+        u.date.replace(tzinfo=None)
+        u.cashier = UserProfile.objects.get(pk = muserprofile[fields['cashier']])
+        u.note = fields['note']
+        # opening
+        u.operation = OPENING #OPENING, CLOSING, PAYMENT, DEPOSIT, WITHDRAW, CASHPOINT
+        u.amount = fields['initial_cash']
+        u.save()
+        u.parent = u
+        u.save()
+        #withdraw
+        if fields['withdraw'] > 0:
+            u2 = deepcopy(u)
+            u2.operation = WITHDRAW
+            u2.pk = None
+            u2.parent = u
+            u2.amount = fields['withdraw']
+            u2.save()
+        #deposit
+        if fields['deposit'] >0:
+            u3 = deepcopy(u)
+            u3.operation = DEPOSIT
+            u3.pk = None
+            u3.parent = u
+            u3.amount = fields['deposit']
+            u3.save()
+        # closing
+        u4 = deepcopy(u)
+        u4.operation = CLOSING
+        u4.pk = None
+        u4.parent = u
+        u4.amount = fields['final_cash']
+        u4.save()
+        print "Aggiungo entrance balance : "# , u
+        #u.full_clean()
+        #u.save()
+    f.close()
+
+def main():
+    import_user()
+    import_userprofile()
+    import_card()
+    import_product()
+    import_greeting()
+    #import_receipt()
+    #import_purchasedproduct()
+    # problemi sul parent dei primi valori
+    #import_barcashbalance()
+    #import_entrancecashbalance()
+
+if  __name__ =='__main__':main()
+
+#TODO ripristinare add now in receipt
+# ripristinare email tesoriere