P. Christeas
98ab6360ed
Merge branch11 into patch18
...
Branch patch11 had somewhere been lost in bzr hell.
Conflicts:
account/account_move_line.py
document_webdav/nodes.py
document_webdav/webdav_server.py
event_project/__init__.py
users_ldap/users_ldap.py
bzr revid: p_christ@hol.gr-20101223155444-ym8r0g4208gm88j9
2010-12-23 17:54:44 +02:00
P. Christeas
43387c7f43
document: improve the attach_parent_id() function.
...
No need to call an SQL command in iteration! No need to transfer the
db_datas back and forth from Postgres!
Also, prepended an underscore, so that the function is never exported
through RPC.
bzr revid: p_christ@hol.gr-20101223142529-hgudbfj54p4d2e34
2010-12-23 16:25:29 +02:00
P. Christeas
f551479a9b
document: even better fix for std_index, which won't leave zombies
...
As in 342b1f32adacf0a, Popen processes need to be properly exited.
bzr revid: p_christ@hol.gr-20101223141744-bbuipsqwqb4wczb5
2010-12-23 16:17:44 +02:00
P. Christeas
8e8803e9df
document, caldav: revert changes that are not needed and spacing
...
Let's keep the diff against trunk-dev-addons1 only to things that
make sense.
bzr revid: p_christ@hol.gr-20101223141639-o13v6llljplpgl7s
2010-12-23 16:16:39 +02:00
P. Christeas
6d38e064e2
doc webdav: revert changes, that would break https
...
See commit 848c3f9ad2df3. Again, read it a few times.
bzr revid: p_christ@hol.gr-20101223141403-6qbj4ysz06mmvuih
2010-12-23 16:14:03 +02:00
atp (Open ERP)
40201bfea2
[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
...
bzr revid: atp@tinyerp.co.in-20101223105705-xyo4vu424j3lhqlt
2010-12-23 16:27:05 +05:30
atp (Open ERP)
ffa6d2dda7
[IMP]
...
bzr revid: atp@tinyerp.co.in-20101223101118-el1zl830r8yj36h2
2010-12-23 15:41:18 +05:30
atp (Open ERP)
ccf73d0da6
[REM]: Remove conflict after Merge
...
bzr revid: atp@tinyerp.co.in-20101223100820-ctvvmg3so6e0rk69
2010-12-23 15:38:20 +05:30
atp (Open ERP)
5633f1b6ba
[Fix]: Fixed documents lost problem which are added before installed document module.
...
bzr revid: atp@tinyerp.co.in-20101223095109-ntp3hrl30xb82pya
2010-12-23 15:21:09 +05:30
Sbh (OpenERP)
6b8317f704
[MERGE] Merge crm and project improvement
...
bzr revid: sbh@tinyerp.com-20101223081458-kcbi2ul623hxr31y
2010-12-23 13:44:58 +05:30
Sbh (OpenERP)
d375799f66
[Merge] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20101223080924-807erjthd9qw1i61
2010-12-23 13:39:24 +05:30
Sbh (OpenERP)
7c46db34b0
[IMP] project: Add the column in task list view
...
bzr revid: sbh@tinyerp.com-20101223061902-o3o2inzyd954c3n4
2010-12-23 11:49:02 +05:30
Sbh (OpenERP)
2fd1445f10
[IMP] project: set invisible on task work when state is draft
...
bzr revid: sbh@tinyerp.com-20101223060808-vz1u88ta4od5whgx
2010-12-23 11:38:08 +05:30
Sbh (OpenERP)
8e815a464d
[IMP] crm_claim: change string name of history tab
...
bzr revid: sbh@tinyerp.com-20101223055210-zmbrz83411j7uvg4
2010-12-23 11:22:10 +05:30
8aaf1f2bdc
[Fix] base_setup: Fix the currency without symbol returns
...
lp bug: https://launchpad.net/bugs/692970 fixed
bzr revid: sbh@tinyerp.com-20101223053420-zvc2rdof61tawxa3
2010-12-23 11:04:20 +05:30
Sbh (OpenERP)
a057f85208
[IMP] crm,project_issue,hr_recruitment: improve the tooltips and renmae the history tab to Communication history
...
bzr revid: sbh@tinyerp.com-20101223053045-jb6rfbwfr6ul1lin
2010-12-23 11:00:45 +05:30
3ce82d3133
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101223050236-jfm5xs0fdmqb9mvs
2010-12-23 05:02:36 +00:00
ffc6599f95
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101223050045-9jqin0v5yb60bv3a
2010-12-23 05:00:45 +00:00
Sbh (OpenERP)
e642d547c7
[MERGE] merge with team1 branch
...
bzr revid: sbh@tinyerp.com-20101223042357-y5gu7nyglvcqhsbd
2010-12-23 09:53:57 +05:30
045728783b
[FIX] account_voucher: fixed onchange_date method
...
bzr revid: qdp-launchpad@tinyerp.com-20101222224722-co70k0g3d9y22cku
2010-12-22 23:47:22 +01:00
Fabien Pinckaers
f644f08841
merge
...
bzr revid: fp@tinyerp.com-20101222184021-7vzgrjcgbnmnnfq5
2010-12-22 19:40:21 +01:00
Fabien Pinckaers
fce401d775
fix_import
...
bzr revid: fp@tinyerp.com-20101222183926-pstib972t969ka5n
2010-12-22 19:39:26 +01:00
Olivier Dony
ef47084aa4
[FIX] ir.property: record rules should only allow reading current company properties, not child ones as well
...
lp bug: https://launchpad.net/bugs/691541 fixed
bzr revid: odo@openerp.com-20101222175258-8aesquwk6v9d4lv4
2010-12-22 18:52:58 +01:00
Olivier Dony
45c4bd0861
[FIX] product: by default products should be visible in parent and child companies
...
bzr revid: odo@openerp.com-20101222174349-jisnsfu1cjucgxbm
2010-12-22 18:43:49 +01:00
Olivier Dony
9e5a6481a3
[FIX] res.currency, account: moved account-related res.currency code from base (second part)
...
lp bug: https://launchpad.net/bugs/557325 fixed
bzr revid: odo@openerp.com-20101222174159-t4i0am9adanns3ya
2010-12-22 18:41:59 +01:00
Thibault Francois
7d1a4cb28d
[FIX] base_calendar view
...
bzr revid: tfr@openerp.com-20101222173601-y4g0x5obvc7riq41
2010-12-22 18:36:01 +01:00
Thibault Francois
1e747bdebd
[IMP] usability : crm meeting view improvement
...
bzr revid: tfr@openerp.com-20101222173438-9npfct260bg1wkdu
2010-12-22 18:34:38 +01:00
Olivier Dony
1ba93c18e1
[FIX] convert: avoid treating XML comments as real nodes when loading views
...
lp bug: https://launchpad.net/bugs/693344 fixed
bzr revid: odo@openerp.com-20101222164515-k60bq20jzngnnghv
2010-12-22 17:45:15 +01:00
Olivier Dony
25d6d96be8
[FIX] res.currency: moved account-related res.currency code to account module
...
lp bug: https://launchpad.net/bugs/557325 fixed
bzr revid: odo@openerp.com-20101222161045-65kzccw65ya55jm9
2010-12-22 17:10:45 +01:00
Olivier Dony
fd5d06ec56
[FIX] res.currency, account: moved account-related res.currency code from base
...
lp bug: https://launchpad.net/bugs/557325 fixed
bzr revid: odo@openerp.com-20101222160926-0eprbvw7wvqked81
2010-12-22 17:09:26 +01:00
Thibault Francois
08876fd85b
[MERGE]
...
bzr revid: tfr@openerp.com-20101222135107-49okognm74r577fj
2010-12-22 14:51:07 +01:00
Olivier Dony
a073aea2a4
[FIX] doc/INSTALL: mention yaml dependency, added to doc.openerp.com too
...
bzr revid: odo@openerp.com-20101222135005-t23nu4s2gv83hy0q
2010-12-22 14:50:05 +01:00
02af34f560
[FIX] account_voucher: multi_currency handling with proper rate (based on the voucher date instead of current date)
...
bzr revid: qdp-launchpad@tinyerp.com-20101222133510-f8xzfmx9mufkuq8v
2010-12-22 14:35:10 +01:00
0291ffa1e5
[FIX] account, account.move.line: removed the string replacement on the fields_view_get in order to allow the translations
...
bzr revid: qdp-launchpad@tinyerp.com-20101222133317-jfa6kqp9mcekjvcj
2010-12-22 14:33:17 +01:00
Thibault Francois
b845bb4ee1
[MERGE] trunk dev addons1
...
bzr revid: tfr@openerp.com-20101222132330-537grpixmbdtz43s
2010-12-22 14:23:30 +01:00
333f5b21c2
[FIX] account: fixed onchange of type in the account.journal form view
...
bzr revid: qdp-launchpad@tinyerp.com-20101222101655-pagdwermbumdffx8
2010-12-22 11:16:55 +01:00
8be856082e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101222054619-0p561c2n1h18e0tc
2010-12-22 05:46:19 +00:00
Sbh (OpenERP)
1319936fdb
[MERGE] Bug fix lp:692971
...
bzr revid: sbh@tinyerp.com-20101222051836-mugpek40a77ja311
2010-12-22 10:48:36 +05:30
Sbh (OpenERP)
b3241b1d61
[MERGE] Merge with team1 branch
...
bzr revid: sbh@tinyerp.com-20101222050433-40ta073dsg7zwdpo
2010-12-22 10:34:33 +05:30
Sbh (OpenERP)
15d4d88ee3
[Fix] hr_timesheet: fix the yml
...
bzr revid: sbh@tinyerp.com-20101222045958-br77qum40o3sblhl
2010-12-22 10:29:58 +05:30
Sbh (OpenERP)
bffb6b96c7
[Fix] Sign in / Sign out by project is not available if the project module is not installed
...
lp bug: https://launchpad.net/bugs/692971 fixed
bzr revid: sbh@tinyerp.com-20101222045353-vqzmi0z3hoduifba
2010-12-22 10:23:53 +05:30
Sbh (OpenERP)
d9f2060af1
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20101222040512-6ahyzlwt9fnpdl2r
2010-12-22 09:35:12 +05:30
Fabien Pinckaers
acb90442a6
fix_man_page
...
bzr revid: fp@tinyerp.com-20101221202727-lsq8uhdwf85nixds
2010-12-21 21:27:27 +01:00
Fabien Pinckaers
e15952531b
fix_lp_673696
...
bzr revid: fp@tinyerp.com-20101221202418-no013141bquj5k6z
2010-12-21 21:24:18 +01:00
Fabien Pinckaers
3df9607a60
fix
...
bzr revid: fp@tinyerp.com-20101221201517-286g910bux4jas0o
2010-12-21 21:15:17 +01:00
Fabien Pinckaers
7cd08c8bc3
index on res_request
...
bzr revid: fp@tinyerp.com-20101221200635-9qjowoftlsxcf9lf
2010-12-21 21:06:35 +01:00
Olivier Dony
df25a5570c
[I18N] all: cleanup export after fixing some remaining translation export issues
...
bzr revid: odo@openerp.com-20101221194751-g69ixmtrurd6ewo7
2010-12-21 20:47:51 +01:00
Fabien Pinckaers
698584b477
merge
...
bzr revid: fp@tinyerp.com-20101221193940-k11n92v4sdnr78jf
2010-12-21 20:39:40 +01:00
Fabien Pinckaers
80b21b75d9
[FIX] import / export
...
bzr revid: fp@tinyerp.com-20101221193847-z9rkx9o4gc0o92dd
2010-12-21 20:38:47 +01:00
Olivier Dony
24b332f5f8
[FIX] product: better natural order for products (suggested by F. Gassauer)
...
lp bug: https://launchpad.net/bugs/692694 fixed
bzr revid: odo@openerp.com-20101221193442-rruy5ghpb1mtguch
2010-12-21 20:34:42 +01:00
P. Christeas