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

app/controllers/sales_controller.rb

@@ -48,7 +48,7 @@ class SalesController < ApplicationController
     pointsale = Pointsale.find(current_user.pointsale_id)
     @opened_cash_registers = pointsale.open_cash_registers.abiertas
     @sale.open_cash_register_id = session[:open_cash_register_id] || nil
-    @seller = @sale.seller_id.present? ? @sale.seller_id : pointsale.sales.activas.last.seller_id
+    @seller = @sale.seller_id.present? ? @sale.seller_id : (pointsale.sales.present? ? pointsale.sales.activas.last.seller_id : nil)
     if @pre_sales.present?
       @sale.saletype = @pre_sales[0].sale_type
       @sale.customer_id = @pre_sales[0].customer_id