Martin Trigaux
ccb38117ee
[MERGE] Forward porting of saas-1 until rev 8739
...
bzr revid: mat@openerp.com-20130605090453-e4mg37kms5j1r18n
2013-06-05 11:04:53 +02:00
5cc8c30adf
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130605053257-nxfx57711h840uev
2013-06-05 05:32:57 +00:00
Thibault Delavallée
af0c4c6045
[MERGE] [IMP] User creation flow
...
Addons-side branch:
- mail_mail.send() and email_template.send() are now able to get the ir_mail_server exceptions up using a new argument (raise_exception, as for access rights); default behavior of all calls to those methods is not changed;
- auth_signup
-- handles the (re)set password email sending possible failure by cancelling the reset password values; having issues with the outgoing email server should not prevent from creating users but should not consider the email was sent if it was not the case;
-- instead of having reset_password in context to send the reset password email, we now have a no_reset_password to avoid sending a reset password email. If not present, the reset password email is sent when creating a user. This allows to avoid adding the key in the context of each res.users many2one;
-- res.users form view (re)set password buttons now have the oe_link class
bzr revid: tde@openerp.com-20130604155001-5twq3pdru12eh1x6
2013-06-04 17:50:01 +02:00
Thibault Delavallée
27839fead3
[CLEAN] auth_signup, mail_mail: better management of exceptions when sending emails, delegated to mail_mail.
...
bzr revid: tde@openerp.com-20130604151508-7bd8gxhkr86fuybp
2013-06-04 17:15:08 +02:00
Vo Minh Thu
21dd30219b
[MERGE] base_action_rule: simplified form view with a clear kind field.
...
bzr revid: vmt@openerp.com-20130604150143-e1vola6oyqxvyxc7
2013-06-04 17:01:43 +02:00
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
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
Vo Minh Thu
3f8551e68c
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20130604131428-nh9ikodh8lit5p7b
2013-06-04 15:14:28 +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
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
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
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
480310a029
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130604062725-756lijc06mik58o7
2013-06-04 06:27:25 +00:00
95c9d77c9f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130604052044-tc482yzk760flm6m
2013-06-04 05:20:44 +00: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
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
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
Olivier Dony
dba21ae6ef
[FIX] procurement: remove spurious placeholder in tree view
...
bzr revid: odo@openerp.com-20130603121914-bf7msemmufcywoc1
2013-06-03 14:19:14 +02:00
Olivier Dony
0f983a0146
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9183
...
rev-id launchpad_translations_on_behalf_of_openerp-20130531070107-7d2k818beg8965ll
bzr revid: odo@openerp.com-20130603121852-jdl6vlo9dmjk0rlc
2013-06-03 14:18:52 +02:00
Martin Trigaux
667876728d
[MERGE] [FIX] account: use the purchase or sale description for manual invoicing instead of product description, courtesy of Numérigraphe
...
lp bug: https://launchpad.net/bugs/1101146 fixed
bzr revid: mat@openerp.com-20130603102627-6dokww7uhijvxlfk
2013-06-03 12:26:27 +02:00
Thibault Delavallée
27b706e9fe
[FIX] sale_crm: still fixing demo data.
...
bzr revid: tde@openerp.com-20130603101200-6of26le663sw0jku
2013-06-03 12:12:00 +02:00
Thibault Delavallée
0f1b903c02
[FIX] sale_crm_demo: fixed demo values for a field that had its name changed.
...
bzr revid: tde@openerp.com-20130603094213-47rhtybwycqnragh
2013-06-03 11:42:13 +02:00
36c14f32d2
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130601052916-cojcbyr1k926vl9n
bzr revid: launchpad_translations_on_behalf_of_openerp-20130601051656-7uhyux565iqufm24
bzr revid: launchpad_translations_on_behalf_of_openerp-20130603060229-es17t14hfn00d47h
2013-06-03 06:02:29 +00:00
9705c37dfa
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130601055923-2o80qu13ofm2jkfh
bzr revid: launchpad_translations_on_behalf_of_openerp-20130531070111-eqt2i0xb3xqrth7p
bzr revid: launchpad_translations_on_behalf_of_openerp-20130601055928-uap5zeq41e0317xt
2013-06-01 05:59:28 +00:00
Thibault Delavallée
09e0cd8dc6
[CLEAN] crm, sale_crm: cleaned code for new fields. Fixed some bugs in calculation and monthly repartition. Updated form views. Improved use of sparkline widget, now having tootips.
...
bzr revid: tde@openerp.com-20130531153100-q1cmpx0kjb02cbtu
2013-05-31 17:31:00 +02:00
Quentin (OpenERP)
fe7866ccec
[FIX] crm: after a merge of several leads/opportunities, delete the old records as the SUPERUSER to avoid security issues.
...
bzr revid: qdp-launchpad@openerp.com-20130531123414-ezx9ixg9ggame1g6
2013-05-31 14:34:14 +02:00
Quentin (OpenERP)
4eb57678cb
[FIX] sale_margin: when sharing a SO with a customer, don't show the margin
...
bzr revid: qdp-launchpad@openerp.com-20130531122745-lkhi0nftibhu325j
2013-05-31 14:27:45 +02:00
Quentin (OpenERP)
5b83d03ac1
[FIX] account, usability: restrict the choice of the account to the ones with type 'other' for income and expense account of product and invoice line
...
bzr revid: qdp-launchpad@openerp.com-20130531121945-fjb9y6rj3k9qd4m9
2013-05-31 14:19:45 +02:00
Dhruti Shastri (OpenERP)
dfe1a7ca34
[hr_hlidays] : Calender view display False value if no user_id
...
bzr revid: dhs@tinyerp.com-20130531120453-56m4n4h4bxrca2x5
2013-05-31 17:34:53 +05:30
Pinakin Nayi (OpenERP)
b430036c7f
[FIX]crm : delete with super user to avoid access rules because if there is any user (not have delete access of lead) than also merge opportunity
...
bzr revid: pna@tinyerp.com-20130531114716-5as9flbu2506reh0
2013-05-31 17:17:16 +05:30
niv-openerp
3a3841aabe
[FIX] im: do not send empty messages
...
bzr revid: nicolas.vanhoren@openerp.com-20130531111317-h17qwsevk06bhf84
2013-05-31 13:13:17 +02:00
Thibault Delavallée
71df2e6f7d
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130531101916-81xwtv4t58krnfaw
2013-05-31 12:19:16 +02:00
Thibault Delavallée
87ca825ae1
[IMP] auth_signup: now manage assertionerror, especially when having a login / email that is not valid.
...
bzr revid: tde@openerp.com-20130531092606-q2gwhtd8j2lva3yo
2013-05-31 11:26:06 +02:00
Dharti Ratani (Open ERP)
2d51566f66
[FIX]Hide the margin in SO if you see SO as a customer through portal, if 'Display margin on sale orders' is activated
...
bzr revid: dhr@tinyerp.com-20130531092311-rgtlbv55ai4223pk
2013-05-31 14:53:11 +05:30
Thibault Delavallée
650cc6b281
[REV] users: constraint on login email-style not applicable anymore.
...
bzr revid: tde@openerp.com-20130531082003-z9s1vvt7hc8c388d
2013-05-31 10:20:03 +02:00
Thibault Delavallée
8205a2d113
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130531081018-dzm2w9p08hakm04q
2013-05-31 10:10:18 +02:00
c3f7fbbf1f
[FIX] project name search if aa id != project id
...
lp bug: https://launchpad.net/bugs/1186146 fixed
bzr revid: nicolas.bessi@camptocamp.com-20130531073631-dthwxiyp8mnmtkfr
2013-05-31 09:36:31 +02:00
Martin Trigaux
c40010d9a3
[IMP] event: remove unused parameter from context added at revision 8737
...
bzr revid: mat@openerp.com-20130531073028-mtal4bgzx2f57yne
2013-05-31 09:30:28 +02:00
ddc7e6c994
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130531070107-7d2k818beg8965ll
2013-05-31 07:01:07 +00:00
Pinakin Nayi (OpenERP)
de5b79545e
[FIX]account : account invoice balance is double the total
...
bzr revid: pna@tinyerp.com-20130531062946-i0rhy98n8bjk9nh4
2013-05-31 11:59:46 +05:30
d9a24a551f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130531053826-kecibs4xe8osg8kr
2013-05-31 05:38:26 +00:00
Olivier Dony
5507cab76f
[MERGE] crm: partner merge wizard: safer behavior when merging + allow choice of target partner + leave note in partner history after merge
...
bzr revid: odo@openerp.com-20130530162721-5urwbdyfh68canf2
2013-05-30 18:27:21 +02:00
Olivier Dony
5b18695c45
[FIX] portal_hr_employee: force inherit_id to False to avoid errors during migrations
...
The view has been converted to a first-class view
but was an inherited view before, so existing
database will exhibit issues when updating unless
the inherit_id field is forced to NULL.
Also fixed a minor typo.
lp bug: https://launchpad.net/bugs/1179349 fixed
bzr revid: odo@openerp.com-20130530151255-6kx6l91mwwa4tfei
2013-05-30 17:12:55 +02:00
Martin Trigaux
49b693e30b
[IMP] event: remove unused parameter from context
...
bzr revid: mat@openerp.com-20130530150621-z4xsss7hfx7v8ixe
2013-05-30 17:06:21 +02:00
Martin Trigaux
7d88fa9443
[MERGE] [IMP] better event form view
...
bzr revid: mat@openerp.com-20130530134736-r5ol9ty83p10iwfl
2013-05-30 15:47:36 +02:00
Martin Trigaux