[MERGE] merge from lp:~openerp/openobject-addons/trunk/

bzr revid: hmo@tinyerp.com-20100315064056-wf12b99uz3700nyi
bzr revid: hmo@tinyerp.com-20100316063137-siiqwyr7q62mu5xs
This commit is contained in:
Harry (Open ERP) 2010-03-16 12:01:37 +05:30
commit 4b08bc496f
31 changed files with 3865 additions and 387 deletions

File diff suppressed because it is too large Load Diff

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-03-11 15:54+0000\n"
"PO-Revision-Date: 2010-03-15 14:11+0000\n"
"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\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-03-12 04:51+0000\n"
"X-Launchpad-Export-Date: 2010-03-16 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -813,7 +813,7 @@ msgstr "Flytta rader"
#. module: account
#: model:ir.model,name:account.model_account_config_wizard
msgid "account.config.wizard"
msgstr "Kontokonfiguration guide"
msgstr "account.config.wizard"
#. module: account
#: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
@ -1555,7 +1555,7 @@ msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_legal_statement
msgid "Legal Statements"
msgstr ""
msgstr "Myndighetsrapporter"
#. module: account
#: field:account.tax.code,parent_id:0
@ -2254,7 +2254,7 @@ msgstr "Öppna transaktionsjournal"
#. module: account
#: view:account.config.wizard:0
msgid "Create a Fiscal Year"
msgstr "Skapa nytt verksamhetsår"
msgstr "Skapa ett verksamhetsår"
#. module: account
#: field:product.template,taxes_id:0
@ -3665,17 +3665,17 @@ msgstr ""
#: wizard_view:account.invoice.refund,init:0
#: model:ir.actions.wizard,name:account.wizard_invoice_refund
msgid "Credit Note"
msgstr ""
msgstr "Kreditnota"
#. module: account
#: model:ir.actions.todo,note:account.config_fiscalyear
msgid "Define Fiscal Years and Select Charts of Account"
msgstr ""
msgstr "Definiera verksamhetsåren och välj kontoplan"
#. module: account
#: wizard_field:account.move.line.reconcile,addendum,period_id:0
msgid "Write-Off Period"
msgstr ""
msgstr "Avskrivningsperiod"
#. module: account
#: selection:account.config.wizard,period:0
@ -3703,7 +3703,7 @@ msgstr ""
#: selection:account.config.wizard,period:0
#: field:report.hr.timesheet.invoice.journal,name:0
msgid "Month"
msgstr ""
msgstr "Månad"
#. module: account
#: model:ir.model,name:account.model_account_subscription
@ -3737,7 +3737,7 @@ msgstr ""
#: field:account.fiscalyear,date_start:0
#: field:account.subscription,date_start:0
msgid "Start Date"
msgstr ""
msgstr "Startdatum"
#. module: account
#: wizard_view:account.general.ledger.report,account_selection:0
@ -3952,12 +3952,12 @@ msgstr "Importera från dina bankutdrag"
#. module: account
#: view:account.chart.template:0
msgid "Properties"
msgstr ""
msgstr "Egenskaper"
#. module: account
#: view:res.partner:0
msgid "Customer Accounting Properties"
msgstr ""
msgstr "Kundens bokföringsinställningar"
#. module: account
#: view:account.bank.statement:0
@ -4021,7 +4021,7 @@ msgstr ""
#: field:account.tax,account_paid_id:0
#: field:account.tax.template,account_paid_id:0
msgid "Refund Tax Account"
msgstr ""
msgstr "Skatteåterbäringskonto"
#. module: account
#: field:account.tax.code,child_ids:0
@ -4038,17 +4038,17 @@ msgstr ""
#: view:account.bank.statement:0
#: field:account.bank.statement,line_ids:0
msgid "Statement lines"
msgstr ""
msgstr "Verifikatrader"
#. module: account
#: field:account.move.line,amount_taxed:0
msgid "Taxed Amount"
msgstr ""
msgstr "Skatteunderlag"
#. module: account
#: field:account.invoice.line,price_subtotal:0
msgid "Subtotal w/o tax"
msgstr ""
msgstr "Nettobelopp"
#. module: account
#: field:account.invoice.line,invoice_id:0
@ -4058,7 +4058,7 @@ msgstr ""
#. module: account
#: field:account.analytic.line,general_account_id:0
msgid "General Account"
msgstr ""
msgstr "Huvudkonton"
#. module: account
#: help:account.move.line,quantity:0
@ -4114,12 +4114,12 @@ msgstr ""
#. module: account
#: field:wizard.multi.charts.accounts,seq_journal:0
msgid "Separated Journal Sequences"
msgstr ""
msgstr "Separerade nummerserier för böcker"
#. module: account
#: help:account.bank.statement.reconcile,total_second_currency:0
msgid "The currency of the journal"
msgstr ""
msgstr "Valuta för boken"
#. module: account
#: view:account.journal.column:0
@ -4149,7 +4149,7 @@ msgstr "Klar"
#: model:ir.ui.menu,name:account.menu_action_account_period_form
#: model:ir.ui.menu,name:account.next_id_23
msgid "Periods"
msgstr ""
msgstr "Perioder"
#. module: account
#: rml:account.invoice:0
@ -4166,7 +4166,7 @@ msgstr "Faktura"
#: wizard_button:account.open_closed_fiscalyear,init,open:0
#: wizard_button:account_use_models,create,open_move:0
msgid "Open"
msgstr ""
msgstr "Öppen"
#. module: account
#: model:ir.ui.menu,name:account.next_id_29
@ -4253,7 +4253,7 @@ msgstr "Ok"
#. module: account
#: rml:account.invoice:0
msgid "Taxes:"
msgstr ""
msgstr "Skatter:"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree7
@ -4714,7 +4714,7 @@ msgstr ""
#. module: account
#: view:account.fiscalyear:0
msgid "Create Monthly Periods"
msgstr ""
msgstr "Skapa månatliga perioder"
#. module: account
#: wizard_button:account.aged.trial.balance,init,print:0
@ -4841,7 +4841,7 @@ msgstr "Total:"
#. module: account
#: model:ir.model,name:account.model_account_analytic_journal
msgid "account.analytic.journal"
msgstr ""
msgstr "account.analytic.journal"
#. module: account
#: view:account.fiscal.position:0
@ -5478,7 +5478,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_tax_template
msgid "account.tax.template"
msgstr ""
msgstr "account.tax.template"
#. module: account
#: field:wizard.multi.charts.accounts,bank_accounts_id:0
@ -5746,7 +5746,7 @@ msgstr "Bokföringsegenskaper"
#. module: account
#: model:ir.model,name:account.model_account_sequence_fiscalyear
msgid "account.sequence.fiscalyear"
msgstr ""
msgstr "account.sequence.fiscalyear"
#. module: account
#: wizard_field:account.print.journal.report,init,sort_selection:0

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-23 10:50+0000\n"
"PO-Revision-Date: 2010-03-15 03:12+0000\n"
"Last-Translator: Songpon Phusing <p.songpon@gmail.com>\n"
"Language-Team: Thai <th@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-11 04:52+0000\n"
"X-Launchpad-Export-Date: 2010-03-16 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -25,23 +25,23 @@ msgstr "ชื่อเรียกภายใน"
#. module: account
#: view:account.tax.code:0
msgid "Account Tax Code"
msgstr ""
msgstr "รหัสบัญชีภาษี"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree9
#: model:ir.ui.menu,name:account.menu_action_invoice_tree9
msgid "Unpaid Supplier Invoices"
msgstr ""
msgstr "ใบแจ้งหนี้ที่ยังไม่จ่าย"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_entries
msgid "Entries Encoding"
msgstr ""
msgstr "กรอกข้อมูล"
#. module: account
#: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
msgid "Specify The Message for the Overdue Payment Report."
msgstr ""
msgstr "ระบุข้อความสำหรับรายงานของการจ่ายที่เกินกำหนด"
#. module: account
#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
@ -66,7 +66,7 @@ msgstr ""
#. module: account
#: wizard_view:account_use_models,init_form:0
msgid "Select Message"
msgstr ""
msgstr "เลือกข้อความ"
#. module: account
#: help:product.category,property_account_income_categ:0

