Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改

jikimo_frontend/views/bye_odoo.xml

@@ -5,9 +5,9 @@
 <!--         修改页面头部图标及文字 -->
         <template id="favicon_icon" inherit_id="web.layout" name="Web layout">
             <!-- change the title with reliance partner -->
-            <xpath expr="//head//title" position="before">
+            <!-- <xpath expr="//head//title" position="before">
                 <title t-esc="'JIKIMO'"/>
-            </xpath>
+            </xpath> -->
             <!-- change the default favicon icon with   -->
             <xpath expr="//head//link[@rel='shortcut icon']" position="replace">
                 <link type="image/x-icon" rel="shortcut icon" href="/jikimo_frontend/static/src/img/jikimo-logo.ico"/>
@@ -16,7 +16,7 @@
 
 <!--         hide 登录页面 powerd by odoo 及管理数据库 -->
         <template id="login_page_layout" inherit_id="web.login_layout" name="Login Page Layout">
-            <xpath expr="//div[@class='card-body']//div[last()]" position="replace"></xpath>
+            <xpath expr="//div[@class='card-body']/div[last()]" position="replace"></xpath>
         </template>
 
 <!--         隐藏odoo版本信息 -->

sf_base/views/tool_views.xml

@@ -578,7 +578,7 @@
         </field>
     </record>
 
-    <record model="ir.ui.view" id="view_cutting_tool_material_search">
+    <record model="ir.ui.view" id="view_cutting_tool_inventory_search">
         <field name="name">sf.tool.inventory.search</field>
         <field name="model">sf.tool.inventory</field>
         <field name="arch" type="xml">

sf_hr/__manifest__.py

@@ -7,10 +7,11 @@
     'sequence': 1,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['hr'],
+    'depends': ['base', 'hr'],
     'data': [
         'views/hr_employee.xml',
         'views/res_config_settings_views.xml',
+        'views/res_users_view.xml',
         'data/cron_data.xml',
     ],
     'demo': [

sf_hr/models/__init__.py

@@ -2,3 +2,4 @@
 
 from . import hr_employee
 from . import res_config_setting
+from . import res_users

sf_hr/models/hr_employee.py

@@ -20,7 +20,9 @@ class JkmPracticeEmployee(models.Model):
             if result['employee_list']:
                 for employee_info in result['employee_list']:
                     if employee_info['work_email']:
-                        self.sudo().search([('work_email', '=', employee_info['work_email'])]).write(
-                            {'we_id': employee_info['we_id']})
+                        hr_employee = self.sudo().search([('work_email', '=', employee_info['work_email'])])
+                        hr_employee.write({'we_id': employee_info['we_id']})
+                        if hr_employee.user_id:
+                            hr_employee.user_id.write({'we_employee_id': employee_info['we_id']})
         else:
             logging.info('_employee_info_sync error:%s' % result['message'])

sf_hr/models/res_users.py

@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+from odoo import models, fields, api
+
+import logging
+
+_logger = logging.getLogger(__name__)
+
+
+class ResUsers(models.Model):
+    _inherit = 'res.users'
+
+    we_employee_id = fields.Char(string=u'企业微信账号', default="")

sf_hr/views/res_users_view.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="view_users_account_form" model="ir.ui.view">
+            <field name="name">res.users.account.form</field>
+            <field name="model">res.users</field>
+            <field name="inherit_id" ref="base.view_users_form"/>
+            <field name="arch" type="xml">
+                <page name="preferences" position="after">
+                    <page name="account" string="企业微信">
+                        <group>
+                            <field name="we_employee_id"/>
+                        </group>
+                    </page>
+                </page>
+            </field>
+        </record>
+    </data>
+</odoo>
+

sf_machine_connect/controllers/controllers.py

@@ -489,11 +489,14 @@ class Sf_Dashboard_Connect(http.Controller):
 
                 for time_interval in time_intervals:
                     start_time, end_time = time_interval
-                    # print(start_time, end_time)
-                    orders = plan_obj.search([('production_line_id.name', '=', line), ('state', 'in', ['finished']),
-                                              (date_field_name, '>=', start_time.strftime('%Y-%m-%d 00:00:00')),
-                                              (date_field_name, '<', end_time.strftime('%Y-%m-%d 00:00:00'))
-                                              ])
+
+                    orders = plan_obj.search([
+                        ('production_line_id.name', '=', line),
+                        ('state', 'in', ['finished']),
+                        (date_field_name, '>=', start_time.strftime('%Y-%m-%d %H:%M:%S')),
+                        (date_field_name, '<=', end_time.strftime('%Y-%m-%d %H:%M:%S'))  # 包括结束时间
+                    ])
+
                     # 使用小时和分钟作为键，确保每个小时的数据有独立的键
                     key = start_time.strftime('%H:%M:%S')  # 只取小时:分钟:秒作为键
                     time_count_dict[key] = len(orders)
@@ -626,10 +629,16 @@ class Sf_Dashboard_Connect(http.Controller):
                  ('production_id.state', 'not in', ['cancel', 'done']), ('active', '=', True)
                  ])
             # print(not_done_orders)
+
             # 完成订单
+            # 获取当前时间，并计算24小时前的时间
+            current_time = datetime.now()
+            time_24_hours_ago = current_time - timedelta(hours=24)
+
             finish_orders = plan_obj.search([
                 ('production_line_id.name', '=', line), ('state', 'in', ['finished']),
-                ('production_id.state', 'not in', ['cancel']), ('active', '=', True)
+                ('production_id.state', 'not in', ['cancel']), ('active', '=', True),
+                ('actual_end_time', '>=', time_24_hours_ago)
             ])
             # print(finish_orders)
 
@@ -687,6 +696,8 @@ class Sf_Dashboard_Connect(http.Controller):
                 not_done_data.append(line_dict)
 
             for finish_order in finish_orders:
+                if not finish_order.actual_end_time:
+                    continue
                 blank_name = ''
                 try:
                     blank_name = finish_order.production_id.move_raw_ids[0].product_id.name
@@ -707,7 +718,7 @@ class Sf_Dashboard_Connect(http.Controller):
                     'material': material,
                     'dimensions': dimensions,
                     'order_qty': finish_order.product_qty,
-                    'finish_time': finish_order.actual_end_time.strftime('%Y-%m-%d %H:%M:%S'),
+                    'finish_time': finish_order.actual_end_time.strftime('%Y-%m-%d %H:%M:%S') if finish_order.actual_end_time else ' '
 
                 }
                 done_data.append(line_dict)

sf_maintenance/models/sf_maintenance_oee.py

@@ -1,5 +1,9 @@
 # -*- coding: utf-8 -*-
+import json
+import datetime
+import requests
 from odoo import api, fields, models, _
+from odoo.exceptions import UserError
 
 
 class SfMaintenanceEquipmentOEE(models.Model):
@@ -9,6 +13,9 @@ class SfMaintenanceEquipmentOEE(models.Model):
     name = fields.Char('设备oee')
     equipment_id = fields.Many2one('maintenance.equipment', '机台号',
                                    domain="[('category_id.equipment_type', '=', '机床'),('state_zc', '=', '已注册')]")
+
+    equipment_code = fields.Char('设备编码', related='equipment_id.code', store=True)
+
     type_id = fields.Many2one('sf.machine_tool.type', '型号', related='equipment_id.type_id')
     machine_tool_picture = fields.Binary('设备图片', related='equipment_id.machine_tool_picture')
     state = fields.Selection(
@@ -28,6 +35,151 @@ class SfMaintenanceEquipmentOEE(models.Model):
                                               related='equipment_id.sf_maintenance_logs_ids')
     oee_logs = fields.One2many('maintenance.equipment.oee.logs', 'equipment_oee_id', string='运行日志')
 
