Commit Graph
73264 Commits
Author SHA1 Message Date
Frédéric van der Essen 3c44559811 [IMP] point_of_sale: reduced the weighting probe interval, and put a non zero default value for easier testing
bzr revid: fva@openerp.com-20130712123455-whp86jp9qbmo6p0o
2013-07-12 14:34:55 +02:00
Frédéric van der Essen 16d3b79dfd [MERGE] from upstream
bzr revid: fva@openerp.com-20130712121148-0ys14v8jc33t6sf5
2013-07-12 14:11:48 +02:00
niv-openerp 17db55200b [IMP] Modified the way the sessions are handled to easily work with or without cookies
bzr revid: nicolas.vanhoren@openerp.com-20130712120727-z1hj46m7m807nal1
2013-07-12 14:07:27 +02:00
Frédéric van der Essen a8ea08cf28 [MERGE] from upstream
bzr revid: fva@openerp.com-20130712100516-mk14z6zqebdje3ud
2013-07-12 12:05:16 +02:00
Frédéric van der Essen d697f759c2 [IMP] point_of_sale: ported the proxy to the new routing api
bzr revid: fva@openerp.com-20130712095455-e4hndk977nigtnx7
2013-07-12 11:54:55 +02:00
niv-openerp a7ab235c3a changed session handling
bzr revid: nicolas.vanhoren@openerp.com-20130712095309-41u7fi7ecs0y1lm1
2013-07-12 11:53:09 +02:00
Christophe Matthieu e52bdd3838 [IMP] website_sale: promotionnal code
bzr revid: chm@openerp.com-20130712085714-rmryh2pebnv8nsjk
2013-07-12 10:57:14 +02:00
Turkesh Patel (Open ERP) d0bcce0b63 [MRG] merge with lp:openobject-addons
bzr revid: tpa@tinyerp.com-20130712085349-jnduvg3tc5ndfjh8
2013-07-12 14:23:49 +05:30
Turkesh Patel (Open ERP) edc65569e4 [IMP] revert change of rename tax code to 'Your Company' from 'Tax'.
bzr revid: tpa@tinyerp.com-20130712085019-oq5ar8jtm2n5s7ae
2013-07-12 14:20:19 +05:30
niv-openerp 206793dfb2 merge trunk
bzr revid: nicolas.vanhoren@openerp.com-20130712084630-1cu2y07lc71xa4e9
2013-07-12 10:46:30 +02:00
Amit Bhavsar (Open ERP) b47a121f44 [Imp] Improve code for pricelists.
bzr revid: amb@tinyerp.com-20130712073654-1fowt1xojgx0pjdc
2013-07-12 13:06:54 +05:30
niv-openerp 12f58092f2 [IMP] some refactoring due to changes in the web client
bzr revid: nicolas.vanhoren@openerp.com-20130711160702-qs6pfyqsxmzd7cgy
2013-07-11 18:07:02 +02:00
niv-openerp e9981f2d7c [IMP] Important changes to the OpenERPSession server-side class and the way the web client handles sessions. Mostly:
* The OpenERPSession class now extends the werkzeug's session class, and is now the only class used to handle sessions
* Now only one cookie is used to identify the session: session_id . It is also possible to specify the id by adding the
  http parameter session_id (the http parameter has higher priority than the cookie).

