pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,144 Commits 1 Branch 0 Tags
ed7ee4df522fd71b63e809f62a07db8ea30210ce
Commit Graph
82144 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Christophe Simonis d623c091f3 [IMP] stock: do not use assert in (python) tests 
bzr revid: chs@openerp.com-20131108221535-c0lowzwd15d7asd3
 2013-11-08 23:15:35 +01:00
Christophe Simonis 636ac0f61e merge upstream 
bzr revid: chs@openerp.com-20131108215612-e5f01a1kvyevlry9
 2013-11-08 22:56:12 +01:00
Christophe Simonis 871e2db195 [FIX] base_action_rule: even test models need access rules (avoid warning) 
bzr revid: chs@openerp.com-20131108215451-mq18m32ajuuydzjq
 2013-11-08 22:54:51 +01:00
Christophe Simonis 46d7eb79e9 [FIX] document: even deprecated models need access rules (avoid warning) 
bzr revid: chs@openerp.com-20131108215408-xodw6lmvvxvw4te7
 2013-11-08 22:54:08 +01:00
Christophe Simonis f42ac76068 [FIX] web_test_demo: make test model a TransientModel. This avoid a warning about the lack of access rules 
bzr revid: chs@openerp.com-20131108214255-cgx1r7x8sx1ak4ea
 2013-11-08 22:42:55 +01:00
Launchpad Translations on behalf of openerp 3f73f59b15 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131108062624-4ihw3f2dghkrup1n
bzr revid: launchpad_translations_on_behalf_of_openerp-20131110064532-3pcx6sl2w1ioizv9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131111053914-v4h4lfsutiem8fos
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112062321-q35iebzktzu6lw8m
 2013-11-12 06:23:21 +00:00
Christophe Simonis aeaed95e81 [IMP] trml2pdf: like css, invalid style name is not a warning. 
bzr revid: chs@openerp.com-20131108212709-4dmdbxxh2w1jd51p
 2013-11-08 22:27:09 +01:00
Christophe Simonis 5859d8e9cf merge upstream 
bzr revid: chs@openerp.com-20131108212107-u6ysowkajvg1m371
 2013-11-08 22:21:07 +01:00
Christophe Simonis d67ff9ba02 [FIX] views inheritance: deleting a non-existing attribute must be a no-op 
bzr revid: chs@openerp.com-20131108175750-yenql6hycpn95i9j
 2013-11-08 18:57:50 +01:00
Christophe Simonis 86fea1e176 [IMP] always dumps threads, even in evented mode 
bzr revid: chs@openerp.com-20131108175224-tztp2w83vfw9yetz
 2013-11-08 18:52:24 +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
Denis Ledoux 3f6ef87416 [FIX]mail: a test failed if there was the word 'model' in the url, which can happen when the branch name contains 'model' or the domain name itself contain 'model' 
bzr revid: dle@openerp.com-20131108164658-x7uznik1n5jo1djd
 2013-11-08 17:46:58 +01:00
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
Atul Patel (OpenERP) e2cc289c82 [MERGE]: Merged with lp:openobject-addons 
bzr revid: atp@tinyerp.com-20131101112323-3xqkqeay6ik1quqf
bzr revid: atp@tinyerp.com-20131108105910-i5zm3y5sz8m416h0
 2013-11-08 16:29:10 +05:30
Atul Patel (OpenERP) 8fa790a71b [MERGE]: Merged with addons 
bzr revid: atp@tinyerp.com-20131101112056-ovwydhmbig7ka71o
bzr revid: atp@tinyerp.com-20131108105612-517qmimkhz06lb51
 2013-11-08 16:26:12 +05:30
Atul Patel (OpenERP) 010c74f61c [MERGE]: Merged with addons 
bzr revid: atp@tinyerp.com-20131101111834-x804u2ds0o6eo5m9
bzr revid: atp@tinyerp.com-20131108105510-vl6d8ehp6kqffkry
 2013-11-08 16:25:10 +05:30
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