mirror of
https://gitlab.com/flectra-hq/flectra.git
synced 2026-10-25 23:40:05 -05:00
[PATCH] Upstream patch - 25042023
This commit is contained in:
1 parent
091c064870
commit
1b7e8e05f6
3 files changed
+6
-3
No files matched your search
@@ -471,7 +471,7 @@ class AccountEdiFormat(models.Model):
|
||||
except RedirectWarning as rw:
|
||||
raise rw
|
||||
except Exception as e:
|
||||
_logger.exception("Error importing attachment \"%s\" as invoice with format \"%s\"", file_data['filename'], edi_format.name, str(e))
|
||||
_logger.exception("Error importing attachment \"%s\" as invoice with format \"%s\"", file_data['filename'], edi_format.name, exc_info=True)
|
||||
if res:
|
||||
if 'extract_state' in res:
|
||||
# Bypass the OCR to prevent overwriting data when an EDI was succesfully imported.
|
||||
@@ -498,7 +498,7 @@ class AccountEdiFormat(models.Model):
|
||||
else: # file_data['type'] == 'binary'
|
||||
res = edi_format._update_invoice_from_binary(file_data['filename'], file_data['content'], file_data['extension'], invoice)
|
||||
except Exception as e:
|
||||
_logger.exception("Error importing attachment \"%s\" as invoice with format \"%s\"", file_data['filename'], edi_format.name, str(e))
|
||||
_logger.exception("Error importing attachment \"%s\" as invoice with format \"%s\"", file_data['filename'], edi_format.name, exc_info=True)
|
||||
if res:
|
||||
if 'extract_state' in res:
|
||||
# Bypass the OCR to prevent overwriting data when an EDI was succesfully imported.
|
||||
|
||||
@@ -864,7 +864,9 @@
|
||||
<field name="binding_view_types">list</field>
|
||||
<field name="state">code</field>
|
||||
<field name="code">
|
||||
if record:
|
||||
if not 'opportunity' in records.mapped('type'):
|
||||
records.action_set_lost()
|
||||
elif records:
|
||||
action_values = env.ref('crm.crm_lead_lost_action').sudo().read()[0]
|
||||
action_values.update({'context': env.context})
|
||||
action = action_values
|
||||
|
||||
@@ -1361,6 +1361,7 @@ header {
|
||||
height: 1.5em;
|
||||
margin-right: 0.2em;
|
||||
border-radius: $rounded-pill;
|
||||
object-fit: cover;
|
||||
}
|
||||
span.list-inline-item.o_add_language:last-child {
|
||||
display: none !important; // Hide the separator if it is the last list item
|
||||
|
||||
Reference in new issue
Block a user