This commit is contained in:
gsinghpal
2026-05-21 03:37:25 -04:00
parent b2f483d67c
commit 1314f4581d
47 changed files with 5730 additions and 177 deletions

View File

@@ -51,10 +51,16 @@
class="btn-primary"
invisible="state not in ('draft', 'inspecting')"/>
<button name="action_close"
string="Close — Racking Confirmed"
string="Close Receiving"
type="object"
class="btn-primary"
invisible="state not in ('counted', 'staged', 'accepted', 'resolved')"/>
<button name="action_reset_to_counted"
string="Reset to Counted"
type="object"
class="btn-secondary"
confirm="Reset this receiving back to Counted? Use only if no work has started on the order."
invisible="state != 'closed'"/>
<!-- Legacy actions (hidden by default; surfaces for old records) -->
<button name="action_accept"
string="Accept (legacy)"
@@ -77,7 +83,7 @@
string="Generate Outbound Label"
class="btn-primary"
icon="fa-print"
invisible="not x_fc_carrier_id or not x_fc_weight"/>
invisible="not x_fc_carrier_id or not x_fc_weight or x_fc_has_label"/>
<button name="action_print_label"
type="object"
string="Print Label"
@@ -108,6 +114,17 @@
</div>
<field name="x_fc_has_label" invisible="1"/>
</button>
<button name="action_print_label_zpl"
type="object"
class="oe_stat_button"
icon="fa-barcode"
invisible="not x_fc_has_label_zpl">
<div class="o_stat_info">
<span class="o_stat_value">ZPL</span>
<span class="o_stat_text">Print Label</span>
</div>
<field name="x_fc_has_label_zpl" invisible="1"/>
</button>
</div>
<div class="alert alert-info" role="alert">
<i class="fa fa-info-circle me-2"/>
@@ -139,6 +156,9 @@
<field name="received_date"/>
<field name="x_fc_carrier_id"
options="{'no_create': True}"/>
<field name="x_fc_outbound_service_type"
invisible="not x_fc_carrier_id"
placeholder="Carrier default"/>
<field name="carrier_tracking"/>
<!--
Legacy carrier_name (Char) is retained
@@ -154,6 +174,35 @@
-->
<field name="carrier_name" invisible="1"/>
</group>
<!-- Shipping-quote preview. The .fp_shipping_quote_callout
class in fp_shipping_quote.scss handles
colour for both light + dark bundles —
yellow tint that flips to deep amber on
dark theme. Structure-only styling stays
inline; semantic colour lives in SCSS. -->
<div invisible="not x_fc_carrier_id"
class="fp_shipping_quote_callout">
<div class="fp_shipping_quote_header">
<strong class="fp_shipping_quote_label">
<i class="fa fa-truck"/>Shipping Quote
</strong>
<button name="action_refresh_shipping_quote"
type="object"
string="Refresh Quote"
class="btn btn-sm btn-warning"
icon="fa-refresh"/>
</div>
<field name="x_fc_shipping_quote_html"
nolabel="1" readonly="1"
widget="html"/>
<div invisible="x_fc_shipping_quote_html"
class="fp_shipping_quote_placeholder">
Click <strong>Refresh Quote</strong> to
fetch the price and estimated delivery
date for the current carrier + service
+ weight.
</div>
</div>
</group>
<group string="Outbound Packaging"
invisible="not x_fc_carrier_id">

View File

@@ -27,6 +27,22 @@
</list>
</field>
</xpath>
<!-- Mirror the receiving form's two-button layout: the
existing "Print Label PDF" smart button (rendered by
fusion_shipping) handles the primary PDF; this adds a
sibling ZPL button only when a ZPL attachment exists. -->
<xpath expr="//div[@name='button_box']/button[@name='action_view_label']" position="after">
<button name="action_view_label_zpl" type="object"
class="oe_stat_button" icon="fa-barcode"
invisible="not x_fc_label_zpl_attachment_id">
<div class="o_field_widget o_stat_info">
<span class="o_stat_value">ZPL</span>
<span class="o_stat_text">Print Label</span>
</div>
<field name="x_fc_label_zpl_attachment_id" invisible="1"/>
</button>
</xpath>
</field>
</record>
</odoo>