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
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
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
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
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
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
Fabien Meghazi
863edbaaf2
Seperate assets_common from other bundles
2014-05-20 17:06:25 +02:00
Christophe Simonis
8f0066d728
[MERGE] merge bzr saas-4 server branch
2014-05-20 17:05:25 +02:00
Christophe Simonis
a5bb6b17e2
[MERGE] merge bzr saas-3 addons branch
2014-05-20 16:46:58 +02:00
Christophe Simonis
e046626093
[MERGE] merge bzr saas-3 server branch
2014-05-20 16:41:04 +02:00
Christophe Simonis
b09b6a06b1
[MERGE] merge bzr addons branch
2014-05-20 16:31:43 +02:00
Christophe Simonis
528d04d6dd
[MERGE] merge bzr server branch
2014-05-20 16:28:48 +02:00
Denis Ledoux
40abb97136
[FIX] account_analytic_analysis: use product.price if pricelist is passed, else list_price
2014-05-20 16:08:03 +02:00
Martin Trigaux
3d70237d0d
[FIX] website_forum: correct goal definition and other improvement
...
- scholar: the field is_correct is on the answer, not on the question
- remove closing reason 'an answer was accepted', the questions should be left as open to be possible to improve the answer afterward
- sort badges by most frequent first
- display the creation date of the question the same way we display the answer date
2014-05-20 15:27:33 +02:00
Martin Trigaux
a558a84630
[IMP] display the createion date of the question the same way we display the answer fate
2014-05-20 15:05:27 +02:00
Martin Trigaux
4d9aa300a7
[IMP] as the closing reason is not required, do not display it if none is present
2014-05-20 14:50:51 +02:00
Martin Trigaux
70d3652c27
[FIX] remove closing reason 'an answer was accepted', the questions should be left as open to be possible to improve the answer afterward
2014-05-20 14:41:56 +02:00
Martin Trigaux
c786ceb760
[FIX] the badges should be ordered by most popular first
2014-05-20 14:32:21 +02:00
Martin Trigaux
8da2cb6d4a
[FIX] definition of badges
2014-05-20 14:31:55 +02:00
Fabien Meghazi
a78e27fc0c
Merge pull request #69 from odoo-dev/saas-4-auth-user-login-redirect-fme
...
Automatic auth='user' redirection for unlogged users
2014-05-20 13:20:15 +02:00
Martin Trigaux
6718e9d03a
[FIX] crm: do not overwrite the value of no_force_assignation if already set in the context
2014-05-20 13:10:56 +02:00
Martin Trigaux
4c822b1a3b
[FIX] website_forum: when sending emails about forum post, use the public url instead of the private
2014-05-20 13:10:44 +02:00