View File

@ -114,7 +114,7 @@ class wizard_report(wizard.interface):
sql = """
SELECT f.id, f.date_start, f.date_stop FROM account_fiscalyear f Where %s between f.date_start and f.date_stop """
cr.execute(sql,(data['form']['date1']))
cr.execute(sql,(data['form']['date1'],))
res = cr.dictfetchall()
if res:
if (data['form']['date2'] > res[0]['date_stop'] or data['form']['date2'] < res[0]['date_start']):

View File

@ -0,0 +1,335 @@
# Occitan (post 1500) 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-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-12 13:35+0000\n"
"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
"Language-Team: Occitan (post 1500) <oc@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-13 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
#: help:account.analytic.account,hours_qtt_invoiced:0
msgid ""
"Number of hours that can be invoiced plus those that already have been "
"invoiced."
msgstr ""
#. module: account_analytic_analysis
#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
msgid "Hours summary by user"
msgstr ""
#. module: account_analytic_analysis
#: field:account.analytic.account,last_invoice_date:0
msgid "Last Invoice Date"
msgstr ""
#. module: account_analytic_analysis
#: help:account.analytic.account,remaining_ca:0
msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
msgstr ""
#. module: account_analytic_analysis
#: help:account.analytic.account,remaining_hours:0
msgid "Computed using the formula: Maximum Quantity - Hours Tot."
msgstr ""
#. module: account_analytic_analysis
#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all
msgid "All Analytic Accounts"
msgstr ""
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_open
#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_open
msgid "My Current Accounts"
msgstr ""
#. module: account_analytic_analysis
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "XML invalid per l'arquitectura de la vista"
#. module: account_analytic_analysis
#: help:account.analytic.account,last_invoice_date:0
msgid "Date of the last invoice created for this analytic account."
msgstr ""
#. module: account_analytic_analysis
#: field:account.analytic.account,ca_theorical:0
msgid "Theorical Revenue"
msgstr ""
#. module: account_analytic_analysis
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr ""
#. module: account_analytic_analysis
#: help:account.analytic.account,theorical_margin:0
msgid "Computed using the formula: Theorial Revenue - Total Costs"
msgstr ""
#. module: account_analytic_analysis
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_new
#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_new
msgid "New Analytic Account"
msgstr ""
#. module: account_analytic_analysis
#: field:account.analytic.account,theorical_margin:0
msgid "Theorical Margin"
msgstr ""
#. module: account_analytic_analysis
#: field:account.analytic.account,real_margin_rate:0
msgid "Real Margin Rate (%)"
msgstr ""
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_open
#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_open
msgid "Current Analytic Accounts"
msgstr ""
#. module: account_analytic_analysis
#: help:account.analytic.account,last_worked_date:0
msgid "Date of the latest work done on this account."
msgstr ""
#. module: account_analytic_analysis
#: help:account.analytic.account,last_worked_invoiced_date:0
msgid ""
"If invoice from the costs, this is the date of the latest work or cost that "
"have been invoiced."
msgstr ""
#. module: account_analytic_analysis
#: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
msgid "Invoicing"
msgstr ""
#. module: account_analytic_analysis
#: field:account.analytic.account,last_worked_date:0
msgid "Date of Last Cost/Work"
msgstr ""
#. module: account_analytic_analysis
#: field:account.analytic.account,total_cost:0
msgid "Total Costs"
msgstr ""
#. module: account_analytic_analysis
#: help:account.analytic.account,hours_quantity:0
msgid ""
"Number of hours you spent on the analytic account (from timesheet). It "
"computes on all journal of type 'general'."
msgstr ""
#. module: account_analytic_analysis
#: field:account.analytic.account,remaining_hours:0
msgid "Remaining Hours"
msgstr ""
#. module: account_analytic_analysis
#: help:account.analytic.account,ca_theorical:0
msgid ""
"Based on the costs you had on the project, what would have been the revenue "
"if all these costs have been invoiced at the normal sale price provided by "
"the pricelist."
msgstr ""
#. module: account_analytic_analysis
#: field:account.analytic.account,user_ids:0
#: field:account_analytic_analysis.summary.user,user:0
msgid "User"
msgstr "Utilizaire"
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_pending
#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_pending
msgid "My Pending Accounts"
msgstr ""
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_my
#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_my
msgid "My Uninvoiced Entries"
msgstr ""
#. module: account_analytic_analysis
#: help:account.analytic.account,real_margin:0
msgid "Computed using the formula: Invoiced Amount - Total Costs."
msgstr ""
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed
#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_managed
msgid "My Accounts"
msgstr "Mos comptes"
#. module: account_analytic_analysis
#: model:ir.module.module,description:account_analytic_analysis.module_meta_information
msgid ""
"Modify account analytic view to show\n"
"important data for project manager of services companies.\n"
"Add menu to show relevant information for each manager."
msgstr ""
#. module: account_analytic_analysis
#: field:account.analytic.account,hours_qtt_non_invoiced:0
msgid "Uninvoiced Hours"
msgstr ""
#. module: account_analytic_analysis
#: field:account.analytic.account,hours_quantity:0
msgid "Hours Tot"
msgstr ""
#. module: account_analytic_analysis
#: model:ir.ui.menu,name:account_analytic_analysis.menu_account
msgid "Analytic Accounts"
msgstr ""
#. module: account_analytic_analysis
#: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
msgid "report_account_analytic"
msgstr "report_account_analytic"
#. module: account_analytic_analysis
#: field:account.analytic.account,ca_invoiced:0
msgid "Invoiced Amount"
msgstr "Montant facturat"
#. module: account_analytic_analysis
#: model:ir.ui.menu,name:account_analytic_analysis.next_id_71
msgid "Financial Project Management"
msgstr ""
#. module: account_analytic_analysis
#: field:account.analytic.account,last_worked_invoiced_date:0
msgid "Date of Last Invoiced Cost"
msgstr ""
#. module: account_analytic_analysis
#: field:account.analytic.account,ca_to_invoice:0
msgid "Uninvoiced Amount"
msgstr ""
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_pending
#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_pending
msgid "Pending Analytic Accounts"
msgstr ""
#. module: account_analytic_analysis
#: field:account.analytic.account,hours_qtt_invoiced:0
msgid "Invoiced Hours"
msgstr ""
#. module: account_analytic_analysis
#: field:account.analytic.account,real_margin:0
msgid "Real Margin"
msgstr ""
#. module: account_analytic_analysis
#: help:account.analytic.account,ca_invoiced:0
msgid "Total customer invoiced amount for this account."
msgstr ""
#. module: account_analytic_analysis
#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
msgid "Hours summary by month"
msgstr ""
#. module: account_analytic_analysis
#: help:account.analytic.account,real_margin_rate:0
msgid "Computes using the formula: (Real Margin / Total Costs) * 100."
msgstr ""
#. module: account_analytic_analysis
#: help:account.analytic.account,hours_qtt_non_invoiced:0
msgid ""
"Number of hours (from journal of type 'general') that can be invoiced if you "
"invoice based on analytic account."
msgstr ""
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Analytic accounts"
msgstr "Compte analitic"
#. module: account_analytic_analysis
#: field:account.analytic.account,remaining_ca:0
msgid "Remaining Revenue"
msgstr ""
#. module: account_analytic_analysis
#: help:account.analytic.account,ca_to_invoice:0
msgid ""
"If invoice from analytic account, the remaining amount you can invoice to "
"the customer based on the total costs."
msgstr ""
#. module: account_analytic_analysis
#: help:account.analytic.account,revenue_per_hour:0
msgid "Computed using the formula: Invoiced Amount / Hours Tot."
msgstr ""
#. module: account_analytic_analysis
#: field:account.analytic.account,revenue_per_hour:0
msgid "Revenue per Hours (real)"
msgstr ""
#. module: account_analytic_analysis
#: field:account_analytic_analysis.summary.month,unit_amount:0
#: field:account_analytic_analysis.summary.user,unit_amount:0
msgid "Total Time"
msgstr "Durada totala"
#. module: account_analytic_analysis
#: field:account.analytic.account,month_ids:0
#: field:account_analytic_analysis.summary.month,month:0
msgid "Month"
msgstr "Mes"
#. module: account_analytic_analysis
#: field:account_analytic_analysis.summary.month,account_id:0
#: field:account_analytic_analysis.summary.user,account_id:0
msgid "Analytic Account"
msgstr ""
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed
#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_managed_overpassed
msgid "Overpassed Accounts"
msgstr ""
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
msgid "All Uninvoiced Entries"
msgstr ""
#. module: account_analytic_analysis
#: help:account.analytic.account,total_cost:0
msgid ""
"Total of costs for this account. It includes real costs (from invoices) and "
"indirect costs, like time spent on timesheets."
msgstr ""

