pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
78,967 Commits 1 Branch 0 Tags
fe8a84f0c189f62db25a1c8f7a392b3ff4fa27a5
Commit Graph
78967 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Mathot (OpenERP) fe8a84f0c1 [IMP] Demo data for OpenERP pre-certification 
bzr revid: rim@openerp.com-20140107105348-faca9zwgzdoecrlg
 2014-01-07 11:53:48 +01:00
Richard Mathot (OpenERP) 0be1ecb053 [MERGE] Merge parents 
bzr revid: rim@openerp.com-20140107094428-h59k5y31u28tjsfe
 2014-01-07 10:44:28 +01:00
Thibault Delavallée b6517bd5bd [FIX] website_sale: product template 
- fixed link to comments
- fixed Comments title + comment form not visible if no previous discussion on the prodcut

bzr revid: tde@openerp.com-20140106171813-rolti0md6xaz1dxd
 2014-01-06 18:18:13 +01:00
Thibault Delavallée e4cdc02337 [FIX] portal_gamification: fixed references to group_portal in gamification. 
Indeed gamification is a new module that landed in trunk recently. It makes some
references to the portal group. However this group has been moved into the
base module in this website feature branch. The references have therefore
been updated.

bzr revid: tde@openerp.com-20140106165001-uqhxqztn1qq1urys
 2014-01-06 17:50:01 +01:00
Thibault Delavallée 1053f3c922 [IMP] website_sale: product website chatter: added a title-link for the comment section 
bzr revid: tde@openerp.com-20140106164434-4d0ddzc1okmfwgrd
 2014-01-06 17:44:34 +01:00
Richard Mathot (OpenERP) c2b21f9a50 [REM] unused garbage 
bzr revid: rim@openerp.com-20140106163142-3nt1gaecll19oc6b
 2014-01-06 17:31:42 +01:00
Richard Mathot (OpenERP) bae5922fb3 [FIX] Loading for demo data / data MUST be after security data 
bzr revid: rim@openerp.com-20140106163024-yasqg459966cz8ue
 2014-01-06 17:30:24 +01:00
Thibault Delavallée 0ee7ffe282 [MERGE] [IMP] shop: added openchatter on product shop 
- product.template now inherits from mail.thread
- added opencahtter on product.template form view
- added discussion thread + attachments in product website view
- added file_type field on ir_attachment, that replaces the javascript thing
from mail.js
- added a controller to comment a product.template
- added a css file for the openchatter embedded in the product website view

bzr revid: tde@openerp.com-20140106162706-v9a60ek6eazn9mm0
 2014-01-06 17:27:06 +01:00
Thibault Delavallée 3aaa474d3c [IMP] website_sale: website chatter: some styling on the attachments 
bzr revid: tde@openerp.com-20140106154358-z3anh1xpdkcmd7wm
 2014-01-06 16:43:58 +01:00
ddm@openerp.com b4b52bbcac [FIX] UI tests imps & fixes 
bzr revid: ddm@openerp.com-20140106153906-tvibq7wjrgflatd6
 2014-01-06 16:39:06 +01:00
Richard Mathot (OpenERP) 2984ef1620 [FIX] Apparence fix 
bzr revid: rim@openerp.com-20140106151510-6mts0k854b1x5tp8
 2014-01-06 16:15:10 +01:00
Richard Mathot (OpenERP) 9d69b2f702 [FIX] Small fixes 
bzr revid: rim@openerp.com-20140106151245-lump4flfquxuv1wu
 2014-01-06 16:12:45 +01:00
Christophe Matthieu 63e2da36a6 [FIX] website: some access right 
bzr revid: chm@openerp.com-20140106141817-2tf0dpfchi5x6kjw
 2014-01-06 15:18:17 +01:00
Thibault Delavallée 0b2d085c1b [IMP] shop: added openchatter on product shop 
- product.template now inherits from mail.thread
- added opencahtter on product.template form view
- added discussion thread + attachments in product website view
- added file_type field on ir_attachment, that replaces the javascript thing
from mail.js
- added a controller to comment a product.template

bzr revid: tde@openerp.com-20140106135727-uf0zaxav28pdx4sv
 2014-01-06 14:57:27 +01:00
