Commit Graph

193 Commits

Author SHA1 Message Date
Denis Ledoux 41fe705943 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9674 rev-id: dle@openerp.com-20131204133633-t7wfbnipv3jtss82
bzr revid: chs@openerp.com-20131204125051-dexejzwigpu0z1yy
bzr revid: dle@openerp.com-20131204134400-50y7ojeb8pw7k56s
2013-12-04 14:44:00 +01:00
Denis Ledoux cf052214bd [FIX]portal_sale: add the lang to the email templates (sale.order and account.invoice), for the email to be translated in the customer language (as this is the case for regular email templates from sale and account modules-
bzr revid: dle@openerp.com-20131203142554-5yrp5o5wl382oyo3
2013-12-03 15:25:54 +01:00
Launchpad Translations on behalf of openerp 5f21b4bff9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131123062620-6obt60lwob64hi98
bzr revid: launchpad_translations_on_behalf_of_openerp-20131124054757-4w9nik6wieeqf0yg
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125060111-rf445xxiinvazinv
2013-11-25 06:01:11 +00:00
Christophe Simonis 0244543c71 [MERGE] forward port of branch 7.0 up to revid 9636 mat@openerp.com-20131122165504-tmbg0ixhqed4kdkz
bzr revid: chs@openerp.com-20131122193122-wpdfsfn24ezj1qrp
2013-11-22 20:31:22 +01:00
Martin Trigaux 56d579b1e0 [FIX] email.template: add missing parenthesis to filter all data on email and not the last one
bzr revid: mat@openerp.com-20131122104509-g2pii4m5rj8qpk7w
2013-11-22 11:45:09 +01:00
Olivier Dony 2cba6a5355 [MERGE] Forward-port of latest 7.0 fixes up to rev 9629 rev-id odo@openerp.com-20131121153230-keie85rmes2zh2o8
bzr revid: chs@openerp.com-20131121112139-aw2ara1i1xymue62
bzr revid: odo@openerp.com-20131121154205-ul9hf9tz3h0x2n7m
2013-11-21 16:42:05 +01:00
Martin Trigaux c3063778ce [FIX] email.template: add safe filter over email address to allow emails to be sent in the format 'Name <name@company.com>' and avoid escaping
bzr revid: mat@openerp.com-20131121151305-t5je12s4w5uctu0k
2013-11-21 16:13:05 +01:00
Launchpad Translations on behalf of openerp 271ed43e7b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121054848-007arsnnoa8fs65e
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121063838-blqn6j0yfmrlw5vp
2013-11-21 06:38:38 +00:00
Launchpad Translations on behalf of openerp 40c309024c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131026062529-74ir3upguunr9mw3
bzr revid: launchpad_translations_on_behalf_of_openerp-20131027061317-d9s440jzv1juvswi
bzr revid: launchpad_translations_on_behalf_of_openerp-20131028054233-15znliqv2eh2jq0i
bzr revid: launchpad_translations_on_behalf_of_openerp-20131029051429-rcytejyrg2s4t9db
bzr revid: launchpad_translations_on_behalf_of_openerp-20131030055438-gp0hyend0jooi941
2013-10-30 05:54:38 +00:00
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
Olivier Dony 5cba82e2c9 [MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8788 dle@openerp.com-20131003094541-ro29hhkas03rdvw8
bzr revid: odo@openerp.com-20131003111222-upt1ytb92db50zay
2013-10-03 13:12:22 +02:00
Olivier Dony 51fe1e63e1 [FIX] portal_sale: re-add auto-subscribe of customer when confirming invoice
It was removed by mistake in commit [1]
when fixing the forward-port of 7.0
to saas-1. Only the mail notification
had to be removed, not the auto-follow
of the customer, which is important
in the portal, otherwise customers
cannot see their invoices.

[1] 8699 revid:chm@openerp.com-20130506135653-7e8nukr68s9255oq

bzr revid: odo@openerp.com-20131001164125-1smk4mi3eulcbkab
2013-10-01 18:41:25 +02:00
Launchpad Translations on behalf of openerp c7471d1bff Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130919045624-x71znzpi3rpnvpcs
bzr revid: launchpad_translations_on_behalf_of_openerp-20130920060145-80h8zse3uw3jg2fx
2013-09-20 06:01:45 +00:00
Launchpad Translations on behalf of openerp a46cbb7a31 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130913060803-zltruvkg213vqm57
bzr revid: launchpad_translations_on_behalf_of_openerp-20130915061052-1kts2jol7uvq1n4f
bzr revid: launchpad_translations_on_behalf_of_openerp-20130917051850-e1s8v09muo1atjwh
bzr revid: launchpad_translations_on_behalf_of_openerp-20130917051903-257acdjbxi60zyv8
2013-09-17 05:19:03 +00:00
Launchpad Translations on behalf of openerp bc0d066505 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130914054213-dq0kt273ooy6fozn
bzr revid: launchpad_translations_on_behalf_of_openerp-20130915055539-hzmy1ws1il6z8fji
bzr revid: launchpad_translations_on_behalf_of_openerp-20130915054954-zisp7huxai3ew84l
bzr revid: launchpad_translations_on_behalf_of_openerp-20130916054225-m0j262vooofcavqz
bzr revid: launchpad_translations_on_behalf_of_openerp-20130917043759-tke0eln0ca01hsm7
2013-09-17 04:37:59 +00:00
Launchpad Translations on behalf of openerp 9dba69ba48 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912064018-3vecn03jcu9fm1m8
2013-09-12 06:40:18 +00:00
Launchpad Translations on behalf of openerp 043a93132d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130903060845-m8b568p0wk2zcy20
2013-09-03 06:08:45 +00:00
Launchpad Translations on behalf of openerp cb8f9c5a0d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130903054857-i15nhvtthlho7chm
2013-09-03 05:48:57 +00:00
Launchpad Translations on behalf of openerp 0e74fd31a4 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130815055122-qjjh1oa8122npkdt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130816060311-osd5epg0pjqggizo
bzr revid: launchpad_translations_on_behalf_of_openerp-20130817061650-b596lee67z2gon1h
bzr revid: launchpad_translations_on_behalf_of_openerp-20130818050503-e1c1ferew0px4k1y
bzr revid: launchpad_translations_on_behalf_of_openerp-20130819045737-ef63g3nwk154ezyw
2013-08-19 04:57:37 +00:00
Launchpad Translations on behalf of openerp bb90e51a78 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130803061336-i8noij4hjz9nxoow
bzr revid: launchpad_translations_on_behalf_of_openerp-20130804053709-rxcnnh17adwk94b4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130805063055-v6y7lrx7lcoemmk0
2013-08-05 06:30:55 +00:00
Launchpad Translations on behalf of openerp d1a4e0aef0 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130711062622-v4muic3uqckueux5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130712063505-m63repwd0zokfibu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130713063525-b30s09rh63t3zox4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714055943-xf6jvk2dpoemt6qx
bzr revid: launchpad_translations_on_behalf_of_openerp-20130715051357-59o0nkhplh3e58mi
bzr revid: launchpad_translations_on_behalf_of_openerp-20130704054706-ace1fcr1vtruoc4s
bzr revid: launchpad_translations_on_behalf_of_openerp-20130705061311-4735gtnj7xjmuprg
bzr revid: launchpad_translations_on_behalf_of_openerp-20130712063510-g2yq0kxqgrx9x1df
bzr revid: launchpad_translations_on_behalf_of_openerp-20130713063533-7mjj5a7226xhtob6
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714055945-h6jn755mtdcubvei
bzr revid: launchpad_translations_on_behalf_of_openerp-20130715051400-rra06yzfd7zw4bt0
2013-07-15 05:14:00 +00:00
Launchpad Translations on behalf of openerp 3e269d1572 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130614070428-by6oo1fc0hvfoqc8
bzr revid: launchpad_translations_on_behalf_of_openerp-20130615061319-hikvcj42kmv0fwla
bzr revid: launchpad_translations_on_behalf_of_openerp-20130616053220-l2jj1f2bfhr8s95f
bzr revid: launchpad_translations_on_behalf_of_openerp-20130617062045-ydm23y8oyqt85r6d
bzr revid: launchpad_translations_on_behalf_of_openerp-20130618065045-8n040l4nl7inbsho
bzr revid: launchpad_translations_on_behalf_of_openerp-20130619061621-p7u5tapogm5ao1o2
bzr revid: launchpad_translations_on_behalf_of_openerp-20130620063408-j244y20qpy61d6dn
bzr revid: launchpad_translations_on_behalf_of_openerp-20130615062054-6zhgccaoectf2c0d
bzr revid: launchpad_translations_on_behalf_of_openerp-20130616053235-3eimstk0anu72x9m
bzr revid: launchpad_translations_on_behalf_of_openerp-20130617062114-7wts3fyy6vgqzt8v
bzr revid: launchpad_translations_on_behalf_of_openerp-20130618065127-8w5xbiwnnza5vlo1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130619061719-63jsadfrb1yoqtgz
bzr revid: launchpad_translations_on_behalf_of_openerp-20130620063509-1xk30ymo1f7nn4h0
2013-06-20 06:35:09 +00:00
Launchpad Translations on behalf of openerp 3a296f5386 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608070127-tu3wr0ejaojeuizk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061554-vunz3dsqv73j8io4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608074839-suk66wcjidodrzyu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061704-e1t9mv2alygf4g38
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608075116-643xgspj93t8g1y9
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061708-y08i6exqm5v36qg7
2013-06-09 06:17:08 +00:00
Olivier Dony 8c33eb76e1 [I18N] Synchronize translation templates with latest source code
bzr revid: odo@openerp.com-20130607194309-eysyrkxpr0dukm07
2013-06-07 21:43:09 +02:00
sgo@tinyerp.com 45d760773e [MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130603131453-t3m0b9emuyp2tmsx
2013-06-03 18:44:53 +05:30
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
sgo@tinyerp.com c04dfafe0b [MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130522062700-rcbg30jfinv0o392
2013-05-22 11:57:00 +05:30
Launchpad Translations on behalf of openerp 35811ae629 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130508061808-15l9uv7xeeaar0cc
2013-05-08 06:18:08 +00:00
Christophe Matthieu 356d18a097 [FIX] An invite email to follow invoice is send to the customer before the real invoice. patch: remove invoice_validate method content of portal_sale
bzr revid: chm@openerp.com-20130506094955-eppzx3fflb3g887j
2013-05-06 11:49:55 +02:00
Launchpad Translations on behalf of openerp a7a4f33d0f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130427063416-maq2j295cuj0d2j4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130429060435-zyumznnykvw92bfg
bzr revid: launchpad_translations_on_behalf_of_openerp-20130501051425-9uhm1n0nmvyus33i
bzr revid: launchpad_translations_on_behalf_of_openerp-20130506063526-tj5l5h3fger6llmw
bzr revid: launchpad_translations_on_behalf_of_openerp-20130501051533-veqndxlj87s13tnp
bzr revid: launchpad_translations_on_behalf_of_openerp-20130502060901-j2v1cs2l31in4q6t
bzr revid: launchpad_translations_on_behalf_of_openerp-20130503062950-h0ojr1tlzqx5nu76
bzr revid: launchpad_translations_on_behalf_of_openerp-20130504071101-jh8a9d3cb8gcz34e
bzr revid: launchpad_translations_on_behalf_of_openerp-20130505060428-4qacudpyuiez39b3
bzr revid: launchpad_translations_on_behalf_of_openerp-20130506063544-ggq3rpht7nsoinxs
bzr revid: launchpad_translations_on_behalf_of_openerp-20130504071108-g8u3u06xpp3g4sks
bzr revid: launchpad_translations_on_behalf_of_openerp-20130506063552-lwxw1ldh3mbflzqf
2013-05-06 06:35:52 +00:00
Launchpad Translations on behalf of openerp 6970e5e041 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130430063704-q6sk7sup4c1ej18w
2013-04-30 06:37:04 +00:00
Launchpad Translations on behalf of openerp 45e303b528 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130430052924-th3a8rf85bi2xz1t
2013-04-30 05:29:24 +00:00
Launchpad Translations on behalf of openerp 3536f65967 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130427063440-bmcyenjvm2fm94ck
bzr revid: launchpad_translations_on_behalf_of_openerp-20130428054142-1k74s6tp0zv4aeu5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130429060457-72jpzgm0ky022n8u
2013-04-29 06:04:57 +00:00
Launchpad Translations on behalf of openerp 83fb6fbf02 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130425060541-r1eqpc1djb3vy953
bzr revid: launchpad_translations_on_behalf_of_openerp-20130425060609-9otf0125cci1hjvi
2013-04-25 06:06:09 +00:00
sgo@tinyerp.com d1e17fbde0 [MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130417061434-zry7pxo7fb17063k
2013-04-17 11:44:34 +05:30
Launchpad Translations on behalf of openerp c13ceba6b9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130412060536-q07q8ed9v8ldi2kv
bzr revid: launchpad_translations_on_behalf_of_openerp-20130414055031-dgknuaf8a4dhgt16
bzr revid: launchpad_translations_on_behalf_of_openerp-20130413063110-rtd3r7hxe54yb8eq
bzr revid: launchpad_translations_on_behalf_of_openerp-20130414054933-k6o13mitp3dl62xq
bzr revid: launchpad_translations_on_behalf_of_openerp-20130415060648-klbxmc1afr5jq4vb
bzr revid: launchpad_translations_on_behalf_of_openerp-20130412060533-fq4nwi1i6h39y7pl
bzr revid: launchpad_translations_on_behalf_of_openerp-20130413063146-745583mwivnzgjqj
bzr revid: launchpad_translations_on_behalf_of_openerp-20130414055028-v2dnk713g9ydbvpo
bzr revid: launchpad_translations_on_behalf_of_openerp-20130415060722-gvarcrrppfcq777a
2013-04-15 06:07:22 +00:00
Launchpad Translations on behalf of openerp eb3ffc52ed Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130406063640-151b9f95w2tgiifb
bzr revid: launchpad_translations_on_behalf_of_openerp-20130407060111-hobhqctome9qtz6c
bzr revid: launchpad_translations_on_behalf_of_openerp-20130408062055-hzgkrbw8lvkfphxe
2013-04-08 06:20:55 +00:00
Quentin (OpenERP) 3bb51ac696 [MERGE] forward port of bugfixes made in 7.0, up to revision 8969.
bzr revid: qdp-launchpad@openerp.com-20130404095257-oek77sijuxjyi0aj
2013-04-04 11:52:57 +02:00
Launchpad Translations on behalf of openerp 252bcc802f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130330060824-pc5f2pj14gj0ak27
bzr revid: launchpad_translations_on_behalf_of_openerp-20130331055726-frtzw3gc9ut4wx4y
bzr revid: launchpad_translations_on_behalf_of_openerp-20130401053127-tolr13p1b3bhjny1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130402054749-t3x0zc7qk3n4man2
bzr revid: launchpad_translations_on_behalf_of_openerp-20130330060920-k0cnlpk0rxcli841
bzr revid: launchpad_translations_on_behalf_of_openerp-20130331055741-loojniiz6du9upat
bzr revid: launchpad_translations_on_behalf_of_openerp-20130401053211-yvt1h32v41rs6jje
bzr revid: launchpad_translations_on_behalf_of_openerp-20130402054814-fwg742kzhsupr6kc
bzr revid: launchpad_translations_on_behalf_of_openerp-20130329051100-3ul1k4qwwm2f49gt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130330060923-wch1f8ndmb15nu6x
bzr revid: launchpad_translations_on_behalf_of_openerp-20130331055759-aj1nc93t9420lov0
bzr revid: launchpad_translations_on_behalf_of_openerp-20130401053215-kqqgqefzp95fa1tk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130402054817-k33rri349nc2ioiz
2013-04-02 05:48:17 +00:00
Launchpad Translations on behalf of openerp 7a8d71be6d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130329050903-yuxb08q83hlvg6ok
2013-03-29 05:09:03 +00:00
Launchpad Translations on behalf of openerp fc04522286 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130328060500-yc40z00ubsz154vw
2013-03-28 06:05:00 +00:00
Launchpad Translations on behalf of openerp 5a3ed6f024 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130322045758-r467emaw1id95my6
bzr revid: launchpad_translations_on_behalf_of_openerp-20130323051036-xet3mefwdp8ohssd
bzr revid: launchpad_translations_on_behalf_of_openerp-20130324044538-isdnsnphf7510ri3
2013-03-24 04:45:38 +00:00
Thibault Delavallée 7e696dfdcb [MERGE] Sync with trunk and latest mail changes.
bzr revid: tde@openerp.com-20130318122027-l570iyzlljshz4ne
2013-03-18 13:20:27 +01:00
sgo@tinyerp.com b8a33bc393 [MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130318071519-3pae2jh7nk2iaqpe
2013-03-18 12:45:19 +05:30
Launchpad Translations on behalf of openerp 4ce8d2697d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130316055338-ogfw01ap8fh1hlaj
bzr revid: launchpad_translations_on_behalf_of_openerp-20130317045918-zi1230lgxjbkqw3x
bzr revid: launchpad_translations_on_behalf_of_openerp-20130318044640-ts2tr31y2gl25rev
2013-03-18 04:46:40 +00:00
Thibault Delavallée 5d59401b91 [MERGE] Sync with trunk, tried to resolve the conflicts without breakign everything.
bzr revid: tde@openerp.com-20130315120759-sf1o1sd80ycuuy7n
2013-03-15 13:07:59 +01:00
Quentin (OpenERP) d0f5b28bd0 [MERGE] merge with main trunk branch to get last translations from launchpad
bzr revid: qdp-launchpad@openerp.com-20130315103116-lxj96usw3ipd11z5
2013-03-15 11:31:16 +01:00
Launchpad Translations on behalf of openerp 72f29d98b8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130315055412-luy9qg1pkdjnqlud
2013-03-15 05:54:12 +00:00
Quentin (OpenERP) be05b374a1 [MERGE] forwardport of bugfixes made in v7 up to revision 8854.
bzr revid: qdp-launchpad@openerp.com-20130314112740-s01t51p4m7mxcumz
2013-03-14 12:27:40 +01:00
Launchpad Translations on behalf of openerp c5319f47f7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130309053740-hrhdafa05mp0s6cd
bzr revid: launchpad_translations_on_behalf_of_openerp-20130310051349-azaf8kb3hdi6ux85
bzr revid: launchpad_translations_on_behalf_of_openerp-20130311054204-8yc0hga0v6pkk36x
bzr revid: launchpad_translations_on_behalf_of_openerp-20130309053843-8x3181swnc2x0rim
bzr revid: launchpad_translations_on_behalf_of_openerp-20130310051523-z6034cfpv1qbztzx
bzr revid: launchpad_translations_on_behalf_of_openerp-20130311054303-38ti3nq1h5jfbasa
bzr revid: launchpad_translations_on_behalf_of_openerp-20130309053849-8eqsc9sjxknzfha8
bzr revid: launchpad_translations_on_behalf_of_openerp-20130310051527-tajzx0x6p7mzpg43
bzr revid: launchpad_translations_on_behalf_of_openerp-20130311054307-qgl6ao1a06b9an3a
2013-03-11 05:43:07 +00:00