View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from lxml import etree
@ -85,7 +85,7 @@ class account_analytic_plan_instance(osv.osv):
_columns={
'name':fields.char('Analytic Distribution',size=64),
'code':fields.char('Distribution Code',size=16),
'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True),
'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal' ),
'account_ids':fields.one2many('account.analytic.plan.instance.line','plan_id','Account Id'),
'account1_ids':one2many_mod2('account.analytic.plan.instance.line','plan_id','Account1 Id'),
'account2_ids':one2many_mod2('account.analytic.plan.instance.line','plan_id','Account2 Id'),
@ -258,8 +258,8 @@ class account_invoice_line(osv.osv):
res ['analytics_id']=line.analytics_id and line.analytics_id.id or False
return res
def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, context=None):
res_prod = super(account_invoice_line,self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, context)
def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
res_prod = super(account_invoice_line,self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context=context)
rec = self.pool.get('account.analytic.default').account_get(cr, uid, product, partner_id, uid, time.strftime('%Y-%m-%d'), context)
if rec and rec.analytics_id:
res_prod['value'].update({'analytics_id':rec.analytics_id.id})
@ -284,6 +284,9 @@ class account_move_line(osv.osv):
super(account_move_line, self).create_analytic_lines(cr, uid, ids, context)
for line in self.browse(cr, uid, ids, context):
if line.analytics_id:
if not line.journal_id.analytic_journal_id:
raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (line.journal_id.name,))
toremove = self.pool.get('account.analytic.line').search(cr, uid, [('move_id','=',line.id)], context=context)
if toremove:
line.unlink(cr, uid, toremove, context=context)
@ -300,7 +303,7 @@ class account_move_line(osv.osv):
'amount': amt,
'general_account_id': line.account_id.id,
'move_id': line.id,
'journal_id': line.analytics_id.journal_id.id,
'journal_id': line.journal_id.analytic_journal_id.id,
'ref': line.ref,
}
ali_id=self.pool.get('account.analytic.line').create(cr,uid,al_vals)

View File

@ -7,48 +7,47 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-09-16 17:29+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"PO-Revision-Date: 2010-03-12 23:52+0000\n"
"Last-Translator: Emerson <Unknown>\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-03-11 04:56+0000\n"
"X-Launchpad-Export-Date: 2010-03-14 05:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account4_ids:0
msgid "Account4 Id"
msgstr ""
msgstr "ID Conta4"
#. module: account_analytic_plans
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
"O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
"especial!"
"O nome do objeto deve começar com x_ e não conter caracteres especiais!"
#. module: account_analytic_plans
#: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
#: model:ir.actions.wizard,name:account_analytic_plans.account_analytic_account_inverted_balance_report
msgid "Crossovered Analytic"
msgstr ""
msgstr "Analítico Cruzado"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account5_ids:0
msgid "Account5 Id"
msgstr ""
msgstr "ID Conta5"
#. module: account_analytic_plans
#: wizard_field:wizard.crossovered.analytic,init,date2:0
msgid "End Date"
msgstr ""
msgstr "Data Final"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance.line,rate:0
msgid "Rate (%)"
msgstr ""
msgstr "Taxa (%)"
#. module: account_analytic_plans
#: view:account.analytic.plan:0
@ -57,82 +56,82 @@ msgstr ""
#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action
#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action
msgid "Analytic Plan"
msgstr ""
msgstr "Plano analítico"
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
msgid "Analytic Instance Line"
msgstr ""
msgstr "Linha Analítica de Instância"
#. module: account_analytic_plans
#: view:account.analytic.plan.instance.line:0
msgid "Analytic Distribution Lines"
msgstr ""
msgstr "Linhas da Distribuição Analítica"
#. module: account_analytic_plans
#: wizard_button:wizard.crossovered.analytic,init,print:0
msgid "Print"
msgstr ""
msgstr "Imprimir"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "To Date"
msgstr ""
msgstr "Até a Data"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance.line,plan_id:0
msgid "Plan Id"
msgstr ""
msgstr "ID do Plano"
#. module: account_analytic_plans
#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
msgid "Analytic Distribution's Models"
msgstr ""
msgstr "Modelos de distribuição analítica"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "Account Name"
msgstr ""
msgstr "Nome da Conta"
#. module: account_analytic_plans
#: view:account.analytic.plan.instance.line:0
msgid "Analytic Distribution Line"
msgstr ""
msgstr "Linha da Distribuição Analítica"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,code:0
msgid "Distribution Code"
msgstr ""
msgstr "Código de Distribuição"
#. module: account_analytic_plans
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr ""
msgstr "Nome de modelo inválido na definição da ação."
#. module: account_analytic_plans
#: field:account.analytic.plan.line,name:0
msgid "Plan Name"
msgstr ""
msgstr "Nome do Plano"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "Printing date"
msgstr ""
msgstr "Data de impressão"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "Percentage"
msgstr ""
msgstr "Percentual"
#. module: account_analytic_plans
#: wizard_field:wizard.crossovered.analytic,init,empty_line:0
msgid "Dont show empty lines"
msgstr ""
msgstr "Não mostrar linhas em branco"
#. module: account_analytic_plans
#: wizard_view:wizard.crossovered.analytic,init:0
msgid "Select Information"
msgstr ""
msgstr "Selecione Informação"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account3_ids:0
@ -143,17 +142,17 @@ msgstr ""
#: field:account.analytic.plan.instance,journal_id:0
#: wizard_field:wizard.crossovered.analytic,init,journal_ids:0
msgid "Analytic Journal"
msgstr ""
msgstr "Diário Analítico"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "100.00%"
msgstr ""
msgstr "100.00%"
#. module: account_analytic_plans
#: wizard_field:wizard.crossovered.analytic,init,ref:0
msgid "Analytic Account Ref."
msgstr ""
msgstr "Ref. Conta Analítica"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0

View File