Thibault Delavallée 49c0b7a820 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
 2014-01-06 14:57:00 +01:00
Christophe Matthieu c4c268c902 [FIX] website_event_track: link 
bzr revid: chm@openerp.com-20140106114144-ev9rwmb9zy9eal0c
 2014-01-06 12:41:44 +01:00
Christophe Matthieu c4ea06327c [FIX] website: typo 
bzr revid: chm@openerp.com-20140106103855-vjd6ro0w4m0xkfrc
 2014-01-06 11:38:55 +01:00
Richard Mathot (OpenERP) 169ce04a38 [IMP] New .po file for translations 
bzr revid: rim@openerp.com-20140106103743-nmoepjqizut0kb74
 2014-01-06 11:37:43 +01:00
Richard Mathot (OpenERP) 08c04d6199 [REF] moving cron to data 
bzr revid: rim@openerp.com-20140106084812-nbgc6o6rx8312wy9
 2014-01-06 09:48:12 +01:00
Richard Mathot (OpenERP) c42b345a90 [REF] Code cleaning 
bzr revid: rim@openerp.com-20140106084708-7yot3pjkfbezd6f8
 2014-01-06 09:47:08 +01:00
Richard Mathot (OpenERP) 194bf80e25 [REM] Code not in use anymore 
bzr revid: rim@openerp.com-20140106082749-nykxi9jjxxycz6h2
 2014-01-06 09:27:49 +01:00
Richard Mathot (OpenERP) 56e98c95b5 [IMP] introducing new fields for quizz mode 
bzr revid: rim@openerp.com-20140106074838-8jzhwk5tbdlq7h1a
 2014-01-06 08:48:38 +01:00
Launchpad Translations on behalf of openerp ced63415b7 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140103054140-sxa6ru24qvhgz2ve
bzr revid: launchpad_translations_on_behalf_of_openerp-20140104054255-7o6b0x7c1vifv0do
bzr revid: launchpad_translations_on_behalf_of_openerp-20140105052647-pckbu2ehnp5l8217
 2014-01-05 05:26:47 +00:00
Richard Mathot (OpenERP) 30b5812804 [MERGE] Merge parents 
bzr revid: rim@openerp.com-20140103103556-5ojxni88p931053d
 2014-01-03 11:35:56 +01:00
ddm a408924315 [FIX] Snippets placed below editor bar 
bzr revid: ddm@openerp.com-20140102171825-208jw33qlmwj05fd
 2014-01-02 18:18:25 +01:00
Richard Mathot (OpenERP) 6e3ff8f109 [REF] Code cleaning 
bzr revid: rim@openerp.com-20140102160442-yqkpap3zgxpzoxc0
 2014-01-02 17:04:42 +01:00
ddm 0e430008bd [IMP] Added blog UI test 
bzr revid: ddm@openerp.com-20140102151115-16mlisduee7zav6g
 2014-01-02 16:11:15 +01:00
Richard Mathot (OpenERP) 140fac1294 [IMP] GUI small trick 
bzr revid: rim@openerp.com-20140102133906-lney9mnvu1e3w5eq
 2014-01-02 14:39:06 +01:00
Thibault Delavallée 2488f78e6d [FORWARD] Forward port of latest saas-2 fixes, until revision 9062 (revid tde@openerp.com-20140102124143-m1qv8koovjcl8mah) 
bzr revid: tde@openerp.com-20140102133028-xhvkzstqy5t8dquh
 2014-01-02 14:30:28 +01:00
Richard Mathot (OpenERP) 39d2f2c685 [MERGE] Merge parents 
bzr revid: rim@openerp.com-20140102132449-bnao4rhjnz4wi5uh
 2014-01-02 14:24:49 +01:00
Richard Mathot (OpenERP) 313dd2a49e [IMP] Demo data (wip) 
bzr revid: rim@openerp.com-20140102132415-iipu8f7gkjvvf07q
 2014-01-02 14:24:15 +01:00
Richard Mathot (OpenERP) f65cea1eea [FIX] 
bzr revid: rim@openerp.com-20140102132357-rxflsg8esa13xlmr
 2014-01-02 14:23:57 +01:00
