Commit Graph

693 Commits

Author SHA1 Message Date
Quentin (OpenERP) 552583b9d8 [MERGE] merged v7 branch
bzr revid: qdp-launchpad@openerp.com-20130205155556-b4zw4y3gr9v2eom3
2013-02-05 16:55:56 +01:00
Antony Lesuisse 36243840d5 [MERGE] analytic search fixes
bzr revid: al@openerp.com-20130205110752-v5b3f4v2q9fsvdvx
2013-02-05 12:07:52 +01:00
Antony Lesuisse 29269460fd Analytic accounts contract search view
bzr revid: al@openerp.com-20130205102849-ur591dnyi5r7c9ao
2013-02-05 11:28:49 +01:00
Launchpad Translations on behalf of openerp 996746634f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130205052331-pkjgm8c2lnxld0x6
2013-02-05 05:23:31 +00:00
Launchpad Translations on behalf of openerp 45077e64db Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130201054853-1vii2se3uthiyvlt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130201054957-7dma2q0grk2328gf
2013-02-01 05:49:57 +00:00
Launchpad Translations on behalf of openerp a7a6bb4a3c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130131043907-udcv4harlyn8j20l
bzr revid: launchpad_translations_on_behalf_of_openerp-20130201044745-rajobestkrskeaty
2013-02-01 04:47:45 +00:00
Launchpad Translations on behalf of openerp b390a5697c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130126050355-xxot322zn826zr96
bzr revid: launchpad_translations_on_behalf_of_openerp-20130127043627-b85ckledrtpdd73m
bzr revid: launchpad_translations_on_behalf_of_openerp-20130128051345-a31wsrx74u1w228d
bzr revid: launchpad_translations_on_behalf_of_openerp-20130129052015-doewhw7byebeeijs
bzr revid: launchpad_translations_on_behalf_of_openerp-20130130043841-h15p02at1d6o2clr
2013-01-30 04:38:41 +00:00
Launchpad Translations on behalf of openerp 39951ce27c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130125060526-1sardheh24y8unc0
bzr revid: launchpad_translations_on_behalf_of_openerp-20130126053740-34a73mqkdg04j9s4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130127051008-60htke4mkwclnqfk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130128055849-swluxyrhgvpbmrg2
bzr revid: launchpad_translations_on_behalf_of_openerp-20130129061824-peffot06nnwkgdkp
2013-01-29 06:18:24 +00:00
Launchpad Translations on behalf of openerp 3499c33270 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130123060246-kt475gbzoz4f1703
bzr revid: launchpad_translations_on_behalf_of_openerp-20130123060324-z9zt3oif6p20i6mp
bzr revid: launchpad_translations_on_behalf_of_openerp-20130123060328-e0rnct2yu9lh23vp
2013-01-23 06:03:28 +00:00
Launchpad Translations on behalf of openerp 7a49719d46 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130118071051-e8wytix67wlb17yd
2013-01-18 07:10:51 +00:00
Thibault Delavallée 1f050cd40e [MERGE] Forward port of addons 7.0 until 8584.
bzr revid: tde@openerp.com-20130115100302-rhhla88naie18hug
bzr revid: tde@openerp.com-20130115141932-60y8i1mbi2x88ess
2013-01-15 15:19:32 +01:00
Launchpad Translations on behalf of openerp de3bc67db1 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130112045551-wjsyz802n4nqd7vr
bzr revid: launchpad_translations_on_behalf_of_openerp-20130113043812-l0ovo49g926v4dgv
bzr revid: launchpad_translations_on_behalf_of_openerp-20130114043606-hh6r16tb0ch8srcs
bzr revid: launchpad_translations_on_behalf_of_openerp-20130115044740-g62460we9b2ubn95
2013-01-15 04:47:40 +00:00
Launchpad Translations on behalf of openerp 567946664b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130112054058-8axv6o0qb0xnmx0w
bzr revid: launchpad_translations_on_behalf_of_openerp-20130113052752-ek3mq7hoe2mj4zyt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130114051817-ltnyu6jl4nxctf8t
2013-01-14 05:18:17 +00:00
Olivier Dony 9434537986 [FIX] contracts: use correct quantity field to avoid mismatching values
`quantity` is a recursive sum of quantities of all types, including child accounts,
while `hours_quantity` is the local sum of quantities in `general` analytic journals.
The latter is what corresponds to the `Units consumed` value for contracts, and what
is used to compute the `remaining_hours`, so we must used that.

