-
diff --git a/addons/account/project/report/analytic_journal.rml b/addons/account/project/report/analytic_journal.rml
index 7b55c6ad212..47775ea9253 100644
--- a/addons/account/project/report/analytic_journal.rml
+++ b/addons/account/project/report/analytic_journal.rml
@@ -280,7 +280,7 @@
[[ move_a.code ]]
|
- [[ move_a.name ]] asgfas
+ [[ move_a.name ]]
|
[[ move_a.account_id.code ]] - [[ move_a.account_id.name ]]
diff --git a/addons/account/project/wizard/account_analytic_inverted_balance_report.xml b/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
index e989f766d7b..114c75f40af 100644
--- a/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
+++ b/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
@@ -2,44 +2,44 @@
-
- Account Analytic Inverted Balance
- account.analytic.inverted.balance
- form
-
-
-
-
+
+ Account Analytic Inverted Balance
+ account.analytic.inverted.balance
+ form
+
+
+
+
-
- Inverted Analytic Balance
- ir.actions.act_window
- account.analytic.inverted.balance
- form
- form
-
- new
-
+
+ Inverted Analytic Balance
+ ir.actions.act_window
+ account.analytic.inverted.balance
+ form
+ form
+
+ new
+
-
-
-
- Account Analytic Inverted Balance
- client_print_multi
-
- action
- account.analytic.account
-
+
+
+
+ Account Analytic Inverted Balance
+ client_print_multi
+
+ action
+ account.analytic.account
+
-
\ No newline at end of file
+
diff --git a/addons/account/report/account_aged_partner_balance.py b/addons/account/report/account_aged_partner_balance.py
index 5a1b8ac868b..22b04e05f39 100644
--- a/addons/account/report/account_aged_partner_balance.py
+++ b/addons/account/report/account_aged_partner_balance.py
@@ -79,6 +79,8 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
#
# Build a string like (1,2,3) for easy use in SQL query
partner_ids = [x['id'] for x in partners]
+ if not partner_ids:
+ return []
# This dictionary will store the debit-credit for all partners, using partner_id as key.
move_state = ['draft','posted']
if self.target_move == 'posted':
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index a131400948b..34d23826e80 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -108,7 +108,10 @@
A tool search lets you know statistics on your analytics records that match your needs.
-
+
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 081328d89fb..a80fb3c3233 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -117,6 +117,9 @@
{'group_by':[], 'search_default_usertype':1, 'search_default_thisyear':1, 'group_by_no_leaf':1}
A tool search lets you know statistics on your different financial accounts that match your needs.
-
+
diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index 39a1709d503..125edb0d992 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -39,7 +39,7 @@ class account_invoice_report(osv.osv):
'uom_name': fields.char('Default UoM', size=128, readonly=True),
'payment_term': fields.many2one('account.payment.term', 'Payment Term', readonly=True),
'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], readonly=True),
- 'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Mapping', readonly=True),
+ 'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True),
'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
'categ_id': fields.many2one('product.category','Category of Product', readonly=True),
'journal_id': fields.many2one('account.journal', 'Journal', readonly=True),
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 12f8b23e550..a2ea227d707 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -78,14 +78,14 @@
domain="['|', ('type','=','out_invoice'),('type','=','out_refund')]"
help="Customer Invoices And Refunds"/>
+ help="Supplier Invoices And Refunds"/>
+ help="Customer And Supplier Invoices"/>
-
+
diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml
index 173cbd1e6c4..c6ff4015ea6 100644
--- a/addons/account/report/account_print_invoice.rml
+++ b/addons/account/report/account_print_invoice.rml
@@ -362,7 +362,7 @@
|
- Fiscal Mapping Remark :
+ Fiscal Position:
|
[[ (o.fiscal_position.note and format(o.fiscal_position and o.fiscal_position.note)) or removeParentNode('blockTable') ]]
diff --git a/addons/account/report/account_report.py b/addons/account/report/account_report.py
index 1136300f065..dd8e0a2ce4e 100644
--- a/addons/account/report/account_report.py
+++ b/addons/account/report/account_report.py
@@ -165,7 +165,7 @@ class report_invoice_created(osv.osv):
'amount_untaxed': fields.float('Untaxed', readonly=True),
'amount_total': fields.float('Total', readonly=True),
'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
- 'date_invoice': fields.date('Date Invoiced', readonly=True),
+ 'date_invoice': fields.date('Invoice Date', readonly=True),
'date_due': fields.date('Due Date', readonly=True),
'residual': fields.float('Residual', readonly=True),
'state': fields.selection([
diff --git a/addons/account/report/account_tax_report.py b/addons/account/report/account_tax_report.py
index d9bcabf0ce4..b03aea5c05d 100644
--- a/addons/account/report/account_tax_report.py
+++ b/addons/account/report/account_tax_report.py
@@ -26,195 +26,195 @@ import rml_parse
from report import report_sxw
class tax_report(rml_parse.rml_parse):
- _name = 'report.account.vat.declaration'
- def __init__(self, cr, uid, name, context={}):
- super(tax_report, self).__init__(cr, uid, name, context=context)
- self.localcontext.update({
- 'time': time,
- 'get_period': self._get_period,
- 'get_codes': self._get_codes,
- 'get_general': self._get_general,
- 'get_company': self._get_company,
- 'get_currency': self._get_currency,
- 'get_lines': self._get_lines,
- })
+ _name = 'report.account.vat.declaration'
+ def __init__(self, cr, uid, name, context={}):
+ super(tax_report, self).__init__(cr, uid, name, context=context)
+ self.localcontext.update({
+ 'time': time,
+ 'get_period': self._get_period,
+ 'get_codes': self._get_codes,
+ 'get_general': self._get_general,
+ 'get_company': self._get_company,
+ 'get_currency': self._get_currency,
+ 'get_lines': self._get_lines,
+ })
- def _get_lines(self, based_on, period_list, company_id=False, parent=False, level=0, context={}):
- res = self._get_codes(based_on, company_id, parent, level, period_list, context=context)
+ def _get_lines(self, based_on, period_list, company_id=False, parent=False, level=0, context={}):
+ res = self._get_codes(based_on, company_id, parent, level, period_list, context=context)
- if period_list:
- res = self._add_codes(based_on, res, period_list, context=context)
- else:
- self.cr.execute ("select id from account_fiscalyear")
- fy = self.cr.fetchall()
- self.cr.execute ("select id from account_period where fiscalyear_id = %s",(fy[0][0],))
- periods = self.cr.fetchall()
- for p in periods:
- period_list.append(p[0])
- res = self._add_codes(based_on, res, period_list, context=context)
+ if period_list:
+ res = self._add_codes(based_on, res, period_list, context=context)
+ else:
+ self.cr.execute ("select id from account_fiscalyear")
+ fy = self.cr.fetchall()
+ self.cr.execute ("select id from account_period where fiscalyear_id = %s",(fy[0][0],))
+ periods = self.cr.fetchall()
+ for p in periods:
+ period_list.append(p[0])
+ res = self._add_codes(based_on, res, period_list, context=context)
- i = 0
- top_result = []
- while i < len(res):
+ i = 0
+ top_result = []
+ while i < len(res):
- res_dict = { 'code': res[i][1].code,
- 'name': res[i][1].name,
- 'debit': 0,
- 'credit': 0,
- 'tax_amount': res[i][1].sum_period,
- 'type': 1,
- 'level': res[i][0],
- 'pos': 0
- }
+ res_dict = { 'code': res[i][1].code,
+ 'name': res[i][1].name,
+ 'debit': 0,
+ 'credit': 0,
+ 'tax_amount': res[i][1].sum_period,
+ 'type': 1,
+ 'level': res[i][0],
+ 'pos': 0
+ }
- top_result.append(res_dict)
- res_general = self._get_general(res[i][1].id, period_list, company_id, based_on, context=context)
- ind_general = 0
- while ind_general < len(res_general):
- res_general[ind_general]['type'] = 2
- res_general[ind_general]['pos'] = 0
- res_general[ind_general]['level'] = res_dict['level']
- top_result.append(res_general[ind_general])
- ind_general+=1
- i+=1
- return top_result
- #return array_result
+ top_result.append(res_dict)
+ res_general = self._get_general(res[i][1].id, period_list, company_id, based_on, context=context)
+ ind_general = 0
+ while ind_general < len(res_general):
+ res_general[ind_general]['type'] = 2
+ res_general[ind_general]['pos'] = 0
+ res_general[ind_general]['level'] = res_dict['level']
+ top_result.append(res_general[ind_general])
+ ind_general+=1
+ i+=1
+ return top_result
+ #return array_result
- def _get_period(self, period_id, context={}):
- return self.pool.get('account.period').browse(self.cr, self.uid, period_id, context=context).name
+ def _get_period(self, period_id, context={}):
+ return self.pool.get('account.period').browse(self.cr, self.uid, period_id, context=context).name
- def _get_general(self, tax_code_id, period_list,company_id, based_on, context={}):
- res=[]
- obj_account = self.pool.get('account.account')
- periods_ids = tuple(period_list)
- if based_on == 'payments':
- self.cr.execute('SELECT SUM(line.tax_amount) AS tax_amount, \
- SUM(line.debit) AS debit, \
- SUM(line.credit) AS credit, \
- COUNT(*) AS count, \
- account.id AS account_id, \
- account.name AS name, \
- account.code AS code \
- FROM account_move_line AS line, \
- account_account AS account, \
- account_move AS move \
- LEFT JOIN account_invoice invoice ON \
- (invoice.move_id = move.id) \
- WHERE line.state<>%s \
- AND line.tax_code_id = %s \
- AND line.account_id = account.id \
- AND account.company_id = %s \
- AND move.id = line.move_id \
- AND line.period_id IN %s \
- AND ((invoice.state = %s) \
- OR (invoice.id IS NULL)) \
- GROUP BY account.id,account.name,account.code', ('draft', tax_code_id,
- company_id, periods_ids, 'paid',))
+ def _get_general(self, tax_code_id, period_list,company_id, based_on, context={}):
+ res=[]
+ obj_account = self.pool.get('account.account')
+ periods_ids = tuple(period_list)
+ if based_on == 'payments':
+ self.cr.execute('SELECT SUM(line.tax_amount) AS tax_amount, \
+ SUM(line.debit) AS debit, \
+ SUM(line.credit) AS credit, \
+ COUNT(*) AS count, \
+ account.id AS account_id, \
+ account.name AS name, \
+ account.code AS code \
+ FROM account_move_line AS line, \
+ account_account AS account, \
+ account_move AS move \
+ LEFT JOIN account_invoice invoice ON \
+ (invoice.move_id = move.id) \
+ WHERE line.state<>%s \
+ AND line.tax_code_id = %s \
+ AND line.account_id = account.id \
+ AND account.company_id = %s \
+ AND move.id = line.move_id \
+ AND line.period_id IN %s \
+ AND ((invoice.state = %s) \
+ OR (invoice.id IS NULL)) \
+ GROUP BY account.id,account.name,account.code', ('draft', tax_code_id,
+ company_id, periods_ids, 'paid',))
- else:
- self.cr.execute('SELECT SUM(line.tax_amount) AS tax_amount, \
- SUM(line.debit) AS debit, \
- SUM(line.credit) AS credit, \
- COUNT(*) AS count, \
- account.id AS account_id, \
- account.name AS name, \
- account.code AS code \
- FROM account_move_line AS line, \
- account_account AS account \
- WHERE line.state <> %s \
- AND line.tax_code_id = %s \
- AND line.account_id = account.id \
- AND account.company_id = %s \
- AND line.period_id IN %s\
- AND account.active \
- GROUP BY account.id,account.name,account.code', ('draft', tax_code_id,
- company_id, periods_ids,))
- res = self.cr.dictfetchall()
+ else:
+ self.cr.execute('SELECT SUM(line.tax_amount) AS tax_amount, \
+ SUM(line.debit) AS debit, \
+ SUM(line.credit) AS credit, \
+ COUNT(*) AS count, \
+ account.id AS account_id, \
+ account.name AS name, \
+ account.code AS code \
+ FROM account_move_line AS line, \
+ account_account AS account \
+ WHERE line.state <> %s \
+ AND line.tax_code_id = %s \
+ AND line.account_id = account.id \
+ AND account.company_id = %s \
+ AND line.period_id IN %s\
+ AND account.active \
+ GROUP BY account.id,account.name,account.code', ('draft', tax_code_id,
+ company_id, periods_ids,))
+ res = self.cr.dictfetchall()
- i = 0
- while i= int(accounts[bcl_rup_ind]['level']) and bcl_rup_ind >= 0 ):
- tot_elem = copy.copy(accounts[bcl_rup_ind], context=context)
- res_tot = { 'code': accounts[bcl_rup_ind]['code'],
- 'name': '',
- 'debit': 0,
- 'credit': 0,
- 'tax_amount': accounts[bcl_rup_ind]['tax_amount'],
- 'type': accounts[bcl_rup_ind]['type'],
- 'level': 0,
- 'pos': 0
- }
+ while (bcl_current_level >= int(accounts[bcl_rup_ind]['level']) and bcl_rup_ind >= 0 ):
+ tot_elem = copy.copy(accounts[bcl_rup_ind], context=context)
+ res_tot = { 'code': accounts[bcl_rup_ind]['code'],
+ 'name': '',
+ 'debit': 0,
+ 'credit': 0,
+ 'tax_amount': accounts[bcl_rup_ind]['tax_amount'],
+ 'type': accounts[bcl_rup_ind]['type'],
+ 'level': 0,
+ 'pos': 0
+ }
- if res_tot['type'] == 1:
- # on change le type pour afficher le total
- res_tot['type'] = 2
- result_accounts.append(res_tot)
- bcl_current_level = accounts[bcl_rup_ind]['level']
- bcl_rup_ind -= 1
+ if res_tot['type'] == 1:
+ # on change le type pour afficher le total
+ res_tot['type'] = 2
+ result_accounts.append(res_tot)
+ bcl_current_level = accounts[bcl_rup_ind]['level']
+ bcl_rup_ind -= 1
- old_level = account_elem['level']
- result_accounts.append(account_elem)
- ind+=1
+ old_level = account_elem['level']
+ result_accounts.append(account_elem)
+ ind+=1
- return result_accounts
+ return result_accounts
report_sxw.report_sxw('report.account.vat.declaration', 'account.tax.code',
- 'addons/account/report/account_tax_report.rml', parser=tax_report, header="internal")
+ 'addons/account/report/account_tax_report.rml', parser=tax_report, header="internal")
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index f6d4ec3d88e..24265065b25 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -5,150 +5,13 @@
Accounting / Invoice
-
+
Accounting / Accountant
-
-
+
Accounting / Manager
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Account Entry
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
index 5f5d404139a..da59388eb91 100644
--- a/addons/account/wizard/account_move_journal_view.xml
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -21,17 +21,8 @@
{'journal_type':'sale','view_mode':False}
new
-
-
-
-
-
-
-
-
-
-
-
+
Journal Items
@@ -48,16 +39,6 @@
sequence="16"
groups="group_account_user,group_account_manager"/>
-
-
-
-
-
-
-
-
-
-
Journal Items
account.move.journal
diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml
index a80ffbc05cd..38ed195820b 100644
--- a/addons/account/wizard/account_reconcile_view.xml
+++ b/addons/account/wizard/account_reconcile_view.xml
@@ -58,8 +58,7 @@
-
-
+
diff --git a/addons/account/wizard/account_report_balance_sheet_view.xml b/addons/account/wizard/account_report_balance_sheet_view.xml
index f1c5ef35de9..68a757c6f9b 100644
--- a/addons/account/wizard/account_report_balance_sheet_view.xml
+++ b/addons/account/wizard/account_report_balance_sheet_view.xml
@@ -30,6 +30,7 @@
diff --git a/addons/account/wizard/account_report_general_ledger_view.xml b/addons/account/wizard/account_report_general_ledger_view.xml
index b251252851c..5a6707f82de 100644
--- a/addons/account/wizard/account_report_general_ledger_view.xml
+++ b/addons/account/wizard/account_report_general_ledger_view.xml
@@ -56,6 +56,7 @@
name="General Ledger"
parent="account.final_accounting_reports"
action="action_account_general_ledger_menu"
+ groups="group_account_manager"
id="menu_general_ledger"
/>
diff --git a/addons/account/wizard/account_report_partner_ledger_view.xml b/addons/account/wizard/account_report_partner_ledger_view.xml
index 33f8e765387..c1504f6d3f5 100644
--- a/addons/account/wizard/account_report_partner_ledger_view.xml
+++ b/addons/account/wizard/account_report_partner_ledger_view.xml
@@ -34,6 +34,7 @@
diff --git a/addons/account/wizard/account_tax_chart_view.xml b/addons/account/wizard/account_tax_chart_view.xml
index f60ad394857..4174285d64d 100644
--- a/addons/account/wizard/account_tax_chart_view.xml
+++ b/addons/account/wizard/account_tax_chart_view.xml
@@ -34,12 +34,13 @@
new
-
-
+
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index c8a6645f744..018c753a7c2 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -10,7 +10,7 @@
-
-
diff --git a/addons/account_voucher/i18n/pl.po b/addons/account_voucher/i18n/pl.po
index a1ddddebc4d..2bde4729e33 100644
--- a/addons/account_voucher/i18n/pl.po
+++ b/addons/account_voucher/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-07 16:41+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \n"
+"PO-Revision-Date: 2010-10-08 07:28+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/invoice.py b/addons/account_voucher/invoice.py
new file mode 100644
index 00000000000..a2cf45391fb
--- /dev/null
+++ b/addons/account_voucher/invoice.py
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+import netsvc
+from osv import fields, osv
+from tools.translate import _
+
+class invoice(osv.osv):
+ _inherit = 'account.invoice'
+ def invoice_pay_customer(self, cr, uid, ids, context={}):
+ if not ids: return []
+ inv = self.browse(cr, uid, ids[0], context=context)
+ return {
+ 'name':_("Pay Invoice"),
+ 'view_mode': 'form',
+ 'view_id': False,
+ 'view_type': 'form',
+ 'res_model': 'account.voucher',
+ 'type': 'ir.actions.act_window',
+ 'nodestroy': True,
+ 'target': 'new',
+ 'domain': '[]',
+ 'context': {
+ 'default_partner_id': inv.partner_id.id,
+ 'default_amount': inv.residual,
+ 'default_name':inv.name,
+ 'close_after_process': True,
+ 'invoice_type':inv.type,
+ 'invoice_id':inv.id,
+ 'default_type': inv.type in ('out_invoice','out_refund') and 'receipt' or 'payment'
+ }
+ }
+
+invoice()
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 1e717a07a33..8169cac31e3 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -219,7 +219,7 @@
-
+
@@ -257,7 +257,7 @@
account.voucher
form
-
@@ -334,7 +334,7 @@
- Sales Payment
+ Customer Payment
account.voucher
form
[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt')]
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 576bf5fa5c7..7bc64a825ae 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -80,7 +80,7 @@
- Sales Payment
+ Customer Payment
account.voucher
form
[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt'), ('partner_id','=',partner_id)]
@@ -111,7 +111,7 @@
-
+
@@ -152,8 +152,8 @@
-
-
+
+
@@ -186,6 +186,7 @@
@@ -203,9 +204,9 @@
account.voucher
form
-
@@ -255,7 +256,7 @@
-
+
@@ -263,7 +264,7 @@
- Vendor Bills
+ Supplier Vouchers
account.voucher
form
[('journal_id.type','in',['purchase','purchase_refund']), ('type','=','purchase')]
@@ -285,7 +286,8 @@
+ action="action_purchase_receipt" parent="account.menu_finance_payables" sequence="10"
+ groups="base.group_extended"/>
diff --git a/addons/analytic/i18n/de.po b/addons/analytic/i18n/de.po
index 8b1b7f71017..36f8cbaaa2d 100644
--- a/addons/analytic/i18n/de.po
+++ b/addons/analytic/i18n/de.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-06-18 10:59+0000\n"
-"PO-Revision-Date: 2010-08-23 06:40+0000\n"
-"Last-Translator: Ferdinand-chricar \n"
+"PO-Revision-Date: 2010-10-10 10:41+0000\n"
+"Last-Translator: Ferdinand @ ChriCar \n"
"Language-Team: German \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic
@@ -50,7 +50,7 @@ msgstr "Definiert die zu zählende Menge"
#. module: analytic
#: help:account.analytic.line,currency_id:0
msgid "The related account currency if not equal to the company one."
-msgstr ""
+msgstr "Die zugeöhrige Währung, wenn abweichend von der Wirmenwährung."
#. module: analytic
#: model:ir.module.module,description:analytic.module_meta_information
@@ -108,7 +108,7 @@ msgstr ""
#. module: analytic
#: field:account.analytic.account,type:0
msgid "Account Type"
-msgstr ""
+msgstr "Kontoart"
#. module: analytic
#: selection:account.analytic.account,state:0
diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml
index 6147ee3e158..2eeda3aa370 100644
--- a/addons/analytic/security/analytic_security.xml
+++ b/addons/analytic/security/analytic_security.xml
@@ -7,9 +7,7 @@
[('company_id','=',user.company_id.id)]
-
-
- Analytic Accounting
+
+ Useability / Analytic Accounting
-
diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml
index a26e5355cde..da4989756f9 100644
--- a/addons/auction/auction_demo.xml
+++ b/addons/auction/auction_demo.xml
@@ -10,93 +10,93 @@
- Auction Adjudications
- A0
- view
-
-
-
-
-
-
+ Auction Adjudications
+ A0
+ view
+
+
+
+
+
+
- Auction Adjudication Expenses
- A1
- view
-
-
-
-
-
-
+ Auction Adjudication Expenses
+ A1
+ view
+
+
+
+
+
+
-
- Auction Adjudications
- A7x*
+
+ Auction Adjudications
+ A7x*
- receivable
-
-
-
+ receivable
+
+
+
-
- Auction Adjudication Expenses
- A6x*
-
- payable
-
-
-
+
+ Auction Adjudication Expenses
+ A6x*
+
+ payable
+
+
+
-
- Auction Buyer Costs
- A8x*
- payable
-
-
-
-
-
- Auction Seller Costs
- A9x*
- receivable
-
-
-
-
+
+ Auction Buyer Costs
+ A8x*
+ payable
+
+
+
+
+
+ Auction Seller Costs
+ A9x*
+ receivable
+
+
+
+
-
- Author rights (4%)
- percent
- code
- 0.04
- sabam
-
-
- result = (price_unit>=1250)
-
-
- Buyer Costs (20%)
- percent
- 0.20
- auction
-
-
-
-
- Seller Costs (12%)
- percent
- -0.12
- auction
-
-
-
-
-
- 770.0
- 700.0
-
+
+ Author rights (4%)
+ percent
+ code
+ 0.04
+ sabam
+
+
+ result = (price_unit>=1250)
+
+
+ Buyer Costs (20%)
+ percent
+ 0.20
+ auction
+
+
+
+
+ Seller Costs (12%)
+ percent
+ -0.12
+ auction
+
+
+
+
+
+ 770.0
+ 700.0
+
@@ -106,39 +106,39 @@
- Bruxelles1
- Benoit Mortie1r1
- 1030
-
- info@opensides.be
- (+32)2 211 34 83
- Rue des Palais 44, bte 33
- default
-
-
+ Bruxelles1
+ Benoit Mortie1r1
+ 1030
+
+ info@opensides.be
+ (+32)2 211 34 83
+ Rue des Palais 44, bte 33
+ default
+
+
-
- Avignon CEDEX 091
- Laurent Jacot1
- 84911
-
- contact@tecsas.fr
- (+33)4.32.74.10.57
- 85 rue du traite de Rome
- default
-
-
+
+ Avignon CEDEX 091
+ Laurent Jacot1
+ 84911
+
+ contact@tecsas.fr
+ (+33)4.32.74.10.57
+ 85 rue du traite de Rome
+ default
+
+
-
- Louvain-la-Neuve
- Thomas Passot
- 1348
-
- info@mediapole.net
- (+32).10.45.17.73
- Rue de l'Angelique, 1
-
-
+
+ Louvain-la-Neuve
+ Thomas Passot
+ 1348
+
+ info@mediapole.net
+ (+32).10.45.17.73
+ Rue de l'Angelique, 1
+
+
@@ -331,33 +331,33 @@
-
-
- keep
+
+
+ keep
-
-
- keep
+
+
+ keep
-
-
- keep
+
+
+ keep
-
-
- keep
+
+
+ keep
-
-
- keep
+
+
+ keep
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index 3c8cb5c0278..1cda8ceba60 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -14,8 +14,8 @@
tree
-
-
+
+
@@ -27,10 +27,10 @@
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 695849e8cf9..ccf85a36422 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -56,7 +56,6 @@ class crm_lead2opportunity(osv.osv_memory):
lead_obj = self.pool.get('crm.lead')
data_obj = self.pool.get('ir.model.data')
- model_obj = self.pool.get('ir.model')
# Get Opportunity views
result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
@@ -156,7 +155,7 @@ class crm_lead2opportunity_partner(osv.osv_memory):
_columns = {
'partner_id': fields.many2one('res.partner', 'Partner'),
- 'action': fields.selection([('exist', 'Link to an existing partner'), ('create', 'Create a new partner')], 'Action'),
+ 'action': fields.selection([('exist', 'Link to an existing partner'), ('create', 'Create a new partner'), ('no','Do not create a partner')], 'Action'),
}
def make_partner(self, cr, uid, ids, context=None):
@@ -174,8 +173,6 @@ class crm_lead2opportunity_partner(osv.osv_memory):
context = {}
partner_ids = self._create_partner(cr, uid, ids, context)
- mod_obj = self.pool.get('ir.model.data')
- result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
value = {}
data_obj = self.pool.get('ir.model.data')
data_id = data_obj._get_id(cr, uid, 'crm', 'view_crm_lead2opportunity_action')
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index e2920d8f9d4..6b0cca78cb3 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -57,7 +57,6 @@
-
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index 21c95442371..80cb4ecf69f 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -69,7 +69,6 @@ class crm_lead2partner(osv.osv_memory):
lead_obj = self.pool.get('crm.lead')
partner_obj = self.pool.get('res.partner')
contact_obj = self.pool.get('res.partner.address')
- rec_ids = context and context.get('active_ids', [])
partner_id = False
data = context and context.get('active_ids', []) or []
@@ -207,12 +206,13 @@ class crm_lead2partner(osv.osv_memory):
partner_ids.append(partner_id)
- vals = {}
- if partner_id:
- vals.update({'partner_id': partner_id})
- if contact_id:
- vals.update({'partner_address_id': contact_id})
- lead_obj.write(cr, uid, [lead.id], vals)
+ if data.action<>'no':
+ vals = {}
+ if partner_id:
+ vals.update({'partner_id': partner_id})
+ if contact_id:
+ vals.update({'partner_address_id': contact_id})
+ lead_obj.write(cr, uid, [lead.id], vals)
return partner_ids
def make_partner(self, cr, uid, ids, context=None):
diff --git a/addons/crm_claim/i18n/nl.po b/addons/crm_claim/i18n/nl.po
index 12c33ba2d66..9429ed442e5 100644
--- a/addons/crm_claim/i18n/nl.po
+++ b/addons/crm_claim/i18n/nl.po
@@ -8,84 +8,84 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-08-20 12:07+0000\n"
-"PO-Revision-Date: 2010-09-10 11:49+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2010-10-09 14:10+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Dutch \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-10-10 04:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm_claim
#: field:crm.claim,planned_revenue:0
msgid "Planned Revenue"
-msgstr ""
+msgstr "Geraamde omzet"
#. module: crm_claim
#: field:crm.claim.report,nbr:0
msgid "# of Cases"
-msgstr ""
+msgstr "# Dossiers"
#. module: crm_claim
#: view:crm.claim:0
#: view:crm.claim.report:0
msgid "Group By..."
-msgstr ""
+msgstr "Groepeer op.."
#. module: crm_claim
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Ongeldige modelnaam in de definitie van de actie."
#. module: crm_claim
#: selection:crm.claim.report,month:0
msgid "March"
-msgstr ""
+msgstr "Maart"
#. module: crm_claim
#: field:crm.claim.report,delay_close:0
msgid "Delay to close"
-msgstr ""
+msgstr "Vertraging tot sluiting"
#. module: crm_claim
#: field:crm.claim,company_id:0
#: view:crm.claim.report:0
#: field:crm.claim.report,company_id:0
msgid "Company"
-msgstr ""
+msgstr "Bedrijf"
#. module: crm_claim
#: field:crm.claim,email_cc:0
msgid "Watchers Emails"
-msgstr ""
+msgstr "Email toeschouwers"
#. module: crm_claim
#: view:crm.claim.report:0
msgid "#Claim"
-msgstr ""
+msgstr "# Klacht"
#. module: crm_claim
#: view:crm.claim.report:0
msgid "This Year"
-msgstr ""
+msgstr "Dit jaar"
#. module: crm_claim
#: view:crm.claim.report:0
msgid "Cases"
-msgstr ""
+msgstr "Dossiers"
#. module: crm_claim
#: selection:crm.claim,priority:0
#: selection:crm.claim.report,priority:0
msgid "Highest"
-msgstr ""
+msgstr "Hoogste"
#. module: crm_claim
#: view:crm.claim.report:0
#: field:crm.claim.report,day:0
msgid "Day"
-msgstr ""
+msgstr "Dag"
#. module: crm_claim
#: help:crm.claim,canal_id:0
@@ -94,6 +94,9 @@ msgid ""
"customer. With each commercial opportunity, you can indicate thecanall which "
"is this opportunity source."
msgstr ""
+"De kanalen geven de verschillende beschikbare communicatievormen met de "
+"klant weer. Met elke verkoopkans kunt u aangeven via welk kanaal deze kans "
+"is ontstaan."
#. module: crm_claim
#: help:crm.claim,section_id:0
@@ -101,152 +104,154 @@ msgid ""
"Sales team to which Case belongs to.Define Responsible user and Email "
"account for mail gateway."
msgstr ""
+"Verkoopteam waaraan het dossier is toegewezen. Definieer de "
+"verantwoordelijke gebruiker en email account voor mail gateway."
#. module: crm_claim
#: field:crm.claim,partner_mobile:0
msgid "Mobile"
-msgstr ""
+msgstr "Mobiel"
#. module: crm_claim
#: field:crm.claim,message_ids:0
msgid "Messages"
-msgstr ""
+msgstr "Berichten"
#. module: crm_claim
#: model:crm.case.categ,name:crm_claim.categ_claim1
msgid "Factual Claims"
-msgstr ""
+msgstr "Feitelijke klachten"
#. module: crm_claim
#: field:crm.claim,type_id:0
#: field:crm.claim.report,type_id:0
msgid "Claim Type"
-msgstr ""
+msgstr "Soort klacht"
#. module: crm_claim
#: selection:crm.claim,state:0
#: selection:crm.claim.report,state:0
msgid "Cancelled"
-msgstr ""
+msgstr "Geannuleerd"
#. module: crm_claim
#: model:crm.case.resource.type,name:crm_claim.type_claim2
msgid "Preventive"
-msgstr ""
+msgstr "Preventief"
#. module: crm_claim
#: model:crm.case.stage,name:crm_claim.stage_claim2
msgid "Fixed"
-msgstr ""
+msgstr "Opgelost"
#. module: crm_claim
#: field:crm.claim,partner_address_id:0
msgid "Partner Contact"
-msgstr ""
+msgstr "Contactpersoon relatie"
#. module: crm_claim
#: view:crm.claim.report:0
msgid "My Case"
-msgstr ""
+msgstr "Mijn klacht"
#. module: crm_claim
#: field:crm.claim,ref:0
msgid "Reference"
-msgstr ""
+msgstr "Referentie"
#. module: crm_claim
#: field:crm.claim,date_action_next:0
msgid "Next Action"
-msgstr ""
+msgstr "Volgende actie"
#. module: crm_claim
#: view:crm.claim:0
msgid "Reset to Draft"
-msgstr ""
+msgstr "Terugzetten naar Concept"
#. module: crm_claim
#: view:crm.claim:0
msgid "Extra Info"
-msgstr ""
+msgstr "Extra info"
#. module: crm_claim
#: view:crm.claim:0
#: field:crm.claim,partner_id:0
#: field:crm.claim.report,partner_id:0
msgid "Partner"
-msgstr ""
+msgstr "Relatie"
#. module: crm_claim
#: field:crm.claim,active:0
msgid "Active"
-msgstr ""
+msgstr "Actief"
#. module: crm_claim
#: field:crm.claim,date_closed:0
#: selection:crm.claim,state:0
#: selection:crm.claim.report,state:0
msgid "Closed"
-msgstr ""
+msgstr "Gesloten"
#. module: crm_claim
#: view:crm.claim.report:0
#: field:crm.claim.report,section_id:0
msgid "Section"
-msgstr ""
+msgstr "Afdeling"
#. module: crm_claim
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Ongeldige XML voor weergave opbouw!"
#. module: crm_claim
#: field:crm.claim,priority:0
#: view:crm.claim.report:0
#: field:crm.claim.report,priority:0
msgid "Priority"
-msgstr ""
+msgstr "Prioriteit"
#. module: crm_claim
#: view:crm.claim:0
msgid "Send New Email"
-msgstr ""
+msgstr "Verstuur nieuwe email"
#. module: crm_claim
#: view:crm.claim:0
msgid "Reply"
-msgstr ""
+msgstr "Beantwoorden"
#. module: crm_claim
#: view:crm.claim:0
msgid "Stage: "
-msgstr ""
+msgstr "Fase: "
#. module: crm_claim
#: view:crm.claim:0
#: view:crm.claim.report:0
msgid "Type"
-msgstr ""
+msgstr "Soort"
#. module: crm_claim
#: field:crm.claim,email_from:0
msgid "Email"
-msgstr ""
+msgstr "Email"
#. module: crm_claim
#: field:crm.claim,canal_id:0
msgid "Channel"
-msgstr ""
+msgstr "Kanaal"
#. module: crm_claim
#: selection:crm.claim,priority:0
#: selection:crm.claim.report,priority:0
msgid "Lowest"
-msgstr ""
+msgstr "Laagste"
#. module: crm_claim
#: field:crm.claim,create_date:0
msgid "Creation Date"
-msgstr ""
+msgstr "Aanmaakdatum"
#. module: crm_claim
#: view:crm.claim:0
@@ -254,28 +259,28 @@ msgstr ""
#: view:crm.claim.report:0
#: selection:crm.claim.report,state:0
msgid "Pending"
-msgstr ""
+msgstr "Wacht"
#. module: crm_claim
#: view:crm.claim:0
#: field:crm.claim,date_deadline:0
msgid "Deadline"
-msgstr ""
+msgstr "Uiterste datum"
#. module: crm_claim
#: selection:crm.claim.report,month:0
msgid "July"
-msgstr ""
+msgstr "Juli"
#. module: crm_claim
#: model:ir.actions.act_window,name:crm_claim.crm_claim_stage_act
msgid "Claim Stages"
-msgstr ""
+msgstr "Klachtfases"
#. module: crm_claim
#: model:ir.ui.menu,name:crm_claim.menu_crm_case_claim-act
msgid "Categories"
-msgstr ""
+msgstr "Categoriën"
#. module: crm_claim
#: view:crm.claim:0
@@ -283,110 +288,110 @@ msgstr ""
#: view:crm.claim.report:0
#: field:crm.claim.report,stage_id:0
msgid "Stage"
-msgstr ""
+msgstr "Fase"
#. module: crm_claim
#: view:crm.claim:0
msgid "History Information"
-msgstr ""
+msgstr "Historie Informatie"
#. module: crm_claim
#: view:crm.claim:0
msgid "Dates"
-msgstr ""
+msgstr "Data"
#. module: crm_claim
#: model:ir.actions.act_window,name:crm_claim.crm_claim_resource_act
msgid "Claim Resource Type"
-msgstr ""
+msgstr "Klacht Actie Soorten"
#. module: crm_claim
#: view:crm.claim:0
msgid "Contact"
-msgstr ""
+msgstr "Contactpersoon"
#. module: crm_claim
#: model:ir.ui.menu,name:crm_claim.menu_crm_claim_stage_act
msgid "Stages"
-msgstr ""
+msgstr "Fasen"
#. module: crm_claim
#: model:ir.ui.menu,name:crm_claim.menu_report_crm_claim_tree
msgid "Claims Analysis"
-msgstr ""
+msgstr "Klachten Analyse"
#. module: crm_claim
#: help:crm.claim.report,delay_close:0
msgid "Number of Days to close the case"
-msgstr ""
+msgstr "Aantal dagen om de klacht te sluiten"
#. module: crm_claim
#: model:ir.model,name:crm_claim.model_crm_claim_report
msgid "CRM Claim Report"
-msgstr ""
+msgstr "CRM Klachtenrapport"
#. module: crm_claim
#: view:crm.claim:0
msgid "Status and Categorization"
-msgstr ""
+msgstr "Status en and indeling"
#. module: crm_claim
#: model:crm.case.stage,name:crm_claim.stage_claim1
msgid "Accepted as Claim"
-msgstr ""
+msgstr "Geaccepteerd als klacht"
#. module: crm_claim
#: model:crm.case.resource.type,name:crm_claim.type_claim1
msgid "Corrective"
-msgstr ""
+msgstr "Correctief"
#. module: crm_claim
#: selection:crm.claim.report,month:0
msgid "September"
-msgstr ""
+msgstr "September"
#. module: crm_claim
#: selection:crm.claim.report,month:0
msgid "December"
-msgstr ""
+msgstr "December"
#. module: crm_claim
#: view:crm.claim.report:0
#: field:crm.claim.report,month:0
msgid "Month"
-msgstr ""
+msgstr "Maand"
#. module: crm_claim
#: field:crm.claim,write_date:0
msgid "Update Date"
-msgstr ""
+msgstr "Wijzigingsdatum"
#. module: crm_claim
#: field:crm.claim,ref2:0
msgid "Reference 2"
-msgstr ""
+msgstr "Referentie 2"
#. module: crm_claim
#: field:crm.claim,categ_id:0
#: view:crm.claim.report:0
#: field:crm.claim.report,categ_id:0
msgid "Category"
-msgstr ""
+msgstr "Categorie"
#. module: crm_claim
#: model:crm.case.categ,name:crm_claim.categ_claim2
msgid "Value Claims"
-msgstr ""
+msgstr "Waarde klachten"
#. module: crm_claim
#: view:crm.claim:0
msgid "Closure Date"
-msgstr ""
+msgstr "Afsluitdatum"
#. module: crm_claim
#: field:crm.claim,planned_cost:0
msgid "Planned Costs"
-msgstr ""
+msgstr "Verwachte kosten"
#. module: crm_claim
#: help:crm.claim,email_cc:0
@@ -395,111 +400,114 @@ msgid ""
"outbound emails for this record before being sent. Separate multiple email "
"addresses with a comma"
msgstr ""
+"Deze email adressen worden toegevoegd aan het CC veld van alle inkomende en "
+"uitgaande emails van dit record voordat het wordt verstuurd. Meerdere namen "
+"scheidt u met een komma (,)."
#. module: crm_claim
#: selection:crm.claim,state:0
#: view:crm.claim.report:0
#: selection:crm.claim.report,state:0
msgid "Draft"
-msgstr ""
+msgstr "Concept"
#. module: crm_claim
#: selection:crm.claim,priority:0
#: selection:crm.claim.report,priority:0
msgid "Low"
-msgstr ""
+msgstr "Laag"
#. module: crm_claim
#: constraint:ir.ui.menu:0
msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Fout ! U kunt geen recursief menu maken."
#. module: crm_claim
#: view:crm.claim.report:0
msgid "7 Days"
-msgstr ""
+msgstr "7 Dagen"
#. module: crm_claim
#: selection:crm.claim.report,month:0
msgid "August"
-msgstr ""
+msgstr "Augustus"
#. module: crm_claim
#: selection:crm.claim,priority:0
#: selection:crm.claim.report,priority:0
msgid "Normal"
-msgstr ""
+msgstr "Normaal"
#. module: crm_claim
#: view:crm.claim:0
msgid "Global CC"
-msgstr ""
+msgstr "Globale CC"
#. module: crm_claim
#: model:ir.module.module,shortdesc:crm_claim.module_meta_information
msgid "Customer & Supplier Relationship Management"
-msgstr ""
+msgstr "Customer & Supplier Relationship Management"
#. module: crm_claim
#: selection:crm.claim.report,month:0
msgid "June"
-msgstr ""
+msgstr "Juni"
#. module: crm_claim
#: view:crm.claim:0
msgid "Type of Action"
-msgstr ""
+msgstr "Soort actie"
#. module: crm_claim
#: field:crm.claim,partner_phone:0
msgid "Phone"
-msgstr ""
+msgstr "Telefoon"
#. module: crm_claim
#: view:crm.claim.report:0
#: field:crm.claim.report,user_id:0
msgid "User"
-msgstr ""
+msgstr "Gebruiker"
#. module: crm_claim
#: model:crm.case.stage,name:crm_claim.stage_claim5
msgid "Awaiting Response"
-msgstr ""
+msgstr "Wacht op reactie"
#. module: crm_claim
#: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
msgid "Claim Categories"
-msgstr ""
+msgstr "Klachtcategoriën"
#. module: crm_claim
#: selection:crm.claim.report,month:0
msgid "November"
-msgstr ""
+msgstr "November"
#. module: crm_claim
#: view:crm.claim.report:0
msgid "Extended Filters..."
-msgstr ""
+msgstr "Uitgebreide filters..."
#. module: crm_claim
#: view:crm.claim:0
msgid "Closure"
-msgstr ""
+msgstr "Afsluiting"
#. module: crm_claim
#: model:ir.ui.menu,name:crm_claim.menu_crm_claim_type_act
msgid "Resource Type"
-msgstr ""
+msgstr "Actie Soort"
#. module: crm_claim
#: view:crm.claim.report:0
msgid "Search"
-msgstr ""
+msgstr "Zoeken"
#. module: crm_claim
#: selection:crm.claim.report,month:0
msgid "October"
-msgstr ""
+msgstr "Oktober"
#. module: crm_claim
#: model:ir.module.module,description:crm_claim.module_meta_information
@@ -511,31 +519,37 @@ msgid ""
"automatically new claims based on incoming emails.\n"
" "
msgstr ""
+"\n"
+"Deze modules laten u de klachten van uw klanten en leveranciers volgen.\n"
+"Het is volledig geïntegreerd met de e-mail gateway zodat u automatisch "
+"nieuwe\n"
+"klachten kunt maken op basis van ingekomen emails.\n"
+" "
#. module: crm_claim
#: selection:crm.claim.report,month:0
msgid "January"
-msgstr ""
+msgstr "Januari"
#. module: crm_claim
#: view:crm.claim:0
msgid "Claim Date"
-msgstr ""
+msgstr "Klachtdatum"
#. module: crm_claim
#: help:crm.claim,email_from:0
msgid "These people will receive email."
-msgstr ""
+msgstr "Deze personen ontvangen email."
#. module: crm_claim
#: field:crm.claim,date:0
msgid "Date"
-msgstr ""
+msgstr "Datum"
#. module: crm_claim
#: model:crm.case.stage,name:crm_claim.stage_claim4
msgid "Invalid"
-msgstr ""
+msgstr "Ongeldig"
#. module: crm_claim
#: view:crm.claim:0
@@ -544,28 +558,28 @@ msgstr ""
#: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
#: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
msgid "Claims"
-msgstr ""
+msgstr "Klachten"
#. module: crm_claim
#: model:crm.case.categ,name:crm_claim.categ_claim3
msgid "Policy Claims"
-msgstr ""
+msgstr "Procedurele klachten"
#. module: crm_claim
#: view:crm.claim:0
msgid "History"
-msgstr ""
+msgstr "Historie"
#. module: crm_claim
#: model:ir.model,name:crm_claim.model_crm_claim
#: model:ir.ui.menu,name:crm_claim.menu_config_claim
msgid "Claim"
-msgstr ""
+msgstr "Klacht"
#. module: crm_claim
#: view:crm.claim:0
msgid "Attachments"
-msgstr ""
+msgstr "Bijlagen"
#. module: crm_claim
#: view:crm.claim:0
@@ -573,34 +587,34 @@ msgstr ""
#: view:crm.claim.report:0
#: field:crm.claim.report,state:0
msgid "State"
-msgstr ""
+msgstr "Status"
#. module: crm_claim
#: view:crm.claim:0
msgid "Claim Info"
-msgstr ""
+msgstr "Klacht Informatie"
#. module: crm_claim
#: view:crm.claim:0
#: view:crm.claim.report:0
msgid "Done"
-msgstr ""
+msgstr "Klaar"
#. module: crm_claim
#: view:crm.claim:0
msgid "Communication"
-msgstr ""
+msgstr "Communicatie"
#. module: crm_claim
#: view:crm.claim:0
#: view:crm.claim.report:0
msgid "Cancel"
-msgstr ""
+msgstr "Annuleren"
#. module: crm_claim
#: view:crm.claim:0
msgid "Close"
-msgstr ""
+msgstr "Sluiten"
#. module: crm_claim
#: view:crm.claim:0
@@ -608,85 +622,86 @@ msgstr ""
#: view:crm.claim.report:0
#: selection:crm.claim.report,state:0
msgid "Open"
-msgstr ""
+msgstr "Open"
#. module: crm_claim
#: view:crm.claim:0
msgid "In Progress"
-msgstr ""
+msgstr "In behandeling"
#. module: crm_claim
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
#. module: crm_claim
#: view:crm.claim:0
#: field:crm.claim,user_id:0
msgid "Responsible"
-msgstr ""
+msgstr "Verantwoordelijke"
#. module: crm_claim
#: view:crm.claim:0
msgid "Date of Claim"
-msgstr ""
+msgstr "Klachtdatum"
#. module: crm_claim
#: view:crm.claim:0
msgid "Current"
-msgstr ""
+msgstr "Actueel"
#. module: crm_claim
#: view:crm.claim:0
msgid "Details"
-msgstr ""
+msgstr "Details"
#. module: crm_claim
#: view:crm.claim:0
msgid "Cases By Stage and Estimates"
-msgstr ""
+msgstr "Klachten op fase en schattingen"
#. module: crm_claim
#: view:crm.claim:0
msgid "Claim/Action Description"
-msgstr ""
+msgstr "Klacht/actie omschrijving"
#. module: crm_claim
#: field:crm.claim,description:0
msgid "Description"
-msgstr ""
+msgstr "Omschrijving"
#. module: crm_claim
#: view:crm.claim:0
msgid "Search Claims"
-msgstr ""
+msgstr "Zoek klachten"
#. module: crm_claim
#: selection:crm.claim.report,month:0
msgid "May"
-msgstr ""
+msgstr "Mei"
#. module: crm_claim
#: model:ir.actions.act_window,name:crm_claim.act_claim_partner
#: model:ir.actions.act_window,name:crm_claim.act_claim_partner_address
msgid "Report a Claim"
-msgstr ""
+msgstr "Rapporteer een klacht"
#. module: crm_claim
#: field:crm.claim,probability:0
msgid "Probability (%)"
-msgstr ""
+msgstr "Waarschijnlijkheid (%)"
#. module: crm_claim
#: field:crm.claim,partner_name:0
msgid "Employee's Name"
-msgstr ""
+msgstr "Werknemernaam"
#. module: crm_claim
#: view:crm.claim.report:0
msgid "This Month"
-msgstr ""
+msgstr "Deze maand"
#. module: crm_claim
#: help:crm.claim,state:0
@@ -699,66 +714,73 @@ msgid ""
" \n"
"If the case needs to be reviewed then the state is set to 'Pending'."
msgstr ""
+"De status wordt op 'Concept' gezet als het dossier wordt gemaakt. "
+" \n"
+"Als het dossier in behandeling is, wordt de status op 'Open' gezet. "
+" \n"
+"Als het dossier klaar is, gaat de status naar 'Gereed'. "
+" \n"
+"Als het dossier moet worden nagekeken, wordt de status op 'Wachtend' gezet."
#. module: crm_claim
#: selection:crm.claim.report,month:0
msgid "February"
-msgstr ""
+msgstr "Februari"
#. module: crm_claim
#: field:crm.claim,name:0
msgid "Name"
-msgstr ""
+msgstr "Naam"
#. module: crm_claim
#: view:crm.claim:0
msgid "Communication history"
-msgstr ""
+msgstr "Communicatiegeschiedenis"
#. module: crm_claim
#: model:crm.case.stage,name:crm_claim.stage_claim3
msgid "Won't fix"
-msgstr ""
+msgstr "Wordt niet opgelost"
#. module: crm_claim
#: selection:crm.claim.report,month:0
msgid "April"
-msgstr ""
+msgstr "April"
#. module: crm_claim
#: view:crm.claim:0
msgid "References"
-msgstr ""
+msgstr "Verwijzingen"
#. module: crm_claim
#: field:crm.claim,id:0
msgid "ID"
-msgstr ""
+msgstr "ID"
#. module: crm_claim
#: selection:crm.claim,priority:0
#: selection:crm.claim.report,priority:0
msgid "High"
-msgstr ""
+msgstr "Hoog"
#. module: crm_claim
#: view:crm.claim:0
#: field:crm.claim,section_id:0
msgid "Sales Team"
-msgstr ""
+msgstr "Verkoopteam"
#. module: crm_claim
#: field:crm.claim.report,create_date:0
msgid "Create Date"
-msgstr ""
+msgstr "Aanmaakdatum"
#. module: crm_claim
#: field:crm.claim,date_action_last:0
msgid "Last Action"
-msgstr ""
+msgstr "Laatste actie"
#. module: crm_claim
#: view:crm.claim.report:0
#: field:crm.claim.report,name:0
msgid "Year"
-msgstr ""
+msgstr "Jaar"
diff --git a/addons/decimal_precision/i18n/de.po b/addons/decimal_precision/i18n/de.po
index c4837bc8a4a..b306e019bb5 100644
--- a/addons/decimal_precision/i18n/de.po
+++ b/addons/decimal_precision/i18n/de.po
@@ -8,46 +8,47 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-08-20 05:24+0000\n"
-"PO-Revision-Date: 2010-09-19 15:22+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2010-10-10 10:48+0000\n"
+"Last-Translator: Ferdinand @ ChriCar \n"
"Language-Team: German \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: decimal_precision
#: field:decimal.precision,digits:0
msgid "Digits"
-msgstr ""
+msgstr "Stellen"
#. module: decimal_precision
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Fehler in xml Ansicht."
#. module: decimal_precision
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Das Objekt muss mit einem x_ beginnen und darf keine Sonderzeichen haben !"
#. module: decimal_precision
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Ungültiger Modulname in der Aktionsdefinition."
#. module: decimal_precision
#: view:decimal.precision:0
msgid "Decimal Precision"
-msgstr ""
+msgstr "Nachkommastellen"
#. module: decimal_precision
#: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
#: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form
msgid "Decimal Accuracy Definitions"
-msgstr ""
+msgstr "Dezimal Genauigkeit Definition"
#. module: decimal_precision
#: model:ir.module.module,description:decimal_precision.module_meta_information
@@ -59,23 +60,28 @@ msgid ""
"\n"
"The decimal precision is configured per company.\n"
msgstr ""
+"\n"
+"Dieses Module ermöglicht die Definition der Anzahl der Decimalstellen für "
+"verschiende Bereiche\n"
+"Finanz, Verkauf, EInkauf ....\n"
+"Diese Konfiguration wird je Firma eingestellt.\n"
#. module: decimal_precision
#: constraint:ir.ui.menu:0
msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Menüeinträge erstellen."
#. module: decimal_precision
#: field:decimal.precision,name:0
msgid "Usage"
-msgstr ""
+msgstr "Verwendung"
#. module: decimal_precision
#: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
msgid "Decimal Precision Configuration"
-msgstr ""
+msgstr "Dezimalstellen Konfiguration"
#. module: decimal_precision
#: model:ir.model,name:decimal_precision.model_decimal_precision
msgid "decimal.precision"
-msgstr ""
+msgstr "decimal.precision"
diff --git a/addons/document_webdav/i18n/eu.po b/addons/document_webdav/i18n/eu.po
index 2bcc8ad61a4..dde3ab14915 100644
--- a/addons/document_webdav/i18n/eu.po
+++ b/addons/document_webdav/i18n/eu.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-05-30 15:14+0000\n"
-"PO-Revision-Date: 2010-10-06 09:58+0000\n"
-"Last-Translator: Ales Zabala Alava (Shagi) \n"
+"PO-Revision-Date: 2010-10-08 07:38+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Basque \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document_webdav_old
diff --git a/addons/fetchmail/i18n/nl.po b/addons/fetchmail/i18n/nl.po
index ec87c239bcc..8a78d6f631b 100644
--- a/addons/fetchmail/i18n/nl.po
+++ b/addons/fetchmail/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-08-20 13:33+0000\n"
-"PO-Revision-Date: 2010-10-07 20:03+0000\n"
-"Last-Translator: Wouter Schrijvers \n"
+"PO-Revision-Date: 2010-10-08 07:39+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Dutch \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: fetchmail
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 0419445c82d..655b9d9bfd1 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -135,6 +135,7 @@ class hr_employee(osv.osv):
'address_id': fields.many2one('res.partner.address', 'Working Address'),
'address_home_id': fields.many2one('res.partner.address', 'Home Address'),
'partner_id': fields.related('address_home_id', 'partner_id', type='many2one', relation='res.partner', readonly=True, help="Partner that is related to the current employee. Accounting transaction will be written on this partner belongs to employee."),
+ 'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account', domain="[('partner_id','=',partner_id)]", help="Employee bank salary account"),
'work_phone': fields.related('address_id', 'phone', type='char', size=32, string='Work Phone', readonly=True),
'work_email': fields.related('address_id', 'email', type='char', size=240, string='Work E-mail'),
'work_location': fields.char('Office Location', size=32),
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index e4ccb11ce4e..08a8135353c 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -183,14 +183,14 @@
+
-
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 7ffdb349826..b30b22c559a 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -47,8 +47,8 @@
tree
-
+
@@ -96,12 +96,11 @@
-
-
-
+
+
-
+
@@ -143,14 +142,14 @@
domain="[('date','<=', time.strftime('%%Y-%%m-%%d')), ('date','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
-
+
+
+
-
-
diff --git a/addons/hr_expense/hr_expense_workflow.xml b/addons/hr_expense/hr_expense_workflow.xml
index 2bb0f51e26b..547129e89e2 100644
--- a/addons/hr_expense/hr_expense_workflow.xml
+++ b/addons/hr_expense/hr_expense_workflow.xml
@@ -83,12 +83,6 @@
refuse
-
-
-
- refuse
-
-
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 6ee69af1bca..124e424f620 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -90,11 +90,11 @@
+
+
-
-
@@ -401,7 +401,8 @@
\n"
"POT-Creation-Date: 2009-11-25 13:16+0000\n"
-"PO-Revision-Date: 2010-10-05 13:27+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2010-10-10 11:08+0000\n"
+"Last-Translator: Ferdinand @ ChriCar \n"
"Language-Team: German \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_payroll
#: rml:employees.salary:0
msgid "E-mail Address"
-msgstr ""
+msgstr "E-Mail Addresse"
#. module: hr_payroll
#: view:hr.holidays.status:0
msgid "(Based on type Payroll will calculate basic salary)"
-msgstr ""
+msgstr "(anhängig vom Typ wird der Grundgehalt berechnet)"
#. module: hr_payroll
#: field:hr.payroll.register,net:0
#: field:hr.payslip,net:0
msgid "Net Salary"
-msgstr ""
+msgstr "Netto Lohn"
#. module: hr_payroll
#: field:hr.payslip,working_days:0
msgid "Working Days"
-msgstr ""
+msgstr "Arbeitstage"
#. module: hr_payroll
#: selection:hr.payroll.register,state:0
#: selection:hr.payslip,state:0
msgid "New Slip"
-msgstr ""
+msgstr "Neue Abrechnung"
#. module: hr_payroll
#: rml:payroll.advice:0
msgid "Axis Bank"
-msgstr ""
+msgstr "Axis Bank"
#. module: hr_payroll
#: field:hr.employee,esp_account:0
@@ -57,7 +57,7 @@ msgstr ""
#. module: hr_payroll
#: help:hr.employee,analytic_account:0
msgid "Analytic Account for Salary Analysis"
-msgstr ""
+msgstr "Analytishes Konto für Personalkosten Analyse"
#. module: hr_payroll
#: rml:employees.salary:0
@@ -67,18 +67,18 @@ msgstr ""
#. module: hr_payroll
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Ungültiger Modulname in der Aktionsdefinition."
#. module: hr_payroll
#: rml:employees.salary:0
#: rml:salary.structure:0
msgid "Department"
-msgstr ""
+msgstr "Abteilung"
#. module: hr_payroll
#: rml:employees.salary:0
msgid "Deductions:"
-msgstr ""
+msgstr "Abzüge:"
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,gratuity:0
@@ -88,28 +88,28 @@ msgstr ""
#. module: hr_payroll
#: rml:payslip.pdf:0
msgid "Employee No"
-msgstr ""
+msgstr "Mitarbetier Nr."
#. module: hr_payroll
#: rml:hr.payroll.register.sheet:0
msgid "Salary Payment Register"
-msgstr ""
+msgstr "Bezüge Auszahlungsevidenz"
#. module: hr_payroll
#: field:hr.payslip,paid:0
msgid "Paid ? "
-msgstr ""
+msgstr "Bezahlt "
#. module: hr_payroll
#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
msgid "Year Salary Report"
-msgstr ""
+msgstr "Jährliches Lohnkonto"
#. module: hr_payroll
#: selection:hr.payroll.register,state:0
#: selection:hr.payslip,state:0
msgid "Paid Salary"
-msgstr ""
+msgstr "Bezahlter Lohn"
#. module: hr_payroll
#: field:hr.payroll.advice.line,flag:0
@@ -121,7 +121,7 @@ msgstr ""
#: field:hr.payslip,company_id:0
#: wizard_field:payroll.analysis,init,company_id:0
msgid "Company"
-msgstr ""
+msgstr "Unternehmen"
#. module: hr_payroll
#: help:hr.employee,employee_account:0
@@ -131,48 +131,48 @@ msgstr ""
#. module: hr_payroll
#: view:hr.payroll.advice:0
msgid "Letter Details"
-msgstr ""
+msgstr "Brief Details"
#. module: hr_payroll
#: rml:hr.payroll.register.sheet:0
msgid ","
-msgstr ""
+msgstr ","
#. module: hr_payroll
#: view:hr.payroll.advice:0
#: view:hr.payroll.register:0
#: view:hr.payslip:0
msgid "Set to Draft"
-msgstr ""
+msgstr "Setze auf Entwurf"
#. module: hr_payroll
#: rml:payroll.advice:0
msgid "The Manager"
-msgstr ""
+msgstr "Der Vorgesetzte"
#. module: hr_payroll
#: selection:hr.holidays.status,type:0
msgid "Half-Pay Holiday"
-msgstr ""
+msgstr "Teilvergüteter (50%) Feiertag"
#. module: hr_payroll
#: selection:hr.allounce.deduction.categoty,type:0
#: rml:hr.payroll.register.sheet:0
#: field:hr.payslip,other_pay:0
msgid "Others"
-msgstr ""
+msgstr "Andere"
#. module: hr_payroll
#: field:hr.payslip.line,slip_id:0
#: model:ir.model,name:hr_payroll.model_hr_payslip
#: rml:payslip.pdf:0
msgid "Pay Slip"
-msgstr ""
+msgstr "Lohnzettel"
#. module: hr_payroll
#: view:hr.allounce.deduction.categoty:0
msgid "Calculations Rules"
-msgstr ""
+msgstr "Rechenregeln"
#. module: hr_payroll
#: model:ir.module.module,description:hr_payroll.module_meta_information
diff --git a/addons/hr_payroll_account/__openerp__.py b/addons/hr_payroll_account/__openerp__.py
index 8cdfe0593e4..5dec5dc4fb8 100644
--- a/addons/hr_payroll_account/__openerp__.py
+++ b/addons/hr_payroll_account/__openerp__.py
@@ -24,7 +24,7 @@
'version': '1.0',
'category': 'Generic Modules/Human Resources',
'description': """Generic Payroll system Integrated with Accountings
- * Expanse Encoding
+ * Expense Encoding
* Payment Encoding
* Company Contribution Management
""",
diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index f5a6897bf1d..87b76895e1a 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -162,7 +162,7 @@ class hr_payslip(osv.osv):
for line in slip.line_ids:
if line.type == 'otherpay' and line.expanse_id.invoice_id:
if not line.expanse_id.invoice_id.move_id:
- raise osv.except_osv(_('Warning !'), _('Please Confirm all Expanse Invoice appear for Reimbursement'))
+ raise osv.except_osv(_('Warning !'), _('Please Confirm all Expense Invoice appear for Reimbursement'))
invids = [line.expanse_id.invoice_id.id]
amount = line.total
acc_id = slip.bank_journal_id.default_credit_account_id and slip.bank_journal_id.default_credit_account_id.id
@@ -487,7 +487,7 @@ class account_move_link_slip(osv.osv):
_description = 'Account Move Link to Pay Slip'
_columns = {
'name':fields.char('Name', size=256, required=True, readonly=False),
- 'move_id':fields.many2one('account.move', 'Expanse Entries', required=False, readonly=True),
+ 'move_id':fields.many2one('account.move', 'Expense Entries', required=False, readonly=True),
'slip_id':fields.many2one('hr.payslip', 'Pay Slip', required=False),
'sequence': fields.integer('Sequence'),
}
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index edd3bd77599..033fd68052c 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -128,10 +128,10 @@
-
-
-
+
+
+
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index c31dfd1ab0f..cb034a8659d 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -129,7 +129,7 @@
-
+
@@ -322,7 +322,9 @@
-
+
diff --git a/addons/knowledge/i18n/nl.po b/addons/knowledge/i18n/nl.po
index 2e270076d5f..0a432783b9e 100644
--- a/addons/knowledge/i18n/nl.po
+++ b/addons/knowledge/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-08-20 06:56+0000\n"
-"PO-Revision-Date: 2010-10-06 18:07+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) \n"
+"PO-Revision-Date: 2010-10-08 07:31+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Dutch \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: knowledge
diff --git a/addons/marketing/i18n/nl.po b/addons/marketing/i18n/nl.po
index bcf2ce6e299..d194189a5ee 100644
--- a/addons/marketing/i18n/nl.po
+++ b/addons/marketing/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-08-20 07:04+0000\n"
-"PO-Revision-Date: 2010-10-06 15:02+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) \n"
+"PO-Revision-Date: 2010-10-08 07:32+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Dutch \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: marketing
diff --git a/addons/marketing/i18n/ru.po b/addons/marketing/i18n/ru.po
new file mode 100644
index 00000000000..e0e0b256623
--- /dev/null
+++ b/addons/marketing/i18n/ru.po
@@ -0,0 +1,124 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2010-08-20 07:04+0000\n"
+"PO-Revision-Date: 2010-10-10 07:29+0000\n"
+"Last-Translator: OpenERP Administrators \n"
+"Language-Team: Russian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: marketing
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Некорректный формат XML для просмотра архитектуры!"
+
+#. module: marketing
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Название объекта должно начинаться с x_ и не должно содержать специальных "
+"символов !"
+
+#. module: marketing
+#: field:marketing.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "title"
+msgstr "заголовок"
+
+#. module: marketing
+#: field:marketing.installer,email_template:0
+msgid "Automated E-Mails"
+msgstr "Автоматизированные рассылки"
+
+#. module: marketing
+#: field:marketing.installer,config_logo:0
+msgid "Image"
+msgstr "Изображение"
+
+#. module: marketing
+#: help:marketing.installer,marketing_campaign:0
+msgid ""
+"Helps you to manage marketing campaigns and automate actions and "
+"communication steps."
+msgstr ""
+"Помогает Вам настроить маркетинговые кампании и автоматизировать действия и "
+"этапы взамодействия"
+
+#. module: marketing
+#: help:marketing.installer,marketing_campaign_mailchimp:0
+msgid ""
+"This modules integrate mailchimp.com's service with OpenERP to automate mass "
+"mailings."
+msgstr ""
+"Этот модуль интегрирует в OpenERP сервисы mailchimp.com для автоматизации "
+"почтовых рассылок"
+
+#. module: marketing
+#: model:ir.module.module,description:marketing.module_meta_information
+msgid "Menu for Marketing"
+msgstr ""
+
+#. module: marketing
+#: help:marketing.installer,email_template:0
+msgid ""
+"Helps you to design templates of emails and integrate them in your different "
+"processes."
+msgstr ""
+"Помогает разработать шаблоны сообщений электронной почты и интегрировать их "
+"в ваши процессы."
+
+#. module: marketing
+#: help:marketing.installer,crm_profiling:0
+msgid ""
+"Helps you to perform segmentation within partners and design questionaires."
+msgstr ""
+
+#. module: marketing
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Недопустимое имя модели в определении действия."
+
+#. module: marketing
+#: model:ir.module.module,shortdesc:marketing.module_meta_information
+msgid "Marketing"
+msgstr "Маркетинг"
+
+#. module: marketing
+#: field:marketing.installer,crm_profiling:0
+msgid "Profiling Tools"
+msgstr "Средства профилирования"
+
+#. module: marketing
+#: field:marketing.installer,marketing_campaign:0
+msgid "Marketing Campaigns"
+msgstr "Маркетинговые кампании"
+
+#. module: marketing
+#: model:ir.model,name:marketing.model_marketing_installer
+msgid "marketing.installer"
+msgstr ""
+
+#. module: marketing
+#: field:marketing.installer,marketing_campaign_mailchimp:0
+msgid "Mailchimp Integration"
+msgstr "Интеграция с сервисом MailChimp"
+
+#. module: marketing
+#: model:ir.actions.act_window,name:marketing.action_marketing_installer
+msgid "Marketing Modules Installation"
+msgstr "Установка модулей маркетинга"
diff --git a/addons/marketing_campaign/i18n/ru.po b/addons/marketing_campaign/i18n/ru.po
new file mode 100644
index 00000000000..bbcc17a7e60
--- /dev/null
+++ b/addons/marketing_campaign/i18n/ru.po
@@ -0,0 +1,935 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2010-08-20 07:09+0000\n"
+"PO-Revision-Date: 2010-10-10 07:30+0000\n"
+"Last-Translator: OpenERP Administrators \n"
+"Language-Team: Russian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "The current step for this item has no email or report to preview."
+msgstr ""
+"Текущий шаг для этого элемента не имеет доступных для предварительного "
+"просмотра отчетов иили шаблонов электронной почты"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Time"
+msgstr "Время"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+msgid "Group By..."
+msgstr "Группировать по .."
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,trigger:0
+msgid "Trigger"
+msgstr "Активатор"
+
+#. module: marketing_campaign
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Недопустимое имя модели в определении действия."
+
+#. module: marketing_campaign
+#: field:campaign.analysis,count:0
+msgid "# of Actions"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Campaign Editor"
+msgstr "Редактор кампаний"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "Today"
+msgstr "Сегодня"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "March"
+msgstr "Март"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,object_id:0
+#: field:marketing.campaign.segment,object_id:0
+#: field:marketing.campaign.workitem,object_id:0
+msgid "Object"
+msgstr "Объект"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Set to Draft"
+msgstr "Сделать черновиком"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,to_ids:0
+msgid "Next Activities"
+msgstr "Следующие действия"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Synchronization"
+msgstr "Синхронизация"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "This Year"
+msgstr "Этот год"
+
+#. module: marketing_campaign
+#: help:marketing.campaign,partner_field_id:0
+msgid ""
+"The generated workitems will be linked to the partner related to the record. "
+"If the record is the partner itself left this field empty."
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "No preview"
+msgstr "Без предпросмотра"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Outgoing Transitions"
+msgstr "Исходящее перемещение"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Reset"
+msgstr "Сброс"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,type:0
+msgid ""
+"Describe type of action to be performed on the Activity.Eg : Send email,Send "
+"paper.."
+msgstr ""
+"Опишите тип действия которое необходимо выполнить. Например: Отправить "
+"электронную почту, отправить буклет ..."
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Year(s)"
+msgstr "Год (а)"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,report_directory_id:0
+msgid "This folder is used to store the generated reports"
+msgstr "Сгенереированные отчеты будут сохранены в этой папке"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Cancelled"
+msgstr "Отменено"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Automatic"
+msgstr "Автоматически"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Activity Definition"
+msgstr "Определение действия"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,keep_if_condition_not_met:0
+msgid "Keep as cancelled when condition not met"
+msgstr "Оставить как отмененное если условие не выполнено."
+
+#. module: marketing_campaign
+#: help:marketing.campaign,mode:0
+msgid ""
+"Test - It creates and process all the activities directly (without waiting "
+"for the delay on transitions) but does not send emails or produce reports.\n"
+"Test in Realtime - It creates and processes all the activities directly but "
+"does not send emails or produce reports.\n"
+"With Manual Confirmation - the campaigns runs normally, but the user has to "
+"validate all workitem manually.\n"
+"Normal - the campaign runs normally and automatically sends all emails and "
+"reports (be very careful with this mode, you're live!)"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,campaign_id:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign.activity,campaign_id:0
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,campaign_id:0
+#: field:marketing.campaign.workitem,campaign_id:0
+msgid "Campaign"
+msgstr "Кампания"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,start:0
+msgid "Start"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,segment_id:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,segment_id:0
+msgid "Segment"
+msgstr "Сегмент"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,sync_mode:0
+msgid "Workitem creation mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Month(s)"
+msgstr "Месяц (ы)"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid ""
+"The campaign hasn't any starting activity nor any activity with a signal and "
+"no previous activity."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,partner_id:0
+#: model:ir.model,name:marketing_campaign.model_res_partner
+#: field:marketing.campaign.workitem,partner_id:0
+msgid "Partner"
+msgstr "Партнёр"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "If record created after last sync"
+msgstr "Если запись сделана после последней синхронизации"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Transitions"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Create After Sync"
+msgstr "Создать После Синхронизации"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Dates"
+msgstr "Даты"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,sync_mode:0
+msgid ""
+"Determines when new workitems should be created for records matching a "
+"segment."
+msgstr ""
+"Определяет, должен ли рабочий элемент создаваться для записи соответствующей "
+"сегменту"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,state:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,state:0
+msgid "State"
+msgstr "Статус"
+
+#. module: marketing_campaign
+#: model:ir.module.module,description:marketing_campaign.module_meta_information
+msgid ""
+"\n"
+"Allows you to setup leads automation through marketing campaigns. The "
+"campaigns\n"
+"are dynamic and multi-channels. The process:\n"
+"* Design marketing campaigns that incluces mail templates, reports to "
+"print,\n"
+" miscelleanous actions, etc.\n"
+"* Define segments that are selections of target people\n"
+"* Launch your campaign to automate communications.\n"
+"\n"
+"If you need demo data, you can install the module "
+"marketing_campaign_crm_demo.\n"
+" "
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,condition:0
+msgid ""
+"Python expression to decide whether the activity can be executed, otherwise "
+"it will be deleted or cancelled.The expression may use the following "
+"[browsable] variables:\n"
+" - activity: the campaign activity\n"
+" - workitem: the campaign workitem\n"
+" - object: the object this campaign item represents\n"
+" - transitions: list of campaign transitions outgoing from this activity\n"
+"...- re: Python regular expression module"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "Marketing Reports"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,type:0
+msgid "Type"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.workitem,res_name:0
+msgid "Resource Name"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Run"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid ""
+"The campaign cannot be started: an email account is missing in the email "
+"activity '%s'"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,from_ids:0
+msgid "Previous Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,activity_from_id:0
+msgid "Previous Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Marketing Campaign Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,error_msg:0
+msgid "Error Message"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_campaign_analysis_all
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_form
+#: model:ir.ui.menu,name:marketing_campaign.menu_action_campaign_analysis_all
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_form
+#: view:marketing.campaign:0
+msgid "Campaigns"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,interval_type:0
+msgid "Interval Unit"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "July"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: marketing_campaign
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr ""
+
+#. module: marketing_campaign
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Hour(s)"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_segment
+msgid "Campaign Segment"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+msgid "Cancel"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,keep_if_condition_not_met:0
+msgid ""
+"By activating this option, workitems that aren't executed because the "
+"condition is not met are marked as cancelled instead of being deleted."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "Exceptions"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:res.partner,workitem_ids:0
+msgid "Workitems"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,fixed_cost:0
+msgid "Fixed Cost"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,interval_nbr:0
+msgid "Interval Value"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,revenue:0
+#: field:marketing.campaign.activity,revenue:0
+msgid "Revenue"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "September"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "December"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,month:0
+msgid "Month"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,activity_to_id:0
+msgid "Next Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,email_template_id:0
+msgid "The e-mail to send when this activity is activated"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "This Month"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Test Mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Manual Mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,server_action_id:0
+msgid "The action to perform when this activity is activated"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,partner_field_id:0
+msgid "Partner Field"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_campaign_analysis
+msgid "Campaign Analysis"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Test in Realtime"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Test Directly"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,report_directory_id:0
+msgid "Directory"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,sync_last_date:0
+msgid "Latest Synchronization"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: selection:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: selection:marketing.campaign.segment,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: marketing_campaign
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,date_run:0
+msgid "Launching Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Preview"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+msgid "Status"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Run Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Related Resource"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "August"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Normal"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,start:0
+msgid "This activity is launched when the campaign starts."
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,signal:0
+msgid ""
+"An activity with a signal can be called programmatically. Be careful, the "
+"workitem is always created when a signal is sent"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "June"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "All records (no duplicates)"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,date:0
+#: view:marketing.campaign.workitem:0
+msgid "Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "November"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,condition:0
+msgid "Condition"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,report_id:0
+msgid "The report to generate when this activity is activated"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "October"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,fixed_cost:0
+msgid ""
+"Fixed cost for the campaign (used for campaign analysis), see also variable "
+"cost on activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "January"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,date:0
+msgid "Execution Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_workitem
+msgid "Campaign Workitem"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,ir_filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Synchronize"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+#: field:marketing.campaign.activity,server_action_id:0
+#: selection:marketing.campaign.activity,type:0
+msgid "Action"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "Automatic transition"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:res.partner:0
+msgid "History"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,object_id:0
+msgid "Choose the model on which you want this campaign to be run"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.module.module,shortdesc:marketing_campaign.module_meta_information
+msgid "marketing_campaign"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Process"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: selection:marketing.campaign.transition,trigger:0
+#, python-format
+msgid "Cosmetic"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.transition,trigger:0
+msgid "How is the destination workitem triggered"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Done"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_email_template
+msgid "Email Templates for Models"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Close"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "The campaign cannot be marked as done before all segments are done"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.workitem,res_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_transition
+msgid "Campaign Transition"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: view:marketing.campaign.workitem:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "To Do"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Campaign Step"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_segment_form
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_segment_form
+#: view:marketing.campaign.segment:0
+msgid "Segments"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_segment_opened
+msgid "All Segments"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Incoming Transitions"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.activity,type:0
+msgid "E-mail"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid ""
+"The campaign cannot be started: the email account is not approved in the "
+"email activity '%s'"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Day(s)"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,activity_ids:0
+#: view:marketing.campaign.activity:0
+msgid "Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "May"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Modified after Sync"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: selection:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: selection:marketing.campaign.segment,state:0
+msgid "Running"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.activity,type:0
+msgid "Paper"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "After %(interval_nbr)d %(interval_type)s"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign
+msgid "Marketing Campaign"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,date_done:0
+msgid "End Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "February"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: field:marketing.campaign,object_id:0
+msgid "Resource"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,name:0
+#: field:marketing.campaign.activity,name:0
+#: field:marketing.campaign.segment,name:0
+#: field:marketing.campaign.transition,name:0
+msgid "Name"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "Email Preview"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,signal:0
+msgid "Signal"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.workitem,date:0
+msgid "If date is not set, this workitem have to be run manually"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "The campaign cannot be started: there are no activities in it"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "April"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: field:marketing.campaign,mode:0
+msgid "Mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,activity_id:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,activity_id:0
+msgid "Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_workitem
+#: model:ir.ui.menu,name:marketing_campaign.menu_action_marketing_campaign_workitem
+msgid "Campaign Followup"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_activity
+msgid "Campaign Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,variable_cost:0
+msgid "Variable Cost"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "If record modified after last sync (no duplicates)"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "With Manual Confirmation"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,total_cost:0
+msgid "Cost"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,year:0
+msgid "Year"
+msgstr ""
diff --git a/addons/marketing_campaign_mailchimp/__init__.py b/addons/marketing_campaign_mailchimp/__init__.py
deleted file mode 100644
index 808e5fc281f..00000000000
--- a/addons/marketing_campaign_mailchimp/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-import marketing_campaign_mailchimp
-import wizard
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign_mailchimp/__openerp__.py b/addons/marketing_campaign_mailchimp/__openerp__.py
deleted file mode 100644
index b046b4ef782..00000000000
--- a/addons/marketing_campaign_mailchimp/__openerp__.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-
-{
- "name" : "",
- "version" : "1.1",
- "depends" : ['marketing_campaign'],
- "author" : "OpenERP SA",
- "category": 'Generic Modules/Marketing',
- "description": """
- This module provides integration of the mailchimp.com marketing campaign and mailing-list service, connecting via Mailchimp's WebServices API.
- You can define multiple Mailchimp accounts and then use them as you wish through a new type of activity, providing direct connection to your Mailchimp Lists.""",
- 'website': 'http://www.openerp.com',
- 'init_xml': [],
- 'update_xml': [
- "security/ir.model.access.csv",
- 'marketing_campaign_mailchimp_view.xml',
- 'wizard/create_list_view.xml',
- ],
- 'demo_xml': [],
- 'installable': True,
- 'active': False,
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp.py b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp.py
deleted file mode 100644
index 2b482867694..00000000000
--- a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp.py
+++ /dev/null
@@ -1,211 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-import urllib
-import urllib2
-import simplejson as json
-import time
-
-from osv import fields, osv
-
-mailchimp_url = 'http://%s.api.mailchimp.com/1.2'
-
-class mailchimp_account(osv.osv):
- _name = "mailchimp.account"
-
- _columns = {
- 'name': fields.char('Account Name', size=64),
- 'username': fields.char('Username', size=64, required=True),
- 'password': fields.char('Password', size=64, required=True),
- 'apikey': fields.char('API Key', size=128),
- 'data_center': fields.selection([('us1', 'US1'), ('us2', 'US2'),
- ('uk1', 'UK1')], 'Data Center'),
- 'state': fields.selection([('draft', 'Draft'), ('approved', 'Approved'),
- ('cancelled', 'Cancelled')], 'State', readonly=True)
- }
-
- _defaults = {
- 'state': lambda *a: 'draft'
- }
-
- def get_response(self, cr, uid, mailchimp_id, method, params={}):
- mailchimp_account = self.browse(cr, uid, mailchimp_id)
- params['output'] = 'json'
- if method == 'login':
- params['username'] = mailchimp_account.username
- params['password'] = mailchimp_account.password
- else :
- params['apikey'] = mailchimp_account.apikey
- url = mailchimp_url%mailchimp_account.data_center+ '/?method=%s'%method
- params = urllib.urlencode(params, doseq=True)
- response = urllib2.urlopen(url, params)
- return json.loads(response.read())
-
- def button_approve(self, cr, uid, ids, context):
- acc_obj = self.browse(cr, uid, ids)[0]
- vals = {}
- if not acc_obj.apikey:
- method = 'login'
- else:
- method = 'ping'
- response = self.get_response(cr, uid, acc_obj.id, method)
- if 'error' not in response:
- if method == 'login' :
- vals['apikey'] = response
- vals['state'] = 'approved'
- self.write(cr, uid, ids, vals)
- else :
- raise osv.except_osv('Error!!!',
- "Can't approved accoutnt : %s"%response['error'])
- return True
-
- def button_cancel(self, cr, uid, ids, context):
- self.write(cr, uid, ids, {'state': 'cancelled'})
- return True
-
- def add_partner_list(self, cr, uid, account_id, list_id, partner_ids):
- vals = {} # just dictionary with partner_id and updated in list or not
- for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids):
- params = {
- 'id' : list_id,
- 'email_address' : partner.email,
- 'email_type':'text',
- 'merge_vars[FNAME]':partner.name ,
- 'merge_vars[date]' : time.strftime('%Y-%m-%d'),
- 'merge_vars[phone]' : partner.phone,
- 'merge_vars[website]' : partner.website,
- 'merge_vars[address][country]' : partner.country.code,
- 'merge_vars[address][city]' : partner.city,
- 'double_optin':False
- }
- vals[partner.id] = self.get_response(cr, uid, account_id,
- 'listSubscribe', params)
- return vals
-
-mailchimp_account()
-
-class mailchimp_list(osv.osv_memory):
- _name = "mailchimp.list"
- _description = "Mailchimp list"
-
- _columns = {
- 'mailchimp_account_id': fields.many2one('mailchimp.account',
- 'Mailchimp Account', required=True),
- 'name': fields.char('Name', size=64)
- }
-
-mailchimp_list()
-
-class marketing_campaign(osv.osv):
- _inherit = "marketing.campaign"
-
- _columns = {
- 'mailchimp_account_id': fields.many2one(
- 'mailchimp.account', 'Account'),
- 'mailchimp_campaign': fields.char('campaign', size=64),
- }
-marketing_campaign()
-
-
-class marketing_campaign_activity(osv.osv):
- _inherit = "marketing.campaign.activity"
-
- _columns = {
- 'mailchimp_account_id': fields.many2one(
- 'mailchimp.account', 'Account'),
- 'mailchimp_list': fields.char('List', size=64),
- }
-
- def onchange_mailchimp(self, cr, uid, ids, mailchimp_account_id):
- if mailchimp_account_id:
- return {'value':{'mailchimp_list':''}}
- return {'value':{}}
-
- def onchange_mailchimp_list(self, cr, uid, ids, mailchimp_account_id,
- mailchimp_list):
- if mailchimp_account_id and mailchimp_list:
- lists = self.pool.get('mailchimp.account').get_response(cr,
- uid, mailchimp_account_id, 'lists')
- list_names = [l['name'] for l in lists]
- if mailchimp_list not in list_names:
- raise osv.except_osv('Error!!!',"Lists doesn't exists")
- else :
- return {}
- return {'value':{}}
-
- def _process_wi_mailchimp(self, cr, uid, activity, workitem, context=None):
- mailchimp_account_id = activity.mailchimp_account_id.id
- list_name = activity.mailchimp_list
- mc_acc_obj = self.pool.get('mailchimp.account')
- lists = mc_acc_obj.get_response(cr, uid, mailchimp_account_id, 'lists')
- list_id = ''
- for l in lists :
- if l['name'] == list_name:
- list_id = l['id']
- break;
- res_model = workitem.object_id.model
- res_id = workitem.res_id
- model_obj = self.pool.get(res_model).browse(cr, uid, res_id)
- params ={}
- if res_model == 'res.partner' :
- params.update({
- 'email_address' : model_obj.email,
- 'merge_vars[FNAME]':model_obj.name and model_obj.name or '',
- 'merge_vars[website]' : model_obj.website,
- 'merge_vars[address][country]' : model_obj.country.code,
- })
- elif res_model == 'crm.lead' :
- params.update({
- 'email_address' : model_obj.email_from,
- 'merge_vars[FNAME]':model_obj.partner_name and \
- model_obj.partner_name or '',
- 'merge_vars[address][country]' : model_obj.country_id and \
- model_obj.country_id.code or ''
- })
- if params['email_address'] :
- user = mc_acc_obj.get_response(cr, uid, mailchimp_account_id,
- 'listMemberInfo', {
- 'id' : list_id,
- 'email_address': params['email_address']
- })
- # if there s no user with the specify email it will return error code
- # and thus we add that user otherwise user is alredy subscribe and there
- # is no need to subscribe user again
- if 'error' in user:
- params.update({
- 'id' : list_id,
- 'email_type':'text',
- 'double_optin':False,
- 'merge_vars[date]' : time.strftime('%Y-%m-%d'),
- 'merge_vars[address][city]' : model_obj.city and model_obj.city or '',
- 'merge_vars[phone]' : model_obj.phone and model_obj.phone or '',
- })
- mc_acc_obj.get_response(cr, uid, mailchimp_account_id, 'listSubscribe', params)
- # TODO handle mailchimp error
- return True
- else :
- return {'error_msg' : "Invalid Email Address"}
-
- def __init__(self, *args):
- super(marketing_campaign_activity, self).__init__(*args)
- self._action_types.append(('mailchimp', 'Mailchimp'))
-
-marketing_campaign_activity()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml
deleted file mode 100644
index a340c5c9d68..00000000000
--- a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
-
-
-
-
-
- marketing.campaign.activity.form.inherit
- marketing.campaign.activity
- form
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- mailchimp.account.tree
- mailchimp.account
- tree
-
-
-
-
-
-
-
-
-
-
-
- mailchimp.account.form
- mailchimp.account
- form
-
-
-
-
-
-
- Mailchimp Accounts
- ir.actions.act_window
- mailchimp.account
- form
- tree,form
-
-
-
-
-
-
-
diff --git a/addons/marketing_campaign_mailchimp/security/ir.model.access.csv b/addons/marketing_campaign_mailchimp/security/ir.model.access.csv
deleted file mode 100644
index 893cd2e9e2c..00000000000
--- a/addons/marketing_campaign_mailchimp/security/ir.model.access.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_mailchimp_account_user","mailchimp.account.user","marketing_campaign_mailchimp.model_mailchimp_account","base.res_groups_email_template_admin",1,1,1,1
-"access_mailchimp_account_system","mailchimp.account.user","marketing_campaign_mailchimp.model_mailchimp_account","base.res_groups_email_template_admin",1,0,0,0
-"access_mailchimp_account_user","mailchimp_account_user","model_mailchimp_account","base.res_groups_email_template_admin",1,1,1,1
diff --git a/addons/marketing_campaign_mailchimp/security/marketing_security.xml b/addons/marketing_campaign_mailchimp/security/marketing_security.xml
deleted file mode 100644
index 59cbf65a63d..00000000000
--- a/addons/marketing_campaign_mailchimp/security/marketing_security.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
- Marketing / User
-
-
-
-
diff --git a/addons/marketing_campaign_mailchimp/wizard/__init__.py b/addons/marketing_campaign_mailchimp/wizard/__init__.py
deleted file mode 100755
index 713b0c1e773..00000000000
--- a/addons/marketing_campaign_mailchimp/wizard/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-import create_list
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign_mailchimp/wizard/create_list.py b/addons/marketing_campaign_mailchimp/wizard/create_list.py
deleted file mode 100755
index 03a69a8ac89..00000000000
--- a/addons/marketing_campaign_mailchimp/wizard/create_list.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-from osv import fields, osv
-from tools.translate import _
-import netsvc
-
-class create_list(osv.osv_memory):
- _name = "create.list"
- _description = "Create List of mailchimp"
-# crm.lead remain
- _columns = {
- 'mailchimp_account_id': fields.many2one('mailchimp.account',
- 'Mailchimp Account', required=True),
- 'mailchimp_list_id': fields.many2one('mailchimp.list', 'List'),
- 'list_name': fields.char('Name',size = 64),
- 'partner_ids': fields.many2many('res.partner',
- 'create_list_partner_rel',
- 'cust_list_id', 'partner_id',
- 'Partner'),
-
- }
-
- def onchange_mailchimp_account_id(self, cr, uid, ids, mailchimp_account_id,
- action):
- return {'value':{}}
-
- def create_list(self, cr, uid, ids, context=None):
- create_list_obj = self.browse(cr, uid, ids[0])
- mailchimp_account_obj = self.pool.get('mailchimp.account')
- account_id = create_list_obj.mailchimp_account_id
- lists = mailchimp_account_obj.get_response(cr, uid, account_id.id, 'lists')
- lists = dict([(l['name'],l['id']) for l in lists])
- if create_list_obj.list_name not in lists.keys():
- raise osv.except_osv(_('UserError'),
- _('There is no list define in account %s') % (account_id.name))
- list_id = lists[create_list_obj.list_name]
- mailchimp_account_obj.add_partner_list(cr, uid, account_id.id, list_id,
- create_list_obj.partner_ids)
- return {}
-create_list()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign_mailchimp/wizard/create_list_view.xml b/addons/marketing_campaign_mailchimp/wizard/create_list_view.xml
deleted file mode 100755
index 6d8f8fe9296..00000000000
--- a/addons/marketing_campaign_mailchimp/wizard/create_list_view.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
- create.list.form
- create.list
- form
-
-
-
-
-
- Manual Mailchimp List Update
- ir.actions.act_window
- create.list
- form
-
- new
-
-
-
-
-
-
diff --git a/addons/mrp_jit/i18n/kab.po b/addons/mrp_jit/i18n/kab.po
new file mode 100644
index 00000000000..0b97e9c4c2b
--- /dev/null
+++ b/addons/mrp_jit/i18n/kab.po
@@ -0,0 +1,23 @@
+# Kabyle translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-09 14:11+0000\n"
+"Last-Translator: yugurten \n"
+"Language-Team: Kabyle \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-10 04:56+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: mrp_jit
+#: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
+msgid "MRP JIT"
+msgstr "MRP JIT"
diff --git a/addons/outlook/README b/addons/outlook/README
index 404f2121c6a..adfd4401cb3 100644
--- a/addons/outlook/README
+++ b/addons/outlook/README
@@ -4,6 +4,7 @@ Pre requirements :
======================================================================================
1.Python 2.6+ . python can be downloaded from http://www.python.org/download/releases/ .
2.Python for Windows extensions - PyWin32 this module for python must be installed for appropriate version of the Python. It can be downloaded from http://sourceforge.net/projects/pywin32/files/ or http://starship.python.net/crew/mhammond/win32/
+3.If you are using MS Outlook 2007 than you are required to install "Microsoft Exchange Server MAPI Client and Collaboration Data Objects 1.2.1 (CDO 1.21)". It can be downloaded from http://www.microsoft.com/downloads/en/details.aspx?FamilyID=e17e7f31-079a-43a9-bff2-0a110307611e&displaylang=en
How to install openerp-outlook plug-in?
======================================================================================
diff --git a/addons/outlook/installer.py b/addons/outlook/installer.py
index 84349a64d17..1fe408d7e67 100755
--- a/addons/outlook/installer.py
+++ b/addons/outlook/installer.py
@@ -55,6 +55,7 @@ class outlook_installer(osv.osv_memory):
Pre-requirements :
1. Python 2.6+ .
2. Python for Windows extensions - PyWin32 this module for python must be installed for appropriate version of the Python.
+ 3. If you are using MS Outlook 2007 than you are required to install "Microsoft Exchange Server MAPI Client and Collaboration Data Objects 1.2.1 (CDO 1.21)".
How to install openerp-outlook plug-in?
1. Extract zip file “openerp-outlook-plugin.zip” .
@@ -65,6 +66,9 @@ How to install openerp-outlook plug-in?
6. See User Guide for more information.
7. Keep All extratced files in some safe places
(e.g. python installation Directory "C:\pythonXX\" or Windows installation Directory "C:\Program Files\" ).
+
+Note :
+ Please refer README file for dependecies external link, openobject-addons/outlook/README.
"""
}
outlook_installer()
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/addin.py b/addons/outlook/plugin/openerp-outlook-plugin/addin.py
index 9cea4016bb2..dbd6f172182 100755
--- a/addons/outlook/plugin/openerp-outlook-plugin/addin.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/addin.py
@@ -61,14 +61,14 @@ def GetConn():
return d
class ButtonEvent:
- def OnClick(self, button, cancel):
- import win32ui
- try:
- mngr = manager.GetManager()
- mngr.ShowManager()
- except Exception,e:
- win32ui.MessageBox("Fail to Initialize dialog.\n"+str(e),"OpenERP Configuration", win32con.MB_ICONERROR)
- return cancel
+ def OnClick(self, button, cancel):
+ import win32ui
+ try:
+ mngr = manager.GetManager()
+ mngr.ShowManager()
+ except Exception,e:
+ win32ui.MessageBox("Fail to Initialize dialog.\n"+str(e),"OpenERP Configuration", win32con.MB_ICONERROR)
+ return cancel
#
class ViewPartners:
def OnClick(self, button, cancel):
@@ -202,11 +202,11 @@ class OutlookAddin:
item.Enabled = True
-# item = toolbarweb.Controls.Add(Type = constants.msoControlButton, Temporary = True)
-# item = self.toolbarButtonOpenDocument = DispatchWithEvents(item, OpenDocument)
-# item.Caption = "Open Document"
-# item.TooltipText = "Click to Open Document that ha been pushed to server."
-# item.Enabled = True
+ item = toolbarweb.Controls.Add(Type = constants.msoControlButton, Temporary = True)
+ item = self.toolbarButtonOpenDocument = DispatchWithEvents(item, OpenDocument)
+ item.Caption = "Open Document"
+ item.TooltipText = "Click to Open Document that ha been pushed to server."
+ item.Enabled = True
# Hook events for the item
item = toolbarweb.Controls.Add(Type = constants.msoControlButton, Temporary = True)
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
index fe3db3e8d0d..dce1f6d9077 100755
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
@@ -438,6 +438,7 @@ def TestConnection(btnProcessor,*args):
return
+
uname = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[1])
pwd = win32gui.GetDlgItemText(btnProcessor.window.hwnd, btnProcessor.other_ids[2])
@@ -630,6 +631,8 @@ def GetSelectedItems(hwndList):
def MakeAttachment(btnProcessor,*args):
#Check if server running or user logged in
+ from win32com.client import Dispatch
+ import win32com
b = check()
if not b:
return
@@ -637,7 +640,6 @@ def MakeAttachment(btnProcessor,*args):
assert ex.Selection.Count == 1
mail = ex.Selection.Item(1)
mail = GetMail(btnProcessor)
-
#get selected records
hwndList = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
r = GetSelectedItems(hwndList)
@@ -940,6 +942,8 @@ def SetDefaultContact(txtProcessor,*args):
global partner_ref
global new_con_country
global new_con_state
+ global state_ref
+ global country_ref
state = win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[2])
country = win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[3])
if txtProcessor.init_done:
@@ -958,6 +962,8 @@ def SetDefaultContact(txtProcessor,*args):
win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[3],new_con_country)
new_con_country = ""
new_con_state = ""
+ state_ref = ""
+ country_ref =""
return
#
try:
@@ -1082,6 +1088,8 @@ def GetDefaultEmail(txtProcessor,*args):
global partner_ref
global country_ref
global state_ref
+ global new_con_country
+ global new_con_state
partner_n = win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[0])
state_n = win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[10])
country_n = win32gui.GetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[11])
@@ -1097,10 +1105,13 @@ def GetDefaultEmail(txtProcessor,*args):
partner_ref = ""
country_ref = ""
state_ref = ""
-
+ new_con_country = ""
+ new_con_state = ""
if state_val == None:
country_ref = country_n
country_ref = state_val
+ if country_ref == None:
+ country_ref = ""
win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[11], ustr(country_ref))
if not b:
@@ -1415,38 +1426,57 @@ def SerachOpenDocuemnt(txtProcessor,*args):
from win32com.client import Dispatch
import win32con
import win32ui
+ import win32com
+ from win32com.mapi import mapi, mapiutil, mapitags
+ import pythoncom
b = check()
if not b:
return
global web_server
global web_server_port
+ #Reading Current Selected Email.
ex = txtProcessor.window.manager.outlook.ActiveExplorer()
assert ex.Selection.Count == 1
mail = ex.Selection.Item(1)
- link_box = None
#Acquiring control of the text box
- try:
- link_box = txtProcessor.GetControl()
- except Exception,e:
- win32ui.MessageBox(str(e),"Excet")
+ link_box = txtProcessor.GetControl()
+ #Checking for the web server Parameters
if web_server.strip() == "" or web_server.strip() == "http:\\\\":
win32gui.SendMessage(link_box, win32con.WM_SETTEXT, 0, " ")
txtProcessor.init_done=True
return
linktodoc = ""
- #Reading Current Selected Email.
- win32ui.MessageBox(str(mail),"mail")
+ message_id = None
try:
- vals = NewConn.SearchEmailResources(mail)
+ outlook = win32com.client.Dispatch("Outlook.Application")
+ session = win32com.client.Dispatch("MAPI.session")
+ session.Logon('Outlook')
+ objMessage = session.GetMessage(mail.EntryID, mail.Parent.StoreID)
+ objFields = objMessage.Fields
+ strheader = objFields.Item(mapitags.PR_TRANSPORT_MESSAGE_HEADERS)
+ strheader = ustr(strheader).encode('iso-8859-1')
+ headers = {}
+ strheader = strheader.replace("\n ", " ").splitlines()
+ for line in strheader:
+ split_here = line.find(":")
+ headers[line[:split_here]] = line[split_here:]
+ temp1 = headers.get('Message-ID')
+ temp2 = headers.get('Message-Id')
+ if temp1 == None: message_id = temp2
+ if temp2 == None: message_id = temp1
+ startCut = message_id.find("<")
+ endCut = message_id.find(">")
+ message_id = message_id[startCut:endCut+1]
except Exception,e:
- win32ui.MessageBox(str(e),"Excep")
+ win32ui.MessageBox(str(e),"Open Document")
+ vals = NewConn.SearchEmailResources(message_id)
if vals == None:
win32gui.SendMessage(link_box, win32con.WM_SETTEXT, 0, "< Mail is still not archived.>")
txtProcessor.init_done=True
return
try:
- linktodoc = web_server+":"+str(web_server_port)+"\\openerp\\form\\view?model="+vals[0][1]+"&id="+str(vals[1][1])
- win32gui.SendMessage(link_box, win32con.WM_SETTEXT, 0, linktodoc)
+ linktodoc = "http:\\\\" +web_server+ ":"+str(web_server_port)+"\\openerp\\form\\view?model="+vals[0][1]+"&id="+str(vals[1][1])
+ win32gui.SendMessage(link_box, win32con.WM_SETTEXT, 0, str(linktodoc))
except Exception,e:
win32ui.MessageBox("Error While Opening Document.\n"+str(e),"Open Document", flag_error)
webbrowser.open_new(linktodoc)
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
index 4c4aabab683..cc19913c851 100755
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
@@ -1,9 +1,9 @@
#C:\workspace\openerp-outlook-plugin\dialogs\resources\dialogs.py
#This is a generated file. Please edit C:\workspace\openerp-outlook-plugin\dialogs\resources\dialogs.rc instead.
-_rc_size_=16024
-_rc_mtime_=1286276397
+_rc_size_=16025
+_rc_mtime_=1286623806
class FakeParser:
- dialogs = {'IDD_OPEN_DOCUEMNT_DIALOG': [['Open Document', (0, 0, 200, 65), -1865940928, 1024, (8, 'Tahoma')], [130, 'Link to Document : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ', -1, (5, 3, 190, 25), 1342177280], [129, '', 2086, (5, 31, 190, 12), 1350631552], [128, 'Ok', 2, (150, 45, 45, 14), 1342242816]], 'IDD_VIEW_PARTNER_DIALOG': [['Open Contact', (0, 0, 350, 215), -1865940928, 1024, (8, 'Tahoma')], [130, 'Email ID : ', -1, (32, 17, 40, 12), 1342177280], [129, '', 2051, (70, 15, 200, 12), 1350631552], [128, 'Search Contact ', 2052, (280, 15, 60, 14), 1342242816], [130, 'Partner Name : ', -1, (13, 42, 50, 17), 1342177280], [129, '', 2064, (70, 42, 150, 12), 1350568064], [128, 'Search Partner', 2070, (225, 41, 60, 14), 1342242816], [128, 'New Partner', 2093, (290, 41, 50, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 65, 175, 125), 1342177287], [130, 'Contact Name : ', -1, (18, 83, 50, 17), 1342177280], [129, '', 2046, (76, 82, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 97, 50, 17), 1342177280], [129, '', 2053, (76, 96, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 112, 50, 17), 1342177280], [129, '', 2054, (76, 111, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 126, 50, 14), 1342177280], [129, '', 40010, (76, 125, 100, 12), 1350631552], [130, 'City : ', -1, (18, 140, 50, 17), 1342177280], [129, '', 40011, (76, 139, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 154, 50, 17), 1342177280], [129, '', 2062, (76, 153, 54, 12), 1350568064], [128, 'Search', 2104, (135, 153, 40, 12), 1342242816], [130, 'Country :', -1, (18, 169, 35, 17), 1342177280], [129, '', 2063, (76, 168, 54, 12), 1350568064], [128, 'Search', 2105, (135, 168, 40, 12), 1342242816], [128, 'Communication ', 2024, (188, 65, 152, 125), 1342177287], [130, 'Phone : ', -1, (194, 83, 30, 17), 1342177280], [129, '', 2048, (224, 82, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 97, 30, 17), 1342177280], [129, '', 2050, (224, 96, 100, 12), 1350631552], [130, 'Email : ', -1, (194, 111, 30, 17), 1342177280], [129, '', 2058, (224, 110, 100, 12), 1350568064], [130, 'Fax : ', -1, (194, 125, 30, 17), 1342177280], [129, '', 2047, (224, 124, 100, 12), 1350631552], [128, 'Create a New Contact', 2071, (124, 195, 82, 14), 1342242816], [128, 'Save', 2059, (213, 195, 60, 14), 1342242816], [128, 'Cancel', 2, (281, 195, 60, 14), 1342242816]], 'IDD_OPEN_PARTNER_DIALOG': [['Open Partner', (0, 0, 200, 65), -1865940928, 1024, (8, 'Tahoma')], [130, 'Link to Partner : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ', -1, (5, 3, 190, 25), 1342177280], [129, '', 2085, (5, 31, 190, 12), 1350631552], [128, 'Ok', 2, (150, 45, 45, 13), 1342242816]], 'IDD_SELECT_STATE': [['Search Country', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2100, (55, 10, 100, 12), 1350631552], [128, 'Search', 40012, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2101, (8, 40, 200, 185), 1353711657], [128, 'Select', 2102, (170, 230, 40, 14), 1342242816]], 'IDD_GENERAL': [['Connection Parameters', (0, 0, 430, 210), 1355284544, None, (8, 'Tahoma')], [128, '', 2024, (10, 10, 250, 130), 1342177287], [130, 'Server : ', -1, (30, 30, 100, 17), 1342177280], [129, '', 2003, (85, 30, 120, 12), 1350633472], [128, 'Change', 2021, (210, 30, 30, 13), 1342242816], [130, 'Database : ', -1, (30, 50, 100, 17), 1342177280], [133, '', 2004, (85, 50, 120, 40), 1344339971], [128, 'Reload', 2038, (210, 50, 30, 13), 1342242816], [130, 'Username : ', -1, (30, 70, 100, 17), 1342177280], [129, '', 2005, (85, 70, 154, 12), 1350631552], [130, 'Password : ', -1, (30, 90, 100, 17), 1342177280], [129, '', 2006, (85, 90, 154, 12), 1350631584], [128, 'Connect', 2007, (179, 110, 60, 13), 1342242816], [128, 'WebServer Parameters', 2024, (270, 10, 150, 130), 1342177287], [130, 'Server : ', -1, (280, 30, 50, 15), 1342177280], [129, '', 2080, (310, 29, 90, 12), 1350568064], [128, 'Change', 2082, (295, 50, 50, 12), 1342242816], [128, 'Connect', 2083, (350, 50, 50, 12), 1342242816]], 'IDD_OBJECT_SETTINGS': [['Documents Setting', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'Document Attributes', 2024, (2, 2, 340, 32), 1342177287], [130, 'Title', -1, (6, 15, 30, 17), 1342177280], [129, '', 2013, (20, 14, 57, 12), 1350631552], [130, 'Document Name', -1, (83, 15, 60, 17), 1342177280], [129, '', 2014, (138, 14, 57, 12), 1350631552], [130, 'Image', -1, (200, 15, 20, 17), 1342177280], [129, '', 2015, (220, 14, 57, 12), 1350631552], [128, 'Load Image', 2010, (286, 13, 50, 15), 1342242816], [128, 'Add', 2011, (347, 13, 38, 15), 1342242816], [128, 'Remove', 2012, (391, 13, 38, 15), 1342242816], ['SysListView32', 'List1', 2016, (8, 40, 535, 160), 1353711657]], 'IDD_NEW_PARTNER_DIALOG': [['Create a New Partner', (0, 0, 140, 40), -1865940928, 1024, (8, 'Tahoma')], [130, 'Name : ', -1, (5, 3, 100, 17), 1342177280], [129, '', 2036, (40, 3, 94, 12), 1350631552], [128, 'Cancel', 2, (90, 22, 45, 14), 1342242816], [128, 'Save', 2035, (40, 22, 45, 14), 1342242817]], 'IDD_MANAGER': [['OpenERP Configuarion', (0, 0, 460, 260), -1865940800, None, (8, 'Tahoma')], [128, 'Close', 2008, (400, 239, 50, 14), 1342177281], ['SysTabControl32', '', 1068, (8, 7, 440, 228), 1342177280], ['SysListView32', '', 2016, (0, 0, 0, 0), 1353711657]], 'IDD_WEB_SERVER_PORT_DIALOG': [['OpenERP Connection', (0, 0, 160, 55), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2089, (40, 3, 100, 12), 1350631552], [130, 'Port : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2090, (40, 18, 100, 12), 1350631552], [128, 'Close', 2, (110, 35, 45, 14), 1342242816], [128, 'OK', 2091, (60, 35, 45, 14), 1342242817]], 'IDD_ABOUT': [['About', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'About Plugin', -1, (7, 3, 422, 200), 1342177287], [130, '1062', 1062, (60, 30, 20, 20), 1342179342], [130, '', 2028, (80, 90, 300, 100), 1342177280]], 'IDD_NEW_CONTACT_DIALOG': [['Create a New Contact', (0, 0, 350, 180), -1865940928, 1024, (8, 'Tahoma')], [130, 'Select Partner : ', -1, (13, 20, 50, 17), 1342177280], [129, '', 2079, (70, 18, 150, 12), 1350568064], [128, 'Search Partner', 2033, (225, 17, 60, 14), 1342242816], [128, 'New Partner', 2092, (290, 17, 50, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 35, 175, 123), 1342177287], [130, 'Contact Name : ', -1, (18, 53, 100, 17), 1342177280], [129, '', 40005, (76, 52, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 67, 40, 17), 1342177280], [129, '', 2062, (76, 66, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 81, 40, 17), 1342177280], [129, '', 2063, (76, 80, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 94, 50, 17), 1342177280], [129, '', 2068, (76, 93, 100, 12), 1350631552], [130, 'City : ', -1, (18, 106, 50, 17), 1342177280], [129, '', 2067, (76, 107, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 121, 50, 17), 1342177280], [129, '', 2106, (76, 122, 54, 12), 1350568064], [128, 'Search', 2107, (135, 121, 40, 12), 1342242816], [130, 'Country :', -1, (18, 134, 35, 17), 1342177280], [129, '', 2108, (76, 135, 54, 12), 1350568064], [128, 'Search', 2109, (135, 136, 40, 12), 1342242816], [128, 'Communication ', 2024, (188, 35, 150, 123), 1342177287], [130, 'Office : ', -1, (194, 53, 30, 17), 1342177280], [129, '', 40006, (224, 52, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 67, 30, 17), 1342177280], [129, '', 40007, (224, 66, 100, 12), 1350631552], [130, 'Fax : ', -1, (194, 81, 30, 17), 1342177280], [129, '', 2066, (224, 80, 100, 12), 1350631552], [130, 'Email : ', -1, (194, 95, 30, 17), 1342177280], [129, '', 40008, (224, 94, 100, 12), 1350631552], [128, 'Cancel', 2, (290, 162, 45, 13), 1342242816], [128, 'Save', 40009, (240, 162, 45, 13), 1342242816]], 'IDD_SERVER_PORT_DIALOG': [['OpenERP Connection', (0, 0, 160, 55), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2001, (40, 3, 100, 12), 1350631552], [130, 'Port : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2002, (40, 18, 100, 12), 1350631552], [128, 'Close', 2, (110, 35, 45, 14), 1342242816], [128, 'OK', 1, (60, 35, 45, 14), 1342242817]], 'IDD_SELECT_PARTNER': [['Search Partner', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2076, (55, 10, 100, 12), 1350631552], [128, 'Search', 2077, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2072, (8, 40, 200, 185), 1353711657], [128, 'Create New Partner', 2078, (10, 230, 100, 14), 1342242816], [128, 'Select', 2075, (170, 230, 40, 14), 1342242816]], 'IDD_SYNC': [['Push to OpenERP', (0, 0, 470, 320), -1865940928, 1024, (8, 'Tahoma')], [128, 'Link to an Existing Documents ', 2024, (8, 5, 250, 290), 1342242823], [130, 'Search for : ', -1, (15, 17, 40, 12), 1342177280], [129, '', 40003, (60, 15, 120, 12), 1350631552], [128, 'Search', 40004, (187, 15, 40, 14), 1342242816], [130, 'Documents : ', -1, (15, 140, 100, 14), 1342177280], ['SysListView32', 'List1', 2026, (15, 150, 234, 110), 1350631433], [128, 'Push', 2019, (160, 270, 85, 14), 1342242816], [128, ' Create a Document ', 2024, (263, 5, 202, 100), 1342242823], [130, 'Type of Document : ', -1, (266, 25, 100, 12), 1342177280], [133, '', 2025, (332, 24, 75, 45), 1344339971], [128, 'Create', 2020, (412, 23, 50, 14), 1342242816], [128, ' Create a Contact ', 2024, (263, 110, 202, 185), 1342242823], [130, 'Create a New Contact : ', -1, (280, 140, 100, 12), 1342177280], [128, 'Create Contact', 2018, (360, 138, 60, 14), 1342242816], [128, 'Close', 2, (385, 300, 60, 14), 1342242816]], 'IDD_SELECT_COUNTRY': [['Search Country', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2095, (55, 10, 100, 12), 1350631552], [128, 'Search', 2098, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2096, (8, 40, 200, 185), 1353711657], [128, 'Select', 2097, (170, 230, 40, 14), 1342242816]]}
+ dialogs = {'IDD_OPEN_DOCUEMNT_DIALOG': [['Open Document', (0, 0, 200, 65), -1865940928, 1024, (8, 'Tahoma')], [130, 'Link to Document : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ', -1, (5, 3, 190, 25), 1342177280], [129, '', 2086, (5, 31, 190, 12), 1350631552], [128, 'Ok', 2, (150, 45, 45, 14), 1342242816]], 'IDD_VIEW_PARTNER_DIALOG': [['Open Contact', (0, 0, 350, 215), -1865940928, 1024, (8, 'Tahoma')], [130, 'Email ID : ', -1, (32, 17, 40, 12), 1342177280], [129, '', 2051, (70, 15, 200, 12), 1350631552], [128, 'Search Contact ', 2052, (280, 15, 60, 14), 1342242816], [130, 'Partner Name : ', -1, (13, 42, 50, 17), 1342177280], [129, '', 2064, (70, 42, 150, 12), 1350568064], [128, 'Search Partner', 2070, (225, 41, 60, 14), 1342242816], [128, 'New Partner', 2093, (290, 41, 50, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 65, 175, 125), 1342177287], [130, 'Contact Name : ', -1, (18, 83, 50, 17), 1342177280], [129, '', 2046, (76, 82, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 97, 50, 17), 1342177280], [129, '', 2053, (76, 96, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 112, 50, 17), 1342177280], [129, '', 2054, (76, 111, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 126, 50, 14), 1342177280], [129, '', 40010, (76, 125, 100, 12), 1350631552], [130, 'City : ', -1, (18, 140, 50, 17), 1342177280], [129, '', 40011, (76, 139, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 154, 50, 17), 1342177280], [129, '', 2062, (76, 153, 54, 12), 1350568064], [128, 'Search', 2104, (135, 153, 40, 12), 1342242816], [130, 'Country :', -1, (18, 169, 35, 17), 1342177280], [129, '', 2063, (76, 168, 54, 12), 1350568064], [128, 'Search', 2105, (135, 168, 40, 12), 1342242816], [128, 'Communication ', 2024, (188, 65, 152, 125), 1342177287], [130, 'Phone : ', -1, (194, 83, 30, 17), 1342177280], [129, '', 2048, (224, 82, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 97, 30, 17), 1342177280], [129, '', 2050, (224, 96, 100, 12), 1350631552], [130, 'Email : ', -1, (194, 111, 30, 17), 1342177280], [129, '', 2058, (224, 110, 100, 12), 1350568064], [130, 'Fax : ', -1, (194, 125, 30, 17), 1342177280], [129, '', 2047, (224, 124, 100, 12), 1350631552], [128, 'Create a New Contact', 2071, (124, 195, 82, 14), 1342242816], [128, 'Save', 2059, (213, 195, 60, 14), 1342242816], [128, 'Cancel', 2, (281, 195, 60, 14), 1342242816]], 'IDD_OPEN_PARTNER_DIALOG': [['Open Partner', (0, 0, 200, 65), -1865940928, 1024, (8, 'Tahoma')], [130, 'Link to Partner : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ', -1, (5, 3, 190, 25), 1342177280], [129, '', 2085, (5, 31, 190, 12), 1350631552], [128, 'Ok', 2, (150, 45, 45, 13), 1342242816]], 'IDD_SELECT_STATE': [['Search Country', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2100, (55, 10, 100, 12), 1350631552], [128, 'Search', 40012, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2101, (8, 40, 200, 185), 1353711657], [128, 'Select', 2102, (170, 230, 40, 14), 1342242816]], 'IDD_GENERAL': [['Connection Parameters', (0, 0, 430, 210), 1355284544, None, (8, 'Tahoma')], [128, '', 2024, (10, 10, 250, 130), 1342177287], [130, 'Server : ', -1, (30, 30, 100, 17), 1342177280], [129, '', 2003, (85, 30, 120, 12), 1350633472], [128, 'Change', 2021, (210, 30, 30, 13), 1342242816], [130, 'Database : ', -1, (30, 50, 100, 17), 1342177280], [133, '', 2004, (85, 50, 120, 40), 1344339971], [128, 'Reload', 2038, (210, 50, 30, 13), 1342242816], [130, 'Username : ', -1, (30, 70, 100, 17), 1342177280], [129, '', 2005, (85, 70, 154, 12), 1350631552], [130, 'Password : ', -1, (30, 90, 100, 17), 1342177280], [129, '', 2006, (85, 90, 154, 12), 1350631584], [128, 'Connect', 2007, (179, 110, 60, 13), 1342242816], [128, 'WebServer Parameters', 2024, (270, 10, 150, 130), 1342177287], [130, 'Server : ', -1, (280, 30, 50, 15), 1342177280], [129, '', 2080, (310, 29, 90, 12), 1350568064], [128, 'Change', 2082, (295, 50, 50, 12), 1342242816], [128, 'Connect', 2083, (350, 50, 50, 12), 1342242816]], 'IDD_OBJECT_SETTINGS': [['Documents Setting', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'Document Attributes', 2024, (2, 2, 340, 32), 1342177287], [130, 'Title', -1, (6, 15, 30, 17), 1342177280], [129, '', 2013, (20, 14, 57, 12), 1350631552], [130, 'Document Name', -1, (83, 15, 60, 17), 1342177280], [129, '', 2014, (138, 14, 57, 12), 1350631552], [130, 'Image', -1, (200, 15, 20, 17), 1342177280], [129, '', 2015, (220, 14, 57, 12), 1350631552], [128, 'Load Image', 2010, (286, 13, 50, 15), 1342242816], [128, 'Add', 2011, (347, 13, 38, 15), 1342242816], [128, 'Remove', 2012, (391, 13, 38, 15), 1342242816], ['SysListView32', 'List1', 2016, (8, 40, 535, 160), 1353711657]], 'IDD_NEW_PARTNER_DIALOG': [['Create a New Partner', (0, 0, 140, 40), -1865940928, 1024, (8, 'Tahoma')], [130, 'Name : ', -1, (5, 3, 100, 17), 1342177280], [129, '', 2036, (40, 3, 94, 12), 1350631552], [128, 'Cancel', 2, (90, 22, 45, 14), 1342242816], [128, 'Save', 2035, (40, 22, 45, 14), 1342242817]], 'IDD_MANAGER': [['OpenERP Configuration', (0, 0, 460, 260), -1865940800, None, (8, 'Tahoma')], [128, 'Close', 2008, (400, 239, 50, 14), 1342177281], ['SysTabControl32', '', 1068, (8, 7, 440, 228), 1342177280], ['SysListView32', '', 2016, (0, 0, 0, 0), 1353711657]], 'IDD_WEB_SERVER_PORT_DIALOG': [['OpenERP Connection', (0, 0, 160, 55), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2089, (40, 3, 100, 12), 1350631552], [130, 'Port : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2090, (40, 18, 100, 12), 1350631552], [128, 'Close', 2, (110, 35, 45, 14), 1342242816], [128, 'OK', 2091, (60, 35, 45, 14), 1342242817]], 'IDD_ABOUT': [['About', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'About Plugin', -1, (7, 3, 422, 200), 1342177287], [130, '1062', 1062, (60, 30, 20, 20), 1342179342], [130, '', 2028, (80, 90, 300, 100), 1342177280]], 'IDD_NEW_CONTACT_DIALOG': [['Create a New Contact', (0, 0, 350, 180), -1865940928, 1024, (8, 'Tahoma')], [130, 'Select Partner : ', -1, (13, 20, 50, 17), 1342177280], [129, '', 2079, (70, 18, 150, 12), 1350568064], [128, 'Search Partner', 2033, (225, 17, 60, 14), 1342242816], [128, 'New Partner', 2092, (290, 17, 50, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 35, 175, 123), 1342177287], [130, 'Contact Name : ', -1, (18, 53, 100, 17), 1342177280], [129, '', 40005, (76, 52, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 67, 40, 17), 1342177280], [129, '', 2062, (76, 66, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 81, 40, 17), 1342177280], [129, '', 2063, (76, 80, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 94, 50, 17), 1342177280], [129, '', 2068, (76, 93, 100, 12), 1350631552], [130, 'City : ', -1, (18, 106, 50, 17), 1342177280], [129, '', 2067, (76, 107, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 121, 50, 17), 1342177280], [129, '', 2106, (76, 122, 54, 12), 1350568064], [128, 'Search', 2107, (135, 121, 40, 12), 1342242816], [130, 'Country :', -1, (18, 134, 35, 17), 1342177280], [129, '', 2108, (76, 135, 54, 12), 1350568064], [128, 'Search', 2109, (135, 136, 40, 12), 1342242816], [128, 'Communication ', 2024, (188, 35, 150, 123), 1342177287], [130, 'Office : ', -1, (194, 53, 30, 17), 1342177280], [129, '', 40006, (224, 52, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 67, 30, 17), 1342177280], [129, '', 40007, (224, 66, 100, 12), 1350631552], [130, 'Fax : ', -1, (194, 81, 30, 17), 1342177280], [129, '', 2066, (224, 80, 100, 12), 1350631552], [130, 'Email : ', -1, (194, 95, 30, 17), 1342177280], [129, '', 40008, (224, 94, 100, 12), 1350631552], [128, 'Cancel', 2, (290, 162, 45, 13), 1342242816], [128, 'Save', 40009, (240, 162, 45, 13), 1342242816]], 'IDD_SERVER_PORT_DIALOG': [['OpenERP Connection', (0, 0, 160, 55), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2001, (40, 3, 100, 12), 1350631552], [130, 'Port : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2002, (40, 18, 100, 12), 1350631552], [128, 'Close', 2, (110, 35, 45, 14), 1342242816], [128, 'OK', 1, (60, 35, 45, 14), 1342242817]], 'IDD_SELECT_PARTNER': [['Search Partner', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2076, (55, 10, 100, 12), 1350631552], [128, 'Search', 2077, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2072, (8, 40, 200, 185), 1353711657], [128, 'Create New Partner', 2078, (10, 230, 100, 14), 1342242816], [128, 'Select', 2075, (170, 230, 40, 14), 1342242816]], 'IDD_SYNC': [['Push to OpenERP', (0, 0, 470, 320), -1865940928, 1024, (8, 'Tahoma')], [128, 'Link to an Existing Documents ', 2024, (8, 5, 250, 290), 1342242823], [130, 'Search for : ', -1, (15, 17, 40, 12), 1342177280], [129, '', 40003, (60, 15, 120, 12), 1350631552], [128, 'Search', 40004, (187, 15, 40, 14), 1342242816], [130, 'Documents : ', -1, (15, 140, 100, 14), 1342177280], ['SysListView32', 'List1', 2026, (15, 150, 234, 110), 1350631433], [128, 'Push', 2019, (160, 270, 85, 14), 1342242816], [128, ' Create a Document ', 2024, (263, 5, 202, 100), 1342242823], [130, 'Type of Document : ', -1, (266, 25, 100, 12), 1342177280], [133, '', 2025, (332, 24, 75, 45), 1344339971], [128, 'Create', 2020, (412, 23, 50, 14), 1342242816], [128, ' Create a Contact ', 2024, (263, 110, 202, 185), 1342242823], [130, 'Create a New Contact : ', -1, (280, 140, 100, 12), 1342177280], [128, 'Create Contact', 2018, (360, 138, 60, 14), 1342242816], [128, 'Close', 2, (385, 300, 60, 14), 1342242816]], 'IDD_SELECT_COUNTRY': [['Search Country', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2095, (55, 10, 100, 12), 1350631552], [128, 'Search', 2098, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2096, (8, 40, 200, 185), 1353711657], [128, 'Select', 2097, (170, 230, 40, 14), 1342242816]]}
ids = {'IDC_BUT_DEL_OBJECT': 2012, 'IDD_OPEN_PARTNER_DIALOG': 2084, 'IDD_SELECT_STATE': 2099, 'IDC_DELAY1_SLIDER': 1056, 'IDC_PROGRESS': 1000, 'IDD_MANAGER': 101, 'IDC_ABOUT': 2028, 'IDD_DIAGNOSTIC': 113, 'IDET_PARTNER_COUNTRY': 2063, 'IDD_TRAINING': 102, 'ID_CONTACT_EMAIL_TEXT': 40008, 'IDC_DELAY2_TEXT': 1059, 'IDC_DELAY1_TEXT': 1057, 'IDD_WIZARD': 114, 'IDC_CHKBX': 2023, 'IDC_STATIC_HAM': 1002, 'IDC_PROGRESS_TEXT': 1001, 'IDR_XMLS_PROTOCOL': 2042, 'IDD_GENERAL': 108, 'IDD_ABOUT': 2027, 'IDD_SYNC': 40002, 'IDC_TAB': 1068, 'IDC_FOLDER_UNSURE': 1033, '_APS_NEXT_SYMED_VALUE': 101, 'IDC_VERBOSE_LOG': 1061, 'IDC_EDIT1': 1094, 'IDC_BROWSE': 1037, 'ID_DB_DROPDOWNLIST': 2004, 'IDC_BACK_BTN': 1069, 'ID_CONTACT_NAME_TEXT': 40005, 'IDPB_PARTNER_SEARCH': 2077, 'IDD_WIZARD_FINISHED_UNCONFIGURED': 119, 'IDC_ACTION_CERTAIN': 1025, 'IDC_BUT_ACT_ALL': 1019, 'IDD_FILTER_NOW': 104, 'IDET_WED_SERVER': 2080, 'ID_WEB_OK': 2091, 'ID_PROTOCOL_GRP': 2040, 'IDC_HEADER': 2017, 'IDC_MARK_SPAM_AS_READ': 1047, 'IDPB_NEW_PARTNER_BUTTON': 2092, 'ID_PARTNER_NAME_TEXT': 2036, 'IDC_RECOVER_RS': 1075, 'IDC_NAME_LIST1': 2037, 'ID_CONTACT_OFFICE_TEXT': 40006, 'IDC_STATIC': -1, 'IDC_PAGE_PLACEHOLDER': 1078, 'IDC_BROWSE_WATCH': 1039, 'IDET_ZIP': 40010, 'IDET_PARTNER_CITY': 40011, 'IDET_PARTNER_LINK_TEXT': 2085, 'IDC_FOLDER_HAM': 1083, 'IDC_LIST_COUNTRY': 2096, 'IDD_WIZARD_FOLDERS_REST': 117, 'IDC_SHOW_DATA_FOLDER': 1071, 'IDC_BUT_ACT_SCORE': 1018, 'IDET_STATE_SEARCH_NAME': 2100, 'IDET_WEB_SERVER': 2089, '_APS_NEXT_RESOURCE_VALUE': 128, 'ID_SET_WEB_CONNECTION': 2082, 'IDC_LIST_STATE': 2101, 'IDC_CONTACT_LIST': 2029, 'IDC_SLIDER_CERTAIN': 1023, 'IDET_PARTNER_STREET': 2053, 'IDC_BUT_UNREAD': 1020, 'ID_PARTNER_DROPDOWNLIST': 2032, 'ID_COUNTRY_DROPLIST': 2065, 'IDC_BUT_ABOUT': 1017, 'IDC_BUT_RESCORE': 1008, 'IDC_BUT_SEARCHSUB': 1041, 'IDC_BUT_TRAIN_FROM_SPAM_FOLDER': 1010, 'IDET_PARTNER_MOBILENO': 2050, 'ID_CONTACT_MOBILE_TEXT': 40007, 'IDD_VIEW_PARTNER_DIALOG': 2044, 'IDD_WIZARD_FOLDERS_TRAIN': 120, 'IDC_BUT_FILTER_ENABLE': 1013, 'IDPB_WEB_CONNECTION': 2083, 'IDC_ABOUT_BTN': 1072, 'IDD_WIZARD_FINISHED_TRAINED': 122, 'ID_SERVER': 2001, 'IDD_SELECT_PARTNER': 2073, 'IDET_NC_PARTNER_STATE': 2106, 'IDD_FOLDER_SELECTOR': 105, 'IDC_BUT_SET_SERVER_PORT': 2021, 'ID_DONE': 2008, 'IDC_LIST_FOLDERS': 1040, 'IDC_IMAGE_PATH': 2015, 'IDB_SBWIZLOGO': 125, 'IDB_OPENERPLOGO': 1062, 'ID_ZIP_TEXT': 2068, 'IDEB_OPENDOC_LINK_TEXT': 2086, 'IDD_NEW_PARTNER_DIALOG': 2034, 'ID_PARTNER_DROPLIST': 2069, 'IDC_BUT_VIEW_LOG': 1093, 'IDC_STATUS2': 1044, 'IDC_STATUS1': 1043, 'IDCANCEL': 2, 'IDC_BROWSE_HAM': 1004, 'ID_BUT_TESTCONNECTION': 2007, 'IDR_NETRPC_PROTOCOL': 2043, 'IDC_BROWSE_SPAM': 1005, 'IDD_OPEN_DOCUEMNT_DIALOG': 2087, 'IDD_WIZARD_FINISHED_UNTRAINED': 116, 'IDC_MARK_UNSURE_AS_READ': 1051, 'IDPB_SEARCH_COUNTRY1': 2105, 'ID_PARTNER_CITY_TEXT': 2067, 'IDC_BUT_WIZARD': 1070, 'IDC_VERSION': 1009, 'ID_NEW_PARTNER_BUTTON': 2033, 'IDC_FOLDER_NAMES': 1036, 'ID_ATT_METHOD_DROPDOWNLIST': 2025, 'IDC_BUT_TIMER_ENABLED': 1091, 'IDPB_WRITE_CHANGES': 2059, 'IDC_SLIDER_UNSURE': 1029, 'IDC_BUT_NEW': 1046, 'IDC_FOLDER_WATCH': 1038, 'IDPB_CREATE_NEW_PARTNER': 2078, 'IDC_BUT_UNTRAINED': 1088, 'IDC_STATIC_SPAM': 1003, 'IDD_NEW_CONTACT_DIALOG': 2031, 'IDC_EDIT_UNSURE': 1030, 'IDC_BUT_CLEARALL': 1042, 'IDC_BUT_UNSEEN': 1021, 'IDC_OBJECT_NAME': 2014, 'IDD_WIZARD_FOLDERS_WATCH': 118, 'IDPB_SEARCH_STATE': 2103, 'IDET_COUNTRY_SEARCH_NAME': 2095, 'IDC_BUT_SAVE_OBJECT': 2011, 'ID_FED_STATE_DROPLIST': 2064, 'ID_ALL_COUNTRY_DROPDOWNLIST': 2061, 'IDC_EDIT_CERTAIN': 1024, 'IDC_BUT_FILTER_DEFINE': 1016, 'ID_NEW_PART_BUTTON': 2070, 'ID_FAX_TEXT': 2066, 'IDD_WIZARD_TRAINING_IS_IMPORTANT': 123, 'ID_ALL_STATE_DROPDOWNLIST': 2060, 'IDPB_SEARCH_STATE1': 2104, 'IDC_INBOX_TIMER_ONLY': 1060, 'IDPB_SEARCH_PARTNER': 2052, 'ID_USERNAME': 2005, '_APS_NEXT_CONTROL_VALUE': 1096, 'IDC_WIZ_GRAPHIC': 1092, 'IDD_OBJECT_SETTINGS': 2009, 'IDD_FILTER_UNSURE': 111, 'IDC_DEL_SPAM_RS': 1074, 'IDD_SELECT_COUNTRY': 2094, 'ID_SERVER_PORT': 2003, 'IDR_XML_PROTOCOL': 2041, 'IDET_PARTNER_OFFICENO': 2048, 'IDB_FOLDERS': 127, 'IDC_BUT_PREPARATION': 1081, 'ID_STREET2_TEXT': 2063, 'IDC_DELAY2_SLIDER': 1058, 'IDET_PARTNER': 2064, 'IDC_SAVE_SPAM_SCORE': 1048, 'IDC_OBJECT_TITLE': 2013, 'IDC_FOLDER_CERTAIN': 1027, 'IDET_WEB_PORT': 2090, 'IDC_BROWSE_UNSURE': 1034, 'IDC_STATISTICS': 1095, 'IDPB_STATE_SEARCH': 40012, 'ID_MAKE_ATTACHMENT': 2019, 'IDC_BUT_LOAD_IMAGE': 2010, 'IDC_NAME_LIST': 2026, 'IDC_BUT_TRAIN_TO_SPAM_FOLDER': 1011, 'IDET_PARTNER_SEARCH_NAME': 2076, 'IDC_BUT_RESET': 1073, 'ID_SEARCH': 40004, 'IDET_PARTNER_CONTACT_NAME': 2046, 'IDPB_SELECT_STATE': 2102, 'IDC_ACTION_UNSURE': 1031, 'IDD_WIZARD_TRAIN': 121, 'IDC_STATIC_GROUP': 2024, 'IDPB_NEWPARTNER_BUTTON': 2071, 'ID_PARTNER_TEXT': 2079, 'IDD_WIZARD_FINISHED_TRAIN_LATER': 124, 'IDET_PARTNER_NAME': 2045, 'IDPB_NEW_PART_BUTTON': 2093, 'IDC_BUT_REBUILD': 1007, 'IDET_PARTNER_STREET2': 2054, 'IDPB_SEARCH_COUNTRY': 2098, 'ID_SAVE_PARTNER_BUTTON': 2035, 'IDPB_SELECT_PARTNER': 2075, 'ID_STREET_TEXT': 2062, '_APS_NEXT_COMMAND_VALUE': 40001, 'IDET_SEARCH_PARTNER': 2051, 'IDC_LIST_PARTNER': 2072, 'IDD_WEB_SERVER_PORT_DIALOG': 2088, 'ID_PORT': 2002, 'IDD_SERVER_PORT_DIALOG': 2022, 'IDET_PARTNER_STATE': 2062, 'IDPB_SELECT_COUNTRY': 2097, 'ID_SEARCH_TEXT': 40003, 'IDET_NC_PARTNER_COUNTRY': 2108, 'ID_CREATE_CONTACT': 2018, 'IDC_FORWARD_BTN': 1077, 'IDC_TRAINING_STATUS': 1035, 'IDD_WIZARD_WELCOME': 115, 'IDET_PARTNER_FAX': 2058, 'IDC_BUT_TRAIN': 1089, 'IDC_LIST': 2016, 'ID_CREATE_CASE': 2020, 'IDET_PARTNER_EMAIL': 2047, 'IDC_START': 1006, 'IDD_FILTER': 103, 'IDC_RELOAD': 2038, 'ID_PASSWORD': 2006, 'ID_NAME_TEXT': 2030, 'IDC_FILTER_STATUS': 1014, 'IDPB_NC_SEARCH_STATE1': 2107, 'ID_CONTACT_SAVE_BUTTON': 40009, 'IDOK': 1, 'IDC_BROWSE_CERTAIN': 1028, 'IDC_BUT_SHOW_DIAGNOSTICS': 1080, 'IDC_BUT_TRAIN_NOW': 1012, 'IDPB_NC_SEARCH_COUNTRY1': 2109}
names = {1024: 'IDC_EDIT_CERTAIN', 1: 'IDOK', 2: 'IDCANCEL', 1027: 'IDC_FOLDER_CERTAIN', 1028: 'IDC_BROWSE_CERTAIN', 1029: 'IDC_SLIDER_UNSURE', 1030: 'IDC_EDIT_UNSURE', 1031: 'IDC_ACTION_UNSURE', 1033: 'IDC_FOLDER_UNSURE', 1034: 'IDC_BROWSE_UNSURE', 1035: 'IDC_TRAINING_STATUS', 1036: 'IDC_FOLDER_NAMES', 1037: 'IDC_BROWSE', 1038: 'IDC_FOLDER_WATCH', 1039: 'IDC_BROWSE_WATCH', 1040: 'IDC_LIST_FOLDERS', 1041: 'IDC_BUT_SEARCHSUB', 1042: 'IDC_BUT_CLEARALL', 1043: 'IDC_STATUS1', 1044: 'IDC_STATUS2', 2069: 'ID_PARTNER_DROPLIST', 1046: 'IDC_BUT_NEW', 1047: 'IDC_MARK_SPAM_AS_READ', 1048: 'IDC_SAVE_SPAM_SCORE', 2052: 'IDPB_SEARCH_PARTNER', 1051: 'IDC_MARK_UNSURE_AS_READ', 2076: 'IDET_PARTNER_SEARCH_NAME', 2077: 'IDPB_PARTNER_SEARCH', 2078: 'IDPB_CREATE_NEW_PARTNER', 2053: 'IDET_PARTNER_STREET', 1056: 'IDC_DELAY1_SLIDER', 1057: 'IDC_DELAY1_TEXT', 1058: 'IDC_DELAY2_SLIDER', 1059: 'IDC_DELAY2_TEXT', 1060: 'IDC_INBOX_TIMER_ONLY', 1061: 'IDC_VERBOSE_LOG', 1062: 'IDB_OPENERPLOGO', 2047: 'IDET_PARTNER_EMAIL', 2088: 'IDD_WEB_SERVER_PORT_DIALOG', 2089: 'IDET_WEB_SERVER', 2090: 'IDET_WEB_PORT', 2091: 'ID_WEB_OK', 1068: 'IDC_TAB', 1069: 'IDC_BACK_BTN', 1070: 'IDC_BUT_WIZARD', 1071: 'IDC_SHOW_DATA_FOLDER', 1072: 'IDC_ABOUT_BTN', 1073: 'IDC_BUT_RESET', 1074: 'IDC_DEL_SPAM_RS', 1075: 'IDC_RECOVER_RS', 2100: 'IDET_STATE_SEARCH_NAME', 1077: 'IDC_FORWARD_BTN', 1078: 'IDC_PAGE_PLACEHOLDER', 2057: 'IDET_PARTNER_COUNTRY', 1080: 'IDC_BUT_SHOW_DIAGNOSTICS', 1081: 'IDC_BUT_PREPARATION', 2106: 'IDET_NC_PARTNER_STATE', 1083: 'IDC_FOLDER_HAM', 2108: 'IDET_NC_PARTNER_COUNTRY', 2058: 'IDET_PARTNER_FAX', 1088: 'IDC_BUT_UNTRAINED', 1089: 'IDC_BUT_TRAIN', 40002: 'IDD_SYNC', 1091: 'IDC_BUT_TIMER_ENABLED', 1025: 'IDC_ACTION_CERTAIN', 1093: 'IDC_BUT_VIEW_LOG', 1094: 'IDC_EDIT1', 1095: 'IDC_STATISTICS', 1096: '_APS_NEXT_CONTROL_VALUE', 2060: 'ID_ALL_STATE_DROPDOWNLIST', 40010: 'IDET_ZIP', 40011: 'IDET_PARTNER_CITY', 40012: 'IDPB_STATE_SEARCH', 2061: 'ID_ALL_COUNTRY_DROPDOWNLIST', 2062: 'IDET_PARTNER_STATE', 2063: 'IDET_PARTNER_COUNTRY', 2064: 'IDET_PARTNER', 101: 'IDD_MANAGER', 102: 'IDD_TRAINING', 103: 'IDD_FILTER', 104: 'IDD_FILTER_NOW', 105: 'IDD_FOLDER_SELECTOR', 106: 'IDD_ABOUT', 108: 'IDD_GENERAL', 2066: 'ID_FAX_TEXT', 111: 'IDD_FILTER_UNSURE', 113: 'IDD_DIAGNOSTIC', 114: 'IDD_WIZARD', 115: 'IDD_WIZARD_WELCOME', 116: 'IDD_WIZARD_FINISHED_UNTRAINED', 117: 'IDD_WIZARD_FOLDERS_REST', 118: 'IDD_WIZARD_FOLDERS_WATCH', 119: 'IDD_WIZARD_FINISHED_UNCONFIGURED', 120: 'IDD_WIZARD_FOLDERS_TRAIN', 121: 'IDD_WIZARD_TRAIN', 122: 'IDD_WIZARD_FINISHED_TRAINED', 123: 'IDD_WIZARD_TRAINING_IS_IMPORTANT', 124: 'IDD_WIZARD_FINISHED_TRAIN_LATER', 125: 'IDB_SBWIZLOGO', 127: 'IDB_FOLDERS', 2067: 'ID_PARTNER_CITY_TEXT', 2050: 'IDET_PARTNER_MOBILENO', 2070: 'ID_NEW_PART_BUTTON', 2071: 'IDPB_NEWPARTNER_BUTTON', 2072: 'IDC_LIST_PARTNER', 2073: 'IDD_SELECT_PARTNER', 2068: 'ID_ZIP_TEXT', 2051: 'IDET_SEARCH_PARTNER', 2075: 'IDPB_SELECT_PARTNER', 2079: 'ID_PARTNER_TEXT', 2080: 'IDET_WED_SERVER', 2081: 'IDET_WEB_PORT', 2082: 'ID_SET_WEB_CONNECTION', 2083: 'IDPB_WEB_CONNECTION', 2084: 'IDD_OPEN_PARTNER_DIALOG', 2085: 'IDET_PARTNER_LINK_TEXT', 40004: 'ID_SEARCH', 2086: 'IDEB_OPENDOC_LINK_TEXT', 2087: 'IDD_OPEN_DOCUEMNT_DIALOG', 2046: 'IDET_PARTNER_CONTACT_NAME', 2105: 'IDPB_SEARCH_COUNTRY1', 2054: 'IDET_PARTNER_STREET2', 128: '_APS_NEXT_RESOURCE_VALUE', 2092: 'IDPB_NEW_PARTNER_BUTTON', 2093: 'IDPB_NEW_PART_BUTTON', 2094: 'IDD_SELECT_COUNTRY', 2095: 'IDET_COUNTRY_SEARCH_NAME', 2096: 'IDC_LIST_COUNTRY', 2097: 'IDPB_SELECT_COUNTRY', 2098: 'IDPB_SEARCH_COUNTRY', 2099: 'IDD_SELECT_STATE', 2101: 'IDC_LIST_STATE', 2102: 'IDPB_SELECT_STATE', 2103: 'IDPB_SEARCH_STATE', 2104: 'IDPB_SEARCH_STATE1', 2040: 'ID_PROTOCOL_GRP', 2065: 'ID_COUNTRY_DROPLIST', 2048: 'IDET_PARTNER_OFFICENO', 2107: 'IDPB_NC_SEARCH_STATE1', 2109: 'IDPB_NC_SEARCH_COUNTRY1', 2024: 'IDC_STATIC_GROUP', 2041: 'IDR_XML_PROTOCOL', 2025: 'ID_ATT_METHOD_DROPDOWNLIST', 2026: 'IDC_NAME_LIST', 2027: 'IDD_ABOUT', 40001: '_APS_NEXT_COMMAND_VALUE', 2028: 'IDC_ABOUT', 2029: 'IDC_CONTACT_LIST', 2059: 'IDPB_WRITE_CHANGES', 2042: 'IDR_XMLS_PROTOCOL', 40003: 'ID_SEARCH_TEXT', 2030: 'ID_NAME_TEXT', 1092: 'IDC_WIZ_GRAPHIC', 2031: 'IDD_NEW_CONTACT_DIALOG', 40005: 'ID_CONTACT_NAME_TEXT', 2032: 'ID_PARTNER_DROPDOWNLIST', 40006: 'ID_CONTACT_OFFICE_TEXT', 2033: 'ID_NEW_PARTNER_BUTTON', 40007: 'ID_CONTACT_MOBILE_TEXT', 2034: 'IDD_NEW_PARTNER_DIALOG', 2043: 'IDR_NETRPC_PROTOCOL', 40008: 'ID_CONTACT_EMAIL_TEXT', 2035: 'ID_SAVE_PARTNER_BUTTON', 40009: 'ID_CONTACT_SAVE_BUTTON', 2036: 'ID_PARTNER_NAME_TEXT', 2037: 'IDC_NAME_LIST1', 2038: 'IDC_RELOAD', 2044: 'IDD_VIEW_PARTNER_DIALOG', 2001: 'ID_SERVER', 2002: 'ID_PORT', 2003: 'ID_SERVER_PORT', 2004: 'ID_DB_DROPDOWNLIST', 2005: 'ID_USERNAME', 2006: 'ID_PASSWORD', 2007: 'ID_BUT_TESTCONNECTION', 2008: 'ID_DONE', 2009: 'IDD_OBJECT_SETTINGS', 2010: 'IDC_BUT_LOAD_IMAGE', 2011: 'IDC_BUT_SAVE_OBJECT', 2012: 'IDC_BUT_DEL_OBJECT', 2013: 'IDC_OBJECT_TITLE', 2014: 'IDC_OBJECT_NAME', 2015: 'IDC_IMAGE_PATH', 2016: 'IDC_LIST', 2017: 'IDC_HEADER', 2018: 'ID_CREATE_CONTACT', 2019: 'ID_MAKE_ATTACHMENT', 2020: 'ID_CREATE_CASE', 2021: 'IDC_BUT_SET_SERVER_PORT', 2022: 'IDD_SERVER_PORT_DIALOG', 2023: 'IDC_CHKBX', 1000: 'IDC_PROGRESS', 1001: 'IDC_PROGRESS_TEXT', 1002: 'IDC_STATIC_HAM', 1003: 'IDC_STATIC_SPAM', 1004: 'IDC_BROWSE_HAM', 1005: 'IDC_BROWSE_SPAM', 1006: 'IDC_START', 1007: 'IDC_BUT_REBUILD', 1008: 'IDC_BUT_RESCORE', 1009: 'IDC_VERSION', 1010: 'IDC_BUT_TRAIN_FROM_SPAM_FOLDER', 1011: 'IDC_BUT_TRAIN_TO_SPAM_FOLDER', 1012: 'IDC_BUT_TRAIN_NOW', 1013: 'IDC_BUT_FILTER_ENABLE', 1014: 'IDC_FILTER_STATUS', 2045: 'IDET_PARTNER_NAME', 1016: 'IDC_BUT_FILTER_DEFINE', 1017: 'IDC_BUT_ABOUT', 1018: 'IDC_BUT_ACT_SCORE', 1019: 'IDC_BUT_ACT_ALL', 1020: 'IDC_BUT_UNREAD', 1021: 'IDC_BUT_UNSEEN', -1: 'IDC_STATIC', 1023: 'IDC_SLIDER_CERTAIN'}
bitmaps = {'IDB_OPENERPLOGO': 'OpenERP_Logo.bmp'}
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc
index 62e8b26ca4a..c00d9c80db0 100755
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc
@@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
IDD_MANAGER DIALOGEX 0, 0, 460, 260
STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME
-CAPTION "OpenERP Configuarion"
+CAPTION "OpenERP Configuration"
FONT 8, "Tahoma", 1000, 0, 0x0
BEGIN
DEFPUSHBUTTON "Close",ID_DONE,400,239,50,14//,WS_VISIBLE //| WS_TABSTOP
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
index ef4b5606ac4..2344a52a29c 100755
--- a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
@@ -27,7 +27,9 @@ import pythoncom
import time
from manager import ustr
import email
-
+from win32com.mapi import mapi, mapiutil, mapitags
+import pythoncom
+import win32com
waittime = 10
wait_count = 0
wait_limit = 12
@@ -136,13 +138,42 @@ class XMLRpcConn(object):
import win32ui, win32con
conn = xmlrpclib.ServerProxy(self._uri + '/xmlrpc/object')
import eml
+ flag = False
new_msg = files = ext_msg =""
+ message_id = referances = None
+ try:
+ outlook = win32com.client.Dispatch("Outlook.Application")
+ session = win32com.client.Dispatch("MAPI.session")
+ session.Logon('Outlook')
+ objMessage = session.GetMessage(mail.EntryID, mail.Parent.StoreID)
+ objFields = objMessage.Fields
+ strheader = objFields.Item(mapitags.PR_TRANSPORT_MESSAGE_HEADERS)
+ strheader = ustr(strheader).encode('iso-8859-1')
+ headers = {}
+ strheader = strheader.replace("\n ", " ").splitlines()
+ for line in strheader:
+ split_here = line.find(":")
+ headers[line[:split_here]] = line[split_here:]
+ temp1 = headers.get('Message-ID')
+ temp2 = headers.get('Message-Id')
+ referances = headers.get('References')
+ if temp1 == None: message_id = temp2
+ if temp2 == None: message_id = temp1
+ startCut = message_id.find("<")
+ endCut = message_id.find(">")
+ message_id = message_id[startCut:endCut+1]
+ if not referances == None:
+ startCut = referances.find("<")
+ endCut = referances.find(">")
+ referances = referances[startCut:endCut+1]
+ except Exception,e:
+ win32ui.MessageBox(str(e),"Archive To OpenERP")
+ return
new_mail=eml.generateEML(mail)
attachments=mail.Attachments
for rec in recs: #[('res.partner', 3, 'Agrolait')]
model = rec[0]
res_id = rec[1]
-
#Check if mailgate installed
object_id = execute ( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[('model','=','mailgate.message')])
if not object_id:
@@ -154,13 +185,12 @@ class XMLRpcConn(object):
#Reading the Object ir.model Name
- ext_ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'mailgate.message','search',[('message_id','=',mail.EntryID),('model','=',model),('res_id','=',res_id)])
+ ext_ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'mailgate.message','search',[('message_id','=',message_id),('model','=',model),('res_id','=',res_id)])
if ext_ids:
name = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,model,'read',res_id,['name'])['name']
- ext_msg += """This mail is already archived to {1} '{2}'.
-""".format(object_name,name)
+ ext_msg += """This mail is already archived to {0} '{1}'.\n""".format(object_name,name)
+ flag = True
continue
-
msg = {
'subject':mail.Subject,
'date':str(mail.ReceivedTime),
@@ -168,8 +198,8 @@ class XMLRpcConn(object):
'cc':mail.CC,
'from':mail.SenderEmailAddress,
'to':mail.To,
- 'message-id':str(new_mail.get('Message-Id')),
- 'references':str(new_mail.get('References')),
+ 'message-id':message_id,
+ 'references':ustr(referances),
}
result = {}
if attachments:
@@ -180,8 +210,8 @@ class XMLRpcConn(object):
flag = True
if flag:
- t = ext_msg
- t += """Mail archived Successfully with attachments.\n"""+new_msg
+ t = """Mail archived Successfully with attachments.\n"""+ext_msg
+ t += "\n"+new_msg
win32ui.MessageBox(t,"Archived to OpenERP",win32con.MB_ICONINFORMATION)
return flag
@@ -240,13 +270,35 @@ class XMLRpcConn(object):
def CreateCase(self, section, mail, partner_ids, with_attachments=True):
import win32ui
import eml
- section=str(section)
flag = False
id = -1
try:
conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
email=eml.generateEML(mail)
- id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'email.server.tools','process_email',section, email)
+ message_id = referances = None
+ outlook = win32com.client.Dispatch("Outlook.Application")
+ session = win32com.client.Dispatch("MAPI.session")
+ session.Logon('Outlook')
+ objMessage = session.GetMessage(mail.EntryID, mail.Parent.StoreID)
+ objFields = objMessage.Fields
+ strheader = objFields.Item(mapitags.PR_TRANSPORT_MESSAGE_HEADERS)
+ strheader = ustr(strheader).encode('iso-8859-1')
+ headers = {}
+ strheader = strheader.replace("\n ", " ").splitlines()
+ for line in strheader:
+ split_here = line.find(":")
+ headers[line[:split_here]] = line[split_here:]
+ temp1 = headers.get('Message-ID')
+ temp2 = headers.get('Message-Id')
+ if temp1 == None: message_id = temp2
+ if temp2 == None: message_id = temp1
+ startCut = message_id.find("<")
+ endCut = message_id.find(">")
+ message_id = message_id[startCut:endCut+1]
+
+ email.replace_header('Message-Id',message_id)
+ win32ui.MessageBox(str(email),"Mail ")
+ id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'email.server.tools','process_email',section, str(email))
if id > 0:
flag = True
return flag
@@ -398,21 +450,13 @@ class XMLRpcConn(object):
return None
return partner_id[0]
- def SearchEmailResources(self, mail):
+ def SearchEmailResources(self, message_id):
import win32ui
import eml
conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
sub = ""
res_vals = []
-
- try:
-# new_mail = eml.generateEML(mail)
- email.SaveAs()
- message_id = str(new_mail.get('message-id'))
- except Exception,e:
- win32ui.MessageBox(str(e),"Mail Reading Error")
- return None
mail_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mailgate.message', 'search', [('message_id','=',message_id)])
if not mail_id:
return None
diff --git a/addons/product/i18n/eu.po b/addons/product/i18n/eu.po
index c4de97452cf..f01bcd3abda 100644
--- a/addons/product/i18n/eu.po
+++ b/addons/product/i18n/eu.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-05 22:13+0000\n"
-"Last-Translator: Ales Zabala Alava (Shagi) \n"
+"PO-Revision-Date: 2010-10-08 07:29+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Basque \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
diff --git a/addons/product/partner_view.xml b/addons/product/partner_view.xml
index 6b756eb8d7f..51d012b8577 100644
--- a/addons/product/partner_view.xml
+++ b/addons/product/partner_view.xml
@@ -9,7 +9,7 @@
-
+
diff --git a/addons/product/product.py b/addons/product/product.py
index 6c1125268a9..09732a9bff3 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -247,7 +247,11 @@ class product_template(osv.osv):
'warranty': fields.float('Warranty (months)'),
'sale_ok': fields.boolean('Can be Sold', help="Determines if the product can be visible in the list of product within a selection from a sale order line."),
'purchase_ok': fields.boolean('Can be Purchased', help="Determine if the product is visible in the list of products within a selection from a purchase order line."),
- 'state': fields.selection([('',''),('draft', 'In Development'),('sellable','In Production'),('end','End of Lifecycle'),('obsolete','Obsolete')], 'State', help="Tells the user if he can use the product or not."),
+ 'state': fields.selection([('',''),
+ ('draft', 'In Development'),
+ ('sellable','Normal'),
+ ('end','End of Lifecycle'),
+ ('obsolete','Obsolete')], 'Status', help="Tells the user if he can use the product or not."),
'uom_id': fields.many2one('product.uom', 'Default Unit Of Measure', required=True, help="Default Unit of Measure used for all stock operation."),
'uom_po_id': fields.many2one('product.uom', 'Purchase Unit of Measure', required=True, help="Default Unit of Measure used for purchase orders. It must be in the same category than the default unit of measure."),
'uos_id' : fields.many2one('product.uom', 'Unit of Sale',
@@ -274,7 +278,9 @@ class product_template(osv.osv):
def _default_category(self, cr, uid, context={}):
if 'categ_id' in context and context['categ_id']:
return context['categ_id']
- return False
+ md = self.pool.get('ir.model.data')
+ res = md.get_object_reference(cr, uid, 'product', 'cat0') or False
+ return res and res[1] or False
def onchange_uom(self, cursor, user, ids, uom_id,uom_po_id):
if uom_id and uom_po_id:
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 05a57126402..2052221cf78 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -4,6 +4,10 @@
+
+ All products
+
+
Unit
diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index cbc1f4d458a..92d0df088ef 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -5,17 +5,12 @@
Resource: product.category
-->
-
-
- All products
- view
-
-
+
Sellable
-
+
Private
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 7e9ae7ce45e..5872e325715 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -89,7 +89,7 @@
-
+
@@ -110,7 +110,7 @@
-
+
@@ -147,13 +147,11 @@
-
-
+
+
-
-
@@ -306,9 +304,7 @@
-
-
@@ -462,7 +458,6 @@
-
@@ -487,7 +482,7 @@
-
+
@@ -559,7 +554,7 @@
-
+
@@ -580,7 +575,7 @@
-
+
@@ -637,5 +632,12 @@
form
+
+ Products
+ ir.ui.menu
+
+
+
+
diff --git a/addons/product_expiry/i18n/pl.po b/addons/product_expiry/i18n/pl.po
index 0a452d38977..ab6fb7826bf 100644
--- a/addons/product_expiry/i18n/pl.po
+++ b/addons/product_expiry/i18n/pl.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-06-30 15:09+0000\n"
-"PO-Revision-Date: 2010-10-07 16:55+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \n"
+"PO-Revision-Date: 2010-10-08 07:39+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Polish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product_expiry
diff --git a/addons/project/i18n/eu.po b/addons/project/i18n/eu.po
index 27209105cea..efa64da581c 100644
--- a/addons/project/i18n/eu.po
+++ b/addons/project/i18n/eu.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-06 11:02+0000\n"
-"Last-Translator: Ales Zabala Alava (Shagi) \n"
+"PO-Revision-Date: 2010-10-09 16:08+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Basque \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-10 04:55+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project
@@ -307,57 +307,58 @@ msgstr ""
#. module: project
#: field:project.task.work,user_id:0
msgid "Done by"
-msgstr ""
+msgstr "Nork egina:"
#. module: project
#: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
#: model:ir.actions.act_window,name:project.action_view_task
#: model:ir.ui.menu,name:project.menu_action_view_task
msgid "All Tasks"
-msgstr ""
+msgstr "Ataza Guztiak"
#. module: project
#: view:project.task:0
msgid "Planning"
-msgstr ""
+msgstr "Planifikazioa"
#. module: project
#: view:project.task:0
msgid "Extra Info"
-msgstr ""
+msgstr "Informazio gehigarria"
#. module: project
#: field:project.project,partner_id:0
#: field:project.task,partner_id:0
msgid "Partner"
-msgstr ""
+msgstr "Kidea"
#. module: project
#: field:project.task,planned_hours:0
#: wizard_field:project.task.delegate,init,planned_hours:0
msgid "Planned Hours"
-msgstr ""
+msgstr "Aurreikusitako Orduak"
#. module: project
#: view:project.project:0
msgid "Task: %(name)s"
-msgstr ""
+msgstr "Ataza: %(name)s"
#. module: project
#: view:project.project:0
msgid "Reset as Project"
-msgstr ""
+msgstr "Proiektu bezala berrezarri"
#. module: project
#: view:project.task:0
msgid "Delegations"
-msgstr ""
+msgstr "Delegazioak"
#. module: project
#: help:project.project,members:0
msgid ""
"Project's member. Not used in any computation, just for information purpose."
msgstr ""
+"Proiektuko kideak. Ez da inolako kalkulutan erabiltzen, informatzeko soilik."
#. module: project
#: view:project.project:0
diff --git a/addons/project_issue_sheet/i18n/pl.po b/addons/project_issue_sheet/i18n/pl.po
index 4087328ec2c..48db8e1680b 100644
--- a/addons/project_issue_sheet/i18n/pl.po
+++ b/addons/project_issue_sheet/i18n/pl.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-08-20 10:05+0000\n"
-"PO-Revision-Date: 2010-10-07 16:53+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \n"
+"PO-Revision-Date: 2010-10-08 07:31+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Polish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_issue_sheet
diff --git a/addons/project_messages/i18n/pl.po b/addons/project_messages/i18n/pl.po
index 30c1ea5569c..0e70ef20021 100644
--- a/addons/project_messages/i18n/pl.po
+++ b/addons/project_messages/i18n/pl.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-08-20 10:28+0000\n"
-"PO-Revision-Date: 2010-10-07 16:53+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \n"
+"PO-Revision-Date: 2010-10-08 07:38+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Polish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_messages
diff --git a/addons/project_retro_planning/i18n/kab.po b/addons/project_retro_planning/i18n/kab.po
new file mode 100644
index 00000000000..a890f540a01
--- /dev/null
+++ b/addons/project_retro_planning/i18n/kab.po
@@ -0,0 +1,23 @@
+# Kabyle translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-09 14:25+0000\n"
+"Last-Translator: yugurten \n"
+"Language-Team: Kabyle \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-10 04:56+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_retro_planning
+#: model:ir.module.module,shortdesc:project_retro_planning.module_meta_information
+msgid "Project Retro planning"
+msgstr "A qanib d we Siqwas n we Senfar"
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 370525f0ae3..d6ed37a8aae 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -46,7 +46,7 @@ class project_work(osv.osv):
raise osv.except_osv(_('Bad Configuration !'),
_('No journal defined on the related employee.\nFill in the timesheet tab of the employee form.'))
- a = emp.product_id.product_tmpl_id.property_account_expense.id
+ a = emp.product_id.product_tmpl_id.property_account_expense.id
if not a:
a = emp.product_id.categ_id.property_account_expense_categ.id
if not a:
@@ -108,7 +108,6 @@ class project_work(osv.osv):
def write(self, cr, uid, ids, vals, context=None):
if context is None:
context = {}
- obj = self.pool.get('hr.analytic.timesheet')
timesheet_obj = self.pool.get('hr.analytic.timesheet')
project_obj = self.pool.get('project.project')
uom_obj = self.pool.get('product.uom')
@@ -144,7 +143,7 @@ class project_work(osv.osv):
vals_line['unit_amount'] = uom_obj._compute_qty(cr, uid, default_uom, vals['hours'], result['product_uom_id'])
# Compute based on pricetype
- amount_unit = obj.on_change_unit_amount(cr, uid, line_id.id,
+ amount_unit = timesheet_obj.on_change_unit_amount(cr, uid, line_id.id,
prod_id=prod_id,
quantity=vals_line['unit_amount'], unit=False, context=context)
diff --git a/addons/project_timesheet/report/task_report.py b/addons/project_timesheet/report/task_report.py
index 261f4e17c64..623d4e4a5cd 100644
--- a/addons/project_timesheet/report/task_report.py
+++ b/addons/project_timesheet/report/task_report.py
@@ -32,8 +32,8 @@ class report_timesheet_task_user(osv.osv):
def _get_task_hours(self, cr, uid, ids, name,args,context):
result = {}
for record in self.browse(cr, uid, ids,context):
- last_date = datetime(record.name, '%Y-%m-%d') + relativedelta(months=1) - 1
- task_obj=self.pool.get('project.task.work')
+ last_date = datetime.strptime(record.name, '%Y-%m-%d') + relativedelta(months=1) - relativedelta(days=1)
+ task_obj = self.pool.get('project.task.work')
task_ids = task_obj.search(cr, uid, [('user_id','=',record.user_id.id),('date','>=',record.name),('date','<=',last_date.strftime('%Y-%m-%d'))])
tsk_hrs = task_obj.read(cr, uid, task_ids, ['hours','date','user_id'])
total = 0.0
@@ -46,8 +46,8 @@ class report_timesheet_task_user(osv.osv):
result = {}
sum = 0.0
for record in self.browse(cr, uid, ids, context):
- last_date = datetime.strptime(record.name, '%Y-%m-%d') + relativedelta(months=1) - 1
- obj=self.pool.get('hr_timesheet_sheet.sheet.day')
+ last_date = datetime.strptime(record.name, '%Y-%m-%d') + relativedelta(months=1) - relativedelta(days=1)
+ obj = self.pool.get('hr_timesheet_sheet.sheet.day')
sheet_ids = obj.search(cr, uid, [('sheet_id.user_id','=',record.user_id.id),('name','>=',record.name),('name','<=',last_date.strftime('%Y-%m-%d'))])
data_days = obj.read(cr, uid, sheet_ids, ['name','sheet_id.user_id','total_attendance'])
total = 0.0
diff --git a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
index d0477c545ff..b08300b8d33 100644
--- a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
+++ b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
@@ -1,5 +1,5 @@
-
- Create an user 'HR Manager'
+ Create a user 'HR Manager'
-
!record {model: res.users, id: res_users_hrmanager0}:
company_id: base.main_company
@@ -9,7 +9,7 @@
password: hr
-
- Create a product with type service used to specifies employees designation
+ Create a product with type service used to specify employees designation
-
!record {model: product.product, id: product_product_hrmanger0}:
categ_id: product.product_category_services
@@ -45,7 +45,7 @@
journal_id: account_analytic_journal_hrtimesheet0
-
- Create a timesheet sheet for hr manager
+ Create a timesheet sheet for HR manager
-
!record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_sheetforhrmanager0}:
date_current: '2010-06-03'
@@ -86,7 +86,7 @@
False, "active_id": ref("project_project_timesheetmanagement0"), })
-
- Make a work task entry 'Get work calendar of all employees' of 10 hours done by hr manager
+ Make a work task entry 'Get work calendar of all employees' of 10 hours done by HR manager
-
!record {model: project.task, id: project_task_getalltimesheetrecords0}:
work_ids:
@@ -96,7 +96,7 @@
user_id: res_users_hrmanager0
-
- Check for timesheet_ids in hr manager's timesheet
+ Check for timesheet_ids in HR manager's timesheet
-
!assert {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_sheetforhrmanager0, string: After hr manager's work task, length of timesheet line of current timesheet must be greater then 1}:
- len(timesheet_ids) > 0
\ No newline at end of file
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 7af6dbceff0..58b049e130e 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -46,8 +46,8 @@
'wizard/purchase_order_group_view.xml',
'wizard/purchase_installer.xml',
'wizard/purchase_line_invoice_view.xml',
- 'purchase_view.xml',
'purchase_report.xml',
+ 'purchase_view.xml',
'stock_view.xml',
'partner_view.xml',
'process/purchase_process.xml',
diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po
index 7f2b499bf51..32a041b8393 100644
--- a/addons/purchase/i18n/de.po
+++ b/addons/purchase/i18n/de.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-29 10:22+0000\n"
-"Last-Translator: Ferdinand-chricar \n"
+"PO-Revision-Date: 2010-10-10 10:52+0000\n"
+"Last-Translator: Ferdinand @ ChriCar \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase
@@ -948,4 +948,4 @@ msgstr "In Bearbeitung"
#: code:addons/purchase/purchase.py:0
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
-msgstr ""
+msgstr "Einkaufsaufträge mit dem Status %s können nicht gelöscht werden"
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index c85088c9b53..a9996202b20 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -35,19 +35,32 @@
action="base.action_partner_supplier_form" sequence="1"/>
-
+ name="Incoming Shipments" sequence="9"
+ groups="base.group_extended"/>
+
+
+ account.invoice
+ form
+ tree,form,calendar,graph
+
+ [('type','=','in_invoice')]
+ {'type':'in_invoice', 'journal_type': 'purchase', 'search_default_draft': 1}
+
+ This is the list of supplier invoice you are waiting for. You can select invoices and validate them once you have received the invoice and checked his data.
+
+
@@ -100,13 +113,13 @@
-
+
-
+
@@ -124,15 +137,16 @@
-
-
-
-
+
-
+
+
+
+
+
@@ -200,7 +214,7 @@
purchase.order
tree
-
+
@@ -222,7 +236,7 @@
ir.actions.act_window
purchase.order
form
- {'search_default_draft': 1,'search_default_create_uid':uid}
+ {'search_default_draft': 1}
tree,form,graph,calendar
With the Requests for quotation menu you can create new quotations, review existing one and confirm them to order once the supplier offer is approved.
@@ -270,7 +284,7 @@
-
+
@@ -287,7 +301,7 @@
purchase.order.line
tree
-
+
@@ -310,8 +324,8 @@
-
+
-
-
+ groups="base.group_extended"
+ id="action_view_purchase_order_group"/>
+
diff --git a/addons/resource/i18n/de.po b/addons/resource/i18n/de.po
index 951474e7385..60a08660213 100644
--- a/addons/resource/i18n/de.po
+++ b/addons/resource/i18n/de.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-08-18 06:50+0000\n"
-"PO-Revision-Date: 2010-08-23 06:41+0000\n"
-"Last-Translator: Ferdinand-chricar \n"
+"PO-Revision-Date: 2010-10-10 10:52+0000\n"
+"Last-Translator: Ferdinand @ ChriCar \n"
"Language-Team: German \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: resource
@@ -212,6 +212,8 @@ msgid ""
"If the active field is set to true, it will allow you to hide the resource "
"record without removing it."
msgstr ""
+"Wenn das Aktiv Feld auf Falsch gesetzt wird, wird die Ressource versteckt "
+"ohne sie zu löschen"
#. module: resource
#: selection:resource.calendar.attendance,dayofweek:0
@@ -243,6 +245,7 @@ msgstr "Ressourcen Kalender"
#: help:resource.resource,user_id:0
msgid "Related user name for the resource to manage its access."
msgstr ""
+"Der mit der Ressource verbunden Benutzer für die Zugriffsberechtigung"
#. module: resource
#: help:resource.resource,calendar_id:0
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index c3e0a29af9d..3cbb2ea4576 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -250,7 +250,7 @@ class sale_order(osv.osv):
'order_line': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft': [('readonly', False)]}),
'invoice_ids': fields.many2many('account.invoice', 'sale_order_invoice_rel', 'order_id', 'invoice_id', 'Invoices', help="This is the list of invoices that have been generated for this sale order. The same sale order may have been invoiced in several times (by line for example)."),
'picking_ids': fields.one2many('stock.picking', 'sale_id', 'Related Picking', readonly=True, help="This is the list of picking list that have been generated for this invoice"),
- 'shipped': fields.boolean('Picked', readonly=True, help="It indicates that a picking has been done. It will be set to True if the ordered quantities are available and the picking is done. If the ordered quantities are not available Procurement generates a Purchase/Manufacturing order. Unless its Picking and Purchase/Manufacturing order are not in the done state it wont be set to True"),
+ 'shipped': fields.boolean('Delivered', readonly=True, help="It indicates that the sale order has been delivered. This field is updated only after the scheduler have been launched !"),
'picked_rate': fields.function(_picked_rate, method=True, string='Picked', type='float'),
'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'),
'invoiced': fields.function(_invoiced, method=True, string='Paid',
@@ -911,7 +911,7 @@ class sale_order_line(osv.osv):
else:
a = self.pool.get('ir.property').get(cr, uid,
'property_account_income_categ', 'product.category',
- context=context)
+ context=context).id
uosqty = _get_line_qty(line)
uos_id = _get_line_uom(line)
pu = 0.0
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index a30c05d5c2b..747414b7e8d 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -56,7 +56,7 @@
sale.order
calendar
-
+
@@ -67,7 +67,7 @@
sale.order
graph
-
+
@@ -79,15 +79,15 @@
sale.order
tree
-
+
-
-
+
+
@@ -98,7 +98,7 @@
sale.order
form
-
-
+
@@ -344,7 +344,7 @@ to your configuration: from the sales order, from the pickings, etc.
sale.order.line
graph
-
+
@@ -356,14 +356,14 @@ to your configuration: from the sales order, from the pickings, etc.
sale.order.line
tree
-
+
-
+
@@ -517,7 +517,8 @@ to your configuration: from the sales order, from the pickings, etc.
src_model="product.product"
groups="base.group_extended"/>
-
+
diff --git a/addons/sale_crm/security/ir.model.access.csv b/addons/sale_crm/security/ir.model.access.csv
index 81007b11678..a1bd4896f5f 100644
--- a/addons/sale_crm/security/ir.model.access.csv
+++ b/addons/sale_crm/security/ir.model.access.csv
@@ -1,2 +1,2 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_account_invoice_report_salesman", "account.invoice.report salesman", "account.model_account_invoice_report","base.group_sale_salesman",1,0,0,0
+"access_account_invoice_report_salesman","account.invoice.report salesman","account.model_account_invoice_report","base.group_sale_salesman",1,0,0,0
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index 7af3e2f7a2a..0c8df05ca06 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -21,7 +21,6 @@
from osv import fields, osv
from tools.translate import _
-import decimal_precision as dp
import time
@@ -54,10 +53,6 @@ class crm_make_sale(osv.osv_memory):
def view_init(self, cr, uid, fields_list, context=None):
if context is None:
context = {}
- if context.get('active_ids', False) and context['active_ids']:
- for line in self.pool.get('crm.lead').browse(cr, uid, context['active_ids']):
- if not line.section_id:
- raise osv.except_osv(_('Warning !'), _(' Sales Team is not specified.'))
return super(crm_make_sale, self).view_init(cr, uid, fields_list, context=context)
def makeOrder(self, cr, uid, ids, context=None):
diff --git a/addons/sale_crm/wizard/crm_make_sale_view.xml b/addons/sale_crm/wizard/crm_make_sale_view.xml
index ed0b9ef780e..d73a2cee1ef 100644
--- a/addons/sale_crm/wizard/crm_make_sale_view.xml
+++ b/addons/sale_crm/wizard/crm_make_sale_view.xml
@@ -8,12 +8,10 @@
crm.make.sale
form
-
@@ -1695,35 +1697,36 @@
@@ -1761,7 +1764,7 @@
search
-
+
@@ -1798,7 +1801,7 @@
tree,form
['|','&',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','in')]
- {"search_default_receive":1}
+
@@ -1860,7 +1863,7 @@
@@ -1875,7 +1878,7 @@
context="{'location': active_id, 'search_default_future': 1,'search_default_product_id': [active_id]}"
domain="[('state','in',('waiting','confirmed','assigned'))]"
id="act_product_stock_move_futur_open"
- name="Future Stock Moves"
+ name="Future Inventory Moves"
res_model="stock.move"
src_model="product.product"
groups="base.group_extended"/>
@@ -1936,7 +1939,7 @@
- Delivery Products
+ Delivered Products
report.delivery.products.planned
tree
@@ -1949,7 +1952,7 @@
- Delivery Products
+ Delivered Products
report.delivery.products.planned
graph
@@ -1962,7 +1965,7 @@
- Delivery Products Vs Planned
+ Delivered Products Vs Planned
report.delivery.products.planned
ir.actions.act_window
form
@@ -2006,7 +2009,7 @@
tree,form
['|','&',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','out')]
- {"search_default_receive":1}
+
diff --git a/addons/stock/wizard/stock_partial_move_view.xml b/addons/stock/wizard/stock_partial_move_view.xml
index a7b4271a5b2..457ddc34ff7 100644
--- a/addons/stock/wizard/stock_partial_move_view.xml
+++ b/addons/stock/wizard/stock_partial_move_view.xml
@@ -2,7 +2,7 @@
-
- Making Picking
+ Process Picking
stock.partial.picking
form
form
diff --git a/addons/thunderbird/i18n/eu.po b/addons/thunderbird/i18n/eu.po
index 17c268d7652..d5836168c61 100644
--- a/addons/thunderbird/i18n/eu.po
+++ b/addons/thunderbird/i18n/eu.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-11-26 06:05+0000\n"
-"PO-Revision-Date: 2010-10-05 22:18+0000\n"
-"Last-Translator: Ales Zabala Alava (Shagi) \n"
+"PO-Revision-Date: 2010-10-08 07:34+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Basque \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: thunderbird
diff --git a/addons/wiki/i18n/sv.po b/addons/wiki/i18n/sv.po
index 1da34d2bef1..30b8bc8f72e 100644
--- a/addons/wiki/i18n/sv.po
+++ b/addons/wiki/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-07 19:19+0000\n"
+"PO-Revision-Date: 2010-10-08 07:35+0000\n"
"Last-Translator: Anders Eriksson (Mobila System) \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: wiki
diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index b8876ee0316..2d814485a7c 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -108,9 +108,9 @@ class wiki_wiki2(osv.osv):
'name': fields.char('Title', size=256, select=True, required=True),
'write_uid': fields.many2one('res.users', "Last Contributor", select=True),
'text_area': fields.text("Content"),
- 'create_uid': fields.many2one('res.users', 'Author', select=True),
- 'create_date': fields.datetime("Created on", select=True),
- 'write_date': fields.datetime("Modification Date", select=True),
+ 'create_uid': fields.many2one('res.users', 'Author', select=True, readonly=True),
+ 'create_date': fields.datetime("Created on", select=True, readonly=True),
+ 'write_date': fields.datetime("Modification Date", select=True, readonly=True),
'tags': fields.char('Keywords', size=1024, select=True),
'history_id': fields.one2many('wiki.wiki.history', 'wiki_id', 'History Lines'),
'minor_edit': fields.boolean('Minor edit', select=True),
@@ -184,8 +184,6 @@ class wiki_wiki2(osv.osv):
""" @param cr: the current row, from the database cursor,
@param uid: the current user’s ID for security checks, """
- #TOFIX: why create_uid in vals
- if 'create_uid' in vals: del vals['create_uid']
wiki_id = super(wiki_wiki2, self).create(cr, uid,
vals, context)
self.create_history(cr, uid, [wiki_id], vals, context)
diff --git a/addons/wiki_faq/i18n/de.po b/addons/wiki_faq/i18n/de.po
index bacf06ac713..24579de9728 100644
--- a/addons/wiki_faq/i18n/de.po
+++ b/addons/wiki_faq/i18n/de.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-08-20 11:42+0000\n"
-"PO-Revision-Date: 2010-10-05 13:38+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2010-10-10 10:53+0000\n"
+"Last-Translator: Ferdinand @ ChriCar \n"
"Language-Team: German \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: wiki_faq
@@ -27,4 +27,4 @@ msgstr ""
#. module: wiki_faq
#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
msgid "Document Management - Wiki - FAQ"
-msgstr ""
+msgstr "Dokument Management - Wiki - F&A"
diff --git a/addons/wiki_quality_manual/i18n/de.po b/addons/wiki_quality_manual/i18n/de.po
index 64a35b43a8e..c0925029a28 100644
--- a/addons/wiki_quality_manual/i18n/de.po
+++ b/addons/wiki_quality_manual/i18n/de.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-08-20 11:48+0000\n"
-"PO-Revision-Date: 2010-10-05 13:38+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2010-10-10 10:54+0000\n"
+"Last-Translator: Ferdinand @ ChriCar \n"
"Language-Team: German \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: wiki_quality_manual
@@ -27,4 +27,4 @@ msgstr ""
#. module: wiki_quality_manual
#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
msgid "Document Management - Wiki - Quality Manual"
-msgstr ""
+msgstr "Dokument Management - Wiki - Qualitätssicherungs Handbuch"
diff --git a/addons/wiki_sale_faq/i18n/de.po b/addons/wiki_sale_faq/i18n/de.po
index 8d74476d08f..bb66a8e23a4 100644
--- a/addons/wiki_sale_faq/i18n/de.po
+++ b/addons/wiki_sale_faq/i18n/de.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-08-20 11:54+0000\n"
-"PO-Revision-Date: 2010-10-05 13:39+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2010-10-10 10:55+0000\n"
+"Last-Translator: Ferdinand @ ChriCar \n"
"Language-Team: German \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: wiki_sale_faq
@@ -22,27 +22,27 @@ msgstr ""
#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
msgid "Documents"
-msgstr ""
+msgstr "Dokumente"
#. module: wiki_sale_faq
#: constraint:ir.ui.menu:0
msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Menüeinträge erstellen."
#. module: wiki_sale_faq
#: constraint:document.directory:0
msgid "Error! You can not create recursive Directories."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Ordner erzeugen."
#. module: wiki_sale_faq
#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
msgid "FAQ"
-msgstr ""
+msgstr "Häufig gestellte Fragen"
#. module: wiki_sale_faq
#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
msgid "Wiki Pages"
-msgstr ""
+msgstr "Wiki Seiten"
#. module: wiki_sale_faq
#: model:ir.module.module,description:wiki_sale_faq.module_meta_information
@@ -50,13 +50,15 @@ msgid ""
"This module provides a wiki FAQ Template\n"
" "
msgstr ""
+"Dieses Modul bitete eine Wiki F&A Vorlage\n"
+" "
#. module: wiki_sale_faq
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Ungültiger Modulname in der Aktionsdefinition."
#. module: wiki_sale_faq
#: model:ir.module.module,shortdesc:wiki_sale_faq.module_meta_information
msgid "Wiki -Sale - FAQ"
-msgstr ""
+msgstr "Wiki -Verkauf - F&A"
| |