diff --git a/purchase_requisition_project_task/README.rst b/purchase_requisition_project_task/README.rst index 930ac97da..e9f119171 100644 --- a/purchase_requisition_project_task/README.rst +++ b/purchase_requisition_project_task/README.rst @@ -23,7 +23,6 @@ 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 6eeac8379..097bdb395 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) 2025-TODAY Cybrosys Technologies() +# Copyright (C) 2024-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 90ea2baaa..421216545 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) 2025-TODAY Cybrosys Technologies() +# Copyright (C) 2024-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': '18.0.1.0.1', + 'version': '17.0.1.0.0', '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 3b00bdca1..8b132fdbf 100644 --- a/purchase_requisition_project_task/doc/RELEASE_NOTES.md +++ b/purchase_requisition_project_task/doc/RELEASE_NOTES.md @@ -1,13 +1,7 @@ ## Module -#### 29.01.2025 -#### Version 18.0.1.0.0 +#### 07.08.2024 +#### Version 17.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 d69561486..c3e9f6a42 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) 2025-TODAY Cybrosys Technologies() +# Copyright (C) 2024-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 80e07e51c..9b6ce1470 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) 2025-TODAY Cybrosys Technologies() +# Copyright (C) 2024-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': 'list,form', + 'view_mode': 'tree,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 1f70783fd..4b2ace8c5 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) 2025-TODAY Cybrosys Technologies() +# Copyright (C) 2024-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': 'list,form', + 'view_mode': 'tree,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 fd6482469..7d6afcdba 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) 2025-TODAY Cybrosys Technologies() +# Copyright (C) 2024-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 deleted file mode 100755 index 1d7efabc5..000000000 --- a/purchase_requisition_project_task/static/description/assets/icons/arrows-repeat.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - 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 deleted file mode 100755 index c180db172..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/icons/banner-1.png and /dev/null 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 deleted file mode 100755 index e606d97d9..000000000 --- a/purchase_requisition_project_task/static/description/assets/icons/banner-2.svg +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 deleted file mode 100755 index a8238d3c0..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/icons/banner-bg.png and /dev/null 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 deleted file mode 100755 index b1378103e..000000000 --- a/purchase_requisition_project_task/static/description/assets/icons/banner-bg.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - 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 deleted file mode 100755 index 96c687e81..000000000 --- a/purchase_requisition_project_task/static/description/assets/icons/banner-call.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - 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 deleted file mode 100755 index cbf0d158d..000000000 --- a/purchase_requisition_project_task/static/description/assets/icons/banner-mail.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - 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 deleted file mode 100755 index 9c1c7e101..000000000 --- a/purchase_requisition_project_task/static/description/assets/icons/banner-pattern.svg +++ /dev/null @@ -1,343 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 deleted file mode 100755 index d52791b11..000000000 --- a/purchase_requisition_project_task/static/description/assets/icons/banner-promo.svg +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 deleted file mode 100755 index d8db7fc1e..000000000 --- a/purchase_requisition_project_task/static/description/assets/icons/brand-pair.svg +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 new file mode 100644 index 000000000..8824deafc Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/icons/capture (1).png 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 100755 new mode 100644 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 100755 new mode 100644 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 deleted file mode 100755 index df8cce37a..000000000 --- a/purchase_requisition_project_task/static/description/assets/icons/close-icon.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - 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 100755 new mode 100644 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 deleted file mode 100755 index dd4e10518..000000000 --- a/purchase_requisition_project_task/static/description/assets/icons/collabarate-icon.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - 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 100755 new mode 100644 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 deleted file mode 100755 index ff4b78220..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/icons/cybro-logo.png and /dev/null 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 deleted file mode 100755 index f21c36271..000000000 --- a/purchase_requisition_project_task/static/description/assets/icons/down.svg +++ /dev/null @@ -1 +0,0 @@ - \ 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 100755 new mode 100644 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 100755 new mode 100644 diff --git a/purchase_requisition_project_task/static/description/assets/icons/faq.png b/purchase_requisition_project_task/static/description/assets/icons/faq.png deleted file mode 100755 index 4250b5b81..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/icons/faq.png and /dev/null 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 deleted file mode 100755 index fa0ea6850..000000000 --- a/purchase_requisition_project_task/static/description/assets/icons/feature-icon.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/purchase_requisition_project_task/static/description/assets/icons/feature.png b/purchase_requisition_project_task/static/description/assets/icons/feature.png deleted file mode 100755 index ac7a785c0..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/icons/feature.png and /dev/null 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 deleted file mode 100755 index 0cc66b6ea..000000000 --- a/purchase_requisition_project_task/static/description/assets/icons/gear.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/purchase_requisition_project_task/static/description/assets/icons/hero.gif b/purchase_requisition_project_task/static/description/assets/icons/hero.gif deleted file mode 100755 index 380654dfe..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/icons/hero.gif and /dev/null 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 deleted file mode 100755 index e1ac089b0..000000000 --- a/purchase_requisition_project_task/static/description/assets/icons/hire-odoo.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - 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 100755 new mode 100644 diff --git a/purchase_requisition_project_task/static/description/assets/icons/img.png b/purchase_requisition_project_task/static/description/assets/icons/img.png new file mode 100644 index 000000000..70197f477 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/icons/img.png 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 100755 new mode 100644 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 deleted file mode 100755 index 3ae6e1d89..000000000 --- a/purchase_requisition_project_task/static/description/assets/icons/life-ring-icon.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - 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 100755 new mode 100644 diff --git a/purchase_requisition_project_task/static/description/assets/icons/mail.svg b/purchase_requisition_project_task/static/description/assets/icons/mail.svg deleted file mode 100755 index 1eedde695..000000000 --- a/purchase_requisition_project_task/static/description/assets/icons/mail.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - 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 100755 new mode 100644 diff --git a/purchase_requisition_project_task/static/description/assets/icons/notes.png b/purchase_requisition_project_task/static/description/assets/icons/notes.png deleted file mode 100755 index ee5e95404..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/icons/notes.png and /dev/null 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 deleted file mode 100755 index 053189973..000000000 --- a/purchase_requisition_project_task/static/description/assets/icons/notification icon.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - 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 deleted file mode 100755 index e05f65bde..000000000 --- a/purchase_requisition_project_task/static/description/assets/icons/odoo-consultancy.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - 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 deleted file mode 100755 index 2606c88b0..000000000 --- a/purchase_requisition_project_task/static/description/assets/icons/odoo-licencing.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - 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 deleted file mode 100755 index 0e4d0eb5a..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/icons/odoo-logo.png and /dev/null 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 deleted file mode 100755 index 25c9c0a8f..000000000 --- a/purchase_requisition_project_task/static/description/assets/icons/patter.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/purchase_requisition_project_task/static/description/assets/icons/pattern1.png b/purchase_requisition_project_task/static/description/assets/icons/pattern1.png deleted file mode 100755 index 09ab0fb2d..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/icons/pattern1.png and /dev/null 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 new file mode 100644 index 000000000..06c111758 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/icons/photo-capture.png 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 100755 new mode 100644 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 deleted file mode 100755 index 3e9ad9373..000000000 --- a/purchase_requisition_project_task/static/description/assets/icons/puzzle-piece-icon.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - 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 100755 new mode 100644 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 deleted file mode 100755 index d0e3a7af1..000000000 --- a/purchase_requisition_project_task/static/description/assets/icons/replace-icon.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - 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 100755 new mode 100644 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 deleted file mode 100755 index 575f8e676..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/icons/screenshot-main.png and /dev/null 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 deleted file mode 100755 index cef272529..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/icons/screenshot.png and /dev/null 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 100755 new mode 100644 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 deleted file mode 100755 index c17423639..000000000 --- a/purchase_requisition_project_task/static/description/assets/icons/skype-fill.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/purchase_requisition_project_task/static/description/assets/icons/skype.png b/purchase_requisition_project_task/static/description/assets/icons/skype.png deleted file mode 100755 index 51b409fb3..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/icons/skype.png and /dev/null 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 deleted file mode 100755 index df3dad39b..000000000 --- a/purchase_requisition_project_task/static/description/assets/icons/skype.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - 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 deleted file mode 100755 index 7e55ab162..000000000 --- a/purchase_requisition_project_task/static/description/assets/icons/star-1.svg +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 deleted file mode 100755 index f6a902663..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/icons/test-1 - Copy.png and /dev/null 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 deleted file mode 100755 index 0908add2b..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/icons/test-1.png and /dev/null 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 deleted file mode 100755 index 4671fe91e..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/icons/test-2.png and /dev/null 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 100755 new mode 100644 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 100755 new mode 100644 diff --git a/purchase_requisition_project_task/static/description/assets/icons/translate.svg b/purchase_requisition_project_task/static/description/assets/icons/translate.svg deleted file mode 100755 index af9c8a1aa..000000000 --- a/purchase_requisition_project_task/static/description/assets/icons/translate.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - 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 100755 new mode 100644 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 100755 new mode 100644 diff --git a/purchase_requisition_project_task/static/description/assets/icons/video.png b/purchase_requisition_project_task/static/description/assets/icons/video.png deleted file mode 100755 index 576705b17..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/icons/video.png and /dev/null differ 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 deleted file mode 100755 index 174b5a465..000000000 --- a/purchase_requisition_project_task/static/description/assets/icons/wrench-icon.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - 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 100755 new mode 100644 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 new file mode 100644 index 000000000..da4058087 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/misc/Cybrosys R.png 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 new file mode 100644 index 000000000..bedf1e0b1 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/misc/categories.png 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 new file mode 100644 index 000000000..42caf24b9 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/misc/check-box.png 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 new file mode 100644 index 000000000..42caf24b9 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/misc/check.png 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 new file mode 100644 index 000000000..d5fed8faa Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/misc/compass.png 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 new file mode 100644 index 000000000..2eb13edbf Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/misc/corporate.png 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 new file mode 100644 index 000000000..79efc72ed Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/misc/customer-support.png 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 new file mode 100644 index 000000000..cc3cc0ccf Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/misc/cybrosys-logo.png 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 new file mode 100644 index 000000000..15291cdc3 --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/misc/email.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/purchase_requisition_project_task/static/description/assets/misc/features.png b/purchase_requisition_project_task/static/description/assets/misc/features.png new file mode 100644 index 000000000..b41769f77 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/misc/features.png 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 new file mode 100644 index 000000000..478462d3e Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/misc/logo.png 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 new file mode 100644 index 000000000..b7bd7f251 --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/misc/phone.svg @@ -0,0 +1,3 @@ + + + diff --git a/purchase_requisition_project_task/static/description/assets/misc/pictures.png b/purchase_requisition_project_task/static/description/assets/misc/pictures.png new file mode 100644 index 000000000..56d255fe9 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/misc/pictures.png 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 new file mode 100644 index 000000000..426e05244 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/misc/pie-chart.png 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 new file mode 100644 index 000000000..730984a06 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/misc/right-arrow.png differ diff --git a/purchase_requisition_project_task/static/description/assets/icons/star-2.svg b/purchase_requisition_project_task/static/description/assets/misc/star (1) 2.svg old mode 100755 new mode 100644 similarity index 100% rename from purchase_requisition_project_task/static/description/assets/icons/star-2.svg rename to purchase_requisition_project_task/static/description/assets/misc/star (1) 2.svg diff --git a/purchase_requisition_project_task/static/description/assets/misc/star.png b/purchase_requisition_project_task/static/description/assets/misc/star.png new file mode 100644 index 000000000..2eb9ab29f Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/misc/star.png 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 new file mode 100644 index 000000000..7d37a8f30 --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/misc/support (1) 1.svg @@ -0,0 +1,9 @@ + + + + + + + + + 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 new file mode 100644 index 000000000..eb70370d6 --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/misc/support-email.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/purchase_requisition_project_task/static/description/assets/icons/support.png b/purchase_requisition_project_task/static/description/assets/misc/support.png old mode 100755 new mode 100644 similarity index 100% rename from purchase_requisition_project_task/static/description/assets/icons/support.png rename to purchase_requisition_project_task/static/description/assets/misc/support.png 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 new file mode 100644 index 000000000..2dbb40187 --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/misc/tick-mark.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 000000000..0bfaf8fc6 --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/misc/whatsapp 1.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/purchase_requisition_project_task/static/description/assets/icons/whatsapp.png b/purchase_requisition_project_task/static/description/assets/misc/whatsapp.png old mode 100755 new mode 100644 similarity index 100% rename from purchase_requisition_project_task/static/description/assets/icons/whatsapp.png rename to purchase_requisition_project_task/static/description/assets/misc/whatsapp.png diff --git a/purchase_requisition_project_task/static/description/assets/misc/whatsapp.svg b/purchase_requisition_project_task/static/description/assets/misc/whatsapp.svg new file mode 100644 index 000000000..b618aea1d --- /dev/null +++ b/purchase_requisition_project_task/static/description/assets/misc/whatsapp.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 100755 new mode 100644 index ae3a880a2..8ac32db03 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 new file mode 100644 index 000000000..3bedf7981 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/modules/1.png 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 deleted file mode 100755 index d19e2b352..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/modules/2.gif and /dev/null 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 new file mode 100644 index 000000000..a1dc39c89 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/modules/2.jpg 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 new file mode 100644 index 000000000..2c8fbb83f Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/modules/2.png 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 100755 new mode 100644 index 8513873ea..25ed3e0b6 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 100755 new mode 100644 index 3bedf7981..bc5648b1a 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 100755 new mode 100644 index 0e311ca87..7cc3625c7 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/6.png b/purchase_requisition_project_task/static/description/assets/modules/6.png new file mode 100644 index 000000000..745d6db78 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/modules/6.png 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 new file mode 100644 index 000000000..84fe94e80 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/modules/approval_image.png differ diff --git a/purchase_requisition_project_task/static/description/assets/modules/6.jpg b/purchase_requisition_project_task/static/description/assets/modules/banner.jpg old mode 100755 new mode 100644 similarity index 100% rename from purchase_requisition_project_task/static/description/assets/modules/6.jpg rename to purchase_requisition_project_task/static/description/assets/modules/banner.jpg 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 new file mode 100644 index 000000000..fe6aa6fe4 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/modules/budget_image.png 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 new file mode 100755 index 000000000..fa5c4077b Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/modules/create_expense_from_task_odoo.png 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 new file mode 100644 index 000000000..4810fc34d Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/modules/gantt_image.png 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 new file mode 100644 index 000000000..77be44d63 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/modules/library_image.png 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 new file mode 100644 index 000000000..1217263a6 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/modules/pos_order_image.png 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 new file mode 100755 index 000000000..6c8c8adc3 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/modules/project_dashboard_odoo.png 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 new file mode 100755 index 000000000..57eebc5b2 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/modules/project_report_pdf.png 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 new file mode 100755 index 000000000..5acf9a06a Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/modules/project_task_timer.png 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 new file mode 100755 index 000000000..bc5648b1a Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/modules/projects_task_checklists.png 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 new file mode 100755 index 000000000..f8aaeb32c Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/modules/task_deadline_reminder.png 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 new file mode 100644 index 000000000..4c0c52982 Binary files /dev/null and b/purchase_requisition_project_task/static/description/assets/modules/whatsapp_image.gif 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 b7fe7c154..801b68c16 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 deleted file mode 100644 index 7bcf25328..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/screenshots/pr1.png and /dev/null 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 deleted file mode 100644 index 32ab65834..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/screenshots/pr2.png and /dev/null 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 deleted file mode 100644 index caab01bd2..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/screenshots/pr3.png and /dev/null 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 deleted file mode 100644 index 40d897a2b..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/screenshots/pr4.png and /dev/null 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 deleted file mode 100644 index b76080ecc..000000000 Binary files a/purchase_requisition_project_task/static/description/assets/screenshots/pr5.png and /dev/null differ diff --git a/purchase_requisition_project_task/static/description/banner.jpg b/purchase_requisition_project_task/static/description/banner.jpg index 3d045a4a2..d5a3d43f0 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 108218ee1..1aa0fb256 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 51edf5420..5a2354387 100644 --- a/purchase_requisition_project_task/static/description/index.html +++ b/purchase_requisition_project_task/static/description/index.html @@ -1,909 +1,814 @@ + - - - Purchase Requisition & Project Task Integration - + + + Odoo App 3 Index + + + - - - - - -
-
- - - -
-
- Community +
+
+
+
+
+ +
+
+
+ Community +
+
+ Enterprise +
+
+ Odoo.sh +
+
-
- Enterprise +
+
+
+

+ Purchase Requisition & Project Task Integration

+

+ Integration of Purchase and Project Modules. +

+
+ +
-
- -
-
-
-
-

- Integration of Purchase and Project Modules. -

-

Purchase Requisition & Project Task Integration -

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

+ Key Highlights +

+
+
+
+
+
+ +
+
+

+ Selection of a project and 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. -

-
-
-
-
-
- -
-

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

-
+
+

+ Selection of multiple tasks from purchase agreement.

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

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

- +
+
+
+
-
- +
+

+ Purchase tab shows the purchase agreement in tasks.

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

+ 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 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 2f7f14e04..6372e232a 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 f5677207b..11eaa7ecd 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 44ba9bd39..43c3cb568 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 @@ - +