bzr revid: nicolas.vanhoren@openerp.com-20130711160357-38tb26zf5dfp1jlv
2013-07-11 18:03:57 +02:00
niv-openerp a0a05454aa Solved a problem appearing in share module
bzr revid: nicolas.vanhoren@openerp.com-20130711154137-vwgb5cd4wj26jed8
2013-07-11 17:41:37 +02:00
Christophe Matthieu 78fa7ceb12 [IMP] website_sale: recommended
bzr revid: chm@openerp.com-20130711143456-dpv0pm9bpeebfq8e
2013-07-11 16:34:56 +02:00
Christophe Matthieu ffbac75519 [IMP] website_sale: recommended
bzr revid: chm@openerp.com-20130711142434-natrpfsutm6o66a9
2013-07-11 16:24:34 +02:00
niv-openerp e6fc23d980 Forgot some refactoring
bzr revid: nicolas.vanhoren@openerp.com-20130711141832-8y5yj3lj7h4gb94q
2013-07-11 16:18:32 +02:00
niv-openerp 3569ff8654 Some details + documentation
bzr revid: nicolas.vanhoren@openerp.com-20130711140519-hdsu75efwvfq4h4q
2013-07-11 16:05:19 +02:00
niv-openerp 89c8698cb3 Make the server always check the identity of the logged user and switch default values of db, uid, login and password to None
bzr revid: nicolas.vanhoren@openerp.com-20130711134825-teiuidqv7z2bzsuq
2013-07-11 15:48:25 +02:00
niv-openerp 0d7ec71bc9 Renamed all _shit in session to remove the underscore
bzr revid: nicolas.vanhoren@openerp.com-20130711133928-zp40wl2t5q54wrnv
2013-07-11 15:39:28 +02:00
niv-openerp 9aaf79ffd2 more and more cleaning
bzr revid: nicolas.vanhoren@openerp.com-20130711132301-5fl5giqio4n9yzgk
2013-07-11 15:23:01 +02:00
Amit Bhavsar (Open ERP) 5eddd3bea5 [MERGE] merge with latest trunk
bzr revid: amb@tinyerp.com-20130711130824-mpv2o3lec8ot8qtq
2013-07-11 18:38:24 +05:30
Thibault Delavallée 034a5d5dcf [FIX] point_of_sale: LocalService -> signal_ validation
bzr revid: tde@openerp.com-20130711125155-hmf0u0p0o45iac66
2013-07-11 14:51:55 +02:00
niv-openerp 47b5a82ae8 Completely removed all ways to specify session identifiers and reduced them to 2 possibilities:
* The http argument 'session_id' (higher priority)
* The cookie 'session_id' (lower priority)

bzr revid: nicolas.vanhoren@openerp.com-20130711122034-3nvmkw4q5z4io4tm
2013-07-11 14:20:34 +02:00
Thibault Delavallée 8c9c9de979 [FIX] Fixed commit about adding stage_id in search view: overridden domain because of a crashotherwise.
bzr revid: tde@openerp.com-20130711120651-2c52hgui1jh1ogsl
2013-07-11 14:06:51 +02:00
Thibault Delavallée fc42945adc [MERGE] Sync wsith trunk
bzr revid: tde@openerp.com-20130711120255-df9yvux7c3vru8dt
2013-07-11 14:02:55 +02:00
Thibault Delavallée ea0fe404a9 [IMP] project, project_issue: added search ons tage for task and issue.
bzr revid: tde@openerp.com-20130711120236-ryzz7wkzxyb8shds
2013-07-11 14:02:36 +02:00
Thibault Delavallée ee6f6e45db [MERGE] hr_payroll: renamed a tab from Other Information to Accounting Information.
bzr revid: tde@openerp.com-20130711112957-xgwvf24aihcviik9
2013-07-11 13:29:57 +02:00
Paramjit Singh Sahota 3ed5c9e838 [MERGE] Sync with lp:openobject-addons
bzr revid: psa@tinyerp.com-20130711110346-63ouy2j3zp5sndcr
2013-07-11 16:33:46 +05:30
Thibault Delavallée 0ac91d60d8 [MERGE] account: better name / tooltip for 'entry_posted' field.
bzr revid: tde@openerp.com-20130711110216-5567aoa8xd3rtfug
2013-07-11 13:02:16 +02:00
niv-openerp a7adac1189 Now OpenERPSession is a subclass of werkzeug's session
bzr revid: nicolas.vanhoren@openerp.com-20130711103422-w7y05ox7tq0hz0og
2013-07-11 12:34:22 +02:00
Thibault Delavallée f94c061ad7 [MERGE] Chatter: links to related document are now breadcrumb-compliant.
bzr revid: tde@openerp.com-20130711094636-m9p1zoska5ntlh41
2013-07-11 11:46:36 +02:00
Thibault Delavallée d6c74a369c [MERGE] Forward-ported lp:~openerp-dev/openobject-addons/7.0-pos-improvements-fva (using -r 8946..8955).
This branch holds several improvements for the point of sale. However it cannot
be merged into 7.0 because a new column is added. As this branch has proven to
be correct, it is forward-ported into trunk.

