24ea151a37
merge upstream
...
bzr revid: chs@openerp.com-20130717142947-de40mn3234gt5044
2013-07-17 16:29:47 +02:00
b7160bc1cf
[IMP] Improved code for fetch_followers and done as was previously && added condition for the record in display_followers so that it never breaks && improve the mouse-enter and mouse-leave.
...
bzr revid: psa@tinyerp.com-20130717124842-vuqct26jy6a7palb
2013-07-17 18:18:42 +05:30
455fa4e597
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130717064313-thb64cq8368siq7s
2013-07-17 06:43:13 +00:00
9ce89b12a9
[MERGE] merge with latest trunk
...
bzr revid: amb@tinyerp.com-20130717051958-qpl3u5aoo15au5c2
2013-07-17 10:49:58 +05:30
788071f34f
[FIX] some more problems with werkzeug 0.9.1
...
bzr revid: nicolas.vanhoren@openerp.com-20130716131401-abj3i020a8831l98
2013-07-16 15:14:01 +02:00
25439cfb3a
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130716122426-lbt7hrxjv3lgi1ev
2013-07-16 14:24:26 +02:00
7c4f374aca
[MERGE] [IMP] l10n_in improvements
...
chart of taxes and taxes improvements
missing COA addition
bzr revid: tde@openerp.com-20130716093458-bgganvrcl6pm8hcb
2013-07-16 11:34:58 +02:00
df8d972057
[IMP] */static/description/index.html: link to /start include app name
...
bzr revid: chs@openerp.com-20130715162504-9ntu1dj222rgv9ek
2013-07-15 18:25:04 +02:00
2fb48c695c
[IMP] modified mono_db to refuse db= in the url if the db does not appear in the db_filter
...
bzr revid: nicolas.vanhoren@openerp.com-20130715132900-xwbve100mn8nyzo9
2013-07-15 15:29:00 +02:00
d42d50df57
[FIX] problem with werkzeug 0.9.1 that crashes when we generate a report
...
bzr revid: nicolas.vanhoren@openerp.com-20130715122648-a926d3tov4efbyrk
2013-07-15 14:26:48 +02:00
7743f13c04
[FIX] small bug that made the reports crash when we try to print them
...
bzr revid: nicolas.vanhoren@openerp.com-20130715121611-q68m7w62h8ngnb2i
2013-07-15 14:16:11 +02:00
54837802ac
Improved code.
...
bzr revid: psa@tinyerp.com-20130715113736-ww4wffkajnwkk961
2013-07-15 17:07:36 +05:30
21e3d7cdc4
[IMP] 2 little improvements when their is no subtype than no edit_subtype pencil will be visible and bydefault set the message_is_follower to false because when no followers are there than subtypes muzt not be visible.
...
bzr revid: psa@tinyerp.com-20130715084907-nrd2oileuyr30nep
2013-07-15 14:19:07 +05:30
670710b88e
[IMP] Improved code and passed the data according to the format as suggest (partner_id, partner_name, {'is_editable': True/False, 'is_uid': True/False}) and done changes according this changes.
...
bzr revid: psa@tinyerp.com-20130715080106-63dbeh3mhgiqppzv
2013-07-15 13:31:06 +05:30
a81df9ca2b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714054309-ugij4upsn8mogaqu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130715045154-1z08ygq4kywcfjio
2013-07-15 04:51:54 +00:00
6694183dcb
[IMP] Improved code and added
...
{'is_editable': True/False, 'is_uid': True/False}
-- where is_editable will be True if uid is in technical group
-- where is_uid will be True if uid is in partner.user_ids.
bzr revid: psa@tinyerp.com-20130712133920-96l6axns7yynyz9e
2013-07-12 19:09:20 +05:30
4c96a05dbb
[MERGE] point_of_sale: various fixes and improvements: invoicing support, snappier scale, and a more robust order sending
...
bzr revid: fva@openerp.com-20130712125419-t588gpoysustm19t
2013-07-12 14:54:19 +02:00
050b6b0ec5
[MERGE] adding timeout option to rpc calls
...
bzr revid: fva@openerp.com-20130712125158-63p24xm18zffpg86
2013-07-12 14:51:58 +02:00
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
16d3b79dfd
[MERGE] from upstream
...
bzr revid: fva@openerp.com-20130712121148-0ys14v8jc33t6sf5
2013-07-12 14:11:48 +02:00
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
a8ea08cf28
[MERGE] from upstream
...
bzr revid: fva@openerp.com-20130712100516-mk14z6zqebdje3ud
2013-07-12 12:05:16 +02:00
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
a7ab235c3a
changed session handling
...
bzr revid: nicolas.vanhoren@openerp.com-20130712095309-41u7fi7ecs0y1lm1
2013-07-12 11:53:09 +02:00
d0bcce0b63
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20130712085349-jnduvg3tc5ndfjh8
2013-07-12 14:23:49 +05:30
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
206793dfb2
merge trunk
...
bzr revid: nicolas.vanhoren@openerp.com-20130712084630-1cu2y07lc71xa4e9
2013-07-12 10:46:30 +02:00
b47a121f44
[Imp] Improve code for pricelists.
...
bzr revid: amb@tinyerp.com-20130712073654-1fowt1xojgx0pjdc
2013-07-12 13:06:54 +05:30
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
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
a0a05454aa
Solved a problem appearing in share module
...
bzr revid: nicolas.vanhoren@openerp.com-20130711154137-vwgb5cd4wj26jed8
2013-07-11 17:41:37 +02:00
e6fc23d980
Forgot some refactoring
...
bzr revid: nicolas.vanhoren@openerp.com-20130711141832-8y5yj3lj7h4gb94q
2013-07-11 16:18:32 +02:00
3569ff8654
Some details + documentation
...
bzr revid: nicolas.vanhoren@openerp.com-20130711140519-hdsu75efwvfq4h4q
2013-07-11 16:05:19 +02:00
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
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
9aaf79ffd2
more and more cleaning
...
bzr revid: nicolas.vanhoren@openerp.com-20130711132301-5fl5giqio4n9yzgk
2013-07-11 15:23:01 +02:00
5eddd3bea5
[MERGE] merge with latest trunk
...
bzr revid: amb@tinyerp.com-20130711130824-mpv2o3lec8ot8qtq
2013-07-11 18:38:24 +05:30
034a5d5dcf
[FIX] point_of_sale: LocalService -> signal_ validation
...
bzr revid: tde@openerp.com-20130711125155-hmf0u0p0o45iac66
2013-07-11 14:51:55 +02:00
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
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
fc42945adc
[MERGE] Sync wsith trunk
...
bzr revid: tde@openerp.com-20130711120255-df9yvux7c3vru8dt
2013-07-11 14:02:55 +02:00
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
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
3ed5c9e838
[MERGE] Sync with lp:openobject-addons
...
bzr revid: psa@tinyerp.com-20130711110346-63ouy2j3zp5sndcr
2013-07-11 16:33:46 +05:30
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
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
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
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
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
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 Simonis
Paramjit Singh Sahota
Launchpad Translations on behalf of openerp
Amit Bhavsar (Open ERP)
niv-openerp
Thibault Delavallée
Frédéric van der Essen
Turkesh Patel (Open ERP)