Amit Bhavsar (Open ERP)
98e8778028
[MERGE] merge with latest trunk.
...
bzr revid: amb@tinyerp.com-20131126091004-vfzynh766ueesq9z
2013-11-26 14:40:04 +05:30
Turkesh Patel (Open ERP)
a68dbfe286
[RMV] remove all currecny related stuff as per the comments of fp sir.
...
bzr revid: tpa@tinyerp.com-20131126064238-odztahk0kofak3vh
2013-11-26 12:12:38 +05:30
Launchpad Translations on behalf of openerp
d95ef220d5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131126060746-ta374lckemq8t257
2013-11-26 06:07:46 +00:00
Turkesh Patel (Open ERP)
b08503e373
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20131126052924-xn4qn67lehe6x2pj
2013-11-26 10:59:24 +05:30
Christophe Simonis
63601c6650
[FIX] html_sanitize does not raise exception for empty string anymore. correct related test
...
bzr revid: chs@openerp.com-20131125174956-1y13zszzf9h2pkl6
2013-11-25 18:49:56 +01:00
Frédéric van der Essen
1a96fe1402
[WIP] point_of_sale: mobile ui optimisations
...
bzr revid: fva@openerp.com-20131125172726-xp81rn938rtfwlbs
2013-11-25 18:27:26 +01:00
Christophe Simonis
28581cc734
[MERGE] manual forward port of changes made in http dispatching in saas-2 branch since last web revid 3865 dle@openerp.com-20131023113414-mlwppd4d7vyh1tyj
...
bzr revid: chs@openerp.com-20131125165804-0d25q1vn5z0y9nv8
2013-11-25 17:58:04 +01:00
Thibault Delavallée
4be6ac800b
[FIX] mail: in some cases tracking is called
...
without the context (some workflows for example). In that case use the
current user lang when generating the automatic message. This is done
by adding it in the context if not present.
lp bug: https://launchpad.net/bugs/1219163 fixed
bzr revid: tde@openerp.com-20131125163808-bbbqwvx22my38zdj
2013-11-25 17:38:08 +01:00
Martin Trigaux
d547acbc4b
[MERGE] [BACKPORT] backport from saas-2 (r4976): ir.model: during garbage collection of obsolete records in _process_end, do it in anti-chronological order
...
bzr revid: mat@openerp.com-20131125162013-z6dhe8eigq7pig0x
2013-11-25 17:20:13 +01:00
Denis Ledoux
7baee28221
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9642 rev-id: dle@openerp.com-20131125160315-tj8n5bv6e5yv8jku
...
bzr revid: dle@openerp.com-20131125143003-vjtzj1c5051pdnk3
bzr revid: dle@openerp.com-20131125160523-hecq5u2uo0mfyoq0
2013-11-25 17:05:23 +01:00
Christophe Simonis
9f52ab382b
[MERGE] forward port of branch saas-2 up to revid 3887 chs@openerp.com-20131122172422-tsd8wzqkbqknrw1w
...
bzr revid: chs@openerp.com-20131125160506-30uia4pdwzpp54gj
2013-11-25 17:05:06 +01:00
Denis Ledoux
fd080fb745
[FIX]hr_timesheet_sheet: remove useless css rule, which had the effect of erasing the half timesheet weekly input on ie.
...
bzr revid: dle@openerp.com-20131125160315-tj8n5bv6e5yv8jku
2013-11-25 17:03:15 +01:00
Christophe Simonis
d26e253edd
[IMP] dumpstack dumps greenlets when running in evented mode.
...
(forward port lost during previous commit)
bzr revid: chs@openerp.com-20131125155956-x92vq9w4r9ov4vcc
2013-11-25 16:59:56 +01:00
Thibault Delavallée
1284c5c0d4
[FIX] mail: fixed reply button in mail_mail form view, should reply
...
to a mail.message, not a mail.mail.
lp bug: https://launchpad.net/bugs/1212190 fixed
bzr revid: tde@openerp.com-20131125155857-m04233fbyan7mglt
2013-11-25 16:58:57 +01:00
Thibault Delavallée
6bfcee2cb7
[FIX] mail: fixed replying to the first message in Inbox that was crashing
...
lp bug: https://launchpad.net/bugs/1212109 fixed
bzr revid: tde@openerp.com-20131125155349-4wfvjxuffnxyumkd
2013-11-25 16:53:49 +01:00
Christophe Simonis
ab386c0f5f
[MERGE] forward port of branch saas-2 up to revid 4984 chs@openerp.com-20131125151017-lmj53bxg1pfrr4a7
...
bzr revid: chs@openerp.com-20131125154140-cpbk4tcdml2a3b9n
2013-11-25 16:41:40 +01:00
Christophe Simonis
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
Christophe Simonis
bb1e256f5b
[MERGE] forward port of branch saas-2 up to revid 9010 dle@openerp.com-20131125143003-vjtzj1c5051pdnk3
...
bzr revid: chs@openerp.com-20131125150054-b135qshkx6icakgk
2013-11-25 16:00:54 +01:00
Olivier
426a643c4f
[BACKPORT] backport from saas-2 (r4976): ir.model: during garbage collection of obsolete records in _process_end, do it in anti-chronological order
...
bzr revid: olt@openerp.com-20131125144649-mib0vqic0nppziew
2013-11-25 15:46:49 +01:00
Denis Ledoux
40a7a5dc64
[FIX]hr_timesheet_sheet: report, the join clause of the view was wrong, account_analytic_line is join with hr_timesheet_sheet_sheet thanks to the sheet_id (hat.sheet_id=htss.id), not with the line_id (hat.line_id=htss.id)
...
bzr revid: dle@openerp.com-20131125142624-wilbjmlgy9yubcgk
2013-11-25 15:26:24 +01:00
Thibault Delavallée
f148061b94
[MERGE] [IMP] chatter: improved 'Log a note'
...
- the button is now only displayed for employee users. This is done
by overriding the fields_view_get in mail.thread and adding options
to the widget according to the groups the user belongs to. Indeed
it is currently not possible to set widget options specific to
some groups. Therefore an override of fields view get was
necessary.
- small layout improvements: Log a note -> Log an internal note,
background color of notes updated.
bzr revid: tde@openerp.com-20131125130455-u8517iyr4jgdgoqn
2013-11-25 14:04:55 +01:00
Martin Trigaux
9635119fc1
[FIX] fields: execute name_get for function field of type many2one as SUPERUSER_ID (same behaviour as classical many2one)
...
bzr revid: mat@openerp.com-20131125125008-wmpssjk5vygdcc0w
2013-11-25 13:50:08 +01:00
Martin Trigaux
e2102ca9ce
[IMP] orm: add missing space in error message during validation
...
bzr revid: mat@openerp.com-20131125124717-4jsqv0lfu7hpxusi
2013-11-25 13:47:17 +01:00
Martin Trigaux
04908a9911
[FIX] orm: when duplicating translated object, get more coherent source and destination values if default value is specified
...
user's language: old (untranslated) -> new (translated)
other language: old (untranslated) -> old (translated)
This allows to have coherent behaviour if copy() method is overwritten to change the text (usually applying _('%s (copy)')). The current user will see the translated terms with modification while the translations are kept for others (and need to be updated).
We prefer keeping slightly irrelevant translations (without translated version of '%s (copy)') for other languages than losing it.
The copy_data method does not modify context to get untranslatated values, done fully in copy_translation
bzr revid: mat@openerp.com-20131125122347-5p5oyxab5rf1kk7u
2013-11-25 13:23:47 +01:00
Martin Trigaux
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
Martin Trigaux
6a5cb66f35
[FIX] sale_crm: return id only for default method of type many2one field in make sale order wizard
...
bzr revid: mat@openerp.com-20131125112629-s3jtair156aqwvpj
2013-11-25 12:26:29 +01:00
Thibault Delavallée
38f3c1c1f2
[MERGE] [IMP] mail: invite wizard: the option of sending an email when inviting someone
...
is now checked by default.
bzr revid: tde@openerp.com-20131125111253-926t4d8brmd90el9
2013-11-25 12:12:53 +01:00
Martin Trigaux
fbbc6ea840
[FIX] orm: when duplicating translated object, modify the values to get more coherent values
...
user's language: old (untranslated) -> new (translated)
other language: old (untranslated) -> old (translated)
This allows to have coherent behaviour if copy() method is overwritten to change the text (usually applying _('%s (copy)')). The current user will see the translated terms with modification while the translations are kept for others (and need to be updated).
We prefer keeping slightly irrelevant translations (without translated version of '%s (copy)') for other languages than losing it.
bzr revid: mat@openerp.com-20131125110736-d6iygeq8om5y4fkz
2013-11-25 12:07:36 +01:00
Frédéric van der Essen
3fe26a6bb7
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20131125103655-2w83i8oy6ebtruin
2013-11-25 11:36:55 +01:00
Thibault Delavallée
618284c63d
[MERGE] Merged web branch holding timepicker update + kanban improvements (move into folded column): removed timepicker updates. This branch will be cleaned.
...
bzr revid: tde@openerp.com-20131125100547-vejcpe9p4le7jury
2013-11-25 11:05:47 +01:00
Thibault Delavallée
000c38816d
[MERGE] [IMP] Addons: updated some field labels to avoid duplicates to ease
...
the import / export process
Aso includes
- project: deprecated priority field: use sequence instead
- base_calendar: calendar.event: deprecated organizer field: use organize_id instead
bzr revid: tde@openerp.com-20131125093741-hx9hpj85xqfalvqw
2013-11-25 10:37:41 +01:00
ajay javiya (OpenERP)
748253929f
[IMP]: set default 'sendmail' check box true
...
bzr revid: aja@tinyerp.com-20131125092349-jpgsilprpag4a2bq
2013-11-25 14:53:49 +05:30
jke-openerp
15dc415893
[FIX] Runbot Red2Green
...
bzr revid: jke@openerp.com-20131125085018-iwck3ozjxngvz9k1
2013-11-25 09:50:18 +01:00
Olivier Dony
4e4b5af3d9
[ADD] i18n: enable Lao language (Laos) as an installation option
...
bzr revid: odo@openerp.com-20131125084215-nddml5h65i2xkuf9
2013-11-25 09:42:15 +01:00
Launchpad Translations on behalf of openerp
5f21b4bff9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131123062620-6obt60lwob64hi98
bzr revid: launchpad_translations_on_behalf_of_openerp-20131124054757-4w9nik6wieeqf0yg
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125060111-rf445xxiinvazinv
2013-11-25 06:01:11 +00:00
Launchpad Translations on behalf of openerp
3d512cf865
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131123062544-0n565bu6p07jgu7c
bzr revid: launchpad_translations_on_behalf_of_openerp-20131124054736-ndfylcrz06mb9z0i
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125060000-s033pap6hv11grl3
2013-11-25 06:00:00 +00:00
Launchpad Translations on behalf of openerp
bba9e86c41
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131123060118-7bayd565wi4mh8nk
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125053223-t2rb928yzma23a29
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125053248-reb9oruqgxx0v61c
2013-11-25 05:32:48 +00:00
Christophe Simonis
028477318e
[FIX] hr_expense: available_in_pos field belong to point_of_sale module which is not a dependency
...
bzr revid: chs@openerp.com-20131124204122-oybusqpry2uugk0e
2013-11-24 21:41:22 +01:00
Christophe Simonis
46fcc63e03
[FIX] hr_recruitment: no more date field on applicants
...
bzr revid: chs@openerp.com-20131124203605-0310whfbei1nbbq3
2013-11-24 21:36:05 +01:00
Christophe Simonis
3fb6b2965c
[FIX] {crm,crm_partner_assign}: server actions does need to be restricted by group
...
bzr revid: chs@openerp.com-20131124202723-qd4ep1q2w3pn4453
2013-11-24 21:27:23 +01:00
Christophe Simonis
f7255290b9
[FIX] project: task type does not have a closed field
...
bzr revid: chs@openerp.com-20131124200937-0hwd527qxuaezic5
2013-11-24 21:09:37 +01:00
Christophe Simonis
081085c294
[FIX] mass_mailing: statistics does not have a state field
...
bzr revid: chs@openerp.com-20131124200156-7kqad8d20jlip46t
2013-11-24 21:01:56 +01:00
Christophe Simonis
7c5994958d
[IMP] crm: TransientModel does not need access rules
...
bzr revid: chs@openerp.com-20131124182419-nn1m2prno6fk0iez
2013-11-24 19:24:19 +01:00
Christophe Simonis
00db0a025d
[IMP] */__openerp__.py: use data key instead of update_xml
...
bzr revid: chs@openerp.com-20131124181952-rflzvxqnt5augevb
2013-11-24 19:19:52 +01:00
Christophe Simonis
21349f7b68
[FIX] fleet: use only data key in manifest
...
bzr revid: chs@openerp.com-20131124181900-opd07sod4b0j3kvd
2013-11-24 19:19:00 +01:00
Christophe Simonis
d3f99f75a6
[MERGE] backport trunk revision 8974 qdp-launchpad@openerp.com-20131113100713-tvl30z5oqym22jqj
...
bzr revid: chs@openerp.com-20131124181037-1tks1yruahiv0jwi
2013-11-24 19:10:37 +01:00
Christophe Simonis
42cc2fe2f1
[FIX] portal: avoid sending email at portal demo user creation
...
bzr revid: chs@openerp.com-20131124170624-1s7dm5udo7n2wxdl
2013-11-24 18:06:24 +01:00
Christophe Simonis
043fe6c2d5
[FIX] base: on_change_login only set email for valid emails
...
bzr revid: chs@openerp.com-20131124164435-977xi3eg7svn5mgz
2013-11-24 17:44:35 +01:00
jke-openerp
e714331429
[REF] rb r2g
...
bzr revid: jke@openerp.com-20131124143101-v29i08qxr7p06knl
2013-11-24 15:31:01 +01:00
jke-openerp
cd4f71cf36
[REF] rb r2g
...
bzr revid: jke@openerp.com-20131124130241-s1hjdl08y5dcsnxs
2013-11-24 14:02:41 +01:00