Olivier Dony
fcdd930396
[IMP] mail.alias: use hyphen instead of underscore for replacing invalid chars, looks better for mail aliases
...
bzr revid: odo@openerp.com-20120814100354-2sn0505046wv27ot
2012-08-14 12:03:54 +02:00
Olivier Dony
8fac3ae62e
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20120814100217-33qe1dyc3w6vfs0g
2012-08-14 12:02:17 +02:00
Vo Minh Thu
1534feb8f7
[IMP] ir_ui_view: somewhat better type functional field implementation.
...
bzr revid: vmt@openerp.com-20120814100049-dngykdg5l21q9vvp
2012-08-14 12:00:49 +02:00
Vo Minh Thu
1182be4291
[IMP] core: removed a filter on null IDs as it hides a possible problem (the very fact they are null).
...
bzr revid: vmt@openerp.com-20120814100007-cppdpazde5oe0khl
2012-08-14 12:00:07 +02:00
Christophe Simonis
a1d68fb739
[IMP] execute original action after login. also pass the current state to login (so the Widget can handle it)
...
bzr revid: chs@openerp.com-20120814094654-fmimm145mrgvznb0
2012-08-14 11:46:54 +02:00
niv-openerp
f111a51f10
Fixed problem when message is false (i think)
...
bzr revid: nicolas.vanhoren@openerp.com-20120814094401-uv548xbylkfq8bun
2012-08-14 11:44:01 +02:00
Thibault Delavallée
e4185c910f
[FIX] orm deprecated: added a list cast because we may receive tuples (as seen on runbot).
...
bzr revid: tde@openerp.com-20120814094142-b79hn5xgduhc7w15
2012-08-14 11:41:42 +02:00
Mustufa Rangwala (OpenERP)
5c47881729
[MERGE] l10n_in_hr_payroll: Add yaml
...
bzr revid: mra@tinyerp.com-20120814094105-xh8g9ni41oc6fh26
2012-08-14 15:11:05 +05:30
Xavier Morel
de09433413
[ADD] feeding of import data into import_data
...
bzr revid: xmo@openerp.com-20120814093813-ql1uq1kb2766db0e
2012-08-14 11:38:13 +02:00
Thibault Delavallée
988e04188a
[RM] Portal: removed res_users override, because partner_id is now in base. Removed view and update init and openerp files accordingly.
...
bzr revid: tde@openerp.com-20120814093202-7do78o1h9z44aj53
2012-08-14 11:32:02 +02:00
Thibault Delavallée
c057c5ec34
[IMP] mail.group: set member_ids as deprecated.
...
bzr revid: tde@openerp.com-20120814090857-2q6a1e9ovrijetea
2012-08-14 11:08:57 +02:00
Fabien Pinckaers
6f7b789f7a
[IMP] mail group in menu
...
bzr revid: fp@openerp.com-20120814090719-7dals8fzupv9cx4j
2012-08-14 11:07:19 +02:00
Thibault Delavallée
9463536724
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120814090341-2qvwriaa09mwn186
2012-08-14 11:03:41 +02:00
Thibault Delavallée
7c0a0a0158
[MERGE] Merged with server/trunk.
...
bzr revid: tde@openerp.com-20120810073318-gcgnj16e02qvg0y3
bzr revid: tde@openerp.com-20120814090328-seyvug8zdagbdm0o
2012-08-14 11:03:28 +02:00
Vidhin Mehta (OpenERP)
63702d6064
[IMP]minor fix to view editor.
...
bzr revid: vme@tinyerp.com-20120814085041-s0lkqzcnyks0ukdn
2012-08-14 14:20:41 +05:30
Thibault Delavallée
bc7ad9c405
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120814084936-04v0hywe2drc9qum
2012-08-14 10:49:36 +02:00
Thibault Delavallée
ed9193d4b2
[MERGE] Merged with server/trunk.
...
bzr revid: tde@openerp.com-20120814084801-b01f3uy5o49m2dva
2012-08-14 10:48:01 +02:00
Bharat Devnani (OpenERP)
afa84101cf
[REM] removed done button from Order Lines to Invoice
...
bzr revid: bde@tinyerp.com-20120814084640-6b25ehh0s29giwsn
2012-08-14 14:16:40 +05:30
Thibault Delavallée
54cce9916e
[MERGE] This 'A Brand New Not-Chatter Branch for Bender' branch fixes some of the warnings / issues :
...
- mail_thread warnings about hasattr(user_id) -> now checks if user_id in columns
- this has trigerred a bug about needaction_user_ids -> called in mail_thread only if defined, all mail_thread objects are not inheriting from need action
- base_calendar: xml files holding values for fields that does not exist
- crm: fixed some warning due to categ_id that became categ_ids; it could have been interesting to check the categ_id(s) behavior before merging
- crm lead demo data: message subtype is now content_subtype since one of the Chatter merge
- misc addons: product.product does not have any 'product_image' field anymore, but an 'image' field
bzr revid: tde@openerp.com-20120814084510-ay2ul0ceru12nkyh
2012-08-14 10:45:10 +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
8d2c35cc75
[IMP] Misc addons: product_image -> image.
...
bzr revid: tde@openerp.com-20120814081616-zb5xe06cy8r3n5ie
2012-08-14 10:16:16 +02:00
Olivier Dony
28148809a1
[IMP] mail.alias: start writing tests, fix detected errors
...
bzr revid: odo@openerp.com-20120814080421-nn6h3z4v54dl949c
2012-08-14 10:04:21 +02:00
Thibault Delavallée
936a2efa46
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120814075258-52pwvh03fl5fjkqg
2012-08-14 09:52:58 +02:00
Thibault Delavallée
0c45b4763c
[FIX] mail_thread: added forgotten brackets in hasattr.
...
bzr revid: tde@openerp.com-20120814075234-t9v53dtfefg70zmt
2012-08-14 09:52:34 +02:00
Sanjay Gohel (Open ERP)
e27b753246
[MERGE]merge with parent branch
...
bzr revid: sgo@tinyerp.com-20120814072409-2anqk2js6qt25jp4
2012-08-14 12:54:09 +05:30
Foram Katharotiya (OpenERP)
7b517425e4
[MERGE] merge with parent branch
...
bzr revid: fka@tinyerp.com-20120814072047-6q3yruttlzar6yh8
2012-08-14 12:50:47 +05:30
Foram Katharotiya (OpenERP)
86768264f4
[IMP] Add constraints in message subtype model
...
bzr revid: fka@tinyerp.com-20120814071919-pk9wkepp7v1geswa
2012-08-14 12:49:19 +05:30
Sanjay Gohel (Open ERP)
b97e2ddd80
[MERGE]merge with trunk
...
bzr revid: sgo@tinyerp.com-20120814071854-247rm43du32l47nu
2012-08-14 12:48:54 +05:30
niv-openerp
39691fd0b5
merge trunk
...
bzr revid: nicolas.vanhoren@openerp.com-20120814071749-1ol2c4ruip6bqsu6
2012-08-14 09:17:49 +02:00
niv-openerp
3052a5fa1a
merge trunk
...
bzr revid: nicolas.vanhoren@openerp.com-20120814071632-jifvgwkj6lawrqo7
2012-08-14 09:16:32 +02:00
niv-openerp
bb09f83ec8
merge trunk
...
bzr revid: nicolas.vanhoren@openerp.com-20120814071605-wfc238jl6vi37hl3
2012-08-14 09:16:05 +02:00
niv-openerp
cfaeed1581
Removed print in test
...
bzr revid: nicolas.vanhoren@openerp.com-20120814071457-hw8d5yp6xzporiuo
2012-08-14 09:14:57 +02:00
Rucha (Open ERP)
ac74a882f0
[FIX]: crm(base_calendar): Added removed category as some meetings have reference of that categories
...
bzr revid: rpa@tinyerp.com-20120814071159-lfgbno216l69ixk4
2012-08-14 12:41:59 +05:30
pso (OpenERP)
3db58da020
[MERGE] Merged with main branch
...
bzr revid: pso@tinyerp.com-20120814070124-c0mc9tgdjed3w5ae
2012-08-14 12:31:24 +05:30
Foram Katharotiya (OpenERP)
71da25a3ca
[MERGE] merge with parent branch
...
bzr revid: fka@tinyerp.com-20120814065459-oj6wo66fpn4xydwc
2012-08-14 12:24:59 +05:30
Mayur Maheshwari (OpenERP)
48f2640283
[FIX]hr_expense :put an onchange in the currency field that fill the force journal field with a purhcase journal that has the same currency
...
bzr revid: mma@tinyerp.com-20120814065201-57472t4o0wma1232
2012-08-14 12:22:01 +05:30
Foram Katharotiya (OpenERP)
9fac5651d5
[IMP] improve as per suggetion
...
bzr revid: fka@tinyerp.com-20120814065149-h1xf3we6t37bsyk3
2012-08-14 12:21:49 +05:30
Fabien Pinckaers
29eb174ce5
[ADD] mail: mail groups
...
extract groups and add new features to them?
bzr revid: fp@tinyerp.com-20120814065136-nlwh14rwbgj57tqx
2012-08-14 08:51:36 +02:00
Atul Patel (OpenERP)
652300eb89
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120814061700-k4swskeiz9r3ypn5
2012-08-14 11:47:00 +05:30
Harry (OpenERP)
bb109f7af9
[FIX] portal: access managment wizard, remove label of user_ids
...
bzr revid: hmo@tinyerp.com-20120814061528-9u2o265dq5qebnry
2012-08-14 11:45:28 +05:30
Atul Patel (OpenERP)
1d2168a02e
[FIX]: Set vote red button alignment.
...
bzr revid: atp@tinyerp.com-20120814061251-em6ipxuvvay8ei2p
2012-08-14 11:42:51 +05:30
Ajay Chauhan (OpenERP)
463d06651a
[Merge] Merge with main addons.
...
bzr revid: cha@tinyerp.com-20120814060914-kvhlm7q2avt2nyc3
2012-08-14 11:39:14 +05:30
Harry (OpenERP)
b570e55b9c
[FIX] portal: access management wizard, miss onchange event of portal
...
bzr revid: hmo@tinyerp.com-20120814060715-xhdgv66amo2hb9tl
2012-08-14 11:37:15 +05:30
Rucha (Open ERP)
8f69cf656e
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120814055216-b7u643smbnc9xpmx
2012-08-14 11:22:16 +05:30
Meera Trambadia
81a44cef8e
[IMP]: provided static string for crm.meeting if desc is not provided on Leave Req
...
bzr revid: mtr@tinyerp.com-20120814054425-eqej763roe0qf60i
2012-08-14 11:14:25 +05:30
Mayur Maheshwari (OpenERP)
25367f13bb
[FIX]hr_expense :improve fource journal if fource journal have currency convert the expense to that currency
...
bzr revid: mma@tinyerp.com-20120814054348-6ofe8r0fcksbhp85
2012-08-14 11:13:48 +05:30
Khushboo Bhatt (Open ERP)
8bdf79744b
[IMP]code added for checking advice in yml.
...
bzr revid: kbh@tinyerp.com-20120814053847-hrxby3r1s17l7uwr
2012-08-14 11:08:47 +05:30
Mustufa Rangwala (OpenERP)
90321e67e5
[MERGE] Merge from main addons
...
bzr revid: mra@tinyerp.com-20120814052207-xsb525ut74bdoube
2012-08-14 10:52:07 +05:30
Harry (OpenERP)
01d2dacf6f
[MERGE]
...
bzr revid: hmo@tinyerp.com-20120814051600-2vej9jzbdgpi3ixt
2012-08-14 10:46:00 +05:30
Launchpad Translations on behalf of openerp
cd04752f66
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120814044618-2edn0a32irj2dpr6
2012-08-14 04:46:18 +00:00