openobject-italia-core-devs team mailing list archive
-
openobject-italia-core-devs team
-
Mailing list archive
-
Message #01995
[Merge] lp:~scigghia/openobject-italia/riba_v7_scigghia_2 into lp:~openobject-italia-core-devs/openobject-italia/adding_riba_v7
Andrea Cometa has proposed merging lp:~scigghia/openobject-italia/riba_v7_scigghia_2 into lp:~openobject-italia-core-devs/openobject-italia/adding_riba_v7.
Requested reviews:
OpenERP Italia core devs (openobject-italia-core-devs)
For more details, see:
https://code.launchpad.net/~scigghia/openobject-italia/riba_v7_scigghia_2/+merge/208596
in questo branch ho aggiunto il campo data registrazione, da propagare in account.move all'accettazione della distinta.
inoltre è presente un controllo sulla presenza del conto accettazione, senza il quale l'accettazione della distinta causa errore se la configurazione della riba viene modificata da "dopo incasso" a "sbf" dopo aver emesso la distinta
--
https://code.launchpad.net/~scigghia/openobject-italia/riba_v7_scigghia_2/+merge/208596
Your team OpenERP Italia core devs is requested to review the proposed merge of lp:~scigghia/openobject-italia/riba_v7_scigghia_2 into lp:~openobject-italia-core-devs/openobject-italia/adding_riba_v7.
=== modified file 'l10n_it_ricevute_bancarie/riba.py'
--- l10n_it_ricevute_bancarie/riba.py 2013-12-16 15:22:58 +0000
+++ l10n_it_ricevute_bancarie/riba.py 2014-02-27 13:10:31 +0000
@@ -92,6 +92,14 @@
'payment_ids': fields.function(_get_payment_ids, relation='account.move.line', type="many2many", string='Payments'),
'unsolved_move_ids': fields.function(_get_unsolved_move_ids, type='many2many', relation='account.move', method=True, string="Unsolved Entries"),
'type': fields.related('config', 'tipo', type='char', size=32, string='Type', readonly=True),
+ 'registration_date': fields.date(
+ 'Registration Date',
+ states={'draft': [('readonly', False)],
+ 'cancel': [('readonly', False)], },
+ select=True,
+ readonly=True,
+ required=True,
+ help="Keep empty to use the current date"),
}
_defaults = {
@@ -99,6 +107,7 @@
'date_created': fields.date.context_today,
'name': lambda self,cr,uid,context: self.pool.get('ir.sequence').get(cr, uid, 'riba.distinta'),
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'riba.distinta', context=c),
+ 'registration_date': fields.date.context_today,
}
def unlink(self, cr, uid, ids, context=None):
@@ -357,6 +366,7 @@
move_id= move_pool.create(cr, uid, {
'ref': 'Ri.Ba. %s - line %s' % (line.distinta_id.name, line.sequence),
'journal_id': journal.id,
+ 'date': line.distinta_id.registration_date,
}, context=context)
to_be_reconciled = []
for riba_move_line in line.move_line_ids:
@@ -372,7 +382,12 @@
to_be_reconciled.append([move_line_id, riba_move_line.move_line_id.id])
move_line_pool.create(cr, uid, {
'name': 'Ri.Ba. %s - line %s' % (line.distinta_id.name, line.sequence),
- 'account_id': line.acceptance_account_id.id,
+ 'account_id': (
+ line.acceptance_account_id.id or
+ line.distinta_id.config.acceptance_account_id.id
+ # in questo modo se la riga non ha conto accettazione
+ # viene prelevato il conto in configurazione riba
+ ),
'partner_id': line.partner_id.id,
'date_maturity': line.due_date,
'credit': 0.0,
=== modified file 'l10n_it_ricevute_bancarie/riba_view.xml'
--- l10n_it_ricevute_bancarie/riba_view.xml 2013-11-09 12:43:20 +0000
+++ l10n_it_ricevute_bancarie/riba_view.xml 2014-02-27 13:10:31 +0000
@@ -51,6 +51,7 @@
<form string="Ri.Ba. - Distinta">
<field name="name" />
<field name="config" widget="selection"/>
+ <field name="registration_date" />
<notebook colspan="4">
<page string="General">
<field name="line_ids" nolabel="1" colspan="4">