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
Josse Colpaert
9f9023b139
[ADD] Product margin UoM + product_extended
...
bzr revid: jco@openerp.com-20130605085626-6g4kvnrfgoxf3y2k
2013-06-05 10:56:26 +02:00
niv-openerp
931744c995
[IMP] Improvement of request handling in server-side controllers.
...
bzr revid: nicolas.vanhoren@openerp.com-20130605084333-m51jfw9ogo0mgfh6
2013-06-05 10:43:33 +02:00
niv-openerp
7f44a2ea6e
Added request in the list of first arguments for methods to wrap
...
bzr revid: nicolas.vanhoren@openerp.com-20130605084221-zyi54wa4ci36e2dd
2013-06-05 10:42:21 +02:00
Stéphane Bidoul
709b6d9ba8
l10n_lu account chart: align account names with latest eCDF field list
...
bzr revid: stephane.bidoul@acsone.eu-20130605075244-x7hhf9kl1nr1rb42
2013-06-05 09:52:44 +02:00
Martin Trigaux
3136aae3f5
[FIX] account: don't display non-commercial partners for bank statement
...
bzr revid: mat@openerp.com-20130605074957-tpd3jol51ww7j86i
2013-06-05 09:49:57 +02:00
Stéphane Bidoul
f2ad29fe1d
l10n_lu account chart: add missing mappings between account chart and financial reports
...
Accounts 756, 758 and 759 should be the only one not mapped as
the mapping is ambiguous, and child accounts should me mapped individually.
bzr revid: stephane.bidoul@acsone.eu-20130605074300-gyiwqfb7qa7wwkbo
2013-06-05 09:43:00 +02:00
sgo@tinyerp.com
1202f9c6d5
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130605072213-cwxmjtzt36434mgt
2013-06-05 12:52:13 +05:30
Foram Katharotiya (OpenERP)
de69f4134c
[MERGE] with 7.0
...
bzr revid: fka@tinyerp.com-20130605071449-n18h0gbtkbv58z9k
2013-06-05 12:44:49 +05:30
Nimesh Contractor (OpenERP)
d307d7bd9b
[MERGE] with trunk.
...
bzr revid: nco@tinyerp.com-20130605065435-pwoa0dbany8pecu7
2013-06-05 12:24:35 +05:30
Launchpad Translations on behalf of openerp
a672175778
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130605063353-olbsp2vtidn3j2l8
2013-06-05 06:33:53 +00:00
Launchpad Translations on behalf of openerp
b1a9b0b9d9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130604062709-pb9s1kp33ar9hc9u
bzr revid: launchpad_translations_on_behalf_of_openerp-20130605063346-xa44erszwq702eya
2013-06-05 06:33:46 +00:00
Randhir Mayatra (OpenERP)
72d510941a
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20130605061651-nt3kgs70e0c3hhq8
2013-06-05 11:46:51 +05:30
Launchpad Translations on behalf of openerp
5cc8c30adf
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130605053257-nxfx57711h840uev
2013-06-05 05:32:57 +00:00
niv-openerp
7735db7202
fix unit tests
...
bzr revid: nicolas.vanhoren@openerp.com-20130604160525-e0qgr814j2g6qhl6
2013-06-04 18:05:25 +02: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
be36071d35
[MERGE] [IMP] User creation flow
...
Server-side branch:
- res.users simplified form view: login field is called 'Email Address' to try to have email-style login (byt no constraint on the login currently; email and login are still different fields);
- res.users form view: removed contact fields from the user view, but added a link to the partner. It allows to go from the user to the related partner and have access to all its profile data;
- res.partner: email is necessary if user_ids is not empty (aka, partner is an user)
bzr revid: tde@openerp.com-20130604154515-0msg7b57luox54sr
2013-06-04 17:45:15 +02:00
niv-openerp
97b22323aa
Refactored main.py
...
bzr revid: nicolas.vanhoren@openerp.com-20130604153037-h4kzan18r2wlkb62
2013-06-04 17:30:37 +02:00
Martin Trigaux
79e283090a
[MERGE] base_import: better FAQ
...
bzr revid: mat@openerp.com-20130604152059-batvt7x6zvvwbipr
2013-06-04 17:20:59 +02:00
niv-openerp
b466818a89
(At least) managed to put the magic patcher for all methods that get a "req" object
...
bzr revid: nicolas.vanhoren@openerp.com-20130604151631-tfqvcoq3kd4e16ey
2013-06-04 17:16:31 +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
Xavier Morel
431e0761c0
[FIX] assertion errors in search view when selecting all of a search input's content
...
Force normalization of the input's root node, Firefox tends to spawn
multiple text node children then create selection ranges over all of
them and worse.
lp bug: https://launchpad.net/bugs/1169945 fixed
bzr revid: xmo@openerp.com-20130604150551-0m0b48aifg9favz8
2013-06-04 17:05:51 +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
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
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
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
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
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
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
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
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
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