@ -0,0 +1,64 @@
# Occitan (post 1500) 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-24 12:50+0000\n"
"PO-Revision-Date: 2010-03-12 13:37+0000\n"
"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
"Language-Team: Occitan (post 1500) <oc@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-13 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_anglo_saxon
#: view:product.category:0
msgid " Accounting Property"
msgstr ""
#. module: account_anglo_saxon
#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
msgid ""
"This module will support the Anglo-Saxons accounting methodology by \n"
" changing the accounting logic with stock transactions. The difference "
"between the Anglo-Saxon accounting countries \n"
" and the Rhine or also called Continental accounting countries is the "
"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
" Anglo-Saxons accounting does take the cost when sales invoice is "
"created, Continental accounting will take the cost at he moment the goods "
"are shipped.\n"
" This module will add this functionality by using a interim account, to "
"store the value of shipped goods and will contra book this interim account \n"
" when the invoice is created to transfer this amount to the debtor or "
"creditor account."
msgstr ""
#. module: account_anglo_saxon
#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
msgid "Stock Account"
msgstr ""
#. module: account_anglo_saxon
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "XML invalid per l'arquitectura de la vista"
#. module: account_anglo_saxon
#: field:product.category,property_account_creditor_price_difference_categ:0
#: field:product.template,property_account_creditor_price_difference:0
msgid "Price Difference Account"
msgstr ""
#. module: account_anglo_saxon
#: help:product.category,property_account_creditor_price_difference_categ:0
#: help:product.template,property_account_creditor_price_difference:0
msgid ""
"This account will be used to value price difference between purchase price "
"and cost price."
msgstr ""

View File

@ -0,0 +1,33 @@
# Occitan (post 1500) 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-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-12 13:29+0000\n"
"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
"Language-Team: Occitan (post 1500) <oc@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-13 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "XML invalid per l'arquitectura de la vista"
#. module: account_date_check
#: field:account.journal,allow_date:0
msgid "Allows date not in the period"
msgstr ""
#. module: account_date_check
#: model:ir.module.module,shortdesc:account_date_check.module_meta_information
msgid "Account Date check"
msgstr ""

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-03-02 15:41+0000\n"
"Last-Translator: smii <Unknown>\n"
"PO-Revision-Date: 2010-03-12 13:04+0000\n"
"Last-Translator: Henri Kovalainen <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-03-11 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-03-13 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
@ -83,7 +83,7 @@ msgstr ""
#. module: account_followup
#: field:account_followup.stat,debit:0
msgid "Debit"
msgstr "debet"
msgstr "Debet"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
@ -162,7 +162,7 @@ msgstr "Sähköpostin aihe"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Paid"
msgstr "Maksu"
msgstr "Maksettu"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
@ -336,7 +336,7 @@ msgstr ""
#. module: account_followup
#: field:account_followup.stat,balance:0
msgid "Balance"
msgstr "Balanssi"
msgstr "Saldo"
#. module: account_followup
#: help:account_followup.followup.print.all,init,date:0

View File

@ -255,7 +255,7 @@ class account_analytic_account(osv.osv):
if not parent_id:
return {}
parent = self.read(cr, uid, [parent_id], ['partner_id','code'])[0]
childs = self.search(cr, uid, [('parent_id', '=', parent_id), ('active', 'in', [True, False])])
childs = self.search(cr, uid, [('parent_id', '=', parent_id)])
numchild = len(childs)
if parent['partner_id']:
partner = parent['partner_id'][0]

View File

