Thibault Delavallée
4e815d28cc
[MERGE] Merged with branch holding user image
...
bzr revid: tde@openerp.com-20120327070733-8hfaskwoi7lh6mhi
2012-03-27 09:07:33 +02:00
Thibault Delavallée
c1737b12b7
[IMP] res.users: form and preference views: added name to some fields, for view inheritance purpose.
...
bzr revid: tde@openerp.com-20120326140003-g9ghmx40st6rlhcf
2012-03-26 16:00:03 +02:00
Thibault Delavallée
73f1f14097
[MERGE] Merged with need_action refactoring
...
bzr revid: tde@openerp.com-20120326092020-svuc8nrm7p0zb2s6
2012-03-26 11:20:20 +02:00
Thibault Delavallée
9f041f4990
[MERGE] Merged with main server
...
bzr revid: tde@openerp.com-20120326091751-gl03qyd1lkuo0jq7
2012-03-26 11:17:51 +02:00
Thibault Delavallée
f11caea8e2
[IMP] Cleaned and updated code. Updated var name.
...
bzr revid: tde@openerp.com-20120326082019-n9ibqzq79y425qc9
2012-03-26 10:20:19 +02:00
1bc9445223
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120324045353-4k2r3vmecpt81dar
bzr revid: launchpad_translations_on_behalf_of_openerp-20120325050452-0k0fqipcci2i2kz1
bzr revid: launchpad_translations_on_behalf_of_openerp-20120326043721-k1m3sl42xkwu653x
2012-03-26 04:37:21 +00:00
b917267f2d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120323050105-hprtqc7nrwqfqj1z
bzr revid: launchpad_translations_on_behalf_of_openerp-20120324050757-v9pyejizu2mdbahw
bzr revid: launchpad_translations_on_behalf_of_openerp-20120323044131-0df3bb0e8hkpsi0f
bzr revid: launchpad_translations_on_behalf_of_openerp-20120324045412-lthrpucdm57jzfy9
bzr revid: launchpad_translations_on_behalf_of_openerp-20120325050513-ruquuow62uoijixn
2012-03-25 05:05:13 +00:00
Thibault Delavallée
b1f53deade
[REF] Refactored code and API. TODO: more cleaning.
...
bzr revid: tde@openerp.com-20120323171418-liiguk4juvqlwsks
2012-03-23 18:14:18 +01:00
Vo Minh Thu
ce6d28f22f
[MERGE] merged removal of deprecated fields (integer_big, one2one, time).
...
bzr revid: vmt@openerp.com-20120323150105-gkhsjca5y70yta2x
2012-03-23 16:01:05 +01:00
Thibault Delavallée
70225fb42e
[MERGE] Merged with main server
...
bzr revid: tde@openerp.com-20120323143626-c05edvr4zwtz6pvm
2012-03-23 15:36:26 +01:00
Thibault Delavallée
14609fa2ed
[FIX] Fix of the last fix. Should avoid fixing on Friday.
...
bzr revid: tde@openerp.com-20120323140251-wki6runit0juqlwg
2012-03-23 15:02:51 +01:00
Thibault Delavallée
31e186687e
[FIX] Fixed crash when clearing avatar in form view. However, clearing means a new default avatar will be chosen.
...
bzr revid: tde@openerp.com-20120323133246-78z4fszbqcvir16h
2012-03-23 14:32:46 +01:00
Thibault Delavallée
4a2b5a72e5
[DOC] Updated doc.
...
bzr revid: tde@openerp.com-20120323111029-6h8je23ywv61123s
2012-03-23 12:10:29 +01:00
Thibault Delavallée
10eba844ba
[IMP] Reordered imports (alaphabetical order); avatar_stored->avatar_big, clearer field name
...
bzr revid: tde@openerp.com-20120323110521-rna7hh5alr0as04c
2012-03-23 12:05:21 +01:00
Thibault Delavallée
d67e232806
[IMP] Improved comments and doc. Note that now avatar_stored stores a bigger version of the avatar, in case a bigger image must be used.
...
bzr revid: tde@openerp.com-20120323103230-lcpbl1e9qhidivz7
2012-03-23 11:32:30 +01:00
Thibault Delavallée
cab93f9673
[IMP] Added height and width parameters to the resize method. Propagated context.
...
bzr revid: tde@openerp.com-20120323101414-28xbjkfhk03f5whe
2012-03-23 11:14:14 +01:00
Thibault Delavallée
0e95e0cf92
[FIX] Fixed the last fix. Also cleaned a bit the code.
...
bzr revid: tde@openerp.com-20120323100513-m2n5n3jtxz8zo1yl
2012-03-23 11:05:13 +01:00
Thibault Delavallée
19f6b095fd
[MERGE] Merged with main server.
...
bzr revid: tde@openerp.com-20120323091819-ais3o3jqjqsofi6r
2012-03-23 10:18:19 +01:00
Thibault Delavallée
6e0643868e
[FIX] Forgot to update a field name.
...
bzr revid: tde@openerp.com-20120323091747-i2dhjhy5witysd7s
2012-03-23 10:17:47 +01:00
Thibault Delavallée
d7be1e92d0
[DOC] Updated doc to match last revision.
...
bzr revid: tde@openerp.com-20120323091508-2m01y3hj9vw49ofk
2012-03-23 10:15:08 +01:00
Thibault Delavallée
d48b3bdb6b
[IMP] Improved code: renamed avatar->avatar_stored (stored in database); avatar_mini->avatar (interface field taht must be used); removed unnecessary comments; added help string on added fields to help understanding how the functionality works.
...
bzr revid: tde@openerp.com-20120323090821-rse7y3i1qpp8tbky
2012-03-23 10:08:21 +01:00
1ba39859e2
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120323044103-1pzlp21u7d512krs
2012-03-23 04:41:03 +00:00
Quentin (OpenERP)
343158f39f
[MERGE] merged the branch with menu modifications
...
bzr revid: qdp-launchpad@openerp.com-20120322172305-ko3l5j363lhdozkw
2012-03-22 18:23:05 +01:00
Quentin (OpenERP)
513b3c5108
[MERGE] merged the branch with modifications in menu
...
bzr revid: qdp-launchpad@openerp.com-20120322170200-6wk454ubjss2jij3
2012-03-22 18:02:00 +01:00
Vo Minh Thu
2c56c6fd4b
[FIX] ir_property: type (missing comma in dict).
...
bzr revid: vmt@openerp.com-20120322165837-9onm0e3o4rm3zc6u
2012-03-22 17:58:37 +01:00
Vo Minh Thu
05422654b6
[IMP+FIX] fields: removed references to one2one, but also
...
corrected some typo `.. in (xxx)` instead of `.. in (xxx,)` (Note the trailing comma).
There is still a (non-harmful) reference to one2one in the base_synchro addons.
bzr revid: vmt@openerp.com-20120322164540-9rl8iidj4wrjohru
2012-03-22 17:45:40 +01:00
Vo Minh Thu
46a190aaf8
[IMP] fields: removed any reference to integer_big.
...
bzr revid: vmt@openerp.com-20120322163850-sxfd9g1x96jstr51
2012-03-22 17:38:50 +01:00
Vo Minh Thu
c5ef5e1394
[IMP] fields: removed deprecated fields (time, integer_big, one2one).
...
bzr revid: vmt@openerp.com-20120322161825-dlbnj9p2xe0mhhxx
2012-03-22 17:18:25 +01:00
Olivier Dony
975c65860f
[MERGE] Latest bugfixes from 6.1
...
bzr revid: odo@openerp.com-20120322150506-vo7r1k65phlotaa2
2012-03-22 16:05:06 +01:00
Olivier Dony
ee77b351b4
[MERGE] Latest fixes from 6.1
...
bzr revid: odo@openerp.com-20120322143654-w7etvdnq4z5tg6bt
2012-03-22 15:36:54 +01:00
Rucha Patel
b3f2abec46
[FIX] email_template: ensure non-empty context when rendering template'
...
bzr revid: odo@openerp.com-20120322141153-8u3kia3k125et6b5
2012-03-22 15:11:53 +01:00
Rucha Patel
cbef5ce396
[FIX] email_template: don't re-encode attachments copied from template'
...
bzr revid: odo@openerp.com-20120322141104-rw5i4dedy01wjmjf
2012-03-22 15:11:04 +01:00
Thibault Delavallée
b07dd8cc6b
[MERGE] Merged with branch holding need_action mechanism.
...
bzr revid: tde@openerp.com-20120322124013-docq19vot6pokgyf
2012-03-22 13:40:13 +01:00
Thibault Delavallée
84e6d42469
[FIX] Fixed last commit
...
bzr revid: tde@openerp.com-20120322123816-0zde1hqp7dc2dneu
2012-03-22 13:38:16 +01:00
Olivier Dony
08f6c75477
[MERGE] Properly pass context when incrementing sequences, courtesy of Stefan Rijnhart (Therp)
...
lp bug: https://launchpad.net/bugs/947355 fixed
bzr revid: odo@openerp.com-20120322122419-xt6rlz330bkdo8ox
2012-03-22 13:24:19 +01:00
Stefan Rijnhart
e792a85858
[FIX] Reference to undefined context variable
...
[ADD] Check on 'None' context in account module's sequence override
bzr revid: stefan@therp.nl-20120322113959-79wxzej9ih4igg28
2012-03-22 12:39:59 +01:00
Xavier Morel
1da49a44a5
[MERGE] 6.1 fixes into trunk
...
bzr revid: xmo@openerp.com-20120322113142-gim4svx01p336nxm
2012-03-22 12:31:42 +01:00
5a5791474a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120322062358-4l28rv6d8dyv0hbg
bzr revid: launchpad_translations_on_behalf_of_openerp-20120323051338-bheo7mng6p5unhxn
bzr revid: launchpad_translations_on_behalf_of_openerp-20120324054029-3tmn15vi8y2j20d6
bzr revid: launchpad_translations_on_behalf_of_openerp-20120322062238-c64xww4bj94c1loc
bzr revid: launchpad_translations_on_behalf_of_openerp-20120323051217-63cegddjt2r1jjz4
bzr revid: launchpad_translations_on_behalf_of_openerp-20120324053950-yfaky6dl5do1nkqf
bzr revid: launchpad_translations_on_behalf_of_openerp-20120325061156-bjofpelu3gdba4fm
bzr revid: launchpad_translations_on_behalf_of_openerp-20120326053412-1vnoycehd8mv047d
2012-03-26 05:34:12 +00:00
Olivier Dony
48d8295acd
[FIX] email.template: properly propagate res_id over context reloads in composition wizard
...
bzr revid: odo@openerp.com-20120323154638-f3o52kb2rka4hcrx
2012-03-23 16:46:38 +01:00
Xavier ALT
b5beb3dbe0
[MERGE] OPW 573037: audittrail: force admin for subscribe/unsubscribe op - fix 'admin/access rights' members access
...
bzr revid: xal@openerp.com-20120323142541-ebxn935mdfk7bk9s
2012-03-23 15:25:41 +01:00
skh
d316afbdaf
[FIX] Audittrail : Audit trail doesn't respect access rights (Case: Ref 573037)
...
bzr revid: skh@tinyerp.com-20120323132751-hhk1pd53o1ihkzdk
2012-03-23 18:57:51 +05:30
c3229cb8ce
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120323051329-vecz1zbjb6gd776p
2012-03-23 05:13:29 +00:00
Olivier Dony
2eb1c00ad2
[FIX] mail: default permissions should allow write for everyone
...
Mail messages are created in multiple steps that
usually involve calling write() at some point, so
giving all users write access is necessary.
bzr revid: odo@openerp.com-20120322110733-unizfb58f0y8xkfz
2012-03-22 12:07:33 +01:00
Thibault Delavallée
23ce37bd73
[IMP] Code cleaning; rename methods; added needaction_get_records_user_ids, to have all users for a set of records.
...
bzr revid: tde@openerp.com-20120322110144-0e30w63q3yl9ettu
2012-03-22 12:01:44 +01:00
dc6161c889
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120322062352-syfsimh3ol3vje45
2012-03-22 06:23:52 +00:00
ff245d6eb5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120320051329-bjlbme9vdduayq3d
bzr revid: launchpad_translations_on_behalf_of_openerp-20120321052118-893avxm4tbqv14s1
bzr revid: launchpad_translations_on_behalf_of_openerp-20120322053119-o98w1yhj3n12vprw
2012-03-22 05:31:19 +00:00
096e31763d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120322045715-7jjkjuud4so1nrvi
2012-03-22 04:57:15 +00:00
b98ad356c9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120320045550-vsf476jdlv0xkh4w
bzr revid: launchpad_translations_on_behalf_of_openerp-20120322045643-1cpsom7idns7t938
2012-03-22 04:56:43 +00:00
Quentin (OpenERP)
4a07a424cd
[MERGE] merged the branch that hide date fields as they will later be replaced by the 'chatter'
...
bzr revid: qdp-launchpad@openerp.com-20120321165440-hl1shvdigj204td7
2012-03-21 17:54:40 +01:00
Quentin (OpenERP)
2801d91337
[REF] reducing the diff toward trunk by removing the assignation to group 'No One' on fields that are already in a <group> tag with such an assignation + review of the work done
...
bzr revid: qdp-launchpad@openerp.com-20120321162956-kyxo5mu1rjwjoqe3
2012-03-21 17:29:56 +01:00
Thibault Delavallée