[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
bzr revid: rpa@tinyerp.com-20100316085708-n2h7xa9fzr2i1d8k
This commit is contained in:
rpa (Open ERP)
commit
768d725563
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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']):
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ import StringIO
|
|||
import odt2txt
|
||||
from subprocess import Popen, PIPE
|
||||
from content_index import indexer, cntIndex
|
||||
|
||||
from subprocess import Popen, PIPE
|
||||
|
||||
def _to_unicode(s):
|
||||
try:
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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 = {}
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue