93bab6ba7a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140507062712-t81pc41duzjfrwa6
2014-05-07 06:27:12 +00:00
b7003a382a
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea
2014-04-29 17:41:04 +02:00
d0e9ba289f
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140429124452-5cvpmtpyz2daj8w2
2014-04-29 14:44:52 +02:00
38e001ce2d
[FIX] missing asset in sale_crm
...
bzr revid: fme@openerp.com-20140425132927-5nslp4tyeh2eoy0r
2014-04-25 15:29:27 +02:00
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
cccc7a3d0c
[MERGE]sync with trunk.
...
bzr revid: dka@tinyerp.com-20140417132329-sd2skyprb3nt88uw
2014-04-17 18:53:29 +05:30
01d9ea6f64
[MERGE][IMP] crm/sale_crm: Terminology
...
Replacement of the term "category" by "tag", for the sake of consistency
bzr revid: rim@openerp.com-20140414083511-b5qvr4ek4mgxx17x
2014-04-14 10:35:11 +02:00
e82fbf7d91
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
5d177a9b10
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140411142817-svp3hp2qfx1xw25k
2014-04-11 16:28:17 +02:00
51aa261b44
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
2014-03-27 07:35:04 +00:00
2a50034bfc
[MERGE] merge with main branch
...
bzr revid: avo@tinyerp.com-20140313124845-p248ahqot4v2x74q
2014-03-13 18:18:45 +05:30
d504764eff
[MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6
...
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
2014-03-11 15:52:05 +01:00
6deae9e9ea
[FIX] *: replace various widgets selection by option no_create, as the purpose of these widgets selection were to actually hide the create and edit and quick create
...
bzr revid: dle@openerp.com-20140306113021-r280g41vkdyf5ew8
2014-03-06 12:30:21 +01:00
9863dbe5c8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
2014-03-04 07:52:38 +00:00
2a73281281
[IMP] improve code according to PEP8
...
bzr revid: voraamitr@gmail.com-20140226133222-9poyk5squ291iyyf
2014-02-26 19:02:22 +05:30
61702ad635
[MERGE] merge with main branch
...
bzr revid: voraamitr@gmail.com-20140226124327-lo0zdy3fztjvdtwk
2014-02-26 18:13:27 +05:30
41f91e2bef
[IMP] sale_crm: subtypes: added sequence
...
bzr revid: tde@openerp.com-20140221112643-thzam5r0db5cfiq6
2014-02-21 12:26:43 +01:00
4b72678bc7
[MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
...
bzr revid: chs@openerp.com-20140220163815-69sza1kclnh5mavs
2014-02-20 17:38:15 +01:00
6b03c5076a
[IMP] sale_crm: udpated gauge parameter name
...
bzr revid: tde@openerp.com-20140211122253-tj3a7llcr0dbhdbn
2014-02-11 13:22:53 +01:00
87028244f4
[FIX] sale_crm: fixed gauge widget according to new parameters
...
bzr revid: tde@openerp.com-20140211100725-n5u4y42givj18ept
2014-02-11 11:07:25 +01:00
b3c6e20e36
[MERGE]sync with trunk and resolve conflicts.
...
bzr revid: dka@tinyerp.com-20140210084803-rjkt9e4rhni8nhlt
2014-02-10 14:18:03 +05:30
04301f3b1e
[FIX] correct various actions in kanban view in sales team: now the user can go to the various reporting view in graph view (addons crm/sale_crm)
...
bzr revid: ged@openerp.com-20140207135038-6tx5ywxxdxywn8cb
2014-02-07 14:50:38 +01:00
033c38c304
[MERGE] trunk
...
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
2014-01-29 03:19:16 +01:00
39c27c72d0
[MERGE] Sync with trunk rev. 9064 rev-id ged@openerp.com-20140127161718-uo6pperke86pqq5v
...
bzr revid: odo@openerp.com-20140128175835-jannyh3cv3gi1sxn
2014-01-28 18:58:35 +01:00
3ce5e01eca
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00:00
168ca32323
[IMP] changes set Tag term instead of category
...
bzr revid: voraamitr@gmail.com-20140124052423-22qu8005g1nooort
2014-01-24 10:54:23 +05:30
4c287b29a9
[IMP] improve Homogenize the terms
...
bzr revid: voraamitr@gmail.com-20140123100058-lhcd5a95wkwi5jj0
2014-01-23 15:30:58 +05:30
49c0b7a820
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
2014-01-06 14:57:00 +01:00
1b7e21a38b
[FIX] removes reference to invoice report tree view in sale_crm because it was already removed in a previous commit to replace it with a graph view (addon web_graph)
...
bzr revid: ged@openerp.com-20140103135342-ba1r15d2r3mrt0k9
2014-01-03 14:53:42 +01:00
bc19dec67c
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140102090034-q44kafh11u0frjv2
2014-01-02 10:00:34 +01:00
9477cacd5f
[IMP] removes old tree view in reporting (sales, sales_crm, sales_stock) and replaces them by the new graph view in pivot mode by default (addon sale, sale_crm, sale_stock)
...
bzr revid: ged@openerp.com-20131231111824-1altk73m9l4iszkq
2013-12-31 12:18:24 +01:00
67e479e96e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131225060225-zss93rqqqz3holkp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131226060540-odnnltlm0bobiqp9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227052235-xq201ghozcgucfuq
bzr revid: launchpad_translations_on_behalf_of_openerp-20131228051943-jo247cfuiyx4w767
bzr revid: launchpad_translations_on_behalf_of_openerp-20131230043947-d1jcf2vpf9go93ec
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231044745-8v24a0fydnvde3js
2013-12-31 04:47:45 +00:00
bdcb7fcc17
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20131227152252-5kz11jpespxg1h5w
bzr revid: ged@openerp.com-20131230090844-9vugoov6jsc6z5j0
2013-12-30 10:08:44 +01:00
54be818a3b
[MERGE] forward port of latest saas-2 until rev 9051 dle@openerp.com-20131217142126-1lbim47d2m2x4bb0
...
bzr revid: mat@openerp.com-20131218155715-khb909yy99cbmna8
2013-12-18 16:57:15 +01:00
7486095918
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9701 rev-id: dle@openerp.com-20131217124201-kha2717b4ka51aih
...
bzr revid: dle@openerp.com-20131217142126-1lbim47d2m2x4bb0
2013-12-17 15:21:26 +01:00
df0a13ab4c
[FIX]sale_crm: quotation/sale order default section_id based on res_users default_section_id
...
bzr revid: dle@openerp.com-20131217124201-kha2717b4ka51aih
2013-12-17 13:42:01 +01:00
d9343e2d27
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20131213094016-ylqkilyo4190g81w
2013-12-13 10:40:16 +01:00
45e34f2f6b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131211053249-7onr7u94z5rfg60p
bzr revid: launchpad_translations_on_behalf_of_openerp-20131212051525-n6q6vsucee027ihr
2013-12-12 05:15:25 +00:00
4b96e85a30
[MERGE] [FORWARD] Forward port of saas-2 branch until revision 9036 (revid tde@openerp.com-20131209102019-kjeg0rx2au1d5e5v)
...
bzr revid: tde@openerp.com-20131209105031-17920wsidpqrwmxj
2013-12-09 11:50:31 +01:00
d181c63d07
[CLEAN] sale_crm: cleaning before merging
...
- sales report: the group by salesteam was wrongly placed in the view
- sale_crm: fixed computation for sparklines, now bar graph should display the same
result as the sales analysis
- added a forgottent cursor: pointer for a gauge
- moved the gauges in the dom
- sale_crm: report: removed extra content not necessary
bzr revid: tde@openerp.com-20131205144505-jfsd8lh91r1b13a1
2013-12-05 15:45:05 +01:00
41fe705943
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9674 rev-id: dle@openerp.com-20131204133633-t7wfbnipv3jtss82
...
bzr revid: chs@openerp.com-20131204125051-dexejzwigpu0z1yy
bzr revid: dle@openerp.com-20131204134400-50y7ojeb8pw7k56s
2013-12-04 14:44:00 +01:00
c0c971b87a
[FIX] sale_crm: wizard crm_make_sale crash if partner_id not sent on the opp.
...
Because defaults get function of partner_id of wizard read the partner_id of the opp and return the first item of the tuple, but if there isnt a partner on the opp, the read return a false for this field, not a tuple.
No return the first item of the tuple if the partner_id is set, else False
bzr revid: dle@openerp.com-20131204133633-t7wfbnipv3jtss82
2013-12-04 14:36:33 +01:00
fd2821086f
[MERGE] sync with trunk
...
bzr revid: chm@openerp.com-20131202150925-eqsi0uu0fqtwimhj
2013-12-02 16:09:25 +01:00
a68dbfe286
[RMV] remove all currecny related stuff as per the comments of fp sir.
...
bzr revid: tpa@tinyerp.com-20131126064238-odztahk0kofak3vh
2013-11-26 12:12:38 +05:30
b08503e373
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20131126052924-xn4qn67lehe6x2pj
2013-11-26 10:59:24 +05:30
7baee28221
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9642 rev-id: dle@openerp.com-20131125160315-tj8n5bv6e5yv8jku
...
bzr revid: dle@openerp.com-20131125143003-vjtzj1c5051pdnk3
bzr revid: dle@openerp.com-20131125160523-hecq5u2uo0mfyoq0
2013-11-25 17:05:23 +01:00
6a5cb66f35
[FIX] sale_crm: return id only for default method of type many2one field in make sale order wizard
...
bzr revid: mat@openerp.com-20131125112629-s3jtair156aqwvpj
2013-11-25 12:26:29 +01:00
5f21b4bff9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131123062620-6obt60lwob64hi98
bzr revid: launchpad_translations_on_behalf_of_openerp-20131124054757-4w9nik6wieeqf0yg
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125060111-rf445xxiinvazinv
2013-11-25 06:01:11 +00:00
d96d2d8725
[FIX] sale_crm: correctly return id only (would break if readonly field)
...
bzr revid: mat@openerp.com-20131122142211-pvbw55ikk74132zm
2013-11-22 15:22:11 +01:00
Launchpad Translations on behalf of openerp
Fabien Meghazi
Richard Mathot (OpenERP)
Darshan Kalola (OpenERP)
Amit Vora
Christophe Simonis
Denis Ledoux
Amit Vora (OpenERP)
Thibault Delavallée
Gery Debongnie
Antony Lesuisse
Olivier Dony
Martin Trigaux
Christophe Matthieu
Turkesh Patel (Open ERP)