Jiten (OpenERP)
b4f93bec8f
[Merge] Merge to get update of crm from bth's branch for social chatter.
...
bzr revid: jra@tinyerp.com-20120319070700-dvv1ild5nwuzozlx
2012-03-19 12:37:00 +05:30
Thibault Delavallée
a97652608d
[MERGE] Merged with main social branch
...
bzr revid: bth@tinyerp.com-20120319054839-fwev70kh9zdkodgt
bzr revid: tde@openerp.com-20120320104958-znzxqduxovp5wvpl
2012-03-20 11:49:58 +01:00
Thibault Delavallée
7262f0e325
[MERGE] Merged with main addons
...
bzr revid: tde@openerp.com-20120320083001-b9f4akuhnfv146hf
2012-03-20 09:30:01 +01:00
Raphael Collet
efa32c3ed1
[MERGE] lp:937194 (mail: remove character from message)
...
bzr revid: rco@openerp.com-20120320081523-nz35q1lwfwmzbo3s
2012-03-20 09:15:23 +01:00
Launchpad Translations on behalf of openerp
5704fccaec
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120316050922-okri3tsqp522c128
bzr revid: launchpad_translations_on_behalf_of_openerp-20120317045527-tp2gnkhtw9g1aeck
bzr revid: launchpad_translations_on_behalf_of_openerp-20120319044111-hx6a1shyurrbofkt
bzr revid: launchpad_translations_on_behalf_of_openerp-20120320045612-fzt50kiv2pqwzofa
2012-03-20 04:56:12 +00:00
Xavier Morel
d71340e21a
[FIX] res.country name_search
...
* also returns name-matched countries when a country matches by code
* same for states
* extract almost-identical implementations of name_search in country and state
* remove useless explicit setting of context (also wrong)
bzr revid: xmo@openerp.com-20120319162424-aycjfr0rpca3yico
2012-03-19 17:24:24 +01:00
Xavier Morel
35c0c36816
[REF] use single implementation for name_search of Country and CountryState
...
bzr revid: xmo@openerp.com-20120319162256-2wcmges2o1gqpb3e
2012-03-19 17:22:56 +01:00
Xavier Morel
f1bbbaa5f8
[FIX] res.country (and res.country.state) name_search so it returns all countries matching even when there's a country matching by code
...
bzr revid: xmo@openerp.com-20120319161526-txd1eiomjrntgmxi
2012-03-19 17:15:26 +01:00
Xavier Morel
e02eab8d97
[IMP] ignores file
...
bzr revid: xmo@openerp.com-20120319103317-8jvvhivavjjomlqy
2012-03-19 11:33:17 +01:00
Thibault Delavallée
3d0ca849b8
[FIX] mail.thread: added _fields_id='res_id' in args: allow to manually defined the _fields_id relationship of a one2many column; for this function field this is not a standard arg, but is passed as optional args. This allows to fix an issue with share module, trying to go through one2many relationships when trying to establish shared user rights.
...
bzr revid: tde@openerp.com-20120316163825-acbbv1ztnk0zmy3w
2012-03-16 17:38:25 +01:00
Olivier Dony
b7f4423ced
[FIX] Fix broken creation of database in previous commit - d'oh
...
bzr revid: odo@openerp.com-20120316155554-uq32b9ken6rcm02p
2012-03-16 16:55:54 +01:00
Olivier Dony
7f8965a00a
[IMP] tools.ustr: allow specific error-handling flags a la unicode
...
Also cleaned up docstrings
bzr revid: odo@openerp.com-20120316144002-og07it5u7x2azhu4
2012-03-16 15:40:02 +01:00
Bhumi Thakkar (Open ERP)
b20463dd38
[FIX] Renamed methods,overwrite get_needaction_user_ids and message_get_subscribers methods,remove send new mail button from view and check state draft for case_open.
...
bzr revid: bth@tinyerp.com-20120316131930-7d8it6g5y0a7u3bw
2012-03-16 18:49:30 +05:30
Olivier Dony
4af38cc64a
[IMP] attempt to dump uid performing operation along with thread stacks
...
bzr revid: odo@openerp.com-20120316111218-o963t7xm4r4honoy
2012-03-16 12:12:18 +01:00
Olivier Dony
d893cb3e80
[MERGE] dumpstacks fix from 6.1 branch
...
bzr revid: odo@openerp.com-20120316111105-c2g3mq6gzd9xe7bs
2012-03-16 12:11:05 +01:00
niv-openerp
6927f15e79
[imp] changed novajs to fire change events only when something really changed
...
bzr revid: nicolas.vanhoren@openerp.com-20120316100334-h9o58afhmzucbrn7
2012-03-16 11:03:34 +01:00
Launchpad Translations on behalf of openerp
f6baede827
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120316052914-p5yapsv9ni1xvv4q
bzr revid: launchpad_translations_on_behalf_of_openerp-20120316053017-3pne9tockyriwj6n
2012-03-16 05:30:17 +00:00
Launchpad Translations on behalf of openerp
595a4aea7a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120315045359-wvyka5craaprlj30
bzr revid: launchpad_translations_on_behalf_of_openerp-20120316051419-x54ftmkxyl1b8vgv
2012-03-16 05:14:19 +00:00
Launchpad Translations on behalf of openerp
d4319b3524
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120315044609-gdj56b4voubjv5kd
bzr revid: launchpad_translations_on_behalf_of_openerp-20120316050901-r5c17a1hfzkz9f1b
2012-03-16 05:09:01 +00:00
Georges Grogero
0fbc4084ff
[IMP] Improved default message in crm_base. Inheriting classes only have to redefine a case_get_note_msg_prefix if using the default crm_base messages.
...
bzr revid: tdelavallee@gmail.com-20120315205128-qeedjxrmscu4fafm
2012-03-15 21:51:28 +01:00
Olivier Dony
4238bc991e
[FIX] openerp-server: allow missing thread names in dump_stacks
...
Report-printing threads don't seem to be included
in the list of active threads, but do need to
be dumped as well.
bzr revid: odo@openerp.com-20120315181355-phtkn2uhy638ei1e
2012-03-15 19:13:55 +01:00
Olivier Dony
975667d190
[FIX] sale,sale_layout: avoid RML loop when printing SO with very long notes
...
Forward port of revision 5001 from the
6.0 branch. Apparently very long SO
notes (above 2200 characters) will cause
an endless loop while trying to render
inside a blockTable
bzr revid: odo@openerp.com-20120315181112-qa4ezlckzfycv5uy
2012-03-15 19:11:12 +01:00
Thibault Delavallée
1a0a7310a8
[IMP] crm: crm_base: case_XXX_send_note methods now contain default messages that can be customized with a prefix in context.
...
bzr revid: tde@openerp.com-20120315170727-joeor9yrna6vca13
2012-03-15 18:07:27 +01:00
Olivier Dony
3e0279ac4a
[FIX] email_template: attachments were not being sent due to programming error
...
bzr revid: odo@openerp.com-20120315155512-s76y2u3gz3awfy74
2012-03-15 16:55:12 +01:00
Thibault Delavallée
159badad44
[MERGE] Merged with main social branch (trunk-social-tde)
...
bzr revid: tde@openerp.com-20120315142411-8glpx8jd9nn86e2r
2012-03-15 15:24:11 +01:00
Bhumi Thakkar (Open ERP)
39c03d296c
[FIX] called case_reset_send_note method from crm_case class.
...
bzr revid: bth@tinyerp.com-20120315133252-lg6x6u5qkrzzjqey
2012-03-15 19:02:52 +05:30
Thibault Delavallée
904e18d1bf
[IMP] hr.holidays: modified get_needaction_user_id -> get_needaction_user_ids to match the new API. Fixed a removed field still present on view. Fixed small sentences.
...
bzr revid: tde@openerp.com-20120315110042-t3tk2w0524gvn3pw
2012-03-15 12:00:42 +01:00
Thibault Delavallée
c2f5c4a148
[FIX] Fixed res.needaction -> base.needaction, commented need_acion_user_id management in mail.thread because mechanism has change
...
bzr revid: tde@openerp.com-20120315105210-g6lci5nb66lo3jdy
2012-03-15 11:52:10 +01:00
Jiten (OpenERP)
0eb94e3cf5
[REM] Remove print line statement.
...
bzr revid: jra@tinyerp.com-20120315103850-5n1tr0gs8y3s6yo5
2012-03-15 16:08:50 +05:30
Thibault Delavallée
980d798e5c
[MERGE] Merged with user_img branch
...
bzr revid: tde@openerp.com-20120315103847-teqa5ciaa45y5h3u
2012-03-15 11:38:47 +01:00
Thibault Delavallée
3e17a01408
[MERGE] Merged with main addons
...
bzr revid: tde@openerp.com-20120315102249-nmw4w0w3zy98sig4
2012-03-15 11:22:49 +01:00
Jiten (OpenERP)
bb02b5f663
[IMP] Improved message notification of social for project escalation.
...
bzr revid: jra@tinyerp.com-20120315102211-0ueh26nr4yrt2lj6
2012-03-15 15:52:11 +05:30
Jiten (OpenERP)
695f3b5bda
[Merge] Merge from trunk social bth branch to get all crm_case methods.
...
bzr revid: jra@tinyerp.com-20120315064645-mbkzin1jwbg25yol
2012-03-15 12:16:45 +05:30
Jiten (OpenERP)
08ec883c3c
[Merge] Merged from trunk social tde.
...
bzr revid: jra@tinyerp.com-20120315063803-bxbu4pgnm0u7k40h
2012-03-15 12:08:03 +05:30
Jiten (OpenERP)
f7059326ac
[IMP] Improved methods of notification messages of social chatter for Project Issue.
...
bzr revid: jra@tinyerp.com-20120315062903-cg7gm6uv2rdvt9b9
2012-03-15 11:59:03 +05:30
Launchpad Translations on behalf of openerp
0284caa8f0
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120315051848-7bpke64obtjd3h06
2012-03-15 05:18:48 +00:00
Launchpad Translations on behalf of openerp
277217cae3
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120313053419-651m21hw6ja8naqc
bzr revid: launchpad_translations_on_behalf_of_openerp-20120314054403-pdvtd2s58mehtlrd
bzr revid: launchpad_translations_on_behalf_of_openerp-20120315051817-qfmyll102427mgi9
2012-03-15 05:18:17 +00:00
Olivier Dony
601da46064
[FIX] manifest flag 'active' was renamed to 'auto_install' a while ago
...
The change occurred in server at revision 3989
and in addons at revision 6451, but had never
been done in openerp-web.
One indirect consequence was that the 'base'
modules was not considered auto-installable
anymore and its CSS files were not loaded on
web, causing layout issues, namely in the
modules kanban view.
Server rev 3989 = al@openerp.com-20120130211001-ytqx759fl920uegc
Addons rev 6451 = al@openerp.com-20120130211812-w0wu42hdu4l7koc4
lp bug: https://launchpad.net/bugs/948866 fixed
bzr revid: odo@openerp.com-20120314181853-kzr6lgqxxcz7rreu
2012-03-14 19:18:53 +01:00
Thibault Delavallée
aa0ff4a15f
[REM] Removed call to removed css files
...
bzr revid: tde@openerp.com-20120314180647-3nsk77xpd3mwo83i
2012-03-14 19:06:47 +01:00
Thibault Delavallée
e755f17155
[REM] Removed some css changes. user image now only replaces the gravatar.
...
bzr revid: tde@openerp.com-20120314180352-8jpbv9j01jt5mq0y
2012-03-14 19:03:52 +01:00
Quentin (OpenERP)
9b9f9fa75b
[FIX] hr_timesheet_sheet: fixed yaml test
...
bzr revid: qdp-launchpad@openerp.com-20120314170050-kma11l6wz66vxv8v
2012-03-14 18:00:50 +01:00
Olivier Dony
caf646a7e5
[IMP] test_ir_sequence: avoid spurious traceback logging
...
bzr revid: odo@openerp.com-20120314142552-283i4s1lwrkt7zx3
2012-03-14 15:25:52 +01:00
Olivier Dony
638a9102c5
[MERGE] Latest fixes from 6.1
...
bzr revid: odo@openerp.com-20120314142043-9jpk3dkss1hkvb3q
2012-03-14 15:20:43 +01:00
Olivier Dony
01f4ecd1c0
[IMP] bump up release number
...
bzr revid: odo@openerp.com-20120314141612-3y0v4monykywvg44
2012-03-14 15:16:12 +01:00
Quentin (OpenERP)
84102aa105
[FIX] sale: fixed demo data in order to make runbot green. Having mrp and mrp_jit installed was causing an assertion failure in sale/test/cancel_order.yml because the sale.order was not in shipping exception (as the procurement was automatically confirmed). As i guess this _is_ the wanted behavior where working in just in time, i just changed the demo data in order to have the test working in 'make to stock'
...
bzr revid: qdp-launchpad@openerp.com-20120314111055-49jiz4z3p87lqos1
2012-03-14 12:10:55 +01:00
Olivier Dony
6a38a66d50
[FIX] BufferedDataSet: avoid randomizing results when there are no sort_fields
...
Array.sort is not necessarily stable, and sorting an
array with an unstable sort will cause a randomization
of the original order, which should have been preserved.
See also:
- http://ecma262-5.com/ELS5_Section_15.htm#Section_15.4.4.11
- http://code.google.com/p/v8/issues/detail?id=90
lp bug: https://launchpad.net/bugs/928389 fixed
bzr revid: odo@openerp.com-20120314111014-1igxhrynu5557di5
2012-03-14 12:10:14 +01:00
Jiten (OpenERP)
df4829dfa5
[IMP] Improved project issue
...
bzr revid: jra@tinyerp.com-20120314105159-y9i9n8kjb39r3vmu
2012-03-14 16:21:59 +05:30
Thibault Delavallée
ca7555d5b2
[IMP] Thread widget: moved all event bindings in a separate function
...
bzr revid: tde@openerp.com-20120314085128-lfyxy0029o99nel6
2012-03-14 09:51:28 +01:00
Launchpad Translations on behalf of openerp
57b2b97308
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120310052736-h7pcyns8m0yapx2r
bzr revid: launchpad_translations_on_behalf_of_openerp-20120311050705-4g6qxsmwzmefmekl
bzr revid: launchpad_translations_on_behalf_of_openerp-20120313053506-zeuvhbd8ml1rhmy8
bzr revid: launchpad_translations_on_behalf_of_openerp-20120314054433-q7eqdv6c3ise2wv1
2012-03-14 05:44:33 +00:00
Bhumi Thakkar (Open ERP)
2c84934e53
[FIX] some minor change of formatting in statement.
...
bzr revid: bth@tinyerp.com-20120314052650-jefvdtkl338df6m0
2012-03-14 10:56:50 +05:30