tryton-do/tryton
2
0 Fork 0
Code Issues Pull Requests 2 Actions 2 Packages Projects Releases Wiki Activity

Change unlink to delete for issue201

Browse Source
This commit is contained in:
Cédric Krier committed 2008-07-25 12:51:48 +02:00
1 parent 170f11b982
commit 58f4845bbc
8 files changed
+35 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

account.py
+2 -2
View File
@@ -1261,7 +1261,7 @@ class CreateChartAccount(Wizard):
('res', '=', False),
('company', '=', datas['form']['company']),
], context=context)
property_obj.unlink(cursor, user, property_ids, context=context)
property_obj.delete(cursor, user, property_ids, context=context)
property_obj.create(cursor, user, {
'name': 'account_receivable',
'field': account_receivable_field_id,
@@ -1279,7 +1279,7 @@ class CreateChartAccount(Wizard):
('res', '=', False),
('company', '=', datas['form']['company']),
], context=context)
property_obj.unlink(cursor, user, property_ids, context=context)
property_obj.delete(cursor, user, property_ids, context=context)
property_obj.create(cursor, user, {
'name': 'account_payable',
'field': account_payable_field_id,
account.xml
+5 -5
View File
@@ -100,7 +100,7 @@
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="False"/>
<field name="perm_create" eval="False"/>
<field name="perm_unlink" eval="False"/>
<field name="perm_delete" eval="False"/>
</record>
<record model="ir.model.access" id="access_account_type_account_admin">
<field name="model" search="[('model', '=', 'account.account.type')]"/>
@@ -108,7 +108,7 @@
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="True"/>
<field name="perm_create" eval="True"/>
<field name="perm_unlink" eval="True"/>
<field name="perm_delete" eval="True"/>
</record>
<record model="account.account.type" id="account_type_asset">
<field name="name">Asset</field>
@@ -247,7 +247,7 @@
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="False"/>
<field name="perm_create" eval="False"/>
<field name="perm_unlink" eval="False"/>
<field name="perm_delete" eval="False"/>
</record>
<record model="account.account.template" id="account_template_root">
<field name="name">Minimal Account Chart</field>
@@ -480,7 +480,7 @@
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="False"/>
<field name="perm_create" eval="False"/>
<field name="perm_unlink" eval="False"/>
<field name="perm_delete" eval="False"/>
</record>
<record model="ir.model.access" id="access_account_account_admin">
<field name="model" search="[('model', '=', 'account.account')]"/>
@@ -488,7 +488,7 @@
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="True"/>
<field name="perm_create" eval="True"/>
<field name="perm_unlink" eval="True"/>
<field name="perm_delete" eval="True"/>
</record>
<record model="ir.ui.view" id="open_chart_account_init_view_form">
fiscalyear.py
+1 -1
View File
@@ -385,7 +385,7 @@ class ReOpenFiscalYear(Wizard):
context=context):
if fiscalyear.state == 'close':
line_ids = [x.id for x in fiscalyear.close_lines]
move_line_obj.unlink(cursor, user, line_ids, context=context)
move_line_obj.delete(cursor, user, line_ids, context=context)
fiscalyear_obj.write(cursor, user, data['ids'], {
'state': 'open',
}, context=context)
journal.py
+2 -2
View File
@@ -204,9 +204,9 @@ class Period(OSV):
return super(Period, self).write(cursor, user, ids, vals,
context=context)
def unlink(self, cursor, user, ids, context=None):
def delete(self, cursor, user, ids, context=None):
self._check(cursor, user, ids, context=context)
return super(Period, self).unlink(cursor, user, ids, vals,
return super(Period, self).delete(cursor, user, ids, vals,
context=context)
Period()
journal.xml
+9 -9
View File
@@ -52,7 +52,7 @@
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="False"/>
<field name="perm_create" eval="False"/>
<field name="perm_unlink" eval="False"/>
<field name="perm_delete" eval="False"/>
</record>
<record model="ir.model.access" id="access_journal_type_account_admin">
<field name="model" search="[('model', '=', 'account.journal.type')]"/>
@@ -60,7 +60,7 @@
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="True"/>
<field name="perm_create" eval="True"/>
<field name="perm_unlink" eval="True"/>
<field name="perm_delete" eval="True"/>
</record>
<record model="account.journal.type" id="journal_type_general">
<field name="name">General</field>
@@ -150,7 +150,7 @@
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="False"/>
<field name="perm_create" eval="False"/>
<field name="perm_unlink" eval="False"/>
<field name="perm_delete" eval="False"/>
</record>
<record model="ir.model.access" id="access_journal_view_account_admin">
<field name="model" search="[('model', '=', 'account.journal.view')]"/>
@@ -158,7 +158,7 @@
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="True"/>
<field name="perm_create" eval="True"/>
<field name="perm_unlink" eval="True"/>
<field name="perm_delete" eval="True"/>
</record>
<record model="ir.ui.view" id="journal_view_form">
@@ -234,7 +234,7 @@
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="False"/>
<field name="perm_create" eval="False"/>
<field name="perm_unlink" eval="False"/>
<field name="perm_delete" eval="False"/>
</record>
<record model="ir.model.access" id="access_journal_account_admin">
<field name="model" search="[('model', '=', 'account.journal')]"/>
@@ -242,7 +242,7 @@
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="True"/>
<field name="perm_create" eval="True"/>
<field name="perm_unlink" eval="True"/>
<field name="perm_delete" eval="True"/>
</record>
<record model="ir.sequence.type" id="sequence_type_account_journal">
<field name="name">Account Journal</field>
@@ -380,7 +380,7 @@
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="False"/>
<field name="perm_create" eval="False"/>
<field name="perm_unlink" eval="False"/>
<field name="perm_delete" eval="False"/>
</record>
<record model="ir.model.access" id="access_journal_period_account">
<field name="model" search="[('model', '=', 'account.journal.period')]"/>
@@ -388,7 +388,7 @@
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="True"/>
<field name="perm_create" eval="True"/>
<field name="perm_unlink" eval="False"/>
<field name="perm_delete" eval="False"/>
</record>
<record model="ir.model.access" id="access_journal_period_account_admin">
<field name="model" search="[('model', '=', 'account.journal.period')]"/>
@@ -396,7 +396,7 @@
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="True"/>
<field name="perm_create" eval="True"/>
<field name="perm_unlink" eval="True"/>
<field name="perm_delete" eval="True"/>
</record>
</data>
</tryton>
move.py
+6 -6
View File
@@ -164,7 +164,7 @@ class Move(OSV):
self.validate(cursor, user, [res], context=context)
return res
def unlink(self, cursor, user, ids, context=None):
def delete(self, cursor, user, ids, context=None):
if isinstance(ids, (int, long)):
ids = [ids]
move_line_obj = self.pool.get('account.move.line')
@@ -174,9 +174,9 @@ class Move(OSV):
context=context)
if move.lines:
move_line_ids = [x.id for x in move.lines]
move_line_obj.unlink(cursor, user, move_line_ids,
move_line_obj.delete(cursor, user, move_line_ids,
context=context)
return super(Move, self).unlink(cursor, user, ids, context=context)
return super(Move, self).delete(cursor, user, ids, context=context)
def validate(self, cursor, user, ids, context=None):
'''
@@ -973,14 +973,14 @@ class Line(OSV):
journal_period_done.append(journal_period)
return
def unlink(self, cursor, user, ids, context=None):
def delete(self, cursor, user, ids, context=None):
move_obj = self.pool.get('account.move')
if isinstance(ids, (int, long)):
ids = [ids]
self.check_modify(cursor, user, ids, context=context)
lines = self.browse(cursor, user, ids, context=context)
move_ids = [x.move.id for x in lines]
res = super(Line, self).unlink(cursor, user, ids, context=context)
res = super(Line, self).delete(cursor, user, ids, context=context)
move_obj.validate(cursor, user, move_ids, context=context)
return res
@@ -1441,7 +1441,7 @@ class UnreconcileLines(Wizard):
reconciliation_ids = [x.reconciliation.id for x in lines \
if x.reconciliation]
if reconciliation_ids:
reconciliation_obj.unlink(cursor, user, reconciliation_ids,
reconciliation_obj.delete(cursor, user, reconciliation_ids,
context=context)
return {}
move.xml
+8 -8
View File
@@ -72,7 +72,7 @@
<field name="perm_read" eval="False"/>
<field name="perm_write" eval="False"/>
<field name="perm_create" eval="False"/>
<field name="perm_unlink" eval="False"/>
<field name="perm_delete" eval="False"/>
</record>
<record model="ir.model.access" id="access_move_account">
<field name="model" search="[('model', '=', 'account.move')]"/>
@@ -80,7 +80,7 @@
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="True"/>
<field name="perm_create" eval="True"/>
<field name="perm_unlink" eval="False"/>
<field name="perm_delete" eval="False"/>
</record>
<record model="ir.model.access" id="access_move_account_admin">
<field name="model" search="[('model', '=', 'account.move')]"/>
@@ -88,7 +88,7 @@
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="True"/>
<field name="perm_create" eval="True"/>
<field name="perm_unlink" eval="True"/>
<field name="perm_delete" eval="True"/>
</record>
<record model="ir.sequence.type" id="sequence_type_account_move">
<field name="name">Account Move</field>
@@ -124,7 +124,7 @@
<field name="perm_read" eval="False"/>
<field name="perm_write" eval="False"/>
<field name="perm_create" eval="False"/>
<field name="perm_unlink" eval="False"/>
<field name="perm_delete" eval="False"/>
</record>
<record model="ir.model.access" id="access_move_reconciliation_account">
<field name="model" search="[('model', '=', 'account.move.reconciliation')]"/>
@@ -132,7 +132,7 @@
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="False"/>
<field name="perm_create" eval="True"/>
<field name="perm_unlink" eval="False"/>
<field name="perm_delete" eval="False"/>
</record>
<record model="ir.model.access" id="access_move_reconciliation_account_admin">
<field name="model" search="[('model', '=', 'account.move.reconciliation')]"/>
@@ -140,7 +140,7 @@
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="True"/>
<field name="perm_create" eval="True"/>
<field name="perm_unlink" eval="True"/>
<field name="perm_delete" eval="True"/>
</record>
<record model="ir.sequence.type" id="sequence_type_account_move_reconciliation">
<field name="name">Account Move Reconciliation</field>
@@ -269,7 +269,7 @@
<field name="perm_read" eval="False"/>
<field name="perm_write" eval="False"/>
<field name="perm_create" eval="False"/>
<field name="perm_unlink" eval="False"/>
<field name="perm_delete" eval="False"/>
</record>
<record model="ir.model.access" id="access_move_line_account">
<field name="model" search="[('model', '=', 'account.move.line')]"/>
@@ -277,7 +277,7 @@
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="True"/>
<field name="perm_create" eval="True"/>
<field name="perm_unlink" eval="True"/>
<field name="perm_delete" eval="True"/>
</record>
<record model="ir.ui.view" id="reconcile_lines_writeoff_view_form">
period.py
+2 -2
View File
@@ -173,9 +173,9 @@ class Period(OSV):
return super(Period, self).write(cursor, user, ids, vals,
context=context)
def unlink(self, cursor, user, ids, context=None):
def delete(self, cursor, user, ids, context=None):
self._check(cursor, user, ids, context=context)
return super(Period, self).unlink(cursor, user, ids,
return super(Period, self).delete(cursor, user, ids,
context=context)
def close(self, cursor, user, ids, context=None):