Commit Graph
75317 Commits
Author SHA1 Message Date
Martin Trigaux 7db84881e7 [MERGE] [FIX] account_anglo_saxon: at invoice validation, the price for the analytic lines should be computed using the price_unit of the related stock.move instead of the product standard price (useful if different valuation method, could have price difference between delivery and invoice time)
bzr revid: mat@openerp.com-20131205163802-chgmkik9qj0s5kw6
2013-12-05 17:38:02 +01:00
Martin Trigaux 81b3203dd7 [FIX] account_anglo_saxon: at invoice validation, the price for the analytic lines should be computed using the price_unit of the related stock.move instead of the product standard price (useful if different valuation method, could have price difference between delivery and invoice time)
bzr revid: mat@openerp.com-20131205163406-3rvupbbj3sm9q550
2013-12-05 17:34:06 +01:00
Thibault Delavallée 7662250693 [MERGE] [IMP] crm, sale_crm: improved sales team kanban view
Including:
- sales team members are displayed
- fixed sparklines whose numbers were incorrect
- sparklines now redirect to a correct report view, filtered for the sales team, grouped by month, in order to have matching results between the vignette links and the displayed reports
- custom css in crm put in a sass file
- sale_crm extend the crm reports, to add the section_id field in the reports, allowing to filter / group by salesteam. The analysis view has been put into several methods to allow extension.

bzr revid: tde@openerp.com-20131205160029-1tljp52ovcavwxel
2013-12-05 17:00:29 +01:00
Thibault Delavallée 84375d5a3e [MERGE] [FIX] web_kanban_gauge: check the value entered in the forecast
[IMP] web_kanban_sparkline: added an option to add a suffix in the sparkline tooltips

bzr revid: tde@openerp.com-20131205160010-8ecv8b618fa6rywj
2013-12-05 17:00:10 +01:00
Thibault Delavallée f44b3126f6 [IMP] crm: sales team kanban view: added suffix on opportunity sparkline + fixed the one on leads
bzr revid: tde@openerp.com-20131205151424-kctwivphai3kspkz
2013-12-05 16:14:24 +01:00
Thibault Delavallée 93ce6e7ab5 [CLEAN] web_kanban_sparkline: removed tootip_suffix_field, not used and not necessary
bzr revid: tde@openerp.com-20131205151355-p2vtq5s1etv145my
2013-12-05 16:13:55 +01:00
Thibault Delavallée bd45d6b47b [CLEAN] web_kanban_gauge: removed unnecessary code before merging
bzr revid: tde@openerp.com-20131205150337-5lwc6w7whrtlwp5d
2013-12-05 16:03:37 +01:00
Thibault Delavallée 5b6b273c1c [CLEAN] crm: effectively removed commented code
bzr revid: tde@openerp.com-20131205145344-y7ierj85glu439l7
2013-12-05 15:53:44 +01:00
Thibault Delavallée 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
Thibault Delavallée ea62cbacf8 [FIX] crm: sales team kanban view: added an oe_clear beceause of alignment issues when adding things below item_list.
bzr revid: tde@openerp.com-20131205144344-d8616y18n2lvnkgu
2013-12-05 15:43:44 +01:00
Thibault Delavallée 73f663eed0 [CLEAN] crm: cleaned modifications before merging :
- moved css into sass file to standardize the process
- commented some records added in the xml file of crm.case.section that do not seem necessary

bzr revid: tde@openerp.com-20131205124749-3a1quhetgxq2d224
2013-12-05 13:47:49 +01:00
Thibault Delavallée 6288f5e299 [MERGE] Sync with trunk, notably for bootstrap that landed in trunk
bzr revid: tde@openerp.com-20131205102402-v6p1c1duimd9m59l
2013-12-05 11:24:02 +01:00
Thibault Delavallée f28d5f47b8 [MERGE] Sync with trunk, notably for bootstrap that landed in trunk
bzr revid: tde@openerp.com-20131205102352-ncx6whb8r0fejgcc
2013-12-05 11:23:52 +01:00
Thibault Delavallée 896fab1b44 [IMP] [FIX] mail: mail_thread: routing: check for exact message_id.
When processing an incoming email, we try to find a parent for the email based on references. Before this merge, it was done using openerp-<model-<res_id> pattern. However it is buggy. Indeed having two OpenERP sending emails to each other leads to messages being inserted in a wrong thread (model and res_id of the first OpenERP for both instances).

