pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,203 Commits 1 Branch 0 Tags
42952bb7cf514b43eac598397e7bfad4cd943bc7
Commit Graph
81203 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Morel 411cd6aa21 [IMP] add img and img-responsive to image fields 
bzr revid: xmo@openerp.com-20131122104148-dpo63pg6mpn1315c
 2013-11-22 11:41:48 +01:00
Xavier Morel 264fe7d98b [ADD] small transparency when hovering editable images, so [Edit] button stands out more 
bzr revid: xmo@openerp.com-20131122102322-s776o3f80bku3f4a
 2013-11-22 11:23:22 +01:00
Xavier Morel 1f2a40e3f7 [FIX] horizontal centering of edition button on images centered with margin: 0 auto in webkit-based browsers 
bzr revid: xmo@openerp.com-20131122101154-fsae9uz33smy2ja9
 2013-11-22 11:11:54 +01:00
ddm 73d16d6d9b [IMP] Blog tour imps 
bzr revid: ddm@openerp.com-20131122094942-au6yn70qdqvcu11u
 2013-11-22 10:49:42 +01:00
Gery Debongnie a32018f962 [REF] large refactoring in progress. goal is to separate the data handling code (pivot) from the ui code (drawing, buttons, events (addon web_graph) 
bzr revid: ged@openerp.com-20131122094322-wn36gtmtv9pgn5su
 2013-11-22 10:43:22 +01:00
Gery Debongnie d0cb5149b4 [REF] large refactoring in progress. goal is to separate the data handling code (pivot) from the ui code (drawing, buttons, events (addon web_graph) 
bzr revid: ged@openerp.com-20131122074327-bfnlw3ew1120um0k
 2013-11-22 08:43:27 +01:00
Darshan Kalola (OpenERP) 9f2dce4fe0 [IMP]improve product template view and change necessary xpath 
bzr revid: dka@tinyerp.com-20131122054850-8sfin7rypnyf17ip
 2013-11-22 11:18:50 +05:30
Fabien Meghazi 54b15928cf [FIX] ahem, fix previous commit 
bzr revid: fme@openerp.com-20131121205959-jvlmcofp5yq5s7ht
 2013-11-21 21:59:59 +01:00
Fabien Meghazi 9f43e80662 [IMP] rendering context not mandatory for ir.ui.view#render() 
bzr revid: fme@openerp.com-20131121203230-uo485jls4uk15n7x
 2013-11-21 21:32:30 +01:00
Fabien Meghazi 8091466de3 [IMP] route lazy request exceptions to ir_http exception handler 
bzr revid: fme@openerp.com-20131121192841-r1c05wj9302l2axj
 2013-11-21 20:28:41 +01:00
Christophe Simonis c6d0006d26 [FIX] email.template: add safe filter over email address to allow emails to be sent in the format 'Name <name@company.com>' and avoid escaping. 
followup of commit mat@openerp.com-20131121151305-t5je12s4w5uctu0k

bzr revid: chs@openerp.com-20131121170949-5rzr7qovzzkzyvvw
 2013-11-21 18:09:49 +01:00
Xavier Morel 233e460b52 [FIX] forgot to tell ckeditor not to load removed bootstrap combo plugin 
bzr revid: xmo@openerp.com-20131121160516-a29x498ode34p1ml
 2013-11-21 17:05:16 +01:00
Denis Ledoux 6fd552c3ce [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5139 rev-id: dle@openerp.com-20131121132305-qjlclgz5v9tze1fr 
bzr revid: odo@openerp.com-20131120102545-2tlp031yib6viz35
bzr revid: chs@openerp.com-20131120161708-c8sbom592moukwxw
bzr revid: dle@openerp.com-20131121155457-lh7fzouk2upeiu16
 2013-11-21 16:54:57 +01:00
Martin Trigaux d2b6174268 [FIX] project_issue: remove test checking the convert_issue_task feature 
bzr revid: mat@openerp.com-20131121155324-yg25mzo2css17f13
 2013-11-21 16:53:24 +01:00
Xavier Morel 32147fbffc [REM] bootstrap link configuration combo, it has served its testing purposes 
bzr revid: xmo@openerp.com-20131121154501-vrs26caromm6ebgb
 2013-11-21 16:45:01 +01:00
Fabien Meghazi a337d0dc2c [FIX] kanban broken by lazyrenderer 
bzr revid: fme@openerp.com-20131121154213-71hb70c9326gtafb
 2013-11-21 16:42:13 +01:00
Olivier Dony 2cba6a5355 [MERGE] Forward-port of latest 7.0 fixes up to rev 9629 rev-id odo@openerp.com-20131121153230-keie85rmes2zh2o8 
bzr revid: chs@openerp.com-20131121112139-aw2ara1i1xymue62
bzr revid: odo@openerp.com-20131121154205-ul9hf9tz3h0x2n7m
 2013-11-21 16:42:05 +01:00
Olivier Dony 17144e9914 [FIX] stock.picking.in: typo in default_get implementation 
bzr revid: odo@openerp.com-20131121153230-keie85rmes2zh2o8
 2013-11-21 16:32:30 +01:00
Martin Trigaux 00f7b3b1f1 [REF] procurement: remove legacy code in scheduler from 6.1 
bzr revid: mat@openerp.com-20131121153048-n1hxpuu8jg3ayyhw
 2013-11-21 16:30:48 +01:00
Martin Trigaux 8b35f23701 [ADD] procurement: add skip_exception parameter on scheduler allowing to have more frequent scheduler only testing confirmed picking 
bzr revid: mat@openerp.com-20131121152823-vphwy0jv9b02ajk2
 2013-11-21 16:28:23 +01:00
Martin Trigaux 57ea381cac [REF] project_issue: remove unused method convert issue to task (button was removed from view at rev 6898) 
bzr revid: mat@openerp.com-20131121152502-kpsax7jze1cc7lbl
 2013-11-21 16:25:02 +01:00
Martin Trigaux c3063778ce [FIX] email.template: add safe filter over email address to allow emails to be sent in the format 'Name <name@company.com>' and avoid escaping 
bzr revid: mat@openerp.com-20131121151305-t5je12s4w5uctu0k
 2013-11-21 16:13:05 +01:00
Xavier Morel 74c63fe9a0 [FIX] website_membership: unfuck delegation to self.members 
should really redirect instead, delegation makes no bloody sense

bzr revid: xmo@openerp.com-20131121143216-qyvf1koz4bwldcpd
 2013-11-21 15:32:16 +01:00
Xavier Morel 7da6b2e074 [IMP] website_membership: simplify partner_ref, move to model converter 
bzr revid: xmo@openerp.com-20131121143127-1fm1e8xuz1da13tr
 2013-11-21 15:31:27 +01:00
Xavier Morel 1ce9f8539b [IMP] style and domain fixes 
bzr revid: xmo@openerp.com-20131121142839-aotrh21l5d416hu3
 2013-11-21 15:28:39 +01:00
Xavier Morel 61431d0384 [IMP] product: avoid redundant work 
bzr revid: xmo@openerp.com-20131121142252-laxz8z457yyebayj
 2013-11-21 15:22:52 +01:00
Xavier Morel 14d15b95a5 [FIX] crap 
* (1, '=', 1) is a noop domain section

* list.append. A thing.

* converting an int to an int is not useful

* search_count avoids having to fetch all product.template ids from
  the database just to call len() on the result when it's not
  necessary

* when using a dict value 5 times in a row, it's simpler to get it
  just once and refer a local variable thereafter

bzr revid: xmo@openerp.com-20131121141647-2w9z2a7b8p5sek22
 2013-11-21 15:16:47 +01:00
Thibault Delavallée 53252152bc [ADD] payment_acquirer, transfer, ogone and paypal integration into ecommerce 
[ADD] payment_acquirer module, holding :
- payment.acquirer model: models the acquirer with the various credentials (e.g. paypal, ogone). payment_acquirer only contains basic fields. Each acquirer can add fields through inheritance. See payment.acquirer model for more details.
- payment.transaction model: models the transaction itself. Inheritance is done by calling custom methods prefixed by the acquirer name. See payment.transaction model for more details.

[ADD] payment_acquirer_ogone, payment_acquirer_paypal and payment_acquirer_transfer modules. Those are specific implementations for ogone, paypal and basic money transfer. They contain dummy account data, to avoid committing real accounts. Will have to be cleaned before final merge. Those module contain tests but some tests will not work without real account creadentials. To be cleaned.

[ADD] website_payment: a test module for payment. Will have to be cleaned.

[IMP] website_sale: added support of payments in the checkout process. Improved checkout process. Confirmation is now basically a view on a sale.order, and a polling on a transaction to see its status. Context / Session are better managed, but still require some cleaning. Also fixed some links in the shop.

[TODO]
- some cleaning in paypal / ogone about form methods
- improve some tests
- clean checkout process after more tests
- cleaning in ogone server2server + tests

bzr revid: tde@openerp.com-20131121134140-3somglek7dk1o6t1
 2013-11-21 14:41:40 +01:00
Thibault Delavallée a64c16aac5 [FIX] payment.acquirer: now passing xml_id instead of id for the template to render. 
Indeed render accepts view ID, but the qweb engine does not handle
IDs, only xml_ids. Using the view xml_id field allows to avoid
having a hack in the server.

bzr revid: tde@openerp.com-20131121133309-qq2alstapq5sonkm
 2013-11-21 14:33:09 +01:00
Thibault Delavallée 32897bf4ee [MERGE] Sync with website-al 
bzr revid: tde@openerp.com-20131121132413-lyngpz4c23kocmye
 2013-11-21 14:24:13 +01:00
Christophe Matthieu dc8ef4da30 [FIX] website_sale: fix product editor and move edit code in website_sale.editor.js 
bzr revid: chm@openerp.com-20131121132317-ysa25sdqqx8dg1wo
 2013-11-21 14:23:17 +01:00
Denis Ledoux 58080c6569 [FIX] ir, ir_translation: it was not possible to empty the source of a translation, or this is sometime something that we want 
bzr revid: dle@openerp.com-20131121132305-qjlclgz5v9tze1fr
 2013-11-21 14:23:05 +01:00
Darshan Kalola (OpenERP) d67a267c39 [IMP]solve traceback. 
bzr revid: dka@tinyerp.com-20131121130844-ywqfpx6aza6wuoia
 2013-11-21 18:38:44 +05:30
Christophe Matthieu 07819834bb [FIX] website_sale: filter controller and shop/?category=37 --> shop/category/37 
bzr revid: chm@openerp.com-20131121130529-1zs3ioih5156ceit
 2013-11-21 14:05:29 +01:00
Christophe Matthieu 31f64313c0 [IMP] website snippet: create website.snippet.StyleEditor to add styles with html class and other logical process into snippet options 
bzr revid: chm@openerp.com-20131121123439-wvvcdegvc1bornux
 2013-11-21 13:34:39 +01:00
Darshan Kalola (OpenERP) f19a433dbb [MERGE] with lp:~openerp-dev/openobject-addons/trunk-product-variant-imp-amb and change necessary code. 
bzr revid: dka@tinyerp.com-20131121122311-629hbtetmqfrtfyg
 2013-11-21 17:53:11 +05:30
Xavier Morel a9b228880b [FIX] hacky image edit button to be less hacky, fix image fields edition/save 
bzr revid: xmo@openerp.com-20131121121731-4ux9gxt8ltluw9e5
 2013-11-21 13:17:31 +01:00
Xavier Morel 82b40bf84c [FIX] urlparse.parse_qs returns a dict *of lists*, eq test on values with a string is always false 
bzr revid: xmo@openerp.com-20131121121235-hafy7n61h3v6kb0k
 2013-11-21 13:12:35 +01:00
Thibault Delavallée bc726e4da7 [MERGE] Sync with website-al 
bzr revid: tde@openerp.com-20131121120935-srk3s4qhxar0k5l5
 2013-11-21 13:09:35 +01:00
Thibault Delavallée 2693636989 [IMP] website_sale: improved checkout process 
- confirmation is now a page displaying a sale order, which polls on the
related transaction to have its status
- when receiving an incoming notification thorugh the acquirer controller
the sale order is updated, then the confirmation page is displayed
- this allows to have a confirmation page that is independant from the 
rest of the checkout process
- cleaned confirmation page, removed order details

bzr revid: tde@openerp.com-20131121120902-fm8b7u94gmepohgi
 2013-11-21 13:09:02 +01:00
Thibault Delavallée 3ee84c32d2 [IMP] payment_acquirer_transfer: better logging 
bzr revid: tde@openerp.com-20131121120745-1j7p7pl5u6yv1g20
 2013-11-21 13:07:45 +01:00
Thibault Delavallée bfc226c4ae [REM] payment_acquirer: removed name field, only using reference 
bzr revid: tde@openerp.com-20131121120722-uxjqdn5ibnrs0k10
 2013-11-21 13:07:22 +01:00
Christophe Simonis fc9c571bcd [FIX] fleet: inherits reference fields must be required. 
Note: there is no db schema change as orm was forcing these values.

bzr revid: chs@openerp.com-20131121120637-c5ufw20ck30hefr5
 2013-11-21 13:06:37 +01:00
Christophe Simonis 6f67143908 [FIX] *: do not call deprecated method LocalService() 
bzr revid: chs@openerp.com-20131121120611-06h1pki3460tzj1s
 2013-11-21 13:06:11 +01:00
ddm 56e19c374f [FIX] Avoid reserved keywords as method names 
bzr revid: ddm@openerp.com-20131121114922-w731pvjnnvqzxu42
 2013-11-21 12:49:22 +01:00
ddm 135345bf2a [IMP] Tour: better modal handling 
bzr revid: ddm@openerp.com-20131121113507-qmz5inlge2ixkib8
 2013-11-21 12:35:07 +01:00
Martin Trigaux 0a60ad5aee [MERGE] [FIX] sale: sale.order.line, remove duplicated state field that made the statusbar in the header to be incorrectly rendered (opw 598572) 
lp bug: https://launchpad.net/bugs/1233567 fixed

bzr revid: mat@openerp.com-20131121113304-kntnvmdmoll2n6hl
 2013-11-21 12:33:04 +01:00
Martin Trigaux b6b86f34f4 [MERGE] [FIX] stock: correctly recount quantity when split on multiple locations for product reservations (opw 600277) 
bzr revid: mat@openerp.com-20131121112321-fdttljrrogsbihf2
 2013-11-21 12:23:21 +01:00
ddm 77c60a94be [IMP] Tour: method names 
bzr revid: ddm@openerp.com-20131121112312-2n8kd2tja6upji3i
 2013-11-21 12:23:12 +01:00
ddm ec4372ac23 [IMP] Tour: better defaults 
bzr revid: ddm@openerp.com-20131121111102-l66jzdysdkqm7fje
 2013-11-21 12:11:02 +01:00