Fabien Meghazi
e54cb0291a
[REM] conflict leftover
...
bzr revid: fme@openerp.com-20140128183644-8wxgd1nwjrbcgwjt
2014-01-28 19:36:44 +01:00
Christophe Simonis
107f2ada55
[FIX] google_calendar: store empty strings in config_parameters
...
bzr revid: chs@openerp.com-20140128181237-yi9js73gz3tujacd
2014-01-28 19:12:37 +01:00
Christophe Simonis
c5d7340e9b
[FIX] auth_oauth: do not shadow non-oauth errors
...
bzr revid: chs@openerp.com-20140128181156-489gcdkiq0yaopda
2014-01-28 19:11:56 +01:00
Christophe Simonis
a47f7ef8e8
[FIX] do not hardcode demo uid
...
bzr revid: chs@openerp.com-20140128180910-2udedma5dwwtos4c
2014-01-28 19:09:10 +01:00
Olivier Dony
39c27c72d0
[MERGE] Sync with trunk rev. 9064 rev-id ged@openerp.com-20140127161718-uo6pperke86pqq5v
...
bzr revid: odo@openerp.com-20140128175835-jannyh3cv3gi1sxn
2014-01-28 18:58:35 +01:00
Xavier Morel
642b3a167d
[FIX] resource: py26 compat'
...
bzr revid: xmo@openerp.com-20140128175640-gmeecmwhevhg3oek
2014-01-28 18:56:40 +01:00
Denis Ledoux
6ab1f8a4a4
[FIX] account: account reconciliation adding float rounding, to avoid having float precision problem
...
bzr revid: dle@openerp.com-20140128175042-a2e4ga47lqow86vj
2014-01-28 18:50:42 +01:00
Christophe Matthieu
59afba09db
[FIX] website_event: possible to order a negative quantity
...
bzr revid: chm@openerp.com-20140128170846-8elbtry7mzrdmeop
2014-01-28 18:08:46 +01:00
Christophe Matthieu
c5c61dd4ba
[IMP] website_project: remove unused
...
bzr revid: chm@openerp.com-20140128170017-87yaf1tf8x8mjqtl
2014-01-28 18:00:17 +01:00
Josse Colpaert
5811842724
[IMP] Negative quants reserve raise error
...
bzr revid: jco@openerp.com-20140128165847-uw13d6bvdljzgswg
2014-01-28 17:58:47 +01:00
Christophe Matthieu
3cb264dce5
[IMP] website_project: active module
...
bzr revid: chm@openerp.com-20140128165340-6qz9iq4iulnck55w
2014-01-28 17:53:40 +01:00
Xavier Morel
98bb821332
[FIX] fubared ir_filters tests
...
bzr revid: xmo@openerp.com-20140128164849-iv19wiwx2074l18f
2014-01-28 17:48:49 +01:00
Josse Colpaert
68f0f8db8f
[FIX] Use correct wizard and solve infinite loop
...
bzr revid: jco@openerp.com-20140128164048-43ptahppk2w2tyn7
2014-01-28 17:40:48 +01:00
Christophe Matthieu
b25a34ea94
[FIX] website_sale: payment if free
...
bzr revid: chm@openerp.com-20140128163815-ksds4a7zox84glv8
2014-01-28 17:38:15 +01:00
Denis Ledoux
f13dd8cee7
[FIX][ADD] im, im_livechat: fix security rules and add history when opening a conversation
...
bzr revid: dle@openerp.com-20140128162649-aptjndl85ocmem8a
2014-01-28 17:26:49 +01:00
jke-openerp
df38615ea3
[REF] Remove button from im_livechat in tree view for History. That a read only view, so nothing to create
...
bzr revid: jke@openerp.com-20140128162304-ta4w7hy3fw1z56ey
2014-01-28 17:23:04 +01:00
Fabien Meghazi
40c7ce4b1c
[REV] Revert t-href and t-action removal
...
bzr revid: fme@openerp.com-20140128161531-t0m0hqpk5u871rwg
2014-01-28 17:15:31 +01:00
Cedric Snauwaert
f2ad111771
[FIX]should not check for a lot_id on a package but should check when putting things in a package
...
lp bug: https://launchpad.net/bugs/1269516 fixed
bzr revid: csn@openerp.com-20140128160243-fchi86wqgkjjdkdv
2014-01-28 17:02:43 +01:00
jke-openerp
c9fa796513
[FIX] Remove hard code demo user ID
...
bzr revid: jke@openerp.com-20140128155640-9k5kvk711tt9w9o5
2014-01-28 16:56:40 +01:00
Christophe Matthieu
d216014ea0
[FIX] website_event: has_access_to_partner
...
bzr revid: chm@openerp.com-20140128155459-w7ryrvgza0ittec4
2014-01-28 16:54:59 +01:00
Josse Colpaert
3562a6d3bf
[IMP] Remove inventory split merge
...
bzr revid: jco@openerp.com-20140128155148-hhz9oskv13qz1ds3
2014-01-28 16:51:48 +01:00
Fabien Meghazi
4a9d1489b3
[CHG] Make templates less readable by removing t-href and t-action
...
bzr revid: fme@openerp.com-20140128154909-oau6aq702rw062gy
2014-01-28 16:49:09 +01:00
Christophe Matthieu
9aa278b3ee
[FIX] payment_ogone: sale order view crash when payment_ogone is installed
...
bzr revid: chm@openerp.com-20140128154135-p2gq6t1z0a2n15qn
2014-01-28 16:41:35 +01:00
Josse Colpaert
34b923a19e
[IMP] change split signature and take into account for action_consume
...
bzr revid: jco@openerp.com-20140128154125-3j1rpc4w6maywcmt
2014-01-28 16:41:25 +01:00
Christophe Matthieu
316745250b
[FIX] website: public user; website_sale
...
bzr revid: chm@openerp.com-20140128152136-pqh7oqj4drpjk09z
2014-01-28 16:21:36 +01:00
Antony Lesuisse
bb4c13a2ec
[FIX] website better instructions for submenus
...
bzr revid: al@openerp.com-20140128152047-kbt87i66zndf1kxr
2014-01-28 16:20:47 +01:00
Josse Colpaert
8ec0968f8d
[WIP] Reorganise action_consume wizard to start from mrp and clean op inventory wizards
...
bzr revid: jco@openerp.com-20140128151834-ni90kny7b2y6sr36
2014-01-28 16:18:34 +01:00
Antony Lesuisse
d54ce03f69
[FIX] remove some colgroups, 2 left as they factorize html and all browsers tolerate them
...
bzr revid: al@openerp.com-20140128151359-rtn0d2edyjf8ajk1
2014-01-28 16:13:59 +01:00
Gery Debongnie
9344f2f851
[FIX] changes the hardcoded string 'undefined' into 'Undefined' in pivot table (addon web_graph)
...
bzr revid: ged@openerp.com-20140128151157-3opcfcockwrgr3kx
2014-01-28 16:11:57 +01:00
Gery Debongnie
f27c1df4d2
[IMP] css changes to improve look and usability of pivot table view (addon web_graph)
...
bzr revid: ged@openerp.com-20140128151113-g8yxl3lphpht4d89
2014-01-28 16:11:13 +01:00
Xavier Morel
3848855462
[FIX] remove outdated & unnecessary security rules
...
bzr revid: xmo@openerp.com-20140128151009-8hie0sex8ev2pads
2014-01-28 16:10:09 +01:00
jke-openerp
4dca6cd0cf
[REF] Add missing image
...
bzr revid: jke@openerp.com-20140128150452-86abqh6w3dfojr3q
2014-01-28 16:04:52 +01:00
jke-openerp
9a8a6a5484
[REF] Add public_user into module server/addons/base (removed from addons/website/website_data.xml)
...
[REF]Add _auth_method_public into server/addons/base/ir/ir_http (removed from website/ir_http)
Related commit for Addons : Committed revision 10689.
bzr revid: jke@openerp.com-20140128145510-3byhdmwftloeod6s
2014-01-28 15:55:10 +01:00
Christophe Matthieu
d7ab648c20
[FIX] website_sale: checkout don't overwrite public partner
...
bzr revid: chm@openerp.com-20140128145246-ruoa5nhmwk00ss3c
2014-01-28 15:52:46 +01:00
jke-openerp
a4a1af8fe6
[Typo] demo -> data
...
bzr revid: jke@openerp.com-20140128145143-uyddcio9z2e0ch0a
2014-01-28 15:51:43 +01:00
jke-openerp
20a5ab8ea4
[MERGE] moved public user to base, livechat fix
...
bzr revid: jke@openerp.com-20140128145023-hthi8f75gq8jo11u
2014-01-28 15:50:23 +01:00
jke-openerp
0fc5b4680b
[REF] Set public_user as a shared user in data when we installs the module share
...
bzr revid: jke@openerp.com-20140128143617-02bfjb27hgmucu4e
2014-01-28 15:36:17 +01:00
jke-openerp
5e12e47c87
[REF] Replace login as anonymous in im_livechat with auth_method_public
...
bzr revid: jke@openerp.com-20140128143224-139yby4apcrvjf54
2014-01-28 15:32:24 +01:00
jke-openerp
2c255db1d0
[REF] Move public_user from website_data to module server/addons/base
...
[REF] Remove _auth_method_public from website/ir_http to become a native auth_method in server/addons/base/ir/ir_http
bzr revid: jke@openerp.com-20140128142824-62ejlnnud4a4m694
2014-01-28 15:28:24 +01:00
Christophe Simonis
4a965b96e5
[FIX] auth_signup: +s
...
bzr revid: chs@openerp.com-20140128142132-skzuuzmkhvsl1sgz
2014-01-28 15:21:32 +01:00
Xavier Morel
1f4bb2d289
[FIX] update CKEditor to 4.3.2, fixes problem of double-escaping of non-ascii characters in widgets
...
bzr revid: xmo@openerp.com-20140128141336-boloxf0cfcrzej03
2014-01-28 15:13:36 +01:00
Fabien Meghazi
568ec06c06
[FIX] proper fix
...
bzr revid: fme@openerp.com-20140128141122-x1tj370w7zqi033h
2014-01-28 15:11:22 +01:00
Cedric Snauwaert
105210acd0
[FIX]better error msg for inventory when a start entry have a negative qty
...
bzr revid: csn@openerp.com-20140128140347-9nkk80d1yjy4sbwe
2014-01-28 15:03:47 +01:00
Fabien Meghazi
de3819972a
[FIX] Temporary hackish fix in order to restore login on runbot
...
bzr revid: fme@openerp.com-20140128140025-h70s2exdswppp8dn
2014-01-28 15:00:25 +01:00
Antony Lesuisse
7c90d3afa5
[FIX] website page creation
...
bzr revid: al@openerp.com-20140128140017-r8yy8tzsvo4y0e92
2014-01-28 15:00:17 +01:00
Martin Trigaux
802d64ca92
[MERGE] [ADD] ways to correctly handle local datetimes in e.g. domains
...
* Alter datetime.now(), generate a local datetime (add utcnow() which generates a UTC datetime)
* Implement datetime.replace() to manipulate local datetimes
* Implement date.today(), generates a local date
* Implement datetime.toJSON(), returns a javascript Date (assumes datetime attributes are local)
* Add conversion hook in JSON and JSONP handlers, automatically converts a Date object to a UTC datetime formatted according to server formats
Should allow the generation of correctly working (from the end-user's POV) [Today] filters, amongst other things.
Eg: a local expression in a domain for 'Today 00:00:00' would now be expressed as 'datetime.datetime.now().replace(hour=0, minute=0, second=0)' (no .strftime) and will be converted to UTC when sent to the server
bzr revid: mat@openerp.com-20140128133706-4yp610pp5w06tcia
2014-01-28 14:37:06 +01:00
Gery Debongnie
ad76309fbe
[IMP] makes the graph view in pivot table mode always display 'Total' instead of the current measure/title (addon web_graph)
...
bzr revid: ged@openerp.com-20140128132625-pk21iuhuffvx6814
2014-01-28 14:26:25 +01:00
Josse Colpaert
4370ed289f
[IMP] commit
...
bzr revid: jco@openerp.com-20140128111959-2sku5ymx71xpco87
2014-01-28 12:19:59 +01:00
Antony Lesuisse
0f2c0f9b6b
[FIX] stock get_object and attrs for stockable non prodcut.template field
...
bzr revid: al@openerp.com-20140128111840-azq5nms0os24ow3f
2014-01-28 12:18:40 +01:00
Christophe Simonis
317a236a59
[IMP] auth_signup: allow overwrite of signup page
...
bzr revid: chs@openerp.com-20140128135507-uvzpqqjzik2inyu3
2014-01-28 14:55:07 +01:00