+    day_logs_detail = fields.Html('日运行日志详情')
+    history_logs_detail = fields.Html('历史运行日志详情')
+    begin_time = fields.Date('开始时间')
+    end_time = fields.Date('结束时间')
+
+    # 获取日志详情
+    def get_day_logs(self):
+        config = self.env['ir.config_parameter'].sudo()
+        url = 'http://172.16.10.112:8069/api/logs/list'
+        machine_list = [self.equipment_code]
+        begin_time = datetime.datetime.now().strftime('%Y-%m-%d') + ' 00:00:00'
+        end_time = datetime.datetime.now().strftime('%Y-%m-%d') + ' 23:59:59'
+
+        # 请求的数据
+        data = {
+            "machine_list": str(machine_list),
+            "begin_time": begin_time,
+            "end_time": end_time
+        }
+
+        print(data)
+
+        # 发送POST请求
+        response = requests.post(url, json={}, data=data)
+        print(response.json())  # 输出服务器返回的响应
+        if response.status_code == 200:
+            result = response.json()
+            print('============', result)
+            if result['status'] == 1:
+                logs_list = result['data'][self.equipment_code]
+                logs_detail = ''
+                for log in logs_list:
+                    print('loooooooooooooooooooogs', log)
+                    production_name = log['production_name'] if log['production_name'] else ' '
+                    logs_detail += '<tr><td>' + log['time'] + '</td><td>' + log[
+                        'state'] + '</td><td>' + production_name + '</td></tr>'
+                # self.day_logs_detail = '<table><tr><th>时间</th><th>事件/状态</th><th>加工工单</th></tr>' + logs_detail + '</table>'
+                self.day_logs_detail = '''
+                    <table border="1" style="border-collapse: collapse; width: 100%; text-align: center;">
+                        <tr style="background-color: #f2f2f2;">
+                            <th style="padding: 8px; border: 1px solid #ddd;">时间</th>
+                            <th style="padding: 8px; border: 1px solid #ddd;">事件/状态</th>
+                            <th style="padding: 8px; border: 1px solid #ddd;">加工工单</th>
+                        </tr>
+                        {logs_detail}
+                    </table>
+                '''.format(logs_detail=logs_detail)
+
+            else:
+                self.day_logs_detail = '获取日志失败'
+        else:
+            self.day_logs_detail = '获取日志失败'
+
+    # 获取历史日志详情
+    def get_history_logs(self):
+        config = self.env['ir.config_parameter'].sudo()
+        url = 'http://172.16.10.112:8069/api/logs/list'
+        machine_list = [self.equipment_code]
+        if not self.begin_time:
+            raise UserError('请选择开始时间')
+        if not self.end_time:
+            raise UserError('请选择结束时间')
+
+        begin_time = self.begin_time.strftime('%Y-%m-%d') + ' 00:00:00'
+        end_time = self.end_time.strftime('%Y-%m-%d') + ' 23:59:59'
+
+        # 请求的数据
+        data = {
+            "machine_list": str(machine_list),
+            "begin_time": begin_time,
+            "end_time": end_time
+        }
+
+        print(data)
+
+        # 发送POST请求
+        response = requests.post(url, json={}, data=data)
+        print(response.json())  # 输出服务器返回的响应
+        if response.status_code == 200:
+            result = response.json()
+            print('============', result)
+            if result['status'] == 1:
+                logs_list = result['data'][self.equipment_code]
+                logs_detail = ''
+                for log in logs_list:
+                    production_name = log['production_name'] if log['production_name'] else ' '
+                    logs_detail += '<tr><td>' + log['time'] + '</td><td>' + log[
+                        'state'] + '</td><td>' + production_name + '</td></tr>'
+                # self.day_logs_detail = '<table><tr><th>时间</th><th>事件/状态</th><th>加工工单</th></tr>' + logs_detail + '</table>'
+                self.history_logs_detail = '''
+                            <table border="1" style="border-collapse: collapse; width: 100%; text-align: center;">
+                                <tr style="background-color: #f2f2f2;">
+                                    <th style="padding: 8px; border: 1px solid #ddd;">时间</th>
+                                    <th style="padding: 8px; border: 1px solid #ddd;">事件/状态</th>
+                                    <th style="padding: 8px; border: 1px solid #ddd;">加工工单</th>
+                                </tr>
+                                {logs_detail}
+                            </table>
+                        '''.format(logs_detail=logs_detail)
+
+            else:
+                self.history_logs_detail = '获取日志失败'
+        else:
+            self.history_logs_detail = '获取日志失败'
+
+    # 下载历史日志
+    def download_history_logs(self):
+        config = self.env['ir.config_parameter'].sudo()
+        url = 'http://172.16.10.112:8069/api/logs/list'
+        machine_list = [self.equipment_code]
+        if not self.begin_time:
+            raise UserError('请选择开始时间')
+        if not self.end_time:
+            raise UserError('请选择结束时间')
+
+        begin_time = self.begin_time.strftime('%Y-%m-%d') + ' 00:00:00'
+        end_time = self.end_time.strftime('%Y-%m-%d') + ' 23:59:59'
+
+        # 请求的数据
+        data = {
+            "machine_list": str(machine_list),
+            "begin_time": begin_time,
+            "end_time": end_time
+        }
+
+        print(data)
+
+        # 发送POST请求
+        response = requests.post(url, json={}, data=data)
+        print(response.json())  # 输出服务器返回的响应
+        if response.status_code == 200:
+            result = response.json()
+            print('============', result)
+            if result['status'] == 1:
+                logs_list = result['data'][self.equipment_code]
+                logs_detail = ''
+                for log in logs_list:
+                    production_name = log['production_name'] if log['production_name'] else ' '
+                    # todo 下载日志
+
+            else:
+                self.history_logs_detail = '下载日志失败'
+        else:
+            self.history_logs_detail = '下载日志失败'
+
     def name_get(self):
         result = []
         for parameter in self:
@@ -95,4 +247,3 @@ class SfMaintenanceEquipmentOEELogDetail(models.Model):
     log_id = fields.Many2one('maintenance.equipment.oee.logs', '日志')
     # equipment_code = fields.Char('设备编码', related='log_id.equipment_code')
     equipment_code = fields.Char('设备编码', readonly='True')
-

sf_maintenance/views/maintenance_equipment_oee_views.xml

@@ -38,6 +38,7 @@
                         <group>
                             <group>
                                 <field name="type_id" readonly="1"/>
+                                <field name="equipment_code"/>
                                 <field name="equipment_time"/>
                                 <field name="run_time"/>
                                 <field name="done_nums"/>
@@ -48,21 +49,37 @@
                             <group>
                                 <field name="machine_tool_picture" widget="image" readonly="1"/>
                             </group>
-
                         </group>
-<!--                         <notebook> -->
-<!--                         <page string="运行日志"> -->
-<!--                             <field name="oee_logs"> -->
-<!--                                 <tree create="1" edit="1" delete="1" editable="bottom"> -->
-<!--                                     <field name = 'run_time'/> -->
-<!--                                     <field name = 'state'/> -->
-<!--                                     <field name = 'workorder_id'/> -->
-<!--                                     <field name = 'time'/> -->
-<!--                                     <field name = 'color' widget="color"/> -->
-<!--                                 </tree> -->
-<!--                             </field> -->
-<!--                         </page> -->
-<!--                         </notebook> -->
+                        <notebook>
+                        <page string="24H日志详情">
+                            <group>
+                                <button name="get_day_logs" type="object" string="查看24H日志" t-attf-style="white-space:nowrap;"/>
+                            </group>
+                            <field name="day_logs_detail"/>
+                        </page>
+                        <page string="历史日志详情">
+                            <group>
+                                <group>
+                                    <group>
+                                    <field name="begin_time"/>
+                                    </group>
+                                     <group>
+                                    <field name="end_time"/>
+                                    </group>
+                                </group>
+                                <group>
+                                    <group>
+                                        <button name="get_history_logs" type="object" string="查看历史日志" t-attf-style="white-space:nowrap;"/>
+                                    </group>
+                                    <group>
+                                        <button name="download_history_logs" type="object" string="下载历史日志" t-attf-style="white-space:nowrap;"/>
+                                    </group>
+                                </group>
+
+                            </group>
+                            <field name="history_logs_detail"/>
+                        </page>
+                    </notebook>
                     </sheet>
                 </form>
             </field>

