diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py index 5730245b83c..329eb59ab05 100644 --- a/addons/account/account_analytic_line.py +++ b/addons/account/account_analytic_line.py @@ -78,12 +78,9 @@ class account_analytic_line(osv.osv): return {} product_obj = self.pool.get('product.product') analytic_journal_obj =self.pool.get('account.analytic.journal') -# company_obj = self.pool.get('res.company') product_price_type_obj = self.pool.get('product.price.type') j_id = analytic_journal_obj.browse(cr, uid, journal_id, context=context) prod = product_obj.browse(cr, uid, prod_id) -# if not company_id: -# company_id = j_id.company_id.id result = 0.0 if j_id.type <> 'sale': @@ -95,7 +92,6 @@ class account_analytic_line(osv.osv): _('There is no expense account defined ' \ 'for this product: "%s" (id:%d)') % \ (prod.name, prod.id,)) -# amount_unit = prod.price_get('standard_price', context)[prod.id] else: a = prod.product_tmpl_id.property_account_income.id if not a: @@ -105,36 +101,31 @@ class account_analytic_line(osv.osv): _('There is no income account defined ' \ 'for this product: "%s" (id:%d)') % \ (prod.name, prod_id,)) -# amount_unit = prod.price_get('list_price', context)[prod_id] -# if not company_id: -# company_id = company_obj._company_default_get(cr, uid, 'account.analytic.line', context=context) -# # so what? do we need company_id? - if True: - flag = False - # Compute based on pricetype - product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','standard_price')], context=context) - pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context)[0] - if journal_id: - journal = analytic_journal_obj.browse(cr, uid, journal_id) - if journal.type == 'sale': - product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','list_price')], context) - if product_price_type_ids: - pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context)[0] - # Take the company currency as the reference one - if pricetype.field == 'list_price': - flag = True - ctx = context.copy() - if unit: - # price_get() will respect a 'uom' in its context, in order - # to return a default price for those units - ctx['uom'] = unit - amount_unit = prod.price_get(pricetype.field, context=ctx)[prod.id] - prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account') - amount = amount_unit * quantity or 1.0 - result = round(amount, prec) - if not flag: - result *= -1 + flag = False + # Compute based on pricetype + product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','standard_price')], context=context) + pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context)[0] + if journal_id: + journal = analytic_journal_obj.browse(cr, uid, journal_id) + if journal.type == 'sale': + product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','list_price')], context) + if product_price_type_ids: + pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context)[0] + # Take the company currency as the reference one + if pricetype.field == 'list_price': + flag = True + ctx = context.copy() + if unit: + # price_get() will respect a 'uom' in its context, in order + # to return a default price for those units + ctx['uom'] = unit + amount_unit = prod.price_get(pricetype.field, context=ctx)[prod.id] + prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account') + amount = amount_unit * quantity or 1.0 + result = round(amount, prec) + if not flag: + result *= -1 return {'value': { 'amount': result, @@ -165,4 +156,4 @@ class res_partner(osv.osv): res_partner() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml index d17fe1d760c..01a14fbc4d0 100644 --- a/addons/account/demo/account_minimal.xml +++ b/addons/account/demo/account_minimal.xml @@ -353,7 +353,7 @@ Sales Credit Note Journal - (test) - SCNJ- (test) + SCNJ - (test) sale_refund @@ -366,7 +366,7 @@ Expenses Journal - (test) - EXJ- (test) + EXJ - (test) purchase @@ -377,7 +377,7 @@ Expenses Credit Notes Journal - (test) - ECNJ- (test) + ECNJ - (test) purchase_refund @@ -390,7 +390,7 @@ Bank Journal - (test) - BNK- (test) + BNK - (test) bank @@ -401,7 +401,7 @@ Checks Journal - (test) - CHK- (test) + CHK - (test) bank @@ -412,7 +412,7 @@ Cash Journal - (test) - CSH- (test) + CSH - (test) cash diff --git a/addons/account/invoice.py b/addons/account/invoice.py index e03e0035022..8df0318bf22 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -1063,7 +1063,7 @@ class account_invoice(osv.osv): 'out_refund': 'OR: ', 'in_refund': 'SR: ', } - return [(r['id'], types[r['type']]+(r['number'] or '')+' '+(r['name'] or '')) for r in self.read(cr, uid, ids, ['type', 'number', 'name'], context, load='_classic_write')] + return [(r['id'], (r['number']) or types[r['type']] + (r['name'] or '')) for r in self.read(cr, uid, ids, ['type', 'number', 'name'], context, load='_classic_write')] def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100): if not args: @@ -1072,9 +1072,9 @@ class account_invoice(osv.osv): context = {} ids = [] if name: - ids = self.search(cr, user, [('number','=',name)]+ args, limit=limit, context=context) + ids = self.search(cr, user, [('number','=',name)] + args, limit=limit, context=context) if not ids: - ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit, context=context) + ids = self.search(cr, user, [('name',operator,name)] + args, limit=limit, context=context) return self.name_get(cr, user, ids, context) def _refund_cleanup_lines(self, cr, uid, lines): diff --git a/addons/account_cancel/i18n/el.po b/addons/account_cancel/i18n/el.po new file mode 100644 index 00000000000..df250c4fa20 --- /dev/null +++ b/addons/account_cancel/i18n/el.po @@ -0,0 +1,28 @@ +# Greek 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 , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-11-09 17:57+0000\n" +"Last-Translator: Dimitris Andavoglou \n" +"Language-Team: Greek \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-11-10 05:03+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: account_cancel +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "" + +#. module: account_cancel +#: model:ir.module.module,shortdesc:account_cancel.module_meta_information +msgid "Account Cancel" +msgstr "Ακύρωση Λογαριασμού" diff --git a/addons/account_followup/report/account_followup_print.py b/addons/account_followup/report/account_followup_print.py index c601aaac13c..8bfb3fff1a9 100644 --- a/addons/account_followup/report/account_followup_print.py +++ b/addons/account_followup/report/account_followup_print.py @@ -20,10 +20,8 @@ ############################################################################## import time -import ir import pooler -from osv import osv from report import report_sxw class report_rappel(report_sxw.rml_parse): diff --git a/addons/account_followup/report/account_followup_report.py b/addons/account_followup/report/account_followup_report.py index 0cfc5cd4671..ba0756f5c49 100644 --- a/addons/account_followup/report/account_followup_report.py +++ b/addons/account_followup/report/account_followup_report.py @@ -56,7 +56,6 @@ class account_followup_stat(osv.osv): context=context, count=count) def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None): - todel=[] for arg in domain: if arg[0] == 'period_id' and arg[2] == 'current_year': current_year = self.pool.get('account.fiscalyear').find(cr, uid) @@ -91,7 +90,7 @@ class account_followup_stat(osv.osv): l.reconcile_id is NULL AND l.partner_id IS NOT NULL GROUP BY - l.id, l.partner_id, l.company_id, l.blocked, l.period_id + l.id, l.partner_id, l.company_id, l.blocked, l.period_id )""") account_followup_stat() diff --git a/addons/account_voucher/report/rml_parse.py b/addons/account_voucher/report/rml_parse.py index 52c724ab7bf..84b4fabc401 100644 --- a/addons/account_voucher/report/rml_parse.py +++ b/addons/account_voucher/report/rml_parse.py @@ -101,7 +101,7 @@ class rml_parse(report_sxw.rml_parse): return Stringer def explode_this(self, chaine, length): - chaine = chaine.rstrip(chaine) + chaine = chaine.rstrip() ast = list(chaine) i = length while i <= len(ast): diff --git a/addons/analytic_user_function/i18n/it.po b/addons/analytic_user_function/i18n/it.po index 143d486ae80..691784b8f41 100644 --- a/addons/analytic_user_function/i18n/it.po +++ b/addons/analytic_user_function/i18n/it.po @@ -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: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-11-08 20:14+0000\n" -"Last-Translator: Nicola Riolini - Micronaet \n" +"PO-Revision-Date: 2010-11-09 08:07+0000\n" +"Last-Translator: OpenERP Administrators \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-11-09 04:49+0000\n" +"X-Launchpad-Export-Date: 2010-11-10 05:03+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: analytic_user_function diff --git a/addons/base_calendar/i18n/it.po b/addons/base_calendar/i18n/it.po index c309e9e49ea..6593e0d9c62 100644 --- a/addons/base_calendar/i18n/it.po +++ b/addons/base_calendar/i18n/it.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-11-08 10:28+0000\n" -"Last-Translator: Nicola Riolini - Micronaet \n" +"PO-Revision-Date: 2010-11-09 08:17+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-11-09 04:49+0000\n" +"X-Launchpad-Export-Date: 2010-11-10 05:03+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_calendar diff --git a/addons/base_contact/i18n/el.po b/addons/base_contact/i18n/el.po index 45941fb3c83..3d76f2aeac2 100644 --- a/addons/base_contact/i18n/el.po +++ b/addons/base_contact/i18n/el.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-08-03 00:58+0000\n" -"Last-Translator: mga (Open ERP) \n" +"PO-Revision-Date: 2010-11-09 18:23+0000\n" +"Last-Translator: Dimitris Andavoglou \n" "Language-Team: 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-10-30 05:19+0000\n" +"X-Launchpad-Export-Date: 2010-11-10 05:03+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: GREECE\n" "X-Poedit-Language: Greek\n" @@ -42,22 +42,22 @@ msgstr "Φαξ" #. module: base_contact #: view:base.contact.installer:0 msgid "title" -msgstr "" +msgstr "τίτλος" #. module: base_contact #: help:res.partner.job,date_start:0 msgid "Start date of job(Joining Date)" -msgstr "" +msgstr "Ημερομηνία έναρξης εργασίας" #. module: base_contact #: help:res.partner.job,function:0 msgid "Function of this contact with this partner" -msgstr "" +msgstr "Σχέση της επαφής με τον συνεργάτη" #. module: base_contact #: help:res.partner.job,state:0 msgid "Status of Address" -msgstr "" +msgstr "Κατάσταση της διεύθυνσης" #. module: base_contact #: help:res.partner.job,name:0 @@ -65,11 +65,13 @@ msgid "" "You may enter Address first,Partner will be linked " "automatically if any." msgstr "" +"Μπορείες να εισάγεις πρώτα την διεύθυνση, ο Συνεργάτης θα συνδεθεί αυτόματα " +"εάν υπάρχει." #. module: base_contact #: help:res.partner.job,fax:0 msgid "Job FAX no." -msgstr "" +msgstr "αρ ΦΑΞ εργασίας" #. module: base_contact #: field:res.partner.contact,mobile:0 @@ -80,7 +82,7 @@ msgstr "Κινητό" #: view:res.partner.contact:0 #: field:res.partner.contact,comment:0 msgid "Notes" -msgstr "" +msgstr "Σημειώσεις" #. module: base_contact #: model:process.node,note:base_contact.process_node_contacts0 @@ -101,7 +103,7 @@ msgstr "" #: view:base.contact.installer:0 #: field:base.contact.installer,migrate:0 msgid "Migrate" -msgstr "" +msgstr "Μετάπτωση" #. module: base_contact #: view:res.partner.contact:0 @@ -175,7 +177,7 @@ msgstr "Εσωτερικό/Εξωτερικό νούμερο τηλεφώνου" #. module: base_contact #: help:res.partner.job,phone:0 msgid "Job Phone no." -msgstr "" +msgstr "αρ. Τηλεφώνου εργασίας" #. module: base_contact #: view:res.partner.contact:0 @@ -192,7 +194,7 @@ msgstr "Επαφή" #. module: base_contact #: help:res.partner.job,email:0 msgid "Job E-Mail" -msgstr "" +msgstr "E-mail εργασίας" #. module: base_contact #: field:res.partner.job,sequence_partner:0 @@ -213,13 +215,13 @@ msgstr "Επώνυμο" #: view:res.partner:0 #: view:res.partner.contact:0 msgid "Communication" -msgstr "" +msgstr "Επικοινωνία" #. module: base_contact #: field:base.contact.installer,config_logo:0 #: field:res.partner.contact,photo:0 msgid "Image" -msgstr "" +msgstr "Εικόνα" #. module: base_contact #: selection:res.partner.job,state:0 @@ -229,7 +231,7 @@ msgstr "Παρελθούσα" #. module: base_contact #: model:ir.model,name:base_contact.model_res_partner_address msgid "Partner Addresses" -msgstr "" +msgstr "Διευθύνσεις Συνεργάτη" #. module: base_contact #: field:res.partner.job,sequence_contact:0 @@ -239,7 +241,7 @@ msgstr "Ιεράρχ. Επαφής" #. module: base_contact #: view:res.partner.address:0 msgid "Search Contact" -msgstr "" +msgstr "Αναζήτηση Επαφής" #. module: base_contact #: model:ir.actions.act_window,name:base_contact.action_partner_contact_form @@ -266,7 +268,7 @@ msgstr "Διευθύνσεις εργασίας και προσωπικές" #. module: base_contact #: help:res.partner.job,address_id:0 msgid "Address which is linked to the Partner" -msgstr "" +msgstr "Διεύθυνση που είναι συνδεδεμένη με τον Συνεργάτη" #. module: base_contact #: constraint:ir.ui.menu:0 @@ -293,12 +295,12 @@ msgstr "Ιστοσελίδα" #. module: base_contact #: view:base.contact.installer:0 msgid "Otherwise these details will not be visible from address/contact." -msgstr "" +msgstr "Αλλιώς οι λεπτομέρεις δεν θα είναι ορατές από διεύθυνση/επαφή" #. module: base_contact #: field:base.contact.installer,progress:0 msgid "Configuration Progress" -msgstr "" +msgstr "Πρόοδος Ριθμίσεων" #. module: base_contact #: field:res.partner.contact,email:0 @@ -331,7 +333,7 @@ msgstr "Τηλέφωνο" #. module: base_contact #: view:base.contact.installer:0 msgid "Do you want to migrate your Address data in Contact Data?" -msgstr "" +msgstr "Θέλεις να μεταφέρεις τα δεδομένα Διεύθυνσης στα δεδομένα Επαφής" #. module: base_contact #: field:res.partner.contact,active:0 @@ -381,7 +383,7 @@ msgstr "Γενικά" #. module: base_contact #: view:res.partner.contact:0 msgid "Photo" -msgstr "" +msgstr "Φωτογραφία" #. module: base_contact #: field:res.partner.contact,birthdate:0 @@ -391,7 +393,7 @@ msgstr "Ημερ/νία Γέννησης" #. module: base_contact #: help:base.contact.installer,migrate:0 msgid "If you select this, all addresses will be migrated." -msgstr "" +msgstr "Αν επιλέξεις αυτό, όλες οι διευθύνσεις θα μεταφερθούν" #. module: base_contact #: selection:res.partner.job,state:0 @@ -453,7 +455,7 @@ msgstr "" #. module: base_contact #: field:base.contact.installer,name:0 msgid "Name" -msgstr "" +msgstr "Όνομα" #. module: base_contact #: field:res.partner.contact,partner_id:0 @@ -463,12 +465,12 @@ msgstr "Κύριος Εργοδότης" #. module: base_contact #: model:ir.actions.act_window,name:base_contact.action_base_contact_installer msgid "Address Migration" -msgstr "" +msgstr "Μεταφορά Διεύθυνσης" #. module: base_contact #: view:res.partner:0 msgid "Postal Address" -msgstr "" +msgstr "Διεύθυνση Αποστολής" #. module: base_contact #: model:process.node,name:base_contact.process_node_addresses0 diff --git a/addons/base_contact/i18n/it.po b/addons/base_contact/i18n/it.po index fd35ead48ab..c492d0088a6 100644 --- a/addons/base_contact/i18n/it.po +++ b/addons/base_contact/i18n/it.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-11-08 10:06+0000\n" -"Last-Translator: Nicola Riolini - Micronaet \n" +"PO-Revision-Date: 2010-11-09 08:17+0000\n" +"Last-Translator: OpenERP Administrators \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-11-09 04:48+0000\n" +"X-Launchpad-Export-Date: 2010-11-10 05:03+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_contact diff --git a/addons/base_setup/base_setup_data.xml b/addons/base_setup/base_setup_data.xml index eabeef61334..2c4f8f46323 100644 --- a/addons/base_setup/base_setup_data.xml +++ b/addons/base_setup/base_setup_data.xml @@ -23,7 +23,7 @@