Thibault Delavallée
978c76c5ea
[MERGE] [IMP] mail: improved management of links in notification emails.
...
This branch adds the URL parameters in context.params.
bzr revid: tde@openerp.com-20130522124012-pf2m5efmmz1vuilc
2013-05-22 14:40:12 +02:00
Thibault Delavallée
d4d6e88266
[IMP] [IMP] mail: now defines a catchall email alias, used to format the
...
reply_to of notification emails when having a document without alias, or for
private discussions.
bzr revid: tde@openerp.com-20130522114007-vlbkzghz278545zn
2013-05-22 13:40:07 +02:00
Thibault Delavallée
faefb9fad1
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130522103426-wjn0ttqdbf72g713
2013-05-22 12:34:26 +02:00
Thibault Delavallée
0d01d958fa
[MERGE] [FORWARD] Forward port of saas-1 branch until revision 8711 (that includes forward-port of 7.0 until 9143)
...
Revision ID: tde@openerp.com-20130521152657-v48pj2m0692rw9b5
bzr revid: tde@openerp.com-20130522102605-bbc5vrfhfro4ab90
2013-05-22 12:26:05 +02:00
Thibault Delavallée
218024570d
[MERGE] [FORWARD] Forward-port of saas-1 branch until revision 4875
...
Revision ID: qdp-launchpad@openerp.com-20130507120149-p2m4ug20nfny234v
bzr revid: tde@openerp.com-20130522102240-ysni935cvnfvpe40
2013-05-22 12:22:40 +02:00
Martin Trigaux
5d47a52df3
[MERGE] fix various usability problems
...
bzr revid: mat@openerp.com-20130522095856-ol8igg97ctyh49sg
2013-05-22 11:58:56 +02:00
Martin Trigaux
b86d62a297
[MERGE] fix various usability problems
...
bzr revid: mat@openerp.com-20130522095319-ls5d91bym2ry8ip6
2013-05-22 11:53:19 +02:00
Thibault Delavallée
8aa85c2523
[FORWARD] Forward port of addons until revision 8711
...
bzr revid: tde@openerp.com-20130521133807-5n97jep45f3lf6uq
bzr revid: tde@openerp.com-20130522083012-4yry4ht2943sjatn
2013-05-22 10:30:12 +02:00
Thibault Delavallée
d2acb63af6
[FORWARD] Forward-port of saas-1 branch until revision 4875
...
bzr revid: tde@openerp.com-20130522082935-rzzbc3p625rkmcdy
2013-05-22 10:29:35 +02:00
Turkesh Patel (Open ERP)
3d4c0a795a
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20130522063035-nype13o1f6oneq4h
2013-05-22 12:00:35 +05:30
Turkesh Patel (Open ERP)
83740f70f0
[MRG] merge with lp:openerp-web
...
bzr revid: tpa@tinyerp.com-20130522063018-q6oevmlcnrfl7i79
2013-05-22 12:00:18 +05:30
Thibault Delavallée
176481a970
[FIX] mail: fixed link in notification email
...
bzr revid: tde@openerp.com-20130521152657-v48pj2m0692rw9b5
2013-05-21 17:26:57 +02:00
Thibault Delavallée
2663fd67b1
[FIX] auth_signup: fixed login_mode going to default when having another type given in parameter
...
bzr revid: tde@openerp.com-20130521145723-3os8q5qej9dr7dxo
2013-05-21 16:57:23 +02:00
Thibault Delavallée
90c7ed2f83
[MERGE] [FORWARD] Forward-port of 7.0 branch until rev 9143.
...
bzr revid: tde@openerp.com-20130521130627-i7zff51rn8xl7dzk
2013-05-21 15:06:27 +02:00
Thibault Delavallée
23c5622e71
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130521123730-06f931ihz43p2o63
2013-05-21 14:37:30 +02:00
Thibault Delavallée
a05b0bebbe
[FORWARD] Forward port of 7.0 branch until revision 9143.
...
bzr revid: tde@openerp.com-20130521122359-b5vii7gv8arluz06
2013-05-21 14:23:59 +02:00
Frédéric van der Essen
39e99c1ce5
[MERGE] point_of_sale: fix for product packaging barcodes
...
bzr revid: fva@openerp.com-20130521093609-0y0z190ut9iggb0w
2013-05-21 11:36:09 +02:00
Frédéric van der Essen
6d03a9be51
[FIX] point_of_sale: wrong ean field for packagings
...
bzr revid: fva@openerp.com-20130521090942-hvtze13ek6p7nguo
2013-05-21 11:09:42 +02:00
Launchpad Translations on behalf of openerp
727de3660d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130519061258-u0iw6lfwponrmlrp
bzr revid: launchpad_translations_on_behalf_of_openerp-20130520063201-x6ngc83h4rru51rx
bzr revid: launchpad_translations_on_behalf_of_openerp-20130521054415-2s1mdz92ybpgx12d
2013-05-21 05:44:15 +00:00
Launchpad Translations on behalf of openerp
1647391acc
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130519061236-r4zubxtanesjqld0
bzr revid: launchpad_translations_on_behalf_of_openerp-20130520063148-0crtjtoieit1g5k8
bzr revid: launchpad_translations_on_behalf_of_openerp-20130521054352-g6yw7uvuietnscm6
2013-05-21 05:43:52 +00:00
Launchpad Translations on behalf of openerp
d51cf60616
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130518053941-wbp6h1apue3chh2l
bzr revid: launchpad_translations_on_behalf_of_openerp-20130520053439-gbmymwgk5ijl3qi0
2013-05-20 05:34:39 +00:00
Launchpad Translations on behalf of openerp
c8136cee66
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130519061301-tarop35lwadoymxh
2013-05-19 06:13:01 +00:00
Olivier Dony
0e8ca44530
[FIX] ir.sequence: add a proper default value for number_next_actual (0 is disallowed by default) + avoid error when trying to alter a sequence during creation
...
lp bug: https://launchpad.net/bugs/960201 fixed
bzr revid: odo@openerp.com-20130517181514-xcy83yakpuqa3oik
2013-05-17 20:15:14 +02:00
Olivier Dony
b50a964eb8
[MERGE] ir.sequence: lazily compute next value for PostgreSQL-backed ir.sequences + avoid resetting it at each change to the sequence, courtesy of Ronald Portier (Therp)
...
The original patch proposed by Ronald has been modified to
make it more suitable to a stable version, in the following
aspects:
- remove all extra physical columns (boolean flags), as they
would break the stable policy and were actually unnecessary
to fix the bug
- avoid displaying both the number_next and the number_next_actual,
the latter is sufficient
- fix a possible bug when setting the number_next to 0
lp bug: https://launchpad.net/bugs/960201 fixed
bzr revid: odo@openerp.com-20130517173513-msabph5x62c9wjxt
2013-05-17 19:35:13 +02:00
Olivier Dony
ef94c53c6f
[MERGE] account: safer code for accessing company currency data, in order to avoid errors in some multi-company setups, courtesy of Alexandre Fayolle (Camptocamp)
...
lp bug: https://launchpad.net/bugs/1111298 fixed
bzr revid: odo@openerp.com-20130517170616-0jkqfls1ph7ydctz
2013-05-17 19:06:16 +02:00
Olivier Dony
4f426731bd
[MERGE] res.currency: default to global currencies in multi-company setup + add proper ir.rule, courtesy of Alexandre Fayolle (Camptocamp)
...
lp bug: https://launchpad.net/bugs/1111298 fixed
bzr revid: odo@openerp.com-20130517170414-zx9v1x3noqnce4h0
2013-05-17 19:04:14 +02:00
Olivier Dony
f49570ee55
[MERGE] l10n_es: updated version of Spanish localization, including a new Chart for associations, courtesy of the Spanish localization team (via Pedro Manuel Baeza, Serv. Tecnol. Avanzados)
...
bzr revid: odo@openerp.com-20130517164146-0og90y9adxzoozj0
2013-05-17 18:41:46 +02:00
Xavier Morel
c694837a64
[FIX] parsing of domains with non-ascii unicode literals
...
update py.js to support parsing of escape sequences in string literals
bzr revid: xmo@openerp.com-20130517162215-4afen1mdzbfx1mxi
2013-05-17 18:22:15 +02:00
Cedric Snauwaert
33ec8239d1
[FIX]ir_sequence: better args definition
...
bzr revid: csn@openerp.com-20130517154544-c9jywavo9pnfn4rt
2013-05-17 17:45:44 +02:00
Olivier Dony
8d639576f0
[FIX] modify domain evaluation tests to avoid relying on res.currency entries assigned to companies, as demo data was modified for bug 1111298
...
lp bug: https://launchpad.net/bugs/1111298 fixed
bzr revid: odo@openerp.com-20130517141726-67utxubzdflsgsnx
2013-05-17 16:17:26 +02:00
Thibault Delavallée
f3f2d72e04
[REV] [IMP] mail: mail.catchall.alias is now only a system parameter; removed from configuration (because much too technical) + udpated tests that could crash on an existing instance.
...
bzr revid: tde@openerp.com-20130517131109-aosyv23p7rz5sjg5
2013-05-17 15:11:09 +02:00
Cedric Snauwaert
913a7a6e5c
[FIX]ir_sequence: only execute a change on postgresql sequence when really needed and add a field to get an approximation of the current next_number.
...
bzr revid: csn@openerp.com-20130517124328-kex5katw2tgpgdty
2013-05-17 14:43:28 +02:00
Thibault Delavallée
1cfd02f66d
[IMP] mail: default catchall alias: improved settings form view and help messages.é
...
bzr revid: tde@openerp.com-20130517105529-16semc1ng1jbwmzq
2013-05-17 12:55:29 +02:00
Olivier Dony
fb3835e8dc
[FIX] l10n_vn: removed incorrect exec bit on files that have no reason to have it
...
lp bug: https://launchpad.net/bugs/993414 fixed
bzr revid: odo@openerp.com-20130517103502-llfmq8m9hk1tjz6c
2013-05-17 12:35:02 +02:00
Olivier Dony
e608027256
[FIX] openerp/tests/test_mail.py marked executable as it should
...
lp bug: https://launchpad.net/bugs/993414 fixed
bzr revid: odo@openerp.com-20130517102933-u1u4n2ad5jxnndw5
2013-05-17 12:29:33 +02:00
Olivier Dony
c8b464b0a1
[MERGE] l10n_es: updated version of Spanish localization, including a new Chart for associations, courtesy of the Spanish localization team (via Pedro Manuel Baeza, Serv. Tecnol. Avanzados)
...
bzr revid: odo@openerp.com-20130517101422-krf1cuk31acszr96
2013-05-17 12:14:22 +02:00
Xavier Morel
548eea6426
[IMP] mouse cursors in search view drawer
...
bzr revid: xmo@openerp.com-20130517100316-9angbyhncxhg8620
2013-05-17 12:03:16 +02:00
dle@openerp.com
86610e3a30
[FIX]crm: mark as lost use now case_cancel instead of case_mark_lost because stage of lead were set to lost instead of dead
...
bzr revid: dle@openerp.com-20130517094629-7l5tx1esj38ydc3u
2013-05-17 11:46:29 +02:00
Olivier Dony
9cff3f2a58
[MERGE] res.currency: default to global currencies in multi-company setup + add proper ir.rule, courtesy of Alexandre Fayolle (Camptocamp)
...
lp bug: https://launchpad.net/bugs/1111298 fixed
bzr revid: odo@openerp.com-20130517093958-d16k9gceenznm9vp
2013-05-17 11:39:58 +02:00
Thibault Delavallée
4741c305dd
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130517093627-50ohth6v8ub767ni
2013-05-17 11:36:27 +02:00
Olivier Dony
764dd051cd
[MERGE] account: safer code for accessing company currency data, in order to avoid errors in some multi-company setups, courtesy of Alexandre Fayolle (Camptocamp)
...
lp bug: https://launchpad.net/bugs/1111298 fixed
bzr revid: odo@openerp.com-20130517093301-702o8x78ufcc369e
2013-05-17 11:33:01 +02:00
Thibault Delavallée
dddabd3e0c
[MERGE] [IMP] 'Stage Bar Manu' Task. This task improves the statusbar widget. Folded columns are
...
not hidden anymore, but available in a side menu accessible after other stages. The
purpose is to be able to have access to all stages using this widget. This way we will be
able to remove some action buttons in form views in a future task.
This web branch updates the statusbar widget (JS and CSS).
bzr revid: tde@openerp.com-20130517090626-n1g1k1o4r8wk9l4v
2013-05-17 11:06:26 +02:00
Thibault Delavallée
d24e53c6ed
[MERGE] [IMP] 'Stage Bar Manu' Task. This task improves the statusbar widget. Folded columns are
...
not hidden anymore, but available in a side menu accessible after other stages. The
purpose is to be able to have access to all stages using this widget. This way we will be
able to remove some action buttons in form views in a future task.
This addons branch updates the stages domain for leads, claims, applicants, tasks and
issues.
bzr revid: tde@openerp.com-20130517090601-hn1or01sciqizq2t
2013-05-17 11:06:01 +02:00
Cedric Snauwaert
ce5c5557a3
[FIX]ir_sequence: fix cryptic error message when prefix/suffix is not in a valid format and update number_next in order for it to have same value as the sql sequence preventing the sql sequence to restart from one if a write is done.
...
bzr revid: csn@openerp.com-20130517090421-kik3215az48lg02f
2013-05-17 11:04:21 +02:00
Alexandre Fayolle
89efc89651
[FIX] remove company_id from currencies in currency_data.xml
...
lp bug: https://launchpad.net/bugs/1111298 fixed
bzr revid: alexandre.fayolle@camptocamp.com-20130517080319-ct4j81mc01dr1e2v
2013-05-17 10:03:19 +02:00
cbi@openerp.my.openerp.com
3d9c8b0513
[FIX] missing multi company currency access rules, set currency.company_id to False by default
...
lp bug: https://launchpad.net/bugs/1111298 fixed
bzr revid: alexandre.fayolle@camptocamp.com-20130517080246-k23d8hd0ks36cr5l
2013-05-17 10:02:46 +02:00
Alexandre Fayolle
b0ee634dec
[FIX] some missed access to currency_id through company_id
...
bzr revid: alexandre.fayolle@camptocamp.com-20130517080031-7j72snb9mdv91cto
2013-05-17 10:00:31 +02:00
Quentin (OpenERP)
e018fb46c5
[FIX] sale_crm: if set on the sale order, copy the sale team to the created invoices
...
bzr revid: qdp-launchpad@openerp.com-20130517074002-qymqczukhj7mpc54
2013-05-17 09:40:02 +02:00
Alexandre Fayolle
8bdccc5cd2
[FIX] work around bug preventing to validate invoices in multicompany setting
...
lp bug: https://launchpad.net/bugs/1111298 fixed
bzr revid: alexandre.fayolle@camptocamp.com-20130517073516-yko5zp0j8zlopq2d
2013-05-17 09:35:16 +02:00
Fabien Pinckaers
afd7d79966
[IMP] medium images in pos
...
bzr revid: fp@tinyerp.com-20130517071738-uw130g0sxbu14yrq
2013-05-17 09:17:38 +02:00