Now we search for an exact match between the references and the stored message_ids. As each message_id can be considered as unique the number of collisions is lessened. This won't cause any issues with OpenERP >= 7.0.

A compatibility mode is implemented for <= 6.1: as in those versions the message_id is not stored, we fall back on the previous behavior for records having messages without message_id. This indicates that the record was created before 7.0.

Tests have been updated accordingly, and a test added for the compatibility mode.

bzr revid: tde@openerp.com-20131205100534-2rlyun8wqng3qa6f
2013-12-05 11:05:34 +01:00
Thibault Delavallée 4f5d36a464 [IMP] [CLEAN] mail: mail_thread: routing
- removed a debug print statement
- now searching all references once instead of each reference one at a time
to lessen the number of queries; as the newest message will be the first
in the search result, it's ok.

bzr revid: tde@openerp.com-20131205093921-h7sits57vqc51c8p
2013-12-05 10:39:21 +01:00
Thibault Delavallée 0624beb6af [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20131205093609-3lj3hsxz2vsudhw3
2013-12-05 10:36:09 +01:00
Christophe Simonis 4ab77759cc [MERGE] forward port of branch saas-2 up to revid 9029 chs@openerp.com-20131204125051-dexejzwigpu0z1yy
bzr revid: chs@openerp.com-20131204130023-lgravuoxwlt39pek
2013-12-04 14:00:23 +01:00
Denis Ledoux 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
Denis Ledoux 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
Christophe Simonis 8fc992910e [FIX] auth_signup: set an alias for the template user
bzr revid: chs@openerp.com-20131204122609-oi2b8g4p8cy13dux
2013-12-04 13:26:09 +01:00
Christophe Simonis 08ec6a3805 [FIX] mail: reset alias when copying users
bzr revid: chs@openerp.com-20131204112734-2h569udrxgsgw9kr
2013-12-04 12:27:34 +01:00
Denis Ledoux dea3fdeeed [FIX] im_livechat: many2one channel_id of im_session to the right model.
In im_session model, field channel_id was a many2one to im_user, or, obviously, this should be a many2one to im_livechat.channel
Well, obviously, this is a copy/paste error (or distraction, your choice!). This fix should normally not be pushed on a stable branch (like the current one, saas-2), but considering the severity of the problem, and the few changes in database (alter foreign key only), this is acceptable. Why such a big mistake has not been seen earlier ? Do you even test or read back what you write ?

bzr revid: dle@openerp.com-20131204122727-q0ch5j2v8rrli41e
2013-12-04 13:27:27 +01:00
Christophe Simonis 51e05e068b [FIX] ir.http: catch all authentification errors
bzr revid: chs@openerp.com-20131204102430-qxqk8qtze5n5rqe8
2013-12-04 11:24:30 +01:00
Launchpad Translations on behalf of openerp 379dc8bf98 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054445-5fy8zd7lvnn9mjp2
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055138-hq05otjnuktjpa48
bzr revid: launchpad_translations_on_behalf_of_openerp-20131204055601-tbzqqhperzffjbjt
bzr revid: launchpad_translations_on_behalf_of_openerp-20131204055642-0rwynvhgvs0r14b3
2013-12-04 05:56:42 +00:00
Antony Lesuisse 447255e021 [FIX] http response handling inside request context
bzr revid: al@openerp.com-20131203215640-ev45het902u6afls
2013-12-03 22:56:40 +01:00
Antony Lesuisse d5aec362a9 [FIX] MockRequestCase
bzr revid: al@openerp.com-20131203214705-6tz63yqo9kk73ztx
2013-12-03 22:47:05 +01:00
Antony Lesuisse 4c45774b6d [IMP] manual exception handling for non-json controllers
bzr revid: al@openerp.com-20131203191621-xu2350cw0u3izn3s
2013-12-03 20:16:21 +01:00
Antony Lesuisse 43979cfd8f [IMP] http improvement
- context manager request object (removes some ugly hacks)
- improve http error handling
- add lazyresponses

bzr revid: al@openerp.com-20131203190639-e8r1qm9wc82t8g4k
2013-12-03 20:06:39 +01:00
Denis Ledoux cf052214bd [FIX]portal_sale: add the lang to the email templates (sale.order and account.invoice), for the email to be translated in the customer language (as this is the case for regular email templates from sale and account modules-
bzr revid: dle@openerp.com-20131203142554-5yrp5o5wl382oyo3
2013-12-03 15:25:54 +01:00
Christophe Simonis 7e8a5f7697 [FIX] web: openerpframework.js: do not use _.str
openerpframework.js can be used as standalone library (im_livechat uses
it this way) and do not depend on underscore.string.js

bzr revid: chs@openerp.com-20131203132937-ss7hx1gligzai5ch
2013-12-03 14:29:37 +01:00
Denis Ledoux 64c0ff21d5 [FIX]sale_stock: do not raise if not able to find any warehouse (for the get default warehouse), it can prevent the user of doing anything (if he does an upgrade of sale_stock module while having no warehouse set, the user will not be able to sign in in his instance again).
bzr revid: dle@openerp.com-20131203095544-i5vmow007dgjbiza
2013-12-03 10:55:44 +01:00
Launchpad Translations on behalf of openerp 4fd98907ce Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131130053134-6u83vcd1133xs8yf
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054550-w0k8alfqs2bigurx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055222-2u7o99e48254dceu
bzr revid: launchpad_translations_on_behalf_of_openerp-20131203061621-hyqqh11jt7g0ilqh
2013-12-03 06:16:21 +00:00
Launchpad Translations on behalf of openerp 3e94f7ab1b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131203054049-9sioco00f1s4dxvt
bzr revid: launchpad_translations_on_behalf_of_openerp-20131203054124-0db72b59pfm46z0f
2013-12-03 05:41:24 +00:00
Antony Lesuisse da6fee2ac1 [FIX] session expired
bzr revid: al@openerp.com-20131202154206-6efsbeeg0mq7s67z
2013-12-02 16:42:06 +01:00
Xavier Morel ef08d834f6 [IMP] add warning re. changed behavior of backbone which may be changed in the client
bzr revid: xmo@openerp.com-20131202151838-z26qnz0xpt3tigrd
2013-12-02 16:18:38 +01:00
Xavier Morel 0dff8277cc [FIX] breakage due to backbone change: in 1.0+, this.reset() will call this.add()
in 0.9, this.add would only be called if items were provided to
reset(), changed in commit cf6e862.

bzr revid: xmo@openerp.com-20131202151037-xxmvu5790p2jsxz6
2013-12-02 16:10:37 +01:00
Antony Lesuisse 753cb31804 [IMP] upgrade backbone to 1.1.0
bzr revid: al@openerp.com-20131202142240-ifh2rua2oiennfao
2013-12-02 15:22:40 +01:00
Antony Lesuisse 9b40c572ae [REM] gravatar support
bzr revid: al@openerp.com-20131202135414-kkm0wz06naitbp4y
2013-12-02 14:54:14 +01:00
Antony Lesuisse e057a64a02 [IMP] update fontawseome to 4.0.3
bzr revid: al@openerp.com-20131202133803-1muybwahwjo9e5sm
2013-12-02 14:38:03 +01:00
Antony Lesuisse 57ef91409a [MERGE] bootstrap3
bzr revid: al@openerp.com-20131202132445-oux9j63auh4om284
2013-12-02 14:24:45 +01:00
Antony Lesuisse d6c6f31231 [MERGE] boostrap3 manually merged
bzr revid: al@openerp.com-20131202131943-b01fb56u0qsgcs53
2013-12-02 14:19:43 +01:00
Christophe Simonis 56bb1b9869 [MERGE] forward port of branch saas-2 up to revid 4992 chs@openerp.com-20131202105848-33gcz1715w370rve
bzr revid: chs@openerp.com-20131127110757-5kaay2kcxq0ysb59
bzr revid: chs@openerp.com-20131127161639-yur4rdh3wx43kxle
bzr revid: chs@openerp.com-20131127180647-f8uws77gaym5kfvd
bzr revid: chs@openerp.com-20131202110030-gf20dv2uj5fqv7c2
2013-12-02 12:00:30 +01:00
Denis Ledoux 20be322c45 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9684 rev-id: dle@openerp.com-20131209145652-3g9rgnfz1w8k0whw
bzr revid: chs@openerp.com-20131202105848-33gcz1715w370rve
bzr revid: dle@openerp.com-20131204150643-is3y0b9n8enh3yql
bzr revid: chs@openerp.com-20131206152726-pirikn7v8pev90ic
bzr revid: dle@openerp.com-20131206162437-b9niay99mirk44qm
bzr revid: tde@openerp.com-20131209102019-kjeg0rx2au1d5e5v
bzr revid: dle@openerp.com-20131209155721-589zihxx8jmvlpvp
2013-12-09 16:57:21 +01:00
Denis Ledoux 3be327c0ae [FIX] point_of_sale: ignore TOTAlY returns
Returns were partially ignored when typing keystrokes, thanks to a return; when event which equaled 13, but the default behaviour (press on the focused input/button) was not prevented. This is now the case thanks to preventDefault. For instance, just after a discount set, the focused input was pressed and the associated value was added when scanning a new product with the scanner. Therefore, if we entered a discount of 30%, scanning a new product added '0', the last pushed button, to the discount, and then added the product.

bzr revid: dle@openerp.com-20131209145652-3g9rgnfz1w8k0whw
2013-12-09 15:56:52 +01:00
Thibault Delavallée 93ab94a608 [MERGE] [FIX] mail: fixed message_follower_ids function field.
The set method of the field, set_followers, is now using message_subscribe and message_unsubscribe to have only one access point to adding or removing followers. Previously to this fix it was directly creating entries in the mail_followers table, neglecting the calculation of subtypes and default subtypes.

bzr revid: tde@openerp.com-20131209100822-f19udgfuubshhrg3
2013-12-09 11:08:22 +01:00
Thibault Delavallée fcd5f7d960 [MERGE] Sync with 7.0
bzr revid: tde@openerp.com-20131209090903-al4o6uhrhhw4cqcl
2013-12-09 10:09:03 +01:00
Thibault Delavallée 2382710f6f [REV] mail: removed some changes to be done in trunk, not in 7.0
bzr revid: tde@openerp.com-20131209090802-q8fzn88ia9w6o5pq
2013-12-09 10:08:02 +01:00
Launchpad Translations on behalf of openerp a092227c6e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131207063209-2xi8ba5wu6l6ze00
bzr revid: launchpad_translations_on_behalf_of_openerp-20131208054536-mg4w4d6ljq8ji1nj
bzr revid: launchpad_translations_on_behalf_of_openerp-20131207063232-l64v1fhf1qcpxm2l
bzr revid: launchpad_translations_on_behalf_of_openerp-20131208054646-zixed7abpuze4qt1
bzr revid: launchpad_translations_on_behalf_of_openerp-20131123062625-f7inv72rtg2kel8g
bzr revid: launchpad_translations_on_behalf_of_openerp-20131124054801-1ukcpelfukkvwn60
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125060120-nm8tkfbftg8c88v1
bzr revid: launchpad_translations_on_behalf_of_openerp-20131126060753-jnx5ran2accmo0lh
bzr revid: launchpad_translations_on_behalf_of_openerp-20131127054000-wtg675pf33f3bkar
bzr revid: launchpad_translations_on_behalf_of_openerp-20131129053028-abszdj4y76smnacb
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054555-3u1m1sy1f2og78nn
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055227-mm70khzdfnp4qcj9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131207063237-vza5vb51xmd2ipl6
bzr revid: launchpad_translations_on_behalf_of_openerp-20131208054653-f4zth8j3iczlzcqz
2013-12-08 05:46:53 +00:00
Denis Ledoux fb90e7d572 [FIX]ir_attachement: not self.pool.get(model) instead of model not in self.pool
bzr revid: dle@openerp.com-20131206173602-no831oxc6m1kf6lu
2013-12-06 18:36:02 +01:00
Martin Trigaux aa9efd6dab [FIX] account: correct name_search on account to be validated even at negation
added test checking every combinaison of name_search

bzr revid: mat@openerp.com-20131206170012-991vs7pa1yzxvav8
2013-12-06 18:00:12 +01:00