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

[Merge]: Merge with trunk addons

Browse Source 
bzr revid: rpa@openerp.co.in-20100303054414-92l9awvj1f5t3aji
This commit is contained in:
rpa (Open ERP)
2010-03-03 11:14:14 +05:30
parent 94709660aa 841d8f4960
commit 6aed24dfd8
25 changed files with 2986 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_invoice_view.xml
+35 -22
View File
@@ -115,19 +115,21 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree colors="blue:state in ('draft');black:state not in ('draft')" string="Invoice">
<field name="name"/>
<field name="type"/>
<field name="number"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<field name="partner_id" groups="base.group_user"/>
<field name="amount_untaxed" sum="Untaxed amount"/>
<field name="amount_total" sum="Total amount"/>
<field name="currency_id"/>
<field name="date_invoice" select="1"/>
<field name="date_due" select="1"/>
<field name="residual"/>
<field name="state"/>
<field name="number"/>
<field name="partner_id" groups="base.group_user"/>
<field name="name"/>
<field name="journal_id" invisible="1"/>
<field name="period_id" invisible="1"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<field name="user_id"/>
<field name="date_due"/>
<field name="origin"/>
<field name="currency_id"/>
<field name="residual" sum="Residual Amount"/>
<field name="amount_untaxed" sum="Untaxed Amount"/>
<field name="amount_total" sum="Total Amount"/>
<field name="state"/>
</tree>
</field>
</record>
@@ -299,7 +301,8 @@
<field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
<field name="fiscal_position" groups="base.group_extended,base.group_user" widget="selection"/>
<newline/>
<field name="date_due" select="1"/>
<field name="date_due"/>
<field name="user_id"/>
<newline/>
<field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank" select="2"/>
<field name="origin" select="2"/>
@@ -336,18 +339,28 @@
<group col="10" colspan="4">
<filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
<filter icon="terp-account" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
<filter icon="terp-account" string="Unpaid" domain="[('state','in',('open','cancel'))]" help="Unpaid Invoices"/>
<filter icon="terp-account" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
<separator orientation="vertical"/>
<field name="number"/>
<field name="partner_id"/>
<field name="user_id">
<filter string="My Invoices" icon="terp-account" domain="[('user_id','=',uid)]"/>
</field>
<field name="origin"/>
<field name="amount_total"/>
</group>
<newline/>
<group expand="1" string="Group By..." colspan="12" col="10">
<filter string="Journal" icon="terp-account" domain="[]" context="{'group_by':'journal_id'}"/>
<filter string="Period" icon="terp-account" domain="[]" context="{'group_by':'period_id'}"/>
<separator orientation="vertical"/>
<field name="number" select='1'/>
<field name="partner_id" select='1'/>
<field name="amount_total" string="Price" select='1'/>
<field name="origin" select='1'/>
</group>
<group expand="context.get('report',False)" string="Group By..." colspan="4" col="10">
<filter string="Partner" icon="terp-account" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="State" icon="terp-account" domain="[]" context="{'group_by':'state'}"/>
<filter string="Date Invoice" icon="terp-account" domain="[]" context="{'group_by':'date_invoice'}"/>
</group>
<filter string="Salesman" icon="terp-account" domain="[]" context="{'group_by':'user_id'}"/>
<filter string="State" icon="terp-account" domain="[]" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
<filter string="Invoice Date" icon="terp-account" domain="[]" context="{group_by':'date_invoice'}"/>
<filter string="Due Date" icon="terp-account" domain="[]" context="{group_by':'date_due'}"/>
</group>
</search>
</field>
</record>
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/invoice.py
+2
View File
@@ -309,6 +309,7 @@ class account_invoice(osv.osv):
help="Remaining amount due."),
'payment_ids': fields.function(_compute_lines, method=True, relation='account.move.line', type="many2many", string='Payments'),
'move_name': fields.char('Ledger Posting', size=64),
'user_id': fields.many2one('res.users', 'Salesman'),
'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position')
}
_defaults = {
@@ -320,6 +321,7 @@ class account_invoice(osv.osv):
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.invoice', context=c),
'reference_type': lambda *a: 'none',
'check_total': lambda *a: 0.0,
'user_id': lambda s,cr,u,c: u,
}
def unlink(self, cr, uid, ids, context=None):
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/analytic/__terp__.py
-1
View File
@@ -36,6 +36,5 @@
],
'installable': True,
'active': False,
'certificate': '',
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/auction/i18n/fi.po
+2560
View File
File diff suppressed because it is too large Load Diff
addons/crm_project/__terp__.py
-1
View File
@@ -46,6 +46,5 @@
'demo_xml': ['crm_bugs_demo.xml'],
'installable': True,
'active': False,
'certificate': '',
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/hr_recruitment/hr_hr.py
+11
View File
@@ -58,5 +58,16 @@ class hr_applicant(osv.osv):
'type_id': fields.many2one('crm.case.resource.type', 'Degree', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]"),
'department_id':fields.many2one('hr.department','Department'),
'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
'survey' : fields.related('job_id', 'survey_id', type='many2one', relation='survey', string='Survey'),
'response' : fields.integer("Response"),
}
hr_applicant()
class hr_job(osv.osv):
_inherit = "hr.job"
_name = "hr.job"
_columns = {
'survey_id': fields.many2one('survey', 'Survey'),
}
hr_job()
addons/hr_recruitment/hr_hr_view.xml
+24 -3
View File
@@ -43,6 +43,8 @@
<field name="partner_phone"/>
<field name="job_id"/>
<field name="stage_id"/>
<field name="survey" invisible="1"/>
<field name="response" invisible="1"/>
<button name="stage_previous" string="Previous" states="open,pending" type="object" icon="gtk-go-back"/>
<button name="stage_next" string="Next" states="open,pending" type="object" icon="gtk-go-forward"/>
<field name="priority"/>
@@ -66,7 +68,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Jobs - Recruitment Form">
<group colspan="4" col="7">
<group colspan="4" col="8">
<field name="name" string="Subject"/>
<label string="Stage: " align="1.0"/>
<group colspan="1" col="2">
@@ -76,12 +78,16 @@
<field name="user_id"/>
<button string="Schedule a Phone Call"
name="%(wizard_hr_job_reschedule_phone_call)d" icon="gtk-redo" type="action"/>
<button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action"
icon="gtk-execute" context="{'survey_id': survey, 'response_id': response ,'active' : response, 'object' : 'hr.applicant', 'cur_id' :active_id}" attrs="{'readonly':[('survey','=',False)]}"/>
<newline/>
<field name="partner_name"/>
<field name="job_id"/>
<field name="department_id" widget="selection"/>
<button name="%(wizard_hr_job_meeting_set)d" string="Schedule Meeting" icon="terp-hr" type="action"/>
</group>
<button name="%(survey.survey_browse_response)d" string="Print Interview" type="action"
icon="gtk-print" context="{'survey_id': survey, 'response_id' : response,}" attrs="{'readonly':[('response','=',False)]}" />
</group>
<notebook colspan="4">
<page string="Job Info">
<group col="2" colspan="2">
@@ -109,7 +115,6 @@
<field name="write_date"/>
<field name="date_closed"/>
</group>
<separator colspan="4" string="Status"/>
<group col="8" colspan="4">
<field name="state"/>
@@ -235,5 +240,21 @@
</field>
</record>
# ------------------------------------------------------
# HR Job
# ------------------------------------------------------
<record id="hr_job_survey" model="ir.ui.view">
<field name="name">hr.job.form1</field>
<field name="model">hr.job</field>
<field name="type">form</field>
<field name="inherit_id" ref="hr.view_hr_job_form"/>
<field name="arch" type="xml">
<field name="no_of_employee" position="after">
<field name="survey_id"/>
</field>
</field>
</record>
</data>
</openerp>
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/mrp/mrp_view.xml
+122 -106
View File
@@ -5,10 +5,10 @@
<menuitem icon="terp-mrp" id="menu_mrp_root" name="Manufacturing"
groups="group_mrp_user,group_mrp_manager" sequence="3"/>
<menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4"/>
<menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="menu_mrp_root" sequence="1"/>
<menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="menu_mrp_root" sequence="1"/>
<menuitem name="Control" id="menu_mrp_control" parent="menu_mrp_root" sequence="3" />
<menuitem name="Master Data"
<menuitem name="Master Data"
id="menu_mrp_bom"
parent="menu_mrp_root"
sequence="5" />
@@ -386,6 +386,7 @@
<field name="name"/>
<field name="product_id"/>
<field name="product_qty" sum="Total Qty"/>
<field name="product_uom"/>
<field name="date_planned"/>
<field name="routing_id" groups="base.group_extended"/>
<field name="hour_total" sum="Total Hours" groups="base.group_extended"/>
@@ -446,7 +447,7 @@
id="mrp.wizard_change_production_qty"
keyword="client_action_multi"
multi="True"/>
<record id="mrp_production_form_view" model="ir.ui.view">
<field name="name">mrp.production.form</field>
<field name="model">mrp.production</field>
@@ -460,8 +461,10 @@
<field name="product_id" on_change="product_id_change(product_id)" select="1"/>
<field name="product_qty"/>
<group colspan="2" col="3">
<field name="product_uom"/>
<field name="product_uom"/>
<button type="action" name="%(mrp.wizard_change_production_qty)d" string="Change Qty" states="ready,confirmed,in_production"/>
</group>
<label string="" colspan="2"/>
<field name="product_uos_qty" groups="product.group_uos"/>
<group colspan="2" col="3" groups="product.group_uos">
@@ -479,51 +482,55 @@
<separator string="" colspan="4"/>
<field colspan="2" name="move_lines" nolabel="1" widget="one2many_list"
mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
<tree string="Products to Consume">
<field name="product_id" />
<field name="product_qty" />
<field name="product_uom" />
<field name="state" invisible="1" />
<button
name="%(stock.move_consume)d"
string=">" type="action"
icon="gtk-go-forward" context="{'consume': True}"
states="draft,waiting,confirmed,assigned"/>
<button name="%(stock.move_scrap)d"
string="D" type="action"
icon="gtk-justify-fill" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" />
</tree>
<form string="Products to Consume">
<field name="product_id" />
<field name="product_qty" />
<field name="product_uom" />
</form>
mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
<tree string="Products to Consume">
<field name="product_id" />
<field name="product_qty" />
<field name="product_uom" />
<field name="state" invisible="1" />
<button
name="%(stock.move_consume)d"
string=">" type="action"
icon="gtk-go-forward" context="{'consume': True}"
states="draft,waiting,confirmed,assigned"/>
<button name="%(stock.move_scrap)d"
string="D" type="action"
icon="gtk-justify-fill" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" />
</tree>
<form string="Products to Consume">
<field name="product_id" />
<field name="product_qty" />
<field name="product_uom" />
</form>
</field>
<field colspan="2" name="move_lines2" nolabel="1" domain="[('state','in', ('done', 'cancel'))]"
widget="one2many_list" mode="tree,form" height="275">
<tree string="Consumed Products" editable="bottom">
<field name="product_id" readonly="1" string="Product"/>
<field name="product_qty" readonly="1" string="Qty"/>
<field name="product_uom" readonly="1" string="Prod. UOM"/>
<field name="state" invisible="1" />
<field name="location_id" readonly="1" string="Source Loc."/>
<field name="prodlot_id" string="Production Lot"/>
<button
name="%(stock.track_line)d"
string="Split in production lots"
type="action" icon="gtk-justify-fill"
states="done,cancel" />
<button
name="%(stock.move_scrap)d"
string="D" type="action"
icon="gtk-convert"
states="done,cancel" />
</tree>
</field>
widget="one2many_list" mode="tree,form" height="275">
<tree string="Consumed Products" editable="bottom">
<field name="product_id" readonly="1"/>
<field name="product_qty" readonly="1"/>
<field name="product_uom" readonly="1" />
<field name="state" invisible="1" />
<field name="location_id" readonly="1"/>
<field name="prodlot_id" />
<button
name="%(stock.track_line)d"
string="Split in production lots"
type="action" icon="gtk-justify-fill"
states="done,cancel" />
<button
name="%(stock.move_scrap)d"
string="D" type="action"
icon="gtk-convert"
states="done,cancel" />
</tree>
<form string="Consumed Products">
<field name="product_id" />
<field name="product_qty" />
<field name="product_uom" />
</form>
</field>
<group col="9" colspan="4">
<field name="state" select="2"/>
<button name="action_compute" states="draft" string="Compute Data" type="object" icon="gtk-execute"/>
@@ -537,50 +544,50 @@
</page>
<page string="Finished Products">
<field colspan="2" name="move_created_ids" nolabel="1" widget="one2many_list"
mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
<tree string="Products to Finish">
<field name="product_id" />
<field name="product_qty" />
<field name="product_uom" />
<field name="state" invisible="1" />
<button
name="%(stock.move_consume)d"
string=">" type="action"
icon="gtk-go-forward"
states="draft,waiting,confirmed,assigned"/>
<button name="%(stock.move_scrap)d"
string="D" type="action"
icon="gtk-justify-fill" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" />
</tree>
<form string="Products to Finish">
<field name="product_id" />
<field name="product_qty" />
<field name="product_uom" />
</form>
mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
<tree string="Products to Finish">
<field name="product_id" />
<field name="product_qty" />
<field name="product_uom" />
<field name="state" invisible="1" />
<button
name="%(stock.move_consume)d"
string=">" type="action"
icon="gtk-go-forward"
states="draft,waiting,confirmed,assigned"/>
<button name="%(stock.move_scrap)d"
string="D" type="action"
icon="gtk-justify-fill" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" />
</tree>
<form string="Products to Finish">
<field name="product_id" />
<field name="product_qty" />
<field name="product_uom" />
</form>
</field>
<field colspan="2" name="move_created_ids2" nolabel="1" domain="[('state','in', ('done', 'cancel'))]"
widget="one2many_list" mode="tree,form" height="275">
<tree string="Finished Products" editable="bottom">
<field name="product_id" readonly="1"/>
<field name="product_qty" readonly="1"/>
<field name="product_uom" readonly="1" />
<field name="state" invisible="1" />
<field name="location_id" readonly="1"/>
<field name="prodlot_id" />
<button name="%(stock.track_line)d"
widget="one2many_list" mode="tree,form" height="275">
<tree string="Finished Products" editable="bottom">
<field name="product_id" readonly="1"/>
<field name="product_qty" readonly="1"/>
<field name="product_uom" readonly="1" />
<field name="state" invisible="1" />
<field name="location_id" readonly="1"/>
<field name="prodlot_id" />
<button name="%(stock.track_line)d"
string="Split in production lots" type="action" icon="gtk-justify-fill" states="done,cancel"/>
<button name="%(stock.move_scrap)d"
string="D" type="action" icon="gtk-go-forward"
states="done,cancel" />
</tree>
<form string="Finished Products">
<field name="product_id" />
<field name="product_qty" />
<field name="product_uom" />
</form>
</field>
<button name="%(stock.move_scrap)d"
string="D" type="action" icon="gtk-go-forward"
states="done,cancel" />
</tree>
<form string="Finished Products">
<field name="product_id" />
<field name="product_qty" />
<field name="product_uom" />
</form>
</field>
</page>
<page string="Work Orders">
<field colspan="4" name="workcenter_lines" nolabel="1">
@@ -627,27 +634,36 @@
<field name="arch" type="xml">
<search string="Search Production">
<group col='9' colspan='4'>
<filter icon="terp-mrp" string="Draft"
domain="[('state','=','draft')]"
help="Non confirmed manufacturing orders"/>
<filter icon="terp-mrp" string="Current"
default="1"
domain="[('state','in',('confirmed','ready'))]"
help="Manufacturing Orders which are waiting for raw materials"/>
<filter icon="terp-mrp" string="Ready"
domain="[('state','=','ready')]"
help="Manufacturing Orders which are ready to produce" />
domain="[('state','=','ready')]"
help="Manufacturing Orders which are ready to produce" />
<filter icon="terp-mrp" string="In Production"
domain="[('state','=','in_production')]"
help="Manufacturing Orders which are in production" />
<filter icon="terp-mrp" string="Late"
domain="['&amp;', ('date_planned::date','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
help="Production started late" />
domain="[('state','=','in_production')]"
help="Manufacturing Orders which are in production" />
<separator orientation="vertical"/>
<field name="name" select='1'/>
<field name="product_id" select='1'/>
<field name="routing_id" select='1'/>
<field name="origin" select='1'/>
<filter icon="terp-mrp" string="Late"
domain="['&amp;', ('date_planned::date','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
help="Production started late" />
<separator orientation="vertical"/>
<field name="name"/>
<field name="product_id"/>
<field name="routing_id"/>
<field name="origin"/>
</group>
<group expand="1" string="Group By" colspan="4" col="8">
<newline/>
<group expand="1" string="Group By" colspan="10" col="8">
<filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
<filter string="State" icon="terp-mrp" domain="[]" context="{'group_by':'state'}"/>
<filter string="Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/>
<filter string="Routing" icon="terp-mrp" domain="[]" context="{'group_by':'routing_id'}"/>
<separator orientation="vertical"/>
<filter string="Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/>
</group>
</search>
</field>
@@ -825,7 +841,7 @@
<button name="button_confirm" states="draft" string="Confirm" icon="gtk-apply"/>
<button name="button_restart" states="exception" string="Retry" icon="gtk-convert"/>
<button name="button_cancel" states="draft,exception,waiting" string="Cancel" icon="gtk-cancel"/>
<button name="button_check" states="confirmed" string="Run Procurement" icon="gtk-media-play"/>
<button name="button_check" states="confirmed" string="Run Procurement" icon="gtk-media-play"/>
</group>
</page>
<page string="Extra Information">
@@ -858,8 +874,8 @@
<filter icon="terp-mrp" string="Current" domain="[('state','in',('draft','confirmed'))]" default="1" help="Procurement Orders in draft or open state."/>
<filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Procurement Orders with exceptions"/>
<filter icon="terp-mrp" string="Late"
domain="['&amp;', ('date_planned::date','&lt;', current_date), ('state', 'in', ('draft', 'confirmed'))]"
help="Procurement started late" />
domain="['&amp;', ('date_planned::date','&lt;', current_date), ('state', 'in', ('draft', 'confirmed'))]"
help="Procurement started late" />
<separator orientation="vertical"/>
<field name="name"/>
<field name="origin"/>
@@ -871,7 +887,7 @@
<filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
<filter string="Reason" icon="terp-mrp" domain="[]" context="{'group_by':'name'}"/>
<filter string="Scheduled Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/>
</group>
</group>
</search>
</field>
</record>
@@ -898,7 +914,7 @@
</record>
<menuitem action="mrp_procurement_action3" id="menu_procurement_requisitions" parent="purchase.menu_procurement_management"
name="Requisitions" sequence="5" />
name="Requisitions" sequence="5" />
@@ -911,7 +927,7 @@
<field name="domain">[('state','=','exception')]</field>
</record>
<menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_exception_action" parent="mrp.menu_mrp_control"
<menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_exception_action" parent="mrp.menu_mrp_control"
sequence="1" />
<record id="mrp_procurement_action4" model="ir.actions.act_window">
<field name="name">Procurement Exceptions to Fix</field>
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/product_view.xml
+6 -5
View File
@@ -16,14 +16,15 @@
<separator orientation="vertical"/>
<field name="default_code" select="1"/>
<field name="name" select="1"/>
<field name="categ_id" select="1" widget="selection"/>
<field name="categ_id" select="1" widget="selection" operator="child_of"/>
<newline/>
<group col='8' colspan='4' expand='1' string='Group by...'>
<filter string='Category' icon="terp-stock" domain="[]" context="{'group_by' : 'categ_id'}" />
</group>
<group col='8' colspan='7' expand="1" string="Extended options...">
<group col='8' colspan='14' expand="1" string="Extended options...">
<field name="pricelist_id" select="1" widget="selection" context="{'pricelist': self}" />
</group>
<newline/>
<group col='8' colspan='15' expand='1' string='Group by...'>
<filter string='Category' icon="terp-stock" domain="[]" context="{'group_by' : 'categ_id'}" />
</group>
</search>
</field>
</record>
addons/product/security/product_security.xml
+2 -2
View File
@@ -2,7 +2,7 @@
<openerp>
<data noupdate="1">
<record id="group_uos" model="res.groups">
<record id="group_uos" context="{'noadmin':True}" model="res.groups">
<field name="name">Useability / Product UoS View</field>
</record>
<record id="group_product_manager" model="res.groups">
@@ -20,7 +20,7 @@
<field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record id="group_product_variant" model="res.groups">
<record id="group_product_variant" model="res.groups" context="{'noadmin':True}">
<field name="name">Product / Variant</field>
</record>
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/sale_crm/sale_crm_view.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<field name="type">form</field>
<field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
<field name="arch" type="xml">
<xpath expr="/form[@string='Opportunities']/group/group/button[@string='Schedule Call']" position="after">
<xpath expr="/form[@string='Opportunities']/group/button[@string='Schedule Call']" position="after">
<button string="Quotation" icon="terp-sale" name="%(sale_crm_wizard)d" type="action"/>
</xpath>
</field>
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/survey/report/survey_browse_response.py
+1 -1
View File
@@ -186,7 +186,7 @@ class survey_browse_response(report_rml):
surv_resp_obj = pooler.get_pool(cr.dbname).get('survey.response')
if datas.has_key('form') and datas['form'].has_key('response_ids'):
response_id = datas['form']['response_ids'][0][2]
elif context.has_key('response_id'):
elif context.has_key('response_id') and context['response_id']:
response_id = [int(context['response_id'])]
else:
response_id = surv_resp_obj.search(cr, uid, [('survey_id', 'in', ids)])
addons/survey/survey.py
+13 -10
View File
@@ -681,7 +681,7 @@ class survey_question_wiz(osv.osv_memory):
total_pages = len(p_id)
pre_button = False
readonly = 0
if context.has_key('response_id'):
if context.has_key('response_id') and context['response_id']:
readonly = 1
if not sur_name_rec['page_no'] + 1 :
surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'store_ans':{}})
@@ -693,7 +693,7 @@ class survey_question_wiz(osv.osv_memory):
fields = {}
if sur_name_read['page'] == "next" or sur_name_rec['page_no'] == - 1 :
if len(p_id) > sur_name_rec['page_no'] + 1 :
if not context.has_key('active') and not sur_name_rec['page_no'] + 1:
if ((context.has_key('active') and not context['active']) or not context.has_key('active')) and not sur_name_rec['page_no'] + 1:
cr.execute('select count(id) from survey_history where user_id=%s\
and survey_id=%s' % (uid,survey_id))
res = cr.fetchone()[0]
@@ -735,12 +735,12 @@ class survey_question_wiz(osv.osv_memory):
que_rec = que_obj.read(cr, uid, que)
descriptive_text = ""
separator_string = tools.ustr(qu_no) + "." + tools.ustr(que_rec['question'])
if not context.has_key('active') and que_rec['is_require_answer']:
star='*'
if ((context.has_key('active') and not context['active']) or not context.has_key('active')) and que_rec['is_require_answer']:
star = '*'
else:
star=''
star = ''
xml_group = etree.SubElement(xml_form, 'group', {'col': '2', 'colspan': '4'})
if context.has_key('active') and context.has_key('edit'):
if context.has_key('active') and context['active'] and context.has_key('edit'):
xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '2'})
etree.SubElement(xml_group, 'separator', {'string': star+to_xml(separator_string), 'colspan': '3'})
xml_group1 = etree.SubElement(xml_form, 'group', {'col': '2', 'colspan': '2'})
@@ -902,11 +902,11 @@ class survey_question_wiz(osv.osv_memory):
but_string = "Next"
if int(page_number) + 1 == total_pages:
but_string = "Done"
if context.has_key('active') and int(page_number) + 1 == total_pages:
if context.has_key('active') and context['active'] and int(page_number) + 1 == total_pages:
etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'string': "Done" ,'special':"cancel",'context' : tools.ustr(context)})
else:
etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'name':"action_next",'string': tools.ustr(but_string) ,'type':"object",'context' : tools.ustr(context)})
if context.has_key('active') and context.has_key('edit'):
if context.has_key('active') and context['active'] and context.has_key('edit'):
etree.SubElement(xml_form, 'separator', {'string' : '','colspan': '4'})
context.update({'page_id' : tools.ustr(p_id),'page_number' : sur_name_rec['page_no'] , 'transfer' : sur_name_read['transfer']})
xml_group3 = etree.SubElement(xml_form, 'group', {'col': '4', 'colspan': '4'})
@@ -985,8 +985,8 @@ class survey_question_wiz(osv.osv_memory):
tot_page_id = self.pool.get('survey').browse(cr, uid, context['survey_id'])
tot_per = (float(100) * (int(field.split('_')[2]) + 1) / len(tot_page_id.page_ids))
value[field] = tot_per
if context.has_key('response_id'):
response_obj = self.pool.get('survey.response')
response_obj = self.pool.get('survey.response')
if context.has_key('response_id') and context['response_id']:
response_ans = response_obj.browse(cr, uid, context['response_id'])
fields_list.sort()
for que in response_ans.question_ids:
@@ -1066,6 +1066,9 @@ class survey_question_wiz(osv.osv_memory):
survey_obj = self.pool.get('survey')
sur_rec = survey_obj.read(cr, uid, sur_name_read['survey_id'])
survey_obj.write(cr, uid, sur_name_read['survey_id'], {'tot_start_survey' : sur_rec['tot_start_survey'] + 1})
if context.has_key('cur_id'):
self.pool.get(context['object']).write(cr, uid, [int(context['cur_id'])], {'response' : response_id})
for key,val in sur_name_read['store_ans'].items():
for field in vals:
if field.split('_')[0] == val['question_id']:
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