Olivier Dony
ce029f887e
[FIX] ir.rule: must eval the rule domain as user, but browse the rule's groups as admin
...
bzr revid: odo@openerp.com-20110601135526-gk7zfiylnhlpvlod
2011-06-01 15:55:26 +02:00
Olivier Dony
6bbe8c7200
[IMP] ir.rule: local rules will be combined with OR within the same group
...
This makes it more intuitive: global rules are restrictions and
always combined with AND, while local rules are always combined
with OR, regardless if they are in the same group or different
groups. It makes it also easier to add rules in an existing group
to grant more rights.
bzr revid: odo@openerp.com-20110601130156-c0swo9w21zqun2gl
2011-06-01 15:01:56 +02:00
Olivier Dony
cf09b1df94
[FIX] test_osv_expression: fixed for new normalization API
...
bzr revid: odo@openerp.com-20110601062303-k9z0birutesfmkhp
2011-06-01 08:23:03 +02:00
Olivier Dony
bf0e9e923c
[FIX] osv_memory: load config params in __init__ to avoid uninitialized values
...
bzr revid: odo@openerp.com-20110601055031-xyungliji7snspsj
2011-06-01 07:50:31 +02:00
Olivier Dony
eeeda53715
[MERGE] merged latest trunk
...
bzr revid: odo@openerp.com-20110531155814-4v057x9fvc1ieaxb
2011-05-31 17:58:14 +02:00
Vo Minh Thu
358f6881f3
[REF] openerp/report/render/render.py: removed silly main() method, rewrote french comment in english.
...
bzr revid: vmt@openerp.com-20110531152711-49kyo4xhtak3r874
2011-05-31 17:27:11 +02:00
Vo Minh Thu
89a7b72bf0
[MERGE] fix in tools/config.
...
bzr revid: vmt@openerp.com-20110531151615-3byoonhhcxpfdwl9
2011-05-31 17:16:15 +02:00
Quentin (OpenERP)
107b1ebbc4
[IMP] account: added treasury report
...
bzr revid: qdp-launchpad@openerp.com-20110531151231-pg36qumj491j8fsx
2011-05-31 17:12:31 +02:00
Olivier Dony
e10e8073db
[IMP] ir.rule,expression: merged improved rule computation mechanism, suggested by RCO
...
bzr revid: odo@openerp.com-20110531144318-vut0opufvqd5mu07
2011-05-31 16:43:18 +02:00
Quentin (OpenERP)
b5bb00cdd3
[FIX] hr: display the expected number of employees and number of employees when grouping
...
bzr revid: qdp-launchpad@openerp.com-20110531140258-p30r6fq5wuyl8j7h
2011-05-31 16:02:58 +02:00
Olivier Dony
581d06ab65
[FIX] res.partner.bank.type: everyone should be able to read bank account types
...
bzr revid: odo@openerp.com-20110531134506-lkop1qey7vhhe56i
2011-05-31 15:45:06 +02:00
niv-openerp
153733a6a3
[fix] many fixes to o2m & m2m
...
bzr revid: nicolas.vanhoren@openerp.com-20110531131510-5zq9rfezkvfq5me8
2011-05-31 15:15:10 +02:00
niv-openerp
fd9c0f359e
[fix] small typo in m2m
...
bzr revid: nicolas.vanhoren@openerp.com-20110531131414-em4fcrbwfiqcq6g1
2011-05-31 15:14:14 +02:00
niv-openerp
f6d4bdc555
Import old branch.
...
bzr revid: nicolas.vanhoren@openerp.com-20110531130154-45t27asxk5pcr7sd
2011-05-31 15:01:54 +02:00
Vo Minh Thu
6672e72c46
[FIX] tools/config: default values always override the config files:
...
- this bug was introduced by commit 3417.6.4 vmt@openerp.com-20110419134016-og6ye1hjrb0j52cl .
bzr revid: vmt@openerp.com-20110531125322-myptetqusymunily
2011-05-31 14:53:22 +02:00
Olivier Dony
89e66c498d
[MERGE] merged latest trunk
...
bzr revid: odo@openerp.com-20110531103720-mas6phcnb22qj4p2
2011-05-31 12:37:20 +02:00
Xavier Morel
5695adf5e6
[IMP] @editable on forms and fields is nonsense, on trees it should only be able to take the values 'top' and 'bottom'
...
bzr revid: xmo@openerp.com-20110531101518-1ycw1fjy5vczcf8g
2011-05-31 12:15:18 +02:00
Xavier Morel
b041c205ff
[REM] @editable on fields and forms, makes no sense
...
bzr revid: xmo@openerp.com-20110531091456-kuyg11u9vtvxn8uv
2011-05-31 11:14:56 +02:00
Xavier Morel
134d61feba
[FIX] tree/@editable value is top or bottom, 1 is not acceptable
...
bzr revid: xmo@openerp.com-20110531083919-xx0chei0bm0ynq3x
2011-05-31 10:39:19 +02:00
Xavier Morel
9a5058a6b4
[FIX] group cleanup issue during apoptosis: remove all children from storage otherwise risk of zombie children
...
bzr revid: xmo@openerp.com-20110531063313-gv7z5vhwnrt5x6pg
2011-05-31 08:33:13 +02:00
Xavier Morel
c404804f28
[IMP] re-add lost base.controllers.__init__
...
bzr revid: xmo@openerp.com-20110531061326-gskit8sefxv56go2
2011-05-31 08:13:26 +02:00
Launchpad Translations on behalf of openerp
f9f3fcca30
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110531044750-6p5w7mfp6bow8hl6
2011-05-31 04:47:50 +00:00
Launchpad Translations on behalf of openerp
8dc31b78ab
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110531044735-dhu40as3jjdi6qwe
2011-05-31 04:47:35 +00:00
Quentin (OpenERP)
f1658260e4
[MERGE] bugfix for assert error: Human Resources/Configuration/Human Resources/Employees/Categories of Employee/Categories structure
...
while open the employee view form above menu and try to filter results, i am getting this assertion error.
bzr revid: qdp-launchpad@openerp.com-20110530165804-h46rxi92qxzljr8w
2011-05-30 18:58:04 +02:00
Quentin (OpenERP)
ba3ee64859
[MERGE] lp:777803
...
bzr revid: qdp-launchpad@openerp.com-20110530163158-0tnmt1b96omcjbft
2011-05-30 18:31:58 +02:00
Quentin (OpenERP)
95942eff53
[MERGE] lp:773128
...
bzr revid: qdp-launchpad@openerp.com-20110530162749-mgix0v37qag65q06
2011-05-30 18:27:49 +02:00
Quentin (OpenERP)
d124481632
[MERGE] lp:777121
...
bzr revid: qdp-launchpad@openerp.com-20110530162143-0jkl2zvcmnaw63av
2011-05-30 18:21:43 +02:00
Quentin (OpenERP)
002d27a81e
[MERGE] lp:778473
...
bzr revid: qdp-launchpad@openerp.com-20110530150655-pv24ogkrchnooib1
2011-05-30 17:06:55 +02:00
Quentin (OpenERP)
edc8ebc7c5
[MERGE] lp:780668
...
bzr revid: qdp-launchpad@openerp.com-20110530150102-5dpu652vgz4by2dc
2011-05-30 17:01:02 +02:00
Quentin (OpenERP)
99ce8bc19b
[MERGE] lp:764855
...
bzr revid: qdp-launchpad@openerp.com-20110530145526-t22u7m93fdse1zp6
2011-05-30 16:55:26 +02:00
Quentin (OpenERP)
13d5e05e0c
[MERGE] lp:767039
...
bzr revid: qdp-launchpad@openerp.com-20110530144537-7l7l518a0hzhzlwr
2011-05-30 16:45:37 +02:00
Quentin (OpenERP)
c8bed1299f
[MERGE] lp:689547
...
bzr revid: qdp-launchpad@openerp.com-20110530144236-06kd5exja9ltn72s
2011-05-30 16:42:36 +02:00
Quentin (OpenERP)
e7ae483c05
[MERGE] lp:781656
...
bzr revid: qdp-launchpad@openerp.com-20110530143432-2mxbtxlpg0zy6vbc
2011-05-30 16:34:32 +02:00
Quentin (OpenERP)
f6b1235dd3
[MERGE] lp:782163
...
bzr revid: qdp-launchpad@openerp.com-20110530142421-94oxsuut60kw206g
2011-05-30 16:24:21 +02:00
Quentin (OpenERP)
c3b44ca55b
[MERGE] lp:782196
...
bzr revid: qdp-launchpad@openerp.com-20110530142156-vg6jsp9eo103k3nh
2011-05-30 16:21:56 +02:00
Quentin (OpenERP)
689cb4e866
[MERGE] lp:783837
...
bzr revid: qdp-launchpad@openerp.com-20110530141932-whj2sfw7dk4hlwtt
2011-05-30 16:19:32 +02:00
Quentin (OpenERP)
909770517d
[MERGE] lp:772476
...
bzr revid: qdp-launchpad@openerp.com-20110530141451-ocblibm1pq72069c
2011-05-30 16:14:51 +02:00
Quentin (OpenERP)
9af10acac9
[MERGE] lp:784363
...
bzr revid: qdp-launchpad@openerp.com-20110530131759-mb15kw86o8ishd0r
2011-05-30 15:17:59 +02:00
Quentin (OpenERP)
523639dff3
[MERGE] lp:751411
...
bzr revid: qdp-launchpad@openerp.com-20110530131523-rb7l2i57zuel6zu0
2011-05-30 15:15:23 +02:00
Quentin (OpenERP)
23179dc69e
[MERGE] lp:710689
...
bzr revid: qdp-launchpad@openerp.com-20110530130419-l8lo9g325me5f5ur
2011-05-30 15:04:19 +02:00
niv-openerp
6be88ddd66
[imp] gantt view improvements.
...
bzr revid: nicolas.vanhoren@openerp.com-20110530111444-koe0m1yl1ftckkpr
2011-05-30 13:14:44 +02:00
niv-openerp
e3a22c89e5
[merge]
...
bzr revid: nicolas.vanhoren@openerp.com-20110530111402-14nl10jtj5wdfow2
2011-05-30 13:14:02 +02:00
Quentin (OpenERP)
8d3685adf4
[MERGE] lp:782164
...
bzr revid: qdp-launchpad@openerp.com-20110530110826-48ripft49ehj1r9q
2011-05-30 13:08:26 +02:00
Vo Minh Thu
52731ee4b8
[MERGE] osv: osv classes merged inside orm classes.
...
bzr revid: vmt@openerp.com-20110530074205-98kdkwhpbu9e19qw
2011-05-30 09:42:05 +02:00
Xavier Morel
ee143db695
[FIX] M2M form widget so it matches new listview API, add missing (needed) method in ListView API
...
* Add reload_content method on ListView to re-fetch list content when requested
* Add StaticDataGroup to handle providing static lists to a ListView
- and fix behavior of DataSet.read_slice in case of a not-provided limit
* Cleanup implementation of M2M widget (and fix its interactions with ListView) to account for improvements in ListView API
bzr revid: xmo@openerp.com-20110530070656-f5sgodses4xqglr2
2011-05-30 09:06:56 +02:00
Xavier Morel
11a95d3bf7
[FIX] cleanup group display before re-rendering it, otherwise m2m widget breaks
...
bzr revid: xmo@openerp.com-20110530070054-m8cbvexw72wpt4mq
2011-05-30 09:00:54 +02:00
Launchpad Translations on behalf of openerp
d08352c14e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110526043628-iggxpe3dtuzm615i
bzr revid: launchpad_translations_on_behalf_of_openerp-20110527044622-w39rbfftxxgek3f8
bzr revid: launchpad_translations_on_behalf_of_openerp-20110529043625-9tpnzf4lz10ypg5f
bzr revid: launchpad_translations_on_behalf_of_openerp-20110530045915-u5a8nm8u0h54ujyv
2011-05-30 04:59:15 +00:00
Launchpad Translations on behalf of openerp
b166b367be
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110527044550-75mzo90wnocq320y
bzr revid: launchpad_translations_on_behalf_of_openerp-20110530045832-ce820mg8qb8eukga
2011-05-30 04:58:32 +00:00
Xavier Morel
dd3c1645ec
[FIX] m2m fields display
...
* Add reload_content method to ListView so third parties can ask for a redisplay
* Add a StaticDataGroup descendant class to DataGroup (actually to GrouplessDataGroup as it can not contain groups, only records via a static data set)
* Fix DataSetStatic.read_ids when no limit provided
* Fix Many2ManyListView usage and overriding of a few ListView methods (due to ListView API changing)
bzr revid: xmo@openerp.com-20110527151000-lq5a6sfohprs9gvs
2011-05-27 17:10:00 +02:00
Vo Minh Thu
3fa8c6beb7
[FIX] osv/ir_model: forgot to remove the module arg in ir_model.
...
bzr revid: vmt@openerp.com-20110527124051-hqc566wumejw4u1s
2011-05-27 14:40:51 +02:00