Commit Graph

762 Commits

Author SHA1 Message Date
Thibault Delavallée a370d1c059 [IMP] email_template: relooked a bit the mail.compose.message wizard, use_template by default, on bottom-right choose the template; rendre only when use_template and template_id set.
bzr revid: tde@openerp.com-20121113113625-fg3jp3047gnrx2wr
2012-11-13 12:36:25 +01:00
Thibault Delavallée 78959edc48 [IMP] email_template: cleaned a bit tools imports.
bzr revid: tde@openerp.com-20121109095122-pifpwr5u1hhyjakw
2012-11-09 10:51:22 +01:00
Olivier Dony c9d5148991 [MERGE] Sync with trunk
bzr revid: odo@openerp.com-20121107114202-mt3gny8e2497m7qf
2012-11-07 12:42:02 +01:00
Christophe Matthieu 42dd7711b5 [FIX] email_template: change name value and concat test
bzr revid: chm@openerp.com-20121107113925-1nmjicj444nez25c
2012-11-07 12:39:25 +01:00
Christophe Matthieu 621c8b4bb7 [IMP] email_template: add test: The fields email_to, email_to_partner and email_cc return the good list of partner_id
bzr revid: chm@openerp.com-20121107102745-9d0dt1fkzauvfyjs
2012-11-07 11:27:45 +01:00
Christophe Matthieu 71c73945fa [IMP] email template: add a email_to_partner field for send a email to a partner with the id
bzr revid: chm@openerp.com-20121106191255-dd1xv90ebsejqunf
2012-11-06 20:12:55 +01:00
Thibault Delavallée 53a6056a35 [FIX] email_template: html_sanitize not in html_sanitize, but in mail.é
bzr revid: tde@openerp.com-20121106121134-8tws1ckwh0mhpiwm
2012-11-06 13:11:34 +01:00
Launchpad Translations on behalf of openerp 87d3caa50f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121030053700-w841c92uvirpii9h
2012-10-30 05:37:00 +00:00
Olivier Dony 822882f118 [MERGE] Sync with trunk
bzr revid: odo@openerp.com-20121019082409-lq3jdj6rptxdkzwn
2012-10-19 10:24:09 +02:00
Launchpad Translations on behalf of openerp 5bfa3c5a7d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121019053933-51d6oob5aw0ujz40
2012-10-19 05:39:33 +00:00
Thibault Delavallée 1737a3161b [REVIEW] Cleaning before merging.
bzr revid: tde@openerp.com-20121018093453-trijh79z0j7oha6f
2012-10-18 11:34:53 +02:00
Thibault Delavallée ae1985702b [REM] email_template: removed overrided chatter form view; updated legacy wizard form view.
bzr revid: tde@openerp.com-20121017092938-8ulu2h3ml9on4iu9
2012-10-17 11:29:38 +02:00
Thibault Delavallée c3aecf0630 [FIX] Fixed fix of revision 7750. Correct fix was to add in the generated action an use_template context key, that triggers the use of templates. Eveything is then managed inside the email_template override of mail.compose.message.
bzr revid: tde@openerp.com-20121016115839-8cj0u9si20qo14av
2012-10-16 13:58:39 +02:00
Olivier Dony 5f24594223 [IMP] edi: work-in-progress: remove permanent storage of edi.document
The EDI documents will now be generated on demand
and available from the Portal view of each document.
Instead of getting a link to a statically generated
EDI document, customers will receive a link to
the portal access to the document. They will be able
to signup on the portal the first time as well,
provided they are using the secure token that was
sent to them (i.e. the right link).

The link to pay online will be available in the
portal as well.

Still much to do, this is a small first step,
with edi.document renamed to edi.edi for
consistency, as it will not persist any
edi.document anymore.

bzr revid: odo@openerp.com-20121011152008-bht7ub6woaex0a7u
2012-10-11 17:20:08 +02:00
Christophe Matthieu 30be16b0fc [MERGE] from trunk
bzr revid: chm@openerp.com-20121011074626-rztxx7vnhg8sd72l
2012-10-11 09:46:26 +02:00
Christophe Matthieu 76a257cd1b [MERGE] from trunk
bzr revid: chm@openerp.com-20121010185721-in3ab4mr8h72lect
2012-10-10 20:57:21 +02:00
Quentin (OpenERP) a8c6c4e34a [MERGE] purchase: ps review
bzr revid: qdp-launchpad@openerp.com-20121010184414-eys4z5k531qwx5ck
2012-10-10 20:44:14 +02:00
Quentin (OpenERP) fbbc0bad19 [IMP] all: replaced 'true' by 'True' in 'options' attribute in views, because now the syntax of these options must be expressed in python instead of json
bzr revid: qdp-launchpad@openerp.com-20121009143433-s4y6isbewqdn2fu2
2012-10-09 16:34:33 +02:00
Christophe Matthieu df5071c896 [IMP] mail chatter: compose mail in js, less request
bzr revid: chm@openerp.com-20121005104654-t5lholex2gh11y15
2012-10-05 12:46:54 +02:00
Jalpesh Patel (OpenERP) 6aba62a847 [fix]fix problem of send RFQ
bzr revid: pja@tinyerp.com-20121004070227-rqo5ec0mckj5vqx8
2012-10-04 12:32:27 +05:30
Fabien Pinckaers c93d70e919 [MERGE] chm - improved subtype - fixes
bzr revid: fp@openerp.com-20121002204023-8v3jf2n84xe2jol9
2012-10-02 22:40:23 +02:00
Antonin Bourguignon 2b2288a3bd [FIX] a few problems introduced with the last merge
bzr revid: abo@openerp.com-20121002111231-zo41jejkrm8afavu
2012-10-02 13:12:31 +02:00
Antonin Bourguignon 1653332080 [MERGE] trunk
bzr revid: abo@openerp.com-20121002102915-424prxd74izb1szw
2012-10-02 12:29:15 +02:00
Fabien Pinckaers eeeabc4b57 [FIX] automated tests
bzr revid: fp@openerp.com-20121001211605-u74rjn9doh65vu94
2012-10-01 23:16:05 +02:00
Fabien Pinckaers e9f4840c93 [IMP] emoving bad code, no invitation system on events
[IMP] no more certifiate, will be managed in apps.openerp.com directly

