Commit Graph

65458 Commits

Author SHA1 Message Date
Olivier Dony 5db87bea9c [MERGE] Bugfixes from 6.1 until revision 6800
bzr revid: odo@openerp.com-20121206153856-9y9v8ok6yxo6l5f0
2012-12-06 16:38:56 +01:00
Olivier Dony 82e892bc53 [MERGE] Sync with trunk
bzr revid: odo@openerp.com-20121204162621-uqvqssyjoa3qsxn3
2012-12-04 17:26:21 +01:00
Olivier Dony 524694747b [I18N] auth_signup: regenerate translation template after merging with auth_reset_password + carry over existing po entries
bzr revid: odo@openerp.com-20121204145345-f5vhzyi3gl1u54zz
2012-12-04 15:53:45 +01:00
Olivier Dony 3e2c2c18f1 [FIX] auth_signup: missing translation marks in JS text
bzr revid: odo@openerp.com-20121204142831-n8idmmz2nwn0ah15
2012-12-04 15:28:31 +01:00
vta vta@openerp.com 6bbe9ad526 [MERGE] lp:~openerp-dev/openobject-addons/trunk-bug-1079205-pja
lp bug: https://launchpad.net/bugs/1079205 fixed

bzr revid: vta@openerp.com-20121204144649-abpod80i1nspeeof
2012-12-04 15:46:49 +01:00
Olivier Dony 690db185c6 [MERGE] stock: proper quantity rounding, courtesy of Sebastien Lange (Syleam)
lp bug: https://launchpad.net/bugs/1080183 fixed

bzr revid: odo@openerp.com-20121204142409-vts933xtqncqrran
2012-12-04 15:24:09 +01:00
Christophe Matthieu 2f38a4425f [MERGE] view list: Show the menu sidebar when a child item is showed.
bzr revid: chm@openerp.com-20121204141416-cay34shj7h5y4a6q
2012-12-04 15:14:16 +01:00
vta vta@openerp.com 243172e1dd [MERGE] lp:~openerp-dev/openobject-addons/trunk-bug-1080127-pja
lp bug: https://launchpad.net/bugs/1080127 fixed

