Denis Ledoux
a5f7891b68
[MERGE] forward port of branch saas-4 up to 5739aebfb1
2014-07-23 13:18:30 +02:00
Denis Ledoux
5739aebfb1
[MERGE] forward port of branch saas-3 up to 474eae9a43
2014-07-23 12:14:14 +02:00
Martin Trigaux
1f878f152a
[MERGE] forward port of branch 7.0 up to 680f955
2014-07-22 13:39:15 +02:00
Dhs-odoo
8320f01fef
[FIX] project : do not show canceled projects in task
...
fixes #938 , opw 610318
2014-07-22 11:29:33 +02:00
Christophe Simonis
e0759c1350
[MERGE] forward port of branch saas-4 up to de696f1
2014-07-15 10:39:08 +02:00
Christophe Simonis
de696f14f8
[MERGE] forward port of branch saas-3 up to 24484c8
2014-07-15 10:38:14 +02:00
Martin Trigaux
3bdb00eaf7
[FIX] project: default_groups_ref expects the format module.xml_id (opw 610098)
2014-07-14 16:39:13 +02:00
Christophe Simonis
adf07a9490
[MERGE] forward port of branch saas-4 up to 5087612
2014-06-19 16:13:35 +02:00
Christophe Simonis
5087612d1d
[MERGE] forward port of branch saas-3 up to bf53aed
2014-06-19 15:44:07 +02:00
dreispt
766cc9c00c
Fix wrong partner_id refs in Project demo data
2014-06-19 10:17:56 +02:00
Thibault Delavallée
aa08287d08
[FIX] document, mail, project: re-add tree view for attachments removed at revision 9279 and 9280
...
when adding a kanban view for documents.
2014-05-13 13:18:37 +02:00
1397b7aa34
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140510075539-empsrh7k5l6q44ln
bzr revid: launchpad_translations_on_behalf_of_openerp-20140510075505-nu0zmfg57i2352lz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140511070820-8xp1e2jxonp4i750
bzr revid: launchpad_translations_on_behalf_of_openerp-20140503064840-v6n2wyrm1l162bh4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140504062728-9tmsk2r01vvs3avi
bzr revid: launchpad_translations_on_behalf_of_openerp-20140506072722-8xpshoxb4um6ef30
bzr revid: launchpad_translations_on_behalf_of_openerp-20140511070841-lboiasc73m8h3fb2
2014-05-11 07:08:41 +00:00
Thibault Delavallée
32561d933d
[IMP] dropdown_selection widget renamed kanban_state_selection
...
bzr revid: tde@openerp.com-20140508153432-h3f2ez0grw8rst1n
2014-05-08 17:34:32 +02:00
Thibault Delavallée
ea1e0e3275
[CLEAN] crm, hr_recruitmnet, project: cleaned priority / kanban state in kanban views
...
bzr revid: tde@openerp.com-20140508152536-s3my5onl33z3kxxx
2014-05-08 17:25:36 +02:00
Thibault Delavallée
400b194d60
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140508123529-w91cb0e6ugzutqd1
2014-05-08 14:35:29 +02:00
Barad Mahendra
c7957d696b
[IMP]improve the form view of task issue
...
bzr revid: mba@tinyerp.com-20140508064114-9ohw86ymc7h3ox19
2014-05-08 12:11:14 +05:30
5f1bd401f8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140508063251-ztdomqygi2izm2o3
2014-05-08 06:32:51 +00:00
Barad Mahendra
07ccf397a3
[Merge]with trunk
...
bzr revid: mba@tinyerp.com-20140507104533-jeorqz7rtx8m8i1c
2014-05-07 16:15:33 +05:30
Gery Debongnie
298edf7217
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140507091210-2bhcz5azxmgcc37o
2014-05-07 11:12:10 +02:00
Gery Debongnie
ff7ad5e918
[FIX] code cleanup (addon project)
...
improves the _task_count method by removing try clause and using
search_count
bzr revid: ged@openerp.com-20140507085535-16w47y51r6q3yqza
2014-05-07 10:55:35 +02:00
93bab6ba7a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140507062712-t81pc41duzjfrwa6
2014-05-07 06:27:12 +00:00
f426972e37
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140430070138-uuemdpfseyysxlvs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140502064550-9r0c2t3tr8dp1hwu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140501063929-ta3t6lhed5dpdz9a
bzr revid: launchpad_translations_on_behalf_of_openerp-20140502064608-1zwt52snc5pg5kfi
bzr revid: launchpad_translations_on_behalf_of_openerp-20140504062721-dgb7m6o6ge2btumg
2014-05-04 06:27:21 +00:00
Gery Debongnie
5aa2fa150c
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
Antony Lesuisse
7e25b9ae55
[MERGE] saas-4 report_webkit missing dependency on report
...
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
2014-05-01 18:11:56 +02:00
Fabien Meghazi
b7003a382a
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea
2014-04-29 17:41:04 +02:00
Richard Mathot (OpenERP)
d0e9ba289f
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140429124452-5cvpmtpyz2daj8w2
2014-04-29 14:44:52 +02:00
Richard Mathot (OpenERP)
65f2db5c21
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140429081937-hhqcg84o7iha78fq
2014-04-29 10:19:37 +02:00
Christophe Simonis
d562249278
[FIX] project: force menu name
...
bzr revid: chs@openerp.com-20140425170357-iqcqqfe71mm2z0qg
2014-04-25 19:03:57 +02:00
Fabien Meghazi
1c4e2cfd22
[IMP] bundlify addons (except website)
...
bzr revid: fme@openerp.com-20140424172129-ze74eaz2eaidmxhm
2014-04-24 19:21:29 +02:00
fa60b90c1f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
Cedric Snauwaert
8befd231ce
[MERGE]tooltip: replace tipsy by bootstrap tooltip
...
bzr revid: csn@openerp.com-20140417141519-2gbldof1uboli23s
2014-04-17 16:15:19 +02:00
Darshan Kalola (OpenERP)
cccc7a3d0c
[MERGE]sync with trunk.
...
bzr revid: dka@tinyerp.com-20140417132329-sd2skyprb3nt88uw
2014-04-17 18:53:29 +05:30
Gery Debongnie
a17c16a660
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140417110726-8w4oktk7ml416ld7
bzr revid: ged@openerp.com-20140417130144-42bkw3f55xosxnks
2014-04-17 15:01:44 +02:00
Darshan Kalola
772bf1392a
[MERGE] [IMP] project, hr_recruitment: fixed access rights on stages.
...
Projec/Recruitment Users can now just read columns; managers can edit and unlink them.
With the server and web branch, this allows to restrict the actions the user can perform
on columns according to its access rights.
bzr revid: tde@openerp.com-20140417114133-qhi281thgsy39tlj
2014-04-17 13:41:33 +02:00
Cedric Snauwaert
19fac75f42
[FIX]bootstrap tooltip cleaned from trunk-tipsy-to-bootstrap
...
bzr revid: csn@openerp.com-20140417090515-l1ku2kdc0lzadjxg
2014-04-17 11:05:15 +02:00
Barad Mahendra
a95649e199
[REV]unwanted changes
...
bzr revid: mba@tinyerp.com-20140416105120-wp2krz40g026s37n
2014-04-16 16:21:20 +05:30
Gery Debongnie
f57b767361
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140415150146-5ovdjzta58t5dhd2
2014-04-15 17:01:46 +02:00
Gery Debongnie
c68163c160
[FIX] correct the spelling of 'task' in stat button in project form view (addon project)
...
bzr revid: ged@openerp.com-20140415121404-gasss4hjx0vx9su5
2014-04-15 14:14:04 +02:00
Barad Mahendra
12b0dfa9b5
[Merge]with trunk
...
bzr revid: mba@tinyerp.com-20140415093047-1ctqspzbofv1pt3d
2014-04-15 15:00:47 +05:30
Darshan Kalola (OpenERP)
9166c305c1
[MERGE]sync with trunk.
...
bzr revid: dka@tinyerp.com-20140415092844-u9vrtpjvwdr2ke5m
2014-04-15 14:58:44 +05:30
Darshan Kalola (OpenERP)
81a5dacbc4
[MERGE]sync with trunk.
...
bzr revid: dka@tinyerp.com-20140415050512-4mww4r7ntghiig37
2014-04-15 10:35:12 +05:30
Randhir Mayatra rma-openerp
c399e1daaf
[MERGE] merge with latest trunk and resolve conflicts
...
bzr revid: rma@tinyerp.com-20140414110149-r3l00xr8l08ex7oc
2014-04-14 16:31:49 +05:30
001a034e58
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412094159-mhy3v2prb3ctx32k
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412094217-3u3f03f0wjhbzyo4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140413062047-z833pejjrtuhfygs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140414055948-intynzk8l823ukei
2014-04-14 05:59:48 +00:00
e82fbf7d91
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
Rashmin Lumbhani (OpenERP)
59ca5c36b8
[IMP]add blocked reason field
...
bzr revid: rlu@tinyerp.com-20140411122327-mj7ihfh4ai8kzsgv
2014-04-11 17:53:27 +05:30
Randhir Mayatra rma-openerp
85714eabb6
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140411062328-srzutp1ln9xe7sxq
2014-04-11 11:53:28 +05:30
Gery Debongnie
2e9ee9c76e
[MERGE] merge from rma branch
...
bzr revid: ged@openerp.com-20140410145131-fj17mdpi13wa5a9m
2014-04-10 16:51:31 +02:00
Darshan Kalola (OpenERP)
8db081a4f3
[REMOVE]removed module_project_long_term field from project/resconfig_view as well as from resconfig_py.
...
bzr revid: dka@tinyerp.com-20140409111738-27eu5g2dzeh9oq0y
2014-04-09 16:47:38 +05:30
Barad Mahendra
0522e80ea5
[Merge]with trunk
...
bzr revid: mba@tinyerp.com-20140408123641-0qyrg1fmgguezmro
2014-04-08 18:06:41 +05:30
Christophe Simonis
0fad8159f3
[MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx
...
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
2014-04-07 18:33:18 +02:00
Denis Ledoux