pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,746 Commits 1 Branch 0 Tags
f61339b82cd6993f00a91149fb5dca7a2bfb8ab1
Commit Graph
89746 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Josse Colpaert ad58b17e6e [IMP] Add security rules from bzr branch 2014-05-21 17:34:19 +02:00
Richard Mathot fbdc29459f Merge remote-tracking branch 'odoo/saas-4' into saas-4-speakers-rim 2014-05-21 17:11:58 +02:00
Richard Mathot 37d6fe344b [FIX] website_event_track: display speakers name to public users 2014-05-21 17:10:50 +02:00
Thibault Delavallée 9d1e0be2e9 Merge pull request #126 from odoo-dev/saas-4-gitignore-tde 
[IMP] [BACKPORT] Converto bzrignore to gitignore, like what has been done in master.
 2014-05-21 17:10:40 +02:00
--global 1b40b5b37a [IMP] [BACKPORT] Converto bzrignore to gitignore, like what has been done in master. 2014-05-21 16:52:24 +02:00
Martin Trigaux 91d61212e1 Merge pull request #14 from savoirfairelinux/7.0-crossovered_unicode_1292245 
[FIX] Fix account_budget name unicode error (7.0 lp:1292245)
 2014-05-21 16:51:34 +02:00
Thibault Delavallée 59a7c85a6f Merge remote-tracking branch 'odoo/saas-4' into saas-4-website-mail-group-tde 2014-05-21 16:35:48 +02:00
Thibault Delavallée 007725cd07 [FIX] website_mail_group: added forgotten files for css / js. 2014-05-21 16:35:15 +02:00
Thibault Delavallée 52eb9cba89 [IMP] website_mail_group: refactored layout of displayed mailing lists and their archive. Should be a bit more easy to use and understand. Todo: fix number of displayed thread / replies, and probably re-do the layout once somebody decides to change everything. 2014-05-21 16:32:31 +02:00
Thibault Delavallée b7c6b1cbca [FIX] website_mail: message description should effectively be limited to the first 30 characters. 2014-05-21 16:27:17 +02:00
Martin Trigaux acca55b06b Merge pull request #124 from odoo-dev/7.0-aged-partner-partial-mat 
[IMP] account: support for partial reconciliation in aged partner balance
    
When computing the aged partner balance, the partial reconciliation was not handled correctly. The reconciled amount should be removed from the original remaining amount instead of displaying two entries in the journal.
eg: if invocie of 1000 in period 1 and payment of 300 in period 2, should only display +700 in period 1 instead of two entries
 2014-05-21 16:16:19 +02:00
etenesaca 0295e12d6c Merge with Origin Master - odoo/odoo 2014-05-21 08:54:51 -05:00
Fabien Meghazi df35de22b8 Disable logging during commands discovery 2014-05-21 15:53:16 +02:00
Martin Trigaux abe5c803a0 [IMP] account: support for partial reconciliation in aged partner balance 
When computing the aged partner balance, the partial reconciliation was not
handled correctly. The reconciled amount should be removed from the original
remaining amount instead of displaying two entries in the journal.
eg: if invocie of 1000 in period 1 and payment of 300 in period 2, should only
display +700 in period 1 instead of two entries
 2014-05-21 15:48:35 +02:00
Géry Debongnie 36471c3955 [FIX] correctly loads default filters (addon web) 
also, hide/show the custom reports list when it is empty/non empty
 2014-05-21 14:27:17 +02:00
