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

Compare commits

base: administrator:c222a2c0d2c0b5b340beedd0193853afb6ba4115
Branches Tags
administrator:feature/odoo18
administrator:samashti
administrator:feature/share_module
administrator:master
administrator:develop
administrator:ats_web
...
compare: administrator:661daeb9ca42b81fec547d81334514ba6c3064a0
Branches Tags
administrator:samashti
administrator:feature/share_module
administrator:master
administrator:develop
administrator:feature/odoo18
administrator:ats_web

50 Commits
c222a2c0d2 ... 661daeb9ca

Author SHA1 Message Date
administrator 661daeb9ca 03-06-2025 
Merge branch 'develop'
 2025-07-03 10:34:22 +05:30
administrator 43d0d8526b Initial commit 2025-07-03 10:33:14 +05:30
administrator fb2b50b1b6 Initial commit 2025-07-03 10:33:14 +05:30
administrator 3b7b4a7bc7 Initial commit 2025-07-03 10:33:14 +05:30
administrator 1c88ccfa53 Initial commit 2025-07-03 10:33:14 +05:30
administrator 76c0bf7275 Initial commit 2025-07-03 10:33:14 +05:30
administrator bf3d82aab2 Initial commit 2025-07-03 10:33:14 +05:30
administrator 4b75814d80 Initial commit 2025-07-03 10:33:13 +05:30
administrator d2fe71965a Initial commit 2025-07-03 10:33:13 +05:30
administrator 0d0e012c36 Initial commit 2025-07-03 10:33:13 +05:30
administrator 58f6edf817 Initial commit 2025-07-03 10:33:13 +05:30
administrator c9bb0e73e2 Initial commit 2025-07-03 10:33:13 +05:30
administrator b8f8dfd8b9 Initial commit 2025-07-03 10:33:13 +05:30
administrator ac50258758 Initial commit 2025-07-03 10:33:13 +05:30
administrator c7d1db59e2 Initial commit 2025-07-03 10:33:13 +05:30
administrator 0c73f89dc3 Initial commit 2025-07-03 10:33:13 +05:30
administrator a8a2decab9 Initial commit 2025-07-03 10:33:13 +05:30
administrator 30585157b2 Initial commit 2025-07-03 10:33:13 +05:30
administrator 11f064ab3e Initial commit 2025-07-03 10:33:13 +05:30
administrator d0de185d37 Initial commit 2025-07-03 10:33:13 +05:30
administrator b90b7e9ab9 Initial commit 2025-07-03 10:33:13 +05:30
administrator 439632cb90 Initial commit 2025-07-03 10:33:13 +05:30
administrator 22673e6fdf pull commit 2025-07-03 10:33:13 +05:30
administrator b0b6b50642 Initial commit 2025-07-03 10:33:13 +05:30
Pranay 6b0b25bd7d TimeOff Fix 2025-07-03 10:33:13 +05:30
Pranay 4cb50a64da time-off FIX 2025-07-03 10:33:13 +05:30
Pranay 3fbf8ae499 Recruitment Changes 2025-07-03 10:33:12 +05:30
Pranay a5ba0c5dae fix whatsapp 2025-07-03 10:33:12 +05:30
Pranay e93a0af02d update whatsapp code 2025-07-03 10:33:12 +05:30
administrator d74a021f54 Initial commit 2025-07-03 10:33:12 +05:30
administrator 5f4df94944 Initial commit 2025-07-03 10:33:12 +05:30
administrator 382151224c Initial commit 2025-07-03 10:33:12 +05:30
administrator e3aa8afab4 Initial commit 2025-07-03 10:33:12 +05:30
administrator 0d9284562c Initial commit 2025-07-03 10:33:12 +05:30
administrator dd98df8e74 Initial commit 2025-07-03 10:33:12 +05:30
administrator f3825cc38c Initial commit 2025-07-03 10:33:12 +05:30
administrator 094804652d Initial commit 2025-07-03 10:33:12 +05:30
administrator e244981df3 Initial commit 2025-07-03 10:33:12 +05:30
administrator fbb7834b09 Initial commit 2025-07-03 10:33:12 +05:30
administrator 47da3b173b Initial commit 2025-07-03 10:33:12 +05:30
administrator c80509e950 Initial commit 2025-07-03 10:33:12 +05:30
administrator 6023854aa3 Initial commit 2025-07-03 10:33:12 +05:30
administrator 1ac3ab580c Initial commit 2025-07-03 10:33:12 +05:30
administrator a0ed31693a Initial commit 2025-07-03 10:33:12 +05:30
administrator 6681a9f38d Initial commit 2025-07-03 10:33:12 +05:30
administrator 0e5239137d Initial commit 2025-07-03 10:33:11 +05:30
administrator 2661344d88 Initial commit 2025-07-03 10:33:11 +05:30
administrator 28590b6f7b Initial commit 2025-07-03 10:33:11 +05:30
administrator 77e2f3a280 Initial commit 2025-07-03 10:33:11 +05:30
raman c371391cdf Mac ID in equipment 2025-07-03 10:31:58 +05:30
3 changed files with 6 additions and 4 deletions
Show Stats Expand all files Collapse all files

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

@ -148,6 +148,7 @@ 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')

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

@ -416,6 +416,7 @@
<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"/>
@ -494,13 +495,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="name"/>
<!-- <field name="active" invisible="1"/> -->
<field name="owner_user_id" string="Owner"/> <field name="owner_user_id" string="Owner"/>
<field name="name"/>
<field name="category_id"/>
<!-- <field name="active" invisible="1"/> -->
<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', '=', 'validate'), ('state', 'in', ['validate','validate1','confirm']),
]) ])
total_allocated = sum(a.number_of_days for a in allocations) total_allocated = sum(a.number_of_days for a in allocations)