Amit Bhavsar (Open ERP)
14a48f5d98
[MERGE] merge with latest trunk.
...
bzr revid: amb@tinyerp.com-20131028050353-drsu5i945d0d2m7n
2013-10-28 10:33:53 +05:30
Darshan Kalola (OpenERP)
0d9d1dcec7
[MERGE]merged with main addons
...
bzr revid: dka@tinyerp.com-20131028045056-ks8dg2ftjz9vcpk3
2013-10-28 10:20:56 +05:30
Darshan Kalola (OpenERP)
9de8fe533d
[IMP]improve name of product in sale/sale_order_demo yml.
...
bzr revid: dka@tinyerp.com-20131028044053-ewvotzso2c1mmrmv
2013-10-28 10:10:53 +05:30
Antony Lesuisse
e5ad3700cb
[IMP] convert controllers to the new route api
...
bzr revid: al@openerp.com-20131027174813-ghwl3p6w7ebr20s9
2013-10-27 18:48:13 +01:00
Antony Lesuisse
d5b4cd627c
more controller conversion to new route api
...
bzr revid: al@openerp.com-20131027173143-tfxc7e7vqn7re6wb
2013-10-27 18:31:43 +01:00
Antony Lesuisse
401099d358
[IMP] move http layer from openerp-web to openobject-server, convert controllers to the new route api
...
bzr revid: al@openerp.com-20131027171717-dzqx2264p152lq8y
2013-10-27 18:17:17 +01:00
Antony Lesuisse
a569093606
[IMP] move http layer from openerp-web to openobject-server, convert controllers to the new route api
...
versioned history http.py can be found in lp:~openerp/openerp-web/trunk file addons/web/http.py
bzr revid: al@openerp.com-20131027171553-qe1ulbff0bphm15o
2013-10-27 18:15:53 +01:00
Antony Lesuisse
737586aa4e
typo
...
bzr revid: al@openerp.com-20131027164023-ky1nthy56fmqr4f2
2013-10-27 17:40:23 +01:00
Alexis de Lattre
0bd592bf64
[MERGE] merge with addons/trunk revno 8956
...
bzr revid: alexis@via.ecp.fr-20131027123104-tf61ztyztstbc9et
2013-10-27 13:31:04 +01:00
daea2f2e08
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131026062534-cy8egi58c7w3cwns
bzr revid: launchpad_translations_on_behalf_of_openerp-20131027061322-op6b5ohzf6eiyiu2
2013-10-27 06:13:22 +00:00
2f3c517054
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131026060436-zq7lmz0wyaf2or7c
bzr revid: launchpad_translations_on_behalf_of_openerp-20131022044413-i5f1hxr3y23buz38
bzr revid: launchpad_translations_on_behalf_of_openerp-20131023043450-hbi0snv6o0qpl0ne
bzr revid: launchpad_translations_on_behalf_of_openerp-20131026054646-gklydoly8cq62jbp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131027055002-ldfxtxmdm5wpc65b
2013-10-27 05:50:02 +00:00
Martin Trigaux
57a78f3f97
[FIX] res_config: don't jump to first root menu after applying changes, instead reload and stay on same configuration page
...
bzr revid: mat@openerp.com-20131025154657-fk7t72hl9cns2279
2013-10-25 17:46:57 +02:00
Denis Ledoux
f07e01f491
[ADD]mail: The announcement bar (blue bar) to inform customers
...
bzr revid: dle@openerp.com-20131025153829-xu6mee27a4hajnk3
2013-10-25 17:38:29 +02:00
Fabien Meghazi
eb7b1362cd
[WIP] Menu working from database (not yet multi-website)
...
bzr revid: fme@openerp.com-20131025152446-si9gsjujzcn40hip
2013-10-25 17:24:46 +02:00
d524b95172
[FIX] list view: serialize concurrent calls when loading files and ensure consistency of variables (prevent selection of items in list view lost, opw #599969 )
...
bzr revid: mat@openerp.com-20131025145519-jio03azp64ppi5ro
2013-10-25 16:55:19 +02:00
Antony Lesuisse
422de0505c
[REM] remove useless warning in user preference
...
bzr revid: al@openerp.com-20131025133531-6sbntv1visib5akt
2013-10-25 15:35:31 +02:00
Xavier Morel
d06d6f7fd9
[FIX] m2o t-field rendering: use uid 1 for name_get
...
This is done automatically on a read(), but t-field uses a browse,
which does not do access-rights bypassing. We've already browsed the
root record so we should have the rights to the reading, and we just
want the textual representation for the child m2o.
bzr revid: xmo@openerp.com-20131025124720-i10eywz70o9c9dpc
2013-10-25 14:47:20 +02:00
Darshan Kalola (OpenERP)
162329ee4a
[IMP]demo data of product and yml test of point of sale.
...
bzr revid: dka@tinyerp.com-20131025122415-b1cssqumzdowxjrb
2013-10-25 17:54:15 +05:30
Mohammed Shekha (OpenERP)
447bec133b
[FIX]Web-Pager: Refixed the issue of Pager, there is inconsistency with pager, display of next page is impossible if records are deleted such that dataset size becomes less than or equals to limit, also if all records of current page is deleted then it does not navigate to previous page.
...
bzr revid: msh@openerp.com-20131025120829-e4kqey0mpz43537c
2013-10-25 17:38:29 +05:30
Christophe Simonis
d91819cb43
[MERGE] forward port of branch saas-2 up to revid 4965 chs@openerp.com-20131025103939-5gta1eifjhx1tsmi
...
bzr revid: chs@openerp.com-20131025104326-4k5hayl0bwdgt0mm
2013-10-25 12:43:26 +02:00
Christophe Simonis
2029aa28eb
[MERGE] forward port of branch saas-1 up to revid 4914 chs@openerp.com-20131025103657-pbnqhw11mygyi5jn
...
bzr revid: chs@openerp.com-20131025103939-5gta1eifjhx1tsmi
2013-10-25 12:39:39 +02:00
Olivier Dony
1632666101
[FIX] stock: move analysis report incorrectly merges multiple lines with same picking, product and qty
...
This error probably stems from the useless complexity of
the SQL view declaration and the double GROUP BY levels.
The patch rewrites the view query with a single GROUP BY
level and proper aggregation levels, but the core part
of the patch is to replace the outer `group by product_qty`
with a `sum(product_qty)`.
Some columns were also mentioned twice in the same GROUP
BY clause, for some reason.
bzr revid: odo@openerp.com-20131025103626-7l78kdjjr7c2wesb
2013-10-25 12:36:26 +02:00
Xavier Morel
77e79435d0
[ADD] blog.tag access rights so public user can read blog
...
Issue was no access rights on blog.tag, add ability for all users to
read them, and for "knowledge" users to edit them.
Also fix pre-existing access rights and move them to knowledge users,
not users in general.
bzr revid: xmo@openerp.com-20131025102421-0c86z775nedzgqyi
2013-10-25 12:24:21 +02:00
Xavier Morel
4c88701f3d
[FIX] change access rights for customize_template_*
...
bzr revid: xmo@openerp.com-20131025095952-9ditm4q3fwr9auto
2013-10-25 11:59:52 +02:00
Turkesh Patel (Open ERP)
29214f0894
[IMP] improved code.
...
bzr revid: tpa@tinyerp.com-20131025094512-m0mx0a0s94h1ldjg
2013-10-25 15:15:12 +05:30
Amit Bhavsar (Open ERP)
d6ea199655
[imp] improve the demo data for pos and solved the yml traceback.
...
bzr revid: amb@tinyerp.com-20131025092841-klm3024v1p53f5nt
2013-10-25 14:58:41 +05:30
Fabien Meghazi
ec09c0fa2c
[ADD] Added website_id in client side context.
...
This allow us to comply to the 'ids' argument of website's model method (if needed)
bzr revid: fme@openerp.com-20131025074343-6nqgte7lzj7uhopj
2013-10-25 09:43:43 +02:00
Darshan Kalola (OpenERP)
4046977bb4
[solved]solved the yml traceback.
...
bzr revid: dka@tinyerp.com-20131025072654-mne6r9kdeww705h3
2013-10-25 12:56:54 +05:30
Darshan Kalola (OpenERP)
21bf32477f
[IMP]demo data of product.
...
bzr revid: dka@tinyerp.com-20131025070047-d7drcy22lclon13d
2013-10-25 12:30:47 +05:30
bth-openerp
1a2c57343f
[IMP]Removed partner.
...
bzr revid: bth@tinyerp.com-20131025063102-69mdt50mja6ydsy2
2013-10-25 12:01:02 +05:30
8bc457816f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131024052057-4ai7sltsmuoke8l5
bzr revid: launchpad_translations_on_behalf_of_openerp-20131025060100-ua2rf6g9urivk8bm
2013-10-25 06:01:00 +00:00
Stefan Rijnhart
62ea0bb383
[FIX] Update test for external id
...
bzr revid: stefan@therp.nl-20131024214735-emciqtcm6vrs9xda
2013-10-24 23:47:35 +02:00
Thibault Delavallée
25d3f4b1a5
[ADD] [CLEAN] payment_acquirer:
...
- lint / cleanup of models/payment_acquirer.py. No changes made, only link cleanup
such as missing imports, typos, missing methods.
Added ogone_errors file containing the ogone errors description that was called
but missing in the module. It is taken from openerp-custom module.
bzr revid: tde@openerp.com-20131024142050-a9b9tjzw9y5qjhia
2013-10-24 16:20:50 +02:00
Fabien Meghazi
a597cc59ef
[WIP] menus
...
bzr revid: fme@openerp.com-20131024141840-ihp2i6huzdlamf94
2013-10-24 16:18:40 +02:00
Xavier Morel
c8dd901b04
[FIX] todo/notes
...
bzr revid: xmo@openerp.com-20131024141024-3kdx3jfcsn8vzsyg
2013-10-24 16:10:24 +02:00
Thibault Delavallée
005a00ad50
[REF] payment_acquirer: refactored module according to
...
new OpenERP addon guidelines :
- models -> for model-related files
- data -> all data
Updated init / openerp files accordingly
bzr revid: tde@openerp.com-20131024135854-ve8d5yw1umcwz2b0
2013-10-24 15:58:54 +02:00
Xavier Morel
a2a3f46d72
[FIX] 'inline' set_image_data
...
bzr revid: xmo@openerp.com-20131024135730-321532upt3aq5esw
2013-10-24 15:57:30 +02:00
Christophe Simonis
2859897815
[FIX] allow falsy extra attributes on fields.
...
bzr revid: chs@openerp.com-20131024135448-e2bpgaqu7mvg1icn
2013-10-24 15:54:48 +02:00
7345cfb697
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131019052730-g67chkz69pmoi5q4
bzr revid: launchpad_translations_on_behalf_of_openerp-20131020050443-pce4qrtn25h1qir6
bzr revid: launchpad_translations_on_behalf_of_openerp-20131023052203-fvk0akb3avqxkqje
bzr revid: launchpad_translations_on_behalf_of_openerp-20131024052015-8kg0owfhye4ws3xw
bzr revid: launchpad_translations_on_behalf_of_openerp-20131025060039-0t8928ck7dgi8yv6
2013-10-25 06:00:39 +00:00
Xavier Morel
a622a5ad55
[FIX] remove handling of parameters in ormcache clearing
...
It's completely broken in case of optional parameters
e.g. (ir.translation)._get_source, as a call with the optional
parameter won't be matched by a clear without, and the other way
around. This becomes even more problematic in the website branch as
_get_source now has *two* optional parameters (source and res_id).
After discussion with odo and discovery that in multiprocess only the
current node will use any granularity (other nodes not only clear all
of the current method cache, but all caches of all models), simplify
cache clearing, ignore parameters and just blow the current method's
cache entirely.
bzr revid: xmo@openerp.com-20131024132956-4tl3prum8za47igy
2013-10-24 15:29:56 +02:00
Xavier Morel
39fb50d43d
[REM] explicit cache clearing, fixing ir.translation instead
...
bzr revid: xmo@openerp.com-20131024131613-6hebrxi5dbbs82ph
2013-10-24 15:16:13 +02:00
Thibault Delavallée
15ec0ebb62
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131024131445-zaxaw5rpu681gwoz
2013-10-24 15:14:45 +02:00
bth-openerp
ecb408f6de
[MERGE]Merge trunk-website-al.
...
bzr revid: bth@tinyerp.com-20131024130519-atsk50w40enrx85s
2013-10-24 18:35:19 +05:30
bth-openerp
3a2a98034e
[IMP]Improved code to paid invoiced.
...
bzr revid: bth@tinyerp.com-20131024121849-0sgdrta07u3quxr6
2013-10-24 17:48:49 +05:30
Thibault Delavallée
980ec4bc9e
[FIX] website_blog: contact us button in blog leading to
...
website.contactus page instead of doing nothing.
bzr revid: tde@openerp.com-20131024121430-ab84qfdulomukkf4
2013-10-24 14:14:30 +02:00
Thibault Delavallée
9f0dcae234
[FIX] website_blog: read_more link was wrong, leading to a 404.
...
The website_blog route is blog/<blog_id>, nothing related to category anymore.
bzr revid: tde@openerp.com-20131024113539-v3e7oi9j67vp27sx
2013-10-24 13:35:39 +02:00
Xavier Morel
c38f729543
[FIX] auth of pagenew
...
bzr revid: xmo@openerp.com-20131024111710-5ghadng4we3p2cgg
2013-10-24 13:17:10 +02:00
Thibault Delavallée
2cc18c153e
[REV] Reverted a change in _openerp__.py in website_sale, because
...
this was just for local tests.
bzr revid: tde@openerp.com-20131024111453-tqjx4st6js5qnoz4
2013-10-24 13:14:53 +02:00
Thibault Delavallée
0467c8a5ab
[FIX] [WIP] website_sale: fix crash when having product templates without variant.
...
probably it should not be displayed, but as there does not seem to exist any
clue about what the controller / view should do, I added some protections.
[DOC] added some comments because some methods seems quite weird.
bzr revid: tde@openerp.com-20131024110453-uj4xnrtwst0fdcrb
2013-10-24 13:04:53 +02:00
Thibault Delavallée
258846a697
[FIX] [WIP] website_sale: Tries to fix method
...
that does things not commented on things that do not necessarily exist.
Does it hurt you to put some docstrings ?
bzr revid: tde@openerp.com-20131024105524-eattmf2s52ekztn3
2013-10-24 12:55:24 +02:00
Amit Bhavsar (Open ERP)