-
+
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 6a0a29cb2fe..b1c5db23df6 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -306,7 +306,7 @@ class account_invoice(osv.osv):
if view_type == 'form':
if partner['supplier'] and not partner['customer']:
view_id = self.pool.get('ir.ui.view').search(cr,uid,[('name', '=', 'account.invoice.supplier.form')])
- else:
+ elif partner['customer'] and not partner['supplier']:
view_id = self.pool.get('ir.ui.view').search(cr,uid,[('name', '=', 'account.invoice.form')])
if view_id and isinstance(view_id, (list, tuple)):
view_id = view_id[0]
diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml
index 4ade4b90876..05e1c77edea 100644
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@@ -25,7 +25,7 @@
-
+
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 5a2b0b346c4..4fc4754ea3f 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -119,6 +119,15 @@ class account_installer(osv.osv_memory):
self.execute_simple(cr, uid, ids, context)
super(account_installer, self).execute(cr, uid, ids, context=context)
+ def action_next(self, cr, uid, ids, context=None):
+ next = self.execute(cr, uid, ids, context=context)
+ for installer in self.browse(cr, uid, ids, context=context):
+ if installer.charts == 'l10n_be':
+ return {'type': 'ir.actions.act_window_close'}
+ else :
+ if next : return next
+ return self.next(cr, uid, ids, context=context)
+
def execute_simple(self, cr, uid, ids, context=None):
if context is None:
context = {}
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 120d901a006..658f87962ff 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -79,10 +79,10 @@ class account_config_settings(osv.osv_memory):
'purchase_refund_sequence_prefix': fields.related('purchase_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier credit note sequence'),
'purchase_refund_sequence_next': fields.related('purchase_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next supplier credit note number'),
- 'module_account_check_writing': fields.boolean('pay your supplier by check',
+ 'module_account_check_writing': fields.boolean('pay your suppliers by check',
help="""This allows you to check writing and printing.
This installs the module account_check_writing."""),
- 'module_account_accountant': fields.boolean('accountant features',
+ 'module_account_accountant': fields.boolean('full accounting features: journals, legal statements, chart of accounts, etc.',
help="""If you do not check this box, you will be able to do invoicing & payments, but not accounting (Journal Items, Chart of Accounts, ...)"""),
'module_account_asset': fields.boolean('assets management',
help="""This allows you to manage the assets owned by a company or a person.
@@ -99,7 +99,7 @@ class account_config_settings(osv.osv_memory):
* serve as base for an easy plug-in of various automated payment mechanisms, and
* provide a more efficient way to manage invoice payments.
This installs the module account_payment."""),
- 'module_account_voucher': fields.boolean('anage customer payments',
+ 'module_account_voucher': fields.boolean('manage customer payments',
help="""This includes all the basic requirements of voucher entries for bank, cash, sales, purchase, expense, contra, etc.
This installs the module account_voucher."""),
'module_account_followup': fields.boolean('manage customer payment follow-ups',
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index fd0fa552238..d19a5dc5f98 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -103,6 +103,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -187,52 +220,17 @@
-
+
+
-
- :
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/addons/account_bank_statement_extensions/i18n/tr.po b/addons/account_bank_statement_extensions/i18n/tr.po
new file mode 100644
index 00000000000..4adfe7f304f
--- /dev/null
+++ b/addons/account_bank_statement_extensions/i18n/tr.po
@@ -0,0 +1,382 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-08-05 14:35+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Turkish