Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix conflicts #298

Open
wants to merge 10 commits into
base: 14.0
Choose a base branch
from
+511 −509
Open

Fix conflicts #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
914596c
[FIX] error language undefine
Feb 11, 2022
38d889e
Merge branch 'CybroOdoo:14.0' into 14.0
efairon Mar 2, 2022
994a70d
Merge branch 'CybroOdoo:14.0' into 14.0
efairon Mar 15, 2022
5375417
[FIX] website, author
May 4, 2022
c308302
[FIX] author
May 4, 2022
c134b8b
Merge branch 'CybroOdoo:14.0' into 14.0
efairon May 6, 2022
a3df8ce
Merge branch 'CybroOdoo:14.0' into 14.0
efairon May 27, 2022
dded021
Merge branch 'CybroOdoo:14.0' into 14.0
efairon Jul 6, 2022
2e23285
Merge branch '14.0' into 14.0
kpofw Jan 2, 2024
60a13ea
Merge branch 'CybroOdoo:14.0' into 14.0
efairon Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions access_restriction_by_ip/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
'version': '14.0.1.0.0',
'description': """User Can Access His Account Only From Specified IP Address""",
'live_test_url': 'https://youtu.be/nn6dAL6eKPc',
'author': 'Cybrosys Techno Solutions',
'company': 'Cybrosys Techno Solutions',
'website': 'https://www.cybrosys.com',
'author': 'Frontware, Cybrosys Techno Solutions',
'company': 'Frontware, Cybrosys Techno Solutions',
'website': "https://github.com/Frontware/CybroAddons",
'category': 'Tools',
'depends': ['base', 'mail'],
'license': 'AGPL-3',
Expand Down
8 changes: 4 additions & 4 deletions account_partner_ledger_filter/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
'version': '14.0.1.0.0',
'summary': """Partner Ledger Report with Partner Filter""",
'description': """Partner Ledger Report with Partner Filter""",
'author': 'Cybrosys Techno Solutions',
'company': 'Cybrosys Techno Solutions',
'maintainer': 'Cybrosys Techno Solutions',
'website': "https://cybrosys.com/",
'author': 'Frontware, Cybrosys Techno Solutions',
'company': 'Frontware, Cybrosys Techno Solutions',
'maintainer': 'Frontware, Cybrosys Techno Solutions',
'website': "https://github.com/Frontware/CybroAddons",
'category': 'Accounting',
'depends': ['base_accounting_kit'],
'data': [
Expand Down
8 changes: 4 additions & 4 deletions account_payment_approval/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
'category': 'Accounting',
'summary': """ This modules enables approval feature in the payment.""",
'description': """This modules enables approval feature in the payment. """,
'author': ' Cybrosys Techno Solutions',
'company': 'Cybrosys Techno Solutions',
'maintainer': 'Cybrosys Techno Solutions',
'website': "https://www.cybrosys.com",
'author': 'Frontware, Cybrosys Techno Solutions',
'company': 'Frontware, Cybrosys Techno Solutions',
'maintainer': 'Frontware, Cybrosys Techno Solutions',
'website': "https://github.com/Frontware/CybroAddons",
'depends': ['account'],
'data': [
'views/res_config_settings_views.xml',
Expand Down
8 changes: 4 additions & 4 deletions account_payment_instalment/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
{
'name': "Instalment in Payment Terms",
'version': '14.0.1.0.0',
'author': 'Cybrosys Techno Solutions',
'company': 'Cybrosys Techno Solutions',
'maintainer': 'Cybrosys Techno Solutions',
'website': 'https://www.cybrosys.com',
'author': 'Frontware, Cybrosys Techno Solutions',
'company': 'Frontware, Cybrosys Techno Solutions',
'maintainer': 'Frontware, Cybrosys Techno Solutions',
'website': "https://github.com/Frontware/CybroAddons",
'category': 'Accounting',
'summary': 'Instalment in Payment Terms"',
'description': """
Expand Down
8 changes: 4 additions & 4 deletions advance_cash_flow_statements/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
'version': '14.0.1.0.0',
'summary': """Generate four levels of cash flow statement reports in PDF and Excel""",
'description': """Generate four levels of cash flow statement reports in PDF and Excel, pdf report, excel report, cashflow, odoo13""",
'author': "Cybrosys Techno Solutions",
'company': 'Cybrosys Techno Solutions',
'maintainer': 'Cybrosys Techno Solutions',
'website': "https://www.cybrosys.com",
'author': "Frontware, Cybrosys Techno Solutions",
'company': 'Frontware, Cybrosys Techno Solutions',
'maintainer': 'Frontware, Cybrosys Techno Solutions',
'website': "https://github.com/Frontware/CybroAddons",
'category': 'Accounting',
'depends': ['base', 'account'],
'data': ['security/ir.model.access.csv',
Expand Down
8 changes: 4 additions & 4 deletions automatic_payroll/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
'version': '14.0.1.0.0',
'category': 'Generic Modules/Human Resources',
'description': """Generate payslips automatically""",
'author': 'Cybrosys Techno Solutions',
'company': 'Cybrosys Techno Solutions',
'website': "https://www.cybrosys.com",
'maintainer': 'Cybrosys Techno Solutions',
'author': 'Frontware, Cybrosys Techno Solutions',
'company': 'Frontware, Cybrosys Techno Solutions',
'website': "https://github.com/Frontware/CybroAddons",
'maintainer': 'Frontware, Cybrosys Techno Solutions',
'depends': ['base', 'hr_payroll_community'],
'data': ['views/schedule_cron.xml',
'views/res_config_settings_view.xml'],
Expand Down
8 changes: 4 additions & 4 deletions backend_theme_odoo12/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
"description": """Backend theme for Odoo 14.0 community edition""",
"summary": "Backend theme for Odoo 14.0 community edition.",
"version": "14.0.1.0.0",
'author': 'Cybrosys Techno Solutions',
'company': 'Cybrosys Techno Solutions',
'maintainer': 'Cybrosys Techno Solutions',
"website": "https://www.cybrosys.com",
'author': 'Frontware, Cybrosys Techno Solutions',
'company': 'Frontware, Cybrosys Techno Solutions',
'maintainer': 'Frontware, Cybrosys Techno Solutions',
"website": "https://github.com/Frontware/CybroAddons",
"category": "Themes/Backend",
'images': [
'static/description/banner.png',
Expand Down
6 changes: 3 additions & 3 deletions barcode_scanning_sale_purchase/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
'category': 'Sales',
'live_test_url': 'https://www.youtube.com/watch?v=6tJZAfPu__s&feature=youtu.be',
'summary': 'This module will help you to use barcode scanner in sales and purchase.',
'author': 'Cybrosys Techno solutions',
'company': 'Cybrosys Techno Solutions',
'website': 'https://www.cybrosys.com',
'author': 'Frontware, Cybrosys Techno Solutions',
'company': 'Frontware, Cybrosys Techno Solutions',
'website': "https://github.com/Frontware/CybroAddons",
'depends': ['purchase', 'sale_management'],
'data': [
'views/sale_order_line.xml',
Expand Down
8 changes: 4 additions & 4 deletions base_account_budget/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@
Odoo 14 Budget Management,Odoo 14, Odoo 14 Budget, Odoo 14 Accounting,
Odoo 14 Account,Budget Management, Budget""",
'category': 'Accounting',
'author': 'Cybrosys Techno Solutions',
'company': 'Cybrosys Techno Solutions',
'maintainer': 'Cybrosys Techno Solutions',
'author': 'Frontware, Cybrosys Techno Solutions',
'company': 'Frontware, Cybrosys Techno Solutions',
'maintainer': 'Frontware, Cybrosys Techno Solutions',
'depends': ['base', 'account'],
'website': 'https://www.cybrosys.com',
'website': "https://github.com/Frontware/CybroAddons",
'data': [
'security/ir.model.access.csv',
'security/account_budget_security.xml',
Expand Down
8 changes: 4 additions & 4 deletions base_accounting_kit/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@
Reconciliation Widget For Odoo14,
Payments Matching
""",
'author': 'Cybrosys Techno Solutions, Odoo SA',
'website': "https://www.cybrosys.com",
'company': 'Cybrosys Techno Solutions',
'maintainer': 'Cybrosys Techno Solutions',
'author': 'Frontware, Cybrosys Techno Solutions, Odoo SA',
'website': "https://github.com/Frontware/CybroAddons",
'company': 'Frontware, Cybrosys Techno Solutions',
'maintainer': 'Frontware, Cybrosys Techno Solutions',
'depends': ['base', 'account', 'sale', 'account_check_printing', 'base_account_budget'],
'data': [
'security/ir.model.access.csv',
Expand Down
4 changes: 3 additions & 1 deletion base_accounting_kit/static/src/js/account_dashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1188,7 +1188,7 @@ odoo.define('AccountingDashboard.AccountingDashboard', function(require) {
.then(function(result) {
currency = result;

})



rpc.query({
Expand Down Expand Up @@ -1836,6 +1836,8 @@ odoo.define('AccountingDashboard.AccountingDashboard', function(require) {

}
})

})// get currency
});
},

Expand Down
8 changes: 4 additions & 4 deletions commission_plan/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
'summary': """CRM Commission Plan for odoo14""",
"category": 'Sales',
"version": '14.0.1.0.0',
'author': 'Cybrosys Techno Solutions',
'company': 'Cybrosys Techno Solutions',
'maintainer': 'Cybrosys Techno Solutions',
'website': "https://www.cybrosys.com",
'author': 'Frontware, Cybrosys Techno Solutions',
'company': 'Frontware, Cybrosys Techno Solutions',
'maintainer': 'Frontware, Cybrosys Techno Solutions',
'website': "https://github.com/Frontware/CybroAddons",
"depends": ['base', 'sale_management', 'crm'],
"data": [
'security/ir.model.access.csv',
Expand Down
8 changes: 4 additions & 4 deletions crm_kit/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
'summary': """Complete CRM Kit for odoo14""",
"category": 'Sales',
"version": '14.0.1.0.0',
'author': 'Cybrosys Techno Solutions',
'company': 'Cybrosys Techno Solutions',
'maintainer': 'Cybrosys Techno Solutions',
'website': "https://www.cybrosys.com",
'author': 'Frontware, Cybrosys Techno Solutions',
'company': 'Frontware, Cybrosys Techno Solutions',
'maintainer': 'Frontware, Cybrosys Techno Solutions',
'website': "https://github.com/Frontware/CybroAddons",
"depends": ['base', 'sale_management', 'crm', 'crm_dashboard'],
"data": [
'security/ir.model.access.csv',
Expand Down
8 changes: 4 additions & 4 deletions cts_theme_perfume/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
'summary': 'Design Web Pages with theme Perfume',
'category': 'Theme/eCommerce',
'version': '14.0.1.0.0',
'author': 'Cybrosys Techno Solutions',
'company': 'Cybrosys Techno Solutions',
'maintainer': 'Cybrosys Techno Solutions',
'website': "https://www.cybrosys.com",
'author': 'Frontware, Cybrosys Techno Solutions',
'company': 'Frontware, Cybrosys Techno Solutions',
'maintainer': 'Frontware, Cybrosys Techno Solutions',
'website': "https://github.com/Frontware/CybroAddons",
'depends': ['website_sale', 'website_sale_wishlist'],
'data': [
'views/snippets/perfume_banner.xml',
Expand Down
8 changes: 4 additions & 4 deletions cts_theme_rozz/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
'summary': 'Design Web Pages with Theme Rozz',
'category': 'Theme/Corporate',
'version': '14.0.1.0.0',
'author': 'Cybrosys Techno Solutions',
'company': 'Cybrosys Techno Solutions',
'maintainer': 'Cybrosys Techno Solutions',
'website': "https://www.cybrosys.com",
'author': 'Frontware, Cybrosys Techno Solutions',
'company': 'Frontware, Cybrosys Techno Solutions',
'maintainer': 'Frontware, Cybrosys Techno Solutions',
'website': "https://github.com/Frontware/CybroAddons",
'depends': ['website', 'website_crm', 'website_blog'],
'data': [
'views/snippets/rozz_banner.xml',
Expand Down
8 changes: 4 additions & 4 deletions customer_product_qrcode/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
'summary': 'Generate Unique QR Codes for Customers and Products',
'description': 'QR Code, QR Code Generator, Odoo QR Code Generator, Customer QR Code, Product QR Code, QR, QR Code Odoo',
'category': 'Extra Tools',
'author': 'Cybrosys Techno solutions',
'maintainer': 'Cybrosys Techno Solutions',
'company': 'Cybrosys Techno Solutions',
'website': 'https://www.cybrosys.com',
'author': 'Frontware, Cybrosys Techno Solutions',
'maintainer': 'Frontware, Cybrosys Techno Solutions',
'company': 'Frontware, Cybrosys Techno Solutions',
'website': "https://github.com/Frontware/CybroAddons",
'depends': ['base', 'sale', 'stock'],
'data': [
'report/paperformat.xml',
Expand Down
6 changes: 3 additions & 3 deletions customer_sequence/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
'description': """
Each customer have unique number code, Odoo 13, Odoo
""",
'author': 'Cybrosys Techno Solutions',
'company': 'Cybrosys Techno Solutions',
'website': "https://cybrosys.com/",
'author': 'Frontware, Cybrosys Techno Solutions',
'company': 'Frontware, Cybrosys Techno Solutions',
'website': "https://github.com/Frontware/CybroAddons",
'category': 'Sales',
'depends': ['sale_management'],
'data': [
Expand Down
6 changes: 3 additions & 3 deletions customize_settings/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
'summary': """Customize Odoo, odoo14""",
'description': """Customize Odoo, odoo14""",
'live_test_url': 'https://www.youtube.com/watch?v=fYSPARjmYA4',
'author': "Cybrosys Techno Solutions",
'company': "Cybrosys Techno Solutions",
'author': "Frontware, Cybrosys Techno Solutions",
'company': "Frontware, Cybrosys Techno Solutions",
'maintainer': "Cybrosys Techno Solutions",
'website': "https://cybrosys.com/",
'website': "https://github.com/Frontware/CybroAddons",
'category': 'Tools',
'depends': ['website', 'base_setup'],
'data': [
Expand Down
8 changes: 4 additions & 4 deletions customized_barcode_generator/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
'description': """The module enables user to print customized product labels, Barcode, Barcode Generator, Barcode Label, Product Label, Product Barcode Generator, Product Barcode, Label Print, Product Label Print
""",
'category': 'Tools',
'author': 'Cybrosys Techno Solutions',
'company': 'Cybrosys Techno Solutions',
'maintainer': 'Cybrosys Techno Solutions',
'author': 'Frontware, Cybrosys Techno Solutions',
'company': 'Frontware, Cybrosys Techno Solutions',
'maintainer': 'Frontware, Cybrosys Techno Solutions',
'depends': ['base', 'web', 'product','account'],
'website': 'https://www.cybrosys.com',
'website': "https://github.com/Frontware/CybroAddons",
'data': [
'report/product_label_template.xml',
'views/barcode_generator_view.xml',
Expand Down
8 changes: 4 additions & 4 deletions cybrosys_support_client/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
'summary': 'Create Odoo Support Request To Cybrosys',
'version': '14.0.1.0.1',
'description': """Odoo Support""",
'author': 'Cybrosys Techno Solutions',
'company': 'Cybrosys Techno Solutions',
'website': 'https://www.cybrosys.com',
'maintainer': 'Cybrosys Techno Solutions',
'author': 'Frontware, Cybrosys Techno Solutions',
'company': 'Frontware, Cybrosys Techno Solutions',
'website': "https://github.com/Frontware/CybroAddons",
'maintainer': 'Frontware, Cybrosys Techno Solutions',
'license': 'LGPL-3',
'depends': ['base'],
'qweb': ['static/src/xml/systray_theme.xml'],
Expand Down
8 changes: 4 additions & 4 deletions dark_mode_backend/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
"summary": "Dark Mode Backend Theme V14 is an attractive theme for backend",
"category": "Themes/Backend",
"version": "14.0.1.0.0",
'author': 'Cybrosys Techno Solutions',
'company': 'Cybrosys Techno Solutions',
'maintainer': 'Cybrosys Techno Solutions',
'website': "https://www.cybrosys.com",
'author': 'Frontware, Cybrosys Techno Solutions',
'company': 'Frontware, Cybrosys Techno Solutions',
'maintainer': 'Frontware, Cybrosys Techno Solutions',
'website': "https://github.com/Frontware/CybroAddons",
"depends": ['base', 'web', 'mail'],
"data": [
'assets/assets.xml',
Expand Down
6 changes: 3 additions & 3 deletions dashboard_pos/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
'summary': """POS Dashboard""",
'description': """POS Dashboard""",
'category': 'Point of Sale',
'author': 'Cybrosys Techno Solutions',
'company': 'Cybrosys Techno Solutions',
'maintainer': 'Cybrosys Techno Solutions',
'author': 'Frontware, Cybrosys Techno Solutions',
'company': 'Frontware, Cybrosys Techno Solutions',
'maintainer': 'Frontware, Cybrosys Techno Solutions',
'website': "https://www.openhrms.com",
'depends': ['hr', 'point_of_sale'],
'external_dependencies': {
Expand Down
8 changes: 4 additions & 4 deletions developer_mode/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
'summary': """Automatically Activate Developer Mode""",
'description': """Automatically Activate Developer Mode""",
'version': '14.0.1.0.0',
'author': 'Cybrosys Techno Solutions',
'website': "https://www.cybrosys.com",
'company': 'Cybrosys Techno Solutions',
'maintainer': 'Cybrosys Techno Solutions',
'author': 'Frontware, Cybrosys Techno Solutions',
'website': "https://github.com/Frontware/CybroAddons",
'company': 'Frontware, Cybrosys Techno Solutions',
'maintainer': 'Frontware, Cybrosys Techno Solutions',
'category': 'Extra Tools',
'depends': ['base', 'web', 'base_setup'],
'data': [
Expand Down
8 changes: 4 additions & 4 deletions discount_limit/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
This module is used to limit the discount on pos product category and
also restrict the global discount for selected cashiers.""",
'version': '14.0.1.0.0',
'author': "Cybrosys Techno Solutions",
'website': "https://www.cybrosys.com",
'company': 'Cybrosys Techno Solutions',
'maintainer': 'Cybrosys Techno Solutions',
'author': "Frontware, Cybrosys Techno Solutions",
'website': "https://github.com/Frontware/CybroAddons",
'company': 'Frontware, Cybrosys Techno Solutions',
'maintainer': 'Frontware, Cybrosys Techno Solutions',
'category': 'Point of Sale',
'depends': ['point_of_sale','hr'],
'data': [
Expand Down
8 changes: 4 additions & 4 deletions dodger_blue/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"summary": "Outrageous Blue Backend Theme",
"version": "14.0.1.0.0",
"category": "Themes/Backend",
"website": "https://www.cybrosys.com",
"website": "https://github.com/Frontware/CybroAddons",
"description": """Backend theme for Odoo 14.0 community edition. Blue theme blue backend theme odoo backend theme""",
'author': 'Cybrosys Techno Solutions',
'company': 'Cybrosys Techno Solutions',
'maintainer': 'Cybrosys Techno Solutions',
'author': 'Frontware, Cybrosys Techno Solutions',
'company': 'Frontware, Cybrosys Techno Solutions',
'maintainer': 'Frontware, Cybrosys Techno Solutions',
"depends": [
'website',
'portal',
Expand Down
8 changes: 4 additions & 4 deletions dynamic_partner_fields/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
'description': """Ability To Add Custom Fields in Partner From User Level,Partner Custom Fields,
Partner Dynamic Fields, odoo13, Dynamic Partner Fields, Dynamic Fields, Create Dynamic Fields, Community odoo Studio""",
'category': 'Extra Tools',
'author': 'Cybrosys Techno Solutions',
'company': 'Cybrosys Techno Solutions',
'maintainer': 'Cybrosys Techno Solutions',
'website': "https://www.cybrosys.com",
'author': 'Frontware, Cybrosys Techno Solutions',
'company': 'Frontware, Cybrosys Techno Solutions',
'maintainer': 'Frontware, Cybrosys Techno Solutions',
'website': "https://github.com/Frontware/CybroAddons",
'depends': ['contacts'],
'data': [
'data/widget_data.xml',
Expand Down
Loading