Martin Trigaux
bb47a9b3bc
[FIX] pos: check constraint on session instead of uid (eg: runbot import demo data with uid=1 but other user_id
...
bzr revid: mat@openerp.com-20131014121959-fp4gs26xh8cdte1w
2013-10-14 14:19:59 +02:00
Martin Trigaux
59efdc209a
[FIX] base_setup: correctly handle new font value
...
bzr revid: mat@openerp.com-20131014103308-jynnbs2cy0nsehhn
2013-10-14 12:33:08 +02:00
Martin Trigaux
3798b1ed96
[IMP] better labels
...
bzr revid: mat@openerp.com-20131014101523-bwb4lda2rxbqpb8a
2013-10-14 12:15:23 +02:00
Martin Trigaux
b94140f6c9
[IMP] better labels
...
bzr revid: mat@openerp.com-20131014101503-lfge6qnfioepu22x
2013-10-14 12:15:03 +02:00
Martin Trigaux
4328f8253a
[MERGE] sync with trunk
...
bzr revid: mat@openerp.com-20131014101423-bvb7sr45rt7890aa
2013-10-14 12:14:23 +02:00
Ravish (Open ERP)
a98bd87122
[FIX] unit_price should be on other_pricelist
...
bzr revid: rmu@tinyerp.com-20131014100746-inm1snk2hgdc7i98
2013-10-14 15:37:46 +05:30
Martin Trigaux
b3a8a4493d
[IMP] fonts: adapt fonts to many2one instead of list
...
bzr revid: mat@openerp.com-20131014094122-6ndc5scni2xyzksy
2013-10-14 11:41:22 +02:00
Martin Trigaux
81e03814e8
[IMP] base_setup: adapt fonts to many2one instead of list
...
bzr revid: mat@openerp.com-20131014094025-05989gbpdghu2rwt
2013-10-14 11:40:25 +02:00
ajay javiya (OpenERP)
22d4226c57
[ADD]: change log
...
bzr revid: aja@tinyerp.com-20131014092758-j5e28vdtheivzt5y
2013-10-14 14:57:58 +05:30
Launchpad Translations on behalf of openerp
566af6033f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131011052941-f4x7ued38x0siu4u
bzr revid: launchpad_translations_on_behalf_of_openerp-20131013053842-x6nja74l8by5vd1q
bzr revid: launchpad_translations_on_behalf_of_openerp-20131014053313-j22u5qen55na9js8
2013-10-14 05:33:13 +00:00
ajay javiya (OpenERP)
13b21f5633
[IMP]: Access Rights : HR Employee can read crm.meeting.type
...
bzr revid: aja@tinyerp.com-20131014053205-hb8q5oj5hz3yu792
2013-10-14 11:02:05 +05:30
Launchpad Translations on behalf of openerp
436a849b2e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130920060157-qwah3z17ksnrmhzi
bzr revid: launchpad_translations_on_behalf_of_openerp-20130922053500-ovnczb82b49pg6f7
bzr revid: launchpad_translations_on_behalf_of_openerp-20130928055413-78fot6ftst9k7als
bzr revid: launchpad_translations_on_behalf_of_openerp-20131004054531-787wl7i8e8bqy44e
bzr revid: launchpad_translations_on_behalf_of_openerp-20131013053846-rei6ary4wt43kqeq
2013-10-13 05:38:46 +00:00
Antony Lesuisse
d2eb959710
[FIX] ensure the use the registry signaling for registries loaded with -d
...
bzr revid: al@openerp.com-20131013021322-5ej7ovpcrf7ilnn5
2013-10-13 04:13:22 +02:00
niv-openerp
fb230b98e7
[IMP] added timeout handling in jsonprpc2 and added more javascript tests about jsonrpc connections and sessions handling
...
bzr revid: nicolas.vanhoren@openerp.com-20131011141156-po7fh1sc7gp64k9x
2013-10-11 16:11:56 +02:00
Olivier Dony
7cb7405ffd
[IMP] orm: _store_get_values: rename variables to make this horror slightly more readable
...
We keep having to fight variable decay in that function, for some reason.
bzr revid: odo@openerp.com-20131011134501-7b5rflknjm1r9zfd
2013-10-11 15:45:01 +02:00
Olivier Dony
8ac110c4dd
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5098 rev-id: odo@openerp.com-20131011123914-7zuvd9mch21yxgj8
...
bzr revid: dle@openerp.com-20131009131902-a93nsbou4w8y0vlx
bzr revid: chs@openerp.com-20131009175454-j06y1ngylfbqyrpj
bzr revid: dle@openerp.com-20130918160049-fo88fl7uyhfoofkv
bzr revid: dle@openerp.com-20130924130544-kmkyr0d73cusvdav
bzr revid: odo@openerp.com-20131011134433-nyfjipvlql4xu127
2013-10-11 15:44:33 +02:00
niv-openerp
6475f3225d
Removed jsonprpc2 test because it fails in phantomjs
...
bzr revid: nicolas.vanhoren@openerp.com-20131011133208-gjz0iprk63447qub
2013-10-11 15:32:08 +02:00
niv-openerp
083d3fc91e
Added tests about timeouts and implemented it in jsonprpc2
...
bzr revid: nicolas.vanhoren@openerp.com-20131011133054-0dx3wxqcqbdocnlf
2013-10-11 15:30:54 +02:00
ajay javiya (OpenERP)
085911cbab
[REN]: Rename method from get_day to get_interval, add access rightsin portal_crm module
...
bzr revid: aja@tinyerp.com-20131011132646-o8i43xa83ptuw5e7
2013-10-11 18:56:46 +05:30
Paramjit Singh Sahota
7d0e4e5fed
[IMP] Improved attrs.
...
bzr revid: psa@tinyerp.com-20131011124816-xk990kd0vpg5tvtn
2013-10-11 18:18:16 +05:30
Paramjit Singh Sahota
8ce6495216
[MERGE] Merged lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20131011124642-zjw0e4qljksvcda8
2013-10-11 18:16:42 +05:30
Turkesh Patel (Open ERP)
62ba3155a0
[IMP] remove type parameter from __get_bar_values and make base_currency_id alwas defined
...
bzr revid: tpa@tinyerp.com-20131011124404-xoytwxfso8rg5lmb
2013-10-11 18:14:04 +05:30
Martin Trigaux
9c14eb963d
[MERGE] sync with trunk
...
bzr revid: mat@openerp.com-20131011124320-3fz6d7evzuh7is51
2013-10-11 14:43:20 +02:00
Olivier Dony
088cb0255d
[FIX] registry: restore elif changed to if in previous commit, for better readability (no effect)
...
This should have no effect because when the first `if`
is entered a new registry is instantiated with
the default value for base_cache_signaling_sequence
set to 1, preventing entering the next `if` even
without `elif`.
bzr revid: odo@openerp.com-20131011123914-7zuvd9mch21yxgj8
2013-10-11 14:39:14 +02:00
ajay javiya (OpenERP)
390e583569
[ADD]:user can accept/decline his/her invitation , other user are not allowed to accept/decline invitation from email template
...
bzr revid: aja@tinyerp.com-20131011123819-2500eau5msgy1bsx
2013-10-11 18:08:19 +05:30
niv-openerp
e059b1c5c0
Added test with openerp sessions
...
bzr revid: nicolas.vanhoren@openerp.com-20131011123416-wsfr0g1pusa0wftp
2013-10-11 14:34:16 +02:00
Christophe Simonis
34d2fd4d02
[FIX] web: request dispatching wraps controller function call to retry request if psycopg raise OperationError and convert IntegrityError into except_orm with translated message.
...
bzr revid: chs@openerp.com-20131011113450-ktoaxul22p3nql75
2013-10-11 13:34:50 +02:00
Amit Bhavsar (Open ERP)
e74cdf08a3
[MERGE] merge with latest trunk.
...
bzr revid: amb@tinyerp.com-20131011112542-uenx4qt1u5232ygf
2013-10-11 16:55:42 +05:30
DBR (OpenERP)
4a5d721b2c
[Merge] lp:openobject-addons
...
bzr revid: dbr@tinyerp.com-20131011112507-abv4gerd2xo3ou17
2013-10-11 16:55:07 +05:30
Olivier Dony
78579d289b
[FIX] registry: avoid discarding registry or cache when the registry is fresh
...
When the sequence value is 1 it means that either:
- the registry was just instantiated, so there is no
reason to reload it immediately, the real checks will
start at next request
- the db was just created with new sequences set to 1,
so there has been no change to reload
In both cases there is no good reason to reload the
registry, and it is actually a performance killer,
especially for cron workers that keep iterating on
the list of databases.
bzr revid: odo@openerp.com-20131011100313-4bud8e9xq2afp9z7
2013-10-11 12:03:13 +02:00
niv-openerp
cfcafee87c
[IMP] Added some documentation in the framwork.
...
bzr revid: nicolas.vanhoren@openerp.com-20131011095424-midppkv5czebt1f2
2013-10-11 11:54:24 +02:00
Guewen Baconnier
9c769c9a99
[FIX] missing a threading.RLock in RegistryManager.get():
...
if no registry exists and several calls to RegistryManager.get() are called at the same time
by several threads, several registries will be created one after the other and only the last
one will be kept in cls.registries
lp bug: https://launchpad.net/bugs/1238560 fixed
bzr revid: guewen.baconnier@camptocamp.com-20131011092632-b267vhdadh7q9som
2013-10-11 11:26:32 +02:00
Turkesh Patel (Open ERP)
6279bcf4b3
[IMP] improved code to set tooltip suffix in sparkline bar, pass suffix in opetion insted of overriding widget.
...
bzr revid: tpa@tinyerp.com-20131011073004-0swv6l1aomjt71xp
2013-10-11 13:00:04 +05:30
Turkesh Patel (Open ERP)
cce3b9138b
[IMP] improved code to set suffix in tooltip.
...
bzr revid: tpa@tinyerp.com-20131011072744-pz4mcxbr4qbdrg79
2013-10-11 12:57:44 +05:30
ajay javiya (OpenERP)
fdee8f3551
[ADD]: Access rights for portal user to accept/decline a meeting ,
...
[IMP]: anonymous user can directly accept/decline a meeting.
bzr revid: aja@tinyerp.com-20131011072210-gu88xqmsps3mj29c
2013-10-11 12:52:10 +05:30
Turkesh Patel (Open ERP)
c2505fb1ef
[MRG] merge with lp:openerp-web
...
bzr revid: tpa@tinyerp.com-20131011061522-j8btp5m7l3qjjumi
2013-10-11 11:45:22 +05:30
Turkesh Patel (Open ERP)
0d840256c5
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20131011061203-z13xuqw5fzznr6qc
2013-10-11 11:42:03 +05:30
ajay javiya (OpenERP)
790ade4a92
[MERGE]: with trunk
...
bzr revid: aja@tinyerp.com-20131011051716-2he5ix4xsgtv3ftc
2013-10-11 10:47:16 +05:30
Launchpad Translations on behalf of openerp
5050231a9c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131010044138-9giz2wpfhyq0u3h1
bzr revid: launchpad_translations_on_behalf_of_openerp-20131011044929-d9u1r6i67x2ru3jp
2013-10-11 04:49:29 +00:00
Launchpad Translations on behalf of openerp
8c3f19d913
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131011044915-qxutw9o1lhyymj8l
2013-10-11 04:49:15 +00:00
Antony Lesuisse
a3fffe3b15
[REM] chorus on multiprocessing cron, it doesnt really helps
...
bzr revid: al@openerp.com-20131010231628-b81uhmhg14aj85tq
2013-10-11 01:16:28 +02:00
Olivier Dony
dafa12d92c
[FIX] ir.model: FK constraints for custom m2o fields were never created, creating possible data integrity errors
...
bzr revid: odo@openerp.com-20131010170718-lwoxkqc1tx7i8vhg
2013-10-10 19:07:18 +02:00
ajay javiya (OpenERP)
cb122a215c
[IMP]:method get_attendee
...
bzr revid: aja@tinyerp.com-20131010134709-rihw9cr0bc8xlvpf
2013-10-10 19:17:09 +05:30
ajay javiya (OpenERP)
ccfc03ccf5
[IMP]: method do_accept,do_decline and get_day
...
bzr revid: aja@tinyerp.com-20131010132100-t2e9mwxv1phzk1zw
2013-10-10 18:51:00 +05:30
Olivier Dony
62b6c2b74b
[MERGE] l10n_fr: update tax templates for 2014 taxes, courtesy of Frederic Clementi (Camptocamp)
...
summary of VAT rates changes for the 01/01/2014:
Taux normal : 20% replace 19.6%
Taux intermédaire : 10% replace 7%
Taux spécial DOM-TOM : no change (8.5%)
Taux réduit : 5% replace 5.5%
Taux super réduit : no change (2.1%)
see also: http://www.service-public.fr/professionnels-entreprises/actualites/00891.html
bzr revid: odo@openerp.com-20131010114424-atzr3bl9e9diir2g
2013-10-10 13:44:24 +02:00
niv-openerp
ffe8490aef
Enabled sort in o2m
...
bzr revid: nicolas.vanhoren@openerp.com-20131010091125-0t1v8wmkrn8bnc5y
2013-10-10 11:11:25 +02:00
Launchpad Translations on behalf of openerp
d03569496d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131010052550-62ak1fdjn6kbivh0
2013-10-10 05:25:50 +00:00
ajay javiya (OpenERP)
3fae74635b
[IMP]:If Location and description is not added put - and change color of label
...
bzr revid: aja@tinyerp.com-20131010045946-58i7kxd2611q2agj
2013-10-10 10:29:46 +05:30
Christophe Simonis
273face907
[MERGE] forward port of branch saas-1 up to revid 8791 chs@openerp.com-20131009175454-j06y1ngylfbqyrpj
...
bzr revid: chs@openerp.com-20131009180337-cxgdt6zzd1z68ga9
2013-10-09 20:03:37 +02:00
Christophe Simonis
e701169ac6
[FIX] note: copy default stages as SUPERUSER_ID to avoid access error. Only do it for employees
...
lp bug: https://launchpad.net/bugs/1156215 fixed
bzr revid: chs@openerp.com-20131009162920-lg56wwmtg8qm1kuf
2013-10-09 18:29:20 +02:00