changes
This commit is contained in:
@@ -142,11 +142,7 @@
|
||||
<field name="domain">[('country_id.code', '=', 'CA')]</field>
|
||||
</record>
|
||||
|
||||
<record id="action_fusion_yearly_rates" model="ir.actions.act_window">
|
||||
<field name="name">Yearly Rates (Legacy)</field>
|
||||
<field name="res_model">tax.yearly.rates</field>
|
||||
<field name="view_mode">list,form</field>
|
||||
</record>
|
||||
<!-- Legacy yearly rates action removed: tax.yearly.rates model no longer exists -->
|
||||
|
||||
<!-- ============================================================ -->
|
||||
<!-- MAIN MENU: FUSION PAYROLL -->
|
||||
@@ -494,12 +490,6 @@
|
||||
action="action_fusion_input_types"
|
||||
sequence="40"/>
|
||||
|
||||
<menuitem id="menu_fusion_config_yearly"
|
||||
name="Yearly Rates (Legacy)"
|
||||
parent="menu_fusion_config"
|
||||
action="action_fusion_yearly_rates"
|
||||
sequence="50"/>
|
||||
|
||||
<menuitem id="menu_fusion_work_locations"
|
||||
name="Work Locations"
|
||||
parent="menu_fusion_config"
|
||||
@@ -525,6 +515,12 @@
|
||||
action="action_cheque_layout_settings"
|
||||
sequence="75"/>
|
||||
|
||||
<menuitem id="menu_fusion_cheques"
|
||||
name="Cheques"
|
||||
parent="menu_fusion_payroll_root"
|
||||
action="action_payroll_cheque"
|
||||
sequence="25"/>
|
||||
|
||||
<menuitem id="menu_fusion_migration"
|
||||
name="Import from QuickBooks"
|
||||
parent="menu_fusion_config"
|
||||
|
||||
@@ -47,17 +47,6 @@
|
||||
<!-- Note: Payslip batch view extension moved to hr_payslip_views.xml -->
|
||||
<!-- The cheque buttons can be added once the correct view ID is identified -->
|
||||
|
||||
<!-- ============================================================ -->
|
||||
<!-- ADD CHEQUE MENU ITEMS -->
|
||||
<!-- ============================================================ -->
|
||||
|
||||
<!-- Cheques menu under Fusion Payroll -->
|
||||
<menuitem id="menu_fusion_cheques"
|
||||
name="Cheques"
|
||||
parent="menu_fusion_payroll_root"
|
||||
action="action_payroll_cheque"
|
||||
sequence="25"/>
|
||||
|
||||
<!-- Removed duplicate menu - use cheque_layout_settings_views.xml instead -->
|
||||
<!-- Menu items moved to fusion_payroll_menus.xml -->
|
||||
|
||||
</odoo>
|
||||
|
||||
@@ -1,6 +1,49 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<odoo>
|
||||
|
||||
<!-- ============================================================ -->
|
||||
<!-- PAYROLL CHEQUE ACTIONS (must be before views that reference) -->
|
||||
<!-- ============================================================ -->
|
||||
|
||||
<!-- Cheque Search View -->
|
||||
<record id="payroll_cheque_view_search" model="ir.ui.view">
|
||||
<field name="name">payroll.cheque.search</field>
|
||||
<field name="model">payroll.cheque</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Search Cheques">
|
||||
<field name="cheque_number"/>
|
||||
<field name="employee_id"/>
|
||||
<field name="payslip_id"/>
|
||||
<field name="payslip_run_id"/>
|
||||
<filter name="draft" string="Draft" domain="[('state', '=', 'draft')]"/>
|
||||
<filter name="printed" string="Printed" domain="[('state', '=', 'printed')]"/>
|
||||
<filter name="cashed" string="Cashed" domain="[('state', '=', 'cashed')]"/>
|
||||
<filter name="voided" string="Voided" domain="[('state', '=', 'voided')]"/>
|
||||
<filter name="group_employee" string="Employee" context="{'group_by': 'employee_id'}"/>
|
||||
<filter name="group_batch" string="Payslip Batch" context="{'group_by': 'payslip_run_id'}"/>
|
||||
<filter name="group_state" string="Status" context="{'group_by': 'state'}"/>
|
||||
<filter name="group_date" string="Date" context="{'group_by': 'cheque_date:month'}"/>
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- Cheque Action -->
|
||||
<record id="action_payroll_cheque" model="ir.actions.act_window">
|
||||
<field name="name">Cheques</field>
|
||||
<field name="res_model">payroll.cheque</field>
|
||||
<field name="view_mode">list,form</field>
|
||||
<field name="search_view_id" ref="payroll_cheque_view_search"/>
|
||||
<field name="context">{'search_default_draft': 1}</field>
|
||||
<field name="help" type="html">
|
||||
<p class="o_view_nocontent_smiling_face">
|
||||
No cheques found
|
||||
</p>
|
||||
<p>
|
||||
Cheques are created when you process payroll for employees with payment method set to "Cheque".
|
||||
</p>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- ============================================================ -->
|
||||
<!-- PAYROLL CHEQUE VIEWS -->
|
||||
<!-- ============================================================ -->
|
||||
@@ -137,45 +180,6 @@
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- Cheque Search View -->
|
||||
<record id="payroll_cheque_view_search" model="ir.ui.view">
|
||||
<field name="name">payroll.cheque.search</field>
|
||||
<field name="model">payroll.cheque</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Search Cheques">
|
||||
<field name="cheque_number"/>
|
||||
<field name="employee_id"/>
|
||||
<field name="payslip_id"/>
|
||||
<field name="payslip_run_id"/>
|
||||
<filter name="draft" string="Draft" domain="[('state', '=', 'draft')]"/>
|
||||
<filter name="printed" string="Printed" domain="[('state', '=', 'printed')]"/>
|
||||
<filter name="cashed" string="Cashed" domain="[('state', '=', 'cashed')]"/>
|
||||
<filter name="voided" string="Voided" domain="[('state', '=', 'voided')]"/>
|
||||
<filter name="group_employee" string="Employee" context="{'group_by': 'employee_id'}"/>
|
||||
<filter name="group_batch" string="Payslip Batch" context="{'group_by': 'payslip_run_id'}"/>
|
||||
<filter name="group_state" string="Status" context="{'group_by': 'state'}"/>
|
||||
<filter name="group_date" string="Date" context="{'group_by': 'cheque_date:month'}"/>
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- Cheque Action -->
|
||||
<record id="action_payroll_cheque" model="ir.actions.act_window">
|
||||
<field name="name">Cheques</field>
|
||||
<field name="res_model">payroll.cheque</field>
|
||||
<field name="view_mode">list,form</field>
|
||||
<field name="search_view_id" ref="payroll_cheque_view_search"/>
|
||||
<field name="context">{'search_default_draft': 1}</field>
|
||||
<field name="help" type="html">
|
||||
<p class="o_view_nocontent_smiling_face">
|
||||
No cheques found
|
||||
</p>
|
||||
<p>
|
||||
Cheques are created when you process payroll for employees with payment method set to "Cheque".
|
||||
</p>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- ============================================================ -->
|
||||
<!-- CHEQUE VOID WIZARD VIEW -->
|
||||
<!-- ============================================================ -->
|
||||
|
||||
Reference in New Issue
Block a user