93bab6ba7a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140507062712-t81pc41duzjfrwa6
2014-05-07 06:27:12 +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
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
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
e82fbf7d91
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
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
Randhir Mayatra rma-openerp
9dbaa58694
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140407102440-ngtr58o2w2ypqrol
2014-04-07 15:54:40 +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
aa0f70f5ae
[FIX] project: do not overwrite start date is specifically set by the user
...
bzr revid: dle@openerp.com-20140404133958-fyw309i5cem11jm1
2014-04-04 15:39:58 +02:00
Randhir Mayatra rma-openerp
4c0f7b1be8
[IMP] improve strings and project view
...
bzr revid: rma@tinyerp.com-20140404112926-716zimuh3p2ec80k
2014-04-04 16:59:26 +05:30
Christophe Simonis
db6fb31870
[MERGE] forward port of branch 7.0 up to revid 9954 chs@openerp.com-20140403153129-jq9zc7ityoy25c73
...
bzr revid: chs@openerp.com-20140403155904-ya5mas5s3g7ivihb
2014-04-03 17:59:04 +02:00
Randhir Mayatra rma-openerp
e31ef83542
[IMP] revert changes of project view
...
bzr revid: rma@tinyerp.com-20140403054856-cx0yhhbaq026bl32
2014-04-03 11:18:56 +05:30
Olivier Dony
4fe43d9ac6
[FIX] project,project_issue: missing indexes on stage/state/project_id/user_id
...
bzr revid: odo@openerp.com-20140402110700-h3ryoroibj1m92ig
2014-04-02 13:07:00 +02:00
Fabien Pinckaers
0b539587b8
[IMP] kanban view for ir.attachments
...
bzr revid: fp@tinyerp.com-20140401164322-fq3r0pt6idkoobxx
2014-04-01 18:43:22 +02:00
Christophe Simonis
dfdbf8cdc4
[MERGE] forward port of branch saas-2 up to revid 9162 chs@openerp.com-20140401184913-5hi2h11lnmadbozr
...
bzr revid: chs@openerp.com-20140401190308-f3f2l9br69qb33ob
2014-04-01 21:03:08 +02:00
Christophe Simonis
822ef4a621
[MERGE] forward port of branch 7.0 up to revid 9943 launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis
...
bzr revid: chs@openerp.com-20140401184913-5hi2h11lnmadbozr
2014-04-01 20:49:13 +02:00
Denis Ledoux
07ae370d90
[FIX] project, project_issue: overwritten method on_change template, wrong signature, following commit 9277 revid:dle@openerp.com-20140401123657-ozh4ycx36jojpg51
...
bzr revid: dle@openerp.com-20140401144205-cmm5vfzlpsro0f7j
2014-04-01 16:42:05 +02:00
Darshan Kalola (OpenERP)
0b34b27d87
[MERGE]sync with trunk.
...
bzr revid: dka@tinyerp.com-20140331092934-qsaib7n3m3iuuv4g
2014-03-31 14:59:34 +05:30
Randhir Mayatra rma-openerp
fdceb21f0e
[IMP] improve project view
...
bzr revid: rma@tinyerp.com-20140328143109-7yqsabwrlxh5ms6p
2014-03-28 20:01:09 +05:30
Amit Dodiya
be0a802e64
[FIX] task: added domain in project_id field on task view to restrict user for selecting closed project
...
bzr revid: ado@tinyerp.com-20140328125215-2xypsdnn84nln171
2014-03-28 18:22:15 +05:30
Martin Trigaux
830e2d00a9
[MERGE] [FIX] project: function field 'doc_count' is of type integer, not int, courtesy of Yanina Aular (Vauxoo)
...
bzr revid: mat@openerp.com-20140328114737-bk29fqfdyabx4r65
2014-03-28 12:47:37 +01:00
Amit Dodiya
d17ba501ef
[FIX] task: added domain in project_id field on task view to restrict user for selecting closed project
...
bzr revid: ado@tinyerp.com-20140328113218-v9gxvylwdtefuj80
2014-03-28 17:02:18 +05:30
391037db85
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327081257-qru0hbrfsyepb2s2
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327081313-vs355ra8b74c35d8
2014-03-27 08:13:13 +00:00
51aa261b44
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
2014-03-27 07:35:04 +00:00
Yanina Aular
204ab9f609
[PEP8]
...
bzr revid: yanina.aular@vauxoo.com-20140326223329-o0dlgynicv0vq0t1
2014-03-26 18:03:29 -04:30
87f5acb97b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140326071242-wi4c4p17bbhfp671
2014-03-26 07:12:42 +00:00
Randhir Mayatra rma-openerp
c086291ddd
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140325135635-rev8asknqwk08svy
2014-03-25 19:26:35 +05:30
Denis Ledoux
e61d12bfa7
[MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9160 revid:dle@openerp.com-20140325112413-xs5z7y81rhyjt0rd
...
bzr revid: dle@openerp.com-20140325112909-zpfi67tx8yfxwnqe
2014-03-25 12:29:09 +01:00
Denis Ledoux
02459f8d4a
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9929 revid:dle@openerp.com-20140325104921-x8zjx5p71l1o3uif
...
bzr revid: dle@openerp.com-20140310133913-465x5t3n1bo7fu98
bzr revid: dle@openerp.com-20140311164146-2s599kogbqj8e94l
bzr revid: dle@openerp.com-20140312111149-u6y036aej3ywq7et
bzr revid: dle@openerp.com-20140312121145-06s1jvct9v4m7l6s
bzr revid: mat@openerp.com-20140313084409-c0kckxemy3in0mlo
bzr revid: chs@openerp.com-20140313163420-ifa4hyixj722d6jo
bzr revid: chs@openerp.com-20140314102034-g0nzryvwhrpzdas9
bzr revid: chs@openerp.com-20140314104803-19c5snl2fcuih91o
bzr revid: odo@openerp.com-20140314143519-x6rzcfkkqxwc0e1g
bzr revid: chs@openerp.com-20140318110229-y8098w3shdpmoig2
bzr revid: dle@openerp.com-20140318151824-sscl4m8p87emjl8s
bzr revid: dle@openerp.com-20140320112618-yfyihlwz66ryeqf5
bzr revid: dle@openerp.com-20140320161003-j01cc6sqves2wnp2
bzr revid: dle@openerp.com-20140320181252-4gqcog22p1ex0pz7
bzr revid: dle@openerp.com-20140321140450-8ulnhr76qybiadks
bzr revid: dle@openerp.com-20140324104743-ubvu8st7emq9pg1q
bzr revid: dle@openerp.com-20140325112413-xs5z7y81rhyjt0rd
2014-03-25 12:24:13 +01:00
Denis Ledoux
6d60e0ee29
[FIX] project: on project template duplication, keep original tasks stages
...
bzr revid: dle@openerp.com-20140325104921-x8zjx5p71l1o3uif
2014-03-25 11:49:21 +01:00
Christophe Simonis
d93b79e6f4
[MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349-e82t1bmmtjqbl85k
...
bzr revid: chs@openerp.com-20140324133811-4az1kvbznd26seow
2014-03-24 14:38:11 +01:00
Randhir Mayatra rma-openerp
b51066b500
[IMP] convert button into stat button for customer
...
bzr revid: rma@tinyerp.com-20140320134414-mk1ie8okynrtudsq
2014-03-20 19:14:14 +05:30
Randhir Mayatra rma-openerp
df53c3f970
[IMP] improve code
...
bzr revid: rma@tinyerp.com-20140320112017-03miv5s8jovz0iac
2014-03-20 16:50:17 +05:30
Launchpad Translations on behalf of openerp