diff --git a/dev_odex30_accounting/odex30_account_3way_match/__init__.py b/dev_odex30_accounting/odex30_account_3way_match/__init__.py new file mode 100644 index 0000000..573a1d1 --- /dev/null +++ b/dev_odex30_accounting/odex30_account_3way_match/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# Part of ODEX. See LICENSE file for full copyright and licensing details. + +from . import models diff --git a/dev_odex30_accounting/odex30_account_3way_match/__manifest__.py b/dev_odex30_accounting/odex30_account_3way_match/__manifest__.py new file mode 100644 index 0000000..a0088c6 --- /dev/null +++ b/dev_odex30_accounting/odex30_account_3way_match/__manifest__.py @@ -0,0 +1,36 @@ +# -*- coding: utf-8 -*- +# Part of ODEX. See LICENSE file for full copyright and licensing details. + +{ + 'name': 'ODEX Account: 3-Way Matching', + 'category': 'Account/Accounting', + 'author': 'ODEX', + 'summary': 'Manage 3-way matching on bills', + 'description': """ +Manage 3-way matching on supplier bills +======================================= + +In this system, you can manage the verification process for supplier bills against +received goods. This ensures that payments are only made when the items +have actually been delivered. + +This feature allows creating the supplier bill based on ordered quantities +while keeping the payment pending until the received quantities on the purchase lines +match the recorded supplier bill. + +The system introduces a "release to pay" status that marks for each bill +whether it is ready for payment. + +Each bill receives one of the following three states: + + - Yes (The bill can be paid) + - No (The bill cannot be paid, delivery is pending) + - Exception (Differences found between received and billed quantities) + """, + 'depends': ['purchase'], + 'data': [ + 'views/account_invoice_view.xml', + 'views/account_journal_dashboard_view.xml' + ], + 'license': 'LGPL-3', +} diff --git a/dev_odex30_accounting/odex30_account_3way_match/i18n/account_3way_match.pot b/dev_odex30_accounting/odex30_account_3way_match/i18n/account_3way_match.pot new file mode 100644 index 0000000..bfe2171 --- /dev/null +++ b/dev_odex30_accounting/odex30_account_3way_match/i18n/account_3way_match.pot @@ -0,0 +1,119 @@ +# Translation of ODEX Server. +# This file contains the translation of the following modules: +# * odex30_account_3way_match +# +msgid "" +msgstr "" +"Project-Id-Version: ODEX Server 18.0+e\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-01-27 13:54+0000\n" +"PO-Revision-Date: 2025-01-27 13:54+0000\n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: odex30_account_3way_match +#: model:ir.model.fields,help:odex30_account_3way_match.field_account_bank_statement_line__release_to_pay_manual +#: model:ir.model.fields,help:odex30_account_3way_match.field_account_move__release_to_pay_manual +msgid "" +" * Yes: you should pay the bill, you have received the products\n" +" * No, you should not pay the bill, you have not received the products\n" +" * Exception, there is a difference between received and billed quantities\n" +"This status is defined automatically, but you can force it by ticking the 'Force Status' checkbox." +msgstr "" + +#. module: odex30_account_3way_match +#: model_terms:ir.ui.view,arch_db:odex30_account_3way_match.account_invoice_filter_inherit_odex30_account_3way_match +msgid "Bills in Exception" +msgstr "" + +#. module: odex30_account_3way_match +#: model_terms:ir.ui.view,arch_db:odex30_account_3way_match.account_invoice_filter_inherit_odex30_account_3way_match +msgid "Bills to Pay" +msgstr "" + +#. module: odex30_account_3way_match +#: model_terms:ir.ui.view,arch_db:odex30_account_3way_match.account_invoice_filter_inherit_odex30_account_3way_match +msgid "Bills to Validate" +msgstr "" + +#. module: odex30_account_3way_match +#: model:ir.model.fields.selection,name:odex30_account_3way_match.selection__account_move__release_to_pay__exception +#: model:ir.model.fields.selection,name:odex30_account_3way_match.selection__account_move__release_to_pay_manual__exception +#: model:ir.model.fields.selection,name:odex30_account_3way_match.selection__account_move_line__can_be_paid__exception +msgid "Exception" +msgstr "" + +#. module: odex30_account_3way_match +#: model:ir.model.fields,field_description:odex30_account_3way_match.field_account_bank_statement_line__force_release_to_pay +#: model:ir.model.fields,field_description:odex30_account_3way_match.field_account_move__force_release_to_pay +msgid "Force Status" +msgstr "" + +#. module: odex30_account_3way_match +#: model:ir.model.fields,help:odex30_account_3way_match.field_account_bank_statement_line__force_release_to_pay +#: model:ir.model.fields,help:odex30_account_3way_match.field_account_move__force_release_to_pay +msgid "" +"Indicates whether the 'Should Be Paid' status is defined automatically or " +"manually." +msgstr "" + +#. module: odex30_account_3way_match +#: model:ir.model,name:odex30_account_3way_match.model_account_journal +msgid "Journal" +msgstr "" + +#. module: odex30_account_3way_match +#: model:ir.model,name:odex30_account_3way_match.model_account_move +msgid "Journal Entry" +msgstr "" + +#. module: odex30_account_3way_match +#: model:ir.model,name:odex30_account_3way_match.model_account_move_line +msgid "Journal Item" +msgstr "" + +#. module: odex30_account_3way_match +#: model:ir.model.fields.selection,name:odex30_account_3way_match.selection__account_move__release_to_pay__no +#: model:ir.model.fields.selection,name:odex30_account_3way_match.selection__account_move__release_to_pay_manual__no +#: model:ir.model.fields.selection,name:odex30_account_3way_match.selection__account_move_line__can_be_paid__no +msgid "No" +msgstr "" + +#. module: odex30_account_3way_match +#: model:ir.model.fields,field_description:odex30_account_3way_match.field_account_bank_statement_line__release_to_pay +#: model:ir.model.fields,field_description:odex30_account_3way_match.field_account_move__release_to_pay +msgid "Release To Pay" +msgstr "" + +#. module: odex30_account_3way_match +#: model:ir.model.fields,field_description:odex30_account_3way_match.field_account_move_line__can_be_paid +msgid "Release to Pay" +msgstr "" + +#. module: odex30_account_3way_match +#: model:ir.model.fields,field_description:odex30_account_3way_match.field_account_bank_statement_line__release_to_pay_manual +#: model:ir.model.fields,field_description:odex30_account_3way_match.field_account_move__release_to_pay_manual +msgid "Should Be Paid" +msgstr "" + +#. module: odex30_account_3way_match +#: model:ir.model.fields,help:odex30_account_3way_match.field_account_bank_statement_line__release_to_pay +#: model:ir.model.fields,help:odex30_account_3way_match.field_account_move__release_to_pay +msgid "" +"This field can take the following values :\n" +" * Yes: you should pay the bill, you have received the products\n" +" * No, you should not pay the bill, you have not received the products\n" +" * Exception, there is a difference between received and billed quantities\n" +"This status is defined automatically, but you can force it by ticking the 'Force Status' checkbox." +msgstr "" + +#. module: odex30_account_3way_match +#: model:ir.model.fields.selection,name:odex30_account_3way_match.selection__account_move__release_to_pay__yes +#: model:ir.model.fields.selection,name:odex30_account_3way_match.selection__account_move__release_to_pay_manual__yes +#: model:ir.model.fields.selection,name:odex30_account_3way_match.selection__account_move_line__can_be_paid__yes +msgid "Yes" +msgstr "" diff --git a/dev_odex30_accounting/odex30_account_3way_match/i18n/ar.po b/dev_odex30_accounting/odex30_account_3way_match/i18n/ar.po new file mode 100644 index 0000000..fca4909 --- /dev/null +++ b/dev_odex30_accounting/odex30_account_3way_match/i18n/ar.po @@ -0,0 +1,132 @@ +# Translation of ODEX Server. +# This file contains the translation of the following modules: +# * odex30_account_3way_match +# +# Translators: +# Wil ODEX, 2025 +# +msgid "" +msgstr "" +"Project-Id-Version: ODEX Server 18.0+e\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-01-27 13:54+0000\n" +"PO-Revision-Date: 2024-09-25 09:43+0000\n" +"Last-Translator: Wil ODEX, 2025\n" +"Language-Team: Arabic (https://app.transifex.com/odoo/teams/41243/ar/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: ar\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" + +#. module: odex30_account_3way_match +#: model:ir.model.fields,help:odex30_account_3way_match.field_account_bank_statement_line__release_to_pay_manual +#: model:ir.model.fields,help:odex30_account_3way_match.field_account_move__release_to_pay_manual +msgid "" +" * Yes: you should pay the bill, you have received the products\n" +" * No, you should not pay the bill, you have not received the products\n" +" * Exception, there is a difference between received and billed quantities\n" +"This status is defined automatically, but you can force it by ticking the 'Force Status' checkbox." +msgstr "" +"* نعم: عليك سداد قيمة الفاتورة، لقد استلمت المنتجات \n" +"* لا: ليس عليك سداد قيمة الفاتورة، لم تستلم المنتجات\n" +" * استثناء: هناك فرق بين الكمية المستلمة والكمية المدفوع قيمتها\n" +"هذه الحالة تُحدد تلقائياً، لكن يمكنك فرض الحالة من خلال تحديد اختيار 'فرض الحالة'." + +#. module: odex30_account_3way_match +#: model_terms:ir.ui.view,arch_db:odex30_account_3way_match.account_invoice_filter_inherit_odex30_account_3way_match +msgid "Bills in Exception" +msgstr "الفواتير المستثناة " + +#. module: odex30_account_3way_match +#: model_terms:ir.ui.view,arch_db:odex30_account_3way_match.account_invoice_filter_inherit_odex30_account_3way_match +msgid "Bills to Pay" +msgstr "الفواتير بانتظار السداد " + +#. module: odex30_account_3way_match +#: model_terms:ir.ui.view,arch_db:odex30_account_3way_match.account_invoice_filter_inherit_odex30_account_3way_match +msgid "Bills to Validate" +msgstr "الفواتير بانتظار التصديق " + +#. module: odex30_account_3way_match +#: model:ir.model.fields.selection,name:odex30_account_3way_match.selection__account_move__release_to_pay__exception +#: model:ir.model.fields.selection,name:odex30_account_3way_match.selection__account_move__release_to_pay_manual__exception +#: model:ir.model.fields.selection,name:odex30_account_3way_match.selection__account_move_line__can_be_paid__exception +msgid "Exception" +msgstr "استثناء " + +#. module: odex30_account_3way_match +#: model:ir.model.fields,field_description:odex30_account_3way_match.field_account_bank_statement_line__force_release_to_pay +#: model:ir.model.fields,field_description:odex30_account_3way_match.field_account_move__force_release_to_pay +msgid "Force Status" +msgstr "فرض الحالة" + +#. module: odex30_account_3way_match +#: model:ir.model.fields,help:odex30_account_3way_match.field_account_bank_statement_line__force_release_to_pay +#: model:ir.model.fields,help:odex30_account_3way_match.field_account_move__force_release_to_pay +msgid "" +"Indicates whether the 'Should Be Paid' status is defined automatically or " +"manually." +msgstr "يحدد إذا ما كانت الحالة 'واجبة السداد' تُعين تلقائياً أم يدوياً. " + +#. module: odex30_account_3way_match +#: model:ir.model,name:odex30_account_3way_match.model_account_journal +msgid "Journal" +msgstr "دفتر اليومية" + +#. module: odex30_account_3way_match +#: model:ir.model,name:odex30_account_3way_match.model_account_move +msgid "Journal Entry" +msgstr "قيد اليومية" + +#. module: odex30_account_3way_match +#: model:ir.model,name:odex30_account_3way_match.model_account_move_line +msgid "Journal Item" +msgstr "عنصر اليومية" + +#. module: odex30_account_3way_match +#: model:ir.model.fields.selection,name:odex30_account_3way_match.selection__account_move__release_to_pay__no +#: model:ir.model.fields.selection,name:odex30_account_3way_match.selection__account_move__release_to_pay_manual__no +#: model:ir.model.fields.selection,name:odex30_account_3way_match.selection__account_move_line__can_be_paid__no +msgid "No" +msgstr "لا" + +#. module: odex30_account_3way_match +#: model:ir.model.fields,field_description:odex30_account_3way_match.field_account_bank_statement_line__release_to_pay +#: model:ir.model.fields,field_description:odex30_account_3way_match.field_account_move__release_to_pay +msgid "Release To Pay" +msgstr "جاهزة للسداد" + +#. module: odex30_account_3way_match +#: model:ir.model.fields,field_description:odex30_account_3way_match.field_account_move_line__can_be_paid +msgid "Release to Pay" +msgstr "جاهزة للسداد" + +#. module: odex30_account_3way_match +#: model:ir.model.fields,field_description:odex30_account_3way_match.field_account_bank_statement_line__release_to_pay_manual +#: model:ir.model.fields,field_description:odex30_account_3way_match.field_account_move__release_to_pay_manual +msgid "Should Be Paid" +msgstr "واجبة السداد" + +#. module: odex30_account_3way_match +#: model:ir.model.fields,help:odex30_account_3way_match.field_account_bank_statement_line__release_to_pay +#: model:ir.model.fields,help:odex30_account_3way_match.field_account_move__release_to_pay +msgid "" +"This field can take the following values :\n" +" * Yes: you should pay the bill, you have received the products\n" +" * No, you should not pay the bill, you have not received the products\n" +" * Exception, there is a difference between received and billed quantities\n" +"This status is defined automatically, but you can force it by ticking the 'Force Status' checkbox." +msgstr "" +"يتحمل هذا الحقل القيم التالية:\n" +" * نعم: عليك سداد قيمة الفاتورة، لقد استلمت المنتجات\n" +" * لا: ليس عليك سداد قيمة الفاتورة، لم تستلم المنتجات\n" +" * استثناء: هناك فرق بين الكمية المستلمة والكمية المدفوع قيمتها\n" +"هذه الحالة تُحدد تلقائياً، لكن يمكنك فرض الحالة من خلال تحديد اختيار 'فرض الحالة'." + +#. module: odex30_account_3way_match +#: model:ir.model.fields.selection,name:odex30_account_3way_match.selection__account_move__release_to_pay__yes +#: model:ir.model.fields.selection,name:odex30_account_3way_match.selection__account_move__release_to_pay_manual__yes +#: model:ir.model.fields.selection,name:odex30_account_3way_match.selection__account_move_line__can_be_paid__yes +msgid "Yes" +msgstr "نعم" diff --git a/dev_odex30_accounting/odex30_account_3way_match/models/__init__.py b/dev_odex30_accounting/odex30_account_3way_match/models/__init__.py new file mode 100644 index 0000000..05c5135 --- /dev/null +++ b/dev_odex30_accounting/odex30_account_3way_match/models/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Part of ODEX. See LICENSE file for full copyright and licensing details. + +from . import account_invoice +from . import account_journal_dashboard diff --git a/dev_odex30_accounting/odex30_account_3way_match/models/account_invoice.py b/dev_odex30_accounting/odex30_account_3way_match/models/account_invoice.py new file mode 100644 index 0000000..f26b902 --- /dev/null +++ b/dev_odex30_accounting/odex30_account_3way_match/models/account_invoice.py @@ -0,0 +1,176 @@ +# -*- coding: utf-8 -*- +# Part of ODEX. See LICENSE file for full copyright and licensing details. + +from odoo import api, fields, models +from odoo.tools.float_utils import float_compare +from odoo.tools.sql import column_exists, create_column + +# Available values for the release_to_pay field. +_release_to_pay_status_list = [('yes', 'Yes'), ('no', 'No'), ('exception', 'Exception')] + +class AccountMove(models.Model): + _inherit = 'account.move' + + def _auto_init(self): + if not column_exists(self.env.cr, "account_move", "release_to_pay"): + # Create column manually to set default value to 'exception' on postgres level. + # This way we avoid heavy computation on module installation. + self.env.cr.execute("ALTER TABLE account_move ADD COLUMN release_to_pay VARCHAR DEFAULT 'exception'") + + return super()._auto_init() + + release_to_pay = fields.Selection( + _release_to_pay_status_list, + compute='_compute_release_to_pay', + copy=False, + store=True, + help="This field can take the following values :\n" + " * Yes: you should pay the bill, you have received the products\n" + " * No, you should not pay the bill, you have not received the products\n" + " * Exception, there is a difference between received and billed quantities\n" + "This status is defined automatically, but you can force it by ticking the 'Force Status' checkbox.") + release_to_pay_manual = fields.Selection( + _release_to_pay_status_list, + string='Should Be Paid', + compute='_compute_release_to_pay_manual', store='True', readonly=False, + help=" * Yes: you should pay the bill, you have received the products\n" + " * No, you should not pay the bill, you have not received the products\n" + " * Exception, there is a difference between received and billed quantities\n" + "This status is defined automatically, but you can force it by ticking the 'Force Status' checkbox.") + force_release_to_pay = fields.Boolean( + string="Force Status", + help="Indicates whether the 'Should Be Paid' status is defined automatically or manually.") + + @api.depends('invoice_line_ids.can_be_paid', 'force_release_to_pay', 'payment_state') + def _compute_release_to_pay(self): + records = self + if self.env.context.get('module') == 'odex30_account_3way_match': + # on module installation we set 'no' for all paid bills and other non relevant records at once + records = records.filtered(lambda r: r.payment_state != 'paid' and r.move_type in ('in_invoice', 'in_refund')) + (self - records).release_to_pay = 'no' + for invoice in records: + if invoice.payment_state == 'paid' or not invoice.is_invoice(include_receipts=True): + # no need to pay, if it's already paid + invoice.release_to_pay = 'no' + elif invoice.force_release_to_pay: + #we must use the manual value contained in release_to_pay_manual + invoice.release_to_pay = invoice.release_to_pay_manual + else: + #otherwise we must compute the field + result = None + for invoice_line in invoice.invoice_line_ids.filtered(lambda l: l.display_type not in ('line_section', 'line_note')): + line_status = invoice_line.can_be_paid + if line_status == 'exception': + #If one line is in exception, the entire bill is + result = 'exception' + break + elif not result: + result = line_status + elif line_status != result: + result = 'exception' + break + #The last two elif conditions model the fact that a + #bill will be in exception if its lines have different status. + #Otherwise, its status will be the one all its lines share. + + #'result' can be None if the bill was entirely empty. + invoice.release_to_pay = result or 'no' + + @api.depends('release_to_pay', 'force_release_to_pay') + def _compute_release_to_pay_manual(self): + for invoice in self: + if not (invoice.payment_state == 'paid' or not invoice.is_invoice(include_receipts=True) or invoice.force_release_to_pay): + invoice.release_to_pay_manual = invoice.release_to_pay + + @api.onchange('release_to_pay_manual') + def _onchange_release_to_pay_manual(self): + if self.release_to_pay and self.release_to_pay_manual != self.release_to_pay: + self.force_release_to_pay = True + + +class AccountMoveLine(models.Model): + _inherit = 'account.move.line' + + def _auto_init(self): + if not column_exists(self.env.cr, "account_move_line", "can_be_paid"): + # Create column manually to set default value to 'exception' on postgres level. + # This way we avoid heavy computation on module installation. + self.env.cr.execute("ALTER TABLE account_move_line ADD COLUMN can_be_paid VARCHAR DEFAULT 'exception'") + + return super()._auto_init() + + + @api.depends('purchase_line_id.qty_received', 'purchase_line_id.qty_invoiced', 'purchase_line_id.product_qty', 'price_unit') + def _can_be_paid(self): + """ Computes the 'release to pay' status of an invoice line, depending on + the invoicing policy of the product linked to it, by calling the dedicated + subfunctions. This function also ensures the line is linked to a purchase + order (otherwise, can_be_paid will be set as 'exception'), and the price + between this order and the invoice did not change (otherwise, again, + the line is put in exception). + """ + precision = self.env['decimal.precision'].precision_get('Product Unit of Measure') + for invoice_line in self: + po_line = invoice_line.purchase_line_id + if po_line: + invoiced_qty = po_line.qty_invoiced + received_qty = po_line.qty_received + ordered_qty = po_line.product_qty + + # A price difference between the original order and the invoice results in an exception + invoice_currency = invoice_line.currency_id + order_currency = po_line.currency_id + invoice_converted_price = invoice_currency._convert( + invoice_line.price_unit, order_currency, invoice_line.company_id, fields.Date.today()) + if order_currency.compare_amounts(po_line.price_unit, invoice_converted_price) != 0: + invoice_line.can_be_paid = 'exception' + continue + + if po_line.product_id.purchase_method == 'purchase': # 'on ordered quantities' + invoice_line._can_be_paid_ordered_qty(invoiced_qty, received_qty, ordered_qty, precision) + else: # 'on received quantities' + invoice_line._can_be_paid_received_qty(invoiced_qty, received_qty, ordered_qty, precision) + + else: # Serves as default if the line is not linked to any Purchase. + invoice_line.can_be_paid = 'exception' + + def _can_be_paid_ordered_qty(self, invoiced_qty, received_qty, ordered_qty, precision): + """ + Gives the release_to_pay status of an invoice line for 'on ordered + quantity' billing policy, if this line's invoice is related to a purchase order. + + This function sets can_be_paid field to one of the following: + 'yes': the content of the line has been ordered and can be invoiced + 'no' : the content of the line hasn't been ordered at all, and cannot be invoiced + 'exception' : only part of the invoice has been ordered + """ + if float_compare(invoiced_qty - self.quantity, ordered_qty, precision_digits=precision) >= 0: + self.can_be_paid = 'no' + elif float_compare(invoiced_qty, ordered_qty, precision_digits=precision) <= 0: + self.can_be_paid = 'yes' + else: + self.can_be_paid = 'exception' + + def _can_be_paid_received_qty(self, invoiced_qty, received_qty, ordered_qty, precision): + """ + Gives the release_to_pay status of an invoice line for 'on received + quantity' billing policy, if this line's invoice is related to a purchase order. + + This function sets can_be_paid field to one of the following: + 'yes': the content of the line has been received and can be invoiced + 'no' : the content of the line hasn't been received at all, and cannot be invoiced + 'exception' : ordered and received quantities differ + """ + if float_compare(invoiced_qty, received_qty, precision_digits=precision) <= 0: + self.can_be_paid = 'yes' + elif received_qty == 0 and float_compare(invoiced_qty, ordered_qty, precision_digits=precision) <= 0: # "and" part to ensure a too high billed quantity results in an exception: + self.can_be_paid = 'no' + else: + self.can_be_paid = 'exception' + + can_be_paid = fields.Selection( + _release_to_pay_status_list, + compute='_can_be_paid', + copy=False, + store=True, + string='Release to Pay') diff --git a/dev_odex30_accounting/odex30_account_3way_match/models/account_journal_dashboard.py b/dev_odex30_accounting/odex30_account_3way_match/models/account_journal_dashboard.py new file mode 100644 index 0000000..85b3ba7 --- /dev/null +++ b/dev_odex30_accounting/odex30_account_3way_match/models/account_journal_dashboard.py @@ -0,0 +1,65 @@ +# -*- coding: utf-8 -*- +# Part of ODEX. See LICENSE file for full copyright and licensing details. +from odoo import fields, models +from odoo.osv import expression +from odoo.tools import SQL + + +class AccountJournal(models.Model): + _inherit = 'account.journal' + + def open_action(self): + action = super(AccountJournal, self).open_action() + view = self.env.ref('account.action_move_in_invoice_type') + if view and action.get("id") == view.id: + action['context']['search_default_in_invoice'] = 0 + account_purchase_filter = self.env.ref('odex30_account_3way_match.account_invoice_filter_inherit_odex30_account_3way_match', False) + action['search_view_id'] = account_purchase_filter and [account_purchase_filter.id, account_purchase_filter.name] or False + return action + + def _get_open_sale_purchase_query(self, journal_type): + # OVERRIDE + assert journal_type in ('sale', 'purchase') + query = self.env['account.move']._where_calc([ + *self.env['account.move']._check_company_domain(self.env.companies), + ('journal_id', 'in', self.ids), + ('payment_state', 'in', ('not_paid', 'partial')), + ('move_type', 'in', ('out_invoice', 'out_refund') if journal_type == 'sale' else ('in_invoice', 'in_refund')), + ('state', '=', 'posted'), + ]) + + selects = [ + SQL("journal_id"), + SQL("company_id"), + SQL("currency_id AS currency"), + SQL("invoice_date_due < %s AS late", fields.Date.context_today(self)), + SQL("SUM(amount_residual_signed) AS amount_total_company"), + SQL("SUM((CASE WHEN move_type = 'in_invoice' THEN -1 ELSE 1 END) * amount_residual) AS amount_total"), + SQL("COUNT(*)"), + SQL("release_to_pay IN ('yes', 'exception') AS to_pay") + ] + + return query, selects + + def _get_draft_sales_purchases_query(self): + # OVERRIDE + domain_sale = [ + ('journal_id', 'in', self.filtered(lambda j: j.type == 'sale').ids), + ('move_type', 'in', self.env['account.move'].get_sale_types(include_receipts=True)) + ] + + domain_purchase = [ + ('journal_id', 'in', self.filtered(lambda j: j.type == 'purchase').ids), + ('move_type', 'in', self.env['account.move'].get_purchase_types(include_receipts=False)), + '|', + ('invoice_date_due', '<', fields.Date.today()), + ('release_to_pay', '=', 'yes') + ] + domain = expression.AND([ + [('state', '=', 'draft'), ('payment_state', 'in', ('not_paid', 'partial'))], + expression.OR([domain_sale, domain_purchase]) + ]) + return self.env['account.move']._where_calc([ + *self.env['account.move']._check_company_domain(self.env.companies), + *domain + ]) diff --git a/dev_odex30_accounting/odex30_account_3way_match/tests/__init__.py b/dev_odex30_accounting/odex30_account_3way_match/tests/__init__.py new file mode 100644 index 0000000..e52ad4b --- /dev/null +++ b/dev_odex30_accounting/odex30_account_3way_match/tests/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Part of ODEX. See LICENSE file for full copyright and licensing details. + +from . import test_release_to_pay_invoice +from . import test_account_journal_dashboard diff --git a/dev_odex30_accounting/odex30_account_3way_match/tests/test_account_journal_dashboard.py b/dev_odex30_accounting/odex30_account_3way_match/tests/test_account_journal_dashboard.py new file mode 100644 index 0000000..7fd1d4c --- /dev/null +++ b/dev_odex30_accounting/odex30_account_3way_match/tests/test_account_journal_dashboard.py @@ -0,0 +1,240 @@ +from freezegun import freeze_time + +from odoo.addons.account.tests.test_account_journal_dashboard_common import TestAccountJournalDashboardCommon + +from odoo.tests import tagged +from odoo.tools.misc import format_amount + + +@tagged('post_install', '-at_install') +class AccountJournalDashboard3WayWatchTest(TestAccountJournalDashboardCommon): + + @classmethod + def init_invoice(cls, move_type, partner=None, invoice_date=None, post=False, products=None, amounts=None, taxes=None, company=False, currency=None, journal=None, invoice_date_due=None, release_to_pay=None): + move = super().init_invoice(move_type, partner, invoice_date, False, products, amounts, taxes, company, currency, journal) + if invoice_date_due: + move.invoice_date_due = invoice_date_due + if release_to_pay: + move.release_to_pay = release_to_pay + if post: + move.action_post() + return move + + def test_sale_purchase_journal_for_purchase(self): + """ + Test different purchase journal setups with or without multicurrency: + 1) Journal with no currency, bills in foreign currency -> dashboard data should be displayed in company currency + 2) Journal in foreign currency, bills in foreign currency -> dashboard data should be displayed in foreign currency + 3) Journal in foreign currency, bills in company currency -> dashboard data should be displayed in foreign currency + 4) Journal in company currency, bills in company currency -> dashboard data should be displayed in company currency + 5) Journal in company currency, bills in foreign currency -> dashboard data should be displayed in company currency + """ + foreign_currency = self.other_currency + company_currency = self.company_data['currency'] + + setup_values = [ + [self.company_data['default_journal_purchase'], foreign_currency], + [self.company_data['default_journal_purchase'].copy({'currency_id': foreign_currency.id, 'default_account_id': self.company_data['default_account_expense'].id}), foreign_currency], + [self.company_data['default_journal_purchase'].copy({'currency_id': foreign_currency.id, 'default_account_id': self.company_data['default_account_expense'].id}), company_currency], + [self.company_data['default_journal_purchase'].copy({'currency_id': company_currency.id, 'default_account_id': self.company_data['default_account_expense'].id}), company_currency], + [self.company_data['default_journal_purchase'].copy({'currency_id': company_currency.id, 'default_account_id': self.company_data['default_account_expense'].id}), foreign_currency], + ] + + expected_vals_list = [ + # number_draft, sum_draft, number_waiting, sum_waiting, number_late, sum_late, currency + [ 1, 100, 1, 55, 1, 55, company_currency], + [ 1, 200, 1, 110, 1, 110, foreign_currency], + [ 1, 400, 1, 220, 1, 220, foreign_currency], + [ 1, 200, 1, 110, 1, 110, company_currency], + [ 1, 100, 1, 55, 1, 55, company_currency], + ] + + for (purchase_journal, bill_currency), expected_vals in zip(setup_values, expected_vals_list): + with self.subTest(purchase_journal_currency=purchase_journal.currency_id, bill_currency=bill_currency, expected_vals=expected_vals): + bill = self.init_invoice('in_invoice', invoice_date='2017-01-01', post=True, amounts=[200], currency=bill_currency, journal=purchase_journal) + _draft_bill = self.init_invoice('in_invoice', invoice_date='2017-01-01', post=False, amounts=[200], currency=bill_currency, journal=purchase_journal) + + payment = self.init_payment(-90, post=True, date='2017-01-01', currency=bill_currency) + (bill + payment.move_id).line_ids.filtered_domain([ + ('account_id', '=', self.company_data['default_account_payable'].id) + ]).reconcile() + + self.assertDashboardPurchaseSaleData(purchase_journal, *expected_vals) + + @freeze_time("2023-03-15") + def test_purchase_journal_numbers_and_sums(self): + company_currency = self.company_data['currency'] + journal = self.company_data['default_journal_purchase'] + + self._create_test_vendor_bills(journal) + + dashboard_data = journal._get_journal_dashboard_data_batched()[journal.id] + # Expected behavior is to have three moves waiting for payment for a total amount of 4440$ one of which would be late + # for a total amount of 40$ (second move has one of three lines late but that's not enough to make the move late) + self.assertEqual(3, dashboard_data['number_waiting']) + self.assertEqual(format_amount(self.env, 4440, company_currency), dashboard_data['sum_waiting']) + self.assertEqual(1, dashboard_data['number_late']) + self.assertEqual(format_amount(self.env, 40, company_currency), dashboard_data['sum_late']) + + @freeze_time("2019-01-22") + def test_customer_invoice_dashboard(self): + journal = self.company_data['default_journal_sale'] + + invoice = self.env['account.move'].create({ + 'move_type': 'out_invoice', + 'journal_id': journal.id, + 'partner_id': self.partner_a.id, + 'invoice_date': '2019-01-21', + 'date': '2019-01-21', + 'invoice_line_ids': [(0, 0, { + 'product_id': self.product_a.id, + 'quantity': 40.0, + 'name': 'product test 1', + 'discount': 10.00, + 'price_unit': 2.27, + 'tax_ids': [], + })] + }) + refund = self.env['account.move'].create({ + 'move_type': 'out_refund', + 'journal_id': journal.id, + 'partner_id': self.partner_a.id, + 'invoice_date': '2019-01-21', + 'date': '2019-01-21', + 'invoice_line_ids': [(0, 0, { + 'product_id': self.product_a.id, + 'quantity': 1.0, + 'name': 'product test 1', + 'price_unit': 13.3, + 'tax_ids': [], + })] + }) + + # Check Draft + dashboard_data = journal._get_journal_dashboard_data_batched()[journal.id] + + self.assertEqual(dashboard_data['number_draft'], 2) + self.assertIn('68.42', dashboard_data['sum_draft']) + + self.assertEqual(dashboard_data['number_waiting'], 0) + self.assertIn('0.00', dashboard_data['sum_waiting']) + + # Check Both + invoice.action_post() + + dashboard_data = journal._get_journal_dashboard_data_batched()[journal.id] + self.assertEqual(dashboard_data['number_draft'], 1) + self.assertIn('-\N{ZERO WIDTH NO-BREAK SPACE}13.30', dashboard_data['sum_draft']) + + self.assertEqual(dashboard_data['number_waiting'], 1) + self.assertIn('81.72', dashboard_data['sum_waiting']) + + # Check partial on invoice + partial_payment = self.env['account.payment'].create({ + 'amount': 13.3, + 'payment_type': 'inbound', + 'partner_type': 'customer', + 'partner_id': self.partner_a.id, + }) + partial_payment.action_post() + + (invoice + partial_payment.move_id).line_ids.filtered(lambda line: line.account_type == 'asset_receivable').reconcile() + + dashboard_data = journal._get_journal_dashboard_data_batched()[journal.id] + self.assertEqual(dashboard_data['number_draft'], 1) + self.assertIn('13.3', dashboard_data['sum_draft']) + + self.assertEqual(dashboard_data['number_waiting'], 1) + self.assertIn('68.42', dashboard_data['sum_waiting']) + + # Check waiting payment + refund.action_post() + + dashboard_data = journal._get_journal_dashboard_data_batched()[journal.id] + self.assertEqual(dashboard_data['number_draft'], 0) + self.assertIn('0.00', dashboard_data['sum_draft']) + + self.assertEqual(dashboard_data['number_waiting'], 2) + self.assertIn('55.12', dashboard_data['sum_waiting']) + + # Check partial on refund + payment = self.env['account.payment'].create({ + 'amount': 10.0, + 'payment_type': 'outbound', + 'partner_type': 'customer', + 'partner_id': self.partner_a.id, + }) + payment.action_post() + + (refund + payment.move_id).line_ids\ + .filtered(lambda line: line.account_type == 'asset_receivable')\ + .reconcile() + + dashboard_data = journal._get_journal_dashboard_data_batched()[journal.id] + self.assertEqual(dashboard_data['number_draft'], 0) + self.assertIn('0.00', dashboard_data['sum_draft']) + + self.assertEqual(dashboard_data['number_waiting'], 2) + self.assertIn('65.12', dashboard_data['sum_waiting']) + + dashboard_data = journal._get_journal_dashboard_data_batched()[journal.id] + self.assertEqual(dashboard_data['number_late'], 2) + self.assertIn('65.12', dashboard_data['sum_late']) + + def test_sale_purchase_journal_for_multi_currency_sale(self): + currency = self.other_currency + company_currency = self.company_data['currency'] + + invoice = self.env['account.move'].create({ + 'move_type': 'out_invoice', + 'invoice_date': '2017-01-01', + 'date': '2017-01-01', + 'partner_id': self.partner_a.id, + 'currency_id': currency.id, + 'invoice_line_ids': [ + (0, 0, {'name': 'test', 'price_unit': 200}) + ], + }) + invoice.action_post() + + payment = self.env['account.payment'].create({ + 'amount': 90.0, + 'date': '2016-01-01', + 'payment_type': 'inbound', + 'partner_type': 'customer', + 'partner_id': self.partner_a.id, + 'currency_id': currency.id, + }) + payment.action_post() + + (invoice + payment.move_id).line_ids.filtered_domain([ + ('account_id', '=', self.company_data['default_account_receivable'].id) + ]).reconcile() + + default_journal_sale = self.company_data['default_journal_sale'] + dashboard_data = default_journal_sale._get_journal_dashboard_data_batched()[default_journal_sale.id] + self.assertEqual(format_amount(self.env, 55, company_currency), dashboard_data['sum_waiting']) + self.assertEqual(format_amount(self.env, 55, company_currency), dashboard_data['sum_late']) + + @freeze_time("2023-03-15") + def test_purchase_journal_numbers_and_sums_to_validate(self): + company_currency = self.company_data['currency'] + journal = self.company_data['default_journal_purchase'] + + datas = [ + {'invoice_date_due': '2023-04-30'}, + {'invoice_date_due': '2023-04-30', 'release_to_pay': 'yes'}, + {'invoice_date_due': '2023-04-30', 'release_to_pay': 'no'}, + {'invoice_date_due': '2023-03-01'}, + {'invoice_date_due': '2023-03-01', 'release_to_pay': 'yes'}, + {'invoice_date_due': '2023-03-01', 'release_to_pay': 'no'}, + ] + + for data in datas: + self.init_invoice('in_invoice', invoice_date='2023-03-01', post=False, amounts=[4000], journal=journal, invoice_date_due=data['invoice_date_due'], release_to_pay=data.get('release_to_pay')) + + dashboard_data = journal._get_journal_dashboard_data_batched()[journal.id] + # Expected behavior is to have six amls waiting for payment for a total amount of 4440$ + # three of which would be late for a total amount of 140$ + self.assertEqual(4, dashboard_data['number_draft']) + self.assertEqual(format_amount(self.env, 16000, company_currency), dashboard_data['sum_draft']) diff --git a/dev_odex30_accounting/odex30_account_3way_match/tests/test_release_to_pay_invoice.py b/dev_odex30_accounting/odex30_account_3way_match/tests/test_release_to_pay_invoice.py new file mode 100644 index 0000000..c0b8cea --- /dev/null +++ b/dev_odex30_accounting/odex30_account_3way_match/tests/test_release_to_pay_invoice.py @@ -0,0 +1,109 @@ +# -*- coding: utf-8 -*- +# Part of ODEX. See LICENSE file for full copyright and licensing details. + +from odoo import Command, fields +from odoo.addons.account.tests.common import AccountTestInvoicingCommon +from odoo.tests import tagged, Form + + +@tagged('post_install', '-at_install') +class TestReleaseToPayInvoice(AccountTestInvoicingCommon): + + @classmethod + def setUpClass(cls): + super().setUpClass() + + cls.partner = cls.env['res.partner'].create({'name': 'Zizizapartner'}) + cls.product = cls.env['product.product'].create({ + 'name': 'VR Computer', + 'standard_price': 2500.0, + 'list_price': 2899.0, + 'type': 'service', + 'default_code': 'VR-01', + 'weight': 1.0, + 'purchase_method': 'receive', + }) + cls.other_currency = cls.setup_other_currency('HRK', rounding=0.001) + + def check_release_to_pay_scenario(self, ordered_qty, scenario, invoicing_policy='receive', order_price=500.0): + """ Generic test function to check that each use scenario behaves properly. + """ + self.product.purchase_method = invoicing_policy + + purchase_order = self.env['purchase.order'].create({ + 'partner_id': self.partner.id, + 'order_line': [ + (0, 0, { + 'name': self.product.name, + 'product_id': self.product.id, + 'product_qty': ordered_qty, + 'product_uom': self.product.uom_po_id.id, + 'price_unit': order_price, + 'date_planned': fields.Datetime.now(), + })] + }) + purchase_order.button_confirm() + + invoices_list = [] + purchase_line = purchase_order.order_line[-1] + AccountMove = self.env['account.move'].with_context(default_move_type='in_invoice') + for (action, params) in scenario: + if action == 'invoice': + # + move_form = Form(AccountMove.with_context(default_purchase_id=purchase_order.id)) + with move_form.invoice_line_ids.edit(0) as line_form: + if 'price' in params: + line_form.price_unit = params['price'] + if 'qty' in params: + line_form.quantity = params['qty'] + new_invoice = move_form.save() + new_invoice.write({'invoice_line_ids': [ + Command.create({'display_type': 'line_section', 'name': 'Section'}), + Command.create({'display_type': 'line_note', 'name': 'Note'}), + ]}) + invoices_list.append(new_invoice) + + self.assertEqual(new_invoice.release_to_pay, params['rslt'], "Wrong invoice release to pay status for scenario " + str(scenario)) + + elif action == 'receive': + purchase_line.write({'qty_received': params['qty']}) # as the product is a service, its recieved quantity is set manually + + if 'rslt' in params: + for (invoice_index, status) in params['rslt']: + self.assertEqual(invoices_list[invoice_index].release_to_pay, status, "Wrong invoice release to pay status for scenario " + str(scenario)) + + def test_3_way_match(self): + self.check_release_to_pay_scenario(10, [('receive',{'qty': 5}), ('invoice', {'qty': 5, 'rslt': 'yes'})], invoicing_policy='purchase') + self.check_release_to_pay_scenario(10, [('receive',{'qty': 5}), ('invoice', {'qty': 10, 'rslt': 'yes'})], invoicing_policy='purchase') + self.check_release_to_pay_scenario(10, [('invoice', {'qty': 10, 'rslt': 'yes'})], invoicing_policy='purchase') + self.check_release_to_pay_scenario(10, [('invoice', {'qty': 5, 'rslt': 'yes'}), ('receive',{'qty': 5}), ('invoice', {'qty': 6, 'rslt': 'exception'})], invoicing_policy='purchase') + self.check_release_to_pay_scenario(10, [('invoice', {'qty': 10, 'rslt': 'yes'}), ('invoice', {'qty': 10, 'rslt': 'no'})], invoicing_policy='purchase') + self.check_release_to_pay_scenario(10, [('receive',{'qty': 5}), ('invoice', {'qty': 5, 'rslt': 'yes'})]) + self.check_release_to_pay_scenario(10, [('receive',{'qty': 5}), ('invoice', {'qty': 10, 'rslt': 'exception'})]) + self.check_release_to_pay_scenario(10, [('invoice', {'qty': 5, 'rslt': 'no'})]) + self.check_release_to_pay_scenario(10, [('invoice', {'qty': 5, 'rslt': 'no'}), ('receive', {'qty': 5, 'rslt': [(-1, 'yes')]})]) + self.check_release_to_pay_scenario(10, [('invoice', {'qty': 5, 'rslt': 'no'}), ('receive', {'qty': 3, 'rslt': [(-1, 'exception')]})]) + self.check_release_to_pay_scenario(10, [('invoice', {'qty': 5, 'rslt': 'no'}), ('receive', {'qty': 10, 'rslt': [(-1, 'yes')]})]) + + # Special use case : a price change between order and invoice should always put the bill in exception + self.check_release_to_pay_scenario(10, [('receive',{'qty': 5}), ('invoice', {'qty': 5, 'rslt': 'exception', 'price':42})]) + self.check_release_to_pay_scenario(10, [('receive',{'qty': 5}), ('invoice', {'qty': 5, 'rslt': 'exception', 'price':42})], invoicing_policy='purchase') + + def test_amount_currency_edit(self): + """ + Ensure that editing the `amount_currency` of a journal item on an invoice is possible. + In 17.0 changes to Binary fields and web_save were made (related to context key 'bin_size'). + They led to tracebacks in the flow tested here. + """ + move_form = Form(self.env['account.move'].with_context(default_move_type='out_invoice')) + move_form.invoice_date = fields.Date.from_string('2023-01-01') + move_form.partner_id = self.partner_a + move_form.currency_id = self.other_currency + with move_form.invoice_line_ids.new() as line_form: + line_form.quantity = 1 + line_form.price_unit = 10 + move_form.save() + with move_form.line_ids.edit(0) as line_form: + line_form.amount_currency = -30 + move_form.save() + self.assertEqual(move_form.line_ids.edit(0).amount_currency, -30) diff --git a/dev_odex30_accounting/odex30_account_3way_match/views/account_invoice_view.xml b/dev_odex30_accounting/odex30_account_3way_match/views/account_invoice_view.xml new file mode 100644 index 0000000..962a5a9 --- /dev/null +++ b/dev_odex30_accounting/odex30_account_3way_match/views/account_invoice_view.xml @@ -0,0 +1,48 @@ + + + + account.move.form.inherit + account.move + + + + + + + + + account.invoice.select.inherit.odex30_account_3way_match + primary + account.move + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev_odex30_accounting/odex30_account_3way_match/views/account_journal_dashboard_view.xml b/dev_odex30_accounting/odex30_account_3way_match/views/account_journal_dashboard_view.xml new file mode 100644 index 0000000..9571981 --- /dev/null +++ b/dev_odex30_accounting/odex30_account_3way_match/views/account_journal_dashboard_view.xml @@ -0,0 +1,25 @@ + + + + account.journal.dashboard.kanban + account.journal + + + + + {'search_default_bills_to_validate': 1} + + + + + {'search_default_bills_to_pay':1} + + + + + {'search_default_late':1} + + + + + diff --git a/dev_odex30_accounting/odex30_account_accountant_check_printing/__init__.py b/dev_odex30_accounting/odex30_account_accountant_check_printing/__init__.py new file mode 100644 index 0000000..2e9271d --- /dev/null +++ b/dev_odex30_accounting/odex30_account_accountant_check_printing/__init__.py @@ -0,0 +1,3 @@ +# Part of ODEX. See LICENSE file for full copyright and licensing details. + +from . import models diff --git a/dev_odex30_accounting/odex30_account_accountant_check_printing/__manifest__.py b/dev_odex30_accounting/odex30_account_accountant_check_printing/__manifest__.py new file mode 100644 index 0000000..491f65b --- /dev/null +++ b/dev_odex30_accounting/odex30_account_accountant_check_printing/__manifest__.py @@ -0,0 +1,26 @@ +# Part of ODEX. See LICENSE file for full copyright and licensing details. + +{ + 'name': 'ODEX Account: Advanced Check Processing', + 'version': '1.0', + 'category': 'Account/Accounting', + 'author': 'ODEX', + 'summary': 'Advanced verification and reconciliation for issued checks.', + 'description': """ +This system provides advanced tools for managing financial check distributions. +It enables seamless verification between your internal accounting records and +issued physical checks within the financial management interface. + +Key Features: +- Seamless verification of check payments. +- Real-time reconciliation within the accounting workspace. +- Enhanced audit trails for distributed checks. + """, + 'depends': ['odex30_account_accountant', 'account_check_printing'], + 'data': [ + 'views/bank_rec_widget_views.xml', + ], + 'installable': True, + 'auto_install': True, + 'license': 'LGPL-3', +} diff --git a/dev_odex30_accounting/odex30_account_accountant_check_printing/i18n/account_accountant_check_printing.pot b/dev_odex30_accounting/odex30_account_accountant_check_printing/i18n/account_accountant_check_printing.pot new file mode 100644 index 0000000..60d2e45 --- /dev/null +++ b/dev_odex30_accounting/odex30_account_accountant_check_printing/i18n/account_accountant_check_printing.pot @@ -0,0 +1,34 @@ +# Translation of ODEX Server. +# This file contains the translation of the following modules: +# * odex30_account_accountant_check_printing +# +msgid "" +msgstr "" +"Project-Id-Version: ODEX Server 18.0+e\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2024-09-25 09:26+0000\n" +"PO-Revision-Date: 2024-09-25 09:26+0000\n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: odex30_account_accountant_check_printing +#: model:ir.model.fields,field_description:odex30_account_accountant_check_printing.field_account_move_line__check_number +msgid "Check Number" +msgstr "" + +#. module: odex30_account_accountant_check_printing +#: model:ir.model,name:odex30_account_accountant_check_printing.model_account_move_line +msgid "Journal Item" +msgstr "" + +#. module: odex30_account_accountant_check_printing +#: model:ir.model.fields,help:odex30_account_accountant_check_printing.field_account_move_line__check_number +msgid "" +"The selected journal is configured to print check numbers. If your pre-" +"printed check paper already has numbers or if the current numbering is " +"wrong, you can change it in the journal configuration page." +msgstr "" diff --git a/dev_odex30_accounting/odex30_account_accountant_check_printing/i18n/ar.po b/dev_odex30_accounting/odex30_account_accountant_check_printing/i18n/ar.po new file mode 100644 index 0000000..4add9c1 --- /dev/null +++ b/dev_odex30_accounting/odex30_account_accountant_check_printing/i18n/ar.po @@ -0,0 +1,41 @@ +# Translation of ODEX Server. +# This file contains the translation of the following modules: +# * odex30_account_accountant_check_printing +# +# Translators: +# Wil ODEX, 2024 +# +msgid "" +msgstr "" +"Project-Id-Version: ODEX Server 18.0+e\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2024-09-25 09:26+0000\n" +"PO-Revision-Date: 2024-09-25 09:43+0000\n" +"Last-Translator: Wil ODEX, 2024\n" +"Language-Team: Arabic (https://app.transifex.com/odoo/teams/41243/ar/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: ar\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" + +#. module: odex30_account_accountant_check_printing +#: model:ir.model.fields,field_description:odex30_account_accountant_check_printing.field_account_move_line__check_number +msgid "Check Number" +msgstr "رقم الشيك " + +#. module: odex30_account_accountant_check_printing +#: model:ir.model,name:odex30_account_accountant_check_printing.model_account_move_line +msgid "Journal Item" +msgstr "عنصر دفتر اليومية " + +#. module: odex30_account_accountant_check_printing +#: model:ir.model.fields,help:odex30_account_accountant_check_printing.field_account_move_line__check_number +msgid "" +"The selected journal is configured to print check numbers. If your pre-" +"printed check paper already has numbers or if the current numbering is " +"wrong, you can change it in the journal configuration page." +msgstr "" +"تمت تهيئة قيد اليومية المُختار لطباعة أرقام الشيكات. إذا كان لشيكاتك " +"المطبوعة مسبقًا أرقام بالفعل أو إذا كان الترقيم الحالي خاطئًا، فيمكنك تغييره" +" في صفحة تهيئة دفتر اليومية. " diff --git a/dev_odex30_accounting/odex30_account_accountant_check_printing/models/__init__.py b/dev_odex30_accounting/odex30_account_accountant_check_printing/models/__init__.py new file mode 100644 index 0000000..f12b182 --- /dev/null +++ b/dev_odex30_accounting/odex30_account_accountant_check_printing/models/__init__.py @@ -0,0 +1,3 @@ +# Part of ODEX. See LICENSE file for full copyright and licensing details. + +from . import account_move_line diff --git a/dev_odex30_accounting/odex30_account_accountant_check_printing/models/account_move_line.py b/dev_odex30_accounting/odex30_account_accountant_check_printing/models/account_move_line.py new file mode 100644 index 0000000..8d4976e --- /dev/null +++ b/dev_odex30_accounting/odex30_account_accountant_check_printing/models/account_move_line.py @@ -0,0 +1,13 @@ +# Part of ODEX. See LICENSE file for full copyright and licensing details. + +from odoo import fields, models + + +class AccountMoveLine(models.Model): + _name = "account.move.line" + _inherit = "account.move.line" + + check_number = fields.Char( + string="Check Number", + related='payment_id.check_number', + ) diff --git a/dev_odex30_accounting/odex30_account_accountant_check_printing/views/bank_rec_widget_views.xml b/dev_odex30_accounting/odex30_account_accountant_check_printing/views/bank_rec_widget_views.xml new file mode 100644 index 0000000..3defd86 --- /dev/null +++ b/dev_odex30_accounting/odex30_account_accountant_check_printing/views/bank_rec_widget_views.xml @@ -0,0 +1,27 @@ + + + + + account.move.line.list.bank_rec_widget + account.move.line + + + + + + + + + + account.move.line.search.bank_rec_widget + account.move.line + + + + + + + + + diff --git a/dev_odex30_accounting/odex30_account_accountant_fleet/static/src/components/bank_reconciliation/bank_rec_form.xml b/dev_odex30_accounting/odex30_account_accountant_fleet/static/src/components/bank_reconciliation/bank_rec_form.xml index 02b0a05..dc200ab 100644 --- a/dev_odex30_accounting/odex30_account_accountant_fleet/static/src/components/bank_reconciliation/bank_rec_form.xml +++ b/dev_odex30_accounting/odex30_account_accountant_fleet/static/src/components/bank_reconciliation/bank_rec_form.xml @@ -1,6 +1,6 @@ - + - +
=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" + +#. module: odex30_account_asset_fleet +#. odoo-python +#: code:addons/odex30_account_asset_fleet/models/account_asset.py:0 +msgid "All the lines should be from the same vehicle" +msgstr "يجب أن تكون كافة البنود من نفس المركبة " + +#. module: odex30_account_asset_fleet +#: model:ir.model,name:odex30_account_asset_fleet.model_account_asset +msgid "Asset/Revenue Recognition" +msgstr "إثبات الأصل/الإيرادات " + +#. module: odex30_account_asset_fleet +#: model:ir.model,name:odex30_account_asset_fleet.model_account_move +msgid "Journal Entry" +msgstr "قيد اليومية" + +#. module: odex30_account_asset_fleet +#: model:ir.model,name:odex30_account_asset_fleet.model_fleet_vehicle_log_services +msgid "Services for vehicles" +msgstr "خدمات المركبات " + +#. module: odex30_account_asset_fleet +#: model:ir.model.fields,field_description:odex30_account_asset_fleet.field_account_asset__vehicle_id +#: model_terms:ir.ui.view,arch_db:odex30_account_asset_fleet.view_odex30_account_asset_fleet_form +msgid "Vehicle" +msgstr "المركبة" diff --git a/dev_odex30_accounting/odex30_account_asset_fleet/models/__init__.py b/dev_odex30_accounting/odex30_account_asset_fleet/models/__init__.py new file mode 100644 index 0000000..b03c273 --- /dev/null +++ b/dev_odex30_accounting/odex30_account_asset_fleet/models/__init__.py @@ -0,0 +1,5 @@ +# Part of ODEX. See LICENSE file for full copyright and licensing details. + +from . import account_asset +from . import account_move +from . import fleet_vehicle_log_services diff --git a/dev_odex30_accounting/odex30_account_asset_fleet/models/account_asset.py b/dev_odex30_accounting/odex30_account_asset_fleet/models/account_asset.py new file mode 100644 index 0000000..b1af83f --- /dev/null +++ b/dev_odex30_accounting/odex30_account_asset_fleet/models/account_asset.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +# Part of ODEX. See LICENSE file for full copyright and licensing details. + +from odoo import api, fields, models, _ +from odoo.exceptions import UserError + + +class AccountAsset(models.Model): + _inherit = 'account.asset' + + vehicle_id = fields.Many2one('fleet.vehicle', compute='_compute_vehicle_id', readonly=False, store=True) + + @api.depends('original_move_line_ids') + def _compute_vehicle_id(self): + for record in self: + if len(record.original_move_line_ids.vehicle_id) > 1: + raise UserError(_("All the lines should be from the same vehicle")) + record.vehicle_id = record.original_move_line_ids.vehicle_id + + def action_open_vehicle(self): + self.ensure_one() + return { + 'type': 'ir.actions.act_window', + 'res_model': 'fleet.vehicle', + 'res_id': self.vehicle_id.id, + 'view_ids': [(False, 'form')], + 'view_mode': 'form', + } diff --git a/dev_odex30_accounting/odex30_account_asset_fleet/models/account_move.py b/dev_odex30_accounting/odex30_account_asset_fleet/models/account_move.py new file mode 100644 index 0000000..3a379aa --- /dev/null +++ b/dev_odex30_accounting/odex30_account_asset_fleet/models/account_move.py @@ -0,0 +1,15 @@ +# Part of ODEX. See LICENSE file for full copyright and licensing details. + +from odoo import models + + +class AccountMove(models.Model): + _inherit = 'account.move' + + def _prepare_move_for_asset_depreciation(self, vals): + # Overridden in order to link the depreciation entries with the vehicle_id + move_vals = super()._prepare_move_for_asset_depreciation(vals) + if vals['asset_id'].vehicle_id: + for _command, _id, line_vals in move_vals['line_ids']: + line_vals['vehicle_id'] = vals['asset_id'].vehicle_id.id + return move_vals diff --git a/dev_odex30_accounting/odex30_account_asset_fleet/models/fleet_vehicle_log_services.py b/dev_odex30_accounting/odex30_account_asset_fleet/models/fleet_vehicle_log_services.py new file mode 100644 index 0000000..d1c12da --- /dev/null +++ b/dev_odex30_accounting/odex30_account_asset_fleet/models/fleet_vehicle_log_services.py @@ -0,0 +1,20 @@ +# Part of ODEX. See LICENSE file for full copyright and licensing details. + +from odoo import api, models + +class FleetVehicleLogServices(models.Model): + _inherit = 'fleet.vehicle.log.services' + + @api.depends('account_move_line_id.price_subtotal', + 'account_move_line_id.non_deductible_tax_value', + 'account_move_line_id.account_id.multiple_assets_per_line') + def _compute_amount(self): + for log_service in self: + if not log_service.account_move_line_id: + continue + account_move_line_id = log_service.account_move_line_id + quantity = 1 + if account_move_line_id.account_id.multiple_assets_per_line: + quantity = account_move_line_id.quantity + log_service.amount = account_move_line_id.currency_id.round( + (account_move_line_id.debit + account_move_line_id.non_deductible_tax_value) / quantity) diff --git a/dev_odex30_accounting/odex30_account_asset_fleet/views/account_asset_views.xml b/dev_odex30_accounting/odex30_account_asset_fleet/views/account_asset_views.xml new file mode 100644 index 0000000..d9668fa --- /dev/null +++ b/dev_odex30_accounting/odex30_account_asset_fleet/views/account_asset_views.xml @@ -0,0 +1,22 @@ + + + + + account.asset.fleet.form + account.asset + + + + + + + + + + Connected until + + + + Extend Connection + + + +
+ + diff --git a/dev_odex30_accounting/odex30_account_online_synchronization/static/src/components/online_account_radio/online_account_radio.js b/dev_odex30_accounting/odex30_account_online_synchronization/static/src/components/online_account_radio/online_account_radio.js new file mode 100644 index 0000000..2260b14 --- /dev/null +++ b/dev_odex30_accounting/odex30_account_online_synchronization/static/src/components/online_account_radio/online_account_radio.js @@ -0,0 +1,41 @@ +/** @odoo-module **/ + +import { onMounted, useState } from "@odoo/owl"; +import { registry } from "@web/core/registry"; +import { RadioField, radioField } from "@web/views/fields/radio/radio_field"; +import { useService } from '@web/core/utils/hooks'; + + +class OnlineAccountRadio extends RadioField { + static template = "odex30_account_online_synchronization.OnlineAccountRadio"; + setup() { + super.setup(); + this.orm = useService("orm"); + this.state = useState({balances: {}}); + + onMounted(async () => { + this.state.balances = await this.loadData(); + // Make sure the first option is selected by default. + this.onChange(this.items[0]); + }); + } + + async loadData() { + const ids = this.items.map(i => i[0]); + return await this.orm.call("account.online.account", "get_formatted_balances", [ids]); + } + + getBalanceName(itemID) { + return this.state.balances?.[itemID]?.[0] ?? "Loading ..."; + } + + isNegativeAmount(itemID) { + // In case of the value is undefined, it will return false as intended. + return this.state.balances?.[itemID]?.[1] < 0; + } +} + +registry.category("fields").add("online_account_radio", { + ...radioField, + component: OnlineAccountRadio, +}); diff --git a/dev_odex30_accounting/odex30_account_online_synchronization/static/src/components/online_account_radio/online_account_radio.xml b/dev_odex30_accounting/odex30_account_online_synchronization/static/src/components/online_account_radio/online_account_radio.xml new file mode 100644 index 0000000..d39c7d7 --- /dev/null +++ b/dev_odex30_accounting/odex30_account_online_synchronization/static/src/components/online_account_radio/online_account_radio.xml @@ -0,0 +1,29 @@ + + + +
+ +
+ +
+ +
+ + diff --git a/dev_odex30_accounting/odex30_account_online_synchronization/static/src/components/refresh_spin_journal_widget/refresh_spin_journal_widget.js b/dev_odex30_accounting/odex30_account_online_synchronization/static/src/components/refresh_spin_journal_widget/refresh_spin_journal_widget.js new file mode 100644 index 0000000..975c859 --- /dev/null +++ b/dev_odex30_accounting/odex30_account_online_synchronization/static/src/components/refresh_spin_journal_widget/refresh_spin_journal_widget.js @@ -0,0 +1,99 @@ +/** @odoo-module **/ + +import { registry } from "@web/core/registry"; +import { standardWidgetProps } from "@web/views/widgets/standard_widget_props"; +import { useService } from "@web/core/utils/hooks"; +import { Component, useState, onWillStart, markup } from "@odoo/owl"; + +class RefreshSpin extends Component { + static template = "odex30_account_online_synchronization.RefreshSpin"; + static props = { ...standardWidgetProps }; + + setup() { + this.state = useState({ + isHovered: false, + fetchingStatus: false, + connectionStateDetails: null, + }); + + this.actionService = useService("action"); + this.busService = this.env.services.bus_service; + this.orm = useService("orm"); + this.state.fetchingStatus = this.props.record.data.online_sync_fetching_status; + + this.busService.subscribe("online_sync", (notification) => { + if (notification?.id === this.recordId && notification?.connection_state_details) { + this.state.connectionStateDetails = notification.connection_state_details; + } + }); + + onWillStart(() => { + this._initConnectionStateDetails(); + }); + } + + refresh() { + this.actionService.restore(this.actionService.currentController.jsId); + } + + onMouseEnter() { + this.state.isHovered = true; + } + + onMouseLeave() { + this.state.isHovered = false; + } + + async openAction() { + /** + * This function is used to open the action that the asynchronous process saved + * on the databsase. It allows users to call the action when they want and not when + * the process is over. + */ + const action = await this.orm.call( + "account.journal", + "action_open_dashboard_asynchronous_action", + [this.recordId], + ); + this.actionService.doAction(action); + this.state.connectionStateDetails = null; + } + + async fetchTransactions() { + /** + * This function call the function to fetch transactions. + * In the main case, we don't do anything after calling the function. + * The idea is that websockets will update the status by themselves. + * In one specific case, we have to return an action to the user to open + * the ODEX Fin iframe to refresh the connection. + */ + this.state.connectionStateDetails = { status: "fetching" }; + const action = await this.orm.call("account.journal", "manual_sync", [this.recordId]); + if (action) { + action.help = markup(action.help); + this.actionService.doAction(action); + } + } + + _initConnectionStateDetails() { + /** + * This function is used to get the last state of the connection (if there is one) + */ + const kanbanDashboardData = JSON.parse(this.props.record.data.kanban_dashboard); + this.state.connectionStateDetails = kanbanDashboardData?.connection_state_details; + } + + get recordId() { + return this.props.record.data.id; + } + + get connectionStatus() { + return this.state.connectionStateDetails?.status; + } +} + +export const refreshSpin = { + component: RefreshSpin, +}; + +registry.category("view_widgets").add("refresh_spin_widget", refreshSpin); diff --git a/dev_odex30_accounting/odex30_account_online_synchronization/static/src/components/refresh_spin_journal_widget/refresh_spin_journal_widget.xml b/dev_odex30_accounting/odex30_account_online_synchronization/static/src/components/refresh_spin_journal_widget/refresh_spin_journal_widget.xml new file mode 100644 index 0000000..2fd6bdc --- /dev/null +++ b/dev_odex30_accounting/odex30_account_online_synchronization/static/src/components/refresh_spin_journal_widget/refresh_spin_journal_widget.xml @@ -0,0 +1,42 @@ + + + + +
+ + + transactions fetched + + + + 0 transaction fetched + +
+ + +
+ + See error + + +
+ + +
+ + Refresh + + + Fetching...