Antonin Bourguignon
85dffc18df
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120824085801-0tr9lajdtiwtpvwr
2012-08-24 10:58:01 +02:00
Thibault Delavallée
4969c586b4
[FIX] mail_mail: temp fix, commented headers propagation; mail_followers: send emails accordign to email preferences was not correct.
...
bzr revid: tde@openerp.com-20120824085342-aa9s1ojl2j3v85fk
2012-08-24 10:53:42 +02:00
Quentin (OpenERP)
0255e6f221
[MERGE] demo data branch
...
bzr revid: qdp-launchpad@openerp.com-20120824085223-qeri3eoqage6hwzs
2012-08-24 10:52:23 +02:00
Vo Minh Thu
b218f74b28
[FIX] uninstall: delete all given ir_model_relation/ir_model_constraint (still making sure the protected resource is not deleted if still referenced elsewhere).
...
bzr revid: vmt@openerp.com-20120824085201-a0ucfta7jwgph0ke
2012-08-24 10:52:01 +02:00
Sanjay Gohel (Open ERP)
cc56b498a1
[IMP]if record is unread it also show only those record which checked in subtype
...
bzr revid: sgo@tinyerp.com-20120824084628-r9bvejcya6mt6l33
2012-08-24 14:16:28 +05:30
Meera Trambadia
afad98e5b5
[MERGE] with lp:openobject-addons
...
bzr revid: mtr@tinyerp.com-20120824084459-h46fbrmp1tvet9k5
2012-08-24 14:14:59 +05:30
Twinkle Christian (OpenERP)
a932d1dc00
[MERGE]merge with main branch
...
bzr revid: tch@tinyerp.com-20120824084232-8b0x7euh7m9f0yor
2012-08-24 14:12:32 +05:30
Mayur Maheshwari (OpenERP)
3e79640aaf
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20120824083535-hvv8cex6d33hfh2o
2012-08-24 14:05:35 +05:30
Twinkle Christian (OpenERP)
523a7610c4
[MERGE]merge with main branch
...
bzr revid: tch@tinyerp.com-20120824070907-g6g6jpkj2t10kals
2012-08-24 12:39:07 +05:30
Jiten (OpenERP)
4cc734842c
[MERGE] Merge from trunk.
...
bzr revid: jra@tinyerp.com-20120824070810-3b0h83ej311os08k
2012-08-24 12:38:10 +05:30
Divyesh Makwana (Open ERP)
12d69b3488
[FIX] sale : Traceback on clicking 'View Invoice' button.
...
lp bug: https://launchpad.net/bugs/1038918 fixed
bzr revid: mdi@tinyerp.com-20120824070444-o43u79mvcg8ga99p
2012-08-24 12:34:44 +05:30
Mustufa Rangwala (OpenERP)
7902111733
[MERGE] Merge from main addons
...
bzr revid: mra@tinyerp.com-20120823112104-5d4bx6cypst26zr0
bzr revid: mra@tinyerp.com-20120824064641-7jn10i1ykbndaywr
2012-08-24 12:16:41 +05:30
Twinkle Christian (OpenERP)
041b29e164
[MERGE]merge with main branch
...
bzr revid: tch@tinyerp.com-20120824063338-xjf9tt2or8mp6kcg
2012-08-24 12:03:38 +05:30
Dharti Ratani (OpenERP)
927ef928a3
[Merge]merged with trunk
...
bzr revid: dhr@tinyerp.com-20120823094724-7w7rv6ma5p89v9fe
bzr revid: dhr@tinyerp.com-20120823132250-88n61c3yaw0r50l7
bzr revid: dhr@tinyerp.com-20120824061705-ll37s5lnpgu7e7xg
2012-08-24 11:47:05 +05:30
Jiten (OpenERP)
b58a469903
[MERGE] Merged from trunk.
...
bzr revid: jra@tinyerp.com-20120824061523-cj132yeribl4me08
2012-08-24 11:45:23 +05:30
Twinkle Christian (OpenERP)
6378c92d7c
[MERGE]merge with main branch
...
bzr revid: tch@tinyerp.com-20120824055833-8xbhra27zvke35pm
2012-08-24 11:28:33 +05:30
Bhumi Thakkar (Open ERP)
8a23424065
[IMP] return true added in button_check_vat method.
...
bzr revid: bth@tinyerp.com-20120824055312-u7jjrxifef7kparr
2012-08-24 11:23:12 +05:30
Ajay Chauhan (OpenERP)
87e7926a14
[IMP] account_asset: fixed depriciation board calculation problem
...
bzr revid: cha@tinyerp.com-20120824054747-vgfv4e3xv7h7ao0r
2012-08-24 11:17:47 +05:30
Jigar Amin - OpenERP
813db083ff
[REF] refectroed the row count code
...
bzr revid: jam@tinyerp.com-20120824054547-v3me14ca341rkj44
2012-08-24 11:15:47 +05:30
Jigar Amin - OpenERP
12f01f09a1
[IMP] 1] if create='false' no extra row in a editable embeded list.
...
2] If edit='false' o2mfrom pop should be on readony mode
bzr revid: jam@tinyerp.com-20120824053459-91ejrex8ox4hfptz
2012-08-24 11:04:59 +05:30
Ajay Chauhan (OpenERP)
53c75799ee
[MERGE] merge with main addons
...
bzr revid: cha@tinyerp.com-20120824053413-muusma66uwo92313
2012-08-24 11:04:13 +05:30
Ajay Chauhan (OpenERP)
987e362d7f
[IMP] account_asset: revert old changes
...
bzr revid: cha@tinyerp.com-20120824051706-16pn120zdtxfve49
2012-08-24 10:47:06 +05:30
Amit Patel (OpenERP)
bd10c0ae19
[MERGE]
...
bzr revid: apa@tinyerp.com-20120824050332-lf9p5bmov0e2wy3o
2012-08-24 10:33:32 +05:30
Olivier Dony
cd67c50e29
[MERGE] crm: cherry-pick of mass conversion improvements from 6.1
...
This corresponds to rev.6762 from 6.1, which includes a lot
of fixes related to mass conversions, and is completely
related to the kind of fixes currently done for crm during
the mail refactoring.
This should not break crm more than it is already in this branch.
bzr revid: odo@openerp.com-20120823200629-1m1eym62l7aabzgl
2012-08-23 22:06:29 +02:00
Olivier Dony
a7193cb193
[FIX] crm: fix some missing bits after the big refactoring
...
bzr revid: odo@openerp.com-20120823193130-4u42mhyih43k32nb
2012-08-23 21:31:30 +02:00
Olivier Dony
2c4ed841b9
[FIX] mail: make message_process/parse work, restore attachment_ids m2m on mail.message, various lint cleanup
...
bzr revid: odo@openerp.com-20120823185443-zsnm6g14r6e42y3i
2012-08-23 20:54:43 +02:00
Thibault Delavallée
95a66586d9
[REF] [TEST] mail: cleaned the way followers are added to a message partner_ids (done in notify in mail.message) and the way emails are send (done in notify in mail.followers). Composition wizard override mail_message.notify to avoid having partners and sending emails. Also added tests that helped finding some bugs, that will be cleaned tomorrow.
...
bzr revid: tde@openerp.com-20120823180648-8xpu8qyf7qr6azc2
2012-08-23 20:06:48 +02:00
Antonin Bourguignon
b28a956248
[IMP] module: properly translate module's description
...
bzr revid: abo@openerp.com-20120823173418-1qed27su2x0jy1ku
2012-08-23 19:34:18 +02:00
Antonin Bourguignon
c43b1f298b
[IMP] module: set two distinct fields for module's description: one for the RST and the other for the HTML
...
this way, we keep translatable the text field
bzr revid: abo@openerp.com-20120823161959-3hewgtegb5h1yw93
2012-08-23 18:19:59 +02:00
Minh Tran
decab66e70
added hover effect to menu counter
...
bzr revid: mit@openerp.com-20120823161953-h5sc0npkpz5drgq1
2012-08-23 18:19:53 +02:00
Fabien Pinckaers
d808f69390
imp_demo
...
bzr revid: fp@tinyerp.com-20120823161655-z823jx02ymg4kmky
2012-08-23 18:16:55 +02:00
Vo Minh Thu
33e9e66f71
[FIX] uninstall: pass IDs instead of names to _module_data_uninstall().
...
bzr revid: vmt@openerp.com-20120823161008-is5xqfe4et8xx51k
2012-08-23 18:10:08 +02:00
Fabien Pinckaers
2c29bd58f0
[IMP] blue color on unread messages
...
bzr revid: fp@tinyerp.com-20120823160416-23a11k1ivu2md34v
2012-08-23 18:04:16 +02:00
Christophe Simonis
ca4c2b8c49
[FIX] correct module menu
...
bzr revid: chs@openerp.com-20120823160308-23iwttphu7l3xan9
2012-08-23 18:03:08 +02:00
Fabien Pinckaers
462fc03987
fix
...
bzr revid: fp@tinyerp.com-20120823155747-0ysezcil7hcy1sv0
2012-08-23 17:57:47 +02:00
Christophe Simonis
b59d9213d6
merge upstream
...
bzr revid: chs@openerp.com-20120823155420-svuhqxa1kmn3mtf4
2012-08-23 17:54:20 +02:00
Christophe Simonis
d73d78d4c8
[IMP] connect to test server
...
bzr revid: chs@openerp.com-20120823155234-welcel8i5odi6hh8
2012-08-23 17:52:34 +02:00
niv-openerp
5b6c4072fd
[FIX] problem with m2o
...
bzr revid: nicolas.vanhoren@openerp.com-20120823153710-0wjh1248zp42dh9b
2012-08-23 17:37:10 +02:00
Antonin Bourguignon
9aff056e73
[MERGE] minor improvements on @noupdate
...
also fix some indentation
bzr revid: abo@openerp.com-20120823153322-30rp469l5xlgff0v
2012-08-23 17:33:22 +02:00
Antonin Bourguignon
6ebb35dc02
[MERGE] minor improvements on @noupdate
...
bzr revid: abo@openerp.com-20120823153243-1iv8cfqoeg9qt95f
2012-08-23 17:32:43 +02:00
Thibault
cd4a62996a
[REF] mail_alias: moved _auto_init code from res_users and hr_recruitment to mail_alias, using a kewl call to migrate_to_alias.
...
bzr revid: odo@openerp.com-20120823153203-8tm3lbqah6vwd7co
2012-08-23 17:32:03 +02:00
Stephane Wirtel
b90a483138
[MERGE] Remove the embedded pychart library, and use the online version
...
bzr revid: stw@openerp.com-20120823150546-3pi7gw8oq2elpnt4
2012-08-23 17:05:46 +02:00
Thibault Delavallée
d0d14766fc
[FIX] mail.js: fixed do_action of Wall.
...
bzr revid: tde@openerp.com-20120823150229-7vp9hbfb80bo29xf
2012-08-23 17:02:29 +02:00
Stephane Wirtel
0063d75e60
[MERGE] remove some warnings
...
bzr revid: stw@openerp.com-20120823145817-541k18v9zjx27iqm
2012-08-23 16:58:17 +02:00
Stephane Wirtel
4f2bea0064
[MERGE] the read of a currency should return a list of dict
...
bzr revid: stw@openerp.com-20120823144846-6mwudsirma64wdzs
2012-08-23 16:48:46 +02:00
Fabien Pinckaers
84625969c0
[FIX] needaction on mail.groups
...
bzr revid: fp@tinyerp.com-20120823143525-28mnbgd015jd8yyd
2012-08-23 16:35:25 +02:00
Quentin (OpenERP)
f6a4aae8c2
[FIX] lp: 1038173
...
bzr revid: qdp-launchpad@openerp.com-20120823143521-3517gexkbqkljnp1
2012-08-23 16:35:21 +02:00
Quentin (OpenERP)
afa60ebc74
[FIX] lp: 1039013, where an id is given to name_get instead of a list of ids
...
lp bug: https://launchpad.net/bugs/1039013 fixed
bzr revid: qdp-launchpad@openerp.com-20120823142656-nsqml3jnyylpgzxu
2012-08-23 16:26:56 +02:00
Fabien Pinckaers
08f22c7411
fix
...
bzr revid: fp@tinyerp.com-20120823142622-8dsevh9eqarj1nht
2012-08-23 16:26:22 +02:00
Antonin Bourguignon
445ddc7594
[IMP] indentation
...
bzr revid: abo@openerp.com-20120823142036-e0kmr9ri1e8ns56d
2012-08-23 16:20:36 +02:00
Antonin Bourguignon