Commit Graph

30 Commits

Author SHA1 Message Date
Denis Ledoux 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
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
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
Chandni Machchhar (OpenERP) bc33f2f609 [IMP] [membership] : Membership End Date in demo data.
bzr revid: cac@openerp.com-20131216073941-klkxlxm5adtk2uo9
2013-12-16 13:09:41 +05:30
Chandni Machchhar (OpenERP) 19a334c1d7 [IMP] [membership] : Membership End Date in demo data.
bzr revid: cac@openerp.com-20131216072328-q6fobmqf9xqpj5ps
2013-12-16 12:53:28 +05:30
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
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 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 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
Thibault Delavallée 8d2c35cc75 [IMP] Misc addons: product_image -> image.
bzr revid: tde@openerp.com-20120814081616-zb5xe06cy8r3n5ie
2012-08-14 10:16:16 +02:00
Rucha (Open ERP) 50164cdb7e [IMP]: Added images for products in some modules like membership, hr_expense...
bzr revid: rpa@tinyerp.com-20120719092738-jlnadpulm88kc032
2012-07-19 14:57:38 +05:30
Rucha (Open ERP) 237173eeff [IMP]: product: Improvement in product category demo, improved xml_id refereneces (work in progress)
bzr revid: rpa@tinyerp.com-20120628093001-k113siqn5sbp3xf2
2012-06-28 15:00:01 +05:30
Rucha (Open ERP) 0aaef8a06e [IMP]: Improved partner demo xml_id referenced based on changes in server
bzr revid: rpa@tinyerp.com-20120620120305-g88c9cp55csnsvoc
2012-06-20 17:33:05 +05:30
Rucha (Open ERP) 189fd8e390 [IMP]: (Work in progress)* Changed demo references according to changes in server, Aim is to add more common names and easy demo.
* Improved xml_id of demo like res_partner_1 instead of specific record name like res_partner_asus so in future we can change that record value easily avoiding confusions in names

bzr revid: rpa@tinyerp.com-20120619071624-3d9mcl9m76gp2s0c
2012-06-19 12:46:24 +05:30
psi (Open ERP) 40410b075b [IMP] membership: Update demo data and add membership field in view
bzr revid: psi@tinyerp.co.in-20101006133719-ffwws6ya5xj42sxs
2010-10-06 19:07:19 +05:30
Harry (OpenERP) 59ef04ef06 [IMP] membership: demo+search view
bzr revid: hmo@tinyerp.com-20100720134326-4d5suwkfmdxcrpvl
2010-07-20 19:13:26 +05:30
Harry (OpenERP) e89b48999c [IMP] Membership: cleaning
bzr revid: hmo@tinyerp.com-20100720125015-w9stiw8lde6hvipx
2010-07-20 18:20:15 +05:30
Fabien Pinckaers 54e1058afd [imp] multi-company groups
bzr revid: fp@tinyerp.com-20091125175023-hmi1msewn9ehb3f2
2009-11-25 18:50:23 +01:00
mra (Open ERP) fd354c6720 [FIX] membership: change membership product date from and date to value with current year on demo data
bzr revid: mra@tinyerp.com-20091112092443-rbah12q1c2n70u0i
2009-11-12 14:54:43 +05:30
vra (Tiny) 1fe8ed7828 Fix account-code duplication error in membership module.
bzr revid: vinusoft85@gmail.com-20090529052432-b8dnw74s7eyxjwk7
2009-05-29 10:54:32 +05:30
mra (Open ERP) 939a981520 membership enhance view and demo data
bzr revid: mra@tinyerp.com-20090219131449-wj7lpcmkmguwwu5y
2009-02-19 18:44:49 +05:30
qdp 7ed9ea3eff [FIX] The state of Associated members was only changed if the Associate member field was changed later.
[IMP] added recursion control on associate_member
[IMP] overall cleaning of the whole module

lp bug: https://launchpad.net/bugs/313339 fixed

bzr revid: qdp@tinyerp.com-20090128111530-h9j1kiizzyd7cyuq
2009-01-28 12:15:30 +01:00
Fabien Pinckaers 7ff10785c1 bugfixes
bzr revid: fp@tinyerp.com-20081128200302-9cbougnii1rfp8mz
2008-11-28 21:03:02 +01:00
Christophe Simonis bbe68afcc4 update demo data with new account module
bzr revid: christophe@tinyerp.com-20080911151302-ma46gickzmg5csu9
2008-09-11 17:13:02 +02:00
Stephane Wirtel 606165c849 rename the tag <terp/> by <openerp/>
bzr revid: stephane@tinyerp.com-20080910175600-tutctqg606c9eil4
2008-09-10 19:56:00 +02:00
Christophe Simonis d245f4f7fb fix errors preventing installation
bzr revid: christophe@tinyerp.com-20080910122034-vcq41c249oz4zqwu
2008-09-10 14:20:34 +02:00
Mustufa Rangwala 7343ac0a5c remove defferal method from account object
- modify close fiscal year wizard
- modify chars : l10n_fr,l10n_chart_uk_minimal
- modify membership

bzr revid: mra@tinyerp.com-20080901094924-vi1df639wpcxf3ci
2008-09-01 15:19:24 +05:30
Fabien Pinckaers 734fa42184 added from extra-addons
bzr revid: fp@tinyerp.com-20080824144543-33o2j8ddmvaxx4ce
2008-08-24 16:45:43 +02:00