Browse Source

[FIX] Bug Fixed

pull/120/head
Ajmalcybrosys 6 years ago
parent
commit
90da446e37
  1. 8
      account_pdc/models/account_payment.py
  2. 14
      account_pdc/views/account_payment_view.xml
  3. 1
      account_pdc_payment_report/report/report_payment.py
  4. 2
      account_pdc_payment_report/views/report_payment.xml

8
account_pdc/models/account_payment.py

@ -30,11 +30,14 @@ class AccountRegisterPayments(models.TransientModel):
bank_reference = fields.Char(copy=False) bank_reference = fields.Char(copy=False)
cheque_reference = fields.Char(copy=False) cheque_reference = fields.Char(copy=False)
effective_date = fields.Date('Effective Date', help='Effective date of PDC', copy=False, default=False) effective_date = fields.Date('Effective Date', help='Effective date of '
'PDC')
def get_payment_vals(self): def get_payment_vals(self):
res = super(AccountRegisterPayments, self).get_payment_vals() res = super(AccountRegisterPayments, self).get_payment_vals()
res['effective_date']=self.effective_date
if self.payment_method_id == self.env.ref('account_check_printing.account_payment_method_check'): if self.payment_method_id == self.env.ref('account_check_printing.account_payment_method_check'):
res.update({ res.update({
'check_amount_in_words': self.check_amount_in_words, 'check_amount_in_words': self.check_amount_in_words,
'check_manual_sequencing': self.check_manual_sequencing, 'check_manual_sequencing': self.check_manual_sequencing,
@ -48,7 +51,7 @@ class AccountPayment(models.Model):
bank_reference = fields.Char(copy=False) bank_reference = fields.Char(copy=False)
cheque_reference = fields.Char(copy=False) cheque_reference = fields.Char(copy=False)
effective_date = fields.Date('Effective Date', help='Effective date of PDC', copy=False, default=False) effective_date = fields.Date('Effective Date', help='Effective date of PDC')
@api.multi @api.multi
def print_checks(self): def print_checks(self):
@ -86,7 +89,6 @@ class AccountPayment(models.Model):
self.write({'state': 'sent'}) self.write({'state': 'sent'})
return self.do_print_checks() return self.do_print_checks()
def _get_move_vals(self, journal=None): def _get_move_vals(self, journal=None):
""" Return dict to create the payment move """ Return dict to create the payment move
""" """

14
account_pdc/views/account_payment_view.xml

@ -10,7 +10,7 @@
<button name="unmark_sent" attrs="{'invisible': ['|', ('payment_method_code', 'not in', ['check_printing','pdc']), ('state', '!=', 'sent')]}" string="Unmark Sent" type="object"/> <button name="unmark_sent" attrs="{'invisible': ['|', ('payment_method_code', 'not in', ['check_printing','pdc']), ('state', '!=', 'sent')]}" string="Unmark Sent" type="object"/>
</xpath> </xpath>
<xpath expr="//div[@name='amount_div']" position="after"> <xpath expr="//div[@name='amount_div']" position="after">
<field name="check_amount_in_words" attrs="{'invisible': [('payment_method_code', 'not in', ['check_printing','pdc'])], 'readonly': [('state', '!=', 'draft')]}" groups="base.group_no_one"/> <field name="check_amount_in_words" attrs="{'invisible': [('payment_method_code', 'not in', ['check_printing','pdc'])]}" groups="base.group_no_one"/>
</xpath> </xpath>
<xpath expr="//field[@name='communication']" position="after"> <xpath expr="//field[@name='communication']" position="after">
<field name="check_manual_sequencing" invisible="1"/> <field name="check_manual_sequencing" invisible="1"/>
@ -18,8 +18,8 @@
</xpath> </xpath>
<xpath expr="//field[@name='payment_date']" position="after"> <xpath expr="//field[@name='payment_date']" position="after">
<field name="effective_date" attrs="{'invisible': [('payment_method_code', '!=', 'pdc')],'required': [('payment_method_code', '=', 'pdc')]}"/> <field name="effective_date" attrs="{'invisible': [('payment_method_code', '!=', 'pdc')],'required': [('payment_method_code', '=', 'pdc')]}"/>
<field name="bank_reference" attrs="{'readonly': [('state', '!=', 'draft')]}"/> <field name="bank_reference"/>
<field name="cheque_reference" attrs="{'readonly': [('state', '!=', 'draft')]}"/> <field name="cheque_reference"/>
</xpath> </xpath>
</field> </field>
</record> </record>
@ -38,8 +38,8 @@
</xpath> </xpath>
<xpath expr="//field[@name='payment_date']" position="after"> <xpath expr="//field[@name='payment_date']" position="after">
<field name="effective_date" attrs="{'invisible': [('payment_method_code', '!=', 'pdc')],'required': [('payment_method_code', '=', 'pdc')]}"/> <field name="effective_date" attrs="{'invisible': [('payment_method_code', '!=', 'pdc')],'required': [('payment_method_code', '=', 'pdc')]}"/>
<field name="bank_reference" attrs="{'readonly': [('state', '!=', 'draft')]}"/> <field name="bank_reference"/>
<field name="cheque_reference" attrs="{'readonly': [('state', '!=', 'draft')]}"/> <field name="cheque_reference"/>
</xpath> </xpath>
</field> </field>
</record> </record>
@ -58,8 +58,8 @@
</xpath> </xpath>
<xpath expr="//field[@name='payment_date']" position="after"> <xpath expr="//field[@name='payment_date']" position="after">
<field name="effective_date" attrs="{'invisible': [('payment_method_code', '!=', 'pdc')],'required': [('payment_method_code', '=', 'pdc')]}"/> <field name="effective_date" attrs="{'invisible': [('payment_method_code', '!=', 'pdc')],'required': [('payment_method_code', '=', 'pdc')]}"/>
<field name="bank_reference" attrs="{'readonly': [('state', '!=', 'draft')]}"/> <field name="bank_reference"/>
<field name="cheque_reference" attrs="{'readonly': [('state', '!=', 'draft')]}"/> <field name="cheque_reference"/>
</xpath> </xpath>
</field> </field>
</record> </record>

1
account_pdc_payment_report/report/report_payment.py

@ -32,7 +32,6 @@ class ReportPayment(models.AbstractModel):
if data['form']['effective_date_to']: if data['form']['effective_date_to']:
domain.append(('effective_date', '<=', data['form']['effective_date_to'])) domain.append(('effective_date', '<=', data['form']['effective_date_to']))
return self.env['account.payment'].search(domain) return self.env['account.payment'].search(domain)

2
account_pdc_payment_report/views/report_payment.xml

@ -43,8 +43,8 @@
<t t-if="lines[o.id]"> <t t-if="lines[o.id]">
<tbody> <tbody>
<tr t-foreach="lines[o.id]" t-as="ap"> <tr t-foreach="lines[o.id]" t-as="ap">
<td><span t-esc="ap.name"/></td>
<td><span t-field="ap.payment_date"/></td> <td><span t-field="ap.payment_date"/></td>
<td><span t-esc="ap.name"/></td>
<td><span t-esc="ap.sudo().partner_id and ap.sudo().partner_id.name[:23] or ''"/></td> <td><span t-esc="ap.sudo().partner_id and ap.sudo().partner_id.name[:23] or ''"/></td>
<td><span t-field="ap.bank_reference"/></td> <td><span t-field="ap.bank_reference"/></td>
<td><span t-field="ap.cheque_reference"/></td> <td><span t-field="ap.cheque_reference"/></td>

Loading…
Cancel
Save