d0e9ba289f
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140429124452-5cvpmtpyz2daj8w2
2014-04-29 14:44:52 +02:00
ce17cb6d14
[MERGE][REM] List views removed in reporting menu (from membership and project_timesheet) as new graph view is now self-sufficient
...
bzr revid: rim@openerp.com-20140428130238-vcetovnq6lhuraoq
2014-04-28 15:02:38 +02:00
fa60b90c1f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
cccc7a3d0c
[MERGE]sync with trunk.
...
bzr revid: dka@tinyerp.com-20140417132329-sd2skyprb3nt88uw
2014-04-17 18:53:29 +05:30
f44a31dd27
[IMP] remove extra action from membership
...
bzr revid: rma@tinyerp.com-20140414131131-y0qjfqkb2dlrh2o5
2014-04-14 18:41:31 +05:30
99d9022830
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140411102703-6yglfuicsyx5gjoh
2014-04-11 15:57:03 +05:30
e82fbf7d91
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
51aa261b44
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
2014-03-27 07:35:04 +00:00
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
74af3ac0fe
[MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9144 revid:dle@openerp.com-20140310133913-465x5t3n1bo7fu98
...
bzr revid: dle@openerp.com-20140310143600-kz7qjfe4p63s0a34
2014-03-10 15:36:00 +01:00
c2ba11e72e
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9885 revid:dle@openerp.com-20140310114026-r0ijm0m36su19wn7
...
bzr revid: dle@openerp.com-20140310122101-gicombyc5ii0yz6a
2014-03-10 13:21:01 +01:00
3754eedf84
[MERGE] [FIX] Demo data had wrong end date for yearly membership ( #602129 )
...
bzr revid: jri@openerp.com-20140307145206-b20cq8fjatce418p
2014-03-07 15:52:06 +01:00
e4cb538cf1
[IMP] remove list view from member analysis report
...
bzr revid: rajmyt@gmail.com-20140304130727-heez8ub1x4jq4dxw
2014-03-04 18:37:27 +05:30
9863dbe5c8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
2014-03-04 07:52:38 +00:00
b3c6e20e36
[MERGE]sync with trunk and resolve conflicts.
...
bzr revid: dka@tinyerp.com-20140210084803-rjkt9e4rhni8nhlt
2014-02-10 14:18:03 +05:30
8d85c23e4a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140209065003-9soyulgvssk8n5ci
bzr revid: launchpad_translations_on_behalf_of_openerp-20140208071621-b018rnkhyxmmm5jk
bzr revid: launchpad_translations_on_behalf_of_openerp-20140209065224-kih7tx56elds0zok
bzr revid: launchpad_translations_on_behalf_of_openerp-20140210055324-raxopm5ej680oc73
2014-02-10 05:53:24 +00:00
ffabcd257c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140206062321-j6cpns6xz3f81net
bzr revid: launchpad_translations_on_behalf_of_openerp-20140206062510-x502ahdwzezvea54
2014-02-06 06:25:10 +00:00
4b30f1fcbd
[MERGE] trunk-website-al
...
bzr revid: al@openerp.com-20140131005157-jkf8hz6fh2buml2c
2014-01-31 01:51:57 +01:00
9cdcf812a6
[MERGE] merge from trunk into local branch
...
bzr revid: ged@openerp.com-20140130135251-ahk515cy0wc87kyr
2014-01-30 14:52:51 +01:00
8dba681c69
[IMP] improves the membership reporting view by adding a measure to the pivot table (num paid) (addon membership)
...
bzr revid: ged@openerp.com-20140129144233-4flp69bq188kdy05
2014-01-29 15:42:33 +01:00
033c38c304
[MERGE] trunk
...
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
2014-01-29 03:19:16 +01:00
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
3ce5e01eca
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00:00
698e2de138
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140121062040-gq8r12g3ypksxa4t
2014-01-21 06:20:40 +00:00
28d79433c3
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070457-rn2tgdxis2fi3nqo
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055822-ajy043mntc4jr407
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055854-z7wtyb24c5t8kcmj
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070538-2xm86ece1aate8u9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055932-sa6vrp2g8ua3u88e
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055948-lwcyqcfutgamwac1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070546-d89xqw56zou7e9p9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055955-6wrdxqy1018mo7jq
2014-01-20 05:59:55 +00:00
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
0c24b69db2
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140113081030-74nfutdr5le70dz4
2014-01-13 09:10:30 +01:00
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
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
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
bc33f2f609
[IMP] [membership] : Membership End Date in demo data.
...
bzr revid: cac@openerp.com-20131216073941-klkxlxm5adtk2uo9
2013-12-16 13:09:41 +05:30
19a334c1d7
[IMP] [membership] : Membership End Date in demo data.
...
bzr revid: cac@openerp.com-20131216072328-q6fobmqf9xqpj5ps
2013-12-16 12:53:28 +05:30
8f2f589561
[FIX] website: typo, partner order, event demo data
...
bzr revid: chm@openerp.com-20131211112617-11kdph7cieews0y8
2013-12-11 12:26:17 +01:00
fd2821086f
[MERGE] sync with trunk
...
bzr revid: chm@openerp.com-20131202150925-eqsi0uu0fqtwimhj
2013-12-02 16:09:25 +01:00
0eeb29ac08
[MERGE] trunk-website-demo-partner-bth
...
bzr revid: chm@openerp.com-20131128173621-ge78agxfpmxcbytu
2013-11-28 18:36:21 +01:00
b1f8f3dfd2
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131122060235-8k2oxuc94x45jjoc
bzr revid: launchpad_translations_on_behalf_of_openerp-20131122060308-lb2sgcxbv804pafr
bzr revid: launchpad_translations_on_behalf_of_openerp-20131116062541-ouuae0dl331ekjcb
bzr revid: launchpad_translations_on_behalf_of_openerp-20131117054520-eypowk6g8qatvq7n
bzr revid: launchpad_translations_on_behalf_of_openerp-20131120054421-95x86930ezm0p33h
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121063904-5igv5f7tgwlaipvv
bzr revid: launchpad_translations_on_behalf_of_openerp-20131122060313-x4c5bx498gyrkhqr
2013-11-22 06:03:13 +00:00
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
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
108ccbf108
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114062958-ies8xa3pft7n59ms
bzr revid: launchpad_translations_on_behalf_of_openerp-20131106055135-r0xt2vr04710jh1t
bzr revid: launchpad_translations_on_behalf_of_openerp-20131107055120-r8z445ergt50erlx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131108062620-bvfofx1jl1wb1csh
bzr revid: launchpad_translations_on_behalf_of_openerp-20131110064525-ioceogsmu0nmx2qj
bzr revid: launchpad_translations_on_behalf_of_openerp-20131111053908-gbrp09ast5fhr6iw
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112062316-5uf2bvbzdhkq1b7k
bzr revid: launchpad_translations_on_behalf_of_openerp-20131113060841-bkjcuz4e9rtzn6f9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114063058-rrm2q5lxkyawuvpz
2013-11-14 06:30:58 +00:00
855e928f83
[IMP]Improved code.
...
bzr revid: bth@tinyerp.com-20131031104719-q4ipxnq57jyj1wke
2013-10-31 16:17:19 +05:30
7af88b47f9
[IMP]Add free member.
...
bzr revid: bth@tinyerp.com-20131031094107-74lqrq6bd2e5gmsi
2013-10-31 15:11:07 +05:30
4a68d69b76
[IMP]Added free members.
...
bzr revid: bth@tinyerp.com-20131031090950-idob74nqsyfaabn0
2013-10-31 14:39:50 +05:30
960924195e
[MERGE]merged with main addons
...
bzr revid: dka@tinyerp.com-20131030052926-i9c25mf6wpseioh3
2013-10-30 10:59:26 +05:30
93bcef7229
[IMP]Remove assigned partners in demo.
...
bzr revid: bth@tinyerp.com-20131028073942-gqtybkjuvpbunxqm
2013-10-28 13:09:42 +05:30
1a2c57343f
[IMP]Removed partner.
...
bzr revid: bth@tinyerp.com-20131025063102-69mdt50mja6ydsy2
2013-10-25 12:01:02 +05:30
3a2a98034e
[IMP]Improved code to paid invoiced.
...
bzr revid: bth@tinyerp.com-20131024121849-0sgdrta07u3quxr6
2013-10-24 17:48:49 +05:30
17a37e775d
[IMP]Created for invoiced and waiting state membership.
...
bzr revid: bth@tinyerp.com-20131023135241-zphclcokpyj0jc75
2013-10-23 19:22:41 +05:30
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
f7e89a0224
[IMP]Create membership demo data.
...
bzr revid: bth@tinyerp.com-20131014120919-95e61zshhg2bi1b3
2013-10-14 17:39:19 +05:30
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
Richard Mathot (OpenERP)
Randhir Mayatra (OpenERP)
Launchpad Translations on behalf of openerp
Darshan Kalola (OpenERP)
Christophe Simonis
Denis Ledoux
Juan Rial
Randhir Mayatra (OpenERP)
Antony Lesuisse
Gery Debongnie
Olivier Dony
Thibault Delavallée
Stephane Wirtel
Chandni Machchhar (OpenERP)
Christophe Matthieu
bth-openerp