diff --git a/.gitmodules b/.gitmodules index 6e491889..bf6c03d7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -35,3 +35,15 @@ path = oca/hr-holidays url = git@github.com:OCA/hr-holidays.git branch = 15.0 +[submodule "oca/rest-framework"] + path = oca/rest-framework + url = git@github.com:OCA/rest-framework.git + branch = 15.0 +[submodule "oca/connector"] + path = oca/connector + url = git@github.com:OCA/connector.git + branch = 15.0 +[submodule "addons/vertical_forestry"] + path = addons/vertical_forestry + url = git@github.com:Mint-System/Odoo-Apps-Vertical-Forestry.git + branch = 15.0 diff --git a/addons/vertical_forestry b/addons/vertical_forestry new file mode 160000 index 00000000..ccda43be --- /dev/null +++ b/addons/vertical_forestry @@ -0,0 +1 @@ +Subproject commit ccda43be465658869031f0f870838a99292ce8a5 diff --git a/config/addons_path b/config/addons_path index d2bbf6dd..4d395df9 100644 --- a/config/addons_path +++ b/config/addons_path @@ -2,8 +2,10 @@ addons addons/manufacture addons/swiss_payroll enterprise +oca/connector oca/partner-contact oca/stock-logistics-workflow oca/hr-holidays +oca/rest-framework oca/web themes \ No newline at end of file diff --git a/config/odoo-native.conf b/config/odoo-native.conf index f2ac0e17..73464dba 100644 --- a/config/odoo-native.conf +++ b/config/odoo-native.conf @@ -1,63 +1,11 @@ [options] -addons_path = /home/janikvonrotz/Odoo-Development/odoo/addons,/home/janikvonrotz/Odoo-Development/addons,/home/janikvonrotz/Odoo-Development/addons/manufacture,/home/janikvonrotz/Odoo-Development/addons/swiss_payroll,/home/janikvonrotz/Odoo-Development/enterprise,/home/janikvonrotz/Odoo-Development/oca/partner-contact,/home/janikvonrotz/Odoo-Development/oca/stock-logistics-workflow,/home/janikvonrotz/Odoo-Development/oca/hr-holidays,/home/janikvonrotz/Odoo-Development/oca/web,/home/janikvonrotz/Odoo-Development/themes -admin_passwd = $pbkdf2-sha512$25000$kRKilFKqFUJorRWCMOb8Pw$W8CQH0UHlBTU5Y30s6apInheZ75GD.JnSSDHJkmB7eYgEQA8UroUhv9K8yygLPitdREKtGUuSY59VN79AgKVUA -csv_internal_sep = , -data_dir = /home/janikvonrotz/.local/share/Odoo -db_host = localhost -db_maxconn = 64 -db_name = odoo -db_password = odoo -db_port = False -db_sslmode = prefer -db_template = template0 -db_user = odoo -dbfilter = .* -demo = {} -email_from = False -from_filter = False -geoip_database = /usr/share/GeoIP/GeoLite2-City.mmdb -http_enable = True -http_interface = -http_port = 8069 -import_partial = -limit_memory_hard = 2684354560 -limit_memory_soft = 2147483648 -limit_request = 8192 -limit_time_cpu = 60 +addons_path = odoo/addons,addons,addons/manufacture,addons/swiss_payroll,enterprise,oca/connector,oca/partner-contact,oca/stock-logistics-workflow,oca/hr-holidays,oca/rest-framework,oca/web,themes +; admin_passwd = admin +admin_passwd = $pbkdf2-sha512$25000$rlUqpfTe2ztn7P2fcw7BOA$J9DDQN5WeT/.hyYeLNtJTOS6PhOsEbCeIN4iFaynjEY1PjW5zZwYVdR19qOEFVPOkR4HuHLi1EsV.juSjEc90w limit_time_real = 240 -limit_time_real_cron = -1 -list_db = True -log_db = False -log_db_level = warning -log_handler = :INFO -log_level = info -logfile = -longpolling_port = 8072 -max_cron_threads = 2 -osv_memory_age_limit = False -osv_memory_count_limit = False -pg_path = -pidfile = -proxy_mode = False -reportgz = False -screencasts = -screenshots = /tmp/odoo_tests -server_wide_modules = base,web -smtp_password = False -smtp_port = 25 -smtp_server = localhost -smtp_ssl = False -smtp_ssl_certificate_filename = False -smtp_ssl_private_key_filename = False -smtp_user = False -syslog = False -test_enable = False -test_file = -test_tags = None -transient_age_limit = 1.0 -translate_modules = ['all'] -unaccent = False -upgrade_path = -without_demo = False -workers = 0 - +dbfilter = .* +db_host = localhost +db_password = odoo +db_user = odoo +;without_demo = True +;log_level = debug diff --git a/config/odoo.conf b/config/odoo.conf index a7d8d569..fa8e3bca 100644 --- a/config/odoo.conf +++ b/config/odoo.conf @@ -1,5 +1,5 @@ [options] -addons_path = /mnt/addons,/mnt/addons/manufacture,/mnt/addons/swiss_payroll,/mnt/enterprise,/mnt/oca/partner-contact,/mnt/oca/stock-logistics-workflow,/mnt/oca/hr-holidays,/mnt/oca/web,/mnt/themes +addons_path = /mnt/addons,/mnt/addons/manufacture,/mnt/addons/swiss_payroll,/mnt/enterprise,/mnt/oca/connector,/mnt/oca/partner-contact,/mnt/oca/stock-logistics-workflow,/mnt/oca/hr-holidays,/mnt/oca/rest-framework,/mnt/oca/web,/mnt/themes admin_passwd = admin data_dir = /var/lib/odoo limit_time_real = 240 diff --git a/enterprise b/enterprise index b100717e..29ec62a8 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit b100717ea54cb1630bb23c25f99d50415fe64978 +Subproject commit 29ec62a8a8600a37c4943870b87f85c2edecd204 diff --git a/oca/account-invoicing b/oca/account-invoicing index ed869f01..1ab8f149 160000 --- a/oca/account-invoicing +++ b/oca/account-invoicing @@ -1 +1 @@ -Subproject commit ed869f01b083c149e43d685fed1a28204c9ce64d +Subproject commit 1ab8f149757a36960f81a87eb756af825f4d7d8d diff --git a/oca/bank-statement-import b/oca/bank-statement-import index d0312fcc..03751822 160000 --- a/oca/bank-statement-import +++ b/oca/bank-statement-import @@ -1 +1 @@ -Subproject commit d0312fcc5d7111366ccf3e83331bbe46184d97ac +Subproject commit 03751822555a33763931d6812c40d572c4a1a6a7 diff --git a/oca/business-requirement b/oca/business-requirement index 4611e13f..f001a81b 160000 --- a/oca/business-requirement +++ b/oca/business-requirement @@ -1 +1 @@ -Subproject commit 4611e13fa63164cb8f81a36e77676834ec56b249 +Subproject commit f001a81b71e1bc51dec2d767edea07fa3f948ea0 diff --git a/oca/connector b/oca/connector new file mode 160000 index 00000000..e93f114f --- /dev/null +++ b/oca/connector @@ -0,0 +1 @@ +Subproject commit e93f114faa3d8a0a304c2e94150d040156779457 diff --git a/oca/contract b/oca/contract index 4bf1fecd..19bc23c7 160000 --- a/oca/contract +++ b/oca/contract @@ -1 +1 @@ -Subproject commit 4bf1fecdb0397cd0ce55bdb1b8657fb16724ce80 +Subproject commit 19bc23c71808247c6bbd1c3e02aac2cbe389399b diff --git a/oca/crm b/oca/crm index a06c3cda..91b4145b 160000 --- a/oca/crm +++ b/oca/crm @@ -1 +1 @@ -Subproject commit a06c3cda8c313bd4188666ad05e5dcf38e2663ce +Subproject commit 91b4145bdcf37d89012cbb14703a517fc436a4d3 diff --git a/oca/dms b/oca/dms index b423381e..6054fdc0 160000 --- a/oca/dms +++ b/oca/dms @@ -1 +1 @@ -Subproject commit b423381e7a2c5789f1d85be08468f6fe50b215a4 +Subproject commit 6054fdc06fcb15394737b16606a4f4560da03a36 diff --git a/oca/hr-attendance b/oca/hr-attendance index 9a6d6381..465eb2ab 160000 --- a/oca/hr-attendance +++ b/oca/hr-attendance @@ -1 +1 @@ -Subproject commit 9a6d63815c5277bec162d51e8ef9630653e51a97 +Subproject commit 465eb2ab9e6f58f12aa54a7561de6a59114fb22b diff --git a/oca/hr-holidays b/oca/hr-holidays index fcd9793c..fc56c40f 160000 --- a/oca/hr-holidays +++ b/oca/hr-holidays @@ -1 +1 @@ -Subproject commit fcd9793c3a60be866c9a1aa94af51b06c762da58 +Subproject commit fc56c40f7e7ca148bdcfdeda34cb41c35ec56bc3 diff --git a/oca/knowledge b/oca/knowledge index 4e5483e9..144e3122 160000 --- a/oca/knowledge +++ b/oca/knowledge @@ -1 +1 @@ -Subproject commit 4e5483e91311fb1f09970f44827a620feecba683 +Subproject commit 144e3122cf688f5fb31c0ca184fe544c16e2e3b5 diff --git a/oca/l10n-switzerland b/oca/l10n-switzerland index b22a8dba..fa52f2e7 160000 --- a/oca/l10n-switzerland +++ b/oca/l10n-switzerland @@ -1 +1 @@ -Subproject commit b22a8dbacdf9e9bd55629a5a8453f482bc08dc7b +Subproject commit fa52f2e79241a7fe9278dc8abea72cc40e331bcd diff --git a/oca/product-attribute b/oca/product-attribute index 11c2b801..827b60d5 160000 --- a/oca/product-attribute +++ b/oca/product-attribute @@ -1 +1 @@ -Subproject commit 11c2b80124d2651e63e9bee70746928ae5c8357a +Subproject commit 827b60d5e9ab105f4c58b5fb86585eb48537b6e8 diff --git a/oca/project b/oca/project index f7608e86..e58f74c8 160000 --- a/oca/project +++ b/oca/project @@ -1 +1 @@ -Subproject commit f7608e864760771bc37773361a8809954d0ce4ea +Subproject commit e58f74c8e471dd28f681e8f43784f4240b5eb762 diff --git a/oca/purchase-workflow b/oca/purchase-workflow index c9145728..ec7b060b 160000 --- a/oca/purchase-workflow +++ b/oca/purchase-workflow @@ -1 +1 @@ -Subproject commit c91457282c64652a26651fe9951a55680d064214 +Subproject commit ec7b060be0ca81230e6132eaedda5bd56c091f15 diff --git a/oca/reporting-engine b/oca/reporting-engine index 59f32df9..cddc62b7 160000 --- a/oca/reporting-engine +++ b/oca/reporting-engine @@ -1 +1 @@ -Subproject commit 59f32df9329db2a8745696d3abb2cdb4934e8b3e +Subproject commit cddc62b70c5ee616152580ca57a862269938be46 diff --git a/oca/sale-workflow b/oca/sale-workflow index a2edc853..c3e02261 160000 --- a/oca/sale-workflow +++ b/oca/sale-workflow @@ -1 +1 @@ -Subproject commit a2edc8536f144769615cd15a70f61af6a01a22aa +Subproject commit c3e022619abec59cc26ca59cdba6852c363b49a9 diff --git a/oca/server-auth b/oca/server-auth index f42ef3d6..667f2e59 160000 --- a/oca/server-auth +++ b/oca/server-auth @@ -1 +1 @@ -Subproject commit f42ef3d60411f6011968a976eda11e2f4e0d6a35 +Subproject commit 667f2e597fe883d4335da589cf8148aa525100be diff --git a/oca/server-backend b/oca/server-backend index 39258517..444e1046 160000 --- a/oca/server-backend +++ b/oca/server-backend @@ -1 +1 @@ -Subproject commit 3925851767823915029d53c8bb511d43a38487bd +Subproject commit 444e10465301689a8e0f1806b105270162655bdd diff --git a/oca/server-env b/oca/server-env index cb7e226e..ae5e594b 160000 --- a/oca/server-env +++ b/oca/server-env @@ -1 +1 @@ -Subproject commit cb7e226e9b37895205373ad0eede5d20ae09a0d7 +Subproject commit ae5e594b1f909d8051e6f19a5c35909cbff59e64 diff --git a/oca/server-tools b/oca/server-tools index 47d914f7..97cc253a 160000 --- a/oca/server-tools +++ b/oca/server-tools @@ -1 +1 @@ -Subproject commit 47d914f73f116882b5fb04e77d64559a7697e5f6 +Subproject commit 97cc253aace6eae450b1c90bf607f6c982dae847 diff --git a/oca/server-ux b/oca/server-ux index 82104da2..fff80281 160000 --- a/oca/server-ux +++ b/oca/server-ux @@ -1 +1 @@ -Subproject commit 82104da2f6db093afcc783afab6d5e2949fc5fcb +Subproject commit fff8028191dc79f1a97d076bb45c2096824b92f5 diff --git a/oca/social b/oca/social index 0628e395..89475bcd 160000 --- a/oca/social +++ b/oca/social @@ -1 +1 @@ -Subproject commit 0628e395dde8aaa57b444b332ff41f1bc3bc7319 +Subproject commit 89475bcd0068c390683a8c7f3de807865ece66a9 diff --git a/oca/stock-logistics-warehouse b/oca/stock-logistics-warehouse index 06097c66..d08f2eac 160000 --- a/oca/stock-logistics-warehouse +++ b/oca/stock-logistics-warehouse @@ -1 +1 @@ -Subproject commit 06097c66a9d3144bc665e0b9e9629ca687c1de05 +Subproject commit d08f2eace026647ff6dd8263b939546ddf92f69a diff --git a/oca/timesheet b/oca/timesheet index d63e36be..8a2175a9 160000 --- a/oca/timesheet +++ b/oca/timesheet @@ -1 +1 @@ -Subproject commit d63e36bef5454b4afe304e059866550bb874ed1b +Subproject commit 8a2175a95964504ae8202ff4512d1d5f59872c49 diff --git a/oca/website b/oca/website index fd21db9b..437670e6 160000 --- a/oca/website +++ b/oca/website @@ -1 +1 @@ -Subproject commit fd21db9b1e08df5b2954d839aeb5cc271f6a00ce +Subproject commit 437670e67ccdc78fdc4c6cd1b93a1c5136cefc3e diff --git a/odoo b/odoo index 52899b2c..d2ae29f5 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit 52899b2c70fa3a0c3889a3ccdd16e54c08664102 +Subproject commit d2ae29f5f724268284b911f188a068a68e297d1e diff --git a/task b/task index 170e839e..b67e2756 100755 --- a/task +++ b/task @@ -92,6 +92,8 @@ function install-native() { pip install pre-commit pyyaml rst2html5 echo "Install graphql dependencies" pip install graphene graphql-server-core + echo "Install rest dependencies" + pip install cerberus pyquerystring parse-accept-language apispec>=4.0.0 marshmallow marshmallow-objects>=2.0.0 jsondiff echo "Install openupgrade functions" pip install git+https://github.com/OCA/openupgradelib.git@master#egg=openupgradelib echo "Install addon dependencies"