account.py

@@ -50,20 +50,18 @@ class Configuration(metaclass=PoolMeta):
         fields.Selection('get_facturae_service', "Factura-e Service",
         help='Service to be used when post the invoice'))
     invoice_facturae_after = fields.TimeDelta("Send Factura-e after",
-        help="Grace period after which the invoice will be sent to the "
-        "facturae service. Applies only if a worker queue is activated.")
+        help="Grace period after which the invoice will be sent to the facturae "
+        "service. Applies only if a worker queue is activated.")
 
     @classmethod
     def default_facturae_service(cls, **pattern):
-        return cls.multivalue_model(
-            'facturae_service').default_facturae_service()
+        return cls.multivalue_model('facturae_service').default_facturae_service()
 
     @classmethod
     def get_facturae_service(cls):
         pool = Pool()
         ConfigurationFacturae = pool.get('account.configuration.facturae')
-        return ConfigurationFacturae.fields_get(['facturae_service'])[
-            'facturae_service']['selection']
+        return ConfigurationFacturae.fields_get(['facturae_service'])['facturae_service']['selection']
 
     @classmethod
     def multivalue_model(cls, field):

invoice.py

@@ -260,7 +260,6 @@ class Invoice(metaclass=PoolMeta):
         # send facturae to service
         if not service and config.facturae_service:
             service = config.facturae_service
-        if service:
             if not self.invoice_facturae:
                 facturae_content = self.get_facturae()
                 self._validate_facturae(facturae_content)
@@ -272,7 +271,7 @@ class Invoice(metaclass=PoolMeta):
                 self.invoice_facturae = invoice_facturae
                 self.save()
 
-            if self.invoice_facturae and service != 'only_file':
+            if self.invoice_facturae and service and service != 'only_file':
                 with transaction.set_context(
                         queue_scheduled_at=config.invoice_facturae_after):
                     Invoice.__queue__.send_facturae(self, service)