Commit Graph
81391 Commits
Author SHA1 Message Date
ajay javiya (OpenERP) 867efd14e4 [MERGE]: with main
bzr revid: aja@tinyerp.com-20131210132424-5g18hyei02691ioe
2013-12-10 18:54:24 +05:30
ajay javiya (OpenERP) 7bb0380af4 [ADD]: product name in recommended product
bzr revid: aja@tinyerp.com-20131210132316-8pgbtqgvs50gjmwz
2013-12-10 18:53:16 +05:30
Christophe Matthieu bbecbabb74 [FIX] website: Can't duplicate a snippet of type quote
bzr revid: chm@openerp.com-20131210125415-tur8ibjjejyyb1ne
2013-12-10 13:54:15 +01:00
ddm 6b43cc4eef [FIX] Remove console.log
bzr revid: ddm@openerp.com-20131210125138-wqmdy5ap9z1qxm1l
2013-12-10 13:51:38 +01:00
Xavier Morel 9322b677aa [FIX] weird behavior when drag&dropping a row during edition in editable listview
When dropping, would simultanously stop the edition and try a write
(so 2 writes on the same record) and generally screw up the state of
all the things, ending up with an empty row and a weird (and
incorrect) warning.

This can be fixed by preventing resequencing during the creation or
edition of a record (row) inline.

For simplicity, implemented by looking up .ui-sortable descendants —
there are no utility methods for handling that and, aside from the
class, there's no good way to know if sortability was enabled on a
list body or not (as far as I can see, jquery-ui's sortable has no API
to query that) — and using jquery-ui's sortable API for enabling and
disabling sortable on the fly.

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

bzr revid: xmo@openerp.com-20131210124755-ugr3ehf744qoh1o5
2013-12-10 13:47:55 +01:00
Xavier ALT f5458a954d [FIX] orm: cleaner batch number of records for auto_init() stored fields.function update
bzr revid: xal@openerp.com-20131210122312-f3f4h0z4lpiagsk3
2013-12-10 13:23:12 +01:00
Christophe Matthieu 3421edaf94 [IMP] website: clean css code for banner
bzr revid: chm@openerp.com-20131210120857-ii53g67n42sha51b
2013-12-10 13:08:57 +01:00
ddm a315678884 [IMP] Banner tour can be automated
bzr revid: ddm@openerp.com-20131210112828-s2kxs2dy64gjewt9
2013-12-10 12:28:28 +01:00
Martin Trigaux f32b87e14d [FIX] css: avoid tabs in row below to move when selected (opw 601379)
bzr revid: mat@openerp.com-20131210112444-pk9yh8bke1z7eerr
2013-12-10 12:24:44 +01:00
Gery Debongnie 1419b07939 [IMP] improves the way the chart view understands the xml descr of the view, so that nows fields after the operator = + are considered col groupbys (addon web_graph)
bzr revid: ged@openerp.com-20131210111646-9d8l78npv72pqfp8
2013-12-10 12:16:46 +01:00
Xavier ALT a3b8c3aa4e [FIX] crm: use email widget for email_from field in Opportunities form view
bzr revid: xal@openerp.com-20131210110007-v1bdkrxadwr661yv
2013-12-10 12:00:07 +01:00
Christophe Matthieu 6e229fa852 [FIX] website: bad css (+remove a wrong js line)
bzr revid: chm@openerp.com-20131210105637-uebvqry67urydl0n
2013-12-10 11:56:37 +01:00
ajay javiya (OpenERP) 060fe3329c [ADD]:Recommendation of related product
[IMP]: demo data

bzr revid: aja@tinyerp.com-20131210104442-1yqigjiwszjowogp
2013-12-10 16:14:42 +05:30
Christophe Matthieu 4dc17d346b [FIX] website_blog: user click 'post' (comment) to publish the post
bzr revid: chm@openerp.com-20131210103604-l4i3sjgfxb1oz3mo
2013-12-10 11:36:04 +01:00
Christophe Matthieu bdc2caab61 [FIX] website: publish function not clear
bzr revid: chm@openerp.com-20131210103253-j1n7cqufivh7ng09
2013-12-10 11:32:53 +01:00
Gery Debongnie fe5543a043 [IMP] improves the chart code to display correct bar chart when no row groupby are selected and a positive number of col groupbys are selected (graph view, addon web_graph)
bzr revid: ged@openerp.com-20131210100723-0arehl16k54wln0z
2013-12-10 11:07:23 +01:00
Thibault Delavallée 03d7a17880 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20131210093307-gxn4g59xba3l82zx
2013-12-10 10:33:07 +01:00
Xavier Morel 029c866b8c [FIX] issue when tabbing too much at end of editable list row
Tabbing is intercepted by keydown_TAB, which — if the current cell is
the last active field of the row — will then call _next:476. _next
then calls save_edition:300 which "takes a lock" (more precisely
serializes access to its body) and within its body checks if an
edition is active (:303) and returns immediately if not (:304).

