Antonin Bourguignon
4f1e657da7
[IMP] we actually can merge more than two opps together
...
bzr revid: abo@openerp.com-20121203164026-jd722eo3h2vqwfkq
2012-12-03 17:40:26 +01:00
Antonin Bourguignon
df6a5e1a73
[MERGE] trunk
...
bzr revid: abo@openerp.com-20121203133455-81ewscuz0o94helo
2012-12-03 14:34:55 +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
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
772a721d85
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121203043613-1gilvazjie7ji5pb
2012-12-03 04:36:13 +00:00
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
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
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
4c0ddb1f01
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121201050734-pfp8sbkds49ewcyv
bzr revid: launchpad_translations_on_behalf_of_openerp-20121201050910-yq8l30zsbpn4rbx8
2012-12-01 05:09:10 +00:00
Fabien Pinckaers
f391da8624
[IMP]
...
bzr revid: fp@openerp.com-20121130234651-2ps66qeu3fv2jda0
2012-12-01 00:46:51 +01:00
Fabien Pinckaers
1165abefc4
[IMP] followup
...
bzr revid: fp@openerp.com-20121130232837-mnp8cdlnsjpl6jeh
2012-12-01 00:28:37 +01:00
Antonin Bourguignon
26ef6d145f
[IMP] tests for lead2opp conversion; properly use m2m operations instead of a simple list of ids
...
bzr revid: abo@openerp.com-20121130192537-2ammzl0irumnau2g
2012-11-30 20:25:37 +01:00
Antonin Bourguignon
6d0aaa0dde
[FIX] forgot a .id
...
bzr revid: abo@openerp.com-20121130191345-bixfvf7cp7g2w8fp
2012-11-30 20:13:45 +01:00
Antonin Bourguignon
448888985b
[IMP] tests for the salesmen assignations; properly use m2m operations instead of a simple list of ids (which doesn't work - and it should be corrected in several other tests)
...
bzr revid: abo@openerp.com-20121130185917-3jxajrp7c3usp5hv
2012-11-30 19:59:17 +01:00
Olivier Dony
e91080c251
[I18N] Update translation templates with latest terms
...
bzr revid: odo@openerp.com-20121130183717-5a4h24j8b5v7kxfl
2012-11-30 19:37:17 +01:00
Olivier Dony
5c9135f118
[I18N] Update base translation template with latest terms
...
bzr revid: odo@openerp.com-20121130183055-xyq5lji852y47nw2
2012-11-30 19:30:55 +01:00
Antonin Bourguignon
94197bdf2a
[IMP] tests for the salesmen assignations
...
bzr revid: abo@openerp.com-20121130181718-0hpl4vvvw84g97ua
2012-11-30 19:17:18 +01:00
Olivier Dony
ab39c09a7b
[MERGE] Less intrusive timezone offset warning (comes with corresponding server branch)
...
bzr revid: odo@openerp.com-20121130175658-r3zvuhx75iqa5sus
2012-11-30 18:56:58 +01:00
Olivier Dony
8fba574007
[MERGE] Less intrusive timezone offset warning (corresponds to web branch)
...
bzr revid: odo@openerp.com-20121130174819-q8g6m5mhoaczcr8q
2012-11-30 18:48:19 +01:00
Quentin (OpenERP)
057ca2072c
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20121130173008-4ew25fx09uamyyp6
2012-11-30 18:30:08 +01:00
Antonin Bourguignon
60884cc4f6
[MERGE] trunk
...
bzr revid: abo@openerp.com-20121130170307-732mw3b7zjkc9l9l
2012-11-30 18:03:07 +01:00
Antonin Bourguignon
a38bdc15c5
[IMP] introduce tests for the salesmen assignations
...
bzr revid: abo@openerp.com-20121130170034-7f5ytzptsks997oq
2012-11-30 18:00:34 +01:00
Antonin Bourguignon
a9f67c3729
[IMP] indentation
...
bzr revid: abo@openerp.com-20121130165958-eg00un2qhipubcwr
2012-11-30 17:59:58 +01:00
Quentin (OpenERP)
3f94a66d1e
[REF] account_followup: code review
...
bzr revid: qdp-launchpad@openerp.com-20121130162401-7g0xm5p7nrbz026e
2012-11-30 17:24:01 +01:00
Olivier Dony
a1d79115e5
[MERGE] Fix sale.order.line's invoiced flag, as part of forward-port of 6.1 server bugfixes
...
After forward-porting the 6.1 server bugfixes to trunk, a hidden bug
was revealed in the way sale.order.line's `invoiced` field
is updated. It makes the sale/test/cancel_order.yml test fail,
because the "recreate invoice" action does not work properly
if there are multiple cancelled invoices, due to incorrect
and outdated `invoiced` values on sale.order.lines.
By replacing the invoiced field with a stored fields.function
we simplify the code and fix this incorrect behavior at the
same time.
bzr revid: odo@openerp.com-20121130161809-0sf3z8k2530ze2zl
2012-11-30 17:18:09 +01:00
Olivier Dony
93a28103db
[MERGE] Forward-port of 6.1 bugfixes up to rev. 4307
...
rev.4307 = rev-id launchpad_translations_on_behalf_of_openerp-20121125065030-g5if5pybr61la4yj
bzr revid: odo@openerp.com-20121130160523-nte65mkgp3y330n6
2012-11-30 17:05:23 +01:00
Antonin Bourguignon
aabe51a5ed
[IMP] test messages
...
bzr revid: abo@openerp.com-20121130154850-9nqciuno6euckoo4
2012-11-30 16:48:50 +01:00
Quentin (OpenERP)
1de4c8e210
[FIX] account_followup: multi currency handling
...
bzr revid: qdp-launchpad@openerp.com-20121130154208-q3gj23y9iqq92ko1
2012-11-30 16:42:08 +01:00
Christophe Simonis
415dc94a9d
[FIX] test_reports.py: use communicate() to avoid creating zombie processes
...
bzr revid: chs@openerp.com-20121130152937-xcgs9bxrw7vyewex
2012-11-30 16:29:37 +01:00
Antonin Bourguignon
6c53679c84
[IMP] tests for the merge feature
...
bzr revid: abo@openerp.com-20121130151413-07ezgnoaiuopsd90
2012-11-30 16:14:13 +01:00
niv-openerp
053d6af231
[FIX] forgot to modify test after API change
...
bzr revid: nicolas.vanhoren@openerp.com-20121130140335-k1nus3oz1xw6deeu
2012-11-30 15:03:35 +01:00
Xavier Morel
4102c43793
[FIX] trailing comma in array
...
bzr revid: xmo@openerp.com-20121130133021-dg09qnw9twz2v4ws
2012-11-30 14:30:21 +01:00
Antonin Bourguignon
e7de389f4b
[WIP] introduce tests for the merge feature
...
bzr revid: abo@openerp.com-20121130125105-f1ewkix6t6saiu8l
2012-11-30 13:51:05 +01:00
Xavier Morel
e137c9d747
[FIX] translations and other failings
...
always include a ``context`` param in rpc requests if none is
provided: use the user_context at the very least
lp bug: https://launchpad.net/bugs/1084963 fixed
bzr revid: xmo@openerp.com-20121130103651-4pf5bauj50cm151y
2012-11-30 11:36:51 +01:00
Xavier Morel
5d313f1754
[FIX] styllistic fixes
...
bzr revid: xmo@openerp.com-20121130103638-8r77jpmb3hhmo8dt
2012-11-30 11:36:38 +01:00
Fabien Pinckaers
33048d7c79
[IMP] merge addons23
...
bzr revid: fp@openerp.com-20121130100516-r0gspmovo8ebdqi0
2012-11-30 11:05:16 +01:00
Antonin Bourguignon
4781eec49d
[MERGE] trunk
...
bzr revid: abo@openerp.com-20121130095538-4yxjx2smpohs27nd
2012-11-30 10:55:38 +01:00
Cedric Snauwaert
e1ff74df35
[FIX]fleet : generation of contract cost should take into account current day too
...
bzr revid: csn@openerp.com-20121130095449-cypcvs98q76vlurp
2012-11-30 10:54:49 +01:00
niv-openerp
94dca54e38
[IMP] removed date.today() in pyeval
...
bzr revid: nicolas.vanhoren@openerp.com-20121130095228-mffq2407lq7tf8jj
2012-11-30 10:52:28 +01:00
niv-openerp
7b48ff70be
[IMP] Removed usage of method date.today() in xml files.
...
bzr revid: nicolas.vanhoren@openerp.com-20121130095104-fnh6yxkvb0cxgc50
2012-11-30 10:51:04 +01:00
Antonin Bourguignon