forked from OCA/purchase-workflow
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'wip/sodexis/0.1.10' into 'develop'
[IMP] Sodexis 0.1.10 Closes OCA#79, OCA#77, OCA#76, and OCA#63 See merge request kencove/odoo/odoo-platform!63
- Loading branch information
Showing
13 changed files
with
39 additions
and
11 deletions.
There are no files selected for viewing
Submodule account-fiscal-rule
updated
8 files
Submodule bank-payment
updated
17 files
Submodule kencove-sodexis
updated
from a85700 to 612cd5
Submodule server-tools
updated
21 files
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
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,4 @@ | ||
"id","name","delivery_type","carrier_type","customer_pickup","product_id/id" | ||
"__setup__.delivery_carrier_1","Customer Pickup Office","Fixed Price","Parcel","True","delivery.product_product_delivery" | ||
"__setup__.delivery_carrier_2","Customer Pickup Dock","Fixed Price","Parcel","True","delivery.product_product_delivery" | ||
"__setup__.delivery_carrier_3","Customer Arranged Truck","Fixed Price","Truck","True","delivery.product_product_delivery" |
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,18 @@ | ||
# Copyright (c) 2021 Sodexis | ||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) | ||
|
||
import anthem | ||
|
||
from ..common import load_csv | ||
|
||
|
||
@anthem.log | ||
def set_delivery_carrier(ctx): | ||
""" Set Delivery Carriers """ | ||
load_csv(ctx, "songs/0-1-10/data/delivery.carrier.csv") | ||
|
||
|
||
@anthem.log | ||
def main(ctx): | ||
""" Set stock """ | ||
set_delivery_carrier(ctx) |
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 |
---|---|---|
|
@@ -6,7 +6,7 @@ | |
- oca 14.0 | ||
- oca refs/pull/150/head | ||
- oca refs/pull/162/head | ||
target: &default_target kencove kcv/14.0.0.1.10 | ||
target: &default_target kencove kcv/14.0.0.1.10-sod | ||
|
||
./odoo/external-src/account-payment: | ||
remotes: | ||
|
@@ -92,7 +92,7 @@ | |
kencove: git+ssh://[email protected]/kencove/server-tools.git | ||
merges: | ||
- oca 14.0 | ||
- oca refs/pull/1942/head | ||
- oca refs/pull/1976/head | ||
target: *default_target | ||
|
||
./odoo/external-src/social: | ||
|