The problem here is when a second tab event arrives during the
potentially extremely long save_edition body (since for toplevel lists
it needs to perform a complete RPC call): the overall state of the
list has not changed so the second event *also* goes into _next, then
into save_edition. There it's serialized with the ongoing call and
thus inactive until said ongoing call's termination, and reaches the
body after the current edition has been wound down. As a result, the
body of _next (:408) gets the resolution of ``$.when()``, which is
``null`` and the first condition blows up.

There are 3 possible ways to fix this:

* adding a check in keydown_TAB's handler to see whether a _next call
  is ongoing. This requires adding a state flag to the object and does
  not protect (or cooperate with) _next calls from outside this
  specific handler, unless they are modified in turn.

* alter save_edition to *fail* in case there's no ongoing edition:
  this part was originally in ensure_saved which does not care whether
  a save was necessary or not and does not propagate save information,
  so ``$.when()`` made sense. In save_edition, there are really 3
  different outcomes: the save succeeded, the save failed (or
  potentially part of save's postprocessing failed, for the current
  implementation) and the save was unnecessary. But deferred only
  provide 1 bit of state (success or failure), so the last state has
  to be merged into either success or failure.
 
  Both make sense, to an extent. Changing from one to the other (as
  necessary here) could break existing code and have more extensive
  effects than expected.

* the simplest and least far-raging change is to just alter the
  save_edition().then handler to ignore cases where save_edition()
  results in no saveinfo, this can be assumed to be a
  bailed-out/unnecessary save call.

For simplicity, the 3rd solution was picked here although with more
extensive tests &al I'd have preferred trying out 2nd.

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

bzr revid: xmo@openerp.com-20131210093055-207fevqc1npy7fwr
2013-12-10 10:30:55 +01:00
Gery Debongnie f24a1b487a [IMP] improves the chart code to display correct bar chart when no groupby are selected (graph view, addon web_graph)
bzr revid: ged@openerp.com-20131210092125-fqv9by5xons81uo1
2013-12-10 10:21:25 +01:00
ajay javiya (OpenERP) 8f4617c335 [MERGE]: with main
bzr revid: aja@tinyerp.com-20131210050701-116a01x8r194arg2
2013-12-10 10:37:01 +05:30
Antony Lesuisse c8e3fe44d8 [FIX] web_linkedin dependencies
bzr revid: al@openerp.com-20131209232510-2ibdkr3846ksb75y
2013-12-10 00:25:10 +01:00
Fabien Pinckaers 59906a3af8 [IMP] allow users to change product price from CMS[FIX] small bug in reordering of PTT
bzr revid: fp@tinyerp.com-20131209210511-5w03vf2wt0pmgdew
2013-12-09 22:05:11 +01:00
Christophe Simonis 5520d73d5f [IMP] mail: announcement bar: no dblclick
bzr revid: chs@openerp.com-20131209192450-zacfq6i0xli7vjju
2013-12-09 20:24:50 +01:00
Christophe Simonis f8b889e1db [IMP] mail: announcement bar only for screen
bzr revid: chs@openerp.com-20131209192400-01jpkaofq1arqekz
2013-12-09 20:24:00 +01:00
Fabien Pinckaers 630e9ad64c [FIX] Don't remove data-... attributes like data-snippet-id
bzr revid: fp@tinyerp.com-20131209185406-newaf16v532l146p
2013-12-09 19:54:06 +01:00
Cecile Tonglet 86776035ba [FIX] Model.create: trigger stored field recalculation for implicit parent_id fields during create
The create() method implicitly creates parent records on objects of the _inherits.
Therefore, in order to make the trigger on the linked field works, we should
include all the _inherits values (fields that make the link to the parent
record) because they are created implicitly.
The write() method does not need this change, as any update of the parent
fields has to be explicit.