sf_manufacturing/models/mrp_workorder.py

@@ -1082,6 +1082,12 @@ class ResMrpWorkOrder(models.Model):
 
     # 重写工单开始按钮方法
     def button_start(self):
+        if self.routing_type == 'CNC加工':
+            self.env['sf.production.plan'].sudo().search([('name', '=', self.production_id.name)]).write({
+                'state': 'processing',
+                'actual_start_time': datetime.now()
+            })
+
         if self.routing_type == '装夹预调':
             # 判断是否有坯料的序列号信息
             boolean = False

sf_manufacturing/views/mrp_production_addional_change.xml

@@ -296,6 +296,10 @@
                     </attribute>
                 </xpath>
 
+                <xpath expr="//sheet//notebook//page[@name='operations']//field[@name='workorder_ids']" position="replace">
+                    <field name="workorder_ids" attrs="{'readonly': ['|', ('state', '!=', 'test_value'), '&amp;', ('state', '=', 'done'), ('is_locked', '=', True)]}" context="{'tree_view_ref': 'mrp.mrp_production_workorder_tree_editable_view', 'default_product_uom_id': product_uom_id, 'from_manufacturing_order': True}"/>
+                </xpath>
+
                 <xpath expr="//sheet//notebook//page[@name='operations']" position="after">
                     <page string="检测结果" attrs="{'invisible': [('detection_result_ids', '=', [])]}">
                         <field name="detection_result_ids" string="" readonly="0">

sf_manufacturing/views/mrp_workorder_view.xml

@@ -520,7 +520,7 @@
 
             <xpath expr="//form//header" position="inside">
                 <button type="object" class="oe_highlight jikimo_button_confirm" name="get_three_check_datas"
-                        string="获取数据" attrs='{"invisible": [("state","!=","progress"), ("routing_type","!=","装夹预调")]}'/>
+                        string="获取数据" attrs='{"invisible": ["|", ("state","!=","progress"), ("routing_type","!=","装夹预调")]}'/>
             </xpath>
 
 

sf_message/__manifest__.py

@@ -11,7 +11,7 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['sale', 'purchase', 'sf_plan', 'jikimo_message_notify'],
+    'depends': ['sale', 'purchase', 'sf_plan', 'jikimo_message_notify','stock'],
     'data': [
         'data/bussiness_node.xml'
     ],

sf_message/data/bussiness_node.xml

@@ -10,5 +10,21 @@
             <field name="name">确认接单</field>
             <field name="model">sale.order</field>
         </record>
+        <record id="transfer_inventory" model="jikimo.message.bussiness.node">
+            <field name="name">调拨入库</field>
+            <field name="model">stock.picking</field>
+        </record>
+        <record id="tool_assembly" model="jikimo.message.bussiness.node">
+            <field name="name">功能刀具组装</field>
+            <field name="model">sf.functional.tool.assembly</field>
+        </record>
+        <record id="tool_dismantle" model="jikimo.message.bussiness.node">
+            <field name="name">功能刀具寿命到期</field>
+            <field name="model">sf.functional.tool.dismantle</field>
+        </record>
+        <record id="bussiness_material_purchase_remind" model="jikimo.message.bussiness.node">
+            <field name="name">坯料采购提醒</field>
+            <field name="model">purchase.order</field>
+        </record>
     </data>
 </odoo>

sf_message/models/__init__.py

@@ -6,3 +6,4 @@ from . import sf_message_cam_program
 from . import sf_message_functional_tool_assembly
 from . import sf_message_purchase
 from . import sf_message_workorder
+from . import sf_message_functional_tool_dismantle

sf_message/models/sf_message_functional_tool_assembly.py

@@ -3,4 +3,16 @@ from odoo import models, fields, api, _
 
 class SFMessagefunctionalToolAssembly(models.Model):
     _name = 'sf.functional.tool.assembly'
+    _description = "刀具组装单"
     _inherit = ['sf.functional.tool.assembly', 'jikimo.message.dispatch']
+
+    @api.model_create_multi
+    def create(self, vals):
+        result = super(SFMessagefunctionalToolAssembly, self).create(vals)
+        is_cam = False
+        for obj in result:
+            if obj.loading_task_source == '0' and obj.assemble_status == '0':
+                is_cam = True
+        if is_cam:
+            self.add_queue('功能刀具组装')
+        return result

sf_message/models/sf_message_functional_tool_dismantle.py

@@ -0,0 +1,18 @@
+from odoo import models, api
+
+
+class SFMessagefunctionalToolDismantle(models.Model):
+    _name = 'sf.functional.tool.dismantle'
+    _description = "刀具拆解单"
+    _inherit = ['sf.functional.tool.dismantle', 'jikimo.message.dispatch']
+
+    @api.model
+    def create(self, vals):
+        result = super(SFMessagefunctionalToolDismantle, self).create(vals)
+        is_dismantle = False
+        for obj in result:
+            if  obj.dismantle_cause in ['寿命到期报废', '崩刀报废']and obj.state=='待拆解':
+                is_dismantle = True
+        if is_dismantle:
+            self.add_queue('功能刀具寿命到期')
+        return result

sf_message/models/sf_message_purchase.py

@@ -1,6 +1,17 @@
+import logging
 from odoo import models, fields, api, _
 
 
 class SFMessagePurchase(models.Model):
     _name = 'purchase.order'
     _inherit = ['purchase.order',  'jikimo.message.dispatch']
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        res = super(SFMessagePurchase, self).create(vals_list)
+        if res:
+            try:
+                res.add_queue('坯料采购提醒')
+            except Exception as e:
+                logging.info('add_queue error:%s' % e)
+        return res

sf_message/models/sf_message_stock_picking.py

@@ -3,4 +3,11 @@ from odoo import models, fields, api, _
 
 class SFMessageStockPicking(models.Model):
     _name = 'stock.picking'
+    _description = "库存调拨"
     _inherit = ['stock.picking',  'jikimo.message.dispatch']
+
+    def button_validate(self):
+        res = super(SFMessageStockPicking, self).button_validate()
+        if self.location_id.name == '进货' and self.location_dest_id.name == '刀具房':
+            self.add_queue('调拨入库')
+        return res

sf_message/models/sf_message_template.py

@@ -9,4 +9,8 @@ class SfMessageTemplate(models.Model):
     def _get_message_model(self):
         res = super(SfMessageTemplate, self)._get_message_model()
         res.append("sale.order")
+        res.append("stock.picking")
+        res.append('sf.functional.tool.assembly')
+        res.append('sf.functional.tool.dismantle')
+        res.append('purchase.order')
         return res

sf_plan/views/view.xml

@@ -278,6 +278,7 @@
                 sequence="150"
                 action="sf_production_plan_action"
                 groups="sf_base.group_plan_dispatch"
+                web_icon="sf_plan,static/description/计划.png"
         />
 
         <!--         <record model="ir.ui.menu" id="mrp_custom_menu" inherit_id="mrp.menu_mrp_manufacturing"> -->

sf_stock/models/stock_picking.py

@@ -74,6 +74,8 @@ class StockPicking(models.Model):
 
     def send_to_bfm(self):
         skip_backorder = self.env.context.get('skip_backorder')
