diff --git a/odex25_transactions/exp_transaction_documents/email_templates/incoming_templates.xml b/odex25_transactions/exp_transaction_documents/email_templates/incoming_templates.xml index 0c1e90c1c..9cc9e83e4 100644 --- a/odex25_transactions/exp_transaction_documents/email_templates/incoming_templates.xml +++ b/odex25_transactions/exp_transaction_documents/email_templates/incoming_templates.xml @@ -47,8 +47,10 @@
- رابط المعاملة +
${user.company_id.name} diff --git a/odex25_transactions/exp_transaction_documents/email_templates/internal_templates.xml b/odex25_transactions/exp_transaction_documents/email_templates/internal_templates.xml index fe7969d23..610fa7cfb 100644 --- a/odex25_transactions/exp_transaction_documents/email_templates/internal_templates.xml +++ b/odex25_transactions/exp_transaction_documents/email_templates/internal_templates.xml @@ -244,8 +244,10 @@
- رابط المعاملة +
${user.company_id.name} diff --git a/odex25_transactions/exp_transaction_documents/email_templates/out_templates.xml b/odex25_transactions/exp_transaction_documents/email_templates/out_templates.xml index 58908461f..9ea68a1ca 100644 --- a/odex25_transactions/exp_transaction_documents/email_templates/out_templates.xml +++ b/odex25_transactions/exp_transaction_documents/email_templates/out_templates.xml @@ -43,8 +43,10 @@
- رابط المعاملة +
${user.company_id.name} diff --git a/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py b/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py index 4fcf389b2..a7da1ecd4 100644 --- a/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py +++ b/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py @@ -104,13 +104,12 @@ class IncomingTransaction(models.Model): @api.model def get_url(self): url = u'' - action = self.env.ref('exp_transaction_documents.forward_incoming_external_tran_action', False) + action = self.env.ref( + 'exp_transaction_documents.incoming_internal_tran_action', False) Param = self.env['ir.config_parameter'].sudo() - base_url = Param.get_param('web.base.url', self.env.user.company_id.website) - if action: return u'{}/web#id={}&model=incoming.transaction&view_type=form&action={}'.format( - base_url, self.id, action.id) + Param.get_param('web.base.url', self.env.user.company_id.website), self.id, action.id) return url @api.depends('incoming_date') diff --git a/odex25_transactions/exp_transaction_documents/models/internal_transaction.py b/odex25_transactions/exp_transaction_documents/models/internal_transaction.py index 057f2e047..3a9b928d9 100644 --- a/odex25_transactions/exp_transaction_documents/models/internal_transaction.py +++ b/odex25_transactions/exp_transaction_documents/models/internal_transaction.py @@ -91,13 +91,12 @@ class InternalTransaction(models.Model): @api.model def get_url(self): url = u'' - action = self.env.ref('exp_transaction_documents.forward_incoming_external_tran_action', False) + action = self.env.ref( + 'exp_transaction_documents.incoming_internal_tran_action', False) Param = self.env['ir.config_parameter'].sudo() - base_url = Param.get_param('web.base.url', self.env.user.company_id.website) - if action: return u'{}/web#id={}&model=incoming.transaction&view_type=form&action={}'.format( - base_url, self.id, action.id) + Param.get_param('web.base.url', self.env.user.company_id.website), self.id, action.id) return url @api.depends('attachment_rule_ids') diff --git a/odex25_transactions/exp_transaction_documents/models/outgoing_transaction.py b/odex25_transactions/exp_transaction_documents/models/outgoing_transaction.py index d92d2bb60..85773eb51 100644 --- a/odex25_transactions/exp_transaction_documents/models/outgoing_transaction.py +++ b/odex25_transactions/exp_transaction_documents/models/outgoing_transaction.py @@ -87,13 +87,12 @@ class OutgoingTransaction(models.Model): @api.model def get_url(self): url = u'' - action = self.env.ref('exp_transaction_documents.forward_incoming_external_tran_action', False) + action = self.env.ref( + 'exp_transaction_documents.incoming_internal_tran_action', False) Param = self.env['ir.config_parameter'].sudo() - base_url = Param.get_param('web.base.url', self.env.user.company_id.website) - if action: return u'{}/web#id={}&model=incoming.transaction&view_type=form&action={}'.format( - base_url, self.id, action.id) + Param.get_param('web.base.url', self.env.user.company_id.website), self.id, action.id) return url def fetch_sequence(self, data=None):