Merge branch '14.0' into 14.0-test

This commit is contained in:
Jared Kipe
2021-09-23 07:38:29 -07:00

View File

@@ -8,21 +8,19 @@
<form> <form>
<field name="packages_planned" invisible="1" /> <field name="packages_planned" invisible="1" />
<group> <group>
<field name="plan_option_ids" nolabel="1" > <field name="plan_option_ids" nolabel="1">
<tree decoration-success="days_different &lt; 0.0 and not selection" <tree decoration-info="selection == 'selected'"
decoration-danger="days_different &gt; 0.0 and not selection"
decoration-info="selection == 'selected'"
decoration-muted="selection == 'deselected'" decoration-muted="selection == 'deselected'"
default_order="package_id, price" default_order="package_id, price"
create="false" edit="false" delete="false"> create="false" edit="false" delete="false">
<field name="package_id"/> <field name="package_id" />
<field name="carrier_id"/> <field name="carrier_id" />
<field name="date_planned" invisible="1"/> <field name="date_planned" invisible="1" />
<field name="requested_date"/> <field name="requested_date" decoration-danger="days_different &gt; 1.0" decoration-warning="days_different &gt; 0.0" decoration-success="days_different &lt; 0.0" />
<field name="transit_days"/> <field name="transit_days" decoration-warning="transit_days > 2.0" decoration-success="transit_days == 1.0"/>
<field name="sale_requested_date"/> <field name="sale_requested_date" decoration-danger="days_different &gt; 1.0" decoration-warning="days_different &gt; 0.0" decoration-success="days_different &lt; 0.0" />
<field name="days_different"/> <field name="days_different" decoration-danger="days_different &gt; 1.0" decoration-warning="days_different &gt; 0.0" decoration-success="days_different &lt; 0.0" />
<field name="price"/> <field name="price" decoration-success="price &lt; 10.99" decoration-warning="price > 31.00 and price &lt; 50.00" decoration-danger="price >= 50.00" />
<field name="selection" invisible="1" /> <field name="selection" invisible="1" />
<button class="eo_highlight" <button class="eo_highlight"
name="select_plan" name="select_plan"