pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,505 Commits 1 Branch 0 Tags
fd6d4d8303563948cfdbde620f5ffdb06c6fa5c1
Commit Graph
65585 Commits
Author SHA1 Message Date
jke-openerp fd6d4d8303 [FIX] Set the good url redirect in "Sign In" button from the cart 
bzr revid: jke@openerp.com-20140130104937-6rjt51rg3o9bz90k
 2014-01-30 11:49:37 +01:00
jke-openerp ab8ee396ec [TYPO] Add space between icon and button in cart "Continue Shopping" 
bzr revid: jke@openerp.com-20140130094927-44b8szwtb602e180
 2014-01-30 10:49:27 +01:00
jke-openerp 7027ce6eda [REF] website_sale : Add missing widget option in recommanded product, to display image 
bzr revid: jke@openerp.com-20140130091813-hko16qlm4t8tmq37
 2014-01-30 10:18:13 +01:00
Christophe Simonis ec14f457c1 [FIX] website_event: correct ui test 
bzr revid: chs@openerp.com-20140129213621-ynbxys4hmw0avhaw
 2014-01-29 22:36:21 +01:00
Christophe Simonis 3d80e31012 [FIX] website: url_for() does not mess up anchor links 
bzr revid: chs@openerp.com-20140129195025-i2ey682o6marp8k1
 2014-01-29 20:50:25 +01:00
Christophe Simonis c202dc1c52 merge upstream 
bzr revid: chs@openerp.com-20140129190834-xfcat3ulfbg5omhn
 2014-01-29 20:08:34 +01:00
Christophe Simonis 947fe0da24 [FIX] calendar: use correct xmlid 
bzr revid: chs@openerp.com-20140129185229-d75g5fsv77468tih
 2014-01-29 19:52:29 +01:00
Christophe Simonis 731019154a [MERGE] forward port of branch saas-2 up to revid 9109 dle@openerp.com-20140129171022-wf6244k90lpncmah 
bzr revid: chs@openerp.com-20140129184703-ypd7iqnor5m5lr3d
 2014-01-29 19:47:03 +01:00
Christophe Matthieu 55fdaf0dd0 [FIX] website_sale: activate test tour 
bzr revid: chm@openerp.com-20140129175038-663iuxiv0os6f9xt
 2014-01-29 18:50:38 +01:00
Denis Ledoux 255fe082bd [FIX] website_membership: membership displayed order depending on website_sequence 
bzr revid: dle@openerp.com-20140129171554-h76n4579xquhdxxv
 2014-01-29 18:15:54 +01:00
Fabien Meghazi c4e48e2388 [REM] Removed auth='admin' from modules 
bzr revid: fme@openerp.com-20140129171520-wkz8ot4pa63utoi3
 2014-01-29 18:15:20 +01:00