bzr revid: fp@tinyerp.com-20120926121627-60isym4hdjkaxe9p
2012-09-26 14:16:27 +02:00
Antonin Bourguignon 6359d39de2 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120924171736-awxstwkuaflv1y7r
2012-09-24 19:17:36 +02:00
Antonin Bourguignon 1fbb4a5c16 [IMP] handling of '(copy)' l10n
bzr revid: abo@openerp.com-20120924162645-z1h4l2mj6c8i6wr3
2012-09-24 18:26:45 +02:00
Antonin Bourguignon f7b90af93a [FIX] forgot to remove })
bzr revid: abo@openerp.com-20120924155600-dnaanyupa5jm0yre
2012-09-24 17:56:00 +02:00
Antonin Bourguignon 05059bef7f [MERGE] trunk
bzr revid: abo@openerp.com-20120924153547-i1r9l0i5asjhml0k
2012-09-24 17:35:47 +02:00
Antonin Bourguignon 7b62802435 [IMP] use kwargs instead of a new dict
bzr revid: abo@openerp.com-20120924153430-0nb2gxker8v9is5p
2012-09-24 17:34:30 +02:00
Christophe Matthieu 46a60cdac7 [MERGE] from trunk-mail-concreting-tde, TODO fix bug
bzr revid: chm@openerp.com-20121029090847-27h3tmyvsv9c8vej
2012-10-29 10:08:47 +01:00
Thibault Delavallée 6966509c6e [IMP] mail_message: partner_ids now holds only specific destination partners. Partners + followers is now stored into notified_partner_ids. Added a from field on mail_message, holding the email address of the sender, in case of an incoming email message that cannot be linked to a partner.
bzr revid: tde@openerp.com-20121025113048-5f1ob8ligqzb52gu
2012-10-25 13:30:48 +02:00
Christophe Matthieu 2055dacf04 [IMP] mail: use widget one2many_binary
bzr revid: chm@openerp.com-20121024092503-mpk7f1vd8jqynvqc
2012-10-24 11:25:03 +02:00
Thibault Delavallée 0e4422809b [IMP] email_template: now inherit from TestMailMockups test class.
bzr revid: tde@openerp.com-20120913114917-na341w0ja7n0ditu
2012-09-13 13:49:17 +02:00
Thibault Delavallée 2a317c55fb [IMP] mail.compose.message wizard form view: put template field, and template buttons, as invisible.
bzr revid: tde@openerp.com-20120911115947-rfjr8scrq06ni01s
2012-09-11 13:59:47 +02:00
Thibault Delavallée e089d49703 [FIX] sale, mail: fixed Send by email, back to a wizard. Cleaned a bit some code related to that action.
bzr revid: tde@openerp.com-20120911094007-svlzik5kgmp4nuvy
2012-09-11 11:40:07 +02:00
niv-openerp 1c0dd3b016 [IMP] added arguments to widget html usage
bzr revid: nicolas.vanhoren@openerp.com-20120910135708-6wq2v7iet7i11624
2012-09-10 15:57:08 +02:00
Launchpad Translations on behalf of openerp ffc320dcc7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120907045929-grtx16xxp1c4m6rh
bzr revid: launchpad_translations_on_behalf_of_openerp-20120907050524-07x2fgbr194czqbs
2012-09-07 05:05:24 +00:00
Thibault Delavallée 089b64214d [FIX] email_template: various improvements and fixes.
email_template.py: fixed attachments
mail.compose.message: fixed various bugs of onchanges and the use of templates
with the composer. Cleaned and added tests related to the composer using
email_template.
mail.compose.message form view: the use of templates is now for
advanced formatting only.

bzr revid: tde@openerp.com-20120905155626-h6laee191ttnglkh
2012-09-05 17:56:26 +02:00
Olivier Dony 5f1dce419b [IMP] mail*: implement auto-deletion mechanism for mail.message, mail.mail and the attachment
This is based on the auto_delete flag on mail.mail
and the assumption that mail.mail records created
without a parent message will be deleted as a whole,
including the parent message and its attachments.
This is contrasted with mail.mail records created
for notifications regarding a mail.message, and therefore
created with an existing `mail_message_id` parent.
For this last case the parent must not be deleted
along with the child mail.mail, as it exists on its own.

bzr revid: odo@openerp.com-20120905151950-7jv6hi0x5fx5iytp
2012-09-05 17:19:50 +02:00
Thibault Delavallée c52ab94960 [REVIEW] addons: small cleanups nex to a diff read. Some improvements will follow, this commit is about small cleanups.
bzr revid: tde@openerp.com-20120904092820-56zgwpkqfpd7as5k
2012-09-04 11:28:20 +02:00
Thibault Delavallée a3db9b35bd [WIP] email_template: WIP about debugging the use of email_templates. A method to get and handle values coming from generate_emial has been added. TODO: use it where necessary, clean the remaining of the code, add some tests. Added some new tests.
bzr revid: tde@openerp.com-20120903181111-yy9y6omu4vyhdc11
2012-09-03 20:11:11 +02:00
Olivier Dony 9d16f324e9 [IMP] email.template: review/adapt form to 7.0-style + continue refactoring polishing
bzr revid: odo@openerp.com-20120901010907-703t6vx6n99tnyzq
2012-09-01 03:09:07 +02:00
Thibault Delavallée 761864c11c [FIX] [WIP] email_template: composition wizard: added render_message that get back the values generated by the template in mass_mail mode; email_template overrides the basic behavior of mail, to use the templating power (niak). Various fixes in the wizard, mostly in onchange_template_id. Some code cleaning. Updated the view, because onchange_template_id now take an extr argument (model). Added some tests used during this WIP. Will be updated next week.
bzr revid: tde@openerp.com-20120831171900-ii0ucshjnf8vjc3z
2012-08-31 19:19:00 +02:00
Thibault Delavallée 7eb5b82950 [FIX] email_template: generate_email now returns a standard-looking attachments in values (list of tuples).
bzr revid: tde@openerp.com-20120831171622-ibrrz5us0lunoi0q
2012-08-31 19:16:22 +02:00
Olivier Dony fb7491ed70 [FIX] email_template: fix template views + preview after latest model changes
bzr revid: odo@openerp.com-20120831163904-jh76tko9hwd2a06y
2012-08-31 18:39:04 +02:00
Olivier Dony 04c6823a99 [IMP] email_template: email.template does not inherit from mail.mail anymore, they had almost nothing left in common
+ minor lint cleanup

