Skip to content

Commit f9a0a99

Browse files
committed
[BOT] post-merge updates
1 parent 3e18b1d commit f9a0a99

File tree

5 files changed

+39
-32
lines changed

5 files changed

+39
-32
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ addon | version | maintainers | summary
3434
[hr_expense_sequence](hr_expense_sequence/) | 15.0.1.0.0 | | HR expense sequence
3535
[hr_expense_tax_adjust](hr_expense_tax_adjust/) | 15.0.1.1.0 | [![ps-tubtim](https://github.com/ps-tubtim.png?size=30px)](https://github.com/ps-tubtim) | Allow to edit tax amount on expenses
3636
[hr_expense_tier_validation](hr_expense_tier_validation/) | 15.0.1.0.0 | [![ps-tubtim](https://github.com/ps-tubtim.png?size=30px)](https://github.com/ps-tubtim) | Expense Tier Validation
37+
[hr_expense_widget_o2m](hr_expense_widget_o2m/) | 15.0.1.0.0 | [![kittiu](https://github.com/kittiu.png?size=30px)](https://github.com/kittiu) | HR Expense one2many widget
3738
[sale_expense_cost_reinvoice](sale_expense_cost_reinvoice/) | 15.0.1.0.0 | [![yankinmax](https://github.com/yankinmax.png?size=30px)](https://github.com/yankinmax) | Provide cost on order line when Auto Re-invoice at cost
3839
[sale_expense_manual_reinvoice](sale_expense_manual_reinvoice/) | 15.0.1.0.1 | [![ivantodorovich](https://github.com/ivantodorovich.png?size=30px)](https://github.com/ivantodorovich) | Allow to manually re-invoice expenses
3940

hr_expense_widget_o2m/README.rst

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22
HR Expense one2many widget
33
==========================
44

5-
.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5+
..
6+
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
67
!! This file is generated by oca-gen-addon-readme !!
78
!! changes will be overwritten. !!
89
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
10+
!! source digest: sha256:6c546677a081405c726e44c4266ac4b8a6e6da07493d3dbbeed9a3a6d156b8a6
11+
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
912
1013
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
1114
:target: https://odoo-community.org/page/development-status
@@ -14,16 +17,16 @@ HR Expense one2many widget
1417
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
1518
:alt: License: AGPL-3
1619
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fhr--expense-lightgray.png?logo=github
17-
:target: https://github.com/OCA/hr-expense/tree/14.0/hr_expense_widget_o2m
20+
:target: https://github.com/OCA/hr-expense/tree/15.0/hr_expense_widget_o2m
1821
:alt: OCA/hr-expense
1922
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
20-
:target: https://translation.odoo-community.org/projects/hr-expense-14-0/hr-expense-14-0-hr_expense_widget_o2m
23+
:target: https://translation.odoo-community.org/projects/hr-expense-15-0/hr-expense-15-0-hr_expense_widget_o2m
2124
:alt: Translate me on Weblate
22-
.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
23-
:target: https://runbot.odoo-community.org/runbot/289/14.0
24-
:alt: Try me on Runbot
25+
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
26+
:target: https://runboat.odoo-community.org/builds?repo=OCA/hr-expense&target_branch=15.0
27+
:alt: Try me on Runboat
2528

26-
|badge1| |badge2| |badge3| |badge4| |badge5|
29+
|badge1| |badge2| |badge3| |badge4| |badge5|
2730

2831
Currently, if user create new expense sheet first, and then click to add expense lines,
2932
System will popup a selection window (many2many widget) allowing user to select the existing expenses first, and also to create new expense.
@@ -47,8 +50,8 @@ Bug Tracker
4750

4851
Bugs are tracked on `GitHub Issues <https://github.com/OCA/hr-expense/issues>`_.
4952
In case of trouble, please check there if your issue has already been reported.
50-
If you spotted it first, help us smashing it by providing a detailed and welcomed
51-
`feedback <https://github.com/OCA/hr-expense/issues/new?body=module:%20hr_expense_widget_o2m%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
53+
If you spotted it first, help us to smash it by providing a detailed and welcomed
54+
`feedback <https://github.com/OCA/hr-expense/issues/new?body=module:%20hr_expense_widget_o2m%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
5255

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

@@ -86,6 +89,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
8689

8790
|maintainer-kittiu|
8891

89-
This module is part of the `OCA/hr-expense <https://github.com/OCA/hr-expense/tree/14.0/hr_expense_widget_o2m>`_ project on GitHub.
92+
This module is part of the `OCA/hr-expense <https://github.com/OCA/hr-expense/tree/15.0/hr_expense_widget_o2m>`_ project on GitHub.
9093

9194
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

hr_expense_widget_o2m/static/description/index.html

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
33
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
6-
<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
6+
<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
77
<title>HR Expense one2many widget</title>
88
<style type="text/css">
99

1010
/*
1111
:Author: David Goodger ([email protected])
12-
:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
12+
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
1313
:Copyright: This stylesheet has been placed in the public domain.
1414
1515
Default cascading style sheet for the HTML output of Docutils.
1616
17-
See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
17+
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
1818
customize this style sheet.
1919
*/
2020

@@ -366,61 +366,63 @@ <h1 class="title">HR Expense one2many widget</h1>
366366
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
367367
!! This file is generated by oca-gen-addon-readme !!
368368
!! changes will be overwritten. !!
369+
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
370+
!! source digest: sha256:6c546677a081405c726e44c4266ac4b8a6e6da07493d3dbbeed9a3a6d156b8a6
369371
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
370-
<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/OCA/hr-expense/tree/14.0/hr_expense_widget_o2m"><img alt="OCA/hr-expense" src="https://img.shields.io/badge/github-OCA%2Fhr--expense-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/hr-expense-14-0/hr-expense-14-0-hr_expense_widget_o2m"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/289/14.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
372+
<p><a class="reference external image-reference" 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 image-reference" 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 image-reference" href="https://github.com/OCA/hr-expense/tree/15.0/hr_expense_widget_o2m"><img alt="OCA/hr-expense" src="https://img.shields.io/badge/github-OCA%2Fhr--expense-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/hr-expense-15-0/hr-expense-15-0-hr_expense_widget_o2m"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/hr-expense&amp;target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
371373
<p>Currently, if user create new expense sheet first, and then click to add expense lines,
372374
System will popup a selection window (many2many widget) allowing user to select the existing expenses first, and also to create new expense.</p>
373375
<p>This can be confusing for some user, and might not be suitable for some use case.</p>
374376
<p>With this module, user have option to directly add new lines on expense report (one2many widget).</p>
375377
<p><strong>Table of contents</strong></p>
376378
<div class="contents local topic" id="contents">
377379
<ul class="simple">
378-
<li><a class="reference internal" href="#configuration" id="id1">Configuration</a></li>
379-
<li><a class="reference internal" href="#bug-tracker" id="id2">Bug Tracker</a></li>
380-
<li><a class="reference internal" href="#credits" id="id3">Credits</a><ul>
381-
<li><a class="reference internal" href="#authors" id="id4">Authors</a></li>
382-
<li><a class="reference internal" href="#contributors" id="id5">Contributors</a></li>
383-
<li><a class="reference internal" href="#maintainers" id="id6">Maintainers</a></li>
380+
<li><a class="reference internal" href="#configuration" id="toc-entry-1">Configuration</a></li>
381+
<li><a class="reference internal" href="#bug-tracker" id="toc-entry-2">Bug Tracker</a></li>
382+
<li><a class="reference internal" href="#credits" id="toc-entry-3">Credits</a><ul>
383+
<li><a class="reference internal" href="#authors" id="toc-entry-4">Authors</a></li>
384+
<li><a class="reference internal" href="#contributors" id="toc-entry-5">Contributors</a></li>
385+
<li><a class="reference internal" href="#maintainers" id="toc-entry-6">Maintainers</a></li>
384386
</ul>
385387
</li>
386388
</ul>
387389
</div>
388390
<div class="section" id="configuration">
389-
<h1><a class="toc-backref" href="#id1">Configuration</a></h1>
391+
<h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
390392
<p>Go to Human Reqsource &gt; Expenses settings, and enable option “Use form view when add line for expense report”</p>
391393
</div>
392394
<div class="section" id="bug-tracker">
393-
<h1><a class="toc-backref" href="#id2">Bug Tracker</a></h1>
395+
<h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
394396
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/hr-expense/issues">GitHub Issues</a>.
395397
In case of trouble, please check there if your issue has already been reported.
396-
If you spotted it first, help us smashing it by providing a detailed and welcomed
397-
<a class="reference external" href="https://github.com/OCA/hr-expense/issues/new?body=module:%20hr_expense_widget_o2m%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
398+
If you spotted it first, help us to smash it by providing a detailed and welcomed
399+
<a class="reference external" href="https://github.com/OCA/hr-expense/issues/new?body=module:%20hr_expense_widget_o2m%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
398400
<p>Do not contact contributors directly about support or help with technical issues.</p>
399401
</div>
400402
<div class="section" id="credits">
401-
<h1><a class="toc-backref" href="#id3">Credits</a></h1>
403+
<h1><a class="toc-backref" href="#toc-entry-3">Credits</a></h1>
402404
<div class="section" id="authors">
403-
<h2><a class="toc-backref" href="#id4">Authors</a></h2>
405+
<h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
404406
<ul class="simple">
405407
<li>Ecosoft</li>
406408
</ul>
407409
</div>
408410
<div class="section" id="contributors">
409-
<h2><a class="toc-backref" href="#id5">Contributors</a></h2>
411+
<h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
410412
<ul class="simple">
411413
<li>Kitti U. &lt;<a class="reference external" href="mailto:kittiu&#64;ecosoft.co.th">kittiu&#64;ecosoft.co.th</a>&gt;</li>
412414
</ul>
413415
</div>
414416
<div class="section" id="maintainers">
415-
<h2><a class="toc-backref" href="#id6">Maintainers</a></h2>
417+
<h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
416418
<p>This module is maintained by the OCA.</p>
417419
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
418420
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
419421
mission is to support the collaborative development of Odoo features and
420422
promote its widespread use.</p>
421423
<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
422-
<p><a class="reference external" href="https://github.com/kittiu"><img alt="kittiu" src="https://github.com/kittiu.png?size=40px" /></a></p>
423-
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/hr-expense/tree/14.0/hr_expense_widget_o2m">OCA/hr-expense</a> project on GitHub.</p>
424+
<p><a class="reference external image-reference" href="https://github.com/kittiu"><img alt="kittiu" src="https://github.com/kittiu.png?size=40px" /></a></p>
425+
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/hr-expense/tree/15.0/hr_expense_widget_o2m">OCA/hr-expense</a> project on GitHub.</p>
424426
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
425427
</div>
426428
</div>

setup/_metapackage/VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
15.0.20230519.1
1+
15.0.20230928.0

setup/_metapackage/setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
'odoo-addon-hr_expense_sequence>=15.0dev,<15.1dev',
2222
'odoo-addon-hr_expense_tax_adjust>=15.0dev,<15.1dev',
2323
'odoo-addon-hr_expense_tier_validation>=15.0dev,<15.1dev',
24+
'odoo-addon-hr_expense_widget_o2m>=15.0dev,<15.1dev',
2425
'odoo-addon-sale_expense_cost_reinvoice>=15.0dev,<15.1dev',
2526
'odoo-addon-sale_expense_manual_reinvoice>=15.0dev,<15.1dev',
2627
],

0 commit comments

Comments
 (0)