Commit Graph
81203 Commits
Author SHA1 Message Date
Christophe Simonis be7084b988 [FIX] web: do not declare variables inside if() scope
bzr revid: chs@openerp.com-20131108160747-1jrpihb66y6vtov5
2013-11-08 17:07:47 +01:00
jke-openerp 0a7c57134c [REF] Remove a console log
bzr revid: jke@openerp.com-20131108160705-j0i13p279ukeacin
2013-11-08 17:07:05 +01:00
Christophe Simonis 5311db325c [FIX] web: filter context before executing actions triggered by buttons in views
bzr revid: chs@openerp.com-20131108160627-osiigir6tsr2k783
2013-11-08 17:06:27 +01:00
jke-openerp d1c3269349 [IMP] slaughtering + Merge calendar_event to crm_meeting + debug + ...
bzr revid: jke@openerp.com-20131108160549-2q6snfpxvbq18l0h
2013-11-08 17:05:49 +01:00
Christophe Matthieu 9d9b2ed63c [FIX] website_sale: Shopping Cart suggested products
bzr revid: chm@openerp.com-20131108155841-m4b6k02zx8h54ajf
2013-11-08 16:58:41 +01:00
Thibault Delavallée c5aea42e12 [IMP] website_payment: wip work to add credit card front-end management + jquery.payment library use
bzr revid: tde@openerp.com-20131108155054-t4wsnvfu5eb0o3hf
2013-11-08 16:50:54 +01:00
Xavier Morel 8c786b7aab [IMP] move slugify to server, use slugified url as page name
bzr revid: xmo@openerp.com-20131108154842-ts1nnd40jusa92h6
2013-11-08 16:48:42 +01:00
Xavier Morel 663ea78caa [ADD] handling of slugs in ModelConverter (generation & parsing)
bzr revid: xmo@openerp.com-20131108154756-znkcyd32csd7vj1u
2013-11-08 16:47:56 +01:00
Gery Debongnie 4dd5ac9924 [FIX] fix a bug preventing hide and show method of chartview widget to function properly (addon web_graph)
bzr revid: ged@openerp.com-20131108154114-25zqn3jq5u6iuibt
2013-11-08 16:41:14 +01:00
Gery Debongnie 906d5168cc [IMP] small cleanups to chartview widget (addon web_graph)
bzr revid: ged@openerp.com-20131108152717-stbx0us8ipom67iq
2013-11-08 16:27:17 +01:00
Christophe Matthieu 870559b5cc [FIX] webiste snippet: mega super fix
bzr revid: chm@openerp.com-20131108152445-9n4oixwxwp150u9k
2013-11-08 16:24:45 +01:00
Gery Debongnie eab6a192e9 [IMP] add pie, line and bar chart to the chartview widget (addon web_graph)
bzr revid: ged@openerp.com-20131108152048-0akyhf0c7lcdsqjh
2013-11-08 16:20:48 +01:00
Christophe Matthieu ecce1f0f4d [FIX] website snippets parallax: remove lib and add custom code to fix editor and reduce code
bzr revid: chm@openerp.com-20131108150025-xlqoygvkz7122gru
2013-11-08 16:00:25 +01:00
Xavier Morel ff7316b89b [ADD] small comment
bzr revid: xmo@openerp.com-20131108145142-px3947qa1apy8gwd
2013-11-08 15:51:42 +01:00
Xavier Morel 3abd06ffe0 [FIX] blog controller to suck less and be more compatible with routes introspection
Routes introspection fixes:
* convert <int:x_id> to <model():x>
* remove **kw, specify explicit enable_editor parameter

Suckless:
* remove useless `/blog/tag/` route
* add pagination support in tags
* add pagination support when no category or tag (`/blog/`)
* remove handling of impossible case of category *and* tag
* make exclusive cases more exclusive, avoid repeatedly checking the
  same condition over and over

bzr revid: xmo@openerp.com-20131108142149-v2z2m6kwgf97o7b0
2013-11-08 15:21:49 +01:00
Christophe Simonis 1ec1125349 [UPD] update underscore and underscore.string libraries to latests versions
bzr revid: chs@openerp.com-20131108134931-muit7ym8q7g3ck1u
2013-11-08 14:49:31 +01:00
Darshan Kalola (OpenERP) 7237e7436b [MERGE]with lp:~openerp-dev/openobject-addons/trunk-product-variant-imp-amb
bzr revid: dka@tinyerp.com-20131108134052-49pappgab0d7j49q
2013-11-08 19:10:52 +05:30
bth-openerp 596da49acc [IMP]Improved demo data for company.
bzr revid: bth@tinyerp.com-20131108133801-64wluz06og52mad3
2013-11-08 19:08:01 +05:30
Xavier Morel 01a414fb7c [ADD] initial route introspection + fix pair of routes/controllers
* most controllers turn out to be complete cork and thus can't be
  reversed

* fixup a pair of simple controllers

TODO:
* fixup more controllers
* how can labels/page names be produced?
* grouping/categories of links?