bzr revid: tde@openerp.com-20130711084547-wl5q22g8z1aha126
2013-07-11 10:45:47 +02:00
Thibault Delavallée ccc2dd61ce [MERGE] Merged lp:~openerp-dev/openerp-web/7.0-pos-improvements-fva (using -r 3867..3868).
[IMP] web corelib: adding timeout option to the rpc api

bzr revid: tde@openerp.com-20130711084451-inllzawy31589568
2013-07-11 10:44:51 +02:00
Launchpad Translations on behalf of openerp f38ef93a05 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130710052627-eedl9mcxycz4m264
bzr revid: launchpad_translations_on_behalf_of_openerp-20130711051719-uejqvkwl3w8nli1l
2013-07-11 05:17:19 +00:00
Christophe Matthieu d04da544b0 [MERGE/FIX] fix for WEB revision 3772 merged
bzr revid: chm@openerp.com-20130710153352-hrsna4ky8ej1acf0
2013-07-10 17:33:52 +02:00
Christophe Matthieu f3b72182bf [MERGE] from trunk
bzr revid: chm@openerp.com-20130710151356-b5prp1zqlgd8lz19
2013-07-10 17:13:56 +02:00
Christophe Matthieu c8b21aafe7 [IMP] website_sale: css
bzr revid: chm@openerp.com-20130710151313-mj1zbli3fd02ahf5
2013-07-10 17:13:13 +02:00
Christophe Matthieu 6a16ccfada [IMP] website_sale: search
bzr revid: chm@openerp.com-20130710150339-m5rn3vzd52vs4ko6
2013-07-10 17:03:39 +02:00
niv-openerp 57d18c1a34 [IMP] In server-side web framework, change auth="db" to auth="admin", with some difference in semantic
bzr revid: nicolas.vanhoren@openerp.com-20130710145451-56ui50mga78eq10v
2013-07-10 16:54:51 +02:00
Christophe Matthieu 5f0b723525 [IMP] website_sale: login and complete information
bzr revid: chm@openerp.com-20130710142908-c9xr4pk38zhu7cn1
2013-07-10 16:29:08 +02:00
Thibault Delavallée 46bd6b5807 [DOC] project_issue: added doc for the branch. Project: updated doc.
bzr revid: tde@openerp.com-20130710133641-911dt5tvwqh10wam
2013-07-10 15:36:41 +02:00
Thibault Delavallée 98ec74dd62 [IMP] project_issue: added date_last_stage_update in reports; removed month_last_stgae_update in project_task, only date is sufficient because reports already handle this correctly. Updated coding style of tests.
bzr revid: tde@openerp.com-20130710132954-tnr75cf33nti8r1u
2013-07-10 15:29:54 +02:00
Christophe Matthieu 1bf0661f69 [IMP] website_sale: css
bzr revid: chm@openerp.com-20130710131111-7ll30ij7279ubcpu
2013-07-10 15:11:11 +02:00
Thibault Delavallée 4b0baa3615 [CLEAN] project, project_issue, project_mrp: misc cleaning of code + fixed bug in project_mrp + re-added commentred tests in project_mrp
bzr revid: tde@openerp.com-20130710122526-tf87avul7huqgigg
2013-07-10 14:25:26 +02:00
Thibault Delavallée 9b41f8fadc [TESTS] project: refactored tests. Moved surviving yml tests into unittest; added mailgateway test.
bzr revid: tde@openerp.com-20130710101508-62eh89gzq22qvpq5
2013-07-10 12:15:08 +02:00
Thibault Delavallée 35c73992c5 [DOC] Added changelog for this branch
bzr revid: tde@openerp.com-20130709134341-9qf3blsiq2sd8l81
2013-07-09 15:43:41 +02:00
Thibault Delavallée 6310275541 [FIX] project, project_issue: fixed get_default_partner not defined anymore, because of the inheritance towards base_stage removal.
bzr revid: tde@openerp.com-20130709133859-jy4aqz6tsrtsqv81
2013-07-09 15:38:59 +02:00
Thibault Delavallée 6eb58cffe0 [DOC] project: added doc directory + changelog + stage explanation
bzr revid: tde@openerp.com-20130709125220-hl7hwo2phc7t0tqr
2013-07-09 14:52:20 +02:00
Thibault Delavallée 9c783ac42b [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130709124324-kq0f0jvqz8lthym1
2013-07-09 14:43:24 +02:00