Commit Graph
4879 Commits
Author SHA1 Message Date
Bhumi Thakkar (Open ERP) 4d24c3fbec [IMP] Add attribute on div.
bzr revid: bth@tinyerp.com-20121109105120-iihflpk9h88uhism
2012-11-09 16:21:20 +05:30
Christophe Matthieu df96456fc5 [FIX] view_form: fixing blockUI attribute in multi file uploader
bzr revid: chm@openerp.com-20121109102102-o5t86g1jz82175jk
2012-11-09 11:21:02 +01:00
Christophe Matthieu 65b8b46401 [MERGE] from trunk
bzr revid: chm@openerp.com-20121109083925-rpuk4rwyu3kx50vt
2012-11-09 09:39:25 +01:00
Xavier Morel d3b22ccb36 [FIX] incorrect handling of empty values in m2m listview display
bzr revid: xmo@openerp.com-20121109083513-mjpzd01hhuylll4j
2012-11-09 09:35:13 +01:00
Bhumi Thakkar (Open ERP) 0ffd487d18 [IMP] Add css class and remove inline style.
bzr revid: bth@tinyerp.com-20121109070434-00onkcty4js1lzbk
2012-11-09 12:34:34 +05:30
Bhumi Thakkar (Open ERP) 94935e92a5 [IMP] Add css class.
bzr revid: bth@tinyerp.com-20121109065546-0k3rmulfy59kyl6g
2012-11-09 12:25:46 +05:30
Bhumi Thakkar (Open ERP) 14f00d4e89 [IMP] Improve css.
bzr revid: bth@tinyerp.com-20121109062014-uhbwcf1ztldz14m6
2012-11-09 11:50:14 +05:30
Bhumi Thakkar (Open ERP) ea14b21995 [IMP] Improve css and structure.
bzr revid: bth@tinyerp.com-20121109060730-c7fxdk1rwokw3npe
2012-11-09 11:37:30 +05:30
Jiten (OpenERP) 7facc34f31 [MERGE] Merged trunk.
bzr revid: jra@tinyerp.com-20121109051225-84fqg11sjo74vdo1
2012-11-09 10:42:25 +05:30
Christophe Simonis a824da4be3 [FIX] do_load_state: propagate _push_me flag
bzr revid: chs@openerp.com-20121108175910-qd2xho4srhhbjs5q
2012-11-08 18:59:10 +01:00
Christophe Matthieu 0baf4727ef [FIX] followers: no confirm save message
bzr revid: chm@openerp.com-20121108162304-paevi0x5isyornd1
2012-11-08 17:23:04 +01:00
vta vta@openerp.com bbb5192346 [FIX] Many2OneButton, don't subscribe to write_complete event.
bzr revid: vta@openerp.com-20121108154215-4b3sk7nh41xfrl62
2012-11-08 16:42:15 +01:00
Xavier Morel 788e8edf81 [FIX] don't resize & reposition invisible or readonly fields in editable listview
the datetime field doesn't setup its internal widget if the field is readonly, so accessing it blows up

bzr revid: xmo@openerp.com-20121108153544-o2uvpfeoofu2tx12
2012-11-08 16:35:44 +01:00
vta vta@openerp.com e0094e20de [FIX] Issue when triggering 'write_completed' on AbstractFormPopup, argument not passed.
bzr revid: vta@openerp.com-20121108152231-cdtdxa1q9rl4eyre
2012-11-08 16:22:31 +01:00
Xavier Morel 3a5421309b [FIX] breakage of m2m (tag) fields in editable (o2m) listviews
e.g. quotation form view, "Order Lines" table, add a tax (or more) to
a line, save, then try to edit the line.

Issue: the listview mostly uses a single-level structure for its
display, each record is a trivial map of {name: value}. For the M2O
the expected value can be complex-ish (a name_get which holds all the
interesting stuff) but not so for the m2m.

An m2m value is just a list of ids (Array<Integer>), the list view
would overwrite that with the concatenated name_get strings to get
something kind-of displayable. Except editable serializes the record
it has and passes that as-is to the embedded formview. The
corresponding widget (FieldMany2ManyTags) most definitely does not
expect a big string to be shoved up its fat ass.

