diff --git a/purchase_requisition_project_task/README.rst b/purchase_requisition_project_task/README.rst index e9f119171..930ac97da 100644 --- a/purchase_requisition_project_task/README.rst +++ b/purchase_requisition_project_task/README.rst @@ -23,6 +23,7 @@ Credits ======== * Developer: (V16) Sajna, (V17) Busthana Shirin, + (V18)Busthana Shirin, Contact : odoo@cybrosys.com Contacts diff --git a/purchase_requisition_project_task/__init__.py b/purchase_requisition_project_task/__init__.py index 097bdb395..6eeac8379 100644 --- a/purchase_requisition_project_task/__init__.py +++ b/purchase_requisition_project_task/__init__.py @@ -3,7 +3,7 @@ # # Cybrosys Technologies Pvt. Ltd. # -# Copyright (C) 2024-TODAY Cybrosys Technologies() +# Copyright (C) 2025-TODAY Cybrosys Technologies() # Author: Cybrosys Techno Solutions() # # You can modify it under the terms of the GNU LESSER diff --git a/purchase_requisition_project_task/__manifest__.py b/purchase_requisition_project_task/__manifest__.py index 421216545..90ea2baaa 100644 --- a/purchase_requisition_project_task/__manifest__.py +++ b/purchase_requisition_project_task/__manifest__.py @@ -3,7 +3,7 @@ # # Cybrosys Technologies Pvt. Ltd. # -# Copyright (C) 2024-TODAY Cybrosys Technologies() +# Copyright (C) 2025-TODAY Cybrosys Technologies() # Author: Cybrosys Techno Solutions() # # You can modify it under the terms of the GNU LESSER @@ -21,7 +21,7 @@ ############################################################################# { 'name': 'Purchase Requisition & Project Task Integration', - 'version': '17.0.1.0.0', + 'version': '18.0.1.0.1', 'category': 'Project,Purchase', 'summary': """Purchase Requisition and Project Task module relate project, task and purchase requisition""", diff --git a/purchase_requisition_project_task/doc/RELEASE_NOTES.md b/purchase_requisition_project_task/doc/RELEASE_NOTES.md index 8b132fdbf..3b00bdca1 100644 --- a/purchase_requisition_project_task/doc/RELEASE_NOTES.md +++ b/purchase_requisition_project_task/doc/RELEASE_NOTES.md @@ -1,7 +1,13 @@ ## Module -#### 07.08.2024 -#### Version 17.0.1.0.0 +#### 29.01.2025 +#### Version 18.0.1.0.0 #### ADD - Initial Commit for Purchase Requisition & Project Task Integration. + +#### 20.03.2025 +#### Version 18.0.1.0.1 +#### UPDATE + +- Updated function for price computing and added function for calculating product quantity. diff --git a/purchase_requisition_project_task/models/__init__.py b/purchase_requisition_project_task/models/__init__.py index c3e9f6a42..d69561486 100644 --- a/purchase_requisition_project_task/models/__init__.py +++ b/purchase_requisition_project_task/models/__init__.py @@ -3,7 +3,7 @@ # # Cybrosys Technologies Pvt. Ltd. # -# Copyright (C) 2024-TODAY Cybrosys Technologies() +# Copyright (C) 2025-TODAY Cybrosys Technologies() # Author: Cybrosys Techno Solutions() # # You can modify it under the terms of the GNU LESSER diff --git a/purchase_requisition_project_task/models/project_project.py b/purchase_requisition_project_task/models/project_project.py index 9b6ce1470..80e07e51c 100644 --- a/purchase_requisition_project_task/models/project_project.py +++ b/purchase_requisition_project_task/models/project_project.py @@ -3,7 +3,7 @@ # # Cybrosys Technologies Pvt. Ltd. # -# Copyright (C) 2024-TODAY Cybrosys Technologies() +# Copyright (C) 2025-TODAY Cybrosys Technologies() # Author: Cybrosys Techno Solutions() # # You can modify it under the terms of the GNU LESSER @@ -52,7 +52,7 @@ class ProjectProject(models.Model): return { 'type': 'ir.actions.act_window', 'name': 'Purchase Requisition', - 'view_mode': 'tree,form', + 'view_mode': 'list,form', 'res_model': 'purchase.requisition', 'domain': [('project_id', '=', self.id)], 'context': { diff --git a/purchase_requisition_project_task/models/project_task.py b/purchase_requisition_project_task/models/project_task.py index 4b2ace8c5..1f70783fd 100644 --- a/purchase_requisition_project_task/models/project_task.py +++ b/purchase_requisition_project_task/models/project_task.py @@ -3,7 +3,7 @@ # # Cybrosys Technologies Pvt. Ltd. # -# Copyright (C) 2024-TODAY Cybrosys Technologies() +# Copyright (C) 2025-TODAY Cybrosys Technologies() # Author: Cybrosys Techno Solutions() # # You can modify it under the terms of the GNU LESSER @@ -43,7 +43,7 @@ class ProjectTask(models.Model): return { 'type': 'ir.actions.act_window', 'name': 'Purchase Requisition', - 'view_mode': 'tree,form', + 'view_mode': 'list,form', 'res_model': 'purchase.requisition', 'domain': [('task_ids', '=', self.id)] } diff --git a/purchase_requisition_project_task/models/purchase_requisition.py b/purchase_requisition_project_task/models/purchase_requisition.py index 7d6afcdba..fd6482469 100644 --- a/purchase_requisition_project_task/models/purchase_requisition.py +++ b/purchase_requisition_project_task/models/purchase_requisition.py @@ -3,7 +3,7 @@ # # Cybrosys Technologies Pvt. Ltd. # -# Copyright (C) 2024-TODAY Cybrosys Technologies() +# Copyright (C) 2025-TODAY Cybrosys Technologies() # Author: Cybrosys Techno Solutions() # # You can modify it under the terms of the GNU LESSER diff --git a/purchase_requisition_project_task/static/description/assets/icons/arrows-repeat.svg b/purchase_requisition_project_task/static/description/assets/icons/arrows-repeat.svg new file mode 100755 index 000000000..1d7efabc5 --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/icons/arrows-repeat.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/purchase_requisition_project_task/static/description/assets/icons/banner-1.png b/purchase_requisition_project_task/static/description/assets/icons/banner-1.png new file mode 100755 index 000000000..c180db172 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/icons/banner-1.png differ diff --git a/purchase_requisition_project_task/static/description/assets/icons/banner-2.svg b/purchase_requisition_project_task/static/description/assets/icons/banner-2.svg new file mode 100755 index 000000000..e606d97d9 --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/icons/banner-2.svg @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/purchase_requisition_project_task/static/description/assets/icons/banner-bg.png b/purchase_requisition_project_task/static/description/assets/icons/banner-bg.png new file mode 100755 index 000000000..a8238d3c0 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/icons/banner-bg.png differ diff --git a/purchase_requisition_project_task/static/description/assets/icons/banner-bg.svg b/purchase_requisition_project_task/static/description/assets/icons/banner-bg.svg new file mode 100755 index 000000000..b1378103e --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/icons/banner-bg.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/purchase_requisition_project_task/static/description/assets/icons/banner-call.svg b/purchase_requisition_project_task/static/description/assets/icons/banner-call.svg new file mode 100755 index 000000000..96c687e81 --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/icons/banner-call.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/purchase_requisition_project_task/static/description/assets/icons/banner-mail.svg b/purchase_requisition_project_task/static/description/assets/icons/banner-mail.svg new file mode 100755 index 000000000..cbf0d158d --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/icons/banner-mail.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/purchase_requisition_project_task/static/description/assets/icons/banner-pattern.svg b/purchase_requisition_project_task/static/description/assets/icons/banner-pattern.svg new file mode 100755 index 000000000..9c1c7e101 --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/icons/banner-pattern.svg @@ -0,0 +1,343 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/purchase_requisition_project_task/static/description/assets/icons/banner-promo.svg b/purchase_requisition_project_task/static/description/assets/icons/banner-promo.svg new file mode 100755 index 000000000..d52791b11 --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/icons/banner-promo.svg @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/purchase_requisition_project_task/static/description/assets/icons/brand-pair.svg b/purchase_requisition_project_task/static/description/assets/icons/brand-pair.svg new file mode 100755 index 000000000..d8db7fc1e --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/icons/brand-pair.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/purchase_requisition_project_task/static/description/assets/icons/capture (1).png b/purchase_requisition_project_task/static/description/assets/icons/capture (1).png deleted file mode 100644 index 8824deafc..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/icons/capture (1).png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/icons/check.png b/purchase_requisition_project_task/static/description/assets/icons/check.png old mode 100644 new mode 100755 diff --git a/purchase_requisition_project_task/static/description/assets/icons/chevron.png b/purchase_requisition_project_task/static/description/assets/icons/chevron.png old mode 100644 new mode 100755 diff --git a/purchase_requisition_project_task/static/description/assets/icons/close-icon.svg b/purchase_requisition_project_task/static/description/assets/icons/close-icon.svg new file mode 100755 index 000000000..df8cce37a --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/icons/close-icon.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/purchase_requisition_project_task/static/description/assets/icons/cogs.png b/purchase_requisition_project_task/static/description/assets/icons/cogs.png old mode 100644 new mode 100755 diff --git a/purchase_requisition_project_task/static/description/assets/icons/collabarate-icon.svg b/purchase_requisition_project_task/static/description/assets/icons/collabarate-icon.svg new file mode 100755 index 000000000..dd4e10518 --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/icons/collabarate-icon.svg @@ -0,0 +1,3 @@ + + + diff --git a/purchase_requisition_project_task/static/description/assets/icons/consultation.png b/purchase_requisition_project_task/static/description/assets/icons/consultation.png old mode 100644 new mode 100755 diff --git a/purchase_requisition_project_task/static/description/assets/icons/cybro-logo.png b/purchase_requisition_project_task/static/description/assets/icons/cybro-logo.png new file mode 100755 index 000000000..ff4b78220 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/icons/cybro-logo.png differ diff --git a/purchase_requisition_project_task/static/description/assets/icons/down.svg b/purchase_requisition_project_task/static/description/assets/icons/down.svg new file mode 100755 index 000000000..f21c36271 --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/icons/down.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/purchase_requisition_project_task/static/description/assets/icons/ecom-black.png b/purchase_requisition_project_task/static/description/assets/icons/ecom-black.png old mode 100644 new mode 100755 diff --git a/purchase_requisition_project_task/static/description/assets/icons/education-black.png b/purchase_requisition_project_task/static/description/assets/icons/education-black.png old mode 100644 new mode 100755 diff --git a/purchase_requisition_project_task/static/description/assets/icons/faq.png b/purchase_requisition_project_task/static/description/assets/icons/faq.png new file mode 100755 index 000000000..4250b5b81 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/icons/faq.png differ diff --git a/purchase_requisition_project_task/static/description/assets/icons/feature-icon.svg b/purchase_requisition_project_task/static/description/assets/icons/feature-icon.svg new file mode 100755 index 000000000..fa0ea6850 --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/icons/feature-icon.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/purchase_requisition_project_task/static/description/assets/icons/feature.png b/purchase_requisition_project_task/static/description/assets/icons/feature.png new file mode 100755 index 000000000..ac7a785c0 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/icons/feature.png differ diff --git a/purchase_requisition_project_task/static/description/assets/icons/gear.svg b/purchase_requisition_project_task/static/description/assets/icons/gear.svg new file mode 100755 index 000000000..0cc66b6ea --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/icons/gear.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/purchase_requisition_project_task/static/description/assets/icons/hero.gif b/purchase_requisition_project_task/static/description/assets/icons/hero.gif new file mode 100755 index 000000000..380654dfe Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/icons/hero.gif differ diff --git a/purchase_requisition_project_task/static/description/assets/icons/hire-odoo.svg b/purchase_requisition_project_task/static/description/assets/icons/hire-odoo.svg new file mode 100755 index 000000000..e1ac089b0 --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/icons/hire-odoo.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/purchase_requisition_project_task/static/description/assets/icons/hotel-black.png b/purchase_requisition_project_task/static/description/assets/icons/hotel-black.png old mode 100644 new mode 100755 diff --git a/purchase_requisition_project_task/static/description/assets/icons/img.png b/purchase_requisition_project_task/static/description/assets/icons/img.png deleted file mode 100644 index 70197f477..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/icons/img.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/icons/license.png b/purchase_requisition_project_task/static/description/assets/icons/license.png old mode 100644 new mode 100755 diff --git a/purchase_requisition_project_task/static/description/assets/icons/life-ring-icon.svg b/purchase_requisition_project_task/static/description/assets/icons/life-ring-icon.svg new file mode 100755 index 000000000..3ae6e1d89 --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/icons/life-ring-icon.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/purchase_requisition_project_task/static/description/assets/icons/lifebuoy.png b/purchase_requisition_project_task/static/description/assets/icons/lifebuoy.png old mode 100644 new mode 100755 diff --git a/purchase_requisition_project_task/static/description/assets/icons/mail.svg b/purchase_requisition_project_task/static/description/assets/icons/mail.svg new file mode 100755 index 000000000..1eedde695 --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/icons/mail.svg @@ -0,0 +1,3 @@ + + + diff --git a/purchase_requisition_project_task/static/description/assets/icons/manufacturing-black.png b/purchase_requisition_project_task/static/description/assets/icons/manufacturing-black.png old mode 100644 new mode 100755 diff --git a/purchase_requisition_project_task/static/description/assets/icons/notes.png b/purchase_requisition_project_task/static/description/assets/icons/notes.png new file mode 100755 index 000000000..ee5e95404 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/icons/notes.png differ diff --git a/purchase_requisition_project_task/static/description/assets/icons/notification icon.svg b/purchase_requisition_project_task/static/description/assets/icons/notification icon.svg new file mode 100755 index 000000000..053189973 --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/icons/notification icon.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/purchase_requisition_project_task/static/description/assets/icons/odoo-consultancy.svg b/purchase_requisition_project_task/static/description/assets/icons/odoo-consultancy.svg new file mode 100755 index 000000000..e05f65bde --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/icons/odoo-consultancy.svg @@ -0,0 +1,4 @@ + + + + diff --git a/purchase_requisition_project_task/static/description/assets/icons/odoo-licencing.svg b/purchase_requisition_project_task/static/description/assets/icons/odoo-licencing.svg new file mode 100755 index 000000000..2606c88b0 --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/icons/odoo-licencing.svg @@ -0,0 +1,3 @@ + + + diff --git a/purchase_requisition_project_task/static/description/assets/icons/odoo-logo.png b/purchase_requisition_project_task/static/description/assets/icons/odoo-logo.png new file mode 100755 index 000000000..0e4d0eb5a Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/icons/odoo-logo.png differ diff --git a/purchase_requisition_project_task/static/description/assets/icons/patter.svg b/purchase_requisition_project_task/static/description/assets/icons/patter.svg new file mode 100755 index 000000000..25c9c0a8f --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/icons/patter.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/purchase_requisition_project_task/static/description/assets/icons/pattern1.png b/purchase_requisition_project_task/static/description/assets/icons/pattern1.png new file mode 100755 index 000000000..09ab0fb2d Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/icons/pattern1.png differ diff --git a/purchase_requisition_project_task/static/description/assets/icons/photo-capture.png b/purchase_requisition_project_task/static/description/assets/icons/photo-capture.png deleted file mode 100644 index 06c111758..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/icons/photo-capture.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/icons/pos-black.png b/purchase_requisition_project_task/static/description/assets/icons/pos-black.png old mode 100644 new mode 100755 diff --git a/purchase_requisition_project_task/static/description/assets/icons/puzzle-piece-icon.svg b/purchase_requisition_project_task/static/description/assets/icons/puzzle-piece-icon.svg new file mode 100755 index 000000000..3e9ad9373 --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/icons/puzzle-piece-icon.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/purchase_requisition_project_task/static/description/assets/icons/puzzle.png b/purchase_requisition_project_task/static/description/assets/icons/puzzle.png old mode 100644 new mode 100755 diff --git a/purchase_requisition_project_task/static/description/assets/icons/replace-icon.svg b/purchase_requisition_project_task/static/description/assets/icons/replace-icon.svg new file mode 100755 index 000000000..d0e3a7af1 --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/icons/replace-icon.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/purchase_requisition_project_task/static/description/assets/icons/restaurant-black.png b/purchase_requisition_project_task/static/description/assets/icons/restaurant-black.png old mode 100644 new mode 100755 diff --git a/purchase_requisition_project_task/static/description/assets/icons/screenshot-main.png b/purchase_requisition_project_task/static/description/assets/icons/screenshot-main.png new file mode 100755 index 000000000..575f8e676 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/icons/screenshot-main.png differ diff --git a/purchase_requisition_project_task/static/description/assets/icons/screenshot.png b/purchase_requisition_project_task/static/description/assets/icons/screenshot.png new file mode 100755 index 000000000..cef272529 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/icons/screenshot.png differ diff --git a/purchase_requisition_project_task/static/description/assets/icons/service-black.png b/purchase_requisition_project_task/static/description/assets/icons/service-black.png old mode 100644 new mode 100755 diff --git a/purchase_requisition_project_task/static/description/assets/icons/skype-fill.svg b/purchase_requisition_project_task/static/description/assets/icons/skype-fill.svg new file mode 100755 index 000000000..c17423639 --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/icons/skype-fill.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/purchase_requisition_project_task/static/description/assets/icons/skype.png b/purchase_requisition_project_task/static/description/assets/icons/skype.png new file mode 100755 index 000000000..51b409fb3 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/icons/skype.png differ diff --git a/purchase_requisition_project_task/static/description/assets/icons/skype.svg b/purchase_requisition_project_task/static/description/assets/icons/skype.svg new file mode 100755 index 000000000..df3dad39b --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/icons/skype.svg @@ -0,0 +1,3 @@ + + + diff --git a/purchase_requisition_project_task/static/description/assets/icons/star-1.svg b/purchase_requisition_project_task/static/description/assets/icons/star-1.svg new file mode 100755 index 000000000..7e55ab162 --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/icons/star-1.svg @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/purchase_requisition_project_task/static/description/assets/misc/star (1) 2.svg b/purchase_requisition_project_task/static/description/assets/icons/star-2.svg old mode 100644 new mode 100755 similarity index 100% rename from purchase_requisition_project_task/static/description/assets/misc/star (1) 2.svg rename to purchase_requisition_project_task/static/description/assets/icons/star-2.svg diff --git a/purchase_requisition_project_task/static/description/assets/misc/support.png b/purchase_requisition_project_task/static/description/assets/icons/support.png old mode 100644 new mode 100755 similarity index 100% rename from purchase_requisition_project_task/static/description/assets/misc/support.png rename to purchase_requisition_project_task/static/description/assets/icons/support.png diff --git a/purchase_requisition_project_task/static/description/assets/icons/test-1 - Copy.png b/purchase_requisition_project_task/static/description/assets/icons/test-1 - Copy.png new file mode 100755 index 000000000..f6a902663 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/icons/test-1 - Copy.png differ diff --git a/purchase_requisition_project_task/static/description/assets/icons/test-1.png b/purchase_requisition_project_task/static/description/assets/icons/test-1.png new file mode 100755 index 000000000..0908add2b Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/icons/test-1.png differ diff --git a/purchase_requisition_project_task/static/description/assets/icons/test-2.png b/purchase_requisition_project_task/static/description/assets/icons/test-2.png new file mode 100755 index 000000000..4671fe91e Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/icons/test-2.png differ diff --git a/purchase_requisition_project_task/static/description/assets/icons/trading-black.png b/purchase_requisition_project_task/static/description/assets/icons/trading-black.png old mode 100644 new mode 100755 diff --git a/purchase_requisition_project_task/static/description/assets/icons/training.png b/purchase_requisition_project_task/static/description/assets/icons/training.png old mode 100644 new mode 100755 diff --git a/purchase_requisition_project_task/static/description/assets/icons/translate.svg b/purchase_requisition_project_task/static/description/assets/icons/translate.svg new file mode 100755 index 000000000..af9c8a1aa --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/icons/translate.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/purchase_requisition_project_task/static/description/assets/icons/update.png b/purchase_requisition_project_task/static/description/assets/icons/update.png old mode 100644 new mode 100755 diff --git a/purchase_requisition_project_task/static/description/assets/icons/user.png b/purchase_requisition_project_task/static/description/assets/icons/user.png old mode 100644 new mode 100755 diff --git a/purchase_requisition_project_task/static/description/assets/icons/video.png b/purchase_requisition_project_task/static/description/assets/icons/video.png new file mode 100755 index 000000000..576705b17 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/icons/video.png differ diff --git a/purchase_requisition_project_task/static/description/assets/misc/whatsapp.png b/purchase_requisition_project_task/static/description/assets/icons/whatsapp.png old mode 100644 new mode 100755 similarity index 100% rename from purchase_requisition_project_task/static/description/assets/misc/whatsapp.png rename to purchase_requisition_project_task/static/description/assets/icons/whatsapp.png diff --git a/purchase_requisition_project_task/static/description/assets/icons/wrench-icon.svg b/purchase_requisition_project_task/static/description/assets/icons/wrench-icon.svg new file mode 100755 index 000000000..174b5a465 --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/icons/wrench-icon.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/purchase_requisition_project_task/static/description/assets/icons/wrench.png b/purchase_requisition_project_task/static/description/assets/icons/wrench.png old mode 100644 new mode 100755 diff --git a/purchase_requisition_project_task/static/description/assets/misc/Cybrosys R.png b/purchase_requisition_project_task/static/description/assets/misc/Cybrosys R.png deleted file mode 100644 index da4058087..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/misc/Cybrosys R.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/misc/categories.png b/purchase_requisition_project_task/static/description/assets/misc/categories.png deleted file mode 100644 index bedf1e0b1..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/misc/categories.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/misc/check-box.png b/purchase_requisition_project_task/static/description/assets/misc/check-box.png deleted file mode 100644 index 42caf24b9..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/misc/check-box.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/misc/check.png b/purchase_requisition_project_task/static/description/assets/misc/check.png deleted file mode 100644 index 42caf24b9..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/misc/check.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/misc/compass.png b/purchase_requisition_project_task/static/description/assets/misc/compass.png deleted file mode 100644 index d5fed8faa..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/misc/compass.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/misc/corporate.png b/purchase_requisition_project_task/static/description/assets/misc/corporate.png deleted file mode 100644 index 2eb13edbf..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/misc/corporate.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/misc/customer-support.png b/purchase_requisition_project_task/static/description/assets/misc/customer-support.png deleted file mode 100644 index 79efc72ed..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/misc/customer-support.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/misc/cybrosys-logo.png b/purchase_requisition_project_task/static/description/assets/misc/cybrosys-logo.png deleted file mode 100644 index cc3cc0ccf..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/misc/cybrosys-logo.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/misc/email.svg b/purchase_requisition_project_task/static/description/assets/misc/email.svg deleted file mode 100644 index 15291cdc3..000000000 --- a/purchase_requisition_project_task/static/description/assets/misc/email.svg +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/purchase_requisition_project_task/static/description/assets/misc/features.png b/purchase_requisition_project_task/static/description/assets/misc/features.png deleted file mode 100644 index b41769f77..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/misc/features.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/misc/logo.png b/purchase_requisition_project_task/static/description/assets/misc/logo.png deleted file mode 100644 index 478462d3e..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/misc/logo.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/misc/phone.svg b/purchase_requisition_project_task/static/description/assets/misc/phone.svg deleted file mode 100644 index b7bd7f251..000000000 --- a/purchase_requisition_project_task/static/description/assets/misc/phone.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/purchase_requisition_project_task/static/description/assets/misc/pictures.png b/purchase_requisition_project_task/static/description/assets/misc/pictures.png deleted file mode 100644 index 56d255fe9..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/misc/pictures.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/misc/pie-chart.png b/purchase_requisition_project_task/static/description/assets/misc/pie-chart.png deleted file mode 100644 index 426e05244..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/misc/pie-chart.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/misc/right-arrow.png b/purchase_requisition_project_task/static/description/assets/misc/right-arrow.png deleted file mode 100644 index 730984a06..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/misc/right-arrow.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/misc/star.png b/purchase_requisition_project_task/static/description/assets/misc/star.png deleted file mode 100644 index 2eb9ab29f..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/misc/star.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/misc/support (1) 1.svg b/purchase_requisition_project_task/static/description/assets/misc/support (1) 1.svg deleted file mode 100644 index 7d37a8f30..000000000 --- a/purchase_requisition_project_task/static/description/assets/misc/support (1) 1.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/purchase_requisition_project_task/static/description/assets/misc/support-email.svg b/purchase_requisition_project_task/static/description/assets/misc/support-email.svg deleted file mode 100644 index eb70370d6..000000000 --- a/purchase_requisition_project_task/static/description/assets/misc/support-email.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/purchase_requisition_project_task/static/description/assets/misc/tick-mark.svg b/purchase_requisition_project_task/static/description/assets/misc/tick-mark.svg deleted file mode 100644 index 2dbb40187..000000000 --- a/purchase_requisition_project_task/static/description/assets/misc/tick-mark.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/purchase_requisition_project_task/static/description/assets/misc/whatsapp 1.svg b/purchase_requisition_project_task/static/description/assets/misc/whatsapp 1.svg deleted file mode 100644 index 0bfaf8fc6..000000000 --- a/purchase_requisition_project_task/static/description/assets/misc/whatsapp 1.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/purchase_requisition_project_task/static/description/assets/misc/whatsapp.svg b/purchase_requisition_project_task/static/description/assets/misc/whatsapp.svg deleted file mode 100644 index b618aea1d..000000000 --- a/purchase_requisition_project_task/static/description/assets/misc/whatsapp.svg +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/purchase_requisition_project_task/static/description/assets/modules/1.gif b/purchase_requisition_project_task/static/description/assets/modules/1.gif old mode 100644 new mode 100755 index 8ac32db03..ae3a880a2 Binary files a/purchase_requisition_project_task/static/description/assets/modules/1.gif and b/purchase_requisition_project_task/static/description/assets/modules/1.gif differ diff --git a/purchase_requisition_project_task/static/description/assets/modules/1.png b/purchase_requisition_project_task/static/description/assets/modules/1.png deleted file mode 100644 index 3bedf7981..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/modules/1.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/modules/2.gif b/purchase_requisition_project_task/static/description/assets/modules/2.gif new file mode 100755 index 000000000..d19e2b352 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/modules/2.gif differ diff --git a/purchase_requisition_project_task/static/description/assets/modules/2.jpg b/purchase_requisition_project_task/static/description/assets/modules/2.jpg deleted file mode 100644 index a1dc39c89..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/modules/2.jpg and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/modules/2.png b/purchase_requisition_project_task/static/description/assets/modules/2.png deleted file mode 100644 index 2c8fbb83f..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/modules/2.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/modules/3.png b/purchase_requisition_project_task/static/description/assets/modules/3.png old mode 100644 new mode 100755 index 25ed3e0b6..8513873ea Binary files a/purchase_requisition_project_task/static/description/assets/modules/3.png and b/purchase_requisition_project_task/static/description/assets/modules/3.png differ diff --git a/purchase_requisition_project_task/static/description/assets/modules/4.png b/purchase_requisition_project_task/static/description/assets/modules/4.png old mode 100644 new mode 100755 index bc5648b1a..3bedf7981 Binary files a/purchase_requisition_project_task/static/description/assets/modules/4.png and b/purchase_requisition_project_task/static/description/assets/modules/4.png differ diff --git a/purchase_requisition_project_task/static/description/assets/modules/5.png b/purchase_requisition_project_task/static/description/assets/modules/5.png old mode 100644 new mode 100755 index 7cc3625c7..0e311ca87 Binary files a/purchase_requisition_project_task/static/description/assets/modules/5.png and b/purchase_requisition_project_task/static/description/assets/modules/5.png differ diff --git a/purchase_requisition_project_task/static/description/assets/modules/banner.jpg b/purchase_requisition_project_task/static/description/assets/modules/6.jpg old mode 100644 new mode 100755 similarity index 100% rename from purchase_requisition_project_task/static/description/assets/modules/banner.jpg rename to purchase_requisition_project_task/static/description/assets/modules/6.jpg diff --git a/purchase_requisition_project_task/static/description/assets/modules/6.png b/purchase_requisition_project_task/static/description/assets/modules/6.png deleted file mode 100644 index 745d6db78..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/modules/6.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/modules/approval_image.png b/purchase_requisition_project_task/static/description/assets/modules/approval_image.png deleted file mode 100644 index 84fe94e80..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/modules/approval_image.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/modules/budget_image.png b/purchase_requisition_project_task/static/description/assets/modules/budget_image.png deleted file mode 100644 index fe6aa6fe4..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/modules/budget_image.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/modules/create_expense_from_task_odoo.png b/purchase_requisition_project_task/static/description/assets/modules/create_expense_from_task_odoo.png deleted file mode 100755 index fa5c4077b..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/modules/create_expense_from_task_odoo.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/modules/gantt_image.png b/purchase_requisition_project_task/static/description/assets/modules/gantt_image.png deleted file mode 100644 index 4810fc34d..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/modules/gantt_image.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/modules/library_image.png b/purchase_requisition_project_task/static/description/assets/modules/library_image.png deleted file mode 100644 index 77be44d63..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/modules/library_image.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/modules/pos_order_image.png b/purchase_requisition_project_task/static/description/assets/modules/pos_order_image.png deleted file mode 100644 index 1217263a6..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/modules/pos_order_image.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/modules/project_dashboard_odoo.png b/purchase_requisition_project_task/static/description/assets/modules/project_dashboard_odoo.png deleted file mode 100755 index 6c8c8adc3..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/modules/project_dashboard_odoo.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/modules/project_report_pdf.png b/purchase_requisition_project_task/static/description/assets/modules/project_report_pdf.png deleted file mode 100755 index 57eebc5b2..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/modules/project_report_pdf.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/modules/project_task_timer.png b/purchase_requisition_project_task/static/description/assets/modules/project_task_timer.png deleted file mode 100755 index 5acf9a06a..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/modules/project_task_timer.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/modules/projects_task_checklists.png b/purchase_requisition_project_task/static/description/assets/modules/projects_task_checklists.png deleted file mode 100755 index bc5648b1a..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/modules/projects_task_checklists.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/modules/task_deadline_reminder.png b/purchase_requisition_project_task/static/description/assets/modules/task_deadline_reminder.png deleted file mode 100755 index f8aaeb32c..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/modules/task_deadline_reminder.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/modules/whatsapp_image.gif b/purchase_requisition_project_task/static/description/assets/modules/whatsapp_image.gif deleted file mode 100644 index 4c0c52982..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/modules/whatsapp_image.gif and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/assets/screenshots/hero.gif b/purchase_requisition_project_task/static/description/assets/screenshots/hero.gif index 801b68c16..b7fe7c154 100644 Binary files a/purchase_requisition_project_task/static/description/assets/screenshots/hero.gif and b/purchase_requisition_project_task/static/description/assets/screenshots/hero.gif differ diff --git a/purchase_requisition_project_task/static/description/assets/screenshots/pr1.png b/purchase_requisition_project_task/static/description/assets/screenshots/pr1.png new file mode 100644 index 000000000..7bcf25328 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/screenshots/pr1.png differ diff --git a/purchase_requisition_project_task/static/description/assets/screenshots/pr2.png b/purchase_requisition_project_task/static/description/assets/screenshots/pr2.png new file mode 100644 index 000000000..32ab65834 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/screenshots/pr2.png differ diff --git a/purchase_requisition_project_task/static/description/assets/screenshots/pr3.png b/purchase_requisition_project_task/static/description/assets/screenshots/pr3.png new file mode 100644 index 000000000..caab01bd2 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/screenshots/pr3.png differ diff --git a/purchase_requisition_project_task/static/description/assets/screenshots/pr4.png b/purchase_requisition_project_task/static/description/assets/screenshots/pr4.png new file mode 100644 index 000000000..40d897a2b Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/screenshots/pr4.png differ diff --git a/purchase_requisition_project_task/static/description/assets/screenshots/pr5.png b/purchase_requisition_project_task/static/description/assets/screenshots/pr5.png new file mode 100644 index 000000000..b76080ecc Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/screenshots/pr5.png differ diff --git a/purchase_requisition_project_task/static/description/banner.jpg b/purchase_requisition_project_task/static/description/banner.jpg index d5a3d43f0..3d045a4a2 100644 Binary files a/purchase_requisition_project_task/static/description/banner.jpg and b/purchase_requisition_project_task/static/description/banner.jpg differ diff --git a/purchase_requisition_project_task/static/description/icon.png b/purchase_requisition_project_task/static/description/icon.png index 1aa0fb256..108218ee1 100644 Binary files a/purchase_requisition_project_task/static/description/icon.png and b/purchase_requisition_project_task/static/description/icon.png differ diff --git a/purchase_requisition_project_task/static/description/index.html b/purchase_requisition_project_task/static/description/index.html index 5a2354387..51edf5420 100644 --- a/purchase_requisition_project_task/static/description/index.html +++ b/purchase_requisition_project_task/static/description/index.html @@ -1,814 +1,909 @@ - - - - Odoo App 3 Index - - - + + + Purchase Requisition & Project Task Integration + - + + + -
-
-
-
-
- -
-
-
- Community -
-
- Enterprise -
-
- Odoo.sh -
-
+ +
+
+ + + +
+
+ Community
-
-
-
-

