c202dc1c52
merge upstream
...
bzr revid: chs@openerp.com-20140129190834-xfcat3ulfbg5omhn
2014-01-29 20:08:34 +01:00
947fe0da24
[FIX] calendar: use correct xmlid
...
bzr revid: chs@openerp.com-20140129185229-d75g5fsv77468tih
2014-01-29 19:52:29 +01:00
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
55fdaf0dd0
[FIX] website_sale: activate test tour
...
bzr revid: chm@openerp.com-20140129175038-663iuxiv0os6f9xt
2014-01-29 18:50:38 +01:00
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
c4e48e2388
[REM] Removed auth='admin' from modules
...
bzr revid: fme@openerp.com-20140129171520-wkz8ot4pa63utoi3
2014-01-29 18:15:20 +01:00
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
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
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
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
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
a09fa10c49
[FIX] website_mail: useless and expensive DISTINCT
...
bzr revid: odo@openerp.com-20140129162532-os3lzjyf87hg1ouc
2014-01-29 17:25:32 +01:00
0ac11b430f
[IMP] website_sale: spellchecking
...
bzr revid: odo@openerp.com-20140129162331-sjmquzz172h9dkp4
2014-01-29 17:23:31 +01:00
b7f88a58fb
[FIX] website:_mail: fix followers
...
bzr revid: chm@openerp.com-20140129170829-abmv73xswzl6ccm9
2014-01-29 18:08:29 +01:00
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
83196be65e
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20140129161802-14patbv206pqj68j
2014-01-29 17:18:02 +01:00
499f9164b8
[FIX] website: tour banner
...
bzr revid: chm@openerp.com-20140129161434-s5razyi3eqeq30vn
2014-01-29 17:14:34 +01:00
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
f31ddba8b3
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140129153718-b86vsyogxkr8lk19
2014-01-29 16:37:18 +01:00
9860ddd352
[REM] POS: Replaced auth="admin" by auth="none"
...
bzr revid: fme@openerp.com-20140129153408-d8zkyty1rcvvzqx3
2014-01-29 16:34:08 +01:00
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
4183310021
[FIX] website_blog: correct comments anchors
...
bzr revid: openerp-sle@openerp-sle.home-20140129142034-6hl5s3vfzi5nuozj
2014-01-29 15:20:34 +01:00
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
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
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
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
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
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
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
7c691e9e27
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140206062518-3g0oj0z7mlartzal
2014-02-06 06:25:18 +00:00
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
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
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
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
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
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
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
df0076c67d
[FIX] getParent() js error when clicking to fast on menu items of dashboards
...
bzr revid: cto@openerp.com-20140204150544-nkuhxree6qijihq2
2014-02-04 16:05:44 +01:00
985ddf3baf
[FIX] auditrail: in case of unlink retrieve first the record and then execute the unlink (the other way around is causes problems for name_get...)
...
bzr revid: mat@openerp.com-20140204142825-jtln4kyfmfhgq4sd
2014-02-04 15:28:25 +01:00
02024a6dfc
[FIX] qweb templates: t-raw to t-esc
...
t-raw usage is discourage if not to displayed html content (after escaping) as it may contain unsafe data
bzr revid: mat@openerp.com-20140204141913-e5hcaml53woumlgs
2014-02-04 15:19:13 +01:00
45f52a3493
[FIX] audittrail: fixing various bugs
...
iter only on fields on __all_columns, this avoids getting inexistant fields such as 'in_group_42' for res.users
make sure read method calls works when passing only one id (lp:1214149)
when itering on change values, if different model (eg: if field is o2m) make sure make name_get on the model of the field and not on the parent model
lp bug: https://launchpad.net/bugs/1214149 fixed
bzr revid: mat@openerp.com-20140204141449-2f922k5awixh1kzt
2014-02-04 15:14:49 +01:00
612fcf8540
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9806 revid:dle@openerp.com-20140204124249-qjjhulqojvcm08k4
...
bzr revid: dle@openerp.com-20140204124802-0yl2z6nr0zflhi9u
2014-02-04 13:48:02 +01:00
8a81670cb0
[FIX] purchase: hide receive invoice if invoice based on purchase order line.
...
It has to be done manually.
opw-603620
bzr revid: dle@openerp.com-20140204124249-qjjhulqojvcm08k4
2014-02-04 13:42:49 +01:00
6cb3c4b735
[FIX] some other t-raw to t-esc conversions
...
bzr revid: mat@openerp.com-20140204124242-emrd7hwlk6d4umkj
2014-02-04 13:42:42 +01:00
5aedbce448
[FIX] account_analytic_analysis: currency were wrong when preparing recurring invoices
...
The id of the sale pricelist of the customer was set as currency_id, instead of using the id of the currency of the pricelist. (Obviously)
Furthermore, the currency of the contract pricelist takes the lead.
Then, if none of these two are set, we choose the currency of the company, finally.
bzr revid: dle@openerp.com-20140204115226-rowmbr5223fcu08k
2014-02-04 12:52:26 +01:00
57b3abdbd6
[FIX] mail: escape user and partner names before being rendered in mail widgets
...
lp bug: https://launchpad.net/bugs/1276078 fixed
bzr revid: mat@openerp.com-20140204113358-2cb39l7ge2f5pcg5
2014-02-04 12:33:58 +01:00
bd4f015533
[FIX]stock: product Forecasted Quantity, incoming and outgoing help tooltip were half removed
...
bzr revid: dle@openerp.com-20140204100835-z0mlvoot21yoz0z3
2014-02-04 11:08:35 +01:00
a12fb24290
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140204064842-0dbci9bv8whxs8ax
2014-02-04 06:48:42 +00:00
2bebb9cd4d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140201065304-8md3g4d14l1b51ii
bzr revid: launchpad_translations_on_behalf_of_openerp-20140202060105-bnt8nw1mcbg2c3m3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140203055609-uxdqgnistwilvo2v
bzr revid: launchpad_translations_on_behalf_of_openerp-20140204064835-qdcrcxldc5zsutio
2014-02-04 06:48:35 +00:00
4f827ec044
[MERGE] Merge with 7.0-fix-css-clearfix-jke - bug clearfix on oe_title and oe_form_group
...
bzr revid: jke@openerp.com-20140203180637-er9c45xm0d9sk7ub
2014-02-03 19:06:37 +01:00
Christophe Simonis
Christophe Matthieu
Denis Ledoux
Fabien Meghazi
Olivier Dony
Frédéric van der Essen
Antony Lesuisse
openerp-sle
Martin Trigaux
Launchpad Translations on behalf of openerp
Thibault Delavallée
Cecile Tonglet
jke-openerp