This commit is contained in:
2026-06-29 21:58:11 +02:00
parent b08d2f4dab
commit cad7f7235e
4 changed files with 124 additions and 53 deletions

View File

@@ -22,7 +22,7 @@
</record>
<record model="ir.action.act_window" id="act_purchase_trade_configuration_form">
<field name="name">Pricing Configuration</field>
<field name="name">Trade Configuration</field>
<field name="res_model">purchase_trade.configuration</field>
</record>
<record model="ir.action.act_window.view" id="act_purchase_trade_configuration_form_view1">
@@ -41,12 +41,26 @@
</record>
<menuitem
name="Configuration"
name="Trade Configuration"
parent="price.menu_price"
action="act_purchase_trade_configuration_form"
sequence="10"
id="menu_purchase_trade_configuration"
icon="tryton-settings"/>
<menuitem
name="Trade Configuration"
parent="purchase.menu_configuration"
action="act_purchase_trade_configuration_form"
sequence="90"
id="menu_purchase_trade_configuration_purchase"
icon="tryton-settings"/>
<menuitem
name="Trade Configuration"
parent="sale.menu_configuration"
action="act_purchase_trade_configuration_form"
sequence="90"
id="menu_purchase_trade_configuration_sale"
icon="tryton-settings"/>
<menuitem
name="Document Templates"
parent="document_incoming.menu_configuration"

View File

@@ -1,7 +1,16 @@
<?xml version="1.0"?>
<form col="4">
<label name="pricing_rule"/>
<field name="pricing_rule" colspan="3"/>
<label name="active_coffee_compatibility"/>
<field name="active_coffee_compatibility"/>
<form col="12" col_widths="1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr">
<group id="trade_options" string="Trade options"
colspan="12" col="4" panel="summary" icon="tryton-settings"
xalign="0" yalign="0"
col_widths="min-content,1fr,min-content,1fr">
<label name="active_coffee_compatibility"/>
<field name="active_coffee_compatibility"/>
</group>
<group id="pricing_options" string="Pricing"
colspan="12" col="1" panel="card" icon="tryton-public"
xalign="0" yalign="0" col_widths="1fr">
<label name="pricing_rule"/>
<field name="pricing_rule"/>
</group>
</form>

View File

@@ -134,31 +134,55 @@ this repository contains the full copyright notices and license terms. -->
</page>
</xpath>
<xpath expr="/form/notebook/page[@id='general']" position="after">
<page string="Coffee Quality" col="4" id="coffee_quality"
<page string="Coffee Quality" id="coffee_quality" col="12"
col_widths="1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr"
states="{'invisible': ~Eval('active_coffee_compatibility')}">
<field name="active_coffee_compatibility" invisible="1"/>
<label name="coffee_quality_status"/>
<field name="coffee_quality_status"/>
<label name="coffee_origin"/>
<field name="coffee_origin"/>
<label name="coffee_type"/>
<field name="coffee_type"/>
<label name="coffee_process"/>
<field name="coffee_process"/>
<label name="coffee_variety"/>
<field name="coffee_variety"/>
<label name="coffee_crop_year"/>
<field name="coffee_crop_year"/>
<label name="coffee_screen_size"/>
<field name="coffee_screen_size"/>
<label name="coffee_moisture_max"/>
<field name="coffee_moisture_max"/>
<label name="coffee_defect_max"/>
<field name="coffee_defect_max"/>
<label name="coffee_cup_score_min"/>
<field name="coffee_cup_score_min"/>
<newline/>
<field name="coffee_samples" colspan="4" mode="tree,form" view_ids="purchase_trade.coffee_sample_view_tree,purchase_trade.coffee_sample_view_form"/>
<group id="coffee_summary" colspan="12" col="8" panel="summary"
xalign="0" yalign="0"
col_widths="min-content,1fr,min-content,1fr,min-content,1fr,min-content,1fr">
<label name="coffee_quality_status"/>
<field name="coffee_quality_status"/>
<label name="coffee_origin"/>
<field name="coffee_origin"/>
<label name="coffee_type"/>
<field name="coffee_type"/>
<label name="coffee_process"/>
<field name="coffee_process"/>
</group>
<group id="coffee_left_column" colspan="6" col="1"
xalign="0" yalign="0" col_widths="1fr">
<group id="coffee_identity" string="Coffee identity"
colspan="1" col="4" panel="card" icon="tryton-public"
xalign="0" yalign="0"
col_widths="min-content,1fr,min-content,1fr">
<label name="coffee_variety"/>
<field name="coffee_variety"/>
<label name="coffee_crop_year"/>
<field name="coffee_crop_year"/>
<label name="coffee_screen_size"/>
<field name="coffee_screen_size"/>
</group>
</group>
<group id="coffee_right_column" colspan="6" col="1"
xalign="0" yalign="0" col_widths="1fr">
<group id="coffee_quality_targets" string="Quality targets"
colspan="1" col="4" panel="card" icon="tryton-note"
xalign="0" yalign="0"
col_widths="min-content,1fr,min-content,1fr">
<label name="coffee_moisture_max"/>
<field name="coffee_moisture_max" width="120" xexpand="0" xfill="0"/>
<label name="coffee_defect_max"/>
<field name="coffee_defect_max" width="120" xexpand="0" xfill="0"/>
<label name="coffee_cup_score_min"/>
<field name="coffee_cup_score_min" width="120" xexpand="0" xfill="0"/>
</group>
</group>
<group id="coffee_samples_panel" string="Coffee samples"
colspan="12" col="1" panel="card" icon="tryton-list"
xalign="0" yalign="0" col_widths="1fr">
<field name="coffee_samples" colspan="1" mode="tree,form" view_ids="purchase_trade.coffee_sample_view_tree,purchase_trade.coffee_sample_view_form"/>
</group>
</page>
<page string="Premium composition" col="4" id="premium_composition">
<field name="premium_decomposition" colspan="4" mode="tree,form" view_ids="purchase_trade.premium_composition_view_tree,purchase_trade.premium_composition_view_form"/>

