Amit Patel
ca38083f17
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20120914100803-1h2h8golavg0wtw0
2012-09-14 15:38:03 +05:30
Amit Patel
a2688f0cf1
[MERGE]:subtype
...
bzr revid: apa@tinyerp.com-20120914094435-s1pchztypph55qae
2012-09-14 15:14:35 +05:30
Sanjay Gohel (Open ERP)
6537579a9c
[IMP]improve lead code
...
bzr revid: sgo@tinyerp.com-20120914093236-knk88eqvnbd4slct
2012-09-14 15:02:36 +05:30
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
Sanjay Gohel (Open ERP)
90532e858e
[MERGE]merge
...
bzr revid: sgo@tinyerp.com-20120914060845-d6xt33tvqtzfn11k
2012-09-14 11:38:45 +05:30
Sanjay Gohel (Open ERP)
a11e752ea2
[IMP]improve code
...
bzr revid: sgo@tinyerp.com-20120914060546-e0uj8dru6c9pym9y
2012-09-14 11:35:46 +05:30
Sanjay Gohel (Open ERP)
8821601a87
[IMP]minor changes
...
bzr revid: sgo@tinyerp.com-20120914055730-c0x2tshrr8j6aa5v
2012-09-14 11:27:30 +05:30
Sanjay Gohel (Open ERP)
2abba24ef3
[MERGE]merge with parent branch
...
bzr revid: sgo@tinyerp.com-20120914053347-u28fihi7mcetup4j
2012-09-14 11:03:47 +05:30
Sanjay Gohel (Open ERP)
a807b57f4e
[MERGE]merge with trunk addons
...
bzr revid: apa@tinyerp.com-20120911054811-24s3e1perqf7x1wo
bzr revid: apa@tinyerp.com-20120911084547-trlru6t8r1dv1yhd
bzr revid: apa@tinyerp.com-20120912050215-glxhb94pu2aed5fz
bzr revid: apa@tinyerp.com-20120913050959-re58fqvnaqrhgzg0
bzr revid: sgo@tinyerp.com-20120914053201-khnzm9ei7rpjcp7u
2012-09-14 11:02:01 +05:30
Launchpad Translations on behalf of openerp
18a1eac3f0
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120914050608-ym2xpjycz25pvge9
2012-09-14 05:06:08 +00:00
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
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
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
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
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
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
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
Raphael Collet
5f0caa6c00
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20120913131557-pn9b9utz2s89trzw
2012-09-13 15:15:57 +02:00
Antonin Bourguignon
4f365e3881
[MERGE] trunk-bug-999315-rmu: recurring line's model form view
...
properly set a company id when a journal is selected and, therefore, correctly display available accounts
lp bug: https://launchpad.net/bugs/999315 fixed
bzr revid: abo@openerp.com-20120913131548-rggrjah0ux5iu1kv
2012-09-13 15:15:48 +02:00
Mayur Maheshwari (OpenERP)
2dff9d3c39
[IMP]account : improve tool tip
...
bzr revid: mma@tinyerp.com-20120913125745-k4deap3rlva45oik
2012-09-13 18:27:45 +05:30
Raphael Collet
edcdd0447c
[FIX] base: replace rml_footer in base.xml
...
bzr revid: rco@openerp.com-20120913125731-ta2gxwtv80fh54gs
2012-09-13 14:57:31 +02:00
Olivier Dony
3e51626b2a
[REM] web_{rpc,dashboard,mobile}: remove web modules re-added by LP, after disabling the template in LP translations
...
bzr revid: odo@openerp.com-20120913125414-n4fxnmn5wjspdzea
2012-09-13 14:54:14 +02:00
Antonin Bourguignon
15b62537f5
[IMP] code cleaning
...
bzr revid: abo@openerp.com-20120913125228-mb17mk4m6dqbm5rt
2012-09-13 14:52:28 +02:00
Mayur Maheshwari (OpenERP)
b90853eaf0
[IMP]account : improve string
...
bzr revid: mma@tinyerp.com-20120913125154-75dc3d48yk1atujy
2012-09-13 18:21:54 +05:30
Vo Minh Thu
7d1d7affc5
[MERGE] fix: renamed thousand_sep to thousands_sep in test_impex, removed rml_footer1 and rml_footer2 from data as the fields were removed.
...
bzr revid: vmt@openerp.com-20120913124448-ba4kgi0brmyldkaf
2012-09-13 14:44:48 +02:00
Raphael Collet
d8aeaddc4b
[IMP] account: in settings, open the company form to change bank accounts (and company footer)
...
bzr revid: rco@openerp.com-20120913124332-hooc2b9pxuqjrpmj
2012-09-13 14:43:32 +02:00
Mayur Maheshwari (OpenERP)
761ea0f89c
[IMP]account : improve tool tip
...
bzr revid: mma@tinyerp.com-20120913123736-87k2n9a595qej21x
2012-09-13 18:07:36 +05:30
Thibault Delavallée
1c85cb8b78
[MERGE] [FIX] Fixed image sharpening in tools; this requires an image converted into RGB.
...
bzr revid: tde@openerp.com-20120913123250-e2ueblluch4aa41p
2012-09-13 14:32:50 +02:00
Mayur Maheshwari (OpenERP)
834bcdfb1a
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20120913122649-oe7fq5q0ntwinoss
2012-09-13 17:56:49 +05:30
Antonin Bourguignon
0986f13047
[FIX] recurring line's model form view
...
properly set a company id when a journal is selected and, therefore, correctly display available accounts
bzr revid: abo@openerp.com-20120913122312-v2zz8m4r8wcxovtx
2012-09-13 14:23:12 +02:00
Raphael Collet
e768bf46ab
[IMP] res.company: rewrite onchange method to compute rml_footer
...
bzr revid: rco@openerp.com-20120913122011-h9qsqizhmsibndf3
2012-09-13 14:20:11 +02:00
Raphael Collet
8ca8589b78
[IMP] res.partner.bank: make _prepare_name_get more robust (field 'id' not required)
...
bzr revid: rco@openerp.com-20120913121830-fzkkdekrxwdq421w
2012-09-13 14:18:30 +02:00
Thibault Delavallée
b2c79d266b
[FIX] mail_message: fixed record_name, because we could call a name_get on a document we can not see (if we are in the recipints of a document we can not access). name_get is therefore inside a try/except statement, getting a void string as result if AccessDenied is raised. Updated JS to avoid displaying the record name on a void string.
...
bzr revid: tde@openerp.com-20120913121110-bd0syf813h0e39gk
2012-09-13 14:11:10 +02:00