mirror of
https://gitlab.com/hibou-io/hibou-odoo/suite.git
synced 2025-01-20 12:37:31 +02:00
[MIG] stock_delivery_planner: to Odoo 15.0
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
'name': 'Stock Delivery Planner',
|
'name': 'Stock Delivery Planner',
|
||||||
'summary': 'Get rates and choose carrier for delivery.',
|
'summary': 'Get rates and choose carrier for delivery.',
|
||||||
'version': '14.0.1.1.1',
|
'version': '15.0.1.0.0',
|
||||||
'author': "Hibou Corp.",
|
'author': "Hibou Corp.",
|
||||||
'category': 'Warehouse',
|
'category': 'Warehouse',
|
||||||
'license': 'OPL-1',
|
'license': 'OPL-1',
|
||||||
|
|||||||
@@ -118,7 +118,7 @@ class TestStockDeliveryPlanner(TransactionCase):
|
|||||||
self.picking.move_line_ids.filtered(lambda ml: ml.product_id == self.product).qty_done = 5.0
|
self.picking.move_line_ids.filtered(lambda ml: ml.product_id == self.product).qty_done = 5.0
|
||||||
packing_action = self.picking.action_put_in_pack()
|
packing_action = self.picking.action_put_in_pack()
|
||||||
packing_wizard = Form(self.env[packing_action['res_model']].with_context(packing_action['context']))
|
packing_wizard = Form(self.env[packing_action['res_model']].with_context(packing_action['context']))
|
||||||
packing_wizard.delivery_packaging_id = self.fedex_package
|
packing_wizard.delivery_package_type_id = self.fedex_package
|
||||||
choose_delivery_package = packing_wizard.save()
|
choose_delivery_package = packing_wizard.save()
|
||||||
choose_delivery_package.action_put_in_pack()
|
choose_delivery_package.action_put_in_pack()
|
||||||
self.assertEqual(self.picking.shipping_weight, 5.0)
|
self.assertEqual(self.picking.shipping_weight, 5.0)
|
||||||
|
|||||||
@@ -7,18 +7,20 @@
|
|||||||
<field name="priority" eval="50"/>
|
<field name="priority" eval="50"/>
|
||||||
<field name="inherit_id" ref="delivery.res_config_settings_view_form"/>
|
<field name="inherit_id" ref="delivery.res_config_settings_view_form"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="//div[@name='shipping_setting_container']" position="inside">
|
<xpath expr="//div[@name='shipping_setting_container']" position="after">
|
||||||
<h2>Delivery Planner</h2>
|
<h2 class="mt32">Delivery Planner</h2>
|
||||||
<div class="col-lg-6 col-12 o_setting_box" id="stock_delivery_planner">
|
<div class="row mt16 o_settings_container" name="shipping_setting_container">
|
||||||
<div class="o_setting_left_pane"/>
|
<div class="col-lg-6 col-12 o_setting_box" id="stock_delivery_planner">
|
||||||
<div class="o_setting_right_pane">
|
<div class="o_setting_left_pane"/>
|
||||||
<label for="stock_delivery_planner_base_carrier_ids" />
|
<div class="o_setting_right_pane">
|
||||||
<div class="text-muted">
|
<label for="stock_delivery_planner_base_carrier_ids" />
|
||||||
Add a carrier that represents the 'base rate' for a carrier's type. <br/>
|
<div class="text-muted">
|
||||||
For example, you should add 1 FedEx carrier here and let us build up the
|
Add a carrier that represents the 'base rate' for a carrier's type. <br/>
|
||||||
rates for your other FedEx shipping methods.
|
For example, you should add 1 FedEx carrier here and let us build up the
|
||||||
|
rates for your other FedEx shipping methods.
|
||||||
|
</div>
|
||||||
|
<field name="stock_delivery_planner_base_carrier_ids" class="oe_inline" />
|
||||||
</div>
|
</div>
|
||||||
<field name="stock_delivery_planner_base_carrier_ids" class="oe_inline" />
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</xpath>
|
</xpath>
|
||||||
|
|||||||
Reference in New Issue
Block a user