Harry (OpenERP)
af2cacb42f
[MERGE]
...
bzr revid: hmo@tinyerp.com-20120914084405-0ho0ian16bp2zgqh
2012-09-14 14:14:05 +05:30
Harry (OpenERP)
e44bfc7c5a
[MERGE]
...
bzr revid: hmo@tinyerp.com-20120913054136-9zg2ud6tfwc7tmfl
bzr revid: hmo@tinyerp.com-20120914084249-fnb7d13rpizrlz6y
2012-09-14 14:12:49 +05:30
Harry (OpenERP)
840a0c9590
[MERGE]
...
bzr revid: hmo@tinyerp.com-20120914084146-1tednotth2ozxcjk
2012-09-14 14:11:46 +05:30
Harry (OpenERP)
11703cf346
[MERGE]
...
bzr revid: hmo@tinyerp.com-20120914083917-tshl4wvhbhjrbtvv
2012-09-14 14:09:17 +05:30
Raphael Collet
3409bdbee9
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20120914083614-clgqbtrk9jio2nt6
2012-09-14 10:36:14 +02:00
Christophe Matthieu
5d25e1c109
[MERGE] trunk
...
bzr revid: chm@openerp.com-20120914083540-t5bhzfksdxi2wqj5
2012-09-14 10:35:40 +02:00
Christophe Matthieu
7e673e2999
[IMP] kanban: delete one method for widget=many2many_tag
...
bzr revid: chm@openerp.com-20120914081846-oi9h8mnmmefl9p3y
2012-09-14 10:18:46 +02:00
Christophe Matthieu
4a48e74c72
[IMP] note: read_group for unknown stage and with empty stage_ids ; statusbar widget
...
bzr revid: chm@openerp.com-20120914081515-sew3sq23151ghqsr
2012-09-14 10:15:15 +02:00
Raphael Collet
35b884551a
[MERGE] trunk-improve_setting_wizard-mma (fix capitalization of field labels in settings)
...
bzr revid: rco@openerp.com-20120914074913-lbuv41yw3u3snmqy
2012-09-14 09:49:13 +02:00
Raphael Collet
c434ca413d
[FIX] purchase/res_config.py: typo
...
bzr revid: rco@openerp.com-20120914074536-u9aelmlv9j82c9mm
2012-09-14 09:45:36 +02:00
Foram Katharotiya (OpenERP)
456c0d3309
[MERGE] merge with parent branch
...
bzr revid: fka@tinyerp.com-20120913060445-4n60qq7qhaaw1spd
bzr revid: fka@tinyerp.com-20120914070718-q6804qt824tz1ccc
2012-09-14 12:37:18 +05:30
Amit Patel
ac780db318
[MERGE]:hr
...
bzr revid: apa@tinyerp.com-20120914064658-cepdpqkt3kn0ck38
2012-09-14 12:16:58 +05:30
Jiten (OpenERP)
b48a82b477
[MERGE] Merged trunk.
...
bzr revid: jra@tinyerp.com-20120914064056-q2c4zjesdxrm3s4k
2012-09-14 12:10:56 +05:30
Jiten (OpenERP)
9e2d7d09aa
[MERGE] Merged trunk.
...
bzr revid: jra@tinyerp.com-20120914064023-184wre867igps8n6
2012-09-14 12:10:23 +05:30
Ajay Chauhan (OpenERP)
65b6041e97
[FIX] event: solved the issue of not getting buttons on form view
...
lp bug: https://launchpad.net/bugs/1050747 fixed
bzr revid: cha@tinyerp.com-20120914063911-jux3xeufwd9frrv7
2012-09-14 12:09:11 +05:30
Turkesh Patel (Open ERP)
c60ca1a94b
[IMP] remove unnecessary changes.
...
bzr revid: tpa@tinyerp.com-20120914055248-zhpzklpwrur0s76m
2012-09-14 11:22:48 +05:30
Khushboo Bhatt (Open ERP)
2388c5ec28
[REM]account_coda:removed onchange attribute from xml for partner_id and type field.And removed domain for account_id
...
bzr revid: kbh@tinyerp.com-20120914054657-cxveo5dnc4cp6a4n
2012-09-14 11:16:57 +05:30
Amit Patel
53d7e98b3e
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20120914053836-rt02ojybaaeirlr5
2012-09-14 11:08:36 +05:30
Amit Patel
4c8f9907f5
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20120913051727-m8omyh3gudlj5pxd
bzr revid: apa@tinyerp.com-20120914051612-pwys78387fhgab7n
2012-09-14 10:46:12 +05:30
Turkesh Patel (Open ERP)
7e0e0df812
[IMP] remove unnecessary changes.
...
bzr revid: tpa@tinyerp.com-20120914051525-k8ksmrjmodmla352
2012-09-14 10:45:25 +05:30
Amit Patel
0ae609bef3
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20120914051523-rgkp00piurhvmt7q
2012-09-14 10:45:23 +05:30
Amit Patel
f908cfd98c
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20120913051526-thybje2gglcj0y72
bzr revid: apa@tinyerp.com-20120914051438-yfgmo3lgoidv40fg
2012-09-14 10:44:38 +05:30
Atul Patel (OpenERP)
2e65d4319f
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120912051440-raj6egoom3qyfsmm
bzr revid: atp@tinyerp.com-20120913034436-i09g3lujgvy81gr6
bzr revid: atp@tinyerp.com-20120914051314-m5g13izj55f4sxqi
2012-09-14 10:43:14 +05:30
Amit Patel
c0445392a5
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20120913052340-sjn1cty7azwi99ei
bzr revid: apa@tinyerp.com-20120914051259-b149vb146y672g6o
2012-09-14 10:42:59 +05:30
Harry (OpenERP)
7058e275a8
[MERGE]
...
bzr revid: hmo@tinyerp.com-20120914051147-3yckhyqvv1mfbv10
2012-09-14 10:41:47 +05:30
Amit Patel
8cf50dd47e
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20120914051056-znuid1t03qv2txun
2012-09-14 10:40:56 +05:30
Amit Patel
73103c0900
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20120914050938-mroxthlp466j35cq
2012-09-14 10:39:38 +05:30
Amit Patel
4eac135e08
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20120914050733-9euo3vftm8fee6sq
2012-09-14 10:37:33 +05:30
18a1eac3f0
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120914050608-ym2xpjycz25pvge9
2012-09-14 05:06:08 +00:00
Amit Patel
447ad3b3f8
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20120914050604-lbks22ofgr6emor0
2012-09-14 10:36:04 +05:30
Amit Patel
1f0d531494
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20120914050342-0ru5hcbfgggkgr54
2012-09-14 10:33:42 +05:30
Mayur Maheshwari (OpenERP)
54a3b527f2
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20120914050233-abnyaijtxlw9zsxy
2012-09-14 10:32:33 +05:30
Amit Patel
682a69ffcc
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20120914050130-c9qugrxlnwude0s7
2012-09-14 10:31:30 +05:30
Amit Patel
8631c14b40
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20120914045854-4uf1rnbysd5udyau
2012-09-14 10:28:54 +05:30
Atul Patel (OpenERP)
9883a6c825
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120912174620-3kjdtcy77wihgeg7
bzr revid: atp@tinyerp.com-20120914044722-xu7x32rzapnl50tp
2012-09-14 10:17:22 +05:30
Jigar Amin - OpenERP
d7dfc3dc1c
[MERGE] lp:openobject-addons
...
bzr revid: jam@tinyerp.com-20120912044315-t7gtrwck9fc3h9vd
bzr revid: jam@tinyerp.com-20120913045246-iuvrqt992b60tekt
bzr revid: jam@tinyerp.com-20120914042725-jiagjctwti0vd68m
2012-09-14 09:57:25 +05:30
Divyesh Makwana (Open ERP)
06d87c9c45
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20120914040923-02fqxkmbyya1wnvk
2012-09-14 09:39:23 +05:30
Antony Lesuisse
56429967c2
[MERGE] developper mode print workflow for nel
...
bzr revid: al@openerp.com-20120913192759-f1t3r9j58zwvba10
2012-09-13 21:27:59 +02:00
Fabien Pinckaers
9df7381ced
[FIX] clean error message when creating a user froma partner form
...
bzr revid: fp@tinyerp.com-20120913185231-efkupz42kovrekpx
2012-09-13 20:52:31 +02:00
Fabien Pinckaers
85f04253b7
[IMP] better layout for BE address
...
bzr revid: fp@tinyerp.com-20120913182736-t22gg05mu202b1b2
2012-09-13 20:27:36 +02:00
Fabien Pinckaers
6c7771b48c
fix
...
bzr revid: fp@tinyerp.com-20120913182256-p7crbo4889pcgg45
2012-09-13 20:22:56 +02:00
Fabien Pinckaers
b58a893844
[IMP] rename coutnries
...
bzr revid: fp@tinyerp.com-20120913182156-dh0wnc9qe0mcb5qc
2012-09-13 20:21:56 +02:00
Fabien Pinckaers
30872ea9da
[IMP] address format of leads according to country
...
bzr revid: fp@tinyerp.com-20120913181952-h19q4v0vu6geungq
2012-09-13 20:19:52 +02:00
Fabien Pinckaers
bd2ccbfd8e
[IMP] address format according to user's country
...
bzr revid: fp@tinyerp.com-20120913181638-lrxd1hrgikl6purj
2012-09-13 20:16:38 +02:00
Fabien Pinckaers
4fcfcc6001
[IMP] address format according to country of user on partners
...
bzr revid: fp@tinyerp.com-20120913175709-tu1zg2efa70ayen7
2012-09-13 19:57:09 +02:00
Christophe Matthieu
576d664f88
[IMP] note: stage by user, group by stage, access rules
...
bzr revid: chm@openerp.com-20120913171938-0zmtm2ds5mjdgttj
2012-09-13 19:19:38 +02:00
Thibault Delavallée
1cd6a90bc4
[MERGE] OpenChatter "Invite Yur Mummy" Invite branch
...
Featuring :
- Invite wizard, to add followers to a document, and to send them an email
- Invite button in Chatter, that calls the Invite wizard
- each send notification is a distinct email, one for each partner to have to receive a notification. Changes in mail_followers and mail_mail to handle this. If send receives a notifier_ids parameter, it uses it instead of the mail_mail.email_to field, and send an email to each partner. Overriding some of the methods allow to somewhat personnalize the email
- Portal: add the signin url in notifications send to portal users
- Tests: made a class for tests using emails, defining and removing mockups for the gateway. Updated mail tests, added an invite test in portal.
bzr revid: tde@openerp.com-20120913163625-7ewt7j3m63ii71jf
2012-09-13 18:36:25 +02:00
Thibault Delavallée
ddfffb47a8
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120913161324-nuc2mo1kynis151u
2012-09-13 18:13:24 +02:00
Thibault Delavallée
4efde28e55
[IMP] Portal: generate_portal_url -> generate_signin_url; slughty udpated portal tests to 1. test the generated URL 2. consider it is correct for future tests.
...
bzr revid: tde@openerp.com-20120913161226-y02gg43lua10s0k4
2012-09-13 18:12:26 +02:00
Thibault Delavallée
e4e21105b2
[FIX] mail.xml: fixed &, now classic ands.
...
bzr revid: tde@openerp.com-20120913161121-qc4m3ijwz1tbrmld
2012-09-13 18:11:21 +02:00
Harry (OpenERP)