At a high level, workings are pretty simple:
* iterate on all rules (every url pattern produces a werkzeug rule)
* check if the url can make sense as a link: GET, http, no auth or
  public auth, coming from the CMS (no web client links) and all
  converters can generate values for themselves (e.g. a url with an
  `int` converter can't be generated as there is no finite set of
  integers, let alone one small enough to make sense to show to users)
* check if the controller function bound to the URL can use the URLs
  we can generate (no **kwargs as that means arbitrary get|post
  parameter, no query param without a default value (a query param is
  a parameter which does not come from a URL/rule converter))
* use rule converter(s) to generate a matrix of values, and build urls
  from these

bzr revid: xmo@openerp.com-20131108132615-2n7t1vj8hz9v9eis
2013-11-08 14:26:15 +01:00
ddm 1e9df02682 [FIX] tour has been fixed
bzr revid: ddm@openerp.com-20131108143848-eg0xulyeggjs4tts
2013-11-08 15:38:48 +01:00
Xavier Morel 565df0c0bf [IMP] ModelConverter
* add generate method to indicate that the converter can produce
  values it can consume

* fix to_url, should return a string

bzr revid: xmo@openerp.com-20131108132135-n80fot7xv6by43dx
2013-11-08 14:21:35 +01:00
Darshan Kalola (OpenERP) 412ee4bd8a [IMP]add search view for product-variant,solve duplication problem of product variant and solve unit price calculation problem.
bzr revid: dka@tinyerp.com-20131108131416-cyqebxz9zgbjy9nj
2013-11-08 18:44:16 +05:30
Gery Debongnie 7ad9aecc13 [IMP] add widgets (chart view and pivot view) in addon web_graph
bzr revid: ged@openerp.com-20131108130806-ez2a6sxdsy0bzg62
2013-11-08 14:08:06 +01:00
Denis Ledoux 0a42a9dec9 [FIX]base: remove unnecessary field sizes from all relateds of ir_model. Size limits prevented some database models customization (like selection fields with selection options longer than 128 chars)
bzr revid: dle@openerp.com-20131108130208-srt5gzlxbk890htf
2013-11-08 14:02:08 +01:00
Amit Bhavsar (Open ERP) da7d267577 [MERGE] merge with latest trunk.
bzr revid: amb@tinyerp.com-20131108124231-s9r46b2x5hohckoo
2013-11-08 18:12:31 +05:30
Amit Bhavsar (Open ERP) e715a7a019 [imp] Improve product and template view and add menu products by templates.
bzr revid: amb@tinyerp.com-20131108123643-4iwtcuf3p9f14l6z
2013-11-08 18:06:43 +05:30
Gery Debongnie 23b9f226c7 [ADD] add (custom version of) bootstrap library to graph view (addon web_graph)
bzr revid: ged@openerp.com-20131108115030-0r4e4vk379mqtkzf
2013-11-08 12:50:30 +01:00
Gery Debongnie d59cbcceef [ADD] add nvd3 library to graph view (addon web_graph)
bzr revid: ged@openerp.com-20131108113900-w4vet1okiwiy5pqf
2013-11-08 12:39:00 +01:00
Gery Debongnie 69257d5d6f [REF] work in progress. reset graph view to minimal state in addon web_graph
bzr revid: ged@openerp.com-20131108113210-aptz2pne05iwca82
2013-11-08 12:32:10 +01:00
bth-openerp 723c47907a [MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: bth@tinyerp.com-20131108112213-3yhd0lg7j1zy0qut
2013-11-08 16:52:13 +05:30
bth-openerp b6942cb19b [MERGE]Merge lp:~openerp-dev/openobject-server/trunk-website-al.
bzr revid: bth@tinyerp.com-20131031073313-0o76y67rae9m0p97
bzr revid: bth@tinyerp.com-20131108111154-elzbel3xcuh1nqld
2013-11-08 16:41:54 +05:30
Thibault Delavallée 825c6ec7c3 [CLEAN] payment_acquirer_* modules
Cleaned openerp declarations. Added icons. Added basic doc directory
and changelog.

bzr revid: tde@openerp.com-20131108105921-2vheg10ahfdp8vvh
2013-11-08 11:59:21 +01:00
Thibault Delavallée 3d1db686c3 [CLEAN] payment_acquirer_* modules: some code cleaning
Cleaned init files, removing some licences (keeping only in init and openerp
in base directory of modules). Cleaned some class name, added forgotten
test file for payment_acquirer_transfer.

bzr revid: tde@openerp.com-20131108101005-a149bvatw5w6sdql
2013-11-08 11:10:05 +01:00
Thibault Delavallée 9386acc59f [ADD] payment_acquirer: added security rules. To check later if correct.
bzr revid: tde@openerp.com-20131108100135-bmapssjb3tb3zomi
2013-11-08 11:01:35 +01:00
Thibault Delavallée 8f2f1b0ac7 [ADD] payment_acquirer: added basic files for doc
bzr revid: tde@openerp.com-20131108095848-fjws4w32mjcseqd4
2013-11-08 10:58:48 +01:00
Thibault Delavallée dab99d29d6 [CLEAN] payment_acquirer: module cleaning
Remove now unnecessary controllers, data and static folders. Moved credit card logos to ogone.

bzr revid: tde@openerp.com-20131108095654-jd6ybw6hkame2ayu
2013-11-08 10:56:54 +01:00
Thibault Delavallée 04e6a95cd5 [ADD] [MOV] payment_acquirer: added transfer payment acquirer
Only dummy module currently. Allowed to remove some old stuff from payment_acquirer.

bzr revid: tde@openerp.com-20131108094444-to0kgzkl2agqkdps
2013-11-08 10:44:44 +01:00
Thibault Delavallée 553870b59e [FIX] payment_acquirer: ogone: fixed import issue due to file move
bzr revid: tde@openerp.com-20131108094348-5umaqjzws0fpyuky
2013-11-08 10:43:48 +01:00
Christophe Matthieu 665e9f8d5b [FIX] website snippet: image resizing with img-responsive and rte editor
bzr revid: chm@openerp.com-20131108091404-uz42809mycr9cqy3
2013-11-08 10:14:04 +01:00
Christophe Simonis c12c482347 [MERGE] deprecate fold feature of statusbar form widget
bzr revid: chs@openerp.com-20131107194316-b1boyw5vopedhi2x
2013-11-07 20:43:16 +01:00
Christophe Simonis 5bd2a7c1e3 [MERGE] {crm,hr_recruitment,project}: update domains for state <-> stage correspondance and for tracking messages matching
{hr_recruitment,project}: correct analysis views: use date_write intead of date_{close,end}
sale_crm: correct inherited oppprotunity view xpath

bzr revid: chs@openerp.com-20131107193956-8vfw3s9eoht61tm7
2013-11-07 20:39:56 +01:00
Thibault Delavallée b2ea74e4e6 [REF] payment: moved paypal and ogone stuff into their dedicated modules.
Added payment_acquirer_paypal and .._ogone modules. Those modules hold
the model / data / controllers related to the specific acquirer.

Also updated website_payment, to use website.menu instead of custom change
in header, as menus are now editable.

bzr revid: tde@openerp.com-20131107180444-bbzobquqq9o6pctv
2013-11-07 19:04:44 +01:00
Thibault Delavallée 35619dfe12 [MERGE] Sync with website-al main branch
bzr revid: tde@openerp.com-20131107172339-zjpa2xmtf2xql9eu
2013-11-07 18:23:39 +01:00
Thibault Delavallée f586b49e58 [ADD] website_payment: basically, a module to test
payments. Just to have a basic interface to click and see what happen.

bzr revid: tde@openerp.com-20131107172305-giegilb90zll82x6
2013-11-07 18:23:05 +01:00
Thibault Delavallée 7fe8885216 [ADD] payment_acquirer: first implementation of paypal and ogone acquirers.
paypal: only form is currently implemented. Method name and call order will change.
However the basic mechanism is impelmented. IPN is implemented (paypal contact us
back after the transaction with transaction details).

ogone: form and server2server are implemented. Method names and call order will
change. Based on chs / dle / ... implementation for ogone server2server.

basic addition of tests, still wip.

This commit is not a clean commit but a WIP commit. Please excuse me
but it's time to commit.

bzr revid: tde@openerp.com-20131107172236-chmg198305crgrud
2013-11-07 18:22:36 +01:00
Thibault Delavallée 3d0ac6643e [IMP] payment_acquirer: continuing base model.
Two main models : payment.acquirer and payment.transaction.

payment.acquirer models the acquirer: paypal, ogone. Each specific
acquirer will inherit from the class and add specific fields.

payment.transaction models the transaction itself. It has basic fields
for a transaction: date, partner, partner fields (to hold data at
transaction time), reference, state and its message, amount, currency.

Class methods are not finished and still quite WIP.

payment.acqurier has a render method that is used to render
its form. The form is the 'pay now' button with the specific
sementic of each acquirer.

This model is supposed to work on form-based and server-to-server
implementation methods.

bzr revid: tde@openerp.com-20131107171558-jrwrj3ll9kol6bav
2013-11-07 18:15:58 +01:00
Christophe Matthieu ec2a9776ab [IMP] website_sale: move attributes under add to cart button in product view
bzr revid: chm@openerp.com-20131107164522-uauyelduq7o4sfj3
2013-11-07 17:45:22 +01:00
Christophe Simonis 44eab2cfed [IMP] dumpstack dumps greenlets when running in evented mode
bzr revid: chs@openerp.com-20131107163419-90pd7uai8fm70sv9
2013-11-07 17:34:19 +01:00
Christophe Matthieu dd497b0ef2 [IMP] website_sale: change name of suggested product template
bzr revid: chm@openerp.com-20131107162916-ocm5q101psem5j2v
2013-11-07 17:29:16 +01:00
Christophe Matthieu 4ff0a207f6 [IMP] website_sale: some change for attributes
bzr revid: chm@openerp.com-20131107162101-82tl3ibbhxkbgjro
2013-11-07 17:21:01 +01:00