Commit Graph
66465 Commits
Author SHA1 Message Date
Paramjit Singh Sahota 4290c54aa7 [MERGE] Merged lp:openobject-addons.
bzr revid: psa@tinyerp.com-20121203051142-3kqunad7eob21ujn
2012-12-03 10:41:42 +05:30
Paramjit Singh Sahota 09eeab5cdf [IMP] Improved code.
bzr revid: psa@tinyerp.com-20121203050607-dvx596nf8qjs3yub
2012-12-03 10:36:07 +05:30
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
Atul Patel (OpenERP) 374c717ec7 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20121203043300-x9npixhsf6eyojkv
2012-12-03 10:03:00 +05:30
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
Atul Patel (OpenERP) 9fa4677b2c [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20121201091113-dw0bnk3jzfr7r61z
2012-12-01 14:41:13 +05:30
Launchpad Translations on behalf of openerp 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
dle@openerp.com fe3327fb42 [MERGE]Latest turkn
bzr revid: dle@openerp.com-20121130193135-zerc3hir61ik7oax
2012-11-30 20:31:35 +01:00
dle@openerp.com d963fb8186 [FIX]Delete name_company_uniq constraint in bank statement
bzr revid: dle@openerp.com-20121130192938-qj9wu6iztkg7helz
2012-11-30 20:29:38 +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 706a58bfec [IMP] instance.init: less offensive constant
bzr revid: odo@openerp.com-20121130175249-yrbcdsn2z1io79dz
2012-11-30 18:52:49 +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) 9fc63f9572 [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121130173041-iyvd47qushkbmenm
2012-11-30 18:30:41 +01:00
Quentin (OpenERP) 057ca2072c [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121130173008-4ew25fx09uamyyp6
2012-11-30 18:30:08 +01:00
dle@openerp.com 6f3f1d4217 [MERGE](Sort of :D)From Luc De Meyer Zip from apps.openerp.com
bzr revid: dle@openerp.com-20121130172033-dinqyw8arg79eh31
2012-11-30 18:20:33 +01:00
Quentin (OpenERP) a68e5f9041 [MERGE] merged the branch with supplier payment term from alexis de Lattre (Akretion). Thanks for the nice proposal
bzr revid: qdp-launchpad@openerp.com-20121130171130-dugntyqmjunwr20m
2012-11-30 18:11:30 +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
Olivier Dony 43e8cda76d [MERGE] Bugfixes from 6.1 until revision 6700
Rev.6700 is xal@openerp.com-20120323142541-ebxn935mdfk7bk9s

bzr revid: odo@openerp.com-20121130165415-0yujyc1mkl7lsmd4
2012-11-30 17:54:15 +01:00
Quentin (OpenERP) 56e72783ae [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121130165350-btj0wcm1u3ejyp3f
2012-11-30 17:53:50 +01:00
Quentin (OpenERP) 79d1871d07 [IMP] account: removed duplicated entry for journal items to reconcile
bzr revid: qdp-launchpad@openerp.com-20121130163848-f898vghiiw9f7rl3
2012-11-30 17:38:48 +01:00
Quentin (OpenERP) 73c53b4071 [FIX] account_voucher: pay invoice propose the good partner (parent if not a company)
bzr revid: qdp-launchpad@openerp.com-20121130163528-zjjncja58hhnyflh
2012-11-30 17:35:28 +01:00
Quentin (OpenERP) 4d3260d92b [IMP] analytic: don't display the full name of templates in name_get()
bzr revid: qdp-launchpad@openerp.com-20121130163445-zaetj2o42s2jjwly
2012-11-30 17:34:45 +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
Christophe Matthieu a96ef73523 [FIX] view: Sidebar attachment, check if empty create or modify
bzr revid: chm@openerp.com-20121130161454-4pujkohpzvvb1zmg
2012-11-30 17:14:54 +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
Christophe Matthieu d945cd6555 [FIX] mail: show_link in js file
bzr revid: chm@openerp.com-20121130160350-7axzlna6254r4u1u
2012-11-30 17:03:50 +01:00
Christophe Matthieu d19c8e5e2c [IMP] mail: don't show the record_name on link with option show_link=false
bzr revid: chm@openerp.com-20121130160157-0tkavi31bn72xwhg
2012-11-30 17:01:57 +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
Christophe Matthieu d3a0fe5044 [IMP] mail: add list of recipients on bottom of messages if there are more of one partner not follower who receive the message
bzr revid: chm@openerp.com-20121130151550-b6ytzlyl5fhgs48w
2012-11-30 16:15:50 +01:00