Commit Graph

681 Commits

Author SHA1 Message Date
Antony Lesuisse 033c38c304 [MERGE] trunk
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
2014-01-29 03:19:16 +01:00
Olivier Dony 39c27c72d0 [MERGE] Sync with trunk rev. 9064 rev-id ged@openerp.com-20140127161718-uo6pperke86pqq5v
bzr revid: odo@openerp.com-20140128175835-jannyh3cv3gi1sxn
2014-01-28 18:58:35 +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
Thibault Delavallée 9cf78e93cc [MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.
bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk
2014-01-16 11:39:10 +01:00
Gery Debongnie 0c24b69db2 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140113081030-74nfutdr5le70dz4
2014-01-13 09:10:30 +01:00
Stephane Wirtel bea411bb98 [IMP] Backport one feature from website: this feature allows to specify a file
path on the field tag fetching the right file instead of using the base64
encoded file in the field.

<field name="image" type="base64" file="base/static/img/main_partner-image.png" />

bzr revid: stw@openerp.com-20140109154550-a04qybctzaaqtrlr
2014-01-09 16:45:50 +01:00
Gery Debongnie 7adfd70d7e [IMP] removes old tree view in reporting and replaces it by the new graph view in pivot mode by default (addon membership)
bzr revid: ged@openerp.com-20131231142807-llb4bvv9njt03ub2
2013-12-31 15:28:07 +01:00
Gery Debongnie b569c6de23 [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon membership)
bzr revid: ged@openerp.com-20131224102846-ul5tyji72ai5sesb
2013-12-24 11:28:46 +01:00
Christophe Matthieu 8f2f589561 [FIX] website: typo, partner order, event demo data
bzr revid: chm@openerp.com-20131211112617-11kdph7cieews0y8
2013-12-11 12:26:17 +01:00
Christophe Matthieu fd2821086f [MERGE] sync with trunk
bzr revid: chm@openerp.com-20131202150925-eqsi0uu0fqtwimhj
2013-12-02 16:09:25 +01:00
Christophe Matthieu 0eeb29ac08 [MERGE] trunk-website-demo-partner-bth
bzr revid: chm@openerp.com-20131128173621-ge78agxfpmxcbytu
2013-11-28 18:36:21 +01:00
Launchpad Translations on behalf of openerp 17fe569269 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131119052725-2fcjekn5ouumctna
bzr revid: launchpad_translations_on_behalf_of_openerp-20131120052525-2pwf2q3wdcrbqics
2013-11-20 05:25:25 +00:00
bth-openerp 855e928f83 [IMP]Improved code.
bzr revid: bth@tinyerp.com-20131031104719-q4ipxnq57jyj1wke
2013-10-31 16:17:19 +05:30
bth-openerp 7af88b47f9 [IMP]Add free member.
bzr revid: bth@tinyerp.com-20131031094107-74lqrq6bd2e5gmsi
2013-10-31 15:11:07 +05:30
bth-openerp 4a68d69b76 [IMP]Added free members.
bzr revid: bth@tinyerp.com-20131031090950-idob74nqsyfaabn0
2013-10-31 14:39:50 +05:30
bth-openerp 93bcef7229 [IMP]Remove assigned partners in demo.
bzr revid: bth@tinyerp.com-20131028073942-gqtybkjuvpbunxqm
2013-10-28 13:09:42 +05:30
bth-openerp 1a2c57343f [IMP]Removed partner.
bzr revid: bth@tinyerp.com-20131025063102-69mdt50mja6ydsy2
2013-10-25 12:01:02 +05:30
bth-openerp 3a2a98034e [IMP]Improved code to paid invoiced.
bzr revid: bth@tinyerp.com-20131024121849-0sgdrta07u3quxr6
2013-10-24 17:48:49 +05:30
bth-openerp 17a37e775d [IMP]Created for invoiced and waiting state membership.
bzr revid: bth@tinyerp.com-20131023135241-zphclcokpyj0jc75
2013-10-23 19:22:41 +05:30
bth-openerp c8d1d72a0b [IMP]Added yml file for invoiced status of membership.
bzr revid: bth@tinyerp.com-20131023125340-xo6fu8loygwjo355
2013-10-23 18:23:40 +05:30
bth-openerp f7e89a0224 [IMP]Create membership demo data.
bzr revid: bth@tinyerp.com-20131014120919-95e61zshhg2bi1b3
2013-10-14 17:39:19 +05:30
Thibault Delavallée dab444adb7 [IMP] membership: added partners for memberships in demo data
bzr revid: tde@openerp.com-20131007145150-gtun0q9vt32sluet
2013-10-07 16:51:50 +02: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
Christophe Simonis 3fa90321e1 [MERGE] forward port of branch saas-1 up to revid 8772 chs@openerp.com-20130910122113-171osvcukxffxcry
bzr revid: chs@openerp.com-20130910124803-wxkb8gkz1tub5qjf
2013-09-10 14:48:03 +02:00
Denis Ledoux 546a191f0a [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9459 rev-id: fva@openerp.com-20130918153347-fy4nuvbm82ngfb8x
bzr revid: mat@openerp.com-20130826135110-f9q4p65ds2aholcw
bzr revid: dle@openerp.com-20130828141129-ecxl2vlpb8vw0o9f
bzr revid: dle@openerp.com-20130828162659-n8a0ku9o3h01qaov
bzr revid: dle@openerp.com-20130830094205-q3itwd7x0246d9n6
bzr revid: dle@openerp.com-20130830133604-mfnfbscn5wdk4vi4
bzr revid: dle@openerp.com-20130902131244-v9uh0s8rg4889i7j
bzr revid: mat@openerp.com-20130903134105-68ziuaccreu6rs61
bzr revid: chs@openerp.com-20130906171851-jtfsf4au1k30wwlr
bzr revid: dle@openerp.com-20130909103120-k5oefxgebhyslac3
bzr revid: dle@openerp.com-20130909170047-pbzw4ernvcpivbhh
bzr revid: chs@openerp.com-20130910122113-171osvcukxffxcry
bzr revid: tde@openerp.com-20130912121059-k840pi4rwdzpez8g
bzr revid: dle@openerp.com-20130913085251-p906ci2divy82jur
bzr revid: tde@openerp.com-20130913092546-kzshg1a7sls566l8
bzr revid: mat@openerp.com-20130917122102-drf8fj9lrjj0fvju
bzr revid: mat@openerp.com-20130917161614-w8u2c1ayeb5kxm30
bzr revid: dle@openerp.com-20130918161305-7ep1642nxzyy3vhd
2013-09-18 18:13:05 +02:00
Thibault Delavallée ed0a829cb3 [MERGE] [IMP] addons: improved name and tooltips of groupby date in various addons.
bzr revid: tde@openerp.com-20130904141053-yustqiuzynbettq8
2013-09-04 16:10:53 +02: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
Martin Trigaux 5739cac5fb [FIX] membership: set priority on search view to avoid getting it for other modules
bzr revid: mat@openerp.com-20130902075012-y6o3wjgz9qhqm837
2013-09-02 09:50:12 +02:00
Launchpad Translations on behalf of openerp c46331a3ca Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130729055508-7yza7v2jdny1gear
bzr revid: launchpad_translations_on_behalf_of_openerp-20130730045810-58du4wi80axs0t81
bzr revid: launchpad_translations_on_behalf_of_openerp-20130806050509-v64stuiemu934s7t
bzr revid: launchpad_translations_on_behalf_of_openerp-20130809053600-ssuy8yhd6ve9cse6
bzr revid: launchpad_translations_on_behalf_of_openerp-20130810053806-gx2uwr6zoit4zow2
bzr revid: launchpad_translations_on_behalf_of_openerp-20130811050026-l3omk3m8v7f34dnu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130810053803-dm8ugwnibrznai0t
bzr revid: launchpad_translations_on_behalf_of_openerp-20130811050015-lmxdgm6fks2fyzoe
bzr revid: launchpad_translations_on_behalf_of_openerp-20130812050650-ta4kndyaxthut4tv
2013-08-12 05:06:50 +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
Launchpad Translations on behalf of openerp bbb628be2a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130606062901-5gh1mnjepy36whkh
2013-06-06 06:29:01 +00:00
Darshan Kalola (OpenERP Trainee) 8f07cb2046 [IMP] Improved Help
bzr revid: darshankalola@gmail.com-20130605070425-ykw13dlv28aq4akh
2013-06-05 12:34:25 +05:30
Launchpad Translations on behalf of openerp 0934155fa6 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130509061134-n0s13s5mudwpofan
bzr revid: launchpad_translations_on_behalf_of_openerp-20130510065122-6968relnf5rj67w4
2013-05-10 06:51:22 +00:00
Xavier Morel 07607f054b [REM] more nonsensical @model + @ref
bzr revid: xmo@openerp.com-20130429125217-slmp1v9t7uri6ev6
2013-04-29 14:52:17 +02:00
Launchpad Translations on behalf of openerp 6b04a532b8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130423060902-2j8xouki50aemi14
bzr revid: launchpad_translations_on_behalf_of_openerp-20130423061017-5os2p9ztugb6jjph
bzr revid: launchpad_translations_on_behalf_of_openerp-20130423061019-n2660taj1o9os75c
2013-04-23 06:10:19 +00:00
Vo Minh Thu e69326ee3b [REF] removed explicit model instanciations.
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02: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
Raphael Collet 9584109b86 [IMP] cleanup of Yaml files: do not translate assert messages
bzr revid: rco@openerp.com-20130321131824-422cc4mk2bm9yrw8
2013-03-21 14:18:24 +01:00
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
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
Launchpad Translations on behalf of openerp 5a8497ddeb Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130306054622-snqw4k5dcxi37p04
bzr revid: launchpad_translations_on_behalf_of_openerp-20130307045702-2p4nejodo4sfrtu8
2013-03-07 04:57:02 +00:00
Raphael Collet 9e05f4d291 [FIX] membership: fix import statements in yml file
bzr revid: rco@openerp.com-20130213103239-5tq1ib4xcbykgjzk
2013-02-13 11:32:39 +01:00
Raphael Collet 55625f52db [FIX] fix import statements in yml files
bzr revid: rco@openerp.com-20130213101803-4y1ponocx6oai2mz
2013-02-13 11:18:03 +01:00
Raphael Collet 5f855a1ddb [MERGE] from trunk
bzr revid: rco@openerp.com-20130213083519-3nbg40h5em0gfeu3
2013-02-13 09:35:19 +01:00
Launchpad Translations on behalf of openerp 6e22d502b9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130210044934-z1bbgxucqmho88yy
bzr revid: launchpad_translations_on_behalf_of_openerp-20130211051101-oqbt39y8nlf4mz0p
bzr revid: launchpad_translations_on_behalf_of_openerp-20130212044352-69l303nui500furz
2013-02-12 04:43:52 +00:00
Vo Minh Thu 854dd54f47 [FIX] import netsvc from the openerp namespace.
bzr revid: vmt@openerp.com-20130209070923-db3hqz16exe6m6i4
2013-02-09 08:09:23 +01:00
Vo Minh Thu 37dec8326d [FIX] import openerp.netsvc instead of netsvc in YML tests.
bzr revid: vmt@openerp.com-20130209062436-e2wfh3sgoufrh77t
2013-02-09 07:24:36 +01:00