Khushboo Bhatt (Open ERP)
143cba7f32
[FIX]crm:field string
...
bzr revid: kbh@tinyerp.com-20121219132253-dx4ceiw78ptgzvjc
2012-12-19 18:52:53 +05:30
56248183fc
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121219051749-jfkdv3ohgd61z9pq
bzr revid: launchpad_translations_on_behalf_of_openerp-20121219052238-gjyvmd0dp8pahk2c
2012-12-19 05:22:38 +00:00
Olivier Dony
3fe6987ce7
[MERGE] Harmonization of noupdate flag on security XML data, courtesy of Alexis de Lattre (Akretion)
...
ir.rule records are in noupdate data blocks to let the admin
alter them without fear of them being reset at next update.
Other records such as groups are in normal mode, so they
can be updated whenever necessary
bzr revid: odo@openerp.com-20121218232001-t425t4hi7qbmsip2
2012-12-19 00:20:01 +01:00
Olivier Dony
fc0c2942ba
[MERGE] Another batch of bugfixes from 6.1
...
bzr revid: odo@openerp.com-20121218175547-7c1uxq4ypbi314gx
2012-12-18 18:55:47 +01:00
Quentin (OpenERP)
0e77d66989
[MERGE] staging branch with misc fixes
...
bzr revid: qdp-launchpad@openerp.com-20121218152005-a1gahm72g6wylrg3
2012-12-18 16:20:05 +01:00
011b4f0045
[FIX] crm stage_id statusbar issues
...
bzr revid: vta@openerp.com-20121218134629-x0ygxo1hwer0m4jm
2012-12-18 14:46:29 +01:00
Quentin (OpenERP)
a513344bc1
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20121218134118-ixggega7sumgv6gq
2012-12-18 14:41:18 +01:00
Quentin (OpenERP)
13637c22b9
[IMP] crm: add a button to send emails on opportunities
...
bzr revid: qdp-launchpad@openerp.com-20121218133844-jjx5ebo122ovwmfg
2012-12-18 14:38:44 +01:00
Raphael Collet
73980eba5f
[MERGE] trunk-import-openerp-thu (use strict naming convention when importing openerp stuff)
...
bzr revid: rco@openerp.com-20121218085914-qzr2upqfxmfbzfsx
2012-12-18 09:59:14 +01:00
b2bb3eafbd
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121218045907-df0xw1q7dgw696s1
bzr revid: launchpad_translations_on_behalf_of_openerp-20121218050221-ab50rd40d94gd9a0
bzr revid: launchpad_translations_on_behalf_of_openerp-20121218050832-5hvbj7p0bpsw6fp0
2012-12-18 05:08:32 +00:00
Olivier Dony
b67f73c327
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20121218025230-zig415ldtmazgbxt
2012-12-18 03:52:30 +01:00
Olivier Dony
84d7987f33
[MERGE] Bugfixes from 6.1 until revision 6900
...
rev.6900 = xal@openerp.com-20120720134532-t07xr3lp8ouhn2dv
bzr revid: odo@openerp.com-20121218021123-9ligpn7bkr9zo4n7
2012-12-18 03:11:23 +01:00
Fabien Pinckaers
6a16fb2fde
[IMP] better domain for crm opportunities
...
bzr revid: fp@tinyerp.com-20121217173046-8w945atg1hxp2wum
2012-12-17 18:30:46 +01:00
Cecile Tonglet
baeefa6952
[FIX] replace from/import stuffs of openerp stuffs by from/import openerp.stuffs
...
bzr revid: cto@openerp.com-20121217154628-0c0i8y3389yz4dxd
2012-12-17 16:46:28 +01:00
Cecile Tonglet
15fe515601
[MERGE] From trunk
...
bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28
2012-12-17 15:43:06 +01:00
Quentin (OpenERP)
d5a38257ea
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20121217110601-z27qffjgh164jgxf
2012-12-17 12:06:01 +01:00
Quentin (OpenERP)
f9e227717e
[MERGE] addons-27 sale
...
bzr revid: qdp-launchpad@openerp.com-20121217110245-1rc9cl4x7r3l607j
2012-12-17 12:02:45 +01:00
a7ddf7c689
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121217044754-0kl222skaeva43lx
bzr revid: launchpad_translations_on_behalf_of_openerp-20121216050743-iza21869j5keaqi5
bzr revid: launchpad_translations_on_behalf_of_openerp-20121217045834-1f6wbi5gkmzotgsl
2012-12-17 04:58:34 +00:00
Fabien Pinckaers
b4d72207b2
[IMP] cleaning sales team stuff
...
bzr revid: fp@tinyerp.com-20121216155843-kl2mgr3ecyi85mw1
2012-12-16 16:58:43 +01:00
bfb52002b6
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121216044909-hd4l9dxtqvx85a3h
2012-12-16 04:49:09 +00:00
809c92fdef
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121214053618-1gz9xun2cb10afle
bzr revid: launchpad_translations_on_behalf_of_openerp-20121215050358-th0pl9jeams3pwkr
bzr revid: launchpad_translations_on_behalf_of_openerp-20121215050620-y27swfcuh62k8u32
bzr revid: launchpad_translations_on_behalf_of_openerp-20121215051723-6cnx1julk94gkm66
2012-12-15 05:17:23 +00:00
cc8025387b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121214053905-mac64ijay9566opr
bzr revid: launchpad_translations_on_behalf_of_openerp-20121214054902-12ndwftreb4g1964
2012-12-14 05:49:02 +00:00
Fabien Pinckaers
8579f12ce7
[IMP] color in CRM opportunities
...
bzr revid: fp@tinyerp.com-20121213142314-x9sc2g8l9kbnikpb
2012-12-13 15:23:14 +01:00
d6ea61789f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121213044507-t1hpxi43gks88w2e
bzr revid: launchpad_translations_on_behalf_of_openerp-20121213050131-3r9t674ehhnkneky
2012-12-13 05:01:31 +00:00
2e7f68e09f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121212043903-maiyd94p4ifgdqew
bzr revid: launchpad_translations_on_behalf_of_openerp-20121212044145-k216g0bcavdlf2o3
bzr revid: launchpad_translations_on_behalf_of_openerp-20121212045414-tgg69aaw4dz72b0p
2012-12-12 04:54:14 +00:00
cc69fe1b25
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121211044948-8q9vf1f9ftrzq4wm
bzr revid: launchpad_translations_on_behalf_of_openerp-20121211050318-3noic2ymt0j497rw
2012-12-11 05:03:18 +00:00
Vo Minh Thu
6072fd11af
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20121210111654-0pm3pupnqqeip52n
2012-12-10 12:16:54 +01:00
Jiten (OpenERP)
fd1e69a638
[MER] Merged trunk.
...
bzr revid: jra@tinyerp.com-20121210083952-fhjlo40g55d7ngf4
2012-12-10 14:09:52 +05:30
Thibault Delavallée
0e85b997ef
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121210083743-9xcv6bhxkh75ay66
2012-12-10 09:37:43 +01:00
7f1d5daf2f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121210043931-72a32pz7q282df45
bzr revid: launchpad_translations_on_behalf_of_openerp-20121210044428-d9bzm1dnqc26voci
2012-12-10 04:44:28 +00:00
Fabien Pinckaers
f3fc080ef7
[MERGE] module desc + stock
...
bzr revid: fp@tinyerp.com-20121209105527-4ot27zsv5vqr38ls
2012-12-09 11:55:27 +01:00
87009adb89
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121209043953-q5uis2ecp5c7g9xg
2012-12-09 04:39:53 +00:00
Fabien Pinckaers
c270aa7693
[MERGE]
...
bzr revid: fp@tinyerp.com-20121208162456-f544eem3hs4sm8i7
2012-12-08 17:24:56 +01:00
Antony Lesuisse
e6efcaeabc
[MERGE] improve_crm_leads_flux by abo
...
bzr revid: al@openerp.com-20121208144139-o9zr10b7qbij48d5
2012-12-08 15:41:39 +01:00
Antony Lesuisse
d30c3a32db
crm change stupid base action rule, this will be completed in the base action rule branch
...
bzr revid: al@openerp.com-20121208141610-o5driggb14sx7e1s
2012-12-08 15:16:10 +01:00
Fabien Pinckaers
56f5c12020
fix
...
bzr revid: fp@tinyerp.com-20121208133604-w17o1fd3gn4uxe1s
2012-12-08 14:36:04 +01:00
Fabien Pinckaers
01b1ee9e3f
[MERGE] Misc Fixes
...
bzr revid: fp@tinyerp.com-20121208131449-4mly488l1o5benuw
2012-12-08 14:14:49 +01:00
Fabien Pinckaers
5c98593604
[IMP] fields name
...
bzr revid: fp@tinyerp.com-20121208104558-2jr4j84go4gcemrb
2012-12-08 11:45:58 +01:00
Antony Lesuisse
0cc0dda679
crm non translatable string
...
bzr revid: al@openerp.com-20121208083038-9hm7uausdmbgclc2
2012-12-08 09:30:38 +01:00
Antony Lesuisse
3fa8c94859
[MERGE] trunk
...
bzr revid: al@openerp.com-20121208082814-qftvqsdht91lxvcc
2012-12-08 09:28:14 +01:00
Olivier Dony
e7b30b164e
[MERGE] Another batch of Bugfixes from 6.1
...
Up to 6.1 revision 6800 olt@tinyerp.com-20120516065727-ghvzjttnncj8ryj0
bzr revid: odo@openerp.com-20121207183024-adx8vnq9cytxi2lu
2012-12-07 19:30:24 +01:00
Quentin (OpenERP)
a778faec7c
[MERGE] part of addons 28: review some filters in phonecalls and account_analytic_analysis
...
bzr revid: qdp-launchpad@openerp.com-20121207133010-ma7a32po5om13blr
2012-12-07 14:30:10 +01:00
Quentin (OpenERP)
c082f008ac
[MERGE] removal of 'mark as read/unread' actions
...
bzr revid: qdp-launchpad@openerp.com-20121207130808-kdxocx9pdi2a47d7
2012-12-07 14:08:08 +01:00
Tejas Tank
392f1913f3
Merged Latest.
...
bzr revid: tta@openerp.com-20121207112002-jtes7j1er6leyd89
2012-12-07 16:20:02 +05:00
Thibault Delavallée
3177ffc800
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121207093430-7y1xu8nrxfm74pkn
2012-12-07 10:34:30 +01:00
Bhumi Thakkar (Open ERP)
7a81c5e8ca
[IMP] Put condition on group.
...
bzr revid: bth@tinyerp.com-20121207072221-f747xnt4s3hh9l46
2012-12-07 12:52:21 +05:30
Bhumi Thakkar (Open ERP)
af950e85c6
[MERGE] Merge lp:openobject-addons
...
bzr revid: bth@tinyerp.com-20121207070347-3gsrwkxgp81bn4nz
2012-12-07 12:33:47 +05:30
c09b9cb5f9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121207043623-mrfjgzunwq1dlmmh
bzr revid: launchpad_translations_on_behalf_of_openerp-20121207044755-avo3gbucdjj6i0ms
2012-12-07 04:47:55 +00:00
Antonin Bourguignon
808850ec54
[IMP] _find_matching_partner() method
...
also minor doc imp
bzr revid: abo@openerp.com-20121206160553-upxra7pkab3vhi1g
2012-12-06 17:05:53 +01:00
Olivier Dony
5db87bea9c
[MERGE] Bugfixes from 6.1 until revision 6800
...
bzr revid: odo@openerp.com-20121206153856-9y9v8ok6yxo6l5f0
2012-12-06 16:38:56 +01:00
Khushboo Bhatt (Open ERP)