Commit Graph

259 Commits

Author SHA1 Message Date
Christophe Simonis d504764eff [MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
2014-03-11 15:52:05 +01:00
Denis Ledoux 78c3646747 [FIX] payment,portal_sale: display payment acquirers of the company of the sale order/invoice
bzr revid: dle@openerp.com-20140306105514-lp0lu6jq955aofv4
2014-03-06 11:55:14 +01:00
Kersten Jeremy b651a86340 [FIX] Fix action url from res_config to configure action_payment_acquirer
bzr revid: jke@openerp.com-20140305161925-z3uy18jllfmcod8p
2014-03-05 17:19:25 +01:00
Kersten Jeremy 322b924a13 [IMP] Custom the payment_acquirer html field in css of its own module and not in web/base.saas
bzr revid: jke@openerp.com-20140305161647-s27kplpnjg1usikg
2014-03-05 17:16:47 +01:00
Launchpad Translations on behalf of openerp b201dc79b7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140218054104-8egkh4jj7hiiwuih
bzr revid: launchpad_translations_on_behalf_of_openerp-20140219054048-688twg0fubtm2x2q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140220054214-237ri67t9rw3l4fu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140221063855-wniw42r27gyg3h6y
bzr revid: launchpad_translations_on_behalf_of_openerp-20140222073328-xpn7nwqz407yzumq
bzr revid: launchpad_translations_on_behalf_of_openerp-20140223074516-0r09cpmma58ylqji
bzr revid: launchpad_translations_on_behalf_of_openerp-20140224060319-535oheaq2w9u2ye3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140225062420-zl7curej0e0warhz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140226073146-3vzhw4hddr81olbs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140227062959-24e2rn98rqb9afpr
bzr revid: launchpad_translations_on_behalf_of_openerp-20140228072152-f9gm4ud1wu19ge27
bzr revid: launchpad_translations_on_behalf_of_openerp-20140301055205-r0df0fqz9yf5z66i
bzr revid: launchpad_translations_on_behalf_of_openerp-20140302052638-bjf11oumy7w15oco
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304082704-k1z2te1tfud43zy3
2014-03-04 08:27:04 +00:00
Launchpad Translations on behalf of openerp 9863dbe5c8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
2014-03-04 07:52:38 +00:00
Launchpad Translations on behalf of openerp 9554c144ff Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140212062357-8n13ec90bnclm1ek
2014-02-12 06:23:57 +00:00
Antony Lesuisse 033c38c304 [MERGE] trunk
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
2014-01-29 03:19:16 +01:00
Launchpad Translations on behalf of openerp 3ce5e01eca Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00:00
Launchpad Translations on behalf of openerp d9cdc8564c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140122061252-9jm03vlbr13ofqo9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140123055652-0p71divui34v1c1q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140124062440-hx0z2e4sd6nz7exc
bzr revid: launchpad_translations_on_behalf_of_openerp-20140126051449-rlunde7qysqsh1b1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140125064003-v340hiykcngjg9ue
bzr revid: launchpad_translations_on_behalf_of_openerp-20140126051541-9fnyw12nex5poeth
bzr revid: launchpad_translations_on_behalf_of_openerp-20140127054606-1jb6usf6pj7gy1xl
2014-01-27 05:46:06 +00:00
Thibault Delavallée 7678ba5bfc [FIX] portal_sale: last occurence of portal.payment.acquirer -> payment.acquirer
bzr revid: tde@openerp.com-20140123162059-6omcrt4a32x7t47c
2014-01-23 17:20:59 +01:00
Thibault Delavallée 3a679c2b7f [IMP] payment_acquirer_paypal: paypal account integration in payment_paypal
- added a call to _migrate_paypal_account in the payment_paypal data that
does the migration from company.paypal_account (char field) to a payment.acquirer
and company.paypal_account becoming a function field, with a getter / setter.
This function field is company aware.
- added an update of the res_config view of invoicing to link to the list
of acquirers
- added possibilty to install acquirers from invoicing (paypal / ogone / adyen
are installable through config)

bzr revid: tde@openerp.com-20140123150135-07b4pkbjade6vimq
2014-01-23 16:01:35 +01:00
Thibault Delavallée 2e7b5991b7 [REF] portal, portal_sale, payment: refactored old acquirer in portal
now based on the new implementation of payment.

[REM] portal: removed acquirer model, views and implementation
[REF] portal_sale: now using payment rendering methods
[IMP] payment: added render_payment_block, taken from old
acquirer, that renders all portal_published acquirers.

bzr revid: tde@openerp.com-20140122190022-lef4b3o1tpcua3vx
2014-01-22 20:00:22 +01:00
Thibault Delavallée d9343e2d27 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20131213094016-ylqkilyo4190g81w
2013-12-13 10:40:16 +01:00
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
Christophe Matthieu fd2821086f [MERGE] sync with trunk
bzr revid: chm@openerp.com-20131202150925-eqsi0uu0fqtwimhj
2013-12-02 16:09:25 +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
Thibault Delavallée e541755ae4 [MOV] portal: moved portal group into base.
Updated security rules. Basic res_partner rules are moved into base. Added rule with website_published.

bzr revid: tde@openerp.com-20131008113545-gpqydx0b199lcqpy
2013-10-08 13:35:45 +02: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
sgo@tinyerp.com a21b4b9b56 [MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130311045638-npwv6lb6bc9i3m1y
2013-03-11 10:26:38 +05:30
Launchpad Translations on behalf of openerp cc87ba5db7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130308052354-6aerviht20qnfh26
bzr revid: launchpad_translations_on_behalf_of_openerp-20130308060553-lujyj3qxhqljssu0
bzr revid: launchpad_translations_on_behalf_of_openerp-20130308060749-69tgopwkctb0v5ei
2013-03-08 06:07:49 +00:00
Olivier Dony 1e5a3aa787 [I18N] *: update translation templates for latest term changes due to bug fixes
bzr revid: odo@openerp.com-20130307121934-jfwfl1q0jtvswe0c
2013-03-07 13:19:34 +01:00
Launchpad Translations on behalf of openerp 03ad9f7290 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130302052257-0w9v71dump44rtov
bzr revid: launchpad_translations_on_behalf_of_openerp-20130303052333-9kn24ocknaagn33h
bzr revid: launchpad_translations_on_behalf_of_openerp-20130304055956-54bietn1iazrisga
2013-03-04 05:59:56 +00:00
Launchpad Translations on behalf of openerp ece4451176 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130301053921-r8m4764fosovd9h6
bzr revid: launchpad_translations_on_behalf_of_openerp-20130301054021-crdgcw5mb7m77u0t
2013-03-01 05:40:21 +00:00
Thibault Delavallée dd8efafad8 [FIX[ portal_sale: fixed second call to amil_mail.send_mail()
bzr revid: tde@openerp.com-20130226173138-3z3lq00nceo46vdp
2013-02-26 18:31:38 +01:00
Thibault Delavallée 35242a6a17 [FIX] portal_sale: fixed call to mail_mail.send_mail()
bzr revid: tde@openerp.com-20130226170353-pnkti0fieicsb9rr
2013-02-26 18:03:53 +01:00
Thibault Delavallée 22afd0cefd [IMP] email_template: renamed email_recipients field to partner_to, in order to have a name that means something.
bzr revid: tde@openerp.com-20130225101918-khyd6qkvtsyr2wi3
2013-02-25 11:19:18 +01:00
Launchpad Translations on behalf of openerp 96e97f7624 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130222051332-d4jok8jmkw4d8k56
bzr revid: launchpad_translations_on_behalf_of_openerp-20130223052013-0e0cku4hw2cmvymq
bzr revid: launchpad_translations_on_behalf_of_openerp-20130224044210-qdwdy4etryz7h438
2013-02-24 04:42:10 +00:00
Jojo La Bricole a49b928657 [FIX] invoice, analytic search view fixes
bzr revid: al@openerp.com-20130222165730-uutgomtcgznarnay
2013-02-22 17:57:30 +01:00
Launchpad Translations on behalf of openerp 99f63ac1f8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130222054434-bf66ye8z35023vi5
2013-02-22 05:44:34 +00:00
Launchpad Translations on behalf of openerp 2685892101 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130220052936-h23tx78qw3dor4gr
2013-02-20 05:29:36 +00:00
Launchpad Translations on behalf of openerp 95ff2f9092 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130219053257-8wvf3wq3x6i40siv
2013-02-19 05:32:57 +00:00
Launchpad Translations on behalf of openerp 5bca6d888f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130216045714-d9igbkeb3a2wzohp
bzr revid: launchpad_translations_on_behalf_of_openerp-20130218044953-7p6xwm71bp0eaxna
bzr revid: launchpad_translations_on_behalf_of_openerp-20130219045706-ixtnuj13l1xhob4u
2013-02-19 04:57:06 +00:00
Launchpad Translations on behalf of openerp 5dbc1b787e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130215052434-vl34xg5zfo9c7wny
bzr revid: launchpad_translations_on_behalf_of_openerp-20130216054019-5mij5aoepxhf3zoy
bzr revid: launchpad_translations_on_behalf_of_openerp-20130216053913-zj2b2x6ll2ok19in
bzr revid: launchpad_translations_on_behalf_of_openerp-20130217052310-9912kfq4cxc7k7fv
bzr revid: launchpad_translations_on_behalf_of_openerp-20130218052538-tly4emi0bggrlp8h
bzr revid: launchpad_translations_on_behalf_of_openerp-20130216054015-2uthx4z6mfqwrbrt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130217052400-07m6wixrfaq58l2k
bzr revid: launchpad_translations_on_behalf_of_openerp-20130218052624-0mh8rmv7upyxmpg9
2013-02-18 05:26:24 +00:00
sgo@tinyerp.com 1150aac0fe [MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130206124101-vuf5dkdtsr6bfe08
2013-02-06 18:11:01 +05:30
Launchpad Translations on behalf of openerp 996746634f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130205052331-pkjgm8c2lnxld0x6
2013-02-05 05:23:31 +00:00
Launchpad Translations on behalf of openerp 4c7e7c1435 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130202050731-t51q7dfh8n3ipxr7
bzr revid: launchpad_translations_on_behalf_of_openerp-20130203044906-164y50yg4hapwqnt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130204051243-cqx7z4ikiu372mqt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130205044457-niu483scgk0278hp
2013-02-05 04:44:57 +00:00
Launchpad Translations on behalf of openerp ffa1be00e1 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130201054959-3q99pnpceh0ywrvw
bzr revid: launchpad_translations_on_behalf_of_openerp-20130202060018-lx1r8atxxituupav
bzr revid: launchpad_translations_on_behalf_of_openerp-20130203052931-09m8yy1o8v06eh5q
bzr revid: launchpad_translations_on_behalf_of_openerp-20130202060014-qh8fzkuorbrs0rc2
bzr revid: launchpad_translations_on_behalf_of_openerp-20130203052927-r4fv1lu71yh8hrw9
bzr revid: launchpad_translations_on_behalf_of_openerp-20130204054306-wccng6apw2bmlmdi
2013-02-04 05:43:06 +00:00
Launchpad Translations on behalf of openerp b390a5697c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130126050355-xxot322zn826zr96
bzr revid: launchpad_translations_on_behalf_of_openerp-20130127043627-b85ckledrtpdd73m
bzr revid: launchpad_translations_on_behalf_of_openerp-20130128051345-a31wsrx74u1w228d
bzr revid: launchpad_translations_on_behalf_of_openerp-20130129052015-doewhw7byebeeijs
bzr revid: launchpad_translations_on_behalf_of_openerp-20130130043841-h15p02at1d6o2clr
2013-01-30 04:38:41 +00:00
sgo@tinyerp.com 2eec99df81 [MERGE]with trunk
bzr revid: sgo@tinyerp.com-20130129132944-0pe1s28990i4cy5r
2013-01-29 18:59:44 +05:30
Launchpad Translations on behalf of openerp 39951ce27c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130125060526-1sardheh24y8unc0
bzr revid: launchpad_translations_on_behalf_of_openerp-20130126053740-34a73mqkdg04j9s4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130127051008-60htke4mkwclnqfk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130128055849-swluxyrhgvpbmrg2
bzr revid: launchpad_translations_on_behalf_of_openerp-20130129061824-peffot06nnwkgdkp
2013-01-29 06:18:24 +00:00
sgo@tinyerp.com cf6595baf2 [IMP]remove total sale.shop from sales
bzr revid: sgo@tinyerp.com-20130121100542-36qmkrd82md97phv
2013-01-21 15:35:42 +05:30
Launchpad Translations on behalf of openerp 7a49719d46 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130118071051-e8wytix67wlb17yd
2013-01-18 07:10:51 +00:00
Launchpad Translations on behalf of openerp f51c31bbfd Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130105050418-fwjlnelqf2aykmfj
bzr revid: launchpad_translations_on_behalf_of_openerp-20130106044611-puihx1twszasvwb4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130107044333-2w2le9zvnd4m1ogf
bzr revid: launchpad_translations_on_behalf_of_openerp-20130108045227-p3vvokxfpwp7js3c
bzr revid: launchpad_translations_on_behalf_of_openerp-20130109050201-927s5kd5kpzb7kxq
bzr revid: launchpad_translations_on_behalf_of_openerp-20130110044634-er0z85237gdgo51h
bzr revid: launchpad_translations_on_behalf_of_openerp-20130111043615-688yaut13s3gl170
2013-01-11 04:36:15 +00:00
Launchpad Translations on behalf of openerp 7212971359 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121222062604-dkriii8eozvsup5y
bzr revid: launchpad_translations_on_behalf_of_openerp-20121223044904-96hdn6ba6yrv4f9j
bzr revid: launchpad_translations_on_behalf_of_openerp-20121226044702-qvjpmsxaacy1cg43
bzr revid: launchpad_translations_on_behalf_of_openerp-20121229050621-bg925wq3m04p2g71
bzr revid: launchpad_translations_on_behalf_of_openerp-20121229050125-ezgc0pyinpf7cjpa
bzr revid: launchpad_translations_on_behalf_of_openerp-20121231044027-9ufahl14z8fnhu6p
bzr revid: launchpad_translations_on_behalf_of_openerp-20130101044603-wg53ihk00q2059zn
bzr revid: launchpad_translations_on_behalf_of_openerp-20130103044748-vijpm6xa5a4wkx8s
bzr revid: launchpad_translations_on_behalf_of_openerp-20130104044725-gnjicg5umjgca6x4
bzr revid: launchpad_translations_on_behalf_of_openerp-20121227052240-6m8i7kropwavbcnh
bzr revid: launchpad_translations_on_behalf_of_openerp-20121228051144-leldhj31i0soxbew
bzr revid: launchpad_translations_on_behalf_of_openerp-20121229050213-cxzd31aqqltp6q2x
bzr revid: launchpad_translations_on_behalf_of_openerp-20121230052006-x87nblyyoe179wg8
bzr revid: launchpad_translations_on_behalf_of_openerp-20121231044049-m31tcl22nog279qx
bzr revid: launchpad_translations_on_behalf_of_openerp-20130101044622-7p5h1mf14m4tlue5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130102043722-j7bk1uojgtgsz7u1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130103044815-xswvowa7jeizv4jk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130104044801-0v8fmmv0jl7itv9b
2013-01-04 04:48:01 +00:00
Launchpad Translations on behalf of openerp 6da448e0ad Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130108060408-8nb3941v15q9ybdf
bzr revid: launchpad_translations_on_behalf_of_openerp-20130109055200-8b1ngo68e9purey3
bzr revid: launchpad_translations_on_behalf_of_openerp-20130110053544-j7oyp5nohajb0nj8
bzr revid: launchpad_translations_on_behalf_of_openerp-20130111052135-l323k3ttzdy0o9km
bzr revid: launchpad_translations_on_behalf_of_openerp-20130111052208-h19znnqin0y82wvx
2013-01-11 05:22:08 +00:00
Launchpad Translations on behalf of openerp 3ba106a80f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130106053125-9sb5dr03kc8gmvpe
bzr revid: launchpad_translations_on_behalf_of_openerp-20130107054512-8vxs3lzomicfru2z
bzr revid: launchpad_translations_on_behalf_of_openerp-20130107054515-z9gktg07rskvs12r
2013-01-07 05:45:15 +00:00
Launchpad Translations on behalf of openerp fca02afad3 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130101051924-2q3t0sbo83ti3ooe
bzr revid: launchpad_translations_on_behalf_of_openerp-20130102052612-z5wooakbv4fnww9x
2013-01-02 05:26:12 +00:00
Launchpad Translations on behalf of openerp f1fcb4a994 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121230055105-9vbynsau05gi9gpg
bzr revid: launchpad_translations_on_behalf_of_openerp-20121231051632-gx9ipbfrlpix1u7e
2012-12-31 05:16:32 +00:00
Launchpad Translations on behalf of openerp 5c360f7327 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121225044840-forvhhdzu8wfuw2y
bzr revid: launchpad_translations_on_behalf_of_openerp-20121226043938-300zdp9oob5hc6e6
2012-12-26 04:39:38 +00:00
Launchpad Translations on behalf of openerp f49cf3ad50 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121222073731-s1qift4p97f9s1zf
bzr revid: launchpad_translations_on_behalf_of_openerp-20121223050857-vzu6pl7ttzy10603
bzr revid: launchpad_translations_on_behalf_of_openerp-20121224051043-oxj4lz3tpjhai7hn
2012-12-24 05:10:43 +00:00
Launchpad Translations on behalf of openerp 94afe1ccef Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121222060744-44at9lbhw0npx5h6
bzr revid: launchpad_translations_on_behalf_of_openerp-20121223044213-e86qkwoh0uo3cjti
bzr revid: launchpad_translations_on_behalf_of_openerp-20121224044035-1y0s4fc6ns7ytko6
2012-12-24 04:40:35 +00:00
Olivier Dony 3815d22432 [I18N] Update translation templates for latest changes - ready for 7.0 release
bzr revid: odo@openerp.com-20121221172005-uuwfq58gslzikygl
2012-12-21 18:20:05 +01:00