Sanjay Gohel (Open ERP)
362b1ef843
[IMP]resolve security restriction for user
...
bzr revid: sgo@tinyerp.com-20121010092410-3be51cvvv3jcap2g
2012-10-10 14:54:10 +05:30
Sanjay Gohel (Open ERP)
e32a71373a
[MERGE]merge with parent branch
...
bzr revid: sgo@tinyerp.com-20121010092138-iwcz52n2uw1cli1m
2012-10-10 14:51:38 +05:30
Khushboo Bhatt (Open ERP)
0e00c44a6c
[FIX]mail:the issue of createing new record
...
bzr revid: kbh@tinyerp.com-20121010092112-944vjsuphod8kv8n
2012-10-10 14:51:12 +05:30
pankita shah (Open ERP)
e65a9208b8
[Fix] when click time sheet timesheet sheet analysis in reporting
...
bzr revid: shp@tinyerp.com-20121010090913-lugvm9jwb43hdmmq
2012-10-10 14:39:13 +05:30
Jalpesh Patel (OpenERP)
d87786fd41
[IMP] user's form view remove link to open User's Projects
...
bzr revid: pja@tinyerp.com-20121010085029-n78m51b40nnzr7qd
2012-10-10 14:20:29 +05:30
Ajay Chauhan (OpenERP)
b5f940c04f
[IMP] project: made little change in ir rule
...
bzr revid: cha@tinyerp.com-20121010083548-lt8oncuanvcfpqk2
2012-10-10 14:05:48 +05:30
Christophe Matthieu
01b083e14d
[FIX]mail: wizard view
...
bzr revid: chm@openerp.com-20121010073133-sd189dd6uc045tp1
2012-10-10 09:31:33 +02:00
Ajay Chauhan (OpenERP)
f147dfe7cc
[MERGE] merge with lp:openobject-addons
...
bzr revid: cha@tinyerp.com-20121010072653-jy1rxxfdrm6cum7r
2012-10-10 12:56:53 +05:30
Raphael Collet
f7d5b5ff0a
[FIX] mail: in function field mail_follower_ids, support value False in setter
...
bzr revid: rco@openerp.com-20121010072510-aacyyj3csj720z8l
2012-10-10 09:25:10 +02:00
Harry (OpenERP)
2ad8ce52bf
[MERGE]
...
bzr revid: hmo@tinyerp.com-20121010072320-gm4ea77wc62bm9bv
2012-10-10 12:53:20 +05:30
Harry (OpenERP)
4034afc923
[FIX] crm: fix
...
bzr revid: hmo@tinyerp.com-20121010072244-5wsnaqwpydx59dmg
2012-10-10 12:52:44 +05:30
Foram Katharotiya (OpenERP)
0e26c16d0f
[IMP] appear the pos fields when create a session
...
bzr revid: fka@tinyerp.com-20121010070940-vyjatobj08nmpoir
2012-10-10 12:39:40 +05:30
Harry (OpenERP)
5973c96a99
[MERGE]
...
bzr revid: hmo@tinyerp.com-20121010064137-a5udff5gr4mr8c9m
2012-10-10 12:11:37 +05:30
Ajay Chauhan (OpenERP)
63b878724e
[MERGE] merge with lp:openobject-addons
...
bzr revid: cha@tinyerp.com-20121010064111-vyuwovhjofy61fth
2012-10-10 12:11:11 +05:30
Ajay Chauhan (OpenERP)
27548d2ae5
[MERGE] merge with lp:openobject-addons
...
bzr revid: cha@tinyerp.com-20121010063725-8zb6we36o2zf6hgb
2012-10-10 12:07:25 +05:30
Saurang Suthar
229758122d
[IMP]event:improved code as per suggestion
...
bzr revid: ssu@tinyerp.com-20121010062204-gna6c83qfhqhr4zy
2012-10-10 11:52:04 +05:30
Twinkle Christian (OpenERP)
6404157707
[FIX]remove warning res.partner.address deprecated
...
bzr revid: tch@tinyerp.com-20121010061127-8e27icb0kqzsyoa5
2012-10-10 11:41:27 +05:30
Twinkle Christian (OpenERP)
4eec1b454e
[FIX]remove warning res.partner.address deprecated
...
bzr revid: tch@tinyerp.com-20121010060717-qmelz3oaxitw3laf
2012-10-10 11:37:17 +05:30
Rajesh Prajapati (OpenERP)
774d49503c
[MERGE] merge with main server
...
bzr revid: rpr@tinyerp.com-20121010053013-9k4sa09ze0anqpt4
2012-10-10 11:00:13 +05:30
Amit Patel
d48856e81a
[FIX]:point_of_sale: In the same way the %age of discount was wrong in the reporting > point of sale > Sale details, there's a problem of conversion from %age to amount in the other report (reporting > point of sale > ORDER ANALYSIS), where the Total discount is the sum of %ages converted in €. So two times 50% discount = 100€ even though the item cost 1 bazillion, which is not correct.
...
bzr revid: apa@tinyerp.com-20121010052920-7d2zl85war0bn8jr
2012-10-10 10:59:20 +05:30
pankita shah (Open ERP)
77636fcdbc
[MERGE] with lp:openobject-addons
...
bzr revid: shp@tinyerp.com-20121010052542-k0tmipytmctpwimk
2012-10-10 10:55:42 +05:30
pankita shah (Open ERP)
28bc19896d
[MERGE] merged with lp:openobject-addons
...
bzr revid: shp@tinyerp.com-20121010052449-hvnp0e53d1sp6xs2
2012-10-10 10:54:49 +05:30
Mayur Maheshwari (OpenERP)
79a84ffc5d
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20121010051917-0ep6z3xy0ff92kzo
2012-10-10 10:49:17 +05:30
Mayur Maheshwari (OpenERP)
2e0c40cb4f
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20121010051757-7rsv5orjcj6x18kg
2012-10-10 10:47:57 +05:30
Mayur Maheshwari (OpenERP)
333ca9b09e
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20121010051648-ym3il22g091ofr33
2012-10-10 10:46:48 +05:30
Mayur Maheshwari (OpenERP)
df9e56d33d
[IMP]sale: improve priority og quotation tree view
...
bzr revid: mma@tinyerp.com-20121010051522-9spi85rv30vwibr7
2012-10-10 10:45:22 +05:30
Mayur Maheshwari (OpenERP)
a324e70fc5
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20121010050840-t8ngznb3lhz1m1xf
2012-10-10 10:38:40 +05:30
Amit Patel
a69672c38a
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121010045510-fbv8rzz39mze1057
2012-10-10 10:25:10 +05:30
49b102b54a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121010044451-x88fqu2rrhax9fq4
2012-10-10 04:44:51 +00:00
Divyesh Makwana (Open ERP)
1c31287162
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20121010043229-bqz4gq67ix25jww2
2012-10-10 10:02:29 +05:30
Divyesh Makwana (Open ERP)
1014600a28
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20121010043137-p51c9n0y5vmdi79f
2012-10-10 10:01:37 +05:30
Divyesh Makwana (Open ERP)
4d9676104f
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20121010043116-5avckqse0rfsgl3g
2012-10-10 10:01:16 +05:30
Divyesh Makwana (Open ERP)
a1c855f705
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20121010043006-lxykvum2bdzuvfsi
2012-10-10 10:00:06 +05:30
Divyesh Makwana (Open ERP)
428b4d4492
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20121010042848-cvvtjmbk26uyb503
2012-10-10 09:58:48 +05:30
Divyesh Makwana (Open ERP)
f5a719cf6c
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20121010042834-woiqdv1nmxwp17le
2012-10-10 09:58:34 +05:30
Olivier Dony
09135fc7ae
[MERGE] Multiple fixes for incoming email processing
...
bzr revid: odo@openerp.com-20121009164411-0fz0wlatm7qcd3jl
2012-10-09 18:44:11 +02:00
Olivier Dony
af24485be3
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20121009155456-03uqk5jwd9qayuj4
2012-10-09 17:54:56 +02:00
Olivier Dony
e9d314646d
[FIX] mail.thread subclasses: convert body to plaintext in message_new, as body is now HTML
...
Also disable the updating of the body when new messages
are received for project.issue records, because this
might discard important information that was manually
entered.
bzr revid: odo@openerp.com-20121009155420-72xvyhhiwd696upv
2012-10-09 17:54:20 +02:00
Quentin (OpenERP)
90fc4d6651
[IMP] use of literal_eval from ast instead of const_eval from tools, as per Olivier recommendation
...
bzr revid: qdp-launchpad@openerp.com-20121009152828-3bdxpatkrl1qmyfi
2012-10-09 17:28:28 +02:00
Christophe Matthieu
8b38e9d1cd
[IMP]mail: css
...
bzr revid: chm@openerp.com-20121009150647-srzt1t1ffkw97y5h
2012-10-09 17:06:47 +02:00
Quentin (OpenERP)
3c7844ddd5
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20121009150045-4fpk56p4s0l5brct
2012-10-09 17:00:45 +02:00
fe07dc2e6d
[FIX] Fixed on_switch_mode tirggering.
...
bzr revid: vta@openerp.com-20121009145113-8sazhfrp3xaan5cq
2012-10-09 16:51:13 +02:00
Quentin (OpenERP)
c26d3da687
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20121009144132-a1ijdnboxjmmhbvs
2012-10-09 16:41:32 +02:00
Christophe Matthieu
6630d57d5c
[IMP] mail: txt2html
...
bzr revid: chm@openerp.com-20121009143645-8mwnzatpox0wll2k
2012-10-09 16:36:45 +02:00
Quentin (OpenERP)
fbbc0bad19
[IMP] all: replaced 'true' by 'True' in 'options' attribute in views, because now the syntax of these options must be expressed in python instead of json
...
bzr revid: qdp-launchpad@openerp.com-20121009143433-s4y6isbewqdn2fu2
2012-10-09 16:34:33 +02:00
Quentin (OpenERP)
c98de15a09
[IMP] osv/orm.py: evaluate in python the 'options' attribute of a field in an xml view, before enclosing it in json. This allow to use python instead of json syntax in the definition of the options of a widget, which is a much more consistent behavior
...
bzr revid: qdp-launchpad@openerp.com-20121009142607-rk3l00atu3w3kksp
2012-10-09 16:26:07 +02:00
Christophe Matthieu
7df8ef5d37
[IMP] mail: sort messages
...
bzr revid: chm@openerp.com-20121009140354-3ozec5q42ckcg16w
2012-10-09 16:03:54 +02:00
Olivier Dony
7f516d2835
[FIX] mail.message: incorrect message-id generation, id/model were swapped
...
For backwards-compatibility reasons we need to stick
with this format: `res_id-model`, even if reversing
the values would look more logical
bzr revid: odo@openerp.com-20121009135040-spvejc1l4mos25yv
2012-10-09 15:50:40 +02:00
Olivier Dony
cb57169c97
[FIX] mail.mail: typo in previous commits
...
bzr revid: odo@openerp.com-20121009134414-923kv1ciw00pxh6v
2012-10-09 15:44:14 +02:00
Olivier Dony
0ce1ef32a8
[FIX] mail: typos -> message-id header is mapped to message_id column
...
bzr revid: odo@openerp.com-20121009134020-9wf96yszv8qcmbm1
2012-10-09 15:40:20 +02:00
Sanjay Gohel (Open ERP)