Merge branch 'chemi_branch' of SML/pos-boutique into master

app/models/cash_registers_move.rb

@@ -93,7 +93,8 @@ class CashRegistersMove < ActiveRecord::Base
         self.quantity = received.to_f > total ? total : received.to_f
       end
     else
-      self.quantity = received.to_f
+      # self.quantity = received.to_f
+      self.received = ""
       self.change = 0
     end
   end

app/views/devise/passwords/new.html.erb

@@ -4,7 +4,7 @@
 			<div class="row bs-reset">
 				<div class="col-md-6 bs-reset">
 					<div class="login-bg" style="background-image:url(assets/login/bg2.jpg)">
-						<%= image_tag "logos/logo-default.png", :class => "login-logo" %>
+						<%= image_tag "logos/logo_ventes.png", :class => "login-logo" %>
 					</div>
 				</div>
 				<div class="col-md-6 login-container bs-reset">

app/views/layouts/application.html.erb

@@ -36,7 +36,7 @@
 						<!-- BEGIN LOGO -->
 						<div class="page-logo">
 							<%= link_to root_path do %>
-							  <%= image_tag "logos/logo-default.png", { class: "logo-default" } %>
+							  <%= image_tag "logos/logo_ventes.png", { class: "logo-default" } %>
 							<% end %>
 						</div>
 						<!-- END LOGO -->

vendor/assets/stylesheets/global/layout.css

@@ -90,7 +90,7 @@ Page Header
       width: 255px;
       height: 75px; }
       .page-header .page-header-top .page-logo .logo-default {
-        margin: 29.5px 0 0 0; }
+        margin: 15px 0 0 0; }
     .page-header .page-header-top .top-menu {
       margin: 13px 0 0;
       padding: 0;
@@ -786,7 +786,7 @@ Page Header
       .page-header .page-header-top .top-menu .username-hide-mobile {
         display: none; } }
 
-/***  
+/***
 Pace - Page Progress
 ***/
 .pace .pace-progress {
@@ -1398,8 +1398,8 @@ Theme Panel
       .page-quick-sidebar-wrapper .page-quick-sidebar .page-quick-sidebar-settings .page-quick-sidebar-settings-list .list-items li select.form-control {
         padding: 4px 0px !important; }
 
-/***  
-Page Loading      
+/***
+Page Loading
 ***/
 .page-on-load {
   background: #fefefe; }