+        cancel_backorder_ids = self.env.context.get('picking_ids_not_to_backorder')
+
         # 下发发货到bfm
         config = self.env['res.config.settings'].get_values()
         move_ids, move_line_ids = self.deal_move_ids(self.move_ids, self.move_line_ids)
@@ -92,13 +94,13 @@ class StockPicking(models.Model):
                 'state': self.state,
                 'backorder_id': self.deal_send_backorder_id(self.backorder_id),
                 'backorder_ids': self.deal_send_backorder_id(self.backorder_ids),
-                'cancel_backorder_ids': skip_backorder,
+                'cancel_backorder_ids': True if skip_backorder and cancel_backorder_ids else False,  # 没有欠单判断
                 'move_type': self.move_type,
             },
         }
         url1 = config['bfm_url_new'] + '/api/stock/deliver_goods'
         json_str = json.dumps(data)
-        print('json_str', json_str)
+        logging.info('json_str= %s', json_str)
         r = requests.post(url1, json=data, data=None)
         if r.status_code == 200:
             result = json.loads(r.json()['result'])

sf_tool_management/models/base.py

@@ -185,6 +185,7 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
     _description = 'CAM工单程序用刀计划'
 
     name = fields.Char('工单任务编号')
+    programming_no = fields.Char('编程单号')
     cam_procedure_code = fields.Char('程序名')
     filename = fields.Char('文件')
     cam_cutter_spacing_code = fields.Char('刀号')
@@ -317,23 +318,30 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
         """
         根据传入的工单信息，查询是否有需要的功能刀具，如果没有则生成CAM工单程序用刀计划
         """
-        knife_plan = self.env['sf.cam.work.order.program.knife.plan'].sudo().create({
-            'name': cnc_processing.workorder_id.production_id.name,
-            'cam_procedure_code': cnc_processing.program_name,
-            'filename': cnc_processing.cnc_id.name,
-            'functional_tool_name': cnc_processing.cutting_tool_name,
-            'cam_cutter_spacing_code': cnc_processing.cutting_tool_no,
-            'process_type': cnc_processing.processing_type,
-            'margin_x_y': float(cnc_processing.margin_x_y),
-            'margin_z': float(cnc_processing.margin_z),
-            'finish_depth': float(cnc_processing.depth_of_processing_z),
-            'extension_length': float(cnc_processing.cutting_tool_extension_length),
-            'shank_model': cnc_processing.cutting_tool_handle_type,
-            'estimated_processing_time': cnc_processing.estimated_processing_time,
-        })
-        logging.info('CAM工单程序用刀计划创建成功！！！')
-        # 创建装刀请求
-        knife_plan.apply_for_tooling()
+
+        # 获取编程单号
+        programming_no = cnc_processing.workorder_id.production_id.programming_no
+        if not self.env['sf.cam.work.order.program.knife.plan'].sudo().search(
+                [('programming_no', '=', programming_no),
+                 ('functional_tool_name', '=', cnc_processing.cutting_tool_name)]):
+            knife_plan = self.env['sf.cam.work.order.program.knife.plan'].sudo().create({
+                'name': cnc_processing.workorder_id.production_id.name,
+                'programming_no': programming_no,
+                'cam_procedure_code': cnc_processing.program_name,
+                'filename': cnc_processing.cnc_id.name,
+                'functional_tool_name': cnc_processing.cutting_tool_name,
+                'cam_cutter_spacing_code': cnc_processing.cutting_tool_no,
+                'process_type': cnc_processing.processing_type,
+                'margin_x_y': float(cnc_processing.margin_x_y),
+                'margin_z': float(cnc_processing.margin_z),
+                'finish_depth': float(cnc_processing.depth_of_processing_z),
+                'extension_length': float(cnc_processing.cutting_tool_extension_length),
+                'shank_model': cnc_processing.cutting_tool_handle_type,
+                'estimated_processing_time': cnc_processing.estimated_processing_time,
+            })
+            logging.info('CAM工单程序用刀计划创建成功！！！')
+            # 创建装刀请求
+            knife_plan.apply_for_tooling()
 
     def unlink_cam_plan(self, production):
         for item in production:

sf_tool_management/models/jikimo_bom.py

@@ -89,7 +89,7 @@ class jikimo_bom(models.Model):
                     ('cutting_tool_blade_diameter', '=', self.tool_inventory_id.diameter),
 
                     # r角
-                    ('cutting_tool_blade_tip_working_size', '=', self.tool_inventory_id.angle)]
+                    ('cutting_tool_blade_tip_r_size', '=', self.tool_inventory_id.angle)]
             if option.name == '刀杆':
                 domain = ['&'] + domain + [
                     ("cutting_tool_cutter_arbor_diameter", "=", self.tool_inventory_id.diameter)]

sf_tool_management/views/tool_base_views.xml

@@ -283,21 +283,22 @@
             <field name="arch" type="xml">
                 <tree create="0">
                     <field name="name" string="工单编码"/>
-                    <field name="cam_procedure_code"/>
-                    <field name="filename"/>
+                    <field name="programming_no"/>
+                    <field name="cam_procedure_code" optional="hide"/>
+                    <field name="filename" optional="hide"/>
                     <field name="functional_tool_name" string="刀具名称"/>
                     <field name="cam_cutter_spacing_code"/>
                     <field name="diameter" optional="hide"/>
                     <field name="tool_included_angle" optional="hide"/>
-                    <field name="process_type"/>
+                    <field name="process_type" optional="hide"/>
                     <field name="margin_x_y"/>
                     <field name="margin_z"/>
                     <field name="finish_depth"/>
                     <field name="extension_length" string="刀具伸出长度(mm)"/>
                     <field name="shank_model"/>
                     <field name="estimated_processing_time"/>
-                    <field name="need_knife_time"/>
-                    <field name="applicant_time"/>
+                    <field name="need_knife_time" optional="hide"/>
+                    <field name="applicant_time" optional="hide"/>
                     <field name="plan_execute_status"/>
 
                     <field name="production_line_id" invisible="1"/>
@@ -332,6 +333,7 @@
                         </div>
                         <group>
                             <group>
+                                <field name="programming_no"/>
                                 <field name="cam_procedure_code"/>
                                 <field name="filename"/>
                                 <field name="production_line_id"/>
@@ -388,6 +390,7 @@
             <field name="model">sf.cam.work.order.program.knife.plan</field>
             <field name="arch" type="xml">
                 <search>
+                    <field name="programming_no"/>
                     <field name="name" string="工单编码"/>
                     <field name="cam_procedure_code"/>
                     <field name="filename"/>

sf_tool_management/views/tool_inventory.xml

@@ -16,7 +16,7 @@
     <record id="view_tool_inventory_inherit_search" model="ir.ui.view">
         <field name="name">sf.tool.inventory.inherit.search</field>
         <field name="model">sf.tool.inventory</field>
-        <field name="inherit_id" ref="sf_base.view_cutting_tool_material_search"/>
+        <field name="inherit_id" ref="sf_base.view_cutting_tool_inventory_search"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='extension']" position="after">
                 <searchpanel>

vista_backend_theme/__init__.py

@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-#############################################################################
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#
-#    Copyright (C) 2022-TODAY Cybrosys Technologies(<https://www.cybrosys.com>)
-#    Author: Cybrosys Techno Solutions(<https://www.cybrosys.com>)
-#
-#    You can modify it under the terms of the GNU LESSER
-#    GENERAL PUBLIC LICENSE (LGPL v3), Version 3.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU LESSER GENERAL PUBLIC LICENSE (LGPL v3) for more details.
-#
-#    You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE
-#    (LGPL v3) along with this program.
-#    If not, see <http://www.gnu.org/licenses/>.
-#
-#############################################################################
-from .hooks import test_pre_init_hook, test_post_init_hook
-from . import wizard
-from . import models
-

