Denis Ledoux
4700a052ac
[MERGE]upstream
...
bzr revid: dle@openerp.com-20130621140419-9ptm2fo45o855d73
2013-06-21 16:04:19 +02:00
Vo Minh Thu
da38583b82
[IMP] oe initialize: add a file lock to protect concurrent access to the template db when creating a new db (useful when multiple oe initialize are performed at the same time).
...
bzr revid: vmt@openerp.com-20130621132411-r6trrt5kd8c4fbca
2013-06-21 15:24:11 +02:00
Martin Trigaux
4808afabff
[MERGE] [FIX] idea: remove filter on many2many field
...
bzr revid: mat@openerp.com-20130621130820-qcilacvqv2l9i3yo
2013-06-21 15:08:20 +02:00
Martin Trigaux
b3bba607e6
allow using price of 0 or less for expense
...
bzr revid: mat@openerp.com-20130621124737-zo01u5jbafnb0ges
2013-06-21 14:47:37 +02:00
Denis Ledoux
1f6bf43079
[FIX]web: views.js & coresetup.js, ir_actions_report_xml and get_file special case for iOS devices, which do not allow iframe use the way we do it
...
bzr revid: dle@openerp.com-20130621124449-e3qyz7m7yfvhta1d
2013-06-21 14:44:49 +02:00
Thibault Delavallée
5eb68b4844
[MERGE] [FIX] Various improvements in quick create in kanban view.
...
- [FIX] crm: fixed crash when searching leads/opportunities on section_id then trying to create a new lead/opportunity. The crash was due to a 'default_section_id: self' in the search_view, that is not supported in 7.0.
- [FIX] crm, task, issue, hr_applicant: fixed quick create in kanban view not taking into account the stage in which it is being created.
- [FIX] mail: when tracking modified values for automatic subscription, also take into account default values coming from the context
- [FIX] issue: added default responsible
bzr revid: tde@openerp.com-20130621122737-yu9ui86t1hvc2t2g
2013-06-21 14:27:37 +02:00
Martin Trigaux
9caf5ef64c
[FIX] hr_timehseet_invoice: allow use force product
...
bzr revid: mat@openerp.com-20130621122639-sfcb7q1pwquiz46l
2013-06-21 14:26:39 +02:00
Thibault Delavallée
6803cae6e2
[FIX] crm: removed self in default_ in search view, because this is not supported in 7.0
...
bzr revid: tde@openerp.com-20130621120609-1ez38kujfkw4ilxp
2013-06-21 14:06:09 +02:00
Martin Trigaux
ca2d1a1c37
[MERGE] sync
...
bzr revid: mat@openerp.com-20130621115631-9hsdpopro9enj5eu
2013-06-21 13:56:31 +02:00
Martin Trigaux
2c85b5a006
[IMP] updating doc for new user keyword
...
bzr revid: mat@openerp.com-20130621111116-2vls38to6ds72421
2013-06-21 13:11:16 +02:00
Martin Trigaux
bb548a1d4e
[IMP] improving the computation of res_id_field with safe eval
...
bzr revid: mat@openerp.com-20130621110758-zo20gjzaecv4iu41
2013-06-21 13:07:58 +02:00
Martin Trigaux
312d3ffc9c
[IMP] updating the docs
...
bzr revid: mat@openerp.com-20130621110727-1dqkre4h61vjnq7g
2013-06-21 13:07:27 +02:00
Thibault Delavallée
f9bc6be1ac
[CLEAN] Before merging: removed an added file not used; cleaned some debugging data; improved user form view to better separate email/login and messaging alias.
...
bzr revid: tde@openerp.com-20130621110344-zx2kxan47uctctka
2013-06-21 13:03:44 +02:00
Thibault Delavallée
4ee8b2836c
[FIX] Fixed last commit.
...
bzr revid: tde@openerp.com-20130621102021-mnozkbmz11dg5k9z
2013-06-21 12:20:21 +02:00
Mahendra Barad (OpenERP Trainee)
a116468ccf
[IMP] if internal user than invitation state goes to accepted.
...
bzr revid: nco@tinyerp.com-20130621101535-01ds8rdbeof4tbbv
2013-06-21 15:45:35 +05:30
Denis Ledoux
74ca07dd1c
[REF]crm_partner_assign: not inheriting anymore of mail.compose.message, portal views, forward to one or multi partner with automatic assignation, only one email with a list of lead instead of one mail/one lead, restructure of views.
...
bzr revid: dle@openerp.com-20130621100525-1rxkl0ydm5ogxhp2
2013-06-21 12:05:25 +02:00
Denis Ledoux
711cfafdff
[MERGE]upstream
...
bzr revid: dle@openerp.com-20130621095123-olb7h0irnoe0h4lm
2013-06-21 11:51:23 +02:00
Thibault Delavallée
82226611cf
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130522105445-3h3sl8chnfhkrdxs
bzr revid: tde@openerp.com-20130612121620-qwc9vlva27d195lp
bzr revid: tde@openerp.com-20130619125106-fy9jjgsyb3fg04fn
bzr revid: tde@openerp.com-20130621094755-t3h5y2s8p838b7u3
2013-06-21 11:47:55 +02:00
Thibault Delavallée
19f934e81e
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130621094658-8a30z60e49jtaptw
2013-06-21 11:46:58 +02:00
Denis Ledoux
efca91362a
[IMP]crm_partner_assign: using child of to find all partner from a company
...
bzr revid: dle@openerp.com-20130621094347-lmjd6tna1gffjxel
2013-06-21 11:43:47 +02:00
Thibault Delavallée
67e4eff42b
[CLEAN] Some code cleaning before merging.
...
bzr revid: tde@openerp.com-20130621093732-qc9ltxfiemmi421s
2013-06-21 11:37:32 +02:00
Thibault Delavallée
b7f4ddb880
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130621092424-supbxu8mwm2qtu6b
2013-06-21 11:24:24 +02:00
Denis Ledoux
8f75b73120
[DEL]crm_partner_assign: remove of useless action
...
bzr revid: dle@openerp.com-20130621091322-nwmsrwidy4ycp24h
2013-06-21 11:13:22 +02:00
Martin Trigaux
d42eccc9b8
cleaning, remove fixed TODO
...
bzr revid: mat@openerp.com-20130621091234-wgeuhikyrb3qvmjr
2013-06-21 11:12:34 +02:00
Amit Bhavsar (Open ERP)
2e494c9a9d
[Fleet] Improve fields string.
...
bzr revid: amb@tinyerp.com-20130621090827-7222v30shoat0521
2013-06-21 14:38:27 +05:30
Martin Trigaux
82db3581b6
[IMP] gamfication: removed duplicate po, fix sending message
...
bzr revid: mat@openerp.com-20130621090252-8dvi2ytjwt3flcrq
2013-06-21 11:02:52 +02:00
Martin Trigaux
828950cf93
[FIX] gamification: send badge as superuser
...
bzr revid: mat@openerp.com-20130621090139-dptxjh66ocy10bi2
2013-06-21 11:01:39 +02:00
ajay javiya (OpenERP)
ecae492f01
[MERG]: sync with trunk
...
bzr revid: aja@tinyerp.com-20130621084804-cwsidnt12wsslxp2
2013-06-21 14:18:04 +05:30
Martin Trigaux
f0d112755a
[MERGE] revert deleted po files
...
bzr revid: mat@openerp.com-20130621083828-axqhyob3lfbxgn84
2013-06-21 10:38:28 +02:00
Martin Trigaux
0f912e0b35
[IMP] gamification: allow translation of check_challenge_reward messages
...
bzr revid: mat@openerp.com-20130621083140-9awr071wzhrv5pzv
2013-06-21 10:31:40 +02:00
Martin Trigaux
027fb2bb23
[FIX] gamification: correct report sending
...
bzr revid: mat@openerp.com-20130621082428-5nxalipljwsgbi2j
2013-06-21 10:24:28 +02:00
Martin Trigaux
ad78a1b6aa
[MERGE] sync with latest trunk
...
bzr revid: mat@openerp.com-20130621075406-d9syftu04k8iytcz
2013-06-21 09:54:06 +02:00
Martin Trigaux
eac496bb64
[IMP] doc: add changelog for changes in addons revision 8753
...
bzr revid: mat@openerp.com-20130621074428-tljs9v8rxd891quf
2013-06-21 09:44:28 +02:00
ajay javiya (OpenERP)
577aa59a7e
[FIX]: Traceback when create employee
...
bzr revid: aja@tinyerp.com-20130621073230-hapnux9r64a7g6mq
2013-06-21 13:02:30 +05:30
Nimesh Contractor (OpenERP)
78619253d2
[IMP] set ids.
...
bzr revid: nco@tinyerp.com-20130621062345-4aqhvuzxn6godrym
2013-06-21 11:53:45 +05:30
Launchpad Translations on behalf of openerp
30b55c6f28
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130620063516-l62hazz4b5zm9k6p
bzr revid: launchpad_translations_on_behalf_of_openerp-20130621060730-fbgecd0fqut0udm9
2013-06-21 06:07:30 +00:00
ajay javiya (OpenERP)
f478332a15
[IMP]:track task/issue assigned
...
bzr revid: aja@tinyerp.com-20130621060330-8m4vzc7jimg36oa6
2013-06-21 11:33:30 +05:30
Launchpad Translations on behalf of openerp
9ebfb79b6b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130620051737-xbqoctnhldtcmkw4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130621053607-64zd4ftmfys6i16f
2013-06-21 05:36:07 +00:00
Amit Bhavsar (Open ERP)
2c75fb7935
[MERGE] merge with latest trunk
...
bzr revid: amb@tinyerp.com-20130621053444-l0l3xgbyjqo0s7tl
2013-06-21 11:04:44 +05:30
Nimesh Contractor (OpenERP)
1b5e51e2e8
[MERGE] lp:~openerp-dev/openobject-addons/trunk-meeting_attendees-cha
...
bzr revid: nco@tinyerp.com-20130621051218-cq0j9minq424yid8
2013-06-21 10:42:18 +05:30
ajay javiya (OpenERP)
c3b83a55b2
[MERGE]:sync with trunk
...
bzr revid: aja@tinyerp.com-20130621050544-v9nmhhxmudx44hs9
2013-06-21 10:35:44 +05:30
Maxime Chambreuil
a00638ba03
[MRG] Fix lp:1189050
...
bzr revid: maxime.chambreuil@gmail.com-20130620225329-rxp3adib5vp6sofj
2013-06-20 18:53:29 -04:00
Maxime Chambreuil
a30a6dbd14
[FIX] Tax Name and Fiscal Position source tax constraints
...
[ADD] International mapping in fiscal positions
[DEL] Account mapping in fiscal positions
bzr revid: maxime.chambreuil@gmail.com-20130620223245-62qcvto6s1bfmrsm
2013-06-20 18:32:45 -04:00
Antony Lesuisse
9a8ff60da0
file based openerp views
...
bzr revid: al@openerp.com-20130620221648-kj53t7vdopfab0c2
2013-06-21 00:16:48 +02:00
Maxime Chambreuil
35707831d5
[IMP] Fix fiscal positions
...
lp bug: https://launchpad.net/bugs/1192629 fixed
bzr revid: maxime.chambreuil@gmail.com-20130620194030-i7h07e9rf2jsgft4
2013-06-20 15:40:30 -04:00
Denis Ledoux
69c314c51d
[RENAME]RERENAME crm_channel => crm_partner_assign, for migration and translation issue
...
bzr revid: dle@openerp.com-20130620175326-0lgpbdxiusa65ss2
2013-06-20 19:53:26 +02:00
Antony Lesuisse
ab8e0f89b4
use read_combined instead of fields_view_get to check inherited views
...
bzr revid: al@openerp.com-20130620154617-uiceguvzjtu3ab87
2013-06-20 17:46:17 +02:00
Denis Ledoux
b8529b22a8
[MERGE]upstream
...
bzr revid: dle@openerp.com-20130620152606-yj5y61799v019yqd
2013-06-20 17:26:06 +02:00
Denis Ledoux
d6ce1e643f
[FIX]crm_channel: email inform when the user has no portal access
...
bzr revid: dle@openerp.com-20130620152429-stiad890f688df5o
2013-06-20 17:24:29 +02:00
Denis Ledoux
1a8fa4dcbe
[FIX]crm_channel: remove removed files from __openerp__.py
...
bzr revid: dle@openerp.com-20130620152402-uza52w5xiyr6vpyt
2013-06-20 17:24:02 +02:00