diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml index 50e431935bc..0bce735f1b3 100644 --- a/addons/account/account_installer.xml +++ b/addons/account/account_installer.xml @@ -17,7 +17,7 @@ - You can enhance OpenERP's basic accounting support with a few additional OpenERP applications. + From this screen, you can configure your accounting system. Choose a Chart of Account matched to your accounting system or the Generic Chart of Account which allows you to configure which suit your needs. Configure diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 272933018ad..0bc9e476601 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -801,15 +801,19 @@ class account_move_line(osv.osv): ids = journal_pool.search(cr, uid, []) journals = journal_pool.browse(cr, uid, ids) all_journal = [None] + common_fields = {} + total = len(journals) for journal in journals: all_journal.append(journal.id) for field in journal.view_id.columns_id: if not field.field in fields: - fields[field.field] = [None, journal.id] + fields[field.field] = [journal.id] fld.append((field.field, field.sequence)) flds.append(field.field) + common_fields[field.field] = 1 else: fields.get(field.field).append(journal.id) + common_fields[field.field] = common_fields[field.field] + 1 fld.append(('period_id', 3)) fld.append(('journal_id', 10)) @@ -831,6 +835,10 @@ class account_move_line(osv.osv): for field_it in fld: field = field_it[0] + + if common_fields.get(field) == total: + fields.get(field).append(None) + if field=='state': state = 'colors="red:state==\'draft\'"' diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po index 4779ae32dd5..fdc62db3d1b 100644 --- a/addons/account/i18n/es.po +++ b/addons/account/i18n/es.po @@ -7,14 +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-06-23 17:24+0000\n" -"Last-Translator: Jordi Esteve (www.zikzakmedia.com) " -"\n" +"PO-Revision-Date: 2010-06-24 10:03+0000\n" +"Last-Translator: Borja López Soilán (Pexego) \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-06-24 03:47+0000\n" +"X-Launchpad-Export-Date: 2010-06-25 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -806,7 +805,7 @@ msgstr "Cuenta de la empresa" #. module: account #: wizard_view:account.subscription.generate,init:0 msgid "Generate entries before:" -msgstr "Generar asientos antes:" +msgstr "Generar asientos hasta:" #. module: account #: rml:account.analytic.account.cost_ledger:0 @@ -3680,7 +3679,7 @@ msgstr "" #: wizard_field:account.invoice.pay,addendum,comment:0 #: wizard_field:account.invoice.pay,init,name:0 msgid "Entry Name" -msgstr "Núm. asiento" +msgstr "Descripción" #. module: account #: help:account.invoice,account_id:0 diff --git a/addons/account/i18n/gl.po b/addons/account/i18n/gl.po index 9ae3edbd1f1..4ec34c15268 100644 --- a/addons/account/i18n/gl.po +++ b/addons/account/i18n/gl.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-05-14 17:04+0000\n" +"PO-Revision-Date: 2010-06-24 09:57+0000\n" "Last-Translator: Borja López Soilán (Pexego) \n" "Language-Team: Galician \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:04+0000\n" +"X-Launchpad-Export-Date: 2010-06-25 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -2047,7 +2047,7 @@ msgstr "" #. module: account #: field:account.journal,invoice_sequence_id:0 msgid "Invoice Sequence" -msgstr "" +msgstr "Secuencia de factura" #. module: account #: wizard_view:account.automatic.reconcile,init:0 @@ -3597,7 +3597,7 @@ msgstr "" #: wizard_field:account.invoice.pay,addendum,comment:0 #: wizard_field:account.invoice.pay,init,name:0 msgid "Entry Name" -msgstr "" +msgstr "Descripción" #. module: account #: help:account.invoice,account_id:0 @@ -5064,7 +5064,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_fiscalyear_seq msgid "Maintains Invoice sequences with Fiscal Year" -msgstr "" +msgstr "Mantén secuencias de facturas con exercicio fiscal" #. module: account #: selection:account.account.balance.report,checktype,display_account:0 diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po index 99660f05218..6f4caf1c7b8 100644 --- a/addons/account/i18n/zh_CN.po +++ b/addons/account/i18n/zh_CN.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n" +"X-Launchpad-Export-Date: 2010-06-25 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account_anglo_saxon/stock.py b/addons/account_anglo_saxon/stock.py index ac0dbeadcec..6b0f367abf0 100644 --- a/addons/account_anglo_saxon/stock.py +++ b/addons/account_anglo_saxon/stock.py @@ -26,7 +26,7 @@ from osv import fields,osv #---------------------------------------------------------- class stock_picking(osv.osv): _inherit = "stock.picking" - _description = "Packing List" + _description = "Picking List" def action_invoice_create(self, cr, uid, ids, journal_id=False, group=False, type='out_invoice', context=None): diff --git a/addons/account_budget/i18n/es.po b/addons/account_budget/i18n/es.po index 22fe5f58d28..fbb0fb4d22e 100644 --- a/addons/account_budget/i18n/es.po +++ b/addons/account_budget/i18n/es.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n" +"X-Launchpad-Export-Date: 2010-06-25 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_budget diff --git a/addons/account_coda/i18n/es.po b/addons/account_coda/i18n/es.po new file mode 100644 index 00000000000..f8fd451970f --- /dev/null +++ b/addons/account_coda/i18n/es.po @@ -0,0 +1,167 @@ +# Spanish 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: 2009-11-24 13:11+0000\n" +"PO-Revision-Date: 2010-06-24 09:42+0000\n" +"Last-Translator: Borja López Soilán (Pexego) \n" +"Language-Team: Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-06-25 03:47+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: account_coda +#: field:account.coda,journal_id:0 +#: wizard_field:account.coda_import,init,journal_id:0 +msgid "Bank Journal" +msgstr "Diario bancario" + +#. module: account_coda +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"¡El objeto debe empezar con x_ y no puede contener ningún carácter especial!" + +#. module: account_coda +#: wizard_field:account.coda_import,extraction,note:0 +msgid "Log" +msgstr "Registro" + +#. module: account_coda +#: wizard_button:account.coda_import,extraction,open:0 +msgid "_Open Statement" +msgstr "" + +#. module: account_coda +#: model:ir.module.module,shortdesc:account_coda.module_meta_information +msgid "Account CODA" +msgstr "" + +#. module: account_coda +#: field:account.coda,name:0 +msgid "Coda file" +msgstr "" + +#. module: account_coda +#: wizard_view:account.coda_import,init:0 +msgid "Clic on 'New' to select your file :" +msgstr "" + +#. module: account_coda +#: model:ir.actions.wizard,name:account_coda.wizard_account_coda_import +msgid "Import Coda File" +msgstr "" + +#. module: account_coda +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Nombre de modelo inválido en la definición de acción." + +#. module: account_coda +#: field:account.coda,note:0 +msgid "Import log" +msgstr "Registro de importación" + +#. module: account_coda +#: wizard_field:account.coda_import,init,def_receivable:0 +msgid "Default receivable Account" +msgstr "Cuenta a recibir por defecto" + +#. module: account_coda +#: model:ir.module.module,description:account_coda.module_meta_information +msgid "" +"Module provides functionality to import\n" +" bank statements from .csv file.\n" +" Import coda file wizard is used to import bank statements." +msgstr "" + +#. module: account_coda +#: wizard_button:account.coda_import,extraction,end:0 +msgid "_Close" +msgstr "_Cerrar" + +#. module: account_coda +#: field:account.coda,statement_id:0 +msgid "Generated Bank Statement" +msgstr "Extracto bancario generado" + +#. module: account_coda +#: view:account.coda:0 +#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement +#: model:ir.actions.act_window,name:account_coda.action_account_coda +msgid "Coda import" +msgstr "" + +#. module: account_coda +#: field:account.coda,user_id:0 +msgid "User" +msgstr "Usuario" + +#. module: account_coda +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "¡XML inválido para la estructura de la vista!" + +#. module: account_coda +#: model:ir.model,name:account_coda.model_account_coda +msgid "coda for an Account" +msgstr "" + +#. module: account_coda +#: wizard_field:account.coda_import,init,def_payable:0 +msgid "Default Payable Account" +msgstr "Cuenta a pagar por defecto" + +#. module: account_coda +#: model:ir.ui.menu,name:account_coda.menu_account_coda +msgid "Coda Statements" +msgstr "" + +#. module: account_coda +#: model:ir.ui.menu,name:account_coda.menu_account_coda_wizard +msgid "Import Coda Statements" +msgstr "" + +#. module: account_coda +#: wizard_button:account.coda_import,init,extraction:0 +msgid "_Ok" +msgstr "_Aceptar" + +#. module: account_coda +#: wizard_view:account.coda_import,extraction:0 +#: wizard_view:account.coda_import,init:0 +msgid "Import Coda Statement" +msgstr "" + +#. module: account_coda +#: field:account.bank.statement,coda_id:0 +msgid "Coda" +msgstr "" + +#. module: account_coda +#: wizard_view:account.coda_import,extraction:0 +msgid "Results :" +msgstr "Resultados :" + +#. module: account_coda +#: wizard_field:account.coda_import,init,coda:0 +msgid "Coda File" +msgstr "" + +#. module: account_coda +#: field:account.coda,date:0 +msgid "Import Date" +msgstr "Fecha de importación" + +#. module: account_coda +#: wizard_view:account.coda_import,init:0 +msgid "Select your bank journal :" +msgstr "Seleccione su diario bancario :" diff --git a/addons/account_payment/i18n/es.po b/addons/account_payment/i18n/es.po index 96b1e86eeb9..0248b3f62c5 100644 --- a/addons/account_payment/i18n/es.po +++ b/addons/account_payment/i18n/es.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n" +"X-Launchpad-Export-Date: 2010-06-25 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_payment diff --git a/addons/auction/i18n/el.po b/addons/auction/i18n/el.po index ee0853b10fc..6e0265c94c5 100644 --- a/addons/auction/i18n/el.po +++ b/addons/auction/i18n/el.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-06-24 02:48+0000\n" +"PO-Revision-Date: 2010-06-24 22:06+0000\n" "Last-Translator: Panayiotis Konstantinidis \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-06-24 03:47+0000\n" +"X-Launchpad-Export-Date: 2010-06-25 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: auction @@ -182,7 +182,7 @@ msgstr "ΦΠΑ" #. module: auction #: view:auction.lots:0 msgid "Statements" -msgstr "" +msgstr "Καταστάσεις" #. module: auction #: xsl:flagey.huissier:0 @@ -244,33 +244,34 @@ msgstr "Σύγχρονη Τέχνη" #: view:auction.lots:0 #: view:report.unclassified.objects:0 msgid "Ref" -msgstr "" +msgstr "Αναφορά" #. module: auction #: field:report.auction.view,nseller:0 msgid "No of sellers" -msgstr "" +msgstr "Αριθμός πωλητών" #. module: auction #: selection:auction.lots.send.aie,date_ask,lang:0 msgid "ned" -msgstr "" +msgstr "Κανονική ισοδύναμη απόκλιση" #. module: auction #: constraint:hr.attendance:0 msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)" msgstr "" +"Σφάλμα: Η Είσοδος (ή Έξοδος) πρέπει να ακολουθείται από Έξοδο (Είσοδο)" #. module: auction #: view:auction.lots:0 #: field:report.buyer.auction,total_price:0 msgid "Total Adj." -msgstr "" +msgstr "Συνολική προσαρμογή" #. module: auction #: field:report.auction.view2,obj_margin_procent:0 msgid "Net margin (%)" -msgstr "" +msgstr "Καθαρό περιθώριο (%)" #. module: auction #: selection:auction.lots,state:0 @@ -278,28 +279,28 @@ msgstr "" #: selection:report.seller.auction,state:0 #: selection:report.unclassified.objects,state:0 msgid "Unsold" -msgstr "" +msgstr "Αδιάθετο" #. module: auction #: view:auction.dates:0 msgid "Dates" -msgstr "" +msgstr "Ημερομηνίες" #. module: auction #: constraint:product.template:0 msgid "Error: UOS must be in a different category than the UOM" -msgstr "" +msgstr "Error: UOS must be in a different category than the UOM" #. module: auction #: rml:auction.total.rml:0 msgid "Items" -msgstr "" +msgstr "Αντικείμενα" #. module: auction #: model:account.tax,name:auction.auction_tax5 #: field:auction.dates,seller_costs:0 msgid "Seller Costs" -msgstr "" +msgstr "Έξοδα πωλητών" #. module: auction #: view:auction.bid:0 @@ -309,75 +310,75 @@ msgstr "" #: model:ir.actions.report.xml,name:auction.bid_auction #: model:ir.ui.menu,name:auction.menu_action_bid_open msgid "Bids" -msgstr "" +msgstr "Προσφορές" #. module: auction #: model:ir.ui.menu,name:auction.auction_all_objects_menu msgid "All objects" -msgstr "" +msgstr "Όλα τα αντικείμενα" #. module: auction #: model:ir.actions.act_window,name:auction.action_auction_buyer_reporting_all2 msgid "Buyer's auction for all months" -msgstr "" +msgstr "Πληστηριασμοί αγοραστή για όλους τους μήνες" #. module: auction #: field:auction.bid,contact_tel:0 msgid "Contact" -msgstr "" +msgstr "Επικοινωνία" #. module: auction #: field:report.auction.view,obj_ret:0 #: field:report.object.encoded,obj_ret:0 #: field:report.object.encoded.manager,obj_ret:0 msgid "# obj ret" -msgstr "" +msgstr "Αριθμός αντικειμένων που επεστράφησαν" #. module: auction #: wizard_button:auction.lots.sms_send,init,send:0 msgid "Send SMS" -msgstr "" +msgstr "Αποστολή SMS" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Cont. Art/Painting" -msgstr "" +msgstr "Cont. Τέχνη/Ζωγραφική" #. module: auction #: field:auction.lots,sel_inv_id:0 msgid "Seller Invoice" -msgstr "" +msgstr "Τιμολόγιο πωλητή" #. module: auction #: view:auction.dates:0 msgid "Commissions" -msgstr "" +msgstr "Προμήθειες" #. module: auction #: wizard_button:auction.lots.numerotate,search,init:0 msgid "Back" -msgstr "" +msgstr "Πίσω" #. module: auction #: model:ir.actions.act_window,name:auction.action_all_objects_unsold msgid "Unsold objects" -msgstr "" +msgstr "Αδιάθετα αντικείμενα" #. module: auction #: model:ir.ui.menu,name:auction.menu_all_objects_sold1 msgid "Sold Objects" -msgstr "" +msgstr "Πουλημένα αντικείμενα" #. module: auction #: view:report.buyer.auction2:0 #: view:report.seller.auction2:0 msgid "Sum net margin" -msgstr "" +msgstr "Σύνολο καθαρού περιθωρίου" #. module: auction #: view:auction.deposit:0 msgid "Deposit Border Form" -msgstr "" +msgstr "Κατάθεση φόρμας συνόρων" #. module: auction #: field:auction.bid,bid_lines:0 @@ -385,12 +386,12 @@ msgstr "" #: rml:bids.lots:0 #: model:ir.model,name:auction.model_auction_bid_line msgid "Bid" -msgstr "" +msgstr "Προσφορά" #. module: auction #: wizard_field:auction.lots.send.aie,date_ask,lang:0 msgid "Langage" -msgstr "" +msgstr "Γλώσσα" #. module: auction #: field:auction.bid_line,lot_id:0 @@ -398,17 +399,17 @@ msgstr "" #: view:auction.lots:0 #: model:ir.model,name:auction.model_auction_lots msgid "Object" -msgstr "" +msgstr "Αντικείμενο" #. module: auction #: model:ir.actions.wizard,name:auction.wizard_map_user msgid "Map buyer username to Partners" -msgstr "" +msgstr "Καταγραφή του ονόματος χρήστη στους 'Συνεργάτες'" #. module: auction #: wizard_field:auction.lots.numerotate,search,lot_num:0 msgid "Inventory Number" -msgstr "" +msgstr "Αριθμός απογραφής" #. module: auction #: wizard_button:auction.lots.buyer_map,check,end:0 @@ -416,17 +417,17 @@ msgstr "" #: wizard_button:auction.lots.numerotate,search,end:0 #: wizard_button:auction.lots.numerotate_cont,init,end:0 msgid "Exit" -msgstr "" +msgstr "Έξοδος" #. module: auction #: field:report.buyer.auction2,net_revenue:0 msgid "Net Revenue" -msgstr "" +msgstr "Καθαρό έσοδο" #. module: auction #: view:report.buyer.auction:0 msgid "Auction buyer reporting form view" -msgstr "" +msgstr "Έντυπο έκθεσης άποψης των αγοραστών δημοπρασιών" #. module: auction #: field:auction.dates,state:0 @@ -436,17 +437,17 @@ msgstr "" #: field:report.seller.auction,state:0 #: field:report.unclassified.objects,state:0 msgid "Status" -msgstr "" +msgstr "Κατάσταση" #. module: auction #: model:ir.actions.wizard,name:auction.wizard_sms msgid "SMS Send" -msgstr "" +msgstr "Αποστολή γραπτού μηνύματος" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Cartoons" -msgstr "" +msgstr "Αντίκες/Γελοιογραφίες" #. module: auction #: view:auction.lots:0 @@ -454,42 +455,43 @@ msgstr "" #: selection:report.seller.auction,state:0 #: selection:report.unclassified.objects,state:0 msgid "Sold" -msgstr "" +msgstr "Πουλημένο" #. module: auction #: constraint:hr.employee:0 msgid "Error ! You cannot create recursive Hierarchy of Employees." msgstr "" +"Σφάλμα! Δε μπορείται να δημιουργήσετε αναδρομική ιεραρχία στους εργαζομένους" #. module: auction #: field:auction.bid_line,name:0 msgid "Bid date" -msgstr "" +msgstr "Ημερομηνία προσφορών" #. module: auction #: field:auction.dates,acc_expense:0 msgid "Expense Account" -msgstr "" +msgstr "Λογαριασμός Εξόδων" #. module: auction #: model:ir.ui.menu,name:auction.menu_wizard_emporte msgid "Deliveries Management" -msgstr "" +msgstr "Διαχείριση Παραδόσεων" #. module: auction #: field:auction.lots,obj_desc:0 msgid "Object Description" -msgstr "" +msgstr "Περιγραφή αντικειμένου" #. module: auction #: selection:auction.deposit,method:0 msgid "Contact the Seller" -msgstr "" +msgstr "Επικοινωνήστε με τον πωλητή" #. module: auction #: view:auction.lots:0 msgid "Auction Objects" -msgstr "" +msgstr "Δημοπρατημένα αντικείμενα" #. module: auction #: field:auction.lots,gross_revenue:0 @@ -497,60 +499,60 @@ msgstr "" #: field:report.object.encoded.manager,gross_revenue:0 #: field:report.seller.auction2,gross_revenue:0 msgid "Gross revenue" -msgstr "" +msgstr "Μικτό έσοδο" #. module: auction #: view:report.seller.auction2:0 msgid "Auction reporting2 form view" -msgstr "" +msgstr "Έντυπο αναφοράς άποψης Δημοπρασίας" #. module: auction #: model:ir.actions.wizard,name:auction.wizard_pay msgid "Pay objects of the buyer" -msgstr "" +msgstr "Πληρωμή αντικειμένων του αγοραστή" #. module: auction #: view:report.deposit.border:0 msgid "Depositer's statistics" -msgstr "" +msgstr "Στατιστικά αποταμιευτή" #. module: auction #: view:auction.lots:0 msgid "Buyer information" -msgstr "" +msgstr "Πληροφορίες Αγοραστή" #. module: auction #: model:ir.model,name:auction.model_report_seller_auction msgid "Auction Reporting on seller view" -msgstr "" +msgstr "Έντυπο αναφοράς άποψης των πωλητών για τη δημοπρασία" #. module: auction #: field:auction.lots,name2:0 msgid "Short Description (2)" -msgstr "" +msgstr "Σύντομη περιγραφή (2)" #. module: auction #: model:ir.model,name:auction.model_auction_dates msgid "auction.dates" -msgstr "" +msgstr "Δημοπρασίες.Ημερομηνίες" #. module: auction #: rml:auction.total.rml:0 #: model:ir.ui.menu,name:auction.auction_buyers_menu msgid "Buyers" -msgstr "" +msgstr "Αγοραστές" #. module: auction #: wizard_field:auction.pay.buy,init,amount:0 #: wizard_field:auction.pay.buy,init,amount2:0 #: wizard_field:auction.pay.buy,init,amount3:0 msgid "Amount paid" -msgstr "" +msgstr "Ποσό που πληρώθηκε" #. module: auction #: model:ir.ui.menu,name:auction.menu_report_latest_doposit_tree msgid "My Latest Deposits" -msgstr "" +msgstr "Οι Τελευταίες Καταθέσεις μου" #. module: auction #: field:auction.lots,lot_est1:0 @@ -559,105 +561,105 @@ msgstr "" #: field:report.auction.view,min_est:0 #: field:report.unclassified.objects,lot_est1:0 msgid "Minimum Estimation" -msgstr "" +msgstr "Ελάχιστος υπολογισμός" #. module: auction #: view:auction.dates:0 msgid "Accounting" -msgstr "" +msgstr "Λογιστική" #. module: auction #: model:ir.ui.menu,name:auction.menu_buyer_allmonth_view2 msgid "Buyer's Revenues" -msgstr "" +msgstr "Έσοδα του Αγοραστή" #. module: auction #: model:ir.model,name:auction.model_report_auction_adjudication msgid "report_auction_adjudication" -msgstr "" +msgstr "Αναφορά_δημοπρασίες_Διαγωνισμοί" #. module: auction #: field:auction.bid_line,price:0 msgid "Maximum Price" -msgstr "" +msgstr "Μέγιστη τιμή" #. module: auction #: selection:auction.lots.send.aie,date_ask,lang:0 msgid "eng" -msgstr "" +msgstr "Αγγλική" #. module: auction #: view:report.buyer.auction2:0 msgid "Auction buyer reporting tree view2" -msgstr "" +msgstr "Προβολή δέντρου εκθέσεων αγοραστή δημοπρασιών" #. module: auction #: wizard_view:auction.lots.sms_send,init:0 msgid "Bulk SMS send" -msgstr "" +msgstr "Μαζική αποστολή γραπτών μηνυμάτων" #. module: auction #: wizard_view:auction.taken,init:0 msgid "Select lots which are Sold" -msgstr "" +msgstr "Επιλέξτε παρτίδες που έχουν πουληθεί" #. module: auction #: field:auction.lots,statement_id:0 msgid "Payment" -msgstr "" +msgstr "Πληρωμή" #. module: auction #: selection:auction.lots.send.aie,date_ask,lang:0 msgid "fr" -msgstr "" +msgstr "Γαλλική" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Old weapons and militaria" -msgstr "" +msgstr "Αντίκες/ παλαιά όπλα και στρατιωτικά είδη" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Oriental Arts/Chineese furnitures" -msgstr "" +msgstr "Αντίκεςς/Ανατολίτικη τέχνη/Κινέζικα έπιπλα" #. module: auction #: selection:auction.deposit,method:0 msgid "Keep until sold" -msgstr "" +msgstr "Διατήρηση μέχρι να πουληθεί" #. module: auction #: wizard_button:auction.lots.numerotate,init,choice:0 #: wizard_button:auction.lots.send.aie,init,date_ask:0 #: wizard_button:auction.lots.send.aie.results,init,date_ask:0 msgid "Continue" -msgstr "" +msgstr "Συνεχίστε" #. module: auction #: field:report.object.encoded,obj_num:0 #: field:report.object.encoded.manager,obj_num:0 msgid "# of Encoded obj." -msgstr "" +msgstr "Πλήθος κωδικοποιημένων αντικειμένων" #. module: auction #: xsl:report.auction.vnd_bordereau:0 msgid "List N." -msgstr "" +msgstr "Λίστα Ν." #. module: auction #: field:report.deposit.border,moy_est:0 msgid "Avg. Est" -msgstr "" +msgstr "Μέσος υπολογισμός" #. module: auction #: rml:auction.total.rml:0 msgid "# of sellers:" -msgstr "" +msgstr "Πλήθος πωλητών:" #. module: auction #: constraint:product.product:0 msgid "Error: Invalid ean code" -msgstr "" +msgstr "Σφάλμα: Άκυρος κωδικός EAN" #. module: auction #: model:ir.module.module,description:auction.module_meta_information @@ -668,26 +670,33 @@ msgid "" " Delivery Management. \n" " " msgstr "" +"Αυτή η μονάδα παρέχει λειτουργικότητα στη \n" +" Διαχείριση καλλιτεχνών, αντικειμένων, πωλητών, αγοραστών και " +"δημοπρασίας.\n" +" Διαχείριση προσφορών, ιχνηλάτιση πουλημένων, πληρωμένων και απλήρωτων " +"αντικειμένων.\n" +" Διαχείριση παραδόσεων. \n" +" " #. module: auction #: rml:auction.total.rml:0 msgid "# of items taken away:" -msgstr "" +msgstr "πλήθος αντικειμένων που παραδόθηκαν:" #. module: auction #: model:ir.ui.menu,name:auction.menu_auction_allmonth_view1 msgid "Auction's Summary" -msgstr "" +msgstr "Περίληψη Δημοπρασίας" #. module: auction #: rml:buyer.list:0 msgid "%)" -msgstr "" +msgstr "%)" #. module: auction #: wizard_view:auction.lots.able,init:0 msgid "Confirmation set taken away" -msgstr "" +msgstr "Επιβεβαίωση αυτών που έχουν σταλθεί" #. module: auction #: wizard_field:auction.lots.make_invoice,init,objects:0 @@ -696,7 +705,7 @@ msgstr "" #: wizard_field:auction.lots.send.aie.results,date_ask,objects:0 #: field:report.deposit.border,nb_obj:0 msgid "# of objects" -msgstr "" +msgstr "ΠΛήθος αντικειμένων" #. module: auction #: field:auction.lots,lot_est2:0 @@ -705,42 +714,42 @@ msgstr "" #: field:report.auction.view,max_est:0 #: field:report.unclassified.objects,lot_est2:0 msgid "Maximum Estimation" -msgstr "" +msgstr "Μέγιστος υπολογισμός" #. module: auction #: field:auction.lots,buyer_price:0 msgid "Buyer price" -msgstr "" +msgstr "Τιμή αγοραστή" #. module: auction #: model:ir.actions.wizard,name:auction.auction_wizard_payer_sel msgid "Mark as paid for seller" -msgstr "" +msgstr "Σημειώστε το ως πληρωμένο για τον πωλητή" #. module: auction #: model:ir.actions.report.xml,name:auction.seller_form_id msgid "Seller List" -msgstr "" +msgstr "Λίστα πωλητών" #. module: auction #: field:auction.lots,is_ok:0 msgid "Buyer's payment" -msgstr "" +msgstr "ΠΛηρωμή αγοραστή" #. module: auction #: view:auction.dates:0 msgid "Close + Create all invoices" -msgstr "" +msgstr "Κλείσιμο + Δημιουργεία όλων των τιμολογίων" #. module: auction #: model:ir.actions.wizard,name:auction.auction_catalog_flagy msgid "Auction Catalog Flagey" -msgstr "" +msgstr "Κατάλογος δημοπρασιών Flagey" #. module: auction #: field:auction.lot.history,price:0 msgid "Withdrawn price" -msgstr "" +msgstr "Απόσυρση τιμής" #. module: auction #: model:account.tax,name:auction.auction_tax4 diff --git a/addons/audittrail/i18n/el.po b/addons/audittrail/i18n/el.po index 6abb75f9b34..4b438a11d61 100644 --- a/addons/audittrail/i18n/el.po +++ b/addons/audittrail/i18n/el.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-06-24 02:58+0000\n" +"PO-Revision-Date: 2010-06-24 21:17+0000\n" "Last-Translator: Panayiotis Konstantinidis \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-06-24 03:47+0000\n" +"X-Launchpad-Export-Date: 2010-06-25 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: audittrail @@ -159,153 +159,157 @@ msgid "" " Subscribe Rules for read, write, create and delete on objects and check " "logs" msgstr "" +"Επιστρέπει στον Διαχειριστή να ακολουθεί τα ίχνη κάθε λειτουργίας του χρήστη " +"σε όλα τα αντικείμενα του συστήματος.\n" +" Εισάγεται κανόνες για ανάγνωση, εγγραφή, δημιουργία και διαγραφή στα " +"αντικείμενα και τα ημερολόγια ελέγχου." #. module: audittrail #: field:audittrail.log,timestamp:0 msgid "Date" -msgstr "" +msgstr "Ημερομηνία" #. module: audittrail #: field:audittrail.log,user_id:0 msgid "User" -msgstr "" +msgstr "Χρήστης" #. module: audittrail #: view:audittrail.log:0 msgid "Old Value Text : " -msgstr "" +msgstr "Παλιά τιμή κειμένου: " #. module: audittrail #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "Λανθασμένο XML για αρχιτεκτονική όψης!" #. module: audittrail #: field:audittrail.log,name:0 msgid "Name" -msgstr "" +msgstr "Όνομα" #. module: audittrail #: field:audittrail.log,line_ids:0 msgid "Log lines" -msgstr "" +msgstr "Γραμμές ημερολογίου" #. module: audittrail #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree_sub msgid "Subscribed Rules" -msgstr "" +msgstr "Εγγεγραμμένοι Κανόνες" #. module: audittrail #: field:audittrail.log.line,field_id:0 msgid "Fields" -msgstr "" +msgstr "Πεδία" #. module: audittrail #: view:audittrail.rule:0 msgid "AuditTrail Rules" -msgstr "" +msgstr "Κανόνες διαδρομής ελέγχου" #. module: audittrail #: model:ir.model,name:audittrail.model_audittrail_rule msgid "audittrail.rule" -msgstr "" +msgstr "ελεγκτική ιχνηλάτηση.κανόνες" #. module: audittrail #: view:audittrail.rule:0 msgid "UnSubscribe" -msgstr "" +msgstr "Διαγραφείτε" #. module: audittrail #: field:audittrail.rule,log_write:0 msgid "Log writes" -msgstr "" +msgstr "Εγγραφές ημερολογίου" #. module: audittrail #: model:ir.model,name:audittrail.model_audittrail_log msgid "audittrail.log" -msgstr "" +msgstr "ελεγκτική ιχνηλάτηση.ημερολόγιο" #. module: audittrail #: field:audittrail.log.line,field_description:0 msgid "Field Description" -msgstr "" +msgstr "Περιγραφή πεδίου" #. module: audittrail #: selection:audittrail.log,method:0 msgid "Delete" -msgstr "" +msgstr "Διαγραφή" #. module: audittrail #: wizard_button:audittrail.view.log,init,open:0 msgid "Open Logs" -msgstr "" +msgstr "Άνοιγμα ημερολογίων" #. module: audittrail #: field:audittrail.log.line,new_value_text:0 msgid "New value Text" -msgstr "" +msgstr "Νέα τιμή κειμένου" #. module: audittrail #: field:audittrail.rule,name:0 msgid "Rule Name" -msgstr "" +msgstr "Όνομα Κανόνα" #. module: audittrail #: field:audittrail.rule,log_read:0 msgid "Log reads" -msgstr "" +msgstr "Αναγνώσεις ημερολογίων" #. module: audittrail #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_log_tree msgid "Logs" -msgstr "" +msgstr "Αρχεία καταγραφής" #. module: audittrail #: field:audittrail.log.line,new_value:0 msgid "New Value" -msgstr "" +msgstr "Νέα τιμή" #. module: audittrail #: model:ir.ui.menu,name:audittrail.menu_action_log_tree2 msgid "View Logs" -msgstr "" +msgstr "Δείτε τα αρχεία καταγραφής" #. module: audittrail #: field:audittrail.rule,log_create:0 msgid "Log creates" -msgstr "" +msgstr "Δημιουργία αρχείων καταγραφής" #. module: audittrail #: view:audittrail.log:0 msgid "AuditTrail Logs" -msgstr "" +msgstr "παρακολούθηση της πόρειας των αρχείων καταγραφής" #. module: audittrail #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree msgid "Rules" -msgstr "" +msgstr "Κανόνες" #. module: audittrail #: view:audittrail.log:0 msgid "New Value : " -msgstr "" +msgstr "Νέα τιμή : " #. module: audittrail #: field:audittrail.rule,user_id:0 msgid "Users" -msgstr "" +msgstr "Χρήστες" #. module: audittrail #: field:audittrail.log.line,old_value_text:0 msgid "Old value Text" -msgstr "" +msgstr "Παλιά τιμή κειμένου" #. module: audittrail #: wizard_button:audittrail.view.log,init,end:0 msgid "Cancel" -msgstr "" +msgstr "Ακύρωση" #. module: audittrail #: field:audittrail.rule,log_unlink:0 msgid "Log deletes" -msgstr "" +msgstr "Διαγραφή αρχείων καταγραφής" diff --git a/addons/base_module_quality/i18n/el.po b/addons/base_module_quality/i18n/el.po index 9ae13c3add3..4472efd47d4 100644 --- a/addons/base_module_quality/i18n/el.po +++ b/addons/base_module_quality/i18n/el.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n" +"X-Launchpad-Export-Date: 2010-06-25 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_module_quality diff --git a/addons/base_module_quality/i18n/es.po b/addons/base_module_quality/i18n/es.po index fbb4ecf48fb..fadb0ecd58e 100644 --- a/addons/base_module_quality/i18n/es.po +++ b/addons/base_module_quality/i18n/es.po @@ -15,7 +15,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n" +"X-Launchpad-Export-Date: 2010-06-25 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_module_quality diff --git a/addons/base_report_creator/i18n/el.po b/addons/base_report_creator/i18n/el.po index a914194a57b..7efe97b103a 100644 --- a/addons/base_report_creator/i18n/el.po +++ b/addons/base_report_creator/i18n/el.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n" +"X-Launchpad-Export-Date: 2010-06-25 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: GREECE\n" "X-Poedit-Language: Greek\n" diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml index 46c4dbc6e0b..6608cea061b 100644 --- a/addons/base_setup/base_setup_installer.xml +++ b/addons/base_setup/base_setup_installer.xml @@ -13,9 +13,7 @@ Now that OpenERP is installed, We have selected applications commonly useful to users which you can install directly, as well as sets of applications for more specific types or groups of businesses (the vertical modules). - -If you don't think you need any of these right now, you can easily install them later on. + >The most common applications have been pre selected. You can directly install them. You can either choose generic modules, or select modules for specific business sectors and industries. If you do not think you need any of these right now, you can easily install them later. diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml index 5ec9be53d76..0bf0fbb09be 100644 --- a/addons/base_setup/base_setup_todo.xml +++ b/addons/base_setup/base_setup_todo.xml @@ -26,9 +26,9 @@ - + diff --git a/addons/base_setup/gtk_contact_form.xml b/addons/base_setup/gtk_contact_form.xml index 41711032bf0..fcbaa9867e7 100644 --- a/addons/base_setup/gtk_contact_form.xml +++ b/addons/base_setup/gtk_contact_form.xml @@ -11,7 +11,7 @@ Contact Information - Information about you and the company you are related too. The Basic information related to the company has already been collected and some more information required by you to fill. + To receive more information, please fill in the form about you and your company. Documentation and/or information will be sent to you as soon as possible. Would you like more information or documentation ? diff --git a/addons/board_association/i18n/el.po b/addons/board_association/i18n/el.po index 35fcc48ad27..9ef871e24af 100644 --- a/addons/board_association/i18n/el.po +++ b/addons/board_association/i18n/el.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-24 03:46+0000\n" +"X-Launchpad-Export-Date: 2010-06-25 03:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: GREECE\n" "X-Poedit-Language: Greek\n" diff --git a/addons/board_auction/i18n/el.po b/addons/board_auction/i18n/el.po index f99a794521e..990647cd866 100644 --- a/addons/board_auction/i18n/el.po +++ b/addons/board_auction/i18n/el.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-24 03:46+0000\n" +"X-Launchpad-Export-Date: 2010-06-25 03:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: GREECE\n" "X-Poedit-Language: Greek\n" diff --git a/addons/board_crm_configuration/i18n/el.po b/addons/board_crm_configuration/i18n/el.po index e2f697e23fd..93c5529b516 100644 --- a/addons/board_crm_configuration/i18n/el.po +++ b/addons/board_crm_configuration/i18n/el.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-24 03:46+0000\n" +"X-Launchpad-Export-Date: 2010-06-25 03:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: GREECE\n" "X-Poedit-Language: Greek\n" diff --git a/addons/board_document/i18n/el.po b/addons/board_document/i18n/el.po index 338203acd35..e3ccc369296 100644 --- a/addons/board_document/i18n/el.po +++ b/addons/board_document/i18n/el.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n" +"X-Launchpad-Export-Date: 2010-06-25 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: GREECE\n" "X-Poedit-Language: Greek\n" diff --git a/addons/board_project/i18n/el.po b/addons/board_project/i18n/el.po index 4b6cc7b8820..cc09dff76e2 100644 --- a/addons/board_project/i18n/el.po +++ b/addons/board_project/i18n/el.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-24 03:46+0000\n" +"X-Launchpad-Export-Date: 2010-06-25 03:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: GREECE\n" "X-Poedit-Language: Greek\n" diff --git a/addons/crm/__init__.py b/addons/crm/__init__.py index 362444ccc2c..e56ed80af30 100644 --- a/addons/crm/__init__.py +++ b/addons/crm/__init__.py @@ -20,7 +20,6 @@ ############################################################################## import crm -import crm_mailgate import crm_action_rule import crm_segmentation import crm_meeting diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml index 9d92f6f1b95..6d8f4b7120f 100644 --- a/addons/crm/crm_installer_view.xml +++ b/addons/crm/crm_installer_view.xml @@ -25,26 +25,25 @@ Configure - + + + + + + + + - + - - - - - - - - diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 2260a9f0965..2700581d6cc 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -27,6 +27,9 @@ import time import mx.DateTime from tools.translate import _ from crm import crm_case +import collections +import binascii +import tools class crm_lead(osv.osv, crm_case): """ CRM Lead Case """ @@ -117,6 +120,8 @@ and users by email"), domain="[('section_id','=',section_id),\ ('object_id.model', '=', 'crm.lead')]"), 'partner_name': fields.char("Partner Name", size=64), + 'optin': fields.selection([('yes','Yes'),('no','No'),('unknown','/')],'Opt-In'), + 'optout': fields.selection([('yes','Yes'),('no','No'),('unknown','/')],'Opt-Out'), 'type':fields.selection([ ('lead','Lead'), ('opportunity','Opportunity'), @@ -139,8 +144,8 @@ and users by email"), \nIf the case is in progress the state is set to \'Open\'.\ \nWhen the case is over, the state is set to \'Done\'.\ \nIf the case needs to be reviewed then the state is set to \'Pending\'.'), - 'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('history', '=', True),('res_model','=',_name)]), - 'log_ids': fields.one2many('mailgate.message', 'res_id', 'Logs', domain=[('history', '=', False),('res_model','=',_name)]), + 'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('history', '=', True),('model','=',_name)]), + 'log_ids': fields.one2many('mailgate.message', 'res_id', 'Logs', domain=[('history', '=', False),('model','=',_name)]), } _defaults = { @@ -148,6 +153,8 @@ and users by email"), 'user_id': crm_case._get_default_user, 'email_from': crm_case._get_default_email, 'state': lambda *a: 'draft', + 'optin': lambda *a: 'unknown', + 'optout': lambda *a: 'unknown', 'section_id': crm_case._get_section, 'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c), 'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], @@ -231,6 +238,130 @@ and users by email"), } return value + def message_new(self, cr, uid, msg, context): + """ + Automatically calls when new email message arrives + + @param self: The object pointer + @param cr: the current row, from the database cursor, + @param uid: the current user’s ID for security checks + """ + + mailgate_pool = self.pool.get('email.server.tools') + + subject = msg.get('subject') + body = msg.get('body') + msg_from = msg.get('from') + priority = msg.get('priority') + + vals = { + 'name': subject, + 'email_from': msg_from, + 'email_cc': msg.get('cc'), + 'description': body, + 'user_id': False, + } + if msg.get('priority', False): + vals['priority'] = priority + + res = mailgate_pool.get_partner(cr, uid, msg.get('from')) + if res: + vals.update(res) + res = self.create(cr, uid, vals, context) + + + attachents = msg.get('attachments', []) + for attactment in attachents or []: + data_attach = { + 'name': attactment, + 'datas':binascii.b2a_base64(str(attachents.get(attactment))), + 'datas_fname': attactment, + 'description': 'Mail attachment', + 'res_model': self._name, + 'res_id': res, + } + self.pool.get('ir.attachment').create(cr, uid, data_attach) + + return res + + def message_update(self, cr, uid, ids, vals={}, msg="", default_act='pending', context={}): + """ + @param self: The object pointer + @param cr: the current row, from the database cursor, + @param uid: the current user’s ID for security checks, + @param ids: List of update mail’s IDs + """ + + if isinstance(ids, (str, int, long)): + ids = [ids] + + msg_from = msg['from'] + vals.update({ + 'description': msg['body'] + }) + if msg.get('priority', False): + vals['priority'] = msg.get('priority') + + maps = { + 'cost':'planned_cost', + 'revenue': 'planned_revenue', + 'probability':'probability' + } + vls = { } + for line in msg['body'].split('\n'): + line = line.strip() + res = tools.misc.command_re.match(line) + if res and maps.get(res.group(1).lower(), False): + key = maps.get(res.group(1).lower()) + vls[key] = res.group(2).lower() + + vals.update(vls) + res = self.write(cr, uid, ids, vals) + return res + + def emails_get(self, cr, uid, ids, context=None): + + """ + Get Emails + @param self: The object pointer + @param cr: the current row, from the database cursor, + @param uid: the current user’s ID for security checks, + @param ids: List of email’s IDs + @param context: A standard dictionary for contextual values + """ + res = {} + + if isinstance(ids, (str, int, long)): + select = [long(ids)] + else: + select = ids + + for thread in self.browse(cr, uid, select, context=context): + values = collections.defaultdict(set) + + for message in thread.message_ids: + user_email = (message.user_id and message.user_id.address_id and message.user_id.address_id.email) or False + values['user_email'].add(user_email) + values['email_from'].add(message.email_from) + values['email_cc'].add(message.email_cc or False) + values['priority'] = thread.priority + + res[thread.id] = dict((key,list(values[key])) for key, value in values.iteritems()) + + return res + + def msg_send(self, cr, uid, id, *args, **argv): + + """ Send The Message + @param self: The object pointer + @param cr: the current row, from the database cursor, + @param uid: the current user’s ID for security checks, + @param ids: List of email’s IDs + @param *args: Return Tuple Value + @param **args: Return Dictionary of Keyword Value + """ + return True + crm_lead() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index c33339047d8..0c5afb27739 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -146,6 +146,11 @@ + + + + + @@ -256,12 +261,11 @@ calendar - + - + diff --git a/addons/crm/crm_mailgate.py b/addons/crm/crm_mailgate.py deleted file mode 100644 index d39293e4716..00000000000 --- a/addons/crm/crm_mailgate.py +++ /dev/null @@ -1,172 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# 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 . -# -############################################################################## - -import time -import re -import os - -import binascii -import mx.DateTime -import base64 - -from tools.translate import _ - -import tools -from osv import fields,osv,orm -from osv.orm import except_orm -import collections - -from tools import command_re - -class mailgate_thread(osv.osv): - """ mailgate_thread """ - _name = "mailgate.thread" - _inherit = "mailgate.thread" - - def message_new(self, cr, uid, msg, context): - """ - Automatically calls when new email message arrives - - @param self: The object pointer - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks - """ - - mailgate_pool = self.pool.get('email.server.tools') - - subject = msg.get('subject') - body = msg.get('body') - msg_from = msg.get('from') - priority = msg.get('priority') - - vals = { - 'name': subject, - 'email_from': msg_from, - 'email_cc': msg.get('cc'), - 'description': body, - 'user_id': False, - } - if msg.get('priority', False): - vals['priority'] = priority - - res = mailgate_pool.get_partner(cr, uid, msg.get('from')) - if res: - vals.update(res) - res = self.create(cr, uid, vals, context) - cases = self.browse(cr, uid, [res]) - self._history(cr, uid, cases, _('Receive'), history=True, details=body, email_from=msg_from, message_id=msg.get('id')) - - attachents = msg.get('attachments', []) - for attactment in attachents or []: - data_attach = { - 'name': attactment, - 'datas':binascii.b2a_base64(str(attachents.get(attactment))), - 'datas_fname': attactment, - 'description': 'Mail attachment', - 'res_model': self._name, - 'res_id': res, - } - self.pool.get('ir.attachment').create(cr, uid, data_attach) - - return res - - def message_update(self, cr, uid, ids, vals={}, msg="", default_act='pending', context={}): - """ - @param self: The object pointer - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param ids: List of update mail’s IDs - """ - - if isinstance(ids, (str, int, long)): - ids = [ids] - - msg_from = msg['from'] - vals.update({ - 'description': msg['body'] - }) - if msg.get('priority', False): - vals['priority'] = msg.get('priority') - - maps = { - 'cost':'planned_cost', - 'revenue': 'planned_revenue', - 'probability':'probability' - } - vls = { } - for line in msg['body'].split('\n'): - line = line.strip() - res = command_re.match(line) - if res and maps.get(res.group(1).lower(), False): - key = maps.get(res.group(1).lower()) - vls[key] = res.group(2).lower() - - vals.update(vls) - res = self.write(cr, uid, ids, vals) - cases = self.browse(cr, uid, ids) - message_id = context.get('references_id', False) - self._history(cr, uid, cases, _('Receive'), history=True, details=msg['body'], email_from=msg_from, message_id=message_id) - #getattr(self, act)(cr, uid, select) - return res - - def emails_get(self, cr, uid, ids, context=None): - - """ - Get Emails - @param self: The object pointer - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param ids: List of email’s IDs - @param context: A standard dictionary for contextual values - """ - res = {} - - if isinstance(ids, (str, int, long)): - select = [long(ids)] - else: - select = ids - - for thread in self.browse(cr, uid, select, context=context): - values = collections.defaultdict(set) - - for message in thread.message_ids: - user_email = (message.user_id and message.user_id.address_id and message.user_id.address_id.email) or False - values['user_email'].add(user_email) - values['email_from'].add(message.email_from) - values['email_cc'].add(message.email_cc or False) - - res[str(thread.id)] = dict((key,list(values[key])) for key, value in values.iteritems()) - - return res - - def msg_send(self, cr, uid, id, *args, **argv): - - """ Send The Message - @param self: The object pointer - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param ids: List of email’s IDs - @param *args: Return Tuple Value - @param **args: Return Dictionary of Keyword Value - """ - return True - -mailgate_thread() diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml index 34bdafe1c58..5d1bb3f29d7 100644 --- a/addons/crm/crm_meeting_view.xml +++ b/addons/crm/crm_meeting_view.xml @@ -148,6 +148,7 @@