diff --git a/room/models/room_booking.py b/room/models/room_booking.py index d6feb6d38..a166448e4 100644 --- a/room/models/room_booking.py +++ b/room/models/room_booking.py @@ -63,7 +63,7 @@ class RoomBooking(models.Model): # odoo发通知 def meeting_sign_in(self): # todo 需要写一个页面填写信息之后返回给地址 - code_url = "" # 制作填写表单的地址 + code_url = "https://pengyuthon.com/contactus" # 制作填写表单的地址 qrcode_url = qrcode.make(code_url) buffer = BytesIO() qrcode_url.save(buffer, format='PNG') @@ -134,7 +134,7 @@ class RoomBooking(models.Model): kwargs={ "location": record.room_id.name, "invitees": { - "userid": record.room_users_ids.oauth_uid + "userid": [r.oauth_uid for r in record.room_users_ids] }, } ) @@ -148,10 +148,10 @@ class RoomBooking(models.Model): kwargs={ "title": title, "meeting_start": meeting_start, - "meeting_duration" :meeting_duration, + "meeting_duration":meeting_duration, "location": record.room_id.name, "invitees": { - "userid": record.room_users_ids.oauth_uid + "userid": [r.oauth_uid for r in record.room_users_ids] }, } ) diff --git a/room/wizard/room_booking_sign_wizard.xml b/room/wizard/room_booking_sign_wizard.xml index d4e98be2c..ef109fafd 100644 --- a/room/wizard/room_booking_sign_wizard.xml +++ b/room/wizard/room_booking_sign_wizard.xml @@ -6,7 +6,7 @@
- +
diff --git a/yuthon_issue/__manifest__.py b/yuthon_issue/__manifest__.py index fa7cae1dd..2ac78637e 100644 --- a/yuthon_issue/__manifest__.py +++ b/yuthon_issue/__manifest__.py @@ -20,6 +20,7 @@ 'views/issue_approval_class_views.xml', 'views/issue_approval_boss_views.xml', 'views/inherit_room_booking_views.xml', + 'views/menus.xml', ], 'installable': True, 'application': True, diff --git a/yuthon_issue/models/issue_library.py b/yuthon_issue/models/issue_library.py index dfdbe0105..69dece85a 100644 --- a/yuthon_issue/models/issue_library.py +++ b/yuthon_issue/models/issue_library.py @@ -15,8 +15,14 @@ class IssueLibrary(models.Model): statu = fields.Selection([('draft', '草稿'), ('approval', '审批中'), ('done', '已通过'), ('stop', '已拒绝'), ('will', '待上会'), ('on_meet', '已上会'), ('cancel', '已取消')], default='draft', string="议题状态") is_party = fields.Boolean(string="党之委会") + is_party_pass = fields.Boolean(string="通过") + is_party_note = fields.Text(string="不通过意见") is_class = fields.Boolean(string="班子会") + is_class_pass = fields.Boolean(string="通过") + is_class_note = fields.Text(string="不通过意见") is_boss = fields.Boolean(string="董事会") + is_boss_pass = fields.Boolean(string="通过") + is_boss_note = fields.Text(string="不通过意见") is_note = fields.Boolean(string="备案、核准") creart_datetime = fields.Datetime(string="创建时间", default=fields.Datetime.now) notice_documents_ids = fields.Many2many('documents.document', string="议题管理文件") diff --git a/yuthon_issue/security/ir.model.access.csv b/yuthon_issue/security/ir.model.access.csv index a2fc9712b..d1f18eba3 100644 --- a/yuthon_issue/security/ir.model.access.csv +++ b/yuthon_issue/security/ir.model.access.csv @@ -1,3 +1,6 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_issue_library,issue_library,model_issue_library,base.group_user,1,1,1,1 +access_issue_approval_boss,issue_approval_boss,model_issue_approval_boss,base.group_user,1,1,1,1 +access_issue_approval_class,issue_approval_class,model_issue_approval_class,base.group_user,1,1,1,1 +access_issue_approval_party,issue_approval_party,model_issue_approval_party,base.group_user,1,1,1,1 diff --git a/yuthon_issue/views/issue_approval_boss_views.xml b/yuthon_issue/views/issue_approval_boss_views.xml index be06b77ce..8507b392e 100644 --- a/yuthon_issue/views/issue_approval_boss_views.xml +++ b/yuthon_issue/views/issue_approval_boss_views.xml @@ -63,13 +63,7 @@ 董事会议题审批 issue.approval.boss tree,form - - + \ No newline at end of file diff --git a/yuthon_issue/views/issue_approval_class_views.xml b/yuthon_issue/views/issue_approval_class_views.xml index 5487e05c5..4cfb88eea 100644 --- a/yuthon_issue/views/issue_approval_class_views.xml +++ b/yuthon_issue/views/issue_approval_class_views.xml @@ -63,13 +63,7 @@ 领导班子议题审批 issue.approval.class tree,form - - + \ No newline at end of file diff --git a/yuthon_issue/views/issue_approval_party_views.xml b/yuthon_issue/views/issue_approval_party_views.xml index c8d7af591..78ffd365e 100644 --- a/yuthon_issue/views/issue_approval_party_views.xml +++ b/yuthon_issue/views/issue_approval_party_views.xml @@ -66,10 +66,5 @@ - + \ No newline at end of file diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml index cf0583fe1..f889ecf14 100644 --- a/yuthon_issue/views/issue_library_views.xml +++ b/yuthon_issue/views/issue_library_views.xml @@ -11,8 +11,11 @@ + + + @@ -40,11 +43,17 @@ + + + + + + @@ -75,21 +84,32 @@ - - - - 待上会 - issue.library - tree,form - + 议题库 + issue.library + tree,form + + + 待上会 + issue.library + tree,form + [('statu','=','will')] + + + 已上会 + issue.library + tree,form + [('statu','=','on_meet')] + + + issue.library.tree issue.library @@ -152,45 +172,34 @@ - - issue.library.search - issue.library - - - - - - - - - - - - - - - 已上会 + 议题库 issue.library tree,form - {'search_default_group_by_statu': 'on_meet'} - - + + 待上会 issue.library tree,form [('statu','=','will')] + - + + 已上会 issue.library tree,form [('statu','=','on_meet')] + @@ -200,72 +209,4 @@ code action = model.all_meeting_issue() - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/yuthon_issue/views/issue_type_views.xml b/yuthon_issue/views/issue_type_views.xml index 830a75533..69ad8c9a1 100644 --- a/yuthon_issue/views/issue_type_views.xml +++ b/yuthon_issue/views/issue_type_views.xml @@ -17,10 +17,10 @@ tree - + + + + + + \ No newline at end of file diff --git a/yuthon_issue/views/menus.xml b/yuthon_issue/views/menus.xml new file mode 100644 index 000000000..eca8b842a --- /dev/null +++ b/yuthon_issue/views/menus.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/yuthon_res_partner/__init__.py b/yuthon_res_partner/__init__.py deleted file mode 100644 index cde864bae..000000000 --- a/yuthon_res_partner/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -# -*- coding: utf-8 -*- - -from . import models diff --git a/yuthon_res_partner/__manifest__.py b/yuthon_res_partner/__manifest__.py deleted file mode 100644 index 9800f7161..000000000 --- a/yuthon_res_partner/__manifest__.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -{ - 'name': "Yuthon Res Partner", - 'summary': "联系人承租方", - 'description': """ - - """, - 'author': 'pengyuthon', - 'website': 'https://www.pengyuthon.com', - 'category': 'Human Resources/Attendances', - 'version': '0.1', - 'license': 'LGPL-3', - 'depends': ['base', 'account', 'contacts'], - 'data': [ - 'security/ir.model.access.csv', - 'views/yuthon_res_partner_views.xml', - 'views/contacts_inherit_menu_views.xml', - ], - 'installable': True, - 'application': True, -} - diff --git a/yuthon_res_partner/models/__init__.py b/yuthon_res_partner/models/__init__.py deleted file mode 100644 index c005a0071..000000000 --- a/yuthon_res_partner/models/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -# -*- coding: utf-8 -*- - -from . import yuthon_res_partner diff --git a/yuthon_res_partner/security/ir.model.access.csv b/yuthon_res_partner/security/ir.model.access.csv deleted file mode 100644 index d7595f820..000000000 --- a/yuthon_res_partner/security/ir.model.access.csv +++ /dev/null @@ -1,4 +0,0 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink - - - diff --git a/yuthon_res_partner/static/description/icon.svg b/yuthon_res_partner/static/description/icon.svg deleted file mode 100644 index 21ce0f24e..000000000 --- a/yuthon_res_partner/static/description/icon.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/yuthon_sale_renting/__manifest__.py b/yuthon_sale_renting/__manifest__.py index 23ba12ad3..ba30b1dc5 100644 --- a/yuthon_sale_renting/__manifest__.py +++ b/yuthon_sale_renting/__manifest__.py @@ -10,10 +10,12 @@ 'category': 'Human Resources/Attendances', 'version': '0.1', 'license': 'LGPL-3', - 'depends': ['sale_renting', 'mail', 'documents', 'soong_workflow'], + 'depends': ['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/property_assess_views.xml', 'views/property_confirm_views.xml', 'views/property_move_views.xml', diff --git a/yuthon_sale_renting/models/__init__.py b/yuthon_sale_renting/models/__init__.py index 8a812b92d..87362a99a 100644 --- a/yuthon_sale_renting/models/__init__.py +++ b/yuthon_sale_renting/models/__init__.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +from . import yuthon_res_partner from . import yuthon_product_template from . import property_assess from . import property_confirm diff --git a/yuthon_res_partner/models/yuthon_res_partner.py b/yuthon_sale_renting/models/yuthon_res_partner.py similarity index 100% rename from yuthon_res_partner/models/yuthon_res_partner.py rename to yuthon_sale_renting/models/yuthon_res_partner.py diff --git a/yuthon_res_partner/views/contacts_inherit_menu_views.xml b/yuthon_sale_renting/views/contacts_inherit_menu_views.xml similarity index 100% rename from yuthon_res_partner/views/contacts_inherit_menu_views.xml rename to yuthon_sale_renting/views/contacts_inherit_menu_views.xml diff --git a/yuthon_res_partner/views/yuthon_res_partner_views.xml b/yuthon_sale_renting/views/yuthon_res_partner_views.xml similarity index 100% rename from yuthon_res_partner/views/yuthon_res_partner_views.xml rename to yuthon_sale_renting/views/yuthon_res_partner_views.xml diff --git a/序列号生成器/序列号.py b/序列号生成器/序列号.py index 1fff5b110..132a85d8a 100644 --- a/序列号生成器/序列号.py +++ b/序列号生成器/序列号.py @@ -39,7 +39,7 @@ def rsaDecrypt(str1): return con -str1 = rsaEncrypt("base#2099-04-18 23:59:59") +str1 = rsaEncrypt("base#2030-04-18 23:59:59") print("加密后密文：\n%s" % str1) # content = rsaDecrypt('16E01254F15E539CF5B734A9A6FB3649640709796F06F5167CB5BFE542210596CE920CBFDB5E22E863983682DC326C421EF896A9D8E2CAC6B9226E89F502FDD7') # print("解密后明文：\n%s" % content)