forked from OCA/stock-logistics-warehouse
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #31 from burroaktoolinc/add_modules
[ADD] OCA/OSI Migrated Modules
- Loading branch information
Showing
54 changed files
with
171 additions
and
89 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -73,3 +73,6 @@ | |
| [submodule "oca/website"] | ||
| path = oca/website | ||
| url = [email protected]:burroaktoolinc/website.git | ||
| [submodule "osi/osi-addons"] | ||
| path = osi/osi-addons | ||
| url = https://github.com/ursais/osi-addons.git | ||
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/account-analytic/account_analytic_wip |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/bank-payment/account_banking_mandate |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/credit-control/account_financial_risk |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/account-financial-tools/account_journal_lock_date |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/account-payment/account_payment_batch_process_discount |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/account-analytic/analytic_activity_based_cost |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/server-auth/auth_user_case_insensitive |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/server-tools/fetchmail_notify_error_to_sender |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../osi/osi-addons/l10n_us_check_printing_micr |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/social/mail_autosubscribe |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/manufacture/mrp_account_analytic |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/manufacture/mrp_account_analytic_wip |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/account-analytic/mrp_analytic |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/account-analytic/mrp_analytic_child_mo |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/account-analytic/mrp_analytic_sale_project |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/partner-contact/partner_stage |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/partner-contact/partner_tier_validation |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/product-attribute/product_tier_validation |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/purchase-workflow/purchase_deposit |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/purchase-workflow/purchase_order_line_price_history |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/purchase-workflow/purchase_order_type |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/purchase-workflow/purchase_request_department |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/purchase-workflow/purchase_request_type |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/sale-workflow/sale_delivery_split_date |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/sale-workflow/sale_order_line_date |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/sale-workflow/sale_order_revision |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/sale-workflow/sale_product_approval_mrp |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/stock-logistics-warehouse/stock_inventory_revaluation_adjustment |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/stock-logistics-warehouse/stock_inventory_revaluation_mrp |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/stock-logistics-warehouse/stock_inventory_revaluation_wip |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/web/web_m2x_options |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../oca/web/web_m2x_options_manager |
Submodule account-analytic
updated
118 files
Submodule account-financial-tools
updated
65 files
Submodule account-invoicing
updated
55 files
Submodule account-payment
updated
19 files
Submodule credit-control
updated
105 files
Submodule manufacture
updated
86 files
Submodule partner-contact
updated
49 files
Submodule product-attribute
updated
37 files
Submodule purchase-workflow
updated
195 files
Submodule queue
updated
3 files
| +1 −1 | README.md | |
| +1 −1 | queue_job/__manifest__.py | |
| +3 −1 | queue_job/models/queue_job.py |
Submodule sale-workflow
updated
141 files
Submodule server-auth
updated
82 files
Submodule server-backend
updated
93 files
Submodule server-tools
updated
28 files
Submodule social
updated
30 files
Submodule stock-logistics-warehouse
updated
62 files
Submodule stock-logistics-workflow
updated
66 files
Submodule web
updated
53 files
Submodule osi-addons
added at
f321c5
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,13 +5,19 @@ | |
| # osi: the code proposed by OSI to the OCA, in review process | ||
| # bot: the release candidate ready code, consolidating the several open PRs | ||
|
|
||
| # OCA Modules | ||
| ./oca/account-analytic: | ||
| remotes: | ||
| oca: https://github.com/OCA/account-analytic.git | ||
| bot: git+ssh://[email protected]/burroaktoolinc/account-analytic.git | ||
| osi: git+ssh://[email protected]/ursais/account-analytic.git | ||
| merges: | ||
| - oca 16.0 | ||
| - oca refs/pull/540/head # [16.0][MIG] account_analytic_wip | ||
| - oca refs/pull/538/head # [16.0][MIG] analytic_activity_based_cost | ||
| - oca refs/pull/494/head # 16.0 mig mrp analytic | ||
| - oca refs/pull/550/head # [16.0][MIG] mrp_analytic_child_mo: migration to 16.0 | ||
| - oca refs/pull/548/head # [WIP][16.0][MIG] mrp_analytic_sale_project | ||
| target: &default_target bot bot/16.0 | ||
|
|
||
| ./oca/account-financial-tools: | ||
|
|
@@ -21,6 +27,7 @@ | |
| osi: git+ssh://[email protected]/ursais/account-financial-tools.git | ||
| merges: | ||
| - oca 16.0 | ||
| - oca refs/pull/1509/head # [16.0][MIG] account_journal_lock_date: Migration to 16.0 | ||
| target: *default_target | ||
|
|
||
| ./oca/account-invoicing: | ||
|
|
@@ -39,6 +46,7 @@ | |
| osi: git+ssh://[email protected]/ursais/account-payment.git | ||
| merges: | ||
| - oca 16.0 | ||
| - oca refs/pull/571/head # [16.0][MIG] account_payment_batch_process_discount | ||
| target: *default_target | ||
|
|
||
| ./oca/bank-payment: | ||
|
|
@@ -57,6 +65,7 @@ | |
| osi: git+ssh://[email protected]/ursais/credit-control.git | ||
| merges: | ||
| - oca 16.0 | ||
| - oca refs/pull/272/head # [MIG][16.0]account_financial_risk | ||
| target: *default_target | ||
|
|
||
| ./oca/l10n-usa: | ||
|
|
@@ -75,6 +84,8 @@ | |
| osi: git+ssh://[email protected]/ursais/manufacture.git | ||
| merges: | ||
| - oca 16.0 | ||
| - oca refs/pull/979/head # [16.0][MIG] mrp_account_analytic | ||
| - oca refs/pull/980/head # [16.0][MIG] mrp_account_analytic_wip: Migration to 16.0 | ||
| target: *default_target | ||
|
|
||
| ./oca/partner-contact: | ||
|
|
@@ -84,6 +95,8 @@ | |
| osi: git+ssh://[email protected]/ursais/partner-contact.git | ||
| merges: | ||
| - oca 16.0 | ||
| - oca refs/pull/1487/head # [16.0][MIG] partner_stage | ||
| - oca refs/pull/1488/head # [16.0][MIG] partner_tier_validation | ||
| target: *default_target | ||
|
|
||
| ./oca/product-attribute: | ||
|
|
@@ -93,6 +106,7 @@ | |
| osi: git+ssh://[email protected]/ursais/product-attribute.git | ||
| merges: | ||
| - oca 16.0 | ||
| - oca refs/pull/1304/head # [16.0][MIG] product_tier_validation | ||
| target: *default_target | ||
|
|
||
| ./oca/project: | ||
|
|
@@ -111,6 +125,11 @@ | |
| osi: git+ssh://[email protected]/ursais/purchase-workflow.git | ||
| merges: | ||
| - oca 16.0 | ||
| - oca refs/pull/1751/head # [16.0][MIG] - purchase_deposit | ||
| - oca refs/pull/1674/head # [16.0][MIG] purchase_order_line_price_history: Migration to 16.0 | ||
| - oca refs/pull/1820/head # [16.0][MIG] purchase_order_type | ||
| - oca refs/pull/1815/head # [MIG][16.0]purchase_request_department | ||
| - oca refs/pull/1818/head # [MIG][16.0]purchase_request_type | ||
| target: *default_target | ||
|
|
||
| ./oca/queue: | ||
|
|
@@ -129,6 +148,11 @@ | |
| osi: git+ssh://[email protected]/ursais/sale-workflow.git | ||
| merges: | ||
| - oca 16.0 | ||
| - oca refs/pull/2432/head # 16.0 mig sale order line date | ||
| - oca refs/pull/2434/head # 16.0 mig sale delivery split date | ||
| - oca refs/pull/2382/head # [16.0][MIG] sale_order_revision | ||
| - oca refs/pull/2427/head # [16.0][MIG] sale_product_approval_mrp | ||
| # - oca refs/pull/2433/head # 16.0 mig sale procurement group by line | ||
| target: *default_target | ||
|
|
||
| ./oca/server-auth: | ||
|
|
@@ -138,6 +162,7 @@ | |
| osi: git+ssh://[email protected]/ursais/server-auth.git | ||
| merges: | ||
| - oca 16.0 | ||
| - oca refs/pull/479/head # [16.0][MIG] auth_user_case_insensitive | ||
| target: *default_target | ||
|
|
||
| ./oca/server-backend: | ||
|
|
@@ -156,6 +181,7 @@ | |
| osi: git+ssh://[email protected]/ursais/server-tools.git | ||
| merges: | ||
| - oca 16.0 | ||
| - oca refs/pull/2574/head # [16.0][MIG] fetchmail_notify_error_to_sender: Migration to 16.0 | ||
| target: *default_target | ||
|
|
||
| ./oca/server-ux: | ||
|
|
@@ -174,6 +200,7 @@ | |
| osi: git+ssh://[email protected]/ursais/social.git | ||
| merges: | ||
| - oca 16.0 | ||
| - oca refs/pull/1115/head # [MIG][16.0]mail_autosubscribe | ||
| target: *default_target | ||
|
|
||
| ./oca/stock-logistics-warehouse: | ||
|
|
@@ -183,6 +210,9 @@ | |
| osi: git+ssh://[email protected]/ursais/stock-logistics-warehouse.git | ||
| merges: | ||
| - oca 16.0 | ||
| - oca refs/pull/1663/head # [16.0][MIG] stock_inventory_revaluation_wip | ||
| - oca refs/pull/1662/head # [16.0][MIG] stock_inventory_revaluation_mrp | ||
| - oca refs/pull/1661/head # [16.0][MIG] stock_inventory_revaluation_adjustment | ||
| target: *default_target | ||
|
|
||
| ./oca/stock-logistics-workflow: | ||
|
|
@@ -202,6 +232,8 @@ | |
| merges: | ||
| - oca 16.0 | ||
| - oca refs/pull/2404/head # [16.0][MIG] web_company_color | ||
| - oca refs/pull/2446/head # [16.0][MIG] web_m2x_options: Migration to 16.0 | ||
| - oca refs/pull/2448/head # [16.0][MIG] web_m2x_options_manager : Migrated to 16.0. | ||
| target: *default_target | ||
|
|
||
| ./oca/website: | ||
|
|
@@ -212,3 +244,13 @@ | |
| merges: | ||
| - oca 16.0 | ||
| target: *default_target | ||
|
|
||
| # OSI Modules | ||
| ./osi/osi-addons: | ||
| remotes: | ||
| osi: git+ssh://[email protected]/ursais/osi-addons.git | ||
| bot: git+ssh://[email protected]/burroaktoolinc/osi-addons.git | ||
| merges: | ||
| - osi 16.0 | ||
| - osi refs/pull/531/head # [16.0][MIG] l10n_us_check_printing_micr | ||
| target: *default_target | ||