vista_backend_theme/__manifest__.py

@@ -1,70 +0,0 @@
-# -*- coding: utf-8 -*-
-#############################################################################
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#
-#    Copyright (C) 2022-TODAY Cybrosys Technologies(<https://www.cybrosys.com>)
-#    Author: Cybrosys Techno Solutions(<https://www.cybrosys.com>)
-#
-#    You can modify it under the terms of the GNU LESSER
-#    GENERAL PUBLIC LICENSE (LGPL v3), Version 3.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU LESSER GENERAL PUBLIC LICENSE (LGPL v3) for more details.
-#
-#    You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE
-#    (LGPL v3) along with this program.
-#    If not, see <http://www.gnu.org/licenses/>.
-#
-#############################################################################
-
-{
-    "name": "Vista Backend Theme V16",
-    "description": """Minimalist and elegant backend theme for Odoo 16, Backend Theme, Theme""",
-    "summary": "Vista Backend Theme V16 is an attractive theme for backend",
-    "category": "Themes/Backend",
-    "version": "16.0.1.0.0",
-    'author': 'Cybrosys Techno Solutions',
-    'company': 'Cybrosys Techno Solutions',
-    'maintainer': 'Cybrosys Techno Solutions',
-    'website': "https://www.cybrosys.com",
-    "depends": ['base', 'web', 'mail', 'base_setup'],
-    "data": [
-        'security/ir.model.access.csv',
-        'views/icons.xml',
-        'views/layout.xml',
-        'views/theme.xml',
-        'views/assets.xml',
-        'data/theme_data.xml',
-        'views/res_config.xml',
-    ],
-    'assets': {
-        'web.assets_backend': {
-            '/vista_backend_theme/static/src/scss/theme.scss',
-            '/vista_backend_theme/static/src/js/systray.js',
-            '/vista_backend_theme/static/src/js/load.js',
-            '/vista_backend_theme/static/src/js/chrome/sidebar_menu.js',
-            '/vista_backend_theme/static/src/xml/systray.xml',
-            '/vista_backend_theme/static/src/xml/top_bar.xml',
-            '/vista_backend_theme/static/src/js/web_window_title.js',
-        },
-        'web.assets_frontend': {
-            '/vista_backend_theme/static/src/scss/login.scss',
-            '/vista_backend_theme/static/src/scss/login.scss',
-
-        },
-    },
-    'images': [
-        'static/description/banner.png',
-        'static/description/theme_screenshot.png',
-        'static/description/main_screenshot.png',
-    ],
-    'license': 'LGPL-3',
-    'pre_init_hook': 'test_pre_init_hook',
-    'post_init_hook': 'test_post_init_hook',
-    'installable': True,
-    'application': False,
-    'auto_install': False,
-}

vista_backend_theme/data/demo.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-
-         <record id="config_parameter_web_base_title_demo" model="ir.config_parameter">
-            <field name="key">web.base.title</field>
-            <field name="value">Demo</field>
-        </record>
-
-    </data>
-</openerp>

vista_backend_theme/data/theme_data.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-   <data noupdate="1">
-        <record id="theme_data_stored" model="theme.data.stored">
-            <field name="name">default</field>
-        </record>
-    </data>
-</odoo>

vista_backend_theme/hooks.py

@@ -1,163 +0,0 @@
-# -*- coding: utf-8 -*-
-#############################################################################
-#
-#    Cybrosys Technologies Pvt. Ltd.
-#
-#    Copyright (C) 2022-TODAY Cybrosys Technologies(<https://www.cybrosys.com>)
-#    Author: Cybrosys Techno Solutions(<https://www.cybrosys.com>)
-#
-#    You can modify it under the terms of the GNU LESSER
-#    GENERAL PUBLIC LICENSE (LGPL v3), Version 3.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU LESSER GENERAL PUBLIC LICENSE (LGPL v3) for more details.
-#
-#    You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE
-#    (LGPL v3) along with this program.
-#    If not, see <http://www.gnu.org/licenses/>.
-#
-#############################################################################
-import base64
-
-from odoo import api, SUPERUSER_ID
-from odoo.modules import get_module_resource
-
-
-def test_pre_init_hook(cr):
-    """pre init hook"""
-
-    env = api.Environment(cr, SUPERUSER_ID, {})
-    menu_item = env['ir.ui.menu'].search([('parent_id', '=', False)])
-
-    for menu in menu_item:
-        if menu.name == 'Contacts':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'contacts.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-        if menu.name == 'Link Tracker':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'link-tracker.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-        if menu.name == 'Dashboards':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'dashboards.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-        if menu.name == 'Sales':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'sales.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-        if menu.name == 'Invoicing':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'accounting.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-        if menu.name == 'Inventory':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'inventory.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-        if menu.name == 'Purchase':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'purchase.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-        if menu.name == 'Calendar':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'calendar.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-        if menu.name == 'CRM':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'crm.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-        if menu.name == 'Note':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'note.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-        if menu.name == 'Website':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'website.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-        if menu.name == 'Point of Sale':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'pos.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-        if menu.name == 'Manufacturing':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'manufacturing.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-        if menu.name == 'Repairs':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'repairs.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-        if menu.name == 'Email Marketing':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'email-marketing.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-        if menu.name == 'SMS Marketing':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'sms-marketing.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-        if menu.name == 'Project':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'project.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-        if menu.name == 'Surveys':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'surveys.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-        if menu.name == 'Employees':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'employee.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-        if menu.name == 'Recruitment':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'recruitment.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-        if menu.name == 'Attendances':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'attendances.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-        if menu.name == 'Time Off':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'timeoff.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-        if menu.name == 'Expenses':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'expenses.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-        if menu.name == 'Maintenance':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'maintenance.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-        if menu.name == 'Live Chat':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'live-chat.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-        if menu.name == 'Lunch':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'lunch.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-        if menu.name == 'Fleet':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'fleet.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-        if menu.name == 'Timesheets':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'timesheets.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-        if menu.name == 'Events':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'events.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-        if menu.name == 'eLearning':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'elearning.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-        if menu.name == 'Members':
-            img_path = get_module_resource(
-                'vista_backend_theme', 'static', 'src', 'img', 'icons', 'members.png')
-            menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
-
-
-def test_post_init_hook(cr, registry):
-    """post init hook"""
-    env = api.Environment(cr, SUPERUSER_ID, {})

vista_backend_theme/models/__init__.py

@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from . import ir_ui_view
-from . import res_config

vista_backend_theme/models/ir_ui_view.py

@@ -1,18 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import logging
-
-from odoo import api, fields, models, _
-
-_logger = logging.getLogger(__name__)
-
-class View(models.Model):
-    _inherit = 'ir.ui.view'
-
-    @api.model
-    def _render_template(self, template, values=None):
-        if template in ['web.login', 'web.webclient_bootstrap']:
-            if not values:
-                values = {}
-            values["title"] = self.env['ir.config_parameter'].sudo().get_param("web.base.title", "")
-        return super(View, self)._render_template(template, values)

vista_backend_theme/models/res_config.py

@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import logging
-
-from odoo import api, fields, models, _
-
-_logger = logging.getLogger(__name__)
-
-CONFIG_PARAM_WEB_WINDOW_TITLE = "web.base.title"
-
-class ResConfigSettings(models.TransientModel):
-    _inherit = 'res.config.settings'
-
-    web_window_title = fields.Char('Window Title')
-
-    @api.model
-    def get_values(self):
-        res = super(ResConfigSettings, self).get_values()
-        ir_config = self.env['ir.config_parameter'].sudo()
-        web_window_title = ir_config.get_param(CONFIG_PARAM_WEB_WINDOW_TITLE, default='')
-        res.update(
-            web_window_title=web_window_title
-        )
-        return res
-
-    def set_values(self):
-        super(ResConfigSettings, self).set_values()
-        ir_config = self.env['ir.config_parameter'].sudo()
-        ir_config.set_param(CONFIG_PARAM_WEB_WINDOW_TITLE, self.web_window_title or "")

