administrator
/
odoo18
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: administrator:43d0d8526b156c33c1511d31432326e0dc50a965
Branches Tags
administrator:feature/odoo18
administrator:srivyn_test
administrator:feature/share_module
administrator:srivyn_uat
administrator:srivyn_prod
administrator:feature/odoo18_docker
administrator:samashti
administrator:demo_odoo18
administrator:master
administrator:develop
administrator:ats_web
..
compare: administrator:623f63d3bfa479cd34f08103e4b876ca7deccb05
Branches Tags
administrator:srivyn_test
administrator:feature/share_module
administrator:srivyn_uat
administrator:srivyn_prod
administrator:feature/odoo18_docker
administrator:samashti
administrator:demo_odoo18
administrator:feature/odoo18
administrator:master
administrator:develop
administrator:ats_web

48 Commits
43d0d8526b ... 623f63d3bf

Author SHA1 Message Date
administrator 623f63d3bf Initial commit 2025-07-02 12:24:17 +05:30
administrator d74591ff58 Initial commit 2025-07-02 12:24:17 +05:30
administrator 291a64d748 Initial commit 2025-07-02 12:24:17 +05:30
administrator f926c73776 Initial commit 2025-07-02 12:24:16 +05:30
administrator dcb2eb15e7 Initial commit 2025-07-02 12:24:16 +05:30
administrator 25a929bb41 Initial commit 2025-07-02 12:24:16 +05:30
administrator 91df8acb79 Initial commit 2025-07-02 12:24:16 +05:30
administrator 182e8068f8 Initial commit 2025-07-02 12:24:16 +05:30
administrator ec471a356c Initial commit 2025-07-02 12:24:16 +05:30
administrator 1bf17ff725 Initial commit 2025-07-02 12:24:16 +05:30
administrator 064fef323a Initial commit 2025-07-02 12:24:16 +05:30
administrator e2c33eaf2a Initial commit 2025-07-02 12:24:16 +05:30
administrator b105ec91e0 Initial commit 2025-07-02 12:24:16 +05:30
administrator b8f860b8c9 Initial commit 2025-07-02 12:24:16 +05:30
administrator 4a69391d8e Initial commit 2025-07-02 12:24:16 +05:30
administrator 69fabf5a5f Initial commit 2025-07-02 12:24:16 +05:30
administrator 6582f3dc90 Initial commit 2025-07-02 12:24:16 +05:30
administrator beaccbb238 Initial commit 2025-07-02 12:24:16 +05:30
administrator a04cf80495 Initial commit 2025-07-02 12:24:16 +05:30
administrator 0c0b46f7a9 Initial commit 2025-07-02 12:24:16 +05:30
administrator 6b05e02a34 Initial commit 2025-07-02 12:24:16 +05:30
administrator e5b9e7183c pull commit 2025-07-02 12:24:16 +05:30
administrator 11e9b7ed86 Initial commit 2025-07-02 12:24:16 +05:30
Pranay 39928d886b TimeOff Fix 2025-07-02 12:24:16 +05:30
Pranay 1f66b6ed6b time-off FIX 2025-07-02 12:24:16 +05:30
Pranay eeb1db9380 Recruitment Changes 2025-07-02 12:24:15 +05:30
Pranay 8bfc48b07c fix whatsapp 2025-07-02 12:24:15 +05:30
Pranay 7224c8a3d5 update whatsapp code 2025-07-02 12:24:15 +05:30
administrator b1e568de55 Initial commit 2025-07-02 12:24:15 +05:30
administrator fab22d9949 Initial commit 2025-07-02 12:24:15 +05:30
administrator 1d6d3f5e0f Initial commit 2025-07-02 12:24:15 +05:30
administrator e5b94079ed Initial commit 2025-07-02 12:24:15 +05:30
administrator 7b4b2bb6fc Initial commit 2025-07-02 12:24:15 +05:30
administrator 9495d2580a Initial commit 2025-07-02 12:24:15 +05:30
administrator 02bac1fe47 Initial commit 2025-07-02 12:24:15 +05:30
administrator b850615371 Initial commit 2025-07-02 12:24:15 +05:30
administrator 4e199c4fd9 Initial commit 2025-07-02 12:24:15 +05:30
administrator f33bbee53a Initial commit 2025-07-02 12:24:15 +05:30
administrator c8567b353b Initial commit 2025-07-02 12:24:15 +05:30
administrator 61ac808e56 Initial commit 2025-07-02 12:24:15 +05:30
administrator 4dfc8067be Initial commit 2025-07-02 12:24:15 +05:30
administrator 6b47e358b7 Initial commit 2025-07-02 12:24:15 +05:30
administrator b41457f43b Initial commit 2025-07-02 12:24:15 +05:30
administrator 724f956044 Initial commit 2025-07-02 12:24:15 +05:30
administrator a47d0c16ca Initial commit 2025-07-02 12:24:15 +05:30
administrator 9d51a83713 Initial commit 2025-07-02 12:24:15 +05:30
administrator b38d5f8baa Initial commit 2025-07-02 12:24:14 +05:30
administrator 8a71219373 Initial commit 2025-07-02 12:24:14 +05:30
3 changed files with 3 additions and 5 deletions
Show Stats Expand all files Collapse all files

