pengyuthon
This commit is contained in:
李鹏宇
@@ -5,4 +5,16 @@ from odoo import api, fields, models, _
|
||||
class SoongNote(models.Model):
|
||||
_name = 'soong.note'
|
||||
|
||||
name = fields.Char(string="常用审批意见")
|
||||
name = fields.Char(string="审批意见")
|
||||
|
||||
|
||||
class SoongRetuenNote(models.Model):
|
||||
_name = 'soong.return.note'
|
||||
|
||||
name = fields.Char(string="退回意见")
|
||||
|
||||
|
||||
class SoongReturntType(models.Model):
|
||||
_name = 'soong.return.type'
|
||||
|
||||
name = fields.Char(string="退回类型")
|
||||
|
||||
@@ -45,9 +45,10 @@ class SoongWorkflow(models.Model):
|
||||
remove_default_attrs_mod = fields.Boolean(string="Remove Default Attributes & Modifiers", default=True,
|
||||
help="This option will remove default attributes set on fields & buttons of current model view in order to customized all attributes depending on your needs\nAttributes like: [required, readonly, invisible].")
|
||||
current_stage_highlight_color = fields.Char(default="rgb(0, 255, 255)", help="The color to highlight the current stage on flow",)
|
||||
start_time = fields.Datetime(string="Start Time", copy=False)
|
||||
end_time = fields.Datetime(string="End Time", copy=False)
|
||||
is_enable = fields.Boolean(string="Enable", default="False", compute="compute_is_enable", store=True)
|
||||
|
||||
start_time = fields.Datetime(string="生效日期", copy=False)
|
||||
end_time = fields.Datetime(string="结束日期", copy=False)
|
||||
is_enable = fields.Boolean(string="是否启用", default="False", compute="compute_is_enable", store=True)
|
||||
|
||||
def copy(self, default=None):
|
||||
workflow_id = self.search([('model_id', '=', self.model_id.id)])
|
||||
|
||||
@@ -18,5 +18,7 @@ access_soong_workflow_record_user,soong_workflow_record_user,model_soong_workflo
|
||||
access_soong_user_role,soong_user_role,model_soong_user_role,soong_workflow.group_soong_workflow_user,1,1,1,1
|
||||
access_soong_approval_users,soong_approval_users,model_soong_approval_users,soong_workflow.group_soong_workflow_user,1,1,1,1
|
||||
access_soong_note,soong_note,model_soong_note,soong_workflow.group_soong_workflow_user,1,1,1,1
|
||||
access_soong_return_note,soong_return_note,model_soong_return_note,soong_workflow.group_soong_workflow_user,1,1,1,1
|
||||
access_soong_return_type,soong_return_type,model_soong_return_type,soong_workflow.group_soong_workflow_user,1,1,1,1
|
||||
|
||||
access_soong_approval_notice_wizard,soong_approval_notice_wizard,model_soong_approval_notice_wizard,base.group_user,1,1,1,1
|
||||
|
||||
|
@@ -17,10 +17,60 @@
|
||||
<field name="view_mode">tree</field>
|
||||
</record>
|
||||
|
||||
<menuitem id="menu_soong_note_action"
|
||||
<record id="soong_return_type_tree" model="ir.ui.view">
|
||||
<field name="name">soong.return.type.tree</field>
|
||||
<field name="model">soong.return.type</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree editable="bottom">
|
||||
<field name="name"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="soong_return_type_action" model="ir.actions.act_window">
|
||||
<field name="name">退回类型配置</field>
|
||||
<field name="res_model">soong.return.type</field>
|
||||
<field name="view_mode">tree</field>
|
||||
</record>
|
||||
|
||||
<record id="soong_return_note_tree" model="ir.ui.view">
|
||||
<field name="name">soong.return.note.tree</field>
|
||||
<field name="model">soong.return.note</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree editable="bottom">
|
||||
<field name="name"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="soong_return_note_action" model="ir.actions.act_window">
|
||||
<field name="name">退回意见配置</field>
|
||||
<field name="res_model">soong.return.note</field>
|
||||
<field name="view_mode">tree</field>
|
||||
</record>
|
||||
|
||||
<menuitem id="menu_soong_other_setting"
|
||||
sequence="3"
|
||||
name="常用审批意见"
|
||||
name="其他配置"
|
||||
parent="menu_soong_workflow_root"
|
||||
action="soong_note_action"/>
|
||||
|
||||
<menuitem id="menu_soong_approval_note"
|
||||
sequence="3"
|
||||
name="常用审批意见"
|
||||
parent="menu_soong_other_setting"
|
||||
action="soong_note_action"/>
|
||||
|
||||
<menuitem id="menu_soong_return_note_type"
|
||||
sequence="5"
|
||||
name="退回类型配置"
|
||||
parent="menu_soong_other_setting"
|
||||
action="soong_return_type_action"/>
|
||||
|
||||
<menuitem id="menu_soong_return_note"
|
||||
sequence="8"
|
||||
name="退回意见配置"
|
||||
parent="menu_soong_other_setting"
|
||||
action="soong_return_note_action"/>
|
||||
</data>
|
||||
</odoo>
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
'views/contract_menu_views.xml',
|
||||
'views/inherit_hr_contract_views.xml',
|
||||
'views/inherit_sale_order_views.xml',
|
||||
'views/inherit_res_partner.xml',
|
||||
# 'views/inherit_res_partner.xml',
|
||||
],
|
||||
'installable': True,
|
||||
'application': True,
|
||||
|
||||
@@ -65,8 +65,7 @@ class BusController(Controller):
|
||||
# validity_period = datetime.strptime(data.get('validity_period'), '%Y-%m-%d').date()
|
||||
employee_id = request.env(user=SUPERUSER_ID)["hr.employee"].search([('name', '=', user_name)])
|
||||
attendance_iot = request.env(user=SUPERUSER_ID)["attendance.iot.manager"]
|
||||
if not attendance_iot.search(
|
||||
[('employee_id', '=', employee_id.id), ('attendance_number', '=', data.get('sn'))]):
|
||||
if not attendance_iot.search([('employee_id', '=', employee_id.id), ('attendance_number', '=', data.get('sn'))]):
|
||||
employee_id.write({
|
||||
'image_1920': data.get('photo'),
|
||||
})
|
||||
|
||||
@@ -10,12 +10,12 @@
|
||||
'category': 'Human Resources/Attendances',
|
||||
'version': '0.1',
|
||||
'license': 'LGPL-3',
|
||||
'depends': ['sale_renting', 'mail', 'documents', 'soong_workflow', 'contacts'],
|
||||
'depends': ['base', 'sale_renting', 'mail', 'documents', 'soong_workflow', 'contacts'],
|
||||
'data': [
|
||||
'data/sale_renting_code_data.xml',
|
||||
'security/ir.model.access.csv',
|
||||
'views/contacts_inherit_menu_views.xml',
|
||||
'views/yuthon_res_partner_views.xml',
|
||||
'views/contacts_inherit_menu_views.xml',
|
||||
'views/property_assess_views.xml',
|
||||
'views/property_confirm_views.xml',
|
||||
'views/property_move_views.xml',
|
||||
@@ -27,4 +27,3 @@
|
||||
'installable': True,
|
||||
'application': True,
|
||||
}
|
||||
|
||||
|
||||
@@ -38,6 +38,7 @@
|
||||
action="action_employee"
|
||||
parent="contacts.res_partner_menu_contacts"
|
||||
sequence="3"/>
|
||||
|
||||
<menuitem id="res_partner_menu_tenant"
|
||||
name="承租方"
|
||||
action="action_tenant"
|
||||
|
||||
@@ -21,29 +21,6 @@
|
||||
<field name="property_start_date"/>
|
||||
<field name="property_end_date"/>
|
||||
</xpath>
|
||||
<xpath expr="//page[@name='general_information']" position="after">
|
||||
<page string="评估信息" name="pinggu">
|
||||
|
||||
</page>
|
||||
<page string="租赁合同" name="hetong">
|
||||
|
||||
</page>
|
||||
<page string="安全生产" name="anquan">
|
||||
|
||||
</page>
|
||||
<page string="附件" name="fujian">
|
||||
|
||||
</page>
|
||||
<page string="产权变更" name="chanquan">
|
||||
|
||||
</page>
|
||||
<page string="管理变更" name="guanli">
|
||||
|
||||
</page>
|
||||
<page string="拆分合并" name="">
|
||||
|
||||
</page>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
</odoo>
|
||||
@@ -27,7 +27,7 @@
|
||||
<field name="name">yuthon.res.partner.views.tree</field>
|
||||
<field name="model">res.partner</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="承租方" sample="1" multi_edit="1">
|
||||
<tree string="承租方">
|
||||
<field name="name"/>
|
||||
<field name="partner_type2"/>
|
||||
<field name="juridical_person"/>
|
||||
|
||||
Reference in New Issue
Block a user