- Purchase Requisition & Project Task Integration

-

- Integration of Purchase and Project Modules. -

-
- -
+
+ Enterprise
-
-
-

- Key Highlights -

-
-
-
-
-
- -
-
-

- Selection of a project and tasks from purchase agreement.

-
+
+ +
+
+
+
+

+ Integration of Purchase and Project Modules. +

+

Purchase Requisition & Project Task Integration +

+
+
+ +
+
+ + + Email Us + + + + Skype Us + +
+
+ +
+
+
+ +
+
+
-
-
-
- -
-
-

- Selection of multiple tasks from purchase agreement.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+

Key + Heighlights

+
+
+
+
+ +
+

Selection of a project and tasks from purchase agreement.

+
+
+
+
+
+ +
+

+ Selection of multiple tasks from purchase agreement. +

+
-
-
-
-
-
- +
+
+
+ +
+

+ Purchase tab shows the purchase agreement in tasks. +

+
-
-

- Purchase tab shows the purchase agreement in tasks.

+
+
+
+ +
+

+Creation of purchase agreement by clicking purchase tab in project.

+
-
-
-
- + +
+
+
+ Purchase Requisition & Project Task Integration +

+ Are you ready to make your business more + organized? +
Improve now! +

+
+ + + + + odoo@cybrosys.com + + + + + + +91 9074270811 + +
-
-

