From 7e43c5e13529c34224b510b4114e3943f89da902 Mon Sep 17 00:00:00 2001 From: Tejas Tank Date: Wed, 18 Apr 2012 11:59:43 +0530 Subject: [PATCH 001/341] q bzr revid: tta@openerp.com-20120418062943-rtvpby15skwqmywx --- addons/base_contact/i18n/cs.po | 501 -------------------------- addons/base_contact/i18n/ja.po | 264 -------------- addons/fetchmail_crm_claim/i18n/ja.po | 34 ++ 3 files changed, 34 insertions(+), 765 deletions(-) delete mode 100644 addons/base_contact/i18n/cs.po delete mode 100644 addons/base_contact/i18n/ja.po create mode 100644 addons/fetchmail_crm_claim/i18n/ja.po diff --git a/addons/base_contact/i18n/cs.po b/addons/base_contact/i18n/cs.po deleted file mode 100644 index e48443f7681..00000000000 --- a/addons/base_contact/i18n/cs.po +++ /dev/null @@ -1,501 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * base_contact -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2012-02-08 00:36+0000\n" -"PO-Revision-Date: 2012-04-15 15:01+0000\n" -"Last-Translator: Jiří Hajda \n" -"Language-Team: Czech \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-04-16 04:40+0000\n" -"X-Generator: Launchpad (build 15099)\n" -"X-Poedit-Language: Czech\n" - -#. module: base_contact -#: field:res.partner.location,city:0 -msgid "City" -msgstr "Město" - -#. module: base_contact -#: view:res.partner.contact:0 -msgid "First/Lastname" -msgstr "Křestní jméno/Příjmení" - -#. module: base_contact -#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form -#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form -#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form -#: model:process.node,name:base_contact.process_node_contacts0 -#: field:res.partner.location,job_ids:0 -msgid "Contacts" -msgstr "Kontakty" - -#. module: base_contact -#: view:res.partner.contact:0 -msgid "Professional Info" -msgstr "Povolání" - -#. module: base_contact -#: field:res.partner.contact,first_name:0 -msgid "First Name" -msgstr "Křestní jméno" - -#. module: base_contact -#: field:res.partner.address,location_id:0 -msgid "Location" -msgstr "Umístění" - -#. module: base_contact -#: model:process.transition,name:base_contact.process_transition_partnertoaddress0 -msgid "Partner to address" -msgstr "Partner na adresu" - -#. module: base_contact -#: help:res.partner.contact,active:0 -msgid "" -"If the active field is set to False, it will allow you to " -"hide the partner contact without removing it." -msgstr "" -"Pokud je aktivní pole nastaveno na Nepravda, umožní vám to " -"skrýt kontakt partnera bez jeho odstranění." - -#. module: base_contact -#: field:res.partner.contact,website:0 -msgid "Website" -msgstr "Webová stránka" - -#. module: base_contact -#: field:res.partner.location,zip:0 -msgid "Zip" -msgstr "PSČ" - -#. module: base_contact -#: field:res.partner.location,state_id:0 -msgid "Fed. State" -msgstr "Fed. stát" - -#. module: base_contact -#: field:res.partner.location,company_id:0 -msgid "Company" -msgstr "Společnost" - -#. module: base_contact -#: field:res.partner.contact,title:0 -msgid "Title" -msgstr "Název" - -#. module: base_contact -#: field:res.partner.location,partner_id:0 -msgid "Main Partner" -msgstr "Hlavní partner" - -#. module: base_contact -#: model:process.process,name:base_contact.process_process_basecontactprocess0 -msgid "Base Contact" -msgstr "Základní kontakt" - -#. module: base_contact -#: field:res.partner.contact,email:0 -msgid "E-Mail" -msgstr "E-mail" - -#. module: base_contact -#: field:res.partner.contact,active:0 -msgid "Active" -msgstr "Aktivní" - -#. module: base_contact -#: field:res.partner.contact,country_id:0 -msgid "Nationality" -msgstr "Národnost" - -#. module: base_contact -#: view:res.partner:0 -#: view:res.partner.address:0 -msgid "Postal Address" -msgstr "Poštovní adresa" - -#. module: base_contact -#: field:res.partner.contact,function:0 -msgid "Main Function" -msgstr "Hlavní funkce" - -#. module: base_contact -#: model:process.transition,note:base_contact.process_transition_partnertoaddress0 -msgid "Define partners and their addresses." -msgstr "Určuje partnery a jejich adresy." - -#. module: base_contact -#: field:res.partner.contact,name:0 -msgid "Name" -msgstr "Jméno" - -#. module: base_contact -#: field:res.partner.contact,lang_id:0 -msgid "Language" -msgstr "Jazyk" - -#. module: base_contact -#: field:res.partner.contact,mobile:0 -msgid "Mobile" -msgstr "Mobil" - -#. module: base_contact -#: field:res.partner.location,country_id:0 -msgid "Country" -msgstr "Země" - -#. module: base_contact -#: view:res.partner.contact:0 -#: field:res.partner.contact,comment:0 -msgid "Notes" -msgstr "Poznámky" - -#. module: base_contact -#: model:process.node,note:base_contact.process_node_contacts0 -msgid "People you work with." -msgstr "Lidé, s kterými pracujete." - -#. module: base_contact -#: view:res.partner.contact:0 -msgid "Extra Information" -msgstr "Speciální informace" - -#. module: base_contact -#: view:res.partner.contact:0 -#: field:res.partner.contact,job_ids:0 -msgid "Functions and Addresses" -msgstr "Funkce a adresy" - -#. module: base_contact -#: model:ir.model,name:base_contact.model_res_partner_contact -#: field:res.partner.address,contact_id:0 -msgid "Contact" -msgstr "Kontakt" - -#. module: base_contact -#: model:ir.model,name:base_contact.model_res_partner_location -msgid "res.partner.location" -msgstr "res.partner.location" - -#. module: base_contact -#: model:process.node,note:base_contact.process_node_partners0 -msgid "Companies you work with." -msgstr "Společnosti, se kterými pracujete." - -#. module: base_contact -#: field:res.partner.contact,partner_id:0 -msgid "Main Employer" -msgstr "Hlavní zaměstnavatel" - -#. module: base_contact -#: view:res.partner.contact:0 -msgid "Partner Contact" -msgstr "Kontakt partnera" - -#. module: base_contact -#: model:process.node,name:base_contact.process_node_addresses0 -msgid "Addresses" -msgstr "Adresy" - -#. module: base_contact -#: model:process.node,note:base_contact.process_node_addresses0 -msgid "Working and private addresses." -msgstr "Pracovní a soukromé adresy." - -#. module: base_contact -#: field:res.partner.contact,last_name:0 -msgid "Last Name" -msgstr "Příjmení" - -#. module: base_contact -#: view:res.partner.contact:0 -#: field:res.partner.contact,photo:0 -msgid "Photo" -msgstr "Fotka" - -#. module: base_contact -#: view:res.partner.location:0 -msgid "Locations" -msgstr "Umístění" - -#. module: base_contact -#: view:res.partner.contact:0 -msgid "General" -msgstr "Obecný" - -#. module: base_contact -#: field:res.partner.location,street:0 -msgid "Street" -msgstr "Ulice" - -#. module: base_contact -#: view:res.partner.contact:0 -msgid "Partner" -msgstr "Partner" - -#. module: base_contact -#: model:process.node,name:base_contact.process_node_partners0 -msgid "Partners" -msgstr "Partneři" - -#. module: base_contact -#: model:ir.model,name:base_contact.model_res_partner_address -msgid "Partner Addresses" -msgstr "Adresy partnerů" - -#. module: base_contact -#: field:res.partner.location,street2:0 -msgid "Street2" -msgstr "Ulice 2" - -#. module: base_contact -#: view:res.partner.contact:0 -msgid "Personal Information" -msgstr "Osobní informace" - -#. module: base_contact -#: field:res.partner.contact,birthdate:0 -msgid "Birth Date" -msgstr "Datum narození" - -#~ msgid "Categories" -#~ msgstr "Kategorie" - -#~ msgid "Current" -#~ msgstr "Stávající" - -#~ msgid "Fax" -#~ msgstr "Fax" - -#~ msgid "Address" -#~ msgstr "Adresa" - -#~ msgid "Invalid XML for View Architecture!" -#~ msgstr "Invalidní XML pro zobrazení architektury!" - -#~ msgid "" -#~ "The Object name must start with x_ and not contain any special character !" -#~ msgstr "" -#~ "Jméno objektu musí začínat znakem x_ a nesmí obsahovat žádný speciální znak!" - -#~ msgid "Invalid model name in the action definition." -#~ msgstr "Špatný název modelu v definici akce" - -#~ msgid "Contact Functions" -#~ msgstr "Kontaktní funkce" - -#~ msgid "Phone" -#~ msgstr "Telefon" - -#~ msgid "Function" -#~ msgstr "Funkce" - -#~ msgid "# of Contacts" -#~ msgstr "# z kontaktů" - -#~ msgid "title" -#~ msgstr "nadpis" - -#~ msgid "Start date of job(Joining Date)" -#~ msgstr "Datum zahájení práce (datum připojení)" - -#~ msgid "Select the Option for Addresses Migration" -#~ msgstr "Vyberte volbu pro přesun adres" - -#~ msgid "Function of this contact with this partner" -#~ msgstr "Funkce tohoto kontaktu s tímto partnerem" - -#~ msgid "Status of Address" -#~ msgstr "Stav adresy" - -#~ msgid "" -#~ "You may enter Address first,Partner will be linked " -#~ "automatically if any." -#~ msgstr "" -#~ "Můžete zadat nejdříve adresu. Pokud je nějaký partner, " -#~ "bude napojen automaticky." - -#~ msgid "Job FAX no." -#~ msgstr "Číslo FAXu do práce" - -#~ msgid "Define functions and address." -#~ msgstr "Určit funkce a adresu." - -#~ msgid "Last date of job" -#~ msgstr "Poslední datum práce" - -#~ msgid "Migrate" -#~ msgstr "Přesunout" - -#~ msgid "Jobs at a same partner address." -#~ msgstr "Pracovní pozice u stejné adresy partnera." - -#~ msgid "State" -#~ msgstr "Stav" - -#~ msgid "" -#~ "\n" -#~ " This module allows you to manage your contacts entirely.\n" -#~ "\n" -#~ " It lets you define\n" -#~ " *contacts unrelated to a partner,\n" -#~ " *contacts working at several addresses (possibly for different " -#~ "partners),\n" -#~ " *contacts with possibly different functions for each of its job's " -#~ "addresses\n" -#~ "\n" -#~ " It also adds new menu items located in\n" -#~ " Partners \\ Contacts\n" -#~ " Partners \\ Functions\n" -#~ "\n" -#~ " Pay attention that this module converts the existing addresses into " -#~ "\"addresses + contacts\". It means that some fields of the addresses will be " -#~ "missing (like the contact name), since these are supposed to be defined in " -#~ "an other object.\n" -#~ " " -#~ msgstr "" -#~ "\n" -#~ " Tento modul umožňuje úplně spravovat vaše kontakty.\n" -#~ "\n" -#~ " Nechá vás určit\n" -#~ " *kontakty nevztažené k partnerovi,\n" -#~ " *kontakty pracující na několika adresách (případně i pro různé " -#~ "partnery),\n" -#~ " *kontakty s možnými různými funkcemi pro každou jeho pracovní " -#~ "adresu\n" -#~ "\n" -#~ " Také přidává nové položky nabídky umístěné v\n" -#~ " Partneři \\ Kontakty\n" -#~ " Partneři \\ Funkce\n" -#~ "\n" -#~ " Berte na vědomí, že tento modul převádí existující adresy na \"adresy + " -#~ "kontakty\". To znamená, že některé pole adres budou chybět (jako jméno " -#~ "kontaktu), protože ty jsou definovány v jiném objektu.\n" -#~ " " - -#~ msgid "Date Stop" -#~ msgstr "Datum zastavení" - -#~ msgid "Contact's Jobs" -#~ msgstr "Pozice kontaktu" - -#~ msgid "" -#~ "Order of importance of this job title in the list of job " -#~ "title of the linked partner" -#~ msgstr "" -#~ "Pořadí důležitosti této pracovní pozice v seznamu titulů " -#~ "pozic napojeného partnera" - -#~ msgid "Extension" -#~ msgstr "Rozšíření" - -#~ msgid "Internal/External extension phone number" -#~ msgstr "Vnitřní/vnější telefoní číslo klapky" - -#~ msgid "Job Phone no." -#~ msgstr "Telefoní číslo do práce." - -#~ msgid "Job E-Mail" -#~ msgstr "Pracovní E-Mail" - -#~ msgid "Partner Seq." -#~ msgstr "Poř. parnera" - -#~ msgid "Function to address" -#~ msgstr "Funkce na adresu" - -#~ msgid "Configuration Progress" -#~ msgstr "Průběh nastavení" - -#~ msgid "Communication" -#~ msgstr "Komunikace" - -#~ msgid "Image" -#~ msgstr "Obrázek" - -#~ msgid "Past" -#~ msgstr "Minulý" - -#~ msgid "Address's Migration to Contacts" -#~ msgstr "Stěhování adresy na kontakty" - -#~ msgid "Contact Seq." -#~ msgstr "Poř. kontaktu" - -#~ msgid "Search Contact" -#~ msgstr "Hledat kontakt" - -#~ msgid "" -#~ "Due to changes in Address and Partner's relation, some of the details from " -#~ "address are needed to be migrated into contact information." -#~ msgstr "" -#~ "Kvůli změnám v adrese a vztahu partnera, některé podrobnosti adresy jsou " -#~ "potřebné, aby byly přesunuty do informací účtu." - -#~ msgid "Address which is linked to the Partner" -#~ msgstr "Adresa, která je napojena na partnera" - -#~ msgid "Partner Function" -#~ msgstr "Funkce partnera" - -#~ msgid "Additional phone field" -#~ msgstr "Doplňující pole telefonu" - -#~ msgid "Otherwise these details will not be visible from address/contact." -#~ msgstr "Jinak tyto podrobnosti nebudou viditelné z adresy/kontaktu." - -#~ msgid "Configure" -#~ msgstr "Nastavit" - -#~ msgid "base.contact.installer" -#~ msgstr "base.contact.installer" - -#~ msgid "Do you want to migrate your Address data in Contact Data?" -#~ msgstr "Chcete stěhovat vaše data adresy v datech kontaktu?" - -#~ msgid "Seq." -#~ msgstr "Poř." - -#~ msgid "If you select this, all addresses will be migrated." -#~ msgstr "Pokud toto vyberete, všechny adresy budou přesunuty." - -#~ msgid "Contact Partner Function" -#~ msgstr "Kontakt funkce partnera" - -#~ msgid "Other" -#~ msgstr "Jiné" - -#~ msgid "Main Job" -#~ msgstr "Hlavní práce" - -#~ msgid "Defines contacts and functions." -#~ msgstr "Určuje kontakty a funkce." - -#~ msgid "Contact to function" -#~ msgstr "Kontakt na funkci" - -#~ msgid "Open Jobs" -#~ msgstr "Otevřené pozice" - -#~ msgid "You can migrate Partner's current addresses to the contact." -#~ msgstr "Můžete stěhovat partnerovu aktuální adresu do kontaktu." - -#~ msgid "Address Migration" -#~ msgstr "Stěhování adresy" - -#~ msgid "Date Start" -#~ msgstr "Počáteční datum" - -#~ msgid "" -#~ "Order of importance of this address in the list of " -#~ "addresses of the linked contact" -#~ msgstr "" -#~ "Pořadí podle důležitosti této adresy v seznamu adres napojeného " -#~ "kontaktu" diff --git a/addons/base_contact/i18n/ja.po b/addons/base_contact/i18n/ja.po deleted file mode 100644 index 89af47fb6ac..00000000000 --- a/addons/base_contact/i18n/ja.po +++ /dev/null @@ -1,264 +0,0 @@ -# Japanese translation for openobject-addons -# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-02-08 00:36+0000\n" -"PO-Revision-Date: 2012-04-14 00:01+0000\n" -"Last-Translator: Tomomi Mengelberg \n" -"Language-Team: Japanese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-04-15 04:42+0000\n" -"X-Generator: Launchpad (build 15070)\n" - -#. module: base_contact -#: field:res.partner.location,city:0 -msgid "City" -msgstr "市区町村" - -#. module: base_contact -#: view:res.partner.contact:0 -msgid "First/Lastname" -msgstr "名/姓" - -#. module: base_contact -#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form -#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form -#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form -#: model:process.node,name:base_contact.process_node_contacts0 -#: field:res.partner.location,job_ids:0 -msgid "Contacts" -msgstr "連絡先" - -#. module: base_contact -#: view:res.partner.contact:0 -msgid "Professional Info" -msgstr "" - -#. module: base_contact -#: field:res.partner.contact,first_name:0 -msgid "First Name" -msgstr "姓" - -#. module: base_contact -#: field:res.partner.address,location_id:0 -msgid "Location" -msgstr "場所" - -#. module: base_contact -#: model:process.transition,name:base_contact.process_transition_partnertoaddress0 -msgid "Partner to address" -msgstr "" - -#. module: base_contact -#: help:res.partner.contact,active:0 -msgid "" -"If the active field is set to False, it will allow you to " -"hide the partner contact without removing it." -msgstr "" - -#. module: base_contact -#: field:res.partner.contact,website:0 -msgid "Website" -msgstr "ウェブサイト" - -#. module: base_contact -#: field:res.partner.location,zip:0 -msgid "Zip" -msgstr "郵便番号" - -#. module: base_contact -#: field:res.partner.location,state_id:0 -msgid "Fed. State" -msgstr "" - -#. module: base_contact -#: field:res.partner.location,company_id:0 -msgid "Company" -msgstr "会社" - -#. module: base_contact -#: field:res.partner.contact,title:0 -msgid "Title" -msgstr "役職" - -#. module: base_contact -#: field:res.partner.location,partner_id:0 -msgid "Main Partner" -msgstr "主なパートナ" - -#. module: base_contact -#: model:process.process,name:base_contact.process_process_basecontactprocess0 -msgid "Base Contact" -msgstr "" - -#. module: base_contact -#: field:res.partner.contact,email:0 -msgid "E-Mail" -msgstr "メール" - -#. module: base_contact -#: field:res.partner.contact,active:0 -msgid "Active" -msgstr "有効" - -#. module: base_contact -#: field:res.partner.contact,country_id:0 -msgid "Nationality" -msgstr "国籍" - -#. module: base_contact -#: view:res.partner:0 -#: view:res.partner.address:0 -msgid "Postal Address" -msgstr "住所" - -#. module: base_contact -#: field:res.partner.contact,function:0 -msgid "Main Function" -msgstr "主な役割" - -#. module: base_contact -#: model:process.transition,note:base_contact.process_transition_partnertoaddress0 -msgid "Define partners and their addresses." -msgstr "" - -#. module: base_contact -#: field:res.partner.contact,name:0 -msgid "Name" -msgstr "名前" - -#. module: base_contact -#: field:res.partner.contact,lang_id:0 -msgid "Language" -msgstr "言語" - -#. module: base_contact -#: field:res.partner.contact,mobile:0 -msgid "Mobile" -msgstr "携帯電話" - -#. module: base_contact -#: field:res.partner.location,country_id:0 -msgid "Country" -msgstr "国名" - -#. module: base_contact -#: view:res.partner.contact:0 -#: field:res.partner.contact,comment:0 -msgid "Notes" -msgstr "備考" - -#. module: base_contact -#: model:process.node,note:base_contact.process_node_contacts0 -msgid "People you work with." -msgstr "同僚" - -#. module: base_contact -#: view:res.partner.contact:0 -msgid "Extra Information" -msgstr "その他の情報" - -#. module: base_contact -#: view:res.partner.contact:0 -#: field:res.partner.contact,job_ids:0 -msgid "Functions and Addresses" -msgstr "" - -#. module: base_contact -#: model:ir.model,name:base_contact.model_res_partner_contact -#: field:res.partner.address,contact_id:0 -msgid "Contact" -msgstr "連絡先" - -#. module: base_contact -#: model:ir.model,name:base_contact.model_res_partner_location -msgid "res.partner.location" -msgstr "" - -#. module: base_contact -#: model:process.node,note:base_contact.process_node_partners0 -msgid "Companies you work with." -msgstr "同僚" - -#. module: base_contact -#: field:res.partner.contact,partner_id:0 -msgid "Main Employer" -msgstr "" - -#. module: base_contact -#: view:res.partner.contact:0 -msgid "Partner Contact" -msgstr "パートナー連絡先" - -#. module: base_contact -#: model:process.node,name:base_contact.process_node_addresses0 -msgid "Addresses" -msgstr "住所" - -#. module: base_contact -#: model:process.node,note:base_contact.process_node_addresses0 -msgid "Working and private addresses." -msgstr "勤め先住所と自宅住所" - -#. module: base_contact -#: field:res.partner.contact,last_name:0 -msgid "Last Name" -msgstr "姓" - -#. module: base_contact -#: view:res.partner.contact:0 -#: field:res.partner.contact,photo:0 -msgid "Photo" -msgstr "写真" - -#. module: base_contact -#: view:res.partner.location:0 -msgid "Locations" -msgstr "場所" - -#. module: base_contact -#: view:res.partner.contact:0 -msgid "General" -msgstr "" - -#. module: base_contact -#: field:res.partner.location,street:0 -msgid "Street" -msgstr "番地" - -#. module: base_contact -#: view:res.partner.contact:0 -msgid "Partner" -msgstr "パートナ" - -#. module: base_contact -#: model:process.node,name:base_contact.process_node_partners0 -msgid "Partners" -msgstr "取引先" - -#. module: base_contact -#: model:ir.model,name:base_contact.model_res_partner_address -msgid "Partner Addresses" -msgstr "パートナの住所" - -#. module: base_contact -#: field:res.partner.location,street2:0 -msgid "Street2" -msgstr "番地" - -#. module: base_contact -#: view:res.partner.contact:0 -msgid "Personal Information" -msgstr "個人情報" - -#. module: base_contact -#: field:res.partner.contact,birthdate:0 -msgid "Birth Date" -msgstr "生年月日" diff --git a/addons/fetchmail_crm_claim/i18n/ja.po b/addons/fetchmail_crm_claim/i18n/ja.po new file mode 100644 index 00000000000..a1f6db4a764 --- /dev/null +++ b/addons/fetchmail_crm_claim/i18n/ja.po @@ -0,0 +1,34 @@ +# Japanese translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-04-08 05:43+0000\n" +"Last-Translator: Masaki Yamaya \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-04-09 04:56+0000\n" +"X-Generator: Launchpad (build 15060)\n" + +#. module: fetchmail_crm_claim +#: model:ir.actions.act_window,help:fetchmail_crm_claim.action_create_crm_claims_from_email_account +msgid "" +"You can connect your email account with claims in OpenERP. A new email sent " +"to this account (example: support@mycompany.com) will automatically create a " +"claim for the followup in OpenERP. The whole communication by email will be " +"attached to the claim automatically to keep track of the history." +msgstr "" +"あなたのＥメールアカウントをOpenERPのクレームに関連づけることはできません。このアカウントに送られた新しいＥメールはOpenERPのフォローアップの" +"ためのクレームを自動的に作成します。Ｅメールによる全てのコミュニケーションは、履歴を記録するために、自動的にクレームに関連づけられます。" + +#. module: fetchmail_crm_claim +#: model:ir.actions.act_window,name:fetchmail_crm_claim.action_create_crm_claims_from_email_account +msgid "Create Claims from Email Account" +msgstr "Ｅメールアカウントからクレームを作成" From 2c780efd12a47d440e7b9a4ecae7da0cf9565390 Mon Sep 17 00:00:00 2001 From: Tejas Tank Date: Thu, 19 Apr 2012 18:59:16 +0530 Subject: [PATCH 002/341] Web Etherpad Integration bzr revid: tta@openerp.com-20120419132916-yzrdnz2y8gus2wlw --- addons/web_etherpad/__init__.py | 2 + addons/web_etherpad/__openerp__.py | 16 +++ addons/web_etherpad/res_company.py | 15 +++ addons/web_etherpad/res_company.xml | 16 +++ .../static/src/js/web_etherpad.js | 125 ++++++++++++++++++ .../web_etherpad/static/src/xml/etherpad.xml | 21 +++ 6 files changed, 195 insertions(+) create mode 100644 addons/web_etherpad/__init__.py create mode 100755 addons/web_etherpad/__openerp__.py create mode 100644 addons/web_etherpad/res_company.py create mode 100644 addons/web_etherpad/res_company.xml create mode 100755 addons/web_etherpad/static/src/js/web_etherpad.js create mode 100755 addons/web_etherpad/static/src/xml/etherpad.xml diff --git a/addons/web_etherpad/__init__.py b/addons/web_etherpad/__init__.py new file mode 100644 index 00000000000..df35bc32106 --- /dev/null +++ b/addons/web_etherpad/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +import res_company diff --git a/addons/web_etherpad/__openerp__.py b/addons/web_etherpad/__openerp__.py new file mode 100755 index 00000000000..829081e8c65 --- /dev/null +++ b/addons/web_etherpad/__openerp__.py @@ -0,0 +1,16 @@ +{ + "name": "web_etherpad", + "category" : "Hidden", + "description":'Openerp web Etherpad Widget', + "version": "2.0", + 'author': 'OpenERP SA', + 'website': 'http://openerp.com', + 'data': [ + 'res_company.xml' + ], + "depends": ['base','web'], + 'qweb' : ['static/src/xml/etherpad.xml'], + "css": [], + "js": ['static/src/js/web_etherpad.js'], + "auto_install": False, +} diff --git a/addons/web_etherpad/res_company.py b/addons/web_etherpad/res_company.py new file mode 100644 index 00000000000..0c1dc7c4929 --- /dev/null +++ b/addons/web_etherpad/res_company.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +from osv import fields, osv + +class company_pad(osv.osv): + _inherit = 'res.company' + _columns = { + 'pad_url_template': fields.char('Pad URL Template', size=128, required=True, + help="Template used to generate pad URL."), + } + _defaults = { + 'pad_url_template': 'http://ietherpad.com/%(db)s-%(model)s-%(id)d-%(salt)s-%(name)s' + } + + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/web_etherpad/res_company.xml b/addons/web_etherpad/res_company.xml new file mode 100644 index 00000000000..20b6f52d853 --- /dev/null +++ b/addons/web_etherpad/res_company.xml @@ -0,0 +1,16 @@ + + + + res.company.form.pad + res.company + form + + + + + + + + + + diff --git a/addons/web_etherpad/static/src/js/web_etherpad.js b/addons/web_etherpad/static/src/js/web_etherpad.js new file mode 100755 index 00000000000..d19fb2b9512 --- /dev/null +++ b/addons/web_etherpad/static/src/js/web_etherpad.js @@ -0,0 +1,125 @@ +openerp.web_etherpad = function (instance) { + + instance.web.form.FieldEtherpad = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, { + template: 'FieldEtherpad', + initialize_content: function() { + this.$textarea = undefined; + if (!this.get("effective_readonly")) { + this.$textarea = this.$element.find('textarea'); + //this.$textarea.hide(); + this.$textarea.change(_.bind(function() { + this.set({'value': instance.web.parse_value(this.$textarea.val(), this)}); + }, this)); + this.resized = false; + } + }, + set_value: function(value_) { + var self = this ; + var company_id = (self.view.datarecord.hasOwnProperty('id')) ?self.view.datarecord.company_id[0]: self.view.datarecord.company_id ; + /* getting etherpad url and set pad to field. */ + self.rpc('/web/dataset/get',{ + 'model':'res.company', + 'ids':[company_id], + 'fields':['pad_url_template'], + 'context':{} + },function(companies){ + var pad_template = companies[0].pad_url_template.replace('-%(salt)s-%(name)s','').replace(/\s/g,''); + + var patt_url = (_.str.sprintf(pad_template.replace('-%(id)d',''), { + db : self.session.db, + model : self.view.model, + })).replace(/\s/g,'') ; + //alert("match or not >?"+value_.search(patt_url)); + if(value_ == false) + self.add_pad(self,pad_template,value_); + else if(value_.search(patt_url) != 0) + self.add_pad(self,pad_template,value_); + else + self.show_pad_value(self,value_); + }); + }, + show_pad_value: function(self,value_) + { + self._inhibit_on_change = true; + self.set({'value': value_ }); + self._inhibit_on_change = false; + self.invalid = false; + self.update_dom(); + self.render_value(); + }, + add_pad: function(self,pad_template,value_){ + var url = (_.str.sprintf(pad_template, { + db : self.session.db, + model : self.view.model, + id : Math.round(new Date().getTime()/100.0), + })).replace(/\s/g,''); + var show_value = instance.web.format_value(value_, this, ''); + self.show_pad_value(self,url + '\n'+ show_value); + this.dirty = true; + }, + render_value: function() { + var show_value = instance.web.format_value(this.get('value'), this, ''); + if (!this.get("effective_readonly")) { + this.$textarea.val(show_value); + this.$element.find('div').html(''); + if (!this.resized && this.view.options.resize_textareas) { + this.do_resize(this.view.options.resize_textareas); + this.resized = true; + } + } else { + this.$element.text(show_value); + if(this.get('value') != false) + { + var self = this; + $.get(show_value.split('\n')[0]+'/export/html', function(data) { + console.log(data); + self.$element.html(data); + }); + } + } + }, + validate: function() { + this.invalid = false; + if (!this.get("effective_readonly")) { + try { + var value_ = instance.web.parse_value(this.$textarea.val(), this, ''); + this.invalid = this.get("required") && value_ === ''; + } catch(e) { + this.invalid = true; + } + } + }, + focus: function($element) { + this._super($element || this.$textarea); + }, + do_resize: function(max_height) { + max_height = parseInt(max_height, 10); + var $input = this.$textarea, + $div = $('
').width($input.width()), + new_height; + $div.text($input.val()); + _.each('font-family,font-size,white-space'.split(','), function(style) { + $div.css(style, $input.css(style)); + }); + $div.appendTo($('body')); + new_height = $div.height(); + if (new_height < 90) { + new_height = 90; + } + if (!isNaN(max_height) && new_height > max_height) { + new_height = max_height; + } + $div.remove(); + $input.height(new_height); + }, + reset: function() { + this.resized = false; + } + })); + + instance.web.form.widgets = instance.web.form.widgets.extend({ + 'etherpad': 'instance.web.form.FieldEtherpad', + }); + + +} diff --git a/addons/web_etherpad/static/src/xml/etherpad.xml b/addons/web_etherpad/static/src/xml/etherpad.xml new file mode 100755 index 00000000000..64c2e2dc6a0 --- /dev/null +++ b/addons/web_etherpad/static/src/xml/etherpad.xml @@ -0,0 +1,21 @@ + + + + + + + +
+ +
+
+ + + + From 4cb57e25230fb289d4e61dd2acb31953ebe7e2a2 Mon Sep 17 00:00:00 2001 From: Tejas Tank Date: Thu, 19 Apr 2012 19:05:22 +0530 Subject: [PATCH 003/341] Not show textarea bzr revid: tta@openerp.com-20120419133522-lk286h44c2y06j6g --- addons/web_etherpad/static/src/js/web_etherpad.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_etherpad/static/src/js/web_etherpad.js b/addons/web_etherpad/static/src/js/web_etherpad.js index d19fb2b9512..28afe60133d 100755 --- a/addons/web_etherpad/static/src/js/web_etherpad.js +++ b/addons/web_etherpad/static/src/js/web_etherpad.js @@ -6,7 +6,7 @@ openerp.web_etherpad = function (instance) { this.$textarea = undefined; if (!this.get("effective_readonly")) { this.$textarea = this.$element.find('textarea'); - //this.$textarea.hide(); + this.$textarea.hide(); this.$textarea.change(_.bind(function() { this.set({'value': instance.web.parse_value(this.$textarea.val(), this)}); }, this)); From 4a9e3512c58627b42fc82f4f2283e2ba0064637f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 19 Apr 2012 17:26:44 +0200 Subject: [PATCH 004/341] [ADD] mail: added mail.subscription.hide model. This will holds the hiden notification subtypes. bzr revid: tde@openerp.com-20120419152644-u3t5y18s0w7r5ton --- addons/mail/mail_subscription.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/addons/mail/mail_subscription.py b/addons/mail/mail_subscription.py index fc82af879a9..2b6a8dd5342 100644 --- a/addons/mail/mail_subscription.py +++ b/addons/mail/mail_subscription.py @@ -44,6 +44,25 @@ class mail_subscription(osv.osv): ondelete='cascade', required=True, select=1), } +class mail_subscription_hide(osv.osv): + """ + mail_subscription_hide holds the data to store the hiden notifications + on the Wall. Hide choices are related to a subscription, not a model + or a user. + :param: subscription_id: the related subscription + :param: subtype: the message subtype hiden + """ + _name = 'mail.subscription.hide' + _rec_name = 'id' + _order = 'id desc' + _description = 'Hidden subscription' + _columns = { + 'subscription_id': fields.many2one('mail.subscription', string='Subscription', + ondelete='cascade', required=True, select=1), + 'subtype': fields.char('Message subtype', size=64, + required=True, help='Message subtype is a string that depends on the related model.'), + } + class mail_notification(osv.osv): """ mail_notification is a relational table modeling messages pushed to users. From 491e8ad9f6192278ee386d6a721f8c810009d581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 19 Apr 2012 17:38:25 +0200 Subject: [PATCH 005/341] [ADD] mail.subscription.hide: added views and menu entry. bzr revid: tde@openerp.com-20120419153825-xodlfiotdgdmco30 --- addons/mail/mail_subscription_view.xml | 36 +++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/addons/mail/mail_subscription_view.xml b/addons/mail/mail_subscription_view.xml index 52b72127b78..827c23b25d2 100644 --- a/addons/mail/mail_subscription_view.xml +++ b/addons/mail/mail_subscription_view.xml @@ -20,6 +20,23 @@ + + + + mail.subscription.hide.tree + mail.subscription.hide + tree + 10 + + + + + + + + @@ -45,6 +62,13 @@ tree,form + + Hidden subscriptions + mail.subscription.hide + form + tree,form + + Pushed notif mail.notification @@ -52,11 +76,15 @@ tree,form - - + + + - - + + From ae0dbd21455e8a6ef2d358b8999fba49674fd497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 19 Apr 2012 17:53:39 +0200 Subject: [PATCH 006/341] [ADD] mail.group: added a 'models' field, to link groups to models. Purpose: group will be able to aggregate messages, and users following the group will receive notifications. Example: being able to follow all leads. bzr revid: tde@openerp.com-20120419155339-etlzmi5jo5d8iwgf --- addons/mail/mail_group.py | 2 ++ addons/mail/mail_group_view.xml | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py index 0a8677d7862..83d0705c4e0 100644 --- a/addons/mail/mail_group.py +++ b/addons/mail/mail_group.py @@ -119,6 +119,8 @@ class mail_group(osv.osv): ondelete='set null', required=True, select=1, help="Responsible of the group that has all rights on the record."), 'public': fields.boolean('Public', help='This group is visible by non members. Invisible groups can add members through the invite button.'), + 'models': fields.many2many('ir.model', rel='mail_group_models_rel', id1='mail_group_id', id2='model_id', + string='Linked models', help='Linked models'), 'photo_big': fields.binary('Full-size photo', help='Field holding the full-sized PIL-supported and base64 encoded version of the group image. The photo field is used as an interface for this field.'), 'photo': fields.function(_get_photo, fnct_inv=_set_photo, string='Photo', type="binary", store = { diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml index ea0dede377d..d911b4a7deb 100644 --- a/addons/mail/mail_group_view.xml +++ b/addons/mail/mail_group_view.xml @@ -58,6 +58,11 @@ + + + + + From caba5db34bb9d6a4f91127c063293aae3be13780 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 19 Apr 2012 18:20:50 +0200 Subject: [PATCH 007/341] [ADD] mail.message: added a message_subtype field, that will contain more precise data about the type of content. Example: create, cancel, ... Purpose: being able to filter (hide) a given content type. bzr revid: tde@openerp.com-20120419162050-6uq495s94i4etnbp --- addons/mail/mail_message.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index 5d5d599be0e..9228861b139 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -206,6 +206,12 @@ class mail_message(osv.osv): ('comment', 'Comment'), ('notification', 'System notification'), ], 'Type', help="Message type: e-mail for e-mail message, notification for system message, comment for other messages such as user replies"), + 'message_subtype': fields.selection([ + ('email', 'e-mail'), + ('comment', 'Comment'), + ('create', 'Create'), + ('cancel', 'Cancel'), + ], 'Type', help="Message subtype, such as create or cancel. May be overriden by addons."), 'partner_id': fields.many2one('res.partner', 'Related partner'), 'user_id': fields.many2one('res.users', 'Related user', readonly=1), 'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'), @@ -224,6 +230,7 @@ class mail_message(osv.osv): _defaults = { 'type': 'email', + 'message_subtype': 'email', 'state': 'received', } From 7a4ca1338c43b63c4d7976519ffe7a374d922fc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 20 Apr 2012 10:42:41 +0200 Subject: [PATCH 008/341] [ADD] Chatter widget: added links to hide a thread or a subtype. Only links, not functional currently, because logic is not implemented. bzr revid: tde@openerp.com-20120420084241-02l4tfifzxjd88go --- addons/mail/static/src/css/mail.css | 31 ++++++++++++++++++++++++++++ addons/mail/static/src/js/mail.js | 32 +++++++++++++++++++++++++++++ addons/mail/static/src/xml/mail.xml | 6 ++++++ 3 files changed, 69 insertions(+) diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index 7f0cc6f222c..5bae0d5e73b 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -167,6 +167,7 @@ } .openerp .oe_mail_msg_notification, .openerp .oe_mail_msg_comment, .openerp .oe_mail_msg_email { + position: relative; padding: 4px; -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -229,6 +230,36 @@ color: #4E43E7; } +.openerp img.oe_mail_msg_menu_icon { + float: right; + cursor: pointer; +} + +.openerp ul.oe_mail_msg_menu { +/* + display: none; +*/ + display: block; + position: absolute; + top: 1em; + right: 1em; + overflow-x: hidden; + z-index: 900; + background: white; + padding: 4px; + border: 1px solid #AFAFB6; + width: 150px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + -o-border-radius: 3px; + -ms-border-radius: 3px; + border-radius: 3px; + -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); + -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); + -o-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); + -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); +} + /* ------------------------------ */ /* Styling (should be openerp) */ /* ------------------------------ */ diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index d99674f98a7..160a1dc33fd 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -174,6 +174,34 @@ openerp.mail = function(session) { } return false; }); + // event: click on 'hide notification' in wheel_menu + this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_hide_thread', 'click', function (event) { + console.log('hiding notification'); + if (! confirm(_t("Do you really want to hide this thread ?"))) { return false; } + var msg_id = event.srcElement.dataset.id; + if (! msg_id) return false; + console.log(msg_id); + //var call_defer = self.ds.call('message_remove_pushed_notifications', [[self.params.res_id], [parseInt(msg_id)], true]); + $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).hide(); + if (self.params.thread_level > 0) { + $(event.srcElement).parents('ul.oe_mail_thread').eq(0).hide(); + } + return false; + }); + // event: click on 'hide this type' in wheel_menu + this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_hide_type', 'click', function (event) { + console.log('hiding type'); + if (! confirm(_t("Do you really want to hide this thread ?"))) { return false; } + var msg_id = event.srcElement.dataset.id; + if (! msg_id) return false; + console.log(msg_id); + //var call_defer = self.ds.call('message_remove_pushed_notifications', [[self.params.res_id], [parseInt(msg_id)], true]); + $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).hide(); + if (self.params.thread_level > 0) { + $(event.srcElement).parents('ul.oe_mail_thread').eq(0).hide(); + } + return false; + }); // event: click on an internal link this.$element.find('div.oe_mail_thread_display').delegate('a.intlink', 'click', function (event) { // lazy implementation: fetch data and try to redirect @@ -193,6 +221,10 @@ openerp.mail = function(session) { } else self.do_action({ type: 'ir.actions.act_window', res_model: res_model, res_id: parseInt(res_id), views: [[false, 'form']]}); }); + // event: click on the wheel menu in messages + this.$element.find('div.oe_mail_thread_display').delegate('img.oe_mail_msg_menu_icon', 'click', function (event) { + self.$element.find('ul.oe_mail_msg_menu').toggle(); + }); }, destroy: function () { diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index f034b04311d..7fe1d39a661 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -58,6 +58,12 @@
  • + menu +
    From 318ef517ab037bafba43c2e5d85301f0f88432c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 20 Apr 2012 11:36:45 +0200 Subject: [PATCH 009/341] [REF] mail.message.common model: renamed subtype to content_subtype. Purpose: make a distinction between content and message model. Type and subtype will be used to distinguish messages, content_subtype to distinguish the content itself. bzr revid: tde@openerp.com-20120420093645-tt78zzrmq2nxomvb --- addons/base_calendar/base_calendar.py | 2 +- addons/crm/wizard/mail_compose_message.py | 2 +- addons/email_template/email_template.py | 4 +- addons/mail/mail_message.py | 78 ++++++++++++---------- addons/mail/mail_message_view.xml | 4 +- addons/mail/mail_thread.py | 22 +++--- addons/mail/wizard/mail_compose_message.py | 12 ++-- 7 files changed, 65 insertions(+), 59 deletions(-) diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index 4dffd8bcbf8..09033bffa84 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -515,7 +515,7 @@ property or property parameter."), sub, body, attachments=attach and {'invitation.ics': attach} or None, - subtype='html', + content_subtype='html', reply_to=email_from, context=context ) diff --git a/addons/crm/wizard/mail_compose_message.py b/addons/crm/wizard/mail_compose_message.py index b82c3083f3a..11d340b2f76 100644 --- a/addons/crm/wizard/mail_compose_message.py +++ b/addons/crm/wizard/mail_compose_message.py @@ -54,7 +54,7 @@ class mail_compose_message(osv.osv_memory): 'email_cc' : tools.ustr(data.email_cc or ''), 'model': model, 'res_id': res_id, - 'subtype': 'plain', + 'content_subtype': 'plain', }) if hasattr(data, 'section_id'): result.update({'reply_to' : data.section_id and data.section_id.reply_to or False}) diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py index 86f136ca5b9..31bf9a76441 100644 --- a/addons/email_template/email_template.py +++ b/addons/email_template/email_template.py @@ -310,7 +310,7 @@ class email_template(osv.osv): 'attachment_ids': False, 'message_id': False, 'state': 'outgoing', - 'subtype': 'plain', + 'content_subtype': 'plain', } if not template_id: return values @@ -326,7 +326,7 @@ class email_template(osv.osv): or False if values['body_html']: - values.update(subtype='html') + values.update(content_subtype='html') if template.user_signature: signature = self.pool.get('res.users').browse(cr, uid, uid, context).signature diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index 9228861b139..1595fbae077 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -63,18 +63,21 @@ def to_email(text): if not text: return [] return re.findall(r'([^ ,<@]+@[^> ,]+)', text) -class mail_message_common(osv.osv_memory): +class mail_message_common(osv.TransientModel): """Common abstract class for holding the main attributes of a message object. It could be reused as parent model for any database model or wizard screen that needs to hold a kind of - message""" + message. + All internal logic should be in a database-based model. For example, + a wizard for writing emails should inherit from this class and not + from mail.message.""" def get_body(self, cr, uid, ids, name, arg, context=None): if context is None: context = {} result = dict.fromkeys(ids, '') for message in self.browse(cr, uid, ids, context=context): - if message.subtype == 'html': + if message.content_subtype == 'html': result[message.id] = message.body_html else: result[message.id] = message.body_text @@ -85,7 +88,7 @@ class mail_message_common(osv.osv_memory): - obj: mail.message object - name: 'body' - args: [('body', 'ilike', 'blah')]""" - return ['|', '&', ('subtype', '=', 'html'), ('body_html', args[0][1], args[0][2]), ('body_text', args[0][1], args[0][2])] + return ['|', '&', ('content_subtype', '=', 'html'), ('body_html', args[0][1], args[0][2]), ('body_text', args[0][1], args[0][2])] def get_record_name(self, cr, uid, ids, name, arg, context=None): if context is None: @@ -115,19 +118,20 @@ class mail_message_common(osv.osv_memory): help="Full message headers, e.g. SMTP session headers (usually available on inbound messages only)"), 'message_id': fields.char('Message-Id', size=256, help='Message unique identifier', select=1, readonly=1), 'references': fields.text('References', help='Message references, such as identifiers of previous messages', readonly=1), - 'subtype': fields.char('Message type', size=32, help="Type of message, usually 'html' or 'plain', used to " - "select plaintext or rich text contents accordingly", readonly=1), + 'content_subtype': fields.char('Message content subtype', size=32, + help="Type of message, usually 'html' or 'plain', used to " + "select plain-text or rich-text contents accordingly", readonly=1), 'body_text': fields.text('Text contents', help="Plain-text version of the message"), 'body_html': fields.text('Rich-text contents', help="Rich-text/HTML version of the message"), 'body': fields.function(get_body, fnct_search = search_body, string='Message content', type='text', - help="Content of the message. This content equals the body_text field for plain-test messages, and body_html for rich-text/HTML messages. This allows having one field if we want to access the content matching the message subtype."), + help="Content of the message. This content equals the body_text field for plain-test messages, and body_html for rich-text/HTML messages. This allows having one field if we want to access the content matching the message content_subtype."), 'parent_id': fields.many2one('mail.message', 'Parent message', help="Parent message, used for displaying as threads with hierarchy", select=True, ondelete='set null',), 'child_ids': fields.one2many('mail.message', 'parent_id', 'Child messages'), } _defaults = { - 'subtype': 'plain', + 'content_subtype': 'plain', 'date': (lambda *a: fields.datetime.now()), } @@ -206,12 +210,12 @@ class mail_message(osv.osv): ('comment', 'Comment'), ('notification', 'System notification'), ], 'Type', help="Message type: e-mail for e-mail message, notification for system message, comment for other messages such as user replies"), - 'message_subtype': fields.selection([ + 'message_tmptype': fields.selection([ ('email', 'e-mail'), ('comment', 'Comment'), ('create', 'Create'), ('cancel', 'Cancel'), - ], 'Type', help="Message subtype, such as create or cancel. May be overriden by addons."), + ], 'Type', help="Message temptype, such as create or cancel. May be overriden by addons."), 'partner_id': fields.many2one('res.partner', 'Related partner'), 'user_id': fields.many2one('res.users', 'Related user', readonly=1), 'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'), @@ -230,7 +234,7 @@ class mail_message(osv.osv): _defaults = { 'type': 'email', - 'message_subtype': 'email', + 'message_tmptype': 'email', 'state': 'received', } @@ -250,18 +254,18 @@ class mail_message(osv.osv): default.update(message_id=False,original=False,headers=False) return super(mail_message,self).copy(cr, uid, id, default=default, context=context) - def schedule_with_attach(self, cr, uid, email_from, email_to, subject, body, model=False, email_cc=None, - email_bcc=None, reply_to=False, attachments=None, message_id=False, references=False, - res_id=False, subtype='plain', headers=None, mail_server_id=False, auto_delete=False, - context=None): + def schedule_with_attach(self, cr, uid, email_from, email_to, subject, body, model=False, + email_cc=None, email_bcc=None, reply_to=False, attachments=None, + message_id=False, references=False, res_id=False, content_subtype='plain', + headers=None, mail_server_id=False, auto_delete=False, context=None): """Schedule sending a new email message, to be sent the next time the mail scheduler runs, or the next time :meth:`process_email_queue` is called explicitly. :param string email_from: sender email address :param list email_to: list of recipient addresses (to be joined with commas) :param string subject: email subject (no pre-encoding/quoting necessary) - :param string body: email body, according to the ``subtype`` (by default, plaintext). - If html subtype is used, the message will be automatically converted + :param string body: email body, according to the ``content_subtype`` + (by default, plaintext). If html content_subtype is used, the message will be automatically converted to plaintext and wrapped in multipart/alternative. :param list email_cc: optional list of string values for CC header (to be joined with commas) :param list email_bcc: optional list of string values for BCC header (to be joined with commas) @@ -272,9 +276,9 @@ class mail_message(osv.osv): be used to generate a tracking id, used to match any response related to the same document) :param string reply_to: optional value of Reply-To header - :param string subtype: optional mime subtype for the text body (usually 'plain' or 'html'), - must match the format of the ``body`` parameter. Default is 'plain', - making the content part of the mail "text/plain". + :param string content_subtype: optional mime content_subtype for the text body (usually 'plain' or 'html'), + must match the format of the ``body`` parameter. Default is 'plain', + making the content part of the mail "text/plain". :param dict attachments: map of filename to filecontents, where filecontents is a string containing the bytes of the attachment :param dict headers: optional map of headers to set on the outgoing mail (may override the @@ -299,8 +303,8 @@ class mail_message(osv.osv): 'model': model, 'res_id': res_id, 'type': 'email', - 'body_text': body if subtype != 'html' else False, - 'body_html': body if subtype == 'html' else False, + 'body_text': body if content_subtype != 'html' else False, + 'body_html': body if content_subtype == 'html' else False, 'email_from': email_from, 'email_to': email_to and ','.join(email_to) or '', 'email_cc': email_cc and ','.join(email_cc) or '', @@ -308,7 +312,7 @@ class mail_message(osv.osv): 'reply_to': reply_to, 'message_id': message_id, 'references': references, - 'subtype': subtype, + 'content_subtype': content_subtype, 'headers': headers, # serialize the dict on the fly 'mail_server_id': mail_server_id, 'state': 'outgoing', @@ -388,7 +392,7 @@ class mail_message(osv.osv): 'headers' : { 'X-Mailer': mailer, #.. all X- headers... }, - 'subtype': msg_mime_subtype, + 'content_subtype': msg_mime_subtype, 'body_text': plaintext_body 'body_html': html_body, 'attachments': [('file1', 'bytes'), @@ -464,7 +468,7 @@ class mail_message(osv.osv): msg['in-reply-to'] = msg_txt.get('In-Reply-To') msg['headers'] = {} - msg['subtype'] = 'plain' + msg['content_subtype'] = 'plain' for item in msg_txt.items(): if item[0].startswith('X-'): msg['headers'].update({item[0]: item[1]}) @@ -473,7 +477,7 @@ class mail_message(osv.osv): body = msg_txt.get_payload(decode=True) if 'text/html' in msg.get('content-type', ''): msg['body_html'] = body - msg['subtype'] = 'html' + msg['content_subtype'] = 'html' if body: body = tools.html2plaintext(body) msg['body_text'] = tools.ustr(body, encoding) @@ -482,9 +486,9 @@ class mail_message(osv.osv): if msg_txt.is_multipart() or 'multipart/alternative' in msg.get('content-type', ''): body = "" if 'multipart/alternative' in msg.get('content-type', ''): - msg['subtype'] = 'alternative' + msg['content_subtype'] = 'alternative' else: - msg['subtype'] = 'mixed' + msg['content_subtype'] = 'mixed' for part in msg_txt.walk(): if part.get_content_maintype() == 'multipart': continue @@ -498,7 +502,7 @@ class mail_message(osv.osv): content = tools.ustr(content, encoding) if part.get_content_subtype() == 'html': msg['body_html'] = content - msg['subtype'] = 'html' # html version prevails + msg['content_subtype'] = 'html' # html version prevails body = tools.ustr(tools.html2plaintext(content)) body = body.replace(' ', '') elif part.get_content_subtype() == 'plain': @@ -515,7 +519,7 @@ class mail_message(osv.osv): # for backwards compatibility: msg['body'] = msg['body_text'] - msg['sub_type'] = msg['subtype'] or 'plain' + msg['sub_type'] = msg['content_subtype'] or 'plain' return msg def _postprocess_sent_message(self, cr, uid, message, context=None): @@ -561,15 +565,17 @@ class mail_message(osv.osv): for attach in message.attachment_ids: attachments.append((attach.datas_fname, base64.b64decode(attach.datas))) - body = message.body_html if message.subtype == 'html' else message.body_text + body = message.body_html if message.content_subtype == 'html' else message.body_text body_alternative = None - subtype_alternative = None - if message.subtype == 'html' and message.body_text: + content_subtype_alternative = None + if message.content_subtype == 'html' and message.body_text: # we have a plain text alternative prepared, pass it to # build_message instead of letting it build one body_alternative = message.body_text - subtype_alternative = 'plain' + content_subtype_alternative = 'plain' + # build an RFC2822 email.message.Message object adn send it + # without queuing msg = ir_mail_server.build_email( email_from=message.email_from, email_to=to_email(message.email_to), @@ -582,8 +588,8 @@ class mail_message(osv.osv): attachments=attachments, message_id=message.message_id, references = message.references, object_id=message.res_id and ('%s-%s' % (message.res_id,message.model)), - subtype=message.subtype, - subtype_alternative=subtype_alternative, + subtype=message.content_subtype, + subtype_alternative=content_subtype_alternative, headers=message.headers and ast.literal_eval(message.headers)) res = ir_mail_server.send_email(cr, uid, msg, mail_server_id=message.mail_server_id.id, diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml index ecd106e05e5..1a7d511de3b 100644 --- a/addons/mail/mail_message_view.xml +++ b/addons/mail/mail_message_view.xml @@ -103,7 +103,7 @@ - + @@ -113,7 +113,7 @@ - +
    + Checklist From f19e5ff9bcc8cbee1d8e389c5a59d5e75591730a Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 18 Jul 2012 15:37:12 +0200 Subject: [PATCH 268/341] [IMP] don't collapse newlines in list cells bzr revid: xmo@openerp.com-20120718133712-0pbdahv62rf0nslc --- addons/web/static/src/css/base.css | 1 + addons/web/static/src/css/base.sass | 1 + addons/web/static/src/xml/base.xml | 5 ++--- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 97d2fcf57a7..f92d5cbf1c2 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2256,6 +2256,7 @@ } .openerp .oe_list_content > tbody > tr > td.oe_list_field_cell { padding: 3px 6px; + white-space: pre-line; } .openerp .oe_list_content > tbody > tr > td, .openerp .oe_list_content > tbody > tr > th { line-height: 18px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c5197743acd..2ad33c8ca62 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1784,6 +1784,7 @@ $sheet-max-width: 860px border-top: 1px solid #ddd > td.oe_list_field_cell padding: 3px 6px + white-space: pre-line > td, > th line-height: 18px > button diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index a9c8e15bcd7..6d0d4a9ea7d 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -657,9 +657,8 @@ - - + t-att-data-field="column.id" + > From 9096f2c45c3c9c12486eed2dd273aeb03441cb68 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 18 Jul 2012 15:46:07 +0200 Subject: [PATCH 269/341] [ADD] reimplement o2m's cancel-on-blur when no alteration has been done by the user to the row being edited (new or not) bzr revid: xmo@openerp.com-20120718134607-bukj6c5lysmqeer3 --- addons/web/static/src/js/view_form.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 948b3a73913..92faa3d7d15 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3331,13 +3331,20 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({ /** * Handles blurring of the nested form (saves the currently edited row), * unless the flag to ignore the event is set to ``true`` + * + * Makes the internal form go away */ _on_form_blur: function () { if (this.__ignore_blur) { this.__ignore_blur = false; return; } - this.save_edition(); + // FIXME: why isn't there an API for this? + if (this.editor.form.$element.hasClass('oe_form_dirty')) { + this.save_edition(); + return; + } + this.cancel_edition(); }, keyup_ENTER: function () { // blurring caused by hitting the [Return] key, should skip the From 03dd20254e2c62b8290f9b329bde256e92fcc3cd Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 18 Jul 2012 16:01:31 +0200 Subject: [PATCH 270/341] [IMP] use 'Save' as label of the button to save an editable list row bzr revid: xmo@openerp.com-20120718140131-eop88n524hwvrguw --- addons/web/static/src/xml/base.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 6d0d4a9ea7d..94b76c170ea 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -668,7 +668,7 @@ + type="button">Save discard From e068ed26636212575245fad882ea549e3a505d91 Mon Sep 17 00:00:00 2001 From: "Rajesh Prajapati (OpenERP)" Date: Thu, 19 Jul 2012 11:08:03 +0530 Subject: [PATCH 271/341] [IMP]vat to tax : changed the label Vat as its abbreviation bzr revid: rpr@tinyerp.com-20120719053803-r4p9dhh28h2bysmm --- addons/account/account.py | 26 +++++++++---------- addons/account/account_move_line.py | 4 +-- .../data/configurable_account_chart.xml | 6 ++--- addons/account/demo/account_minimal.xml | 4 +-- .../report/account_journal_sale_purchase.rml | 6 ++--- .../account/report/account_print_invoice.rml | 2 +- .../account/report/account_print_overdue.rml | 2 +- addons/account/wizard/account_vat_view.xml | 4 +-- .../account_coda/account_coda_comm_type.xml | 2 +- .../account_coda_trans_category.xml | 2 +- .../account_coda/account_coda_trans_code.xml | 4 +-- .../report/account_followup_print.rml | 2 +- addons/l10n_th/account_data.xml | 20 +++++++------- addons/l10n_us/account_tax_template.xml | 2 +- addons/mrp_repair/report/order.rml | 4 +-- addons/point_of_sale/report/pos_lines.rml | 2 +- addons/report_intrastat/report/invoice.rml | 2 +- addons/sale/report/sale_order.rml | 4 +-- 18 files changed, 49 insertions(+), 49 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 78d0a192237..3675e89c06d 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1788,7 +1788,7 @@ class account_tax_code(osv.osv): 'line_ids': fields.one2many('account.move.line', 'tax_code_id', 'Lines'), 'company_id': fields.many2one('res.company', 'Company', required=True), 'sign': fields.float('Coefficent for parent', required=True, help='You can specify here the coefficient that will be used when consolidating the amount of this case into its parent. For example, set 1/-1 if you want to add/substract it.'), - 'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any TAX related to this Tax Code to appear on invoices"), + 'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any Tax related to this Tax Code to appear on invoices"), 'sequence': fields.integer('Sequence', help="Determine the display order in the report 'Accounting \ Reporting \ Generic Reporting \ Taxes \ Taxes Report'"), } @@ -1880,17 +1880,17 @@ class account_tax(osv.osv): 'python_applicable':fields.text('Python Code'), # - # Fields used for the TAX declaration + # Fields used for the Tax declaration # - 'base_code_id': fields.many2one('account.tax.code', 'Account Base Code', help="Use this code for the TAX declaration."), - 'tax_code_id': fields.many2one('account.tax.code', 'Account Tax Code', help="Use this code for the TAX declaration."), + 'base_code_id': fields.many2one('account.tax.code', 'Account Base Code', help="Use this code for the Tax declaration."), + 'tax_code_id': fields.many2one('account.tax.code', 'Account Tax Code', help="Use this code for the Tax declaration."), 'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."), 'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."), # Same fields for refund invoices - 'ref_base_code_id': fields.many2one('account.tax.code', 'Refund Base Code', help="Use this code for the TAX declaration."), - 'ref_tax_code_id': fields.many2one('account.tax.code', 'Refund Tax Code', help="Use this code for the TAX declaration."), + 'ref_base_code_id': fields.many2one('account.tax.code', 'Refund Base Code', help="Use this code for the Tax declaration."), + 'ref_tax_code_id': fields.many2one('account.tax.code', 'Refund Tax Code', help="Use this code for the Tax declaration."), 'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."), 'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."), 'include_base_amount': fields.boolean('Included in base amount', help="Indicates if the amount of tax must be included in the base amount for the computation of the next taxes"), @@ -2217,7 +2217,7 @@ class account_tax(osv.osv): def compute_inv(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None, precision=None): """ Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID. - Price Unit is a TAX included price + Price Unit is a Tax included price RETURN: [ tax ] @@ -2673,7 +2673,7 @@ class account_tax_code_template(osv.osv): 'parent_id': fields.many2one('account.tax.code.template', 'Parent Code', select=True), 'child_ids': fields.one2many('account.tax.code.template', 'parent_id', 'Child Codes'), 'sign': fields.float('Sign For Parent', required=True), - 'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any TAX related to this Tax Code to appear on invoices"), + 'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any Tax related to this Tax Code to appear on invoices"), } _defaults = { @@ -2788,17 +2788,17 @@ class account_tax_template(osv.osv): 'python_applicable':fields.text('Python Code'), # - # Fields used for the TAX declaration + # Fields used for the Tax declaration # - 'base_code_id': fields.many2one('account.tax.code.template', 'Base Code', help="Use this code for the TAX declaration."), - 'tax_code_id': fields.many2one('account.tax.code.template', 'Tax Code', help="Use this code for the TAX declaration."), + 'base_code_id': fields.many2one('account.tax.code.template', 'Base Code', help="Use this code for the Tax declaration."), + 'tax_code_id': fields.many2one('account.tax.code.template', 'Tax Code', help="Use this code for the Tax declaration."), 'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."), 'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."), # Same fields for refund invoices - 'ref_base_code_id': fields.many2one('account.tax.code.template', 'Refund Base Code', help="Use this code for the TAX declaration."), - 'ref_tax_code_id': fields.many2one('account.tax.code.template', 'Refund Tax Code', help="Use this code for the TAX declaration."), + 'ref_base_code_id': fields.many2one('account.tax.code.template', 'Refund Base Code', help="Use this code for the Tax declaration."), + 'ref_tax_code_id': fields.many2one('account.tax.code.template', 'Refund Tax Code', help="Use this code for the Tax declaration."), 'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."), 'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."), 'include_base_amount': fields.boolean('Include in Base Amount', help="Set if the amount of tax must be included in the base amount before computing the next taxes."), diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index e9f3459ad2c..5eb56bfa645 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -327,7 +327,7 @@ class account_move_line(osv.osv): if account and ((not fields) or ('debit' in fields) or ('credit' in fields)): data['account_id'] = account.id - # Propose the price TAX excluded, the TAX will be added when confirming line + # Propose the price Tax excluded, the Tax will be added when confirming line if account.tax_ids: taxes = fiscal_pos_obj.map_tax(cr, uid, part and part.property_account_position or False, account.tax_ids) tax = tax_obj.browse(cr, uid, taxes) @@ -1347,7 +1347,7 @@ class account_move_line(osv.osv): } if data['tax_code_id']: self.create(cr, uid, data, context) - #create the TAX movement + #create the Tax movement data = { 'move_id': vals['move_id'], 'name': tools.ustr(vals['name'] or '') + ' ' + tools.ustr(tax['name'] or ''), diff --git a/addons/account/data/configurable_account_chart.xml b/addons/account/data/configurable_account_chart.xml index 345202de899..21a58fb2a6d 100644 --- a/addons/account/data/configurable_account_chart.xml +++ b/addons/account/data/configurable_account_chart.xml @@ -385,8 +385,8 @@ - - + + @@ -444,7 +444,7 @@ purchase - + diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml index 3592c82d6f8..b13af6a735c 100644 --- a/addons/account/demo/account_minimal.xml +++ b/addons/account/demo/account_minimal.xml @@ -94,7 +94,7 @@ X11003 - Output TAX - (test) + Output Tax - (test) other @@ -152,7 +152,7 @@ X1112 - Input TAX - (test) + Input Tax - (test) other diff --git a/addons/account/report/account_journal_sale_purchase.rml b/addons/account/report/account_journal_sale_purchase.rml index 69f26ce1ff8..236879669f9 100644 --- a/addons/account/report/account_journal_sale_purchase.rml +++ b/addons/account/report/account_journal_sale_purchase.rml @@ -219,7 +219,7 @@ Account Partner Label - TAX + Tax Debit Credit @@ -271,7 +271,7 @@ Account Partner Label - TAX + Tax Debit Credit @@ -330,7 +330,7 @@ - TAX Declaration + Tax Declaration diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml index 12192f8472b..4ffa7a33f9d 100644 --- a/addons/account/report/account_print_invoice.rml +++ b/addons/account/report/account_print_invoice.rml @@ -168,7 +168,7 @@ Tel. : [[ (o.partner_id.phone) or removeParentNode('para') ]] Fax : [[ (o.partner_id.fax) or removeParentNode('para') ]] - TAX : [[ (o.partner_id.vat) or removeParentNode('para') ]] + VAT : [[ (o.partner_id.vat) or removeParentNode('para') ]] diff --git a/addons/account/report/account_print_overdue.rml b/addons/account/report/account_print_overdue.rml index 6b4253d99f9..2d4238823da 100644 --- a/addons/account/report/account_print_overdue.rml +++ b/addons/account/report/account_print_overdue.rml @@ -138,7 +138,7 @@ - TAX: [[ o.vat or removeParentNode('para') ]] + VAT: [[ o.vat or removeParentNode('para') ]] diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml index 44dae7ec5ac..6e5dc09b816 100644 --- a/addons/account/wizard/account_vat_view.xml +++ b/addons/account/wizard/account_vat_view.xml @@ -8,7 +8,7 @@ form - 106 - Method of calculation (TAX, withholding tax on income, commission, etc.) + Method of calculation (Tax, withholding tax on income, commission, etc.) 107 diff --git a/addons/account_coda/account_coda_trans_category.xml b/addons/account_coda/account_coda_trans_category.xml index e2d46e017b4..d96282bb422 100644 --- a/addons/account_coda/account_coda_trans_category.xml +++ b/addons/account_coda/account_coda_trans_category.xml @@ -49,7 +49,7 @@ 011 - TAX + Tax 012 diff --git a/addons/account_coda/account_coda_trans_code.xml b/addons/account_coda/account_coda_trans_code.xml index 4f4e0d9f3cf..4ab9650d59a 100644 --- a/addons/account_coda/account_coda_trans_code.xml +++ b/addons/account_coda/account_coda_trans_code.xml @@ -382,7 +382,7 @@ code Reimbursement of cheque-related costs - Overall amount, TAX included + Overall amount, Tax included 99 @@ -1850,7 +1850,7 @@ code Miscellaneous fees and commissions - Costs not specified otherwise, often with a manual communication (e.g. for collecting, ordering funds). TAX excluded = type 0 TAX included = type 3 (at least 3 articles) + Costs not specified otherwise, often with a manual communication (e.g. for collecting, ordering funds). Tax excluded = type 0 Tax included = type 3 (at least 3 articles) 35 diff --git a/addons/account_followup/report/account_followup_print.rml b/addons/account_followup/report/account_followup_print.rml index 83fcfe0f24c..3d096ecf3ac 100644 --- a/addons/account_followup/report/account_followup_print.rml +++ b/addons/account_followup/report/account_followup_print.rml @@ -141,7 +141,7 @@ - TAX: [[ o.partner_id.vat or removeParentNode('para') ]] + VAT: [[ o.partner_id.vat or removeParentNode('para') ]] diff --git a/addons/l10n_th/account_data.xml b/addons/l10n_th/account_data.xml index 53af51f40d4..84ccb182792 100644 --- a/addons/l10n_th/account_data.xml +++ b/addons/l10n_th/account_data.xml @@ -125,7 +125,7 @@ 1510 - Input TAX + Input Tax other @@ -187,7 +187,7 @@ 2310 - Output TAX + Output Tax other @@ -333,7 +333,7 @@ - + Value Added Tax @@ -341,13 +341,13 @@ - Output TAX + Output Tax PP30_4 - Input TAX + Input Tax PP30_6 @@ -397,7 +397,7 @@ - + Taxes to be paid @@ -410,13 +410,13 @@ - Output TAX + Output Tax PP30_5 - Input TAX + Input Tax PP30_7 @@ -485,7 +485,7 @@ - Input TAX + Input Tax percent @@ -497,7 +497,7 @@ - Output TAX + Output Tax percent diff --git a/addons/l10n_us/account_tax_template.xml b/addons/l10n_us/account_tax_template.xml index 292872a7b6e..6e70700a9f3 100644 --- a/addons/l10n_us/account_tax_template.xml +++ b/addons/l10n_us/account_tax_template.xml @@ -27,7 +27,7 @@ purchase - + diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml index 794aa13e2b9..be5737d4b85 100644 --- a/addons/mrp_repair/report/order.rml +++ b/addons/mrp_repair/report/order.rml @@ -169,7 +169,7 @@ Description - TAX + Tax Quantity @@ -278,7 +278,7 @@ Description - TAX + Tax Quantity diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml index 6ec3e728653..be394ed4f16 100644 --- a/addons/point_of_sale/report/pos_lines.rml +++ b/addons/point_of_sale/report/pos_lines.rml @@ -150,7 +150,7 @@ Description - TAX + Tax Quantity diff --git a/addons/report_intrastat/report/invoice.rml b/addons/report_intrastat/report/invoice.rml index e76e3a00196..c07bd06f402 100644 --- a/addons/report_intrastat/report/invoice.rml +++ b/addons/report_intrastat/report/invoice.rml @@ -148,7 +148,7 @@ Tel. : [[ (o.partner_id.phone) or removeParentNode('para') ]] Fax : [[ (o.partner_id.fax) or removeParentNode('para') ]] - TAX : [[ (o.partner_id.vat) or removeParentNode('para') ]] + VAT : [[ (o.partner_id.vat) or removeParentNode('para') ]] diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml index 2a0b4b1955a..8fecc17e62c 100644 --- a/addons/sale/report/sale_order.rml +++ b/addons/sale/report/sale_order.rml @@ -134,7 +134,7 @@ Description - TAX + Tax Quantity @@ -236,7 +236,7 @@ Description - TAX + Tax Quantity From 06104ba553702b16878d52c5b8ab089355216a5e Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 19 Jul 2012 10:23:52 +0200 Subject: [PATCH 272/341] [FIX] shitty undoc flag so saving a form doesn't forget/miss a row being edited bzr revid: xmo@openerp.com-20120719082352-pqq02u03fo09rcwe --- addons/web/static/src/js/view_form.js | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 92faa3d7d15..9e3db4f1b05 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3236,6 +3236,7 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({ if (!form.$element.is('.oe_form_dirty')) { return true; } + this.o2m._dirty_flag = true; // Otherwise validate internal form return _(form.fields).chain() From ac5dc58367d9bed5a576baaa7b803a67b5d00d07 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 19 Jul 2012 11:57:42 +0200 Subject: [PATCH 273/341] [IMP] focus the clicked field when starting a row edition by clicking on a cell bzr revid: xmo@openerp.com-20120719095742-lps9xjsrvhn5fnlh --- .../web/static/src/js/view_list_editable.js | 54 +++++++++++++------ doc/list-view.rst | 22 +++++++- 2 files changed, 58 insertions(+), 18 deletions(-) diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js index 052a471f0f3..56df125c98b 100644 --- a/addons/web/static/src/js/view_list_editable.js +++ b/addons/web/static/src/js/view_list_editable.js @@ -165,9 +165,11 @@ openerp.web.list_editable = function (instance) { * Set up the edition of a record of the list view "inline" * * @param {instance.web.list.Record} [record] record to edit, leave empty to create a new record + * @param {Object} [options] + * @param {String} [options.focus_field] field to focus at start of edition * @return {jQuery.Deferred} */ - start_edition: function (record) { + start_edition: function (record, options) { var self = this; var item = false; if (record) { @@ -194,14 +196,14 @@ openerp.web.list_editable = function (instance) { return self.editor.edit(item, function (field_name, field) { var cell = cells[field_name]; if (!cell || field.get('effective_readonly')) { - // Readonly fields can just remain the list's, form's - // usually don't have backgrounds &al + // Readonly fields can just remain the list's, + // form's usually don't have backgrounds &al field.set({invisible: true}); return; } self.fields_for_resize.push({field: field, cell: cell}); - }).pipe(function () { + }, options).pipe(function () { $recordRow.addClass('oe_edition'); self.resize_fields(); return record.attributes; @@ -558,7 +560,33 @@ openerp.web.list_editable = function (instance) { throw new Error("is_editing's state filter must be either `new` or" + " `edit` if provided"); }, - edit: function (record, configureField) { + _focus_setup: function (focus_field) { + var form = this.form; + + var field; + // If a field to focus was specified + if (focus_field + // Is actually in the form + && (field = form.fields[focus_field]) + // And is visible + && field.$element.is(':visible')) { + // focus it + field.focus(); + return; + } + + _(form.fields_order).detect(function (name) { + // look for first visible field in fields_order, focus it + var field = form.fields[name]; + if (!field.$element.is(':visible')) { + return false; + } + field.focus(); + // Stop as soon as a field got focused + return true; + }); + }, + edit: function (record, configureField, options) { // TODO: specify sequence of edit calls var self = this; var form = self.form; @@ -573,16 +601,7 @@ openerp.web.list_editable = function (instance) { _(form.fields).each(function (field, name) { configureField(name, field); }); - // TODO: actually focus clicked field (if editable) - _(form.fields_order).detect(function (name) { - // look for first visible field in fields_order, focus it - var field = form.fields[name]; - if (!field.$element.is(':visible')) { - return false; - } - field.focus(); - return true; - }); + self._focus_setup(options && options.focus_field); return form; }); }, @@ -627,7 +646,10 @@ openerp.web.list_editable = function (instance) { return this._super.apply(this, arguments); } var record_id = $(event.currentTarget).data('id'); - this.view.start_edition(record_id ? this.records.get(record_id) : null); + this.view.start_edition( + record_id ? this.records.get(record_id) : null, { + focus_field: $(event.target).data('field') + }); }, /** * If a row mapping to the record (@data-id matching the record's id or diff --git a/doc/list-view.rst b/doc/list-view.rst index ebb5f0ffe4d..0d67c27f963 100644 --- a/doc/list-view.rst +++ b/doc/list-view.rst @@ -131,7 +131,7 @@ Interaction Methods rejected if a pending edition could not be saved (e.g. validation failure) -.. js:function:: openerp.web.ListView.start_edition([record]) +.. js:function:: openerp.web.ListView.start_edition([record][, options]) Starts editing the provided record inline, through an overlay form view of editable fields in the record. @@ -142,7 +142,9 @@ Interaction Methods This method resolves any pending edition when invoked, before starting a new edition. + :param record: record to edit, or null to create a new record :type record: :js:class:`~openerp.web.list.Record` + :param EditOptions options: :returns: delegate to the form used for the edition .. js:function:: openerp.web.ListView.save_edition @@ -303,7 +305,7 @@ formview, delegating instead to its :type record_state: String :rtype: Boolean - .. js:function:: openerp.web.list.Editor.edit(record, configureField) + .. js:function:: openerp.web.list.Editor.edit(record, configureField[, options]) Loads the provided record into the internal form view and displays the form view. @@ -320,6 +322,7 @@ formview, delegating instead to its method do some last-minute configuration of form fields. :type configureField: Function + :param EditOptions options: :returns: jQuery delegate to the form object .. js:function:: openerp.web.list.Editor.save @@ -391,6 +394,21 @@ formview, delegating instead to its dataset (instead of appended) :rtype: Boolean + +.. js:class:: EditOptions + + Options object optionally passed into a method starting an edition + to configure its setup and behavior + + .. js:attribute:: focus_field + + Name of the field to set focus on after setting up the edition + of the record. + + If this option is not provided, or the requested field can not + be focused (invisible, readonly or not in the view), the first + visible non-readonly field is focused. + Changes from 6.1 ---------------- From 9e0be9ffd17bf4f2293ef746274527ef5d8e8ea0 Mon Sep 17 00:00:00 2001 From: "Rajesh Prajapati (OpenERP)" Date: Thu, 19 Jul 2012 16:41:15 +0530 Subject: [PATCH 274/341] [IMP]vat to tax : changed the label tax in lowercase bzr revid: rpr@tinyerp.com-20120719111115-ap37b1bo2o7w1w1k --- addons/account/account.py | 20 ++++++++++---------- addons/account/wizard/account_vat_view.xml | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index ce6cba3edff..c95dbe253ad 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1788,7 +1788,7 @@ class account_tax_code(osv.osv): 'line_ids': fields.one2many('account.move.line', 'tax_code_id', 'Lines'), 'company_id': fields.many2one('res.company', 'Company', required=True), 'sign': fields.float('Coefficent for parent', required=True, help='You can specify here the coefficient that will be used when consolidating the amount of this case into its parent. For example, set 1/-1 if you want to add/substract it.'), - 'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any Tax related to this Tax Code to appear on invoices"), + 'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any tax related to this tax Code to appear on invoices"), 'sequence': fields.integer('Sequence', help="Determine the display order in the report 'Accounting \ Reporting \ Generic Reporting \ Taxes \ Taxes Report'"), } @@ -1882,15 +1882,15 @@ class account_tax(osv.osv): # # Fields used for the Tax declaration # - 'base_code_id': fields.many2one('account.tax.code', 'Account Base Code', help="Use this code for the Tax declaration."), - 'tax_code_id': fields.many2one('account.tax.code', 'Account Tax Code', help="Use this code for the Tax declaration."), + 'base_code_id': fields.many2one('account.tax.code', 'Account Base Code', help="Use this code for the tax declaration."), + 'tax_code_id': fields.many2one('account.tax.code', 'Account Tax Code', help="Use this code for the tax declaration."), 'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."), 'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."), # Same fields for refund invoices - 'ref_base_code_id': fields.many2one('account.tax.code', 'Refund Base Code', help="Use this code for the Tax declaration."), - 'ref_tax_code_id': fields.many2one('account.tax.code', 'Refund Tax Code', help="Use this code for the Tax declaration."), + 'ref_base_code_id': fields.many2one('account.tax.code', 'Refund Base Code', help="Use this code for the tax declaration."), + 'ref_tax_code_id': fields.many2one('account.tax.code', 'Refund Tax Code', help="Use this code for the tax declaration."), 'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."), 'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."), 'include_base_amount': fields.boolean('Included in base amount', help="Indicates if the amount of tax must be included in the base amount for the computation of the next taxes"), @@ -2673,7 +2673,7 @@ class account_tax_code_template(osv.osv): 'parent_id': fields.many2one('account.tax.code.template', 'Parent Code', select=True), 'child_ids': fields.one2many('account.tax.code.template', 'parent_id', 'Child Codes'), 'sign': fields.float('Sign For Parent', required=True), - 'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any Tax related to this Tax Code to appear on invoices"), + 'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any tax related to this tax Code to appear on invoices"), } _defaults = { @@ -2790,15 +2790,15 @@ class account_tax_template(osv.osv): # # Fields used for the Tax declaration # - 'base_code_id': fields.many2one('account.tax.code.template', 'Base Code', help="Use this code for the Tax declaration."), - 'tax_code_id': fields.many2one('account.tax.code.template', 'Tax Code', help="Use this code for the Tax declaration."), + 'base_code_id': fields.many2one('account.tax.code.template', 'Base Code', help="Use this code for the tax declaration."), + 'tax_code_id': fields.many2one('account.tax.code.template', 'Tax Code', help="Use this code for the tax declaration."), 'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."), 'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."), # Same fields for refund invoices - 'ref_base_code_id': fields.many2one('account.tax.code.template', 'Refund Base Code', help="Use this code for the Tax declaration."), - 'ref_tax_code_id': fields.many2one('account.tax.code.template', 'Refund Tax Code', help="Use this code for the Tax declaration."), + 'ref_base_code_id': fields.many2one('account.tax.code.template', 'Refund Base Code', help="Use this code for the tax declaration."), + 'ref_tax_code_id': fields.many2one('account.tax.code.template', 'Refund Tax Code', help="Use this code for the tax declaration."), 'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."), 'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."), 'include_base_amount': fields.boolean('Include in Base Amount', help="Set if the amount of tax must be included in the base amount before computing the next taxes."), diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml index 6e5dc09b816..e1a5ea3b140 100644 --- a/addons/account/wizard/account_vat_view.xml +++ b/addons/account/wizard/account_vat_view.xml @@ -8,7 +8,7 @@ form - Date: Thu, 19 Jul 2012 13:14:14 +0200 Subject: [PATCH 275/341] [FIX] Client must do the session_bind bzr revid: chs@openerp.com-20120719111414-ivf6lq2iymws0ytm --- addons/web/static/src/js/boot.js | 5 +--- addons/web/static/src/js/chrome.js | 47 +++++++++++++++++------------- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/addons/web/static/src/js/boot.js b/addons/web/static/src/js/boot.js index 9f426ee787c..c1b1b984abe 100644 --- a/addons/web/static/src/js/boot.js +++ b/addons/web/static/src/js/boot.js @@ -21,7 +21,7 @@ * * @param {Array} modules list of modules to initialize */ - init: function(modules, origin) { + init: function(modules) { // By default only web will be loaded, the rest will be by loaded // by openerp.web.Session on the first session_authenticate modules = _.union(['web'], modules || []); @@ -39,9 +39,6 @@ for(var i=0; i < modules.length; i++) { openerp[modules[i]](new_instance,new_instance[modules[i]]); } - new_instance.connection.synchronized_mode(function() { - new_instance.connection.session_bind(origin); - }); return new_instance; } }; diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 9eb8a238cec..f1163440a5e 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -857,17 +857,24 @@ instance.web.UserMenu = instance.web.Widget.extend({ }); instance.web.Client = instance.web.Widget.extend({ - init: function(parent) { + init: function(parent, origin) { if (instance.webclient) { throw new Error('Only one client per instance'); } instance.client = instance.webclient = this; this._super(parent); + this._origin = origin }, start: function() { - this.bind_events(); - this.show_common(); + var self = this; + return instance.connection.session_bind(this.origin).then(function() { + var $e = $(QWeb.render(self._template, {})); + self.$element.replaceWith($e); + self.$element = $e; + self.bind_events(); + self.show_common(); + }); }, bind_events: function() { @@ -914,7 +921,7 @@ instance.web.Client = instance.web.Widget.extend({ }); instance.web.WebClient = instance.web.Client.extend({ - template: 'WebClient', + _template: 'WebClient', init: function(parent) { this._super(parent); this._current_state = null; @@ -1081,9 +1088,9 @@ instance.web.WebClient = instance.web.Client.extend({ }); instance.web.EmbeddedClient = instance.web.Client.extend({ - template: 'EmbedClient', - init: function(parent, dbname, login, key, action_id, options) { - this._super(parent); + _template: 'EmbedClient', + init: function(parent, origin, dbname, login, key, action_id, options) { + this._super(parent, origin); this.dbname = dbname; this.login = login; @@ -1095,24 +1102,24 @@ instance.web.EmbeddedClient = instance.web.Client.extend({ var self = this; return $.when(this._super()).pipe(function() { return instance.connection.session_authenticate(self.dbname, self.login, self.key, true).pipe(function() { - return self.rpc("/web/action/load", { action_id: self.action_id }, function(result) { - var action = result.result; - action.flags = _.extend({ - //views_switcher : false, - search_view : false, - action_buttons : false, - sidebar : false - //pager : false - }, self.options, action.flags || {}); + return self.rpc("/web/action/load", { action_id: self.action_id }, function(result) { + var action = result.result; + action.flags = _.extend({ + //views_switcher : false, + search_view : false, + action_buttons : false, + sidebar : false + //pager : false + }, self.options, action.flags || {}); - self.action_manager.do_action(action); - }); + self.action_manager.do_action(action); + }); }); }); }, }); -instance.web.embed = function (dbname, login, key, action, options) { +instance.web.embed = function (origin, dbname, login, key, action, options) { $('head').append($('', { 'rel': 'stylesheet', 'type': 'text/css', @@ -1123,7 +1130,7 @@ instance.web.embed = function (dbname, login, key, action, options) { var sc = document.getElementsByTagName('script'); currentScript = sc[sc.length-1]; } - var client = new instance.web.EmbeddedClient(null, dbname, login, key, action, options); + var client = new instance.web.EmbeddedClient(null, origin, dbname, login, key, action, options); client.insertAfter(currentScript); }; From ce0b92a08b0be8c84da0c90708c44e5ab44ddc93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 19 Jul 2012 14:00:26 +0200 Subject: [PATCH 276/341] [IMP] mail.group: cleaned model. Now only have linked user groups, that automatically subscribe its users to the mail.group instead of broadcasting or anything else. Removed old fields, cleaned view. Added code for res.users and res.groups to handle user changes in groups, propagating them to the mail.group attached to the res.group. bzr revid: tde@openerp.com-20120719120026-fi5o23cnh17kapgu --- addons/mail/mail_group.py | 117 ++++++++++++-------------------- addons/mail/mail_group_view.xml | 21 +----- addons/mail/res_users.py | 38 +++++++++++ 3 files changed, 82 insertions(+), 94 deletions(-) diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py index 98ee06918e8..9ed282acb0a 100644 --- a/addons/mail/mail_group.py +++ b/addons/mail/mail_group.py @@ -36,7 +36,7 @@ class mail_group(osv.osv): A mail_group is a collection of users sharing messages in a discussion group. Group users are users that follow the mail group, using the subscription/follow mechanism of OpenSocial. A mail group has nothing - in common wih res.users.group. + in common with res.users.group. Additional information on fields: - ``member_ids``: user member of the groups are calculated with ``message_get_subscribers`` method from mail.thread @@ -110,37 +110,33 @@ class mail_group(osv.osv): 'name': fields.char('Name', size=64, required=True), 'description': fields.text('Description'), 'responsible_id': fields.many2one('res.users', string='Responsible', - ondelete='set null', required=True, select=1, - help="Responsible of the group that has all rights on the record."), + ondelete='set null', required=True, select=1, + help="Responsible of the group that has all rights on the record."), 'public': fields.boolean('Visible by non members', help='This group is visible by non members. \ - Invisible groups can add members through the invite button.'), - 'models': fields.many2many('ir.model', rel='mail_group_ir_model_rel', - id1='mail_group_id', id2='model_id', - string='Linked models', help='Linked models'), - 'groups': fields.many2many('res.groups', rel='mail_group_res_group_rel', - id1='mail_group_id', id2='groups_id', - string='Linked groups', help='Linked groups'), - 'push_to_groups': fields.boolean('Push to groups', - help="When posting a comment on this mail_group, \ - the message is pushed to the users beloging to \ - the linked user groups."), - 'photo_big': fields.binary('Full-size photo', help='Field holding \ - the full-sized PIL-supported and base64 encoded \ - version of the group image. The photo field is \ - used as an interface for this field.'), - 'photo': fields.function(_get_photo, fnct_inv=_set_photo, string='Photo', type="binary", + Invisible groups can add members through the invite button.'), + 'group_ids': fields.many2many('res.groups', rel='mail_group_res_group_rel', + id1='mail_group_id', id2='groups_id', string='Linked groups', + help="Members of those groups will automatically added as followers. "\ + "Note that they will be able to manage their subscription manually "\ + "if necessary."), + 'photo_big': fields.binary('Full-size photo', + help='Field holding the full-sized PIL-supported and base64 encoded "\ + version of the group image. The photo field is used as an "\ + interface for this field.'), + 'photo': fields.function(_get_photo, fnct_inv=_set_photo, + string='Photo', type="binary", store = { 'mail.group': (lambda self, cr, uid, ids, c={}: ids, ['photo_big'], 10), - }, help='Field holding the automatically resized (128x128) PIL-supported and base64 encoded version of the group image.'), + }, + help='Field holding the automatically resized (128x128) PIL-supported and base64 encoded version of the group image.'), 'member_ids': fields.function(get_member_ids, fnct_search=search_member_ids, - type='many2many', relation='res.users', - string='Group members', multi='get_member_ids'), + type='many2many', relation='res.users', string='Group members', multi='get_member_ids'), 'member_count': fields.function(get_member_ids, type='integer', - string='Member count', multi='get_member_ids'), + string='Member count', multi='get_member_ids'), 'is_subscriber': fields.function(get_member_ids, type='boolean', - string='Joined', multi='get_member_ids'), + string='Joined', multi='get_member_ids'), 'last_month_msg_nbr': fields.function(get_last_month_msg_nbr, type='integer', - string='Messages count for last month'), + string='Messages count for last month'), } _defaults = { @@ -148,57 +144,30 @@ class mail_group(osv.osv): 'responsible_id': (lambda s, cr, uid, ctx: uid), 'photo': _get_default_photo, } - - def message_create_get_notification_user_ids(self, cr, uid, thread_ids, new_msg_vals, context=None): - """ Overrider OpenChatter message_create_get_notification_user_ids - method. The purpose is to add to the subscribers users that - belong to the res.groups linked to the mail.group through the - groups field. The fields push_to_groups allows to control this - feature. - """ - notif_user_ids = super(mail_group, self).message_create_get_notification_user_ids(cr, uid, thread_ids, new_msg_vals, context=context) - for thread in self.browse(cr, uid, thread_ids, context=context): - if not thread.push_to_groups or not thread.groups: - continue - for group in thread.groups: - for user in group.users: - notif_user_ids.append(user.id) - return list(set(notif_user_ids)) - - def message_load(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None, - limit=100, offset=0, domain=None, count=False, context=None): - """ Override OpenChatter message_load method. - if models attribute is set: search all messages from that model - else: as usual - """ - all_msg_ids = [] - message_obj = self.pool.get('mail.message') - for group in self.browse(cr, uid, ids, context=context): - # call super to have default message ids - group_msg_ids = super(mail_group, self).message_load(cr, uid, ids, fetch_ancestors, ancestor_ids, limit, offset, domain, False, True, context) - group_domain = ['&', ('model', '=', self._name), ('id', 'in', group_msg_ids)] - # if no linked domain: go on - if not group.models: - search_domain = group_domain - # add message ids linked to group models - else: - model_list = [] - for model in group.models: - model_list.append(model.model) - search_domain = [('|')] + group_domain - search_domain += [('model', 'in', model_list)] - # perform the search - msg_ids = message_obj.search(cr, uid, search_domain, limit=limit, offset=offset, context=context) - if (fetch_ancestors): msg_ids = self._message_load_add_ancestor_ids(cr, uid, ids, msg_ids, ancestor_ids, context=context) - all_msg_ids += msg_ids - if count: - return len(all_msg_ids) - else: - return message_obj.read(cr, uid, all_msg_ids, context=context) - + + def create(self, cr, uid, vals, context=None): + mail_group_id = super(mail_group, self).create(cr, uid, vals, context=context) + if vals.get('group_ids'): + user_goup_ids = vals.get('group_ids')[0][2] + res_groups_obj = self.pool.get('res.groups') + user_ids = [] + for group in res_groups_obj.browse(cr, uid, user_goup_ids, context=None): + user_ids += [user.id for user in group.users] + self.message_subscribe(cr, uid, [mail_group_id], user_ids, context=context) + return mail_group_id + + def write(self, cr, uid, ids, vals, context=None): + if vals.get('group_ids'): + user_goup_ids = vals.get('group_ids')[0][2] + res_groups_obj = self.pool.get('res.groups') + user_ids = [] + for group in res_groups_obj.browse(cr, uid, user_goup_ids, context=None): + user_ids += [user.id for user in group.users] + self.message_subscribe(cr, uid, ids, user_ids, context=context) + return super(mail_group, self).write(cr, uid, ids, vals, context=context) + def action_group_join(self, cr, uid, ids, context=None): return self.message_subscribe(cr, uid, ids, context=context) def action_group_leave(self, cr, uid, ids, context=None): return self.message_unsubscribe(cr, uid, ids, context=context) - diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml index f5443fcf0d7..c755209f952 100644 --- a/addons/mail/mail_group_view.xml +++ b/addons/mail/mail_group_view.xml @@ -64,6 +64,7 @@ + @@ -71,26 +72,6 @@ -
    - - -

    Models for automatic message fetching

    - - - - - -     - -

    User groups for message forwarding

    - - - - - -     -     -
    Date: Thu, 19 Jul 2012 14:01:56 +0200 Subject: [PATCH 277/341] [FIX] mail group data: fixed and cleaned data. bzr revid: tde@openerp.com-20120719120156-nifroiplglxjd6ou --- addons/mail/data/mail_group_data.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml index 6cb2bec6ab1..11c259b3ee8 100644 --- a/addons/mail/data/mail_group_data.xml +++ b/addons/mail/data/mail_group_data.xml @@ -8,14 +8,10 @@ Sales - All Employees - - + From fb61d25873860e2afd59e37fa63e461ceb8efab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 19 Jul 2012 14:03:11 +0200 Subject: [PATCH 278/341] [IMP] demo data: subtype -> content_subtype. bzr revid: tde@openerp.com-20120719120311-d4eecei6g9k2dddo --- addons/mail/mail_demo.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/mail/mail_demo.xml b/addons/mail/mail_demo.xml index 1adec42a910..6c25b59e35d 100644 --- a/addons/mail/mail_demo.xml +++ b/addons/mail/mail_demo.xml @@ -28,7 +28,7 @@ Internal company announce mail.group - html + html sit amet, consectetur adipiscing elit. Pellentesque et quam sapien, in sagittis tellus. Praesent vel massa sed massa consequat egestas in tristique orci. Praesent iaculis libero et neque vehicula iaculis. Vivamus placerat tincidunt orci ac ornare. Proin ut dolor fringilla velit ultricies consequat. Maecenas sit amet ipsum non leo interdum imperdiet. Donec sapien mi, varius a consequat id, consectetur sit amet nulla. @@ -44,7 +44,7 @@ Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in Reply mail.group - html + html tremendous blogpost ! (first comment)]]> comment @@ -55,7 +55,7 @@ Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in Reply mail.group - html + html @@ -78,7 +78,7 @@ Would it be possible to learn more about the author ? (second comment)]]>Reply mail.group - html + html Date: Thu, 19 Jul 2012 14:03:15 +0200 Subject: [PATCH 279/341] [IMP] mail: chatter: cleaned a bit the js code; added a refresh of internal records structure, that was causing some issues when loading more comments in record thrad. bzr revid: tde@openerp.com-20120719120315-2sg2peifgh4hklvo --- addons/mail/mail_thread.py | 4 +- addons/mail/static/src/css/mail.css | 2 +- addons/mail/static/src/js/mail.js | 98 +++++++++---------- .../mail/wizard/mail_compose_message_view.xml | 3 +- 4 files changed, 53 insertions(+), 54 deletions(-) diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index a234fcfcf53..1f1a3d7223b 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -498,15 +498,13 @@ class mail_thread(osv.Model): message_ids = self.message_search(cr, uid, ids, fetch_ancestors, ancestor_ids, limit, offset, domain, context=context) messages = self.pool.get('mail.message').read(cr, uid, message_ids, context=context) - + """ Retrieve all attachments names """ map_id_to_name = dict((attachment_id, '') for message in messages for attachment_id in message['attachment_ids']) - print map_id_to_name map_id_to_name = {} for msg in messages: for attach_id in msg["attachment_ids"]: map_id_to_name[attach_id] = '' # use empty string as a placeholder - print map_id_to_name ids = map_id_to_name.keys() names = self.pool.get('ir.attachment').name_get(cr, uid, ids, context=context) diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index 5593832549a..cf2f7d43a20 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -40,7 +40,7 @@ width: 474px; height: 60px; padding: 4px; - margin-bottom: 8px; + margin-bottom: 2px; } .openerp ul.oe_mail_wall_threads { diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 3ee88fbc37d..53f86fda893 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -15,11 +15,8 @@ openerp.mail = function(session) { */ session.web.FormView = session.web.FormView.extend({ - do_action: function(action, on_close) { - if (action.res_model == 'mail.compose.message') { - console.log(this); - // debugger + if (action.res_model == 'mail.compose.message' && this.fields && this.fields.message_ids) { var record_thread = this.fields.message_ids; var thread = record_thread.thread; thread.instantiate_composition_form('comment', true, false, 0, action.context); @@ -55,26 +52,23 @@ openerp.mail = function(session) { */ //var mail_msg_struct = {}; // TODO: USE IT OR NOT :) - do_bind_chatter_events: function(widget) { - // event: click on an internal link - widget.$element.delegate('a.oe_mail_oe_internal_link', 'click', function (event) { + /* generic chatter events binding */ + bind_events: function(widget) { + // event: click on an internal link to a document: model, login + widget.$element.delegate('a.oe_mail_internal_link', 'click', function (event) { event.preventDefault(); // lazy implementation: fetch data and try to redirect if (! event.srcElement.dataset.resModel) return false; else var res_model = event.srcElement.dataset.resModel; var res_login = event.srcElement.dataset.resLogin; - var res_id = event.srcElement.dataset.resId; - if ((! res_login) && (! res_id)) return false; - if (! res_id) { - var ds = new session.web.DataSet(widget, res_model); - var defer = ds.call('search', [[['login', '=', res_login]]]).then(function (records) { - if (records[0]) { - widget.do_action({ type: 'ir.actions.act_window', res_model: res_model, res_id: parseInt(records[0]), views: [[false, 'form']]}); - } - else return false; - }); - } - else widget.do_action({ type: 'ir.actions.act_window', res_model: res_model, res_id: parseInt(res_id), views: [[false, 'form']]}); + if (! res_login) return false; + var ds = new session.web.DataSet(widget, res_model); + var defer = ds.call('search', [[['login', '=', res_login]]]).pipe(function (records) { + if (records[0]) { + widget.do_action({ type: 'ir.actions.act_window', res_model: res_model, res_id: parseInt(records[0]), views: [[false, 'form']]}); + } + else return false; + }); }); }, @@ -92,19 +86,19 @@ openerp.mail = function(session) { * Add records to comments_structure array * @param {Array} records records from mail.message sorted by date desc * @returns {Object} cs comments_structure: dict - * cs.model_to_root_ids = {model: [root_ids], } - * cs.new_root_ids = [new_root_ids] - * cs.root_ids = [root_ids] - * cs.msgs = {record.id: record,} - * cs.tree_struct = {record.id: { - * 'level': record_level in hierarchy, 0 is root, - * 'msg_nbr': number of childs, - * 'direct_childs': [msg_ids], - * 'all_childs': [msg_ids], - * 'for_thread_msgs': [records], - * 'ancestors': [msg_ids], } } + * cs.model_to_root_ids = {model: [root_ids], } + * cs.new_root_ids = [new_root_ids] + * cs.root_ids = [root_ids] + * cs.msgs = {record.id: record,} + * cs.tree_struct = {record.id: { + * 'level': record_level in hierarchy, 0 is root, + * 'msg_nbr': number of childs, + * 'direct_childs': [msg_ids], + * 'all_childs': [msg_ids], + * 'for_thread_msgs': [records], + * 'ancestors': [msg_ids], } } */ - sort_comments: function(cs, records, parent_id) { + records_struct_add_records: function(cs, records, parent_id) { var cur_iter = 0; var max_iter = 10; var modif = true; while ( modif && (cur_iter++) < max_iter) { modif = false; @@ -141,6 +135,14 @@ openerp.mail = function(session) { return cs; }, + /* copy cs.new_root_ids into cs.root_ids */ + records_struct_update_after_display: function(cs) { + // update TODO + cs['root_ids'] = _.union(cs['root_ids'], cs['new_root_ids']); + cs['new_root_ids'] = []; + return cs; + }, + /** * CONTENT MANIPULATION * @@ -349,7 +351,6 @@ openerp.mail = function(session) { 'mail.compose.message.mode': this.params.mode, }; var context = _.extend({}, this.params.context, widget_context); - // console.log(context); this.ds_compose = new session.web.DataSetSearch(this, 'mail.compose.message', context); // find the id of the view to display in the chatter form var data_ds = new session.web.DataSetSearch(this, 'ir.model.data'); @@ -456,10 +457,10 @@ openerp.mail = function(session) { // update 'Post' button -> 'Send' // update 'Send an Email' link -> 'Post a comment' if (this.email_mode) { - this.$element.find('button.oe_form_button').html('Send'); + this.$element.find('button.oe_mail_compose_message_button_send').html('Send'); this.$element.find('a.oe_mail_compose_message_email').html('Comment'); } else { - this.$element.find('button.oe_form_button').html('Post'); + this.$element.find('button.oe_mail_compose_message_button_send').html('Post'); this.$element.find('a.oe_mail_compose_message_email').html('Send an Email'); } // toggle display @@ -468,7 +469,7 @@ openerp.mail = function(session) { /** * Update the values of the composition form; with possible different - values for body_text and body_html. */ + * values for body_text and body_html. */ set_body_value: function(body_text, body_html) { this.form_view.fields.body_text.set_value(body_text); this.form_view.fields.body_html.set_value(body_html); @@ -522,7 +523,7 @@ openerp.mail = function(session) { this.params.is_wall = this.params.is_wall || (this.params.records != undefined) || false; this.params.msg_more_limit = this.params.msg_more_limit || 150; this.params.limit = this.params.limit || 100; - this.params.limit = 3; // tmp for testing + // this.params.limit = 3; // tmp for testing this.params.offset = this.params.offset || 0; this.params.records = this.params.records || null; // datasets and internal vars @@ -597,7 +598,7 @@ openerp.mail = function(session) { bind_events: function() { var self = this; // generic events from Chatter Mixin - mail.ChatterUtils.do_bind_chatter_events(this); + mail.ChatterUtils.bind_events(this); // event: click on 'more' at bottom of thread this.$element.find('button.oe_mail_button_more').click(function () { self.do_more(); @@ -681,8 +682,9 @@ openerp.mail = function(session) { var defer = this.ds.call('message_read', [[this.params.res_id], (this.params.thread_level > 0), (this.comments_structure['root_ids']), (limit+1) || (this.params.limit+1), offset||this.params.offset, domain||undefined ]).then(function (records) { if (records.length <= self.params.limit) self.display.show_more = false; - else { self.display.show_more = true; records.pop(); } - + // else { self.display.show_more = true; records.pop(); } + // else { self.display.show_more = true; records.splice(0, 1); } + else { self.display.show_more = true; } self.display_comments(records); // TODO: move to customize display if (self.display.show_more == true) self.$element.find('div.oe_mail_thread_more:last').show(); @@ -704,10 +706,8 @@ openerp.mail = function(session) { display_comments: function (records) { var self = this; - - // sort comments - mail.ChatterUtils.sort_comments(this.comments_structure, records, this.params.parent_id); - + // sort the records + mail.ChatterUtils.records_struct_add_records(this.comments_structure, records, this.params.parent_id); //build attachments download urls and compute time-relative from dates for (var k in records) { records[k].timerelative = $.timeago(records[k].date); @@ -718,7 +718,6 @@ openerp.mail = function(session) { } } } - _(records).each(function (record) { var sub_msgs = []; if ((record.parent_id == false || record.parent_id[0] == self.params.parent_id) && self.params.thread_level > 0 ) { @@ -740,6 +739,7 @@ openerp.mail = function(session) { self.display_comment(record); } }); + mail.ChatterUtils.records_struct_update_after_display(this.comments_structure); // update offset for "More" buttons if (this.params.thread_level == 0) this.params.offset += records.length; }, @@ -783,14 +783,14 @@ openerp.mail = function(session) { var comment_node = this.$element.find('textarea'); var body_text = comment_node.val(); comment_node.val(''); - return this.ds.call('message_append_note', [[this.params.res_id], 'Reply', body_text, this.params.parent_id, 'comment', 'html', 'comment']).then( + return this.ds.call('message_append_note', [[this.params.res_id], '', body_text, this.params.parent_id, 'comment', 'plain']).then( this.proxy('init_comments')); }, /** * Create a domain to fetch new comments according to * comment already present in comments_structure - * @param {Object} comments_structure (see sort_comments) + * @param {Object} comments_structure (see chatter utils) * @returns {Array} fetch_domain (OpenERP domain style) */ get_fetch_domain: function (comments_structure) { @@ -855,7 +855,7 @@ openerp.mail = function(session) { start: function() { var self = this; this._super.apply(this, arguments); - mail.ChatterUtils.do_bind_chatter_events(this); + mail.ChatterUtils.bind_events(this); this.$element.find('button.oe_mail_button_followers').click(function () { self.do_toggle_followers(); }); if (! this.params.see_subscribers_options) { this.$element.find('button.oe_mail_button_followers').hide(); } @@ -962,7 +962,7 @@ openerp.mail = function(session) { * @param {Object} [params] * @param {Number} [params.limit=20] number of messages to show and fetch * @param {Number} [params.search_view_id=false] search view id for messages - * @var {Array} comments_structure see sort_comments + * @var {Array} comments_structure (see chatter utils) */ init: function (parent, params) { this._super(parent); @@ -1112,7 +1112,7 @@ openerp.mail = function(session) { display_comments: function (records) { var self = this; this.do_update_show_more(records.length >= self.params.limit); - mail.ChatterUtils.sort_comments(this.comments_structure, records, false); + mail.ChatterUtils.records_struct_add_records(this.comments_structure, records, false); _(this.comments_structure['new_root_ids']).each(function (root_id) { var records = self.comments_structure.tree_struct[root_id]['for_thread_msgs']; var model_name = self.comments_structure.msgs[root_id]['model']; diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml index 2b69bf21dda..816cfddb555 100644 --- a/addons/mail/wizard/mail_compose_message_view.xml +++ b/addons/mail/wizard/mail_compose_message_view.xml @@ -57,7 +57,8 @@ placeholder="Add contacts to notify..." class="oe_mail_compose_message_partner_ids oe_mail_compose_message_invisible"/>
    -
    From 41fdcaf9949bec96b7abb3c13727d17076f40628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 19 Jul 2012 14:34:39 +0200 Subject: [PATCH 280/341] [FIX] [REF] mail.group: refactored a bit the code about res.groups management and mail.group user update. bzr revid: tde@openerp.com-20120719123439-81glrece7xm615ii --- addons/mail/mail_group.py | 27 +++++++++++++++------------ addons/mail/res_users.py | 8 +++++--- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py index 9ed282acb0a..ba8a53025e8 100644 --- a/addons/mail/mail_group.py +++ b/addons/mail/mail_group.py @@ -145,25 +145,28 @@ class mail_group(osv.osv): 'photo': _get_default_photo, } + def _subscribe_user_with_group_m2m_command(self, cr, uid, ids, group_ids_command, context=None): + print group_ids_command + # form: {'group_ids': [(3, 10), (3, 3), (4, 10), (4, 3)]} or {'group_ids': [(6, 0, [ids]} + user_group_ids = [command[1] for command in group_ids_command if command[0] == 4] + user_group_ids += [id for command in group_ids_command if command[0] == 6 for id in command[2]] + # retrieve the user member of those groups + user_ids = [] + res_groups_obj = self.pool.get('res.groups') + for group in res_groups_obj.browse(cr, uid, user_group_ids, context=context): + user_ids += [user.id for user in group.users] + # subscribe the users + return self.message_subscribe(cr, uid, ids, user_ids, context=context) + def create(self, cr, uid, vals, context=None): mail_group_id = super(mail_group, self).create(cr, uid, vals, context=context) if vals.get('group_ids'): - user_goup_ids = vals.get('group_ids')[0][2] - res_groups_obj = self.pool.get('res.groups') - user_ids = [] - for group in res_groups_obj.browse(cr, uid, user_goup_ids, context=None): - user_ids += [user.id for user in group.users] - self.message_subscribe(cr, uid, [mail_group_id], user_ids, context=context) + self._subscribe_user_with_group_m2m_command(cr, uid, [mail_group_id], vals.get('group_ids'), context=context) return mail_group_id def write(self, cr, uid, ids, vals, context=None): if vals.get('group_ids'): - user_goup_ids = vals.get('group_ids')[0][2] - res_groups_obj = self.pool.get('res.groups') - user_ids = [] - for group in res_groups_obj.browse(cr, uid, user_goup_ids, context=None): - user_ids += [user.id for user in group.users] - self.message_subscribe(cr, uid, ids, user_ids, context=context) + self._subscribe_user_with_group_m2m_command(cr, uid, ids, vals.get('group_ids'), context=context) return super(mail_group, self).write(cr, uid, ids, vals, context=context) def action_group_join(self, cr, uid, ids, context=None): diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py index 9bb8a79a87f..203854925d7 100644 --- a/addons/mail/res_users.py +++ b/addons/mail/res_users.py @@ -93,8 +93,9 @@ class res_users_mail_group(osv.osv): def write(self, cr, uid, ids, vals, context=None): write_res = super(res_users_mail_group, self).write(cr, uid, ids, vals, context=context) if vals.get('groups_id'): - # form: {'groups_id': [(3, 10), (3, 3), (4, 10), (4, 3)]} + # form: {'group_ids': [(3, 10), (3, 3), (4, 10), (4, 3)]} or {'group_ids': [(6, 0, [ids]} user_group_ids = [command[1] for command in vals['groups_id'] if command[0] == 4] + user_group_ids += [id for command in vals['groups_id'] if command[0] == 6 for id in command[2]] mail_group_obj = self.pool.get('mail.group') mail_group_ids = mail_group_obj.search(cr, uid, [('group_ids', 'in', user_group_ids)], context=context) mail_group_obj.message_subscribe(cr, uid, mail_group_ids, ids, context=context) @@ -112,8 +113,9 @@ class res_groups_mail_group(osv.osv): def write(self, cr, uid, ids, vals, context=None): if vals.get('users'): - # form: {'users': [(6, 0, [ids]} - user_ids = vals['users'][0][2] + # form: {'group_ids': [(3, 10), (3, 3), (4, 10), (4, 3)]} or {'group_ids': [(6, 0, [ids]} + user_ids = [command[1] for command in vals['users'] if command[0] == 4] + user_ids += [id for command in vals['users'] if command[0] == 6 for id in command[2]] mail_group_obj = self.pool.get('mail.group') mail_group_ids = mail_group_obj.search(cr, uid, [('group_ids', 'in', ids)], context=context) mail_group_obj.message_subscribe(cr, uid, mail_group_ids, user_ids, context=context) From f7dee95e6c2d9f3bb2c729c502af4e3ee0f3c1b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 19 Jul 2012 15:19:33 +0200 Subject: [PATCH 281/341] [CLEAN] hr_evaluation: removed unnecessary values in mail.compose.message override. bzr revid: tde@openerp.com-20120719131933-ncrp9ru0kb2kfg5e --- addons/hr_evaluation/wizard/mail_compose_message.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/addons/hr_evaluation/wizard/mail_compose_message.py b/addons/hr_evaluation/wizard/mail_compose_message.py index 7b4c1b69164..7e4ba326947 100644 --- a/addons/hr_evaluation/wizard/mail_compose_message.py +++ b/addons/hr_evaluation/wizard/mail_compose_message.py @@ -44,15 +44,9 @@ class mail_compose_message(osv.osv_memory): if record_data.state == "waiting_answer": msg = _("Hello %s, \n\n Kindly post your response for '%s' survey interview. \n\n Thanks,") %(record_data.user_to_review_id.name, record_data.survey_id.title) result.update({ - 'email_from': tools.config.get('email_from',''), 'email_to': record_data.user_to_review_id.work_email or False, 'subject': _("Reminder to fill up Survey"), 'body_text': msg, - 'res_id': resource_id, - 'model': model, - 'email_cc': False, - 'email_bcc': False, - 'reply_to': False, }) return result From e4677c76870ef5a64b7b26d72c65c7429aea8cf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 19 Jul 2012 15:56:09 +0200 Subject: [PATCH 282/341] [IMP] mail demo data: removed replies subjects. bzr revid: tde@openerp.com-20120719135609-05upy1w3kbo2frix --- addons/mail/mail_demo.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/addons/mail/mail_demo.xml b/addons/mail/mail_demo.xml index 6c25b59e35d..0a4751cedb1 100644 --- a/addons/mail/mail_demo.xml +++ b/addons/mail/mail_demo.xml @@ -41,7 +41,6 @@ Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in - Reply mail.group html @@ -52,7 +51,6 @@ Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in - Reply mail.group html @@ -75,7 +73,6 @@ Would it be possible to learn more about the author ? (second comment)]]> - Reply mail.group html From 6b9783629b214413cf4ddc3da00e365d90974cdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 19 Jul 2012 15:57:45 +0200 Subject: [PATCH 283/341] [IMP] mail: composition form: added partner form email templates; when sending an email, email_to is composed based on partner_ids also. bzr revid: tde@openerp.com-20120719135745-b9ksd2adtrfdb2bm --- addons/email_template/email_template.py | 7 +++++++ addons/email_template/wizard/mail_compose_message.py | 2 ++ addons/mail/mail_message.py | 9 ++++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py index 16b66982d14..bf57342f14f 100644 --- a/addons/email_template/email_template.py +++ b/addons/email_template/email_template.py @@ -331,6 +331,13 @@ class email_template(osv.osv): template.model, res_id, context=context) \ or False + # if email_to: find or create a partner + if values['email_to']: + partner_id = self.pool.get('mail.thread').message_partner_by_email(cr, uid, values['email_to'], context=context)['partner_id'] + if not partner_id: + partner_id = self.pool.get('res.partner').name_create(cr, uid, values['email_to'], context=context) + values['partner_ids'] = [partner_id] + if values['body_html']: values.update(content_subtype='html') diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py index 15fbeff20b0..410817dc06e 100644 --- a/addons/email_template/wizard/mail_compose_message.py +++ b/addons/email_template/wizard/mail_compose_message.py @@ -74,6 +74,8 @@ class mail_compose_message(osv.osv_memory): else: # render the mail as one-shot values = self.pool.get('email.template').generate_email(cr, uid, template_id, res_id, context=context) + # get partner_ids back + values['dest_partner_ids'] = values['partner_ids'] # retrofit generated attachments in the expected field format if values['attachments']: attachment = values.pop('attachments') diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index b7d887e4eed..564f81bf4a5 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -616,11 +616,18 @@ class mail_message(osv.Model): body_alternative = message.body_text content_subtype_alternative = 'plain' + # handle destination_partners + partner_ids_email_to = '' + for partner in message.partner_ids: + partner_ids_email_to += '%s ' % (partner.email or '') + message_email_to = '%s %s' % (partner_ids_email_to, message.email_to or '') + print message_email_to + # build an RFC2822 email.message.Message object adn send it # without queuing msg = ir_mail_server.build_email( email_from=message.email_from, - email_to=mail_tools_to_email(message.email_to), + email_to=mail_tools_to_email(message_email_to), subject=message.subject, body=body, body_alternative=body_alternative, From 7e748858cd91cf8c4d6d287b320307671d3c1ecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 19 Jul 2012 16:12:01 +0200 Subject: [PATCH 284/341] [FIX] mail compose message: fixed body_html on quotation, fixed reference and header computation. bzr revid: tde@openerp.com-20120719141201-32rl7t40qhzu0ylj --- addons/mail/wizard/mail_compose_message.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py index c8ce25def0b..eea3a7eb46f 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -200,9 +200,9 @@ class mail_compose_message(osv.TransientModel): body_text = message_data.body_text or '' body_html = message_data.body_html or '' quoted_body_text = '> %s' % tools.ustr(body_text.replace('\n', "\n> ") or '') - quoted_body_html = '\n
    %s
    ' % (body_html), + quoted_body_html = '
    %s
    ' % {tools.ustr(body_html)}, reply_body_text = '\n%s%s\n%s\n%s' % (sent_date, sender, quoted_body_text, current_user.signature) - reply_body_html = '\n%s%s\n%s\n%s' % (sent_date, sender, quoted_body_html, current_user.signature) + reply_body_html = '

    %s%s
    %s
    %s' % (sent_date, sender, quoted_body_html, current_user.signature) # form dest_partner_ids dest_partner_ids = [partner.id for partner in message_data.partner_ids] # Update header and references @@ -210,12 +210,12 @@ class mail_compose_message(osv.TransientModel): reply_references = message_data.references and tools.ustr(message_data.references) or False reply_message_id = message_data.message_id or False if reply_message_id: - reply_references = (reply_references or '') + " " + mail_wiz.message_id - reply_headers['In-Reply-To'] = mail_wiz.message_id + reply_references = (reply_references or '') + " " + message_data.message_id + reply_headers['In-Reply-To'] = message_data.message_id # update the result result.update({ 'body_text': reply_body_text, - 'body_html': quoted_body_html, + 'body_html': reply_body_html, 'subject': reply_subject, 'attachment_ids': [], 'dest_partner_ids': dest_partner_ids, From 4b5bf16065d913f3e40f868d8d4243bd38c5a6fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 19 Jul 2012 16:12:14 +0200 Subject: [PATCH 285/341] [IMP] mail: chatter: html messages displayed as html. bzr revid: tde@openerp.com-20120719141214-m5yyj74q65yoiruu --- addons/mail/static/src/js/mail.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 53f86fda893..3872a486565 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -754,7 +754,9 @@ openerp.mail = function(session) { record.mini_url = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'avatar', record.user_id[0]); } // body text manipulation - record.body = mail.ChatterUtils.do_text_remove_html_tags(record.body); + if (record.subtype == 'plain') { + record.body = mail.ChatterUtils.do_text_remove_html_tags(record.body); + } record.body = mail.ChatterUtils.do_replace_expressions(record.body); // format date according to the user timezone record.date = session.web.format_value(record.date, {type:"datetime"}); From 667f3bc2297f298b2de83cc221e3aaa57d273b21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 19 Jul 2012 16:27:59 +0200 Subject: [PATCH 286/341] [DOC] res_partner: cleaned comments. bzr revid: tde@openerp.com-20120719142759-uskridc98l3q7d1f --- openerp/addons/base/res/res_partner.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index 469196fc06b..ee20298a6f3 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -303,8 +303,8 @@ class res_partner(osv.osv): return res def name_create(self, cr, uid, name, context=None): - """ Overrider of orm's name_create method for partners. The purpose is - to handle some basic syntaxic tricks to create partners using the + """ Override of orm's name_create method for partners. The purpose is + to handle some basic formats to create partners using the name_create. Supported syntax: - 'info@mail.com': create a partner with name info@mail.com, and From 06fdb65695a2a98642ae92956f55d0c1cc395eb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 19 Jul 2012 17:03:49 +0200 Subject: [PATCH 287/341] [IMP] res_partner: improved regex used to find the email and name. bzr revid: tde@openerp.com-20120719150349-6nkkq6h576tc6hyp --- openerp/addons/base/res/res_partner.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index ee20298a6f3..f739ea430b3 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -307,28 +307,28 @@ class res_partner(osv.osv): to handle some basic formats to create partners using the name_create. Supported syntax: - - 'info@mail.com': create a partner with name info@mail.com, and - sets its email to info@mail.com + - 'raoul@grosbedon.fr': create a partner with name raoul@grosbedon.fr + and sets its email to raoul@grosbedon.fr - 'Raoul Grosbedon ': create a partner with name Raoul Grosbedon, and set its email to raoul@grosbedon.fr - anything else: fall back on the default name_create Regex : - - (^|\s)([\w|\.]+)@([\w|\.]*): (void), info, openerp.com - - (^|\s)([\w|\.|\s]+)[\<]([\w|\.]+)@([\w|\.]*)[\>]: (void), Raoul - Grosbedon, raoul, grosbedon.fr + - ([a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}): raoul@grosbedon.fr + - ([\w|\.|\s]+)[\<]([a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4})[\>]: + Raoul Grosbedon, raoul@grosbedon.fr """ - contact_regex = re.compile('(^|\s)([\w|\.|\s]+)[\<]([\w|\.]+)@([\w|\.]*)[\>]') - email_regex = re.compile('(^|\s)([\w|\.]+)@([\w|\.]*)') + contact_regex = re.compile('([\w|\.|\s]+)[\<]([a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4})[\>]') + email_regex = re.compile('([a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4})') contact_regex_res = contact_regex.findall(name) email_regex_res = email_regex.findall(name) if contact_regex_res: - name = contact_regex_res[0][1] - name = name.rstrip(' ') # remove extra spaces on the right - email = '%s@%s' % (contact_regex_res[0][2], contact_regex_res[0][3]) + print contact_regex_res + name = contact_regex_res[0][0].rstrip(' ') # remove extra spaces on the right + email = contact_regex_res[0][1] rec_id = self.create(cr, uid, {self._rec_name: name, 'email': email}, context); return self.name_get(cr, uid, [rec_id], context)[0] elif email_regex: - email = '%s@%s' % (email_regex_res[0][1], email_regex_res[0][2]) + email = '%s' % (email_regex_res[0]) rec_id = self.create(cr, uid, {self._rec_name: email, 'email': email}, context); return self.name_get(cr, uid, [rec_id], context)[0] else: From 81e6449e57269e9bfc9e0acdbff19f6657adef74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 19 Jul 2012 17:07:25 +0200 Subject: [PATCH 288/341] [IMP] res_partner regex: added more support to the name. bzr revid: tde@openerp.com-20120719150725-sas4xjbj492hv3pb --- openerp/addons/base/res/res_partner.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index f739ea430b3..bf985d50f8a 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -314,10 +314,10 @@ class res_partner(osv.osv): - anything else: fall back on the default name_create Regex : - ([a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}): raoul@grosbedon.fr - - ([\w|\.|\s]+)[\<]([a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4})[\>]: + - ([\w\s.\\-]+)[\<]([a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4})[\>]: Raoul Grosbedon, raoul@grosbedon.fr """ - contact_regex = re.compile('([\w|\.|\s]+)[\<]([a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4})[\>]') + contact_regex = re.compile('([\w\s.\\-]+)[\<]([a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4})[\>]') email_regex = re.compile('([a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4})') contact_regex_res = contact_regex.findall(name) email_regex_res = email_regex.findall(name) From 8a56b182a89fe1a62634d16fd810b0072c5eb12e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 19 Jul 2012 17:11:54 +0200 Subject: [PATCH 289/341] [CLEAN] Removed some unnecessary code and comments. bzr revid: tde@openerp.com-20120719151154-2u1rni4pxwik21o9 --- addons/web/static/src/js/view_form.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 24182503b9b..c59af5a9307 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2318,7 +2318,7 @@ instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({ "margin:4px; font:12px monospace; cursor:text; color:#1F1F1F" }); this.$cleditor = this.$textarea.cleditor()[0]; - // call super now, because cleditor seems to reset the disable attr + // call super now, because cleditor resets the disable attr this._super.apply(this, arguments); if (this.$textarea.attr('disabled') == 'disabled') { this.$textarea.cleditor()[0].disable(true); @@ -2334,16 +2334,11 @@ instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({ }, render_value: function() { - var show_value = instance.web.format_value(this.get('value'), this, ''); - this.$textarea.val(show_value); - if (show_value && this.view.options.resize_textareas) { - this.do_resize(this.view.options.resize_textareas); - } + this._super.apply(this, arguments); this.$cleditor.updateFrame(); }, get_value: function() { - // cleditor.updateTextArea(); var value = this.$cleditor.$area.val(); return value; }, From b3c5d4361b5bb98cf3253cd5e67a9c013be3709c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 19 Jul 2012 17:43:00 +0200 Subject: [PATCH 290/341] [REM] Removed js library, moved into web decades ago. bzr revid: tde@openerp.com-20120719154300-x1za0g4srxogt45k --- .../mail/static/src/js/jquery.expander.min.js | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 addons/mail/static/src/js/jquery.expander.min.js diff --git a/addons/mail/static/src/js/jquery.expander.min.js b/addons/mail/static/src/js/jquery.expander.min.js deleted file mode 100644 index 2c61251fcf0..00000000000 --- a/addons/mail/static/src/js/jquery.expander.min.js +++ /dev/null @@ -1,24 +0,0 @@ -/*! - * jQuery Expander Plugin v1.4.2 - * - * Date: Sat Mar 31 20:51:48 2012 EDT - * Requires: jQuery v1.3+ - * - * Copyright 2011, Karl Swedberg - * Dual licensed under the MIT and GPL licenses (just like jQuery): - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - * - * - * - * -*/ -(function(c){c.expander={version:"1.4.2",defaults:{slicePoint:100,preserveWords:true,widow:4,expandText:"read more",expandPrefix:"… ",expandAfterSummary:false,summaryClass:"summary",detailClass:"details",moreClass:"read-more",lessClass:"read-less",collapseTimer:0,expandEffect:"slideDown",expandSpeed:250,collapseEffect:"slideUp",collapseSpeed:200,userCollapse:true,userCollapseText:"read less",userCollapsePrefix:" ",onSlice:null,beforeExpand:null,afterExpand:null,onCollapse:null}};c.fn.expander= -function(l){function J(a,d){var g="span",h=a.summary;if(d){g="div";if(x.test(h)&&!a.expandAfterSummary)h=h.replace(x,a.moreLabel+"$1");else h+=a.moreLabel;h='
    '+h+"
    "}else h+=a.moreLabel;return[h,"<",g+' class="'+a.detailClass+'"',">",a.details,""].join("")}function K(a){var d=''+a.expandPrefix;d+=''+a.expandText+"";return d}function y(a,d){if(a.lastIndexOf("<")>a.lastIndexOf(">"))a=a.slice(0,a.lastIndexOf("<")); -if(d)a=a.replace(L,"");return c.trim(a)}function z(a,d){d.stop(true,true)[a.collapseEffect](a.collapseSpeed,function(){d.prev("span."+a.moreClass).show().length||d.parent().children("div."+a.summaryClass).show().find("span."+a.moreClass).show()})}function M(a,d,g){if(a.collapseTimer)A=setTimeout(function(){z(a,d);c.isFunction(a.onCollapse)&&a.onCollapse.call(g,false)},a.collapseTimer)}var v="init";if(typeof l=="string"){v=l;l={}}var o=c.extend({},c.expander.defaults,l),N=/^<(?:area|br|col|embed|hr|img|input|link|meta|param).*>$/i, -L=o.wordEnd||/(&(?:[^;]+;)?|[a-zA-Z\u00C0-\u0100]+)$/,B=/<\/?(\w+)[^>]*>/g,C=/<(\w+)[^>]*>/g,D=/<\/(\w+)>/g,x=/(<\/[^>]+>)\s*$/,O=/^<[^>]+>.?/,A;l={init:function(){this.each(function(){var a,d,g,h,m,i,p,w,E=[],t=[],q={},r=this,f=c(this),F=c([]),b=c.meta?c.extend({},o,f.data()):o;i=!!f.find("."+b.detailClass).length;var s=!!f.find("*").filter(function(){return/^block|table|list/.test(c(this).css("display"))}).length,u=(s?"div":"span")+"."+b.detailClass,G="span."+b.moreClass,P=b.expandSpeed||0,n=c.trim(f.html()); -c.trim(f.text());var e=n.slice(0,b.slicePoint);if(!c.data(this,"expander")){c.data(this,"expander",true);c.each(["onSlice","beforeExpand","afterExpand","onCollapse"],function(j,k){q[k]=c.isFunction(b[k])});e=y(e);for(d=e.replace(B,"").length;d")}else m.splice(I,1)});t.reverse();if(i){i=f.find(u).remove().html();e=f.html();n=e+i;a=""}else{i=n.slice(e.length);a=c.trim(i.replace(B,""));if(a===""||a.split(/\s+/).length'+b.userCollapsePrefix+''+b.userCollapseText+"");f.find("span."+ -b.lessClass+" a").unbind("click.expander").bind("click.expander",function(j){j.preventDefault();clearTimeout(A);j=c(this).closest(u);z(b,j);q.onCollapse&&b.onCollapse.call(r,true)})}})},destroy:function(){if(this.data("expander")){this.removeData("expander");this.each(function(){var a=c(this),d=c.meta?c.extend({},o,a.data()):o,g=a.find("."+d.detailClass).contents();a.find("."+d.moreClass).remove();a.find("."+d.summaryClass).remove();a.find("."+d.detailClass).after(g).remove();a.find("."+d.lessClass).remove()})}}}; -l[v]&&l[v].call(this);return this};c.fn.expander.defaults=c.expander.defaults})(jQuery); From fab43d4140781d6fca6b488243f5e1255677f925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 19 Jul 2012 17:56:41 +0200 Subject: [PATCH 291/341] [REM] Removed a print statement. bzr revid: tde@openerp.com-20120719155641-a2ant2472swb3fhp --- openerp/addons/base/res/res_partner.py | 1 - 1 file changed, 1 deletion(-) diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index bf985d50f8a..f3985c79552 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -322,7 +322,6 @@ class res_partner(osv.osv): contact_regex_res = contact_regex.findall(name) email_regex_res = email_regex.findall(name) if contact_regex_res: - print contact_regex_res name = contact_regex_res[0][0].rstrip(' ') # remove extra spaces on the right email = contact_regex_res[0][1] rec_id = self.create(cr, uid, {self._rec_name: name, 'email': email}, context); From 642fc05be5f47afebad5ddac7003c569d47fc881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 19 Jul 2012 18:38:09 +0200 Subject: [PATCH 292/341] [CLEAN] mail.message: cleaned comments before merge. Also made an auto update of email_to field, based on partner_ids. bzr revid: tde@openerp.com-20120719163809-3c6cex32rg0qo8y1 --- addons/mail/mail_message.py | 74 ++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 34 deletions(-) diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index 564f81bf4a5..507f467e2cb 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -279,7 +279,7 @@ class mail_message(osv.Model): if default is None: default = {} self.check(cr, uid, [id], 'read', context=context) - default.update(message_id=False,original=False,headers=False) + default.update(message_id=False, original=False, headers=False) return super(mail_message,self).copy(cr, uid, id, default=default, context=context) def write(self, cr, uid, ids, vals, context=None): @@ -291,38 +291,45 @@ class mail_message(osv.Model): return super(mail_message, self).unlink(cr, uid, ids, context) def schedule_with_attach(self, cr, uid, email_from, email_to, subject, body, model=False, - email_cc=None, email_bcc=None, reply_to=False, attachments=None, partner_ids=None, + email_cc=None, email_bcc=None, reply_to=False, partner_ids=None, attachments=None, message_id=False, references=False, res_id=False, content_subtype='plain', headers=None, mail_server_id=False, auto_delete=False, context=None): - """Schedule sending a new email message, to be sent the next time the mail scheduler runs, or - the next time :meth:`process_email_queue` is called explicitly. - - :param string email_from: sender email address - :param list email_to: list of recipient addresses (to be joined with commas) - :param string subject: email subject (no pre-encoding/quoting necessary) - :param string body: email body, according to the ``content_subtype`` - (by default, plaintext). If html content_subtype is used, the message will be automatically converted - to plaintext and wrapped in multipart/alternative. - :param list email_cc: optional list of string values for CC header (to be joined with commas) - :param list email_bcc: optional list of string values for BCC header (to be joined with commas) - :param string model: optional model name of the document this mail is related to (this will also - be used to generate a tracking id, used to match any response related to the - same document) - :param int res_id: optional resource identifier this mail is related to (this will also - be used to generate a tracking id, used to match any response related to the - same document) - :param string reply_to: optional value of Reply-To header - :param string content_subtype: optional mime content_subtype for the text body (usually 'plain' or 'html'), - must match the format of the ``body`` parameter. Default is 'plain', - making the content part of the mail "text/plain". - :param dict attachments: map of filename to filecontents, where filecontents is a string - containing the bytes of the attachment - :param dict headers: optional map of headers to set on the outgoing mail (may override the - other headers, including Subject, Reply-To, Message-Id, etc.) - :param int mail_server_id: optional id of the preferred outgoing mail server for this mail - :param bool auto_delete: optional flag to turn on auto-deletion of the message after it has been - successfully sent (default to False) + """ Schedule sending a new email message, to be sent the next time the + mail scheduler runs, or the next time :meth:`process_email_queue` is + called explicitly. + :param string email_from: sender email address + :param list email_to: list of recipient addresses (to be joined with commas) + :param string subject: email subject (no pre-encoding/quoting necessary) + :param string body: email body, according to the ``content_subtype`` + (by default, plaintext). If html content_subtype is used, the + message will be automatically converted to plaintext and wrapped + in multipart/alternative. + :param list email_cc: optional list of string values for CC header + (to be joined with commas) + :param list email_bcc: optional list of string values for BCC header + (to be joined with commas) + :param string model: optional model name of the document this mail + is related to (this will also be used to generate a tracking id, + used to match any response related to the same document) + :param int res_id: optional resource identifier this mail is related + to (this will also be used to generate a tracking id, used to + match any response related to the same document) + :param string reply_to: optional value of Reply-To header + :param partner_ids: destination partner_ids + :param string content_subtype: optional mime content_subtype for + the text body (usually 'plain' or 'html'), must match the format + of the ``body`` parameter. Default is 'plain', making the content + part of the mail "text/plain". + :param dict attachments: map of filename to filecontents, where + filecontents is a string containing the bytes of the attachment + :param dict headers: optional map of headers to set on the outgoing + mail (may override the other headers, including Subject, + Reply-To, Message-Id, etc.) + :param int mail_server_id: optional id of the preferred outgoing + mail server for this mail + :param bool auto_delete: optional flag to turn on auto-deletion of + the message after it has been successfully sent (default to False) """ if context is None: context = {} @@ -336,7 +343,7 @@ class mail_message(osv.Model): param = [param] msg_vals = { 'subject': subject, - 'date': time.strftime('%Y-%m-%d %H:%M:%S'), + 'date': fields.datetime.now(), 'user_id': uid, 'model': model, 'res_id': res_id, @@ -621,7 +628,6 @@ class mail_message(osv.Model): for partner in message.partner_ids: partner_ids_email_to += '%s ' % (partner.email or '') message_email_to = '%s %s' % (partner_ids_email_to, message.email_to or '') - print message_email_to # build an RFC2822 email.message.Message object adn send it # without queuing @@ -644,9 +650,9 @@ class mail_message(osv.Model): mail_server_id=message.mail_server_id.id, context=context) if res: - message.write({'state':'sent', 'message_id': res}) + message.write({'state':'sent', 'message_id': res, 'email_to': message_email_to}) else: - message.write({'state':'exception'}) + message.write({'state':'exception', 'email_to': message_email_to}) message.refresh() if message.state == 'sent': self._postprocess_sent_message(cr, uid, message, context=context) From 9cfa2908b89e0ab4c1c531ada0b4d4518a5849a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 20 Jul 2012 10:25:49 +0200 Subject: [PATCH 293/341] [FIX] mail_compose_message: lost '{'. bzr revid: tde@openerp.com-20120720082549-2z2feyuk37xrlqtw --- addons/mail/wizard/mail_compose_message.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py index eea3a7eb46f..de3e5ca39ba 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -200,7 +200,7 @@ class mail_compose_message(osv.TransientModel): body_text = message_data.body_text or '' body_html = message_data.body_html or '' quoted_body_text = '> %s' % tools.ustr(body_text.replace('\n', "\n> ") or '') - quoted_body_html = '
    %s
    ' % {tools.ustr(body_html)}, + quoted_body_html = '
    %s
    ' % (tools.ustr(body_html)), reply_body_text = '\n%s%s\n%s\n%s' % (sent_date, sender, quoted_body_text, current_user.signature) reply_body_html = '

    %s%s
    %s
    %s' % (sent_date, sender, quoted_body_html, current_user.signature) # form dest_partner_ids From bb64a121e74919fe387176784cf8e4a20e4e0490 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 20 Jul 2012 11:25:45 +0200 Subject: [PATCH 294/341] [CLEAN] mail.message: cleaned comments and formatting, added parent_id and child_ids to mail.message model; mail.message.common only have a parent_id field now. bzr revid: tde@openerp.com-20120720092545-gouxtlg9b6frehm1 --- addons/mail/mail_message.py | 85 +++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 41 deletions(-) diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index 507f467e2cb..b2104322da6 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -57,13 +57,13 @@ def to_email(text): return mail_tools_to_email(text) class mail_message_common(osv.TransientModel): - """Common abstract class for holding the main attributes of a - message object. It could be reused as parent model for any - database model or wizard screen that needs to hold a kind of - message. - All internal logic should be in a database-based model while this - model holds the basics of a message. For example, a wizard for writing - emails should inherit from this class and not from mail.message.""" + """ Common abstract class for holding the main attributes of a + message object. It could be reused as parent model for any + database model or wizard screen that needs to hold a kind of + message. + All internal logic should be in another model while this + model holds the basics of a message. For example, a wizard for writing + emails should inherit from this class and not from mail.message.""" def get_body(self, cr, uid, ids, name, arg, context=None): """ get correct body version: body_html for html messages, and @@ -132,11 +132,13 @@ class mail_message_common(osv.TransientModel): 'body_html': fields.text('Rich-text Contents', help="Rich-text/HTML version of the message"), 'body': fields.function(get_body, fnct_search = search_body, type='text', string='Message Content', store=True, - help="Content of the message. This content equals the body_text field for plain-test messages, and body_html for rich-text/HTML messages. This allows having one field if we want to access the content matching the message subtype."), - 'parent_id': fields.many2one('mail.message', 'Parent Message', + help="Content of the message. This content equals the body_text field "\ + "for plain-test messages, and body_html for rich-text/HTML "\ + "messages. This allows having one field if we want to access "\ + "the content matching the message content_subtype."), + 'parent_id': fields.many2one('mail.message.common', 'Parent Message', select=True, ondelete='set null', help="Parent message, used for displaying as threads with hierarchy"), - 'child_ids': fields.one2many('mail.message', 'parent_id', 'Child Messages'), } _defaults = { @@ -149,24 +151,22 @@ class mail_message(osv.Model): notifications), comments (for OpenChatter feature) and RFC2822 email messages. This model also provides facilities to parse, queue and send new email messages. Type of messages - are differentiated using the 'type' column. - - The ``display_text`` field will have a slightly different - presentation for real emails and for log messages.""" + are differentiated using the 'type' column. """ _name = 'mail.message' _inherit = 'mail.message.common' _description = 'Mail Message (email, comment, notification)' _order = 'date desc' - # XXX to review - how to determine action to use? def open_document(self, cr, uid, ids, context=None): + """ Open the message related document. Note that only the document of + ids[0] will be opened. + TODO: how to determine the action to use ? + """ action_data = False if not ids: return action_data - # works only on 1 item - id = ids[0] - msg = self.browse(cr, uid, id, context=context) + msg = self.browse(cr, uid, ids[0], context=context) ir_act_window = self.pool.get('ir.actions.act_window') action_ids = ir_act_window.search(cr, uid, [('res_model', '=', msg.model)], context=context) if action_ids: @@ -178,14 +178,16 @@ class mail_message(osv.Model): }) return action_data - # XXX to review - how to determine action to use? def open_attachment(self, cr, uid, ids, context=None): + """ Open the message related attachments. + TODO: how to determine the action to use ? + """ action_data = False if not ids: return action_data action_pool = self.pool.get('ir.actions.act_window') messages = self.browse(cr, uid, ids, context=context) - att_ids = [x.id for x in message.attachment_ids for message in messages] + att_ids = [x.id for message in messages for x in message.attachment_ids] action_ids = action_pool.search(cr, uid, [('res_model', '=', 'ir.attachment')], context=context) if action_ids: action_data = action_pool.read(cr, uid, action_ids[0], context=context) @@ -200,13 +202,11 @@ class mail_message(osv.Model): ('email', 'email'), ('comment', 'Comment'), ('notification', 'System notification'), - ], 'Type', help="Message type: email for email message, notification for system message, comment for other messages such as user replies"), - 'subtype': fields.char('Subtype', size=64, - help="Message subtype, such as 'create' or 'cancel'. The purpose \ - is to be able to distinguish message of the same type.\ - For example, it is used to add the possibility to hide \ - notifications in the wall."), - 'partner_id': fields.many2one('res.partner', 'Related partner'), + ], 'Type', + help="Message type: email for email message, notification for system "\ + "message, comment for other messages such as user replies"), + 'partner_id': fields.many2one('res.partner', 'Related partner', + help="Deprecated field. Use partner_ids instead."), 'partner_ids': fields.many2many('res.partner', 'mail_message_destination_partner_rel', 'message_id', 'partner_id', 'Destination partners', @@ -222,13 +222,18 @@ class mail_message(osv.Model): ('exception', 'Delivery Failed'), ('cancel', 'Cancelled'), ], 'Status', readonly=True), - 'auto_delete': fields.boolean('Auto Delete', help="Permanently delete this email after sending it, to save space"), - 'original': fields.binary('Original', help="Original version of the message, as it was sent on the network", readonly=1), + 'auto_delete': fields.boolean('Auto Delete', + help="Permanently delete this email after sending it, to save space"), + 'original': fields.binary('Original', readonly=1, + help="Original version of the message, as it was sent on the network"), + 'parent_id': fields.many2one('mail.message', 'Parent Message', + select=True, ondelete='set null', + help="Parent message, used for displaying as threads with hierarchy"), + 'child_ids': fields.one2many('mail.message', 'parent_id', 'Child Messages'), } _defaults = { 'type': 'email', - 'subtype': 'email', 'state': 'received', } @@ -382,7 +387,10 @@ class mail_message(osv.Model): return email_msg_id def mark_outgoing(self, cr, uid, ids, context=None): - return self.write(cr, uid, ids, {'state':'outgoing'}, context) + return self.write(cr, uid, ids, {'state':'outgoing'}, context=context) + + def cancel(self, cr, uid, ids, context=None): + return self.write(cr, uid, ids, {'state':'cancel'}, context=context) def process_email_queue(self, cr, uid, ids=None, context=None): """Send immediately queued messages, committing after each @@ -582,10 +590,9 @@ class mail_message(osv.Model): """ if message.auto_delete: self.pool.get('ir.attachment').unlink(cr, uid, - [x.id for x in message.attachment_ids \ - if x.res_model == self._name and \ - x.res_id == message.id], - context=context) + [x.id for x in message.attachment_ids + if x.res_model == self._name and x.res_id == message.id], + context=context) message.unlink() return True @@ -604,8 +611,6 @@ class mail_message(osv.Model): transactions (default: False) :return: True """ - if context is None: - context = {} ir_mail_server = self.pool.get('ir.mail_server') self.write(cr, uid, ids, {'state': 'outgoing'}, context=context) for message in self.browse(cr, uid, ids, context=context): @@ -629,7 +634,7 @@ class mail_message(osv.Model): partner_ids_email_to += '%s ' % (partner.email or '') message_email_to = '%s %s' % (partner_ids_email_to, message.email_to or '') - # build an RFC2822 email.message.Message object adn send it + # build an RFC2822 email.message.Message object and send it # without queuing msg = ir_mail_server.build_email( email_from=message.email_from, @@ -664,8 +669,6 @@ class mail_message(osv.Model): cr.commit() return True - def cancel(self, cr, uid, ids, context=None): - self.write(cr, uid, ids, {'state':'cancel'}, context=context) - return True + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 58da4f7688b6bbdd229cce8be3aff387955ebbd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 20 Jul 2012 11:26:20 +0200 Subject: [PATCH 295/341] [REF] mail: res.partner inheritance: removed unnecessary 'emails' column, as this is managed by Chatter. Also updated partner_id -> partner_ids. bzr revid: tde@openerp.com-20120720092620-o94cxdi2hxthd5y1 --- addons/mail/res_partner.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py index ceb90041142..aeec9a5a6b3 100644 --- a/addons/mail/res_partner.py +++ b/addons/mail/res_partner.py @@ -22,21 +22,18 @@ from osv import osv from osv import fields -class res_partner(osv.osv): +class res_partner_mail(osv.osv): """ Inherits partner and adds CRM information in the partner form """ _name = "res.partner" _inherit = ['res.partner', 'mail.thread'] - _columns = { - 'emails': fields.one2many('mail.message', 'partner_id', 'Emails', readonly=True, domain=[('email_from','!=',False)]), - } def message_search_get_domain(self, cr, uid, ids, context=None): """ Override of message_search_get_domain for partner discussion page. The purpose is to add messages directly sent to the partner. """ - initial_domain = super(res_partner, self).message_search_get_domain(cr, uid, ids, context=context) + initial_domain = super(res_partner_mail, self).message_search_get_domain(cr, uid, ids, context=context) if self._name == 'res.partner': # to avoid models inheriting from res.partner - search_domain = ['|'] + initial_domain + [('partner_id', 'in', ids)] + search_domain = ['|'] + initial_domain + [('partner_ids', 'in', ids)] return search_domain # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 7ab67eb72da9c4bc5a7d4977dbf1e228eb4db04f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 20 Jul 2012 11:49:29 +0200 Subject: [PATCH 296/341] [IMP] mail.message view: cleaned short view for feeds. bzr revid: tde@openerp.com-20120720094929-wite8l21xa60v33n --- addons/mail/mail_message_view.xml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml index 151b2558480..634b5317d27 100644 --- a/addons/mail/mail_message_view.xml +++ b/addons/mail/mail_message_view.xml @@ -34,16 +34,22 @@ - - - + + + + + + + + + From a5648e75d83f474422179eb1092b9b97055a9176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 20 Jul 2012 11:57:19 +0200 Subject: [PATCH 297/341] [IMP] mail.mesage: scheduler: try to send only outgoing emails. bzr revid: tde@openerp.com-20120720095719-0qmigezuv7r6gr3d --- addons/mail/mail_message.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index b2104322da6..8553566a6d1 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -409,7 +409,7 @@ class mail_message(osv.Model): if context is None: context = {} if not ids: - filters = [('state', '=', 'outgoing')] + filters = ['&', ('state', '=', 'outgoing'), ('type', '=', 'email')] if 'filters' in context: filters.extend(context['filters']) ids = self.search(cr, uid, filters, context=context) From 150b0fccd1bf5489eb62b81dc02f1420a3c39f7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 20 Jul 2012 12:17:56 +0200 Subject: [PATCH 298/341] [REM] mail.message: schedule with attach: removed type=email, because this is the default value. bzr revid: tde@openerp.com-20120720101756-slv9kd6r5a3d9qrw --- addons/mail/mail_message.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index 8553566a6d1..2443a5b8eca 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -352,7 +352,6 @@ class mail_message(osv.Model): 'user_id': uid, 'model': model, 'res_id': res_id, - 'type': 'email', 'body_text': body if content_subtype != 'html' else False, 'body_html': body if content_subtype == 'html' else False, 'email_from': email_from, From 49acfe69785efa7779dbe7409e7d4aab95122650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 20 Jul 2012 12:21:03 +0200 Subject: [PATCH 299/341] [MOV] mail_demo moved to data/mail_demo. bzr revid: tde@openerp.com-20120720102103-4ls3yb0s7z27m4t6 --- addons/mail/__openerp__.py | 2 +- addons/mail/{ => data}/mail_demo.xml | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename addons/mail/{ => data}/mail_demo.xml (100%) diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py index 47256cd5730..6ad9ae91a53 100644 --- a/addons/mail/__openerp__.py +++ b/addons/mail/__openerp__.py @@ -100,7 +100,7 @@ The main features of the module are : 'static/src/xml/mail.xml', ], 'demo': [ - 'mail_demo.xml', + 'data/mail_demo.xml', ], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/mail/mail_demo.xml b/addons/mail/data/mail_demo.xml similarity index 100% rename from addons/mail/mail_demo.xml rename to addons/mail/data/mail_demo.xml From 10e64ed7ebc95ce35c549d3b87883af8eba42a91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 20 Jul 2012 12:24:35 +0200 Subject: [PATCH 300/341] [IMP] res.users, res.partner: chatter in correct 'footer' style. bzr revid: tde@openerp.com-20120720102435-v20b8jnwum6uvm84 --- addons/mail/res_partner_view.xml | 2 +- addons/mail/res_users_view.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/mail/res_partner_view.xml b/addons/mail/res_partner_view.xml index 8b4d89f89f4..d1e2d881739 100644 --- a/addons/mail/res_partner_view.xml +++ b/addons/mail/res_partner_view.xml @@ -9,7 +9,7 @@ -
    +
    diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml index bd8041b3f1c..e268997ac2c 100644 --- a/addons/mail/res_users_view.xml +++ b/addons/mail/res_users_view.xml @@ -27,9 +27,9 @@ -
    +
    -
    +
    From f4baf23f07dde32eda9aca152ab9381fe9ab4817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 20 Jul 2012 12:29:04 +0200 Subject: [PATCH 301/341] [REM] [ADD] Removed old unused icons; added icons for composer. bzr revid: tde@openerp.com-20120720102904-jkwhlt1fgvf1ywja --- addons/mail/__openerp__.py | 5 +++-- addons/mail/static/src/img/_fp.png | Bin 7725 -> 0 bytes addons/mail/static/src/img/feeds-hover.png | Bin 15696 -> 0 bytes addons/mail/static/src/img/feeds.png | Bin 5647 -> 0 bytes 4 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 addons/mail/static/src/img/_fp.png delete mode 100644 addons/mail/static/src/img/feeds-hover.png delete mode 100644 addons/mail/static/src/img/feeds.png diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py index 6ad9ae91a53..6247e894661 100644 --- a/addons/mail/__openerp__.py +++ b/addons/mail/__openerp__.py @@ -83,9 +83,10 @@ The main features of the module are : 'static/src/img/email_icong.png', 'static/src/img/_al.png', 'static/src/img/_pincky.png', - 'static/src/img/feeds.png', - 'static/src/img/feeds-hover.png', 'static/src/img/groupdefault.png', + 'static/src/img/attachment.png', + 'static/src/img/checklist.png', + 'static/src/img/formatting.png', ], 'css': [ 'static/src/css/mail.css', diff --git a/addons/mail/static/src/img/_fp.png b/addons/mail/static/src/img/_fp.png deleted file mode 100644 index 17dce2a047c386c1cf1c16074254839717369085..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7725 zcmV+|9@627P)Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RX1O^E%0SXe0-2ea`zez+vRCwC8 zoJ+4I*>cx^5wTW2_CBxb>b~85ecLvY1vVfV2}?-KJz&81LgF(p;4?5rMhp-VQ%~>& zi+gR{?(TY=bM_;1trfu_GtZ+Q_fn1Ps8n_8RPDVpV@3QU;vfG=i3tARzXBYVSIF|K zBFj&y(L}Q2bMZd+4K>_of>Sb+GVxdc>A(Ns7r!dEWuLAH0YgANR6-(zh>$?SG{ANJ zEOjnB250o|Pv3w2ul|T|Mi0}|9BLMd34wzP5kx{11jCiKUAaO6{e(MC{ERPo^84eL zmNE}ruBBOsp$38yjRv7KaQc*!W-<9)pW)B$BbZ;mExEM4AKQt5(nz@bm=a0^0RfHH z+#@_$x4jRD0_gkK{5cFH@0dxqn~|{_LHm>ms4y?bm6r?0q0;A3Lp>A`LLm?VA|ezQ z0#{Vxx!Vfe)paLR>Dpxk4k;s8g9?TS7>Fjxp}xFK9u@c3g`~7cg*WaD)Syu1>YhEp?j>wiu5HBqAbcv3f-iN`Oas_2$Ub27C-A7@%#} zvlygNPv>+sP>Xbm$chExtl#R-h?bw}K>@yA*J2^v?=ESy*C(AO8TS-81zE@&Y#pKS z;^KwMn51#8gdmOx@#se%i8amp%YExw7p)5p&>%qpz!nFY>-m^=gGh%5>LAGSj{b18 z@`+~p85rcTo!R0(!UofY-~82YZvW4ZSGM7Yx^`cNXi~A%KlPx% zk?p`^GrKsk-H%HYpUZqc*7ld*Pt0e^G@a`C*bgSAWX?YSlgob@^GRM_5MT}h;Y5Jb z6tPdVQTlZ2xC7{eb(AfLg1+X_hcEkUx;Erw``v9jH)W7sBnBC{yrKzBIG!F;;r8Al zEO;9cOFG*E4dx;)UFt1$QRuDj(pYof<$d3o6KAH|5+swUThjuHRb;_H4+zvgYly|O zP}4OtG-yzu(Y17?7yEq8;lSCcr5|#U&>}whTCJ#Zh2WzCJ;ib9SdAW?VAU6V%#Ol)vcd*YKVoYT+%Z4Sf)pwR8^%EDepTpbh zqtTOuQoEE?k&vWnqJ&!45xON{M`XbtKmtJ!k@cs71RjXe8Uk}eTs28}v=F2mCrM&M z-t8}UFTdi~6Z=eS;YYdbxapDPerkz;^yxUAJ`tcbKwOfVVmNW&_20bO$uQ`SH)oEm zXD~6sXbl%}QP5C+9qB z)tf2GS?Wp4Y~_nzef79k_0=X-=iM|Z@8?Zl z8iy6gmf}X9{1;8An5wB}kf&qXIY%3}GtR6Juce6&v3=`b@-g@YnH<$=< z6&IS+T$`w`)$CgJIpDI!h$4?RTK&k^67fj|?9bwA`Pt@ZDY0~C9?@!Z8WF-cjE6VJ z@voy=JJn-LvAeps{NtD8&upN#zj<}{cdz@B@*G3yhUl0eEAtskWUc12#VoZdNF7WB zmq0@$&=3hEbSX6D(I~7&S&H5z5MqriU04k9D!9}oNFBCLg5+YDdNS0|5U3%?YJKa+ zmy_~_pGkuP}u+MVc z=^$cL*LCxBSH0M-pU*Xi2inWTrzae z>)mJH_|snM!BoH7gF>F0ywXp(cNI-Igi;H&9NMg^HQLp;H{-73f}LL?kf4GzgPM0y1SuEFW7UVTMRV#?prGT-_ri> z&GAs`VZPd3sw*gUVyY4~+@2ND@x+OEH>*DQRr)|_ARlNfme-j;guBeE z))b9ut!m3dl3hCAPU{T_IL(`7Yk~RNtl{-6Ri#QN>KY_S653qd-J@AjUyw;aqJ_7p zbJU5FlMLNv7oknHhIf4@=dJ!2h{WaoqPMZUK4b^6#p|vetym%w3dQm@?Q%77aF`K}!eX<7(FQ8zY^$x=QJhfw2b*DQ-F;Pi0 znBanVR;(kU@c|BGIU`NKg_U1vn$2D-!Rjs|YKDY+m1H({db1x+EiTeNU95cT0Pa|X zSc#U@q%|><%h-RtyRfnMPG;rkKDo~)s;Vc^5Y<2&50yx&9Yf!D$=e(;1nP)VovbK< z*H*I#0c8A8^6^{_G4qS-m)xIeOVQAoVzHs&hr%V^=h!4UM^)c6N_@hq^7z@j8n0iE^hDaWbYuGK$uPCL?xwAG; zk;F|Ks3z-jfS5MH3qpxe33J>5dFsPqko zW(vKfUwxA>s?wk~4ySUQIv1qNDl2=xm72=)VB4~``1446kL%Y5yR_B>F~n=d9f$tH z#Kff$-H_iN-g411ZiT#ok^2r2>$_zA+|1YuyK@^0`Srcnez*231L5iRaBiU~=V;~b z)sMKVrkwM+%x~`BVw*oU=r|pZE}n<3tst5k{mdx&3h&7mkk?+MLDM&fslU7qwK|vM z+qe>gGs-fU1j1mhziHj4iP8O14u_j#wrGYNJ1WIT& zJHxSWxY@hyj1PdZ)r6g-W`c-$w5Q}2Unq6`}hVf5#e~U zl={R{OKsL!lAvx({_Pw7;=kVYRQpLPS`kU! zMW0SL>S|$~AO2xNLQT}8hF~dSy41}L_b0QUhZu9}qtr?(c8U z=V^4uXL=Vpqt8nqF9y-oMyr7wR2A@w0nX``!|i3OH)#n>A;g=O6w|9Whwm=51*MWj z=(;a%F4=G6#)n!)LGbF*sXnFgw&_#)V2+pAaM9ra^ESOb!YMS=R0WF=ht)vxUY{GQ zjk12BaTBi5uDoTW4?H9{4r;W92FV)j2#tl0c+9~5fSM0eTz5JH;d~<6zSS4%NN7`< zR;L7~7dKrVZd|DjK2r~BXa4#Xy8&y(TXfRBxaJy^VNB24ss(FT4~h?n1;A&tF}%*3+5^ezU0eU z(?pTpUjFi{FY+(BfC~Ac1#=!j$rBq@7f+i~&C5Vy4I;b-33)v22$J<4 zD?*E4ifEr`t=t2V5SR{4y$)Z#i2K{|`r9*dU+yQX+0xoJ>hrqiiMyn=YFNkrYeow} zmJl29yK_HVS7pRv66%3YneLjFbDR6!ZoLOb^%;txc<}NY-rk+R`MsC(9dlu~=XBuu zlJX|qzB-*x0QV<`AoVZEY5HO6Z}#M95w`E>m&+>d(n`tfX4pVKIvVb9u zIo7P6<}Y8om@0>gwc%#?C6kZ7<947-VmiDSj>p4g|A<8Kz*R22gE&}vPG~&jAbr3Q zb-JcqQ;kF`>zKt*K}2e;_3n_yO9n)isg18p1w=wKP0r`}SUredJo&`ibNOm--9>*n zvftqavE)-|o2~CLtrDfW7H686C8QK@x$Cp!m2?y&ad9P@isB;bK~%!AI*Gr2xgR>C zHd>IaBP%|0oEcO0$TGVVCYuI~Sl~F`Eto%@w6}yP-ViZY4ND|^i?YB(9~D+Y>goEo z)kQ8JDkAJh{mP?|_Yt!6#6Xl{36;P9$!q*(p5L@8S$00Xxz0oB4i<+#P1)bn(@lyAE2xNSxYH`)o#xIu zbi|xeq#_HsZ`^Tn!{}aSKF#{}1)g|NKv`E^e4DW@*QEVLj)o z>zsAE|Ksnjzu4jDCSF0pT}+535vH1oa_0=nZYfrSQOKxJz*F1b@a?ap(=u3*5`OTQ z%HVA$^_y?M{O+q^moX{slT%ELE-||#Gc$MZ`+gB6{gy$Q#3Blir(J>?Dh?AAe)=E3 z?(eOymZRs?u!I=aQ1{d#MRcupaq!b@b^Ky~^W87F$V9k_E6urk%gr9G#ED=3PxOS& z?7$CP4`iVoZY>I0eVTN*Af&Zgn5EOS&vwzrKuKOY-~av#dKyGxhT_a82GB;i{61f2_p=UZ!612$KK$em3kM6q zFx8+<)A@LsVk)_|+;l%erhy2hS!V<k~3^_OeEqcDdEN!AL2TNoL+L+j0O;fJ^8 z(uxz3Ry}Y=oaT5{RIN)9rB#|&$SKWd=L8)lLg0cdje9I@Cl?Absn#BDzyD#^S>IV_ zN+@ovdB9p~imdhC@6;mvZo!MHyVqKYASF~nBqC^y(kQM?EUewN!F%S!8>rx{9D;8x z%Ls3IaWPz|AAkDZ>Vy|l5jD*{l9^dY`>KfIK}gm-=6*+a_rvW~cd@on0tfW$sci&9 zgMyvsG~W+CUuOMcH;k6F1r?e^RiaC_v+<(M^XYWzx^7{It?%RG1L>cka`g};Hj*S9 z)SQd)ikxYQGu&-+n5W%Gfm6XH=RS`x`Kn-j!gj6-*~fSWR2)

    hcTg_N#6JaBO+` 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 na?=4ncn=^Mc>X=q~~R-y41mV4#pT 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 VO&d1z-`Qp$DKUA`T4BTB{|nfHS~>s# diff --git a/addons/mail/static/src/img/feeds.png b/addons/mail/static/src/img/feeds.png deleted file mode 100644 index ac2293c0bf5ae591a8a5e4bd404a64a93f578ccf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5647 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 UNjnbxOKfq#nox~ewHKlP0Xin0a{vGU From 28b3d3eac4edcbf30ca8c8799bca3cd6e249ccd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 20 Jul 2012 13:33:58 +0200 Subject: [PATCH 302/341] [IMP] text_html widget: cleaned a bit the code. bzr revid: tde@openerp.com-20120720113358-y5mt98w1ug9ljbvo --- addons/web/static/src/js/view_form.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index c59af5a9307..29ba9060345 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2320,12 +2320,8 @@ instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({ this.$cleditor = this.$textarea.cleditor()[0]; // call super now, because cleditor resets the disable attr this._super.apply(this, arguments); - if (this.$textarea.attr('disabled') == 'disabled') { - this.$textarea.cleditor()[0].disable(true); - } - else { - this.$textarea.cleditor()[0].disable(false); - } + // propagate disabled property to cleditor + this.$cleditor.disable(this.$textarea.prop('disabled')); }, set_value: function(value_) { @@ -2339,8 +2335,7 @@ instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({ }, get_value: function() { - var value = this.$cleditor.$area.val(); - return value; + return this.$cleditor.$area.val(); }, }); From d5ec4a6535fa787e76e0653a0f779809193287d5 Mon Sep 17 00:00:00 2001 From: "Purnendu Singh (OpenERP)" Date: Fri, 20 Jul 2012 17:14:02 +0530 Subject: [PATCH 303/341] [IMP] update pot files bzr revid: psi@tinyerp.com-20120720114402-yipigtjmk4j7qk1r --- addons/account/account.py | 4 ++-- addons/account/i18n/account.pot | 14 +++++++------- addons/mrp_repair/i18n/mrp_repair.pot | 2 +- addons/point_of_sale/i18n/point_of_sale.pot | 2 +- addons/sale/i18n/sale.pot | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index c95dbe253ad..335822b7299 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1788,7 +1788,7 @@ class account_tax_code(osv.osv): 'line_ids': fields.one2many('account.move.line', 'tax_code_id', 'Lines'), 'company_id': fields.many2one('res.company', 'Company', required=True), 'sign': fields.float('Coefficent for parent', required=True, help='You can specify here the coefficient that will be used when consolidating the amount of this case into its parent. For example, set 1/-1 if you want to add/substract it.'), - 'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any tax related to this tax Code to appear on invoices"), + 'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any tax related to this tax code to appear on invoices"), 'sequence': fields.integer('Sequence', help="Determine the display order in the report 'Accounting \ Reporting \ Generic Reporting \ Taxes \ Taxes Report'"), } @@ -2673,7 +2673,7 @@ class account_tax_code_template(osv.osv): 'parent_id': fields.many2one('account.tax.code.template', 'Parent Code', select=True), 'child_ids': fields.one2many('account.tax.code.template', 'parent_id', 'Child Codes'), 'sign': fields.float('Sign For Parent', required=True), - 'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any tax related to this tax Code to appear on invoices"), + 'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any tax related to this tax Code to appear on invoices."), } _defaults = { diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index b092b3a2f8c..174002a8d8d 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -203,7 +203,7 @@ msgstr "" #. module: account #: help:account.tax.code,notprintable:0 #: help:account.tax.code.template,notprintable:0 -msgid "Check this box if you don't want any VAT related to this Tax Code to appear on invoices" +msgid "Check this box if you don't want any tax related to this tax code to appear on invoices" msgstr "" #. module: account @@ -1853,7 +1853,7 @@ msgstr "" #. module: account #: report:account.journal.period.print.sale.purchase:0 -msgid "VAT Declaration" +msgid "Tax Declaration" msgstr "" #. module: account @@ -2249,7 +2249,7 @@ msgstr "" #. module: account #: view:account.vat.declaration:0 -msgid "This menu prints a VAT declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter." +msgid "This menu prints a tax declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter." msgstr "" #. module: account @@ -4480,7 +4480,7 @@ msgstr "" #. module: account #: model:ir.actions.act_window,name:account.action_account_vat_declaration #: model:ir.model,name:account.model_account_vat_declaration -msgid "Account Vat Declaration" +msgid "Account Tax Declaration" msgstr "" #. module: account @@ -4821,7 +4821,7 @@ msgstr "" #: help:account.tax.template,ref_base_code_id:0 #: help:account.tax.template,ref_tax_code_id:0 #: help:account.tax.template,tax_code_id:0 -msgid "Use this code for the VAT declaration." +msgid "Use this code for the tax declaration." msgstr "" #. module: account @@ -5247,7 +5247,7 @@ msgstr "" #. module: account #: report:account.journal.period.print.sale.purchase:0 -msgid "VAT" +msgid "Tax" msgstr "" #. module: account @@ -7561,7 +7561,7 @@ msgstr "" #. module: account #: model:ir.actions.act_window,help:account.action_account_vat_declaration -msgid "This menu print a VAT declaration based on invoices or payments. You can select one or several periods of the fiscal year. Information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter." +msgid "This menu print a tax declaration based on invoices or payments. You can select one or several periods of the fiscal year. Information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter." msgstr "" #. module: account diff --git a/addons/mrp_repair/i18n/mrp_repair.pot b/addons/mrp_repair/i18n/mrp_repair.pot index 884f6a30d00..3f21da6f93d 100644 --- a/addons/mrp_repair/i18n/mrp_repair.pot +++ b/addons/mrp_repair/i18n/mrp_repair.pot @@ -154,7 +154,7 @@ msgstr "" #. module: mrp_repair #: report:repair.order:0 -msgid "VAT" +msgid "Tax" msgstr "" #. module: mrp_repair diff --git a/addons/point_of_sale/i18n/point_of_sale.pot b/addons/point_of_sale/i18n/point_of_sale.pot index b0ff45bb671..0246ca65227 100644 --- a/addons/point_of_sale/i18n/point_of_sale.pot +++ b/addons/point_of_sale/i18n/point_of_sale.pot @@ -155,7 +155,7 @@ msgstr "" #. module: point_of_sale #: report:pos.lines:0 -msgid "VAT" +msgid "Tax" msgstr "" #. module: point_of_sale diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot index 64cd1ee5a8c..2c477d1d7a0 100644 --- a/addons/sale/i18n/sale.pot +++ b/addons/sale/i18n/sale.pot @@ -105,7 +105,7 @@ msgstr "" #. module: sale #: report:sale.order:0 -msgid "VAT" +msgid "Tax" msgstr "" #. module: sale From 284e7939360c9d6bde0e1f0394cc55648c0c11e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 20 Jul 2012 13:50:46 +0200 Subject: [PATCH 304/341] [IMP] cleditor: removed source link. Updated get_value to be more consistent. bzr revid: tde@openerp.com-20120720115046-fp0do72zy3cs2p2w --- addons/web/static/src/js/view_form.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 29ba9060345..b65d95e9bd6 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2310,8 +2310,7 @@ instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({ controls: // controls to add to the toolbar "bold italic underline strikethrough | size " + "| removeformat | bullets numbering | outdent " + - "indent | " + - "link unlink | source", + "indent | link unlink", sizes: // sizes in the font size popup "1,2,3,4,5,6,7", bodyStyle: // style to assign to document body contained within the editor @@ -2335,7 +2334,8 @@ instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({ }, get_value: function() { - return this.$cleditor.$area.val(); + this.$cleditor.updateTextArea(); + return this.$textarea.val(); }, }); From ae8b2f65ed50e33340453ffc624bacc4a9c72179 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Fri, 20 Jul 2012 14:12:46 +0200 Subject: [PATCH 305/341] [FIX] merge of lp:~openerp-dev/openobject-addons/trunk-addons_issue_hr-cha and fix bzr revid: stw@openerp.com-20120720121246-ltdbylsj8aveiz13 --- addons/base_calendar/__openerp__.py | 5 +++-- addons/base_calendar/base_calendar_data.xml | 2 +- addons/{crm => base_calendar}/crm_meeting_data.xml | 0 addons/{crm => base_calendar}/crm_meeting_demo.xml | 12 ++++++------ .../wizard/base_calendar_invite_attendee.py | 3 +++ addons/crm/__openerp__.py | 2 -- addons/crm/test/process/lead2opportunity2win.yml | 2 +- 7 files changed, 14 insertions(+), 12 deletions(-) rename addons/{crm => base_calendar}/crm_meeting_data.xml (100%) rename addons/{crm => base_calendar}/crm_meeting_demo.xml (89%) diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py index 3f6ca129f6f..c7df187dd87 100644 --- a/addons/base_calendar/__openerp__.py +++ b/addons/base_calendar/__openerp__.py @@ -39,9 +39,10 @@ If you need to manage your meetings, you should install the CRM module. 'category': 'Hidden/Dependency', 'website': 'http://www.openerp.com', "init_xml": [ - 'base_calendar_data.xml' + 'base_calendar_data.xml', + 'crm_meeting_data.xml', ], - "demo_xml": [], + "demo_xml": ['crm_meeting_demo.xml'], "update_xml": [ 'security/calendar_security.xml', 'security/ir.model.access.csv', diff --git a/addons/base_calendar/base_calendar_data.xml b/addons/base_calendar/base_calendar_data.xml index 3c20bf5fad5..727a0703db2 100644 --- a/addons/base_calendar/base_calendar_data.xml +++ b/addons/base_calendar/base_calendar_data.xml @@ -2,7 +2,7 @@ - + Event calendar.event diff --git a/addons/crm/crm_meeting_data.xml b/addons/base_calendar/crm_meeting_data.xml similarity index 100% rename from addons/crm/crm_meeting_data.xml rename to addons/base_calendar/crm_meeting_data.xml diff --git a/addons/crm/crm_meeting_demo.xml b/addons/base_calendar/crm_meeting_demo.xml similarity index 89% rename from addons/crm/crm_meeting_demo.xml rename to addons/base_calendar/crm_meeting_demo.xml index dda6d5a03a8..ad88c11bb1b 100644 --- a/addons/crm/crm_meeting_demo.xml +++ b/addons/base_calendar/crm_meeting_demo.xml @@ -12,7 +12,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -70,7 +70,7 @@ - + diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py index 676f9b3fdd2..0e62555f6ba 100644 --- a/addons/base_calendar/wizard/base_calendar_invite_attendee.py +++ b/addons/base_calendar/wizard/base_calendar_invite_attendee.py @@ -78,6 +78,9 @@ send an Email to Invited Person') att_obj = self.pool.get('calendar.attendee') user_obj = self.pool.get('res.users') current_user = user_obj.browse(cr, uid, uid, context=context) + + import pdb + pdb.set_trace() for datas in self.read(cr, uid, ids, context=context): type = datas.get('type') vals = [] diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index 0c9b75b4d41..9fb1a4db28d 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -68,7 +68,6 @@ Creates a dashboard for CRM that includes: 'init_xml': [ 'crm_data.xml', 'crm_lead_data.xml', - 'crm_meeting_data.xml', 'crm_phonecall_data.xml', ], 'update_xml': [ @@ -115,7 +114,6 @@ Creates a dashboard for CRM that includes: 'demo_xml': [ 'crm_demo.xml', 'crm_lead_demo.xml', - 'crm_meeting_demo.xml', 'crm_phonecall_demo.xml', ], 'test': [ diff --git a/addons/crm/test/process/lead2opportunity2win.yml b/addons/crm/test/process/lead2opportunity2win.yml index c1caf394c2e..1c2cfdeb605 100644 --- a/addons/crm/test/process/lead2opportunity2win.yml +++ b/addons/crm/test/process/lead2opportunity2win.yml @@ -113,7 +113,7 @@ - !python {model: crm.meeting}: | context.update({'active_model': 'crm.meeting'}) - self.case_open(cr, uid, [ref('crm.crm_case_reviewneeds0')]) + self.case_open(cr, uid, [ref('base_calendar.crm_case_reviewneeds0')]) - I invite a user for meeting. - From 5759d97daa97ac07c76af1255b6b722f83c7ec49 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 20 Jul 2012 14:35:28 +0200 Subject: [PATCH 306/341] [IMP] changed place of buttons in relation popups bzr revid: nicolas.vanhoren@openerp.com-20120720123528-fpskc2r42d06z28r --- addons/web/static/src/js/view_form.js | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index c430b013c40..13f70a421de 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3877,14 +3877,16 @@ instance.web.form.AbstractFormPopup = instance.web.OldWidget.extend({ display_popup: function() { var self = this; this.renderElement(); - new instance.web.Dialog(this, { + var dialog = new instance.web.Dialog(this, { min_width: '800px', - dialogClass: 'oe_act_window', + dialogClass: 'oe_act_window', close: function() { self.check_exit(true); }, title: this.options.title || "", + buttons: [{text:"tmp"}], }, this.$element).open(); + this.$buttonpane = dialog.$element.dialog("widget").find(".ui-dialog-buttonpane").html(""); this.start(); }, on_write_completed: function() {}, @@ -3900,16 +3902,18 @@ instance.web.form.AbstractFormPopup = instance.web.OldWidget.extend({ if (this.row_id !== null) { options.initial_mode = this.options.readonly ? "view" : "edit"; } + _.extend(options, { + $buttons: this.$buttonpane, + }); this.view_form = new instance.web.FormView(this, this.dataset, false, options); if (this.options.alternative_form_view) { this.view_form.set_embedded_view(this.options.alternative_form_view); } this.view_form.appendTo(this.$element.find(".oe_popup_form")); this.view_form.on_loaded.add_last(function() { - var $buttons = self.view_form.$element.find(".oe_form_buttons"); var multi_select = self.row_id === null && ! self.options.disable_multiple_selection; - $buttons.html(QWeb.render("AbstractFormPopup.buttons", {multi_select: multi_select})); - var $snbutton = $buttons.find(".oe_abstractformpopup-form-save-new"); + self.$buttonpane.html(QWeb.render("AbstractFormPopup.buttons", {multi_select: multi_select})); + var $snbutton = self.$buttonpane.find(".oe_abstractformpopup-form-save-new"); $snbutton.click(function() { $.when(self.view_form.do_save()).then(function() { self.view_form.reload_mutex.exec(function() { @@ -3917,7 +3921,7 @@ instance.web.form.AbstractFormPopup = instance.web.OldWidget.extend({ }); }); }); - var $sbutton = $buttons.find(".oe_abstractformpopup-form-save"); + var $sbutton = self.$buttonpane.find(".oe_abstractformpopup-form-save"); $sbutton.click(function() { $.when(self.view_form.do_save()).then(function() { self.view_form.reload_mutex.exec(function() { @@ -3925,7 +3929,7 @@ instance.web.form.AbstractFormPopup = instance.web.OldWidget.extend({ }); }); }); - var $cbutton = $buttons.find(".oe_abstractformpopup-form-close"); + var $cbutton = self.$buttonpane.find(".oe_abstractformpopup-form-close"); $cbutton.click(function() { self.check_exit(); }); @@ -4034,6 +4038,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend 'selectable': !self.options.disable_multiple_selection, 'read_only': true, 'import_enabled': false, + '$buttons': self.$buttonpane, }, self.options.list_view_options || {})); self.view_list.popup = self; self.view_list.appendTo($(".oe_popup_list", self.$element)).pipe(function() { @@ -4042,13 +4047,12 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend self.searchview.do_search(); }); self.view_list.on_loaded.add_last(function() { - var $buttons = self.view_list.$element.find(".oe-actions"); - $buttons.prepend(QWeb.render("SelectCreatePopup.search.buttons")); - var $cbutton = $buttons.find(".oe_selectcreatepopup-search-close"); + self.$buttonpane.html(QWeb.render("SelectCreatePopup.search.buttons")); + var $cbutton = self.$buttonpane.find(".oe_selectcreatepopup-search-close"); $cbutton.click(function() { self.destroy(); }); - var $sbutton = $buttons.find(".oe_selectcreatepopup-search-select"); + var $sbutton = self.$buttonpane.find(".oe_selectcreatepopup-search-select"); if(self.options.disable_multiple_selection) { $sbutton.hide(); } From 52f6f0bd0437a0735cd3020a8786047c0fb00652 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 20 Jul 2012 14:44:30 +0200 Subject: [PATCH 307/341] [IMP] Changed some "Cancel" buttons to links bzr revid: nicolas.vanhoren@openerp.com-20120720124430-gbhow8qcipsrieb4 --- addons/web/static/src/js/view_form.js | 5 +---- addons/web/static/src/xml/base.xml | 9 ++++++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 13f70a421de..06ca0ce13c4 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -4047,15 +4047,12 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend self.searchview.do_search(); }); self.view_list.on_loaded.add_last(function() { - self.$buttonpane.html(QWeb.render("SelectCreatePopup.search.buttons")); + self.$buttonpane.html(QWeb.render("SelectCreatePopup.search.buttons", {widget:self})); var $cbutton = self.$buttonpane.find(".oe_selectcreatepopup-search-close"); $cbutton.click(function() { self.destroy(); }); var $sbutton = self.$buttonpane.find(".oe_selectcreatepopup-search-select"); - if(self.options.disable_multiple_selection) { - $sbutton.hide(); - } $sbutton.click(function() { self.on_select_elements(self.selected_ids); self.destroy(); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 5377c394ace..f334b649671 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1468,8 +1468,11 @@

    - - + + + or + + Cancel @@ -1479,7 +1482,7 @@ - + or Cancel Send an Email
    - From 707c2dd573a8505a1d1af9b31b6f8666929e3bfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 20 Jul 2012 14:57:09 +0200 Subject: [PATCH 309/341] [FIX] mail.compos.message: outgoing state only for emails. Send only emails, also. bzr revid: tde@openerp.com-20120720125709-rgfiwsy8qp3z5x1f --- addons/mail/wizard/mail_compose_message.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py index de3e5ca39ba..d26511464f8 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -136,6 +136,8 @@ class mail_compose_message(osv.TransientModel): 'email_from': user.user_email or tools.config.get('email_from', False), 'body_html': False, 'body_text': False, + 'subject': False, + 'dest_partner_ids': [], }) return result @@ -263,6 +265,7 @@ class mail_compose_message(osv.TransientModel): subject = mail_wiz.subject if formatting else False content_subtype = 'html' if formatting else 'plain' type = 'email' if email_mode else 'comment' + state = 'outgoing' if email_mode else False partner_ids = [partner.id for partner in mail_wiz.dest_partner_ids] references = None headers = {} @@ -298,7 +301,7 @@ class mail_compose_message(osv.TransientModel): # processed as soon as the mail scheduler runs. if mail_thread_enabled: active_model_pool.message_append(cr, uid, [active_id], rendered_subject, rendered_body_text, rendered_body_html, - type=type, content_subtype=content_subtype, state='outgoing', partner_ids=partner_ids, + type=type, content_subtype=content_subtype, state=state, partner_ids=partner_ids, email_from=email_from, email_to=email_to, email_cc=email_cc, email_bcc=email_bcc, reply_to=reply_to, references=references, attachments=attachment, headers=headers, context=context) else: @@ -310,16 +313,17 @@ class mail_compose_message(osv.TransientModel): # normal mode - no mass-mailing if mail_thread_enabled: msg_ids = active_model_pool.message_append(cr, uid, active_ids, subject, mail_wiz.body_text, mail_wiz.body_html, - type=type, content_subtype=content_subtype, state='outgoing', partner_ids=partner_ids, + type=type, content_subtype=content_subtype, state=state, partner_ids=partner_ids, email_from=mail_wiz.email_from, email_to=mail_wiz.email_to, email_cc=mail_wiz.email_cc, email_bcc=mail_wiz.email_bcc, reply_to=mail_wiz.reply_to, references=references, attachments=attachment, headers=headers, context=context) else: msg_ids = [mail_message_obj.schedule_with_attach(cr, uid, mail_wiz.email_from, to_email(mail_wiz.email_to), subject, mail_wiz.body_text, - model=mail_wiz.model, email_cc=to_email(mail_wiz.email_cc), email_bcc=to_email(mail_wiz.email_bcc), reply_to=mail_wiz.reply_to, + type=type, model=mail_wiz.model, email_cc=to_email(mail_wiz.email_cc), email_bcc=to_email(mail_wiz.email_bcc), reply_to=mail_wiz.reply_to, attachments=attachment, references=references, res_id=int(mail_wiz.res_id), partner_ids=partner_ids, content_subtype=mail_wiz.content_subtype, headers=headers, context=context)] # in normal mode, we send the email immediately, as the user expects us to (delay should be sufficiently small) - mail_message_obj.send(cr, uid, msg_ids, context=context) + if type == 'email': + mail_message_obj.send(cr, uid, msg_ids, context=context) return {'type': 'ir.actions.act_window_close'} From f6a4e4875d31d936fb15194e18b0efdd2a48b5f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 20 Jul 2012 14:57:29 +0200 Subject: [PATCH 310/341] [IMP] mail.message: added type in parameters. Default is email. bzr revid: tde@openerp.com-20120720125729-4xq31w4o0qey6erl --- addons/mail/mail_message.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index 2443a5b8eca..b96b6e3791e 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -295,7 +295,7 @@ class mail_message(osv.Model): self.check(cr, uid, ids, 'unlink', context=context) return super(mail_message, self).unlink(cr, uid, ids, context) - def schedule_with_attach(self, cr, uid, email_from, email_to, subject, body, model=False, + def schedule_with_attach(self, cr, uid, email_from, email_to, subject, body, model=False, type='email', email_cc=None, email_bcc=None, reply_to=False, partner_ids=None, attachments=None, message_id=False, references=False, res_id=False, content_subtype='plain', headers=None, mail_server_id=False, auto_delete=False, context=None): @@ -352,6 +352,7 @@ class mail_message(osv.Model): 'user_id': uid, 'model': model, 'res_id': res_id, + 'type': type, 'body_text': body if content_subtype != 'html' else False, 'body_html': body if content_subtype == 'html' else False, 'email_from': email_from, From c9ff048d924f18e49e0b65cd4159305d1fe4d5a5 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 20 Jul 2012 15:01:00 +0200 Subject: [PATCH 311/341] [IMP] debug mode bzr revid: nicolas.vanhoren@openerp.com-20120720130100-olttd8ovamdtywtt --- addons/web/common/http.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/web/common/http.py b/addons/web/common/http.py index 87748d2e6d9..bb87d719bad 100644 --- a/addons/web/common/http.py +++ b/addons/web/common/http.py @@ -28,6 +28,7 @@ import werkzeug.wsgi from . import nonliterals from . import session from . import openerplib +import urlparse __all__ = ['Root', 'jsonrequest', 'httprequest', 'Controller', 'WebRequest', 'JsonRequest', 'HttpRequest'] @@ -422,7 +423,9 @@ class DisableCacheMiddleware(object): self.app = app def __call__(self, environ, start_response): def start_wrapped(status, headers): - debug = environ.get('HTTP_REFERER', '').find('debug') != -1 + referer = environ.get('HTTP_REFERER', '') + parsed = urlparse.urlparse(referer) + debug = not urlparse.parse_qs(parsed.query).has_key('debug') filtered_headers = [(k,v) for k,v in headers if not (k=='Last-Modified' or (debug and k=='Cache-Control'))] if debug: filtered_headers.append(('Cache-Control', 'no-cache')) From a8ca054cf203ea01656590ee44af8ac2b44fd200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 20 Jul 2012 15:01:27 +0200 Subject: [PATCH 312/341] [CLEAN] mail.js: removed debug data. bzr revid: tde@openerp.com-20120720130127-7kquweauwh4bv7zi --- addons/mail/static/src/css/mail.css | 8 -------- addons/mail/static/src/js/mail.js | 12 +----------- addons/mail/static/src/xml/mail.xml | 18 +----------------- 3 files changed, 2 insertions(+), 36 deletions(-) diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index cf2f7d43a20..03f1078e6d5 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -275,14 +275,6 @@ display: none; } -.openerp ul.oe_mail_debug { - color: #888; -} - -.openerp ul.oe_mail_debug li { - margin-right: 12px; -} - /* ------------------------------------------------------------ */ /* mail.compose.message form view & OpenERP hacks /* ------------------------------------------------------------ */ diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 3872a486565..8ce050fd144 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -319,11 +319,11 @@ openerp.mail = function(session) { reinit: function() { var self = this; if (! this.form_view) return; - // debugger var call_defer = this.ds_compose.call('default_get', [['subject', 'body_text', 'body_html', 'dest_partner_ids'], this.ds_compose.get_context()]).then( function (result) { self.form_view.on_processed_onchange({'value': result}, []); }); + return call_defer; }, /** @@ -586,12 +586,8 @@ openerp.mail = function(session) { do_customize_display: function() { if (this.display.show_post_comment) { this.$element.find('div.oe_mail_thread_action').eq(0).show(); } - if (this.session.debug) { - this.$element.find('ul.oe_mail_debug').toggleClass('oe_mail_invisible'); - } }, - /** * Bind events in the widget. Each event is slightly described * in the function. */ @@ -656,12 +652,6 @@ openerp.mail = function(session) { self.instantiate_composition_form('reply', email_mode, formatting, msg_id); event.preventDefault(); }); - // event: click on "Debug data" in msg side menu (email style) - this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_debug', 'click', function (event) { - var act_dom = $(event.srcElement).parents('div.oe_mail_msg_content').find('ul.oe_mail_debug'); - act_dom.toggleClass('oe_mail_invisible'); - event.preventDefault(); - }); }, destroy: function () { diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 5d76096fb9a..bf8d7fd1475 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -136,7 +136,6 @@
    • -->
  • Reply by email
  • Details
    • -
  • Debug data
    • @@ -147,27 +146,12 @@
    -
      -
    • document: (,)
      • -
    • id:
      • -
    • type:
      • -
    • content_subtype:
      • -
    • state:
      • -
    • parent_id:
      • -
    • email_from:
      • -
    • email_to:
      • -
    • email_cc:
      • -
    • email_bcc:
      • -
    • reply_to:
      • -
    • partner_ids:
      • -
    • message_id:
      • -
    • references:
      • -
    +
    • Reply
      • From e9ec0ec009a1ad69f210f2117e5023d0e972e55a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 20 Jul 2012 15:28:46 +0200 Subject: [PATCH 313/341] [REM] mail_thread: removed broadcast. bzr revid: tde@openerp.com-20120720132846-s1ad623e60pyejeb --- addons/mail/mail_thread.py | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index 1f1a3d7223b..d036150b21c 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -811,31 +811,6 @@ class mail_thread(osv.Model): #------------------------------------------------------ # Note specific #------------------------------------------------------ - - def message_broadcast(self, cr, uid, ids, subject=None, body=None, parent_id=False, type='notification', content_subtype='html', context=None): - if context is None: - context = {} - notification_obj = self.pool.get('mail.notification') - # write message - msg_ids = self.message_append_note(cr, uid, ids, subject=subject, body=body, parent_id=parent_id, type=type, content_subtype=content_subtype, context=context) - # escape if in install mode or note writing was not successfull - if 'install_mode' in context: - return True - if not isinstance(msg_ids, (list)): - return True - # get already existing notigications - notification_ids = notification_obj.search(cr, uid, [('message_id', 'in', msg_ids)], context=context) - already_pushed_user_ids = map(itemgetter('user_id'), notification_obj.read(cr, uid, notification_ids, context=context)) - # get base.group_user group - res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_user') or False - group_id = res and res[1] or False - if not group_id: return True - group = self.pool.get('res.groups').browse(cr, uid, [group_id], context=context)[0] - for user in group.users: - if user.id in already_pushed_user_ids: continue - for msg_id in msg_ids: - notification_obj.create(cr, uid, {'user_id': user.id, 'message_id': msg_id}, context=context) - return True def log(self, cr, uid, id, message, secondary=False, context=None): _logger.warning("log() is deprecated. As this module inherit from \ From 34db4d2ac7cea573afc8beb7f1e3915529962c32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 20 Jul 2012 15:29:04 +0200 Subject: [PATCH 314/341] [IMP] res_users in mail: Welcome message posted on its wall at creation. bzr revid: tde@openerp.com-20120720132904-v7f8876p87c74wxe --- addons/mail/res_users.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py index 203854925d7..89767473754 100644 --- a/addons/mail/res_users.py +++ b/addons/mail/res_users.py @@ -24,8 +24,9 @@ from tools.translate import _ class res_users(osv.osv): """ Update of res.users class - - add a preference about sending emails about notificatoins + - add a preference about sending emails about notifications - make a new user follow itself + - add a welcome message """ _name = 'res.users' _inherit = ['res.users', 'mail.thread'] @@ -61,11 +62,10 @@ class res_users(osv.osv): user = self.browse(cr, uid, [user_id], context=context)[0] # make user follow itself self.message_subscribe(cr, uid, [user_id], [user_id], context=context) - # create a welcome message to broadcast + # create a welcome message company_name = user.company_id.name if user.company_id else 'the company' - message = _('%s has joined %s! You may leave him/her a message to celebrate a new arrival in the company ! You can help him/her doing its first steps on OpenERP.') % (user.name, company_name) - # TODO: clean the broadcast feature. As this is not cleany specified, temporarily remove the message broadcasting that is not buggy but not very nice. - #self.message_broadcast(cr, uid, [user.id], 'Welcome notification', message, context=context) + message = _('%s has joined %s! Welcome in OpenERP !') % (user.name, company_name) + self.message_append_note(cr, uid, [user_id], subject='Welcom to OpenERP', body=message, type='comment', context=context) return user_id def message_search_get_domain(self, cr, uid, ids, context=None): From 76678c427eecb70d32652de38a35ce1efda96c84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 20 Jul 2012 15:29:31 +0200 Subject: [PATCH 315/341] [IMP] res_partner in mail: also look messages related to the partner. bzr revid: tde@openerp.com-20120720132931-lf19b1v3ambao30p --- addons/mail/res_partner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py index aeec9a5a6b3..3dc1f91d857 100644 --- a/addons/mail/res_partner.py +++ b/addons/mail/res_partner.py @@ -33,7 +33,7 @@ class res_partner_mail(osv.osv): """ initial_domain = super(res_partner_mail, self).message_search_get_domain(cr, uid, ids, context=context) if self._name == 'res.partner': # to avoid models inheriting from res.partner - search_domain = ['|'] + initial_domain + [('partner_ids', 'in', ids)] + search_domain = ['|'] + initial_domain + ['|', ('partner_id', 'in', ids), ('partner_ids', 'in', ids)] return search_domain # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 2578f575e220557ebd4f9ade1e4b5684f3bba1d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 20 Jul 2012 15:29:52 +0200 Subject: [PATCH 316/341] [IMP] hr_employee: now sends a message on All employee mail.group to welcome the new employee. bzr revid: tde@openerp.com-20120720132952-y0j1d4n7qaywbrrl --- addons/hr/hr.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/addons/hr/hr.py b/addons/hr/hr.py index 4a0c3736222..2a0ea3b45a4 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -212,6 +212,16 @@ class hr_employee(osv.osv): 'last_login': fields.related('user_id', 'date', type='datetime', string='Latest Connection', readonly=1), } + def create(self, cr, uid, data, context=None): + employee_id = super(hr_employee, self).create(cr, uid, data, context=context) + try: + (model, mail_group_id) = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'group_all_employees') + employee = self.browse(cr, uid, employee_id, context=context) + self.pool.get('mail.group').message_append_note(cr, uid, [mail_group_id], body='Welcome to %s! Please help him make its first steps in OpenERP!' % (employee.name), context=context) + except: + pass # group deleted: do not push a message + return employee_id + def unlink(self, cr, uid, ids, context=None): resource_obj = self.pool.get('resource.resource') resource_ids = [] From b30754f32bab0376c9f734c66675fed342564d1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 20 Jul 2012 15:37:12 +0200 Subject: [PATCH 317/341] [IMP] demo data: made them noupdate. bzr revid: tde@openerp.com-20120720133712-p6gd58nndabsit14 --- addons/mail/data/mail_demo.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml index 0a4751cedb1..274259e544e 100644 --- a/addons/mail/data/mail_demo.xml +++ b/addons/mail/data/mail_demo.xml @@ -1,6 +1,6 @@ - + A cool attachment From 365cb6284571f04f08a9ffc4e4bab60fc57153a3 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Fri, 20 Jul 2012 15:46:54 +0200 Subject: [PATCH 318/341] [FIX] base_calendar: remove pdb bzr revid: stw@openerp.com-20120720134654-2mzht44jvteayuen --- addons/base_calendar/wizard/base_calendar_invite_attendee.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py index 0e62555f6ba..5da711cf657 100644 --- a/addons/base_calendar/wizard/base_calendar_invite_attendee.py +++ b/addons/base_calendar/wizard/base_calendar_invite_attendee.py @@ -79,8 +79,6 @@ send an Email to Invited Person') user_obj = self.pool.get('res.users') current_user = user_obj.browse(cr, uid, uid, context=context) - import pdb - pdb.set_trace() for datas in self.read(cr, uid, ids, context=context): type = datas.get('type') vals = [] From ec3ff22aed6c113a1fad2875809562e9f9a92a13 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 20 Jul 2012 16:13:04 +0200 Subject: [PATCH 319/341] [FIX] rare problem during save bzr revid: nicolas.vanhoren@openerp.com-20120720141304-dpmw02lx7u2ureia --- addons/web/static/src/js/view_form.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 06ca0ce13c4..d97197074bb 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -80,7 +80,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM this.reload_mutex = new $.Mutex(); this.__clicked_inside = false; this.__blur_timeout = null; - this.rendering_engine = new instance.web.form.FormRenderingEngineReadonly(this); + this.rendering_engine = new instance.web.form.FormRenderingEngine(this); this.qweb = null; // A QWeb instance will be created if the view is a QWeb template }, destroy: function() { @@ -680,7 +680,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM if (!first_invalid_field) { first_invalid_field = f; } - } else if (f.name !== 'id' && !f.get("readonly") && (!self.datarecord.id || f._dirty_flag)) { + } else if (f.name !== 'id' && (!self.datarecord.id || (!f.get("readonly") && f._dirty_flag))) { // Special case 'id' field, do not save this field // on 'create' : save all non readonly fields // on 'edit' : save non readonly modified fields @@ -1347,12 +1347,6 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt }, }); -instance.web.form.FormRenderingEngineReadonly = instance.web.form.FormRenderingEngine.extend({ - alter_field: function(field) { - field.set({"force_readonly": true}); - }, -}); - instance.web.form.FormDialog = instance.web.Dialog.extend({ init: function(parent, options, view_id, dataset) { this._super(parent, options); @@ -1813,6 +1807,7 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w // some events to make the property "effective_readonly" sync automatically with "readonly" and // "force_readonly" this.set({"readonly": this.modifiers['readonly'] === true}); + this.set({"force_readonly": false}); var test_effective_readonly = function() { this.set({"effective_readonly": this.get("readonly") || !!this.get("force_readonly")}); }; From 1b5b5d9a87c433583be09f8cb65cab97a7f672bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 20 Jul 2012 16:17:54 +0200 Subject: [PATCH 320/341] [CLEAN] email_template: removed print statements. bzr revid: tde@openerp.com-20120720141754-dlbl78znso8dzyz2 --- addons/email_template/wizard/mail_compose_message.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py index 410817dc06e..1b007a990c0 100644 --- a/addons/email_template/wizard/mail_compose_message.py +++ b/addons/email_template/wizard/mail_compose_message.py @@ -103,14 +103,9 @@ class mail_compose_message(osv.osv_memory): for record in self.browse(cr, uid, ids, context=context): values = {} use_template = record.use_template - print 'template_toggle: use_template: %d' % (use_template) - # update use_template value - # simulate an on_change on use_template values.update(self.onchange_use_template(cr, uid, ids, not use_template, context=context)['value']) - print 'template_toggle: values %s' % (str(values)) record.write(values) - return False def onchange_use_template(self, cr, uid, ids, use_template, context=None): @@ -121,7 +116,6 @@ class mail_compose_message(osv.osv_memory): onchange_template_values = self.on_change_template(cr, uid, record.id, use_template, False, email_from=record.email_from, email_to=record.email_to, context=context) values.update(onchange_template_values['value']) - print 'onchange_use_template: values %s' % (str(values)) return {'value': values} def save_as_template(self, cr, uid, ids, context=None): From 062017bd87c6acb011a4e3b5386de1b2f620085a Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Fri, 20 Jul 2012 16:18:30 +0200 Subject: [PATCH 321/341] [IMP] usability: partner form view bzr revid: qdp-launchpad@openerp.com-20120720141830-htjstvlkqikv4d0z --- addons/account/partner_view.xml | 24 ++++++--------------- addons/base_vat/base_vat_view.xml | 2 +- addons/l10n_be_invoice_bba/partner_view.xml | 2 +- 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml index cd75daa6c07..1e360f6c742 100644 --- a/addons/account/partner_view.xml +++ b/addons/account/partner_view.xml @@ -78,18 +78,19 @@ - + + + + + + - - - - - + @@ -142,16 +143,5 @@ view_type="form" view_mode="tree,form,graph,calendar"/> - - res.partner.form.reconcile - res.partner - - - - - - - - diff --git a/addons/base_vat/base_vat_view.xml b/addons/base_vat/base_vat_view.xml index 1d7f06eb571..df1d18ac194 100644 --- a/addons/base_vat/base_vat_view.xml +++ b/addons/base_vat/base_vat_view.xml @@ -7,7 +7,7 @@ res.partner - +