vista_backend_theme/security/ir.model.access.csv

@@ -1,2 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_theme_data,access.theme.data,model_theme_data,,1,1,1,1

vista_backend_theme/static/description/index.html

@@ -1,444 +0,0 @@
-<!-- HERO SECTION -->
-<div class="contianer">
-  <div class="row position-relative"
-    style="background-color: #2f3542 !important; height: 400px; margin-bottom: 6rem; border-radius: 1rem !important;">
-    <div class="col-lg-12 d-flex flex-column justify-content-start align-items-center">
-      <h1 class="display-1 text-white" style="padding-top: 5rem;">Vista Backend Theme V16</h1>
-      <p class="text-light small font-weight-bold" style="letter-spacing: 2px; text-transform: uppercase;">Multi-Color
-        &amp; Multi-Design Backend Theme for
-        Odoo 16</p>
-    </div>
-    <img src="./images/hero.gif" class="img img-fluid"
-      style="height: auto; width: 525px; top: 45%; left: 0; right: 0; margin-left: auto; margin-right: auto;"
-      height="auto" width="525px">
-  </div>
-</div>
-<!-- END OF HERO SECTION -->
-<!-- SHORT DESCRIPTION -->
-<div class="container">
-  <div class="row my-4">
-    <div class="col-lg-12 d-flex justify-content-center align-items-center">
-      <h6 class="text-muted text-center w-50" style="line-height: 22px;">The app enables a user friendly backend
-        theme for Odoo 16.0 community edition.</h6>
-    </div>
-  </div>
-</div>
-<!-- END OF SHORT DESCRIPTION -->
-<!-- FEATURE ICONS -->
-<div class="container w-50" style="margin: 3rem auto;">
-  <div class="row">
-    <div class="col-lg-4 my-2 d-flex flex-column justify-content-center align-items-center">
-      <div
-        style="height: 100px; width: 100px; border: 8px solid #eaebec; border-radius: 50%; background-color: #e0e1e3; box-shadow: 0px 0px 0px 8px #f3f3f4;"
-        class="d-flex justify-content-center align-items-center">
-        <img height="60px" src="./images/icons/design.png">
-      </div>
-      <h6 class="my-4 text-center">Carefully Crafted</h6>
-    </div>
-
-    <div class="col-lg-4 my-2 d-flex flex-column justify-content-center align-items-center">
-      <div
-        style="height: 100px; width: 100px; border: 8px solid #eaebec; border-radius: 50%; background-color: #e0e1e3; box-shadow: 0px 0px 0px 8px #f3f3f4;"
-        class="d-flex justify-content-center align-items-center">
-        <img height="60px" src="./images/icons/responsive.png">
-      </div>
-      <h6 class="my-4 text-center">Responsive Design</h6>
-    </div>
-
-    <div class="col-lg-4 my-2 d-flex flex-column justify-content-center align-items-center">
-      <div
-        style="height: 100px; width: 100px; border: 8px solid #eaebec; border-radius: 50%; background-color: #e0e1e3; box-shadow: 0px 0px 0px 8px #f3f3f4;"
-        class="d-flex justify-content-center align-items-center">
-        <img height="60px" src="./images/icons/quality.png">
-      </div>
-      <h6 class="my-4 text-center">Quality Checked</h6>
-    </div>
-  </div>
-</div>
-<!-- END OF FEATURE ICONS -->
-
-<!-- ONE COLUMN SECTION-->
-<div class="container" style="margin: 3rem auto;">
-  <div class="row my-4">
-    <div class="col-lg-12 d-flex flex-column justify-content-center align-items-center">
-      <h2 class="text-center mt-3 display-4 text-weight-bold">Kanban View</h2>
-      <p class="text-center lead text-muted mb-4">Kanban view with a clean layout and modified font.</p>
-      <img height="600px" width="auto" src="./images/kanban.png" class="img img-fluid deep-4 rounded">
-    </div>
-  </div>
-</div>
-<!-- END OF ONE COLUMN SECTION-->
-
-<!-- TWO COLUMN SECTION-->
-<div class="container" style="margin: 6rem auto;">
-  <div class="row my-4">
-    <div class="col-lg-6 d-flex flex-column justify-content-center align-items-start">
-      <span class="font-weight-bold" style="letter-spacing: 2px; text-transform: uppercase; color: #444955">Custom
-        Login</span>
-      <h2 class="mt-3">Minimal, Colorful Login Screen</h2>
-      <p class="lead text-muted mb-4">Customized minimal and colorful login screen.</p>
-      <img src="./images/login.png" class="img img-fluid deep-2 rounded">
-    </div>
-
-    <div class="col-lg-6 d-flex flex-column justify-content-center align-items-start">
-      <span class="font-weight-bold" style="letter-spacing: 2px; text-transform: uppercase; color: #444955">Colored UI
-        Elements</span>
-      <h2 class="mt-3">Discuss</h2>
-      <p class="lead text-muted mb-4">Discuss page with a different style.</p>
-      <img src="./images/discuss.png" class="img img-fluid deep-2 rounded">
-    </div>
-
-  </div>
-</div>
-<!-- END OF TWO COLUMN SECTION-->
-
-<!-- RESPONSIVE SECTION-->
-<div class="container" style="margin: 6rem auto;">
-  <div class="row my-4">
-    <div class="col-lg-5 d-flex flex-column justify-content-center align-items-start">
-      <img src="./images/responsive.png" class="img img-fluid deep-2 rounded">
-    </div>
-    <div class="col-lg-7 d-flex flex-column justify-content-center">
-      <span class="font-weight-bold" style="letter-spacing: 2px; text-transform: uppercase; color: #444955">Responsive
-        Layout</span>
-      <h2 class="mt-3">Truly Responsive</h2>
-      <p class="lead text-muted mb-4">Fully responsive layout which enables to view and manage everything from the
-        comfort of your mobile device.</p>
-    </div>
-  </div>
-
-</div>
-<!-- END OF RESPONSIVE SECTION-->
-
-<!-- RESPONSIVE SECTION-->
-<div class="container" style="margin: 6rem auto;">
-  <div class="row my-4">
-    <div class="col-lg-7 d-flex flex-column justify-content-center">
-      <span class="font-weight-bold" style="letter-spacing: 2px; text-transform: uppercase; color: #444955">Responsive
-        Layout</span>
-      <h2 class="mt-3">Modified App Drawer</h2>
-      <p class="lead text-muted mb-4">Modified app drawer which helps to navigate through different applications.</p>
-    </div>
-    <div class="col-lg-5 d-flex flex-column justify-content-center align-items-start">
-      <img src="./images/app_drawer.png" class="img img-fluid deep-2 rounded">
-    </div>
-  </div>
-</div>
-<!-- END OF RESPONSIVE SECTION-->
-
-
-<!-- RESPONSIVE SECTION-->
-<div class="container" style="margin: 6rem auto;">
-  <div class="row my-4">
-    <div class="col-lg-5 d-flex flex-column justify-content-center align-items-start">
-      <img src="./images/custom_date.png" class="img img-fluid deep-2 rounded">
-    </div>
-    <div class="col-lg-7 d-flex flex-column justify-content-center">
-      <span class="font-weight-bold" style="letter-spacing: 2px; text-transform: uppercase; color: #444955">Colored UI
-        Elements</span>
-      <h2 class="mt-3">Custom Date Picker</h2>
-      <p class="lead text-muted mb-4">Customized date picker</p>
-    </div>
-  </div>
-
-</div>
-</div>
-<!-- END OF RESPONSIVE SECTION-->
-
-<!-- TWO COLUMN SECTION-->
-<div class="container" style="margin: 6rem auto;">
-  <div class="row my-4">
-    <div class="col-lg-6 d-flex flex-column justify-content-center align-items-start">
-      <span class="font-weight-bold" style="letter-spacing: 2px; text-transform: uppercase; color: #444955">Colored UI
-        Elements</span>
-      <h2 class="mt-3">Tree View</h2>
-      <p class="lead text-muted mb-4">Tree view with a clean layout and modified font.</p>
-      <img src="./images/tree_view.png" class="img img-fluid deep-2 rounded">
-    </div>
-
-    <div class="col-lg-6 d-flex flex-column justify-content-center align-items-start">
-      <span class="font-weight-bold" style="letter-spacing: 2px; text-transform: uppercase; color: #444955">Colored UI
-        Elements</span>
-      <h2 class="mt-3">Form View</h2>
-      <p class="lead text-muted mb-4">Form view with a clean layout and modified font.</p>
-      <img src="./images/form_view.png" class="img img-fluid deep-2 rounded">
-    </div>
-
-  </div>
-</div>
-<!-- END OF TWO COLUMN SECTION-->
-
-<!-- OUR SERVICES -->
-<section class="container" style="margin-top: 6rem !important;">
-  <div class="row">
-    <div class="col-lg-12 d-flex flex-column justify-content-center align-items-center">
-      <h2 class="text-center"
-        style="font-family: Montserrat, 'sans-serif'; color: #000 !important; font-weight: 800 !important; font-size: 2rem !important; width: 80%;">
-        Our Services</h2>
-      <p class="text-center"
-        style="font-family: Montserrat, 'sans-serif'; color: #1a1a1a !important; font-weight: 300 !important; font-size: 1.3rem !important;">
-        We provide following services</p>
-    </div>
-
-    <div class="col-lg-4 d-flex flex-column justify-content-center align-items-center my-4">
-      <div class="d-flex justify-content-center align-items-center mx-3 my-3"
-        style="background-color: #1dd1a1 !important; border-radius: 15px !important; height: 80px; width: 80px;">
-        <img src="assets/icons/cogs.png" class="img-responsive" height="48px" width="48px">
-      </div>
-      <h6 class="text-center" style="font-family: Montserrat, 'sans-serif' !important; font-weight: bold;">Odoo
-        Customization</h6>
-    </div>
-
-    <div class="col-lg-4 d-flex flex-column justify-content-center align-items-center my-4">
-      <div class="d-flex justify-content-center align-items-center mx-3 my-3"
-        style="background-color: #ff6b6b !important; border-radius: 15px !important; height: 80px; width: 80px;">
-        <img src="assets/icons/wrench.png" class="img-responsive" height="48px" width="48px">
-      </div>
-      <h6 class="text-center" style="font-family: Montserrat, 'sans-serif' !important; font-weight: bold;">Odoo
-        Implementation</h6>
-    </div>
-
-    <div class="col-lg-4 d-flex flex-column justify-content-center align-items-center my-4">
-      <div class="d-flex justify-content-center align-items-center mx-3 my-3"
-        style="background-color: #6462CD !important; border-radius: 15px !important; height: 80px; width: 80px;">
-        <img src="assets/icons/lifebuoy.png" class="img-responsive" height="48px" width="48px">
-      </div>
-      <h6 class="text-center" style="font-family: Montserrat, 'sans-serif' !important; font-weight: bold;">Odoo
-        Support</h6>
-    </div>
-
-
-    <div class="col-lg-4 d-flex flex-column justify-content-center align-items-center my-4">
-      <div class="d-flex justify-content-center align-items-center mx-3 my-3"
-        style="background-color: #ffa801 !important; border-radius: 15px !important; height: 80px; width: 80px;">
-        <img src="assets/icons/user.png" class="img-responsive" height="48px" width="48px">
-      </div>
-      <h6 class="text-center" style="font-family: Montserrat, 'sans-serif' !important; font-weight: bold;">Hire
-        Odoo
-        Developer</h6>
-    </div>
-
-    <div class="col-lg-4 d-flex flex-column justify-content-center align-items-center my-4">
-      <div class="d-flex justify-content-center align-items-center mx-3 my-3"
-        style="background-color: #54a0ff  !important; border-radius: 15px !important; height: 80px; width: 80px;">
-        <img src="assets/icons/puzzle.png" class="img-responsive" height="48px" width="48px">
-      </div>
-      <h6 class="text-center" style="font-family: Montserrat, 'sans-serif' !important; font-weight: bold;">Odoo
-        Integration</h6>
-    </div>
-
-    <div class="col-lg-4 d-flex flex-column justify-content-center align-items-center my-4">
-      <div class="d-flex justify-content-center align-items-center mx-3 my-3"
-        style="background-color: #6d7680 !important; border-radius: 15px !important; height: 80px; width: 80px;">
-        <img src="assets/icons/update.png" class="img-responsive" height="48px" width="48px">
-      </div>
-      <h6 class="text-center" style="font-family: Montserrat, 'sans-serif' !important; font-weight: bold;">Odoo
-        Migration</h6>
-    </div>
-
-
-    <div class="col-lg-4 d-flex flex-column justify-content-center align-items-center my-4">
-      <div class="d-flex justify-content-center align-items-center mx-3 my-3"
-        style="background-color: #786fa6 !important; border-radius: 15px !important; height: 80px; width: 80px;">
-        <img src="assets/icons/consultation.png" class="img-responsive" height="48px" width="48px">
-      </div>
-      <h6 class="text-center" style="font-family: Montserrat, 'sans-serif' !important; font-weight: bold;">Odoo
-        Consultancy</h6>
-    </div>
-
-    <div class="col-lg-4 d-flex flex-column justify-content-center align-items-center my-4">
-      <div class="d-flex justify-content-center align-items-center mx-3 my-3"
-        style="background-color: #f8a5c2 !important; border-radius: 15px !important; height: 80px; width: 80px;">
-        <img src="assets/icons/training.png" class="img-responsive" height="48px" width="48px">
-      </div>
-      <h6 class="text-center" style="font-family: Montserrat, 'sans-serif' !important; font-weight: bold;">Odoo
-        Implementation</h6>
-    </div>
-
-    <div class="col-lg-4 d-flex flex-column justify-content-center align-items-center my-4">
-      <div class="d-flex justify-content-center align-items-center mx-3 my-3"
-        style="background-color: #e6be26 !important; border-radius: 15px !important; height: 80px; width: 80px;">
-        <img src="assets/icons/license.png" class="img-responsive" height="48px" width="48px">
-      </div>
-      <h6 class="text-center" style="font-family: Montserrat, 'sans-serif' !important; font-weight: bold;">Odoo
-        Licensing Consultancy</h6>
-    </div>
-  </div>
-</section>
-<!-- END OF END OF OUR SERVICES -->
-
-<!-- OUR INDUSTRIES -->
-<section class="container" style="margin-top: 6rem !important;">
-  <div class="row">
-    <div class="col-lg-12 d-flex flex-column justify-content-center align-items-center">
-      <h2 class="text-center"
-        style="font-family: Montserrat, 'sans-serif'; color: #000 !important; font-weight: 800 !important; font-size: 2rem !important; width: 80%;">
-        Our Industries</h2>
-      <p class="text-center"
-        style="font-family: Montserrat, 'sans-serif'; color: #1a1a1a !important; font-weight: 300 !important; font-size: 1.3rem !important;">
-        Our industry specifics and process segments to solve your complex business barriers.</p>
-    </div>
-
-    <div class="col-lg-3">
-      <div class="my-4 d-flex flex-column justify-content-center"
-        style="background-color: #f6f8f9 !important; border-radius: 10px; padding: 2rem !important; height: 250px !important;">
-        <img src="./assets/icons/trading-black.png" class="img-responsive mb-3" height="48px" width="48px">
-        <h5 style="color: #000 !important; font-weight: bold;">
-          Trading
-        </h5>
-        <p style="font-size: 0.9rem !important;">Easily procure
-          and
-          sell your products</p>
-      </div>
-    </div>
-
-    <div class="col-lg-3">
-      <div class="my-4 d-flex flex-column justify-content-center"
-        style="background-color: #f6f8f9 !important; border-radius: 10px; padding: 2rem !important; height: 250px !important;">
-        <img src="./assets/icons/pos-black.png" class="img-responsive mb-3" height="48px" width="48px">
-        <h5 style="color: #000 !important; font-weight: bold;">
-          POS
-        </h5>
-        <p style="font-size: 0.9rem !important;">Easy
-          configuration
-          and convivial experience</p>
-      </div>
-    </div>
-
-    <div class="col-lg-3">
-      <div class="my-4 d-flex flex-column justify-content-center"
-        style="background-color: #f6f8f9 !important; border-radius: 10px; padding: 2rem !important; height: 250px !important;">
-        <img src="./assets/icons/education-black.png" class="img-responsive mb-3" height="48px" width="48px">
-        <h5 style="color: #000 !important; font-weight: bold;">
-          Education
-        </h5>
-        <p style="font-size: 0.9rem !important;">A platform for
-          educational management</p>
-      </div>
-    </div>
-
-    <div class="col-lg-3">
-      <div class="my-4 d-flex flex-column justify-content-center"
-        style="background-color: #f6f8f9 !important; border-radius: 10px; padding: 2rem !important; height: 250px !important;">
-        <img src="./assets/icons/manufacturing-black.png" class="img-responsive mb-3" height="48px" width="48px">
-        <h5 style="color: #000 !important; font-weight: bold;">
-          Manufacturing
-        </h5>
-        <p style="font-size: 0.9rem !important;">Plan, track and
-          schedule your operations</p>
-      </div>
-    </div>
-
-    <div class="col-lg-3">
-      <div class="my-4 d-flex flex-column justify-content-center"
-        style="background-color: #f6f8f9 !important; border-radius: 10px; padding: 2rem !important; height: 250px !important;">
-        <img src="./assets/icons/ecom-black.png" class="img-responsive mb-3" height="48px" width="48px">
-        <h5 style="color: #000 !important; font-weight: bold;">
-          E-commerce &amp; Website
-        </h5>
-        <p style="font-size: 0.9rem !important;">Mobile
-          friendly,
-          awe-inspiring product pages</p>
-      </div>
-    </div>
-
-    <div class="col-lg-3">
-      <div class="my-4 d-flex flex-column justify-content-center"
-        style="background-color: #f6f8f9 !important; border-radius: 10px; padding: 2rem !important; height: 250px !important;">
-        <img src="./assets/icons/service-black.png" class="img-responsive mb-3" height="48px" width="48px">
-        <h5 style="color: #000 !important; font-weight: bold;">
-          Service Management
-        </h5>
-        <p style="font-size: 0.9rem !important;">Keep track of
-          services and invoice</p>
-      </div>
-    </div>
-
-    <div class="col-lg-3">
-      <div class="my-4 d-flex flex-column justify-content-center"
-        style="background-color: #f6f8f9 !important; border-radius: 10px; padding: 2rem !important; height: 250px !important;">
-        <img src="./assets/icons/restaurant-black.png" class="img-responsive mb-3" height="48px" width="48px">
-        <h5 style="color: #000 !important; font-weight: bold;">
-          Restaurant
-        </h5>
-        <p style="font-size: 0.9rem !important;">Run your bar or
-          restaurant methodically</p>
-      </div>
-    </div>
-
-    <div class="col-lg-3">
-      <div class="my-4 d-flex flex-column justify-content-center"
-        style="background-color: #f6f8f9 !important; border-radius: 10px; padding: 2rem !important; height: 250px !important;">
-        <img src="./assets/icons/hotel-black.png" class="img-responsive mb-3" height="48px" width="48px">
-        <h5 style="color: #000 !important; font-weight: bold;">
-          Hotel Management
-        </h5>
-        <p style="font-size: 0.9rem !important;">An
-          all-inclusive
-          hotel management application</p>
-      </div>
-    </div>
-
-  </div>
-</section>
-
-<!-- END OF END OF OUR INDUSTRIES -->
-
-<!-- FOOTER -->
-<!-- Footer Section -->
-<section class="container" style="margin: 5rem auto 2rem;">
-  <div class="row" style="max-width:1540px;">
-    <div class="col-lg-12 d-flex flex-column justify-content-center align-items-center">
-      <h2 class="text-center"
-        style="color: #000 !important; font-weight: 800 !important; font-size: 2rem !important; width: 80%;">
-        Need Help?</h2>
-      <p class="text-center"
-        style="color: #1a1a1a !important; font-weight: 300 !important; font-size: 1.3rem !important;">
-        Do you have any queries regarding our products &amp; services? Let us know.</p>
-    </div>
-  </div>
-
-  <!-- Contact Cards -->
-  <div class="row d-flex justify-content-center align-items-center" style="max-width:1540px; margin: 0 auto 2rem auto;">
-
-    <div class="col-lg-12" style="padding: 0rem 3rem 2rem; border-radius: 10px; margin-right: 3rem; ">
-
-      <div class="row mt-4">
-        <div class="col-lg-4">
-          <a href="mailto:odoo@cybrosys.com" target="_blank" class="btn btn-block mb-2 deep_hover"
-            style="text-decoration: none;  background-color: #4d4d4d; color: #FFF;  border-radius: 4px;"><i
-              class="fa fa-envelope mr-2"></i>odoo@cybrosys.com</a>
-        </div>
-        <div class="col-lg-4">
-          <a href="https://api.whatsapp.com/send?phone=918606827707" target="_blank"
-            class="btn btn-block mb-2 deep_hover"
-            style="text-decoration: none;  background-color: #25D366; color: #FFF;  border-radius: 4px;"><i
-              class="fa fa-whatsapp mr-2"></i>WhatsApp</a>
-        </div>
-        <div class="col-lg-4">
-          <a href="skype:cybrosystechnologies?chat" target="_blank" class="btn btn-block deep_hover"
-            style="text-decoration: none; background-color: #4d4d4d; color: #FFF;  border-radius: 4px;"><i
-              class="fa fa-envelope mr-2"></i>cybrosystechnologies</a>
-        </div>
-      </div>
-    </div>
-
-  </div>
-  <!-- End of Contact Cards -->
-</section>
-<!-- Footer -->
-<section class="oe_container" style="padding: 2rem 3rem 1rem;">
-  <div class="row" style="max-width:1540px; margin: 0 auto; margin-right: 3rem; ">
-    <!-- Logo -->
-    <div class="col-lg-12 d-flex justify-content-center align-items-center" style="margin-top: 3rem;">
-      <img src="https://www.cybrosys.com/images/logo.png" width="200px" height="auto" />
-    </div>
-    <!-- End of Logo -->
-    <div class="col-lg-12">
-      <hr
-        style="margin-top: 3rem;background: linear-gradient(90deg, rgba(2,0,36,0) 0%, rgba(229,229,229,1) 33%, rgba(229,229,229,1) 58%, rgba(0,212,255,0) 100%); height: 2px; border-style: none;">
-      <!-- End of Footer Section -->
-    </div>
-  </div>
-
-  <!-- END OF FOOTER -->