Compare commits

...

3 Commits
17.0 ... 19.0

15 changed files with 18 additions and 13 deletions

1
.gitignore vendored
View File

@ -2,6 +2,7 @@
__pycache__/ __pycache__/
*.py[cod] *.py[cod]
*$py.class *$py.class
*.pyc
# Odoo # Odoo
*.log *.log

View File

@ -1,6 +1,6 @@
{ {
'name': 'GA Asset Management', 'name': 'GA Asset Management',
'version': '17.0.1.0.0', 'version': '19.0.1.0.0',
'category': 'Operations', 'category': 'Operations',
'summary': 'Asset Management for General Affair Team', 'summary': 'Asset Management for General Affair Team',
'description': """ 'description': """

Binary file not shown.

View File

@ -7,17 +7,21 @@
<field name="sequence">10</field> <field name="sequence">10</field>
</record> </record>
<record model="res.groups.privilege" id="res_groups_privilege_ga_asset">
<field name="name">General Affair Assets</field>
<field name="category_id" ref="module_category_ga_asset"/>
</record>
<record id="group_ga_asset_user" model="res.groups"> <record id="group_ga_asset_user" model="res.groups">
<field name="name">User</field> <field name="name">User</field>
<field name="category_id" ref="module_category_ga_asset"/> <field name="privilege_id" ref="res_groups_privilege_ga_asset"/>
<field name="implied_ids" eval="[(4, ref('base.group_user'))]"/> <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
</record> </record>
<record id="group_ga_asset_manager" model="res.groups"> <record id="group_ga_asset_manager" model="res.groups">
<field name="name">Manager</field> <field name="name">Manager</field>
<field name="category_id" ref="module_category_ga_asset"/> <field name="privilege_id" ref="res_groups_privilege_ga_asset"/>
<field name="implied_ids" eval="[(4, ref('group_ga_asset_user'))]"/> <field name="implied_ids" eval="[(4, ref('group_ga_asset_user'))]"/>
<field name="users" eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"/>
</record> </record>
<record id="rule_ga_asset_transfer_log_multi_company" model="ir.rule"> <record id="rule_ga_asset_transfer_log_multi_company" model="ir.rule">

View File

@ -6,7 +6,7 @@
<field name="name">ga.account.asset.tree</field> <field name="name">ga.account.asset.tree</field>
<field name="model">account.asset</field> <field name="model">account.asset</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Fixed Assets" sample="1"> <list string="Fixed Assets" sample="1">
<field name="asset_code"/> <field name="asset_code"/>
<field name="name"/> <field name="name"/>
<field name="product_id" optional="show"/> <field name="product_id" optional="show"/>
@ -14,7 +14,7 @@
<field name="original_value"/> <field name="original_value"/>
<field name="state" widget="badge" decoration-info="state == 'draft'" decoration-success="state == 'open'" decoration-danger="state == 'close'"/> <field name="state" widget="badge" decoration-info="state == 'draft'" decoration-success="state == 'open'" decoration-danger="state == 'close'"/>
<field name="company_id" groups="base.group_multi_company"/> <field name="company_id" groups="base.group_multi_company"/>
</tree> </list>
</field> </field>
</record> </record>
@ -81,9 +81,9 @@
<record id="action_ga_asset_management" model="ir.actions.act_window"> <record id="action_ga_asset_management" model="ir.actions.act_window">
<field name="name">Assets</field> <field name="name">Assets</field>
<field name="res_model">account.asset</field> <field name="res_model">account.asset</field>
<field name="view_mode">tree,form</field> <field name="view_mode">list,form</field>
<field name="view_ids" eval="[(5, 0, 0), <field name="view_ids" eval="[(5, 0, 0),
(0, 0, {'view_mode': 'tree', 'view_id': ref('view_ga_account_asset_tree')}), (0, 0, {'view_mode': 'list', 'view_id': ref('view_ga_account_asset_tree')}),
(0, 0, {'view_mode': 'form', 'view_id': ref('view_ga_account_asset_form')})]"/> (0, 0, {'view_mode': 'form', 'view_id': ref('view_ga_account_asset_form')})]"/>
<field name="search_view_id" ref="account_asset.view_account_asset_search"/> <field name="search_view_id" ref="account_asset.view_account_asset_search"/>
<field name="domain">[('state', '!=', 'model')]</field> <!-- Filter out Asset Models --> <field name="domain">[('state', '!=', 'model')]</field> <!-- Filter out Asset Models -->

View File

@ -4,7 +4,7 @@
<field name="name">ga.asset.transfer.log.tree</field> <field name="name">ga.asset.transfer.log.tree</field>
<field name="model">ga.asset.transfer.log</field> <field name="model">ga.asset.transfer.log</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Asset Transfer Logs" decoration-info="state == 'transit'" decoration-muted="state == 'cancel'" decoration-success="state == 'done'"> <list string="Asset Transfer Logs" decoration-info="state == 'transit'" decoration-muted="state == 'cancel'" decoration-success="state == 'done'">
<field name="name"/> <field name="name"/>
<field name="transfer_date"/> <field name="transfer_date"/>
<field name="asset_id"/> <field name="asset_id"/>
@ -12,7 +12,7 @@
<field name="target_company_id"/> <field name="target_company_id"/>
<field name="user_id"/> <field name="user_id"/>
<field name="state" widget="badge" decoration-info="state == 'transit'" decoration-success="state == 'done'"/> <field name="state" widget="badge" decoration-info="state == 'transit'" decoration-success="state == 'done'"/>
</tree> </list>
</field> </field>
</record> </record>
@ -57,7 +57,7 @@
<record id="action_ga_asset_transfer_log" model="ir.actions.act_window"> <record id="action_ga_asset_transfer_log" model="ir.actions.act_window">
<field name="name">Pending Asset Receipts</field> <field name="name">Pending Asset Receipts</field>
<field name="res_model">ga.asset.transfer.log</field> <field name="res_model">ga.asset.transfer.log</field>
<field name="view_mode">tree,form</field> <field name="view_mode">list,form</field>
<field name="domain">[('state', '=', 'transit')]</field> <!-- Focus on pending ones by default, or maybe all? --> <field name="domain">[('state', '=', 'transit')]</field> <!-- Focus on pending ones by default, or maybe all? -->
<field name="context">{'search_default_transit': 1}</field> <field name="context">{'search_default_transit': 1}</field>
<field name="help" type="html"> <field name="help" type="html">

View File

@ -13,7 +13,7 @@
invisible="state != 'assigned'" invisible="state != 'assigned'"
groups="ga_asset_management.group_ga_asset_user"/> groups="ga_asset_management.group_ga_asset_user"/>
</xpath> </xpath>
<xpath expr="//field[@name='move_ids_without_package']/tree/field[@name='product_id']" position="after"> <xpath expr="//field[@name='move_ids']/list/field[@name='product_id']" position="after">
<field name="asset_code" optional="show"/> <field name="asset_code" optional="show"/>
<field name="asset_id" optional="hide" readonly="1"/> <field name="asset_id" optional="hide" readonly="1"/>
</xpath> </xpath>
@ -24,7 +24,7 @@
<record id="action_asset_receipts" model="ir.actions.act_window"> <record id="action_asset_receipts" model="ir.actions.act_window">
<field name="name">Pending Asset Receipts</field> <field name="name">Pending Asset Receipts</field>
<field name="res_model">stock.picking</field> <field name="res_model">stock.picking</field>
<field name="view_mode">tree,form</field> <field name="view_mode">list,form</field>
<field name="domain">[('picking_type_code', '=', 'incoming'), ('state', 'not in', ('done', 'cancel')), ('has_asset_moves', '=', True)]</field> <field name="domain">[('picking_type_code', '=', 'incoming'), ('state', 'not in', ('done', 'cancel')), ('has_asset_moves', '=', True)]</field>
<field name="context">{'create': False}</field> <field name="context">{'create': False}</field>
</record> </record>