diff --git a/account.py b/account.py
index af8bfb7fca..24ded0dc31 100644
--- a/account.py
+++ b/account.py
@@ -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,
diff --git a/account.xml b/account.xml
index 532b6380c7..ad61af4970 100644
--- a/account.xml
+++ b/account.xml
@@ -100,7 +100,7 @@
-
+
@@ -108,7 +108,7 @@
-
+
Asset
@@ -247,7 +247,7 @@
-
+
Minimal Account Chart
@@ -480,7 +480,7 @@
-
+
@@ -488,7 +488,7 @@
-
+
diff --git a/fiscalyear.py b/fiscalyear.py
index 0b2b436c9c..dfee6f0406 100644
--- a/fiscalyear.py
+++ b/fiscalyear.py
@@ -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)
diff --git a/journal.py b/journal.py
index 75ca3dc5a1..63bb4d0d4f 100644
--- a/journal.py
+++ b/journal.py
@@ -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()
diff --git a/journal.xml b/journal.xml
index bdb84e9121..c3a4759947 100644
--- a/journal.xml
+++ b/journal.xml
@@ -52,7 +52,7 @@
-
+
@@ -60,7 +60,7 @@
-
+
General
@@ -150,7 +150,7 @@
-
+
@@ -158,7 +158,7 @@
-
+
@@ -234,7 +234,7 @@
-
+
@@ -242,7 +242,7 @@
-
+
Account Journal
@@ -380,7 +380,7 @@
-
+
@@ -388,7 +388,7 @@
-
+
@@ -396,7 +396,7 @@
-
+
diff --git a/move.py b/move.py
index d86c9be81a..9809872c61 100644
--- a/move.py
+++ b/move.py
@@ -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 {}
diff --git a/move.xml b/move.xml
index ce14e6095d..74adfcc3f0 100644
--- a/move.xml
+++ b/move.xml
@@ -72,7 +72,7 @@
-
+
@@ -80,7 +80,7 @@
-
+
@@ -88,7 +88,7 @@
-
+
Account Move
@@ -124,7 +124,7 @@
-
+
@@ -132,7 +132,7 @@
-
+
@@ -140,7 +140,7 @@
-
+
Account Move Reconciliation
@@ -269,7 +269,7 @@
-
+
@@ -277,7 +277,7 @@
-
+
diff --git a/period.py b/period.py
index f15ff2c5e5..e03a7029ba 100644
--- a/period.py
+++ b/period.py
@@ -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):