Denis Ledoux 6cc096aebc [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9798 revid:dle@openerp.com-20140129163238-1s1t9oc814z4z7f3 
bzr revid: dle@openerp.com-20140129171022-wf6244k90lpncmah
 2014-01-29 18:10:22 +01:00
Olivier Dony e6e8bb3789 [IMP] website_*: remove useless % chars surrounding ilike operand, this is the default 
bzr revid: odo@openerp.com-20140129163557-0bb86mx8it57mcvi
 2014-01-29 17:35:57 +01:00
Frédéric van der Essen 64822bd188 [MERGE] hw_escpos: moving list of supported printers to a separate file 
bzr revid: fva@openerp.com-20140129163503-tvd69qd5u5nktjb9
 2014-01-29 17:35:03 +01:00
Frédéric van der Essen d88b10fd07 [IMP] hw_escpos: moved list of supported printers to a separate file 
bzr revid: fva@openerp.com-20140129163259-xdarcaw4qcqprvt6
 2014-01-29 17:32:59 +01:00
Denis Ledoux 08dfda9ec6 [FIX] purchase: on po confirm, avoid to write location_id on the chained stock move if the move is done 
On purchase order confirmation, if the order_line comes from a procurement order created by a sale order,
it tried to write on the location_id, whatever the move state was, even done.

Or, sometimes, the stock move associated to the procurement order (from the so) was already done, for example because we forced the availability of the stock move.
It makes sense to not write the location_id if the move is already done, because the location_id is already good.

bzr revid: dle@openerp.com-20140129163238-1s1t9oc814z4z7f3
 2014-01-29 17:32:38 +01:00
Olivier Dony a09fa10c49 [FIX] website_mail: useless and expensive DISTINCT 
bzr revid: odo@openerp.com-20140129162532-os3lzjyf87hg1ouc
 2014-01-29 17:25:32 +01:00
Olivier Dony 0ac11b430f [IMP] website_sale: spellchecking 
bzr revid: odo@openerp.com-20140129162331-sjmquzz172h9dkp4
 2014-01-29 17:23:31 +01:00
Christophe Matthieu b7f88a58fb [FIX] website:_mail: fix followers 
bzr revid: chm@openerp.com-20140129170829-abmv73xswzl6ccm9
 2014-01-29 18:08:29 +01:00
Antony Lesuisse 632c014b76 [FIX] fix werkzeug dependency on debian, misc changes 
- add an more friendly syntax for images /website/image/<model>/<id>/<field>
- reorder methods based on their use case
- move new page to /website namespace

bzr revid: al@openerp.com-20140129163809-d4z4f8t3h11n5ozv
 2014-01-29 17:38:09 +01:00
Frédéric van der Essen 83196be65e [MERGE] from trunk 
bzr revid: fva@openerp.com-20140129161802-14patbv206pqj68j
 2014-01-29 17:18:02 +01:00
Christophe Matthieu 499f9164b8 [FIX] website: tour banner 
bzr revid: chm@openerp.com-20140129161434-s5razyi3eqeq30vn
 2014-01-29 17:14:34 +01:00
Christophe Matthieu 876b61f42c [FIX] website: test tour and website_sale tour. Add ajax trigger to display popover when the ajax is complete and hmlt is loaded 
bzr revid: chm@openerp.com-20140129160839-ijdcnuiny6ys8z6p
 2014-01-29 17:08:39 +01:00
Fabien Meghazi f31ddba8b3 [MERGE] upstream 
bzr revid: fme@openerp.com-20140129153718-b86vsyogxkr8lk19
 2014-01-29 16:37:18 +01:00
Fabien Meghazi 9860ddd352 [REM] POS: Replaced auth="admin" by auth="none" 
bzr revid: fme@openerp.com-20140129153408-d8zkyty1rcvvzqx3
 2014-01-29 16:34:08 +01:00
openerp-sle be6b038fb7 [FIX] website_customer: removed redundant template 'customer_contact', fixed the country-filtering and avoid showing 'false' when partner has not website_short_description 
bzr revid: openerp-sle@openerp-sle.home-20140129150838-pj9hmexxl3sk89tp
 2014-01-29 16:08:38 +01:00
openerp-sle 4183310021 [FIX] website_blog: correct comments anchors 
bzr revid: openerp-sle@openerp-sle.home-20140129142034-6hl5s3vfzi5nuozj
 2014-01-29 15:20:34 +01:00
Martin Trigaux 3a07e0a012 [FIX] attachement: display error message (removed inexistant template) and redraw the window (to avoid getting stucked) 
bzr revid: mat@openerp.com-20140129141438-3883hhzdiwyoo19t
 2014-01-29 15:14:38 +01:00
Denis Ledoux a3b7279ff6 [FIX] account: set purchase analytic journal when creating purchase accounting journal 
bzr revid: dle@openerp.com-20140129140625-ywxraf0ix040a0b5
 2014-01-29 15:06:25 +01:00
Frédéric van der Essen 1f2900aa7c [MERGE] point_of_sale: regression fix 
bzr revid: fva@openerp.com-20140129133339-myxow8s1jyppg3zp
bzr revid: fva@openerp.com-20140129140026-87ehph86jx9ya263
 2014-01-29 15:00:26 +01:00
Frédéric van der Essen 4e73dce8d3 [FIX] point_of_sale: loading screen was not waiting until posbox connection 
bzr revid: fva@openerp.com-20140129135710-vobqzjyq12d7io3v
 2014-01-29 14:57:10 +01:00
Fabien Meghazi eff61fde93 [FIX] Support for older werkzeug versions 
bzr revid: fme@openerp.com-20140129135208-liewqaib50lwbbjy
 2014-01-29 14:52:08 +01:00
Denis Ledoux 905e92d81c [FIX] website_crm: contact us form create lead without salesteam and with channel 'Website' 
No sales team is assigned because:
1. This is not cleary explained anywhere that the sales team which will have the lead should have "Website" in its code.
2. Assigning the leads coming from the website to one specific sales team is not enough generic and does not cover all cases. For instance, assignation can be done on the customer country/language, not that it comes from the website.
3. The actual way to filter leads coming from the site is to assign the channel "Website" to the lead

bzr revid: dle@openerp.com-20140129134114-686ytvsck8osrzr9
 2014-01-29 14:41:14 +01:00
Frédéric van der Essen 7de8b5c615 [FIX] hw_scanner: do not use real keyboards as scanners, start driver thread on get status 
bzr revid: fva@openerp.com-20140129132408-fv56ihpz6cg3fi4n
 2014-01-29 14:24:08 +01:00
Frédéric van der Essen dff17307e2 [MERGE] from trunk 
bzr revid: fva@openerp.com-20140129132134-vw0hwk1573ippjyz
 2014-01-29 14:21:34 +01:00
Denis Ledoux dbcdbab2ba [FIX] website_event_track: fix speaker image not displayed once logged out 
bzr revid: dle@openerp.com-20140129130836-fnewn1u4r4odyzjj
 2014-01-29 14:08:36 +01:00
Denis Ledoux 0306adbfe3 [FIX] *: using werkzeug.url_encode instead of urllib.urlencode because urliblib.encode does not accept unicode 
bzr revid: dle@openerp.com-20140129121316-b5f5e4r6fz9l80kq
 2014-01-29 13:13:16 +01:00
Christophe Simonis 83345e4414 [MERGE] forward port of branch saas-2 up to revid 3899 chs@openerp.com-20140129095637-mbfz82r5pyz4dctc 
bzr revid: chs@openerp.com-20140129101004-44ft0oaeo201guhd
 2014-01-29 11:10:04 +01:00
Christophe Simonis acb010a985 [MERGE] forward port of branch 7.0 up to revid 4162 launchpad_translations_on_behalf_of_openerp-20140318062141-rdiqz2ptnz3qmxd0 
bzr revid: chs@openerp.com-20140129095637-mbfz82r5pyz4dctc
bzr revid: dle@openerp.com-20140210140818-5mtk1qhheo219bm1
bzr revid: dle@openerp.com-20140214114445-krexrwm9o2nrxepk
bzr revid: mat@openerp.com-20140219111353-cxo860z7ctz7om30
bzr revid: dle@openerp.com-20140221120519-1pj3wc8kqgkr5uda
bzr revid: chs@openerp.com-20140318112743-tqv492026y2pnbff
 2014-03-18 12:27:43 +01:00
Launchpad Translations on behalf of openerp a8d14c47df Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140318062141-rdiqz2ptnz3qmxd0
bzr revid: launchpad_translations_on_behalf_of_openerp-20140325072122-d9jgtji9dmmytg8d
 2014-03-25 07:21:22 +00:00
Denis Ledoux 04f632820b [FIX] sale: trigger signal manual invoice for make invoices wizard (not advance) 
bzr revid: dle@openerp.com-20140324103427-yckncrnynvs5si8i
 2014-03-24 11:34:27 +01:00
Simon Lejeune 245e83d43b [FIX] last version of wkhtmltopdf expects all file to have a doctype, inject one if not present 
bzr revid: sle@openerp.com-20140324101731-eqzqins3s8uak1yd
 2014-03-24 11:17:31 +01:00
Launchpad Translations on behalf of openerp 6472e4155a Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140322070453-bbx8zxmppthwar0s
bzr revid: launchpad_translations_on_behalf_of_openerp-20140323064412-l97e4rap18b68ab0
 2014-03-23 06:44:12 +00:00
Denis Ledoux 0871d10503 [FIX] survey: avoid duplicate partners on new users creation 
bzr revid: dle@openerp.com-20140321135705-lrnxu3gsnkt4r5cd
 2014-03-21 14:57:05 +01:00
Launchpad Translations on behalf of openerp 2fa6706037 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140321065150-vovy9a0q2y6vkwm4
 2014-03-21 06:51:50 +00:00
Kersten Jeremy 9bf6f0310e [FIX] Move default value in the _defaults of model and not in default_get. 
Don't override the location_id if the super get_default don't retrun a value. 

Else it is impossible to set a default value, because the ir_values is always overrided with stock_location_stock as location_id

bzr revid: jke@openerp.com-20140320180240-un42lptu3pjnsmxq
 2014-03-20 19:02:40 +01:00
Denis Ledoux be81326ee3 [FIX] survey: report not stored on filesystem 
bzr revid: dle@openerp.com-20140320174835-kdha7ivs64vsvizt
 2014-03-20 18:48:35 +01:00
Denis Ledoux 84eeb79875 [FIX] point_of_sale: add multi-companies rules on pos.config 
bzr revid: dle@openerp.com-20140320154436-ygqhvvyhe6otv70p
 2014-03-20 16:44:36 +01:00
Denis Ledoux 287aae3942 [FIX] stock: force form_view_ref to False in context of actions track_line and scrap_move to avoid context propagation of stock picking views 
bzr revid: dle@openerp.com-20140320110741-pg8se5c02p87yi1y
 2014-03-20 12:07:41 +01:00
Olivier Dony 42518c339a [FIX] subscription: missing required dependency on base 
bzr revid: odo@openerp.com-20140320091349-74zykqzf2ols3ja1
 2014-03-20 10:13:49 +01:00