Skip to content

Commit

Permalink
Merge pull request #6 from ingadhoc/17.0
Browse files Browse the repository at this point in the history
Fork Sync Branch 17.0
  • Loading branch information
btl-bot authored Jan 9, 2025
2 parents 31de229 + 7ba8f54 commit d045163
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 6 deletions.
3 changes: 2 additions & 1 deletion account_debt_report/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
##############################################################################
{
'name': 'Account Debt Report',
'version': "17.0.2.0.0",
'version': "17.0.2.1.0",
'category': 'Account Reporting',
'author': 'ADHOC SA',
'website': 'www.adhoc.com.ar',
Expand All @@ -33,6 +33,7 @@
'data/mail_template_data.xml',
'security/ir.model.access.csv',
'wizard/account_debt_report_wizard_view.xml',
'views/account_move_line.xml',
],
'demo': [
],
Expand Down
16 changes: 15 additions & 1 deletion account_debt_report/models/res_partner.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,19 @@
class ResPartner(models.Model):
_inherit = 'res.partner'

def action_open_debt_report_wizard(self):

return {
'type': 'ir.actions.act_window',
'res_model': 'account.debt.report.wizard',
'view_mode': 'form',
'view_id': self.env.ref('account_debt_report.account_debt_report_wizard_form').id,
'target': 'new',
'context': {
'partner_id': self.id,
},
}

def _get_debt_report_lines(self):
# TODO ver si borramos este metodo que no tiene mucho sentido (get_line_vals)
def get_line_vals(
Expand Down Expand Up @@ -120,7 +133,8 @@ def get_line_vals(
amount_residual = record.amount_residual
amount_currency = record.amount_currency
show_currency = record.currency_id != record.company_id.currency_id
name += ' - ' + record.journal_id.name
if record.payment_id:
name += ' - ' + record.journal_id.name

# TODO tal vez la suma podriamos probar hacerla en el xls como hacemos en libro iva v11/v12
res.append(get_line_vals(
Expand Down
Binary file modified account_debt_report/report/account_debt_report.ods
Binary file not shown.
12 changes: 12 additions & 0 deletions account_debt_report/views/account_move_line.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<odoo>
<record id="view_move_line_payment_tree" model="ir.ui.view">
<field name="name">account.move.line.inherit.view.tree</field>
<field name="model">account.move.line</field>
<field name="inherit_id" ref="account.view_move_line_payment_tree"/>
<field name="arch" type="xml">
<groupby name="partner_id">
<button type="object" name="action_open_debt_report_wizard" icon="fa-file-o" title="Debt Report"/>
</groupby>
</field>
</record>
</odoo>
6 changes: 5 additions & 1 deletion account_interests/models/res_company_interest.py
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,11 @@ def _prepare_interest_invoice(self, line, to_date, journal):
}

# hack para evitar modulo glue con l10n_latam_document
if journal._fields.get('l10n_latam_use_documents') and journal.l10n_latam_use_documents:
# hasta el momento tenemos feedback de dos clientes uruguayos de que los ajustes por intereses
# se hacen comoo factura normal y no ND. Si eventualmente otros clintes solicitan ND tendremos
# que analizar hacerlo parametrizable y además cambios en validación electrónica con DGI
# porque actualmente exige vincular una factura original (implementar poder pasar indicadores globales)
if journal.country_code != 'UY' and journal._fields.get('l10n_latam_use_documents') and journal.l10n_latam_use_documents:
debit_note = self.env['account.move'].new({
'move_type': 'out_invoice',
'journal_id': journal.id,
Expand Down
23 changes: 20 additions & 3 deletions account_ux/i18n/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
# Translators:
# feg, 2024
# Gonzalo, 2024
# Juan José Scarafía <[email protected]>, 2024
# Juan José Scarafía <[email protected]>, 2025
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 17.0+e\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-01-01 06:55+0000\n"
"POT-Creation-Date: 2025-01-07 15:05+0000\n"
"PO-Revision-Date: 2023-11-23 13:23+0000\n"
"Last-Translator: Juan José Scarafía <[email protected]>, 2024\n"
"Last-Translator: Juan José Scarafía <[email protected]>, 2025\n"
"Language-Team: Spanish (https://app.transifex.com/adhoc/teams/46451/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -52,6 +52,23 @@ msgstr "Grupo de cuenta"
msgid "Add an internal note..."
msgstr "Agregar una nota interna"

#. module: account_ux
#: model:ir.model.fields,field_description:account_ux.field_account_account__algolia_search
#: model:ir.model.fields,field_description:account_ux.field_account_bank_statement_line__algolia_search
#: model:ir.model.fields,field_description:account_ux.field_account_change_currency__algolia_search
#: model:ir.model.fields,field_description:account_ux.field_account_chart_template__algolia_search
#: model:ir.model.fields,field_description:account_ux.field_account_group__algolia_search
#: model:ir.model.fields,field_description:account_ux.field_account_invoice_report__algolia_search
#: model:ir.model.fields,field_description:account_ux.field_account_journal__algolia_search
#: model:ir.model.fields,field_description:account_ux.field_account_move__algolia_search
#: model:ir.model.fields,field_description:account_ux.field_account_move_line__algolia_search
#: model:ir.model.fields,field_description:account_ux.field_account_payment__algolia_search
#: model:ir.model.fields,field_description:account_ux.field_res_company__algolia_search
#: model:ir.model.fields,field_description:account_ux.field_res_config_settings__algolia_search
#: model:ir.model.fields,field_description:account_ux.field_res_currency_rate__algolia_search
msgid "Algolia Search"
msgstr "Busqueda Avanzada"

#. module: account_ux
#: model_terms:ir.ui.view,arch_db:account_ux.view_account_invoice_tree
msgid "Amount total"
Expand Down

0 comments on commit d045163

Please sign in to comment.