@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
"PO-Revision-Date: 2010-03-11 23:55+0000\n"
"PO-Revision-Date: 2010-03-12 20:47+0000\n"
"Last-Translator: Mauri Latvala <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-03-12 04:51+0000\n"
"X-Launchpad-Export-Date: 2010-03-13 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
#: field:crm.email.add.cc,name:0
msgid "Send to"
msgstr "Lähetä"
msgstr "Vastaanottaja"
#. module: crm
#: help:crm.meeting,exdate:0
@ -508,7 +508,7 @@ msgstr ""
#. module: crm
#: view:crm.case.rule:0
msgid "%(partner)s = Partner name"
msgstr ""
msgstr "%(kumppani)t = Kumppanin nimi"
#. module: crm
#: view:crm.case:0
@ -1087,7 +1087,7 @@ msgstr ""
#. module: crm
#: field:crm.case,partner_mobile:0
msgid "Mobile"
msgstr ""
msgstr "Matkapuhelin"
#. module: crm
#: field:crm.case.rule,name:0
@ -1108,12 +1108,12 @@ msgstr "Tapaushistoria"
#. module: crm
#: model:crm.case.categ,name:crm.categ_job2
msgid "Junior Developer"
msgstr ""
msgstr "Nuorempi kehittäjä"
#. module: crm
#: view:crm.meeting:0
msgid "My Meetings"
msgstr ""
msgstr "Omat kokoukset"
#. module: crm
#: field:crm.case.categ,name:0
@ -1123,7 +1123,7 @@ msgstr "Tapahtumakategorian nimi"
#. module: crm
#: model:crm.case.category2,name:crm.category_claim2
msgid "Preventive"
msgstr ""
msgstr "Ennaltaehkäisevä"
#. module: crm
#: field:crm.case.rule,act_email_cc:0
@ -1143,7 +1143,7 @@ msgstr ""
#: code:addons/crm/crm_phonecall.py:0
#, python-format
msgid "You can not assign Closed Case."
msgstr ""
msgstr "Et voi valita suljettua tapausta"
#. module: crm
#: help:crm.case.rule,act_remind_partner:0
@ -1161,7 +1161,7 @@ msgstr ""
#: view:crm.meeting:0
#, python-format
msgid "Meetings"
msgstr ""
msgstr "Kokoukset"
#. module: crm
#: view:crm.case.rule:0
@ -1186,12 +1186,12 @@ msgstr "Määräaika"
#: wizard_button:caldav.crm.import,init,end:0
#: wizard_button:caldav.crm.subscribe,init,end:0
msgid "_Cancel"
msgstr ""
msgstr "_Peruuta"
#. module: crm
#: field:crm.case,category2_id:0
msgid "Category Name"
msgstr ""
msgstr "Kategorian nimi"
#. module: crm
#: view:crm.segmentation:0
@ -1215,12 +1215,12 @@ msgstr "Tapahtuman kategoria"
#: view:crm.phonecall:0
#: wizard_field:crm.send.mail,init,subject:0
msgid "Subject"
msgstr ""
msgstr "Aihe"
#. module: crm
#: field:crm.meeting,attendees:0
msgid "Attendees"
msgstr ""
msgstr "Osallistujat"
#. module: crm
#: model:ir.module.module,description:crm.module_meta_information
@ -1281,7 +1281,7 @@ msgstr ""
#. module: crm
#: model:process.transition,note:crm.process_transition_leadpartner0
msgid "Prospect is converting to business partner"
msgstr ""
msgstr "Ehdokas on muuttumassa liiketoimintakumppaniksi"
#. module: crm
#: view:crm.case.rule:0
@ -1291,24 +1291,24 @@ msgstr ""
#. module: crm
#: view:crm.claim:0
msgid "Pending Claims"
msgstr ""
msgstr "Odottavat vaateet"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_stage
msgid "Cases by Opportunities, Category and Stage"
msgstr ""
msgstr "Tapahtumat mahdollisuuden, kategorian ja vaiheen mukaan"
#. module: crm
#: model:crm.case.category2,name:crm.category_lead4
msgid "Print"
msgstr ""
msgstr "Tulosta"
#. module: crm
#: field:crm.case,som:0
#: field:crm.case.log,som:0
#: selection:crm.segmentation.line,expr_name:0
msgid "State of Mind"
msgstr ""
msgstr "Mielentila"
#. module: crm
#: view:crm.claim:0
@ -1316,12 +1316,12 @@ msgstr ""
#: field:report.crm.case.section.categ.categ2,category2_id:0
#: field:report.crm.case.section.categ2,category2_id:0
msgid "Type"
msgstr ""
msgstr "Tyyppi"
#. module: crm
#: view:crm.job:0
msgid "Candidate Refused"
msgstr ""
msgstr "Ehdokas kieltäytynyt"
#. module: crm
#: view:crm.segmentation:0
@ -1344,7 +1344,7 @@ msgstr "Segmentoinnit"
#. module: crm
#: selection:crm.case.rule,trg_date_type:0
msgid "Creation Date"
msgstr ""
msgstr "Luontipäivämäärä"
#. module: crm
#: view:crm.meeting:0
@ -1377,7 +1377,7 @@ msgstr ""
#. module: crm
#: model:crm.case.stage,name:crm.stage_oppor6
msgid "Closed Won"
msgstr ""
msgstr "Suljettu voitettuna"
#. module: crm
#: model:ir.actions.act_window,name:crm.act_crm_case_categ_crm_case_opened
@ -1396,12 +1396,12 @@ msgstr "Avoimet tapahtumat"
#: field:report.crm.case.section.categ2,stage_id:0
#: field:report.crm.case.section.stage,stage_id:0
msgid "Stage"
msgstr ""
msgstr "Vaihe"
#. module: crm
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
#. module: crm
#: help:crm.case.section,active:0
@ -1409,31 +1409,33 @@ msgid ""
"If the active field is set to true, it will allow you to hide the case "
"section without removing it."
msgstr ""
"Jos aktiivisen kentän arvoksi asetetaan TOSI, sallii se sinun piilottaa "
"tapauksen osiot poistamatta niitä."
#. module: crm
#: model:crm.case.categ,name:crm.categ_fund2
msgid "Learning And Education"
msgstr ""
msgstr "Oppiminen ja koulutus"
#. module: crm
#: wizard_view:crm.phonecall.opportunity_set,create_partner:0
#: wizard_view:crm.phonecall.partner_create,init:0
msgid "Are you sure you want to create a partner based on this phonecall ?"
msgstr ""
msgstr "Haluatko varmasti luoda kumppanin tämän puhelun perusteella?"
#. module: crm
#: view:crm.case.stage:0
#: model:ir.actions.act_window,name:crm.crm_case_stage_act
#: model:ir.ui.menu,name:crm.menu_crm_case_stage_act
msgid "Stages"
msgstr ""
msgstr "Vaiheet"
#. module: crm
#: wizard_field:crm.case.opportunity.partner_opportunity,init,planned_revenue:0
#: wizard_field:crm.lead.opportunity_set,opportunity,planned_revenue:0
#: wizard_field:crm.phonecall.opportunity_set,opportunity,planned_revenue:0
msgid "Expected Revenue"
msgstr ""
msgstr "Odotettu tuotto"
#. module: crm
#: view:crm.meeting:0
@ -1445,7 +1447,7 @@ msgstr ""
#: view:crm.lead:0
#: view:crm.phonecall:0
msgid "Convert to Partner"
msgstr ""
msgstr "Muunna kumppaniksi"
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_category_act_meetall3
@ -1461,7 +1463,7 @@ msgstr ""
#: code:addons/crm/crm.py:0
#, python-format
msgid "You can not delete this case. You should better cancel it."
msgstr ""
msgstr "Et voi poistaa tätä kohtaa. Sinun olisi parempi peruuttaa se."
#. module: crm
#: wizard_button:caldav.crm.subscribe,init,open:0
@ -1486,7 +1488,7 @@ msgstr ""
#. module: crm
#: wizard_view:caldav.crm.subscribe,display:0
msgid "Message..."
msgstr ""
msgstr "Viesti..."
#. module: crm
#: model:ir.model,name:crm.model_crm_phonecall_assign_wizard
@ -1496,19 +1498,19 @@ msgstr ""
#. module: crm
#: view:report.crm.case.section.categ2:0
msgid "Cases by Section and Category2"
msgstr ""
msgstr "Tapahtumat osion ja kategoria2:n mukaan"
#. module: crm
#: code:addons/crm/crm.py:0
#, python-format
msgid "done"
msgstr ""
msgstr "valmis"
#. module: crm
#: view:crm.meeting:0
#: view:crm.phonecall:0
msgid "Reminder"
msgstr ""
msgstr "Muistutus"
#. module: crm
#: help:crm.segmentation,sales_purchase_active:0
@ -1523,7 +1525,7 @@ msgstr ""
#: code:addons/crm/crm.py:0
#, python-format
msgid "open"
msgstr ""
msgstr "avaa"
#. module: crm
#: field:crm.case.rule,act_remind_attach:0
@ -1534,7 +1536,7 @@ msgstr "Muistuta liitteen kanssa"
#: model:crm.case.categ,name:crm.categ_lead6
#: model:crm.case.categ,name:crm.categ_oppor6
msgid "Website"
msgstr ""
msgstr "Verkkosivu"
#. module: crm
#: field:crm.case.rule,act_remind_user:0
@ -1552,6 +1554,8 @@ msgid ""
"Helps you to organise the jobs hiring process: evaluation, meetings, email "
"integration..."
msgstr ""
"Auttaa sinua organisoimaan palkkausprosessin: arvioinnin, taapaamiset, "
"sähköpostineuvottelut..."
#. module: crm
#: view:crm.fundraising:0
@ -1562,13 +1566,13 @@ msgstr ""
#: code:addons/crm/crm.py:0
#, python-format
msgid "draft"
msgstr ""
msgstr "luonnos"
#. module: crm
#: model:crm.case.stage,name:crm.stage_claim5
#: model:crm.case.stage,name:crm.stage_meet4
msgid "Awaiting Response"
msgstr ""
msgstr "Odottaa vastausta"
#. module: crm
#: field:crm.case,date:0

View File

@ -77,7 +77,7 @@ class document_file(osv.osv):
# the directory id now is mandatory. It can still be computed automatically.
'parent_id': fields.many2one('document.directory', 'Directory', select=1, required=True),
'file_size': fields.integer('File Size', required=True),
'file_type': fields.char('Content Type', size=32),
'file_type': fields.char('Content Type', size=64),
# If ir.attachment contained any data before document is installed, preserve
# the data, don't drop the column!
'db_datas': fields.binary('Data', oldname='datas'),
@ -141,6 +141,8 @@ class document_file(osv.osv):
return super(document_file, self).copy(cr, uid, id, default, context)
def write(self, cr, uid, ids, vals, context=None):
if not isinstance(ids, list):
ids = [ids]
res = self.search(cr, uid, [('id', 'in', ids)])
if not len(res):
return False

View File

@ -65,14 +65,14 @@ class document_directory(osv.osv):
objid=self.pool.get('ir.model.data')
try:
mid = objid._get_id(cr, uid, 'document', 'dir_root')
return None # TODO: check why not display root dir
return False # TODO: check why not display root dir
if not mid:
return None
return False
except Exception, e:
import netsvc
logger = netsvc.Logger()
logger.notifyChannel("document", netsvc.LOG_WARNING, 'Cannot set directory root:'+ str(e))
return None
return False
return objid.browse(cr, uid, mid, context=context).res_id
def _get_def_storage(self,cr,uid,context=None):

View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-04-24 14:45+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"PO-Revision-Date: 2010-03-15 14:11+0000\n"
"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\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-03-11 05:03+0000\n"
"X-Launchpad-Export-Date: 2010-03-16 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document
@ -203,7 +203,7 @@ msgstr ""
#. module: document
#: model:ir.ui.menu,name:document.menu_document
msgid "Document Management"
msgstr ""
msgstr "Dokumenthantering"
#. module: document
#: selection:ir.attachment,store_method:0

