Thibault Delavallée
bec83eef6f
[REF] mail_mail: body_html is back, holding the body of emails to send.
...
Body of send emails is mail_mail.body_html, not body anymore.
Signature adding is back to mail_followers.notify().
Subject adding is still done just before sending.
Updated mail_mail view. mail.compose.message: body_text inside <pre>.
[TESTS] mail: added tests for message_post, updated tests for mail.message.compose to test the composer only.
bzr revid: tde@openerp.com-20120830085116-o5h13yqodt0vof0k
2012-08-30 10:51:16 +02:00
pso (OpenERP)
ecb67b4b81
[MERGE] Merged with main branch
...
bzr revid: pso@tinyerp.com-20120830084954-jneto8bxd6hjf8e6
2012-08-30 14:19:54 +05:30
Xavier Morel
41240706e7
[MERGE] trunk updates
...
bzr revid: xmo@openerp.com-20120830082547-qw3vsnw60e91if4c
2012-08-30 10:25:47 +02:00
Fabien Pinckaers
1c7213ab41
imp
...
bzr revid: fp@tinyerp.com-20120830075118-39gdhfw1zhnc6lqk
2012-08-30 09:51:18 +02:00
Fabien Pinckaers
8b0f2cfd71
[IMP] cleaning project/contracts and removing unused code
...
bzr revid: fp@tinyerp.com-20120830074903-m8yiovofd2891p7i
2012-08-30 09:49:03 +02:00
a96751985e
[MERGE] Merged trunk-autosize-textarea-pso
...
bzr revid: vta@openerp.com-20120830074821-tm99gmsw3e7n93z1
2012-08-30 09:48:21 +02:00
Mustufa Rangwala (OpenERP)
b30cedc677
[MERGE] l10n_in_hr_payroll: Python code on salary rule format
...
bzr revid: mra@tinyerp.com-20120830072358-d98lg6o4ncstlvl2
2012-08-30 12:53:58 +05:30
baf572ae1c
[FIX] Fixed resize after sending.
...
bzr revid: vta@openerp.com-20120830072024-004ingk1ourozupn
2012-08-30 09:20:24 +02:00
Mustufa Rangwala (OpenERP)
eb8a8906f0
[MERGE] merge from main trunk addons
...
bzr revid: mra@tinyerp.com-20120829123043-qrx1poqa41nj79q7
bzr revid: mra@tinyerp.com-20120830071713-53bp6apq6j11latw
2012-08-30 12:47:13 +05:30
e2d9e9e2f7
[MERGE] Merged latest trunk.
...
bzr revid: vta@openerp.com-20120830070501-qy3am8pj7q3xm0oi
2012-08-30 09:05:01 +02:00
Mayur Maheshwari (OpenERP)
b185760c7b
[IMP]stock : added a new filed type for set a location in or out and make a onchane & default method for it and set action of moves for its view
...
bzr revid: mma@tinyerp.com-20120830065255-ogmp9xytwd3kr8f8
2012-08-30 12:22:55 +05:30
Amit Patel (OpenERP)
253325f488
[MERGE]
...
bzr revid: apa@tinyerp.com-20120830064010-zqp6nqlapw5lqhb6
2012-08-30 12:10:10 +05:30
Amit (OpenERP)
cd3db05409
[FIX] account : Fixes the account privileges problem on account template
...
lp bug: https://launchpad.net/bugs/1043509 fixed
bzr revid: amp@tinyerp.com-20120830063642-4b2gpneog4whw3ub
2012-08-30 12:06:42 +05:30
Foram Katharotiya (OpenERP)
0135c779a8
[IMP] Improve code in project demo
...
bzr revid: fka@tinyerp.com-20120830062948-llta7r2pc2ezbjij
2012-08-30 11:59:48 +05:30
Khushboo Bhatt (Open ERP)
eb57fb1503
[FIX]l10n_in_hr_payroll:python code for rules
...
bzr revid: kbh@tinyerp.com-20120830054908-7j6vydmwwfzsoned
2012-08-30 11:19:08 +05:30
pso (OpenERP)
83bb1753ac
[IMP] Improved code to write default company currency into the pricelists
...
bzr revid: pso@tinyerp.com-20120830053856-uzsqy4usnp1widvo
2012-08-30 11:08:56 +05:30
cba457edb9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828100939-57o3hlwidhig7fkm
bzr revid: launchpad_translations_on_behalf_of_openerp-20120830052616-lctzwyi167hu5gs3
2012-08-30 05:26:16 +00:00
b065d54d96
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120830051221-904da3tt7dpfmhlx
2012-08-30 05:12:21 +00:00
Foram Katharotiya (OpenERP)
837cb65e30
[MERGE] Merge with parent branch
...
bzr revid: fka@tinyerp.com-20120830051147-rnykvglqlg3tr5e0
2012-08-30 10:41:47 +05:30
Amit Patel (OpenERP)
f6a1567ed1
[MERGE]
...
bzr revid: apa@tinyerp.com-20120830050811-n0pdxdbvg2ezelmc
2012-08-30 10:38:11 +05:30
Atul Patel (OpenERP)
a3004d489a
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120824090649-ox0mg96nt781sj6u
bzr revid: atp@tinyerp.com-20120827044113-rdfz9y0fp85xgt67
bzr revid: atp@tinyerp.com-20120829045255-7h3p24xh37hkxhq1
bzr revid: atp@tinyerp.com-20120830044301-a5oay3ahmpq823si
2012-08-30 10:13:01 +05:30
Fabien Pinckaers
6e943465be
imp_css
...
bzr revid: fp@tinyerp.com-20120829191243-zmgsqb8twjcwzx02
2012-08-29 21:12:43 +02:00
Fabien Pinckaers
254489e168
[IMP] analytic contracts
...
bzr revid: fp@tinyerp.com-20120829190831-f6n1ruzsca2bo8xc
2012-08-29 21:08:31 +02:00
Fabien Pinckaers
d0261477f8
[IMP] CSS improvement
...
bzr revid: fp@tinyerp.com-20120829190819-gl2q4d0d0xsbh2l3
2012-08-29 21:08:19 +02:00
Olivier Dony
d8c65aa88e
[IMP] mail.notification: simplify model creation + some lint cleanup
...
No need for extra constraints/defaults, in OpenERP
boolean values are `true` and `not true` (false/NULL).
This seems to work well with db indexes too.
bzr revid: odo@openerp.com-20120829164614-9kqrownb7q4vzrjc
2012-08-29 18:46:14 +02:00
Minh Tran
1fbec3ca40
merge from mit-trunk
...
bzr revid: mit@openerp.com-20120829164028-5wuckgc6ozhd9s38
2012-08-29 18:40:28 +02:00
Antony Lesuisse
12dd1aaca1
[MERGE] pad working no conversion yet
...
bzr revid: al@openerp.com-20120829160430-v6gou8uu5ldwyd6v
2012-08-29 18:04:30 +02:00
Olivier Dony
bc74fc920c
[MERGE] Rebase incorrect top-level merge of pad/wiki refactoring + extra merge of product form simplification
...
To be completed by an extra merge containing the remaining
work-in-progress stuff of pad/wiki refactoring.
bzr revid: odo@openerp.com-20120829155400-memirrjghutw5pl7
2012-08-29 17:54:00 +02:00
Stephane Wirtel
7d120eb1d1
[FIX] point_of_sale: Set the right balance end for a bank statement
...
[FIX] point_of_sale: Show/Hide some tabs
bzr revid: stw@openerp.com-20120829154634-ko3v2bi6oephr04e
2012-08-29 17:46:34 +02:00
Minh Tran
3053d26382
fixed project_timesheet with the new project xml
...
bzr revid: mit@openerp.com-20120829154535-z3qr72o9usnt9piv
2012-08-29 17:45:35 +02:00
Fabien Meghazi
ba7aee832d
[IMP] Support for classnames in m2o autocomplete
...
Also improved readability of code
bzr revid: fme@openerp.com-20120829153756-7b3lq5lan6b97chy
2012-08-29 17:37:56 +02:00
Benoit Guillot
e6f172b66d
[FIX] fix typo
...
bzr revid: benoit.guillot@akretion.com.br-20120829153448-i4ek7jny5hqgid1a
2012-08-29 17:34:48 +02:00
Thibault Delavallée
9b6379462b
[REF] mail_mail: cool and clean refactoring of the models.
...
Removed body_html and content_subtype fields. We now entirely
rely on the body field, that holds sanitized HTML.
Added a user_signature field from email_template. mail_mail.send()
is now responsible of adding the signature on emails.
mail_notification.notify() sets the user_signature flag on
emails send for notifciations.
mail_mail.send() is responsible of adding a default subject
on emails send if there is no subject on the mail.message,
and res_id and model are set.
purchase_requisition: removed an override of mail.message
schedule_with_attach.
bzr revid: tde@openerp.com-20120829150002-v8t581oesnw0rhvl
2012-08-29 17:00:02 +02:00
Antonin Bourguignon
fd4178ee58
[IMP] auth_signup: better ids for the config_parameter record
...
bzr revid: abo@openerp.com-20120829143453-vn6l5b1c8kcvxqgj
2012-08-29 16:34:53 +02:00
Raphael Collet
3b2423c5da
[IMP] ir.ui.view: filter inheriting views based on groups
...
bzr revid: rco@openerp.com-20120829133732-ijyy3y05mlbazgya
2012-08-29 15:37:32 +02:00
Antonin Bourguignon
eb66436083
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120828171936-upwug8lze2anni7l
bzr revid: abo@openerp.com-20120829093255-01m8hy8c7pccol73
bzr revid: abo@openerp.com-20120829133240-zn21qghw0zp1ungw
2012-08-29 15:32:40 +02:00
Bhumi Thakkar (Open ERP)
26a2b7378d
[IMP] Remove 'message_email_pref' field.
...
bzr revid: bth@tinyerp.com-20120829132420-9c2mqv2pzg10z0co
2012-08-29 18:54:20 +05:30
pso (OpenERP)
192a5ed4a0
[MERGE] Merged PNA's branch to write new currency into demo pricelist
...
bzr revid: pso@tinyerp.com-20120829132209-v17f20ffvvyoesly
2012-08-29 18:52:09 +05:30
Foram Katharotiya (OpenERP)
aa9fa89423
[IMP] improve demo data of crm and add demo data in project
...
bzr revid: fka@tinyerp.com-20120829131532-vpvaaq0mbwdfktyk
2012-08-29 18:45:32 +05:30
Frédéric van der Essen
93395ac1ec
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120829125759-mjulntnmsyjzs0xq
2012-08-29 14:57:59 +02:00
Frédéric van der Essen
1eedcaedad
[IMP] point_of_sale: TODO changes
...
bzr revid: fva@openerp.com-20120829125640-5bml13zupja3w30b
2012-08-29 14:56:40 +02:00
Harry (OpenERP)
20eb0a5e88
[FIX] account: refactor js of account_reconciliation
...
bzr revid: hmo@tinyerp.com-20120829124303-8kw2jz4x4p2jr64u
2012-08-29 18:13:03 +05:30
Antony Lesuisse
588f233f15
wip part1 (no setHTML) working
...
bzr revid: al@openerp.com-20120829123833-4b9kp33d9ne2gyom
2012-08-29 14:38:33 +02:00
Raphael Collet
750165e94d
[MERGE] trunk-ir_ui_view_access_rights-mdi (add field groups_id on views)
...
bzr revid: rco@openerp.com-20120829123539-5m718m71c8o06ujz
2012-08-29 14:35:39 +02:00
Stephane Wirtel
6aded504b3
[FIX] point_of_sale: redefine the copy function for the pos.config to avoid a copy of the sequence.
...
[IMP] point_of_sale: Associate a default category for the existing products.
bzr revid: stw@openerp.com-20120829122501-xta26dk5bbav36zz
2012-08-29 14:25:01 +02:00
Mustufa Rangwala (OpenERP)
95c0fec699
[MERGE] l10n_in_hr_payroll: Improve salary rules
...
bzr revid: mra@tinyerp.com-20120829121912-rhsuygls3ot6yn9s
2012-08-29 17:49:12 +05:30
Fabien Meghazi
6e80e425d1
[IMP] Use 'open' action in kanban views
...
bzr revid: fme@openerp.com-20120829114847-dzvqs8gaas03ma5b
2012-08-29 13:48:47 +02:00
Fabien Meghazi
d78cd0a57d
[IMP] Use 'open' action in kanban views
...
bzr revid: fme@openerp.com-20120829114753-s0rhr2jcb7qlvvfp
2012-08-29 13:47:53 +02:00
Fabien Meghazi
848c16e6d0
[ADD] Added 'open' action to kanban card links
...
bzr revid: fme@openerp.com-20120829114713-kj9c0vsxtn504li3
2012-08-29 13:47:13 +02:00
Thibault Delavallée
1d131bae84
[RENAME] mail: res.partner: renamed notification_email_pref into notification_email_send, because this pref suffix is very ugly.
...
bzr revid: tde@openerp.com-20120829114424-fznd0ujsqnk1hve7
2012-08-29 13:44:24 +02:00
Thibault Delavallée