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

merge

Browse Source 
bzr revid: fp@tinyerp.com-20100303070440-b5uggb0jiam7zz1r
This commit is contained in:
Fabien Pinckaers
2010-03-03 08:04:40 +01:00
parent 566b334c59 13a0206be5
commit 33749177de
18 changed files with 2852 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/i18n/fi.po
+6 -6
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-01-05 09:22+0000\n"
"Last-Translator: pmjt <Unknown>\n"
"PO-Revision-Date: 2010-03-02 11:01+0000\n"
"Last-Translator: smii <Unknown>\n"
"Language-Team: Finnish <fi@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: 2010-01-06 04:36+0000\n"
"X-Launchpad-Export-Date: 2010-03-03 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1904,7 +1904,7 @@ msgstr "Tilit Sallittuja (tyhjä tarkoittaa ei kontrollia)"
#. module: account
#: view:account.invoice:0
msgid "Untaxed amount"
msgstr ""
msgstr "Veroton määrä"
#. module: account
#: field:account.tax,account_collected_id:0
@@ -2078,7 +2078,7 @@ msgstr "Laskunnumero, lasketaan automaattisesti kun laskua luodaan."
#. module: account
#: rml:account.invoice:0
msgid "Draft Invoice"
msgstr ""
msgstr "Laskun luonnos"
#. module: account
#: model:account.account.type,name:account.account_type_expense
@@ -2849,7 +2849,7 @@ msgstr "Luoton keskitys"
#. module: account
#: rml:account.overdue:0
msgid "Customer Ref:"
msgstr ""
msgstr "Asiakkaan Viite:"
#. module: account
#: xsl:account.transfer:0
addons/account/i18n/ru.po
+42 -40
View File
@@ -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: 2010-02-06 19:29+0000\n"
"Last-Translator: Santjaga <Unknown>\n"
"PO-Revision-Date: 2010-03-02 15:44+0000\n"
"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\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-02-07 04:37+0000\n"
"X-Launchpad-Export-Date: 2010-03-03 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -185,7 +185,7 @@ msgstr "Планы счетов"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_move_line_select
msgid "Move line select"
msgstr ""
msgstr "Выберите строку для перемещения"
#. module: account
#: rml:account.journal.period.print:0
@@ -397,7 +397,7 @@ msgstr "Проводки итогов"
#: field:account.fiscal.position.account,account_src_id:0
#: field:account.fiscal.position.account.template,account_src_id:0
msgid "Account Source"
msgstr ""
msgstr "Счет источник"
#. module: account
#: field:account.journal,update_posted:0
@@ -413,7 +413,7 @@ msgstr "Согласование платежа"
#. module: account
#: model:account.journal,name:account.expenses_journal
msgid "Journal de frais"
msgstr ""
msgstr "Журнал расходов"
#. module: account
#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
@@ -491,7 +491,7 @@ msgstr "Ссылка"
#. module: account
#: field:account.tax.template,type_tax_use:0
msgid "Tax Use In"
msgstr ""
msgstr "Использовать налог в"
#. module: account
#: help:account.tax.template,include_base_amount:0
@@ -516,7 +516,7 @@ msgstr "Состояния проводок аналитики"
#: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
#: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
msgid "Tax Code Templates"
msgstr ""
msgstr "Шаблоны кодов налога"
#. module: account
#: view:account.invoice:0
@@ -527,18 +527,18 @@ msgstr "Счет поставщика"
#: model:process.transition,name:account.process_transition_reconcilepaid0
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
msgid "Reconcile Paid"
msgstr ""
msgstr "Выверите Оплаченный"
#. module: account
#: wizard_field:account.chart,init,target_move:0
msgid "Target Moves"
msgstr ""
msgstr "Цель перемещений"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_tax_template_form
#: model:ir.ui.menu,name:account.menu_action_account_tax_template_form
msgid "Tax Templates"
msgstr ""
msgstr "Шаблоны налогов"
#. module: account
#: field:account.invoice,reconciled:0
@@ -553,13 +553,13 @@ msgstr "Метод отсрочки"
#. module: account
#: field:account.tax.template,include_base_amount:0
msgid "Include in Base Amount"
msgstr ""
msgstr "Включить в базовую сумму"
#. module: account
#: field:account.tax,ref_base_code_id:0
#: field:account.tax.template,ref_base_code_id:0
msgid "Refund Base Code"
msgstr ""
msgstr "Базовый код возмещения"
#. module: account
#: view:account.invoice.line:0
@@ -569,7 +569,7 @@ msgstr "Строка"
#. module: account
#: rml:account.analytic.account.cost_ledger:0
msgid "J.C. or Move name"
msgstr ""
msgstr "J.C. или имя Перемещения"
#. module: account
#: selection:account.tax,applicable_type:0
@@ -587,12 +587,12 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_tax
msgid "account.tax"
msgstr ""
msgstr "Счет налога"
#. module: account
#: rml:account.central.journal:0
msgid "Printing Date"
msgstr ""
msgstr "Дата печати"
#. module: account
#: rml:account.general.ledger:0
@@ -621,7 +621,7 @@ msgstr ""
#: wizard_view:account.analytic.account.chart,init:0
#: wizard_view:account.analytic.line,init:0
msgid "(Keep empty to open the current situation)"
msgstr ""
msgstr "(Оставить пустым для отображения текущего состояния)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
@@ -673,7 +673,7 @@ msgstr "Бухг. аналитика"
#. module: account
#: rml:account.overdue:0
msgid "Sub-Total :"
msgstr ""
msgstr "Подитог:"
#. module: account
#: field:account.analytic.account,line_ids:0
@@ -691,7 +691,7 @@ msgstr "месяц"
#. module: account
#: field:account.analytic.account,partner_id:0
msgid "Associated Partner"
msgstr ""
msgstr "Связанный контрагент"
#. module: account
#: field:account.invoice,comment:0
@@ -729,7 +729,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_tax_code_line_open
msgid "account.move.line"
msgstr ""
msgstr "Строки финансового документа"
#. module: account
#: model:process.transition,name:account.process_transition_supplieranalyticcost0
@@ -761,7 +761,7 @@ msgstr "Свойства покупки"
#. module: account
#: model:process.node,note:account.process_node_paymententries0
msgid "Can be draft or validated"
msgstr ""
msgstr "Может быть черновиком или подтвержденным"
#. module: account
#: wizard_button:account.invoice.pay,init,reconcile:0
@@ -771,7 +771,7 @@ msgstr "Частичный платеж"
#. module: account
#: wizard_view:account_use_models,create:0
msgid "Move Lines Created."
msgstr ""
msgstr "Строка финансового документа создана."
#. module: account
#: field:account.fiscalyear,state:0
@@ -787,7 +787,7 @@ msgstr "Статус"
#: rml:account.analytic.account.cost_ledger:0
#: rml:account.analytic.account.quantity_cost_ledger:0
msgid "Period to"
msgstr ""
msgstr "Период по"
#. module: account
#: field:account.account.type,partner_account:0
@@ -818,12 +818,12 @@ msgstr "Оставить пустым для всех открытых фина
#. module: account
#: field:account.invoice,move_lines:0
msgid "Move Lines"
msgstr ""
msgstr "Строки финансового документа"
#. module: account
#: model:ir.model,name:account.model_account_config_wizard
msgid "account.config.wizard"
msgstr ""
msgstr "Мастер конфигурации"
#. module: account
#: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
@@ -872,7 +872,7 @@ msgstr "Распечатать журнал"
#. module: account
#: model:ir.model,name:account.model_account_bank_accounts_wizard
msgid "account.bank.accounts.wizard"
msgstr ""
msgstr "Мастер банковских счетов"
#. module: account
#: field:account.move.line,date_created:0
@@ -883,7 +883,7 @@ msgstr "Дата создания"
#. module: account
#: wizard_button:account.invoice.refund,init,cancel_invoice:0
msgid "Cancel Invoice"
msgstr ""
msgstr "Отмена счета"
#. module: account
#: field:account.journal.column,required:0
@@ -923,6 +923,8 @@ msgid ""
"If a default tax is given in the partner it only overrides taxes from "
"accounts (or products) in the same group."
msgstr ""
"Если налог определен в настройках контрагента, он перекрывает налоги "
"настроенные с счетах или продукции если они в той же группе налогов"
#. module: account
#: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0
@@ -932,7 +934,7 @@ msgstr "Открыть отчетный год"
#. module: account
#: view:account.config.wizard:0
msgid "Select Chart of Accounts"
msgstr ""
msgstr "Выбор плана счетов"
#. module: account
#: field:account.analytic.account,quantity:0
@@ -1013,7 +1015,7 @@ msgstr "Финансы и бухгалтерия"
#. module: account
#: rml:account.invoice:0
msgid "Net Total:"
msgstr ""
msgstr "Итог нетто"
#. module: account
#: view:account.fiscal.position:0
@@ -1027,7 +1029,7 @@ msgstr ""
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
msgstr ""
msgstr "Налоговая позиция"
#. module: account
#: field:account.analytic.line,product_uom_id:0
@@ -1038,7 +1040,7 @@ msgstr "Ед. изм."
#. module: account
#: wizard_field:account.third_party_ledger.report,init,page_split:0
msgid "One Partner Per Page"
msgstr ""
msgstr "Один контрагент на страницу"
#. module: account
#: field:account.account,child_parent_ids:0
@@ -1049,7 +1051,7 @@ msgstr "Потомки"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr ""
msgstr "Структура налогов финансовой области"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1077,7 +1079,7 @@ msgstr "Закрыть отчетный год"
#. module: account
#: field:account.sequence.fiscalyear,sequence_main_id:0
msgid "Main Sequence"
msgstr ""
msgstr "Основная Последовательность"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
@@ -1088,7 +1090,7 @@ msgstr "Распечатать журналы аналитики"
#. module: account
#: rml:account.tax.code.entries:0
msgid "Voucher Nb"
msgstr ""
msgstr "№ ваучера"
#. module: account
#: help:account.payment.term.line,sequence:0
@@ -1102,7 +1104,7 @@ msgstr ""
#. module: account
#: field:account.bank.statement.reconcile,total_new:0
msgid "Total write-off"
msgstr ""
msgstr "Общий объем списания"
#. module: account
#: view:account.tax.template:0
@@ -1121,7 +1123,7 @@ msgstr "Коды налогов"
#: field:account.tax.template,chart_template_id:0
#: field:wizard.multi.charts.accounts,chart_template_id:0
msgid "Chart Template"
msgstr ""
msgstr "Шаблона плана счетов"
#. module: account
#: field:account.chart.template,property_account_income_categ:0
@@ -1149,7 +1151,7 @@ msgstr "Цена за ед."
#. module: account
#: rml:account.analytic.account.journal:0
msgid "Period from :"
msgstr ""
msgstr "Период с"
#. module: account
#: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -1191,12 +1193,12 @@ msgstr "Открыть планы счетов"
#. module: account
#: wizard_view:account.fiscalyear.close.state,init:0
msgid "Are you sure you want to close the fiscal year ?"
msgstr ""
msgstr "Вы уверены, что хотите закрыть финансовый год?"
#. module: account
#: selection:account.move,type:0
msgid "Bank Receipt"
msgstr ""
msgstr "Квитанция банка"
#. module: account
#: view:res.partner:0
@@ -1206,7 +1208,7 @@ msgstr "Банковский счёт"
#. module: account
#: field:account.chart.template,tax_template_ids:0
msgid "Tax Template List"
msgstr ""
msgstr "Список шаблонов налогов"
#. module: account
#: model:process.transition,name:account.process_transition_invoiceimport0
addons/account_followup/i18n/fi.po
+4 -4
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-09-08 15:28+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"PO-Revision-Date: 2010-03-02 15:41+0000\n"
"Last-Translator: smii <Unknown>\n"
"Language-Team: Finnish <fi@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: 2009-12-16 05:10+0000\n"
"X-Launchpad-Export-Date: 2010-03-03 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
@@ -41,7 +41,7 @@ msgstr ""
#. module: account_followup
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr ""
msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä."
#. module: account_followup
#: field:account_followup.followup.line,description:0
addons/auction/i18n/fi.po
+2560
View File
File diff suppressed because it is too large Load Diff
addons/base_action_rule/base_action_rule.py
+4
View File
@@ -126,6 +126,10 @@ class base_action_rule(osv.osv):
obj.state = action.act_state
write['state'] = action.act_state
if hasattr(obj, 'categ_id') and action.act_categ_id:
obj.categ_id = action.act_categ_id
write['categ_id'] = action.act_categ_id.id
if hasattr(obj, 'priority') and action.act_priority:
obj.priority = action.act_priority
write['priority'] = action.act_priority
addons/base_action_rule/base_action_rule_view.xml
+58 -37
View File
@@ -2,9 +2,9 @@
<openerp>
<data>
<menuitem id="menu_base_action_rule" name="Action Rule" parent="base.menu_base_config" sequence="0"/>
<!--
Action Rule
<!--
Action Rule
-->
<record id="view_base_action_rule_form" model="ir.ui.view">
<field name="name">base.action.rule.form</field>
@@ -12,27 +12,28 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Action Rule">
<field name="name"/>
<field name="name" select="1"/>
<field name="active"/>
<field name="max_level" />
<separator colspan="4" string="Rule lines"/>
<field name="rule_lines" colspan="4" nolabel="1"/>
<field name="rule_lines" colspan="4" nolabel="1"/>
</form>
</field>
</record>
<record id="view_base_action_rule_tree" model="ir.ui.view">
<field name="name">base.action.rule.tree</field>
<field name="model">base.action.rule</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Action Rule">
<field name="name"/>
<field name="max_level"/>
<field name="name" colspan="4"/>
<field name="max_level"/>
<field name="rule_lines" colspan="4" nolabel="1"/>
</tree>
</field>
</record>
<record id="base_action_rule_act" model="ir.actions.act_window">
<field name="name">Action Rules</field>
<field name="res_model">base.action.rule</field>
@@ -40,10 +41,11 @@
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_base_action_rule_tree"/>
</record>
<menuitem id="menu_base_action_rule_form" parent="menu_base_action_rule" action="base_action_rule_act"/>
<!--
Action Rule Lines
<!--
Action Rule Lines
-->
<record id="view_base_action_rule_line_form" model="ir.ui.view">
<field name="name">base.action.rule.line.form</field>
@@ -54,34 +56,44 @@
<field name="name" select="1"/>
<field name="active" select="2"/>
<notebook colspan="4">
<page string="Conditions">
<separator colspan="4" string="Conditions on Model Fields"/>
<field name="regex_name" string="Regex on Model Name" colspan="2"/>
<field name="trg_user_id" select="2"/>
<separator colspan="4" string="Conditions on Model Partner"/>
<field name="trg_partner_id"/>
<field name="trg_partner_categ_id"/>
<separator colspan="4" string="Conditions on States"/>
<field name="trg_state_from" select="2"/>
<field name="trg_state_to" select="2"/>
<separator colspan="4" string="Conditions on Priority Range"/>
<field name="trg_priority_from"/>
<field name="trg_priority_to"/>
<separator colspan="4" string="Conditions on Timing"/>
<field name="trg_date_type"/>
<label align="1.0" string="Delay After Trigger Date:"/>
<group col="2" colspan="1">
<field name="trg_date_range" nolabel="1"/>
<field name="trg_date_range_type" nolabel="1"/>
<page string="Conditions">
<group col="2" colspan="2" name="model">
<separator colspan="4" string="Conditions on Model Fields"/>
<field name="regex_name" string="Regex on Model Name" colspan="2"/>
<field name="trg_user_id" select="2"/>
</group>
<group col="2" colspan="2" name="partner">
<separator colspan="4" string="Conditions on Model Partner"/>
<field name="trg_partner_id"/>
<field name="trg_partner_categ_id"/>
</group>
<group col="2" colspan="2">
<separator colspan="4" string="Conditions on States"/>
<field name="trg_state_from" select="2"/>
<field name="trg_state_to" select="2"/>
</group>
<group col="2" colspan="2">
<separator colspan="4" string="Conditions on Priority Range"/>
<field name="trg_priority_from"/>
<field name="trg_priority_to"/>
</group>
<group col="2" colspan="2">
<separator colspan="4" string="Conditions on Timing"/>
<field name="trg_date_type"/>
<label align="1.0" string="Delay After Trigger Date:"/>
<group col="2" colspan="1">
<field name="trg_date_range" nolabel="1"/>
<field name="trg_date_range_type" nolabel="1"/>
</group>
</group>
<separator colspan="4" string="Note"/>
<label align="0.0" string="The rule use a AND operator. The model must match all non empty fields so that the rule execute the action described in the 'Actions' tab." colspan="4"/>
<label align="0.0" string="The rule use a AND operator. The model must match all non empty fields so that the rule execute the action described in the 'Actions' tab." colspan="4"/>
</page>
<page string="Actions">
<separator colspan="4" string="Fields to Change"/>
<field name="act_user_id"/>
<field name="act_user_id"/>
<field name="act_state"/>
<field name="act_priority"/>
<field name="act_priority"/>
<separator colspan="4" string="E-Mail Reminders (includes the content of the object)"/>
<field name="act_remind_partner"/>
<field name="act_remind_attach"/>
@@ -95,7 +107,7 @@
</page>
<page string="E-Mail Actions">
<separator colspan="4" string="Template of Email to Send"/>
<field name="act_mail_to_user"/>
<field name="act_mail_to_user"/>
<field name="act_mail_to_watchers"/>
<field colspan="4" name="act_mail_to_email"/>
<field colspan="4" name="act_mail_body" attrs="{'required':[('act_remind_user','=',True)]}"/>
@@ -103,7 +115,7 @@
<label align="0.0" string="%%(object_id)s = Object ID" colspan="2"/>
<label align="0.0" string="%%(object_subject)s = Object subject" colspan="2"/>
<label align="0.0" string="%%(object_description)s = Object description" colspan="2"/>
<label align="0.0" string="%%(object_date)s = Creation date" colspan="2"/>
<label align="0.0" string="%%(object_date)s = Creation date" colspan="2"/>
<label align="0.0" string="%%(partner)s = Partner name" colspan="2"/>
<label align="0.0" string="%%(partner_email)s = Partner email" colspan="2"/>
<label align="0.0" string="%%(object_user)s = Responsible name" colspan="2"/>
@@ -125,6 +137,15 @@
<field name="active"/>
</tree>
</field>
</record>
</record>
<act_window
domain="[('rule_id', '=', active_id)]"
id="act_rule_lines_open"
name="Open Rule Lines"
context="{'rule_id': active_id}"
res_model="base.action.rule.line"
src_model="base.action.rule"/>
</data>
</openerp>
addons/crm/crm.py
+1 -1
View File
@@ -606,6 +606,6 @@ class users(osv.osv):
_inherit = 'res.users'
_description = "Users"
_columns = {
'context_section_id': fields.many2one('crm.case.section', 'Sales Section'),
'context_section_id': fields.many2one('crm.case.section', 'Sales Team'),
}
users()
addons/crm/crm_action_rule.py
+1
View File
@@ -188,6 +188,7 @@ class base_action_rule_line(osv.osv):
'trg_categ_id': fields.many2one('crm.case.categ', 'Category'),
'regex_history' : fields.char('Regular Expression on Case History', size=128),
'act_section_id': fields.many2one('crm.case.section', 'Set section to'),
'act_categ_id': fields.many2one('crm.case.categ', 'Set Category to'),
'act_mail_to_partner': fields.boolean('Mail to partner',help="Check this if you want the rule to send an email to the partner."),
}
addons/crm/crm_action_rule_view.xml
+19 -13
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<data>
<!-- Case rules -->
<record id="view_base_action_rule_line_form1" model="ir.ui.view">
<field name="name">base.action.rule.line.form.inherit</field>
@@ -8,27 +8,32 @@
<field name="inherit_id" ref="base_action_rule.view_base_action_rule_line_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="trg_partner_categ_id" position="after">
<separator colspan="4" string="Condition on Communication History"/>
<field name="regex_history"/>
<field name="trg_max_history"/>
</field>
<group name="partner" position="after">
<group col="2" colspan="2">
<separator colspan="4" string="Condition on Communication History"/>
<field name="regex_history"/>
<field name="trg_max_history"/>
</group>
</group>
</field>
</record>
<record id="view_base_action_rule_line_form2" model="ir.ui.view">
<field name="name">base.action.rule.line.form2.inherit</field>
<field name="model">base.action.rule.line</field>
<field name="inherit_id" ref="base_action_rule.view_base_action_rule_line_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="regex_name" position="after">
<field name="trg_section_id" select="1" widget="selection"/>
<field name="trg_categ_id"/>
</field>
<group name="partner" position="after">
<group col="2" colspan="2">
<separator colspan="4" string="Condition Case Fields"/>
<field name="trg_section_id" select="1" widget="selection"/>
<field name="trg_categ_id"/>
</group>
</group>
</field>
</record>
<record id="view_base_action_rule_line_form3" model="ir.ui.view">
<field name="name">base.action.rule.line.form3.inherit</field>
<field name="model">base.action.rule.line</field>
@@ -36,7 +41,8 @@
<field name="type">form</field>
<field name="arch" type="xml">
<field name="act_user_id" position="after">
<field name="act_section_id"/>
<field name="act_section_id"/>
<field name="act_categ_id"/>
<field name="act_mail_to_partner"/>
</field>
</field>
addons/l10n_lu/i18n/hr.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-03-02 04:41+0000\n"
"X-Launchpad-Export-Date: 2010-03-03 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_lu
addons/membership/i18n/fi.po
+25 -25
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-12-11 08:33+0000\n"
"Last-Translator: NightSpirit <Unknown>\n"
"PO-Revision-Date: 2010-03-02 12:22+0000\n"
"Last-Translator: smii <Unknown>\n"
"Language-Team: Finnish <fi@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: 2009-12-16 05:07+0000\n"
"X-Launchpad-Export-Date: 2010-03-03 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: membership
@@ -42,7 +42,7 @@ msgstr ""
#: field:report.partner_member.year,currency:0
#: field:report.partner_member.year_new,currency:0
msgid "Currency"
msgstr ""
msgstr "Valuutta"
#. module: membership
#: model:process.node,note:membership.process_node_setassociation0
@@ -102,12 +102,12 @@ msgstr "Virhe: BVR -viite on pakollinen."
#. module: membership
#: field:product.product,membership_date_from:0
msgid "Date from"
msgstr ""
msgstr "Päiväys alkaen"
#. module: membership
#: field:membership.membership_line,partner:0
msgid "Partner"
msgstr ""
msgstr "Kumppani"
#. module: membership
#: model:ir.actions.act_window,name:membership.action_membership_members_free
@@ -123,12 +123,12 @@ msgstr ""
#. module: membership
#: view:res.partner:0
msgid "Partners"
msgstr ""
msgstr "Kumppanit"
#. module: membership
#: field:membership.membership_line,date_from:0
msgid "From"
msgstr ""
msgstr "Kohteesta"
#. module: membership
#: constraint:membership.membership_line:0
@@ -138,17 +138,17 @@ msgstr "Virhe, tämä jäsentuote on vanhentunut"
#. module: membership
#: wizard_button:wizard_invoice_membership,init,ok:0
msgid "Confirm"
msgstr ""
msgstr "Hyväksy"
#. module: membership
#: model:process.transition.action,name:membership.process_transition_action_create0
msgid "Create"
msgstr ""
msgstr "Luo"
#. module: membership
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
#. module: membership
#: model:ir.model,name:membership.model_membership_membership_line
@@ -158,7 +158,7 @@ msgstr "Jäsen rivi"
#. module: membership
#: field:membership.membership_line,state:0
msgid "State"
msgstr ""
msgstr "Tila"
#. module: membership
#: field:res.partner,membership_start:0
@@ -180,12 +180,12 @@ msgstr "Jäsenyys vuosissa"
#. module: membership
#: model:ir.ui.menu,name:membership.menu_reporting
msgid "Reporting"
msgstr ""
msgstr "Raportointi"
#. module: membership
#: view:res.partner:0
msgid "Members"
msgstr ""
msgstr "Jäsenet"
#. module: membership
#: selection:membership.membership_line,state:0
@@ -201,7 +201,7 @@ msgstr "Avaa lasku."
#. module: membership
#: model:ir.ui.menu,name:membership.menu_conf
msgid "Configuration"
msgstr ""
msgstr "Asetukset"
#. module: membership
#: model:process.transition,note:membership.process_transition_producttomember0
@@ -250,7 +250,7 @@ msgstr "Jäsenyystuote - 1"
#: field:report.partner_member.year_new,canceled_amount:0
#: field:report.partner_member.year_new,canceled_number:0
msgid "Canceled"
msgstr ""
msgstr "Peruttu"
#. module: membership
#: model:product.pricelist,name:membership.list1m
@@ -263,7 +263,7 @@ msgstr "Jäsenen myynnin hintalista"
#: field:report.partner_member.year_new,invoiced_amount:0
#: field:report.partner_member.year_new,invoiced_number:0
msgid "Invoiced"
msgstr ""
msgstr "Laskutettu"
#. module: membership
#: selection:membership.membership_line,state:0
@@ -318,7 +318,7 @@ msgstr "Jäsenyyslasku maksettu."
#: field:report.partner_member.year_new,paid_amount:0
#: field:report.partner_member.year_new,paid_number:0
msgid "Paid"
msgstr ""
msgstr "Maksettu"
#. module: membership
#: selection:membership.membership_line,state:0
@@ -361,7 +361,7 @@ msgstr "Laskutetut jäsenet"
#. module: membership
#: constraint:product.pricelist.version:0
msgid "You cannot have 2 pricelist versions that overlap!"
msgstr ""
msgstr "Hinnastoista ei voi olla päällekkäisiä versioita!"
#. module: membership
#: model:ir.actions.act_window,name:membership.action_membership_members_old
@@ -396,7 +396,7 @@ msgstr ""
#: field:report.partner_member.year_new,waiting_amount:0
#: field:report.partner_member.year_new,waiting_number:0
msgid "Waiting"
msgstr ""
msgstr "Odotetaan"
#. module: membership
#: model:process.transition,note:membership.process_transition_waitingtoinvoice0
@@ -411,7 +411,7 @@ msgstr "Tulevat jäsenet"
#. module: membership
#: wizard_button:wizard_invoice_membership,init,end:0
msgid "Cancel"
msgstr ""
msgstr "Peru"
#. module: membership
#: model:ir.actions.act_window,name:membership.action_membership_members_associated
@@ -428,7 +428,7 @@ msgstr "Maksaneet jäsenet"
#. module: membership
#: view:product.product:0
msgid "Information"
msgstr ""
msgstr "Tietoa"
#. module: membership
#: field:membership.membership_line,account_invoice_line:0
@@ -472,7 +472,7 @@ msgstr "Lopeta jäsenyyspäivämäärä"
#: model:ir.actions.act_window,name:membership.action_membership_members
#: model:ir.ui.menu,name:membership.menu_members
msgid "Current members"
msgstr ""
msgstr "Tämänhetkiset jäsenet"
#. module: membership
#: model:ir.model,name:membership.model_report_partner_member_year_new
@@ -510,13 +510,13 @@ msgstr "Jäsenyystuote"
#. module: membership
#: constraint:product.product:0
msgid "Error: Invalid ean code"
msgstr ""
msgstr "Virhe: Virheellinen EAN-koodi"
#. module: membership
#: field:report.partner_member.year,year:0
#: field:report.partner_member.year_new,year:0
msgid "Year"
msgstr ""
msgstr "Vuosi"
#. module: membership
#: field:res.partner,membership_state:0
addons/olap_crm/i18n/hr.po
+34
View File
@@ -0,0 +1,34 @@
# Croatian 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 <EMAIL@ADDRESS>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-11-26 05:29+0000\n"
"PO-Revision-Date: 2010-03-02 23:39+0000\n"
"Last-Translator: goranc <goranc@gmail.com>\n"
"Language-Team: Croatian <hr@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: 2010-03-03 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: olap_crm
#: model:ir.module.module,description:olap_crm.module_meta_information
msgid ""
"\n"
" Sale module will load the data in olap tables\n"
" "
msgstr ""
"\n"
" Modul prodaja uvesti će podatke u olap tablice\n"
" "
#. module: olap_crm
#: model:ir.module.module,shortdesc:olap_crm.module_meta_information
msgid "olap_crm"
msgstr "olap_crm"
addons/olap_extract/i18n/hr.po
+59
View File
@@ -0,0 +1,59 @@
# Croatian 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 <EMAIL@ADDRESS>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-11-26 05:29+0000\n"
"PO-Revision-Date: 2010-03-02 23:44+0000\n"
"Last-Translator: goranc <goranc@gmail.com>\n"
"Language-Team: Croatian <hr@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: 2010-03-03 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: olap_extract
#: model:ir.module.module,shortdesc:olap_extract.module_meta_information
msgid "olap_extract"
msgstr "olap_extract"
#. module: olap_extract
#: wizard_button:olap.extract.schema,init,ok:0
msgid "OK"
msgstr "U redu"
#. module: olap_extract
#: model:ir.actions.wizard,name:olap_extract.bi_olap_extract_schema
msgid "Olap Extract"
msgstr "Olap izvajanje"
#. module: olap_extract
#: model:ir.module.module,description:olap_extract.module_meta_information
msgid ""
"\n"
" Extracts the schema structure.\n"
" "
msgstr ""
"\n"
" Izdvajanje strukture sheme.\n"
" "
#. module: olap_extract
#: wizard_field:olap.extract.schema,init,module_name:0
msgid "Module Name"
msgstr "Naziv modula"
#. module: olap_extract
#: wizard_button:olap.extract.schema,init,end:0
msgid "Cancel"
msgstr "Odustani"
#. module: olap_extract
#: wizard_view:olap.extract.schema,init:0
msgid "New Module Name"
msgstr "Novi naziv modula"
addons/olap_sale/i18n/hr.po
+34
View File
@@ -0,0 +1,34 @@
# Croatian 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 <EMAIL@ADDRESS>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-11-26 05:29+0000\n"
"PO-Revision-Date: 2010-03-02 23:45+0000\n"
"Last-Translator: goranc <goranc@gmail.com>\n"
"Language-Team: Croatian <hr@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: 2010-03-03 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: olap_sale
#: model:ir.module.module,description:olap_sale.module_meta_information
msgid ""
"\n"
" Sale module will load the data in olap tables\n"
" "
msgstr ""
"\n"
" Modul prodaja uvesti će podatke u olap tablice\n"
" "
#. module: olap_sale
#: model:ir.module.module,shortdesc:olap_sale.module_meta_information
msgid "olap_sale"
msgstr "olap_sale"
addons/olap_sale/i18n/sk.po
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-03-02 04:41+0000\n"
"X-Launchpad-Export-Date: 2010-03-03 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: olap_sale
addons/product_margin/i18n/cs.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-03-02 04:41+0000\n"
"X-Launchpad-Export-Date: 2010-03-03 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product_margin
addons/survey/i18n/cs.po
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-03-02 04:41+0000\n"
"X-Launchpad-Export-Date: 2010-03-03 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: survey
addons/wiki/i18n/cs.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-03-02 04:41+0000\n"
"X-Launchpad-Export-Date: 2010-03-03 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: wiki