Martin Trigaux
6e91cb5f50
Merge pull request #746 from acsone/master-defer_parent_store_computation-on-write
...
[IMP] orm: defer_parent_store_computation in write
Take into account the context parameter 'defer_parent_store_computation' in write operation.
When executing actions with this key in the context, _parent_store_compute should be manually called afterwards. Use at your own risks...
2014-06-24 15:13:24 +02:00
Christophe Matthieu
204a62499a
[IMP] website_sale_options
2014-06-24 15:11:53 +02:00
Christophe Simonis
53f7a5594b
Merge pull request #622 from odoo-dev/7.0-opw-592890-msh
...
[FIX] search on translated field: Only search on source field if not translated.
2014-06-24 15:05:53 +02:00
Laurent Mignon (aka lmi)
ea00789e35
[IMP] take into account the context parameter 'defer_parent_store_computation' also on write operations
2014-06-24 14:22:41 +02:00
Mohammed Shekha
0b593ada11
Server Translation: Fixed the issue search on translated field do not return true result, search on tranlsated field fails due to expression parsing which fetches ids from ir_translation as well as working table and UNION of this makes search fruitless, also search fails for in language other then english when you enter part of a string for the field to search.
2014-06-24 17:42:48 +05:30
Denis Ledoux
e1e0cfbba8
[MERGE] Forward-port of 7.0 bugfixes up to e2201369a3
2014-06-24 13:56:51 +02:00
Denis Ledoux
e2201369a3
[FIX] web: format.js, toString while parsing date
...
When attempting to parse client date, value is not always a string.
We force the toString when adding the leading 0, as the replace method is for string
2014-06-24 13:53:02 +02:00
Martin Trigaux
90deaf386a
Merge pull request #650 from yvaucher/patch-1
...
[7.0] sale_stock: field sale_id should be on stock.picking.out view
2014-06-24 13:49:50 +02:00
sle-odoo
fd7809f97f
Merge pull request #745 from odoo-dev/saas-4-update-bootswatch-sle
...
[MERGE] manual merge of latest bootswatch minified stylesheets
2014-06-24 13:40:58 +02:00
Denis Ledoux
8e83dbff5d
[MERGE] Forward-port of 7.0 bugfixes up to 7d3453d119
2014-06-24 12:27:09 +02:00
Denis Ledoux
7d3453d119
[FIX] purchase_requisition: broken procurement wkf
...
If a purchase requisition is created instead of a purchase order for a procurement order, the method make_po should not return the id of this requisition, as methods calling the make_po method expects ids of purchase orders, not purchase requisition ids.
Besides, on purchase requisition done or cancel, we set the procurement order accordingly, without the use of the workflow. We consider this as crappy, the proper fix should be the use of a dedicated workflow for purchase requisition, but I cannot be done in stable branches. This aims trunk/master.
2014-06-24 12:12:27 +02:00
Simon Lejeune
478a763cac
[MERGE] manual merge of latest bootswatch minified stylesheets
2014-06-24 11:48:49 +02:00
qdp-odoo
113d2f95ba
Merge pull request #717 from odoo-dev/master-bnk-stmt-widget-fix-csn2
...
Master bnk stmt widget fix csn2
reduces a lot the number of rpc call in the bank statement widget interface.
2014-06-24 11:05:55 +02:00
Christophe Matthieu
1d68662fb9
[IMP] website_sale: use geoip session key insead of import GeoIP
2014-06-24 11:02:52 +02:00
Christophe Matthieu
34815021b8
merge upstream
2014-06-24 10:13:11 +02:00
odony
34034a8ec1
Update CONTRIBUTING.md
2014-06-24 09:44:11 +02:00
Martin Trigaux
05a87c9f8d
Merge pull request #739 from apertoso/7.0-bug-vat_intra
...
[FIX] l10n_be: VAT number for Intra XML declaration should not contain county code
2014-06-24 09:27:16 +02:00
Christophe Matthieu
518feee650
[FIX] merge error
2014-06-24 08:17:12 +02:00
Grover Menacho
6284fbbbf0
[ADD] FIXED create_from_ui inheritable to add more fields on order and payment
2014-06-23 17:06:55 -04:00
Jos De Graeve
b86e0a4392
[FIX] Partner VAT Intra XML delaration: Vat number format correction
...
The Partner VAT Intra XML delaration needs to have the VAT number
in the format without the country code prefix.
The current behaviour was to include the country code prefix in the
report which causes an SQLException error on uploading the XML file
to the Federal goverment's website. While the error is non-descriptive
fixing the VAT number format fixes the error.
2014-06-23 18:18:42 +02:00
Josse Colpaert
5616e052cf
Merge pull request #728 from odoo-dev/master-wmsstagingmig-jco
...
Master wmsstagingmig jco
2014-06-23 18:10:25 +02:00
Christophe Matthieu
ed6becb2c0
Merge pull request #233 from odoo-dev/master-website_hr_recruitment-GeoIP-chm
...
[IMP] website_hr_recruitment: Search by country or/and department or/and by office. Default search by country with GeoIP
2014-06-23 17:56:38 +02:00
Christophe Matthieu
be4dddca8a
[IMP] website_hr_recruitment: use session geoip for country default value
2014-06-23 17:51:20 +02:00
Christophe Matthieu
176a6aad46
merge upstream
2014-06-23 17:48:55 +02:00
Christophe Matthieu
9eb3356b16
merge upstream
2014-06-23 17:44:58 +02:00
Martin Trigaux
f9ce9a00d0
Merge pull request #17 from savoirfairelinux/7.0-m2m-context
...
[FIX] view_list: Add context propagation for m2m list view
If the _rec_name field of a model is translatable, the value was not translated when displayed in a list view through a many2many field (e.g. server_action_ids on base.action.rule).
2014-06-23 17:41:03 +02:00
Cedric Snauwaert
31f1fad0f6
[FIX]account reconciliation widget: add account_code to filter
2014-06-23 17:20:42 +02:00
Christophe Matthieu
c81708a891
Merge pull request #732 from odoo-dev/master-fix-website_sale-change-price-chm
...
[FIX] website_sale: user can't edit the price.
2014-06-23 16:44:54 +02:00
Christophe Matthieu
1d1b6e79b5
[FIX] website_sale: user can't edit the price.
2014-06-23 16:38:04 +02:00
Thibault Delavallée
f2c2deecd7
Merge pull request #680 from odoo-dev/master-remove-crm-dependancy-from-issue-rma
...
[REF] project_issue: remove dependency towards crm (but added dependency to sales_team). Main change: channel_id is now channel, a char field that holds the source channel.
2014-06-23 16:37:10 +02:00
Martin Trigaux
d9e6a7a9ae
[FIX] calendar: do not parse date to date
...
When creating an event from the calendar view, no need to parse a date to date (error undefined is not a function)
2014-06-23 16:33:41 +02:00
Martin Trigaux
caea4a9aec
Merge pull request #621 from odoo-dev/saas-4-fix_actions_server_controller_return-vta
...
[FIX] website: controller for server actions should accept basic werkzeug requests (e.g. redirections)
2014-06-23 16:05:04 +02:00
Peter Herczeg
1cbef2e9f5
[ADD] Hungarian Localization
2014-06-23 15:37:40 +02:00
Josse Colpaert
5ecde0fa26
[IMP] Tristates should be working even if the picking has no name
2014-06-23 15:23:20 +02:00
Richard Mathot
4871d68d2d
Merge pull request #498 from odoo-dev/master-calendar-meeting-ptr
...
[IMP] calendar: favorite contacts list
2014-06-23 15:15:41 +02:00
Pariket Trivedi
f0765121c6
[IMP] calendar: favorite contacts list
...
Improved calendar's favorite meeting list and added a input box to directly
insert the partner in favorite list and 'X' to remove the partner's name
from the favorite meeting list in calendar view.
2014-06-23 15:03:29 +02:00
odony
8f72a3f160
Merge pull request #716 from sve-odoo/patch-5
...
[MERGE] ir.ui.view: display inherited views in form view
2014-06-23 13:21:02 +02:00
Antony Lesuisse
f404d63712
[FIX] setup missing file for windows nsi
2014-06-23 13:20:19 +02:00
Guillermo Bisheimer
f8706c31e0
Typo in server autoreload class
2014-06-23 13:19:38 +02:00
odony
36296d459e
Merge pull request #607 from pedrobaeza/master
...
[FIX] l10n_es: Some tax code names get truncated due to the field size
2014-06-23 13:15:33 +02:00
Martin Trigaux
d0b3e3b8c6
[IMP] module: when uninstalling a module, do not redirect to a useless screen
2014-06-23 13:09:36 +02:00
Antony Lesuisse
1a2c3b1029
[FIX] git config for pull
2014-06-23 12:50:57 +02:00
Antony Lesuisse
fd21912cfe
[FIX] move back setup to root
2014-06-23 12:50:57 +02:00
kevin wang
59c27970b5
[FIX] orm: allow unicode in inherit views with attribute
...
When extending a view with position='attributes', prevent crash if view contains unicode char
Fixes #706
2014-06-23 12:48:27 +02:00
Christophe Matthieu
2e2e6f8b5b
Merge pull request #623 from odoo-dev/master-website-session-geoip-chm
...
[IMP] website: set geoip in user session
2014-06-23 12:47:56 +02:00
Randhir Mayatra
053a2b2e42
[IMP] remove dependancy of crm on project_issue
2014-06-23 12:33:08 +02:00
Jeremy Kersten
2b44ac2cd6
[MERGE] Gengo - Merge saas-4-gengo-jke - Fix gengo to make it working
2014-06-23 12:22:25 +02:00
Commandant Custo
05373b3532
[IMP] Change tab name to keep it simple
...
As odony advised.
2014-06-23 12:18:09 +02:00
Cédric Snauwaert
f39ea24f0b
Merge pull request #718 from odoo-dev/saas-4-modal-dropdb-fix-csn
...
[FIX]change password and dropdb error modal not closing
2014-06-23 12:17:02 +02:00
Thibault Delavallée
5739f3a2f9
Merge pull request #683 from odoo-dev/master-ref-reply_to-tde
...
[REF] mail, crm, hr_recruitment, project, project_issue: simplified repl.y-to of notification emails (now displaying 'YourCompany -docname- ' instead of 'Followers of ...'; added same_thread directly on the mail.message model to ease the reply_to and message-id computation; factorized a bit the reply-to generation for a batch of records; udpated tests accordingly.
2014-06-23 12:11:07 +02:00