View File

@ -23,7 +23,7 @@ import StringIO
import odt2txt
from content_index import indexer, cntIndex
from subprocess import Popen, PIPE
def _to_unicode(s):
try:

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: 2009-09-17 09:48+0000\n"
"Last-Translator: Jay (Open ERP) <jvo@tinyerp.com>\n"
"PO-Revision-Date: 2010-03-15 14:12+0000\n"
"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\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-03-11 04:54+0000\n"
"X-Launchpad-Export-Date: 2010-03-16 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: idea
@ -157,7 +157,7 @@ msgstr ""
#. module: idea
#: model:ir.ui.menu,name:idea.menu_reporting
msgid "Reporting"
msgstr ""
msgstr "Rapportering"
#. module: idea
#: model:ir.model,name:idea.model_idea_vote_stat

View File

@ -0,0 +1,92 @@
# Occitan (post 1500) 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-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-12 14:00+0000\n"
"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
"Language-Team: Occitan (post 1500) <oc@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-13 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_chart_uk_minimal
#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_receivable
msgid "Receivable"
msgstr ""
#. module: l10n_chart_uk_minimal
#: model:ir.module.module,description:l10n_chart_uk_minimal.module_meta_information
msgid ""
"This is the base module to manage the accounting chart for United Kingdom in "
"Open ERP."
msgstr ""
#. module: l10n_chart_uk_minimal
#: constraint:account.account.template:0
msgid "Error ! You can not create recursive account templates."
msgstr ""
#. module: l10n_chart_uk_minimal
#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_income
msgid "Income"
msgstr "Produches"
#. module: l10n_chart_uk_minimal
#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_tax
msgid "Tax"
msgstr "Impôts et taxes"
#. module: l10n_chart_uk_minimal
#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_cash
msgid "Cash"
msgstr ""
#. module: l10n_chart_uk_minimal
#: model:ir.actions.todo,note:l10n_chart_uk_minimal.config_call_account_template_uk_minimal
msgid ""
"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
"the name of the company, the chart template to follow, the no. of digits to "
"generate the code for your accounts and Bank account, currency to create "
"Journals. Thus,the pure copy of chart Template is generated.\n"
"\tThis is the same wizard that runs from Financial "
"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
"Chart of Accounts from a Chart Template."
msgstr ""
#. module: l10n_chart_uk_minimal
#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_payable
msgid "Payable"
msgstr ""
#. module: l10n_chart_uk_minimal
#: model:ir.module.module,shortdesc:l10n_chart_uk_minimal.module_meta_information
msgid "United Kingdom - minimal"
msgstr ""
#. module: l10n_chart_uk_minimal
#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_equity
msgid "Equity"
msgstr ""
#. module: l10n_chart_uk_minimal
#: constraint:account.tax.code.template:0
msgid "Error ! You can not create recursive Tax Codes."
msgstr ""
#. module: l10n_chart_uk_minimal
#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_expense
msgid "Expense"
msgstr "Despensas"
#. module: l10n_chart_uk_minimal
#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_view
msgid "View"
msgstr "Afichatge"

1049
addons/l10n_fr/i18n/oc.po Normal file

File diff suppressed because it is too large Load Diff

126
addons/l10n_lu/i18n/oc.po Normal file
View File

@ -0,0 +1,126 @@
# Occitan (post 1500) 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-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-12 13:54+0000\n"
"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
"Language-Team: Occitan (post 1500) <oc@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-13 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_lu
#: wizard_view:l10n_lu.tax.report.wizard,init:0
msgid "VAT Legal Declaration"
msgstr ""
#. module: l10n_lu
#: constraint:account.account.template:0
msgid "Error ! You can not create recursive account templates."
msgstr ""
#. module: l10n_lu
#: wizard_button:l10n_lu.tax.report.wizard,init,pdf:0
msgid "Print Taxes Statement"
msgstr ""
#. module: l10n_lu
#: wizard_field:l10n_lu.tax.report.wizard,init,tax_code_id:0
msgid "Company"
msgstr "Entrepresa"
#. module: l10n_lu
#: model:account.account.type,name:l10n_lu.account_type_income
msgid "Income"
msgstr "Produches"
#. module: l10n_lu
#: model:account.account.type,name:l10n_lu.account_type_cash_moves
msgid "Cash"
msgstr ""
#. module: l10n_lu
#: model:ir.actions.todo,note:l10n_lu.config_call_account_template
msgid ""
"Generate Chart of Accounts from a Chart Template. You will be asked to "
"select the company, the chart template, the no. of digits to generate the "
"code for your accounts and Bank account, currency to create Journals. "
"Thus,the pure copy of chart Template is generated.\n"
"This is the same wizard that runs from Financial "
"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
"Chart of Accounts from a Chart Template."
msgstr ""
#. module: l10n_lu
#: model:ir.actions.report.xml,name:l10n_lu.legal_vat
msgid "Luxembourg VAT Declaration"
msgstr ""
#. module: l10n_lu
#: model:account.account.type,name:l10n_lu.account_type_liability
msgid "Liability"
msgstr ""
#. module: l10n_lu
#: model:ir.ui.menu,name:l10n_lu.legal_lu
msgid "Luxembourg"
msgstr "Luxemborg"
#. module: l10n_lu
#: model:ir.actions.wizard,name:l10n_lu.wizard_print_vat
#: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
msgid "VAT Declaration"
msgstr ""
#. module: l10n_lu
#: wizard_field:l10n_lu.tax.report.wizard,init,period_id:0
msgid "Period"
msgstr ""
#. module: l10n_lu
#: model:account.account.type,name:l10n_lu.account_type_asset
msgid "Asset"
msgstr ""
#. module: l10n_lu
#: model:account.account.type,name:l10n_lu.account_type_cash_equity
msgid "Equity"
msgstr ""
#. module: l10n_lu
#: wizard_button:l10n_lu.tax.report.wizard,init,end:0
msgid "Cancel"
msgstr "Anullar"
#. module: l10n_lu
#: constraint:account.tax.code.template:0
msgid "Error ! You can not create recursive Tax Codes."
msgstr ""
#. module: l10n_lu
#: model:ir.module.module,shortdesc:l10n_lu.module_meta_information
msgid "Luxembourg - Plan Comptable Minimum Normalise"
msgstr ""
#. module: l10n_lu
#: model:account.account.type,name:l10n_lu.account_type_expense
msgid "Expense"
msgstr ""
#. module: l10n_lu
#: model:account.account.type,name:l10n_lu.account_type_creances
msgid "Créances"
msgstr ""
#. module: l10n_lu
#: model:account.account.type,name:l10n_lu.account_type_root
msgid "View"
msgstr "Afichatge"

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-16 11:17+0000\n"
"Last-Translator: Treecko <Unknown>\n"
"PO-Revision-Date: 2010-03-15 14:14+0000\n"
"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\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-03-11 04:45+0000\n"
"X-Launchpad-Export-Date: 2010-03-16 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: membership
@ -179,7 +179,7 @@ msgstr ""
#. module: membership
#: model:ir.ui.menu,name:membership.menu_reporting
msgid "Reporting"
msgstr ""
msgstr "Rapportering"
#. module: membership
#: view:res.partner:0
@ -249,7 +249,7 @@ msgstr ""
#: field:report.partner_member.year_new,canceled_amount:0
#: field:report.partner_member.year_new,canceled_number:0
msgid "Canceled"
msgstr ""
msgstr "Avbruten"
#. module: membership
#: model:product.pricelist,name:membership.list1m
@ -317,7 +317,7 @@ msgstr ""
#: field:report.partner_member.year_new,paid_amount:0
#: field:report.partner_member.year_new,paid_number:0
msgid "Paid"
msgstr ""
msgstr "Betalad"
#. module: membership
#: selection:membership.membership_line,state:0
@ -510,7 +510,7 @@ msgstr ""
#. module: membership
#: constraint:product.product:0
msgid "Error: Invalid ean code"
msgstr ""
msgstr "Fel: felaktig EAN-kod"
#. module: membership
#: field:report.partner_member.year,year:0