bzr revid: odo@openerp.com-20131209184718-wczdefzo9evc0cgc
2013-12-09 19:47:18 +01:00
Martin Trigaux 06831d67c4 [MERGE] [FIX] res_font: requires server commit 5011
Mainly fix reports
Adapt API to new res_font methods
See server commit message for more information

bzr revid: mat@openerp.com-20131209171551-fgiv790hcvjnp1ly
2013-12-09 18:15:51 +01:00
Martin Trigaux f3e7afaaca [MERGE] [FIX] res_font: make it works in multiworker environment
res_font model gains family, path and mode field
Basic fonts embedded in pdf (Helvetica, Times and Courier) are data
Fix reports using font names to be valid (eg: DejaVu Sans Bold -> DejaVuSans-Bold)
default_get of res_company does not scan the filesystem anymore
family field is new name_get font for res_font (more user friendly)
Domain on displayed font to only 'normal ones' (not bold or italic)
Handle fonts in 'book' mode as normal in setTTFontMapping
Relax constraint on res_font to unique family and name ('name' was actually family before)
font_scan is called on 'reload fonts' action button and for each report rendering
font_scan is lazy when loaded from report and scanning the filesystem only if no font recorded in filesystem
'/dev/null' in font path is used to add fonts in the list but not loaded by reportlab
Scanning the filesystem triggers clear_caches
clear_cache resets the list of found fonts to empty list to make font_scan call to reload the full list (when redering a report on any worker, will always get the updated font list after a scan)
Add access rights for fonts (read everybody, create admin, call font_scan as superuser in report rendering)
Remove font hack with BaseCustomTTFonts, rely fully on the system fonts
Use glob instead of listdir (needed for path like '/usr/share/fonts/TTF/*')
Make warning message from reportlab more self-explaining.

Also make the runbot green (which is nice)

bzr revid: mat@openerp.com-20131209171338-o796pldia9da3kt2
2013-12-09 18:13:38 +01:00
Martin Trigaux 7328a64425 [MERGE] sync with trunk
bzr revid: mat@openerp.com-20131209154236-jjawy50a8tvmyayb
bzr revid: mat@openerp.com-20131209163936-6n9z81etuejkdpsg
2013-12-09 17:39:36 +01:00
Christophe Matthieu 6652856445 [FIX] website_sale: link; product: clean code and use product.template for supplierinfo
bzr revid: chm@openerp.com-20131209163254-k9dwxw48rcgz1hbs
2013-12-09 17:32:54 +01:00
Thibault Delavallée 89bc58bae6 [TESTS] mail: mute logger back in mail tests
bzr revid: tde@openerp.com-20131209160923-3yisgzqmns6pviud
2013-12-09 17:09:23 +01:00
Denis Ledoux 20be322c45 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9684 rev-id: dle@openerp.com-20131209145652-3g9rgnfz1w8k0whw
bzr revid: chs@openerp.com-20131202105848-33gcz1715w370rve
bzr revid: dle@openerp.com-20131204150643-is3y0b9n8enh3yql
bzr revid: chs@openerp.com-20131206152726-pirikn7v8pev90ic
bzr revid: dle@openerp.com-20131206162437-b9niay99mirk44qm
bzr revid: tde@openerp.com-20131209102019-kjeg0rx2au1d5e5v
bzr revid: dle@openerp.com-20131209155721-589zihxx8jmvlpvp
2013-12-09 16:57:21 +01:00
Martin Trigaux efdfcfc90e [FIX] font: family with one l (Familly is a commune in the Calvados department in the Basse-Normandie region in northwestern France.)
bzr revid: mat@openerp.com-20131209155702-negir6agbiugfctz
2013-12-09 16:57:02 +01:00
Cecile Tonglet 3b328aaab4 [FIX] Trigger stored field recalculation for inherited records
The create() method implicitly creates record on objects of the _inherits.
Therefore, in order to make the trigger on linked field works, we should
include all the _inherits values (field that makes the link to the rel
record) because they are created implicitly.

