Skip to content

Commit

Permalink
[3767][UPD] remove (.ALT) reports (#263)
Browse files Browse the repository at this point in the history
* [UPD] remove (.ALT) reports
  • Loading branch information
AungKoKoLin1997 committed Nov 20, 2023
1 parent c57cb99 commit 976e6cd
Show file tree
Hide file tree
Showing 24 changed files with 68 additions and 319 deletions.
12 changes: 6 additions & 6 deletions report_account_nrq/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ Accounting Document Print
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
:target: https://odoo-community.org/page/development-status
:alt: Beta
.. |badge2| image:: https://img.shields.io/badge/licence-LGPL--3-blue.png
:target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
:alt: License: LGPL-3
.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-qrtl%2Fnrq--custom-lightgray.png?logo=github
:target: https://github.com/qrtl/nrq-custom/tree/12.0/report_account_nrq
:target: https://github.com/qrtl/nrq-custom/tree/10.0/report_account_nrq
:alt: qrtl/nrq-custom

|badge1| |badge2| |badge3|
Expand All @@ -32,7 +32,7 @@ Bug Tracker
Bugs are tracked on `GitHub Issues <https://github.com/qrtl/nrq-custom/issues>`_.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed
`feedback <https://github.com/qrtl/nrq-custom/issues/new?body=module:%20report_account_nrq%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
`feedback <https://github.com/qrtl/nrq-custom/issues/new?body=module:%20report_account_nrq%0Aversion:%2010.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.

Do not contact contributors directly about support or help with technical issues.

Expand All @@ -47,6 +47,6 @@ Authors
Maintainers
~~~~~~~~~~~

This module is part of the `qrtl/nrq-custom <https://github.com/qrtl/nrq-custom/tree/12.0/report_account_nrq>`_ project on GitHub.
This module is part of the `qrtl/nrq-custom <https://github.com/qrtl/nrq-custom/tree/10.0/report_account_nrq>`_ project on GitHub.

You are welcome to contribute.
2 changes: 1 addition & 1 deletion report_account_nrq/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright 2016-2017 Quartile Limited
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
{
"name": "Accounting Document Print",
"summary": "",
Expand Down
15 changes: 0 additions & 15 deletions report_account_nrq/i18n/ja.po
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,12 @@ msgstr "(控)"
msgid "Delivery Note"
msgstr "納品書"

#. module: report_account_nrq
#: model:ir.actions.report.xml,name:report_account_nrq.report_delivery_note_alt
msgid "Delivery Note (Alt.)"
msgstr "納品書(旧)"

#. module: report_account_nrq
#: model:ir.actions.report.xml,name:report_account_nrq.report_account_invoice_acceptance
#: model:ir.model,name:report_account_nrq.model_account_invoice
msgid "Invoice"
msgstr "請求書"

#. module: report_account_nrq
#: model:ir.actions.report.xml,name:report_account_nrq.report_account_invoice_acceptance_alt
msgid "Invoice (Alt.)"
msgstr "請求書(旧)"

#. module: report_account_nrq
#: model:ir.ui.view,arch_db:report_account_nrq.report_acceptance_document_nrq
msgid "acceptance"
Expand All @@ -56,8 +46,3 @@ msgstr "deliverynote"
msgid "invoice"
msgstr "invoice"

#. module: report_account_nrq
#: model:ir.ui.view,arch_db:report_account_nrq.report_deliverynote_alt
#: model:ir.ui.view,arch_db:report_account_nrq.report_invoice_acceptance_alt
msgid "true"
msgstr "true"
2 changes: 1 addition & 1 deletion report_account_nrq/models/invoice_print.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright 2016-2017 Quartile Limited
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

from odoo import api, models

Expand Down
21 changes: 0 additions & 21 deletions report_account_nrq/report/account_report_deliverynote.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,6 @@
</t>
</t>
</template>
<template id="report_deliverynote_alt">
<t t-call="report.html_container">
<t t-set="alt">true</t>
<t t-foreach="docs" t-as="doc">
<div class="row">
<t
t-call="report_account_nrq.report_deliverynote_document_nrq"
t-lang="doc.partner_id.lang"
/>
</div>
</t>
</t>
</template>
<report
id="report_delivery_note"
model="account.invoice"
Expand All @@ -44,14 +31,6 @@
file="report_account_nrq.report_deliverynote"
report_type="qweb-pdf"
/>
<report
id="report_delivery_note_alt"
model="account.invoice"
string="Delivery Note (Alt.)"
name="report_account_nrq.report_deliverynote_alt"
file="report_account_nrq.report_deliverynote_alt"
report_type="qweb-pdf"
/>
<report
id="account.account_invoice_action_report_duplicate"
model="account.invoice"
Expand Down
33 changes: 0 additions & 33 deletions report_account_nrq/report/account_report_invoice_acceptance.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,30 +56,6 @@
</t>
</t>
</template>
<template id="report_invoice_acceptance_alt">
<t t-call="report.html_container">
<t t-set="alt">true</t>
<t t-foreach="docs" t-as="doc">
<t
t-call="report_account_nrq.report_invoice_document_nrq"
t-lang="doc.partner_id.lang"
/>
<t
t-call="report_account_nrq.report_invoice_copy_document_nrq"
t-lang="doc.partner_id.lang"
/>
<t
t-call="report_account_nrq.report_acceptance_document_nrq"
t-lang="doc.partner_id.lang"
/>
<t
t-if="doc.delivery_note"
t-call="report_account_nrq.report_deliverynote_document_nrq"
t-lang="doc.partner_id.lang"
/>
</t>
</t>
</template>
<report
id="report_account_invoice_acceptance"
model="account.invoice"
Expand All @@ -89,15 +65,6 @@
file="report_account_nrq.report_invoice_acceptance"
attachment="(object.state in ('open','paid')) and ('INV'+(object.number or '').replace('/','')+'.pdf')"
/>
<report
id="report_account_invoice_acceptance_alt"
model="account.invoice"
string="Invoice (Alt.)"
report_type="qweb-pdf"
name="report_account_nrq.report_invoice_acceptance_alt"
file="report_account_nrq.report_invoice_acceptance_alt"
attachment="(object.state in ('open','paid')) and ('INV'+(object.number or '').replace('/','')+'.pdf')"
/>
<report
id="account.account_invoices"
model="account.invoice"
Expand Down
8 changes: 4 additions & 4 deletions report_account_nrq/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
<title>Accounting Document Print</title>
<style type="text/css">

Expand Down Expand Up @@ -367,7 +367,7 @@ <h1 class="title">Accounting Document Print</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/qrtl/nrq-custom/tree/12.0/report_account_nrq"><img alt="qrtl/nrq-custom" src="https://img.shields.io/badge/github-qrtl%2Fnrq--custom-lightgray.png?logo=github" /></a></p>
<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/qrtl/nrq-custom/tree/10.0/report_account_nrq"><img alt="qrtl/nrq-custom" src="https://img.shields.io/badge/github-qrtl%2Fnrq--custom-lightgray.png?logo=github" /></a></p>
<p>This module adjusts the report templates of invoice and delivery.</p>
<p><strong>Table of contents</strong></p>
<div class="contents local topic" id="contents">
Expand All @@ -385,7 +385,7 @@ <h1><a class="toc-backref" href="#id1">Bug Tracker</a></h1>
<p>Bugs are tracked on <a class="reference external" href="https://github.com/qrtl/nrq-custom/issues">GitHub Issues</a>.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed
<a class="reference external" href="https://github.com/qrtl/nrq-custom/issues/new?body=module:%20report_account_nrq%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<a class="reference external" href="https://github.com/qrtl/nrq-custom/issues/new?body=module:%20report_account_nrq%0Aversion:%2010.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<p>Do not contact contributors directly about support or help with technical issues.</p>
</div>
<div class="section" id="credits">
Expand All @@ -398,7 +398,7 @@ <h2><a class="toc-backref" href="#id3">Authors</a></h2>
</div>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#id4">Maintainers</a></h2>
<p>This module is part of the <a class="reference external" href="https://github.com/qrtl/nrq-custom/tree/12.0/report_account_nrq">qrtl/nrq-custom</a> project on GitHub.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/qrtl/nrq-custom/tree/10.0/report_account_nrq">qrtl/nrq-custom</a> project on GitHub.</p>
<p>You are welcome to contribute.</p>
</div>
</div>
Expand Down
35 changes: 0 additions & 35 deletions report_common_nrq/i18n/ja.po
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,6 @@ msgstr "検収日:"
msgid "Address for Reports"
msgstr "レポート用アドレス"

#. module: report_common_nrq
#: model:ir.model.fields,field_description:report_common_nrq.field_res_company_company_address_alt
msgid "Address for Reports (Alt.)"
msgstr "レポート用アドレス(旧)"

#. module: report_common_nrq
#: model:ir.ui.view,arch_db:report_common_nrq.view_company_form
msgid "Alternative Particulars"
Expand All @@ -140,11 +135,6 @@ msgstr "承認済"
msgid "Bank Details"
msgstr "銀行詳細"

#. module: report_common_nrq
#: model:ir.model.fields,field_description:report_common_nrq.field_res_company_bank_details_alt
msgid "Bank Details (Alt.)"
msgstr "銀行詳細(旧)"

#. module: report_common_nrq
#: model:ir.ui.view,arch_db:report_common_nrq.document_footer_layout
msgid "Bank Details:"
Expand All @@ -170,21 +160,11 @@ msgstr "社印"
msgid "Company Chop Image"
msgstr "社印画像"

#. module: report_common_nrq
#: model:ir.model.fields,field_description:report_common_nrq.field_res_company_chop_alt
msgid "Company Chop Image (Alt.)"
msgstr "社印画像(旧)"

#. module: report_common_nrq
#: model:ir.model.fields,field_description:report_common_nrq.field_res_company_company_name
msgid "Company Name for Reports"
msgstr "レポート用社名"

#. module: report_common_nrq
#: model:ir.model.fields,field_description:report_common_nrq.field_res_company_company_name_alt
msgid "Company Name for Reports (Alt.)"
msgstr "レポート用社名(旧)"

#. module: report_common_nrq
#: model:ir.ui.view,arch_db:report_common_nrq.acceptance_header_layout
msgid "Date:"
Expand Down Expand Up @@ -228,11 +208,6 @@ msgstr "有効期日:"
msgid "Fax for Reports"
msgstr "レポート用FAX"

#. module: report_common_nrq
#: model:ir.model.fields,field_description:report_common_nrq.field_res_company_company_fax_alt
msgid "Fax for Reports (Alt.)"
msgstr "レポート用FAX(旧)"

#. module: report_common_nrq
#: model:ir.ui.view,arch_db:report_common_nrq.common_header_layout
msgid "Fax:"
Expand Down Expand Up @@ -299,11 +274,6 @@ msgstr "取引先番号"
msgid "Phone for Reports"
msgstr "レポート用電話番号"

#. module: report_common_nrq
#: model:ir.model.fields,field_description:report_common_nrq.field_res_company_company_phone_alt
msgid "Phone for Reports (Alt.)"
msgstr "レポート用電話番号(旧)"

#. module: report_common_nrq
#: model:ir.ui.view,arch_db:report_common_nrq.common_header_layout
msgid "Phone:"
Expand Down Expand Up @@ -450,11 +420,6 @@ msgstr "仕入先返金"
msgid "Website for Reports"
msgstr "レポート用ウェブサイト"

#. module: report_common_nrq
#: model:ir.model.fields,field_description:report_common_nrq.field_res_company_company_website_alt
msgid "Website for Reports (Alt.)"
msgstr "レポート用ウェブサイト(旧)"

#. module: report_common_nrq
#: model:ir.ui.view,arch_db:report_common_nrq.common_header_layout
msgid "Website:"
Expand Down
7 changes: 0 additions & 7 deletions report_common_nrq/models/res_company.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,10 @@ class Company(models.Model):
_inherit = "res.company"

company_name = fields.Char("Company Name for Reports", translate=True,)
company_name_alt = fields.Char("Company Name for Reports (Alt.)", translate=True,)
company_address = fields.Text("Address for Reports", translate=True,)
company_address_alt = fields.Text("Address for Reports (Alt.)", translate=True,)
company_phone = fields.Char("Phone for Reports", translate=True,)
company_phone_alt = fields.Char("Phone for Reports (Alt.)", translate=True,)
company_fax = fields.Char("Fax for Reports", translate=True,)
company_fax_alt = fields.Char("Fax for Reports (Alt.)", translate=True,)
company_website = fields.Char("Website for Reports",)
company_website_alt = fields.Char("Website for Reports (Alt.)",)
bank_details = fields.Text(string="Bank Details", translate=True,)
bank_details_alt = fields.Text(string="Bank Details (Alt.)", translate=True,)
chop = fields.Binary("Company Chop Image", attachment=True,)
chop_alt = fields.Binary("Company Chop Image (Alt.)", attachment=True,)
invoice_remarks = fields.Text(string="Invoice Remarks",)

0 comments on commit 976e6cd

Please sign in to comment.