1
addons/maintenance/models/maintenance.py
View File

@ -148,7 +148,6 @@ class MaintenanceEquipment(models.Model):
location = fields.Char('Location') location = fields.Char('Location')
model = fields.Char('Model') model = fields.Char('Model')
serial_no = fields.Char('Serial Number', copy=False) serial_no = fields.Char('Serial Number', copy=False)
mac_address = fields.Char('MAC address', copy=False)
assign_date = fields.Date('Assigned Date', tracking=True) assign_date = fields.Date('Assigned Date', tracking=True)
cost = fields.Float('Cost') cost = fields.Float('Cost')
note = fields.Html('Note') note = fields.Html('Note')

5
addons/maintenance/views/maintenance_views.xml
View File

@ -416,7 +416,6 @@
<field name="partner_ref"/> <field name="partner_ref"/>
<field name="model"/> <field name="model"/>
<field name="serial_no"/> <field name="serial_no"/>
<field name="mac_address"/>
</group><group> </group><group>
<field name="effective_date"/> <field name="effective_date"/>
<field name="cost" groups="maintenance.group_equipment_manager"/> <field name="cost" groups="maintenance.group_equipment_manager"/>
@ -495,13 +494,13 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<list string="Assign To User" sample="1"> <list string="Assign To User" sample="1">
<field name="message_needaction" column_invisible="True"/> <field name="message_needaction" column_invisible="True"/>
<field name="owner_user_id" string="Owner"/>
<field name="name"/> <field name="name"/>
<field name="category_id"/>
<!-- <field name="active" invisible="1"/> --> <!-- <field name="active" invisible="1"/> -->
<field name="owner_user_id" string="Owner"/>
<field name="assign_date" groups="base.group_no_one"/> <field name="assign_date" groups="base.group_no_one"/>
<field name="serial_no"/> <field name="serial_no"/>
<field name="technician_user_id"/> <field name="technician_user_id"/>
<field name="category_id"/>
<field name="partner_id" column_invisible="True"/> <field name="partner_id" column_invisible="True"/>
<field name="company_id" groups="base.group_multi_company"/> <field name="company_id" groups="base.group_multi_company"/>
<field name="activity_exception_decoration" widget="activity_exception"/> <field name="activity_exception_decoration" widget="activity_exception"/>

2
addons_extensions/hr_emp_dashboard/controllers/employee_dashboard.py
View File

@ -24,7 +24,7 @@ class EmployeeDashboard(http.Controller):
taken_leaves = request.env['hr.leave'].search([ taken_leaves = request.env['hr.leave'].search([
('employee_id', '=', employee.id), ('employee_id', '=', employee.id),
('holiday_status_id', '=', leave_type.id), ('holiday_status_id', '=', leave_type.id),
('state', 'in', ['validate','validate1','confirm']), ('state', '=', 'validate'),
]) ])
total_allocated = sum(a.number_of_days for a in allocations) total_allocated = sum(a.number_of_days for a in allocations)