合并分支 'dongjie0423' 到 'master'

销售模块菜单调整，crm模块增加报价单菜单，供应商账单打印金额取到期金额

查看合并请求 !2

acct_account/report/purchase_invoice_report.py

@@ -88,7 +88,8 @@ class AccPurchaseInvoice(models.AbstractModel):
                     'note_str':note_str,
                     'bank_str':bank_str,
                     'invoice_str':invoice_str,
-                    'today':today
+                    'today':today,
+                    'residual':invoice_model.residual
             }
         else:
             po_names = ''
@@ -118,7 +119,8 @@ class AccPurchaseInvoice(models.AbstractModel):
                     'note_str':note_str,
                     'bank_str':bank_str,
                     'invoice_str':invoice_str,
-                    'today':today
+                    'today':today,
+                    'residual':invoice_model.residual
             }
         return res
 

acct_account/report/purchase_invoice_report_views.xml

@@ -104,7 +104,7 @@
                                     金额
                                 </td>
                                 <td class="text-center">
-                                    <span t-esc="final_datas.get('amount_total', '')" t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
+                                    <span t-esc="final_datas.get('residual', '')" t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
                                     <!-- <span t-esc="total.get('upper_amount', '')"/> -->
                                 </td>
                             </tr>

acct_base/views/res_groups.xml

@@ -67,6 +67,10 @@
         <record id="sale.report_sales_team" model="ir.ui.menu">  
             <field name="groups_id" eval="[(6, 0, [ref('wb_less_important')])]"/>   
         </record>
+        <!-- 屏蔽销售中的订单菜单 -->
+        <record id="sale.menu_sale_order" model="ir.ui.menu">  
+            <field name="groups_id" eval="[(6, 0, [ref('wb_less_important')])]"/>   
+        </record>
         <!-- 屏蔽主菜单中的日历 -->
         <record id="calendar.mail_menu_calendar" model="ir.ui.menu">  
             <field name="groups_id" eval="[(6, 0, [ref('wb_less_important')])]"/>   

acct_sale/models/acc_crm_lead.py

@@ -135,10 +135,13 @@ class AccCrmLead(models.Model):
         ret = re.match(r"^1[35678]\d{9}$", contact_mobile)
         if not ret:
             raise ValidationError('销售员手机号填写格式不正确！')
+        _logger.debug('===========%s==%s=%s============',topic,partner_name,contact_name)
         if create:
-            text = 'erp系统商机新建提醒,商机' + '“' + topic + '”' + ',关联客户' +'“' + partner_name + '”' + '销售员' + '“' + contact_name + '”'
+            # text = 'erp系统商机新建提醒,商机' + '“' + topic + '”' + ',关联客户' +'“' + partner_name + '”' + '销售员' + '“' + contact_name + '”'
+            text = 'erp系统商机新建提醒,商机' + '“' + topic + '”' + '销售员' + '“' + contact_name + '”'
         else:
-            text = 'erp系统商机更新提醒,商机' + '“' + topic + '”' + ',关联客户' +'“' + partner_name + '”' + '销售员已变更为' + '“' + contact_name + '”'
+            # text = 'erp系统商机更新提醒,商机' + '“' + topic + '”' + ',关联客户' +'“' + partner_name + '”' + '销售员已变更为' + '“' + contact_name + '”'
+            text = 'erp系统商机更新提醒,商机' + '“' + topic + '”' + '销售员已变更为' + '“' + contact_name + '”'
         vals = {
                 'topic':topic,
                 'user_name':contact_name,

acct_sale/views/acc_crm_lead_view.xml

@@ -26,6 +26,11 @@
             </field>
         </record>
 
+        <menuitem id="menu_zhijing_acc_sale_quotation"
+                action="action_acc_quotation1"
+                parent="crm.crm_menu_sales"
+                sequence="9" name="报价单" groups="acct_base.unovo_it_operation_group"/>
+
         <menuitem id="acc_crm_my_partner"
             name="我的客户"
             parent="crm.crm_menu_sales"

acct_sale/views/acc_sale_view.xml

@@ -218,7 +218,7 @@
         </record> -->
 
         <record id="action_acc_manager_order" model="ir.actions.act_window">
-            <field name="name">待确认销售单</field>
+            <field name="name">待提交销售订单</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order</field>
             <field name="view_mode">tree,kanban,form,calendar,pivot,graph,activity</field>
@@ -235,7 +235,7 @@
         <menuitem id="menu_acc_manager_sale_order"
                 action="action_acc_manager_order"
                 parent="sale.sale_order_menu"
-                sequence="0" name="待确认销售单"/>
+                sequence="0" name="待提交销售订单"/>
 
         <!-- <record id="action_acc_certain_order" model="ir.actions.act_window">
             <field name="name">已确认销售单</field>
@@ -250,7 +250,7 @@
                 parent="sale.sale_order_menu"
                 sequence="0" name="已确认销售单"/> -->
         <record id="action_acc_change_sale_order" model="ir.actions.act_window">
-            <field name="name">需变更销售单</field>
+            <field name="name">需变更销售订单</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order</field>
             <field name="view_mode">tree,kanban,form,calendar,pivot,graph,activity</field>
@@ -260,10 +260,10 @@
         <menuitem id="menu_acc_change_sale_order"
                 action="action_acc_change_sale_order"
                 parent="sale.sale_order_menu"
-                sequence="5" name="需变更销售单"/>
+                sequence="5" name="需变更销售订单"/>
 
         <record id="action_acc_confirm_order" model="ir.actions.act_window">
-            <field name="name">已提交销售单</field>
+            <field name="name">待确认销售订单</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order</field>
             <field name="view_mode">tree,kanban,form,calendar,pivot,graph,activity</field>
@@ -273,19 +273,20 @@
         <menuitem id="menu_acc_confirm_sale_order"
                 action="action_acc_confirm_order"
                 parent="sale.sale_order_menu"
-                sequence="1" name="已提交销售单"/>
+                sequence="1" name="待确认销售订单"/>
 
         <record id="action_acc_all_order" model="ir.actions.act_window">
-            <field name="name">所有销售单</field>
+            <field name="name">已完成销售订单</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order</field>
             <field name="view_mode">tree,kanban,form,calendar,pivot,graph,activity</field>
+            <field name="domain">[('state','=','sale')]</field>
         </record>
 
         <menuitem id="menu_acc_all_sale_order"
                 action="action_acc_all_order"
                 parent="sale.sale_order_menu"
-                sequence="1" name="所有销售单"/>
+                sequence="4" name="已完成销售订单"/>
 
         <!-- <menuitem id="menu_acc_sale_quotations"
                 action="action_acc_quotations"
@@ -305,7 +306,7 @@
                         <!-- <button name="draft_sent" states="sent" string="设为草稿" type="object"/> -->
                         <button name="certain" states="draft,sent" string="确认报价单" type="object"/>
                         <button name="cancel_draft" states="cancel" string="设为草稿" type="object"/>
-                        <button name="sent" confirm='是否发送报价短信给客户!' states="draft" string="发送" type="object"/>
+                        <button name="sent" confirm='是否发送报价短信给客户!' states="draft" string="短信通知客户" type="object"/>
                         <button name="cancel" confirm='是否取消报价单!' states="sent" string="取消" type="object"/>
                         <!-- <button name='make_acccode' type='object' string='test'/> -->
                         <field name="state" widget="statusbar" statusbar_visible="draft,sent,done,cancel" statusbar_colors='{"draft":"red"}'/>
@@ -467,10 +468,10 @@
                 parent="sale.sale_order_menu"
                 sequence="1" name="所有销售单" groups="sales_team.group_sale_salesman"/> -->
 
-        <menuitem id="menu_crm_acc_sale_quotations"
+        <!-- <menuitem id="menu_crm_acc_sale_quotations"
                 action="action_acc_quotations"
                 parent="crm.crm_menu_sales"
-                sequence="1" name="报价单" groups="sales_team.group_sale_salesman"/>
+                sequence="1" name="报价单" groups="sales_team.group_sale_salesman"/> -->
 
         <menuitem id="menu_zhijing_acc_sale_quotation"
                 action="action_acc_quotation1"