View File

@@ -127,31 +127,55 @@ this repository contains the full copyright notices and license terms. -->
</page>
</xpath>
<xpath expr="/form/notebook/page[@id='general']" position="after">
<page string="Coffee Quality" col="4" id="coffee_quality"
<page string="Coffee Quality" id="coffee_quality" col="12"
col_widths="1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr"
states="{'invisible': ~Eval('active_coffee_compatibility')}">
<field name="active_coffee_compatibility" invisible="1"/>
<label name="coffee_quality_status"/>
<field name="coffee_quality_status"/>
<label name="coffee_origin"/>
<field name="coffee_origin"/>
<label name="coffee_type"/>
<field name="coffee_type"/>
<label name="coffee_process"/>
<field name="coffee_process"/>
<label name="coffee_variety"/>
<field name="coffee_variety"/>
<label name="coffee_crop_year"/>
<field name="coffee_crop_year"/>
<label name="coffee_screen_size"/>
<field name="coffee_screen_size"/>
<label name="coffee_moisture_max"/>
<field name="coffee_moisture_max"/>
<label name="coffee_defect_max"/>
<field name="coffee_defect_max"/>
<label name="coffee_cup_score_min"/>
<field name="coffee_cup_score_min"/>
<newline/>
<field name="coffee_samples" colspan="4" mode="tree,form" view_ids="purchase_trade.coffee_sample_view_tree,purchase_trade.coffee_sample_view_form"/>
<group id="coffee_summary" colspan="12" col="8" panel="summary"
xalign="0" yalign="0"
col_widths="min-content,1fr,min-content,1fr,min-content,1fr,min-content,1fr">
<label name="coffee_quality_status"/>
<field name="coffee_quality_status"/>
<label name="coffee_origin"/>
<field name="coffee_origin"/>
<label name="coffee_type"/>
<field name="coffee_type"/>
<label name="coffee_process"/>
<field name="coffee_process"/>
</group>
<group id="coffee_left_column" colspan="6" col="1"
xalign="0" yalign="0" col_widths="1fr">
<group id="coffee_identity" string="Coffee identity"
colspan="1" col="4" panel="card" icon="tryton-public"
xalign="0" yalign="0"
col_widths="min-content,1fr,min-content,1fr">
<label name="coffee_variety"/>
<field name="coffee_variety"/>
<label name="coffee_crop_year"/>
<field name="coffee_crop_year"/>
<label name="coffee_screen_size"/>
<field name="coffee_screen_size"/>
</group>
</group>
<group id="coffee_right_column" colspan="6" col="1"
xalign="0" yalign="0" col_widths="1fr">
<group id="coffee_quality_targets" string="Quality targets"
colspan="1" col="4" panel="card" icon="tryton-note"
xalign="0" yalign="0"
col_widths="min-content,1fr,min-content,1fr">
<label name="coffee_moisture_max"/>
<field name="coffee_moisture_max" width="120" xexpand="0" xfill="0"/>
<label name="coffee_defect_max"/>
<field name="coffee_defect_max" width="120" xexpand="0" xfill="0"/>
<label name="coffee_cup_score_min"/>
<field name="coffee_cup_score_min" width="120" xexpand="0" xfill="0"/>
</group>
</group>
<group id="coffee_samples_panel" string="Coffee samples"
colspan="12" col="1" panel="card" icon="tryton-list"
xalign="0" yalign="0" col_widths="1fr">
<field name="coffee_samples" colspan="1" mode="tree,form" view_ids="purchase_trade.coffee_sample_view_tree,purchase_trade.coffee_sample_view_form"/>
</group>
</page>
<page string="Fees" col="4" id="fees">
<button name="apply_default_fees" icon="tryton-launch"/>