diff --git a/addons/account/account.py b/addons/account/account.py index 432a90a653e..278e752cfe4 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2524,7 +2524,10 @@ class account_account_template(osv.osv): #deactivate the parent_store functionnality on account_account for rapidity purpose ctx = context.copy() ctx.update({'defer_parent_store_computation': True}) - children_acc_template = self.search(cr, uid, ['|', ('chart_template_id','=', chart_template_id),'&',('parent_id','child_of', [template.account_root_id.id]),('chart_template_id','=', False), ('nocreate','!=',True)], order='id') + children_acc_criteria = [('chart_template_id','=', chart_template_id)] + if template.account_root_id.id: + children_acc_criteria = ['|'] + children_acc_criteria + ['&',('parent_id','child_of', [template.account_root_id.id]),('chart_template_id','=', False)] + children_acc_template = self.search(cr, uid, [('nocreate','!=',True)] + children_acc_criteria, order='id') for account_template in self.browse(cr, uid, children_acc_template, context=context): # skip the root of COA if it's not the main one if (template.account_root_id.id == account_template.id) and template.parent_id: @@ -2982,7 +2985,7 @@ class wizard_multi_charts_accounts(osv.osv_memory): tax_templ_obj = self.pool.get('account.tax.template') if 'bank_accounts_id' in fields: - res.update({'bank_accounts_id': [{'acc_name': _('Cash'), 'account_type': 'cash'}]}) + res.update({'bank_accounts_id': [{'acc_name': _('Cash'), 'account_type': 'cash'},{'acc_name': _('Bank'), 'account_type': 'bank'}]}) if 'company_id' in fields: res.update({'company_id': self.pool.get('res.users').browse(cr, uid, [uid], context=context)[0].company_id.id}) if 'seq_journal' in fields: diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index bd31b01a41d..9cfda051ec1 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -52,8 +52,9 @@ class account_bank_statement(osv.osv): journal_pool = self.pool.get('account.journal') journal_type = context.get('journal_type', False) journal_id = False + company_id = self.pool.get('res.company')._company_default_get(cr, uid, 'account.bank.statement',context=context) if journal_type: - ids = journal_pool.search(cr, uid, [('type', '=', journal_type)]) + ids = journal_pool.search(cr, uid, [('type', '=', journal_type),('company_id','=',company_id)]) if ids: journal_id = ids[0] return journal_id @@ -169,30 +170,31 @@ class account_bank_statement(osv.osv): 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.bank.statement',context=c), } - def onchange_date(self, cr, user, ids, date, context=None): + def _check_company_id(self, cr, uid, ids, context=None): + for statement in self.browse(cr, uid, ids, context=context): + if statement.company_id.id != statement.period_id.company_id.id: + return False + return True + + _constraints = [ + (_check_company_id, 'The journal and period chosen have to belong to the same company.', ['journal_id','period_id']), + ] + + def onchange_date(self, cr, uid, ids, date, company_id, context=None): """ - Returns a dict that contains new values and context - @param cr: A database cursor - @param user: ID of the user currently logged in - @param date: latest value from user input for field date - @param args: other arguments - @param context: context arguments, like lang, time zone - @return: Returns a dict which contains new values, and context + Find the correct period to use for the given date and company_id, return it and set it in the context """ res = {} period_pool = self.pool.get('account.period') if context is None: context = {} - - pids = period_pool.search(cr, user, [('date_start','<=',date), ('date_stop','>=',date)]) + ctx = context.copy() + ctx.update({'company_id': company_id}) + pids = period_pool.find(cr, uid, dt=date, context=ctx) if pids: - res.update({ - 'period_id':pids[0] - }) - context.update({ - 'period_id':pids[0] - }) + res.update({'period_id': pids[0]}) + context.update({'period_id': pids[0]}) return { 'value':res, @@ -385,8 +387,10 @@ class account_bank_statement(osv.osv): ORDER BY date DESC,id DESC LIMIT 1', (journal_id, 'draft')) res = cr.fetchone() balance_start = res and res[0] or 0.0 - account_id = self.pool.get('account.journal').read(cr, uid, journal_id, ['default_debit_account_id'], context=context)['default_debit_account_id'] - return {'value': {'balance_start': balance_start, 'account_id': account_id}} + journal_data = self.pool.get('account.journal').read(cr, uid, journal_id, ['default_debit_account_id', 'company_id'], context=context) + account_id = journal_data['default_debit_account_id'] + company_id = journal_data['company_id'] + return {'value': {'balance_start': balance_start, 'account_id': account_id, 'company_id': company_id}} def unlink(self, cr, uid, ids, context=None): stat = self.read(cr, uid, ids, ['state'], context=context) diff --git a/addons/account/account_financial_report.py b/addons/account/account_financial_report.py index 4ee8ac3d74b..0688d6f12b1 100644 --- a/addons/account/account_financial_report.py +++ b/addons/account/account_financial_report.py @@ -104,20 +104,30 @@ class account_financial_report(osv.osv): ('account_report','Report Value'), ],'Type'), 'account_ids': fields.many2many('account.account', 'account_account_financial_report', 'report_line_id', 'account_id', 'Accounts'), + 'account_report_id': fields.many2one('account.financial.report', 'Report Value'), + 'account_type_ids': fields.many2many('account.account.type', 'account_account_financial_report_type', 'report_id', 'account_type_id', 'Account Types'), + 'sign': fields.selection([(-1, 'Reverse balance sign'), (1, 'Preserve balance sign')], 'Sign on Reports', required=True, help='For accounts that are typically more debited than credited and that you would like to print as negative amounts in your reports, you should reverse the sign of the balance; e.g.: Expense account. The same applies for accounts that are typically more credited than debited and that you would like to print as positive amounts in your reports; e.g.: Income account.'), 'display_detail': fields.selection([ ('no_detail','No detail'), ('detail_flat','Display children flat'), ('detail_with_hierarchy','Display children with hierarchy') ], 'Display details'), - 'account_report_id': fields.many2one('account.financial.report', 'Report Value'), - 'account_type_ids': fields.many2many('account.account.type', 'account_account_financial_report_type', 'report_id', 'account_type_id', 'Account Types'), - 'sign': fields.selection([(-1, 'Reverse balance sign'), (1, 'Preserve balance sign')], 'Sign on Reports', required=True, help='For accounts that are typically more debited than credited and that you would like to print as negative amounts in your reports, you should reverse the sign of the balance; e.g.: Expense account. The same applies for accounts that are typically more credited than debited and that you would like to print as positive amounts in your reports; e.g.: Income account.'), + 'style_overwrite': fields.selection([ + (0, 'Automatic formatting'), + (1,'Main Title 1 (bold, underlined)'), + (2,'Title 2 (bold)'), + (3,'Title 3 (bold, smaller)'), + (4,'Normal Text'), + (5,'Italic Text (smaller)'), + (6,'Smallest Text'), + ],'Financial Report Style', help="You can set up here the format you want this record to be displayed. If you leave the automatic formatting, it will be computed based on the financial reports hierarchy (auto-computed field 'level')."), } _defaults = { 'type': 'sum', 'display_detail': 'detail_flat', 'sign': 1, + 'style_overwrite': 0, } account_financial_report() diff --git a/addons/account/account_financial_report_data.xml b/addons/account/account_financial_report_data.xml index 18624f94749..6410a5e887c 100644 --- a/addons/account/account_financial_report_data.xml +++ b/addons/account/account_financial_report_data.xml @@ -4,23 +4,6 @@ - - Balance Sheet - sum - - - Assets - - detail_with_hierarchy - account_type - - - Liability - - detail_with_hierarchy - account_type - - Profit and Loss sum @@ -38,6 +21,35 @@ account_type + + Balance Sheet + sum + + + Assets + + detail_with_hierarchy + account_type + + + Liability + + no_detail + sum + + + Liability + + detail_with_hierarchy + account_type + + + Profit (Loss) to report + + no_detail + account_report + + diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index 166d146829b..edab8f90b3f 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -316,6 +316,15 @@ class account_invoice(osv.osv): res['fields'][field]['selection'] = journal_select doc = etree.XML(res['arch']) + + if context.get('type', False): + for node in doc.xpath("//field[@name='partner_bank_id']"): + if context['type'] == 'in_refund': + node.set('domain', "[('partner_id.ref_companies', 'in', [company_id])]") + elif context['type'] == 'out_refund': + node.set('domain', "[('partner_id', '=', partner_id)]") + res['arch'] = etree.tostring(doc) + if view_type == 'search': if context.get('type', 'in_invoice') in ('out_invoice', 'out_refund'): for node in doc.xpath("//group[@name='extended filter']"): diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 3d34396248b..e7686919d22 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -594,7 +594,7 @@
- + @@ -655,7 +655,8 @@ - + + @@ -2620,7 +2621,7 @@ action = pool.get('res.config').next(cr, uid, [], context) - + @@ -2693,7 +2694,7 @@ action = pool.get('res.config').next(cr, uid, [], context) - + @@ -2785,6 +2786,7 @@ action = pool.get('res.config').next(cr, uid, [], context) + diff --git a/addons/account/data/data_account_type.xml b/addons/account/data/data_account_type.xml index 590357ef080..a594f3db968 100644 --- a/addons/account/data/data_account_type.xml +++ b/addons/account/data/data_account_type.xml @@ -2,7 +2,7 @@ - View + Root/View view none @@ -10,11 +10,13 @@ Receivable receivable unreconciled + asset Payable payable unreconciled + liability Bank @@ -25,6 +27,7 @@ Cash cash balance + asset Asset diff --git a/addons/account/demo/account_demo.xml b/addons/account/demo/account_demo.xml index 0bbfa71af62..0dff40ca19f 100644 --- a/addons/account/demo/account_demo.xml +++ b/addons/account/demo/account_demo.xml @@ -33,7 +33,8 @@ - + + diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po index 85f6ab44208..bb580ccffc5 100644 --- a/addons/account/i18n/tr.po +++ b/addons/account/i18n/tr.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n" -"X-Generator: Launchpad (build 14713)\n" +"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n" +"X-Generator: Launchpad (build 14719)\n" #. module: account #: view:account.invoice.report:0 diff --git a/addons/account/report/account_financial_report.py b/addons/account/report/account_financial_report.py index c3b1f5e2e1a..eed42230aaf 100644 --- a/addons/account/report/account_financial_report.py +++ b/addons/account/report/account_financial_report.py @@ -58,18 +58,25 @@ class report_account_common(report_sxw.rml_parse, common_report_header): 'name': report.name, 'balance': report.balance, 'type': 'report', - 'level': report.level, + 'level': bool(report.style_overwrite) and report.style_overwrite or report.level, + 'account_type': report.type =='sum' and 'view' or False, #used to underline the financial report balances } if data['form']['enable_filter']: vals['balance_cmp'] = self.pool.get('account.financial.report').browse(self.cr, self.uid, report.id, context=data['form']['comparison_context']).balance lines.append(vals) account_ids = [] + if report.display_detail == 'no_detail': + #the rest of the loop is used to display the details of the financial report, so it's not needed here. + continue if report.type == 'accounts' and report.account_ids: account_ids = account_obj._get_children_and_consol(self.cr, self.uid, [x.id for x in report.account_ids]) elif report.type == 'account_type' and report.account_type_ids: account_ids = account_obj.search(self.cr, self.uid, [('user_type','in', [x.id for x in report.account_type_ids])]) if account_ids: for account in account_obj.browse(self.cr, self.uid, account_ids, context=data['form']['used_context']): + #if there are accounts to display, we add them to the lines with a level equals to their level in + #the COA + 1 (to avoid having them with a too low level that would conflicts with the level of data + #financial reports for Assets, liabilities...) if report.display_detail == 'detail_flat' and account.type == 'view': continue flag = False @@ -77,7 +84,7 @@ class report_account_common(report_sxw.rml_parse, common_report_header): 'name': account.code + ' ' + account.name, 'balance': account.balance != 0 and account.balance * report.sign or account.balance, 'type': 'account', - 'level': report.display_detail == 'detail_with_hierarchy' and min(account.level,6) or 6, + 'level': report.display_detail == 'detail_with_hierarchy' and min(account.level + 1,6) or 6, #account.level + 1 'account_type': account.type, } if not currency_obj.is_zero(self.cr, self.uid, account.company_id.currency_id, vals['balance']): diff --git a/addons/account/report/account_financial_report.rml b/addons/account/report/account_financial_report.rml index 4982c9b3bed..91694c6b902 100644 --- a/addons/account/report/account_financial_report.rml +++ b/addons/account/report/account_financial_report.rml @@ -127,43 +127,31 @@ - - - - - - - - - - + + + + + + + + + + + + - - - - - + + + - - - - - - - - - - - - @@ -231,9 +219,11 @@ [[ repeatIn(get_lines(data), 'a') ]] [[ (a.get('level') <> 0) or removeParentNode('tr') ]] [[ setTag('tr','tr',{'style': 'Table'+str(min(3,'level' in a and a.get('level') or 1))}) ]] - [[ (a.get('account_type') =='view' and a.get('level') >= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a.get('level')))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a.get('level')))+'_name'}) ]][[ a.get('name') ]] - [[ (a.get('level') <>2) or removeParentNode('td') ]][[ (a.get('account_type') =='view' and a.get('level') >= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.get('level')))+'_balance'}) ]][[ formatLang(a.get('balance'), currency_obj = company.currency_id) ]] - [[ a.get('level') == 2 or removeParentNode('td') ]][[ formatLang(a.get('balance'), currency_obj = company.currency_id) ]] + [[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a.get('level')))+'_name'}) ]][[ a.get('name') ]] + [[ a.get('account_type') =='view' or removeParentNode('td') ]] + [[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a.get('level')))+'_balance'}) ]][[ formatLang(a.get('balance'), currency_obj = company.currency_id) ]] + [[ a.get('account_type') <>'view' or removeParentNode('td') ]] + [[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a.get('level')))+'_balance'}) ]][[ formatLang(a.get('balance'), currency_obj = company.currency_id) ]] @@ -256,11 +246,15 @@ [[ repeatIn(get_lines(data), 'a') ]] [[ (a.get('level') <> 0) or removeParentNode('tr') ]] [[ setTag('tr','tr',{'style': 'Table'+str(min(3,'level' in a and a.get('level') or 1))}) ]] - [[ (a.get('account_type') =='view' and a.get('level') >= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a.get('level')))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a.get('level')))+'_name'}) ]][[ a.get('name') ]] - [[ (a.get('level') <>2) or removeParentNode('td') ]][[ (a.get('account_type') =='view' and a.get('level') >= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.get('level')))+'_balance'}) ]][[ formatLang(a.get('balance'), currency_obj = company.currency_id) ]] - [[ a.get('level') == 2 or removeParentNode('td') ]][[ formatLang(a.get('balance'), currency_obj = company.currency_id) ]] - [[ (a.get('level') <>2) or removeParentNode('td') ]][[ (a.get('account_type') =='view' and a.get('level') >= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.get('level')))+'_balance'}) ]][[ formatLang(a.get('balance_cmp'), currency_obj = company.currency_id) ]] - [[ a.get('level') == 2 or removeParentNode('td') ]][[ formatLang(a.get('balance_cmp'), currency_obj = company.currency_id) ]] + [[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a.get('level')))+'_name'}) ]][[ a.get('name') ]] + [[ a.get('account_type') =='view' or removeParentNode('td') ]] + [[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a.get('level')))+'_balance'}) ]][[ formatLang(a.get('balance'), currency_obj = company.currency_id) ]] + [[ a.get('account_type') <>'view' or removeParentNode('td') ]] + [[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a.get('level')))+'_balance'}) ]][[ formatLang(a.get('balance'), currency_obj = company.currency_id) ]] + [[ a.get('account_type') =='view' or removeParentNode('td') ]] + [[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a.get('level')))+'_balance'}) ]][[ formatLang(a.get('balance_cmp'), currency_obj = company.currency_id) ]] + [[ a.get('account_type') <>'view' or removeParentNode('td') ]] + [[ setTag('para','para',{'style': 'terp_level_'+str(min(6,a.get('level')))+'_balance'}) ]][[ formatLang(a.get('balance_cmp'), currency_obj = company.currency_id) ]] diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py index 8ae425e0b15..50c5d4adbae 100644 --- a/addons/account/wizard/account_report_common.py +++ b/addons/account/wizard/account_report_common.py @@ -29,8 +29,14 @@ class account_common_report(osv.osv_memory): _name = "account.common.report" _description = "Account Common Report" + def onchange_chart_id(self, cr, uid, ids, chart_account_id=False, context=None): + if chart_account_id: + company_id = self.pool.get('account.account').browse(cr, uid, chart_account_id, context=context).company_id.id + return {'value': {'company_id': company_id}} + _columns = { 'chart_account_id': fields.many2one('account.account', 'Chart of Account', help='Select Charts of Accounts', required=True, domain = [('parent_id','=',False)]), + 'company_id': fields.related('chart_account_id', 'company_id', type='many2one', relation='res.company', string='Company', readonly=True), 'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', help='Keep empty for all open fiscal year'), 'filter': fields.selection([('filter_no', 'No Filters'), ('filter_date', 'Date'), ('filter_period', 'Periods')], "Filter by", required=True), 'period_from': fields.many2one('account.period', 'Start Period'), @@ -44,6 +50,22 @@ class account_common_report(osv.osv_memory): } + def _check_company_id(self, cr, uid, ids, context=None): + for wiz in self.browse(cr, uid, ids, context=context): + company_id = wiz.company_id.id + if wiz.fiscalyear_id and company_id != wiz.fiscalyear_id.company_id.id: + return False + if wiz.period_from and company_id != wiz.period_from.company_id.id: + return False + if wiz.period_to and company_id != wiz.period_to.company_id.id: + return False + return True + + _constraints = [ + (_check_company_id, 'The fiscalyear, periods or chart of account chosen have to belong to the same company.', ['chart_account_id','fiscalyear_id','period_from','period_to']), + ] + + def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): res = super(account_common_report, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False) if context.get('active_model', False) == 'account.account' and view_id: diff --git a/addons/account/wizard/account_report_common_view.xml b/addons/account/wizard/account_report_common_view.xml index 30d90a55245..db1da8223d5 100644 --- a/addons/account/wizard/account_report_common_view.xml +++ b/addons/account/wizard/account_report_common_view.xml @@ -10,8 +10,9 @@ diff --git a/addons/account_analytic_plans/i18n/tr.po b/addons/account_analytic_plans/i18n/tr.po index 3dd6f8b775c..e6fd65dbabd 100644 --- a/addons/account_analytic_plans/i18n/tr.po +++ b/addons/account_analytic_plans/i18n/tr.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2012-01-23 23:33+0000\n" +"PO-Revision-Date: 2012-01-25 00:10+0000\n" "Last-Translator: Ahmet Altınışık \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: 2012-01-24 05:29+0000\n" -"X-Generator: Launchpad (build 14713)\n" +"X-Launchpad-Export-Date: 2012-01-26 05:27+0000\n" +"X-Generator: Launchpad (build 14719)\n" #. module: account_analytic_plans #: view:analytic.plan.create.model:0 @@ -139,7 +139,7 @@ msgstr "Analitik Planınızı Tanımlayın" #. module: account_analytic_plans #: constraint:account.invoice:0 msgid "Invalid BBA Structured Communication !" -msgstr "" +msgstr "Geçersiz BBA Yapılı İletişim !" #. module: account_analytic_plans #: field:account.analytic.plan.instance.line,analytic_account_id:0 diff --git a/addons/account_anglo_saxon/i18n/tr.po b/addons/account_anglo_saxon/i18n/tr.po index e1ab6374080..fad9d6ef02c 100644 --- a/addons/account_anglo_saxon/i18n/tr.po +++ b/addons/account_anglo_saxon/i18n/tr.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-06-02 17:13+0000\n" -"Last-Translator: Ayhan KIZILTAN \n" +"PO-Revision-Date: 2012-01-25 00:15+0000\n" +"Last-Translator: Ahmet Altınışık \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:15+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-26 05:28+0000\n" +"X-Generator: Launchpad (build 14719)\n" #. module: account_anglo_saxon #: sql_constraint:purchase.order:0 msgid "Order Reference must be unique per Company!" -msgstr "" +msgstr "Sipariş Referansı Her Şirket İçin Tekil Olmalı!" #. module: account_anglo_saxon #: view:product.category:0 @@ -35,17 +35,17 @@ msgstr "Ürün Kategorisi" #. module: account_anglo_saxon #: sql_constraint:stock.picking:0 msgid "Reference must be unique per Company!" -msgstr "" +msgstr "Referans her şirket için tekil olmalı!" #. module: account_anglo_saxon #: constraint:product.category:0 msgid "Error ! You cannot create recursive categories." -msgstr "" +msgstr "Birbirinin alt kategorisi olan kategoriler oluşturamazsınız." #. module: account_anglo_saxon #: constraint:account.invoice:0 msgid "Invalid BBA Structured Communication !" -msgstr "" +msgstr "Geçersiz BBA Yapılı İletişim !" #. module: account_anglo_saxon #: constraint:product.template:0 @@ -88,7 +88,7 @@ msgstr "Toplama Listesi" #. module: account_anglo_saxon #: sql_constraint:account.invoice:0 msgid "Invoice Number must be unique per Company!" -msgstr "" +msgstr "Fatura Numarası Her Şirkette Tekil Olmalı!" #. module: account_anglo_saxon #: help:product.category,property_account_creditor_price_difference_categ:0 diff --git a/addons/account_asset/i18n/tr.po b/addons/account_asset/i18n/tr.po new file mode 100644 index 00000000000..91d73284da8 --- /dev/null +++ b/addons/account_asset/i18n/tr.po @@ -0,0 +1,821 @@ +# Turkish translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-12-22 18:43+0000\n" +"PO-Revision-Date: 2012-01-25 17:20+0000\n" +"Last-Translator: Ahmet Altınışık \n" +"Language-Team: Turkish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-01-26 05:28+0000\n" +"X-Generator: Launchpad (build 14719)\n" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Assets in draft and open states" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,method_end:0 +#: field:account.asset.history,method_end:0 +#: field:asset.modify,method_end:0 +msgid "Ending date" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,value_residual:0 +msgid "Residual Value" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,account_expense_depreciation_id:0 +msgid "Depr. Expense Account" +msgstr "" + +#. module: account_asset +#: view:asset.depreciation.confirmation.wizard:0 +msgid "Compute Asset" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Group By..." +msgstr "Grupla..." + +#. module: account_asset +#: field:asset.asset.report,gross_value:0 +msgid "Gross Amount" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +#: field:account.asset.asset,name:0 +#: field:account.asset.depreciation.line,asset_id:0 +#: field:account.asset.history,asset_id:0 +#: field:account.move.line,asset_id:0 +#: view:asset.asset.report:0 +#: field:asset.asset.report,asset_id:0 +#: model:ir.model,name:account_asset.model_account_asset_asset +msgid "Asset" +msgstr "Varlık" + +#. module: account_asset +#: help:account.asset.asset,prorata:0 +#: help:account.asset.category,prorata:0 +msgid "" +"Indicates that the first depreciation entry for this asset have to be done " +"from the purchase date instead of the first January" +msgstr "" + +#. module: account_asset +#: field:account.asset.history,name:0 +msgid "History name" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,company_id:0 +#: field:account.asset.category,company_id:0 +#: view:asset.asset.report:0 +#: field:asset.asset.report,company_id:0 +msgid "Company" +msgstr "" + +#. module: account_asset +#: view:asset.modify:0 +msgid "Modify" +msgstr "" + +#. module: account_asset +#: selection:account.asset.asset,state:0 +#: view:asset.asset.report:0 +#: selection:asset.asset.report,state:0 +msgid "Running" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,amount:0 +msgid "Depreciation Amount" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report +#: model:ir.model,name:account_asset.model_asset_asset_report +#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report +msgid "Assets Analysis" +msgstr "" + +#. module: account_asset +#: field:asset.modify,name:0 +msgid "Reason" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,method_progress_factor:0 +#: field:account.asset.category,method_progress_factor:0 +msgid "Degressive Factor" +msgstr "" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal +msgid "Asset Categories" +msgstr "" + +#. module: account_asset +#: view:asset.depreciation.confirmation.wizard:0 +msgid "" +"This wizard will post the depreciation lines of running assets that belong " +"to the selected period." +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,account_move_line_ids:0 +#: field:account.move.line,entry_ids:0 +#: model:ir.actions.act_window,name:account_asset.act_entries_open +msgid "Entries" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +#: field:account.asset.asset,depreciation_line_ids:0 +msgid "Depreciation Lines" +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,salvage_value:0 +msgid "It is the amount you plan to have that you cannot depreciate." +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,depreciation_date:0 +#: view:asset.asset.report:0 +#: field:asset.asset.report,depreciation_date:0 +msgid "Depreciation Date" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,account_asset_id:0 +msgid "Asset Account" +msgstr "" + +#. module: account_asset +#: field:asset.asset.report,posted_value:0 +msgid "Posted Amount" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +#: view:asset.asset.report:0 +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form +#: model:ir.ui.menu,name:account_asset.menu_finance_assets +#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets +msgid "Assets" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,account_depreciation_id:0 +msgid "Depreciation Account" +msgstr "" + +#. module: account_asset +#: constraint:account.move.line:0 +msgid "You can not create move line on closed account." +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +#: view:account.asset.category:0 +#: view:account.asset.history:0 +#: view:asset.modify:0 +#: field:asset.modify,note:0 +msgid "Notes" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,move_id:0 +msgid "Depreciation Entry" +msgstr "" + +#. module: account_asset +#: sql_constraint:account.move.line:0 +msgid "Wrong credit or debit value in accounting entry !" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +#: field:asset.asset.report,nbr:0 +msgid "# of Depreciation Lines" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Assets in draft state" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,method_end:0 +#: selection:account.asset.asset,method_time:0 +#: selection:account.asset.category,method_time:0 +#: selection:account.asset.history,method_time:0 +msgid "Ending Date" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,code:0 +msgid "Reference" +msgstr "" + +#. module: account_asset +#: constraint:account.invoice:0 +msgid "Invalid BBA Structured Communication !" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Account Asset" +msgstr "" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard +#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard +msgid "Compute Assets" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,sequence:0 +msgid "Sequence of the depreciation" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,method_period:0 +#: field:account.asset.category,method_period:0 +#: field:account.asset.history,method_period:0 +#: field:asset.modify,method_period:0 +msgid "Period Length" +msgstr "" + +#. module: account_asset +#: selection:account.asset.asset,state:0 +#: view:asset.asset.report:0 +#: selection:asset.asset.report,state:0 +msgid "Draft" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Date of asset purchase" +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,method_number:0 +msgid "Calculates Depreciation within specified interval" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Change Duration" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,account_analytic_id:0 +msgid "Analytic account" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,method:0 +#: field:account.asset.category,method:0 +msgid "Computation Method" +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,method_period:0 +msgid "State here the time during 2 depreciations, in months" +msgstr "" + +#. module: account_asset +#: constraint:account.asset.asset:0 +msgid "" +"Prorata temporis can be applied only for time method \"number of " +"depreciations\"." +msgstr "" + +#. module: account_asset +#: help:account.asset.history,method_time:0 +msgid "" +"The method to use to compute the dates and number of depreciation lines.\n" +"Number of Depreciations: Fix the number of depreciation lines and the time " +"between 2 depreciations.\n" +"Ending Date: Choose the time between 2 depreciations and the date the " +"depreciations won't go beyond." +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,purchase_value:0 +msgid "Gross value " +msgstr "" + +#. module: account_asset +#: constraint:account.asset.asset:0 +msgid "Error ! You can not create recursive assets." +msgstr "" + +#. module: account_asset +#: help:account.asset.history,method_period:0 +msgid "Time in month between two depreciations" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +#: field:asset.asset.report,name:0 +msgid "Year" +msgstr "" + +#. module: account_asset +#: view:asset.modify:0 +#: model:ir.actions.act_window,name:account_asset.action_asset_modify +#: model:ir.model,name:account_asset.model_asset_modify +msgid "Modify Asset" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Other Information" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,salvage_value:0 +msgid "Salvage Value" +msgstr "" + +#. module: account_asset +#: field:account.invoice.line,asset_category_id:0 +#: view:asset.asset.report:0 +msgid "Asset Category" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Set to Close" +msgstr "" + +#. module: account_asset +#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute +msgid "Compute assets" +msgstr "" + +#. module: account_asset +#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify +msgid "Modify asset" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Assets in closed state" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,parent_id:0 +msgid "Parent Asset" +msgstr "" + +#. module: account_asset +#: view:account.asset.history:0 +#: model:ir.model,name:account_asset.model_account_asset_history +msgid "Asset history" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Assets purchased in current year" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,state:0 +#: field:asset.asset.report,state:0 +msgid "State" +msgstr "" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_account_invoice_line +msgid "Invoice Line" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Month" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Depreciation Board" +msgstr "" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_account_move_line +msgid "Journal Items" +msgstr "" + +#. module: account_asset +#: field:asset.asset.report,unposted_value:0 +msgid "Unposted Amount" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,method_time:0 +#: field:account.asset.category,method_time:0 +#: field:account.asset.history,method_time:0 +msgid "Time Method" +msgstr "" + +#. module: account_asset +#: constraint:account.move.line:0 +msgid "" +"The selected account of your Journal Entry must receive a value in its " +"secondary currency" +msgstr "" + +#. module: account_asset +#: view:account.asset.category:0 +msgid "Analytic information" +msgstr "" + +#. module: account_asset +#: view:asset.modify:0 +msgid "Asset durations to modify" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,note:0 +#: field:account.asset.category,note:0 +#: field:account.asset.history,note:0 +msgid "Note" +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,method:0 +#: help:account.asset.category,method:0 +msgid "" +"Choose the method to use to compute the amount of depreciation lines.\n" +" * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n" +" * Degressive: Calculated on basis of: Remaining Value * Degressive Factor" +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,method_time:0 +#: help:account.asset.category,method_time:0 +msgid "" +"Choose the method to use to compute the dates and number of depreciation " +"lines.\n" +" * Number of Depreciations: Fix the number of depreciation lines and the " +"time between 2 depreciations.\n" +" * Ending Date: Choose the time between 2 depreciations and the date the " +"depreciations won't go beyond." +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Assets in running state" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Closed" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,partner_id:0 +#: field:asset.asset.report,partner_id:0 +msgid "Partner" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +#: field:asset.asset.report,depreciation_value:0 +msgid "Amount of Depreciation Lines" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Posted depreciation lines" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,child_ids:0 +msgid "Children Assets" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Date of depreciation" +msgstr "" + +#. module: account_asset +#: field:account.asset.history,user_id:0 +msgid "User" +msgstr "" + +#. module: account_asset +#: field:account.asset.history,date:0 +msgid "Date" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Assets purchased in current month" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Extended Filters..." +msgstr "" + +#. module: account_asset +#: constraint:account.move.line:0 +msgid "Company must be same for its related account and period." +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +#: view:asset.depreciation.confirmation.wizard:0 +msgid "Compute" +msgstr "" + +#. module: account_asset +#: view:account.asset.category:0 +msgid "Search Asset Category" +msgstr "" + +#. module: account_asset +#: constraint:account.move.line:0 +msgid "The date of your Journal Entry is not in the defined period!" +msgstr "" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard +msgid "asset.depreciation.confirmation.wizard" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,active:0 +msgid "Active" +msgstr "" + +#. module: account_asset +#: model:ir.actions.wizard,name:account_asset.wizard_asset_close +msgid "Close asset" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,parent_state:0 +msgid "State of Asset" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,name:0 +msgid "Depreciation Name" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +#: field:account.asset.asset,history_ids:0 +msgid "History" +msgstr "" + +#. module: account_asset +#: sql_constraint:account.invoice:0 +msgid "Invoice Number must be unique per Company!" +msgstr "" + +#. module: account_asset +#: field:asset.depreciation.confirmation.wizard,period_id:0 +msgid "Period" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "General" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,prorata:0 +#: field:account.asset.category,prorata:0 +msgid "Prorata Temporis" +msgstr "" + +#. module: account_asset +#: view:account.asset.category:0 +msgid "Accounting information" +msgstr "" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_account_invoice +msgid "Invoice" +msgstr "" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form_normal +msgid "Review Asset Categories" +msgstr "" + +#. module: account_asset +#: view:asset.depreciation.confirmation.wizard:0 +#: view:asset.modify:0 +msgid "Cancel" +msgstr "" + +#. module: account_asset +#: selection:account.asset.asset,state:0 +#: selection:asset.asset.report,state:0 +msgid "Close" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +#: view:account.asset.category:0 +msgid "Depreciation Method" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,purchase_date:0 +#: view:asset.asset.report:0 +#: field:asset.asset.report,purchase_date:0 +msgid "Purchase Date" +msgstr "" + +#. module: account_asset +#: selection:account.asset.asset,method:0 +#: selection:account.asset.category,method:0 +msgid "Degressive" +msgstr "" + +#. module: account_asset +#: help:asset.depreciation.confirmation.wizard,period_id:0 +msgid "" +"Choose the period for which you want to automatically post the depreciation " +"lines of running assets" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Current" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,remaining_value:0 +msgid "Amount to Depreciate" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,open_asset:0 +msgid "Skip Draft State" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +#: view:account.asset.category:0 +#: view:account.asset.history:0 +msgid "Depreciation Dates" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,currency_id:0 +msgid "Currency" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,journal_id:0 +msgid "Journal" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,depreciated_value:0 +msgid "Amount Already Depreciated" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,move_check:0 +#: view:asset.asset.report:0 +#: field:asset.asset.report,move_check:0 +msgid "Posted" +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,state:0 +msgid "" +"When an asset is created, the state is 'Draft'.\n" +"If the asset is confirmed, the state goes in 'Running' and the depreciation " +"lines can be posted in the accounting.\n" +"You can manually close an asset when the depreciation is over. If the last " +"line of depreciation is posted, the asset automatically goes in that state." +msgstr "" + +#. module: account_asset +#: field:account.asset.category,name:0 +msgid "Name" +msgstr "" + +#. module: account_asset +#: help:account.asset.category,open_asset:0 +msgid "" +"Check this if you want to automatically confirm the assets of this category " +"when created by invoices." +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Set to Draft" +msgstr "" + +#. module: account_asset +#: selection:account.asset.asset,method:0 +#: selection:account.asset.category,method:0 +msgid "Linear" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Month-1" +msgstr "" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_account_asset_depreciation_line +msgid "Asset depreciation line" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,category_id:0 +#: view:account.asset.category:0 +#: field:asset.asset.report,asset_category_id:0 +#: model:ir.model,name:account_asset.model_account_asset_category +msgid "Asset category" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Assets purchased in last month" +msgstr "" + +#. module: account_asset +#: code:addons/account_asset/wizard/wizard_asset_compute.py:49 +#, python-format +msgid "Created Asset Moves" +msgstr "" + +#. module: account_asset +#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report +msgid "" +"From this report, you can have an overview on all depreciation. The tool " +"search can also be used to personalise your Assets reports and so, match " +"this analysis to your needs;" +msgstr "" + +#. module: account_asset +#: help:account.asset.category,method_period:0 +msgid "State here the time between 2 depreciations, in months" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,method_number:0 +#: selection:account.asset.asset,method_time:0 +#: field:account.asset.category,method_number:0 +#: selection:account.asset.category,method_time:0 +#: field:account.asset.history,method_number:0 +#: selection:account.asset.history,method_time:0 +#: field:asset.modify,method_number:0 +msgid "Number of Depreciations" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Create Move" +msgstr "" + +#. module: account_asset +#: view:asset.depreciation.confirmation.wizard:0 +msgid "Post Depreciation Lines" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Confirm Asset" +msgstr "" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree +msgid "Asset Hierarchy" +msgstr "" + +#. module: account_asset +#: constraint:account.move.line:0 +msgid "You can not create move line on view account." +msgstr "" diff --git a/addons/account_bank_statement_extensions/account_bank_statement_view.xml b/addons/account_bank_statement_extensions/account_bank_statement_view.xml index 8f132f1f34e..400cc92452b 100644 --- a/addons/account_bank_statement_extensions/account_bank_statement_view.xml +++ b/addons/account_bank_statement_extensions/account_bank_statement_view.xml @@ -47,12 +47,14 @@ + + diff --git a/addons/account_followup/i18n/tr.po b/addons/account_followup/i18n/tr.po index d05fc2e2234..042647d851e 100644 --- a/addons/account_followup/i18n/tr.po +++ b/addons/account_followup/i18n/tr.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-11-11 15:22+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2012-01-24 20:05+0000\n" +"Last-Translator: Ahmet Altınışık \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: 2011-12-23 06:07+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n" +"X-Generator: Launchpad (build 14719)\n" #. module: account_followup #: view:account_followup.followup:0 @@ -117,7 +117,7 @@ msgstr "Kapanmış bir hesap için hareket yaratamazsınız." #. module: account_followup #: report:account_followup.followup.print:0 msgid "Amount" -msgstr "" +msgstr "Tutar" #. module: account_followup #: sql_constraint:account.move.line:0 @@ -335,7 +335,7 @@ msgstr "Paydaşa göre İzleme İstatistikleri" #. module: account_followup #: view:account_followup.followup.line:0 msgid "Message" -msgstr "" +msgstr "Mesaj" #. module: account_followup #: constraint:account.move.line:0 @@ -425,12 +425,12 @@ msgstr "Email Onayı gönder" #. module: account_followup #: report:account_followup.followup.print:0 msgid "Total:" -msgstr "" +msgstr "Toplam:" #. module: account_followup #: constraint:account.move.line:0 msgid "The date of your Journal Entry is not in the defined period!" -msgstr "" +msgstr "Yevmiye Girişinizin tarihi tanımlanan dönemle uyuşmuyor!" #. module: account_followup #: constraint:res.company:0 @@ -566,6 +566,9 @@ msgid "" "\n" "%s" msgstr "" +"Aşağıdaki carilere e-posta gönderilmedi, E-posta bulunmuyor!\n" +"\n" +"%s" #. module: account_followup #: view:account.followup.print.all:0 @@ -633,7 +636,7 @@ msgstr "Gönderilen İzlemeler" #. module: account_followup #: sql_constraint:res.company:0 msgid "The company name must be unique !" -msgstr "" +msgstr "Şirket adı tekil olmalı !" #. module: account_followup #: field:account_followup.followup,name:0 @@ -715,7 +718,7 @@ msgstr "Müşteri Ref :" #. module: account_followup #: field:account.followup.print.all,test_print:0 msgid "Test Print" -msgstr "" +msgstr "Test Baskısı" #. module: account_followup #: view:account.followup.print.all:0 diff --git a/addons/account_invoice_layout/i18n/tr.po b/addons/account_invoice_layout/i18n/tr.po index 653a5b8ca0d..f4c56bc35cd 100644 --- a/addons/account_invoice_layout/i18n/tr.po +++ b/addons/account_invoice_layout/i18n/tr.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n" -"X-Generator: Launchpad (build 14713)\n" +"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n" +"X-Generator: Launchpad (build 14719)\n" #. module: account_invoice_layout #: selection:account.invoice.line,state:0 diff --git a/addons/account_payment/i18n/tr.po b/addons/account_payment/i18n/tr.po index 9e0beb8846e..9999d3d997b 100644 --- a/addons/account_payment/i18n/tr.po +++ b/addons/account_payment/i18n/tr.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-05-29 17:44+0000\n" -"Last-Translator: Ayhan KIZILTAN \n" +"PO-Revision-Date: 2012-01-24 22:37+0000\n" +"Last-Translator: Ahmet Altınışık \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: 2011-12-23 06:51+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n" +"X-Generator: Launchpad (build 14719)\n" #. module: account_payment #: field:payment.order,date_scheduled:0 @@ -87,7 +87,7 @@ msgstr "İstenen Tarih" #. module: account_payment #: model:res.groups,name:account_payment.group_account_payment msgid "Accounting / Payments" -msgstr "" +msgstr "Muhasebe / Ödemeler" #. module: account_payment #: selection:payment.line,state:0 @@ -171,7 +171,7 @@ msgstr "Ödeme satırı adı eşsiz olmalı!" #. module: account_payment #: constraint:account.invoice:0 msgid "Invalid BBA Structured Communication !" -msgstr "" +msgstr "Geçersiz BBA Yapılı İletişim !" #. module: account_payment #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree @@ -527,7 +527,7 @@ msgstr "Fatura Ref." #. module: account_payment #: sql_constraint:account.invoice:0 msgid "Invoice Number must be unique per Company!" -msgstr "" +msgstr "Fatura Numarası Her Şirkette Tekil Olmalı!" #. module: account_payment #: field:payment.line,name:0 @@ -572,7 +572,7 @@ msgstr "İptal" #. module: account_payment #: field:payment.line,bank_id:0 msgid "Destination Bank Account" -msgstr "" +msgstr "Hedef Banka Hesabı" #. module: account_payment #: view:payment.line:0 @@ -637,7 +637,7 @@ msgstr "Ödemeleri Onayla" #. module: account_payment #: constraint:account.move.line:0 msgid "The date of your Journal Entry is not in the defined period!" -msgstr "" +msgstr "Yevmiye Girişinizin tarihi tanımlanan dönemle uyuşmuyor!" #. module: account_payment #: field:payment.line,company_currency:0 diff --git a/addons/account_sequence/i18n/tr.po b/addons/account_sequence/i18n/tr.po index a3f7cc6c22c..c9e4bc3d418 100644 --- a/addons/account_sequence/i18n/tr.po +++ b/addons/account_sequence/i18n/tr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-05-29 17:45+0000\n" -"Last-Translator: Ayhan KIZILTAN \n" +"PO-Revision-Date: 2012-01-25 00:14+0000\n" +"Last-Translator: Ahmet Altınışık \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:32+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-26 05:28+0000\n" +"X-Generator: Launchpad (build 14719)\n" #. module: account_sequence #: view:account.sequence.installer:0 @@ -126,7 +126,7 @@ msgstr "Ad" #. module: account_sequence #: constraint:account.move.line:0 msgid "The date of your Journal Entry is not in the defined period!" -msgstr "" +msgstr "Yevmiye Girişinizin tarihi tanımlanan dönemle uyuşmuyor!" #. module: account_sequence #: constraint:account.journal:0 diff --git a/addons/analytic_journal_billing_rate/i18n/tr.po b/addons/analytic_journal_billing_rate/i18n/tr.po index f65da009ac9..1996a9e80fc 100644 --- a/addons/analytic_journal_billing_rate/i18n/tr.po +++ b/addons/analytic_journal_billing_rate/i18n/tr.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2012-01-23 23:27+0000\n" +"PO-Revision-Date: 2012-01-25 00:10+0000\n" "Last-Translator: Ahmet Altınışık \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: 2012-01-24 05:30+0000\n" -"X-Generator: Launchpad (build 14713)\n" +"X-Launchpad-Export-Date: 2012-01-26 05:27+0000\n" +"X-Generator: Launchpad (build 14719)\n" #. module: analytic_journal_billing_rate #: sql_constraint:account.invoice:0 @@ -34,7 +34,7 @@ msgstr "Fatura" #. module: analytic_journal_billing_rate #: constraint:account.invoice:0 msgid "Invalid BBA Structured Communication !" -msgstr "" +msgstr "Geçersiz BBA Yapılı İletişim !" #. module: analytic_journal_billing_rate #: view:analytic_journal_rate_grid:0 diff --git a/addons/audittrail/i18n/zh_CN.po b/addons/audittrail/i18n/zh_CN.po index ff93a817f0b..8af737c7770 100644 --- a/addons/audittrail/i18n/zh_CN.po +++ b/addons/audittrail/i18n/zh_CN.po @@ -7,20 +7,20 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2012-01-23 10:09+0000\n" +"PO-Revision-Date: 2012-01-26 05:10+0000\n" "Last-Translator: Wei \"oldrev\" Li \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: 2012-01-24 05:29+0000\n" -"X-Generator: Launchpad (build 14713)\n" +"X-Launchpad-Export-Date: 2012-01-27 05:28+0000\n" +"X-Generator: Launchpad (build 14727)\n" #. module: audittrail #: code:addons/audittrail/audittrail.py:75 #, python-format msgid "WARNING: audittrail is not part of the pool" -msgstr "警告：审计跟踪不属于这" +msgstr "警告：审计跟踪不属于此池" #. module: audittrail #: field:audittrail.log.line,log_id:0 @@ -39,11 +39,13 @@ msgid "" "There is already a rule defined on this object\n" " You cannot define another: please edit the existing one." msgstr "" +"该对象已经定义了审计规则。\n" +"您不能再次定义，请直接编辑现有的审计规则。" #. module: audittrail #: view:audittrail.rule:0 msgid "Subscribed Rule" -msgstr "订阅规则" +msgstr "已订阅规则" #. module: audittrail #: model:ir.model,name:audittrail.model_audittrail_rule @@ -61,7 +63,7 @@ msgstr "审计日志" #: view:audittrail.log:0 #: view:audittrail.rule:0 msgid "Group By..." -msgstr "分组..." +msgstr "分组于..." #. module: audittrail #: view:audittrail.rule:0 @@ -105,17 +107,17 @@ msgstr "方法" #. module: audittrail #: field:audittrail.view.log,from:0 msgid "Log From" -msgstr "日志格式" +msgstr "日志来源" #. module: audittrail #: field:audittrail.log.line,log:0 msgid "Log ID" -msgstr "日志ID" +msgstr "日志标识" #. module: audittrail #: field:audittrail.log,res_id:0 msgid "Resource Id" -msgstr "资源ID" +msgstr "资源标识" #. module: audittrail #: help:audittrail.rule,user_id:0 @@ -127,7 +129,7 @@ msgstr "如果未添加用户则适用于所有用户" msgid "" "Select this if you want to keep track of workflow on any record of the " "object of this rule" -msgstr "如果你需要跟踪次对象所有记录的工作流请选择此项" +msgstr "如果您需要跟踪该对象所有记录的工作流请选择此项" #. module: audittrail #: field:audittrail.rule,user_id:0 @@ -154,17 +156,17 @@ msgstr "审计跟踪规则" #. module: audittrail #: field:audittrail.view.log,to:0 msgid "Log To" -msgstr "日志到" +msgstr "记录到" #. module: audittrail #: view:audittrail.log:0 msgid "New Value Text: " -msgstr "新值正文: " +msgstr "新值内容： " #. module: audittrail #: view:audittrail.rule:0 msgid "Search Audittrail Rule" -msgstr "查询审计跟踪规则" +msgstr "搜索审计跟踪规则" #. module: audittrail #: model:ir.actions.act_window,name:audittrail.action_audittrail_rule_tree @@ -175,7 +177,7 @@ msgstr "审计规则" #. module: audittrail #: view:audittrail.log:0 msgid "Old Value : " -msgstr "旧值: " +msgstr "旧值： " #. module: audittrail #: field:audittrail.log,name:0 @@ -193,7 +195,7 @@ msgstr "日期" msgid "" "Select this if you want to keep track of modification on any record of the " "object of this rule" -msgstr "如果你要跟踪这个对象所有记录的修改请选择此项。" +msgstr "如果您要跟踪此对象所有记录的变更请选择此项。" #. module: audittrail #: field:audittrail.rule,log_create:0 @@ -203,22 +205,22 @@ msgstr "创建日志" #. module: audittrail #: help:audittrail.rule,object_id:0 msgid "Select object for which you want to generate log." -msgstr "选择你要生成日志的对象" +msgstr "选择您要生成审计日志的对象" #. module: audittrail #: view:audittrail.log:0 msgid "Old Value Text : " -msgstr "旧值正文: " +msgstr "旧值内容： " #. module: audittrail #: field:audittrail.rule,log_workflow:0 msgid "Log Workflow" -msgstr "工作流日志" +msgstr "记录工作流" #. module: audittrail #: field:audittrail.rule,log_read:0 msgid "Log Reads" -msgstr "读日志" +msgstr "记录读操作" #. module: audittrail #: code:addons/audittrail/audittrail.py:76 @@ -234,7 +236,7 @@ msgstr "日志明细" #. module: audittrail #: field:audittrail.log.line,field_id:0 msgid "Fields" -msgstr "字段" +msgstr "字段列表" #. module: audittrail #: view:audittrail.rule:0 @@ -272,7 +274,7 @@ msgstr "取消订阅" #. module: audittrail #: field:audittrail.rule,log_unlink:0 msgid "Log Deletes" -msgstr "删除日志" +msgstr "记录删除操作" #. module: audittrail #: field:audittrail.log.line,field_description:0 @@ -287,7 +289,7 @@ msgstr "查询审计跟踪日志" #. module: audittrail #: field:audittrail.rule,log_write:0 msgid "Log Writes" -msgstr "修改日志" +msgstr "记录修改操作" #. module: audittrail #: view:audittrail.view.log:0 @@ -358,7 +360,7 @@ msgstr "日志明细" #. module: audittrail #: field:audittrail.rule,log_action:0 msgid "Log Action" -msgstr "操作日志" +msgstr "记录动作" #. module: audittrail #: help:audittrail.rule,log_create:0 diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py index 40653f01ff3..7df5c444ecb 100644 --- a/addons/base_contact/base_contact.py +++ b/addons/base_contact/base_contact.py @@ -120,7 +120,6 @@ class res_partner_location(osv.osv): 'city': fields.char('City', size=128), 'state_id': fields.many2one("res.country.state", 'Fed. State', domain="[('country_id','=',country_id)]"), 'country_id': fields.many2one('res.country', 'Country'), - 'partner_id': fields.many2one('res.partner', 'Partner Name', ondelete='set null', select=True, help="Keep empty for a private address, not related to partner."), 'company_id': fields.many2one('res.company', 'Company',select=1), 'job_ids': fields.one2many('res.partner.address', 'location_id', 'Contacts'), 'partner_id': fields.related('job_ids', 'partner_id', type='many2one',\ diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml index 10d8de984c2..16a9a966e25 100644 --- a/addons/base_contact/base_contact_view.xml +++ b/addons/base_contact/base_contact_view.xml @@ -50,7 +50,8 @@ - + + @@ -135,7 +136,7 @@ form - + diff --git a/addons/base_contact/security/ir.model.access.csv b/addons/base_contact/security/ir.model.access.csv index 15de7d5b975..0a7ffeee7f8 100644 --- a/addons/base_contact/security/ir.model.access.csv +++ b/addons/base_contact/security/ir.model.access.csv @@ -2,4 +2,6 @@ "access_res_partner_contact","res.partner.contact","model_res_partner_contact","base.group_partner_manager",1,1,1,1 "access_res_partner_contact_all","res.partner.contact all","model_res_partner_contact","base.group_user",1,0,0,0 "access_res_partner_location","res.partner.location","model_res_partner_location","base.group_user",1,0,0,0 +"access_res_partner_location_sale_salesman","res.partner.location","model_res_partner_location","base.group_sale_salesman",1,1,1,0 +"access_res_partner_address_sale_salesman","res.partner.address.user","base.model_res_partner_address","base.group_sale_salesman",1,1,1,0 "access_group_sale_salesman","res.partner.contact.sale.salesman","model_res_partner_contact","base.group_sale_salesman",1,1,1,0 diff --git a/addons/base_module_record/i18n/tr.po b/addons/base_module_record/i18n/tr.po index d6588b13aaa..ee5ca2403bf 100644 --- a/addons/base_module_record/i18n/tr.po +++ b/addons/base_module_record/i18n/tr.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2010-09-09 07:16+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2012-01-24 19:00+0000\n" +"Last-Translator: Ahmet Altınışık \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: 2011-12-23 06:03+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n" +"X-Generator: Launchpad (build 14719)\n" #. module: base_module_record #: wizard_field:base_module_record.module_record_objects,info,category:0 @@ -89,6 +89,9 @@ msgid "" "publish it on http://www.openerp.com, in the 'Modules' section. You can do " "it through the website or using features of the 'base_module_publish' module." msgstr "" +"Eğer modülünüzün başka kullanıcıların ilgisini çekeceğini düşünüyorsanız, " +"modülünüzü http://apps.openerp.com sitesinde yayınlamak isteriz. Modül " +"yayını için yine 'base_module_publish' modülünü de kullanabilirsiniz." #. module: base_module_record #: wizard_field:base_module_record.module_record_data,init,check_date:0 diff --git a/addons/board/i18n/tr.po b/addons/board/i18n/tr.po index 6a89b783805..b6750c9b164 100644 --- a/addons/board/i18n/tr.po +++ b/addons/board/i18n/tr.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-01-24 05:29+0000\n" -"X-Generator: Launchpad (build 14713)\n" +"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n" +"X-Generator: Launchpad (build 14719)\n" #. module: board #: view:res.log.report:0 diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 100227e3397..566885e3c46 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -545,8 +545,10 @@ class crm_lead(crm_case, osv.osv): 'type': 'opportunity', 'stage_id': stage_id or False, 'date_action': time.strftime('%Y-%m-%d %H:%M:%S'), - 'partner_address_id': contact_id + 'date_open': time.strftime('%Y-%m-%d %H:%M:%S'), + 'partner_address_id': contact_id, } + def _convert_opportunity_notification(self, cr, uid, lead, context=None): success_message = _("Lead '%s' has been converted to an opportunity.") % lead.name self.message_append(cr, uid, [lead.id], success_message, body_text=success_message, context=context) @@ -777,7 +779,10 @@ class crm_lead(crm_case, osv.osv): for case in self.browse(cr, uid, ids, context=context): values = dict(vals) if case.state in CRM_LEAD_PENDING_STATES: - values.update(state=crm.AVAILABLE_STATES[1][0]) #re-open + #re-open + values.update(state=crm.AVAILABLE_STATES[1][0]) + if not case.date_open: + values['date_open'] = time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT) res = self.write(cr, uid, [case.id], values, context=context) return res diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml index 850d806f970..3f04bd0edeb 100644 --- a/addons/crm/crm_meeting_view.xml +++ b/addons/crm/crm_meeting_view.xml @@ -249,7 +249,7 @@ calendar - + diff --git a/addons/crm/i18n/tr.po b/addons/crm/i18n/tr.po index 081977e1181..f1ac0cb45b2 100644 --- a/addons/crm/i18n/tr.po +++ b/addons/crm/i18n/tr.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:43+0000\n" -"PO-Revision-Date: 2011-06-20 20:31+0000\n" -"Last-Translator: Ayhan KIZILTAN \n" +"PO-Revision-Date: 2012-01-24 22:23+0000\n" +"Last-Translator: Ahmet Altınışık \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: 2011-12-23 06:01+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n" +"X-Generator: Launchpad (build 14719)\n" #. module: crm #: view:crm.lead.report:0 @@ -109,7 +109,7 @@ msgstr "Aşama Adı" #. module: crm #: model:ir.model,name:crm.model_crm_lead_report msgid "CRM Lead Analysis" -msgstr "" +msgstr "CRM Fırsat Analizleri" #. module: crm #: view:crm.lead.report:0 @@ -138,7 +138,7 @@ msgstr "Aday '%s' kapatılmıştır." #. module: crm #: view:crm.lead.report:0 msgid "Exp. Closing" -msgstr "" +msgstr "Bekl. Kapanış" #. module: crm #: selection:crm.meeting,rrule_type:0 @@ -148,7 +148,7 @@ msgstr "Yıllık" #. module: crm #: help:crm.lead.report,creation_day:0 msgid "Creation day" -msgstr "" +msgstr "Oluşturulma Tarihi" #. module: crm #: field:crm.segmentation.line,name:0 @@ -178,7 +178,7 @@ msgstr "Fırsatları Ara" #. module: crm #: help:crm.lead.report,deadline_month:0 msgid "Expected closing month" -msgstr "" +msgstr "Tahmini Kapatma Ayı" #. module: crm #: view:crm.lead2opportunity.partner.mass:0 @@ -238,7 +238,7 @@ msgstr "Çekildi" #. module: crm #: field:crm.meeting,end_type:0 msgid "Recurrence termination" -msgstr "" +msgstr "Tekrarları sonlandırma" #. module: crm #: code:addons/crm/crm_lead.py:323 @@ -345,7 +345,7 @@ msgstr "Olası Paydaş" #: code:addons/crm/crm_lead.py:733 #, python-format msgid "No Subject" -msgstr "" +msgstr "Konu Yok" #. module: crm #: model:crm.case.resource.type,name:crm.type_lead6 @@ -431,7 +431,7 @@ msgstr "Güncelleme Tarihi" #. module: crm #: field:crm.case.section,user_id:0 msgid "Team Leader" -msgstr "" +msgstr "Takım Lideri" #. module: crm #: field:crm.lead2opportunity.partner,name:0 @@ -465,7 +465,7 @@ msgstr "Kategori" #. module: crm #: view:crm.lead:0 msgid "Opportunity / Customer" -msgstr "" +msgstr "Fırsat / Müşteri" #. module: crm #: view:crm.lead.report:0 @@ -511,7 +511,7 @@ msgstr "Fırsat için normal ya da telefonla toplantı" #. module: crm #: view:crm.case.section:0 msgid "Mail Gateway" -msgstr "" +msgstr "Eposta Geçidi" #. module: crm #: model:process.node,note:crm.process_node_leads0 @@ -550,7 +550,7 @@ msgstr "Postalama" #. module: crm #: view:crm.phonecall:0 msgid "To Do" -msgstr "" +msgstr "Yapılacaklar" #. module: crm #: selection:crm.lead.report,creation_month:0 @@ -573,7 +573,7 @@ msgstr "E-Posta" #. module: crm #: view:crm.phonecall:0 msgid "Phonecalls during last 7 days" -msgstr "" +msgstr "Son 7 günlük telefon kayıtları" #. module: crm #: selection:crm.lead.report,creation_month:0 @@ -622,7 +622,7 @@ msgstr "" #. module: crm #: field:crm.lead,partner_address_name:0 msgid "Partner Contact Name" -msgstr "" +msgstr "Cari İlgili Kişisi" #. module: crm #: selection:crm.meeting,end_type:0 @@ -633,7 +633,7 @@ msgstr "Bitiş Tarihi" #: view:crm.opportunity2phonecall:0 #: view:crm.phonecall2phonecall:0 msgid "Schedule/Log a call" -msgstr "" +msgstr "Telefon görüşmesi programla/kaydet" #. module: crm #: constraint:base.action.rule:0 @@ -669,7 +669,7 @@ msgstr "'%s' görüşmesi onaylandı." #: selection:crm.add.note,state:0 #: selection:crm.lead,state:0 msgid "In Progress" -msgstr "" +msgstr "Sürüyor" #. module: crm #: help:crm.case.section,reply_to:0 @@ -683,7 +683,7 @@ msgstr "" #. module: crm #: field:crm.lead.report,creation_month:0 msgid "Creation Month" -msgstr "" +msgstr "Oluşturma Ayı" #. module: crm #: field:crm.case.section,resource_calendar_id:0 @@ -739,7 +739,7 @@ msgstr "" #. module: crm #: field:crm.lead2opportunity.partner.mass,user_ids:0 msgid "Salesmans" -msgstr "" +msgstr "Satış Temsilcisi" #. module: crm #: field:crm.lead.report,probable_revenue:0 @@ -749,7 +749,7 @@ msgstr "Olası Gelir" #. module: crm #: help:crm.lead.report,creation_month:0 msgid "Creation month" -msgstr "" +msgstr "Oluşturma Ayı" #. module: crm #: help:crm.segmentation,name:0 @@ -765,7 +765,7 @@ msgstr "Olasılık (%)" #. module: crm #: field:crm.lead,company_currency:0 msgid "Company Currency" -msgstr "" +msgstr "Şirket Dövizi" #. module: crm #: view:crm.lead:0 @@ -812,7 +812,7 @@ msgstr "Süreci durdur" #: view:crm.lead.report:0 #: view:crm.phonecall.report:0 msgid "Month-1" -msgstr "" +msgstr "Ay-1" #. module: crm #: view:crm.phonecall:0 @@ -855,12 +855,12 @@ msgstr "Ayrıcalıklı" #: code:addons/crm/crm_lead.py:451 #, python-format msgid "From %s : %s" -msgstr "" +msgstr "%s den: %s" #. module: crm #: field:crm.lead.report,creation_year:0 msgid "Creation Year" -msgstr "" +msgstr "Oluşturulma Yılı" #. module: crm #: field:crm.lead.report,create_date:0 @@ -881,7 +881,7 @@ msgstr "Satış Alımları" #. module: crm #: help:crm.case.section,resource_calendar_id:0 msgid "Used to compute open days" -msgstr "" +msgstr "Açık günleri hesaplamak için kullanılır" #. module: crm #: view:crm.lead:0 @@ -916,7 +916,7 @@ msgstr "Yinelenen Toplantı" #. module: crm #: view:crm.phonecall:0 msgid "Unassigned Phonecalls" -msgstr "" +msgstr "Atanmamış Telefon Görüşmeleri" #. module: crm #: view:crm.lead:0 @@ -980,7 +980,7 @@ msgstr "Uyarı !" #. module: crm #: view:crm.phonecall.report:0 msgid "Phone calls made in current year" -msgstr "" +msgstr "Bu yıl yapılan telefon görüşmeleri" #. module: crm #: field:crm.lead,day_open:0 @@ -1021,7 +1021,7 @@ msgstr "Toplantılarım" #. module: crm #: view:crm.phonecall:0 msgid "Todays's Phonecalls" -msgstr "" +msgstr "Bugün yapılan telefon görüşmeleri" #. module: crm #: view:board.board:0 @@ -1083,7 +1083,7 @@ msgstr "" #. module: crm #: view:crm.lead:0 msgid "Change Color" -msgstr "" +msgstr "Renk Değiştir" #. module: crm #: view:crm.segmentation:0 @@ -1101,7 +1101,7 @@ msgstr "Sorumlu" #. module: crm #: view:crm.lead.report:0 msgid "Show only opportunity" -msgstr "" +msgstr "Sadece fırsatı göster" #. module: crm #: view:res.partner:0 @@ -1126,12 +1126,12 @@ msgstr "Gönderen" #. module: crm #: view:crm.lead2opportunity.partner.mass:0 msgid "Convert into Opportunities" -msgstr "" +msgstr "Fırsata Dönüştür" #. module: crm #: view:crm.lead:0 msgid "Show Sales Team" -msgstr "" +msgstr "Satış Ekibini Göster" #. module: crm #: view:res.partner:0 @@ -1194,7 +1194,7 @@ msgstr "Oluşturma Tarihi" #. module: crm #: view:board.board:0 msgid "My Opportunities" -msgstr "" +msgstr "Fırsatlarım" #. module: crm #: model:crm.case.categ,name:crm.categ_oppor5 @@ -1204,7 +1204,7 @@ msgstr "Websitesi Tasarımına ihtiyaç var" #. module: crm #: view:crm.phonecall.report:0 msgid "Year of call" -msgstr "" +msgstr "Arama Yılı" #. module: crm #: field:crm.meeting,recurrent_uid:0 @@ -1246,7 +1246,7 @@ msgstr "İş Ortağına e-posta" #: view:crm.opportunity2phonecall:0 #: view:crm.phonecall2phonecall:0 msgid "Call Details" -msgstr "" +msgstr "Arama detayları" #. module: crm #: field:crm.meeting,class:0 @@ -1257,7 +1257,7 @@ msgstr "İşaretle" #: view:crm.opportunity2phonecall:0 #: view:crm.phonecall2phonecall:0 msgid "Log call" -msgstr "" +msgstr "Arama Kaydet" #. module: crm #: help:crm.meeting,rrule_type:0 @@ -1272,7 +1272,7 @@ msgstr "Durum Alanları Koşulları" #. module: crm #: view:crm.phonecall.report:0 msgid "Phone calls which are in pending state" -msgstr "" +msgstr "Bekleme durumundaki Telefon Aramaları" #. module: crm #: view:crm.case.section:0 @@ -1340,7 +1340,7 @@ msgstr "Dakika olarak Süre" #. module: crm #: field:crm.case.channel,name:0 msgid "Channel Name" -msgstr "" +msgstr "Kanal Adı" #. module: crm #: field:crm.partner2opportunity,name:0 @@ -1351,7 +1351,7 @@ msgstr "Fırsat Adı" #. module: crm #: help:crm.lead.report,deadline_day:0 msgid "Expected closing day" -msgstr "" +msgstr "Beklenen Bitiş Günü" #. module: crm #: help:crm.case.section,active:0 @@ -1416,7 +1416,7 @@ msgstr "Bu sefer etkinlikten önce alarm ayarla" #. module: crm #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner msgid "Schedule a Call" -msgstr "" +msgstr "Arama Programla" #. module: crm #: view:crm.lead2partner:0 @@ -1490,7 +1490,7 @@ msgstr "Genişletilmiş Filtreler..." #. module: crm #: view:crm.phonecall.report:0 msgid "Phone calls which are in closed state" -msgstr "" +msgstr "Kapalı durumdaki Telefon Görüşmeleri" #. module: crm #: view:crm.phonecall.report:0 @@ -1505,13 +1505,14 @@ msgstr "Kategorilere göre fırsatlar" #. module: crm #: view:crm.phonecall.report:0 msgid "Date of call" -msgstr "" +msgstr "Arama Tarihi" #. module: crm #: help:crm.lead,section_id:0 msgid "" "When sending mails, the default email address is taken from the sales team." msgstr "" +"E-posta gönderilirken, Öntanımlı e-posta adresi satış ekibinden alınır." #. module: crm #: view:crm.meeting:0 @@ -1533,12 +1534,12 @@ msgstr "Toplantı Planla" #: code:addons/crm/crm_lead.py:431 #, python-format msgid "Merged opportunities" -msgstr "" +msgstr "Birleştirilmiş Fırsatlar" #. module: crm #: model:ir.actions.act_window,name:crm.crm_case_section_view_form_installer msgid "Define Sales Team" -msgstr "" +msgstr "Satış Ekiplerini Tanımla" #. module: crm #: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act @@ -1564,7 +1565,7 @@ msgstr "Çocuk Takımları" #. module: crm #: view:crm.phonecall.report:0 msgid "Phone calls which are in draft and open state" -msgstr "" +msgstr "Taslak veya açık durumdaki telefon görüşmeleri" #. module: crm #: model:crm.case.resource.type,name:crm.type_lead1 @@ -1623,7 +1624,7 @@ msgstr "" #. module: crm #: view:crm.lead:0 msgid "Mail" -msgstr "" +msgstr "E-Posta" #. module: crm #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action @@ -1638,7 +1639,7 @@ msgstr "" #. module: crm #: model:ir.actions.act_window,name:crm.act_oppor_categ msgid "Opportunities By Categories" -msgstr "" +msgstr "KAtegorilerine Göre Fırsatlar" #. module: crm #: help:crm.lead,partner_name:0 @@ -1656,13 +1657,13 @@ msgstr "Hata ! Yinelenen Satış takımı oluşturamazsınız." #: selection:crm.opportunity2phonecall,action:0 #: selection:crm.phonecall2phonecall,action:0 msgid "Log a call" -msgstr "" +msgstr "Görüşme kaydet" #. module: crm #: selection:crm.lead2opportunity.partner,action:0 #: selection:crm.lead2opportunity.partner.mass,action:0 msgid "Do not link to a partner" -msgstr "" +msgstr "Bir cariye bağlama" #. module: crm #: view:crm.meeting:0 @@ -1726,7 +1727,7 @@ msgstr "" #. module: crm #: model:ir.actions.act_window,name:crm.action_crm_send_mass_convert msgid "Convert opportunities" -msgstr "" +msgstr "Fırsatları Dönüştür" #. module: crm #: view:crm.lead.report:0 @@ -1766,7 +1767,7 @@ msgstr "Olasıyı iş ortağına dönüştür" #. module: crm #: view:crm.meeting:0 msgid "Meeting / Partner" -msgstr "" +msgstr "Toplantı / Cari" #. module: crm #: view:crm.phonecall2opportunity:0 @@ -1878,7 +1879,7 @@ msgstr "Gelen" #. module: crm #: view:crm.phonecall.report:0 msgid "Month of call" -msgstr "" +msgstr "Arama Ayı" #. module: crm #: view:crm.phonecall.report:0 @@ -1912,7 +1913,7 @@ msgstr "En yüksek" #. module: crm #: help:crm.lead.report,creation_year:0 msgid "Creation year" -msgstr "" +msgstr "Oluşturma Yılı" #. module: crm #: view:crm.case.section:0 @@ -1991,7 +1992,7 @@ msgstr "Fırsata Dönüştür" #: model:ir.model,name:crm.model_crm_case_channel #: model:ir.ui.menu,name:crm.menu_crm_case_channel msgid "Channels" -msgstr "" +msgstr "Kanallar" #. module: crm #: view:crm.phonecall:0 @@ -2219,7 +2220,7 @@ msgstr "Elde Değil" #: code:addons/crm/crm_lead.py:491 #, python-format msgid "Please select more than one opportunities." -msgstr "" +msgstr "Lütfen birden fazla fırsat seçin." #. module: crm #: field:crm.lead.report,probability:0 @@ -2229,7 +2230,7 @@ msgstr "Olasılık" #. module: crm #: view:crm.lead:0 msgid "Pending Opportunities" -msgstr "" +msgstr "Bekleyen Fırsatlar" #. module: crm #: view:crm.lead.report:0 @@ -2282,7 +2283,7 @@ msgstr "Yeni iş ortağı oluştur" #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound msgid "Scheduled Calls" -msgstr "" +msgstr "Planlanmış Görüşmeler" #. module: crm #: view:crm.meeting:0 @@ -2293,7 +2294,7 @@ msgstr "Başlangıç Tarihi" #. module: crm #: view:crm.phonecall:0 msgid "Scheduled Phonecalls" -msgstr "" +msgstr "Planlanmış Telefon Görüşmeleri" #. module: crm #: view:crm.meeting:0 @@ -2303,7 +2304,7 @@ msgstr "Reddet" #. module: crm #: field:crm.lead,user_email:0 msgid "User Email" -msgstr "" +msgstr "Kullanıcı E-posta" #. module: crm #: help:crm.lead,optin:0 @@ -2354,7 +2355,7 @@ msgstr "Toplam Planlanan Gelir" #. module: crm #: view:crm.lead:0 msgid "Open Opportunities" -msgstr "" +msgstr "Açık Fırsatlar" #. module: crm #: model:crm.case.categ,name:crm.categ_meet2 @@ -2394,7 +2395,7 @@ msgstr "Telefon Görüşmeleri" #. module: crm #: view:crm.case.stage:0 msgid "Stage Search" -msgstr "" +msgstr "Sahne Arama" #. module: crm #: help:crm.lead.report,delay_open:0 @@ -2405,7 +2406,7 @@ msgstr "Durumun açılması için gün sayısı" #. module: crm #: selection:crm.meeting,end_type:0 msgid "Number of repetitions" -msgstr "" +msgstr "Tekrar Sayısı" #. module: crm #: field:crm.lead,phone:0 @@ -2444,7 +2445,7 @@ msgstr ">" #: view:crm.opportunity2phonecall:0 #: view:crm.phonecall2phonecall:0 msgid "Schedule call" -msgstr "" +msgstr "Görüşme Programla" #. module: crm #: view:crm.meeting:0 @@ -2480,7 +2481,7 @@ msgstr "Azalt (0>1)" #. module: crm #: field:crm.lead.report,deadline_day:0 msgid "Exp. Closing Day" -msgstr "" +msgstr "Bekl. Kapanış Günü" #. module: crm #: field:crm.case.section,change_responsible:0 @@ -2507,7 +2508,7 @@ msgstr "Muhtelif" #. module: crm #: model:ir.actions.act_window,name:crm.open_board_crm msgid "Sales" -msgstr "" +msgstr "Satış" #. module: crm #: model:crm.case.categ,name:crm.categ_oppor8 @@ -2560,7 +2561,7 @@ msgstr "Meşgul" #. module: crm #: field:crm.lead.report,creation_day:0 msgid "Creation Day" -msgstr "" +msgstr "Oluşturulma Günü" #. module: crm #: field:crm.meeting,interval:0 @@ -2575,7 +2576,7 @@ msgstr "Yinelenen" #. module: crm #: view:crm.phonecall.report:0 msgid "Phone calls made in last month" -msgstr "" +msgstr "Geçen Ay yapılan Telefon görüşmeleri" #. module: crm #: model:ir.actions.act_window,name:crm.act_my_oppor @@ -2707,7 +2708,7 @@ msgstr "Bölümleme Testi" #. module: crm #: field:crm.lead,user_login:0 msgid "User Login" -msgstr "" +msgstr "Kullanıcı Adı" #. module: crm #: view:crm.segmentation:0 @@ -2752,12 +2753,12 @@ msgstr "Süre" #. module: crm #: view:crm.lead:0 msgid "Show countries" -msgstr "" +msgstr "Ülkeleri Göster" #. module: crm #: view:crm.lead2opportunity.partner.mass:0 msgid "Select Salesman" -msgstr "" +msgstr "Satış Temsilcisi Seç" #. module: crm #: view:board.board:0 @@ -2845,7 +2846,7 @@ msgstr "" #. module: crm #: field:crm.lead,subjects:0 msgid "Subject of Email" -msgstr "" +msgstr "E-posta Konusu" #. module: crm #: model:ir.actions.act_window,name:crm.action_view_attendee_form @@ -2904,7 +2905,7 @@ msgstr "Mesajlar" #. module: crm #: help:crm.lead,channel_id:0 msgid "Communication channel (mail, direct, phone, ...)" -msgstr "" +msgstr "İletişim Kanalı (eposta, doğrudan, telefon, ...)" #. module: crm #: code:addons/crm/crm_action_rule.py:61 @@ -2969,7 +2970,7 @@ msgstr "" #. module: crm #: field:crm.lead,color:0 msgid "Color Index" -msgstr "" +msgstr "Renk İndeksi" #. module: crm #: view:crm.lead:0 @@ -3135,7 +3136,7 @@ msgstr "Kanal" #: view:crm.phonecall:0 #: view:crm.phonecall.report:0 msgid "My Sales Team(s)" -msgstr "" +msgstr "Satış Ekiplerim" #. module: crm #: help:crm.segmentation,exclusif:0 @@ -3176,7 +3177,7 @@ msgstr "Adaylardan iş fırsatları oluşturma" #: model:ir.actions.act_window,name:crm.open_board_statistical_dash #: model:ir.ui.menu,name:crm.menu_board_statistics_dash msgid "CRM Dashboard" -msgstr "" +msgstr "CRM Kontrol Paneli" #. module: crm #: model:crm.case.categ,name:crm.categ_oppor4 @@ -3196,7 +3197,7 @@ msgstr "Kategoriyi şuna Ayarla" #. module: crm #: view:crm.meeting:0 msgid "Mail To" -msgstr "" +msgstr "Kime" #. module: crm #: field:crm.meeting,th:0 @@ -3230,13 +3231,13 @@ msgstr "Yeterlik" #. module: crm #: field:crm.lead,partner_address_email:0 msgid "Partner Contact Email" -msgstr "" +msgstr "Cari İletişim E-postası" #. module: crm #: code:addons/crm/wizard/crm_lead_to_partner.py:48 #, python-format msgid "A partner is already defined." -msgstr "" +msgstr "Bir Cari zaten Tanımlanmış" #. module: crm #: selection:crm.meeting,byday:0 @@ -3246,7 +3247,7 @@ msgstr "İlk" #. module: crm #: field:crm.lead.report,deadline_month:0 msgid "Exp. Closing Month" -msgstr "" +msgstr "Bekl. Kapanış Ayı" #. module: crm #: selection:crm.lead.report,creation_month:0 @@ -3264,7 +3265,7 @@ msgstr "İletişim Geçmişi Koşulları" #. module: crm #: view:crm.phonecall:0 msgid "Date of Call" -msgstr "" +msgstr "Arama Tarihi" #. module: crm #: help:crm.segmentation,som_interval:0 @@ -3327,7 +3328,7 @@ msgstr "Tekrarla" #. module: crm #: field:crm.lead.report,deadline_year:0 msgid "Ex. Closing Year" -msgstr "" +msgstr "Belk. Kapanış Yılı" #. module: crm #: view:crm.lead:0 @@ -3387,7 +3388,7 @@ msgstr "" #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound msgid "Logged Calls" -msgstr "" +msgstr "Kayıtlı Aramalar" #. module: crm #: field:crm.partner2opportunity,probability:0 @@ -3522,12 +3523,12 @@ msgstr "Twitter Reklamları" #: code:addons/crm/crm_lead.py:336 #, python-format msgid "The opportunity '%s' has been been won." -msgstr "" +msgstr "'%s' Fırsatı kazanıldı." #. module: crm #: field:crm.case.stage,case_default:0 msgid "Common to All Teams" -msgstr "" +msgstr "Bütün Ekiplerde Ortak" #. module: crm #: code:addons/crm/wizard/crm_add_note.py:28 @@ -3553,7 +3554,7 @@ msgstr "Hata ! Yinelen profiller oluşturamazsınız." #. module: crm #: help:crm.lead.report,deadline_year:0 msgid "Expected closing year" -msgstr "" +msgstr "Beklenen Kapanış Yılı" #. module: crm #: field:crm.lead,partner_address_id:0 @@ -3584,7 +3585,7 @@ msgstr "Kapat" #: selection:crm.opportunity2phonecall,action:0 #: selection:crm.phonecall2phonecall,action:0 msgid "Schedule a call" -msgstr "" +msgstr "Görüşme Programla" #. module: crm #: view:crm.lead:0 @@ -3620,7 +3621,7 @@ msgstr "Kime" #. module: crm #: view:crm.lead:0 msgid "Create date" -msgstr "" +msgstr "Oluşturulma Tarihi" #. module: crm #: selection:crm.meeting,class:0 @@ -3630,7 +3631,7 @@ msgstr "Özel" #. module: crm #: selection:crm.meeting,class:0 msgid "Public for Employees" -msgstr "" +msgstr "Çalışanlara açık" #. module: crm #: field:crm.lead,function:0 @@ -3655,7 +3656,7 @@ msgstr "Açıklama" #. module: crm #: view:crm.phonecall.report:0 msgid "Phone calls made in current month" -msgstr "" +msgstr "Bu ay yapılan telefon görüşmeleri" #. module: crm #: selection:crm.lead.report,creation_month:0 @@ -3673,13 +3674,13 @@ msgstr "Aksesuarlara ilgi duyuyor" #. module: crm #: view:crm.lead:0 msgid "New Opportunities" -msgstr "" +msgstr "Yeni Fırsatlar" #. module: crm #: code:addons/crm/crm_action_rule.py:61 #, python-format msgid "No E-Mail Found for your Company address!" -msgstr "" +msgstr "Şirket adresinizde E-posta bulunamadı" #. module: crm #: field:crm.lead.report,email:0 @@ -3764,7 +3765,7 @@ msgstr "Kayıp" #. module: crm #: view:crm.lead:0 msgid "Edit" -msgstr "" +msgstr "Düzenle" #. module: crm #: field:crm.lead,country_id:0 @@ -3859,7 +3860,7 @@ msgstr "Sıra No" #. module: crm #: model:ir.model,name:crm.model_mail_compose_message msgid "E-mail composition wizard" -msgstr "" +msgstr "E-posta oluşturma sihirbazı" #. module: crm #: view:crm.meeting:0 @@ -3897,7 +3898,7 @@ msgstr "Yıl" #. module: crm #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." -msgstr "" +msgstr "Hata ! kendini çağıran ilişkili üyeler oluşturamazsınız." #. module: crm #: model:crm.case.resource.type,name:crm.type_lead8 diff --git a/addons/crm_claim/i18n/tr.po b/addons/crm_claim/i18n/tr.po index ec0fd8614b9..ee9ff7cc1db 100644 --- a/addons/crm_claim/i18n/tr.po +++ b/addons/crm_claim/i18n/tr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-02-05 10:21+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2012-01-24 22:26+0000\n" +"Last-Translator: Ahmet Altınışık \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:21+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-25 05:26+0000\n" +"X-Generator: Launchpad (build 14719)\n" #. module: crm_claim #: field:crm.claim.report,nbr:0 @@ -90,7 +90,7 @@ msgstr "" #. module: crm_claim #: view:crm.claim:0 msgid "Date Closed" -msgstr "" +msgstr "Kapatılma Tarihi" #. module: crm_claim #: view:crm.claim.report:0 @@ -227,7 +227,7 @@ msgstr "Yeni e-posta gönder" #: selection:crm.claim,state:0 #: view:crm.claim.report:0 msgid "New" -msgstr "" +msgstr "Yeni" #. module: crm_claim #: view:crm.claim:0 @@ -254,7 +254,7 @@ msgstr "Sonraki İşlem" #. module: crm_claim #: view:crm.claim.report:0 msgid "My Sales Team(s)" -msgstr "" +msgstr "Satış Ekiplerim" #. module: crm_claim #: model:crm.case.stage,name:crm_claim.stage_claim3 @@ -321,7 +321,7 @@ msgstr "İletişim" #. module: crm_claim #: view:crm.claim.report:0 msgid "Month-1" -msgstr "" +msgstr "Ay-1" #. module: crm_claim #: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim @@ -402,7 +402,7 @@ msgstr "Fiyat Şikayetleri" #. module: crm_claim #: view:crm.claim:0 msgid "Responsible User" -msgstr "" +msgstr "Sorumlu Kullanıcı" #. module: crm_claim #: help:crm.claim,email_cc:0 @@ -489,7 +489,7 @@ msgstr "Kullanıcı" #. module: crm_claim #: field:crm.claim,active:0 msgid "Active" -msgstr "" +msgstr "Etkin" #. module: crm_claim #: selection:crm.claim.report,month:0 @@ -763,7 +763,7 @@ msgstr "Yıl" #. module: crm_claim #: view:crm.claim.report:0 msgid "My company" -msgstr "" +msgstr "Şirketim" #. module: crm_claim #: selection:crm.claim.report,month:0 @@ -783,7 +783,7 @@ msgstr "Kimlik" #. module: crm_claim #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." -msgstr "" +msgstr "Hata ! kendini çağıran ilişkili üyeler oluşturamazsınız." #. module: crm_claim #: view:crm.claim:0 diff --git a/addons/crm_helpdesk/i18n/tr.po b/addons/crm_helpdesk/i18n/tr.po index ba702408a58..161dca579e0 100644 --- a/addons/crm_helpdesk/i18n/tr.po +++ b/addons/crm_helpdesk/i18n/tr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-02-21 15:10+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2012-01-24 22:32+0000\n" +"Last-Translator: Ahmet Altınışık \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-23 07:23+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-25 05:26+0000\n" +"X-Generator: Launchpad (build 14719)\n" #. module: crm_helpdesk #: field:crm.helpdesk.report,delay_close:0 @@ -46,7 +46,7 @@ msgstr "Mart" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Helpdesk requests occurred in current year" -msgstr "" +msgstr "Bu yıl oluşturulan Destek talepleri" #. module: crm_helpdesk #: field:crm.helpdesk,company_id:0 @@ -80,7 +80,7 @@ msgstr "Şirket dahili not ekle" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Date of helpdesk requests" -msgstr "" +msgstr "Destek talebi tarihi" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -95,7 +95,7 @@ msgstr "Mesajlar" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "My company" -msgstr "" +msgstr "Şirketim" #. module: crm_helpdesk #: selection:crm.helpdesk,state:0 @@ -156,7 +156,7 @@ msgstr "Bölüm" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Helpdesk requests occurred in last month" -msgstr "" +msgstr "geçen ay yapılan destek talepleri" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -166,14 +166,14 @@ msgstr "Yeni e-posta gönder" #. module: crm_helpdesk #: view:crm.helpdesk:0 msgid "Helpdesk requests during last 7 days" -msgstr "" +msgstr "son 7 günde yapılan destek talepleri" #. module: crm_helpdesk #: view:crm.helpdesk:0 #: selection:crm.helpdesk,state:0 #: view:crm.helpdesk.report:0 msgid "New" -msgstr "" +msgstr "Yeni" #. module: crm_helpdesk #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report @@ -207,7 +207,7 @@ msgstr "Posta sayısı" #: view:crm.helpdesk:0 #: view:crm.helpdesk.report:0 msgid "My Sales Team(s)" -msgstr "" +msgstr "Satış Ekiplerim" #. module: crm_helpdesk #: field:crm.helpdesk,create_date:0 @@ -252,7 +252,7 @@ msgstr "Kategoriler" #. module: crm_helpdesk #: view:crm.helpdesk:0 msgid "New Helpdesk Request" -msgstr "" +msgstr "Yeni Destek Talebi" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -267,13 +267,13 @@ msgstr "Tarihler" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Month of helpdesk requests" -msgstr "" +msgstr "Destek taleplerinin ayı" #. module: crm_helpdesk #: code:addons/crm_helpdesk/crm_helpdesk.py:101 #, python-format msgid "No Subject" -msgstr "" +msgstr "Konu Yok" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 @@ -283,12 +283,12 @@ msgstr "# Danışma Masası" #. module: crm_helpdesk #: view:crm.helpdesk:0 msgid "All pending Helpdesk Request" -msgstr "" +msgstr "Bekleyen bütün destek talepleri" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Year of helpdesk requests" -msgstr "" +msgstr "Destek Talebinin Yılı" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -324,7 +324,7 @@ msgstr "Güncelleme Tarihi" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Helpdesk requests occurred in current month" -msgstr "" +msgstr "Bu ay oluşan destek talepleri" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 @@ -345,7 +345,7 @@ msgstr "Kategori" #. module: crm_helpdesk #: view:crm.helpdesk:0 msgid "Responsible User" -msgstr "" +msgstr "Sorumlu Kullanıcı" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -361,7 +361,7 @@ msgstr "Planlanan Maliyet" #. module: crm_helpdesk #: help:crm.helpdesk,channel_id:0 msgid "Communication channel." -msgstr "" +msgstr "İletişim Kanalı" #. module: crm_helpdesk #: help:crm.helpdesk,email_cc:0 @@ -574,7 +574,7 @@ msgstr "Danışma Masası Destek Ağacı" #. module: crm_helpdesk #: selection:crm.helpdesk,state:0 msgid "In Progress" -msgstr "" +msgstr "Sürüyor" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -662,7 +662,7 @@ msgstr "Ad" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Month-1" -msgstr "" +msgstr "Ay-1" #. module: crm_helpdesk #: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main @@ -701,17 +701,17 @@ msgstr "" #. module: crm_helpdesk #: view:crm.helpdesk:0 msgid "Todays's Helpdesk Requests" -msgstr "" +msgstr "Bugünün destek talepleri" #. module: crm_helpdesk #: view:crm.helpdesk:0 msgid "Request Date" -msgstr "" +msgstr "Talep Tarihi" #. module: crm_helpdesk #: view:crm.helpdesk:0 msgid "Open Helpdesk Request" -msgstr "" +msgstr "Destek Talebi Aç" #. module: crm_helpdesk #: selection:crm.helpdesk,priority:0 diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml index 14e160fb397..224a52a104c 100644 --- a/addons/crm_partner_assign/crm_lead_view.xml +++ b/addons/crm_partner_assign/crm_lead_view.xml @@ -61,7 +61,7 @@ - + diff --git a/addons/crm_profiling/i18n/tr.po b/addons/crm_profiling/i18n/tr.po index ca1030cb69b..a8d124d9f75 100644 --- a/addons/crm_profiling/i18n/tr.po +++ b/addons/crm_profiling/i18n/tr.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-05-16 20:15+0000\n" -"Last-Translator: Ayhan KIZILTAN \n" +"PO-Revision-Date: 2012-01-25 00:16+0000\n" +"Last-Translator: Ahmet Altınışık \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: 2011-12-23 07:04+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-26 05:27+0000\n" +"X-Generator: Launchpad (build 14719)\n" #. module: crm_profiling #: view:crm_profiling.questionnaire:0 @@ -68,7 +68,7 @@ msgstr "Yanıt" #. module: crm_profiling #: model:ir.model,name:crm_profiling.model_open_questionnaire_line msgid "open.questionnaire.line" -msgstr "" +msgstr "open.questionnaire.line" #. module: crm_profiling #: model:ir.model,name:crm_profiling.model_crm_segmentation @@ -101,7 +101,7 @@ msgstr "Yanıtlar" #. module: crm_profiling #: model:ir.model,name:crm_profiling.model_open_questionnaire msgid "open.questionnaire" -msgstr "" +msgstr "open.questionnaire" #. module: crm_profiling #: field:open.questionnaire,questionnaire_id:0 @@ -116,12 +116,12 @@ msgstr "Bir Anket Kullan" #. module: crm_profiling #: view:open.questionnaire:0 msgid "_Cancel" -msgstr "" +msgstr "_İptal" #. module: crm_profiling #: field:open.questionnaire,question_ans_ids:0 msgid "Question / Answers" -msgstr "" +msgstr "Soru /Cevap" #. module: crm_profiling #: view:crm_profiling.questionnaire:0 @@ -154,7 +154,7 @@ msgstr "Profil Kurallarını Kullan" #. module: crm_profiling #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." -msgstr "" +msgstr "Hata ! kendini çağıran ilişkili üyeler oluşturamazsınız." #. module: crm_profiling #: view:crm_profiling.question:0 diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py index c48237ed3da..10db8e85a73 100644 --- a/addons/delivery/delivery.py +++ b/addons/delivery/delivery.py @@ -124,7 +124,6 @@ class delivery_carrier(osv.osv): grid_line_pool.unlink(cr, uid, lines, context=context) #create the grid lines - line_data = None if record.free_if_more_than: line_data = { 'grid_id': grid_id and grid_id[0], @@ -135,6 +134,7 @@ class delivery_carrier(osv.osv): 'standard_price': 0.0, 'list_price': 0.0, } + grid_line_pool.create(cr, uid, line_data, context=context) if record.normal_price: line_data = { 'grid_id': grid_id and grid_id[0], @@ -145,7 +145,6 @@ class delivery_carrier(osv.osv): 'standard_price': record.normal_price, 'list_price': record.normal_price, } - if line_data: grid_line_pool.create(cr, uid, line_data, context=context) return True diff --git a/addons/delivery/delivery_demo.xml b/addons/delivery/delivery_demo.xml index acc17e20eae..427f943890b 100644 --- a/addons/delivery/delivery_demo.xml +++ b/addons/delivery/delivery_demo.xml @@ -31,6 +31,7 @@ Free delivery charges + 10 True 1000 diff --git a/addons/delivery/i18n/tr.po b/addons/delivery/i18n/tr.po index 6c23d516cba..010653aa37d 100644 --- a/addons/delivery/i18n/tr.po +++ b/addons/delivery/i18n/tr.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2010-09-09 07:15+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2012-01-24 20:57+0000\n" +"Last-Translator: Ahmet Altınışık \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: 2011-12-23 05:53+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n" +"X-Generator: Launchpad (build 14719)\n" #. module: delivery #: report:sale.shipping:0 @@ -69,7 +69,7 @@ msgstr "Grid Satırı" #. module: delivery #: help:delivery.carrier,partner_id:0 msgid "The partner that is doing the delivery service." -msgstr "" +msgstr "Teslimat Servisini veren Cari" #. module: delivery #: model:ir.actions.report.xml,name:delivery.report_shipping @@ -89,7 +89,7 @@ msgstr "Faturalanmak üzere seçilen" #. module: delivery #: field:delivery.carrier,pricelist_ids:0 msgid "Advanced Pricing" -msgstr "" +msgstr "Gelişmiş Fiyatlama" #. module: delivery #: help:delivery.grid,sequence:0 @@ -129,7 +129,7 @@ msgstr "" #. module: delivery #: field:delivery.carrier,amount:0 msgid "Amount" -msgstr "" +msgstr "Tutar" #. module: delivery #: selection:delivery.grid.line,price_type:0 @@ -214,7 +214,7 @@ msgstr "Lot" #. module: delivery #: field:delivery.carrier,partner_id:0 msgid "Transport Company" -msgstr "" +msgstr "Taşıma Şirketi" #. module: delivery #: model:ir.model,name:delivery.model_delivery_grid @@ -287,17 +287,17 @@ msgstr "Bitiş P. Kodu" #: code:addons/delivery/delivery.py:143 #, python-format msgid "Default price" -msgstr "" +msgstr "Öntanımlı Fiyat" #. module: delivery #: model:ir.model,name:delivery.model_delivery_define_delivery_steps_wizard msgid "delivery.define.delivery.steps.wizard" -msgstr "" +msgstr "delivery.define.delivery.steps.wizard" #. module: delivery #: field:delivery.carrier,normal_price:0 msgid "Normal Price" -msgstr "" +msgstr "Normal Fiyat" #. module: delivery #: report:sale.shipping:0 @@ -344,7 +344,7 @@ msgstr "" #. module: delivery #: constraint:stock.move:0 msgid "You can not move products from or to a location of the type view." -msgstr "" +msgstr "view tipinde bir lokasyona ürün giriş çıkışı yapamazsınız." #. module: delivery #: code:addons/delivery/wizard/delivery_sale_order.py:94 @@ -420,7 +420,7 @@ msgstr "" #. module: delivery #: sql_constraint:stock.picking:0 msgid "Reference must be unique per Company!" -msgstr "" +msgstr "Referans her şirket için tekil olmalı!" #. module: delivery #: field:delivery.grid.line,max_value:0 @@ -441,7 +441,7 @@ msgstr "" #. module: delivery #: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form1 msgid "Define Delivery Methods" -msgstr "" +msgstr "Teslimat Yöntemini Tanımla" #. module: delivery #: help:delivery.carrier,free_if_more_than:0 @@ -471,7 +471,7 @@ msgstr "" #. module: delivery #: sql_constraint:sale.order:0 msgid "Order Reference must be unique per Company!" -msgstr "" +msgstr "Sipariş Referansı Her Şirket İçin Tekil Olmalı!" #. module: delivery #: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form @@ -499,7 +499,7 @@ msgstr "Bu ürün için bir üretim lotu oluşturmanız gerekir" #. module: delivery #: field:delivery.carrier,free_if_more_than:0 msgid "Free If More Than" -msgstr "" +msgstr "Ücretsiz Eğer fazlaysa" #. module: delivery #: view:delivery.sale.order:0 @@ -571,17 +571,17 @@ msgstr "Nakliyeci %s (id: %d) teslimat gridine sahip değil!" #. module: delivery #: view:delivery.carrier:0 msgid "Pricing Information" -msgstr "" +msgstr "Fiyat Bilgisi" #. module: delivery #: selection:delivery.define.delivery.steps.wizard,picking_policy:0 msgid "Deliver all products at once" -msgstr "" +msgstr "Tüm ürünleri tek seferde teslim et" #. module: delivery #: field:delivery.carrier,use_detailed_pricelist:0 msgid "Advanced Pricing per Destination" -msgstr "" +msgstr "Adrese göre Gelişmiş Fiyatlama" #. module: delivery #: view:delivery.carrier:0 @@ -613,7 +613,7 @@ msgstr "" #. module: delivery #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." -msgstr "" +msgstr "Hata ! kendini çağıran ilişkili üyeler oluşturamazsınız." #. module: delivery #: field:delivery.grid,sequence:0 @@ -634,12 +634,12 @@ msgstr "Teslimat Maliyeti" #. module: delivery #: selection:delivery.define.delivery.steps.wizard,picking_policy:0 msgid "Deliver each product when available" -msgstr "" +msgstr "Her ürün hazır olduğunda teslim et" #. module: delivery #: view:delivery.define.delivery.steps.wizard:0 msgid "Apply" -msgstr "" +msgstr "Uygula" #. module: delivery #: field:delivery.grid.line,price_type:0 diff --git a/addons/document/i18n/tr.po b/addons/document/i18n/tr.po index 55ff5b033d1..e9f4483671b 100644 --- a/addons/document/i18n/tr.po +++ b/addons/document/i18n/tr.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2011-06-10 19:43+0000\n" -"Last-Translator: Ayhan KIZILTAN \n" +"PO-Revision-Date: 2012-01-24 20:09+0000\n" +"Last-Translator: Ahmet Altınışık \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: 2011-12-23 07:11+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-01-25 05:25+0000\n" +"X-Generator: Launchpad (build 14719)\n" #. module: document #: field:document.directory,parent_id:0 @@ -150,7 +150,7 @@ msgstr "Klasör adı eşsiz olmalı !" #. module: document #: view:ir.attachment:0 msgid "Filter on my documents" -msgstr "" +msgstr "Dökümanlarımdaki filtreler" #. module: document #: field:ir.attachment,index_content:0 @@ -169,7 +169,7 @@ msgstr "" #. module: document #: model:ir.actions.todo.category,name:document.category_knowledge_mgmt_config msgid "Knowledge Management" -msgstr "" +msgstr "Bilgi Yönetimi" #. module: document #: view:document.directory:0 @@ -203,7 +203,7 @@ msgstr "Her kaynağın klasörü" #. module: document #: view:ir.attachment:0 msgid "Indexed Content - experimental" -msgstr "" +msgstr "İndekslenmiş İçerik - Deneysel" #. module: document #: field:document.directory.content,suffix:0 @@ -522,7 +522,7 @@ msgstr "" #. module: document #: model:ir.actions.act_window,name:document.action_config_auto_directory msgid "Configure Directories" -msgstr "" +msgstr "Klasörleri Ayarla" #. module: document #: field:document.directory.content,include_name:0 @@ -675,7 +675,7 @@ msgstr "Salt Okunur" #. module: document #: model:ir.actions.act_window,name:document.action_document_directory_form msgid "Document Directory" -msgstr "" +msgstr "Dökümanlar Klasörü" #. module: document #: sql_constraint:document.directory:0 @@ -794,7 +794,7 @@ msgstr "Ay" #. module: document #: view:report.document.user:0 msgid "This Months Files" -msgstr "" +msgstr "Bu ayın Dosyaları" #. module: document #: model:ir.ui.menu,name:document.menu_reporting @@ -859,7 +859,7 @@ msgstr "Paydaşa göre Dosyalar" #. module: document #: view:document.configuration:0 msgid "Configure Direcories" -msgstr "" +msgstr "Klasörleri Ayarla" #. module: document #: view:report.document.user:0 @@ -874,7 +874,7 @@ msgstr "Notlar" #. module: document #: model:ir.model,name:document.model_document_configuration msgid "Directory Configuration" -msgstr "" +msgstr "Klasör Ayarları" #. module: document #: help:document.directory,type:0 @@ -969,7 +969,7 @@ msgstr "Mime Türü" #. module: document #: view:report.document.user:0 msgid "All Months Files" -msgstr "" +msgstr "Bütün Ayların Dosyaları" #. module: document #: field:document.directory.content,name:0 diff --git a/addons/document/i18n/zh_CN.po b/addons/document/i18n/zh_CN.po index 3f428c4565f..07f59d5a3e1 100644 --- a/addons/document/i18n/zh_CN.po +++ b/addons/document/i18n/zh_CN.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-12-22 18:44+0000\n" -"PO-Revision-Date: 2012-01-12 04:38+0000\n" -"Last-Translator: Wei \"oldrev\" Li \n" +"PO-Revision-Date: 2012-01-26 04:56+0000\n" +"Last-Translator: openerp-china.black-jack \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: 2012-01-13 04:40+0000\n" -"X-Generator: Launchpad (build 14664)\n" +"X-Launchpad-Export-Date: 2012-01-27 05:28+0000\n" +"X-Generator: Launchpad (build 14727)\n" #. module: document #: field:document.directory,parent_id:0 @@ -148,7 +148,7 @@ msgstr "目录名必须唯一！" #. module: document #: view:ir.attachment:0 msgid "Filter on my documents" -msgstr "" +msgstr "用于我的文档的过滤器" #. module: document #: field:ir.attachment,index_content:0 @@ -165,7 +165,7 @@ msgstr "如勾选，所有与该记录匹配的附件都会被找到。如不选 #. module: document #: model:ir.actions.todo.category,name:document.category_knowledge_mgmt_config msgid "Knowledge Management" -msgstr "" +msgstr "知识管理" #. module: document #: view:document.directory:0 @@ -199,7 +199,7 @@ msgstr "每个资源一个目录" #. module: document #: view:ir.attachment:0 msgid "Indexed Content - experimental" -msgstr "" +msgstr "索引内容——实验性功能" #. module: document #: field:document.directory.content,suffix:0 @@ -381,7 +381,7 @@ msgstr "自动生成的文件列表" msgid "" "When executing this wizard, it will configure your directories automatically " "according to modules installed." -msgstr "" +msgstr "当执行此向导时将自动通过已安装的模块进行目录配置。" #. module: document #: field:document.directory.content,directory_id:0 @@ -514,7 +514,7 @@ msgstr "" #. module: document #: model:ir.actions.act_window,name:document.action_config_auto_directory msgid "Configure Directories" -msgstr "" +msgstr "配置目录" #. module: document #: field:document.directory.content,include_name:0 @@ -661,7 +661,7 @@ msgstr "只读" #. module: document #: model:ir.actions.act_window,name:document.action_document_directory_form msgid "Document Directory" -msgstr "" +msgstr "文档目录" #. module: document #: sql_constraint:document.directory:0 @@ -687,6 +687,8 @@ msgid "" "attached to the document, or to print and download any report. This tool " "will create directories automatically according to modules installed." msgstr "" +"OpenERP " +"的文档管理系统支持为文档映射虚拟文件夹。单据的虚拟文件夹将用于管理该单据的附件文件，或者用于打印和下载任何报表。此工具将按照已安装的模块自动创建目录。" #. module: document #: view:board.board:0 @@ -736,7 +738,7 @@ msgstr "外部文件存储设区" #: model:ir.actions.act_window,name:document.action_view_wall #: view:report.document.wall:0 msgid "Wall of Shame" -msgstr "羞愧者名单" +msgstr "耻辱之墙" #. module: document #: help:document.storage,path:0 @@ -780,7 +782,7 @@ msgstr "月份" #. module: document #: view:report.document.user:0 msgid "This Months Files" -msgstr "" +msgstr "本月文件" #. module: document #: model:ir.ui.menu,name:document.menu_reporting @@ -843,7 +845,7 @@ msgstr "业务伙伴文件" #. module: document #: view:document.configuration:0 msgid "Configure Direcories" -msgstr "" +msgstr "配置目录" #. module: document #: view:report.document.user:0 @@ -858,7 +860,7 @@ msgstr "备注" #. module: document #: model:ir.model,name:document.model_document_configuration msgid "Directory Configuration" -msgstr "" +msgstr "目录配置" #. module: document #: help:document.directory,type:0 @@ -952,7 +954,7 @@ msgstr "MIME 类型" #. module: document #: view:report.document.user:0 msgid "All Months Files" -msgstr "" +msgstr "所有月份的文件" #. module: document #: field:document.directory.content,name:0 diff --git a/addons/document_webdav/i18n/tr.po b/addons/document_webdav/i18n/tr.po new file mode 100644 index 00000000000..fa6799d172e --- /dev/null +++ b/addons/document_webdav/i18n/tr.po @@ -0,0 +1,194 @@ +# Turkish translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-12-22 18:44+0000\n" +"PO-Revision-Date: 2012-01-25 17:22+0000\n" +"Last-Translator: Ahmet Altınışık \n" +"Language-Team: Turkish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-01-26 05:27+0000\n" +"X-Generator: Launchpad (build 14719)\n" + +#. module: document_webdav +#: field:document.webdav.dir.property,create_date:0 +#: field:document.webdav.file.property,create_date:0 +msgid "Date Created" +msgstr "Oluşturma Tarihi" + +#. module: document_webdav +#: model:ir.ui.menu,name:document_webdav.menu_document_props +msgid "Documents" +msgstr "Belgeler" + +#. module: document_webdav +#: constraint:document.directory:0 +msgid "Error! You can not create recursive Directories." +msgstr "Hata! Yinelenen Dizinler oluşturamazsınız." + +#. module: document_webdav +#: view:document.webdav.dir.property:0 +#: view:document.webdav.file.property:0 +msgid "Search Document properties" +msgstr "" + +#. module: document_webdav +#: view:document.webdav.dir.property:0 +#: field:document.webdav.dir.property,namespace:0 +#: view:document.webdav.file.property:0 +#: field:document.webdav.file.property,namespace:0 +msgid "Namespace" +msgstr "" + +#. module: document_webdav +#: field:document.directory,dav_prop_ids:0 +msgid "DAV properties" +msgstr "" + +#. module: document_webdav +#: model:ir.model,name:document_webdav.model_document_webdav_file_property +msgid "document.webdav.file.property" +msgstr "" + +#. module: document_webdav +#: view:document.webdav.dir.property:0 +#: view:document.webdav.file.property:0 +msgid "Group By..." +msgstr "Grupla..." + +#. module: document_webdav +#: view:document.directory:0 +msgid "These properties will be added to WebDAV requests" +msgstr "" + +#. module: document_webdav +#: model:ir.actions.act_window,name:document_webdav.action_file_props_form +msgid "DAV Properties for Documents" +msgstr "" + +#. module: document_webdav +#: code:addons/document_webdav/webdav.py:37 +#, python-format +msgid "PyWebDAV Import Error!" +msgstr "" + +#. module: document_webdav +#: view:document.webdav.file.property:0 +#: field:document.webdav.file.property,file_id:0 +msgid "Document" +msgstr "" + +#. module: document_webdav +#: model:ir.ui.menu,name:document_webdav.menu_folder_props +msgid "Folders" +msgstr "" + +#. module: document_webdav +#: sql_constraint:document.directory:0 +msgid "Directory cannot be parent of itself!" +msgstr "" + +#. module: document_webdav +#: view:document.directory:0 +msgid "Dynamic context" +msgstr "" + +#. module: document_webdav +#: view:document.directory:0 +msgid "WebDAV properties" +msgstr "" + +#. module: document_webdav +#: sql_constraint:document.directory:0 +msgid "The directory name must be unique !" +msgstr "" + +#. module: document_webdav +#: code:addons/document_webdav/webdav.py:37 +#, python-format +msgid "" +"Please install PyWebDAV from " +"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-" +"0.9.4.tar.gz&can=2&q=/" +msgstr "" + +#. module: document_webdav +#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form +msgid "DAV Properties for Folders" +msgstr "" + +#. module: document_webdav +#: view:document.directory:0 +#: view:document.webdav.dir.property:0 +#: view:document.webdav.file.property:0 +msgid "Properties" +msgstr "" + +#. module: document_webdav +#: field:document.webdav.dir.property,name:0 +#: field:document.webdav.file.property,name:0 +msgid "Name" +msgstr "" + +#. module: document_webdav +#: model:ir.model,name:document_webdav.model_document_webdav_dir_property +msgid "document.webdav.dir.property" +msgstr "" + +#. module: document_webdav +#: field:document.webdav.dir.property,value:0 +#: field:document.webdav.file.property,value:0 +msgid "Value" +msgstr "" + +#. module: document_webdav +#: field:document.webdav.dir.property,dir_id:0 +#: model:ir.model,name:document_webdav.model_document_directory +msgid "Directory" +msgstr "" + +#. module: document_webdav +#: field:document.webdav.dir.property,write_uid:0 +#: field:document.webdav.file.property,write_uid:0 +msgid "Last Modification User" +msgstr "" + +#. module: document_webdav +#: view:document.webdav.dir.property:0 +msgid "Dir" +msgstr "" + +#. module: document_webdav +#: field:document.webdav.dir.property,write_date:0 +#: field:document.webdav.file.property,write_date:0 +msgid "Date Modified" +msgstr "" + +#. module: document_webdav +#: field:document.webdav.dir.property,create_uid:0 +#: field:document.webdav.file.property,create_uid:0 +msgid "Creator" +msgstr "" + +#. module: document_webdav +#: model:ir.ui.menu,name:document_webdav.menu_properties +msgid "DAV Properties" +msgstr "" + +#. module: document_webdav +#: sql_constraint:document.directory:0 +msgid "Directory must have a parent or a storage" +msgstr "" + +#. module: document_webdav +#: field:document.webdav.dir.property,do_subst:0 +#: field:document.webdav.file.property,do_subst:0 +msgid "Substitute" +msgstr "" diff --git a/addons/edi/static/src/js/edi.js b/addons/edi/static/src/js/edi.js index 3135c0f8102..5493077e831 100644 --- a/addons/edi/static/src/js/edi.js +++ b/addons/edi/static/src/js/edi.js @@ -1,7 +1,7 @@ openerp.edi = function(openerp) { openerp.edi = {} -openerp.edi.EdiView = openerp.web.Widget.extend({ +openerp.edi.EdiView = openerp.web.OldWidget.extend({ init: function(parent, db, token) { this._super(); this.db = db; @@ -113,7 +113,7 @@ openerp.edi.edi_view = function (db, token) { }); } -openerp.edi.EdiImport = openerp.web.Widget.extend({ +openerp.edi.EdiImport = openerp.web.OldWidget.extend({ init: function(parent,url) { this._super(); this.url = url; diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py index 90eda625759..35803c21864 100644 --- a/addons/email_template/email_template.py +++ b/addons/email_template/email_template.py @@ -180,20 +180,21 @@ class email_template(osv.osv): src_obj = template.model_id.model model_data_id = data_obj._get_id(cr, uid, 'mail', 'email_compose_message_wizard_form') res_id = data_obj.browse(cr, uid, model_data_id, context=context).res_id + button_name = _('Send Mail (%s)') % template.name vals['ref_ir_act_window'] = action_obj.create(cr, uid, { - 'name': template.name, + 'name': button_name, 'type': 'ir.actions.act_window', 'res_model': 'mail.compose.message', 'src_model': src_obj, 'view_type': 'form', - 'context': "{'mail.compose.message.mode':'mass_mail'}", + 'context': "{'mail.compose.message.mode':'mass_mail', 'mail.compose.template_id' : %d}" % (template.id), 'view_mode':'form,tree', 'view_id': res_id, 'target': 'new', 'auto_refresh':1 }, context) vals['ref_ir_value'] = self.pool.get('ir.values').create(cr, uid, { - 'name': _('Send Mail (%s)') % template.name, + 'name': button_name, 'model': src_obj, 'key2': 'client_action_multi', 'value': "ir.actions.act_window," + str(vals['ref_ir_act_window']), diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml index 1f3b9aef949..e2422d0be7e 100644 --- a/addons/email_template/email_template_view.xml +++ b/addons/email_template/email_template_view.xml @@ -23,12 +23,12 @@ - - + + - + @@ -79,7 +79,7 @@ - + diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py index beb59ba1eea..ef4572429a1 100644 --- a/addons/email_template/wizard/mail_compose_message.py +++ b/addons/email_template/wizard/mail_compose_message.py @@ -69,6 +69,10 @@ class mail_compose_message(osv.osv_memory): size=-1 # means we want an int db column ), } + + _defaults = { + 'template_id' : lambda self, cr, uid, context={} : context.get('mail.compose.template_id', False) + } def on_change_template(self, cr, uid, ids, use_template, template_id, email_from=None, email_to=None, context=None): if context is None: diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py index 0e1e4e0dd3a..b55e7439bd0 100644 --- a/addons/event/__openerp__.py +++ b/addons/event/__openerp__.py @@ -47,7 +47,6 @@ Note that: 'wizard/event_confirm_view.xml', 'event_view.xml', 'report/report_event_registration_view.xml', - 'wizard/event_make_invoice_view.xml', 'wizard/partner_event_registration_view.xml', 'board_association_view.xml', 'res_partner_view.xml', diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml index a795fd2d7ab..c39f11b314f 100644 --- a/addons/event/event_demo.xml +++ b/addons/event/event_demo.xml @@ -119,7 +119,7 @@ 24.00 - + @@ -130,7 +130,7 @@ 15.50 - + @@ -141,7 +141,7 @@ 20 - + diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 3da534bb651..0891caf5b53 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -5,6 +5,7 @@ + diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py index 118c20f8761..52104e82b33 100644 --- a/addons/event/report/report_event_registration.py +++ b/addons/event/report/report_event_registration.py @@ -30,14 +30,12 @@ class report_event_registration(osv.osv): _rec_name = 'date' _columns = { 'event_date': fields.date('Event Start Date', readonly=True), - 'price_subtotal':fields.integer('subtotal'), 'year': fields.char('Year', size=4, readonly=True), 'month': fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True), 'event_id': fields.many2one('event.event', 'Event', required=True), 'draft_state': fields.integer(' # No of Draft Registrations', size=20), - 'average_subtotal': fields.integer('average_subtotal', size=20), 'confirm_state': fields.integer(' # No of Confirmed Registrations', size=20), 'register_max': fields.integer('Maximum Registrations'), 'nbevent': fields.integer('Number Of Events'), @@ -76,10 +74,7 @@ class report_event_registration(osv.osv): count(e.id) AS nbevent, CASE WHEN r.state IN ('draft') THEN r.nb_register ELSE 0 END AS draft_state, CASE WHEN r.state IN ('open','done') THEN r.nb_register ELSE 0 END AS confirm_state, - CASE WHEN r.state IN ('done') THEN r.price_subtotal ELSE 0 END AS total, e.type AS event_type, - r.price_subtotal, - AVG(r.price_subtotal) AS average_subtotal, e.register_max AS register_max, e.state AS event_state, r.state AS registration_state @@ -99,7 +94,7 @@ class report_event_registration(osv.osv): registration_state, r.nb_register, event_type, e.id, e.date_begin, e.main_speaker_id, - e.register_max,event_id, e.user_id,e.company_id,e.section_id, r.price_subtotal, + e.register_max,event_id, e.user_id,e.company_id,e.section_id, e.user_id, e.section_id, event_state, diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml index c1d98ac2c1a..62a2e143fdf 100644 --- a/addons/event/report/report_event_registration_view.xml +++ b/addons/event/report/report_event_registration_view.xml @@ -23,11 +23,8 @@ - - - diff --git a/addons/event/wizard/__init__.py b/addons/event/wizard/__init__.py index fbc44f417f4..d38e350bd11 100644 --- a/addons/event/wizard/__init__.py +++ b/addons/event/wizard/__init__.py @@ -19,7 +19,7 @@ # ############################################################################## -import event_make_invoice + import event_confirm_registration import event_confirm import partner_event_registration diff --git a/addons/moodle_integration/__init__.py b/addons/event_moodle/__init__.py similarity index 96% rename from addons/moodle_integration/__init__.py rename to addons/event_moodle/__init__.py index d9fdb7d9349..87ba4f10024 100644 --- a/addons/moodle_integration/__init__.py +++ b/addons/event_moodle/__init__.py @@ -19,7 +19,8 @@ # ############################################################################## -import moodle +import event_moodle +import wizard # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/moodle_integration/__openerp__.py b/addons/event_moodle/__openerp__.py similarity index 92% rename from addons/moodle_integration/__openerp__.py rename to addons/event_moodle/__openerp__.py index f50da1f1e6f..21100941581 100644 --- a/addons/moodle_integration/__openerp__.py +++ b/addons/event_moodle/__openerp__.py @@ -21,16 +21,18 @@ { - 'name': 'moodle integration', + 'name': 'Event Moodle', 'version': '0.1', 'category': 'Tools', 'complexity': "easy", 'description': """ - """, 'author': 'OpenERP SA', 'depends': ['event'], - 'init_xml': ['moodle_view.xml'], + 'init_xml': [], + 'data': [ + 'wizard_moodle.xml', + ], 'demo_xml': [], 'test': [], 'installable': True, diff --git a/addons/event_moodle/event_moodle.py b/addons/event_moodle/event_moodle.py new file mode 100644 index 00000000000..01dea24817c --- /dev/null +++ b/addons/event_moodle/event_moodle.py @@ -0,0 +1,125 @@ +# -*- 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 +import xmlrpclib +import string +from random import sample + +class event_moodle(osv.osv): + """ Event Type """ + _name = 'event.moodle' + _columns = { + 'moodle_username' : fields.char('Moodle username', 128), + 'moodle_password' : fields.char('Moodle password', 128), + 'moodle_token' : fields.char('Moodle token', 128), + 'serveur_moodle': fields.char('Moodle server', 128) + } + + def configure_moodle(self,cr,uid,ids,context=None): + self.write(cr,uid,ids,{'id':1}) + + def make_url(self,cr,uid,ids,context=None): + config_moodle = self.browse(cr, uid, ids, context=context) + if config_moodle.moodle_username and config_moodle.moodle_password: + url='http://'+config_moodle.serveur_moodle+'/moodle/webservice/xmlrpc/simpleserver.php?wsusername='+config_moodle.moodle_username+'&wspassword='+config_moodle.moodle_password + if config_moodle.moodle_token: + url='http://'+config_moodle.serveur_moodle+'/moodle/webservice/xmlrpc/server.php?wstoken='+config_moodle.moodle_token + return url + + def create_moodle_user(self,cr,uid,ids,dic_user): + """ + user is a list of dictionaries with every required datas for moodle + """ + sock = xmlrpclib.ServerProxy(self.make_url()) + #connect to moodle + + return sock.core_user_create_users(dic_user) + #add user un moodle + #return list of id and username + + def create_moodle_courses(courses): + sock = xmlrpclib.ServerProxy(self.make_url()) + #connect to moodle + sock.core_course_create_courses(courses) + #add course un moodle + + def moodle_enrolled(enrolled): + sock = xmlrpclib.ServerProxy(self.Get_url()) + #connect to moodle + sock.enrol_manual_enrol_users(enrolled) + #add enrolled un moodle + + + +event_moodle() + +class event_event(osv.osv): + _inherit = "event.event" + + def button_confirm(self, cr, uid, ids, context=None): + event = self.browse(cr, uid, ids, context=context) + name_event = event[0].name + dic_courses= [{'fullname' :name_event,'shortname' :'','categoryid':0}] + event_moodle.create_moodle_courses() + return super(event_event, self).button_confirm(cr, uid, ids, context) + +event_event() + + +class event_registration(osv.osv): + + _inherit = "event.registration" + + def create_password(): + pop = string.ascii_letters + string.digits + k=200 + while k > len(pop): + pop *= 2 + passwd = ''.join(sample(pop, k)) + return passwd + trhrthrthtrh + def check_confirm(self, cr, uid, ids, context=None): + register = self.browse(cr, uid, ids, context=context) + users=[{ + 'username' : register[0].name, + 'password' : create_password(), + 'firstname' : register[0].name, + 'lastname': '', + 'email': register[0].email + }] + user=event_moodle.create_moodle_user(users) +#to do get id of the new user + + enrolled=[{ + 'roleid' :'', + 'userid' :'', + 'courseid' :'' + }] + event_moodle.moodle_enrolled(enrolled) + print ">>>>>>>>>>>>>>>>>>>>>>>>>>>>" + print ">>>>>>>>>>>>>>>>>>>>>>>>>>>>" + print ">>>>>>>>>>>>>>>>>>>>>>>>>>>>" + print ">>>>>>>>>>>>>>>>>>>>>>>>>>>>" + print ">>>>>>>>>>>>>>>>>>>>>>>>>>>>" + return super(event_registration, self).check_confirm(cr, uid, ids, context) +event_registration() + diff --git a/addons/event_moodle/wizard_moodle.xml b/addons/event_moodle/wizard_moodle.xml new file mode 100644 index 00000000000..dac37f599ab --- /dev/null +++ b/addons/event_moodle/wizard_moodle.xml @@ -0,0 +1,58 @@ + + + + + moodle.config.wizard.form + event.moodle + form + + + + + + + + + + + + + + + + +