Skip to content

Commit

Permalink
[REFACTOR] s/procurement_rule/stock_rule across repo
Browse files Browse the repository at this point in the history
  • Loading branch information
HviorForgeFlow committed Oct 18, 2019
1 parent 905eacd commit 2fe4e2b
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion purchase_discount/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from . import account_invoice
from . import purchase_order
from . import stock_move
from . import procurement_rule
from . import stock_rule
from . import product_supplierinfo
from . import res_partner
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from odoo import api, models


class ProcurementRule(models.Model):
class StockRule(models.Model):
_inherit = 'stock.rule'

@api.multi
Expand Down
6 changes: 3 additions & 3 deletions purchase_discount/tests/test_product_supplierinfo_discount.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def test_003_purchase_order_partner_1_qty_1(self):
"6 with partner 1 and qty 1")

def test_004_prepare_purchase_order_line(self):
procurement_rule = self.env['stock.rule'].create({
stock_rule = self.env['stock.rule'].create({
'sequence': 20,
'location_id': self.env.ref('stock.stock_location_locations').id,
'picking_type_id': self.env.ref('stock.chi_picking_type_in').id,
Expand All @@ -89,9 +89,9 @@ def test_004_prepare_purchase_order_line(self):
'name': 'WH: Stock -> Customers MTO',
'product_id': self.product.id,
'date_planned': fields.Datetime.now(),
'rule_id': procurement_rule.id,
'rule_id': stock_rule.id,
}
res = procurement_rule._prepare_purchase_order_line(
res = stock_rule._prepare_purchase_order_line(
self.product, 50, self.env.ref('uom.product_uom_unit'),
po_line_vals, self.purchase_order, self.supplierinfo.name,
)
Expand Down
4 changes: 2 additions & 2 deletions subcontracted_service/init_hook.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

def post_init_hook(cr, pool):
env = Environment(cr, SUPERUSER_ID, {})
create_warehouse_procurement_rules(env)
create_warehouse_stock_rules(env)


def create_warehouse_procurement_rules(env):
def create_warehouse_stock_rules(env):
warehouses = env['stock.warehouse'].with_context(
active_test=False).search([])
warehouses._set_subcontracting_service_proc_rule()
2 changes: 1 addition & 1 deletion subcontracted_service/tests/test_subcontracted_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def setUp(self):
limit=1
)

def test_wh_procurement_rule(self):
def test_wh_stock_rule(self):
"""Tests if the procurement rule for subcontracting services is
assigned properly to the warehouse."""
wh = self.test_wh
Expand Down

0 comments on commit 2fe4e2b

Please sign in to comment.