bzr revid: vta@openerp.com-20121204132327-n73nl0s0xalxvjmt
2012-12-04 14:23:27 +01:00
Christophe Simonis a7ec9f3743 [FIX] web_analytics: works in monodb mode
bzr revid: chs@openerp.com-20121204131322-ob2hgda17oj83fax
2012-12-04 14:13:22 +01:00
Quentin (OpenERP) 966890c540 [MERGE] merged the branch with supplier payment term from alexis de Lattre (Akretion). Thanks for the nice proposal
bzr revid: qdp-launchpad@openerp.com-20121204103146-9mfmx56ulfxrlphj
2012-12-04 11:31:46 +01:00
Xavier Morel c04b5b7e1f [IMP] client actions doc fixes
bzr revid: xmo@openerp.com-20121204094925-0h0un3eg6znnxy7i
2012-12-04 10:49:25 +01:00
Raphael Collet bf2a3109ee [MERGE] trunk-merge_signup_resetpw-rco (merge auth_reset_password into auth_signup)
bzr revid: rco@openerp.com-20121204093535-4adcvecnozkbtbyj
2012-12-04 10:35:35 +01:00
vta vta@openerp.com dd539643e6 [FIX] Added the context of the action when evaluating the domain.
bzr revid: vta@openerp.com-20121204093326-plc4pf4qszok1rw6
2012-12-04 10:33:26 +01:00
Raphael Collet 9bcdc37039 [MERGE] from trunk
bzr revid: rco@openerp.com-20121204091154-a7e6wzq6bpt2676j
2012-12-04 10:11:54 +01:00
Quentin (OpenERP) f231b5b5f6 [MERGE] staging branch with misc fixes in accounting
bzr revid: qdp-launchpad@openerp.com-20121204091014-89ck1ditngl1u12c
2012-12-04 10:10:14 +01:00
Arnaud Pineux 70b9f41051 [FIX] Lunch wrong access rights
bzr revid: api@openerp.com-20121204083635-trp1qh1kidabngsr
2012-12-04 09:36:35 +01:00
vta vta@openerp.com 060c576acc [MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-filters-warehouse-pja into lp:openobject-addons, which solves some tracebacks when filtering in warehouse.
bzr revid: vta@openerp.com-20121204075102-xxnctn7y68rxom8g
2012-12-04 08:51:02 +01:00
Launchpad Translations on behalf of openerp 683f31e51b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121204055506-fin73s7n3o52fmuy
bzr revid: launchpad_translations_on_behalf_of_openerp-20121204055956-fsd4tp3felpk8pm5
2012-12-04 05:59:56 +00:00
Launchpad Translations on behalf of openerp 2be8fdd030 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121204050358-y59q1n93uu6j3s03
2012-12-04 05:03:58 +00:00
Christophe Simonis 0892aa7c49 [IMP] improve css for monetary fields
bzr revid: chs@openerp.com-20121203184214-wdunfzy4u2z99fk5
2012-12-03 19:42:14 +01:00
Xavier Morel ab0012292e [REM] stock_planning reintroduced after launchpad export
bzr revid: xmo@openerp.com-20121203175701-pahgm651weulzi76
2012-12-03 18:57:01 +01:00
Olivier Dony bac2638a2f [I18N] Removed duplicated terms for inherited [_sql]_constraints
bzr revid: odo@openerp.com-20121203162834-78jvf03c2octss1w
2012-12-03 17:28:34 +01:00
Olivier Dony 308e4f1073 [I18N] Removed duplicated terms for inherited [_sql]_constraints -> 400 terms removed
bzr revid: odo@openerp.com-20121203162755-p71dnn0k0t2b98yp
2012-12-03 17:27:55 +01:00
Olivier Dony 5483897ad0 [I18N] Update translation templates for latest changes
bzr revid: odo@openerp.com-20121203155934-zmut8afc7hh82b02
2012-12-03 16:59:34 +01:00
Raphael Collet 699a332377 [IMP] auth_signup: automatically invite new users to set their password (if they have an email address)
bzr revid: rco@openerp.com-20121203155757-a93sl67rubl3eoov
2012-12-03 16:57:57 +01:00
Raphael Collet 1ea7171ae9 [REM] auth_reset_password: functionality is taken over by auth_signup
bzr revid: rco@openerp.com-20121203155005-cl6pu8dj9joagata
2012-12-03 16:50:05 +01:00
Raphael Collet 4d200952f7 [IMP] auth_signup: on login page, show the links 'Sign Up' and 'Reset Password' only when enabled
bzr revid: rco@openerp.com-20121203154811-1v0f3eu444rkw6cp
2012-12-03 16:48:11 +01:00
Christophe Matthieu 385986cc9d [MERGE] from trunk-fix-1084424: use abs(v)<epsilon when checking a small difference between 2 values
bzr revid: chm@openerp.com-20121203151655-1eehju2e61mtlfxw
2012-12-03 16:16:55 +01:00
Olivier Dony 40becc876d [MERGE] stock: proper quantity rounding, courtesy of Sebastien Lange (Syleam)
bzr revid: odo@openerp.com-20121203150134-eqej5zsjzm4a4z90
2012-12-03 16:01:34 +01:00
Raphael Collet 41ceffd52b [ADD] auth_signup: merge in functionality of auth_reset_password
bzr revid: rco@openerp.com-20121203144424-39wrr5z78smswox2
2012-12-03 15:44:24 +01:00
Olivier Dony 6c00237919 [MERGE] instance.init: less offensive constant
bzr revid: odo@openerp.com-20121203125820-e1k8dphqhp35z2z2
2012-12-03 13:58:20 +01:00
Xavier Morel f9670e67a2 [FIX] rollback default conversion of js Object to py.object (not py.dict) and add default toJSON to all py.object
* Accesses in contexts & domains are object derefs, so using dicts was
  dumb

* But objects still need to round-trip through in case of e.g. o2m
  commands in contexts, so py.object needs a toJSON (or a special
  object kind needs to be added, specifically for round-tripping
  objects through)

bzr revid: xmo@openerp.com-20121203122312-gc499mujf4l0nuz7
2012-12-03 13:23:12 +01:00
Xavier Morel 54ea7670d3 [FIX] incorrect conversion of JS arrays to py.js lists/tuples
bzr revid: xmo@openerp.com-20121203114706-dn5sqq3glqst4g1q
2012-12-03 12:47:06 +01:00
Christophe Matthieu 96cd88b04c [MERGE] from trunk-patest-w45: date and timerelative with timezone
bzr revid: chm@openerp.com-20121203113044-p7xbxnva5kg9xbpu
2012-12-03 12:30:44 +01:00
Jalpesh Patel (OpenERP) 48c3aee44d [Merge] Merge with lp:openobject-addons
bzr revid: pja@tinyerp.com-20121203112559-ofkbangr2rzhrud8
2012-12-03 16:55:59 +05:30
Vo Minh Thu 7afd9783e8 [IMP] Use the loglevel TEST when logging test file loading and testsuite execution.
bzr revid: vmt@openerp.com-20121203104228-8a5on97pn9r1klls
2012-12-03 11:42:28 +01:00
Christophe Matthieu e87ff010e7 [MERGE] from trunk-openchatter-doc-chm: doc to use openchatter client action and options
bzr revid: chm@openerp.com-20121203102923-nd7qfc5002bmajdg
2012-12-03 11:29:23 +01:00
Christophe Matthieu 3e91a0a80b [IMP] mail: doc
bzr revid: chm@openerp.com-20121203092317-cq9xbl9g4xgn58kq
2012-12-03 10:23:17 +01:00
Christophe Matthieu b577b29487 [MERGE] from trunk
bzr revid: chm@openerp.com-20121203091951-fd9dn570gfv13edr
2012-12-03 10:19:51 +01:00
Xavier Morel 0b54cbb64f [IMP] update py.js for abs builtin support
bzr revid: xmo@openerp.com-20121203084803-ib325gp18g5xvdv6
2012-12-03 09:48:03 +01:00
Launchpad Translations on behalf of openerp 772a721d85 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121203043613-1gilvazjie7ji5pb
2012-12-03 04:36:13 +00:00
Launchpad Translations on behalf of openerp b184574f18 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121202043653-0wjef9gxgx96i7pf
bzr revid: launchpad_translations_on_behalf_of_openerp-20121203043528-zme86exbes8aiol3
2012-12-03 04:35:28 +00:00
Fabien Pinckaers 929d1cf6c2 [MERGE] fix create invoice on picking
bzr revid: fp@openerp.com-20121202173607-we6l6uy38nic1t12
2012-12-02 18:36:07 +01:00
Fabien Pinckaers 017e2c2f77 [FIX] account creation
bzr revid: fp@openerp.com-20121202172651-0gtlf31avv8d01ti
2012-12-02 18:26:51 +01:00
Fabien Pinckaers 2ab4b76b5f [MERGE] l10n_nl fiscal positions
bzr revid: fp@openerp.com-20121202161123-16cm2sh67ah2tps3
2012-12-02 17:11:23 +01:00
Fabien Pinckaers 2b4372e58b [MERGE] sequence in l10n_nl + cleaned indentation
bzr revid: fp@openerp.com-20121202160220-oniiebur8zbt6j15
2012-12-02 17:02:20 +01:00
Launchpad Translations on behalf of openerp 0c1c7e0645 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121201052150-yqa0633xufeghwro
bzr revid: launchpad_translations_on_behalf_of_openerp-20121202044423-mgcbteebgi44toci
2012-12-02 04:44:23 +00:00
Launchpad Translations on behalf of openerp c0d74ff9a5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121202043859-e4rnpga3ab08i8ks
2012-12-02 04:38:59 +00:00
Fabien Pinckaers cada27b307 [FIX] followup
bzr revid: fp@openerp.com-20121201113637-c3cr6yrkjxow6qds
2012-12-01 12:36:37 +01:00
Fabien Pinckaers 0a933f44e5 [IMP] small fix in YAML XML import
bzr revid: fp@openerp.com-20121201113524-8n94vnpxt3g21b1b
2012-12-01 12:35:24 +01:00