Commit Graph
89860 Commits
Author SHA1 Message Date
Christophe Simonis 1eaa69d342 [MERGE] forward port of branch saas-5 up to 9e8e365 2014-06-25 12:44:13 +02:00
Christophe Simonis 9e8e3653f2 [MERGE] forward port of branch saas-4 up to f68c835 2014-06-25 12:43:41 +02:00
Christophe Matthieu 95c7cf8a68 [FIX] website_sale_options: tour for test use the modal 2014-06-25 12:39:21 +02:00
Christophe Simonis f68c83545a [MERGE] forward port of branch saas-3 up to a66f3dd 2014-06-25 12:33:17 +02:00
Christophe Simonis a66f3dd992 [MERGE] forward port of branch 7.0 up to df6b37c 2014-06-25 12:27:43 +02:00
Fabien Meghazi f988d75035 [FIX] check after openerp's AccessErrors in website's _handle_exception 2014-06-25 12:20:40 +02:00
dhr-odoo df6b37c472 [FIX] account: add multicompany rule to account.subscription.line
The wizard to generate recurring entries did not respect multicompany rules as the request was done in plain sql.
Add ir.rule and use the orm (opw 607782)
2014-06-25 12:07:02 +02:00
Christophe Matthieu f0ca6fbf75 merge upstream 2014-06-25 12:02:10 +02:00
Christophe Matthieu 216456127d [IMP] website_sale_options: clean code; add ondelete cascade for optional product on sale order 2014-06-25 12:00:27 +02:00
Denis Ledoux dee969929a [FIX] purchase_requisition: duplicated stock moves
When a purchase requisition is created from a procurement order, a first stock move is created, not associated to any purchase orders
Then, on purchase order creation and confirmation, in the purchase requisition, new stock moves are created, associated to the purchase order.
The existing stock move issued from the procurement order which created the purchase requisition remained untouched, leading to wrong inventory values
To fix this, the destination location of the stock move of the procurement order is written on the source location
A proper fix should be to use a dedicated workflow for puchase requisition, but this can't be done in 7.0, it has to be done in master/trunk
2014-06-25 12:00:14 +02:00
Fabien Meghazi 4e0799e163 [FIX] _handle_exception() logic amongst requests and ir_http objects
Changes in website's ir_http#_handle_exception():

- exception is mandatory, can't be None anymore
- we don't touch non website_enabled requests
- we don't touch explicits plain responses from parent
- logic flow is now easier to read (I hope so)

Change in website's ir_http#_dispatch():

- In case of real 404, instead of returning self._handle_exception(),
  just let parent do the job (so we call super())
2014-06-25 11:47:44 +02:00
Christophe Simonis a1b3e22a17 [MERGE] forward port of branch 7.0 up to 4bfcbb2 2014-06-25 11:35:11 +02:00
Christophe Matthieu 412a7593be [IMP] website_sale_options 2014-06-25 11:31:39 +02:00
Christophe Simonis 5112421a93 [FIX] website: correct slug parsing 2014-06-25 11:08:51 +02:00
Alexandre Fayolle 4bfcbb2a48 [FIX] fields property: do not create empty properties
fixes #595
In the case where a property for the company exists but has no related record (e.g. in case of type m2o with no defined value), not setting a value to this field for a new record would create a new property (as browse_null is not an instance of browse_record)
2014-06-25 10:57:10 +02:00
Thibault Delavallée 50871bb4fe Merge pull request #725 from odoo-dev/7.0-bug-1235237-ypa
[FIX] crm_claim: copy: reset stage + add a copy marker to the name
2014-06-25 09:15:11 +02:00
Thibault Delavallée 71ce98b364 Merge pull request #726 from odoo-dev/master-bug-1233410-ypa
[FIX] crm_claim: track responsible, allowing automatic subscription and helping avoiding some access rights issues.
2014-06-25 08:51:28 +02:00
Fabien Meghazi aa97aaa9d7 [ADD] Assets Bundle versioning and better cache handling
An asset bundle is now versionned with the dates of the
ir.ui.views that compose it and also with the dates of
the files and ir.attachments linked inside the bundle.

This new behavior is reflected in the bundle's lru cache
managment.
2014-06-24 18:52:38 +02:00
Juan Rial 07e2994e92 Remove unused imports/variables 2014-06-24 18:22:37 +02:00
Juan Rial 4b8e15c3fa Performance improvement: defer optional write() - there's another one coming later, values can be combined. 2014-06-24 18:17:18 +02:00
Christophe Matthieu 7505cce2e9 [WIP] 2014-06-24 17:37:13 +02:00
dhr-odoo b466e6e6b9 Displayed the name of Intrasat code in Intrasat Invoice report instead of browse record 2014-06-24 17:01:07 +02:00
Atul Patel 56ba15a3c8 [IMP]: Remove user id domain changes from ir rule 2014-06-24 19:37:00 +05:30
Martin Trigaux a6c579c4fc Merge pull request #528 from bwrsandman/patch-1
[FIX] Spawn gevent using same python executable
2014-06-24 16:06:57 +02:00
Yogesh Parekh ac5a0b046b [IMP]: Improve copy method to set stage_id in draft stage 2014-06-24 19:05:46 +05:30
Thibault Delavallée efa0e4218f Merge pull request #727 from odoo-dev/master-document-fix-issue-gan
[IMP] document: remove from knowledge + view type fixes
2014-06-24 15:33:49 +02:00
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