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

app/models/cash_registers_move.rb

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