9056c6dfe8
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120814194449-lbgwttiax09fhvj6
2012-08-14 21:44:49 +02:00
87f657f9ef
[REM] mail.js: removed debugger added by FP... you could have check before merging for this one -_- .
...
bzr revid: tde@openerp.com-20120814194322-yj7nyekugt7rmzn8
2012-08-14 21:43:22 +02:00
7fa1111d0a
[MERGE] staging branch with lp bug and new settings for decimal precision (Courtesy of Akretion)
...
bzr revid: qdp-launchpad@openerp.com-20120814192123-lr3ru44x900owv2n
2012-08-14 21:21:23 +02:00
9532bbb033
[FIX] procurement_order: moved a chatter message from user to the procurement.order; deleted second message_append_note that was never called, because of a void variable.
...
bzr revid: tde@openerp.com-20120814191603-u1lsovhurrvuxbm4
2012-08-14 21:16:03 +02:00
a05b3f3a2e
[REVIEW] res_users: added wrappers on some Chatter methods; moved welcome message on the partner.
...
bzr revid: tde@openerp.com-20120814185025-g5kdwisy2rjnipsb
2012-08-14 20:50:25 +02:00
9deb60afe2
[FIX] Fixed typo in var name.
...
bzr revid: tde@openerp.com-20120814184956-qk4isl8rljf4nxzk
2012-08-14 20:49:56 +02:00
4a9be8de85
[REVIEW] res_users in mail_thread: removed form view inheritance adding Chatter.
...
bzr revid: tde@openerp.com-20120814184931-q2hnox9dhc87wc27
2012-08-14 20:49:31 +02:00
5249a3fadf
[FIX] mail_thread: import res_partner before res_users.
...
bzr revid: tde@openerp.com-20120814170342-y10dzgromrpppa6i
2012-08-14 19:03:42 +02:00
7290d5880d
fix
...
bzr revid: fp@openerp.com-20120814165750-k2mmj30200jaee3m
2012-08-14 18:57:50 +02:00
40e2dbbab2
[IMP] mail_thread: res_users do not inherit from mail.thread anymore. Moved the search_domain of chatter of res.users (@login) to the partner, that have to find its related partner.
...
bzr revid: tde@openerp.com-20120814164817-8mw4txrmvka484wg
2012-08-14 18:48:17 +02:00
d6a6522c34
merge
...
bzr revid: fp@openerp.com-20120814163901-chassx588kktn17y
2012-08-14 18:39:01 +02:00
c5dc5cef00
[IMP] sed -i '' -e 's/connection/session/g'
...
bzr revid: chs@openerp.com-20120814153053-3bznfj7woq2xi1f1
2012-08-14 17:30:53 +02:00
63e4d9b572
[IMP] sed -i '' -e 's/connection/session/g'
...
bzr revid: chs@openerp.com-20120814152900-8r84kyz0qy1hwkvz
2012-08-14 17:29:00 +02:00
aac03b547d
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120814152634-ix63oxwcyrfkku4t
2012-08-14 17:26:34 +02:00
a381c0adce
[REVIEW] res_users in mail_thread: no Chatter-compatible anymore ! Some cleaning will follow. Also reidented some code.
...
bzr revid: tde@openerp.com-20120814152053-edu3i87uzd8ev0u0
2012-08-14 17:20:53 +02:00
8d23cb9ad2
[MERGE] trunk + lp bug branch
...
bzr revid: qdp-launchpad@openerp.com-20120814144336-93vym1dfc4i6j0dy
2012-08-14 16:43:36 +02:00
0bcf969ec7
[MERGE] lp: 932059 (removal of dead state in PO)
...
bzr revid: qdp-launchpad@openerp.com-20120814143751-e14dqq9ofcf69jgb
2012-08-14 16:37:51 +02:00
1232812cc6
[MERGE] merged branch that corrects the decimal precision on fields. Courtesy of Akretion
...
bzr revid: qdp-launchpad@openerp.com-20120814141040-oaf7d56thhi2s9rm
2012-08-14 16:10:40 +02:00
caa053c252
[IMP] Removed usage of OldWidget in edi
...
bzr revid: nicolas.vanhoren@openerp.com-20120814135414-5kdjbmf9www5u24q
2012-08-14 15:54:14 +02:00
cf59ee6f43
[IMP] removed categories in tags , fix
...
bzr revid: fp@openerp.com-20120814132952-1t9pocyaxlsoxwt3
2012-08-14 15:29:52 +02:00
8c43267c4a
[FIX] unknow route must return 404 not 500
...
bzr revid: chs@openerp.com-20120814131159-0ie5h6tnxdgebpva
2012-08-14 15:11:59 +02:00
b7a5629052
[FIX] invocation of import and export dialogs
...
bzr revid: xmo@openerp.com-20120814143003-ss974ub0yym09gyt
2012-08-14 16:30:03 +02:00
824a0568c6
[IMP] removed remaining usages of OldWidget (sorry)
...
bzr revid: nicolas.vanhoren@openerp.com-20120814135439-mslx2buf8pdpidkk
2012-08-14 15:54:39 +02:00
6229869bc1
Removed remaining usages
...
bzr revid: nicolas.vanhoren@openerp.com-20120814135324-7s3nmywqyikgvvui
2012-08-14 15:53:24 +02:00
3ebfaedd64
[IMP] removed a lot of OldWidget usage
...
bzr revid: nicolas.vanhoren@openerp.com-20120814134246-y2awqbt2i1hcan61
2012-08-14 15:42:46 +02:00
183b85f750
[IMP] Removed OldWidget in data.js
...
bzr revid: nicolas.vanhoren@openerp.com-20120814133107-prmdonwh6f7gu276
2012-08-14 15:31:07 +02:00
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
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
1885387ace
[IMP] added html field
...
bzr revid: nicolas.vanhoren@openerp.com-20120814130656-4pa91mud8u30mqr5
2012-08-14 15:06:56 +02:00
b60c51dc2d
[IMP] removing structure in partner tags
...
bzr revid: fp@openerp.com-20120814125611-16zayxxzha9213re
2012-08-14 14:56:11 +02:00
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
63ae87fb4c
Fixed encoding problems
...
bzr revid: nicolas.vanhoren@openerp.com-20120814121425-jq3ieebbsa7rcds5
2012-08-14 14:14:25 +02:00
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
9341a6f791
[MERGE] merged view changes: the `type` is now a functional field derived from the arch.
...
bzr revid: vmt@openerp.com-20120814121110-0wx4w6etkzspzpbh
2012-08-14 14:11:10 +02:00
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
0b2118c10d
[FIX] project.issue: duplicate method, probably bad merge
...
bzr revid: odo@openerp.com-20120814102425-50sbp71muozamm61
2012-08-14 12:24:25 +02:00
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
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
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
8fac3ae62e
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20120814100217-33qe1dyc3w6vfs0g
2012-08-14 12:02:17 +02:00
1534feb8f7
[IMP] ir_ui_view: somewhat better `type` functional field implementation.
...
bzr revid: vmt@openerp.com-20120814100049-dngykdg5l21q9vvp
2012-08-14 12:00:49 +02:00
1182be4291
[IMP] core: removed a filter on null IDs as it hides a possible problem (the very fact they are null).
...
bzr revid: vmt@openerp.com-20120814100007-cppdpazde5oe0khl
2012-08-14 12:00:07 +02:00
f111a51f10
Fixed problem when message is false (i think)
...
bzr revid: nicolas.vanhoren@openerp.com-20120814094401-uv548xbylkfq8bun
2012-08-14 11:44:01 +02:00
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
bc7ad9c405
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120814084936-04v0hywe2drc9qum
2012-08-14 10:49:36 +02:00
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
ac4e5d746b
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20120814082029-i1b7d4l5cqgs434g
2012-08-14 10:20:29 +02:00
8d2c35cc75
[IMP] Misc addons: product_image -> image.
...
bzr revid: tde@openerp.com-20120814081616-zb5xe06cy8r3n5ie
2012-08-14 10:16:16 +02:00
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
936a2efa46
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120814075258-52pwvh03fl5fjkqg
2012-08-14 09:52:58 +02:00
Thibault Delavallée
Quentin (OpenERP)
Fabien Pinckaers
Christophe Simonis
niv-openerp
Xavier Morel
Olivier Dony
Vo Minh Thu