Commit Graph

670 Commits

Author SHA1 Message Date
Launchpad Translations on behalf of openerp 420f82ec0e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130305053802-13krr4lhrwrebwak
bzr revid: launchpad_translations_on_behalf_of_openerp-20130305053905-y30zk4dbbcc3qj4b
2013-03-05 05:39:05 +00: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
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 31f73fef99 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130215052430-80s9f9m1p1xvy6f1
2013-02-15 05:24:30 +00:00
Launchpad Translations on behalf of openerp b64db1c007 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130207054227-fy00xo21liqcoqz8
bzr revid: launchpad_translations_on_behalf_of_openerp-20130207054231-c558abx56zwr0mg2
2013-02-07 05:42:31 +00:00
Launchpad Translations on behalf of openerp 3a2286bd78 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130206054638-vf8j7uyaw84orsww
2013-02-06 05:46:38 +00:00
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 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 d299567edb Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130109055250-wxy0mw21gmbainhu
2013-01-09 05:52:50 +00:00
Thibault Delavallée fa36ac76ee [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121220091908-7qy8excmhe3ussi0
2012-12-20 10:19:08 +01:00
Launchpad Translations on behalf of openerp 2315050bab Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121220044654-aygk0cmaxl26bs0f
bzr revid: launchpad_translations_on_behalf_of_openerp-20121220045947-8j22pe4nm62kzq22
2012-12-20 04:59:47 +00:00
Thibault Delavallée 8d26e78582 [IMP] Addons: removed bold in subtype descriptions.
bzr revid: tde@openerp.com-20121219212330-xfx3lykstl1nsa8m
2012-12-19 22:23:30 +01:00
Thibault Delavallée 3e67fc6d6b [CLEAN] Sale_crm: cleaned subtypes, removed auto following that will be added in mail_thread. Updated track_visility parameter.
bzr revid: tde@openerp.com-20121219164001-dbjvkl0q11e9f91t
2012-12-19 17:40:01 +01:00
Thibault Delavallée cd290565a4 [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121219093924-5rqmhb6ve7bv7qzl
2012-12-19 10:39:24 +01:00
Launchpad Translations on behalf of openerp 56248183fc Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121219051749-jfkdv3ohgd61z9pq
bzr revid: launchpad_translations_on_behalf_of_openerp-20121219052238-gjyvmd0dp8pahk2c
2012-12-19 05:22:38 +00:00
Thibault Delavallée ddda5c3640 [REF] sale: removed some chatter messages, replaced by a track on state and amount, and a _track with subtype. Moved link between salesteam and sale order into sale_crm.
bzr revid: tde@openerp.com-20121218181718-zw3d4lmau83bhk7v
2012-12-18 19:17:18 +01:00
Thibault Delavallée b95b32d644 [MERGE] Merged branch holding subtype work by APA.
bzr revid: tde@openerp.com-20121218131142-2jb6wac6y9q6dc7v
2012-12-18 14:11:42 +01:00
Raphael Collet 73980eba5f [MERGE] trunk-import-openerp-thu (use strict naming convention when importing openerp stuff)
bzr revid: rco@openerp.com-20121218085914-qzr2upqfxmfbzfsx
2012-12-18 09:59:14 +01:00
Launchpad Translations on behalf of openerp b2bb3eafbd Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121218045907-df0xw1q7dgw696s1
bzr revid: launchpad_translations_on_behalf_of_openerp-20121218050221-ab50rd40d94gd9a0
bzr revid: launchpad_translations_on_behalf_of_openerp-20121218050832-5hvbj7p0bpsw6fp0
2012-12-18 05:08:32 +00:00
Cecile Tonglet 15fe515601 [MERGE] From trunk
bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28
2012-12-17 15:43:06 +01:00
Foram Katharotiya (OpenERP) 1f2f15c51d [IMP] update followers
bzr revid: fka@tinyerp.com-20121217091402-pylrooffkzykcnu9
2012-12-17 14:44:02 +05:30
Foram Katharotiya (OpenERP) 7608fe70de [IMP] add generic method _subscribe_followers_subtype in mail_thread & remove method in all module
bzr revid: fka@tinyerp.com-20121217073817-8kmp0j3kn39gyrwg
2012-12-17 13:08:17 +05:30
Foram Katharotiya (OpenERP) f0ade4cd4d [IMP] Add comments
bzr revid: fka@tinyerp.com-20121213115810-x1myyu344xdklky9
2012-12-13 17:28:10 +05:30
Foram Katharotiya (OpenERP) e664c9583a [IMP] improve code
bzr revid: fka@tinyerp.com-20121213102024-gly6jwslfkyg9wsm
2012-12-13 15:50:24 +05:30
Foram Katharotiya (OpenERP) 0139a0baed [IMP] improve code
bzr revid: fka@tinyerp.com-20121213085354-j1u1d7zj0peyoulb
2012-12-13 14:23:54 +05:30
Launchpad Translations on behalf of openerp d6ea61789f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121213044507-t1hpxi43gks88w2e
bzr revid: launchpad_translations_on_behalf_of_openerp-20121213050131-3r9t674ehhnkneky
2012-12-13 05:01:31 +00:00
Foram Katharotiya (OpenERP) ff15fe0c7c [MERGE] with trunk
bzr revid: fka@tinyerp.com-20121213045043-hwdrk202wlubx31b
2012-12-13 10:20:43 +05:30
Foram Katharotiya (OpenERP) 267f8aa64f [MERGE] with trunk
bzr revid: fka@tinyerp.com-20121212045623-v35kdwf3rlbewqiu
2012-12-12 10:26:23 +05:30
Launchpad Translations on behalf of openerp 2e7f68e09f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121212043903-maiyd94p4ifgdqew
bzr revid: launchpad_translations_on_behalf_of_openerp-20121212044145-k216g0bcavdlf2o3
bzr revid: launchpad_translations_on_behalf_of_openerp-20121212045414-tgg69aaw4dz72b0p
2012-12-12 04:54:14 +00:00
Vo Minh Thu 6072fd11af [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20121210111654-0pm3pupnqqeip52n
2012-12-10 12:16:54 +01:00
Foram Katharotiya (OpenERP) 955f2588a2 [MERGE] with trunk
bzr revid: fka@tinyerp.com-20121210045724-sk2hk8mmi8iahfwn
2012-12-10 10:27:24 +05:30
Launchpad Translations on behalf of openerp 7f1d5daf2f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121210043931-72a32pz7q282df45
bzr revid: launchpad_translations_on_behalf_of_openerp-20121210044428-d9bzm1dnqc26voci
2012-12-10 04:44:28 +00:00
Foram Katharotiya (OpenERP) 0cce342627 [IMP] update followers
bzr revid: fka@tinyerp.com-20121207105030-97ohiuppto439633
2012-12-07 16:20:30 +05:30
Foram Katharotiya (OpenERP) b3b6bacccd [MERGE] with trunk
bzr revid: fka@tinyerp.com-20121207044936-2wh9gdjltd2isdjm
2012-12-07 10:19:36 +05:30
Launchpad Translations on behalf of openerp c09b9cb5f9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121207043623-mrfjgzunwq1dlmmh
bzr revid: launchpad_translations_on_behalf_of_openerp-20121207044755-avo3gbucdjj6i0ms
2012-12-07 04:47:55 +00:00
Vo Minh Thu e7f4891d46 [IMP] use the openerp namespace.
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
Foram Katharotiya (OpenERP) 84527bbdf3 [IMP]improve code
bzr revid: fka@tinyerp.com-20121206064927-59pdr3580a693waa
2012-12-06 12:19:27 +05:30
Foram Katharotiya (OpenERP) 2887aa08cb [IMP] display subtype of related salesteam in sale order
bzr revid: fka@tinyerp.com-20121205095217-w122mu69wvxkuzmg
2012-12-05 15:22:17 +05:30
Launchpad Translations on behalf of openerp 683f31e51b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121204055506-fin73s7n3o52fmuy
bzr revid: launchpad_translations_on_behalf_of_openerp-20121204055956-fsd4tp3felpk8pm5
2012-12-04 05:59:56 +00:00
Olivier Dony 308e4f1073 [I18N] Removed duplicated terms for inherited [_sql]_constraints -> 400 terms removed
bzr revid: odo@openerp.com-20121203162755-p71dnn0k0t2b98yp
2012-12-03 17:27:55 +01:00
Olivier Dony 5483897ad0 [I18N] Update translation templates for latest changes
bzr revid: odo@openerp.com-20121203155934-zmut8afc7hh82b02
2012-12-03 16:59:34 +01:00
Quentin (OpenERP) b75fde3773 [FIX] account, sale_crm: fixed invoices analysis
bzr revid: qdp-launchpad@openerp.com-20121129134842-cro77z9siesjifdm
2012-11-29 14:48:42 +01:00
Launchpad Translations on behalf of openerp 09eccd07dc Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121128044150-jz3ll5wdeuxmt0uq
bzr revid: launchpad_translations_on_behalf_of_openerp-20121128045740-q3cav2rhekdy6gq8
2012-11-28 04:57:40 +00:00
Fabien Pinckaers b28d6f1e7d [IMP] Sales team on invoices
bzr revid: fp@tinyerp.com-20121126083331-43pm5qo3snv7ie19
2012-11-26 09:33:31 +01:00
Launchpad Translations on behalf of openerp 828cce9be0 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121125063324-fjz8k77annh364u7
bzr revid: launchpad_translations_on_behalf_of_openerp-20121126044235-u20vi1440dgppikf
bzr revid: launchpad_translations_on_behalf_of_openerp-20121125064209-s515ia18188hl147
bzr revid: launchpad_translations_on_behalf_of_openerp-20121126045508-rm6d2mx71a0sjqh9
2012-11-26 04:55:08 +00:00
Launchpad Translations on behalf of openerp 117bf937b9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124055830-p04ni2o2ogsch9zc
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124065500-zwtkurcb1ic9ktqb
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124070752-itto1xb6r6oao3z5
2012-11-24 07:07:52 +00:00
Olivier Dony 771b216118 [I18N] Update translation templates in preparation for 7.0 release
bzr revid: odo@openerp.com-20121124030804-9dvr1qwec830p8fc
2012-11-24 04:08:04 +01:00
Vijaykumar Baladaniya 03be785583 [IMP] Improve changes.
bzr revid: vba@tinyerp.com-20121122105108-svykp47xpq1ghvdy
2012-11-22 16:21:08 +05:30
Vijaykumar Baladaniya b434782c96 Improve context.
bzr revid: vba@tinyerp.com-20121121134831-39shqk4z9mwj2eu4
2012-11-21 19:18:31 +05:30
Vijaykumar Baladaniya c4366709a8 Improve code.
bzr revid: vba@tinyerp.com-20121121132238-blrkmrt10wsyxdqm
2012-11-21 18:52:38 +05:30
Vijaykumar Baladaniya 950ae6e125 Set a default_section_id at create time.
bzr revid: vba@tinyerp.com-20121121124128-8smdl8valzdp4efk
2012-11-21 18:11:28 +05:30
Vijaykumar Baladaniya 7efa6b7685 [IMP] Change argument.
bzr revid: vba@tinyerp.com-20121121112038-8n21ntn7m25j73i6
2012-11-21 16:50:38 +05:30
Vijaykumar Baladaniya 81b9e073ee [IMP] Improve default_section_id.
bzr revid: vba@tinyerp.com-20121121105007-8i3en0t0retn27nz
2012-11-21 16:20:07 +05:30
Vijaykumar Baladaniya d17568d572 [IMP] Add section_id in the invoice analysis report.
bzr revid: vba@tinyerp.com-20121121101909-hez6fxcqcyn3njy8
2012-11-21 15:49:09 +05:30
Vijaykumar Baladaniya d6e87438d9 [IMP] Add a group by on invoice tree for salesteam.
bzr revid: vba@tinyerp.com-20121121050215-jswj8y7khi6ap37n
2012-11-21 10:32:15 +05:30
Vijaykumar Baladaniya 76376ed19c [IMP] Improve sales team invoice.
bzr revid: vba@tinyerp.com-20121120133940-dnu83uuxqkqg1tto
2012-11-20 19:09:40 +05:30
Arnaud Pineux 7b76c5216e [MERGE] fix the phone call to opportunity to quotation
lp bug: https://launchpad.net/bugs/1017353 fixed

bzr revid: api@openerp.com-20121113134911-gd4o1zj6ixtu83hm
2012-11-13 14:49:11 +01:00
Launchpad Translations on behalf of openerp 87d3caa50f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121030053700-w841c92uvirpii9h
2012-10-30 05:37:00 +00:00
Quentin (OpenERP) b526278aa1 [IMP] sale_crm depends on sale, not sale_stock
bzr revid: qdp-launchpad@openerp.com-20121024085842-98edk5c5twqi1rqw
2012-10-24 10:58:42 +02:00
Launchpad Translations on behalf of openerp 5bfa3c5a7d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121019053933-51d6oob5aw0ujz40
2012-10-19 05:39:33 +00:00
Fabien Pinckaers 6d60d6a56f [MERGE] conver tto quote useability
bzr revid: fp@openerp.com-20121010194325-pisfvcf8664q78c1
2012-10-10 21:43:25 +02:00
Saurang Suthar ae5c833184 [MERGE]:merged with main addons
bzr revid: ssu@tinyerp.com-20121008061925-puy5tlpntcmdrxr9
2012-10-08 11:49:25 +05:30
Antonin Bourguignon 1653332080 [MERGE] trunk
bzr revid: abo@openerp.com-20121002102915-424prxd74izb1szw
2012-10-02 12:29:15 +02:00
Saurang Suthar dad2475d9f [IMP]sale_crm:made Convert to Quotation button invisible if opportunity is closed(Won)
bzr revid: ssu@tinyerp.com-20120926063147-l4nvifaehms9lugc
2012-09-26 12:01:47 +05:30
Fabien Pinckaers 0eee48d30a [MERGE] auto-follow Sales Team, Projet, HR Manager
bzr revid: fp@tinyerp.com-20120927191059-pug5mrft8f06uwux
2012-09-27 21:10:59 +02:00
Atul Patel (OpenERP) 1c1978fbb7 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120927041011-e90b4710saidnlcf
2012-09-27 09:40:11 +05:30
Atul Patel (OpenERP) d050d743ee [FIX]: override write method into hr module..
bzr revid: atp@tinyerp.com-20120926184445-3o03o0n4oxgprern
2012-09-27 00:14:45 +05:30
Atul Patel (OpenERP) f7c2177157 [IMP]: Improve write method for project
bzr revid: atp@tinyerp.com-20120926162225-io7szog9omvd0sx6
2012-09-26 21:52:25 +05:30
Atul Patel (OpenERP) ae0d1d99a3 [FIX]: Fix override write() method for sales team
bzr revid: atp@tinyerp.com-20120926160233-1vvmf21nspprr4qp
2012-09-26 21:32:33 +05:30
Fabien Pinckaers e9f4840c93 [IMP] emoving bad code, no invitation system on events
[IMP] no more certifiate, will be managed in apps.openerp.com directly

bzr revid: fp@tinyerp.com-20120926121627-60isym4hdjkaxe9p
2012-09-26 14:16:27 +02:00
Atul Patel (OpenERP) f8df69e807 [FIX]: Fix id and None project_id problem
bzr revid: atp@tinyerp.com-20120925023502-s114b6811pxm84kg
2012-09-25 08:05:02 +05:30
Atul Patel (OpenERP) 4199e2bfbb [MERGE]: Merged lp:~openerp-dev/openobject-addons/trunk-auto_follow-atp-sales_auto_follow-pja
bzr revid: atp@tinyerp.com-20120924125139-uaw26laihpyk4u7o
2012-09-24 18:21:39 +05:30
Jalpesh Patel (OpenERP) 771936b836 [IMP]sales auto followe
bzr revid: pja@tinyerp.com-20120924110409-muixiwuv5u9fkl62
2012-09-24 16:34:09 +05:30
Quentin (OpenERP) 79da379130 [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20120920101159-oaz40ygm6md27i8y
2012-09-20 12:11:59 +02:00
Foram Katharotiya (OpenERP) 5bef9aa440 [IMP] in Opportunities form view change button name of 'convert to quote' & put escalate button near the field 'Sales Team'
bzr revid: fka@tinyerp.com-20120912064257-3zg1j4oek2o7imje
2012-09-12 12:12:57 +05:30
Atul Patel (OpenERP) f1cf4c04b9 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120909110214-2e1c7e7t43c69zzo
2012-09-09 16:32:14 +05:30
Atul Patel (OpenERP) eb28892a3a [IMP]: MOVE PROCUREMENT CHANGES INTO PROCUREMENT..
bzr revid: atp@tinyerp.com-20120909101156-9pna66qbx28px2ii
2012-09-09 15:41:56 +05:30
Thibault Delavallée 48c081f271 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120904075142-4xnbxyf52ph0jezj
2012-09-04 09:51:42 +02:00
Launchpad Translations on behalf of openerp ffc772edfd Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120904045249-1039twan4q8v5oip
2012-09-04 04:52:49 +00:00
Thibault Delavallée 6fa349a4eb [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120903091818-0qnjl3e5tss54bbj
2012-09-03 11:18:18 +02:00
Launchpad Translations on behalf of openerp e3f1c26e6a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120901045519-l6nqaovtdathorsj
bzr revid: launchpad_translations_on_behalf_of_openerp-20120903052117-yz3n1mkbu0qpbnfo
2012-09-03 05:21:17 +00:00
Thibault Delavallée 8b910c1f1d [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120829074244-x6u8dnw4owiw93pv
2012-08-29 09:42:44 +02:00
Launchpad Translations on behalf of openerp 4e31d1be93 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828064335-bftlutj6aiymztbp
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828072410-7ndsu3tnyrjhtuor
2012-08-28 07:24:10 +00:00
Thibault Delavallée 4b0d1be1c0 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120827083705-p2edynkzch7hszrd
2012-08-27 10:37:05 +02:00
Mayur Maheshwari (OpenERP) e6541e7791 [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20120823123824-6yot4cwpejdmdrdz
2012-08-23 18:08:24 +05:30
Antonin Bourguignon 121b351b59 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120822175756-ypym270e6cklpbds
2012-08-22 19:57:56 +02:00
Fabien Pinckaers e30fed20b8 merge_trunk
bzr revid: fp@tinyerp.com-20120822133742-yx81c62bux28wruy
2012-08-22 15:37:42 +02:00
Saurang Suthar(OpenERP) 095843797c [IMP] Improved _openerp__.py of all modules by replacing demo_xml with demo, init_xml and update_xml with data and adding noupdate
bzr revid: pso@tinyerp.com-20120822130232-un52dks3sclyx8m5
2012-08-22 18:32:32 +05:30
Hardik 8f9f860323 [IMP]Update __openerp__.py for all modules
bzr revid: hsa@tinyerp.com-20120820125644-px287o03bxrx8h3o
2012-08-20 18:26:44 +05:30
Hardik b040d2706d [IMP]update __openerp__.py in all modules
bzr revid: hsa@tinyerp.com-20120817111540-rfql0ifsvbx5nz7g
2012-08-17 16:45:40 +05:30
Fabien Pinckaers b62858e83e [IMP] Merging different ways of posting a message:
message_append_note
  message_append_dict
  message_append
  --> merged all to message_post

bzr revid: fp@tinyerp.com-20120817100302-bqsqv23ogrchslew
2012-08-17 12:03:02 +02:00
Frédéric van der Essen 36b8744644 [MERGE] from trunk
bzr revid: fva@openerp.com-20120816162407-w35dzm3xqkxj8jry
2012-08-16 18:24:07 +02:00
Atul Patel (OpenERP) f35c0b3d44 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120814161000-41ai95ixagtqteok
2012-08-14 21:40:00 +05:30
Vo Minh Thu 2376fe0add [MERGE] merged view changes: the `type` is now a functional field derived from the arch.
bzr revid: vmt@openerp.com-20120814121117-dent4ctz89kdcabi
2012-08-14 14:11:17 +02:00
Atul Patel (OpenERP) 652300eb89 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120814061700-k4swskeiz9r3ypn5
2012-08-14 11:47:00 +05:30
Frédéric van der Essen d537abc1b2 [MERGE] from trunk
bzr revid: fva@openerp.com-20120813161157-55ts36fibrys5o7j
2012-08-13 18:11:57 +02:00
Vo Minh Thu 9822629548 [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
Stephane Wirtel 36aaaf4a32 [MERGE]
bzr revid: stw@openerp.com-20120813145708-botpw2f1shkhv3on
2012-08-13 16:57:08 +02:00
Frédéric van der Essen 01cb3ebb99 [MERGE] from trunk
bzr revid: fva@openerp.com-20120813124439-izug22kl0plts08x
2012-08-13 14:44:39 +02:00