Commit Graph
81595 Commits
Author SHA1 Message Date
Kersten Jeremy 47d7045f76 [FIX] Move bootstrap.css outside from the single css file generate.
Without that, OpenERP become unusable in IE due to the follows limitations:
   - All style tags after the first 31 style tags are not applied.
   - All style rules after the first 4,095 rules are not applied.
   - On pages that uses the @import rule to continously import external style sheets that import other style sheets, style sheets that are more than three levels deep are ignored.
  (http://support.microsoft.com/kb/262161/en)

bzr revid: jke@openerp.com-20140307174411-hejt3x324nlv6tjr
2014-03-07 18:44:11 +01:00
chm@openerp.com d037df50e5 [FIX] website_sale: grid view don't display empty cells
bzr revid: chm@openerp.com-20140307161922-ph7vq7zfw5qvisi4
2014-03-07 17:19:22 +01:00
chm@openerp.com 3195913272 [FIX] website_sale: grid view don't display empty cells
bzr revid: chm@openerp.com-20140307153718-2nlw8mtntfkm7ehu
2014-03-07 16:37:18 +01:00
chm@openerp.com 69237e1c8e [FIX] website_sale: test tour: button in checkout must contains 'Confirm' because for running with public user
bzr revid: chm@openerp.com-20140307142825-lrhnzl32u4ex7l0s
2014-03-07 15:28:25 +01:00
chm@openerp.com dfc428a6a1 [FIX] website_sale: Remove the oe_shadow from product Description; fix description editing; fix resize shopping cart.
bzr revid: chm@openerp.com-20140307134551-kxxp703sgep5eacv
2014-03-07 14:45:51 +01:00
chm@openerp.com 592890e24b [FIX] website_event_sale: tour button to .btn selector
bzr revid: chm@openerp.com-20140307133758-6g6cve5rkr09xsrm
2014-03-07 14:37:58 +01:00
chm@openerp.com 0560bd631a [TYPO] website: snippet Style Readability rename into Narrow
bzr revid: chm@openerp.com-20140307132247-k442d541jqti8yqv
2014-03-07 14:22:47 +01:00
chm@openerp.com e5f1cb5a4e [FIX] website: allow fixed size of a slider with 3 slides of distinct size => add resize option on slider
bzr revid: chm@openerp.com-20140307132213-tg3jl2mybbpd0kg3
2014-03-07 14:22:13 +01:00
Kersten Jeremy 9f23642476 [FIX] Change 'Administration' to 'My Account' to switch between website and portal - backend and frontend
bzr revid: jke@openerp.com-20140307131017-nhqlnhnsgeprtblc
2014-03-07 14:10:17 +01:00
chm@openerp.com c0d20af756 [FIX] Fix bug where button with contenteditable does not work in cross browser. Fix : replace tag 'button' by 'a' with class 'a-submit'; forgotten part
bzr revid: chm@openerp.com-20140307125141-gfvnwq0rnjyqbbvp
2014-03-07 13:51:41 +01:00
chm@openerp.com ce2b3215ab [FIX] website_event: tour does not run at installation
bzr revid: chm@openerp.com-20140307122951-al082ryupj64xk35
2014-03-07 13:29:51 +01:00
Kersten Jeremy 449dd4638d [FIX] Replace srcElement into target in JS from calendar, because Firefox does not support srcElement
bzr revid: jke@openerp.com-20140307122617-26756dgeeuqs168i
2014-03-07 13:26:17 +01:00
chm@openerp.com f3f170ec6d [FIX] Fix bug where button with contenteditable does not work in cross browser. Fix : replace tag 'button' by 'a' with class 'a-submit'
bzr revid: chm@openerp.com-20140307122223-5ka2xiiibqmzqshv
2014-03-07 13:22:23 +01:00
chm@openerp.com 0a85dc580b [FIX] website tour: change tour to use the features widget instead of the 3 columns one; fix 'Customize banner's text' step.
bzr revid: chm@openerp.com-20140307111314-3lklte4vzz8smgc4
2014-03-07 12:13:14 +01:00
chm@openerp.com 9a6dfe1b54 [FIX] website: test tour shop_buy_product
bzr revid: chm@openerp.com-20140307105727-zm6bok7wbr6u0f6f
2014-03-07 11:57:27 +01:00
chm@openerp.com 23eca80556 [MERGE] from trunk
bzr revid: chm@openerp.com-20140307104233-fqz4jwzf5yj6jtm2
2014-03-07 11:42:33 +01:00
chm@openerp.com 0b92d30081 [FIX] Replace t-esc in t-field for amount_untaxed in checkout of website_sale. Else display monetary does not work
bzr revid: chm@openerp.com-20140307103702-lsfj0iehm5kg4z29
2014-03-07 11:37:02 +01:00
Kersten Jeremy e8e1cf2d2f [FIX] Fix route of controller to post a comment from a product page
bzr revid: jke@openerp.com-20140307103038-rc5rdaa7ottpjgz1
2014-03-07 11:30:38 +01:00
Kersten Jeremy 590b50f548 [FIX] Compare the real pathname with the new url and not the object windows.location
bzr revid: jke@openerp.com-20140305164321-xw05yeun302rizm4
2014-03-05 17:43:21 +01:00
Olivier Dony 2cf5d26b1a [FIX] auth_signup: autofocus second field in signup form if login is already filled in
bzr revid: odo@openerp.com-20140306210835-82auwdf2aal3a25x
2014-03-06 22:08:35 +01:00
Denis Ledoux 6f12f4ba67 [FIX] crm: lead_to_opp wizard, use email address to find duplicated lead in single convert lead to opp
bzr revid: dle@openerp.com-20140306143621-z5mgcl2cm7kn6we0
2014-03-06 15:36:21 +01:00
Denis Ledoux c11db79d57 [MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9141 revid:dle@openerp.com-20140306123937-sn61atwvbcjwbyup
bzr revid: dle@openerp.com-20140306124247-29dgpb0ap5j0vsk0
2014-03-06 13:42:47 +01:00
Denis Ledoux cfe28b8b2f [FIX] account_followup: surround pre tags with para tags to avoid text being partially hidden in the followup report if the text is too long
bzr revid: dle@openerp.com-20140306123937-sn61atwvbcjwbyup
2014-03-06 13:39:37 +01:00
Denis Ledoux 6deae9e9ea [FIX] *: replace various widgets selection by option no_create, as the purpose of these widgets selection were to actually hide the create and edit and quick create
bzr revid: dle@openerp.com-20140306113021-r280g41vkdyf5ew8
2014-03-06 12:30:21 +01:00
Denis Ledoux 78c3646747 [FIX] payment,portal_sale: display payment acquirers of the company of the sale order/invoice
bzr revid: dle@openerp.com-20140306105514-lp0lu6jq955aofv4
2014-03-06 11:55:14 +01:00
Denis Ledoux 6a1e65b561 [FIX] crm: crm_to_lead tests, force assignation, to check round robin
bzr revid: dle@openerp.com-20140306092330-wuhfw36f3xpwdy4d
2014-03-06 10:23:30 +01:00
Olivier Dony 07fbbe288c [MERGE] Forward-port of 7.0 bugfixes, up to rev. 5251 revision-id: odo@openerp.com-20140304152927-havybom9x1jgdzae
bzr revid: odo@openerp.com-20140305213115-w55dqs3xra6ejmni
2014-03-05 22:31:15 +01:00
Denis Ledoux 83a4374363 [FIX] crm: lead_to_opp, do not force assignation in mass convert with deduplication (to prevent change the salesman of an existing opp), + fix get duplicated lead, now based on probability of stage instead of probability of the opp itself
bzr revid: dle@openerp.com-20140305164016-432vz5axo5l4wqko
2014-03-05 17:40:16 +01:00
Kersten Jeremy f7058f9b64 [TYPO] Typo on tooltip of payment columns
bzr revid: jke@openerp.com-20140305163737-dd26k3t4hi0ng93g
2014-03-05 17:37:37 +01:00
Kersten Jeremy b651a86340 [FIX] Fix action url from res_config to configure action_payment_acquirer
bzr revid: jke@openerp.com-20140305161925-z3uy18jllfmcod8p
2014-03-05 17:19:25 +01:00
Kersten Jeremy 322b924a13 [IMP] Custom the payment_acquirer html field in css of its own module and not in web/base.saas
bzr revid: jke@openerp.com-20140305161647-s27kplpnjg1usikg
2014-03-05 17:16:47 +01:00
Kersten Jeremy bd90911698 [FIX] Replace overflow scroll into overflow auto by default
bzr revid: jke@openerp.com-20140305142849-5ustm55y0qp4k5hm
2014-03-05 15:28:49 +01:00
chm@openerp.com 8df09c6c6a [FIX] website: snippet: display image editor button in snippet. Don't remove overlay (editor is used to clean snippets for save view)
bzr revid: chm@openerp.com-20140305132422-sfmlq8giol53rqjm
2014-03-05 14:24:22 +01:00
Thibault Delavallée 3a576a47b9 [MERGE] [UPD] [FIX] Update the cleditor library from 1.3.0 to 1.4.4. This version notably fixes some bugs when using IE 9.
(Monkey) Patches done on the version 1.3 have been applied on this version as well to avoid having regression. The saas-3 commits linked to those (monkey) patches are :
- 3328: original commit by chm: [FIX] cleditor: When the DOM is modify, the event resize try to call refresh and refresh has not DOM available. Correction : If the DOM as no prent, don't call refresh.
- 3664 (7.0 forward port): commit 1 by fme: [FIX] html widget: fix cleditor width when the field was invisible before becoming editable + commit 2 by tde: [IMP] cleditor: stop using custom font-size, font-family.
- 3755 (saas-1 forward port): commit by msh: [FIX]Fixed the issue of cleditor, on window resize blur event not triggered except firefox so due to which value disappears from the container.

bzr revid: tde@openerp.com-20140305121828-0zwx3qfecx7hmnj2
2014-03-05 13:18:28 +01:00
Denis Ledoux 80ba313bbe [FIX] base: qweb display correct traceback on exception
bzr revid: dle@openerp.com-20140305110435-ekhperp8jwusrzu0
2014-03-05 12:04:35 +01:00
Denis Ledoux b38245d6cb [FIX] product: price_get_multi raise if there is no active pricelist version (same behavior than before the pricelist computation factoring)
bzr revid: dle@openerp.com-20140305110314-pgiotwksjmdt63zm
2014-03-05 12:03:14 +01:00
Thibault Delavallée 5c45aac7ef [IMP] [MONKEY] Re-apply changes introduced at version 3755.
This commit was a forward-pord of saas-1 commits.
Commit by msh
[FIX]Fixed the issue of cleditor, on window resize blur event not triggered except firefox so due to which value disappears from the container.

bzr revid: tde@openerp.com-20140305105922-cqw9vrvk306jynco
2014-03-05 11:59:22 +01:00
Thibault Delavallée cc23ddd0ce [IMP] [MONKEY] Re-apply changes introduced at version 3664 that was
a forward port of 7.0 commits.
Commit 1 by fme.
[FIX] html widget: fix cleditor width when the field was invisible before becoming editable
Commit 2 by tde.
[IMP] cleditor: stop using custom font-size, font-family.

bzr revid: tde@openerp.com-20140305105751-w1i47ytx73ac5gkr
2014-03-05 11:57:51 +01:00
Thibault Delavallée 17a23c60b8 [IMP] [MONKEY] Re-apply changes introduced at version 3328.
Original commit by chm.

[FIX] cleditor: When the DOM is modify, the event resize try to call refresh and refresh has not DOM available. Correction : If the DOM as no prent, don't call refresh.

bzr revid: tde@openerp.com-20140305105455-1ewix4pm9m5ob1bm
2014-03-05 11:54:55 +01:00
Thibault Delavallée bff34f4014 [DUMMY] Void commit with a space change, because this cause a crash in bazaar.
bzr revid: tde@openerp.com-20140305104931-xnftljkziznsi9qq
2014-03-05 11:49:31 +01:00
Denis Ledoux 6d97f74963 [FIX]event: speaker_id field removed from report, thus the group by speaker_id should be removed too from the search view
bzr revid: dle@openerp.com-20140305101737-uh22w2jo6engblvb
2014-03-05 11:17:37 +01:00
Paramjit Singh Sahota a64ed6673c [MERGE] Merged lp:~openerp/openerp-web/saas-3
bzr revid: psa@tinyerp.com-20140305050903-8n1prme78ou7n2h2
2014-03-05 10:39:03 +05:30
Paramjit Singh Sahota 97cff89b3d [REM] REmoved the jquery.cleditor.min.js for the lib.
bzr revid: psa@tinyerp.com-20140305050612-8z0jpohvg026l2xi
2014-03-05 10:36:12 +05:30
Denis Ledoux a76cedfee3 [FIX] base: widget selection changed its behavior in saas-3
_search overwritten in res_company to allow user to change of company among its allowed companies is not usefull anymore, name_search is now the method to overwrite.
moreover, widget selection replaced by options no_create in user preferenes view, to allow typing in the many2one(for searching purpose) without having the option to create a new company or edit.

bzr revid: dle@openerp.com-20140304175231-ojhzqecrdkjg2w52
2014-03-04 18:52:31 +01:00
Denis Ledoux 1761704af2 [FIX] web: view form fieldselection, use name_search instead of cascading search and name_get
One rpc call won
Moreover, res_company in server overwrite name_search for company field in res users preferences, to display all allowed companies of the user, and not just the one allowed by record rules, so the user can change to the companies he is allowed to.

bzr revid: dle@openerp.com-20140304173838-c7uimmey8gvi3b64
2014-03-04 18:38:38 +01:00
Thibault Delavallée de37ea15ac [MERGE] [FIX] website_sale: effectively send the email of a draft or confirmed quotation on the ecommerce after payment. Having the action is not sufficient, we have to trigger it manually. We do this by creating and sending a mail.compose.message, like what is done manually on a quotation when using the 'Send by email' button.
bzr revid: tde@openerp.com-20140304161659-9ueka2y4ctfk4okv
2014-03-04 17:16:59 +01:00
Denis Ledoux 40b1ab36bb [FIX] crm: convert lead to opp wizard, on change salesman choose default salesteam if any
bzr revid: dle@openerp.com-20140304154442-o2zvun8ehv2ro6dl
2014-03-04 16:44:42 +01:00
Thibault Delavallée 6924171964 [FIX] website_sale: effectively send the email of a draft
or confirmed quotation on the ecommerce. Having the action is not sufficient
we have to trigger it manually.

bzr revid: tde@openerp.com-20140304154433-t9mo6bzsesx7z613
2014-03-04 16:44:33 +01:00
Olivier Dony b79a33aefc [FIX] orm.read_group: improve test coverage and corner case handling:
- allow leading spaces in orderby spec for m2o columns
- extra test for read_group on multiple columns
- proper handling of groupby on numeric column with default order

bzr revid: odo@openerp.com-20140304152927-havybom9x1jgdzae
2014-03-04 16:29:27 +01:00
Thibault Delavallée 1802496c9f [FIX] website_sale: fixed wrong method name, sale_reset_order is not defined anymore
bzr revid: tde@openerp.com-20140304143426-0eaec0sr6y4ogta9
2014-03-04 15:34:26 +01:00