View File

@ -819,7 +819,7 @@
</group>
<group col="2" colspan="2">
<separator colspan="2" string="Planification"/>
<field name="date_planned" select="1" widget="date"/>
<field name="date_planned" select="1"/>
<field name="procure_method" select="2"/>
<field name="priority" groups="base.group_extended"/>
</group>

View File

@ -0,0 +1,89 @@
# Occitan (post 1500) 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-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-12 13:51+0000\n"
"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
"Language-Team: Occitan (post 1500) <oc@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-13 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp_subproduct
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "XML invalid per l'arquitectura de la vista"
#. module: mrp_subproduct
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
#. module: mrp_subproduct
#: view:mrp.bom:0
msgid "sub products"
msgstr ""
#. module: mrp_subproduct
#: field:mrp.subproduct,product_id:0
msgid "Product"
msgstr "Produch"
#. module: mrp_subproduct
#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
msgid "Mrp Sub Product"
msgstr "Components per MRP"
#. module: mrp_subproduct
#: field:mrp.subproduct,subproduct_type:0
msgid "Quantity Type"
msgstr ""
#. module: mrp_subproduct
#: field:mrp.subproduct,product_qty:0
msgid "Product Qty"
msgstr ""
#. module: mrp_subproduct
#: field:mrp.subproduct,product_uom:0
msgid "Product UOM"
msgstr ""
#. module: mrp_subproduct
#: field:mrp.subproduct,bom_id:0
msgid "BoM"
msgstr "Nomenclatura"
#. module: mrp_subproduct
#: view:mrp.bom:0
msgid "Sub Products"
msgstr ""
#. module: mrp_subproduct
#: selection:mrp.subproduct,subproduct_type:0
msgid "Variable"
msgstr "Variabla"
#. module: mrp_subproduct
#: field:mrp.bom,sub_products:0
msgid "sub_products"
msgstr ""
#. module: mrp_subproduct
#: selection:mrp.subproduct,subproduct_type:0
msgid "Fixed"
msgstr ""
#. module: mrp_subproduct
#: model:ir.module.module,shortdesc:mrp_subproduct.module_meta_information
msgid "MRP Sub Product"
msgstr ""

View File

@ -0,0 +1,192 @@
# Occitan (post 1500) 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-12-08 11:46+0000\n"
"PO-Revision-Date: 2010-03-12 13:42+0000\n"
"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
"Language-Team: Occitan (post 1500) <oc@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-13 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: multi_company
#: help:multi_company.default,object_id:0
msgid "Object affect by this rules"
msgstr ""
#. module: multi_company
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
#. module: multi_company
#: constraint:product.template:0
msgid ""
"Error: The default UOM and the purchase UOM must be in the same category."
msgstr ""
#. module: multi_company
#: constraint:res.partner:0
msgid "The VAT doesn't seem to be correct."
msgstr ""
#. module: multi_company
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr ""
#. module: multi_company
#: model:res.company,overdue_msg:multi_company.res_company_odoo
#: model:res.company,overdue_msg:multi_company.res_company_oerp_be
#: model:res.company,overdue_msg:multi_company.res_company_oerp_editor
#: model:res.company,overdue_msg:multi_company.res_company_oerp_in
#: model:res.company,overdue_msg:multi_company.res_company_oerp_us
msgid ""
"Would your payment have been carried out after this mail was sent, please "
"consider the present one as void. Do not hesitate to contact our accounting "
"department"
msgstr ""
#. module: multi_company
#: field:multi_company.default,company_dest_id:0
msgid "Default Company"
msgstr ""
#. module: multi_company
#: field:multi_company.default,object_id:0
msgid "Object"
msgstr "Objècte"
#. module: multi_company
#: model:ir.module.module,shortdesc:multi_company.module_meta_information
#: view:multi_company.default:0
msgid "Multi Company"
msgstr "Multisocietat"
#. module: multi_company
#: model:ir.module.module,description:multi_company.module_meta_information
msgid ""
"This module add the possibility to easily manage \n"
" the default value for each object\n"
" "
msgstr ""
#. module: multi_company
#: field:multi_company.default,company_id:0
msgid "Main Company"
msgstr ""
#. module: multi_company
#: view:multi_company.default:0
msgid "Condition"
msgstr "Condicion"
#. module: multi_company
#: help:multi_company.default,company_dest_id:0
msgid "Company to store the current record"
msgstr ""
#. module: multi_company
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "XML invalid per l'arquitectura de la vista"
#. module: multi_company
#: field:multi_company.default,name:0
msgid "Name"
msgstr "Nom"
#. module: multi_company
#: constraint:product.template:0
msgid "Error: UOS must be in a different category than the UOM"
msgstr ""
#. module: multi_company
#: model:product.category,name:multi_company.Odoo1
msgid "Odoo Offers"
msgstr ""
#. module: multi_company
#: constraint:res.company:0
msgid "Error! You can not create recursive companies."
msgstr ""
#. module: multi_company
#: help:multi_company.default,name:0
msgid "Name it to easily find a record"
msgstr ""
#. module: multi_company
#: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
msgid "Multi company"
msgstr "Multisocietat"
#. module: multi_company
#: model:ir.model,name:multi_company.model_multi_company_default
msgid "multi_company.default"
msgstr "multi_company.default"
#. module: multi_company
#: help:multi_company.default,company_id:0
msgid "Company where the user is connected"
msgstr ""
#. module: multi_company
#: model:ir.actions.act_window,name:multi_company.action_inventory_form
msgid "Default Company per Object"
msgstr ""
#. module: multi_company
#: field:multi_company.default,expression:0
msgid "Expression"
msgstr "Expression"
#. module: multi_company
#: model:product.template,name:multi_company.product_product_odoo1_product_template
msgid "Odoo Offer"
msgstr ""
#. module: multi_company
#: field:multi_company.default,sequence:0
msgid "Sequence"
msgstr "Sequéncia"
#. module: multi_company
#: constraint:product.category:0
msgid "Error ! You can not create recursive categories."
msgstr ""
#. module: multi_company
#: constraint:product.product:0
msgid "Error: Invalid ean code"
msgstr ""
#. module: multi_company
#: help:multi_company.default,expression:0
msgid "Expression, must be True to match"
msgstr ""
#. module: multi_company
#: model:ir.ui.menu,name:multi_company.menu_action_inventory_form
msgid "Default company per Object"
msgstr ""
#. module: multi_company
#: code:addons/multi_company/multi_company.py:0
#, python-format
msgid " (copy)"
msgstr " (còpia)"
#. module: multi_company
#: view:multi_company.default:0
msgid "Matching"
msgstr "Correspondéncia"

1399
addons/olap/i18n/oc.po Normal file

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,31 @@
# Occitan (post 1500) 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-12 13:38+0000\n"
"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
"Language-Team: Occitan (post 1500) <oc@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-13 04:51+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 ""
#. module: olap_crm
#: model:ir.module.module,shortdesc:olap_crm.module_meta_information
msgid "olap_crm"
msgstr "olap_crm"

View File

