Commit Graph
76435 Commits
Author SHA1 Message Date
Thibault Delavallée 3d73443fcd [IMP] website_payment: form for credit card, using jquery.payment in the module JS file + udpated CSS / SASS
bzr revid: tde@openerp.com-20131112132133-f9nqb7jgy1ovmc5b
2013-11-12 14:21:33 +01:00
Thibault Delavallée 92e72bb317 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131112095402-82v28vq537o6le8c
2013-11-12 10:54:02 +01:00
Fabien Pinckaers 46072d92ef [REVERT] partially reverted wrong change
bzr revid: fp@openerp.com-20131111224509-xxpw3qltvib53rhj
2013-11-11 23:45:09 +01:00
Fabien Pinckaers e402105d91 [IMP] empty screen for events
bzr revid: fp@openerp.com-20131111212433-xyvl14vhewsp2g14
2013-11-11 22:24:33 +01:00
Fabien Pinckaers 7164a12eb8 [iMP] website event: old events and order by
bzr revid: fp@openerp.com-20131111210759-g3qlzpgj7qckfywi
2013-11-11 22:07:59 +01:00
Fabien Pinckaers 0c4ed1d5d5 [IMP] mini change in text
bzr revid: fp@openerp.com-20131111204221-5oc7797k7ke34fi2
2013-11-11 21:42:21 +01:00
Fabien Pinckaers 43af25742e [IMP] some fixes in HR: #employees -> integer not float, forecasted employees is fixed and 'in recruitment' is computed so that it is still correct after doing a new recruitment
bzr revid: fp@openerp.com-20131111203209-cpoqpwsvepkl1elx
2013-11-11 21:32:09 +01:00
Fabien Pinckaers eb3cc55347 [IMP] Job Positions update: filter by office and dept
bzr revid: fp@openerp.com-20131111200621-mlkryuems0d8qx6r
2013-11-11 21:06:21 +01:00
Fabien Pinckaers c8fb0335a5 [IMP] Cleaning Jobs + Small Imp Event layout
bzr revid: fp@openerp.com-20131111183638-w7o1tsbo1shxzptk
2013-11-11 19:36:38 +01:00
Fabien Pinckaers 70338369a9 [IMP] better margin events
bzr revid: fp@openerp.com-20131111161537-et1ts7ohat7mvo59
2013-11-11 17:15:37 +01:00
Fabien Pinckaers 221c6b7dbd [IMP] Event improvement in views
bzr revid: fp@openerp.com-20131110124244-n85z3usyj7laak33
2013-11-10 13:42:44 +01:00
Fabien Pinckaers d5c4111aa2 [IMP] default photo for parallax
bzr revid: fp@openerp.com-20131109195346-0a5dyg2gmv54tj92
2013-11-09 20:53:46 +01:00
Fabien Pinckaers 107aa205fe [IMP] about us page
bzr revid: fp@openerp.com-20131109194824-mf2v3o1myzwmj48t
2013-11-09 20:48:24 +01:00
Fabien Pinckaers 1f691bbbd9 [IMP] better about us page
bzr revid: fp@openerp.com-20131109194306-h3d25wgbuvsk2fm2
2013-11-09 20:43:06 +01:00
Fabien Pinckaers c960a04a65 [IMP] order of menu
bzr revid: fp@openerp.com-20131109185847-rrejtk6e0i77yln2
2013-11-09 19:58:47 +01:00
Fabien Pinckaers 854916ce54 [IMP] Reorder menu
bzr revid: fp@openerp.com-20131109150613-scepw4gdw7my4s76
2013-11-09 16:06:13 +01:00
Fabien Pinckaers d58b41a160 [IMP] menus
bzr revid: fp@openerp.com-20131109144350-34tyjox2q5r9lc35
2013-11-09 15:43:50 +01:00
Fabien Pinckaers bc62ae21b6 [IMP] Remove Bounce effet
bzr revid: fp@openerp.com-20131109142751-cj9334s8avd4rzve
2013-11-09 15:27:51 +01:00
Fabien Pinckaers 14146a7b6c [IMP] Show Sign In as an option
bzr revid: fp@openerp.com-20131109083550-pa2u3dqvynz0qrb1
2013-11-09 09:35:50 +01:00
Fabien Pinckaers b0b8c8c083 [iMP] One pixel lost in height
bzr revid: fp@openerp.com-20131109082845-py6jbtugr2rp00ay
2013-11-09 09:28:45 +01:00
Fabien Pinckaers 929197e578 [IMP] wording
bzr revid: fp@openerp.com-20131109081123-dh5h1xfsfesor4v0
2013-11-09 09:11:23 +01:00
ddm 0b16f685c1 [FIX] beware of multilang when removing **post
bzr revid: ddm@openerp.com-20131108172019-51yymatg4b1zanc1
2013-11-08 18:20:19 +01:00
ddm 4d5a8ed6ab [IMP] cleanup product controller
bzr revid: ddm@openerp.com-20131108164917-0cn91vb1yn822bvi
2013-11-08 17:49:17 +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
Christophe Matthieu 870559b5cc [FIX] webiste snippet: mega super fix
bzr revid: chm@openerp.com-20131108152445-9n4oixwxwp150u9k
2013-11-08 16:24:45 +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
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
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
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 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
Fabien Meghazi 777a4ba2c2 [FIX] Editing menu t-fields fails
Problem lays in ir.ui.view#save()
meanwhile used t-ignore as a workaround

bzr revid: fme@openerp.com-20131107160656-sf728j65kcyg82cc
2013-11-07 17:06:56 +01:00
Fabien Meghazi 01a28b6e03 [FIX] Can't translate menus
context was not passed while setting request.website
forced to refactor a bit in order to make true model methods but stopped
because it will be duplicated work when migrating to the new api

bzr revid: fme@openerp.com-20131107151400-9dmtgz7xs34qmbmq
2013-11-07 16:14:00 +01:00