Martin Trigaux
7a5b5e89f9
[MERGE] [FIX] sale_crm: add payment_term to sale order
...
bzr revid: mat@openerp.com-20130604144618-midnzv5x0418amkf
2013-06-04 16:46:18 +02:00
Jignesh Rathod (OpenERP)
b117b19ac0
Merge with main branch.
...
bzr revid: jir@tinyerp.com-20130604134522-nqo6js7d39elqo1a
2013-06-04 19:15:22 +05:30
Thibault Delavallée
01c61499a3
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130604134414-ryv37jryzi3c8061
2013-06-04 15:44:14 +02:00
Thibault Delavallée
b545e866b1
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130604134405-byfc98qwgyeoufrl
2013-06-04 15:44:05 +02:00
Thibault Delavallée
02ba5f2561
[MERGE] [IMP] Salesteam kanban view
...
- now displaying bar charts for open leads, won opportunities, invoiced and quoted for the last 5 months
- now displaying gauge charts for invoiced and forecast invoice amount for the current month
- improved search (fields/filters/groupby) on sales teams
Including :
- SparklineBarWidget widget: using sparkline widget, allows to display bar charts on a char field. The field value should be formatted like a list of objects (value, tooltip): (str) value='[{'value': 10, 'tooltip': 'my tooltip1'}, {..}, {..}]'.
- GaugeWidget widget: using JustGage widget, allows to display gauge chart on an int field. The max_field attribute allows to set the gauge maximum value.
- improved search on salesteam (responsible, code, note + filter 'My Salesteam' + groupbys (team leader, parent salesteam)
Misc :
- small improvements of lead/opportunities form view
- moved several fields / filters in view into base.group_multi_salesteams group
bzr revid: tde@openerp.com-20130604134228-j5f00q4x8tp92k7k
2013-06-04 15:42:28 +02:00
niv-openerp
01c6623a9b
Puts the request in a thread-local stack
...
bzr revid: nicolas.vanhoren@openerp.com-20130604133450-j7mhtn2r9wbur5o7
2013-06-04 15:34:50 +02:00
Vo Minh Thu
3f8551e68c
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20130604131428-nh9ikodh8lit5p7b
2013-06-04 15:14:28 +02:00
Vo Minh Thu
048b365aff
[FIX] renamed Partner Catgories to Partner Tags.
...
bzr revid: vmt@openerp.com-20130604124003-bpga8k6lq4s7qlvp
2013-06-04 14:40:03 +02:00
Thibault Delavallée
a3c677b337
[CLEAN] sale, sale_crm: reverted some changes, cleaning before merging.
...
bzr revid: tde@openerp.com-20130604123026-f0xks6ky1rkw3ser
2013-06-04 14:30:26 +02:00
Nimesh Contractor (OpenERP)
a8e8042a8d
[MERGE] with trunk.
...
bzr revid: nco@tinyerp.com-20130604115406-360or8wlq5gl3du2
2013-06-04 17:24:06 +05:30
Vo Minh Thu
0019a86ecf
[MERGE] orm: add _sql_contraints only when _auto.
...
bzr revid: vmt@openerp.com-20130604115402-4cf07eq53o6ocs39
2013-06-04 13:54:02 +02:00
Thibault Delavallée
6dd31d5841
[IMP] crm: added code on sales team search view
...
bzr revid: tde@openerp.com-20130604115159-56jsm8dr23gxl30c
2013-06-04 13:51:59 +02:00
Thibault Delavallée
1d8cd3ec88
[FIX] crm: order of files in tertimonial
...
bzr revid: tde@openerp.com-20130604113516-v79kumeixy26538b
2013-06-04 13:35:16 +02:00
Olivier Dony
b16935efdc
[IMP] orm: include forbidden IDs when logging ir.rules violations, to make troubleshooting easier
...
bzr revid: odo@openerp.com-20130604111354-1x5yc305okhx5ujk
2013-06-04 13:13:54 +02:00
Amit Dodiya
244c82fe4f
[FIX]ir_property: If we add a property on a many2one field with multicompany the value of main company is replaced in all companies value
...
bzr revid: ado@tinyerp.com-20130604110137-jclbsmkohs5mm66w
2013-06-04 16:31:37 +05:30
Martin Trigaux
45c3fd063b
[MERGE] Forward porting of latest 7.0 bugfixes, up to rev. 9193
...
bzr revid: mat@openerp.com-20130604110041-yemgrfsi02uboe8m
2013-06-04 13:00:41 +02:00
Thibault Delavallée
8480636380
[CLEAN] crm: removed minified file for sparkline as we use plain file; small changes in views.
...
bzr revid: tde@openerp.com-20130604105648-ytfhdb5wmdrzkyay
2013-06-04 12:56:48 +02:00
Paramjit Singh Sahota
438fe61061
[MErGE] Merged lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20130604095006-0lkt0ve4kztg7b8h
2013-06-04 15:20:06 +05:30
Paramjit Singh Sahota
388a3e14a1
[ImP] method name change and removed the access call which is not needed bcz the system is calling it self.
...
bzr revid: psa@tinyerp.com-20130604094722-2b8i6ba7blz1g2rc
2013-06-04 15:17:22 +05:30
Vo Minh Thu
186da3a29c
[MERGE] res_users treee view: use the login_date field (instead of date).
...
bzr revid: vmt@openerp.com-20130604094438-zwp5e09fte4ie1af
2013-06-04 11:44:38 +02:00
DBR (OpenERP)
f7ccb3ac80
[Merge] lp:openobject-addons
...
bzr revid: dbr@tinyerp.com-20130604091834-8bk4deid3bogiwmx
2013-06-04 14:48:34 +05:30
Thibault Delavallée
37fb148346
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130604091042-6aethn2pmxtniqaw
2013-06-04 11:10:42 +02:00
Thibault Delavallée
6049940fea
[IMP] crm: lead form view: escalate as a link
...
bzr revid: tde@openerp.com-20130604091014-25vsm5upv9z1oq97
2013-06-04 11:10:14 +02:00
Martin Trigaux
b7fb321f5b
[MERGE] [FIX] correct path for printing webkit reports on windows server, courtesy of Olivier Laurent (Acsone)
...
lp bug: https://launchpad.net/bugs/1159702 fixed
bzr revid: mat@openerp.com-20130604084631-pv3echfj33qatqug
2013-06-04 10:46:31 +02:00
Vo Minh Thu
6f1531f1d3
[MERGE] orm: add __iter__ method on browse_null.
...
Otherwise Python falls back to __getitem__ when trying to loop over it
or when trying to test `in`.
bzr revid: vmt@openerp.com-20130604081706-z79vqj36ls2adw09
2013-06-04 10:17:06 +02:00
bth-openerp
a3830c9ed3
[MERGE] Merge lp:openobject-addons.
...
bzr revid: bth@tinyerp.com-20130604063011-shbl1vyb7qs4ojkg
2013-06-04 12:00:11 +05:30
Turkesh Patel (Open ERP)
ed3509568d
[IMP] improve configuration warning and disription of the module
...
bzr revid: tpa@tinyerp.com-20130604062948-vi0j5pzi5s2agjp9
2013-06-04 11:59:48 +05:30
Launchpad Translations on behalf of openerp
480310a029
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130604062725-756lijc06mik58o7
2013-06-04 06:27:25 +00:00
Chandni Machchhar (OpenERP Trainee)
d3044130c8
[FIX] Optimize the Code.
...
bzr revid: chandni.machchhar3@gmail.com-20130604062132-n8x9iofinoz9cx43
2013-06-04 11:51:32 +05:30
sgo@tinyerp.com
bdeaa2c722
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130604053815-g0iohxg8vtgapt7p
2013-06-04 11:08:15 +05:30
sgo@tinyerp.com
bb00be2dfe
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130604053654-iioke97u2i18j5jz
2013-06-04 11:06:54 +05:30
Foram Katharotiya (OpenERP)
6d5cb91043
[MERGE] with 7.0
...
bzr revid: fka@tinyerp.com-20130515051235-i2opyehkanl77oud
bzr revid: fka@tinyerp.com-20130520051543-kd6e5rhqb3c2j2w2
bzr revid: fka@tinyerp.com-20130522062104-u9f3sec8wxivuouv
bzr revid: fka@tinyerp.com-20130531103058-mu8bja9j90m2newc
bzr revid: fka@tinyerp.com-20130604053616-dq91e11sgmbhqxjz
2013-06-04 11:06:16 +05:30
sgo@tinyerp.com
4bbb78f531
[IMP]hide group by partner checkbox when wizard popups automatically after product recieved
...
bzr revid: sgo@tinyerp.com-20130604053546-twaycqp4130s6x48
2013-06-04 11:05:46 +05:30
Launchpad Translations on behalf of openerp
95c9d77c9f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130604052044-tc482yzk760flm6m
2013-06-04 05:20:44 +00:00
Foram Katharotiya (OpenERP)
1501cc6b47
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20130604050828-0mds6epwthsxxv4m
2013-06-04 10:38:28 +05:30
Foram Katharotiya (OpenERP)
cf5c0c03e6
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20130604044810-a7wry61al6i9td29
2013-06-04 10:18:10 +05:30
Quentin (OpenERP)
3887f78cef
[REF] gamification: code review (WIP)
...
bzr revid: qdp-launchpad@openerp.com-20130603203053-dy7ia09rl0i1sxmd
2013-06-03 22:30:53 +02:00
Yannick Vaucher
1a1d9b67e8
[IMP] report_webkit - remove separator and colspan
...
bzr revid: yannick.vaucher@camptocamp.com-20130603172749-rxr7f333junwc725
2013-06-03 19:27:49 +02:00
Olivier Dony
2c364097c7
[MERGE] l10n_ca: fix some tax definitions + updated fiscal position names, courtesy of Jonatan Cloutier (Savoir-Faire Linux)
...
bzr revid: odo@openerp.com-20130603161020-gljpqmv504pn2npv
2013-06-03 18:10:20 +02:00
Quentin (OpenERP)
a8eb9301e4
[REF] gamification: code review of badge.py
...
bzr revid: qdp-launchpad@openerp.com-20130603160314-zprlgye2rpd140pv
2013-06-03 18:03:14 +02:00
Olivier Dony
b942539e3d
[MERGE] l10n_lu: update financial report labels to match latest eCDF values, courtesy of Stéphane Bidoul (Acsone)
...
bzr revid: odo@openerp.com-20130603155610-penultapioum2i8w
2013-06-03 17:56:10 +02:00
Christophe Matthieu
d86f6f24c0
[IMP] suppress button oe_demo_play
...
bzr revid: chm@openerp.com-20130603154158-7k9tvdwmn6ukp5x3
2013-06-03 17:41:58 +02:00
Vo Minh Thu
afc7b07905
[MERGE] rng: more precise attributes/values on the field element.
...
bzr revid: vmt@openerp.com-20130603153456-kl112hvilfnyjtjg
2013-06-03 17:34:56 +02:00
Vo Minh Thu
38d9325f66
[MERGE] views: removed unnecessary model attribute used with ref.
...
bzr revid: vmt@openerp.com-20130603144446-ara6oli0her5rdm3
2013-06-03 16:44:46 +02:00
Christophe Matthieu
68080eb17f
[IMP] description.html to index.html
...
bzr revid: chm@openerp.com-20130603142201-l3pdz4s5ggxjdf8w
2013-06-03 16:22:01 +02:00
Vo Minh Thu
6d80cebc3d
[MERGE] improved typos.
...
bzr revid: vmt@openerp.com-20130603134442-zeqchsvtb9bukben
2013-06-03 15:44:42 +02:00
Vo Minh Thu
de673a99a9
[MERGE] res.partner: ondelete=restrict on the state and country many2one.
...
bzr revid: vmt@openerp.com-20130603133555-2oz1bxotnkdh7tu4
2013-06-03 15:35:55 +02:00
Mahendra Barad (OpenERP Trainee)
290f67fec2
[IMP] add the or lable in between configure and skip button
...
bzr revid: baradmahendra344@gmail.com-20130603132854-vw5n0988ppacmfdk
2013-06-03 18:58:54 +05:30
Nimesh Contractor (OpenERP)
3160f39b17
[MERGE] with trunk
...
bzr revid: nco@tinyerp.com-20130603132631-o8dvw3v5x1wi3im6
2013-06-03 18:56:31 +05:30
Vo Minh Thu
e081fd19dc
[MERGE] res_users_view (preferences): save button now in red.
...
bzr revid: vmt@openerp.com-20130603132532-v5rlpj8tbbk34djy
2013-06-03 15:25:32 +02:00