Christophe Simonis
636b3ff2dd
[FIX] testing: only load js tests of loaded modules
...
bzr revid: chs@openerp.com-20140221095543-07lv6as8ym17mj7z
2014-02-21 10:55:43 +01:00
Quentin (OpenERP)
87d3e53c64
[MERGE] stock: in action_assign, force assignment of move if they have a picking with a type having auto_force_assign set to True
...
bzr revid: qdp-launchpad@openerp.com-20140221095516-bwxf7vaz5qg8b3h3
2014-02-21 10:55:16 +01:00
Christophe Simonis
b79f35471e
[FIX] testing: rpc tests works directly on the source database instead of copying it
...
bzr revid: chs@openerp.com-20140221095500-5cer5exzdei76y1d
2014-02-21 10:55:00 +01:00
Simon Lejeune
35b64811e9
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140221095425-9043pbzjy7rtbxd1
2014-02-21 10:54:25 +01:00
Christophe Matthieu
bfeb2b9631
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140221094343-s1oh3iq07zi2jo0x
2014-02-21 10:43:43 +01:00
Paramjit Singh Sahota
777506617a
[FIX] 'window.location.origin' is not found in IE browser thats why generated manually.
...
bzr revid: psa@tinyerp.com-20140221071512-4uky4k2wiu6miysi
2014-02-21 12:45:12 +05:30
Kunal Chavda (Open ERP)
1434c34bba
[MERGE]With latest trunk.
...
bzr revid: kch@tinyerp.com-20140221062327-zbfqjr0asc4mrr2l
2014-02-21 11:53:27 +05:30
Paramjit Singh Sahota
2e49e46698
[FIX] Fixed the sliding issue of carousel library in IE9. The transition was not working in any snippet
...
bzr revid: psa@tinyerp.com-20140221061236-7jcbgae7m081pjv8
2014-02-21 11:42:36 +05:30
ajay javiya (OpenERP)
0e7997da55
[REV] : unwanted changes
...
bzr revid: aja@tinyerp.com-20140221055906-s0744gu0tqae6x8u
2014-02-21 11:29:06 +05:30
Launchpad Translations on behalf of openerp
b949cef63c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140221054843-7g7jwzx085jnes1q
2014-02-21 05:48:43 +00:00
Darshan Kalola (OpenERP)
b69271064b
[MERGE]sync with trunk and resolve conflicts.
...
bzr revid: dka@tinyerp.com-20140221045744-hopnxp3mj9z7vz0j
2014-02-21 10:27:44 +05:30
Darshan Kalola (OpenERP)
1e16c40ab0
[IMP]mail_followers: remove li from dropdown and keep table as it is.
...
bzr revid: dka@tinyerp.com-20140221045107-ete68out3asvjign
2014-02-21 10:21:07 +05:30
Christophe Simonis
4769ff5e5d
[FIX] mail: fix IndentationError introduced in last commit
...
bzr revid: chs@openerp.com-20140220172926-4fy9x1i1q4wknfqx
2014-02-20 18:29:26 +01:00
Christophe Simonis
170f3ef1f9
[FIX] openerp/addons/base/ir/ir_actions.py: correct SyntaxError introduced in last commit
...
bzr revid: chs@openerp.com-20140220170949-kc4ru12sc5on300c
2014-02-20 18:09:49 +01:00
Christophe Simonis
4b72678bc7
[MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
...
bzr revid: chs@openerp.com-20140220163815-69sza1kclnh5mavs
2014-02-20 17:38:15 +01:00
Josse Colpaert
754b126f10
[IMP] Improve descriptions
...
bzr revid: jco@openerp.com-20140220163111-7glosa7deh60u1k8
2014-02-20 17:31:11 +01:00
Christophe Simonis
49f26ffbc8
[MERGE] forward port of branch saas-2 up to revid 3950 dle@openerp.com-20140220141302-3paib80ixiyi66qg
...
bzr revid: chs@openerp.com-20140220161753-ec6l9ser1pbnmzgk
2014-02-20 17:17:53 +01:00
Christophe Simonis
65db3c635e
[MERGE] forward port of branch saas-2 up to revid 5014 mat@openerp.com-20140220145701-6y7s1roj88q7ys13
...
bzr revid: chs@openerp.com-20140220160548-0rhulha4cml6t08v
2014-02-20 17:05:48 +01:00
Christophe Simonis
d5106a4d34
[MERGE] forward port of branch saas-2 up to revid 9136 dle@openerp.com-20140219170746-3yjvjyc2wwrb7rvd
...
bzr revid: chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
2014-02-20 16:45:17 +01:00
Thibault Delavallée
1ac8e7cdfd
[IMP] mail, email_template: mass mailing feature cleaning
...
- now differentiates mass mailing and mass post.
- mass mailing is a true mass mailing
- using same_thread log a copy in the document, without using message_post
(using notification field, + model and res_id)
- improved form view of composer, adding a filed explaining a bit the various
recipients
- removed unnecessary fields coming from the template (partner_to, ...) because
they are confusing -> composer should be easier to understand and use
- removed some unnecessary code
- removed double body computation when using templates (one for tmeplate, then
the wizard -> not necessary)
This commit will be followed by other to try to improve the mass mailing
and mass post.
bzr revid: tde@openerp.com-20140220152945-ash0hfkzevzamihq
2014-02-20 16:29:45 +01:00
Martin Trigaux
e3bd52897e
[FIX] home action: fixing the broken field 'action_id' on the res.users form (lost with 6.1->7). This field executes a custom action at page load.
...
Manual forward port of 7.0 revision 4142
bzr revid: mat@openerp.com-20140220152615-vgs25btczlizw4ce
2014-02-20 16:26:15 +01:00
Kersten Jeremy
8d8ede7f7d
[FIX] Disable traceback popup when rpc /calendar/notify fail
...
bzr revid: jke@openerp.com-20140220150817-0yyovkr4ooqu8ejc
2014-02-20 16:08:17 +01:00
Kersten Jeremy
6305ac4094
[FIX] Disable traceback popup when rpc /calendar/notify fail
...
bzr revid: jke@openerp.com-20140220150817-3rvvm8neeqviba6o
2014-02-20 16:08:17 +01:00
Martin Trigaux
bb3ff8b449
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev.5240 revid:mat@openerp.com-20140220145445-0xt7alp3uj0os1fz
...
bzr revid: mat@openerp.com-20140220145701-6y7s1roj88q7ys13
2014-02-20 15:57:01 +01:00
Martin Trigaux
9515daa3f8
[MERGE] [FIX] read_group: skip date(time) fields when generating the sql query, the monthly grouping is done afterward
...
lp bug: https://launchpad.net/bugs/1282485 fixed
bzr revid: mat@openerp.com-20140220103351-n3ohwombd1kk802f
bzr revid: mat@openerp.com-20140220145445-0xt7alp3uj0os1fz
2014-02-20 15:54:45 +01:00
Fabien Meghazi
f8ddf1dcb7
[FIX] /web/login renders with the wrong user id
...
bzr revid: fme@openerp.com-20140220144106-ge85vlbjeawa9982
2014-02-20 15:41:06 +01:00
Christophe Simonis
09d7364739
[FIX] website: on DOM elements we must set attribute via setAttribute
...
bzr revid: chs@openerp.com-20140220142110-zwtvvt2bkvbki7oo
2014-02-20 15:21:10 +01:00
Quentin (OpenERP)
7b17e234e6
[REF] stock: some code optimization in do_prepare_partial (avoid computing 'move_list' for each 'x')
...
bzr revid: qdp-launchpad@openerp.com-20140220142001-i81f7x2pgmhwqeda
2014-02-20 15:20:01 +01:00
Quentin (OpenERP)
5dd1cb2885
[FIX] stock: copying a stock.mvoe shouldn't copy the move_dest_id field otherwise push rule may not be applied (and that ain't good\!)
...
bzr revid: qdp-launchpad@openerp.com-20140220141531-ij23xtkqkfw5e1b5
2014-02-20 15:15:31 +01:00
Denis Ledoux
2a4d8bc6d5
[ADD] web: add no_create option in view_form, allowing to remove create and edit (and quick create)
...
Before, we used to use selection widget to hide or disable the create and edit of many2one fields, but this is actually an abuse of the selection widget, this is not its purpose
bzr revid: dle@openerp.com-20140220141302-3paib80ixiyi66qg
2014-02-20 15:13:02 +01:00
Josse Colpaert
526353db3c
[IMP] Take into account returned move in auto force assign the correct way
...
bzr revid: jco@openerp.com-20140220140506-velvy6yxliyujmtk
2014-02-20 15:05:06 +01:00
Simon Lejeune
1650919181
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140220135606-qks6te5keyca9chx
2014-02-20 14:56:06 +01:00
Anael Closson
5e593b34d0
[FIX] orm: grouping of date and datetime conflicts ordering on dates with date and datetime - hotfix
...
bzr revid: acl@openerp.com-20140220135127-1hh7s6dx6p2wuhz9
2014-02-20 14:51:27 +01:00
Denis Ledoux
b0f1e57269
[FIX] web: oe_form_uri is not always a link (many2one readonly no_open for instance), therefore, apply css only for a.oe_form_uri, to add the underline. Color was already added by another rule.
...
bzr revid: dle@openerp.com-20140220135030-tt6isdwum15zt6i8
2014-02-20 14:50:30 +01:00
Fabien Meghazi
587ada964e
[IMP] Refactor CROS support
...
bzr revid: fme@openerp.com-20140220133714-igpobx20mhzlxi20
2014-02-20 14:37:14 +01:00
Fabien Meghazi
d7ea890cbe
[FIX] Don't crash if no host specified
...
bzr revid: fme@openerp.com-20140220132922-wax6e05u8x06lepu
2014-02-20 14:29:22 +01:00
Denis Ledoux
1b3925fadf
[FIX] service: wrong namespace for using tools
...
bzr revid: dle@openerp.com-20140220132548-fkw19c45mbnejgld
2014-02-20 14:25:48 +01:00
Denis Ledoux
ddf1a51b05
[FIX] crm_partner_assign: remove selection widget from type_id and channel_id, as the selection widget implies to have read access on these models, which is not the case for portal users.
...
bzr revid: dle@openerp.com-20140220123819-mfxr5sne9s4f0u9d
2014-02-20 13:38:19 +01:00
Richard Mathot (OpenERP)
77e89f6a81
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140220120929-lbhrdz5sv190ylhu
2014-02-20 13:09:29 +01:00
Richard Mathot (OpenERP)
9eb2db4465
[FIX] Typos
...
bzr revid: rim@openerp.com-20140220120044-syde053xmunoy75z
2014-02-20 13:00:44 +01:00
Richard Mathot (OpenERP)
8951de3741
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140220115658-4cz2t47siz5p2zg3
2014-02-20 12:56:58 +01:00
Fabien Meghazi
17f1992698
[FIX] Correctly handle super() for decorated routes and keep the request type on all functions
...
bzr revid: fme@openerp.com-20140220115016-axebl9ei9dvysko0
2014-02-20 12:50:16 +01:00
Darshan Kalola (OpenERP)
30201e75fd
[IMP]improve spacing.
...
bzr revid: dka@tinyerp.com-20140220112638-5in8gomndoy3z08g
2014-02-20 16:56:38 +05:30
Christophe Matthieu
f267773646
[FIX] website_blog: manifest: the url is wrong to start a freetrial from blog apps in the website. Go to openerp.com, clisk on Blog icon (apps), the url is good, now click on free trial button, it is the website_sale link
...
bzr revid: chm@openerp.com-20140220111951-h80w1v1w7hwr3pvl
2014-02-20 12:19:51 +01:00
Simon Lejeune
8930e494d0
[FIX] Qweb-PDF: fixed 'werkzeug relative links' (like src='/report/getbarcode/QR/texttext') by setting a base_url and passing the cookie header to wkhtmltopdf. ; Barcode Controller: added possibility to set image size.
...
bzr revid: sle@openerp.com-20140220111323-z6zuic6lg77zutqb
2014-02-20 12:13:23 +01:00
Quentin (OpenERP)
c96fbd2c70
[IMP] stock, usability: added reserved quants in stock.move form view of picking (in group technical features)
...
bzr revid: qdp-launchpad@openerp.com-20140220103940-nxub84uglqwfwqk1
2014-02-20 11:39:40 +01:00
Christophe Matthieu
a1bfa32389
[IMP] website ace editor: display more informations about errors when the user save views
...
bzr revid: chm@openerp.com-20140220103355-0us8k76yrrodqs0u
2014-02-20 11:33:55 +01:00
Xavier Morel
bc86fdc614
[IMP] Cursor.savepoint
...
time.time doesn't guarantee sub-second precision.
Use a uuid1 instead (lower anonymity but higher isolation than uuid4
especially in distributed systems, and we don't care about anonimity for
savepoint names from application servers).
Quote name so first character can be a digit.
bzr revid: xmo@openerp.com-20140220103345-xistzxy17r8j87hf
2014-02-20 11:33:45 +01:00
Darshan Kalola (OpenERP)
7c1f4fb619
[IMP]convert subtypes list into selection.
...
bzr revid: dka@tinyerp.com-20140220102958-l2uwymwtnzcxnetw
2014-02-20 15:59:58 +05:30
Paramjit Singh Sahota
2e3e44255e
[FIX] Editor bar is showing border.
...
bzr revid: psa@tinyerp.com-20140220102200-2r2urlrrkngv20at
2014-02-20 15:52:00 +05:30