@ -0,0 +1,56 @@
# Occitan (post 1500) 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-12 13:38+0000\n"
"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
"Language-Team: Occitan (post 1500) <oc@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-13 04:51+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 ""
#. module: olap_extract
#: wizard_button:olap.extract.schema,init,ok:0
msgid "OK"
msgstr "D'acòrdi"
#. module: olap_extract
#: model:ir.actions.wizard,name:olap_extract.bi_olap_extract_schema
msgid "Olap Extract"
msgstr ""
#. module: olap_extract
#: model:ir.module.module,description:olap_extract.module_meta_information
msgid ""
"\n"
" Extracts the schema structure.\n"
" "
msgstr ""
#. module: olap_extract
#: wizard_field:olap.extract.schema,init,module_name:0
msgid "Module Name"
msgstr ""
#. module: olap_extract
#: wizard_button:olap.extract.schema,init,end:0
msgid "Cancel"
msgstr "Anullar"
#. module: olap_extract
#: wizard_view:olap.extract.schema,init:0
msgid "New Module Name"
msgstr ""

View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from osv import fields, osv
@ -58,11 +58,12 @@ class project_work(osv.osv):
res['general_account_id'] = a
res['product_uom_id'] = emp.product_id.uom_id.id
return res
def create(self, cr, uid, vals, *args, **kwargs):
obj = self.pool.get('hr.analytic.timesheet')
obj_timesheet = self.pool.get('hr.analytic.timesheet')
task_obj = self.pool.get('project.task')
vals_line = {}
obj_task = self.pool.get('project.task').browse(cr, uid, vals['task_id'])
obj_task = task_obj.browse(cr, uid, vals['task_id'])
result = self.get_user_related_details(cr, uid, vals.get('user_id', uid))
vals_line['name'] = '%s: %s' % (tools.ustr(obj_task.name), tools.ustr(vals['name']) or '/')
vals_line['user_id'] = vals['user_id']
@ -71,33 +72,36 @@ class project_work(osv.osv):
vals_line['unit_amount'] = vals['hours']
acc_id = obj_task.project_id.category_id.id
vals_line['account_id'] = acc_id
res = obj.on_change_account_id(cr, uid, False, acc_id)
res = obj_timesheet.on_change_account_id(cr, uid, False, acc_id)
if res.get('value'):
vals_line.update(res['value'])
vals_line['general_account_id'] = result['general_account_id']
vals_line['journal_id'] = result['journal_id']
vals_line['amount'] = 00.0
vals_line['product_uom_id'] = result['product_uom_id']
timeline_id = obj.create(cr, uid, vals_line, {})
amount = vals_line['unit_amount']
prod_id = vals_line['product_id']
unit = False
timeline_id = obj_timesheet.create(cr, uid, vals=vals_line, context=kwargs['context'])
# Compute based on pricetype
amount_unit=obj.on_change_unit_amount(cr, uid, line_id,
vals_line['product_id'], vals_line['unit_amount'], unit, context)
vals_line['amount'] = (-1) * vals['hours']* (unit_amount or 0.0)
obj.write(cr, uid,[timeline_id], vals_line, {})
amount_unit=obj_timesheet.on_change_unit_amount(cr, uid, timeline_id,
prod_id, amount, unit, context=kwargs['context'])
vals_line['amount'] = (-1) * vals['hours']* (amount_unit['value']['amount'] or 0.0)
obj_timesheet.write(cr, uid,[timeline_id], vals_line, {})
vals['hr_analytic_timesheet_id'] = timeline_id
return super(project_work,self).create(cr, uid, vals, *args, **kwargs)
def write(self, cr, uid, ids, vals, context=None):
vals_line = {}
task = self.pool.get('project.task.work').browse(cr, uid, ids)[0]
obj = self.pool.get('hr.analytic.timesheet')
timesheet_obj = self.pool.get('hr.analytic.timesheet')
task = self.pool.get('project.task.work').browse(cr, uid, ids, context=context)[0]
line_id = task.hr_analytic_timesheet_id
# in case,if a record is deleted from timesheet,but we change it from tasks!
list_avail_ids = self.pool.get('hr.analytic.timesheet').search(cr, uid, [])
list_avail_ids = timesheet_obj.search(cr, uid, [], context=context)
if line_id in list_avail_ids:
obj = self.pool.get('hr.analytic.timesheet')
if 'name' in vals:
vals_line['name'] = '%s: %s' % (tools.ustr(task.task_id.name), tools.ustr(vals['name']) or '/')
if 'user_id' in vals:
@ -111,13 +115,13 @@ class project_work(osv.osv):
vals_line['date'] = vals['date'][:10]
if 'hours' in vals:
vals_line['unit_amount'] = vals['hours']
# Compute based on pricetype
amount_unit=obj.on_change_unit_amount(cr, uid, line_id,
vals_line['product_id'], vals_line['unit_amount'], unit, context)
vals_line['amount'] = (-1) * vals['hours'] * (amount_unit or 0.0)
obj.write(cr, uid, [line_id], vals_line, {})
unit = False
amount_unit=obj.on_change_unit_amount(cr, uid, line_id,
vals_line['product_id'], vals_line['unit_amount'], unit, context=context)
vals_line['amount'] = (-1) * vals['hours'] * (amount_unit['value']['amount'] or 0.0)
obj.write(cr, uid, [line_id], vals_line, context=context)
return super(project_work,self).write(cr, uid, ids, vals, context)
@ -147,9 +151,9 @@ class task(osv.osv):
if task_obj.work_ids:
work_ids = [x.id for x in task_obj.work_ids]
self.pool.get('project.task.work').unlink(cr, uid, work_ids, *args, **kwargs)
return super(task,self).unlink(cr, uid, ids, *args, **kwargs)
def write(self, cr, uid, ids,vals,context={}):
if (vals.has_key('project_id') and vals['project_id']) or (vals.has_key('name') and vals['name']):
vals_line = {}

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-29 10:05+0000\n"
"Last-Translator: NightSpirit <Unknown>\n"
"PO-Revision-Date: 2010-03-15 14:30+0000\n"
"Last-Translator: Henri Kovalainen <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-03-11 04:57+0000\n"
"X-Launchpad-Export-Date: 2010-03-16 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: report_sale
@ -330,4 +330,4 @@ msgstr "Myynti tiloittain"
#. module: report_sale
#: field:report.sale.order.created,amount_untaxed:0
msgid "Untaxed Amount"
msgstr "Veroton määrä"
msgstr "Veroton summa"

View File

@ -319,7 +319,7 @@
<field name="arch" type="xml">
<search string="Scrum Sprint">
<group col="10" colspan="4">
<filter icon="terp-project" string="Daily" domain="[('date','=',time.strftime('%Y-%m-%d'))]" help="Daily Meetings"/>
<filter icon="terp-project" string="Daily" domain="[('date','=',time.strftime(%%Y-%%m-%%d))]" help="Daily Meetings"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="sprint_id">

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: 2009-12-16 20:04+0000\n"
"Last-Translator: Andreas Porevopoulos <Unknown>\n"
"PO-Revision-Date: 2010-03-15 21:55+0000\n"
"Last-Translator: j0hn aka c7p <c7p.admin@gmail.com>\n"
"Language-Team: nls@hellug.gr <nls@hellug.gr>\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-11 04:40+0000\n"
"X-Launchpad-Export-Date: 2010-03-16 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"X-Poedit-Country: GREECE\n"
"X-Poedit-Language: Greek\n"
@ -665,7 +665,7 @@ msgstr "Αναμενόμενη Ημερ/νία Αποστολής"
#. module: stock
#: rml:stock.picking.list:0
msgid "Shipping Address :"
msgstr ""
msgstr "Ταχυδρομική Διεύθυνση :"
#. module: stock
#: view:stock.tracking:0