Skip to content

Commit

Permalink
Merge branch 'wip/sodexis/0.1.10' into 'develop'
Browse files Browse the repository at this point in the history
[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
max3903 committed Feb 5, 2021
2 parents 80e202e + 2672467 commit 3b4b71c
Show file tree
Hide file tree
Showing 13 changed files with 39 additions and 11 deletions.
2 changes: 1 addition & 1 deletion odoo/external-src/crm
Submodule crm updated 0 files
2 changes: 1 addition & 1 deletion odoo/external-src/kencove-sodexis
Submodule kencove-sodexis updated from a85700 to 612cd5
2 changes: 1 addition & 1 deletion odoo/external-src/l10n-usa
Submodule l10n-usa updated 0 files
2 changes: 1 addition & 1 deletion odoo/external-src/sale-workflow
Submodule sale-workflow updated 0 files
2 changes: 1 addition & 1 deletion odoo/external-src/social
2 changes: 1 addition & 1 deletion odoo/external-src/stock-rma
6 changes: 6 additions & 0 deletions odoo/migration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -436,10 +436,16 @@ migration:
- 'sh -c ''psql -c "UPDATE project_project SET bill_type = ''customer_task'' WHERE bill_type = ''no'';"'''
post:
- anthem songs.0-1-10.general::main
- anthem songs.0-1-10.stock::main
addons:
upgrade:
- account_avatax
- kencove
- kencove_purchase
- kencove_sale
- mail_activity_board
- mail_activity_team
- mail_debrand
- muk_rest
- printnode_base
- s2u_oauth2
4 changes: 4 additions & 0 deletions odoo/songs/0-1-10/data/delivery.carrier.csv
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"
18 changes: 18 additions & 0 deletions odoo/songs/0-1-10/stock.py
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)
4 changes: 2 additions & 2 deletions repos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 3b4b71c

Please sign in to comment.