bzr revid: cto@openerp.com-20131209154857-788f94w0kh6ef5pp
2013-12-09 16:48:57 +01:00
Martin Trigaux b48b746dd1 [IMP] fix licence
bzr revid: mat@openerp.com-20131209154537-r5hpcveuxmvcdj10
2013-12-09 16:45:37 +01:00
Martin Trigaux 3215f8ea3a [MERGE] sync with trunk
bzr revid: mat@openerp.com-20131209154201-1s0f98h43y5mu9ui
2013-12-09 16:42:01 +01:00
Martin Trigaux b37d3b7989 [FIX] font: trigger signal for clear cache instead on self
bzr revid: mat@openerp.com-20131209153842-l13zfc24at7cfisc
2013-12-09 16:38:42 +01:00
Michel Meyer 68aac8e855 [FIX] events handling ordering courtesy of Michel Meyer
lead to errors during the validation of rows in list o2ms.

See https://bugs.launchpad.net/openerp-web/+bug/1182101/comments/20
for an extensive description of the events and issue.

bzr revid: xmo@openerp.com-20131209153519-n05bdx15t75dh7gf
2013-12-09 16:35:19 +01:00
Christophe Matthieu b894f72fda [FIX] payment_acquirer_adyen: controller methods=POST
bzr revid: chm@openerp.com-20131209152923-7qru626cydyrwuaw
2013-12-09 16:29:23 +01:00
ddm 4715ab3705 [FIX] HTML editor bug
bzr revid: ddm@openerp.com-20131209152801-2q9grtwc7xfiengv
2013-12-09 16:28:01 +01:00
Martin Trigaux aac5c9d6eb [IMP] font: better handeling of multiworker environement
bzr revid: mat@openerp.com-20131209151454-5rylu5alldd3ixmh
2013-12-09 16:14:54 +01:00
Christophe Matthieu 6aface1bd0 [FIX] product.supplierinfo: product_id is a product.product fields. Rename fields into product_tmpl_id for many2one to product.template model
bzr revid: chm@openerp.com-20131209151135-q54g17zcq1vnshsl
2013-12-09 16:11:35 +01:00
Denis Ledoux 3be327c0ae [FIX] point_of_sale: ignore TOTAlY returns
Returns were partially ignored when typing keystrokes, thanks to a return; when event which equaled 13, but the default behaviour (press on the focused input/button) was not prevented. This is now the case thanks to preventDefault. For instance, just after a discount set, the focused input was pressed and the associated value was added when scanning a new product with the scanner. Therefore, if we entered a discount of 30%, scanning a new product added '0', the last pushed button, to the discount, and then added the product.

bzr revid: dle@openerp.com-20131209145652-3g9rgnfz1w8k0whw
2013-12-09 15:56:52 +01:00
Fabien Pinckaers 66e85ee1e0 [IMP] Product visible discount: discount is expressed based in Public Price
bzr revid: fp@tinyerp.com-20131209142203-20l555dfdyvb60xe
2013-12-09 15:22:03 +01:00
Cecile Tonglet 2e197cbb98 [IMP] Batch for the computation of function's stored values is now customizable
bzr revid: cto@openerp.com-20131209141111-tbg9x1h8l6neu0ml
2013-12-09 15:11:11 +01:00
jke-openerp 9134c79175 [REF] Synchro method create-delete-update, to replace with always active=False and pre-processing
bzr revid: jke@openerp.com-20131209140819-v0njlfjvl2biep2m
2013-12-09 15:08:19 +01:00
Martin Trigaux 5f1f44401f [FIX] font: revert previous (use name and not familly in reportlab), fix reports using spaces
bzr revid: mat@openerp.com-20131209133742-7u1sesoinrmfpwf0
2013-12-09 14:37:42 +01:00
Martin Trigaux cca8bb4d64 [FIX] font: revert previous (use name and not familly in reportlab), fix reports using spaces
bzr revid: mat@openerp.com-20131209133431-6gjhq1zmrb2ro6eo
2013-12-09 14:34:31 +01:00
Martin Trigaux 34beeaeba7 [FIX] font: correct call to font_scan, add book to displayed mode
bzr revid: mat@openerp.com-20131209132132-61qg1zsybh6zcxim
2013-12-09 14:21:32 +01:00
Martin Trigaux 48cce10a7a [FIX] font: correct call to font_scan, add book to displayed mode
bzr revid: mat@openerp.com-20131209132109-c2bluohdj7hkp2px
2013-12-09 14:21:09 +01:00