Commit Graph
62692 Commits
Author SHA1 Message Date
vta vta@openerp.com 2576cd9d5c [MERGE] Latest trunk.
bzr revid: vta@openerp.com-20121108132049-7ape10oz1gvz4vi8
2012-11-08 14:20:49 +01:00
Fabien Meghazi d0400362d6 [IMP] Updated jquery and jquery ui. API change for $.Deferreds
bzr revid: fme@openerp.com-20121108113703-0qfymcfmkdgyuz91
2012-11-08 12:37:03 +01:00
Fabien Pinckaers f851ad9253 [FIX] if view_id provided in account.move.line, do not compute a specific view
bzr revid: fp@tinyerp.com-20121108113423-5c3ypdqsmphq1qgd
2012-11-08 12:34:23 +01:00
niv-openerp 7ec48c2d26 [IMP] merged documentation in the wiki with web client documentation
bzr revid: nicolas.vanhoren@openerp.com-20121108112356-zl99m2qod2e1fdk8
2012-11-08 12:23:56 +01:00
Fabien Meghazi 0b4b1cf52d [MERGE] trunk
bzr revid: fme@openerp.com-20121108111222-cetz6q6s47iwxnm2
bzr revid: fme@openerp.com-20121108111448-2rzx9moaqloc5lpc
2012-11-08 12:14:48 +01:00
Fabien Meghazi e2766b6690 [FIX] Restore dialog buttons
bzr revid: fme@openerp.com-20121108104248-fqv98fv45n35q8qf
2012-11-08 11:42:48 +01:00
Xavier Morel 7c3d2a37b5 [IMP] support set_dimensions on date and datetime form widgets
bzr revid: xmo@openerp.com-20121108103631-dlgw5q58agq8ndb0
2012-11-08 11:36:31 +01:00
Fabien Meghazi 225b0c2c2d [MERGE] trunk
bzr revid: fme@openerp.com-20121108091548-enm1aftirkzngld1
2012-11-08 10:15:48 +01:00
Xavier Morel a423c32454 [IMP] m2m_tags code
bzr revid: xmo@openerp.com-20121107161955-bc7bxmmbdkmr34ix
2012-11-07 17:19:55 +01:00
niv-openerp 6f79b279bf [IMP] removed "blacklist" feature in form view that was implemented due to inability to call get_value() on a o2m during its modification. With the recent commit_value() implementation this feature is now useless.
bzr revid: nicolas.vanhoren@openerp.com-20121108103856-uou2leyng8bhx5ba
2012-11-08 11:38:56 +01:00
Fabien Pinckaers 3f0c4c9b23 [MERGE] multi-company fix
bzr revid: fp@tinyerp.com-20121108103753-vueaierdbjm210ig
2012-11-08 11:37:53 +01:00
niv-openerp db4a1042ee [MERGE] modification of save and on_change mechanism in form view to support the commit_value method in fields
bzr revid: nicolas.vanhoren@openerp.com-20121108102009-int2qix09okvdihm
2012-11-08 11:20:09 +01:00
Fabien Pinckaers a19b7ceb27 [IMP] project reevaluate task when reopening
bzr revid: fp@tinyerp.com-20121108100947-tktayv1tt0by059z
2012-11-08 11:09:47 +01:00
niv-openerp 86f9f5db35 merge trunk
bzr revid: nicolas.vanhoren@openerp.com-20121108100145-i1ey2f6g07nri18a
2012-11-08 11:01:45 +01:00
Fabien Pinckaers 065848db8f [IMP] default emails on admin and demo so that they can perform tests
bzr revid: fp@tinyerp.com-20121108095604-6tzd8i8chuxr9014
2012-11-08 10:56:04 +01:00
Fabien Pinckaers d7693629cd [FIX] marketing campaign, creating activities from campaign
bzr revid: fp@tinyerp.com-20121108094213-vl68841q9mgf8dic
2012-11-08 10:42:13 +01:00
Fabien Pinckaers 63d497e43d [IMP] FIX crm segmentation+event related subscription
bzr revid: fp@tinyerp.com-20121108093943-jioh0puqlpkn1fex
2012-11-08 10:39:43 +01:00
Fabien Pinckaers 10ee314620 [IMP] thunderbird plugin + purchase fix
bzr revid: fp@tinyerp.com-20121108093319-imp9wmzhoxmfcv34
2012-11-08 10:33:19 +01:00
Fabien Pinckaers d7f5edf313 [FIX] portal fixes
bzr revid: fp@tinyerp.com-20121108092747-o1elda4akkp6ua71
2012-11-08 10:27:47 +01:00
Fabien Pinckaers 574405bed8 [MERGE] HR fixes
bzr revid: fp@tinyerp.com-20121108092451-2jk31s913mrat1jm
2012-11-08 10:24:51 +01:00
Fabien Pinckaers b0c77208d5 [IMP] typo
bzr revid: fp@tinyerp.com-20121108080818-xmwuxk05b2ztoq1j
2012-11-08 09:08:18 +01:00
Ajay Chauhan (OpenERP) ae131bd0c7 [MERGE] merge with lp:openobject-addons
bzr revid: cha@tinyerp.com-20121108051227-w1009nchkx9ge1n7
2012-11-08 10:42:27 +05:30
Launchpad Translations on behalf of openerp 1a8ef8657b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121108044758-ltq38lseznj56gu2
2012-11-08 04:47:58 +00:00
Divyesh Makwana (Open ERP) ab890754c0 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121108044445-d0b690dz549m23oz
2012-11-08 10:14:45 +05:30
Divyesh Makwana (Open ERP) 33501d1d7a [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121108044353-0w5igwrzus3xe4tp
2012-11-08 10:13:53 +05:30
Fabien Pinckaers b5b3cbf4e4 [FIX] typo
bzr revid: fp@tinyerp.com-20121107173349-02vp0acqgdcnmi83
2012-11-07 18:33:49 +01:00
Antonin Bourguignon a6d3dfbe59 [MERGE] trunk-bug-1065751-abo: fix the double partner creation in lead2opportunity (introduced in revno 7251.1.122 revid:odo@openerp.com-20120823200629-1m1eym62l7aabzgl)
lp bug: https://launchpad.net/bugs/1065751 fixed

bzr revid: abo@openerp.com-20121107170532-nhrxnm0rv58osk4m
2012-11-07 18:05:32 +01:00
Antonin Bourguignon 664e05b3a2 [MERGe] trunk
bzr revid: abo@openerp.com-20121107164012-tmog8zotnel3f5ob
2012-11-07 17:40:12 +01:00
Antonin Bourguignon ab8b6fae11 [FIX] the double partner creation in lead2opportunity (introduced in revno 7251.1.122 revid:odo@openerp.com-20120823200629-1m1eym62l7aabzgl)
lp bug: https://launchpad.net/bugs/1065751 fixed

bzr revid: abo@openerp.com-20121107163037-bmywme6nnhlxaaic
2012-11-07 17:30:37 +01:00
Antonin Bourguignon 48bf8e72da [IMP] minor imp of code style
bzr revid: abo@openerp.com-20121107161142-c5iqr501mxbghy82
2012-11-07 17:11:42 +01:00
Fabien Meghazi c73ac9ef04 [YEAH] jquery ui bootstrap has 1.9 support in dev branch
bzr revid: fme@openerp.com-20121107155758-e6637hp114k2twve
2012-11-07 16:57:58 +01:00
Fabien Meghazi 1de27448ea [FIX] jquery ui bootstrap not yet ready for jquery ui 1.9, load jquery ui 1.9 css before
bzr revid: fme@openerp.com-20121107153018-zla0kxkospg0lpxj
2012-11-07 16:30:18 +01:00
Antony Lesuisse a963bd019a [MERGE] m2o button
bzr revid: al@openerp.com-20121107151954-aqqtn4w6hpd39kmi
2012-11-07 16:19:54 +01:00
Antony Lesuisse af9304fc98 [FIX] seupt.py zsi not needed anymore
bzr revid: al@openerp.com-20121107144232-xf9qyo1rurwc0xnq
2012-11-07 15:42:32 +01:00
Xavier Morel 1b8a0e66ee [REV] nicolas.vanhoren@openerp.com-20120712074237-xugmbw19wjjoes9l
eagerly loaded treeviews, making heavily loaded charts of accounts
completely unusable

bzr revid: xmo@openerp.com-20121107143740-31i16933dfg4t6xk
2012-11-07 15:37:40 +01:00
Arnaud Pineux 8740c3306f [FIX] bug 1062119
bzr revid: api@openerp.com-20121107134404-pmpq2q691fmpt1ie
2012-11-07 14:44:04 +01:00
Arnaud Pineux a50f46c488 [MERGE]
bzr revid: api@openerp.com-20121107134258-05254zobnci373xe
2012-11-07 14:42:58 +01:00
Fabien Meghazi 57638a3657 [FIX] Fixed regression due to previous trunk merge
bzr revid: fme@openerp.com-20121107132839-wwf3svdnmrfbj97u
2012-11-07 14:28:39 +01:00
Xavier Morel bfad5ad032 [ADD] custom dimensioning of a bunch of form widget for better editable listview compat/styling
bzr revid: xmo@openerp.com-20121107132152-9s6s1n4fn4bwjdm2
2012-11-07 14:21:52 +01:00
Arnaud Pineux 74390164ba [FIX] origin fixed and reviewed
lp bug: https://launchpad.net/bugs/1062119 fixed

bzr revid: api@openerp.com-20121107131320-854kmobh0vno3osb
2012-11-07 14:13:20 +01:00
Fabien Meghazi e7007332d8 [FIX] Restore tests
bzr revid: fme@openerp.com-20121107131212-dk2i6kzvkp4jwrb3
2012-11-07 14:12:12 +01:00
Fabien Meghazi 8b18d999bd [FIX] BinaryImage field triggers render_value() two times on file change
bzr revid: fme@openerp.com-20121107111247-ge1oi0oxbr7k5dhf
2012-11-07 12:12:47 +01:00
Quentin (OpenERP) f22e2397d6 [MERGE] staging branch with new version of lunch module, made by api
bzr revid: qdp-launchpad@openerp.com-20121107111043-hoxenf5bsl0dmxfl
2012-11-07 12:10:43 +01:00
vta vta@openerp.com 064003797e [FIX] Issue with py.eval if no options passed.
bzr revid: vta@openerp.com-20121107104933-a60t27t1hjyu368f
2012-11-07 11:49:33 +01:00
Quentin (OpenERP) 385bf30ae3 [REN] lunch: renamed security/groups.xml to meet OpenERP standards and conventions
bzr revid: qdp-launchpad@openerp.com-20121107104348-9xkt13jmscamgy34
2012-11-07 11:43:48 +01:00
vta vta@openerp.com 4b0d99d6c8 [IMP] Now the Many2OneButton accepts an option (label) containing a dict to set the string displayed in the button ({'create':String, 'edit':String}). If no label, the string is empty.
bzr revid: vta@openerp.com-20121107103426-u6dfd1vcfu8fwap3
2012-11-07 11:34:26 +01:00
Divyesh Makwana (Open ERP) d34199588c [FIX] marketing_campaign : Create a new campaign, do not save, directly add an activity line and then save. It gives warning 'The following fields are invalid: *Campaign'.
bzr revid: mdi@tinyerp.com-20121107091855-zvrv96n9hi7t3vrx
2012-11-07 14:48:55 +05:30
Fabien Meghazi f06b78dbf6 [MERGE] trunk
bzr revid: fme@openerp.com-20121107091047-uehws6qa3ouaa4fs
2012-11-07 10:10:47 +01:00
vta vta@openerp.com 83405dba45 [IMP] Make the popup accessible.
bzr revid: vta@openerp.com-20121107081738-kortakwtjj7s9k80
2012-11-07 09:17:38 +01:00
Bharat Devnani (OpenERP) 5a4a17268a [IMP] changed instances of USD to EUR in tooltips
bzr revid: bde@tinyerp.com-20121107070515-3d1t4u5fwe1n1vf1
2012-11-07 12:35:15 +05:30