Antony Lesuisse
5fc754b5d3
[MERGE] manually merge customizable web logo, by chs
...
bzr revid: al@openerp.com-20121215192606-9p66tpo1f4344e20
2012-12-15 20:26:06 +01:00
Antony Lesuisse
6d4b753632
[FIX] res.partner.address missing line from merge
...
bzr revid: al@openerp.com-20121215191540-ldo8blfy2lud56if
2012-12-15 20:15:40 +01:00
Antony Lesuisse
0a35f78974
[MERGE] remove res.partner.address by chs
...
it also removes an ugly hack in the orm.
bzr revid: al@openerp.com-20121215182836-y15v2mwgdg9wyubi
2012-12-15 19:28:36 +01:00
Antony Lesuisse
f332548205
[MERGE] remove res.partner.address by chs
...
bzr revid: al@openerp.com-20121215182645-a45w9ydn56rzmsty
2012-12-15 19:26:45 +01:00
Fabien Pinckaers
9651852c7c
[MERGE] product_margin
...
bzr revid: fp@tinyerp.com-20121215182355-pmmdmb5uezejgk4a
2012-12-15 19:23:55 +01:00
Fabien Pinckaers
1b33e7488a
[IMP] revert bad commit l10n_ro
...
bzr revid: fp@tinyerp.com-20121215181544-geuk2fldpykwcxbg
2012-12-15 19:15:44 +01:00
Fabien Pinckaers
fd002daed5
[MERGE] mrp byprodyct with uom conversion
...
bzr revid: fp@tinyerp.com-20121215180313-tc367avv1rl4bsj6
2012-12-15 19:03:13 +01:00
Fabien Pinckaers
9c090f63a2
[MERGE] missing sxw file
...
bzr revid: fp@tinyerp.com-20121215175213-znlkz1rnot3zf0e9
2012-12-15 18:52:13 +01:00
Fabien Pinckaers
769a275158
fix
...
bzr revid: fp@tinyerp.com-20121215175033-1hr5un0gk1b4qxmw
2012-12-15 18:50:33 +01:00
Fabien Pinckaers
a9b2569219
[MERGE] duplicate of lots
...
bzr revid: fp@tinyerp.com-20121215174743-uwadx7l92s5h0wal
2012-12-15 18:47:43 +01:00
Fabien Pinckaers
1aae18691f
[IMP] l10n_ro account type
...
bzr revid: fp@tinyerp.com-20121215174305-a3q62cgxkx4z3vax
2012-12-15 18:43:05 +01:00
Fabien Pinckaers
3799863eda
[MERGE] fix invoice state for refunds
...
bzr revid: fp@tinyerp.com-20121215173711-hw4expisg9i0su8f
2012-12-15 18:37:11 +01:00
Fabien Pinckaers
e45ce2e846
[MERGE] fix timeshet user report
...
bzr revid: fp@tinyerp.com-20121215172837-haxqsk93eosw311y
2012-12-15 18:28:37 +01:00
Fabien Pinckaers
160cafa249
[MERGE] fix: do not reinvoice customer invoices
...
bzr revid: fp@tinyerp.com-20121215171202-841po7g5xjqgmwy7
2012-12-15 18:12:02 +01:00
Fabien Pinckaers
67bdf29938
[IMP] date invoice in sale
...
bzr revid: fp@tinyerp.com-20121215170559-6qq3xwawj0p1bies
2012-12-15 18:05:59 +01:00
Fabien Pinckaers
2bcf2bcec0
[FIX] empty lists
...
bzr revid: fp@tinyerp.com-20121215165929-kqaz4dpuk2z4zy46
2012-12-15 17:59:29 +01:00
Fabien Pinckaers
da2054e7a7
[MERGE] fix in warning
...
bzr revid: fp@tinyerp.com-20121215165510-cn0ps21rfwrtz22l
2012-12-15 17:55:10 +01:00
Fabien Pinckaers
6028d39466
[IMP] analytic account not required on budgets
...
bzr revid: fp@tinyerp.com-20121215164718-yodnoep77obff2ul
2012-12-15 17:47:18 +01:00
Fabien Pinckaers
16b00196d1
[MERGE] unpaid invoices from journal, clean domain
...
bzr revid: fp@tinyerp.com-20121215164449-ddocbdolel5ufyb8
2012-12-15 17:44:49 +01:00
Fabien Pinckaers
e6478eb9f1
[MERGE] fix base_calendar
...
bzr revid: fp@tinyerp.com-20121215163556-dunic7yj2yoa7av9
2012-12-15 17:35:56 +01:00
Fabien Pinckaers
070d39bf2f
[MERGE] fix in report designer with no admin rights
...
bzr revid: fp@tinyerp.com-20121215163323-wspya3a5i7lrey4t
2012-12-15 17:33:23 +01:00
Fabien Pinckaers
5449102e85
[MERGE] improved email for contract renewal if no phone number
...
bzr revid: fp@tinyerp.com-20121215163204-0k0gzws8c8kjc9s4
2012-12-15 17:32:04 +01:00
Fabien Pinckaers
29421ba8a0
[MERGE] clean invoice view from mrp_repair
...
bzr revid: fp@tinyerp.com-20121215163101-m1pkeca4bdk4557j
2012-12-15 17:31:01 +01:00
Fabien Pinckaers
1b966e5bfd
[MERGE] translated terms in share wizard
...
bzr revid: fp@tinyerp.com-20121215162857-9ai03h2nedmfvrag
2012-12-15 17:28:57 +01:00
Fabien Pinckaers
24ad388ccc
[MERGE] fix in hr leave report
...
bzr revid: fp@tinyerp.com-20121215162615-sfrwcy66xw7tfcm1
2012-12-15 17:26:15 +01:00
Fabien Pinckaers
d9b7d8155e
[IMP] multi-currency stuff
...
bzr revid: fp@tinyerp.com-20121215162309-yav3g8hu50bp9wvv
2012-12-15 17:23:09 +01:00
Fabien Pinckaers
eabbbd247b
[IMP] typo
...
bzr revid: fp@tinyerp.com-20121215133047-n2t7q58gckfbjfci
2012-12-15 14:30:47 +01:00
Fabien Pinckaers
4ae90a7206
[IMP] fancy note by default
...
bzr revid: fp@tinyerp.com-20121215130053-4q72g3z2nvu6h7zq
2012-12-15 14:00:53 +01:00
Fabien Pinckaers
b0cb3ed3fe
[IMP] small css fixes
...
bzr revid: fp@tinyerp.com-20121215125849-0gtgfjpmnnwdkjrb
2012-12-15 13:58:49 +01:00
Fabien Pinckaers
ecb085fff6
[IMP] project form view save space for etherpad
...
bzr revid: fp@tinyerp.com-20121215121549-gh6baznv34isvy18
2012-12-15 13:15:49 +01:00
Fabien Pinckaers
52ba63d94a
[IMP] css modifs
...
bzr revid: fp@tinyerp.com-20121215110829-u3nahqtwckg0qxjx
2012-12-15 12:08:29 +01:00
Fabien Pinckaers
bdc7dcd539
[IMP] CSS of etherpad
...
bzr revid: fp@tinyerp.com-20121215110758-3ahwmk20uh5kt6g7
2012-12-15 12:07:58 +01:00
Fabien Pinckaers
b8008dc7e4
[IMP] better thumbnail generation
...
bzr revid: fp@tinyerp.com-20121215104647-p4xnj04v5hxdz5wb
2012-12-15 11:46:47 +01:00
Fabien Pinckaers
1be0da09b3
[FIX] project small stuff: star, search on tags, #documents
...
bzr revid: fp@tinyerp.com-20121215101227-jb4z7hu57p2q11b4
2012-12-15 11:12:27 +01:00
809c92fdef
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121214053618-1gz9xun2cb10afle
bzr revid: launchpad_translations_on_behalf_of_openerp-20121215050358-th0pl9jeams3pwkr
bzr revid: launchpad_translations_on_behalf_of_openerp-20121215050620-y27swfcuh62k8u32
bzr revid: launchpad_translations_on_behalf_of_openerp-20121215051723-6cnx1julk94gkm66
2012-12-15 05:17:23 +00:00
Christophe Simonis
c4e89c651a
[FIX] hr_attendance: do not show slider widget if user is not an employee
...
bzr revid: chs@openerp.com-20121214155430-h6u3l9jlutm1dclw
2012-12-14 16:54:30 +01:00
Christophe Simonis
2c8f4f7572
[FIX] hr_attendance: invert condition
...
bzr revid: chs@openerp.com-20121214155225-olze66svgx4hwqvg
2012-12-14 16:52:25 +01:00
Xavier Morel
d6087e208f
[FIX] flow control annoyances
...
bzr revid: xmo@openerp.com-20121214152957-izvuo2u0uvpuv2ho
2012-12-14 16:29:57 +01:00
Christophe Simonis
539af8a8f0
[FIX] hr_attendance: check the user is an employee by checking if (s)he belongs to the "Employee" group
...
bzr revid: chs@openerp.com-20121214152453-tvtjuvvmefw9qcrp
2012-12-14 16:24:53 +01:00
Christophe Matthieu
d9e7ed7472
[FIX] note: remove double set stage (sequence=1) for set_stage_per_user. Add set on list.
...
bzr revid: chm@openerp.com-20121214145659-flkusegza64o9n04
2012-12-14 15:56:59 +01:00
Thibault Delavallée
1b800a75a4
[MERGE] Mail/Portal fixes and tests.
...
Mail: fixes
- fixed employee user not allowed to invite people on documents (see bug lp:1075501)
- fixed a crash using email template in mass_mail mode without choosing a template (see bug lp:1078702
- fixed user not allowed to read mail_message displayed in their mailbox because of mission notification
- fixed user not allowed to read ir_attachment linked to displayed messages but without read access on the related document
- fixed design of mail.group that was inherits'ing from ir_ui_menu; removed the inheritance but added an explicit link and menu management inside mail_group
Portal:
- limited res_partner read access on their own partner for portal group members
- fixed access rights of group portal members for various models (based those defined for employees)
Misc:
- refactored a bit the various tests, now splitted in several files
- cleaned and updated tests about mail_message and Chatter flow
- more tests are using an employee instead of administrator to trigger access rights issues
- improved the tests related to mail in portal
- removed unused files of deprecated models mail_vote, mail_favorite
lp bug: https://launchpad.net/bugs/1075501 fixed
lp bug: https://launchpad.net/bugs/1078702 fixed
bzr revid: tde@openerp.com-20121214124410-jt18ai8ltw1h2xeo
2012-12-14 13:44:10 +01:00
804e69fd78
[MERGE]trunk-addons21_hr_imp-ssu
...
bzr revid: dle@openerp.com-20121214123802-cxax5cqcnw672h2p
2012-12-14 13:38:02 +01:00
Thibault Delavallée
580f6f0551
[REM] portal: removed file adding because of merge conflict.
...
bzr revid: tde@openerp.com-20121214115053-mv089r9fk4g3vqhu
2012-12-14 12:50:53 +01:00
Thibault Delavallée
62d9ce4cce
[REM] mail_group: removed unused method.
...
bzr revid: tde@openerp.com-20121214115032-de2w9jnnigkjuojn
2012-12-14 12:50:32 +01:00
bd365fca74
[FIX]hr analytic timesheet view
...
bzr revid: dle@openerp.com-20121214111432-2b5rynpl75gh342s
2012-12-14 12:14:32 +01:00
Christophe Matthieu
0475ce0f56
[FIX]note: remove double set stage (sequence=1) for set_stage_per_user. Add set on list.
...
bzr revid: chm@openerp.com-20121214105434-xctytfnl929nt8sb
2012-12-14 11:54:34 +01:00
Thibault Delavallée
5f008a69a6
[IMP] mail: small code cleanup, added some comments.
...
bzr revid: tde@openerp.com-20121214104810-kpmnwii14ghdaksd
2012-12-14 11:48:10 +01:00
Thibault Delavallée
d5a2853ba4
[IMP] mail_mail: removed unnecessary SUPERUSER_ID.
...
bzr revid: tde@openerp.com-20121214104754-5zsqi9tyhyk7fe6s
2012-12-14 11:47:54 +01:00
Raphael Collet
34100dd535
[IMP] auth_signup: improve code that makes a signup url by using urlencode instead of manual stuff
...
bzr revid: rco@openerp.com-20121214104329-jhflp8vxwy4wzc10
2012-12-14 11:43:29 +01:00
Thibault Delavallée
90062eb86a
[MERGE] Sync with trunk. portal_security.xml file is back, holding a custom res_partner rule.
...
bzr revid: tde@openerp.com-20121214085639-8xrn4l413x1901n0
2012-12-14 09:56:39 +01:00
Antony Lesuisse