307ca374d6
[MERGE] forward merge 7.0 until revision 4919.
...
bzr revid: vmt@openerp.com-20130404130704-24vsmczw34cssytd
2013-04-04 15:07:04 +02:00
5a4be3d44c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130403150224-6o2tq7pqtgax4o8w
bzr revid: launchpad_translations_on_behalf_of_openerp-20130404145635-l4x86488xak0gwr1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130404145655-30mhci39kbd5n7dq
2013-04-04 14:56:55 +00:00
f0320d4258
[FIX] web: company_logo route may be accessed with uid = False in some cases, it should still work
...
bzr revid: odo@openerp.com-20130404143144-3o2j0xbwh4m84tu8
2013-04-04 16:31:44 +02:00
b207801acc
[FIX] base.sass: removed curly braket introduced at rev 3707 in base.sass that caused sass to css to crash. Does not seem to impact base.css that was already containing up to date css.
...
bzr revid: tde@openerp.com-20130404103015-czo5p9tgrsxpzjie
2013-04-04 12:30:15 +02:00
30cce00296
[FIX] Date[time] widget width issues on OSX
...
bzr revid: fme@openerp.com-20130404102306-hrinhnldt5dxqcy7
2013-04-04 12:23:06 +02:00
8a20760fc8
[FIX] DataSet#size() problem + FormView#on_button_delete() shall pop breadcrumb on empty dataset
...
bzr revid: fme@openerp.com-20130404101459-m9q90e32qwf068lw
2013-04-04 12:14:59 +02:00
3bb51ac696
[MERGE] forward port of bugfixes made in 7.0, up to revision 8969.
...
bzr revid: qdp-launchpad@openerp.com-20130404095257-oek77sijuxjyi0aj
2013-04-04 11:52:57 +02:00
47be40b075
[MERGE] OPW 587330: DO not copy the value of the statement_id field when copying an account move
...
bzr revid: cbi@openerp.com-20130404095120-eomhgacjsbejf31d
2013-04-04 11:51:20 +02:00
d43b932270
[FIX] Forwardport of 6.1 fix by han: Do not copy the statement_id value when copying account moves
...
bzr revid: cbi@openerp.com-20130404090948-c7zw5yco1sply0b8
2013-04-04 11:09:48 +02:00
665cd6c6ea
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130403150332-0q7u1so0j76xbo3n
bzr revid: launchpad_translations_on_behalf_of_openerp-20130403150338-iksqy6aim64hko1m
2013-04-03 15:03:38 +00:00
07822d2b9f
[MERGE] OPW 584359: Fixed the issue of Calendar responsible label not translated when there is selection field on responsible.
...
bzr revid: cbi@openerp.com-20130403134029-2vr50v2dmcu1vn1c
2013-04-03 15:40:29 +02:00
cd52a05d1d
[FIX] Forwardport of 6.1 merge proposal by msh: Fixed the issue of Calendar responsible label not translated when there is selection field on responsible.
...
bzr revid: cbi@openerp.com-20130403132346-bs0k6na71nmu7ztl
2013-04-03 15:23:46 +02:00
05306fd30a
[FIX] Chatter: do not show colon when there is no trailing record name.
...
bzr revid: tde@openerp.com-20130403124125-3hbmaqktlxhsgih1
2013-04-03 14:41:25 +02:00
37bec9643d
[FIX] mail: fixed recipients of private discussion, that were not correct. Author could be notified of their own reply independently of the specified recipients. Added tests for private discussions.
...
bzr revid: tde@openerp.com-20130403121307-4rixx7ct6y86spoz
2013-04-03 14:13:07 +02:00
d300e2b0ce
[FIX] mail: notifications: email_to now contains reference to 'Followers of Doc Name' when having a related document.
...
bzr revid: tde@openerp.com-20130403121022-lijarue6r2t7mh3w
2013-04-03 14:10:22 +02:00
a173caa0f4
[FIX] Fixed wrong parameter name given to astimezone introduced at revision 8954; correct parameter name is tz, not tzinfo.
...
bzr revid: tde@openerp.com-20130403120926-xfxtj5hsva6jzb1u
2013-04-03 14:09:26 +02:00
07bb17a6cb
[FIX] mail: issue: After receiving inbox messages from external emails, when clicking on reply button the external email is listed in the form. However when clicking on send the external email is removed! and instead of email what we get is an internal note.
...
bzr revid: chm@openerp.com-20130403095149-kjy5v4uesatwc4p9
2013-04-03 11:51:49 +02:00
04f1da5278
[FIX] mail: issue: After receiving inbox messages from external emails, when clicking on reply button the external email is listed in the form. However when clicking on send the external email is removed! and instead of email what we get is an internal note.
...
bzr revid: chm@openerp.com-20130403094046-rexsmdz6tn1zc2hk
2013-04-03 11:40:46 +02:00
de77b89d98
[MERGE] [FIX] mail: private discussion now have correct recipients. After receiving messages, when clicking on reply button the recipients were correctly listed in the composer. However when sending the recipients were not correctly added, leading to a message considered as a log.
...
bzr revid: tde@openerp.com-20130403091231-y0x76orxxrqbw6cl
2013-04-03 11:12:31 +02:00
767fe2458a
[FIX] mail: issue: After receiving inbox messages from external emails, when clicking on reply button the external email is listed in the form. However when clicking on send the external email is removed! and instead of email what we get is an internal note.
...
bzr revid: chm@openerp.com-20130403085116-m2kyiem0r2dnjwov
2013-04-03 10:51:16 +02:00
347b2a7604
[MERGE] [FIX] tools: mail: html2plaintext better manages carriage returns.
...
lp bug: https://launchpad.net/bugs/1159782 fixed
bzr revid: tde@openerp.com-20130403083237-a406615qs8pe1jon
2013-04-03 10:32:37 +02:00
086b844df5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130330052753-vptpgl8jh0zxx2zf
bzr revid: launchpad_translations_on_behalf_of_openerp-20130331052801-af1yzruwutw4ce3b
bzr revid: launchpad_translations_on_behalf_of_openerp-20130401050658-9x864eerp9tph8ia
bzr revid: launchpad_translations_on_behalf_of_openerp-20130403052653-u7naqcrqgxv41q33
2013-04-03 05:26:53 +00:00
051885fd88
[MERGE] workers cron each job should be considered as one request
...
bzr revid: al@openerp.com-20130403013833-4599683ji5tztevd
2013-04-03 03:38:33 +02:00
f3ce4dedf3
[FIX] view_form: Fixed the issue of attachment was not added in any other language, because action URL was getting translated.
...
bzr revid: chm@openerp.com-20130402144039-y0xoaijds4ipw7g0
2013-04-02 16:40:39 +02:00
cea7a7a0ab
[FIX] m2o does not use @alive()
...
lp bug: https://launchpad.net/bugs/1160192 fixed
bzr revid: fme@openerp.com-20130402133952-xz2qaoygg83ks3tx
2013-04-02 15:39:52 +02:00
3d58511f89
[FIX]crm: crm lead/merge keystroke mistake, revert remove of minus
...
bzr revid: dle@openerp.com-20130402131434-jkap5399rrfq8rm5
2013-04-02 15:14:34 +02:00
6f3ba2a572
[FIX]crm: crm lead/opp merge, if merged stage not in sales team and same type (lead/opp)n choose first stage of the sales team with the same type
...
bzr revid: dle@openerp.com-20130402125809-4qzwe1nm0nkrx283
2013-04-02 14:58:09 +02:00
f645c8671e
[FIX] calendar.js: From calendar view create customer or supplier invoice, when select partner it gives error.
...
bzr revid: chm@openerp.com-20130402104752-k6ts4s6j7mi7lnjp
2013-04-02 12:47:52 +02:00
9c1b0f6164
[FIX]crm: crm lead/opp merge, when opp has stage with state cancel, then it is less important than leads with stage which are not in state cancel
...
bzr revid: dle@openerp.com-20130402101331-12skhykfzrv35nno
2013-04-02 12:13:31 +02:00
27ab383508
[FIX] loading: typo.
...
lp bug: https://launchpad.net/bugs/1162753 fixed
bzr revid: vmt@openerp.com-20130402092914-cqrjxveg66gbpm3s
2013-04-02 11:29:14 +02:00
52a35371b1
[FIX] javascript error that made the application crash when a on_change returns a warning
...
lp bug: https://launchpad.net/bugs/1161772 fixed
bzr revid: nicolas.vanhoren@openerp.com-20130402092547-rid9bjbxv92ukqti
2013-04-02 11:25:47 +02:00
9c4f0bf9d8
[FIX] service.db: forgot to remove the indicing when pooler.get_pool() was replaced.
...
lp bug: https://launchpad.net/bugs/1162681 fixed
bzr revid: vmt@openerp.com-20130402091852-9hsatm95ej53lllg
2013-04-02 11:18:52 +02:00
b4c2805012
[IMP] removed now useless code
...
bzr revid: nicolas.vanhoren@openerp.com-20130402090405-coachhx5x2bayakr
2013-04-02 11:04:05 +02:00
252bcc802f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130330060824-pc5f2pj14gj0ak27
bzr revid: launchpad_translations_on_behalf_of_openerp-20130331055726-frtzw3gc9ut4wx4y
bzr revid: launchpad_translations_on_behalf_of_openerp-20130401053127-tolr13p1b3bhjny1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130402054749-t3x0zc7qk3n4man2
bzr revid: launchpad_translations_on_behalf_of_openerp-20130330060920-k0cnlpk0rxcli841
bzr revid: launchpad_translations_on_behalf_of_openerp-20130331055741-loojniiz6du9upat
bzr revid: launchpad_translations_on_behalf_of_openerp-20130401053211-yvt1h32v41rs6jje
bzr revid: launchpad_translations_on_behalf_of_openerp-20130402054814-fwg742kzhsupr6kc
bzr revid: launchpad_translations_on_behalf_of_openerp-20130329051100-3ul1k4qwwm2f49gt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130330060923-wch1f8ndmb15nu6x
bzr revid: launchpad_translations_on_behalf_of_openerp-20130331055759-aj1nc93t9420lov0
bzr revid: launchpad_translations_on_behalf_of_openerp-20130401053215-kqqgqefzp95fa1tk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130402054817-k33rri349nc2ioiz
2013-04-02 05:48:17 +00:00
a4a7fb332d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130331053353-0cyzdy57t6sekpjl
2013-03-31 05:33:53 +00:00
3450d73332
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130331052742-dbyi02qcz3pizf30
2013-03-31 05:27:42 +00:00
600f03b294
[FIX] html2plaintext: bug 1159782
...
bzr revid: chm@openerp.com-20130329154130-56wjtfrj41eatxl6
2013-03-29 16:41:30 +01:00
2c265513ec
[MERGE] When creating a contact for a company, correctly set the address to be the company's address. Also corrects the propagation of address changes from the contact to the company.
...
bzr revid: cbi@openerp.com-20130329135559-zwe06tozbrkpjpsg
2013-03-29 14:55:59 +01:00
f0957681c9
[FIX]crm: crm lead/opp merge, opportunities more important than lead. If lead.stage > opp.lead, the merged result will be the opp stage anyway.
...
bzr revid: dle@openerp.com-20130329133541-ztu6g7qwgdjzpb9s
2013-03-29 14:35:41 +01:00
2d925d5c27
[FIX]crm: crm merge tests testing new merge behaviour (opps before leads)
...
bzr revid: dle@openerp.com-20130329130615-gbjqw0x2ybeekext
2013-03-29 14:06:15 +01:00
58a31f00d8
[FIX]crm: crm lead merge, add create_date in argument for sorting
...
bzr revid: dle@openerp.com-20130329115908-gjia2se2kgnkaahh
2013-03-29 12:59:08 +01:00
0d14fd300a
[MERGE] [IMP] email_template: template_id field is now a many2one towards email.template
...
- changed selection field to a many2one using a domain; this
allows to edit the template while being in a composition wizard.
- improved email template and template preview form view
bzr revid: tde@openerp.com-20130329114631-fd6phvjaxojk9ja5
2013-03-29 12:46:31 +01:00
b2fc9d75c7
[IMP] email_template_preview: improved form view.
...
bzr revid: tde@openerp.com-20130329112722-9aulsfcixis2id6w
2013-03-29 12:27:22 +01:00
43cc95ce2b
[FIX] partner: fix update for company address
...
* when writing an empty value to ADDRESS_FIELDS, that value
should also be propagated by update_address()
* when creating a contact from a company form view, even with
'use_company_address', company's contact address remains empty. We
now force adding missing address fields uppon creation when default
'use_company_address' is True.
bzr revid: xal@openerp.com-20130329112317-6lat4jx5x2yh18t6
2013-03-29 12:23:17 +01:00
3679b0c44c
[FIX]crm: convert lead to opportunity, opportunity always win vs lead, even if lead.stage > opp.lead
...
bzr revid: dle@openerp.com-20130329111609-7v516rnid2ytk836
2013-03-29 12:16:09 +01:00
becbd707cf
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20130329105546-epbmbbxd64cncj2h
2013-03-29 11:55:46 +01:00
07a46db2cb
[MERGE] [FIX] Chatter:
...
- message date was wrong for records created from incoming email servers.
- fix the (only visual) duplication of partners in the 'To' of quick reply widget
- fixed empty list message appearing twice when quickly clicking on 'read'
bzr revid: tde@openerp.com-20130329105116-7ocxb9cn9f1h7yi6
2013-03-29 11:51:16 +01:00
97bba88a53
[MERGE] [REV] Partial revert of change introduced at rev 8926. Portal menu name is now Portal again, Billing and Support will be only used for sub-menus.
...
bzr revid: tde@openerp.com-20130329104956-y9uck7pam32vlnld
2013-03-29 11:49:56 +01:00
c6bf1f1af3
[MERGE] Sync with 7.0
...
bzr revid: tde@openerp.com-20130329103315-ico83ec57l2dzx4v
2013-03-29 11:33:15 +01:00
7a8d71be6d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130329050903-yuxb08q83hlvg6ok
2013-03-29 05:09:03 +00:00
Vo Minh Thu
Launchpad Translations on behalf of openerp
Olivier Dony
Thibault Delavallée
Fabien Meghazi
Quentin (OpenERP)
Chris Biersbach
Christophe Matthieu
Antony Lesuisse
niv-openerp
Xavier ALT