Martin Trigaux
78c82fc0c6
[FIX] tree views: rename variable parent-id to avoid conflicts with record fields name (eg: account.account)
...
bzr revid: mat@openerp.com-20130829124448-xr89v0gsuoukqhao
2013-08-29 14:44:48 +02:00
Mansi Kariya (OpenERP Trainee)
e92eb160af
[MERGE] Merged with main branch
...
bzr revid: mansi.mk.179@gmail.com-20130829123307-q4dl81sd3ekb01e4
2013-08-29 18:03:07 +05:30
Thibault Delavallée
f70313103a
[IMP] mail_message: cleaned search view
...
bzr revid: tde@openerp.com-20130829100932-xrh11khzghwxzyuf
2013-08-29 12:09:32 +02:00
Olivier Dony
cbad29493e
[FIX] purchase: res.partner.copy() must properly return the super() call's result
...
lp bug: https://launchpad.net/bugs/1189966 fixed
bzr revid: odo@openerp.com-20130829095240-19ka4u1ikgd6ti5n
2013-08-29 11:52:40 +02:00
niv-openerp
982d598a8d
[IMP] now remembers OpenERP sessions
...
bzr revid: nicolas.vanhoren@openerp.com-20130829085801-z2wxxif0nzpbf5x2
2013-08-29 10:58:01 +02:00
Darshan Kalola
9d29902fa5
[MERGE]merged with main addons
...
bzr revid: darshankalola@gmail.com-20130829063416-3zo337keanlemwe2
2013-08-29 12:04:16 +05:30
4e77cb6d26
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130829052759-jx9b15a0ss1lxapn
2013-08-29 05:27:59 +00:00
Amit Bhavsar (Open ERP)
18961cfdf5
[MERGE] merge with latest trunk
...
bzr revid: amb@tinyerp.com-20130829050254-xwt0261q0hdtrwun
2013-08-29 10:32:54 +05:30
895481c21d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130827044704-wom10yf9wm9nzeho
bzr revid: launchpad_translations_on_behalf_of_openerp-20130828050800-3u3eo84ahvpggvao
bzr revid: launchpad_translations_on_behalf_of_openerp-20130829045342-evt31nszsin4eqj5
2013-08-29 04:53:42 +00:00
Denis Ledoux
18193da769
[FIX]account: in wizard of refund, replace type(line.reconcile_id) != osv.orm.browse_null with simply if line.reconcile_id: + imp of the following line
...
bzr revid: dle@openerp.com-20130828155815-0i8uoez4guh0i85x
2013-08-28 17:58:15 +02:00
Martin Trigaux
33001ec5ff
[FIX] stock: post messages on stock.pciking instead of stock.picking.in/out to be able to display messages on the form
...
This will only display newly posted messages, not already existing.
To do so apply the following SQL command:
UPDATE mail_message SET model = 'stock.picking' WHERE model = 'stock.picking.in' OR model = 'stock.picking.out';
lp bug: https://launchpad.net/bugs/1197169 fixed
bzr revid: mat@openerp.com-20130828151434-5nu7o0ybguh86w6f
2013-08-28 17:14:34 +02:00
Atul Patel (OpenERP)
14a855f297
[FIX]: Remove onchange from xml part.
...
bzr revid: atp@tinyerp.com-20130828150105-ylwdzki1viq9n8kl
2013-08-28 20:31:05 +05:30
Martin Trigaux
cf45a9fa01
[FIX] project: correct name_search for analytic accounts, use args, name, limit and context
...
bzr revid: mat@openerp.com-20130828141123-ws38n7353f717not
2013-08-28 16:11:23 +02:00
Thibault Delavallée
9ef46123a6
[IMP] mail.compose.message, email.template: rendering is now done in batch.
...
Also refactored send_mail in mail.compose.message in order to be able to override
mail values without having to intefere with the send_mail behavior.
bzr revid: tde@openerp.com-20130828140929-xe9hbmbo6jxgs9mh
2013-08-28 16:09:29 +02:00
Thibault Delavallée
eaf07ae5c4
[FIX] mail_message: fixed reply_to and email_from computation in create: take also False values, only undefined values trigger the default one
...
bzr revid: tde@openerp.com-20130828140845-uuv8ouoto4q7g96j
2013-08-28 16:08:45 +02:00
Denis Ledoux
055c4b94f2
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5059 rev-id: dle@openerp.com-20130828125209-5jqwjqhrl17x7kpa
...
bzr revid: dle@openerp.com-20130828135425-yuls3wav79znadt3
2013-08-28 15:54:25 +02:00
Denis Ledoux
57818bb779
[FIX]res_config: in _install_modules, result returned by button_immediate_install must be returned, in order to launch the action if there is one. TODO fix,at the moment, if there are missing modules, this return statement prevent their installation
...
bzr revid: dle@openerp.com-20130828125209-5jqwjqhrl17x7kpa
2013-08-28 14:52:09 +02:00
Martin Trigaux
3b549486e9
[FIX] pos: correctly link refund order to a current session and set to today's date (opw 589810)
...
lp bug: https://launchpad.net/bugs/1123575 fixed
bzr revid: mat@openerp.com-20130828123940-ik9gvx7flywia0oe
2013-08-28 14:39:40 +02:00
Martin Trigaux
1d431fe4f8
[FIX] stock,mrp: move multicomp user to test instead of demo data
...
bzr revid: mat@openerp.com-20130828085019-cgbj6zrug73it3nw
2013-08-28 10:50:19 +02:00
ccbb4335ec
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130828050349-f8ozlg2e354f87ge
2013-08-28 05:03:49 +00:00
Thibault Delavallée
9825eef774
[FIX] crm: fixed a bug in opportunities merge.
...
_merge_notify was called with a browse record but was waiting for an ID.
bzr revid: tde@openerp.com-20130827162036-v7yhfijgpdhcyte5
2013-08-27 18:20:36 +02:00
Martin Trigaux
3b88ba87c1
[FIX] pos: avoid a user to use another user's session (opw 595033)
...
bzr revid: mat@openerp.com-20130828073030-mmgcd0atfm7qjq1b
2013-08-28 09:30:30 +02:00
8c5c877948
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130828053808-8isassv2181er8jt
2013-08-28 05:38:08 +00:00
Thibault Delavallée
0dfe3a2e67
[FIX] crm: fixed regression in merge_notify, due to a cleaning in opportunities merging a few months ago
...
bzr revid: tde@openerp.com-20130827161801-d8i11n5uq7n4v9r8
2013-08-27 18:18:01 +02:00
Thibault Delavallée
4779df339e
[REF] mail_followers: cleaned notify methods, lessening the number of queries.
...
bzr revid: tde@openerp.com-20130827153840-fo9s2lc35fvld3fb
2013-08-27 17:38:40 +02:00
Olivier Dony
baef4d3d92
[FIX] Force safer ondelete=restrict on the alias_id _inherits FK on models with a mail.alias parent
...
The delete-rule was initially set to `cascade` in revision
6897.16.13 revid:odo@openerp.com-20120705141706-5gm5mmqode3bvkuc
because the ORM would not allow anything else for the FK of
an _inherits relationship.
This constraint was later lifted in 7.0 server at revision
4681 revid:odo@openerp.com-20121212210247-emrz5rf9ewcwdggu
so we can now switch to the intended default behavior:
when deleting mail aliases we never want to cascade delete
the child records, as that could lead to unwanted deletions.
On the other hand the aliases are automatically deleted when
the record they belong to is deleted, as a kind of internal
dependency. This is the intended safe way to delete them.
There is a special case when the same alias is manually set
on multiple records, in which case you will not be able to
delete any of those records. This is an acceptable exception
and should be manually handled if ever needed, by temporarily
linking the records to delete to new dummy aliases.
bzr revid: odo@openerp.com-20130827150708-62hqk8p7twd527n0
2013-08-27 17:07:08 +02:00
Thibault Delavallée
c0dd112221
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130827133120-z8flzb85bo0a98po
2013-08-27 15:31:20 +02:00
Thibault Delavallée
b35a44f66d
[IMP] mail_mail, mail_message: various improvements to try to improve message creation time
...
Replaced some read by browse
Moved get_reply_to from mail_mail to mail_message
Hint: specifying email_from, reply_to help to enhance computation time
[REF] mail: cleaned some tests, renamed a file, moved mail_group tests into a dedicated file
bzr revid: tde@openerp.com-20130827133058-ko0g0ib0f0jihmdk
2013-08-27 15:30:58 +02:00
Dharmraj Zala (OpenERP Trainee)
411a3da7bc
[MERGE] with trunk
...
bzr revid: dizzy.zala@gmail.com-20130827132438-mz4tvrx3vchosm94
2013-08-27 18:54:38 +05:30
Martin Trigaux
f9a01a68a1
[MERGE] [FIX] account: handle value errors for inexisting object references for account reports
...
bzr revid: mat@openerp.com-20130827093508-0e58bj81h1qam5w1
2013-08-27 11:35:08 +02:00
Sanjay Gohel (OpenERP)
f740e0961d
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130827083334-hih0l1qsvab8pows
2013-08-27 14:03:34 +05:30
Cecile Tonglet
aef380c5c8
[FIX] account.account.type getter function of field report_type now handle ValueError raised by get_object_reference()
...
bzr revid: cto@openerp.com-20130827064025-ebw8skxpku1jad20
2013-08-27 08:40:25 +02:00
Paramjit Singh Sahota
b4d13e3c3d
[IMP] Improved the product_id in yml.
...
bzr revid: psa@tinyerp.com-20130827054608-ppf03r3xzu9td4db
2013-08-27 11:16:08 +05:30
642311aa26
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130827050316-c3hzsnzygj4np1qh
2013-08-27 05:03:16 +00:00
niv-openerp
00d3d9a4b6
[FIX] im: multiple bugs
...
bzr revid: nicolas.vanhoren@openerp.com-20130826135135-93tmyi6a1fpju8vy
2013-08-26 15:51:35 +02:00
Martin Trigaux
98541c5827
[FIX] mrp: display Bill of Materials as a list, not as a tree
...
bzr revid: mat@openerp.com-20130826132943-mp8f331mxafb3z9z
2013-08-26 15:29:43 +02:00
niv-openerp
05a1a5ffe6
merge trunk
...
bzr revid: nicolas.vanhoren@openerp.com-20130826131051-c7aatnvew9q52iw6
2013-08-26 15:10:51 +02:00
niv-openerp
5e8315730b
Solved a few bugs
...
bzr revid: nicolas.vanhoren@openerp.com-20130826125254-smlkkh5m3n36cklw
2013-08-26 14:52:54 +02:00
Olivier Dony
20e5751e62
[IMP] email_template: add datetime and dateutil.relativedelta in the global rendering context for templates
...
The `dateutil` package is not included directly in the globals because
`dateutil.relativedelta.relativedelta` is an old-style class and jinja2
does not appear to support instantiating old-style classes within an
expression, so `relativedelta` support is provided using a "lambda proxy".
bzr revid: odo@openerp.com-20130826124405-bixzwyhl65c7v75b
2013-08-26 14:44:05 +02:00
niv-openerp
8ee25f9856
Refactored to avoid user duplication problem
...
bzr revid: nicolas.vanhoren@openerp.com-20130826123947-alcsov647beqge0c
2013-08-26 14:39:47 +02:00
Thibault Delavallée
3a67d7dc99
[FIX] crm: fixed a bug introduced when merging trunk
...
bzr revid: tde@openerp.com-20130826095600-bgvdzah9nwb2vu0l
2013-08-26 11:56:00 +02:00
Thibault Delavallée
21d57f5e9d
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130826085410-qngwkw6eyxol4192
2013-08-26 10:54:10 +02:00
niv-openerp
7bce27c528
Now uses im.user's images
...
bzr revid: nicolas.vanhoren@openerp.com-20130826085212-od9oxv6h4jtkd6nf
2013-08-26 10:52:12 +02:00
niv-openerp
8f33049f2f
Changed user field to user_id and added unique constraint
...
bzr revid: nicolas.vanhoren@openerp.com-20130826084554-221ts80q8c5jvqv1
2013-08-26 10:45:54 +02:00
dc07d21f86
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130824053459-k3vf5zjfz0sjn6t6
bzr revid: launchpad_translations_on_behalf_of_openerp-20130825051935-7croxf3zpoo1cvwk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130824053520-dpq7ulxrh0e06fd4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130825051953-hv03d787cy2sc9l4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130825051959-4r4bun8nvl6neyi5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130826051253-70i5qzbp5ttpsmb7
2013-08-26 05:12:53 +00:00
7294b0ebfa
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130824050400-vvklljkx8p2e77no
2013-08-24 05:04:00 +00:00
Christophe Simonis
f751ce30b7
[FIX] project: correct migrate_to_alias call
...
bzr revid: chs@openerp.com-20130823161810-417zchlc06mbzcb8
2013-08-23 18:18:10 +02:00
Christophe Simonis
5343c48c5f
[MERGE] forward port of branch saas-1 up to revid 8760 chs@openerp.com-20130823143114-83tdjhbsdes0kydr
...
bzr revid: chs@openerp.com-20130823154655-blm2wyfivmg8qi2z
2013-08-23 17:46:55 +02:00
Christophe Simonis
b86eee378e
[MERGE] forward port of branch saas-1 up to revid 3743 chs@openerp.com-20130823145204-xwpnlwg0gg2259f6
...
bzr revid: chs@openerp.com-20130823145527-fz58kta3qpup4sb2
2013-08-23 16:55:27 +02:00
Christophe Simonis
58868227f9
[MERGE] forward port of branch 7.0 up to revid 9382 chs@openerp.com-20130823131214-ipouwtnz8r16mlvv
...
bzr revid: chs@openerp.com-20130823143114-83tdjhbsdes0kydr
2013-08-23 16:31:14 +02:00
Martin Trigaux