niv-openerp
6229869bc1
Removed remaining usages
...
bzr revid: nicolas.vanhoren@openerp.com-20120814135324-7s3nmywqyikgvvui
2012-08-14 15:53:24 +02:00
niv-openerp
3ebfaedd64
[IMP] removed a lot of OldWidget usage
...
bzr revid: nicolas.vanhoren@openerp.com-20120814134246-y2awqbt2i1hcan61
2012-08-14 15:42:46 +02:00
niv-openerp
183b85f750
[IMP] Removed OldWidget in data.js
...
bzr revid: nicolas.vanhoren@openerp.com-20120814133107-prmdonwh6f7gu276
2012-08-14 15:31:07 +02:00
niv-openerp
ba5314947b
[IMP] added html field, removed text_html widget
...
bzr revid: nicolas.vanhoren@openerp.com-20120814131030-yrs7wlc53zn8omor
2012-08-14 15:10:30 +02:00
niv-openerp
91c6cb6d8d
[IMP] replaced text_html widget by html field
...
bzr revid: nicolas.vanhoren@openerp.com-20120814131003-5iquqrl8g85v2otc
2012-08-14 15:10:03 +02:00
Antonin Bourguignon
e850c38b2f
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120814125315-7p70wxl91l8o1nv9
2012-08-14 14:53:15 +02:00
vta vta@openerp.com
ba5168192a
[FIX] main.py
...
bzr revid: vta@openerp.com-20120814124636-nhv4iurcc9phe3cm
2012-08-14 14:46:36 +02:00
Mayur Maheshwari (OpenERP)
b5c6ed5197
[MERGE]Merge with parent branch
...
bzr revid: mma@tinyerp.com-20120814123614-36hf9mz1obl52mk7
2012-08-14 18:06:14 +05:30
Olivier Dony
11bdbfd183
[MERGE] Next batch of improvements/fixes for mail.alias
...
bzr revid: odo@openerp.com-20120814123050-xw3ltthoc9nld76r
2012-08-14 14:30:50 +02:00
Purnendu Singh (OpenERP)
b5fbb818f2
[IMP] small fix
...
bzr revid: psi@tinyerp.com-20120814122543-7o6hkxpy3ecap1m1
2012-08-14 17:55:43 +05:30
Antonin Bourguignon
c070b68d31
[IMP] portal: customize events menu tooltips
...
bzr revid: abo@openerp.com-20120814121512-0kmgpw5p31bi1mnw
2012-08-14 14:15:12 +02:00
Thibault Delavallée
89e404301b
[CLEAN] mail_group_menu: cleaned file, added some doc.
...
bzr revid: tde@openerp.com-20120814121202-zuhu88g95p78ggdc
2012-08-14 14:12:02 +02:00
Vo Minh Thu
2376fe0add
[MERGE] merged view changes: the `type` is now a functional field derived from the arch.
...
bzr revid: vmt@openerp.com-20120814121117-dent4ctz89kdcabi
2012-08-14 14:11:17 +02:00
vta vta@openerp.com
ebc010fd39
[FIX] Fixed auth_oauth method
...
bzr revid: vta@openerp.com-20120814115555-qyveeb9fibs598rh
2012-08-14 13:55:55 +02:00
Thibault Delavallée
19abc35ce6
[CLEAN] Cleaned mail_group and mail.js due to the merge of trunk.
...
bzr revid: tde@openerp.com-20120814115222-gxunwfuttejrock0
2012-08-14 13:52:22 +02:00
Thibault Delavallée
0eccca51d5
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120814114638-pkj3d70sg9mr2hkv
2012-08-14 13:46:38 +02:00
Thibault Delavallée
4dd85980ec
[IMP] mail_group: removed fields now delegated to mail_thread; updated doc and kanban view accordingly.
...
bzr revid: tde@openerp.com-20120814114021-vwiz24yu2mo75jt7
2012-08-14 13:40:21 +02:00
Thibault Delavallée
70f8659e78
[IMP] mail_thread: method to calculate mail values is now _get_message_data; added message_is_follower field, with its computation; cleaned a bit the code.
...
bzr revid: tde@openerp.com-20120814113937-a7279ud2rj5fixl9
2012-08-14 13:39:37 +02:00
Purnendu Singh (OpenERP)
a6bd413462
[merge] merge with main addons
...
bzr revid: psi@tinyerp.com-20120814113447-3c20ay8rtvht373i
2012-08-14 17:04:47 +05:30
Purnendu Singh (OpenERP)
14e4696c0d
[IMP] hr_expense: update journal on currency change and improve the code for multicurrency
...
bzr revid: psi@tinyerp.com-20120814113320-wf5bnieerjo7yt86
2012-08-14 17:03:20 +05:30
Fabien Pinckaers
ff9cbe0673
[MERGE] mail groups improvements
...
better form view
security on groups: public, private, selected groups (for employees)
menu automatically created/filtered
action to open a specific group inline
small fix in composition: new msg not linked to current user
bzr revid: fp@openerp.com-20120814112942-8wo9owa14hk5xqbj
2012-08-14 13:29:42 +02:00
Fabien Pinckaers
85ca542ad0
[IMP] mail groups improvements: security
...
bzr revid: fp@openerp.com-20120814112204-hwamufqqz4qj9ptb
2012-08-14 13:22:04 +02:00
Thibault Delavallée
2edf42928b
[MERGE] 'My Second Not-Chatter Merge of the Day': add a deprecated attribute on fields.
...
This revision adds a string 'deprecated' attribute on fields. This addons-side merge is a small addition to be used as an example. The 'member_ids' field of mail.group is set as deprecated, as it will disappear when merging openchater-3-5-followers task, putting a real follower_ids fields on mail.thread objects.
bzr revid: tde@openerp.com-20120814111111-xq9ddv5w3favht93
2012-08-14 13:11:11 +02:00
Olivier Dony
0a22166f88
[FIX] mail.alias: fix constraint creation warnings + properly hide alias on creation form for inhering classes
...
bzr revid: odo@openerp.com-20120814105114-ei0qbgy71fyc8jtb
2012-08-14 12:51:14 +02:00
Thibault Delavallée
65f589dda5
[IMP] mail.gorup: added deprecated attribute on field that will trigger a warning.
...
bzr revid: tde@openerp.com-20120814104233-91qvv2bqc0d3mtc1
2012-08-14 12:42:33 +02:00
Christophe Simonis
b1e5c9e1ae
[FIX] auth_openid: use set_cookie_and_redirect + handle errors correctly
...
bzr revid: chs@openerp.com-20120814104052-tw5zgqu5nb12zj5c
2012-08-14 12:40:52 +02:00
Fabien Pinckaers
dcc24957bd
[IMP] small css improvement
...
bzr revid: fp@openerp.com-20120814103911-8l63u3bahy9w4xsj
2012-08-14 12:39:11 +02:00
Christophe Simonis
747374f98f
[FIX] hide/show topbar and leftbar on login page and db manager
...
bzr revid: chs@openerp.com-20120814103815-ajdku32ngf5eidrf
2012-08-14 12:38:15 +02:00
Thibault Delavallée
4cb99779ba
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120814103247-ft1lda03ud0rv62q
2012-08-14 12:32:47 +02:00
Olivier Dony
0b2118c10d
[FIX] project.issue: duplicate method, probably bad merge
...
bzr revid: odo@openerp.com-20120814102425-50sbp71muozamm61
2012-08-14 12:24:25 +02:00
Thibault Delavallée
15d997d37b
[RM] [CLEAN] auth_signup: removed unique constraint on email, because what is important is the login; added licence header in files.
...
bzr revid: tde@openerp.com-20120814101535-3fxb1w88qh33srbi
2012-08-14 12:15:35 +02:00
Olivier Dony
d7a2131fd2
[FIX] mail.group: fix broken form view - still needs work!
...
bzr revid: odo@openerp.com-20120814100521-0dac576zzdfhi1mg
2012-08-14 12:05:21 +02:00
Olivier Dony
fcdd930396
[IMP] mail.alias: use hyphen instead of underscore for replacing invalid chars, looks better for mail aliases
...
bzr revid: odo@openerp.com-20120814100354-2sn0505046wv27ot
2012-08-14 12:03:54 +02:00
Olivier Dony
8fac3ae62e
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20120814100217-33qe1dyc3w6vfs0g
2012-08-14 12:02:17 +02:00
Christophe Simonis
a1d68fb739
[IMP] execute original action after login. also pass the current state to login (so the Widget can handle it)
...
bzr revid: chs@openerp.com-20120814094654-fmimm145mrgvznb0
2012-08-14 11:46:54 +02:00
Thibault Delavallée
988e04188a
[RM] Portal: removed res_users override, because partner_id is now in base. Removed view and update init and openerp files accordingly.
...
bzr revid: tde@openerp.com-20120814093202-7do78o1h9z44aj53
2012-08-14 11:32:02 +02:00
Thibault Delavallée
c057c5ec34
[IMP] mail.group: set member_ids as deprecated.
...
bzr revid: tde@openerp.com-20120814090857-2q6a1e9ovrijetea
2012-08-14 11:08:57 +02:00
Fabien Pinckaers
6f7b789f7a
[IMP] mail group in menu
...
bzr revid: fp@openerp.com-20120814090719-7dals8fzupv9cx4j
2012-08-14 11:07:19 +02:00
Thibault Delavallée
9463536724
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120814090341-2qvwriaa09mwn186
2012-08-14 11:03:41 +02:00
Thibault Delavallée
bc7ad9c405
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120814084936-04v0hywe2drc9qum
2012-08-14 10:49:36 +02:00
Thibault Delavallée
54cce9916e
[MERGE] This 'A Brand New Not-Chatter Branch for Bender' branch fixes some of the warnings / issues :
...
- mail_thread warnings about hasattr(user_id) -> now checks if user_id in columns
- this has trigerred a bug about needaction_user_ids -> called in mail_thread only if defined, all mail_thread objects are not inheriting from need action
- base_calendar: xml files holding values for fields that does not exist
- crm: fixed some warning due to categ_id that became categ_ids; it could have been interesting to check the categ_id(s) behavior before merging
- crm lead demo data: message subtype is now content_subtype since one of the Chatter merge
- misc addons: product.product does not have any 'product_image' field anymore, but an 'image' field
bzr revid: tde@openerp.com-20120814084510-ay2ul0ceru12nkyh
2012-08-14 10:45:10 +02:00
Olivier Dony
ac4e5d746b
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20120814082029-i1b7d4l5cqgs434g
2012-08-14 10:20:29 +02:00
Thibault Delavallée
8d2c35cc75
[IMP] Misc addons: product_image -> image.
...
bzr revid: tde@openerp.com-20120814081616-zb5xe06cy8r3n5ie
2012-08-14 10:16:16 +02:00
Olivier Dony
28148809a1
[IMP] mail.alias: start writing tests, fix detected errors
...
bzr revid: odo@openerp.com-20120814080421-nn6h3z4v54dl949c
2012-08-14 10:04:21 +02:00
Thibault Delavallée
936a2efa46
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120814075258-52pwvh03fl5fjkqg
2012-08-14 09:52:58 +02:00
Thibault Delavallée
0c45b4763c
[FIX] mail_thread: added forgotten brackets in hasattr.
...
bzr revid: tde@openerp.com-20120814075234-t9v53dtfefg70zmt
2012-08-14 09:52:34 +02:00
niv-openerp
39691fd0b5
merge trunk
...
bzr revid: nicolas.vanhoren@openerp.com-20120814071749-1ol2c4ruip6bqsu6
2012-08-14 09:17:49 +02:00
niv-openerp
3052a5fa1a
merge trunk
...
bzr revid: nicolas.vanhoren@openerp.com-20120814071632-jifvgwkj6lawrqo7
2012-08-14 09:16:32 +02:00
Mayur Maheshwari (OpenERP)
48f2640283
[FIX]hr_expense :put an onchange in the currency field that fill the force journal field with a purhcase journal that has the same currency
...
bzr revid: mma@tinyerp.com-20120814065201-57472t4o0wma1232
2012-08-14 12:22:01 +05:30
Fabien Pinckaers
29eb174ce5
[ADD] mail: mail groups
...
extract groups and add new features to them?
bzr revid: fp@tinyerp.com-20120814065136-nlwh14rwbgj57tqx
2012-08-14 08:51:36 +02:00
Mayur Maheshwari (OpenERP)
25367f13bb
[FIX]hr_expense :improve fource journal if fource journal have currency convert the expense to that currency
...
bzr revid: mma@tinyerp.com-20120814054348-6ofe8r0fcksbhp85
2012-08-14 11:13:48 +05:30
Launchpad Translations on behalf of openerp
cd04752f66
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120814044618-2edn0a32irj2dpr6
2012-08-14 04:46:18 +00:00
Antony Lesuisse
e51d72422c
[IMP] move session_context above wsgi app
...
bzr revid: al@openerp.com-20120813232405-qna3d48h6j8tfks1
2012-08-14 01:24:05 +02:00
Antony Lesuisse
01d89b15b7
[IMP] rename session cookie into httpsession_cookie
...
bzr revid: al@openerp.com-20120813231123-wodv8vkof9dvi1gh
2012-08-14 01:11:23 +02:00
Thibault Delavallée
f397e44b2f
[FIX] portal: mail_subscription -> mail_followers.
...
bzr revid: tde@openerp.com-20120813195419-c1j3r95wyj7fb0hj
2012-08-13 21:54:19 +02:00
Thibault Delavallée
3d3f17c465
[FIX] crm_opp_to_phonecall: I was quite too fast for last rev, phonecall has categ_id, not categ_ids.
...
bzr revid: tde@openerp.com-20120813195210-lj58w2hc1r0yxj1u
2012-08-13 21:52:10 +02:00
Thibault Delavallée
634a68a0ff
[FIX] mail_thread: protection for needaction_user_ids: check if has the method.
...
bzr revid: tde@openerp.com-20120813195023-jv4pi1ct6tj30n4r
2012-08-13 21:50:23 +02:00
Thibault Delavallée
2ae73a7615
[REF] mail_thread: updated message_ids and message_summary computation due to changes in followers.
...
bzr revid: tde@openerp.com-20120813194115-j125ubffz7alghzv
2012-08-13 21:41:15 +02:00
Thibault Delavallée
882eff5556
[REF] mail.group: continuing the refactoring. member_ids field deleted, because this is now a standard field on mail.thread. Updated view and methods accordingly.
...
bzr revid: tde@openerp.com-20120813194037-qm2xamhgnos3gqpt
2012-08-13 21:40:37 +02:00
Thibault Delavallée
f6155e6fa0
[FIX] mail_followers_view: deleted read field from view, because was deleted from modele.
...
bzr revid: tde@openerp.com-20120813193910-5rnsgm0wf3hikkss
2012-08-13 21:39:10 +02:00
Thibault Delavallée
a52b57acf4
[REF] Still refactoring of names: propagated to security files.
...
bzr revid: tde@openerp.com-20120813193841-yavky2odabj5li70
2012-08-13 21:38:41 +02:00
Thibault Delavallée
0c3e1607de
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120813193029-jsilsux051e53van
2012-08-13 21:30:29 +02:00
Thibault Delavallée
c14a28fd93
[MISC] mail_thread: updated one comment.
...
bzr revid: tde@openerp.com-20120813192427-vw2id9wtd1hil9as
2012-08-13 21:24:27 +02:00
Thibault Delavallée
9a3680e7f5
[REF] mail: init and openerp files updated with followers instead of subscription.
...
bzr revid: tde@openerp.com-20120813191501-tapi42znpz9bckiy
2012-08-13 21:15:01 +02:00
Thibault Delavallée
838e63a429
[REF] mail_thread: refactoring of followers continuing. Updated reference to subscription to followers. Also removed message_read_subscribers and message_is_subscriber, not used anymore.
...
bzr revid: tde@openerp.com-20120813191346-cpn09u4xqiesvpwb
2012-08-13 21:13:46 +02:00
Thibault Delavallée
ff0a280a7e
[REF] mail.subscription: renamed to mail.followers. Also renamed files accordingly. Views and menu entries have been updated. Also removed an ununsed read field on mail.notification.
...
bzr revid: tde@openerp.com-20120813191006-jf7vygdyb93k7nxf
2012-08-13 21:10:06 +02:00
Thibault Delavallée
59d8cb124c
[IMP] mail_thread: do not subscribe followers already subscribed.
...
bzr revid: tde@openerp.com-20120813183312-qpuksy9ku7z5zemx
2012-08-13 20:33:12 +02:00
Minh Tran
45660bff5c
Brand new status breadcrum! (TODO: update js for clickable buttons)
...
bzr revid: mit@openerp.com-20120813182946-ep9231bf7bksyvev
2012-08-13 20:29:46 +02:00
Thibault Delavallée
ceff2d6110
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120813181421-tul284j7ybvrevjd
2012-08-13 20:14:21 +02:00
Thibault Delavallée
98b17f6e96
[IMP] mail_thread: many2many_reference: now overrides the 6 command.
...
bzr revid: tde@openerp.com-20120813180941-n0u1xq0dx2cf8rsf
2012-08-13 20:09:41 +02:00
Christophe Simonis
f2c059312b
[IMP] split login_and_redirect() into login_and_redirect() and set_cookie_and_redirect()
...
bzr revid: chs@openerp.com-20120813171301-w1ynjqhosrt68ppa
2012-08-13 19:13:01 +02:00
Antony Lesuisse
5fe34edd38
[IMP] update backbone
...
bzr revid: al@openerp.com-20120813170739-kxm4s289mbm2tty4
2012-08-13 19:07:39 +02:00
Christophe Simonis
3e797902fc
[FIX] /login route
...
bzr revid: chs@openerp.com-20120814120335-6lc0u21r0mhd9bl2
2012-08-14 14:03:35 +02:00
Vo Minh Thu
9822629548
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
niv-openerp
1ea43c0a23
Changed necessary fields
...
bzr revid: nicolas.vanhoren@openerp.com-20120813160654-kdebwwds8eysxtar
2012-08-13 18:06:54 +02:00
Thibault Delavallée
a4e674a913
[IMP] mail: cleaned (un)follow process. Methods now return the new field value, the widget calls set_value to update the displayed value. More consistent with OpenERP web behavior (I think). Misc improvements in code, more general.
...
bzr revid: tde@openerp.com-20120813160027-tx4p80kvxwbkg66c
2012-08-13 18:00:27 +02:00
Antonin Bourguignon
47976b0f42
[MERGE] simplify portal's jobs section
...
bzr revid: abo@openerp.com-20120813154637-2tdmpl5pgmx7a0sp
2012-08-13 17:46:37 +02:00
niv-openerp
1ea62dd94c
Added protection
...
bzr revid: nicolas.vanhoren@openerp.com-20120813154555-rw4kh1jxdbmg8xab
2012-08-13 17:45:55 +02:00
Christophe Simonis
6a33cfa71a
[IMP] auth_openid: use registry.cursor() instead of utils.cursor()
...
bzr revid: chs@openerp.com-20120813154419-4rwe6d4w6w0irl37
2012-08-13 17:44:19 +02:00
Christophe Simonis
f25ad66a8f
[FIX] auth_openid: correct Login template overwrite
...
bzr revid: chs@openerp.com-20120813154309-ka8cfp777ktglfr6
2012-08-13 17:43:09 +02:00
vta vta@openerp.com
6b2738dc13
[FIX] added password to auth process
...
bzr revid: vta@openerp.com-20120814101337-b3ucei2tdyyinsbd
2012-08-14 12:13:37 +02:00
vta vta@openerp.com
acd84e72c6
[FIX] res_user check method partial fix.
...
bzr revid: vta@openerp.com-20120814063413-kymp5dq5sbz2iih8
2012-08-14 08:34:13 +02:00
niv-openerp
235f8996bf
Implemented read only mode
...
bzr revid: nicolas.vanhoren@openerp.com-20120813154011-hgq3vxxdps5s9w91
2012-08-13 17:40:11 +02:00
Antonin Bourguignon
c06ff002b5
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120813152604-c55hayq9h29ovzdc
2012-08-13 17:26:04 +02:00
Thibault Delavallée
74a2396949
[CLEAN] mail_thread: 1-sign cleaning.
...
bzr revid: tde@openerp.com-20120813152437-vbuie6z4g51th7rz
2012-08-13 17:24:37 +02:00
niv-openerp
8c7b192ab7
Removed useless dependency between fieldtexthtml and fieldtext
...
bzr revid: nicolas.vanhoren@openerp.com-20120813152227-29l173q31tcwc9tq
2012-08-13 17:22:27 +02:00
Antony Lesuisse
2a84ba0160
[IMP] use registry contextmanager
...
bzr revid: al@openerp.com-20120813152045-woeg16q10xkhiqgk
2012-08-13 17:20:45 +02:00
Christophe Simonis
661b4e0786
[IMP] auth_signup: use contextmanager to manage the cursor
...
bzr revid: chs@openerp.com-20120813150605-964tpaedgremjnoa
2012-08-13 17:06:05 +02:00
Antonin Bourguignon
381d97cbf2
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120813145754-wjihljr9iyc2ll08
2012-08-13 16:57:54 +02:00
Stephane Wirtel
36aaaf4a32
[MERGE]
...
bzr revid: stw@openerp.com-20120813145708-botpw2f1shkhv3on
2012-08-13 16:57:08 +02:00
Thibault Delavallée
c008f8973a
[IMP] mail_thread: updated override of many2many (1 and 4 opcodes now supported); fixed write that could go into a loop. Do not subscribe the guy that write on subscribers.
...
bzr revid: tde@openerp.com-20120813145526-tm8cjegtdoymrax7
2012-08-13 16:55:26 +02:00
niv-openerp
78f92ec031
Some tuning in text html
...
bzr revid: nicolas.vanhoren@openerp.com-20120813145111-s8uw1x4fc26xe6xl
2012-08-13 16:51:11 +02:00
Fabien Pinckaers
b79db6f0b3
[IMP] useability, hide fields on partners when not used
...
bzr revid: fp@tinyerp.com-20120813143731-8omk52y879rgbjc1
2012-08-13 16:37:31 +02:00
Christophe Simonis
26efdb4b98
merge upstream
...
bzr revid: chs@openerp.com-20120813143423-gkbtqsmwuy1fn9nh
2012-08-13 16:34:23 +02:00
Christophe Simonis
0f1aa3300d
[FIX] do not autocorrect location header in redirects
...
bzr revid: chs@openerp.com-20120813135927-k32eih6tg6y28ivl
2012-08-13 15:59:27 +02:00
Fabien Meghazi
41791f7e2f
[FIX] Fix bug in binary/image controller
...
bzr revid: fme@openerp.com-20120813135653-zvk21ch7dc9rs66w
2012-08-13 15:56:53 +02:00
Antonin Bourguignon
b8ba2d279b
[IMP] portal's jobs are now a mail group (no more relation with hr_recruitment)
...
bzr revid: abo@openerp.com-20120813133827-ta4zh1s2gbl4a4ib
2012-08-13 15:38:27 +02:00
Stephane Wirtel
c356b0ea47
[MERGE] procurement: Fix a part of the code
...
bzr revid: stw@openerp.com-20120813133528-1n8sykpenpjkgi74
2012-08-13 15:35:28 +02:00
Christophe Simonis
4077ff353b
[FIX] auth_signup: flake8
...
bzr revid: chs@openerp.com-20120813132543-v79g6om8a4ge9zsb
2012-08-13 15:25:43 +02:00
Mayur Maheshwari (OpenERP)
52eb6fd1dd
[FIX]hr_expense :improve voucher if voucher journal have currency convert the expense to that currency
...
bzr revid: mma@tinyerp.com-20120813132347-j6f6uy991wbrogfi
2012-08-13 18:53:47 +05:30
Thibault Delavallée
9a3deaf3da
[IMP] crm: fixed some categ_id remaining.
...
bzr revid: tde@openerp.com-20120813131207-lu1c271q5dh27vlr
2012-08-13 15:12:07 +02:00
Christophe Simonis
e543552dbd
[FIX] do not mess up the headers in the DisableCacheMiddleware
...
bzr revid: chs@openerp.com-20120813130955-1fwkyahlceotln5o
2012-08-13 15:09:55 +02:00
Thibault Delavallée
ae6d1fe900
[FIX] crm_lead: categ_id -> now categ_ids.
...
bzr revid: tde@openerp.com-20120813125822-1knqrg2adg90xxpy
2012-08-13 14:58:22 +02:00
Thibault Delavallée
9db0a94280
[IMP] CRM demo data: subtype -> content_subtype. Please check your logs before merging ...
...
bzr revid: tde@openerp.com-20120813125803-sodjl70yrnk3i2v0
2012-08-13 14:58:03 +02:00
Thibault Delavallée
ba61f0733a
[IMP] base_calendar: removed email_from from demo data, because this field does not exist; updated used categories, because some were not defined.
...
bzr revid: tde@openerp.com-20120813124704-qa70aa3aevh4s0qv
2012-08-13 14:47:04 +02:00
vta vta@openerp.com
7c3a72300c
[FIX] Fixed login to OpenERP with Google OAuth2. Still fails when redirecting an authenticated user.
...
bzr revid: vta@openerp.com-20120813123333-b4jwsrn106lakbnh
2012-08-13 14:33:33 +02:00
Thibault Delavallée
fd009ce95f
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120813123145-ruli48hzsfiu6g1y
2012-08-13 14:31:45 +02:00
Thibault Delavallée
9558419498
[IMP] base_calendar: removed annoying spaces in debug for tests.
...
bzr revid: tde@openerp.com-20120813123111-i224x123n2a1r8fx
2012-08-13 14:31:11 +02:00
Thibault Delavallée
2a22a88230
[FIX] mail_thread: fixed some forgotten \).
...
bzr revid: tde@openerp.com-20120813123051-5lxzx5011j2skrk8
2012-08-13 14:30:51 +02:00
Thibault Delavallée
f37f9dcaec
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120813115802-wxjj2oubawzxclm9
2012-08-13 13:58:02 +02:00
niv-openerp
d8796d429c
Now uses the html field type for cl editor
...
bzr revid: nicolas.vanhoren@openerp.com-20120813114638-pla647nupeha1tim
2012-08-13 13:46:38 +02:00
Thibault Delavallée
c2c27b1858
[FIX$] This time, it's the good fix.
...
bzr revid: tde@openerp.com-20120813111521-uws1uophrd39krfg
2012-08-13 13:15:21 +02:00
Thibault Delavallée
f80c247812
[FIX] Still fixing stpid bugs.
...
bzr revid: tde@openerp.com-20120813105420-stxm7cjc981bj8fq
2012-08-13 12:54:20 +02:00
Fabien Meghazi
b50dfe4f8f
[IMP] Adapt openerp.web.Dialog's position and maxHeight to the new jquery bootstrap theme.
...
bzr revid: fme@openerp.com-20120813103256-zhw7od30g9j406uv
2012-08-13 12:32:56 +02:00
Thibault Delavallée
b479fbf64a
[IMP] mail_thread: continuing to translate hasattr to something else.
...
bzr revid: tde@openerp.com-20120813103038-4o1xwtsmjnvjj0b4
2012-08-13 12:30:38 +02:00
Fabien Pinckaers
cdc3e2b333
[MERGE] demo data
...
bzr revid: fp@tinyerp.com-20120813103024-9yn1jrk80hk59bkz
2012-08-13 12:30:24 +02:00
Thibault Delavallée
e120d9a699
[REV] Reverted last fixes. Think it comes from outer space.
...
bzr revid: tde@openerp.com-20120813091719-6551uziq8ts4kj6a
2012-08-13 11:17:19 +02:00
Thibault Delavallée
fd471af0d8
[IMP] mail_thread: replaced hasattr by check in columns.
...
bzr revid: tde@openerp.com-20120813090641-n8o08be2ecfxxtdz
2012-08-13 11:06:41 +02:00
Thibault Delavallée
db7e49ca91
[FIX] project_timesheet tests: user creation should also have its partner.
...
bzr revid: tde@openerp.com-20120813081054-csyaq8p7lf7e1nvh
2012-08-13 10:10:54 +02:00
Thibault Delavallée
18aaed7f4f
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120813073105-pz2vdiz7gc27triz
2012-08-13 09:31:05 +02:00
Rucha (Open ERP)
5fd7ad04c1
[REM]: hr: Removed duplicate employee and department from demo
...
bzr revid: rpa@tinyerp.com-20120813072738-temucs10vhcubepv
2012-08-13 12:57:38 +05:30
Rucha (Open ERP)
98e591c2a7
[IMP]: point_of_sale: Improved remaining product name translation
...
bzr revid: rpa@tinyerp.com-20120813071720-kcsjouksbz4v0act
2012-08-13 12:47:20 +05:30
Launchpad Translations on behalf of openerp
2d10577000
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120813052537-ans6r1oi6i0xrzyy
2012-08-13 05:25:37 +00:00
Rucha (Open ERP)
dd7a2972d8
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120813051411-5no0xcudwbkw07c5
2012-08-13 10:44:11 +05:30
Antony Lesuisse
d946d35ee0
oauth wip
...
bzr revid: al@openerp.com-20120813000149-lslqyhszzz8axhrv
2012-08-13 02:01:49 +02:00
Antony Lesuisse
7ff74cc4b1
oauth wip
...
bzr revid: al@openerp.com-20120812232612-9cib8w333no9hg3d
2012-08-13 01:26:12 +02:00
Antony Lesuisse
2a7d95ac75
[IMP] load all modules at boot in single db mode
...
bzr revid: al@openerp.com-20120812222901-tjz9443oylidd7sy
2012-08-13 00:29:01 +02:00
Antony Lesuisse
1d0c2968ce
[FIX] standalone client
...
bzr revid: al@openerp.com-20120812215517-qxqnd1fvc9hcxezh
2012-08-12 23:55:17 +02:00
Antony Lesuisse
aa93e7186d
[IMP] web controller helpers
...
- move helpers on top
- move some code from controllers to helpers
- deprecate module dependecy processing in standalone client
bzr revid: al@openerp.com-20120812214827-m1wrv7y1jvnro9ew
2012-08-12 23:48:27 +02:00
Antony Lesuisse
9e43be663b
[MERGE] trunk
...
bzr revid: al@openerp.com-20120812174337-wcnind98b8uvypf5
2012-08-12 19:43:37 +02:00
Antony Lesuisse
4dc0440cb1
wip options
...
bzr revid: al@openerp.com-20120812174306-p47bfuzo2r030r3t
2012-08-12 19:43:06 +02:00
Antony Lesuisse
875d7541d9
sign up with controller
...
bzr revid: al@openerp.com-20120812170603-mnp54q5xn9htg6vj
2012-08-12 19:06:03 +02:00
Antony Lesuisse
6a78b5dbd9
[FIX] authenticate optional env
...
bzr revid: al@openerp.com-20120812151532-gqt8dcqo6f5t2szb
2012-08-12 17:15:32 +02:00
vta vta@openerp.com
dd84bffaa8
[MERGE] Latest trunk
...
bzr revid: vta@openerp.com-20120812150835-zv2f1r9bdf9c406u
2012-08-12 17:08:35 +02:00
vta vta@openerp.com
d0ff623729
[ADD] Basic functionality.
...
bzr revid: vta@openerp.com-20120812150739-nrdwvxmnnnw8yr54
2012-08-12 17:07:39 +02:00
Antony Lesuisse
9211174a6f
[MERGE] document_page aka wiki
...
it still uses the wiki syntax, switch to full html will occur after the
autosizing of cleditor
bzr revid: al@openerp.com-20120812144730-nxgxz8c77afczfr9
2012-08-12 16:47:30 +02:00
Antony Lesuisse
0de43d05c2
fix config wizard
...
bzr revid: al@openerp.com-20120812135319-bcwu9blrd71wepig
2012-08-12 15:53:19 +02:00
Antony Lesuisse
d9624f3e76
[FIX] database manager languages
...
bzr revid: al@openerp.com-20120812134857-yfdwxbszmm8o6q7q
2012-08-12 15:48:57 +02:00
Antony Lesuisse
ecbc9a4446
fix config wizard
...
bzr revid: al@openerp.com-20120812130527-6ffgm7vxjbm2vlft
2012-08-12 15:05:27 +02:00
Antony Lesuisse
d7fc09e8ab
fix config wizard
...
bzr revid: al@openerp.com-20120811234327-5dy2khgh7ldiqvnr
2012-08-12 01:43:27 +02:00
Antony Lesuisse
86fac976de
[MERGE] database manager look
...
bzr revid: al@openerp.com-20120811214809-uhj4hatw5bmi5710
2012-08-11 23:48:09 +02:00
Antony Lesuisse
e1bc12fb27
[MERGE] preference change password fixe
...
bzr revid: al@openerp.com-20120811195354-sayk1u53wy42vqc1
2012-08-11 21:53:54 +02:00
Antony Lesuisse
ddfd83d9ff
fixes test
...
bzr revid: al@openerp.com-20120811185610-o95wfdvtwfg4f4g6
2012-08-11 20:56:10 +02:00
Antony Lesuisse
d2a01d78a4
fixes css, demo, js
...
bzr revid: al@openerp.com-20120811183444-0wwagnum2tm964i6
2012-08-11 20:34:44 +02:00
Antony Lesuisse
683edea774
[IMP] inlineview and minor cleanups
...
bzr revid: al@openerp.com-20120811175852-kde116e50scn9ugs
2012-08-11 19:58:52 +02:00
Fabien Pinckaers
9bc2064028
[FIX] PoS import order from UI, return money
...
bzr revid: fp@openerp.com-20120811143309-pd44zfw6l67j7x7l
2012-08-11 16:33:09 +02:00
Fabien Pinckaers
c17b2443e7
[IMP] improved UI for PoS - mainly forms version=7.0
...
bzr revid: fp@openerp.com-20120811133406-jvso3qhmozmgnj3j
2012-08-11 15:34:06 +02:00
Fabien Pinckaers
c5c7ed79e3
[IMP] better menu tips and todo wizards
...
bzr revid: fp@openerp.com-20120811100322-jeh50k4c4wnbpmom
2012-08-11 12:03:22 +02:00
Launchpad Translations on behalf of openerp
d402784c74
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120811054547-ebfnq6hteui8geba
bzr revid: launchpad_translations_on_behalf_of_openerp-20120811054607-chyn98m3ivp16qg3
2012-08-11 05:46:07 +00:00
Antony Lesuisse
d8e8f22b3f
fix css
...
bzr revid: al@openerp.com-20120810233534-dqcuim7ip990gj6c
2012-08-11 01:35:34 +02:00
Antony Lesuisse
1f4d92ba8b
fix index
...
bzr revid: al@openerp.com-20120810231307-w9rgwiaybhm1gdyk
2012-08-11 01:13:07 +02:00
Antony Lesuisse
e991f474c3
[MERGE] trunk
...
bzr revid: al@openerp.com-20120810225211-0t3wn5b6u1pdosay
2012-08-11 00:52:11 +02:00
Antony Lesuisse
4e4a7dcbee
document_page ready
...
bzr revid: al@openerp.com-20120810225046-qs3liea2s76lh6v0
2012-08-11 00:50:46 +02:00
Thibault Delavallée
1d00613511
[IMP] mail.thread: res.users: messages appened to res.users are attached to the related partner.
...
bzr revid: tde@openerp.com-20120810155754-c7towsarcawxe1le
2012-08-10 17:57:54 +02:00
Antonin Bourguignon
c1159a0219
[MERGE] add options='{"no_open": true} on some fields
...
with this modification, users won't be able to open countries or languages form views anymore, which didn't really make sense
also fix indentation in crm/crm_lead_view.xml
bzr revid: abo@openerp.com-20120810155255-2x1maqcoenok6dsv
2012-08-10 17:52:55 +02:00
Antonin Bourguignon
72fdeea2d8
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120810153957-asszi74t9dxrzhx7
2012-08-10 17:39:57 +02:00
Quentin (OpenERP)
8b47fc9a32
[MERGE] branch with improvements of refunds handling in account_voucher + whipping of some dead code (in account_voucher too)
...
bzr revid: qdp-launchpad@openerp.com-20120810152331-h837mhhvdq8x0j1y
2012-08-10 17:23:31 +02:00
Olivier Dony
1f32ebdc7c
[FIX] pos: Fix runbot breakage: use new XML id for unreference_product + move to pos_data file
...
bzr revid: odo@openerp.com-20120810151204-t6c0wmiusf9un7gq
2012-08-10 17:12:04 +02:00
Quentin (OpenERP)
4c0e143471
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20120810151153-3csv9pds2yt3so3n
2012-08-10 17:11:53 +02:00
Quentin (OpenERP)
e8e7c91138
[IMP] hr_expense: small improvements
...
bzr revid: qdp-launchpad@openerp.com-20120810151108-lxqlaxh7m6yd31fi
2012-08-10 17:11:08 +02:00
niv-openerp
c2caa24bd6
[FIX] small "or" in some x2x popup
...
bzr revid: nicolas.vanhoren@openerp.com-20120810145048-ctnvl0w5r5h439f7
2012-08-10 16:50:48 +02:00
Stephane Wirtel
4be59d666f
[MERGE]
...
bzr revid: stw@openerp.com-20120810144930-hco5k1lvttsh17o8
2012-08-10 16:49:30 +02:00
Thibault Delavallée
620b7e9b11
[IMP] Addons: user_email -> email.
...
bzr revid: tde@openerp.com-20120810144339-30ro9omgfxtjtjyz
2012-08-10 16:43:39 +02:00
Christophe Simonis
c710e12517
[IMP] auth_openid: forward port of patches made on 6.1 branch
...
revid:chs@openerp.com-20120802102525-2uyr5za46swxs0n7
[FIX] auth_openid: Due to multiprocessus we must use a FileStore instead of a MemStore to store openid associations.
[FIX] auth_openid: GoogleApps: avoid crash when handle not found in store.
[IMP] auth_openid: flake8.
revid:chs@openerp.com-20120403093926-4222u3cs3qc10xew
[FIX] auth_openid: use correct api for login users
revid:chs@openerp.com-20120403093627-easttnf2qoemeoli
[FIX] auth_openid: allow login from direct http request
bzr revid: chs@openerp.com-20120810144333-o8zejl4pmdldab6j
2012-08-10 16:43:33 +02:00
Quentin (OpenERP)
600625f0ae
[FIX] account_voucher: fixed yaml tests in order to reflect the new behavior of computed writeoff amount (does not use abs() anymore)
...
bzr revid: qdp-launchpad@openerp.com-20120810143707-8vma2dld7mkolbh1
2012-08-10 16:37:07 +02:00
niv-openerp
a9c0de5325
[FIX] small bug in some m2m
...
bzr revid: nicolas.vanhoren@openerp.com-20120810142253-8ly58vsbqum6o7ng
2012-08-10 16:22:53 +02:00
Thibault Delavallée
7657aedc4e
[IMP] auth_ldap, auth_openid, base_crypt: update login_date instead of date on res.users.
...
bzr revid: tde@openerp.com-20120810141219-qa0howq34k03ynxh
2012-08-10 16:12:19 +02:00
Antonin Bourguignon
f2fd44d85b
[MERGE] latust trunk
...
bzr revid: abo@openerp.com-20120810140856-xl6sj3xu9t4bee6c
2012-08-10 16:08:56 +02:00
Christophe Simonis
7359e75711
merge upstream
...
bzr revid: chs@openerp.com-20120810140709-6xub089z1urgbngy
2012-08-10 16:07:09 +02:00
Fabien Pinckaers
01dc1b218b
[IMP] help menutips for PoS
...
bzr revid: fp@tinyerp.com-20120810135548-w2cgv11ynu6l8n5l
2012-08-10 15:55:48 +02:00
niv-openerp
f3d824424f
[FIX] problem with tipsy & quick create in m2o
...
bzr revid: nicolas.vanhoren@openerp.com-20120810134815-qt91cbf1rndvxn0a
2012-08-10 15:48:15 +02:00
Fabien Pinckaers
cf57a87d41
[IMP] point of sale backend, useability improvements
...
bzr revid: fp@tinyerp.com-20120810134517-tenqseu6otf0rdin
2012-08-10 15:45:17 +02:00
Olivier Dony
6aa4f80b2d
[IMP] mail: support multi routing + cleanup/lint
...
bzr revid: odo@openerp.com-20120810131919-1zkxu41eq9oy4c74
2012-08-10 15:19:19 +02:00
Thibault Delavallée
7272ed1f76
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120810130612-m46ea5q03nbbpu3h
2012-08-10 15:06:12 +02:00
Thibault Delavallée
e7a654eba3
[REF] mail_thread: refactoring of Chatter. Followers are now managed by another widget (mail.followers). Code removed from mail.js to mail_followers.js, same for xml. Mail_group is the test-object to receive tne new widget, specified in form view.
...
bzr revid: tde@openerp.com-20120810130542-0dern12lk4e7yfc9
2012-08-10 15:05:42 +02:00
Thibault Delavallée
f7c452baf5
[IMP] mail_thread: updated modified many2many for subscriber_ids; updated message_subscribe and message_unsubscribe.
...
bzr revid: tde@openerp.com-20120810130351-7eeki3c3415r1mm6
2012-08-10 15:03:51 +02:00
Minh Tran
e5b954cad0
chatter padding
...
bzr revid: mit@openerp.com-20120810124912-bg2emb6fabv0xrkx
2012-08-10 14:49:12 +02:00
Minh Tran
687e25a7fc
more visual improvements to mail module
...
bzr revid: mit@openerp.com-20120810124754-78ui3odg5d5odi20
2012-08-10 14:47:54 +02:00
Quentin (OpenERP)
6391df3989
[FIX/IMP] account_voucher: changed/fixed/improved the way to handle refunds payments through vouchers. Now, the refund have to be encoded as a negative of the right type (if the amount is -200 in a customer payment, it means your paying a customer refund of 200)
...
bzr revid: qdp-launchpad@openerp.com-20120810124056-9rpa4ugnxhdtqhhb
2012-08-10 14:40:56 +02:00
Quentin (OpenERP)
766ee94872
[REF] account_voucher: remove useless and unused code (classes account.statement.from.invoice and account.voucher.unreconcile)
...
bzr revid: qdp-launchpad@openerp.com-20120810123525-lhijvv2khh0xqw38
2012-08-10 14:35:25 +02:00
Quentin (OpenERP)
29bd7ba2db
[IMP] account: invoice form view usability improvement (display 'Refund' in place of 'Invoice' when needed)
...
bzr revid: qdp-launchpad@openerp.com-20120810122621-dbhx84hse3fylajw
2012-08-10 14:26:21 +02:00
Stephane Wirtel
37932b9439
[MERGE] lp:~openerp-dev/openobject-addons/trunk-addons-issues4-hr-pso
...
bzr revid: stw@openerp.com-20120810122247-zh355i7xjn93habu
2012-08-10 14:22:47 +02:00
vta vta@openerp.com
bda8bff768
[ADD] First commit
...
bzr revid: vta@openerp.com-20120810111616-irbkp26p1oi3pbwu
2012-08-10 13:16:16 +02:00
Thibault Delavallée
67480c3823
[FIX] account: partner before account in import ... weird ?.
...
bzr revid: tde@openerp.com-20120810102743-mx70k3gymn4ou7y1
2012-08-10 12:27:43 +02:00
Thibault Delavallée
8e6cc3a924
[REF] addons: propagated change about context_lang and context_tz.
...
bzr revid: tde@openerp.com-20120810102257-g9r21nesh799kf7u
2012-08-10 12:22:57 +02:00
Stephane Wirtel
8f028c4cd0
[MERGE] lp:~openerp-dev/openobject-addons/trunk-addons-issues4-survey-pso
...
bzr revid: stw@openerp.com-20120810100513-35f25v8rz3ynwbrv
2012-08-10 12:05:13 +02:00
Thibault Delavallée
8afd274c2d
[REF] res_users in mail: user_email -> email.
...
bzr revid: tde@openerp.com-20120810095630-d70pxftvanhxywn6
2012-08-10 11:56:30 +02:00
niv-openerp
7bd54c9c0b
[IMP] correction of some comments
...
bzr revid: nicolas.vanhoren@openerp.com-20120810094522-4dpdw06ql3ex0ig3
2012-08-10 11:45:22 +02:00
Thibault Delavallée
e9d6d69993
[REF] view inheriting from res.users: user_email -> email.
...
bzr revid: tde@openerp.com-20120810092706-538ot71bfqzkk3rg
2012-08-10 11:27:06 +02:00
Stephane Wirtel
b01fc5c9a2
[MERGE] lp:~openerp-dev/openobject-addons/trunk-addons-issues4-crm-pso
...
bzr revid: stw@openerp.com-20120810091332-c80h6kh3gc88mpt7
2012-08-10 11:13:32 +02:00
Stephane Wirtel
b619fb2c0c
[MERGE] lp:~openerp-dev/openobject-addons/trunk-addons-issues4-warehouse-pso
...
bzr revid: stw@openerp.com-20120810091218-t1w5ejk29dg730y1
2012-08-10 11:12:18 +02:00
Thibault Delavallée
176728a644
[REF] portal wizard: _lang_get coming from res_partner, not res.users anymore.
...
bzr revid: tde@openerp.com-20120810084906-cs7wrc7aen1v2itp
2012-08-10 10:49:06 +02:00
Stephane Wirtel
5b4dadc773
[MERGE]
...
bzr revid: stw@openerp.com-20120810083733-hm0fq46jeonb4eaq
2012-08-10 10:37:33 +02:00
Thibault Delavallée
798cecb55e
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120810073444-hm8lfcpnoelmunf3
2012-08-10 09:34:44 +02:00
Antony Lesuisse
4fb193140b
page minor fixes
...
bzr revid: al@openerp.com-20120810003104-9kjue6bigt2ayfsu
2012-08-10 02:31:04 +02:00
Antony Lesuisse
bda8f3fb7f
page mostly ok
...
bzr revid: al@openerp.com-20120810000908-ujg81v4mgm22glem
2012-08-10 02:09:08 +02:00
Fabien Pinckaers
9dd3e6476f
[IMP] PoS backend
...
bzr revid: fp@tinyerp.com-20120809212311-q2b86eww9ppvdv8s
2012-08-09 23:23:11 +02:00
Olivier Dony
b35671ceb3
[FIX] project,hr: improved alias creation/duplication
...
bzr revid: odo@openerp.com-20120809171726-ade5v5171r2r2hxp
2012-08-09 19:17:26 +02:00
Olivier Dony
de2f7bad58
[FIX] mail.alias: fix mail routing, improved logging
...
bzr revid: odo@openerp.com-20120809171655-isxma6sczw5mkn1y
2012-08-09 19:16:55 +02:00
Olivier Dony
1e704867bd
[FIX] project_issue: typo in earlier refactoring
...
bzr revid: odo@openerp.com-20120809171539-pmz33xfr39h1i8jj
2012-08-09 19:15:39 +02:00