Modificação do campo name para permitir textos maiores que serão usad…

…os na discriminação de serviços

br_account_einvoice/models/account_invoice.py

@@ -170,9 +170,6 @@ def _prepare_edoc_item_vals(self, line):
     def _prepare_edoc_vals(self, invoice, inv_lines):
         num_controle = int(''.join([str(SystemRandom().randrange(9))
                                     for i in range(8)]))
-        descricao = ''
-        for line in inv_lines:
-            descricao += line.name + '\n'
         vals = {
             'name': invoice.number,
             'invoice_id': invoice.id,
@@ -211,7 +208,6 @@ def _prepare_edoc_vals(self, invoice, inv_lines):
             'valor_retencao_csll': invoice.csll_retention,
             'valor_bc_inss': invoice.inss_base,
             'valor_retencao_inss': invoice.inss_retention,
-            'discriminacao_servicos': descricao,
         }
 
         eletronic_items = []

br_account_einvoice/models/invoice_eletronic.py

@@ -187,8 +187,6 @@ class InvoiceEletronic(models.Model):
     email_sent = fields.Boolean(string=u"Email enviado", default=False,
                                 readonly=True, states=STATE)
 
-    discriminacao_servicos = fields.Text('Discriminação de Serviços')
-
     def _create_attachment(self, prefix, event, data):
         file_name = '%s-%s.xml' % (
             prefix, datetime.now().strftime('%Y-%m-%d-%H-%M'))
@@ -328,9 +326,7 @@ def _compute_legal_information(self):
         observacao = self._compute_msg(obs_ids) + (
             self.invoice_id.comment or '')
 
-        if fiscal:
-            self.informacoes_legais = fiscal
-            self.discriminacao_servicos += fiscal + '\n'
+        self.informacoes_legais = fiscal
         self.informacoes_complementares = observacao
 
     def _compute_msg(self, observation_ids):
@@ -493,7 +489,7 @@ class InvoiceEletronicEvent(models.Model):
 class InvoiceEletronicItem(models.Model):
     _name = 'invoice.eletronic.item'
 
-    name = fields.Char(u'Nome', size=100, readonly=True, states=STATE)
+    name = fields.Text(u'Nome', readonly=True, states=STATE)
     company_id = fields.Many2one(
         'res.company', u'Empresa', index=True, readonly=True, states=STATE)
     invoice_eletronic_id = fields.Many2one(

br_account_einvoice/views/invoice_eletronic.xml

@@ -22,16 +22,18 @@
                                     <field name="frete" />
                                     <field name="outras_despesas" />
                                     <field name="valor_liquido" />
-                                    <field name="indicador_total" />
-                                    <field name="item_pedido_compra" />
                                 </group>
                                 <group>
                                     <field name="tipo_produto" />
                                     <field name="cfop" />
                                     <field name="ncm" />
                                     <field name="tributos_estimados" />
+                                    <field name="indicador_total" />
+                                    <field name="item_pedido_compra" />
                                 </group>
                             </group>
+                            <label for="name"/>
+                            <field name="name"/>
                         </page>
 
                         <page name="icms" string="ICMS" attrs="{'invisible': [('tipo_produto', '=', 'service')]}">
@@ -273,7 +275,6 @@
                                 <group>
                                     <field name="informacoes_legais" />
                                     <field name="informacoes_complementares" />
-                                    <field name="discriminacao_servicos" invisible="1" />
                                 </group>
                             </page>
                             <page name="eventos" string="Eventos">

br_base/models/res_company.py

@@ -101,7 +101,7 @@ def _compute_expiry_date(self):
             self.cert_state = 'invalid_password'
         except:
             self.cert_state = 'unknown'
-            _logger.error(
+            _logger.warning(
                 u'Erro desconhecido ao consultar certificado', exc_info=True)
 
     cnpj_cpf = fields.Char(

br_nfse_paulistana/models/invoice_eletronic.py

@@ -35,6 +35,16 @@ class InvoiceEletronicItem(models.Model):
 class InvoiceEletronic(models.Model):
     _inherit = 'invoice.eletronic'
 
+    @api.multi
+    def _compute_discriminacao(self):
+        for item in self:
+            descricao = ''
+            for eletronic_item in item.eletronic_item_ids:
+                descricao += eletronic_item.name + '<br/>'
+            if item.informacoes_legais:
+                descricao += item.informacoes_legais + '<br/>'
+            item.discriminacao_servicos = descricao
+
     operation = fields.Selection(
         [('T', u"Tributado em São Paulo"),
          ('F', u"Tributado Fora de São Paulo"),
@@ -52,6 +62,8 @@ class InvoiceEletronic(models.Model):
     numero_nfse = fields.Char(
         string=u"Número NFSe", size=50, readonly=True, states=STATE)
 
+    discriminacao_servicos = fields.Char(compute='_compute_discriminacao')
+
     def issqn_due_date(self):
         date_emition = datetime.strptime(self.data_emissao, DTFT)
         next_month = date_emition + relativedelta(months=1)
@@ -137,10 +149,15 @@ def _prepare_eletronic_invoice_values(self):
                 'email': self.company_id.partner_id.email or '',
             }
 
+            descricao = ''
             codigo_servico = ''
             for item in self.eletronic_item_ids:
+                descricao += item.name + '\n'
                 codigo_servico = item.codigo_servico_paulistana
 
+            if self.informacoes_legais:
+                descricao += self.informacoes_legais + '\n'
+
             rps = {
                 'tomador': tomador,
                 'prestador': prestador,
@@ -162,7 +179,7 @@ def _prepare_eletronic_invoice_values(self):
                 'aliquota_ir': str("%.2f" % 0.0),
                 'valor_servico': str("%.2f" % self.valor_final),
                 'valor_deducao': '0',
-                'descricao': self.discriminacao_servicos,
+                'descricao': descricao,
                 'deducoes': [],
             }
 

br_nfse_paulistana/reports/danfse_sao_paulo.xml

@@ -181,7 +181,7 @@
                 </div>
                 <div class="col-xs-12">
                     <br />
-                    <span t-field="doc.discriminacao_servicos"></span>
+                    <span t-raw="doc.discriminacao_servicos"></span>
                 </div>
             </div>
             <div class="row" style="border: 1px solid black;padding: 0 0 5px 5px;">