pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Merge] Merge with main addons.

Browse Source 
bzr revid: mdi@tinyerp.com-20120803043434-566tws7pa0l7xhn3
This commit is contained in:
Divyesh Makwana (Open ERP)
2012-08-03 10:04:34 +05:30
parent e827996af0 5ee6c09b31
commit 3fa76729b0
34 changed files with 1417 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/i18n/es_EC.po
+2 -2
View File
@@ -16,8 +16,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-07-31 04:58+0000\n"
"X-Generator: Launchpad (build 15702)\n"
"X-Launchpad-Export-Date: 2012-08-01 04:43+0000\n"
"X-Generator: Launchpad (build 15719)\n"
#. module: account
#: view:account.invoice.report:0
addons/account_anglo_saxon/__openerp__.py
+1 -1
View File
@@ -22,7 +22,7 @@
"name": "Anglo-Saxon Accounting",
"version": "1.2",
"author": "OpenERP SA, Veritos",
"website": "http://tinyerp.com - http://veritos.nl",
"website": "http://openerp.com - http://veritos.nl",
"description": """
This module supports the Anglo-Saxon accounting methodology by changing the accounting logic with stock transactions.
=====================================================================================================================
addons/account_asset/i18n/es_EC.po
+2 -2
View File
@@ -14,8 +14,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-07-31 04:58+0000\n"
"X-Generator: Launchpad (build 15702)\n"
"X-Launchpad-Export-Date: 2012-08-01 04:44+0000\n"
"X-Generator: Launchpad (build 15719)\n"
#. module: account_asset
#: view:account.asset.asset:0
addons/account_check_writing/i18n/sv.po
+199
View File
@@ -0,0 +1,199 @@
# Swedish 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 <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-08-01 23:35+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Swedish <sv@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-08-02 04:46+0000\n"
"X-Generator: Launchpad (build 15719)\n"
#. module: account_check_writing
#: selection:res.company,check_layout:0
msgid "Check on Top"
msgstr ""
#. module: account_check_writing
#: model:ir.actions.act_window,help:account_check_writing.action_write_check
msgid ""
"The check payment form allows you to track the payment you do to your "
"suppliers specially by check. When you select a supplier, the payment method "
"and an amount for the payment, OpenERP will propose to reconcile your "
"payment with the open supplier invoices or bills.You can print the check"
msgstr ""
#. module: account_check_writing
#: view:account.voucher:0
#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
msgid "Print Check"
msgstr "Skriv ut check"
#. module: account_check_writing
#: selection:res.company,check_layout:0
msgid "Check in middle"
msgstr ""
#. module: account_check_writing
#: help:res.company,check_layout:0
msgid ""
"Check on top is compatible with Quicken, QuickBooks and Microsoft Money. "
"Check in middle is compatible with Peachtree, ACCPAC and DacEasy. Check on "
"bottom is compatible with Peachtree, ACCPAC and DacEasy only"
msgstr ""
#. module: account_check_writing
#: selection:res.company,check_layout:0
msgid "Check on bottom"
msgstr ""
#. module: account_check_writing
#: constraint:res.company:0
msgid "Error! You can not create recursive companies."
msgstr "Fel! Du kan inte skapa rekursiva företag."
#. module: account_check_writing
#: help:account.journal,allow_check_writing:0
msgid "Check this if the journal is to be used for writing checks."
msgstr ""
#. module: account_check_writing
#: field:account.journal,allow_check_writing:0
msgid "Allow Check writing"
msgstr ""
#. module: account_check_writing
#: report:account.print.check.bottom:0
#: report:account.print.check.middle:0
#: report:account.print.check.top:0
msgid "Description"
msgstr "Beskrivning"
#. module: account_check_writing
#: model:ir.model,name:account_check_writing.model_account_journal
msgid "Journal"
msgstr "Journal"
#. module: account_check_writing
#: model:ir.actions.act_window,name:account_check_writing.action_write_check
#: model:ir.ui.menu,name:account_check_writing.menu_action_write_check
msgid "Write Checks"
msgstr ""
#. module: account_check_writing
#: report:account.print.check.bottom:0
#: report:account.print.check.middle:0
#: report:account.print.check.top:0
msgid "Discount"
msgstr "Rabatt"
#. module: account_check_writing
#: report:account.print.check.bottom:0
#: report:account.print.check.middle:0
#: report:account.print.check.top:0
msgid "Original Amount"
msgstr "Ursprungligt belopp"
#. module: account_check_writing
#: view:res.company:0
msgid "Configuration"
msgstr ""
#. module: account_check_writing
#: field:account.voucher,allow_check:0
msgid "Allow Check Writing"
msgstr ""
#. module: account_check_writing
#: report:account.print.check.bottom:0
#: report:account.print.check.middle:0
#: report:account.print.check.top:0
msgid "Payment"
msgstr "Betalning"
#. module: account_check_writing
#: field:account.journal,use_preprint_check:0
msgid "Use Preprinted Check"
msgstr ""
#. module: account_check_writing
#: sql_constraint:res.company:0
msgid "The company name must be unique !"
msgstr ""
#. module: account_check_writing
#: report:account.print.check.bottom:0
#: report:account.print.check.middle:0
#: report:account.print.check.top:0
msgid "Due Date"
msgstr ""
#. module: account_check_writing
#: model:ir.model,name:account_check_writing.model_res_company
msgid "Companies"
msgstr "Företag"
#. module: account_check_writing
#: view:res.company:0
msgid "Default Check Layout"
msgstr ""
#. module: account_check_writing
#: constraint:account.journal:0
msgid ""
"Configuration error! The currency chosen should be shared by the default "
"accounts too."
msgstr ""
#. module: account_check_writing
#: report:account.print.check.bottom:0
#: report:account.print.check.middle:0
msgid "Balance Due"
msgstr ""
#. module: account_check_writing
#: report:account.print.check.bottom:0
#: report:account.print.check.middle:0
#: report:account.print.check.top:0
msgid "Check Amount"
msgstr ""
#. module: account_check_writing
#: model:ir.model,name:account_check_writing.model_account_voucher
msgid "Accounting Voucher"
msgstr ""
#. module: account_check_writing
#: sql_constraint:account.journal:0
msgid "The name of the journal must be unique per company !"
msgstr "Journalnamnet måste vara unikt per företag!"
#. module: account_check_writing
#: sql_constraint:account.journal:0
msgid "The code of the journal must be unique per company !"
msgstr "Journalkoden måste vara unik per företag!"
#. module: account_check_writing
#: field:account.voucher,amount_in_word:0
msgid "Amount in Word"
msgstr ""
#. module: account_check_writing
#: report:account.print.check.top:0
msgid "Open Balance"
msgstr ""
#. module: account_check_writing
#: field:res.company,check_layout:0
msgid "Choose Check layout"
msgstr ""
addons/account_voucher/__openerp__.py
+1 -1
View File
@@ -35,7 +35,7 @@ eInvoicing & Payments module manage all Voucher Entries such as "Reconciliation
""",
"category": 'Accounting & Finance',
"sequence": 4,
"website" : "http://tinyerp.com",
"website" : "http://openerp.com",
"images" : ["images/customer_payment.jpeg","images/journal_voucher.jpeg","images/sales_receipt.jpeg","images/supplier_voucher.jpeg"],
"depends" : ["account"],
"init_xml" : [
addons/analytic_contract_hr_expense/__openerp__.py
-1
View File
@@ -40,7 +40,6 @@ This module is for modifying account analytic view to show some data related to
],
'installable': True,
'auto_install': True,
'certificate': '',
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/anonymization/i18n/sv.po
+213
View File
@@ -0,0 +1,213 @@
# Swedish 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 <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-08-02 00:12+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Swedish <sv@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-08-02 04:46+0000\n"
"X-Generator: Launchpad (build 15719)\n"
#. module: anonymization
#: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
msgid "ir.model.fields.anonymize.wizard"
msgstr ""
#. module: anonymization
#: field:ir.model.fields.anonymization,field_name:0
msgid "Field Name"
msgstr "Fältnamn"
#. module: anonymization
#: field:ir.model.fields.anonymization,field_id:0
msgid "Field"
msgstr "Fält"
#. module: anonymization
#: field:ir.model.fields.anonymization.history,state:0
#: field:ir.model.fields.anonymize.wizard,state:0
msgid "State"
msgstr ""
#. module: anonymization
#: field:ir.model.fields.anonymize.wizard,file_import:0
msgid "Import"
msgstr "Import"
#. module: anonymization
#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization
msgid "ir.model.fields.anonymization"
msgstr ""
#. module: anonymization
#: field:ir.model.fields.anonymization.history,direction:0
msgid "Direction"
msgstr ""
#. module: anonymization
#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_tree
#: view:ir.model.fields.anonymization:0
#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_fields
msgid "Anonymized Fields"
msgstr ""
#. module: anonymization
#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
msgid "Database anonymization"
msgstr ""
#. module: anonymization
#: selection:ir.model.fields.anonymization.history,direction:0
msgid "clear -> anonymized"
msgstr ""
#. module: anonymization
#: selection:ir.model.fields.anonymization,state:0
#: selection:ir.model.fields.anonymize.wizard,state:0
msgid "Anonymized"
msgstr ""
#. module: anonymization
#: field:ir.model.fields.anonymization,state:0
msgid "unknown"
msgstr "okänd"
#. module: anonymization
#: field:ir.model.fields.anonymization,model_id:0
msgid "Object"
msgstr "Object"
#. module: anonymization
#: field:ir.model.fields.anonymization.history,filepath:0
msgid "File path"
msgstr "Sökväg"
#. module: anonymization
#: field:ir.model.fields.anonymization.history,date:0
msgid "Date"
msgstr "Datum"
#. module: anonymization
#: field:ir.model.fields.anonymize.wizard,file_export:0
msgid "Export"
msgstr "Export"
#. module: anonymization
#: view:ir.model.fields.anonymize.wizard:0
msgid "Reverse the Database Anonymization"
msgstr ""
#. module: anonymization
#: view:ir.model.fields.anonymize.wizard:0
msgid "Database Anonymization"
msgstr ""
#. module: anonymization
#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
msgid "Anonymize database"
msgstr ""
#. module: anonymization
#: view:ir.model.fields.anonymization.history:0
#: field:ir.model.fields.anonymization.history,field_ids:0
msgid "Fields"
msgstr "Fält"
#. module: anonymization
#: selection:ir.model.fields.anonymization,state:0
#: selection:ir.model.fields.anonymize.wizard,state:0
msgid "Clear"
msgstr "Rensa"
#. module: anonymization
#: view:ir.model.fields.anonymize.wizard:0
#: field:ir.model.fields.anonymize.wizard,summary:0
msgid "Summary"
msgstr ""
#. module: anonymization
#: view:ir.model.fields.anonymization:0
msgid "Anonymized Field"
msgstr ""
#. module: anonymization
#: selection:ir.model.fields.anonymize.wizard,state:0
msgid "Unstable"
msgstr ""
#. module: anonymization
#: selection:ir.model.fields.anonymization.history,state:0
msgid "Exception occured"
msgstr ""
#. module: anonymization
#: selection:ir.model.fields.anonymization,state:0
#: selection:ir.model.fields.anonymize.wizard,state:0
msgid "Not Existing"
msgstr ""
#. module: anonymization
#: field:ir.model.fields.anonymization,model_name:0
msgid "Object Name"
msgstr "Objektnamn"
#. module: anonymization
#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_history_tree
#: view:ir.model.fields.anonymization.history:0
#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_history
msgid "Anonymization History"
msgstr ""
#. module: anonymization
#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
msgid "ir.model.fields.anonymization.history"
msgstr ""
#. module: anonymization
#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
#: view:ir.model.fields.anonymize.wizard:0
msgid "Anonymize Database"
msgstr ""
#. module: anonymization
#: field:ir.model.fields.anonymize.wizard,name:0
msgid "File Name"
msgstr "Filnamn"
#. module: anonymization
#: selection:ir.model.fields.anonymization.history,direction:0
msgid "anonymized -> clear"
msgstr ""
#. module: anonymization
#: selection:ir.model.fields.anonymization.history,state:0
msgid "Started"
msgstr "Påbörjad"
#. module: anonymization
#: selection:ir.model.fields.anonymization.history,state:0
msgid "Done"
msgstr "Färdig"
#. module: anonymization
#: view:ir.model.fields.anonymization.history:0
#: field:ir.model.fields.anonymization.history,msg:0
#: field:ir.model.fields.anonymize.wizard,msg:0
msgid "Message"
msgstr "Meddelande"
#. module: anonymization
#: code:addons/anonymization/anonymization.py:55
#: sql_constraint:ir.model.fields.anonymization:0
#, python-format
msgid "You cannot have two fields with the same name on the same object!"
msgstr ""
addons/crm/res_partner.py
+8
View File
@@ -46,6 +46,14 @@ class res_partner(osv.osv):
'meeting_count': fields.function(_opportunity_meeting_count, string="Meeting", type='integer', multi='opp_meet'),
}
def copy(self, cr, uid, record_id, default=None, context=None):
if default is None:
default = {}
default.update({'opportunity_ids': [], 'meeting_ids' : [], 'phonecall_ids' : []})
super(res_partner, self).copy(cr, uid, record_id, default, context)
def redirect_partner_form(self, cr, uid, partner_id, context=None):
search_view = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'view_res_partner_filter')
value = {
addons/document_ftp/ftpserver/ftpserver.py
+1 -1
View File
@@ -5,7 +5,7 @@
# pyftpdlib is released under the MIT license, reproduced below:
# ======================================================================
# Copyright (C) 2007 Giampaolo Rodola' <g.rodola@gmail.com>
# Hacked by Fabien Pinckaers (C) 2008 <fp@tinyerp.com>
# Hacked by Fabien Pinckaers (C) 2008 <fp@openerp.com>
#
# All Rights Reserved
#
addons/event/report/report_event_registration.py
-1
View File
@@ -27,7 +27,6 @@ class report_event_registration(osv.osv):
_name = "report.event.registration"
_description = "Events Analysis"
_auto = False
_rec_name = 'date'
_columns = {
'event_date': fields.char('Event Start Date', size=64, readonly=True),
'year': fields.char('Year', size=4, readonly=True),
addons/fetchmail/__init__.py
+1 -1
View File
@@ -3,7 +3,7 @@
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# mga@tinyerp.com
# mga@openerp.com
#
# 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
addons/fetchmail/__openerp__.py
+1 -1
View File
@@ -3,7 +3,7 @@
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# mga@tinyerp.com
# mga@openerp.com
#
# 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
addons/hr_evaluation/report/hr_evaluation_report.py
-1
View File
@@ -26,7 +26,6 @@ class hr_evaluation_report(osv.osv):
_name = "hr.evaluation.report"
_description = "Evaluations Statistics"
_auto = False
_rec_name = 'date'
_columns = {
'create_date': fields.date('Create Date', readonly=True),
'delay_date':fields.float('Delay to Start', digits=(16,2),readonly=True),
addons/hr_payroll/hr_payroll_view.xml
+2 -3
View File
@@ -659,11 +659,10 @@
<act_window name="All Children Rules"
domain="[('id', 'in', [active_id])]"
domain="[('parent_rule_id', '=', active_id)]"
res_model="hr.salary.rule"
src_model="hr.salary.rule"
view_id="hr_salary_rule_tree"
view_type="tree"
view_id="hr_salary_rule_list"
id="act_children_salary_rules"/>
<!-- payslip runs -->
addons/hr_payroll/i18n/he.po
+2 -2
View File
@@ -14,8 +14,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-07-31 04:58+0000\n"
"X-Generator: Launchpad (build 15702)\n"
"X-Launchpad-Export-Date: 2012-08-01 04:44+0000\n"
"X-Generator: Launchpad (build 15719)\n"
#. module: hr_payroll
#: field:hr.payslip.line,condition_select:0
addons/import_base/i18n/pt_BR.po
+105
View File
@@ -0,0 +1,105 @@
# Brazilian Portuguese 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 <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2012-08-01 01:59+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-08-02 04:46+0000\n"
"X-Generator: Launchpad (build 15719)\n"
#. module: import_base
#: code:addons/import_base/import_framework.py:434
#, python-format
msgid "Import failed due to an unexpected error"
msgstr "A importação falhou devido a um erro inesperado"
#. module: import_base
#: code:addons/import_base/import_framework.py:461
#, python-format
msgid "started at %s and finished at %s \n"
msgstr "Início em %s e término em %s \n"
#. module: import_base
#: code:addons/import_base/import_framework.py:448
#, python-format
msgid "Import of your data finished at %s"
msgstr "A Importação de seus dados terminou em %s"
#. module: import_base
#: code:addons/import_base/import_framework.py:463
#, python-format
msgid ""
"but failed, in consequence no data were imported to keep database "
"consistency \n"
" error : \n"
msgstr ""
"mas falhou, por isso nenhum dado foi importado para manter a consistência do "
"banco de dados \n"
" erro: \n"
#. module: import_base
#: code:addons/import_base/import_framework.py:477
#, python-format
msgid ""
"The import of data \n"
" instance name : %s \n"
msgstr ""
"A importação de dados \n"
" nome da instância: %s \n"
#. module: import_base
#: code:addons/import_base/import_framework.py:470
#, python-format
msgid "%s has been successfully imported from %s %s, %s \n"
msgstr "%s foi importada com sucesso de %s %s, %s \n"
#. module: import_base
#: code:addons/import_base/import_framework.py:447
#, python-format
msgid "Data Import failed at %s due to an unexpected error"
msgstr "A importação falhou em %s devido a um erro inesperado"
#. module: import_base
#: code:addons/import_base/import_framework.py:436
#, python-format
msgid "Import finished, notification email sended"
msgstr "Importação Concluída, o email de notificação foi enviado"
#. module: import_base
#: code:addons/import_base/import_framework.py:190
#, python-format
msgid "%s is not a valid model name"
msgstr "%s não é um nome de modelo válido"
#. module: import_base
#: model:ir.ui.menu,name:import_base.menu_import_crm
msgid "Import"
msgstr "Importar"
#. module: import_base
#: code:addons/import_base/import_framework.py:467
#, python-format
msgid "with no warning"
msgstr "sem nenhum erro"
#. module: import_base
#: code:addons/import_base/import_framework.py:469
#, python-format
msgid "with warning : %s"
msgstr "com avisos: %s"
#. module: import_base
#: code:addons/import_base/import_framework.py:191
#, python-format
msgid " fields imported : "
msgstr " campos importados: "
addons/l10n_ar/__openerp__.py
-1
View File
@@ -45,7 +45,6 @@ Plan contable argentino e impuestos de acuerdo a disposiciones vigentes
],
"active": False,
"installable": True,
"certificate" : "",
'images': ['images/config_chart_l10n_ar.jpeg','images/l10n_ar_chart.jpeg'],
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/l10n_ch/__openerp__.py
+1 -1
View File
@@ -36,7 +36,7 @@ You can also add ZIP and bank completion with:
------------------------------------------------------------------------
Module incluant la localisation Suisse de TinyERP revu et corrigé par Camptocamp.
Module incluant la localisation Suisse de OpenERP revu et corrigé par Camptocamp.
Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement
électronique via DTA (pour les banques, le système postal est en développement)
et l'import du relevé de compte depuis la banque de manière automatisée. De plus,
addons/l10n_cl/__openerp__.py
-1
View File
@@ -45,7 +45,6 @@ Plan contable chileno e impuestos de acuerdo a disposiciones vigentes
],
"active": False,
"installable": True,
"certificate" : "",
'images': ['images/config_chart_l10n_cl.jpeg','images/l10n_cl_chart.jpeg'],
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/mail/static/src/js/mail.js
+2 -1
View File
@@ -373,7 +373,8 @@ openerp.mail = function(session) {
action_buttons: false,
pager: false,
initial_mode: 'edit',
});
disable_autofocus: true,
});
// add the form, bind events, activate the form
var msg_node = this.$element.find('div.oe_mail_msg_content');
return $.when(this.form_view.appendTo(msg_node)).pipe(function() {
addons/marketing_campaign/marketing_campaign_demo.xml
+3 -3
View File
@@ -4,7 +4,7 @@
<!-- Email tempalte -->
<record id="email_template_1" model="email.template">
<field name="name">Template for New Partner</field>
<field name="email_from">info@tinyerp.com</field>
<field name="email_from">info@openerp.com</field>
<field name="subject">Welcome in OpenERP Partner Channel!</field>
<field name="email_to">${object.email or ''}</field>
<field name="model_id" ref="base.model_res_partner"/>
@@ -12,7 +12,7 @@
</record>
<record id="email_template_2" model="email.template">
<field name="name">Template for Silver Partner</field>
<field name="email_from">info@tinyerp.com</field>
<field name="email_from">info@openerp.com</field>
<field name="subject">Congratulation! You become now our Silver Partner.</field>
<field name="email_to">${object.email or ''}</field>
<field name="model_id" ref="base.model_res_partner"/>
@@ -21,7 +21,7 @@
<record id="email_template_3" model="email.template">
<field name="name">Template for Gold Partner</field>
<field name="email_from">info@tinyerp.com</field>
<field name="email_from">info@openerp.com</field>
<field name="subject">Congratulation! You become our Gold Partner.</field>
<field name="email_to">${object.email or ''}</field>
<field name="model_id" ref="base.model_res_partner"/>
addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
+8 -8
View File
@@ -35,7 +35,7 @@
<!-- Email tempalte -->
<record id="email_template_1" model="email.template">
<field name="subject">Thanks for showing interest in OpenERP</field>
<field name="email_to">info@tinyerp.com</field>
<field name="email_to">info@openerp.com</field>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
<field name="model_id" ref="crm.model_crm_lead"/>
@@ -45,7 +45,7 @@
</record>
<record id="email_template_2" model="email.template">
<field name="subject">Propose to subscribe to the OpenERP Discovery Day on May 2010</field>
<field name="email_to">info@tinyerp.com</field>
<field name="email_to">info@openerp.com</field>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
<field name="model_id" ref="crm.model_crm_lead"/>
@@ -60,7 +60,7 @@
<record id="email_template_3" model="email.template">
<field name="subject">Thanks for subscribing to the OpenERP Discovery Day</field>
<field name="email_to">info@tinyerp.com</field>
<field name="email_to">info@openerp.com</field>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
<field name="model_id" ref="crm.model_crm_lead"/>
@@ -74,7 +74,7 @@
<record id="email_template_4" model="email.template">
<field name="subject">Thanks for buying the OpenERP book</field>
<field name="email_to">info@tinyerp.com</field>
<field name="email_to">info@openerp.com</field>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
<field name="model_id" ref="crm.model_crm_lead"/>
@@ -88,7 +88,7 @@
<record id="email_template_5" model="email.template">
<field name="subject">Propose a free technical training to Gold partners</field>
<field name="email_to">info@tinyerp.com</field>
<field name="email_to">info@openerp.com</field>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
<field eval="0" name="user_signature"/>
@@ -102,7 +102,7 @@
<record id="email_template_6" model="email.template">
<field name="subject">Propose paid training to Silver partners</field>
<field name="email_to">info@tinyerp.com</field>
<field name="email_to">info@openerp.com</field>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
<field name="model_id" ref="crm.model_crm_lead"/>
@@ -117,7 +117,7 @@
<record id="email_template_7" model="email.template">
<field name="subject">Propose gold partnership to silver partners</field>
<field name="email_to">info@tinyerp.com</field>
<field name="email_to">info@openerp.com</field>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
<field name="model_id" ref="crm.model_crm_lead"/>
@@ -132,7 +132,7 @@
<record id="email_template_8" model="email.template">
<field name="subject">Thanks for subscribing to technical training</field>
<field name="email_to">info@tinyerp.com</field>
<field name="email_to">info@openerp.com</field>
<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
<field name="model_id" ref="crm.model_crm_lead"/>
addons/mrp_repair/i18n/mn.po
+819
View File
@@ -0,0 +1,819 @@
# Mongolian 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 <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2012-07-31 11:41+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Mongolian <mn@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-08-01 04:44+0000\n"
"X-Generator: Launchpad (build 15719)\n"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Fees Line"
msgstr "Ажлын хөлсний мөр"
#. module: mrp_repair
#: help:mrp.repair,state:0
msgid ""
" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
"repair order. \n"
"* The 'Confirmed' state is used when a user confirms the repair order. "
" \n"
"* The 'Ready to Repair' state is used to start to repairing, user can start "
"repairing only after repair order is confirmed. \n"
"* The 'To be Invoiced' state is used to generate the invoice before or after "
"repairing done. \n"
"* The 'Done' state is set when repairing is completed. \n"
"* The 'Cancelled' state is used when user cancel repair order."
msgstr ""
" * Засварын захиалгыг шинээр оруулж батлаагүй байх үед 'Ноорог' төлөвтэй "
"байдаг. \n"
"* Хэрэглэгч засварын захиалгыг батлахад төлөв 'Батлагдсан' болдог.\n"
"* Засах ажлыг эхлүүлснээр 'Засахад бэлэн' төлөвтэй болдог. Хэрэглэгч зөвхөн "
"засварын захиалга батлагдсан дараа эхлүүлэх боломжтой. \n"
"* Засварын өмнө эсвэл хойно нэхэмжлэхээс хамааран 'Нэхэмжлэх' гэсэн төлөв "
"хэрэглэгддэг. \n"
"* Засвар дууссан дараа 'Хийгдсэн' төлөвтэй болдог. \n"
"* Засварын захиалга цуцлагдсан тохиолдолд 'Цуцлагдсан' төлөвтэй болдог."
#. module: mrp_repair
#: field:mrp.repair.line,move_id:0
msgid "Inventory Move"
msgstr "Барааны хөдөлгөөн"
#. module: mrp_repair
#: model:ir.actions.act_window,help:mrp_repair.action_repair_order_tree
msgid ""
"Repair orders allow you to organize your product repairs. In a repair order, "
"you can detail the components you remove, add or replace and record the time "
"you spent on the different operations. The repair order uses the warranty "
"date on the production lot in order to know if whether the repair should be "
"invoiced to the customer or not."
msgstr ""
"Засварын захиалга нь барааны засварыг зохион байгуулах боломжийг олгодог. "
"Засварын захиалгад хасах, нэмэх, солих бүрэлдхүүнийг хөтлөх, мөн ажиллагааг "
"хийхэд зарцуулсан цагийг хөтлөх боломжтой. Засварын захиалга нь "
"үйлдвэрлэлийн цувралын баталгааны хугацааг ашиглан захиалагчийг нэхэмжлэх "
"эсэхиээ шийддэг."
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Group By..."
msgstr "Бүлэглэх..."
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Recreate Invoice"
msgstr "Дахин нэхэмжлэл үүсгэх"
#. module: mrp_repair
#: help:mrp.repair,deliver_bool:0
msgid ""
"Check this box if you want to manage the delivery once the product is "
"repaired. If cheked, it will create a picking with selected product. Note "
"that you can select the locations in the Info tab, if you have the extended "
"view."
msgstr ""
"Бараа засагдсан дараа хүргэлтийг менеж хийхээр бол үүнийг тэмдэглэнэ. Хэрэв "
"тэмдгэлэгдсэн бол сонгосон барааны бэлтгэлт үүсгэгдэнэ."
#. module: mrp_repair
#: model:ir.actions.act_window,name:mrp_repair.action_cancel_repair
#: view:mrp.repair.cancel:0
msgid "Cancel Repair Order"
msgstr "Засварын захиалгыг цуцлах"
#. module: mrp_repair
#: field:mrp.repair.fee,to_invoice:0
#: field:mrp.repair.line,to_invoice:0
msgid "To Invoice"
msgstr "Нэхэмжлэх"
#. module: mrp_repair
#: report:repair.order:0
msgid "Printing Date"
msgstr "Хэвлэх огноо"
#. module: mrp_repair
#: field:mrp.repair.make_invoice,group:0
msgid "Group by partner invoice address"
msgstr "Захиалагчийн нэхэмжлэх хаягаар бүлэглэх"
#. module: mrp_repair
#: code:addons/mrp_repair/mrp_repair.py:435
#, python-format
msgid "No product defined on Fees!"
msgstr "Ажлын хөлс дээр бараа тодорхойлогдоогүй байна!"
#. module: mrp_repair
#: view:mrp.repair:0
#: field:mrp.repair,company_id:0
msgid "Company"
msgstr "Компани"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Set to Draft"
msgstr "Ноороглох"
#. module: mrp_repair
#: selection:mrp.repair,state:0
msgid "Invoice Exception"
msgstr "Нэхэмжлэлийн сондгойрол"
#. module: mrp_repair
#: field:mrp.repair,address_id:0
msgid "Delivery Address"
msgstr "Хургэх Хаяг"
#. module: mrp_repair
#: model:ir.actions.act_window,name:mrp_repair.act_mrp_repair_invoice
#: model:ir.model,name:mrp_repair.model_mrp_repair_make_invoice
#: view:mrp.repair:0
msgid "Make Invoice"
msgstr "Нэхэмжлэл үүсгэх"
#. module: mrp_repair
#: field:mrp.repair.fee,price_subtotal:0
#: field:mrp.repair.line,price_subtotal:0
msgid "Subtotal"
msgstr "Дэд дүн"
#. module: mrp_repair
#: report:repair.order:0
msgid "Invoice address :"
msgstr "Нэхэмжлэх хаяг :"
#. module: mrp_repair
#: view:mrp.repair:0
#: field:mrp.repair,guarantee_limit:0
msgid "Guarantee limit"
msgstr "Баталгааны хязгаар"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Notes"
msgstr "Тэмдэглэл"
#. module: mrp_repair
#: view:mrp.repair:0
#: field:mrp.repair,amount_tax:0
#: field:mrp.repair.fee,tax_id:0
#: field:mrp.repair.line,tax_id:0
msgid "Taxes"
msgstr "Татвар"
#. module: mrp_repair
#: report:repair.order:0
msgid "Net Total :"
msgstr "Цэвэр дүн :"
#. module: mrp_repair
#: code:addons/mrp_repair/mrp_repair.py:435
#, python-format
msgid "Warning !"
msgstr "Анхааруулга !"
#. module: mrp_repair
#: report:repair.order:0
msgid "Tax"
msgstr ""
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Operations"
msgstr "Ажиллагаанууд"
#. module: mrp_repair
#: field:mrp.repair,move_id:0
msgid "Move"
msgstr "Хөдөлгөөн"
#. module: mrp_repair
#: code:addons/mrp_repair/mrp_repair.py:370
#, python-format
msgid "You have to select a Partner Invoice Address in the repair form !"
msgstr "Засварын маягтад харилцагчийн нэхэмжлэх хаягийг сонгох хэрэгтэй !"
#. module: mrp_repair
#: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
#: model:ir.ui.menu,name:mrp_repair.menu_repair_order
msgid "Repair Orders"
msgstr "Засварын захиалгууд"
#. module: mrp_repair
#: model:ir.actions.report.xml,name:mrp_repair.report_mrp_repair
msgid "Quotation / Order"
msgstr "Үнийн санал / Захиалга"
#. module: mrp_repair
#: code:addons/mrp_repair/mrp_repair.py:337
#, python-format
msgid "Warning"
msgstr "Анхааруулга"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Extra Info"
msgstr "Нэмэлт мэдээлэл"
#. module: mrp_repair
#: field:mrp.repair.fee,repair_id:0
#: field:mrp.repair.line,repair_id:0
msgid "Repair Order Reference"
msgstr "Засварын Захиалгын Код"
#. module: mrp_repair
#: selection:mrp.repair.line,state:0
msgid "Draft"
msgstr "Ноорог"
#. module: mrp_repair
#: code:addons/mrp_repair/mrp_repair.py:384
#, python-format
msgid "No account defined for partner \"%s\"."
msgstr "\"%s\" харилцагчид данс тодорхойлогдоогүй байна."
#. module: mrp_repair
#: view:mrp.repair:0
#: selection:mrp.repair,state:0
#: selection:mrp.repair.line,state:0
msgid "Confirmed"
msgstr "Батлагдсан"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Repairs order"
msgstr "Засварын захиалга"
#. module: mrp_repair
#: report:repair.order:0
msgid "Repair Order N° :"
msgstr "Засварын Захиалга № :"
#. module: mrp_repair
#: field:mrp.repair,prodlot_id:0
#: field:mrp.repair.line,prodlot_id:0
#: report:repair.order:0
msgid "Lot Number"
msgstr "Цувралын Дугаар"
#. module: mrp_repair
#: field:mrp.repair,fees_lines:0
msgid "Fees Lines"
msgstr "Ажлын хөлсний мөрүүд"
#. module: mrp_repair
#: field:mrp.repair.line,type:0
msgid "Type"
msgstr "Төрөл"
#. module: mrp_repair
#: report:repair.order:0
msgid "Fees Line(s)"
msgstr "Ажлын хөлсний мөрүүд"
#. module: mrp_repair
#: selection:mrp.repair,state:0
msgid "To be Invoiced"
msgstr "Нэхэмжлэх"
#. module: mrp_repair
#: report:repair.order:0
msgid "Shipping address :"
msgstr "Хүргэх хаяг :"
#. module: mrp_repair
#: code:addons/mrp_repair/mrp_repair.py:334
#: code:addons/mrp_repair/mrp_repair.py:384
#: code:addons/mrp_repair/mrp_repair.py:413
#: code:addons/mrp_repair/mrp_repair.py:442
#, python-format
msgid "Error !"
msgstr "Алдаа !"
#. module: mrp_repair
#: field:mrp.repair.line,product_uom_qty:0
msgid "Quantity (UoM)"
msgstr "Тоо хэмжээ (х.н)"
#. module: mrp_repair
#: help:mrp.repair.line,state:0
msgid ""
" * The 'Draft' state is set automatically as draft when repair order in "
"draft state. \n"
"* The 'Confirmed' state is set automatically as confirm when repair order in "
"confirm state. \n"
"* The 'Done' state is set automatically when repair order is completed. "
" \n"
"* The 'Cancelled' state is set automatically when user cancel repair order."
msgstr ""
" * Засварын захиалгын 'Ноорог' төлөв автоматаар олгогддог. "
" \n"
"* Засварын захиалга батлагдахад төлөв 'Батлагдсан' болдог. "
" \n"
"* Засварын захиалга дуусахад 'Хийгдсэн' төлөвтэй болдог. "
" \n"
"* Хэрэглэгч засварын захиалгыг цуцлахад 'Цуцлагдсан' төлөвтэй болдог."
#. module: mrp_repair
#: report:repair.order:0
msgid "Total :"
msgstr "Нийт :"
#. module: mrp_repair
#: view:mrp.repair.cancel:0
msgid ""
"This operation will cancel the Repair process, but will not cancel it's "
"Invoice. Do you want to continue?"
msgstr ""
"Энэ үйлдэл нь засварын захиалгыг цуцлах боловч үүний нэхэмжлэлийг нь "
"цуцлахгүй. Та үргэлжлүүлэхийг хүсч байна уу?"
#. module: mrp_repair
#: field:mrp.repair,pricelist_id:0
msgid "Pricelist"
msgstr "Үнийн жагсаалт"
#. module: mrp_repair
#: view:mrp.repair:0
#: field:mrp.repair,quotation_notes:0
msgid "Quotation Notes"
msgstr "Үнийн саналын тэмдэглэл"
#. module: mrp_repair
#: code:addons/mrp_repair/wizard/cancel_repair.py:49
#, python-format
msgid "Warning!"
msgstr "Анхааруулга!"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Search Reair Orders"
msgstr "Засварын захиалгыг хайх"
#. module: mrp_repair
#: report:repair.order:0
msgid "(Add)"
msgstr "(Нэмэх)"
#. module: mrp_repair
#: model:ir.model,name:mrp_repair.model_mrp_repair_line
#: view:mrp.repair:0
msgid "Repair Line"
msgstr "Засварын мөр"
#. module: mrp_repair
#: view:mrp.repair:0
#: field:mrp.repair,partner_id:0
msgid "Partner"
msgstr "Харилцагч"
#. module: mrp_repair
#: field:mrp.repair,invoice_method:0
msgid "Invoice Method"
msgstr "Нэхэмжлэх арга"
#. module: mrp_repair
#: field:mrp.repair,repaired:0
msgid "Repaired"
msgstr "Засагдсан"
#. module: mrp_repair
#: field:mrp.repair.fee,invoice_line_id:0
#: field:mrp.repair.line,invoice_line_id:0
msgid "Invoice Line"
msgstr "Нэхэмжлэлийн мөр"
#. module: mrp_repair
#: selection:mrp.repair.line,state:0
msgid "Canceled"
msgstr "Цуцлагдсан"
#. module: mrp_repair
#: code:addons/mrp_repair/mrp_repair.py:337
#, python-format
msgid "Production lot is required for opration line with product '%s'"
msgstr "'%s' бараатай ажиллагааны үйлдвэрлэлийн цуврал шаардлагатай"
#. module: mrp_repair
#: selection:mrp.repair,invoice_method:0
msgid "Before Repair"
msgstr "Засварын өмнө"
#. module: mrp_repair
#: field:mrp.repair,location_id:0
msgid "Current Location"
msgstr "Одоогийн байрлал"
#. module: mrp_repair
#: view:mrp.repair.cancel:0
msgid "Yes"
msgstr "Тийм"
#. module: mrp_repair
#: field:mrp.repair,invoiced:0
#: field:mrp.repair.fee,invoiced:0
#: field:mrp.repair.line,invoiced:0
msgid "Invoiced"
msgstr "Нэхэмжилсэн"
#. module: mrp_repair
#: view:mrp.repair.cancel:0
msgid "No"
msgstr "Үгүй"
#. module: mrp_repair
#: view:mrp.repair.make_invoice:0
msgid "Create invoices"
msgstr "Нэхэмжлэлүүд үүсгэх"
#. module: mrp_repair
#: report:repair.order:0
msgid "(Remove)"
msgstr "(Устгах)"
#. module: mrp_repair
#: selection:mrp.repair.line,type:0
msgid "Add"
msgstr "Нэмэх"
#. module: mrp_repair
#: view:mrp.repair.make_invoice:0
msgid "Do you really want to create the invoice(s)?"
msgstr ""
#. module: mrp_repair
#: field:mrp.repair,name:0
msgid "Repair Reference"
msgstr "Засварын Код"
#. module: mrp_repair
#: model:ir.model,name:mrp_repair.model_mrp_repair
msgid "Repair Order"
msgstr "Засварын Захиалга"
#. module: mrp_repair
#: selection:mrp.repair,state:0
msgid "Under Repair"
msgstr "Засагдаж буй"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Ready To Repair"
msgstr "Засахад Бэлэн"
#. module: mrp_repair
#: field:mrp.repair,amount_untaxed:0
msgid "Untaxed Amount"
msgstr "Татвар татахгүй дүн"
#. module: mrp_repair
#: report:repair.order:0
msgid "Guarantee Limit"
msgstr "Баталгааны Хязгаар"
#. module: mrp_repair
#: field:mrp.repair,default_address_id:0
msgid "unknown"
msgstr "үл мэдэгдэх"
#. module: mrp_repair
#: field:mrp.repair,product_id:0
#: report:repair.order:0
msgid "Product to Repair"
msgstr "Засах бараа"
#. module: mrp_repair
#: report:repair.order:0
msgid "N° :"
msgstr "№ :"
#. module: mrp_repair
#: help:mrp.repair,pricelist_id:0
msgid "The pricelist comes from the selected partner, by default."
msgstr "Үнийн жасгаалт сонгосон харилцагчаас анхны утгаараа ирнэ."
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Date"
msgstr "Огноо"
#. module: mrp_repair
#: model:ir.model,name:mrp_repair.model_mrp_repair_fee
msgid "Repair Fees Line"
msgstr "Засварын Ажлын Хөлсний Мөр"
#. module: mrp_repair
#: code:addons/mrp_repair/mrp_repair.py:334
#, python-format
msgid "You cannot confirm a repair order which has no line."
msgstr "Мөр байхгүй засварын захиалгыг батлаж чадахгүй."
#. module: mrp_repair
#: selection:mrp.repair,state:0
msgid "Quotation"
msgstr "Үнийн санал"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Compute"
msgstr "Тооцоолох"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Confirm Repair"
msgstr "Засварыг Батлах"
#. module: mrp_repair
#: report:repair.order:0
msgid "Repair Quotation"
msgstr "Засварын Үнийн Санал"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "End Repair"
msgstr "Засварыг Төгсгөх"
#. module: mrp_repair
#: code:addons/mrp_repair/mrp_repair.py:413
#: code:addons/mrp_repair/mrp_repair.py:442
#, python-format
msgid "No account defined for product \"%s\"."
msgstr "\"%s\" бараанд данс тодорхойлогдоогүй байна."
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Quotations"
msgstr "Үнийн санал"
#. module: mrp_repair
#: field:mrp.repair.fee,product_uom_qty:0
#: report:repair.order:0
msgid "Quantity"
msgstr "Тоо хэмжээ"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Start Repair"
msgstr "Засварыг эхлүүлэх"
#. module: mrp_repair
#: view:mrp.repair:0
#: field:mrp.repair,state:0
#: field:mrp.repair.line,state:0
msgid "State"
msgstr "Төлөв"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Qty"
msgstr "Тоо хэмжээ"
#. module: mrp_repair
#: field:mrp.repair.fee,price_unit:0
#: field:mrp.repair.line,price_unit:0
#: report:repair.order:0
msgid "Unit Price"
msgstr "Нэгж үнэ"
#. module: mrp_repair
#: selection:mrp.repair,state:0
#: selection:mrp.repair.line,state:0
msgid "Done"
msgstr "Хийгдсэн"
#. module: mrp_repair
#: help:mrp.repair,guarantee_limit:0
msgid ""
"The guarantee limit is computed as: last move date + warranty defined on "
"selected product. If the current date is below the guarantee limit, each "
"operation and fee you will add will be set as 'not to invoiced' by default. "
"Note that you can change manually afterwards."
msgstr ""
"Баталгааны хязгаар дараах байдлаар тооцоологддог: сүүлийн хөдөлгөөний огноо "
"+ сонгосон бараанд тодорхойлогдсон баталгаа. Хэрэв одоогийн огноо нь "
"баталгааны хязгаараас бага бол бүх ажиллагаа болон ажлын хөлсүүд нь "
"'нэхэмжлэгдэхгүй' төлөвтэй болно. Гэхдээ эдгээрийг дараа нь гараараа өөрчлөх "
"боломжтой."
#. module: mrp_repair
#: field:mrp.repair,invoice_id:0
msgid "Invoice"
msgstr "Нэхэмжлэл"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Fees"
msgstr "Ажлын хөлс"
#. module: mrp_repair
#: selection:mrp.repair,state:0
#: view:mrp.repair.make_invoice:0
msgid "Cancel"
msgstr "Цуцлах"
#. module: mrp_repair
#: field:mrp.repair.line,location_dest_id:0
msgid "Dest. Location"
msgstr "Хүрэх байршил"
#. module: mrp_repair
#: report:repair.order:0
msgid "Operation Line(s)"
msgstr "Ажиллагааны Мөрүүд"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "History"
msgstr "Түүх"
#. module: mrp_repair
#: field:mrp.repair,location_dest_id:0
msgid "Delivery Location"
msgstr "Хүргэх Байрлал"
#. module: mrp_repair
#: help:mrp.repair,invoice_method:0
msgid ""
"This field allow you to change the workflow of the repair order. If value "
"selected is different from 'No Invoice', it also allow you to select the "
"pricelist and invoicing address."
msgstr ""
"Энэ талбар нь засварын захиалгын ажлын урсгалыг өөрчлөх боломжийг олгодог. "
"Хэрэв сонгосон утга нь 'Нэхэмжлэл үгүй'-с ялгаатай бол үнийн жагсаалт болон "
"нэхэмжлэх хаягийг сонгох боломжийг мөн олгоно."
#. module: mrp_repair
#: view:mrp.repair.make_invoice:0
msgid "Create Invoice"
msgstr "Нэхэмжлэл үүсгэх"
#. module: mrp_repair
#: field:mrp.repair.fee,name:0
#: field:mrp.repair.line,name:0
#: report:repair.order:0
msgid "Description"
msgstr "Тайлбар"
#. module: mrp_repair
#: field:mrp.repair,operations:0
msgid "Operation Lines"
msgstr "Ажиллагааны мөрүүд"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "invoiced"
msgstr "нэхэмжилсэн"
#. module: mrp_repair
#: view:mrp.repair:0
#: field:mrp.repair.fee,product_id:0
#: field:mrp.repair.line,product_id:0
msgid "Product"
msgstr "Бараа"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Invoice Corrected"
msgstr "Нэхэмжлэлийг Зөв Болгосон"
#. module: mrp_repair
#: report:repair.order:0
msgid "Price"
msgstr "Үнэ"
#. module: mrp_repair
#: field:mrp.repair,deliver_bool:0
msgid "Deliver"
msgstr "Хүргэлт"
#. module: mrp_repair
#: view:mrp.repair:0
#: field:mrp.repair,internal_notes:0
msgid "Internal Notes"
msgstr "Дотоод тэмдэглэл"
#. module: mrp_repair
#: report:repair.order:0
msgid "Taxes:"
msgstr "Татвар:"
#. module: mrp_repair
#: field:mrp.repair,picking_id:0
msgid "Picking"
msgstr "Бэлтгэл"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Untaxed amount"
msgstr "Татваргүй дүн"
#. module: mrp_repair
#: code:addons/mrp_repair/wizard/cancel_repair.py:41
#, python-format
msgid "Active ID is not Found"
msgstr "Идэвхтэй ID олдсонгүй"
#. module: mrp_repair
#: code:addons/mrp_repair/wizard/cancel_repair.py:49
#, python-format
msgid "Repair order is not invoiced."
msgstr "Засварын захиалга нэхэмлэгдээгүй."
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Total amount"
msgstr "Нийт дүн"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "UoM"
msgstr "Х.Н"
#. module: mrp_repair
#: selection:mrp.repair.line,type:0
msgid "Remove"
msgstr "Хасах"
#. module: mrp_repair
#: field:mrp.repair.fee,product_uom:0
#: field:mrp.repair.line,product_uom:0
msgid "Product UoM"
msgstr "Барааны х.н"
#. module: mrp_repair
#: field:mrp.repair,partner_invoice_id:0
msgid "Invoicing Address"
msgstr "Нэхэмжлэх Хаяг"
#. module: mrp_repair
#: selection:mrp.repair,invoice_method:0
msgid "After Repair"
msgstr "Засварын Дараа"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Invoicing"
msgstr "Нэхэмжлэл"
#. module: mrp_repair
#: field:mrp.repair.line,location_id:0
msgid "Source Location"
msgstr "Эх байрлал"
#. module: mrp_repair
#: model:ir.model,name:mrp_repair.model_mrp_repair_cancel
#: view:mrp.repair:0
msgid "Cancel Repair"
msgstr "Засвар Цуцлах"
#. module: mrp_repair
#: selection:mrp.repair,invoice_method:0
msgid "No Invoice"
msgstr "Нэхэмлэл үгүй"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "States"
msgstr "Төлөв"
#. module: mrp_repair
#: help:mrp.repair,partner_id:0
msgid ""
"This field allow you to choose the parner that will be invoiced and delivered"
msgstr ""
"Энэ талбар нь нэхэмжлэгдэх болон хүргэлт хийгдэх харилцагчийг сонгох "
"боломжийг олгоно"
#. module: mrp_repair
#: field:mrp.repair,amount_total:0
msgid "Total"
msgstr "Нийт"
#. module: mrp_repair
#: selection:mrp.repair,state:0
msgid "Ready to Repair"
msgstr "Засахад Бэлэн"
#. module: mrp_repair
#: code:addons/mrp_repair/mrp_repair.py:370
#, python-format
msgid "No partner !"
msgstr "Харилцагч алга !"
#~ msgid "VAT"
#~ msgstr "НӨАТ"
#~ msgid "Do you really want to create the invoice(s) ?"
#~ msgstr "Та үнэхээр нэхэмжлэл үүсгэхийг хүсч байна уу ?"
addons/point_of_sale/security/point_of_sale_security.xml
+6
View File
@@ -13,5 +13,11 @@
<field name="users" eval="[(4, ref('base.user_root'))]"/>
</record>
<record id="rule_pos_multi_company" model="ir.rule">
<field name="name">Point Of Sale Order</field>
<field name="model_id" ref="model_pos_order" />
<field name="global" eval="True" />
<field name="domain_force">[('company_id', '=', user.company_id.id)]</field>
</record>
</data>
</openerp>
addons/product/product_view.xml
-1
View File
@@ -45,7 +45,6 @@
<field name="categ_id" invisible="1"/>
<field name="variants" groups="product.group_product_variant"/>
<field name="uom_id" string="Unit of Measure" groups="product.group_uom"/>
<field name="type"/>
<field name="qty_available"/>
<field name="virtual_available"/>
<field name="lst_price"/>
addons/sale/i18n/mn.po
+5 -5
View File
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-05-10 17:34+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
"PO-Revision-Date: 2012-07-31 11:44+0000\n"
"Last-Translator: gobi <Unknown>\n"
"Language-Team: Mongolian <mn@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n"
"X-Generator: Launchpad (build 15654)\n"
"X-Launchpad-Export-Date: 2012-08-01 04:43+0000\n"
"X-Generator: Launchpad (build 15719)\n"
#. module: sale
#: field:sale.config.picking_policy,timesheet:0
@@ -1491,7 +1491,7 @@ msgstr "Борлуулалт Захиалгын Мөр Нэхэмжлэх Үүс
#. module: sale
#: selection:sale.order,state:0 selection:sale.report,state:0
msgid "Invoice Exception"
msgstr "Нэхэмжлэлийн алдаа"
msgstr "Нэхэмжлэлийн сондгойрол"
#. module: sale
#: model:process.node,note:sale.process_node_saleorder0
addons/sale/res_partner.py
+8
View File
@@ -31,6 +31,14 @@ class res_partner(osv.osv):
res[partner.id] = len(partner.sale_order_ids)
return res
def copy(self, cr, uid, record_id, default=None, context=None):
if default is None:
default = {}
default.update({'sale_order_ids': []})
super(res_partner, self).copy(cr, uid, record_id, default, context)
_columns = {
'sale_order_count': fields.function(_sale_order_count, string='# of Sales Order', type='integer'),
'sale_order_ids': fields.one2many('sale.order','partner_id','Sales Order')
addons/sale/sale_view.xml
+11 -6
View File
@@ -164,7 +164,7 @@
<button name="action_button_confirm" states="sent" string="Confirm" class="oe_highlight" type="object"/>
<button name="action_view_invoice" string="Open Invoice" type="object" class="oe_highlight"
attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/>
<button name="action_view_delivery" string="Open Delivery Order" type="object" class="oe_highlight"
<button name="action_view_delivery" string="View Delivery Order" type="object" class="oe_highlight"
attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
<button name="%(action_view_sale_advance_payment_inv)d" string="Create Invoice"
type="action" states="manual" class="oe_highlight"/>
@@ -287,14 +287,18 @@
<group class="oe_subtotal_footer oe_right" colspan="2" name="sale_total">
<field name="amount_untaxed"/>
<field name="amount_tax"/>
<field name="amount_total" class="oe_subtotal_footer_separator"/>
<div class="oe_subtotal_footer_separator oe_inline">
<label for="amount_total" />
<button name="button_dummy"
states="draft" string="(update)" type="object" class="oe_edit_only oe_link"/>
</div>
<field name="amount_total" nolabel="1" class="oe_subtotal_footer_separator"/>
</group>
<group name="sale_margin_grp">
</group>
<div class="oe_clear">
<label for="note"/>
</div>
<field name="note" class="oe_inline"/>
<div class="oe_clear"/>
<label for="note"/>
<field name="note"/>
</page>
<page string="Other Information" groups="base.group_user">
<group>
@@ -364,6 +368,7 @@
<filter icon="terp-document-new" string="Quotations" name="draft" domain="[('state','in',('draft','sent'))]" help="Sales Order that haven't yet been confirmed"/>
<filter icon="terp-check" string="Sales" name="sales" domain="[('state','in',('manual','progress'))]"/>
<filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sales Order ready to be invoiced"/>
<filter icon="terp-dolar_ok!" string="Done" domain="[('state','=','done')]" help="Sales Order done"/>
<separator/>
<filter string="My Sale Orders" domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal" name="my_sale_orders_filter"/>
<field name="partner_id"/>
addons/sale/wizard/sale_make_invoice_advance.py
+1 -1
View File
@@ -28,7 +28,7 @@ class sale_advance_payment_inv(osv.osv_memory):
_columns = {
'advance_payment_method':fields.selection(
[('all', 'All'), ('percentage','Percentage'), ('fixed','Fixed Price'),
[('all', 'Invoice all the Sale Order'), ('percentage','Percentage'), ('fixed','Fixed Price'),
('lines', 'Some Order Lines')],
'Type', required=True,
help="""Use All to create the final invoice.
addons/sale_crm/i18n/ja.po
+2 -2
View File
@@ -14,8 +14,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-07-31 04:58+0000\n"
"X-Generator: Launchpad (build 15702)\n"
"X-Launchpad-Export-Date: 2012-08-01 04:43+0000\n"
"X-Generator: Launchpad (build 15719)\n"
#. module: sale_crm
#: field:sale.order,categ_id:0
addons/sale_margin/i18n/ja.po
+2 -2
View File
@@ -14,8 +14,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-07-31 04:58+0000\n"
"X-Generator: Launchpad (build 15702)\n"
"X-Launchpad-Export-Date: 2012-08-01 04:44+0000\n"
"X-Generator: Launchpad (build 15719)\n"
#. module: sale_margin
#: sql_constraint:sale.order:0
addons/stock/wizard/stock_location_product.py
+5 -2
View File
@@ -20,13 +20,16 @@
##############################################################################
from osv import fields, osv
from tools.translate import _
class stock_location_product(osv.osv_memory):
_name = "stock.location.product"
_description = "Products by Location"
_columns = {
'from_date': fields.datetime('From'),
'to_date': fields.datetime('To'),
'to_date': fields.datetime('To'),
'type': fields.selection([('inventory','Analyse Current Inventory'),
('period','Analyse a Period')], 'Analyse Type', required=True),
}
def action_open_window(self, cr, uid, ids, context=None):
@@ -43,7 +46,7 @@ class stock_location_product(osv.osv_memory):
location_products = self.read(cr, uid, ids, ['from_date', 'to_date'], context=context)
if location_products:
return {
'name': False,
'name': _('Current Inventory'),
'view_type': 'form',
'view_mode': 'tree,form',
'res_model': 'product.product',
addons/stock/wizard/stock_location_product_view.xml
+4 -3
View File
@@ -7,14 +7,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="View Stock of Products" version="7.0">
<separator string="Stock Location Analysis"/>
<group>
<field name="type"/>
</group>
<group attrs="{'invisible':[('type', '!=', 'period')], 'required':[('type', '=', 'period')]}">
<field name="from_date"/>
<field name="to_date"/>
</group>
<label string="(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to filter all resources of the day for the 'From' date and 23:59:59 for the 'To' date)"/>
<footer>
<button name="action_open_window" string="Open Product" type="object" class="oe_highlight"/>
<button name="action_open_window" string="View Products Inventory" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
addons/stock_planning/i18n/ja.po
+2 -2
View File
@@ -14,8 +14,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-07-31 04:58+0000\n"
"X-Generator: Launchpad (build 15702)\n"
"X-Launchpad-Export-Date: 2012-08-01 04:44+0000\n"
"X-Generator: Launchpad (build 15719)\n"
#. module: stock_planning
#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73