Antony Lesuisse
ec45bc96f9
[IMP] safe_eval add int float range, rename public user
...
bzr revid: al@openerp.com-20140130034238-qlgbu41d7mg9ns6i
2014-01-30 04:42:38 +01:00
Christophe Simonis
ec14f457c1
[FIX] website_event: correct ui test
...
bzr revid: chs@openerp.com-20140129213621-ynbxys4hmw0avhaw
2014-01-29 22:36:21 +01:00
Christophe Simonis
3d80e31012
[FIX] website: url_for() does not mess up anchor links
...
bzr revid: chs@openerp.com-20140129195025-i2ey682o6marp8k1
2014-01-29 20:50:25 +01:00
Christophe Simonis
c202dc1c52
merge upstream
...
bzr revid: chs@openerp.com-20140129190834-xfcat3ulfbg5omhn
2014-01-29 20:08:34 +01:00
Christophe Simonis
947fe0da24
[FIX] calendar: use correct xmlid
...
bzr revid: chs@openerp.com-20140129185229-d75g5fsv77468tih
2014-01-29 19:52:29 +01:00
Christophe Simonis
731019154a
[MERGE] forward port of branch saas-2 up to revid 9109 dle@openerp.com-20140129171022-wf6244k90lpncmah
...
bzr revid: chs@openerp.com-20140129184703-ypd7iqnor5m5lr3d
2014-01-29 19:47:03 +01:00
Olivier Dony
3d1b879049
[IMP] qweb.render: t-esc/t-raw rendered as False or None replaced by empty strings
...
bzr revid: odo@openerp.com-20140129180600-0c155g520gpvnqqf
2014-01-29 19:06:00 +01:00
Christophe Matthieu
55fdaf0dd0
[FIX] website_sale: activate test tour
...
bzr revid: chm@openerp.com-20140129175038-663iuxiv0os6f9xt
2014-01-29 18:50:38 +01:00
Christophe Simonis
958ecb84b0
[FIX] ir.model.data: correct cache clearing
...
bzr revid: chs@openerp.com-20140129172949-tmwd17c2ofsqj94t
2014-01-29 18:29:49 +01:00
Fabien Meghazi
04a52645c0
[REM] auth="admin" removed
...
bzr revid: fme@openerp.com-20140129171933-e61qp9p5xfdwyw89
2014-01-29 18:19:33 +01:00
Denis Ledoux
255fe082bd
[FIX] website_membership: membership displayed order depending on website_sequence
...
bzr revid: dle@openerp.com-20140129171554-h76n4579xquhdxxv
2014-01-29 18:15:54 +01:00
Fabien Meghazi
c4e48e2388
[REM] Removed auth='admin' from modules
...
bzr revid: fme@openerp.com-20140129171520-wkz8ot4pa63utoi3
2014-01-29 18:15:20 +01:00
Christophe Matthieu
d546e0db2f
[fIX] ir_qweb: fix groups inside t-call (use request.cr and request.uid and don't use None, None)
...
bzr revid: chm@openerp.com-20140129171138-zwuj2vyzu7l853np
2014-01-29 18:11:38 +01:00
Denis Ledoux
6cc096aebc
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9798 revid:dle@openerp.com-20140129163238-1s1t9oc814z4z7f3
...
bzr revid: dle@openerp.com-20140129171022-wf6244k90lpncmah
2014-01-29 18:10:22 +01:00
Olivier Dony
e6e8bb3789
[IMP] website_*: remove useless % chars surrounding ilike operand, this is the default
...
bzr revid: odo@openerp.com-20140129163557-0bb86mx8it57mcvi
2014-01-29 17:35:57 +01:00
Frédéric van der Essen
64822bd188
[MERGE] hw_escpos: moving list of supported printers to a separate file
...
bzr revid: fva@openerp.com-20140129163503-tvd69qd5u5nktjb9
2014-01-29 17:35:03 +01:00
Frédéric van der Essen
d88b10fd07
[IMP] hw_escpos: moved list of supported printers to a separate file
...
bzr revid: fva@openerp.com-20140129163259-xdarcaw4qcqprvt6
2014-01-29 17:32:59 +01:00
Denis Ledoux
08dfda9ec6
[FIX] purchase: on po confirm, avoid to write location_id on the chained stock move if the move is done
...
On purchase order confirmation, if the order_line comes from a procurement order created by a sale order,
it tried to write on the location_id, whatever the move state was, even done.
Or, sometimes, the stock move associated to the procurement order (from the so) was already done, for example because we forced the availability of the stock move.
It makes sense to not write the location_id if the move is already done, because the location_id is already good.
bzr revid: dle@openerp.com-20140129163238-1s1t9oc814z4z7f3
2014-01-29 17:32:38 +01:00
Olivier Dony
a09fa10c49
[FIX] website_mail: useless and expensive DISTINCT
...
bzr revid: odo@openerp.com-20140129162532-os3lzjyf87hg1ouc
2014-01-29 17:25:32 +01:00
Olivier Dony
0ac11b430f
[IMP] website_sale: spellchecking
...
bzr revid: odo@openerp.com-20140129162331-sjmquzz172h9dkp4
2014-01-29 17:23:31 +01:00
Christophe Matthieu
b7f88a58fb
[FIX] website:_mail: fix followers
...
bzr revid: chm@openerp.com-20140129170829-abmv73xswzl6ccm9
2014-01-29 18:08:29 +01:00
Antony Lesuisse
632c014b76
[FIX] fix werkzeug dependency on debian, misc changes
...
- add an more friendly syntax for images /website/image/<model>/<id>/<field>
- reorder methods based on their use case
- move new page to /website namespace
bzr revid: al@openerp.com-20140129163809-d4z4f8t3h11n5ozv
2014-01-29 17:38:09 +01:00
Frédéric van der Essen
83196be65e
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20140129161802-14patbv206pqj68j
2014-01-29 17:18:02 +01:00
Christophe Matthieu
499f9164b8
[FIX] website: tour banner
...
bzr revid: chm@openerp.com-20140129161434-s5razyi3eqeq30vn
2014-01-29 17:14:34 +01:00
Christophe Matthieu
876b61f42c
[FIX] website: test tour and website_sale tour. Add ajax trigger to display popover when the ajax is complete and hmlt is loaded
...
bzr revid: chm@openerp.com-20140129160839-ijdcnuiny6ys8z6p
2014-01-29 17:08:39 +01:00
Gery Debongnie
d07bb7e870
[IMP] improves the reporting view Asset Analysis in accounting module (adds some relevent measures to the pivot table) (addon account_asset)
...
bzr revid: ged@openerp.com-20140129160709-t5e4c9h91y0jug6e
2014-01-29 17:07:09 +01:00
Gery Debongnie
4b3076e955
[IMP] improves the reporting views in account module (work on the Pivot tables, and remove some useless day/month/year attributes) (addon account)
...
bzr revid: ged@openerp.com-20140129160348-230nvcutbdqh1hx1
2014-01-29 17:03:48 +01:00
Fabien Meghazi
f31ddba8b3
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140129153718-b86vsyogxkr8lk19
2014-01-29 16:37:18 +01:00
Fabien Meghazi
9860ddd352
[REM] POS: Replaced auth="admin" by auth="none"
...
bzr revid: fme@openerp.com-20140129153408-d8zkyty1rcvvzqx3
2014-01-29 16:34:08 +01:00
Gery Debongnie
906f28109c
[IMP] improves the task analysis reporting view by adding measures to the pivot table (num paid) and changes the view in dashboard project (addon project)
...
bzr revid: ged@openerp.com-20140129152440-ibi9ity10onbi3st
2014-01-29 16:24:40 +01:00
openerp-sle
be6b038fb7
[FIX] website_customer: removed redundant template 'customer_contact', fixed the country-filtering and avoid showing 'false' when partner has not website_short_description
...
bzr revid: openerp-sle@openerp-sle.home-20140129150838-pj9hmexxl3sk89tp
2014-01-29 16:08:38 +01:00
Fabien Meghazi
07235017aa
[REM] Remove single auth="admin" left
...
bzr revid: fme@openerp.com-20140129144623-a8fy4xx3hmvcww0j
2014-01-29 15:46:23 +01:00
Gery Debongnie
8dba681c69
[IMP] improves the membership reporting view by adding a measure to the pivot table (num paid) (addon membership)
...
bzr revid: ged@openerp.com-20140129144233-4flp69bq188kdy05
2014-01-29 15:42:33 +01:00
Gery Debongnie
ddc1d840e7
[IMP] improves the Work Order Analysis reporting view, removes old Day, Month, Year field from the postgres view (addon mrp_operations)
...
bzr revid: ged@openerp.com-20140129143055-2qtivjtkpzyb13zw
2014-01-29 15:30:55 +01:00
openerp-sle
4183310021
[FIX] website_blog: correct comments anchors
...
bzr revid: openerp-sle@openerp-sle.home-20140129142034-6hl5s3vfzi5nuozj
2014-01-29 15:20:34 +01:00
Martin Trigaux
3a07e0a012
[FIX] attachement: display error message (removed inexistant template) and redraw the window (to avoid getting stucked)
...
bzr revid: mat@openerp.com-20140129141438-3883hhzdiwyoo19t
2014-01-29 15:14:38 +01:00
Christophe Simonis
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
Christophe Simonis
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
Christophe Simonis
c234d8547d
[FIX] _(): avoid useless warning where translating string without a cursor
...
bzr revid: chs@openerp.com-20140206105141-7e8bv8ordqqsswh7
2014-02-06 11:51:41 +01:00
Martin Trigaux
b75c52f3ed
[IMP] reference fields: display a more user-friendly window title when open a chosen many2one record in reference field
...
bzr revid: mat@openerp.com-20140206102409-4lbx7ofsgz8speni
2014-02-06 11:24:09 +01:00
Martin Trigaux
7950914c69
[IMP] ir_fields: no need to sanitize the _str_to_html as it is already done in the _symbol_set of html fields. This avoids doing twice the sanitization.
...
bzr revid: mat@openerp.com-20140206094628-umx2rfb9rcim7v82
2014-02-06 10:46:28 +01:00
Martin Trigaux
909ff6e368
[MERGE] [FIX] ir_fields: allow convertion from string to html using sanitize function
...
This is required to be able to import csv file containing html fields
lp bug: https://launchpad.net/bugs/1093800 fixed
bzr revid: mat@openerp.com-20140206084708-j63kpkr9apd3j01j
2014-02-06 09:47:08 +01:00
Launchpad Translations on behalf of openerp
7c691e9e27
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140206062518-3g0oj0z7mlartzal
2014-02-06 06:25:18 +00:00
Launchpad Translations on behalf of openerp
ffabcd257c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140206062321-j6cpns6xz3f81net
bzr revid: launchpad_translations_on_behalf_of_openerp-20140206062510-x502ahdwzezvea54
2014-02-06 06:25:10 +00:00
Martin Trigaux
7c7081df56
[MERGE] [FIX] account: action 'Journal Items' on a journal entries should restrict by account.move and not journal (src_model) (opw 585153)
...
bzr revid: mat@openerp.com-20140205132057-jxxmmyhfk6c15w9o
2014-02-05 14:20:57 +01:00
Martin Trigaux
ea3c17a2e9
[MERGE] [FIX] search: make sure search view is not destroyed when starting SearchView widget
...
This avoids getting the error 'Cannot call method 'getParent' of undefined'
lp bug: https://launchpad.net/bugs/1178289 fixed
bzr revid: mat@openerp.com-20140205102107-5ggbbkyr172855uu
2014-02-05 11:21:07 +01:00
Denis Ledoux
34beebac6c
[FIX] account: residual amount computation with refund invoices
...
On invoice residual amount computing, we ignore reconcile entries line if their invoice are not of the same type of the current invoice
The above revision(s) will be removed
bzr revid: dle@openerp.com-20140205100324-5tyquozmylcp40p1
2014-02-05 11:03:24 +01:00
Thibault Delavallée
a7c7e33131
[FIX] mass_mailing: fixed variables used outside of their scope
...
bzr revid: tde@openerp.com-20140204165949-9xax1pul22ktsf41
2014-02-04 17:59:49 +01:00
Martin Trigaux
14631ed6c5
[FIX] css: remove height: 18px on .oe_facet_value property to avoid long filter name to exceed the size of the box (on 2 lines)
...
bzr revid: mat@openerp.com-20140204155046-ifqts8mpaqhgvjnj
2014-02-04 16:50:46 +01:00
Martin Trigaux
d298449277
[MERGE] [FIX] audittrail: various bugs (opw 603072)
...
- tracking unlink does not fail anymore
- do not track virtual fields on res.users model (would for .column call)
- make sure read calls with one id works (launchpad bug lp:1214149)
- select the correct model when tracking x2m fields values
bzr revid: mat@openerp.com-20140204151136-51cm1tbgvcsnlsoe
2014-02-04 16:11:36 +01:00