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
Amit Patel
4181beb819
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20120914051211-7orjdzpqcpjfbd4v
2012-09-14 10:42:11 +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
f6ed42db86
[WIP] [FIX] mail: fixing access rights + related tests. WIP, already fixed mail.group and mail.alias, not readable by anonymous not-employee users.
...
bzr revid: tde@openerp.com-20120913170500-um93rzw0nq6njl39
2012-09-13 19:05:00 +02:00
Thibault Delavallée
abf6701050
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120913165123-451edw5qpyd4pu3k
2012-09-13 18:51:23 +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
niv-openerp
096251e8c5
wip
...
bzr revid: nicolas.vanhoren@openerp.com-20120913160948-5wwnw7s2jk1zkr1o
2012-09-13 18:09:48 +02:00
Thibault Delavallée
34210e5558
[FIX] follower widget: fixed multiple calls to events, due to a bind_events placed in set_value instead of start.
...
bzr revid: tde@openerp.com-20120913160329-uycrwvahbpmdlyxg
2012-09-13 18:03:29 +02:00
Antonin Bourguignon
fa00f15670
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120913155908-uk9z63tp3vv5o65g
2012-09-13 17:59:08 +02:00
Antonin Bourguignon
e66cd01467
[IMP] portal: first batch of ir rules
...
bzr revid: abo@openerp.com-20120913155810-3grgq7xht1h981m5
2012-09-13 17:58:10 +02:00
Thibault Delavallée
3180b4def5
[CLEAN] mail: cleaned mail-invite before merging. Updated some methods and var names; updated some comments.
...
bzr revid: tde@openerp.com-20120913154844-i5tikncn3sxepk34
2012-09-13 17:48:44 +02:00
Frédéric van der Essen
91b808b27a
[MERGE] point_of_sale : debug window and various fixes
...
bzr revid: fva@openerp.com-20120913154020-pn308mkkk2lp1e9j
2012-09-13 17:40:20 +02:00
Antonin Bourguignon
827bc4ec98
[IMP] portal: better ids for csv access rights
...
bzr revid: abo@openerp.com-20120913153027-64cq2njzbagdlr3h
2012-09-13 17:30:27 +02:00
Frédéric van der Essen
8920abbb65
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120913151434-y30kfigwj20w3y58
2012-09-13 17:14:34 +02:00
Frédéric van der Essen
703cc35a4d
[FIX] point_of_sale: demo data ean match the debug window defaults
...
bzr revid: fva@openerp.com-20120913150913-bq96hvr3cmbgijjg
2012-09-13 17:09:13 +02:00
Antonin Bourguignon
d6c4049865
[FIX] fields_get check_access_right
...
bzr revid: abo@openerp.com-20120913144641-ybtrvd4vyf7nfium
2012-09-13 16:46:41 +02:00
Raphael Collet
410c7e9531
[MERGE] trunk-res_rml_footer-rco (adapt to api change in res.partner.bank)
...
bzr revid: rco@openerp.com-20120913143422-liapp9mr5xayap7y
2012-09-13 16:34:22 +02:00
Raphael Collet
16abde46a3
[MERGE] trunk-res_rml_footer-rco (improve onchange on res.company form)
...
bzr revid: rco@openerp.com-20120913143150-kt34zk9yd58dthus
2012-09-13 16:31:50 +02:00
Olivier Dony
550751b358
[IMP] translations: wip, remove unnecessary code, support loading PO comments and storing them, split ir.translation view data in separate XML file
...
bzr revid: odo@openerp.com-20120913142920-ggpeqth4s2wwqwd2
2012-09-13 16:29:20 +02:00
niv-openerp
9454aa5a42
merge trunk
...
bzr revid: nicolas.vanhoren@openerp.com-20120913142630-aipokburya29ysl6
2012-09-13 16:26:30 +02:00
niv-openerp
7bc023c7a8
[IMP] made linked in module more tolerant about some linked in errors
...
bzr revid: nicolas.vanhoren@openerp.com-20120913141256-4jny0rfl0t976ko7
2012-09-13 16:12:56 +02:00
Frédéric van der Essen
200d33229a
[IMP] point_of_sale: scan and search in products packagings
...
bzr revid: fva@openerp.com-20120913140310-4z9bxo1d0r13ep76
2012-09-13 16:03:10 +02:00
Harry (OpenERP)
aa2b50eb0f
[FIX] account_budget: access right
...
bzr revid: hmo@tinyerp.com-20120913134455-p83c7d8ku023tvym
2012-09-13 19:14:55 +05:30
Amit Patel