Merge lp:~agilebg/openobject-italia/7.0-bug-1253598-elbati into lp:~openobject-italia-core-devs/openobject-italia/italian-addons-7.0

Proposed by Lorenzo Battistini
Status: Merged
Merged at revision: 229
Proposed branch: lp:~agilebg/openobject-italia/7.0-bug-1253598-elbati
Merge into: lp:~openobject-italia-core-devs/openobject-italia/italian-addons-7.0
Diff against target: 15 lines (+2/-2)
1 file modified
account_vat_period_end_statement/account.py (+2/-2)
To merge this branch: bzr merge lp:~agilebg/openobject-italia/7.0-bug-1253598-elbati
Reviewer Review Type Date Requested Status
Davide Corio (community) Approve
Review via email: mp+196096@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Davide Corio (enlightx-deactivatedaccount) wrote :

Mi sono accorto in tempo del mp, altrimenti duplicavo.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_vat_period_end_statement/account.py'
2--- account_vat_period_end_statement/account.py 2013-08-05 13:34:40 +0000
3+++ account_vat_period_end_statement/account.py 2013-11-21 12:55:07 +0000
4@@ -200,9 +200,9 @@
5 _name = "account.vat.period.end.statement"
6 _rec_name = 'date'
7 _columns = {
8- 'debit_vat_account_line_ids': fields.one2many('statement.debit.account.line', 'statement_id', 'Debit VAT', help='The accounts containing the debit VAT amount to write-off', required=True, states={'confirmed': [('readonly', True)], 'paid': [('readonly', True)], 'draft': [('readonly', False)]}),
9+ 'debit_vat_account_line_ids': fields.one2many('statement.debit.account.line', 'statement_id', 'Debit VAT', help='The accounts containing the debit VAT amount to write-off', states={'confirmed': [('readonly', True)], 'paid': [('readonly', True)], 'draft': [('readonly', False)]}),
10
11- 'credit_vat_account_line_ids': fields.one2many('statement.credit.account.line', 'statement_id', 'Credit VAT', help='The accounts containing the credit VAT amount to write-off', required=True, states={'confirmed': [('readonly', True)], 'paid': [('readonly', True)], 'draft': [('readonly', False)]}),
12+ 'credit_vat_account_line_ids': fields.one2many('statement.credit.account.line', 'statement_id', 'Credit VAT', help='The accounts containing the credit VAT amount to write-off', states={'confirmed': [('readonly', True)], 'paid': [('readonly', True)], 'draft': [('readonly', False)]}),
13
14 'previous_credit_vat_account_id': fields.many2one('account.account', 'Previous Credits VAT', help='Credit VAT from previous periods', states={'confirmed': [('readonly', True)], 'paid': [('readonly', True)], 'draft': [('readonly', False)]}),
15 'previous_credit_vat_amount': fields.float('Previous Credits VAT Amount', states={'confirmed': [('readonly', True)], 'paid': [('readonly', True)], 'draft': [('readonly', False)]},

Subscribers

People subscribed via source and target branches