Olivier Dony
11bdbfd183
[MERGE] Next batch of improvements/fixes for mail.alias
...
bzr revid: odo@openerp.com-20120814123050-xw3ltthoc9nld76r
2012-08-14 14:30:50 +02:00
Vo Minh Thu
2376fe0add
[MERGE] merged view changes: the `type` is now a functional field derived from the arch.
...
bzr revid: vmt@openerp.com-20120814121117-dent4ctz89kdcabi
2012-08-14 14:11:17 +02:00
Olivier Dony
0a22166f88
[FIX] mail.alias: fix constraint creation warnings + properly hide alias on creation form for inhering classes
...
bzr revid: odo@openerp.com-20120814105114-ei0qbgy71fyc8jtb
2012-08-14 12:51:14 +02:00
Olivier Dony
8fac3ae62e
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20120814100217-33qe1dyc3w6vfs0g
2012-08-14 12:02:17 +02:00
Olivier Dony
ac4e5d746b
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20120814082029-i1b7d4l5cqgs434g
2012-08-14 10:20:29 +02:00
Thibault Delavallée
3d3f17c465
[FIX] crm_opp_to_phonecall: I was quite too fast for last rev, phonecall has categ_id, not categ_ids.
...
bzr revid: tde@openerp.com-20120813195210-lj58w2hc1r0yxj1u
2012-08-13 21:52:10 +02:00
Vo Minh Thu
9822629548
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
Thibault Delavallée
9a3deaf3da
[IMP] crm: fixed some categ_id remaining.
...
bzr revid: tde@openerp.com-20120813131207-lu1c271q5dh27vlr
2012-08-13 15:12:07 +02:00
Thibault Delavallée
ae6d1fe900
[FIX] crm_lead: categ_id -> now categ_ids.
...
bzr revid: tde@openerp.com-20120813125822-1knqrg2adg90xxpy
2012-08-13 14:58:22 +02:00
Thibault Delavallée
9db0a94280
[IMP] CRM demo data: subtype -> content_subtype. Please check your logs before merging ...
...
bzr revid: tde@openerp.com-20120813125803-sodjl70yrnk3i2v0
2012-08-13 14:58:03 +02:00
Rucha (Open ERP)
dd7a2972d8
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120813051411-5no0xcudwbkw07c5
2012-08-13 10:44:11 +05:30
Antony Lesuisse
9211174a6f
[MERGE] document_page aka wiki
...
it still uses the wiki syntax, switch to full html will occur after the
autosizing of cleditor
bzr revid: al@openerp.com-20120812144730-nxgxz8c77afczfr9
2012-08-12 16:47:30 +02:00
Antony Lesuisse
0de43d05c2
fix config wizard
...
bzr revid: al@openerp.com-20120812135319-bcwu9blrd71wepig
2012-08-12 15:53:19 +02:00
Launchpad Translations on behalf of openerp
d402784c74
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120811054547-ebfnq6hteui8geba
bzr revid: launchpad_translations_on_behalf_of_openerp-20120811054607-chyn98m3ivp16qg3
2012-08-11 05:46:07 +00:00
Antonin Bourguignon
f2fd44d85b
[MERGE] latust trunk
...
bzr revid: abo@openerp.com-20120810140856-xl6sj3xu9t4bee6c
2012-08-10 16:08:56 +02:00
Antonin Bourguignon
ee4fd16e94
[FIX] remove the option from the user_id fields
...
we want users to be openable !
also improve indentation and remove some useless whitespaces
bzr revid: abo@openerp.com-20120809163529-8adlpszt3n6lhszi
2012-08-09 18:35:29 +02:00
Fabien Pinckaers
5e326c35ba
[IMP] opportunity view
...
bzr revid: fp@tinyerp.com-20120809154849-etl88u1njryc8vfz
2012-08-09 17:48:49 +02:00
Antonin Bourguignon
24f6e09c45
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120809143919-qrn9nm5ut5vlm8hw
2012-08-09 16:39:19 +02:00
Fabien Meghazi
fcd96b6890
[IMP] kanban_image is tolerant to m2o id's
...
bzr revid: fme@openerp.com-20120809125330-a8iy3xvxfnltnmmd
2012-08-09 14:53:30 +02:00
Olivier Dony
2d8980d724
[FIX] crm: typo
...
bzr revid: odo@openerp.com-20120808171501-o5eaoalcy0xeu2ko
2012-08-08 19:15:01 +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
Rucha (Open ERP)
1fd0cd8200
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120808103917-0xxio0ugprx6y4r2
2012-08-08 16:09:17 +05:30
niv-openerp
174e3ba5a6
[FIX] small problem in kanban view in opportunities
...
bzr revid: nicolas.vanhoren@openerp.com-20120809095225-m2mjw452887ir6xo
2012-08-09 11:52:25 +02:00
Antony Lesuisse
243323f9de
[MERGE] stages clickable
...
bzr revid: al@openerp.com-20120808170215-fot80280eulblm8s
2012-08-08 19:02:15 +02:00
Antony Lesuisse
6065e32e2b
[MERGE] trunk
...
bzr revid: al@openerp.com-20120808154332-8v1vp9yeykzxcey2
2012-08-08 17:43:32 +02:00
Olivier Dony
3fd9a77c83
[REVERT] Cancel PO Template changes from rev.2702 - to be fully re-generated before next release
...
We'll also attempt to replace the master strings in the
translated .po files before replacing the master strings,
to avoid losing translations just because of mere typo fixes.
bzr revid: odo@openerp.com-20120808144613-wtz50tcz5n7kvcza
2012-08-08 16:46:13 +02:00
Antonin Bourguignon
54bbe3d78b
[MERGE] exception and warning messages improvement
...
bzr revid: abo@openerp.com-20120808130608-tnk060lr543nqn2n
2012-08-08 15:06:08 +02:00
Mayur Maheshwari (OpenERP)
ff612f9d02
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20120808094005-o7v0l6u15ide75za
2012-08-08 15:10:05 +05:30
Antonin Bourguignon
4388ace499
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120808091048-hr1r4vn9milozexf
2012-08-08 11:10:48 +02:00
Stephane Wirtel
71cd55490a
[IMP] crm: improve the on_change of the partner in the lead form view
...
bzr revid: stw@openerp.com-20120808090846-uat120rr9ta5wtdt
2012-08-08 11:08:46 +02:00
Fabien Pinckaers
3fdd2881b9
[IMP] clean address format on leads
...
bzr revid: fp@tinyerp.com-20120808072453-tnm2rkvn7djksxtm
2012-08-08 09:24:53 +02:00
Fabien Pinckaers
2dfc350825
[IMP] small improvement in opportunity view
...
bzr revid: fp@tinyerp.com-20120808064122-wjz6ua224nb9mkoi
2012-08-08 08:41:22 +02:00
Rucha (Open ERP)
d597437dd7
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120808063503-ymsvwnerxakqbcbx
2012-08-08 12:05:03 +05:30
Launchpad Translations on behalf of openerp
d58b36a8a3
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120808043651-egwkmt6jun55wr8g
bzr revid: launchpad_translations_on_behalf_of_openerp-20120808044644-idxbpx3utx816s2p
2012-08-08 04:46:44 +00:00
Olivier Dony
217df4232e
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20120807180759-6ezme82cn1byqc9v
2012-08-07 20:07:59 +02:00
Olivier Dony
86836d67dd
[IMP] mail.alias: work-in-progress: cleanup actual email processing
...
bzr revid: odo@openerp.com-20120807180412-u2gdsjg579ak7zxp
2012-08-07 20:04:12 +02:00
Fabien Pinckaers
c433498ef7
[IMP] config wizards, feedback from SAM's user testing
...
bzr revid: fp@tinyerp.com-20120807155552-eo88mb4ngysjd8n6
2012-08-07 17:55:52 +02:00
Olivier Dony
60722930cd
[IMP] mail.alias: fix creation errors for inheriting models
...
bzr revid: odo@openerp.com-20120807142736-zxfhdrr9t2euvh8x
2012-08-07 16:27:36 +02:00
Olivier Dony
675ed5e84f
[IMP] mail.alias: fix copy() errors for inheriting models
...
bzr revid: odo@openerp.com-20120807140821-xijunvy5d546o8c6
2012-08-07 16:08:21 +02:00
Thibault Delavallée
0e77a7d45c
[MERGE] MyNotChatterTask: image resize.
...
This revision adds standard image field names and sizes (image: 1024x1024; image_medium: 180x180; image_small: 50x50, the last two being function fields). This addons-side branch holds the update for mail.group, product, point of sale and hr. Default image for new hr employee has also been updated. Hr module now has its icon for the module kanban view.
bzr revid: tde@openerp.com-20120807131152-qw0lw9s8s6lq5m2b
2012-08-07 15:11:52 +02:00
Antonin Bourguignon
a97687a420
[MERGE] latest trunk
...
also replace the error message title 'Operation Not Permitted' by 'Invalid Action'
bzr revid: abo@openerp.com-20120807120451-zdrrecilfh82obhl
2012-08-07 14:04:51 +02:00
Antonin Bourguignon
59aa37f0e4
[IMP] all the warning messages now start with 'Warning\!' (not 'Warning' or 'Warning \!')
...
bzr revid: abo@openerp.com-20120807113414-7mryqyt3jnq8shsa
2012-08-07 13:34:14 +02:00
Antonin Bourguignon
8a64e7580a
[IMP] all the error messages now start with 'Error\!' (not 'Error' or 'Error \!')
...
bzr revid: abo@openerp.com-20120807113137-44vehm0mthqawlo3
2012-08-07 13:31:37 +02:00
Jigar Amin - OpenERP
935e31b328
merge lp:openobject-addons
...
bzr revid: jam@tinyerp.com-20120807105628-j3py2jnd1fnbnzza
2012-08-07 16:26:28 +05:30
Thibault Delavallée
6c4dda8441
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120807100920-mr0oc56qs2zntvu1
2012-08-07 12:09:20 +02:00
pso (OpenERP)
97e61e1d6a
[MERGE] Merged PNA's branch for Lead/Opportunity view improvements
...
bzr revid: pso@tinyerp.com-20120807095634-d91bzmzsl4oledwg
2012-08-07 15:26:34 +05:30
Pinakin Nayi (OpenERP)
90ea0b4dd1
[IMP]crm-lead-category
...
bzr revid: pna@tinyerp.com-20120807085914-4ufygn773tvl4j52
2012-08-07 14:29:14 +05:30
Rucha (Open ERP)
0591aaa554
[IMP]: crm: Improved phonecall demo
...
bzr revid: rpa@tinyerp.com-20120807075000-b5efil1mkifvz712
2012-08-07 13:20:00 +05:30
Twinkle Christian (OpenERP)
e63254835c
[IMP]improved ciews
...
bzr revid: tch@tinyerp.com-20120807073359-p6flrh7wr98t2pue
2012-08-07 13:03:59 +05:30
Rucha (Open ERP)
7f80d25893
[FIX]: crm: Fixed opportunity demo for proper partner geo assignation in crm_partner_assign test yml
...
bzr revid: rpa@tinyerp.com-20120807063446-8f5est5ojm3lp96e
2012-08-07 12:04:46 +05:30