Merge pull request #171 from Trust-Code/fix/document_event_mapping_oca

[FIX] Fix #95 document event mapping
OCA · Aug 10, 2015 · 6023907 · 6023907
2 parents 9352948 + 258cc43
commit 6023907
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/l10n_br_account/models/l10n_br_account.py b/l10n_br_account/models/l10n_br_account.py
@@ -57,7 +57,8 @@ class L10n_brAccountInvoiceCancel(models.Model):
         'Justificativa', size=255, readonly=True, required=True,
         states={'draft': [('readonly', False)]})
     cancel_document_event_ids = fields.One2many(
-        'l10n_br_account.document_event', 'document_event_ids', u'Eventos')
+        'l10n_br_account.document_event', 'cancel_document_event_id',
+        u'Eventos')
     state = fields.Selection(
         [('draft', 'Rascunho'), ('cancel', 'Cancelado'),
          ('done', u'Concluído')], 'Status', required=True, default='draft')
@@ -118,6 +119,10 @@ class L10n_brDocumentEvent(models.Model):
         'Status', select=True, readonly=True, default='draft')
     document_event_ids = fields.Many2one(
         'account.invoice', 'Documentos', ondelete='cascade')
+    cancel_document_event_id = fields.Many2one(
+        'l10n_br_account.invoice.cancel', 'Cancelamento')
+    invalid_number_document_event_id = fields.Many2one(
+        'l10n_br_account.invoice.invalid.number', u'Inutilização')
 
     _order = 'write_date desc'
 
@@ -313,7 +318,8 @@ def _name_get(self, cr, uid, ids, field_name, arg, context=None):
         'Justificativa', size=255, readonly=True,
         states={'draft': [('readonly', False)]}, required=True)
     invalid_number_document_event_ids = fields.One2many(
-        'l10n_br_account.document_event', 'document_event_ids', u'Eventos')
+        'l10n_br_account.document_event', 'invalid_number_document_event_id',
+        u'Eventos', states={'done': [('readonly', True)]})
 
     _sql_constraints = [
         ('number_uniq',

diff --git a/l10n_br_account/views/l10n_br_account_view.xml b/l10n_br_account/views/l10n_br_account_view.xml
@@ -262,7 +262,6 @@
 						<field name="status"/>
 						<field name="message"/>
 						<field name="state"/>
-						<field name="document_event_ids"/>
 					</group>
 				</form>
 			</field>
@@ -282,7 +281,6 @@
 						<field name="status"/>
 						<field name="message"/>
 						<field name="state"/>
-						<field name="document_event_ids"/>
 				</tree>
 			</field>
 		</record>