So use a different but just as disgusting hack: instead of *replacing*
the ids array with the string, add the string to the record after very
slightly munging the original name, that way the form is happy because
it gets the value it expects, and the Many2Many column can override
_format to use the value of the munged/fake column as "stuff it passes
to whatever is in charge of formatting fields for display" when the
original field is asked for.

NOTE: redundant work is done as every line will do its own name_get,
      potentially on the same ids over and over again. Having a
      short-lived backend cache may allow not name_get-ing ids we've
      already fetched during the same table display...

bzr revid: xmo@openerp.com-20121108145705-uphw76z4q4krcpnl
2012-11-08 15:57:05 +01:00
Fabien Meghazi c6d4dcd2ab [FIX] Fix form view bounce effect
bzr revid: fme@openerp.com-20121108151810-c5p3rsha9x8kg6lv
2012-11-08 16:18:10 +01:00
vta vta@openerp.com d68db69b42 [MERGE] trunk-saas_analytics.
bzr revid: vta@openerp.com-20121108140803-jhow00d9w5696yla
2012-11-08 15:08:03 +01:00
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 a8518622dd [FIX] Check if console exists before using it
bzr revid: fme@openerp.com-20121108132001-jg5cuqszl2qemy92
2012-11-08 14:20:01 +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
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
Christophe Matthieu b865a94c6b [MERGE] from trunk
bzr revid: chm@openerp.com-20121108111417-ds9eyxd32tihpuxs
2012-11-08 12:14:17 +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
Christophe Matthieu d59417c879 [IMP] web controllers: add resize option on /web/binary/?image. The max size of resizing is 500*500.
bzr revid: chm@openerp.com-20121108102423-oh5633zqlj4g762o
2012-11-08 11:24:23 +01:00
Bhumi Thakkar (Open ERP) 4833726717 [IMP] Improve css.
bzr revid: bth@tinyerp.com-20121108102242-0u95m8s6yexa33vq
2012-11-08 15:52:42 +05:30
Fabien Meghazi 225b0c2c2d [MERGE] trunk
bzr revid: fme@openerp.com-20121108091548-enm1aftirkzngld1
2012-11-08 10:15:48 +01:00
Bhumi Thakkar (Open ERP) f72442feb0 [IMP] Improve code for right click logo resolution.
bzr revid: bth@tinyerp.com-20121108065407-zl8zldfsnb9go03e
2012-11-08 12:24:07 +05:30
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
niv-openerp 86f9f5db35 merge trunk
bzr revid: nicolas.vanhoren@openerp.com-20121108100145-i1ey2f6g07nri18a
2012-11-08 11:01:45 +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
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
Vishmita d65ab4c014 [IMP]Improve Code.
bzr revid: vja@tinyerp.com-20121107132852-nq4uflsfc1l9o72g
2012-11-07 18:58:52 +05:30
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
Fabien Meghazi e7007332d8 [FIX] Restore tests
bzr revid: fme@openerp.com-20121107131212-dk2i6kzvkp4jwrb3
2012-11-07 14:12:12 +01:00
Xavier Morel 7959c832cd [FIX] lost call to setup_default_query during merge
bzr revid: xmo@openerp.com-20121107120955-xgnnm2pfvsqch8kn
2012-11-07 13:09:55 +01:00
Tejas Tank 47e028f6c9 Merge with latest.
bzr revid: tta@openerp.com-20121107115008-rkt9fpy2r6lgirkk
2012-11-07 17:20:08 +05:30
Tejas Tank 1a9f93fc85 [fix] on model form tags issue fixed..
bzr revid: tta@openerp.com-20121107113256-ac6znf9m5ibzoovl
2012-11-07 17:02:56 +05:30
Xavier Morel 36dad4cef9 [MERGE] from trunk
bzr revid: xmo@openerp.com-20121107112516-64hqps4jjgmrs3a4
2012-11-07 12:25:16 +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
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
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
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
Tejas Tank d22ade963d Merged with latest.
bzr revid: tta@openerp.com-20121107072349-legqnnhnczvl0ny2
2012-11-07 12:53:49 +05:30