fix petty cash
This commit is contained in:
parent
cf98a92f84
commit
04c955fed0
|
|
@ -9,6 +9,16 @@ class PurchaseOrder(models.Model):
|
|||
petty_employee_id = fields.Many2one('hr.employee', string='Petty Cashier', copy=False)
|
||||
|
||||
|
||||
def _prepare_invoice(self):
|
||||
res = super(PurchaseOrder, self)._prepare_invoice()
|
||||
res.update({
|
||||
'purchase_id': self.id,
|
||||
'res_id': self.id,
|
||||
'res_model': 'purchase.order',
|
||||
'is_petty_paid': self.is_petty_paid,
|
||||
'petty_employee_id': self.petty_employee_id.id
|
||||
})
|
||||
return res
|
||||
|
||||
class AccountMove(models.Model):
|
||||
_inherit = 'account.move'
|
||||
|
|
|
|||
|
|
@ -23,9 +23,10 @@
|
|||
<field name="inherit_id" ref="purchase.purchase_order_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//field[@name='partner_id']" position="after">
|
||||
<field name="is_petty_paid"/>
|
||||
<field name="is_petty_paid" attrs="{'readonly': [('state', 'in', ['sign', 'wait'])]}"/>
|
||||
<field name="petty_employee_id" options='{"no_open": True, "no_create": True}'
|
||||
attrs="{'invisible':[('is_petty_paid','=',False)],'required':[('is_petty_paid','=',True)]}"/>
|
||||
attrs="{'invisible': [('is_petty_paid', '=', False)],
|
||||
'readonly': [('state', 'in', ['sign', 'wait'])]}"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
|||
|
|
@ -373,7 +373,7 @@ class PurchaseOrderCustom(models.Model):
|
|||
|
||||
def _prepare_invoice(self):
|
||||
res = super(PurchaseOrderCustom, self)._prepare_invoice()
|
||||
res.update({'purchase_id': self.id, 'res_id': self.id, 'res_model': 'purchase.order','is_petty_paid':self.is_cash_advance_spent,'petty_employee_id':self.cash_advance_employee_id})
|
||||
res.update({'purchase_id': self.id, 'res_id': self.id, 'res_model': 'purchase.order'})
|
||||
return res
|
||||
|
||||
@api.onchange('type')
|
||||
|
|
|
|||
|
|
@ -123,10 +123,10 @@
|
|||
</xpath>
|
||||
<xpath expr="//field[@name='requisition_id']" position="after">
|
||||
<field name="is_cash_advance_spent"
|
||||
attrs="{'readonly': [('state', 'in', ['sign', 'wait'])]}"/>
|
||||
invisible="1"
|
||||
/>
|
||||
<field name="cash_advance_employee_id"
|
||||
attrs="{'invisible': [('is_cash_advance_spent', '=', False)],
|
||||
'readonly': [('state', 'in', ['sign', 'wait'])]}"/>
|
||||
invisible="1"/>
|
||||
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='payment_term_id']" position="after">
|
||||
|
|
|
|||
Loading…
Reference in New Issue