待确认询价单按bom分开，报价单权限修改

acct_base/models/acc_tools.py

@@ -40,7 +40,8 @@ class AccTools(models.Model):
         toaddrs = toaddrs
         toaddrs = toaddrs
         # subject = "最新消息"
         # subject = "最新消息"
         subject = subjects
         subject = subjects
-        password = "Acc@0113"
+        # password = "Acc@0113"
+        password = "Acc@011"
         # msg = "测试"
         # msg = "测试"
         msg = message
         msg = message
         mail_msg = MIMEMultipart()
         mail_msg = MIMEMultipart()

acct_purchase/models/before_purchase.py

@@ -35,6 +35,7 @@ class BeforePurchase(models.Model):
     purchase_order_ids = fields.Many2many('purchase.order','before_purchase_rel','before_id','purchase_id',string='关联采购单',readonly=True)
     purchase_order_ids = fields.Many2many('purchase.order','before_purchase_rel','before_id','purchase_id',string='关联采购单',readonly=True)
     purchase_company = fields.Many2one('acc.company',string='采购公司',required=True)
     purchase_company = fields.Many2one('acc.company',string='采购公司',required=True)
     delivery_address = fields.Many2one('delivery.address',string='交货地址')
     delivery_address = fields.Many2one('delivery.address',string='交货地址')
+    mrp_bom_id = fields.Many2one('mrp.bom',string='关联BOM',readonly=True)
     state = fields.Selection([('draft', '待确认'), ('done', '已确认'),('cancel', '已取消')], '状态', default='draft',track_visibility='onchange')
     state = fields.Selection([('draft', '待确认'), ('done', '已确认'),('cancel', '已取消')], '状态', default='draft',track_visibility='onchange')
     order_line = fields.One2many('before.purchase.line', 'order_id', 'Order Lines')
     order_line = fields.One2many('before.purchase.line', 'order_id', 'Order Lines')
     recreate_line = fields.One2many('recreate.purchase.line', 'before_id', 'recreate Lines')
     recreate_line = fields.One2many('recreate.purchase.line', 'before_id', 'recreate Lines')

acct_purchase/views/before_purchase_view.xml

@@ -34,6 +34,7 @@
                                 <field name="gen_datetime" readonly="1"/>
                                 <field name="gen_datetime" readonly="1"/>
                                 <field name="charge_person"/>
                                 <field name="charge_person"/>
                                 <field name="purchase_company"/>
                                 <field name="purchase_company"/>
+                                <field name="mrp_bom_id"/>
                             </group>
                             </group>
                         </group>
                         </group>
                         <notebook colspan="4">
                         <notebook colspan="4">
@@ -101,6 +102,7 @@
                     <field name="name"/>
                     <field name="name"/>
                     <field name="sale_order_id"/>
                     <field name="sale_order_id"/>
                     <field name="demand_purchase_id"/>
                     <field name="demand_purchase_id"/>
+                    <field name="mrp_bom_id"/>
                     <field name="charge_person"/>
                     <field name="charge_person"/>
                     <field name="gen_datetime"/>
                     <field name="gen_datetime"/>
                     <field name="is_excipients"/>
                     <field name="is_excipients"/>
@@ -138,6 +140,7 @@
                 <field name="sale_order_id"/>
                 <field name="sale_order_id"/>
                 <field name="demand_purchase_id"/>
                 <field name="demand_purchase_id"/>
                 <field name="charge_person"/>
                 <field name="charge_person"/>
+                <field name="mrp_bom_id"/>
             </search>
             </search>
             </field>
             </field>
         </record>
         </record>

acct_sale/views/acc_sale_view.xml

@@ -365,7 +365,7 @@
                                     </tree>
                                     </tree>
                                 </field>
                                 </field>
 
 
-                                <group class="oe_subtotal_footer oe_right" groups="purchase.group_purchase_user">
+                                <group class="oe_subtotal_footer oe_right">
                                     <field name="amount_untaxed" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                                     <field name="amount_untaxed" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                                     <field name="amount_tax" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                                     <field name="amount_tax" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                                     <field name="discount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                                     <field name="discount" widget="monetary" options="{'currency_field': 'currency_id'}"/>