3d2e9b4d2b
[MERGE] forward port of branch 7.0 up to revid 5281 launchpad_translations_on_behalf_of_openerp-20140412094159-mhy3v2prb3ctx32k
...
bzr revid: jke@openerp.com-20140409153527-mic1a8afcvdhsd27
bzr revid: chs@openerp.com-20140410102422-fcwxhjk40z0oy8x5
bzr revid: chs@openerp.com-20140415133650-y46i0o3qkb2atbvi
2014-04-15 15:36:50 +02:00
1578776814
[FIX] expression: when evaluatoing *like operator, add cast to text to column in case of different type
...
bzr revid: mat@openerp.com-20140409144346-nbn0dno3bs6ozwk5
2014-04-09 16:43:46 +02:00
120342d537
[MERGE] forward port of branch 7.0 up to revid 5274 chs@openerp.com-20140404141611-qi1yagltvkd9q8ji
...
bzr revid: chs@openerp.com-20140404155858-mvupqmuvi8ime2tl
2014-04-04 17:58:58 +02:00
bcf36e6deb
[IMP] expression: new helper for generating unaccent aware sql queries. Adapt _auto_join tests to use it.
...
bzr revid: chs@openerp.com-20140404141559-d2sn68lruik9hz81
2014-04-04 16:15:59 +02:00
19993ab1d5
[FIX] expression: translated search as params are flatten, we need to expand "%s" placeholders when using the `in` operator
...
bzr revid: chs@openerp.com-20140402112730-eoqxt0pu7lvcq5yg
2014-04-02 13:27:30 +02:00
7c9db05d1e
[MERGE] forward port of branch saas-2 up to revid 5024 chs@openerp.com-20140402112825-ky8rcb3p467ikitc
...
bzr revid: chs@openerp.com-20140402093016-rcl15e5vpdj7ishv
bzr revid: chs@openerp.com-20140402114823-4mncr059d9ms8v3t
2014-04-02 13:48:23 +02:00
1c3ee251f0
[MERGE] forward port of branch 7.0 up to revid 5270 chs@openerp.com-20140403084524-9rb174osjrbmhgwc
...
bzr revid: chs@openerp.com-20140402083506-w4cywcf0kxxx9xmk
bzr revid: chs@openerp.com-20140312174526-a5rhh83g0fw8djuc
bzr revid: chs@openerp.com-20140318105837-53vsx5g7fm517cuc
bzr revid: dle@openerp.com-20140326092548-bu4bqinhvco8j5wj
bzr revid: chs@openerp.com-20140402092735-3a23yjl169vvt0iv
bzr revid: chs@openerp.com-20140402112825-ky8rcb3p467ikitc
bzr revid: chs@openerp.com-20140403084808-slnj7uis17kwi9js
2014-04-03 10:48:08 +02:00
c7d114d9a9
[MERGE] forward port of branch saas-2 up to revid 5020 chs@openerp.com-20140312174526-a5rhh83g0fw8djuc
...
bzr revid: chs@openerp.com-20140312180614-8yb454s3mkjwnk2q
2014-03-12 19:06:14 +01:00
07fbbe288c
[MERGE] Forward-port of 7.0 bugfixes, up to rev. 5251 revision-id: odo@openerp.com-20140304152927-havybom9x1jgdzae
...
bzr revid: odo@openerp.com-20140305213115-w55dqs3xra6ejmni
2014-03-05 22:31:15 +01:00
b79a33aefc
[FIX] orm.read_group: improve test coverage and corner case handling:
...
- allow leading spaces in orderby spec for m2o columns
- extra test for read_group on multiple columns
- proper handling of groupby on numeric column with default order
bzr revid: odo@openerp.com-20140304152927-havybom9x1jgdzae
2014-03-04 16:29:27 +01:00
27a1770e20
[FIX] orm.read_group: fix various issues introduced in recent commit, cleanup
...
Fixed the implementation of the sorting for inherited
columns, many2one columns, and aggregated columns.
Added corresponding tests with increased coverage of
the read_group() method.
bzr revid: odo@openerp.com-20140228173320-p8l0jc8op7xsgn1x
2014-02-28 18:33:20 +01:00
a67cd4c049
[FIX] t-ignore should remove injected sub-view branding below the ignore flag
...
bzr revid: xmo@openerp.com-20140225114706-j8q44cubs59tuwby
2014-02-25 12:47:06 +01:00
1b2be9be76
[IMP] unbrand t-raw and t-esc as keeping them branded makes very little sense
...
they can't be edited in any situation
bzr revid: xmo@openerp.com-20140225110046-90rdevm13pp4m51s
2014-02-25 12:00:46 +01:00
cf702eb1c6
[IMP] in view tests, replace tostring() and string comparisons by custom lxml.etree comparator
...
bzr revid: xmo@openerp.com-20140225092842-sc6whhm173azurtt
2014-02-25 10:28:42 +01:00
198640434f
[FIX] injected views need branding distribution too
...
forgot to set it up after installed injected view skipping during distribution of injectee
bzr revid: xmo@openerp.com-20140224170301-b4ta04zqsd5d2956
2014-02-24 18:03:01 +01:00
c83247c38b
[MERGE] Forward-port of latest saas-2 bugfixes, up to rev.5012 revid:mat@openerp.com-20140219134943-60ssztc01cxdtk09
...
bzr revid: mat@openerp.com-20140219140617-na0q47yaloblb67i
2014-02-19 15:06:17 +01:00
e635ebe6c1
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5238 revid:launchpad_translations_on_behalf_of_openerp-20140219053940-dvi4g7ajttoj6h9k
...
bzr revid: mat@openerp.com-20140219134943-60ssztc01cxdtk09
2014-02-19 14:49:43 +01:00
e1dff48492
[MERGE] [FIX] orm: read_group doesn't take referenced fields or aggregated fields in account when sorting (opw 598942)
...
Sorting was done using a search on ids that where found in a custom SQL field,
only 1 record among aggregated records with same groupby value was used
when using search for ordering, resulting data ordered on
max(aggregated_data).field_value instead of sum(aggregated_data.field_value).
bzr revid: mat@openerp.com-20140218100929-qeg0rz1fmta2ni9y
2014-02-18 11:09:29 +01:00
775ae7d728
[REF] removing useless comment
...
bzr revid: acl@openerp.com-20140218083045-aimu376msu052k5d
2014-02-18 09:30:45 +01:00
90dcc00443
[FIX] OPW 598942 : orm read_group doesn't take referenced fields or aggregated fields in account when sorting
...
Sorting was done using a search on ids that where found in a custom SQL field,
only 1 record among aggregated records with same groupby value was used
when using search for ordering, resulting data ordered on
max(aggregated_data).field_value instead of sum(aggregated_data.field_value).
lp bug: https://launchpad.net/bugs/1060086 fixed
bzr revid: acl@openerp.com-20140217172926-ka2fw8t2l3cqi7h3
2014-02-17 18:29:26 +01:00
325ad57a00
[FIX] branding distribution to generate correct xpath even after injection of inherited view contents
...
bzr revid: xmo@openerp.com-20140213164546-xor2k3tat8d216wq
2014-02-13 17:45:46 +01:00
500fea28b7
[MERGE] forward port of branch saas-2 up to revid 5007 chs@openerp.com-20140206110220-myn57cryam1y4k9v
...
bzr revid: chs@openerp.com-20140206110423-qe4h5ip2dg6dm7ph
2014-02-06 12:04:23 +01:00
a69f789b41
[MERGE] forward port of branch 7.0 up to revid 5224 chs@openerp.com-20140206105141-7e8bv8ordqqsswh7
...
bzr revid: dle@openerp.com-20140205105045-j95kduyjiq83e57z
bzr revid: dle@openerp.com-20140114173613-ruxye1m7fxtcjfim
bzr revid: dle@openerp.com-20140116161158-u95vcs3os4tk2zob
bzr revid: dle@openerp.com-20140121172737-gzawfi3ssg7xifef
bzr revid: chs@openerp.com-20140129094554-c3abc8x3qz9mpszr
bzr revid: chs@openerp.com-20140129140159-9vwkpr078shoonum
bzr revid: chs@openerp.com-20140206110220-myn57cryam1y4k9v
2014-02-06 12:02:20 +01:00
5f10bec1a0
[IMP] better assert message and cleaning
...
bzr revid: mat@openerp.com-20140203134051-lgwo4v0rdntgxyor
2014-02-03 14:40:51 +01:00
6ea8851fd0
[ADD] test read_group on a column of _inherits model and group on right field
...
bzr revid: mat@openerp.com-20140203133331-mujvv812zd971ci2
2014-02-03 14:33:31 +01:00
c3c0705203
[FIX] ir.ui.view: fix tests after refactoring of ir.ui.view/qweb view processing
...
bzr revid: odo@openerp.com-20140130154354-6xg4mx31to4dg0ql
2014-01-30 16:43:54 +01:00
53098c666c
[MERGE] trunk's CORS support (merge with changes)
...
bzr revid: chs@openerp.com-20140130120448-tj9pu30o7dj74zid
bzr revid: fme@openerp.com-20140130125425-j1yn6p4lr7lincr3
2014-01-30 13:54:25 +01:00
378c908d4c
[MERGE] forward port of branch saas-2 up to revid 5006 chs@openerp.com-20140129140159-9vwkpr078shoonum
...
bzr revid: chs@openerp.com-20140129094847-4rsg0kjio0ed0rjk
bzr revid: chs@openerp.com-20140129141002-4p8fttm8ii0ogsse
2014-01-29 15:10:02 +01:00
cb4ce12d3a
[IMP] make sure the records will be in right order (and trigger chirurgiens-dentistes.fr for the second name_search)
...
bzr revid: mat@openerp.com-20140129124806-dq56o7r1yt38nb08
2014-01-29 13:48:06 +01:00
e6ee1947f8
[FIX] better test, add missing parentheses in query, return empty list in case of no idea (instead of triggering super)
...
bzr revid: mat@openerp.com-20140129123404-8hs786n64briqyta
2014-01-29 13:34:04 +01:00
5d38e40e6b
[FIX] revert previous rev for better where and add test
...
bzr revid: mat@openerp.com-20140129113938-517gqfi1kzcf64fz
2014-01-29 12:39:38 +01:00
7a72d858cb
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140103151324-jk0u8vmrxxomy5vx
2014-01-03 16:13:24 +01:00
0bd968a801
[MERGE] [FIX] ir_translation: backport of rev 5018 from trunk
...
rename method load to load_module_terms to avoid name clash with load call from base_import (opw 602531)
bzr revid: mat@openerp.com-20131231140358-ldh0snu9zmcs3tpw
2013-12-31 15:03:58 +01:00
216303c2fa
[FIX] ir_translation: rename method load to load_module_terms to avoid name clash with load call from base_import
...
bzr revid: mat@openerp.com-20131230125307-kald7ir36bvq3o7c
2013-12-30 13:53:07 +01:00
0546993327
[FIX] merge from trunk and fix handling of view inheritance
...
main problem, view inheritance model field would use model from the
root view (after following inherit_id links) rather than the base view
(the requested one) -> with divergent models, it was possible for the
requested view itself to never be returned.
bzr revid: xmo@openerp.com-20131212134422-uxg6h21w1jhth9ow
2013-12-12 14:44:22 +01:00
00b012c01b
[ADD] tentative tests for application of view inheritance stuff
...
bzr revid: xmo@openerp.com-20131212120600-timum4yzr84kl0mf
2013-12-12 13:06:00 +01:00
ebc6ff5256
[REM] broken tests
...
weird tests (using broken views, but not just broken in the way the
test expects) were really testing for error on using a field which
does not exist, predicated on full rendering of the view during
validation.
This has been removed from the website branch as it's unfeasible and
nonsensical for model-less views (e.g. qweb), and thus the test blew
up with a completely different error (missing @string) or, once the
test was fixed, wouldn't blow up at all.
bzr revid: xmo@openerp.com-20131211162412-t31bxkpy2yzdnf0q
2013-12-11 17:24:12 +01:00
8460122209
[MERGE] sync with trunk
...
bzr revid: chm@openerp.com-20131202150856-fzrfcoa8pmsjutau
2013-12-02 16:08:56 +01:00
3211a29d9b
[MERGE] forward port of branch 7.0 up to revid 5148 mat@openerp.com-20131125125008-wmpssjk5vygdcc0w
...
bzr revid: chs@openerp.com-20131125151017-lmj53bxg1pfrr4a7
2013-11-25 16:10:17 +01:00
3b5cf5d56c
[FIX] translations: fix tests to adapt to new duplication behaviour and remove context hack in copy_data (translations are now fully handled in copy_translation)
...
bzr revid: mat@openerp.com-20131125115727-o9oejao1ziagqti1
2013-11-25 12:57:27 +01:00
6fd552c3ce
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5139 rev-id: dle@openerp.com-20131121132305-qjlclgz5v9tze1fr
...
bzr revid: odo@openerp.com-20131120102545-2tlp031yib6viz35
bzr revid: chs@openerp.com-20131120161708-c8sbom592moukwxw
bzr revid: dle@openerp.com-20131121155457-lh7fzouk2upeiu16
2013-11-21 16:54:57 +01:00
ec88c042b2
[MERGE] forward port of branch saas-1 up to revid 4918 chs@openerp.com-20131114134731-n324awyon0spq624
...
bzr revid: chs@openerp.com-20131114135502-xqi6df3jzm7ng0io
2013-11-14 14:55:02 +01:00
993bff902e
[MERGE] forward port of branch 7.0 up to revid 4067 chs@openerp.com-20131114142639-ng7wzfjwvvel2nhv
...
bzr revid: dle@openerp.com-20131112134311-h1vsux0ge17bsqkc
bzr revid: chs@openerp.com-20131114134731-n324awyon0spq624
bzr revid: chs@openerp.com-20130823145204-xwpnlwg0gg2259f6
bzr revid: chs@openerp.com-20130906170157-e7m4pjskyi47q82o
bzr revid: dle@openerp.com-20130909170408-wxgoduzggap6o4ng
bzr revid: dle@openerp.com-20130919141212-ridtrvvfwvu6calr
bzr revid: dle@openerp.com-20131018120136-fvoq337kgx74njsy
bzr revid: dle@openerp.com-20131023103308-18pj2gqq3imrcir7
bzr revid: chs@openerp.com-20131030180528-hqsztaujjjqev8ky
bzr revid: dle@openerp.com-20131106100128-mx8mnguvp321wick
bzr revid: chs@openerp.com-20131115104909-3u3mu40g9xnler88
2013-11-15 11:49:09 +01:00
1df6461c4a
[FIX] base: test_translation: load an existing translation
...
bzr revid: chs@openerp.com-20131108225820-i2pea15b7lymyw6t
2013-11-08 23:58:20 +01:00
861fcbcd50
[IMP] use assertEqual instead of assertTrue for better logging
...
bzr revid: mat@openerp.com-20131104161720-2ofur11haask32ni
2013-11-04 17:17:20 +01:00
7e83c23844
[ADD] base: tests for translations and duplication
...
bzr revid: mat@openerp.com-20131104153946-vhpnbn8t1oxfaep1
2013-11-04 16:39:46 +01:00
d67ff9ba02
[FIX] views inheritance: deleting a non-existing attribute must be a no-op
...
bzr revid: chs@openerp.com-20131108175750-yenql6hycpn95i9j
2013-11-08 18:57:50 +01:00
e5d67ad2e0
[REM] broken tests
...
expectation of view validation errors when creating view referencing
non-existent fields or models, but in website branch models and views
have become independents, these are not context-free errors anymore.
Also fix shit code.
bzr revid: xmo@openerp.com-20131007093328-gjrktqbsoe48ikol
2013-10-07 11:33:28 +02:00
54933118a4
[MERGE] Sync with trunk until revision 4957.
...
bzr revid: tde@openerp.com-20131002133820-8xomdumexexqp3pk
2013-10-02 15:38:20 +02:00
e9980e8725
[FIX] test_views: update matching error message
...
bzr revid: chs@openerp.com-20130918212216-libtu7zpsn2768j0
2013-09-18 23:22:16 +02:00
Christophe Simonis
jba
Olivier Dony
Xavier Morel
Martin Trigaux
Anael Closson
Fabien Meghazi
Thibault Delavallée
Christophe Matthieu
Denis Ledoux