Commit Graph
65936 Commits
Author SHA1 Message Date
Gery Debongnie 5a2ddfdf80 [FIX] forces an update when the user switches back to the graph view, to make sure the data displayed are up to date (graph view, addon web_graph)
bzr revid: ged@openerp.com-20131226123449-qjm7hvkhfsdvi7pw
2013-12-26 13:34:49 +01:00
Thibault Delavallée 327f0fdb40 [MERGE] [FIX] sale_stock: invoice services when invoicing on delivery order
bzr revid: tde@openerp.com-20131226100605-wk4nht7msupkyuj9
2013-12-26 11:06:05 +01:00
Launchpad Translations on behalf of openerp 61962e42b0 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131225063515-dusvptjej0lwd8g5
bzr revid: launchpad_translations_on_behalf_of_openerp-20131226062501-h5l10yzkfldlxfra
2013-12-26 06:25:01 +00:00
Martin Trigaux aba5888a34 [MERGE] [ADD] gamification
New modules gamification, hr_gamification, gamification_sale_crm, portal_gamification.

Merry Christmas OpenERP

bzr revid: mat@openerp.com-20131224155138-3bbp8m3gyrfsb3ni
2013-12-24 16:51:38 +01:00
Martin Trigaux a42bf998e2 [MERGE] sync with trunk
bzr revid: mat@openerp.com-20131224154340-pwtp292xac5eodci
2013-12-24 16:43:40 +01:00
Gery Debongnie d145c7a8c4 [IMP] displays a nice message when the graph view has no data to display (addon web_graph)
bzr revid: ged@openerp.com-20131224153735-on6cx12v7x2r1ln0
2013-12-24 16:37:35 +01:00
Martin Trigaux 90ebde3676 [FIX] gamification: remove old calls to action_close
bzr revid: mat@openerp.com-20131224152902-i2ozrf41y1ou2vdm
2013-12-24 16:29:02 +01:00
Martin Trigaux 13bfaef3a3 [FIX] gamification: remove old calls to action_start
bzr revid: mat@openerp.com-20131224151543-oofn9wc2w3933gjy
2013-12-24 16:15:43 +01:00
Frédéric van der Essen 5a8040d909 [MERGE] from trunk
bzr revid: fva@openerp.com-20131224151318-hw70xl6vfxckf412
2013-12-24 16:13:18 +01:00
Thibault Delavallée c1fb818999 [REV] Reverted commit 10363
bzr revid: tde@openerp.com-20131224151201-g8luax3t431t7ky4
2013-12-24 16:12:01 +01:00
Frédéric van der Essen e95ea35caa [IMP] hw_escpos: company logo on receipt and multi-lingual receipt support
bzr revid: fva@openerp.com-20131224151112-3svn5wm1wyf71wim
2013-12-24 16:11:12 +01:00
Martin Trigaux 58994713d8 [FIX] gamification: move template block before challenge declaration
bzr revid: mat@openerp.com-20131224150549-uafyr7lyva3u9k8n
2013-12-24 16:05:49 +01:00
Thibault Delavallée dfd52bfc2c [FIX] website_sale: fixed several access rights issue related to public user + billing / shipping partner_id of sale order badly set, retrieved and displayed in the checkout process
bzr revid: tde@openerp.com-20131224145845-q6255ll7n8wy0syv
2013-12-24 15:58:45 +01:00
Martin Trigaux ff83d9eb4d [FIX] gamification: remove import data, add trackvisibility on challenge instead of sending message
bzr revid: mat@openerp.com-20131224145449-93b3z97lagu12yri
2013-12-24 15:54:49 +01:00
Martin Trigaux be7bc54edc [REF] gamification: use m2o to email.template for report progress, create new field report_template_id, cleaning code
bzr revid: mat@openerp.com-20131224144514-lmbhw88nj7aa3r8i
2013-12-24 15:45:14 +01:00
Martin Trigaux 25117ca97f [REF] gamification: use statusbar instead of action buttons
bzr revid: mat@openerp.com-20131224141140-vc0v5lpm0ivfl6i4
2013-12-24 15:11:40 +01:00
Gery Debongnie 69f6efa000 [IMP] hides controls (stacked/grouped) in graph view when they are useless (i.e., when there's only one dimension which can't be stacked/grouped (addon web_graph)
bzr revid: ged@openerp.com-20131224140942-w0dwy3ck6yslbhxy
2013-12-24 15:09:42 +01:00
Martin Trigaux 22a291d47a [REF] gamification: use sass files instead of native css
bzr revid: mat@openerp.com-20131224134405-9k4potbzq7ea20p4
2013-12-24 14:44:05 +01:00
Fabien Pinckaers 992830d773 [IMP] better snippets
bzr revid: fp@tinyerp.com-20131224131201-f1wplq1g324g3y2q
2013-12-24 14:12:01 +01:00
Fabien Pinckaers 147dc3b423 [IMP] wording
bzr revid: fp@tinyerp.com-20131224130914-3mrrzpdirpimu3fa
2013-12-24 14:09:14 +01:00
Fabien Pinckaers 571735c8d2 [IMP] wording
bzr revid: fp@tinyerp.com-20131224130810-ej5fnh2yridfq894
2013-12-24 14:08:10 +01:00
Martin Trigaux aefd64e8cf [REF] gamification: compute_code is now similar to ir.actions, cleanup code
bzr revid: mat@openerp.com-20131224130023-e4gc91ell38zdtfj
2013-12-24 14:00:23 +01:00
Denis Ledoux 1508c5dd00 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9718 rev-id: dle@openerp.com-20131224103535-rhtje7dnq1ie7jtb
bzr revid: tde@openerp.com-20131220162158-hbgktly09dv37958
bzr revid: dle@openerp.com-20131223155041-8zp8e08fihbr0ie2
bzr revid: dle@openerp.com-20131224112407-aw6dq2q92312kjbk
2013-12-24 12:24:07 +01:00
Gery Debongnie 457090c1a3 [REF] removes some useless variables and some other cleaning to please jshint (addon web_graph)
bzr revid: ged@openerp.com-20131224112224-q1o0hmp1s2ryi9bn
2013-12-24 12:22:24 +01:00
Denis Ledoux 7bb4f6da82 [FIX]web: status bar alignment, sometimes wrong on google chrome
bzr revid: dle@openerp.com-20131224112201-0zlxa6fevvj3501h
2013-12-24 12:22:01 +01:00
ddm fe1ecaa9bc Disable until fixed
bzr revid: ddm@openerp.com-20131224105210-4k6hu0ym0mvg3nih
2013-12-24 11:52:10 +01:00
Denis Ledoux d1b4aa974d [FIX] account_voucher: computed writeoff and invoices selected were not right on partial invoice payment in account voucher wizard.
Due to the algorithm which did not handle the fact that an invoice could have several move lines

bzr revid: dle@openerp.com-20131224103535-rhtje7dnq1ie7jtb
2013-12-24 11:35:35 +01:00
Gery Debongnie 50f183d4ed [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon stock)
bzr revid: ged@openerp.com-20131224102950-kz77cndltvqinzmr
2013-12-24 11:29:50 +01:00
Gery Debongnie ae13bea0d8 [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon sale)
bzr revid: ged@openerp.com-20131224102942-5g4gchmgyloo2s06
2013-12-24 11:29:42 +01:00
Gery Debongnie e6c2dd738b [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon project)
bzr revid: ged@openerp.com-20131224102922-g7nbwftaktd4g2v4
2013-12-24 11:29:22 +01:00
Gery Debongnie def9e99aa4 [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon mrp_operations)
bzr revid: ged@openerp.com-20131224102909-cxweo8yyo67bt7su
2013-12-24 11:29:09 +01:00
Gery Debongnie b569c6de23 [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon membership)
bzr revid: ged@openerp.com-20131224102846-ul5tyji72ai5sesb
2013-12-24 11:28:46 +01:00
Gery Debongnie 2793a41cd4 [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon hr_recruitment)
bzr revid: ged@openerp.com-20131224102827-of7l5cds4t25g17z
2013-12-24 11:28:27 +01:00
Gery Debongnie bb5a2662c8 [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon hr_holidays)
bzr revid: ged@openerp.com-20131224102813-l818l4lp6ml5164i
2013-12-24 11:28:13 +01:00
Gery Debongnie 48196bcad5 [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon hr_evaluation)
bzr revid: ged@openerp.com-20131224102758-nrt1i8kv6y1bpl21
2013-12-24 11:27:58 +01:00
Gery Debongnie 7e6a3a7b79 [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon fleet)
bzr revid: ged@openerp.com-20131224102735-hvwlr0kcnb5tp9lx
2013-12-24 11:27:35 +01:00
Gery Debongnie 6e651f2b05 [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon event)
bzr revid: ged@openerp.com-20131224102719-69fmb4wc1zccjtfx
2013-12-24 11:27:19 +01:00
Gery Debongnie 323226ff3a [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon crm_claim)
bzr revid: ged@openerp.com-20131224102706-wgwmx711355g2xmj
2013-12-24 11:27:06 +01:00
Gery Debongnie 6474a028d2 [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon crm)
bzr revid: ged@openerp.com-20131224102650-rbekdotddbgfylcp
2013-12-24 11:26:50 +01:00
Gery Debongnie 9edecec48f [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon account)
bzr revid: ged@openerp.com-20131224102631-gca1kk3xfh48d4bp
2013-12-24 11:26:31 +01:00
Thibault Delavallée f6e83a5474 [FIX] payment_acquirer_adyen: fixed return controller, that can be contacted using a GET method
bzr revid: tde@openerp.com-20131224102536-0olgbqwkqo4t5o0c
2013-12-24 11:25:36 +01:00
Gery Debongnie db9cdb7eb0 [IMP] makes some small changes to improves backward compatibility in some edge cases (takes the first 'operator' as a measure instead of the last, ...) in graph view (addon web_graph)
bzr revid: ged@openerp.com-20131224100942-jnrdjeb9lg7rx8d2
2013-12-24 11:09:42 +01:00
Thibault Delavallée f5f055340f [MERGE] Merged demo homepage improvements
bzr revid: tde@openerp.com-20131224100630-x0r20pj1v2y1g5pg
2013-12-24 11:06:30 +01:00
ddm eb9aa9ca3b [IMP] Code cleanup
bzr revid: ddm@openerp.com-20131224084326-j2mbcq90pc5hvezi
2013-12-24 09:43:26 +01:00
Fabien Pinckaers 6f2e3e118f [IMP] CSS fix for statusbar misaligned
bzr revid: fp@tinyerp.com-20131224082157-o2ncgd7rsd0tpd18
2013-12-24 09:21:57 +01:00
Launchpad Translations on behalf of openerp 87aae0efca Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131224055213-dm6b0zx4e0fn18ex
2013-12-24 05:52:13 +00:00
Paramjit Singh Sahota 18d8368ee1 [MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-website-al
bzr revid: psa@tinyerp.com-20131224053125-3lrogsrgd3ccp0i6
2013-12-24 11:01:25 +05:30
Fabien Pinckaers 123185757f [IMP] wording
bzr revid: fp@tinyerp.com-20131223173304-mvetk8b2494hup93
2013-12-23 18:33:04 +01:00
ddm 7c695446b8 bzr revid: ddm@openerp.com-20131223165708-3fz1mk6s9bmlvxka 2013-12-23 17:57:08 +01:00
ddm 2648d55033 [IMP] Refactor UI test code for reusability
bzr revid: ddm@openerp.com-20131223165113-kx4aalzs6las1m2z
2013-12-23 17:51:13 +01:00