sbh (Open ERP)
a5bd782fd1
[MERGE] project Improvment
...
bzr revid: sbh@tinyerp.com-20101118100940-z7z6cjocs940ovwg
2010-11-18 15:39:40 +05:30
vda (Open ERP)
a578d8a6bf
[FIX] Widget per user.
...
bzr revid: vda@tinyerp.com-20101118093845-l94t2z4qw9kc4dse
2010-11-18 15:08:45 +05:30
nvi-openerp
d5debf686f
[IMP] wip
...
bzr revid: nicolas.vanhoren@openerp.com-20101118093412-czjcmcqupngfqjnt
2010-11-18 10:34:12 +01:00
Mustufa Rangwala
e84e5841b2
[MEREGE] Hr_holidays: update demo of allocation req user can not take atlease 20 days, and remove buttons from hr leaves tree view accept first and second approval buttons
...
bzr revid: mra@mra-laptop-20101118092127-9d1ehlwmes0xrmor
2010-11-18 14:51:27 +05:30
rch-openerp
46571ed5a7
[Merge]: Merge from lp:~openerp-dev/openobject-addons/report_dev.
...
bzr revid: rch@tinyerp.com-20101118091403-wnoftxwop5tx6kya
2010-11-18 14:44:03 +05:30
pso
5b7e4ae117
[IMP] hr_holidays: Improved view file
...
bzr revid: pso@tinyerp.com-20101118090417-jh30e5dbmy7p2p77
2010-11-18 14:34:17 +05:30
rch-openerp
34dbad4d9c
[Merge]: Merge from lp:~openerp-dev/openobject-server/report_server.
...
bzr revid: rch@tinyerp.com-20101118085933-xf4cay4dub5ff4s2
2010-11-18 14:29:33 +05:30
pso
668b7caba0
[MERGE] merge from trunk addons3
...
bzr revid: pso@tinyerp.com-20101118085221-j05wjc0enfq2m8vt
2010-11-18 14:22:21 +05:30
rpa (Open ERP)
0ea8b6a3f5
[MERGE]: merge with lp:~openerp-dev/openobject-addons/ron-dev-addons2
...
bzr revid: rpa@tinyerp.com-20101118084254-r8rlpp12hd24jsng
2010-11-18 14:12:54 +05:30
pso
25972d2cc3
[IMP] hr_holidays: Improved demo file
...
bzr revid: pso@tinyerp.com-20101118084146-a4ixwa81n9tn62gi
2010-11-18 14:11:46 +05:30
ssi
b59f70ed08
[IMP]project: added sum of hours spent on task.
...
bzr revid: ssi@tinyerp.com-20101118083524-lri1a9tsdrerq1gd
2010-11-18 14:05:24 +05:30
mtr
dd50d55b8d
[IMP] Account: Partner Ledger Report-cummulative balance
...
bzr revid: mtr@mtr-20101118082759-3sztv3si7sc5kztj
2010-11-18 13:57:59 +05:30
AMP (OpenERP)
4acf094a47
[MOD/IMP] : Small Usebility Improvement
...
bzr revid: amp@tinyerp.com-20101118072615-fa1rn4vu3ijlhw9n
2010-11-18 12:56:15 +05:30
rpa (Open ERP)
6c73e2ddee
[MERGE]: Merge with lp:~openerp-dev/openobject-addons/ksa-addons2/
...
bzr revid: rpa@tinyerp.com-20101118070823-x9u2ctofgh24lj2u
2010-11-18 12:38:23 +05:30
Mustufa Rangwala
e4be43236d
[MERGE] l10n_gr: Replace tab with 4 spaces
...
bzr revid: mra@mra-laptop-20101118065815-so2nzozatw95jyde
2010-11-18 12:28:15 +05:30
ksa (Open ERP)
06187294ab
[IMP]:task-1773 improvement by given comment
...
bzr revid: ksa@tinyerp.co.in-20101118064712-zuuj9wim9h140olk
2010-11-18 12:17:12 +05:30
Mustufa Rangwala
e1ee38bbad
[ADD] l10n_ch: back demo of payment mode
...
bzr revid: mra@mra-laptop-20101118064549-91ziuutpjhcuh3tl
2010-11-18 12:15:49 +05:30
ARA (OpenERP)
293a3e1764
[MERGE] merge from dev3
...
bzr revid: ara@tinyerp.com-20101116095529-alz3gxamsln32r6q
bzr revid: ara@tinyerp.com-20101118062940-15l025tjmcnzcqq7
2010-11-18 11:59:40 +05:30
psi (Open ERP)
db10d11f42
[MERGE] merge with dev-addons3 branch
...
bzr revid: psi@tinyerp.co.in-20101118061407-8uqb1k91u4bm3zlm
2010-11-18 11:44:07 +05:30
psi (Open ERP)
6544f14dc9
[MERGE] merge with dev-addons3 branch
...
bzr revid: psi@tinyerp.co.in-20101118061323-hmoi5ncs19zy56ye
2010-11-18 11:43:23 +05:30
uco (OpenERP)
9f6f4d1d3f
[MERGE]: Merged with team1.
...
bzr revid: uco@tinyerp.com-20101118054913-eocpgiag58j4148c
2010-11-18 11:19:13 +05:30
jam-openerp
7a7ced8aa0
[MERGE] with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
...
bzr revid: jam@tinyerp.com-20101118053350-pq3xuv3buow1olwe
2010-11-18 11:03:50 +05:30
ksa (Open ERP)
56ba267931
[MERGE]: Merge with lp:openobject-trunk-dev-addons2
...
bzr revid: ksa@tinyerp.co.in-20101118052931-2y8sr1xbl38v2jnn
2010-11-18 10:59:31 +05:30
c8635170b6
[MERGE] Merged:lp:-trunk-dev-addons2
...
bzr revid: ron@tinyerp.com-20101118052650-3xjc4p5fbcaw9rxy
2010-11-18 10:56:50 +05:30
sbh (Open ERP)
9dae21ab67
[MERGE] Fix crm bug and project imrovement
...
bzr revid: sbh@tinyerp.com-20101118052119-olc3tq5va7si8lv5
2010-11-18 10:51:19 +05:30
pso
23fbadb305
[MERGE] merge from trunk addons3
...
bzr revid: pso@tinyerp.com-20101118051828-u72gkr5wkrz13oju
2010-11-18 10:48:28 +05:30
mtr
57faed65d3
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
...
bzr revid: mtr@mtr-20101116103617-30q971pia00n91p1
bzr revid: mtr@mtr-20101118051308-b0zs6tdm3bhdfgmc
2010-11-18 10:43:08 +05:30
rpa (Open ERP)
3bf1e51c9c
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: rpa@tinyerp.com-20101116050204-qg9k2gezzag7jdmc
bzr revid: rpa@tinyerp.com-20101118051016-w08xamxw222qh9cy
2010-11-18 10:40:16 +05:30
Mustufa Rangwala
27ebf5eec2
[MERGE] merge from trunk addons
...
bzr revid: mra@mra-laptop-20101116092536-dfa20lk0lg0jzsnj
bzr revid: mra@mra-laptop-20101118050021-q0dpjzphc62ukd88
2010-11-18 10:30:21 +05:30
ksa (Open ERP)
4c517bc53a
[REM]:lp-500931 remove wrong changes
...
bzr revid: ksa@tinyerp.co.in-20101118045531-eihmkjo3a4rv8mj5
2010-11-18 10:25:31 +05:30
apa-tiny
068b0a5550
merged from trunk
...
bzr revid: apa@tinyerp.com-20101110051800-icb53ssfrmvwkxku
bzr revid: jni@tinyerp.com-20101110121042-o1m820c0f91hu5i2
bzr revid: apa@tinyerp.com-20101111043645-lvecsnz4mg7ppq1v
bzr revid: apa@tinyerp.com-20101112043105-x3tyre135droxvue
bzr revid: jni@tinyerp.com-20101112102112-3g2n6ithgnhgb6o6
bzr revid: apa@tinyerp.com-20101115044136-6lkhebavkg2grq2b
bzr revid: apa@tinyerp.com-20101116044013-jbbnnmja6lr16qfb
bzr revid: apa@tinyerp.com-20101118045057-kl5jah46fhao5kja
2010-11-18 10:20:57 +05:30
6af95836bb
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101118044540-oqxeg8703hrtp73g
2010-11-18 04:45:40 +00:00
Vir (Open ERP)
4f1e113160
[Merge]
...
bzr revid: amp@tinyerp.com-20101028045857-j82tmesmh5t8jat6
bzr revid: amp@tinyerp.com-20101029051607-93mbt6kw40n95bf0
bzr revid: amp@tinyerp.com-20101030053305-52a94rx6sb0oi8vt
bzr revid: amp@tinyerp.com-20101101045243-zwnmc82cfmrvk12m
bzr revid: vir@tinyerp.com-20101102043603-a8tjpen4iyne6xql
bzr revid: vir@tinyerp.com-20101103044658-8la6t189ejys3fq5
bzr revid: vir@tinyerp.com-20101104045230-kdlty17bhf7ptska
bzr revid: vir@tinyerp.com-20101110050419-v4fo3sahj3fagfvx
bzr revid: vir@tinyerp.com-20101111053716-vfedljjc4ex1lqz8
bzr revid: vir@tinyerp.com-20101115042342-vmk5szk7imfxrbu4
bzr revid: vir@tinyerp.com-20101116043547-ieo3mgxwlc3icw7x
bzr revid: vir@tinyerp.com-20101118044503-zwz24srpiahxw2te
2010-11-18 10:15:03 +05:30
sbh (Open ERP)
eb2fc05914
[MERGE] MERGE with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20101118034714-yurvk3vtq119rdlz
2010-11-18 09:17:14 +05:30
nvi-openerp
b8551a5fcc
[IMP] wip
...
bzr revid: nicolas.vanhoren@openerp.com-20101117171754-ay58hnzhsq56iq3s
2010-11-17 18:17:54 +01:00
Julien Thewys
c9c2f03a8c
[REM] Removed wrongly committed changes (wrong branch name).
...
bzr revid: jth@openerp.com-20101117123928-vi70mnhlt9nz8cfc
2010-11-17 13:39:28 +01:00
Julien Thewys
04c3beb9cb
[REF] update comments for test loading (previous commit)
...
bzr revid: jth@openerp.com-20101117122737-hqcrj7m28pbsbuup
2010-11-17 13:27:37 +01:00
P. Christeas
1f380f0504
web-services: new "get_sqlcount" call
...
Useful for automated statistics, returns the global SQL counter of queries.
It does not affect any counters, and will print a warning if debug_sql
is not enabled (counter would be zero, then).
bzr revid: p_christ@hol.gr-20101117115232-olq747j4vmauqgy8
2010-11-17 13:52:32 +02:00
Julien Thewys
36d2afb046
[IMP] Added 'test_force' cli param for loading tests without demo data.
...
Sometimes you want tests to be run against an environment where no demo data are allowed
and you do not want to have tests loaded from the 'data' section as records will not be rolled back.
bzr revid: jth@openerp.com-20101117104601-jottg84dmss716r0
2010-11-17 11:46:01 +01:00
e87ba838db
[MERGE] merged with main addons branch
...
bzr revid: qdp-launchpad@tinyerp.com-20101117083339-muarvort9lhslzaq
2010-11-17 09:33:39 +01:00
7eedada6ef
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101117045012-amxy5910bu2gnxkl
bzr revid: launchpad_translations_on_behalf_of_openerp-20101117045237-ocn43d52h55iukmm
2010-11-17 04:52:37 +00:00
Jay (OpenERP)
1dde0f53da
[FIX] Delete and function tag should respect ref(XML_ID). Maintenance Case 262
...
lp bug: https://launchpad.net/bugs/675906 fixed
bzr revid: jvo@tinyerp.com-20101116215359-qcnfefkqhxsa2uym
2010-11-17 03:23:59 +05:30
P. Christeas
406e8aaba6
ORM: do import warnings, needed for _check_recursion() earlier patch
...
bzr revid: p_christ@hol.gr-20101116163536-jmfxkzagrq5fcrx8
2010-11-16 18:35:36 +02:00
P. Christeas
89c40dec2f
translate: fix scanning the ir.models for translations
...
The loop would only consider models that have >0 records registered in
ir.model.data.
This is merge of commits 3988ebf4dc130, 070e7d6ac717de and adapt to trunk.
bzr revid: p_christ@hol.gr-20101116163510-yemzlcy0f0yk893l
2010-11-16 18:35:10 +02:00
P. Christeas
cfdd34d511
web_services: implement os timestamp query.
...
The os user and sys elapsed times are very useful for performance metrics,
they can tell us how much did the openerp server try for some operation.
Conflicts:
bin/service/web_services.py
bzr revid: p_christ@hol.gr-20101116162025-go5lx4qs658pt7t5
2010-11-16 18:20:25 +02:00
5afd1eaa8a
[MERGE] merged the usability team branch
...
bzr revid: qdp-launchpad@tinyerp.com-20101116160125-14it45iyheduijk9
2010-11-16 17:01:25 +01:00
83f9e26b4e
[MERGE] merged with main addons branch
...
bzr revid: qdp-launchpad@tinyerp.com-20101116155210-g722dgr0sue1pftr
2010-11-16 16:52:10 +01:00
3a75761749
[FIX] l10n_cr: reference to the currency crc fixed (now in base module)
...
bzr revid: qdp-launchpad@tinyerp.com-20101116154722-ldxdhnaega3iy0j8
2010-11-16 16:47:22 +01:00
Olivier Dony
90c6039271
[ADD] base.data: added Costa Rican colones (CRC) as a currency (corrected)
...
bzr revid: odo@openerp.com-20101116153705-7j46ugddva6035u8
2010-11-16 16:37:05 +01:00
Olivier Dony
73c4ad722d
[ADD] base.data: added Costa Rican colones (CRC) as a currency
...
bzr revid: odo@openerp.com-20101116153111-h2yn0r6hd2xs7xi8
2010-11-16 16:31:11 +01:00
sbh (Open ERP)