bzr revid: odo@openerp.com-20130110171100-el2g1i3ou89p2yjc
2013-01-10 18:11:00 +01:00
Launchpad Translations on behalf of openerp d299567edb Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130109055250-wxy0mw21gmbainhu
2013-01-09 05:52:50 +00:00
Launchpad Translations on behalf of openerp 0f8f807662 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130108060621-ui1ieo61n4a6evjr
bzr revid: launchpad_translations_on_behalf_of_openerp-20130108060625-j9tf52wfuw30yh8i
2013-01-08 06:06:25 +00:00
Launchpad Translations on behalf of openerp d4fe8fe12a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130105054051-qzsonom63if47pod
2013-01-05 05:40:51 +00:00
Launchpad Translations on behalf of openerp 738f2b44a7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130104052810-1hc0kz14e6ev38ly
bzr revid: launchpad_translations_on_behalf_of_openerp-20130104052815-90n20ge4a6x22t2o
2013-01-04 05:28:15 +00:00
Launchpad Translations on behalf of openerp f659d305f7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130103053838-8dc22w7xc4pekn1v
bzr revid: launchpad_translations_on_behalf_of_openerp-20130103053926-saljmu2wubie130o
bzr revid: launchpad_translations_on_behalf_of_openerp-20130103053929-zhnxa8yb58llx12y
2013-01-03 05:39:29 +00:00
Launchpad Translations on behalf of openerp fca02afad3 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130101051924-2q3t0sbo83ti3ooe
bzr revid: launchpad_translations_on_behalf_of_openerp-20130102052612-z5wooakbv4fnww9x
2013-01-02 05:26:12 +00:00
Launchpad Translations on behalf of openerp 667d98cab0 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121228053555-9fpc1mj7ur0a5tbd
bzr revid: launchpad_translations_on_behalf_of_openerp-20121229053621-25bpaf17lvsnyr4e
bzr revid: launchpad_translations_on_behalf_of_openerp-20121229053655-b3agh60e70at492g
2012-12-29 05:36:55 +00:00
Launchpad Translations on behalf of openerp 22808e5a81 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121228053716-q30ba0cxw7g5wxlo
2012-12-28 05:37:16 +00:00
Launchpad Translations on behalf of openerp efb64ff56e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121225051611-uumpxy0vogqpajgy
bzr revid: launchpad_translations_on_behalf_of_openerp-20121226051837-36l8c87rcj3outah
2012-12-26 05:18:37 +00:00
Launchpad Translations on behalf of openerp 5c360f7327 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121225044840-forvhhdzu8wfuw2y
bzr revid: launchpad_translations_on_behalf_of_openerp-20121226043938-300zdp9oob5hc6e6
2012-12-26 04:39:38 +00:00
Launchpad Translations on behalf of openerp f49cf3ad50 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121222073731-s1qift4p97f9s1zf
bzr revid: launchpad_translations_on_behalf_of_openerp-20121223050857-vzu6pl7ttzy10603
bzr revid: launchpad_translations_on_behalf_of_openerp-20121224051043-oxj4lz3tpjhai7hn
2012-12-24 05:10:43 +00:00
Launchpad Translations on behalf of openerp 94afe1ccef Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121222060744-44at9lbhw0npx5h6
bzr revid: launchpad_translations_on_behalf_of_openerp-20121223044213-e86qkwoh0uo3cjti
bzr revid: launchpad_translations_on_behalf_of_openerp-20121224044035-1y0s4fc6ns7ytko6
2012-12-24 04:40:35 +00:00
Olivier Dony 3815d22432 [I18N] Update translation templates for latest changes - ready for 7.0 release
bzr revid: odo@openerp.com-20121221172005-uuwfq58gslzikygl
2012-12-21 18:20:05 +01:00
Olivier Dony 49597f0e66 [MERGE] *: improved english wording, suggestions courtesy of OpenERP Community
bzr revid: odo@openerp.com-20121221164808-kdjrtcbgma4dr3on
2012-12-21 17:48:08 +01:00
Fabien Pinckaers 22454532d1 [IMP] very small fix in contracts, always show sale orders
bzr revid: fp@tinyerp.com-20121221164255-2mys887v0uee0f0z
2012-12-21 17:42:55 +01:00
Launchpad Translations on behalf of openerp 231ecd2032 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121221043915-9f5zsgjkksp56zwn
bzr revid: launchpad_translations_on_behalf_of_openerp-20121221044239-5bv82e8q9e8s6bxw
bzr revid: launchpad_translations_on_behalf_of_openerp-20121221050452-f6jqbwzk9lovjkxm
2012-12-21 05:04:52 +00:00
Launchpad Translations on behalf of openerp 2315050bab Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121220044654-aygk0cmaxl26bs0f
bzr revid: launchpad_translations_on_behalf_of_openerp-20121220045947-8j22pe4nm62kzq22
2012-12-20 04:59:47 +00:00
Khushboo Bhatt (Open ERP) f233374657 [FIX]account_analytic_analysis:menu string changed
bzr revid: kbh@tinyerp.com-20121219063050-6418jrzcmh8vqe5x
2012-12-19 12:00:50 +05:30
Launchpad Translations on behalf of openerp 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
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
Launchpad Translations on behalf of openerp 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
Cecile Tonglet 15fe515601 [MERGE] From trunk
bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28
2012-12-17 15:43:06 +01:00
Fabien Pinckaers 5449102e85 [MERGE] improved email for contract renewal if no phone number
bzr revid: fp@tinyerp.com-20121215163204-0k0gzws8c8kjc9s4
2012-12-15 17:32:04 +01:00
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp 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
Fabien Pinckaers 0a29f55843 [IMP] contracts
bzr revid: fp@tinyerp.com-20121210194250-ausp6zfxnu4ruq4q
2012-12-10 20:42:50 +01:00
Fabien Pinckaers ed0355a6b7 [IMP] better contract search view
bzr revid: fp@tinyerp.com-20121210193951-ewpv561fq2tbvxuw
2012-12-10 20:39:51 +01:00
Fabien Pinckaers 2f96683e20 [IMP] contract management
bzr revid: fp@tinyerp.com-20121210192810-eff3qaqn90vgl5q3
2012-12-10 20:28:10 +01:00
Vo Minh Thu 6072fd11af [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20121210111654-0pm3pupnqqeip52n
2012-12-10 12:16:54 +01:00
Launchpad Translations on behalf of openerp 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 c412faac93 [IMP] better demo data for contracts
bzr revid: fp@tinyerp.com-20121208132156-njzmw57hkp8d7cdj
2012-12-08 14:21:56 +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
Launchpad Translations on behalf of openerp 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
Vo Minh Thu e7f4891d46 [IMP] use the openerp namespace.
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
Launchpad Translations on behalf of openerp 538834d9c3 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121206044118-gn1y04y813l6skve
bzr revid: launchpad_translations_on_behalf_of_openerp-20121206045406-0pzpwmkyyxre13hn
2012-12-06 04:54:06 +00:00