Twinkle Christian (OpenERP)
400fca9a1c
[merge]merge with main branch
...
bzr revid: tch@tinyerp.com-20120827092352-bm2vjzmxi84qkh5z
2012-08-27 14:53:52 +05:30
Bhumi Thakkar (Open ERP)
85eee1fad0
[FIX] Replace '=' with 'in'.
...
bzr revid: bth@tinyerp.com-20120827091656-emz7wpwsyyto3n12
2012-08-27 14:46:56 +05:30
Thibault Delavallée
b5cd423bca
[FIX] Chatter: tried to fix the display on Wall / document.
...
bzr revid: tde@openerp.com-20120827085145-7v4l5cz6u7lhsajw
2012-08-27 10:51:45 +02:00
Thibault Delavallée
1fc94ed5ca
[MERGE] Merged with server/trunk.
...
bzr revid: tde@openerp.com-20120827083724-237j1jgf3b3g3uy8
2012-08-27 10:37:24 +02:00
Thibault Delavallée
4b0d1be1c0
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120827083705-p2edynkzch7hszrd
2012-08-27 10:37:05 +02:00
Xavier ALT
16209e42a2
[MERGE] OPW 577292: orm: force computing store values for all columns on unlink()
...
bzr revid: xal@openerp.com-20120827082905-mh12du8t60zzeh0y
2012-08-27 10:29:05 +02:00
ajay javiya (OpenERP)
652a309eed
[MERGE]: Merge with main branch
...
bzr revid: aja@tinyerp.com-20120827073002-w18750599ys0xlru
2012-08-27 13:00:02 +05:30
Jigar Amin - OpenERP
6ad7a5a4b0
[FIX/USA] Usabality Impovments ans Import error fixed
...
bzr revid: jam@tinyerp.com-20120827072743-v022e5obnd06csoy
2012-08-27 12:57:43 +05:30
Jigar Amin - OpenERP
20ee040c6c
merge lp:~openerp-dev/openobject-addons/trunk-base-gengo-security-aja
...
bzr revid: jam@tinyerp.com-20120827070411-aoqflv45qqfgx08w
2012-08-27 12:34:11 +05:30
ajay javiya (OpenERP)
ac0566a856
[FIX] base_gengo: remove warning
...
bzr revid: aja@tinyerp.com-20120827065218-3ztowz1icyc6jv82
2012-08-27 12:22:18 +05:30
Xavier ALT
c4bb6b1669
[MERGE] OPW 577140: stock: use float_compare() to check if initial and provided quantity equals - based on UoM rounding
...
bzr revid: xal@openerp.com-20120827064849-67mo7ln8uyx1z2pl
2012-08-27 08:48:49 +02:00
03dd0da485
Remove print
...
bzr revid: rgaopenerp-20120827064531-hxwor2pr6nn5f53r
2012-08-27 12:15:31 +05:30
f8936e0f00
Merge with trunk
...
bzr revid: rgaopenerp-20120827063112-jo5kud1xw2waqywf
2012-08-27 12:01:12 +05:30
Amit Patel (OpenERP)
5a8bdae6d6
[IMP]:improved view
...
bzr revid: apa@tinyerp.com-20120827055539-kqybbq2sqhx9tax9
2012-08-27 11:25:39 +05:30
pso (OpenERP)
f06f0da395
[MERGE] Merged with main branch
...
bzr revid: pso@tinyerp.com-20120823130751-55j9naym9rab8492
bzr revid: pso@tinyerp.com-20120827053644-mzy2bj3fppc3ij4e
2012-08-27 11:06:44 +05:30
Amit Patel (OpenERP)
287ea3ba88
[MERGE]
...
bzr revid: apa@tinyerp.com-20120827053614-wgv9082nw6yixwwh
2012-08-27 11:06:14 +05:30
Pinakin Nayi (OpenERP)
fb08d41118
[IMP]project issue5
...
bzr revid: pna@tinyerp.com-20120827053040-xq743y0ivvtrfwzc
2012-08-27 11:00:40 +05:30
Sanjay Gohel (Open ERP)
1338046cf0
[IMP]added access to mail_message_subtype
...
bzr revid: sgo@tinyerp.com-20120827052933-6ajhaete5vuzqhiv
2012-08-27 10:59:33 +05:30
Amit Patel (OpenERP)
af5583bb93
[IMP]:improved view
...
bzr revid: apa@tinyerp.com-20120827052920-e7dwg2vqj0swnwqk
2012-08-27 10:59:20 +05:30
pso (OpenERP)
abb7a9be3d
[MERGE] Merged with main branch
...
bzr revid: pso@tinyerp.com-20120827052854-ax0ty7hjqkke70rw
2012-08-27 10:58:54 +05:30
Mustufa Rangwala (OpenERP)
6aa5ea647f
[IMP] l10n_in_hr_payroll: typo
...
bzr revid: mra@tinyerp.com-20120827052843-tx702vetryimkldk
2012-08-27 10:58:43 +05:30
Mustufa Rangwala (OpenERP)
ee80611902
[IMP] l10n_in_hr_payroll: typo
...
bzr revid: mra@tinyerp.com-20120827051507-d6jpql116j7s8q3k
2012-08-27 10:45:07 +05:30
Amit Patel (OpenERP)
99d98e963c
[MERGe]
...
bzr revid: apa@tinyerp.com-20120827050858-5rlntcz476cha7p1
2012-08-27 10:38:58 +05:30
Jigar Amin - OpenERP
e79baa9e8a
[FIX] resolve Conflicts reverts
...
bzr revid: jam@tinyerp.com-20120827050151-yinbjtladoe3vu5w
2012-08-27 10:31:51 +05:30
Paramjit Singh Sahota
1ece100468
[MERGE] Merged lp:openobject-addons
...
bzr revid: psa@tinyerp.com-20120823090620-jqeebsoj3h3305w8
bzr revid: psa@tinyerp.com-20120824063336-mwpmbjh59oc2y08y
bzr revid: psa@tinyerp.com-20120827045129-7irvbu8u7bcz8iao
2012-08-27 10:21:29 +05:30
Meera Trambadia
6b66df2a1f
[MERGE] with lp:openobject-addons
...
bzr revid: mtr@tinyerp.com-20120827044724-w5pgc7up6e40qqgb
2012-08-27 10:17:24 +05:30
Jigar Amin - OpenERP
548672a2c3
merge lp:openerp-web
...
bzr revid: jam@tinyerp.com-20120827044256-engs2hibz5x5fnwh
2012-08-27 10:12:56 +05:30
Mustufa Rangwala (OpenERP)
2658682b32
[MERGE] Merge from main addons
...
bzr revid: mra@tinyerp.com-20120827043902-6e5u3v77oporquab
2012-08-27 10:09:02 +05:30
Jigar Amin - OpenERP
2cb5de993a
Merge lp:openobject-server
...
bzr revid: jam@tinyerp.com-20120817044741-thqezvmy7iaphkea
bzr revid: jam@tinyerp.com-20120821043844-4wf3dcxbbbokhe5l
bzr revid: jam@tinyerp.com-20120827043023-kz2bbk8fvfv4gkh5
2012-08-27 10:00:23 +05:30
Jigar Amin - OpenERP
25c85917f4
Merge lp:openobject-addons
...
bzr revid: jam@tinyerp.com-20120827042911-zo7ck8hlst9hnuwk
2012-08-27 09:59:11 +05:30
Jigar Amin - OpenERP
b882d6c8b1
Merge lp:openobject-addons
...
bzr revid: jam@tinyerp.com-20120827042850-taxag4eede9p8kyb
2012-08-27 09:58:50 +05:30
Xavier ALT
d84e7e1c8c
[FIX] OPW 577140: stock: use float_compare() to check if initial and provided quantity equals - based on UoM rounding
...
bzr revid: xal@openerp.com-20120826205954-of9eokcaiok3d7yt
2012-08-26 22:59:54 +02:00
Xavier ALT
8ce989c700
[FIX] OPW 577292: orm: force computing store values for all columns on unlink()
...
bzr revid: xal@openerp.com-20120826202655-e28mcrpof6iss1bk
2012-08-26 22:26:55 +02:00
niv-openerp
65f532e001
[IMP] made a whole-application replace of $element by $el
...
bzr revid: nicolas.vanhoren@openerp.com-20120824182743-1d9cii7kigc7exer
2012-08-24 20:27:43 +02:00
niv-openerp
5e338c591a
[IMP] made a whole-application replace of $element by $el
...
bzr revid: nicolas.vanhoren@openerp.com-20120824182707-vt91ef40ieeudwyw
2012-08-24 20:27:07 +02:00
niv-openerp
9818cf073f
[IMP] crm: added create_name_field on partner_id in leads
...
bzr revid: nicolas.vanhoren@openerp.com-20120824172729-4botx8doui5iw1er
2012-08-24 19:27:29 +02:00
niv-openerp
9780532da1
[IMP] changed the way create from m2o works, added option create_name_field
...
bzr revid: nicolas.vanhoren@openerp.com-20120824172622-evcz7011wlagep4z
2012-08-24 19:26:22 +02:00
niv-openerp
0068c09358
[IMP] web_linkedin: put the wizard into the sales wizard
...
bzr revid: nicolas.vanhoren@openerp.com-20120824170111-j64d4l8xc6403a2m
2012-08-24 19:01:11 +02:00
Antonin Bourguignon
aa4f0002e1
[WIP] company: improve bank accounts management in footer
...
bzr revid: abo@openerp.com-20120824165900-li4qvg82uxxs1di6
2012-08-24 18:59:00 +02:00
niv-openerp
49b3c7b753
[IMP] made the loading messages translatable
...
bzr revid: nicolas.vanhoren@openerp.com-20120824165449-mfb4ftxnq3vd0p84
2012-08-24 18:54:49 +02:00
Thibault Delavallée
1a3091d10e
[MERGE] Merged branch holding a cleaning of code for mail.alias
...
installation hook for res.users and hr.recruitment
is now delegatede to mail.alias, using the
migrate_to_alias method. The purpose is to
set the alias_id column as required even if
the models are already present in the DB.
Behavior has not been modified; this branch
is only about some code relocation in mail.alias
to avoid duplication.
bzr revid: tde@openerp.com-20120824161556-pf95siqd24e2dlht
2012-08-24 18:15:56 +02:00
Olivier Dony
971756e016
[FIX] crm: correct mass conversion wizard defaults, fixes crm tests
...
bzr revid: odo@openerp.com-20120824161320-mdfqibfe53v2op79
2012-08-24 18:13:20 +02:00
Thibault Delavallée
d19ad1ff4b
[TEST] mail: added tests for the composer, includes a first bench of tests for notifications and send emails.
...
bzr revid: tde@openerp.com-20120824161117-abur02jlgs08my21
2012-08-24 18:11:17 +02:00
Thibault Delavallée
d583b98a97
[IMP] mail_followers: moved email creation for emails send for notification into a dedicated method; updated subject and body creation (added default subject, added signature on body).
...
bzr revid: tde@openerp.com-20120824161038-vhylgsify9f9xder
2012-08-24 18:10:38 +02:00
Thibault Delavallée
6e3ea98e48
[IMP] mail_mail: re-instaured body_alternative, using html2plaintext of tools. Removed some dead imports.
...
bzr revid: tde@openerp.com-20120824160936-n3fehtgf4f2k0dkn
2012-08-24 18:09:36 +02:00
Thibault Delavallée
f6fc11c48b
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120824144007-4r11uoy3sux5f7cv
2012-08-24 16:40:07 +02:00
Thibault Delavallée
7423196143
[REVIEW] Updated some variable names to try to be more explicit.
...
bzr revid: tde@openerp.com-20120824143944-cjm0zwfaldbfztq1
2012-08-24 16:39:44 +02:00
Christophe Simonis
522fb2e4b9
[FIX] add missing file
...
bzr revid: chs@openerp.com-20120824143837-tpgu7g2rqnkag22u
2012-08-24 16:38:37 +02:00
Christophe Simonis
1f747d892c
[IMP] reload static paths when new modules are availables
...
bzr revid: chs@openerp.com-20120824143538-49u29wyaojakhzfu
2012-08-24 16:35:38 +02:00
Thibault Delavallée
ab6b3cc266
[IMP] Remove some warnings about: alias_force_id -> alias_force_thread_id; type set in view that is not necessayr anymore.
...
bzr revid: tde@openerp.com-20120824143112-krho3ahvklxcod29
2012-08-24 16:31:12 +02:00
Twinkle Christian (OpenERP)