bzr revid: odo@openerp.com-20120831155805-bs8jmpt3eh52zwfb
2012-08-31 17:58:05 +02:00
Olivier Dony 24fab3ca7d [IMP] mail: refactor various places where we append content to HTML
bzr revid: odo@openerp.com-20120831155103-t13p33p7232g0128
2012-08-31 17:51:03 +02:00
Thibault Delavallée c14a11482c [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120831074032-3b41p3qnuknfv461
2012-08-31 09:40:32 +02:00
Launchpad Translations on behalf of openerp 4639967d0c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120831045649-sm7os4ihiv8fv422
2012-08-31 04:56:49 +00:00
Olivier Dony 9aabe91bbf [FIX] email_template: wip - trying to make templates work again
bzr revid: odo@openerp.com-20120830174452-59q43k1x13at4i37
2012-08-30 19:44:52 +02:00
Thibault Delavallée 088dc6a3d3 [WIP] email_template: WIP on mail.compose.message in email_template. Cleaned a bit the code, the view. Added base for testing mail composer in tests. TODO: handle partners, email_cc, email_to, attachments, ... almost everything.
bzr revid: tde@openerp.com-20120830155154-419yn1aj0u6vq8yb
2012-08-30 17:51:54 +02:00
Thibault Delavallée 8b910c1f1d [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120829074244-x6u8dnw4owiw93pv
2012-08-29 09:42:44 +02:00
Launchpad Translations on behalf of openerp 4e31d1be93 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828064335-bftlutj6aiymztbp
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828072410-7ndsu3tnyrjhtuor
2012-08-28 07:24:10 +00:00
Thibault Delavallée 4b0d1be1c0 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120827083705-p2edynkzch7hszrd
2012-08-27 10:37:05 +02:00
Olivier Dony 545d7843e3 [FIX] marketing_campaign: make tests pass again, move partner resolution to mail_compose_message
email_template's job is to generate a mail.mail record, but it
does not care about linking it automatically to a partner
(and certainly not creating new partners) as this must be
usable for mass mailing and for marketing campaign,
and we don't want to pollute the partners database with
possibly thousands of partially fake emails

bzr revid: odo@openerp.com-20120824120102-jycs8x4vkxdmrvge
2012-08-24 14:01:02 +02:00
Thibault Delavallée 18f6fd8990 [FIX] email_template: fixed inherited view.
bzr revid: tde@openerp.com-20120824103845-7g1jzgtcctry6nod
2012-08-24 12:38:45 +02:00
Olivier Dony 2b14337518 [FIX] email_template: fix invalid _rec_name
bzr revid: odo@openerp.com-20120822184856-ye5ff2wzvte0qgwr
2012-08-22 20:48:56 +02:00
Saurang Suthar(OpenERP) 095843797c [IMP] Improved _openerp__.py of all modules by replacing demo_xml with demo, init_xml and update_xml with data and adding noupdate
bzr revid: pso@tinyerp.com-20120822130232-un52dks3sclyx8m5
2012-08-22 18:32:32 +05:30
pso (OpenERP) c78a04bc68 [MERGE] Merged HSA's branch to improve __openerp__.py of all modules by replacing init_xml, update_xml with data, demo_xml with demo, Adding noupdate in init_xml files
bzr revid: pso@tinyerp.com-20120822071445-yamr1s0zf3fk9jj7
2012-08-22 12:44:45 +05:30
Amit (OpenERP) 0195eb407d [FIX] mail_template : Fixes the duplication problem on email template
lp bug: https://launchpad.net/bugs/1039645 fixed

bzr revid: amp@tinyerp.com-20120822062555-d7thh474wn5lisnv
2012-08-22 11:55:55 +05:30
Olivier Dony 95b13bdaa4 [FIX] *mail: s/mail_message/mail_mail/ for cases where a full mail_mail is necessary
bzr revid: odo@openerp.com-20120821212419-yu2criox6sayf2cv
2012-08-21 23:24:19 +02:00
Thibault Delavallée 169c8055ba [REF] mail.compose.message: removed extended mode, because not really usefull. Removed reference to that mode in addons (crm lead, crm claim, crm helpdesk, hr evaluation, hr recruitement, project issue). Completely removed the wizard directory in hr_evaluation: mail_compose_message will become a button (TODO), and other files were not called anymore in init/openerp files.
bzr revid: tde@openerp.com-20120821142747-q9drv71749opusr1
2012-08-21 16:27:47 +02:00
pso (OpenERP) 72ec57d5d4 [MERGE] Merged SSU's branch to improve module description with respect of rst format
bzr revid: pso@tinyerp.com-20120821111356-abyhw484xe2nkzyi
2012-08-21 16:43:56 +05:30
Fabien Pinckaers 043dc83d20 [IMP] mails
bzr revid: fp@tinyerp.com-20120817125004-wcchhac2cvxuf93i
2012-08-17 14:50:04 +02:00
Fabien Pinckaers 06f60b3517 [FIX] body_text --> body, not ure it's good enough
bzr revid: fp@tinyerp.com-20120817120606-t97l9x2dguuv7kmp
2012-08-17 14:06:06 +02:00
Fabien Pinckaers a71b01ab24 [IMP] mail cleaning
bzr revid: fp@tinyerp.com-20120817115513-3b3faqcl78blyrfo
2012-08-17 13:55:13 +02:00
Hardik b040d2706d [IMP]update __openerp__.py in all modules
bzr revid: hsa@tinyerp.com-20120817111540-rfql0ifsvbx5nz7g
2012-08-17 16:45:40 +05:30
Vo Minh Thu 9822629548 [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
Twinkle Christian (OpenERP) 2d6aae609b [IMP]Remove type field from the views
bzr revid: tch@tinyerp.com-20120808121950-r4tux6lfej82bi2h
2012-08-08 17:49:50 +05:30
Thibault Delavallée f725d5e679 [FIX] email_template: fixed an issue where no destination partner could be found.
bzr revid: tde@openerp.com-20120807160924-hdnqudnwowkbmsem
2012-08-07 18:09:24 +02:00
Launchpad Translations on behalf of openerp 3cfd65b43d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120807053928-8131c98edycpivlb
2012-08-07 05:39:28 +00:00
Twinkle Christian (OpenERP) cb1c6c08af [IMP]Improve search view in all modules
bzr revid: tch@tinyerp.com-20120731112804-a0akxtqr1z0uew6w
2012-07-31 16:58:04 +05:30
vta vta@openerp.com 264d2c3365 [MERGE] Trunk.
bzr revid: vta@openerp.com-20120730123628-49rirhupbwqfzr0r
2012-07-30 14:36:28 +02:00
Launchpad Translations on behalf of openerp 0c581831b8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120728045741-hrbggtt37yutrbpx
bzr revid: launchpad_translations_on_behalf_of_openerp-20120729043802-x7m56po0nxue0jb0
2012-07-29 04:38:02 +00:00
Antony Lesuisse 775b1db3bf [FIX] email_template chatter icons
bzr revid: al@openerp.com-20120726021434-fsrca98mrw905dmi
2012-07-26 04:14:34 +02:00
Stephane Wirtel 9f299d9a20 [MERGE] lp:~openerp-dev/openobject-addons/trunk-review_module_desc-psi
bzr revid: stw@openerp.com-20120724080711-6655pbbfubiau3li
2012-07-24 10:07:11 +02:00
Thibault Delavallée 1b5b5d9a87 [CLEAN] email_template: removed print statements.
bzr revid: tde@openerp.com-20120720141754-dlbl78znso8dzyz2
2012-07-20 16:17:54 +02:00
Turkesh Patel (Open ERP) 29eb035bca [IMP] email_template: improved search view.
bzr revid: tpa@tinyerp.com-20120720095256-qhjdl6jrtcw2qo1k
2012-07-20 15:22:56 +05:30
Thibault Delavallée 6b9783629b [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
2012-07-19 15:57:45 +02:00
Thibault Delavallée 56e6186ad9 [IMP] mail, email_template: chatter: added forgotton images for links/buttons, cleaned a bit the CSS for the composer.
bzr revid: tde@openerp.com-20120718133234-p933jg1y8658i5ah
2012-07-18 15:32:34 +02:00
Thibault Delavallée b722ae5b82 [IMP] mail: chatter: save template button not opening a new wizard anymore.
bzr revid: tde@openerp.com-20120718110815-hqlis1tdq27upbqn
2012-07-18 13:08:15 +02:00
Purnendu Singh (OpenERP) c45d68d6b8 [MERGE] Merge with main addons
bzr revid: psi@tinyerp.com-20120718055558-03lss1ha0tcdi2dk
2012-07-18 11:25:58 +05:30
Thibault Delavallée 4e038b3615 [IMP] email_template: override name_get, because old one coming from mail.message.common was quite ugly for email templates.
bzr revid: tde@openerp.com-20120717132329-5m15l8akdu8hksy4
2012-07-17 15:23:29 +02:00
Thibault Delavallée b92f0df86c [IMP] email_template: cleaned wizard behavior (no more reloading, only value update); cleaned form view for chatter. Also cleaned form view for compose wizard (removed unnecessary colspan=4).
bzr revid: tde@openerp.com-20120717130718-w8c8dwv1ga9uhivs
2012-07-17 15:07:18 +02:00
Thibault Delavallée 6135e52cfc [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120717075845-wpdcsvxywunqju5b
2012-07-17 09:58:45 +02:00
Thibault Delavallée c773bf396e [IMP] email_template: WIP of adding template feature in composer.
bzr revid: tde@openerp.com-20120716173851-63sz7qnqklz3c1zu
2012-07-16 19:38:51 +02:00
Thibault Delavallée 2cbe5b1b7e [FIX] email_template Updated _reopen call according to new function.
bzr revid: tde@openerp.com-20120716173837-t12xb8p270uds508
2012-07-16 19:38:37 +02:00
Thibault Delavallée 21c9788aa7 [FIX] email_template: fixed active_mode, active_id and active_ids.
bzr revid: tde@openerp.com-20120716164825-dj5643lgo6fk6j3h
2012-07-16 18:48:25 +02:00
Purnendu Singh (OpenERP) 2e2f7188d3 [MERGE, IMP] improve and merge cha branch to update desc formatting
bzr revid: psi@tinyerp.com-20120716094548-xx1ip3eljal3ffvl
2012-07-16 15:15:48 +05:30
Thibault Delavallée 6c967e69a7 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120716083213-36vl49dem980amto
2012-07-16 10:32:13 +02:00
Sanjay Gohel (Open ERP) b81c51c73c [MERGE]merge with trunk addons
bzr revid: sgo@tinyerp.com-20120716065703-gcmugagvaaq1xl4c
2012-07-16 12:27:03 +05:30
Launchpad Translations on behalf of openerp 8028996327 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120714062750-arh47r4vgtj7zlwu
2012-07-14 06:27:50 +00:00
Quentin (OpenERP) 413d44c915 [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20120712153040-tglxx3gc7gjlry72
2012-07-12 17:30:40 +02:00
Ajay Chauhan (OpenERP) 3e94213845 [IMP] : Update Description for modules
bzr revid: cha@tinyerp.com-20120712114535-4a6ge109hskz0gcq
2012-07-12 17:15:35 +05:30
Ajay Chauhan (OpenERP) 4db49fc84d [IMP] : update description
bzr revid: cha@tinyerp.com-20120712062015-vz3w55yen0y2ixaw
2012-07-12 11:50:15 +05:30
Thibault Delavallée 1daefb8fd5 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120711075257-1gldrjfxw8vgi7hx
2012-07-11 09:52:57 +02:00
Fabien Pinckaers 64a9321d56 [IMP] footer on forms
bzr revid: fp@tinyerp.com-20120710164011-unqi1okf2uu8yhts
2012-07-10 18:40:11 +02:00
Sanjay Gohel (Open ERP) 12bae0d8f9 [IMP]improve company form view as per review. improve email_template,user form and all action window and also remove sheets from configuration
bzr revid: sgo@tinyerp.com-20120706123413-1n615yx09cw2kq36
2012-07-06 18:04:13 +05:30
Thibault Delavallée 2f3256d325 [MERGE] Merged with addons/trunk, because of the mail_thread widget renaming.
bzr revid: tde@openerp.com-20120703122104-pl5qn39hte3ui71p
bzr revid: tde@openerp.com-20120703142103-mfssnvtoqx5jn4df
2012-07-03 16:21:03 +02:00
Thibault Delavallée 289dad87d4 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120703122020-79rl9b03mygz5s0h
2012-07-03 14:20:20 +02:00
Launchpad Translations on behalf of openerp c449d53f0f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120703053613-vs3ebaffu079mlld
bzr revid: launchpad_translations_on_behalf_of_openerp-20120703055544-8hfe2zf9x5g8muvi
2012-07-03 05:55:44 +00:00
Quentin (OpenERP) 6fe94bd4bc [MERGE] merged with maint runk
bzr revid: qdp-launchpad@openerp.com-20120629123618-z1bv3dqdfqy23hno
2012-06-29 14:36:18 +02:00
Raphael Collet 1debe0efcd [MERGE] from trunk
bzr revid: rco@openerp.com-20120628131210-hyx2t1lqbl5hwm9g
2012-06-28 15:12:10 +02:00
Sanjay Gohel (Open ERP) 1702b2335d [IMP]remove tabs and add spaces instead of them
bzr revid: sgo@tinyerp.com-20120628064005-zuerrpazumf5lf1q
2012-06-28 12:10:05 +05:30
Launchpad Translations on behalf of openerp 997fe404b3 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120628044101-cehvpv9yfm3xfsr3
2012-06-28 04:41:01 +00:00
Antony Lesuisse f17b0eea00 [MERGE] Use Email everywhere
bzr revid: al@openerp.com-20120627131528-u97jw0m7cq2825ll
2012-06-27 15:15:28 +02:00
Jigar Amin - OpenERP 7c645856fe [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120627114052-094g4yequ34sr59d
2012-06-27 17:10:52 +05:30
Jigar Amin - OpenERP d9db3c44df [REN] renamed e-mail, E-mail, E-Mail to email, Email
bzr revid: jam@tinyerp.com-20120625134253-sebauihl53zctcu0
2012-06-25 19:12:53 +05:30
Sbh (Openerp) 9eb877fee5 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20120622084051-mu5wvb8ubinul6gb
bzr revid: sbh@tinyerp.com-20120625090342-b149ncajdnl4a3i6
2012-06-25 14:33:42 +05:30
Jigar Amin - OpenERP dfdbf8cf17 [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120625041316-rwtc4zf2pska9t5c
2012-06-25 09:43:16 +05:30
Quentin (OpenERP) c9ef276770 [REF] search views: removed filter_domain if only one element was inside + made some small usability changes
bzr revid: qdp-launchpad@openerp.com-20120622102959-fhc1oe2w8in8y6v2
2012-06-22 12:29:59 +02:00
Kuldeep Joshi (OpenERP) 3c50eb017a [IMP] set logging.getLogger(__name__)
bzr revid: kjo@tinyerp.com-20120622064854-5f6fss55k7305e8q
2012-06-22 12:18:54 +05:30
Purnendu Singh (OpenERP) 1c35eb1049 [MERGE] Mearge with main addons
bzr revid: psi@tinyerp.com-20120622055230-trqmxu7r1qtxa0ut
2012-06-22 11:22:30 +05:30
Thibault Delavallée 7ec35818bd [MERGE] Merged with mail-state-tde, recently updated with trunk.
bzr revid: tde@openerp.com-20120621153019-023jhxwu3zq9k2sx
2012-06-21 17:30:19 +02:00
Launchpad Translations on behalf of openerp 6e30c1323d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120621052527-r3t1oxcolviiii4x
2012-06-21 05:25:27 +00:00
Jigar Amin - OpenERP 21650f9790 [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120619093157-ay1hdzmp8yh8bfgz
2012-06-19 15:01:57 +05:30
Jigar Amin - OpenERP 1f54be8182 [MERGE] lp:~openerp-dev/openobject-addons/trunk-wiz-remove-btn-tools-tpa
bzr revid: jam@tinyerp.com-20120619090140-90laxckmkq19h9us
2012-06-19 14:31:40 +05:30
Thibault Delavallée da6c90c697 [MERGE] Merged with mail-state-tde, recently updated with trunk.
bzr revid: tde@openerp.com-20120619074603-6gr3chta7f4u2k4g
2012-06-19 09:46:03 +02:00
Purnendu Singh (OpenERP) 2e3728db21 [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120619050100-26hsypt5z491kbje
2012-06-19 10:31:00 +05:30
ajay javiya (OpenERP) 25bcae09f8 [REM] : Remove cancel button from wizard
bzr revid: aja@tinyerp.com-20120618124511-362td1pd82io8sxr
2012-06-18 18:15:11 +05:30
Purnendu Singh (OpenERP) 8e80119ac5 [MERGE] email_template: Merge a branch to update email template search view
bzr revid: psi@tinyerp.com-20120618071427-7uotdeqffegt32jx
2012-06-18 12:44:27 +05:30
Divyesh Makwana (Open ERP) dafb1992d7 [IMP] email_template : Improved the Search View.
bzr revid: mdi@tinyerp.com-20120618063739-8lc5v1qtpa0dr6fu
2012-06-18 12:07:39 +05:30
Divyesh Makwana (Open ERP) 7e1bbf696e [IMP] email_template : Improved the Search View.
bzr revid: mdi@tinyerp.com-20120618045341-dadyvs5qx233rye7
2012-06-18 10:23:41 +05:30
Turkesh Patel (Open ERP) 1a2735c7b2 [IMP] mail: remove cancel button and improved view of wizard.
bzr revid: tpa@tinyerp.com-20120615111732-pzquodtezhyfpakp
2012-06-15 16:47:32 +05:30
Atul Patel (OpenERP) f505fe0f63 [MERGE]: Merged lp:~openerp-commiter/openobject-addons/trunk-page-sheet-improvement-atp-sales_management_pos_crm_page_sheet_improve-pja
bzr revid: atp@tinyerp.com-20120615072926-o94hhqvlnvohfhq7
2012-06-15 12:59:26 +05:30
Thibault Delavallée 08813cc9d5 [MERGE] Merged wih main addons.
bzr revid: tde@openerp.com-20120611104147-gnqgnt51taq899su
2012-06-11 12:41:47 +02:00
Fabien Pinckaers 3c8643ce4c [IMP] better form views, new guidelines
bzr revid: fp@tinyerp.com-20120609143904-ydwqfyb54atbcpvw
2012-06-09 16:39:04 +02:00
Fabien Pinckaers 001d2e84c9 [IMP] form views
bzr revid: fp@tinyerp.com-20120607173007-1kihroun2dbacq1c
2012-06-07 19:30:07 +02:00
Amit Patel (OpenERP) 7d382f34d7 [IMP]:email_template:solved inheritance problem
bzr revid: apa@tinyerp.com-20120605073234-xtdjpdfwlcxpqk5v
2012-06-05 13:02:34 +05:30
Thibault Delavallée 6a16fd4a78 [MERGE] Merged with main addons.
bzr revid: tde@openerp.com-20120604080134-t1zg2sv0jpmhbyge
2012-06-04 10:01:34 +02:00
Ajay Chauhan (OpenERP) bdeb623399 [IMP]: resolved all conflicts
bzr revid: cha@tinyerp.com-20120530133024-ex0xf9142j8cn34o
2012-05-30 19:00:24 +05:30
Launchpad Translations on behalf of openerp 1227741b5a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120526050749-nakl3x59zsy0e3ln
bzr revid: launchpad_translations_on_behalf_of_openerp-20120527044006-4kmo9posveuumgsz
2012-05-27 04:40:06 +00:00
Ajay Chauhan (OpenERP) 47cc03c954 [MERGE] merge with main addons
bzr revid: cha@tinyerp.com-20120523111541-o1o60ncctasc5t41
2012-05-23 16:45:41 +05:30
Ajay Chauhan (OpenERP) 7418558d1d [IMP] : removed button from tree
bzr revid: cha@tinyerp.com-20120523110047-3403esloff9i98ki
2012-05-23 16:30:47 +05:30
Mayur Maheshwari (OpenERP) ea859f54c8 [IMP]all: remove a complexity in openerp and move asset management and Payroll in extra modules
bzr revid: mma@tinyerp.com-20120518052605-e6sdmicwtb4kcoq0
2012-05-18 10:56:05 +05:30
Launchpad Translations on behalf of openerp 420e45e139 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120511051518-305vmplvaiu2zncy
bzr revid: launchpad_translations_on_behalf_of_openerp-20120512054219-7jxlr0c1whe4vrob
bzr revid: launchpad_translations_on_behalf_of_openerp-20120513044345-ujj9bgbnd64gpfnz
bzr revid: launchpad_translations_on_behalf_of_openerp-20120514044358-vu4410a564766u5f
2012-05-14 04:43:58 +00:00
Thibault Delavallée 7a553f429b [MERGE] Merged with main addons.
bzr revid: tde@openerp.com-20120511124643-y1rsa0ouh3e6xq1k
2012-05-11 14:46:43 +02:00
Raphael Collet d08ad3bab3 [MERGE] trunk-some_typo (fix capitalization and typos in labels)
bzr revid: rco@openerp.com-20120510151939-fdadjh0rgll6uihr
2012-05-10 17:19:39 +02:00
Raphael Collet a327b7aed5 [IMP] adapt po files to label changes, to ease translations
bzr revid: rco@openerp.com-20120510130751-3vhhfbsmo45zitzx
2012-05-10 15:07:51 +02:00
Raphael Collet 1dcd32ec5e [IMP] email_template: fix capitalization in po files
bzr revid: rco@openerp.com-20120510075314-u9977nneo4rtad3t
2012-05-10 09:53:14 +02:00
Raphael Collet f8a6776092 [FIX] crm: rename fields optin, optout to opt_in, opt_out, to make them consistent with opt_out in res.partner (module email_template)
lp bug: https://launchpad.net/bugs/995986 fixed

bzr revid: rco@openerp.com-20120508074338-2dcayog3ebybfi22
2012-05-08 09:43:38 +02:00
Thibault Delavallée 5caa26fa26 [MERGE] Merged with main addons
bzr revid: tde@openerp.com-20120430082139-p0q9c33x63dnsul1
2012-04-30 10:21:39 +02:00
Mayur Maheshwari (OpenERP) c71446957f [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20120426091833-ocminkwzjkntdkde
2012-04-26 14:48:33 +05:30
Raphael Collet ac94300f0f [IMP] base_*, email_template, fetchmail, mail, import_*: remove group_extended
bzr revid: rco@openerp.com-20120425144258-jpb9xey20h7fq4tx
2012-04-25 16:42:58 +02:00
Mayur Maheshwari (OpenERP) 9e59ce8812 [IMP]all: Improve all typos
bzr revid: mma@tinyerp.com-20120424060532-ohrf0sxwq8rpq6ls
2012-04-24 11:35:32 +05:30
Launchpad Translations on behalf of openerp 869d9375d9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120421050113-mihw3po15423nlen
bzr revid: launchpad_translations_on_behalf_of_openerp-20120422044519-ij0it02kxvl7jm52
bzr revid: launchpad_translations_on_behalf_of_openerp-20120423044629-8fb2zo9nmi3e8grt
2012-04-23 04:46:29 +00:00
Thibault Delavallée 318ef517ab [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
2012-04-20 11:36:45 +02:00
Olivier Dony ee77b351b4 [MERGE] Latest fixes from 6.1
bzr revid: odo@openerp.com-20120322143654-w7etvdnq4z5tg6bt
2012-03-22 15:36:54 +01:00
Rucha Patel b3f2abec46 [FIX] email_template: ensure non-empty context when rendering template'
bzr revid: odo@openerp.com-20120322141153-8u3kia3k125et6b5
2012-03-22 15:11:53 +01:00
Rucha Patel cbef5ce396 [FIX] email_template: don't re-encode attachments copied from template'
bzr revid: odo@openerp.com-20120322141104-rw5i4dedy01wjmjf
2012-03-22 15:11:04 +01:00
Launchpad Translations on behalf of openerp dc6161c889 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120322062352-syfsimh3ol3vje45
2012-03-22 06:23:52 +00:00
Olivier Dony 5615911303 [MERGE] Latest bugfixes from 6.1
bzr revid: odo@openerp.com-20120320182912-g2ylze2qsqv93y4i
2012-03-20 19:29:12 +01:00
Christophe Simonis b7bad83c21 [FIX] email_template: report_name must be rendered
bzr revid: chs@openerp.com-20120316091517-e2hc8ydzd3vnnv3j
2012-03-16 10:15:17 +01:00
Olivier Dony 3e0279ac4a [FIX] email_template: attachments were not being sent due to programming error
bzr revid: odo@openerp.com-20120315155512-s76y2u3gz3awfy74
2012-03-15 16:55:12 +01:00
Launchpad Translations on behalf of openerp 5ebc07237a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120310052625-78n2341gtv2zrgwg
bzr revid: launchpad_translations_on_behalf_of_openerp-20120311050634-9ftgr94cy2tvp9y5
bzr revid: launchpad_translations_on_behalf_of_openerp-20120312051214-q1f14seqal4j8rn5
bzr revid: launchpad_translations_on_behalf_of_openerp-20120310052733-s24jj1qyoxy2j8lz
bzr revid: launchpad_translations_on_behalf_of_openerp-20120311050659-0ky4089nbil85weg
bzr revid: launchpad_translations_on_behalf_of_openerp-20120312051227-90mlbjgzqjyj8a8a
2012-03-12 05:12:27 +00:00
Olivier Dony d55eff4218 [FIX] email.template: body_html should be translatable
bzr revid: odo@openerp.com-20120309160625-kwp4pof4vm7aci2g
2012-03-09 17:06:25 +01:00
Olivier Dony eefbb2ac5c [FIX] email_template: care for missing context
bzr revid: odo@openerp.com-20120309011156-q53pc4h6stlz3kq2
2012-03-09 02:11:56 +01:00
Launchpad Translations on behalf of openerp f6c3cd9bb7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120306052805-zlaw3c4skc81oj8z
bzr revid: launchpad_translations_on_behalf_of_openerp-20120307060413-fvlney19la4wjhqn
bzr revid: launchpad_translations_on_behalf_of_openerp-20120307060421-haf4qy1x6vu5xdrx
2012-03-07 06:04:21 +00:00
Launchpad Translations on behalf of openerp 79ff7b620a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120306044843-9a70e0z9fqoy4v3f
2012-03-06 04:48:43 +00:00
Numerigraphe - Lionel Sausin 2d2a44dcf2 [FIX] unmutable default in the remaining modules
[REF] coding style consistency

lp bug: https://launchpad.net/bugs/525808 fixed

bzr revid: ls@numerigraphe.fr-20120305184003-er00xtj9vtcw7gna
2012-03-05 19:40:03 +01:00
Launchpad Translations on behalf of openerp f210e73f21 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120225055251-o6ajm1k0ya17sd2j
bzr revid: launchpad_translations_on_behalf_of_openerp-20120226052201-liykx2ue4jufkcwc
bzr revid: launchpad_translations_on_behalf_of_openerp-20120227055617-7bb3evbppqedlx8p
bzr revid: launchpad_translations_on_behalf_of_openerp-20120228063037-0nhyn4iid36dorfs
2012-02-28 06:30:37 +00:00
Launchpad Translations on behalf of openerp a3ac698fe8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120218071328-fl3yjw2gawigfooh
bzr revid: launchpad_translations_on_behalf_of_openerp-20120219063344-7w5y8nkweukg0f88
bzr revid: launchpad_translations_on_behalf_of_openerp-20120220061321-0z254064e8vsx286
bzr revid: launchpad_translations_on_behalf_of_openerp-20120221063558-wc526qfv4ko5s6q0
bzr revid: launchpad_translations_on_behalf_of_openerp-20120221063603-medp0cjt2z5vy70x
2012-02-21 06:36:03 +00:00
Launchpad Translations on behalf of openerp 88c25488a5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120218050004-fsjgcm68ejwkyila
bzr revid: launchpad_translations_on_behalf_of_openerp-20120219054401-1933r0e5ukykqh0h
bzr revid: launchpad_translations_on_behalf_of_openerp-20120220054126-hug47vk8c43pxbqk
bzr revid: launchpad_translations_on_behalf_of_openerp-20120221055612-pdqteum51dyapu2e
2012-02-21 05:56:12 +00:00
Launchpad Translations on behalf of openerp 9f65e1565e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120217050201-xlguleciidhnkxln
bzr revid: launchpad_translations_on_behalf_of_openerp-20120217051344-6opxazcgg875mypq
2012-02-17 05:13:44 +00:00
Launchpad Translations on behalf of openerp 2094148de5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120216050419-fgzhvlogc71u42qe
bzr revid: launchpad_translations_on_behalf_of_openerp-20120216050718-lf9hgvr1p33jpm2h
bzr revid: launchpad_translations_on_behalf_of_openerp-20120216052148-ta5bwtqg3bzmvp3i
2012-02-16 05:21:48 +00:00
Launchpad Translations on behalf of openerp 74b3b0bc69 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120214054303-2gawtr1s4zulhhhs
bzr revid: launchpad_translations_on_behalf_of_openerp-20120214054630-925y7kotw7axa7z4
bzr revid: launchpad_translations_on_behalf_of_openerp-20120214061906-2g5kxwe0xle5u54c
2012-02-14 06:19:06 +00:00
Olivier Dony 16a8811930 [IMP] mail,email_template: improved views, assert missing email_from
- add missing colspans for notebooks
- remove some buttons from mail.message form view,
  namely because send button can cause record deletion
  possibly causing some weird UI result.. better used
  from the list view for now (web was fixed anyway)
- better domain on Message action, to ease debugging
- added assert for email_from in email_template.send_email()
  to catch errors earlier

bzr revid: odo@openerp.com-20120213143531-eiuhulo46bv059pl
2012-02-13 15:35:31 +01:00
Launchpad Translations on behalf of openerp 2aa2378015 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120211050953-f8t9zos3qjzmnj3t
bzr revid: launchpad_translations_on_behalf_of_openerp-20120212044319-nxuw0h7g5aqrqy4s
bzr revid: launchpad_translations_on_behalf_of_openerp-20120213045042-jyku2inv3wkcae91
2012-02-13 04:50:42 +00:00
Launchpad Translations on behalf of openerp 5d4664f823 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120210044704-ffxh1ikqgom660lz
bzr revid: launchpad_translations_on_behalf_of_openerp-20120210045028-kbviilp8xdby42fi
2012-02-10 04:50:28 +00:00
Launchpad Translations on behalf of openerp 0e2e9ddd78 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120209055558-qfwy9bg1km791dys
bzr revid: launchpad_translations_on_behalf_of_openerp-20120209071015-0jykfhbo8iamzpzk
bzr revid: launchpad_translations_on_behalf_of_openerp-20120209072746-stmwycdircyzrxn4
2012-02-09 07:27:46 +00:00
Carlos Vásquez 3afecc7604 [ADD] es_CR.po: added po to all modules, copy from es.po or from pot
bzr revid: carlos.vasquez@clearcorp.co.cr-20120208145917-aaai0irh68omlzmb
2012-02-08 08:59:17 -06:00
Launchpad Translations on behalf of openerp 320b2d2e2e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120208060921-wir47e717rh04xxn
bzr revid: launchpad_translations_on_behalf_of_openerp-20120208063913-vg9qdu30tx09ojrl
2012-02-08 06:39:13 +00:00
Olivier Dony 0a63ecb0cf [I18N] all: updated translation template
This should be the last major template sync
before the final release of 6.1.

bzr revid: odo@openerp.com-20120208010830-zchnkg48u7s40nw2
2012-02-08 02:08:30 +01:00
Vo Minh Thu ad4b6fcc21 [IMP] manifest: renamed active to auto_install.
bzr revid: vmt@openerp.com-20120130101837-zyebtyhfjypg2b4w
2012-01-30 11:18:37 +01:00
Launchpad Translations on behalf of openerp ffbff476df Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120128050312-sep3uryazw4j1xz6
bzr revid: launchpad_translations_on_behalf_of_openerp-20120129052156-67wqllfafijp6h1m
bzr revid: launchpad_translations_on_behalf_of_openerp-20120130044112-h04p0g5ne16y1nav
bzr revid: launchpad_translations_on_behalf_of_openerp-20120128050513-ncpdbsqyyk18pc67
bzr revid: launchpad_translations_on_behalf_of_openerp-20120129052226-dfcf7sm2r00y1s3s
bzr revid: launchpad_translations_on_behalf_of_openerp-20120130044131-sdsyvt62gvyzo0e3
2012-01-30 04:41:31 +00:00
Olivier Dony a4a36695c7 [IMP] email_template: use button name as action name
The action name is what gets displayed in the sidebar
and there is no reason to have a different name for
the action and button anyway.

lp bug: https://launchpad.net/bugs/886144 fixed

bzr revid: odo@openerp.com-20120125174249-wxor3br5xbqtluld
2012-01-25 18:42:49 +01:00
Olivier Dony f0fdfc450c [MERGE] email_template: correctly pass template id via context
This fixes the sidebar action buttons that
are supposed to open a given template, but
actually opened an empty form

lp bug: https://launchpad.net/bugs/915372 fixed
lp bug: https://launchpad.net/bugs/886144 fixed

bzr revid: odo@openerp.com-20120125173403-dit8zp3ggalajdhq
2012-01-25 18:34:03 +01:00
Raphael Collet c071dd8fc1 [MERGE] lp:917516 (email_template: fix layout of some views)
bzr revid: rco@openerp.com-20120125131528-ota5w60jb6me8m2o
2012-01-25 14:15:28 +01:00
tfr@openerp.com dde2a5766f [FIX] auto populate Wizard while clicking on email template
lp bug: https://launchpad.net/bugs/886144 fixed

bzr revid: tfr@openerp.com-20120118164943-4u1c79bzeqakizua
2012-01-18 17:49:43 +01:00
Olivier Dony f1dc3773b8 [FIX] email_template: properly pass target model in composition wizard reloading action
This fixes reloading of the composition wizard after selecting
templating options in the new web client.

lp bug: https://launchpad.net/bugs/886144 fixed

bzr revid: odo@openerp.com-20120118162203-17d1tug4lw40wpex
2012-01-18 17:22:03 +01:00
Vishal Parmar 04c98a8a99 [FIX] email_template: set colspan
lp bug: https://launchpad.net/bugs/917516 fixed

bzr revid: kjo@tinyerp.com-20120117105116-yc8eo5ij0d2owo1v
2012-01-17 16:21:16 +05:30
Launchpad Translations on behalf of openerp 5b10b7022d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120115052053-qy9rgrxe745vw4zw
bzr revid: launchpad_translations_on_behalf_of_openerp-20120116051929-9hq3xgbkj3t90wvt
bzr revid: launchpad_translations_on_behalf_of_openerp-20120114054042-idria8u0iiizg9xu
bzr revid: launchpad_translations_on_behalf_of_openerp-20120115053522-rki2r1zjt8544t0c
bzr revid: launchpad_translations_on_behalf_of_openerp-20120116052722-mb4w266h2j8som8q
2012-01-16 05:27:22 +00:00
Launchpad Translations on behalf of openerp d68dd46a65 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120107052107-owlh11bgcy0oh2pg
bzr revid: launchpad_translations_on_behalf_of_openerp-20120108050411-no4cbjgpimxjbvq7
bzr revid: launchpad_translations_on_behalf_of_openerp-20120109045058-isf848e523hr6ome
2012-01-09 04:50:58 +00:00
fp 8aff5209ea [IMP] improved error message, constraints must allways propose a solution
bzr revid: fp@fp-laptop-20111231075720-4kak7o320td4wxqc
2011-12-31 08:57:20 +01:00
Launchpad Translations on behalf of openerp a6c649dd4e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20111223054503-il515335tdfkghbw
bzr revid: launchpad_translations_on_behalf_of_openerp-20111223073609-mpe8e232ykba47y0
2011-12-23 07:36:09 +00:00
Olivier Dony cb28f8de07 [I18N] all: update translation templates
bzr revid: odo@openerp.com-20111222185539-9gn06tu38ynoc416
2011-12-22 19:55:39 +01:00
Launchpad Translations on behalf of openerp 8e2457efe8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20111220045056-kxmsczkxkgf5ffe1
bzr revid: launchpad_translations_on_behalf_of_openerp-20111220045629-sx3btepqeei2nq1k
2011-12-20 04:56:29 +00:00
Fabien Pinckaers 9c69c1c0c9 [IMP] group_by on mail servers
bzr revid: fp@tinyerp.com-20111219230020-mhpopbczuo0y677y
2011-12-20 00:00:20 +01:00
Fabien Pinckaers f27318c8af [IMP] Security Rule: removed duplicates due to inheritancies of groups
bzr revid: fp@tinyerp.com-20111212181113-mhnnbps3ip8ls6pp
2011-12-12 19:11:13 +01:00
Fabien Pinckaers 81c1bf7fcb [IMP] better manifests for modules
bzr revid: fp@tinyerp.com-20111212142244-cm6e3um1adizu3kz
2011-12-12 15:22:44 +01:00
Vo Minh Thu ff22d6eca9 [FIX] clean some warnings.
bzr revid: vmt@openerp.com-20111206142130-y2nu8bx6jzjviojk
2011-12-06 15:21:30 +01:00
Kuldeep Joshi (OpenERP) 506a69d3b5 [FIX] email_template: change tree and search view by adding mail_server_id field
lp bug: https://launchpad.net/bugs/900239 fixed

bzr revid: kjo@tinyerp.com-20111206060837-2av5qo1eyv4f0w69
2011-12-06 11:38:37 +05:30
Olivier Dony 8f61212ad6 [MERGE] Missing modelines, requested and provided by Lionel Sausin (Numerigraphe)
bzr revid: odo@openerp.com-20111124155058-le9vg75rik4pl0xa
2011-11-24 16:50:58 +01:00
Numerigraphe - Lionel Sausin 779fa653c1 [IMP] Added missing vim mode lines
lp bug: https://launchpad.net/bugs/524279 fixed

bzr revid: ls@numerigraphe.fr-20111122085138-x6u2lcl6vrpyybp9
2011-11-22 09:51:38 +01:00
Olivier Dony ec9f0d49a8 [MERGE] sync w/ latest trunk
bzr revid: odo@openerp.com-20111116134336-ig6681v2cw6xfb6h
2011-11-16 14:43:36 +01:00
Fabien Pinckaers 6cbf19d815 [Merge] es_MX from Vauxoo
bzr revid: fp@tinyerp.com-20111111144930-5o37idpxdvyhtfri
2011-11-11 15:49:30 +01:00
Olivier Dony 06046f46ad [MERGE] sync w/ latest trunk
bzr revid: odo@openerp.com-20111105140205-34f3hrpyvsiv4o2e
bzr revid: odo@openerp.com-20111105165051-dxyhea1ry93516mw
bzr revid: odo@openerp.com-20111107121624-fummc56927uz6t3p
2011-11-07 13:16:24 +01:00
Launchpad Translations on behalf of openerp 6f77ce98c7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20111105055805-1lmgpe8dot0mqkd3
bzr revid: launchpad_translations_on_behalf_of_openerp-20111105060437-gd0ilsg6cdytkvq2
2011-11-05 06:04:37 +00:00
Olivier Dony 1327b45c6a [IMP] edi,email: moved mail menus to avoid using Tools top-level
Application-specific templates should be accessible
from the application's configutation menu, and the
rest should go to the Administration menu

bzr revid: odo@openerp.com-20111105015922-m7r2de9pux5k6pg9
2011-11-05 02:59:22 +01:00