Simon Lejeune d7e8edc880 Merge remote-tracking branch 'odoo/saas-4' into saas-4-report-fixes-sle 2014-05-21 14:09:35 +02:00
Simon Lejeune 1f97c40c9c [FIX] Report: get the wkhtmltopdf version in a cleaner way with a simple regex 2014-05-21 14:05:18 +02:00
Denis Ledoux 2cc28ce65b [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. b6a7402fdb 2014-05-21 13:46:10 +02:00
Richard Mathot 2e760407e4 [FIX] survey: enable survey access to portal users instead of 404 2014-05-21 13:42:17 +02:00
Fabien Meghazi eb7f96efbb --addons-path not required anymore 2014-05-21 13:24:39 +02:00
Géry Debongnie aec3ba08ae [IMP] improvements to inline searchview (web) 
this commit splits the widget CustomFilters in two widgets:
CustomReports and SaveFilter.  CustomReports is the widget
displaying the list of reports, and SaveFilter obviously is the
Save Current Filter widget.

The goal was to put the custom reports in the first column and the
Save Current Filter form in the second.
 2014-05-21 13:18:30 +02:00
Simon Lejeune b50421e551 [FIX] ir_actions: adapt render_report when called in a tests/qweb report context to generate the pdf only if a directory has been provided 2014-05-21 13:11:27 +02:00
Simon Lejeune 58d3a6f3f7 [FIX] Report: inform the user that he may not print a pdf report while his openerp is running with only one worker; adapt method to extract wkhtmltopdf version to also work on mac where the ouput of '--version' is different from gnu/linux binary 2014-05-21 13:06:31 +02:00
Denis Ledoux ecce35bc6e [MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 6958d47694 2014-05-21 13:05:41 +02:00
Pariket Trivedi ff4fe2c05e [FIX]: change correct label and fields in Event Analysis. 2014-05-21 16:34:34 +05:30
Simon Lejeune 654df600c1 [FIX] Report: less verbose error message 2014-05-21 13:02:59 +02:00
Simon Lejeune 226579a80d [FIX] Report: removed psutil/signal/openerp worker crap 2014-05-21 13:01:42 +02:00
Simon Lejeune 1745c738ee [FIX] Report: double the default height/width of barcode image to avoid a blurred/unusable barcode once integrated in a report 2014-05-21 12:59:05 +02:00
Denis Ledoux 6958d47694 [FIX] account_analytic_analysis: recurring invoices prepare and product_id_change 
product_id_change set the description with the same behavior as sale orders
product_id_change set the price unit according to the pricelist
_prepare_invoice is split into two sub methods, _prepare_invoice_data and _prepare_invoice_line
_prepare_invoice actually prepare the invoice values instead of directly creating the invoice
 2014-05-21 12:57:28 +02:00
Simon Lejeune 4019b2b334 [FIX] Report: do not raise when wkhtmltopdf returns a code 1. In most cases, it is due to some http requests which did not success *but* the pdf is still acceptable. Far from the best commit ever, but it avoids to completely crash when just a link to an image is wrong 2014-05-21 12:56:56 +02:00
Simon Lejeune 35c5e56718 [FIX] address div more to the left on external reports 2014-05-21 11:57:45 +02:00
Denis Ledoux b6a7402fdb [FIX] report: correct page numbering 2014-05-21 11:20:37 +02:00
Fabien Meghazi 7adfaf786d Merge pull request #97 from odoo-dev/master-default-addons-path-fme 
[FIX] If no addons-path provided, include the main addons [Fixes #29]
 2014-05-21 11:15:21 +02:00
Richard Mathot a7b7fa3d4a Merge pull request #96 from odoo-dev/saas-4-hr-security-rim 
[FIX] website_hr_recruitment: Hide unpublished job offers to portal users and employees
 2014-05-21 10:49:46 +02:00
Fabien Meghazi d5fcc1e1e0 Merge pull request #95 from odoo-dev/master-seperate-bundle-fme 
Seperate web.assets_common from other bundles
 2014-05-21 10:40:33 +02:00
Fabien Meghazi 593cdf427f Merge remote-tracking branch 'odoo/master' into master-seperate-bundle-fme 2014-05-21 10:29:04 +02:00
Richard Mathot f1a6ab5070 [FIX] website_hr_recruitment: Hide unpublished job offers to portal users and employees 2014-05-21 10:00:08 +02:00
Mantavya Gajjar e184e502c0 [IMP]: change author and module name 2014-05-21 13:23:01 +05:30
etenesaca bd8b2e9002 Optimized search fields from m2o 
Added translation of the message
Now this style of message in a CSS class and not use HTML tags
 2014-05-20 21:16:52 -05:00
etenesaca 1ce6322bfc Merge branch 'master' of https://github.com/odoo/odoo 2014-05-20 16:08:22 -05:00
Fabien Meghazi 05f376e310 If no addons-path provided, include the main addons 2014-05-20 22:33:49 +02:00
etenesaca 49657b28e6 Now when a search is conducted in the fields and not m2o results have a message saying "No results to show" since the show nothing will display the user is confused 2014-05-20 14:58:40 -05:00
Christophe Simonis 93238cd1cb [FIX] website: respect max_{width,height} for /website/image route 2014-05-20 20:23:25 +02:00
Christophe Simonis a756b82372 [MERGE] forward port of branch saas-4 up to revid bb26dea 2014-05-20 20:19:55 +02:00
Christophe Simonis bb26dea60b [MERGE] forward port of branch saas-3 up to revid 38abc8a 2014-05-20 19:00:50 +02:00
Christophe Simonis 38abc8a006 [MERGE] forward port of branch 7.0 up to revid b09b6a0 2014-05-20 18:57:04 +02:00
Christophe Simonis 040c93026a [MERGE] merge bzr trunk addons branch 2014-05-20 18:10:36 +02:00
Christophe Simonis ab4c3534de [MERGE] merge bzr trunk server branch 2014-05-20 17:30:01 +02:00
Christophe Simonis a70eea3b11 [MERGE] merge bzr saas-4 web branch 2014-05-20 17:14:18 +02:00
Christophe Simonis d93f628c72 [MERGE] merge bzr saas-4 addons branch 2014-05-20 17:12:01 +02:00