details: https://code.tryton.org/tryton/commit/3739409035ff
branch: default
user: Cédric Krier <[email protected]>
date: Wed Oct 14 14:38:11 2026 +0200
description:
Use notebook in carrier form
diffstat:
modules/account_stock_eu/view/carrier_form.xml | 10 +++---
modules/carrier/view/carrier_form.xml | 14 +++++++--
modules/carrier_percentage/view/carrier_form.xml | 4 +--
modules/carrier_weight/view/carrier_form.xml | 5 +--
modules/incoterm/view/carrier_form.xml | 9 +++--
modules/purchase_shipment_cost/view/carrier_form.xml | 4 +--
modules/stock_package_shipping/view/carrier_form.xml | 8 +++--
modules/stock_package_shipping_dpd/carrier.py | 8 -----
modules/stock_package_shipping_dpd/view/carrier_form.xml | 4 +-
modules/stock_package_shipping_mygls/carrier.py | 8 -----
modules/stock_package_shipping_mygls/view/carrier_form.xml | 11 +++----
modules/stock_package_shipping_sendcloud/carrier.py | 8 -----
modules/stock_package_shipping_sendcloud/view/carrier_form.xml | 4 +-
modules/stock_package_shipping_ups/carrier.py | 8 -----
modules/stock_package_shipping_ups/view/carrier_form.xml | 6 ++--
modules/stock_shipment_cost/view/carrier_form.xml | 4 +--
modules/web_shop_shopify/view/carrier_form.xml | 6 ++-
17 files changed, 46 insertions(+), 75 deletions(-)
diffs (304 lines):
diff -r d5b534cf5b66 -r 3739409035ff
modules/account_stock_eu/view/carrier_form.xml
--- a/modules/account_stock_eu/view/carrier_form.xml Fri Nov 13 00:37:36
2026 +0100
+++ b/modules/account_stock_eu/view/carrier_form.xml Wed Oct 14 14:38:11
2026 +0200
@@ -2,10 +2,10 @@
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
<data>
- <xpath expr="//form" position="inside">
- <newline/>
- <label name="intrastat_transport"/>
- <field name="intrastat_transport"/>
- <newline/>
+ <xpath expr="//notebook" position="inside">
+ <page string="Intrastat" id="intrastat">
+ <label name="intrastat_transport"/>
+ <field name="intrastat_transport"/>
+ </page>
</xpath>
</data>
diff -r d5b534cf5b66 -r 3739409035ff modules/carrier/view/carrier_form.xml
--- a/modules/carrier/view/carrier_form.xml Fri Nov 13 00:37:36 2026 +0100
+++ b/modules/carrier/view/carrier_form.xml Wed Oct 14 14:38:11 2026 +0200
@@ -6,8 +6,14 @@
<field name="party"/>
<label name="active"/>
<field name="active"/>
- <label name="carrier_product"/>
- <field name="carrier_product"/>
- <label name="carrier_cost_method"/>
- <field name="carrier_cost_method"/>
+ <notebook>
+ <page string="Costs" id="costs" col="2">
+ <label name="carrier_product"/>
+ <field name="carrier_product"/>
+
+ <label name="carrier_cost_method"/>
+ <field name="carrier_cost_method"/>
+ <newline/>
+ </page>
+ </notebook>
</form>
diff -r d5b534cf5b66 -r 3739409035ff
modules/carrier_percentage/view/carrier_form.xml
--- a/modules/carrier_percentage/view/carrier_form.xml Fri Nov 13 00:37:36
2026 +0100
+++ b/modules/carrier_percentage/view/carrier_form.xml Wed Oct 14 14:38:11
2026 +0200
@@ -2,10 +2,8 @@
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
<data>
- <xpath expr="/form/field[@name='carrier_cost_method']" position="after">
- <newline/>
+ <xpath expr="//field[@name='carrier_cost_method']" position="after">
<label name="percentage"/>
<field name="percentage"/>
- <newline/>
</xpath>
</data>
diff -r d5b534cf5b66 -r 3739409035ff
modules/carrier_weight/view/carrier_form.xml
--- a/modules/carrier_weight/view/carrier_form.xml Fri Nov 13 00:37:36
2026 +0100
+++ b/modules/carrier_weight/view/carrier_form.xml Wed Oct 14 14:38:11
2026 +0200
@@ -2,12 +2,11 @@
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
<data>
- <xpath expr="/form/field[@name='carrier_cost_method']" position="after">
- <newline/>
+ <xpath expr="//field[@name='carrier_cost_method']" position="after">
<label name="weight_uom"/>
<field name="weight_uom"/>
<label name="weight_currency"/>
<field name="weight_currency"/>
- <field name="weight_price_list" colspan="4"/>
+ <field name="weight_price_list" colspan="2"/>
</xpath>
</data>
diff -r d5b534cf5b66 -r 3739409035ff modules/incoterm/view/carrier_form.xml
--- a/modules/incoterm/view/carrier_form.xml Fri Nov 13 00:37:36 2026 +0100
+++ b/modules/incoterm/view/carrier_form.xml Wed Oct 14 14:38:11 2026 +0200
@@ -2,9 +2,10 @@
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
<data>
- <xpath expr="//field[@name='carrier_cost_method']" position="after">
- <label name="mode"/>
- <field name="mode"/>
- <newline/>
+ <xpath expr="//notebook" position="inside">
+ <page string="Incoterm" id="incoterm">
+ <label name="mode"/>
+ <field name="mode"/>
+ </page>
</xpath>
</data>
diff -r d5b534cf5b66 -r 3739409035ff
modules/purchase_shipment_cost/view/carrier_form.xml
--- a/modules/purchase_shipment_cost/view/carrier_form.xml Fri Nov 13
00:37:36 2026 +0100
+++ b/modules/purchase_shipment_cost/view/carrier_form.xml Wed Oct 14
14:38:11 2026 +0200
@@ -2,10 +2,8 @@
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
<data>
- <xpath expr="/form/field[@name='carrier_product']" position="after">
- <newline/>
+ <xpath expr="//page[@id='costs']" position="inside">
<label name="carrier_cost_allocation_method"/>
<field name="carrier_cost_allocation_method"/>
- <newline/>
</xpath>
</data>
diff -r d5b534cf5b66 -r 3739409035ff
modules/stock_package_shipping/view/carrier_form.xml
--- a/modules/stock_package_shipping/view/carrier_form.xml Fri Nov 13
00:37:36 2026 +0100
+++ b/modules/stock_package_shipping/view/carrier_form.xml Wed Oct 14
14:38:11 2026 +0200
@@ -2,8 +2,10 @@
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
<data>
- <xpath expr="/form/field[@name='carrier_cost_method']" position="after">
- <label name="shipping_service"/>
- <field name="shipping_service"/>
+ <xpath expr="//notebook" position="inside">
+ <page name="shipping_service">
+ <label name="shipping_service"/>
+ <field name="shipping_service"/>
+ </page>
</xpath>
</data>
diff -r d5b534cf5b66 -r 3739409035ff
modules/stock_package_shipping_dpd/carrier.py
--- a/modules/stock_package_shipping_dpd/carrier.py Fri Nov 13 00:37:36
2026 +0100
+++ b/modules/stock_package_shipping_dpd/carrier.py Wed Oct 14 14:38:11
2026 +0200
@@ -133,14 +133,6 @@
super().__register__(module)
- @classmethod
- def view_attributes(cls):
- return super().view_attributes() + [
- ("/form/separator[@id='dpd']", 'states', {
- 'invisible': Eval('shipping_service') != 'dpd',
- }),
- ]
-
@property
def shipping_label_mimetype(self):
mimetype = super().shipping_label_mimetype
diff -r d5b534cf5b66 -r 3739409035ff
modules/stock_package_shipping_dpd/view/carrier_form.xml
--- a/modules/stock_package_shipping_dpd/view/carrier_form.xml Fri Nov 13
00:37:36 2026 +0100
+++ b/modules/stock_package_shipping_dpd/view/carrier_form.xml Wed Oct 14
14:38:11 2026 +0200
@@ -2,8 +2,8 @@
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
<data>
- <xpath expr="/form/field[@name='shipping_service']" position="after">
- <separator string="DPD" colspan="4" id="dpd"/>
+ <xpath expr="//field[@name='shipping_service']" position="after">
+ <newline/>
<label name="dpd_product"/>
<field name="dpd_product"/>
<label name="dpd_notification"/>
diff -r d5b534cf5b66 -r 3739409035ff
modules/stock_package_shipping_mygls/carrier.py
--- a/modules/stock_package_shipping_mygls/carrier.py Fri Nov 13 00:37:36
2026 +0100
+++ b/modules/stock_package_shipping_mygls/carrier.py Wed Oct 14 14:38:11
2026 +0200
@@ -114,14 +114,6 @@
super().__setup__()
cls.shipping_service.selection.append(('mygls', "MyGLS"))
- @classmethod
- def view_attributes(cls):
- return super().view_attributes() + [
- ("/form/separator[@id='mygls']", 'states', {
- 'invisible': Eval('shipping_service') != 'mygls',
- }),
- ]
-
@property
def shipping_label_mimetype(self):
mimetype = super().shipping_label_mimetype
diff -r d5b534cf5b66 -r 3739409035ff
modules/stock_package_shipping_mygls/view/carrier_form.xml
--- a/modules/stock_package_shipping_mygls/view/carrier_form.xml Fri Nov
13 00:37:36 2026 +0100
+++ b/modules/stock_package_shipping_mygls/view/carrier_form.xml Wed Oct
14 14:38:11 2026 +0200
@@ -2,18 +2,17 @@
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
<data>
- <xpath expr="/form/field[@name='shipping_service']" position="after">
- <separator string="MyGLS" colspan="4" id="mygls"/>
-
+ <xpath expr="//field[@name='shipping_service']" position="after">
+ <newline/>
<label name="mygls_type_of_printer"/>
<field name="mygls_type_of_printer"/>
<label name="mygls_print_position"/>
<field name="mygls_print_position"/>
- <label name="mygls_services"/>
- <field name="mygls_services" colspan="3"/>
-
<label name="mygls_sms"/>
<field name="mygls_sms" colspan="3"/>
+
+ <label name="mygls_services" yalign="0"/>
+ <field name="mygls_services" colspan="3"/>
</xpath>
</data>
diff -r d5b534cf5b66 -r 3739409035ff
modules/stock_package_shipping_sendcloud/carrier.py
--- a/modules/stock_package_shipping_sendcloud/carrier.py Fri Nov 13
00:37:36 2026 +0100
+++ b/modules/stock_package_shipping_sendcloud/carrier.py Wed Oct 14
14:38:11 2026 +0200
@@ -344,14 +344,6 @@
def default_sendcloud_format(cls):
return 'label'
- @classmethod
- def view_attributes(cls):
- return super().view_attributes() + [
- ("/form/separator[@id='sendcloud']", 'states', {
- 'invisible': Eval('shipping_service') != 'sendcloud',
- }),
- ]
-
@property
def shipping_label_mimetype(self):
mimetype = super().shipping_label_mimetype
diff -r d5b534cf5b66 -r 3739409035ff
modules/stock_package_shipping_sendcloud/view/carrier_form.xml
--- a/modules/stock_package_shipping_sendcloud/view/carrier_form.xml Fri Nov
13 00:37:36 2026 +0100
+++ b/modules/stock_package_shipping_sendcloud/view/carrier_form.xml Wed Oct
14 14:38:11 2026 +0200
@@ -2,8 +2,8 @@
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
<data>
- <xpath expr="/form/field[@name='shipping_service']" position="after">
- <separator string="Sendcloud" colspan="4" id="sendcloud"/>
+ <xpath expr="//field[@name='shipping_service']" position="after">
+ <newline/>
<label name="sendcloud_format"/>
<field name="sendcloud_format"/>
</xpath>
diff -r d5b534cf5b66 -r 3739409035ff
modules/stock_package_shipping_ups/carrier.py
--- a/modules/stock_package_shipping_ups/carrier.py Fri Nov 13 00:37:36
2026 +0100
+++ b/modules/stock_package_shipping_ups/carrier.py Wed Oct 14 14:38:11
2026 +0200
@@ -170,14 +170,6 @@
super().__setup__()
cls.shipping_service.selection.append(('ups', 'UPS'))
- @classmethod
- def view_attributes(cls):
- return super().view_attributes() + [
- ("/form/separator[@id='ups']", 'states', {
- 'invisible': Eval('shipping_service') != 'ups',
- }),
- ]
-
@property
def shipping_label_mimetype(self):
mimetype = super().shipping_label_mimetype
diff -r d5b534cf5b66 -r 3739409035ff
modules/stock_package_shipping_ups/view/carrier_form.xml
--- a/modules/stock_package_shipping_ups/view/carrier_form.xml Fri Nov 13
00:37:36 2026 +0100
+++ b/modules/stock_package_shipping_ups/view/carrier_form.xml Wed Oct 14
14:38:11 2026 +0200
@@ -2,8 +2,8 @@
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
<data>
- <xpath expr="/form/field[@name='shipping_service']" position="after">
- <separator string="UPS" colspan="4" id="ups"/>
+ <xpath expr="//field[@name='shipping_service']" position="after">
+ <newline/>
<label name="ups_service_type"/>
<field name="ups_service_type"/>
<newline/>
@@ -12,7 +12,7 @@
<label name="ups_label_height"/>
<field name="ups_label_height"/>
- <label name="ups_notifications"/>
+ <label name="ups_notifications" yalign="0"/>
<field name="ups_notifications" colspan="3"/>
</xpath>
</data>
diff -r d5b534cf5b66 -r 3739409035ff
modules/stock_shipment_cost/view/carrier_form.xml
--- a/modules/stock_shipment_cost/view/carrier_form.xml Fri Nov 13 00:37:36
2026 +0100
+++ b/modules/stock_shipment_cost/view/carrier_form.xml Wed Oct 14 14:38:11
2026 +0200
@@ -2,10 +2,8 @@
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
<data>
- <xpath expr="//field[@name='carrier_cost_method']" position="after">
- <newline/>
+ <xpath expr="//page[@id='costs']" position="inside">
<label name="shipment_cost_allocation_method"/>
<field name="shipment_cost_allocation_method"/>
- <newline/>
</xpath>
</data>
diff -r d5b534cf5b66 -r 3739409035ff
modules/web_shop_shopify/view/carrier_form.xml
--- a/modules/web_shop_shopify/view/carrier_form.xml Fri Nov 13 00:37:36
2026 +0100
+++ b/modules/web_shop_shopify/view/carrier_form.xml Wed Oct 14 14:38:11
2026 +0200
@@ -2,7 +2,9 @@
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
<data>
- <xpath expr="/form" position="inside">
- <field name="shopify_selections" colspan="4"/>
+ <xpath expr="//notebook" position="inside">
+ <page string="Shopify" id="shopify">
+ <field name="shopify_selections" colspan="4"/>
+ </page>
</xpath>
</data>
