Skip to content

Commit

Permalink
Merge pull request #259 from OCA/15.0
Browse files Browse the repository at this point in the history
Syncing from upstream OCA/sale-reporting (15.0)
  • Loading branch information
bt-admin authored Jan 29, 2025
2 parents 80b23a8 + 2a07d05 commit 5e76432
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ addon | version | maintainers | summary
[sale_order_product_recommendation_product_sold_by_delivery_week](sale_order_product_recommendation_product_sold_by_delivery_week/) | 15.0.1.0.0 | [![chienandalu](https://github.com/chienandalu.png?size=30px)](https://github.com/chienandalu) | Adds the weekly sales field to the recommendation wizard
[sale_order_report_customer_lead](sale_order_report_customer_lead/) | 15.0.1.0.1 | [![ivantodorovich](https://github.com/ivantodorovich.png?size=30px)](https://github.com/ivantodorovich) | Show the lead time on sale documents
[sale_order_report_product_image](sale_order_report_product_image/) | 15.0.1.0.0 | | Show product images on Sale documents
[sale_report_delivered](sale_report_delivered/) | 15.0.1.1.0 | [![sergio-teruel](https://github.com/sergio-teruel.png?size=30px)](https://github.com/sergio-teruel) | Sale Report Delivered
[sale_report_delivered](sale_report_delivered/) | 15.0.1.2.0 | [![sergio-teruel](https://github.com/sergio-teruel.png?size=30px)](https://github.com/sergio-teruel) | Sale Report Delivered
[sale_report_delivered_brand](sale_report_delivered_brand/) | 15.0.1.0.1 | [![CarlosRoca13](https://github.com/CarlosRoca13.png?size=30px)](https://github.com/CarlosRoca13) | Sale Report Delivered Brand
[sale_report_delivered_elaboration](sale_report_delivered_elaboration/) | 15.0.1.0.0 | [![sergio-teruel](https://github.com/sergio-teruel.png?size=30px)](https://github.com/sergio-teruel) | Sale Report Delivered Elaboration
[sale_report_delivered_partner_priority](sale_report_delivered_partner_priority/) | 15.0.1.0.1 | [![CarlosRoca13](https://github.com/CarlosRoca13.png?size=30px)](https://github.com/CarlosRoca13) | Sale Report Delivered Partner Priority
Expand Down
2 changes: 1 addition & 1 deletion sale_report_delivered/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Sale Report Delivered
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:564de0af9e4f9d10ef32493376ea4ca0981e39dc5883577b32c9c1c0b648cb70
!! source digest: sha256:b1610e21b56a370ea0946c5c682c03c684c325f405d560acc42220f5deb083ce
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down
8 changes: 6 additions & 2 deletions sale_report_delivered/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
{
"name": "Sale Report Delivered",
"version": "15.0.1.1.0",
"version": "15.0.1.2.0",
"author": "Tecnativa," "Odoo Community Association (OCA)",
"website": "https://github.com/OCA/sale-reporting",
"category": "Sales",
Expand All @@ -11,5 +11,9 @@
"installable": True,
"development_status": "Beta",
"maintainers": ["sergio-teruel"],
"data": ["security/ir.model.access.csv", "views/sale_report_delivered_views.xml"],
"data": [
"security/ir.model.access.csv",
"security/sale_report_security.xml",
"views/sale_report_delivered_views.xml",
],
}
1 change: 1 addition & 0 deletions sale_report_delivered/security/ir.model.access.csv
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_sale_report_delivered_manager,sale.report.delivered,model_sale_report_delivered,sales_team.group_sale_manager,1,1,1,1
access_sale_report_delivered_salesman,sale.report.delivered,model_sale_report_delivered,sales_team.group_sale_salesman,1,0,0,0
21 changes: 21 additions & 0 deletions sale_report_delivered/security/sale_report_security.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<record id="sale_report_delivered_personal_rule" model="ir.rule">
<field name="name">Personal Delivered Analysis</field>
<field name="model_id" ref="model_sale_report_delivered" />
<field
name="domain_force"
>['|',('user_id','=',user.id),('user_id','=',False)]</field>
<field name="groups" eval="[(4, ref('sales_team.group_sale_salesman'))]" />
</record>

<record id="sale_report_delivered_see_all_rule" model="ir.rule">
<field name="name">All Delivered Analysis</field>
<field name="model_id" ref="model_sale_report_delivered" />
<field name="domain_force">[(1, '=', 1)]</field>
<field
name="groups"
eval="[(4, ref('sales_team.group_sale_salesman_all_leads'))]"
/>
</record>
</odoo>
2 changes: 1 addition & 1 deletion sale_report_delivered/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ <h1 class="title">Sale Report Delivered</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:564de0af9e4f9d10ef32493376ea4ca0981e39dc5883577b32c9c1c0b648cb70
!! source digest: sha256:b1610e21b56a370ea0946c5c682c03c684c325f405d560acc42220f5deb083ce
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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/sale-reporting/tree/15.0/sale_report_delivered"><img alt="OCA/sale-reporting" src="https://img.shields.io/badge/github-OCA%2Fsale--reporting-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/sale-reporting-15-0/sale-reporting-15-0-sale_report_delivered"><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/sale-reporting&amp;target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>Adds subtotal price based on the delivered quantities field to the
Expand Down

0 comments on commit 5e76432

Please sign in to comment.