| Project website | www.ooops404.com |
|---|---|
| Translation process |
|
| Translation license | Proprietary |
| Source code repository |
git@github.com:ooops404/ooops-marketplace.git
|
| Repository branch | 12.0-dev |
| Last remote commit |
Fix oca_dependencies
73b3ae4
Giovanni authored 4 years ago |
| Weblate repository |
http://weblate.ops404.it/git/ooops-marketplace/ooops_odoo_marketplace/
|
| Filemask | ooops_odoo_marketplace/i18n/*.po |
| Languages | 2 |
| Source strings | 20 |
| Source words | 79 |
| Source characters | 460 |
| Hosted strings | 40 |
| Hosted words | 158 |
| Hosted characters | 920 |
First, rewinding head to replay your work on top of it... Applying: Fix precommit issues Using index info to reconstruct a base tree... M .github/PULL_REQUEST_TEMPLATE.md M .github/workflows/ci-push.yml M ooops_odoo_marketplace/data/ir_actions.xml M ooops_odoo_marketplace/data/ir_ui_menu.xml M ooops_odoo_marketplace/models/ir_ui_menu.py M ooops_odoo_marketplace/models/res_config_settings.py M ooops_odoo_marketplace/models/sale_order_line.py M ooops_odoo_marketplace/models/seller_shop.py M ooops_odoo_marketplace/security/ir_rule.xml M ooops_odoo_marketplace/static/src/scss/main.scss M ooops_odoo_marketplace/views/assets.xml M ooops_odoo_marketplace/views/product_template.xml M ooops_odoo_marketplace/views/res_config_settings.xml M ooops_odoo_marketplace/views/sale_order_line.xml M ooops_odoo_marketplace/views/templates.xml M ooops_odoo_marketplace_booking/controllers/main.py M ooops_odoo_marketplace_booking/models/meeting_request.py M ooops_odoo_marketplace_confirmation_email/data/mail_template.xml M ooops_odoo_marketplace_confirmation_email/models/sale_order.py M ooops_odoo_marketplace_confirmation_email/views/res_config_settings.xml M ooops_odoo_marketplace_confirmation_email/views/templates.xml M ooops_odoo_marketplace_delivery_terms/__manifest__.py M ooops_odoo_marketplace_delivery_terms/controllers/main.py M ooops_odoo_marketplace_delivery_terms/data/ir_actions.xml M ooops_odoo_marketplace_delivery_terms/data/ir_ui_menu.xml M ooops_odoo_marketplace_delivery_terms/models/marketplace_delivery_terms.py M ooops_odoo_marketplace_delivery_terms/models/sale_order_line.py M ooops_odoo_marketplace_delivery_terms/static/src/js/main.js M ooops_odoo_marketplace_delivery_terms/views/assets.xml M ooops_odoo_marketplace_delivery_terms/views/marketplace_delivery_terms.xml M ooops_odoo_marketplace_delivery_terms/views/sale_order.xml M ooops_odoo_marketplace_delivery_terms/views/sale_order_line.xml M ooops_odoo_marketplace_delivery_terms/views/templates.xml M ooops_odoo_marketplace_shipped_by/__manifest__.py M ooops_odoo_marketplace_shipped_by/controllers/main.py M ooops_odoo_marketplace_shipped_by/data/ir_actions.xml M ooops_odoo_marketplace_shipped_by/data/ir_ui_menu.xml M ooops_odoo_marketplace_shipped_by/models/marketplace_shipped_by.py M ooops_odoo_marketplace_shipped_by/models/sale_order_line.py M ooops_odoo_marketplace_shipped_by/static/src/js/main.js M ooops_odoo_marketplace_shipped_by/views/assets.xml M ooops_odoo_marketplace_shipped_by/views/marketplace_shipped_by.xml M ooops_odoo_marketplace_shipped_by/views/sale_order.xml M ooops_odoo_marketplace_shipped_by/views/sale_order_line.xml M ooops_odoo_marketplace_shipped_by/views/templates.xml M ooops_odoo_marketplace_shipping/__manifest__.py M ooops_odoo_marketplace_shipping/controllers/main.py M ooops_odoo_marketplace_shipping/models/sale_order_line.py M ooops_odoo_marketplace_shipping/models/seller_shop_shipping_option.py M ooops_odoo_marketplace_shipping/security/ir_rule.xml M ooops_odoo_marketplace_shipping/static/src/js/main.js M ooops_odoo_marketplace_shipping/views/assets.xml M ooops_odoo_marketplace_shipping/views/sale_order.xml M ooops_odoo_marketplace_shipping/views/sale_order_line.xml M ooops_odoo_marketplace_shipping/views/seller_shop.xml M ooops_odoo_marketplace_shipping/views/templates.xml M ooops_odoo_marketplace_unique_cart/__manifest__.py M ooops_odoo_marketplace_unique_cart/controllers/main.py M ooops_odoo_marketplace_unique_cart/views/templates.xml M ooops_website_sale_infinite_scroll_marketplace/__manifest__.py M ooops_website_sale_infinite_scroll_marketplace/controllers/main.py M ooops_website_sale_infinite_scroll_marketplace/static/src/js/main.js M ooops_website_sale_infinite_scroll_marketplace/static/src/scss/main.scss M ooops_website_sale_infinite_scroll_marketplace/views/assets.xml M ooops_website_sale_infinite_scroll_marketplace/views/templates.xml M ooops_website_sale_sequence_marketplace/__manifest__.py M ooops_website_sale_sequence_marketplace/views/product_template.xml Falling back to patching base and 3-way merge... Auto-merging ooops_website_sale_infinite_scroll_marketplace/controllers/main.py CONFLICT (content): Merge conflict in ooops_website_sale_infinite_scroll_marketplace/controllers/main.py error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Fix precommit issues Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". (1)4 years ago
None
giovanni-ooops