- Creation of purchase agreement by clicking purchase tab in project.

+
+
-
-
-
- -
-
-
-
-
- -
-
-

+ + + +
+
+ +
+
+
+
+ acc_bg +
+ +
+
+
+
+

Project and tasks selection from purchase agreement

From Purchase agreement, user can select a project and tasks.

+ +
+
+
+ +
+
+
+
-
-
-
-
-
- -
-
-

+
+
+
+

Purchase tab in project form.

Purchase tab in project form shows the count of purchase agreement of a corresponding project.

+
+
+
+ +
+
+
+

-
-
-
-
-
- -
-
-

+
+
+
+

Tree view of purchase agreements from project.

When clicking purchase tab, it shows the tree view of all purchase agreement for the project.

+
+
+
+ +
+
+
+

-
-
-
-
-
- -
-
-

- Create purchase agreement from project.

-

- From the project form, by clicking the purchase tab, user can - directly create new purchase agreement. -

-
-
-
-
-
-
- -
-
-

- Purchase agreement from project.

-

- Purchase agreement will show the project name. -

-
-
-
-
-
-
- -
-
-

+
+
+
+

Purchase tab in tasks form.

Task form view will show all the purchase agreement that created for the task.

+
+
+
+ +
+
+
+

-
-
-
-
-
- -
-
-

