diff --git a/addons/account/account.py b/addons/account/account.py index cabf51586fc..5181028c17b 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -763,7 +763,7 @@ account_period() class account_journal_period(osv.osv): _name = "account.journal.period" - _description = "Journal - Period" + _description = "Journal Period" def _icon_get(self, cr, uid, ids, field_name, arg=None, context={}): result = {}.fromkeys(ids, 'STOCK_NEW') diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py index 232d4018ae9..ba33185119e 100644 --- a/addons/account/account_analytic_line.py +++ b/addons/account/account_analytic_line.py @@ -30,7 +30,7 @@ from tools import config class account_analytic_line(osv.osv): _inherit = 'account.analytic.line' - _description = 'Analytic lines' + _description = 'Analytic Line' _columns = { 'product_uom_id' : fields.many2one('product.uom', 'UoM'), 'product_id' : fields.many2one('product.product', 'Product'), @@ -118,7 +118,7 @@ account_analytic_line() class timesheet_invoice(osv.osv): _name = "report.hr.timesheet.invoice.journal" - _description = "Analytic account costs and revenues" + _description = "Analytic Account Costs and Revenues" _auto = False _columns = { 'name': fields.char('Year',size=64,required=False, readonly=True), diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 9fd609c7ed3..81b6e3157a1 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -387,7 +387,7 @@ account_bank_statement() class account_bank_statement_reconcile(osv.osv): _name = "account.bank.statement.reconcile" - _description = "Statement reconcile" + _description = "Statement Reconcile" def _total_entry(self, cursor, user, ids, name, attr, context=None): result = {} diff --git a/addons/account/account_invoice_workflow.xml b/addons/account/account_invoice_workflow.xml index 374a436e9ac..4c919765596 100644 --- a/addons/account/account_invoice_workflow.xml +++ b/addons/account/account_invoice_workflow.xml @@ -50,7 +50,7 @@ write({'state':'open'}) paid - write({'state':'paid'}) + confirm_paid() function subflow.paid diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index d4f913a32ce..36b65d20dca 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -30,7 +30,7 @@ import tools class account_move_line(osv.osv): _name = "account.move.line" - _description = "Entry lines" + _description = "Entry Lines" def _query_get(self, cr, uid, obj='l', context={}): fiscalyear_obj = self.pool.get('account.fiscalyear') diff --git a/addons/account/invoice.py b/addons/account/invoice.py index 8d11845b3d4..4af3b43d54c 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -216,6 +216,7 @@ class account_invoice(osv.osv): _name = "account.invoice" _description = 'Invoice' _order = "number" + _log_create = True _columns = { 'name': fields.char('Description', size=64, select=True,readonly=True, states={'draft':[('readonly',False)]}), 'origin': fields.char('Source Document', size=64, help="Reference of the document that produced this invoice."), @@ -334,6 +335,13 @@ class account_invoice(osv.osv): else: raise orm.except_orm(_('UnknownError'), str(e)) + def confirm_paid(self, cr, uid, ids, context=None): + self.write(cr, uid, ids, {'state':'paid'}, context=context) + for (id,name) in self.name_get(cr, uid, ids): + message = _('Document ') + " '" + name + "' "+ _("has been paid.") + self.log(cr, uid, id, message) + return True + def unlink(self, cr, uid, ids, context=None): invoices = self.read(cr, uid, ids, ['state']) unlink_ids = [] @@ -1168,7 +1176,7 @@ class account_invoice_line(osv.osv): return 0 _name = "account.invoice.line" - _description = "Invoice line" + _description = "Invoice Line" _columns = { 'name': fields.char('Description', size=256, required=True), 'origin': fields.char('Origin', size=256, help="Reference of the document that produced this invoice."), diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 5f89a9172a9..b4a7b67a05a 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -25,13 +25,13 @@ - + @@ -97,6 +97,7 @@ form tree,graph,form + {"search_default_user_id":uid} @@ -188,11 +189,11 @@ - + @@ -202,6 +203,7 @@ ir.actions.act_window account.analytic.line form + {"search_default_user_id":uid} diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index b6729c2c005..ae00608b164 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -88,10 +88,6 @@ - account.invoice.report form tree,graph - {'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]} + {'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[],'search_default_user_id':uid} diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv index ba5bf65592c..7458594d240 100644 --- a/addons/account/security/ir.model.access.csv +++ b/addons/account/security/ir.model.access.csv @@ -93,3 +93,13 @@ "access_report_account_type_sales","report.account_type.sales","model_report_account_type_sales","account.group_account_manager",1,0,0,0 "access_report_account_sales","report.account.sales","model_report_account_sales","account.group_account_manager",1,0,0,0 "access_account_invoice_report","account.invoice.report","model_account_invoice_report","account.group_account_manager",1,0,0,0 +"access_project_account_analytic_line","project.account.analytic.line","model_project_account_analytic_line","account.group_account_manager",1,1,1,1 +"access_account_move_line_reconcile_select","account.move.line.reconcile.select","model_account_move_line_reconcile_select","account.group_account_manager",1,1,1,1 +"access_account_move_line_unreconcile_select","account.move.line.unreconcile.select","model_account_move_line_unreconcile_select","account.group_account_manager",1,1,1,1 +"access_account_invoice_refund","account.invoice.refund","model_account_invoice_refund","account.group_account_manager",1,1,1,1 +"access_account_move_journal","account.move.journal","model_account_move_journal","account.group_account_manager",1,1,1,1 +"access_account_move_bank_reconcile","account.move.bank.reconcile","model_account_move_bank_reconcile","account.group_account_manager",1,1,1,1 +"access_account_subscription_generate","account.subscription.generate","model_account_subscription_generate","account.group_account_manager",1,1,1,1 +"access_account_period_close","account.period.close","model_account_period_close","account.group_account_manager",1,1,1,1 +"access_account_fiscalyear_close_state","account.fiscalyear.close.state","model_account_fiscalyear_close_state","account.group_account_manager",1,1,1,1 +"access_account_chart","account.chart","model_account_chart","account.group_account_manager",1,1,1,1 diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 7e4807a3f81..742ef74cc84 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -393,7 +393,7 @@ account_analytic_account() class account_analytic_account_summary_user(osv.osv): _name = "account_analytic_analysis.summary.user" - _description = "Hours summary by user" + _description = "Hours Summary by User" _order='user' _auto = False _rec_name = 'user' diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/account_analytic_default.py index cec0d093685..1db16ca8787 100644 --- a/addons/account_analytic_default/account_analytic_default.py +++ b/addons/account_analytic_default/account_analytic_default.py @@ -25,7 +25,7 @@ import time class account_analytic_default(osv.osv): _name = 'account.analytic.default' - _description = 'Analytic Distributions' + _description = 'Analytic Distribution' _rec_name = 'analytic_id' _order = 'sequence' _columns = { @@ -69,7 +69,7 @@ account_analytic_default() class account_invoice_line(osv.osv): _inherit = 'account.invoice.line' - _description = 'account invoice line' + _description = 'Invoice Line' def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition=False, price_unit=False, address_invoice_id=False, currency_id=False, context={}): res_prod = super(account_invoice_line,self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition, price_unit, address_invoice_id, currency_id=currency_id, context=context) diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py index 828d1b1e847..db441d0931f 100644 --- a/addons/account_analytic_plans/account_analytic_plans.py +++ b/addons/account_analytic_plans/account_analytic_plans.py @@ -54,7 +54,7 @@ class one2many_mod2(fields.one2many): class account_analytic_plan(osv.osv): _name = "account.analytic.plan" - _description = "Analytic Plans" + _description = "Analytic Plan" _columns = { 'name': fields.char('Analytic Plan', size=64, required=True, select=True,), 'plan_ids': fields.one2many('account.analytic.plan.line','plan_id','Analytic Plans'), @@ -63,7 +63,7 @@ account_analytic_plan() class account_analytic_plan_line(osv.osv): _name = "account.analytic.plan.line" - _description = "Analytic Plan Lines" + _description = "Analytic Plan Line" _columns = { 'plan_id':fields.many2one('account.analytic.plan','Analytic Plan'), 'name': fields.char('Plan Name', size=64, required=True, select=True), diff --git a/addons/account_anglo_saxon/purchase.py b/addons/account_anglo_saxon/purchase.py index 98694a3d5dd..ac2dffbfd22 100644 --- a/addons/account_anglo_saxon/purchase.py +++ b/addons/account_anglo_saxon/purchase.py @@ -24,7 +24,7 @@ from osv import fields, osv class purchase_order(osv.osv): _name = "purchase.order" _inherit = "purchase.order" - _description = "Purchase order" + _description = "Purchase Order" def inv_line_create(self, cr, uid, a, ol): line = super(purchase_order, self).inv_line_create(cr, uid, a, ol) @@ -37,5 +37,4 @@ class purchase_order(osv.osv): a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, oa) line[2].update({'account_id': a}) return line -purchase_order() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +purchase_order() diff --git a/addons/account_budget/crossovered_budget.py b/addons/account_budget/crossovered_budget.py index 0fdb10c89a6..0e2ef2a363d 100644 --- a/addons/account_budget/crossovered_budget.py +++ b/addons/account_budget/crossovered_budget.py @@ -239,7 +239,7 @@ class crossovered_budget_lines(osv.osv): res[line.id]=0.00 return res _name="crossovered.budget.lines" - _description = "Budget Lines" + _description = "Budget Line" _columns = { 'crossovered_budget_id': fields.many2one('crossovered.budget', 'Budget', ondelete='cascade', select=True, required=True), 'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account',required=True), diff --git a/addons/account_chart/i18n/th.po b/addons/account_chart/i18n/th.po new file mode 100644 index 00000000000..e53bfc9b6c2 --- /dev/null +++ b/addons/account_chart/i18n/th.po @@ -0,0 +1,23 @@ +# Thai translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2009-08-28 16:01+0000\n" +"PO-Revision-Date: 2010-05-20 04:33+0000\n" +"Last-Translator: Songpon Phusing \n" +"Language-Team: Thai \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-05-21 03:38+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: account_chart +#: model:ir.module.module,description:account_chart.module_meta_information +msgid "Remove minimal account chart" +msgstr "ทำการลบตัวอย่างผังบัญชีแบบง่าย" diff --git a/addons/account_followup/followup.py b/addons/account_followup/followup.py index 5eaa2a4e25a..c8bf9537f13 100644 --- a/addons/account_followup/followup.py +++ b/addons/account_followup/followup.py @@ -23,7 +23,7 @@ from osv import fields, osv class followup(osv.osv): _name = 'account_followup.followup' - _description = 'Follow-Ups' + _description = 'Follow-Up' _columns = { 'name': fields.char('Name', size=64, required=True), 'description': fields.text('Description'), @@ -34,7 +34,7 @@ followup() class followup_line(osv.osv): _name = 'account_followup.followup.line' - _description = 'Follow-Ups Criteria' + _description = 'Follow-Up Criteria' _columns = { 'name': fields.char('Name', size=64, required=True), 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of follow-up lines."), diff --git a/addons/account_followup/followup_report.py b/addons/account_followup/followup_report.py index 79cd6006e2b..5ce062ebd0b 100644 --- a/addons/account_followup/followup_report.py +++ b/addons/account_followup/followup_report.py @@ -30,7 +30,7 @@ def _code_get(self, cr, uid, context={}): class account_followup_stat(osv.osv): _name = "account_followup.stat" - _description = "Followup statistics" + _description = "Followup Statistics" _auto = False _columns = { 'name': fields.many2one('res.partner', 'Partner', readonly=True), diff --git a/addons/account_payment/payment.py b/addons/account_payment/payment.py index 8f68bdaf46f..8e300f7072a 100644 --- a/addons/account_payment/payment.py +++ b/addons/account_payment/payment.py @@ -28,7 +28,7 @@ import pooler class payment_type(osv.osv): _name= 'payment.type' - _description= 'Payment type' + _description= 'Payment Type' _columns= { 'name': fields.char('Name', size=64, required=True,help='Payment Type'), 'code': fields.char('Code', size=64, required=True,help='Specifies the Code for Payment Type'), @@ -43,7 +43,7 @@ payment_type() class payment_mode(osv.osv): _name= 'payment.mode' - _description= 'Payment mode' + _description= 'Payment Mode' _columns= { 'name': fields.char('Name', size=64, required=True,help='Mode of Payment'), 'bank_id': fields.many2one('res.partner.bank', "Bank account", diff --git a/addons/account_payment/wizard/account_payment_populate_statement.py b/addons/account_payment/wizard/account_payment_populate_statement.py index 6b34a2c662c..381f0d0f8f7 100644 --- a/addons/account_payment/wizard/account_payment_populate_statement.py +++ b/addons/account_payment/wizard/account_payment_populate_statement.py @@ -106,5 +106,3 @@ class account_payment_populate_statement(osv.osv_memory): return {'type' : 'ir.actions.act_window_close'} account_payment_populate_statement() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:>>>>>>> MERGE-SOURCE diff --git a/addons/account_report/account.py b/addons/account_report/account.py index 7a6d65878f0..a3f92676111 100644 --- a/addons/account_report/account.py +++ b/addons/account_report/account.py @@ -32,7 +32,7 @@ from mx.DateTime import RelativeDateTime, now, DateTime, localtime class account_report(osv.osv): _name = "account.report.report" - _description = "Account reporting" + _description = "Account Reporting" # _color = [ # ('', ''), # ('green','Green'), diff --git a/addons/account_reporting/account.py b/addons/account_reporting/account.py index ad1ce59f769..0b4a16b0dd8 100644 --- a/addons/account_reporting/account.py +++ b/addons/account_reporting/account.py @@ -30,7 +30,7 @@ from mx.DateTime import RelativeDateTime, now, DateTime, localtime class color_rml(osv.osv): _name = "color.rml" - _description = "Rml Colors" + _description = "Rml Color" _columns = { 'name': fields.char('Name', size=64, required=True), 'code': fields.char('code',size=64,required=True), diff --git a/addons/analytic/project.py b/addons/analytic/project.py index c3f9eb28fcb..a3425c3925b 100644 --- a/addons/analytic/project.py +++ b/addons/analytic/project.py @@ -31,7 +31,7 @@ import decimal_precision as dp class account_analytic_account(osv.osv): _name = 'account.analytic.account' - _description = 'Analytic Accounts' + _description = 'Analytic Account' def _compute_currency_for_level_tree(self, cr, uid, ids, ids2, res, acc_set, context={}): # Handle multi-currency on each level of analytic account @@ -285,7 +285,7 @@ account_analytic_account() class account_analytic_line(osv.osv): _name = 'account.analytic.line' - _description = 'Analytic lines' + _description = 'Analytic Line' def _amount_currency(self, cr, uid, ids, field_name, arg, context={}): result = {} for rec in self.browse(cr, uid, ids, context): diff --git a/addons/auction/security/ir.model.access.csv b/addons/auction/security/ir.model.access.csv index 1c1df0828ca..cc3a2e304f7 100644 --- a/addons/auction/security/ir.model.access.csv +++ b/addons/auction/security/ir.model.access.csv @@ -32,3 +32,5 @@ "acess_auction_payer","auction.payer","model_auction_payer","base.group_user",1,0,0,0 "access_auction_pay_sel","auction.pay.sel","model_auction_payer_sel","base.group_user",1,0,0,0 "acess_auction_taken","auction.taken","model_auction_taken","base.group_user",1,0,0,0 +"access_auction_catalog_flagey","auction.catalog.flagey","model_auction_catalog_flagey","base.group_user",1,0,0,0 +"access_auction_lots_buyer_map_user","auction_lots_buyer_map_user","model_auction_lots_buyer_map","base.group_user",1,0,0,0 diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py index 7eaf68fd5d5..2c6c8bf3f9b 100644 --- a/addons/base_calendar/__openerp__.py +++ b/addons/base_calendar/__openerp__.py @@ -24,6 +24,7 @@ "version" : "1.0", "depends" : ["base"], 'description': """Full featured calendar system that supports: + - Alerts (create requests) - Recurring events (*) - Invitations to others people""", diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py index 0becfa611e2..23589fd2d6d 100644 --- a/addons/base_contact/base_contact.py +++ b/addons/base_contact/base_contact.py @@ -25,7 +25,7 @@ class res_partner_contact(osv.osv): """ Partner Contact """ _name = "res.partner.contact" - _description = "res.partner.contact" + _description = "Contact" def _title_get(self,cr, user, context={}): """ diff --git a/addons/base_setup/gtk_contact_form.py b/addons/base_setup/gtk_contact_form.py index 6257bfe5cf6..a9fde39ffde 100644 --- a/addons/base_setup/gtk_contact_form.py +++ b/addons/base_setup/gtk_contact_form.py @@ -76,10 +76,12 @@ class base_gtkcontactform(osv.osv_memory): def execute(self, cr, uid, ids, context=None): if context is None: context = {} + company_id = self.pool.get('base.setup.company').search(cr, uid, [], context=context) company_data = self.pool.get('base.setup.company').read(cr, uid, company_id, context=context) company_data = company_data and company_data[0] or {} country = '' + if company_data.get('country_id', False): country = self.pool.get('res.country').read(cr, uid, company_data['country_id'],['name'], context=context)['name'] diff --git a/addons/base_setup/i18n/th.po b/addons/base_setup/i18n/th.po new file mode 100644 index 00000000000..0d613b0573b --- /dev/null +++ b/addons/base_setup/i18n/th.po @@ -0,0 +1,277 @@ +# Thai translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2009-08-28 16:01+0000\n" +"PO-Revision-Date: 2010-05-20 04:32+0000\n" +"Last-Translator: Songpon Phusing \n" +"Language-Team: Thai \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-05-21 03:37+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: base_setup +#: wizard_field:base_setup.base_setup,company,city:0 +#: wizard_field:base_setup.base_setup,init,city:0 +#: wizard_field:base_setup.base_setup,update,city:0 +msgid "City" +msgstr "อำเภอ" + +#. module: base_setup +#: wizard_view:base_setup.base_setup,finish:0 +msgid "" +"You can start configuring the system or connect directly to the database " +"using the default setup." +msgstr "คุณอาจจะเริ่มตั้งค่าหรือใช้ค่าพื้นฐานเบื้องต้น" + +#. module: base_setup +#: wizard_field:base_setup.base_setup,company,zip:0 +#: wizard_field:base_setup.base_setup,init,zip:0 +#: wizard_field:base_setup.base_setup,update,zip:0 +msgid "Zip code" +msgstr "รหัสไปรษณีย์" + +#. module: base_setup +#: wizard_view:base_setup.base_setup,init:0 +msgid "Select a Profile" +msgstr "เลือกแบบ" + +#. module: base_setup +#: wizard_view:base_setup.base_setup,company:0 +msgid "Report header" +msgstr "หัวรายงาน" + +#. module: base_setup +#: wizard_button:base_setup.base_setup,finish,config:0 +msgid "Start Configuration" +msgstr "เริ่มการตั้งค่า" + +#. module: base_setup +#: wizard_view:base_setup.base_setup,init:0 +msgid "" +"You'll be able to install more modules later through the Administration menu." +msgstr "คุณสามารถลงโมดูลใหม่ๆได้ในเมนูการบริหารระบบ" + +#. module: base_setup +#: wizard_view:base_setup.base_setup,init:0 +msgid "" +"A profile sets a pre-selection of modules for specific needs. These profiles " +"have been setup to help you discover the different aspects of OpenERP. This " +"is just an overview, we have 300+ available modules." +msgstr "" +"รูปแบบโมดูลเป็นเพียงการตั้งค่าแนะนำในการใช้งานเพื่อตั้งค่าได้ง่ายขึ้น " +"แต่เรามีโมดูลที่สามารถหาติดตั้งได้มากกว่า 500 โมดูล" + +#. module: base_setup +#: wizard_button:base_setup.base_setup,company,update:0 +#: wizard_button:base_setup.base_setup,init,company:0 +msgid "Next" +msgstr "ถัดไป" + +#. module: base_setup +#: wizard_field:base_setup.base_setup,company,email:0 +#: wizard_field:base_setup.base_setup,init,email:0 +#: wizard_field:base_setup.base_setup,update,email:0 +msgid "E-mail" +msgstr "อีเมล์" + +#. module: base_setup +#: wizard_field:base_setup.base_setup,company,state_id:0 +#: wizard_field:base_setup.base_setup,init,state_id:0 +#: wizard_field:base_setup.base_setup,update,state_id:0 +msgid "State" +msgstr "จังหวัด" + +#. module: base_setup +#: wizard_view:base_setup.base_setup,finish:0 +msgid "Your new database is now fully installed." +msgstr "ฐานข้อมูลใหม่ตั้งตั้งเสร็จสิ้น" + +#. module: base_setup +#: wizard_field:base_setup.base_setup,company,profile:0 +#: wizard_field:base_setup.base_setup,init,profile:0 +#: wizard_field:base_setup.base_setup,update,profile:0 +msgid "Profile" +msgstr "รูปแบบ" + +#. module: base_setup +#: wizard_field:base_setup.base_setup,company,rml_footer1:0 +#: wizard_field:base_setup.base_setup,init,rml_footer1:0 +#: wizard_field:base_setup.base_setup,update,rml_footer1:0 +msgid "Report Footer 1" +msgstr "หัวรายงาน 1" + +#. module: base_setup +#: wizard_field:base_setup.base_setup,company,rml_footer2:0 +#: wizard_field:base_setup.base_setup,init,rml_footer2:0 +#: wizard_field:base_setup.base_setup,update,rml_footer2:0 +msgid "Report Footer 2" +msgstr "ท้ายรายงาน 2" + +#. module: base_setup +#: wizard_view:base_setup.base_setup,company:0 +msgid "General Information" +msgstr "ข้อมูลทั่วไป" + +#. module: base_setup +#: wizard_field:base_setup.base_setup,company,street2:0 +#: wizard_field:base_setup.base_setup,init,street2:0 +#: wizard_field:base_setup.base_setup,update,street2:0 +msgid "Street2" +msgstr "ตำบล" + +#. module: base_setup +#: wizard_view:base_setup.base_setup,company:0 +msgid "Report Information" +msgstr "ข้อมูลรายงาน" + +#. module: base_setup +#: wizard_field:base_setup.base_setup,company,phone:0 +#: wizard_field:base_setup.base_setup,init,phone:0 +#: wizard_field:base_setup.base_setup,update,phone:0 +msgid "Phone" +msgstr "โทรศัพท์" + +#. module: base_setup +#: wizard_view:base_setup.base_setup,company:0 +msgid "Define Main Company" +msgstr "ตั้งบริษัทหลัก" + +#. module: base_setup +#: wizard_field:base_setup.base_setup,company,name:0 +#: wizard_field:base_setup.base_setup,init,name:0 +#: wizard_field:base_setup.base_setup,update,name:0 +msgid "Company Name" +msgstr "ชื่อบริษัท" + +#. module: base_setup +#: help:base_setup.base_setup,company,rml_footer2:0 +#: help:base_setup.base_setup,init,rml_footer2:0 +#: help:base_setup.base_setup,update,rml_footer2:0 +msgid "" +"This sentence will appear at the bottom of your reports.\n" +"We suggest you to put bank information here:\n" +"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701" +msgstr "" +"ข้อมูลนี่จะอยู่ในท้ายกระดาษของรายงาน\n" +"เราแนะนำให้เปลี่ยนโดยใส่ข้อมูลของธนาคาร\n" +"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701" + +#. module: base_setup +#: wizard_field:base_setup.base_setup,company,country_id:0 +#: wizard_field:base_setup.base_setup,init,country_id:0 +#: wizard_field:base_setup.base_setup,update,country_id:0 +msgid "Country" +msgstr "ประเทศ" + +#. module: base_setup +#: wizard_view:base_setup.base_setup,company:0 +#: wizard_view:base_setup.base_setup,finish:0 +#: wizard_view:base_setup.base_setup,init:0 +#: wizard_view:base_setup.base_setup,update:0 +#: model:ir.actions.wizard,name:base_setup.action_wizard_setup +#: model:ir.actions.wizard,name:base_setup.wizard_base_setup +msgid "Setup" +msgstr "ตั้งค่า" + +#. module: base_setup +#: help:base_setup.base_setup,company,rml_footer1:0 +#: help:base_setup.base_setup,init,rml_footer1:0 +#: help:base_setup.base_setup,update,rml_footer1:0 +msgid "" +"This sentence will appear at the bottom of your reports.\n" +"We suggest you to write legal sentences here:\n" +"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07" +msgstr "" +"ข้อมูลนี่จะอยู่ในท้ายกระดาษของรายงาน\n" +"เราแนะนำให้ท่านนำข้อมูลเกี่ยวกับทางกฏหมาย\n" +"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07" + +#. module: base_setup +#: wizard_view:base_setup.base_setup,update:0 +msgid "Summary" +msgstr "สรุป" + +#. module: base_setup +#: wizard_button:base_setup.base_setup,update,finish:0 +msgid "Install" +msgstr "ติดตั้ง" + +#. module: base_setup +#: wizard_view:base_setup.base_setup,finish:0 +msgid "Installation Done" +msgstr "ติดตั้งเสร็จสิ้น" + +#. module: base_setup +#: help:base_setup.base_setup,company,rml_header1:0 +#: help:base_setup.base_setup,init,rml_header1:0 +#: help:base_setup.base_setup,update,rml_header1:0 +msgid "" +"This sentence will appear at the top right corner of your reports.\n" +"We suggest you to put a slogan here:\n" +"\"Open Source Business Solutions\"." +msgstr "" +"ข้อมูลนี่จะอยู่ในด้านบนขวาของรายงานท่าน\n" +"กรุณาใส่ สโลแกน\n" +"\"Open Source Business Solutions\"." + +#. module: base_setup +#: wizard_field:base_setup.base_setup,company,rml_header1:0 +#: wizard_field:base_setup.base_setup,init,rml_header1:0 +#: wizard_field:base_setup.base_setup,update,rml_header1:0 +msgid "Report Header" +msgstr "หัวรายงาน" + +#. module: base_setup +#: wizard_view:base_setup.base_setup,company:0 +msgid "Your Logo - Use a size of about 450x150 pixels." +msgstr "กรุณาใช้โลโก้ขนาด 450X150 px" + +#. module: base_setup +#: wizard_field:base_setup.base_setup,company,currency:0 +#: wizard_field:base_setup.base_setup,init,currency:0 +#: wizard_field:base_setup.base_setup,update,currency:0 +msgid "Currency" +msgstr "อัตราแลกเปลี่ยน" + +#. module: base_setup +#: wizard_field:base_setup.base_setup,company,street:0 +#: wizard_field:base_setup.base_setup,init,street:0 +#: wizard_field:base_setup.base_setup,update,street:0 +msgid "Street" +msgstr "ที่อยู่" + +#. module: base_setup +#: wizard_button:base_setup.base_setup,finish,menu:0 +msgid "Use Directly" +msgstr "ใช้ทันที" + +#. module: base_setup +#: wizard_button:base_setup.base_setup,init,menu:0 +msgid "Cancel" +msgstr "ยกเลิก" + +#. module: base_setup +#: wizard_field:base_setup.base_setup,company,logo:0 +#: wizard_field:base_setup.base_setup,init,logo:0 +#: wizard_field:base_setup.base_setup,update,logo:0 +msgid "Logo" +msgstr "โลโก้" + +#. module: base_setup +#: model:ir.module.module,shortdesc:base_setup.module_meta_information +msgid "Base Setup" +msgstr "โครงสร้าง ตั้งค่า" + +#. module: base_setup +#: wizard_button:base_setup.base_setup,company,init:0 +#: wizard_button:base_setup.base_setup,update,company:0 +msgid "Previous" +msgstr "ก่อนหน้า" diff --git a/addons/board_association/i18n/lt.po b/addons/board_association/i18n/lt.po index cf53291f10b..581b5bc4c83 100644 --- a/addons/board_association/i18n/lt.po +++ b/addons/board_association/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-08 15:20+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-05-19 09:15+0000\n" +"Last-Translator: Rytis Ūsalis \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n" +"X-Launchpad-Export-Date: 2010-05-20 05:23+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: board_association @@ -40,7 +40,7 @@ msgstr "" #. module: board_association #: view:board.board:0 msgid "My tasks" -msgstr "" +msgstr "Mano užduotys" #. module: board_association #: view:board.board:0 diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 96bc0b269d7..a9e8d1c000f 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -32,7 +32,7 @@ class crm_lead(osv.osv, crm_case): """ CRM Lead Case """ _name = "crm.lead" - _description = "Leads Cases" + _description = "Lead" _order = "priority, id desc" _inherit = ['res.partner.address'] _inherits = {'mailgate.thread': 'thread_id'} diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml index 4fef09d28df..aad27f9eb14 100644 --- a/addons/crm/crm_lead_menu.xml +++ b/addons/crm/crm_lead_menu.xml @@ -8,6 +8,7 @@ tree,form ['|', ('type','=','lead'), ('type','=',False)] + {"search_default_user_id":uid,'search_default_current':1} {'search_default_current':1, 'default_type': 'lead'} diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index d0e51b9ed05..9c24e306154 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -102,18 +102,18 @@ -