Thibault Delavallée 5e7fdb5bcc [MERGE] [IMP] hr: changed some pictures of employees in demo data to avoid copyright issues 
bzr revid: tde@openerp.com-20140102125858-b2r3mntmj5uu15nl
 2014-01-02 13:58:58 +01:00
Thibault Delavallée c243854aae [FIX] account_anglo_saxon: fixed yml tests using an hardocded year instead of the current year. 
bzr revid: tde@openerp.com-20140102124143-m1qv8koovjcl8mah
 2014-01-02 13:41:43 +01:00
Thibault Delavallée 737be08fbf [MERGE] account: cash register view improvements 
- now looking like cash control methods from the point of sale module.

point of sale: improved some tooltips + cash control form view improvements

bzr revid: tde@openerp.com-20140102113009-lb1vv2w3g4dz2oqw
 2014-01-02 12:30:09 +01:00
ddm c71318e342 [FIX] UI test runner snafu 
bzr revid: ddm@openerp.com-20140102103629-r6sjvevgsihricte
 2014-01-02 11:36:29 +01:00
Richard Mathot (OpenERP) 53991002b1 [MERGE] Merge parents 
bzr revid: rim@openerp.com-20140102075714-wdj7669dmxhbou13
 2014-01-02 08:57:14 +01:00
Richard Mathot (OpenERP) 19579b04d6 [REF] Code cleaning 
bzr revid: rim@openerp.com-20140102075652-d1sih1x42jt9dgv1
 2014-01-02 08:56:52 +01:00
Richard Mathot (OpenERP) 35646da49d [REM] Removing unused old code 
bzr revid: rim@openerp.com-20131231150447-flcpsnl6mjm99yt2
 2013-12-31 16:04:47 +01:00
Richard Mathot (OpenERP) a67631c934 [IMP] Security rules for user inputs 
bzr revid: rim@openerp.com-20131231144735-5v7dm5ya9ovmy8nu
 2013-12-31 15:47:35 +01:00
ddm 8baadbd7b1 [IMP] code cleanup + comments 
bzr revid: ddm@openerp.com-20131231142824-rxyge2oupzaym6mh
 2013-12-31 15:28:24 +01:00
Martin Trigaux 0bd968a801 [MERGE] [FIX] ir_translation: backport of rev 5018 from trunk 
rename method load to load_module_terms to avoid name clash with load call from base_import (opw 602531)

bzr revid: mat@openerp.com-20131231140358-ldh0snu9zmcs3tpw
 2013-12-31 15:03:58 +01:00
ddm 4d24f84615 [IMP] Ensure correct parsing 
bzr revid: ddm@openerp.com-20131231132100-jdddbzx2tzpiqmgi
 2013-12-31 14:21:00 +01:00
ddm 14cc067b4a [IMP] Mini code cleanup 
bzr revid: ddm@openerp.com-20131231131842-pzaqildephzp69xj
 2013-12-31 14:18:42 +01:00
Richard Mathot (OpenERP) 522b8ca196 [IMP] Security rules 
bzr revid: rim@openerp.com-20131231110914-bz4njdxfqpjv3do4
 2013-12-31 12:09:14 +01:00
ddm f3ef0e15ff [FIX] Fixed popovers in product tour 
bzr revid: ddm@openerp.com-20131231104153-fy4sr9d7e0vwlef7
 2013-12-31 11:41:53 +01:00
ddm 0753a436b3 [FIX] Fixed popovers in blog tour 
bzr revid: ddm@openerp.com-20131231103436-4i70wc0mffbhrujx
 2013-12-31 11:34:36 +01:00
ddm 3a8cc41c8e [FIX] Fixed popovers in event tour 
bzr revid: ddm@openerp.com-20131231102916-et2mbmtym6mm604s
 2013-12-31 11:29:16 +01:00
ddm 7b5f713c93 [FIX] Fixed popovers in banner tour 
bzr revid: ddm@openerp.com-20131231101338-91q7yt5d62joldwd
 2013-12-31 11:13:38 +01:00
Richard Mathot (OpenERP) 9f94714a33 [MERGE] Merge parents 
bzr revid: rim@openerp.com-20131231085543-c5btm7anb4n0gzgv
 2013-12-31 09:55:43 +01:00