+
+
+
+

Purchase agreement tree view from task.

When clicking the purchase tab, it will show the tree view of all purchase agreement of the task.

-
-
-
-

-
-
-
    -
  • - - Selection of a project and tasks from purchase agreement - -
    • -
  • - - Selection of multiple tasks from purchase agreement - -
    • -
  • - - Purchase tab shows the purchase agreement in project - -
    • -
  • - - Purchase tab shows the purchase agreement in tasks -
    • -
  • - - Creation of purchase agreement by clicking purchase tab in project -
    • -
-
-
-
-
-
-
Version - 17.0.1.0.0|Released on:07th AUGUST 2024 -
-

- - Initial Commit for Purchase Requisition & Project Task Integration.

-
-
-
-
-
-
-
-

- Related Products

-
-
-

+ - - - - - + + + + + diff --git a/purchase_requisition_project_task/views/project_project_views.xml b/purchase_requisition_project_task/views/project_project_views.xml index 6372e232a..2f7f14e04 100644 --- a/purchase_requisition_project_task/views/project_project_views.xml +++ b/purchase_requisition_project_task/views/project_project_views.xml @@ -10,7 +10,7 @@ diff --git a/purchase_requisition_project_task/views/project_task_views.xml b/purchase_requisition_project_task/views/project_task_views.xml index 11eaa7ecd..f5677207b 100644 --- a/purchase_requisition_project_task/views/project_task_views.xml +++ b/purchase_requisition_project_task/views/project_task_views.xml @@ -10,7 +10,7 @@ diff --git a/purchase_requisition_project_task/views/purchase_requisition_views.xml b/purchase_requisition_project_task/views/purchase_requisition_views.xml index 43c3cb568..44ba9bd39 100644 --- a/purchase_requisition_project_task/views/purchase_requisition_views.xml +++ b/purchase_requisition_project_task/views/purchase_requisition_views.xml @@ -9,7 +9,7 @@ - +