Commit Graph
89860 Commits
Author SHA1 Message Date
Xavier Morel 64ca79cc4c [IMP] remove usage of psycopg1.cursor, implement dictfetch* on openerp cursor 2014-06-20 07:54:44 +02:00
Xavier Morel 64762086b8 [IMP] unpack a listcomp in a dict passed to an update, pass gencomp directly to update 2014-06-20 07:52:42 +02:00
Thibault Delavallée 452c1e32da [IMP] account: removed demo data about unexisting field, causing a warning. 2014-06-19 19:04:10 +02:00
Christophe Matthieu 5165b52b43 merge upstream 2014-06-19 18:46:49 +02:00
Fabien Meghazi 52ee6c52bd Merge remote-tracking branch 'odoo/master' into master-sass-in-bundles-fme 2014-06-19 18:39:56 +02:00
Christophe Matthieu d89c36866e [IMP] tour.js: less flickering and clean code 2014-06-19 18:10:38 +02:00
Fabien Meghazi 146d7b2886 [IMP] refactor assets bundle for future features 2014-06-19 18:09:01 +02:00
Christophe Matthieu 2d686988a4 [FIX] tour.js: forgotten backdrop and orphan css 2014-06-19 17:52:32 +02:00
Christophe Matthieu f8b23df55a [FIX] tour.js: fickering of the popover in tutorial mode in backend 2014-06-19 17:29:39 +02:00
Christophe Matthieu 148a332b4a [FIX] tour.js: don't throw error in tutorial mode; error with multi ajax request (change page, data...) 2014-06-19 17:14:37 +02:00
Josse Colpaert f1afeb680b [NOIMP] Create move before other move when routing location is different from production source location 2014-06-19 16:58:52 +02:00
Richard Mathot 981362b2d8 Merge pull request #658 from odoo-dev/master-anglo-saxon-accounting-coa-cod
[IMP] accounting: add account_anglo_saxon in deps of l10n_uk and l10n_us
2014-06-19 16:47:14 +02:00
Christophe Simonis eef6330c55 [MERGE] forward port of branch saas-5 up to adf07a9 2014-06-19 16:23:32 +02:00
Christophe Simonis adf07a9490 [MERGE] forward port of branch saas-4 up to 5087612 2014-06-19 16:13:35 +02:00
Martin Trigaux f855f1c162 Merge pull request #325 from odoo-dev/saas-3-opw-608186-acl
[FIX] sale: cannot filter on paid = False (opw 608186)
2014-06-19 16:01:23 +02:00
cod-odoo 7814d16046 [IMP] accounting: add account_anglo_saxon in dependencies of l10n_uk l10n_us 2014-06-19 16:00:30 +02:00
Josse Colpaert 7f7337e0a8 Merge remote-tracking branch 'odoo/master' into master-wmsstaging3-jco 2014-06-19 15:48:07 +02:00
Christophe Simonis 5087612d1d [MERGE] forward port of branch saas-3 up to bf53aed 2014-06-19 15:44:07 +02:00
Christophe Simonis bf53aeda94 [MERGE] forward port of branch 7.0 up to e5533d0 2014-06-19 15:32:32 +02:00
Niels Huylebroeck e59077b0f9 Fix displaying of minKarma requirements 2014-06-19 15:23:54 +02:00
Martin Trigaux e5533d0c14 Merge pull request #654 from nel-odoo/patch-3
Production : Use the source location of the MO instead of the one of the BOM
2014-06-19 15:16:01 +02:00
Denis Ledoux 893e4aae9f [FIX] web: focused field in view editable list
When adding an item to the editable list, the focused field was no longer the first visible field
This is related to revision 4a508885ac
visible_columns list is not ordered
2014-06-19 14:58:44 +02:00
Najlaâ El Khayat e7285c6e1d Production : Source location of the BOM
Use the source location defined on the current MO's routing not directly on the BOM
2014-06-19 14:51:32 +02:00
Anand-Dharampuriya 78ce1d0eff [FIX] From crm_claim remove the checkbox 'Hide when empty' on claim stages 2014-06-19 18:19:24 +05:30
Paramjit Singh Sahota 5023816c55 [FIX] website: correct selector
The selector to toggle the theme was triggered too often (on almost each button) but had no effect because no view-id was present.
Patch fix #627
2014-06-19 14:45:56 +02:00
Richard Mathot dc4178a962 Merge pull request #649 from odoo-dev/master-eval-action-context-pna
[FIX] Accounting: Filter on fiscal year in CoA tree
2014-06-19 14:32:32 +02:00
Josse Colpaert 026bcc8cfc Merge remote-tracking branch 'odoo/master' into master-wmsstaging3-jco 2014-06-19 14:28:50 +02:00
Yannick Vaucher 2542992c24 Fix sale_id on stock.picking.out view
View inheritance is on the wrong model after model change of stock.picking.
Here we just fix the model.
2014-06-19 14:10:24 +02:00
Guillermo Bisheimer 6618a9a1e5 wrong domain in action_reception_picking_move in addons/stock/stock_view.xml 2014-06-19 14:00:33 +02:00
Pinakin Nayi 788404cd92 [FIX]Accounting: filter on fiscal year in CoA tree 2014-06-19 13:57:29 +02:00
Martin Trigaux 05f17ebb6e Merge pull request #633 from komsas/patch-1
account: Unify reconcile_partial and reconcile behaviour: return the account.move.reconcile id
2014-06-19 13:54:02 +02:00
xmo-odoo cdf87a2063 Merge pull request #648 from odoo-dev/7.0-fix-searchbar-navigation-ged
[FIX] fixes searchbar navigation (web client)
2014-06-19 13:31:41 +02:00
Denis Ledoux 088eead3a3 Merge pull request #640 from xmo-odoo/master-auth_crypt_passlib-xmo
[MERGE] auth_crypt: Upgrade to pbkdf2_sha512

replace handrolled KDF by passlib (& usage of passlib API)
* replace handrolled KDF by passlib (& usage of passlib API)
* replace md5crypt by pbkdf2(sha512)
  - handle upgrade from an old database (rehash on login)
* forward-port encrypt-at-install from f29ff5e
2014-06-19 13:20:12 +02:00
Christophe Simonis 5206eb16d5 merge upstream 2014-06-19 13:13:27 +02:00
Christophe Matthieu 54605acc65 [FIX] website_sale: demo data must set website_sequence insead of sequence 2014-06-19 13:12:09 +02:00
Christophe Matthieu 22d528c7a7 [IMP] website_sale: display the discount in the product template when the user select a variant 2014-06-19 13:12:08 +02:00
Christophe Matthieu 40840436f4 [FIX] website_sale: add shop/pricelist controller 2014-06-19 13:12:07 +02:00
Christophe Matthieu 43ca22d10c [FIX] website_sale: access right for currency for public user 2014-06-19 13:12:07 +02:00
Christophe Matthieu a6185caa18 [FIX] website_sale: display in currency of the user 2014-06-19 13:12:06 +02:00
Christophe Matthieu 7295a07c4a [FIX] website_sale: display price with user curencie. 2014-06-19 13:12:06 +02:00
Christophe Matthieu 087bf22fb5 [IMP] website_sale: add GeoIP localisation for default value in checkout; display vat number if vat module is installed; fix labels 2014-06-19 13:12:05 +02:00
Christophe Matthieu c3c922f84e [IMP] website_sale: convert comma to dashed for url attrib 2014-06-19 13:12:05 +02:00
Christophe Matthieu 86c6cf7a68 [FIX] website_sale: display discount only if the price is lower than the standard price 2014-06-19 13:12:04 +02:00
Thibault Delavallée cb7d43864a [FIX] Fix attach icon that was under the upload label. 2014-06-19 12:56:46 +02:00
Géry Debongnie 3d43f9d454 [FIX] fixes searchbar navigation (web client)
the code handling the keydown events was moved, but the variable this
was not adjusted accordingly, resulting in a broken navigation.

It is now possible to press LEFT and RIGHT again to move the focus
between facets.
2014-06-19 12:43:25 +02:00
Thibault Delavallée 3dcdd2180a [FIX] web_calendar: check for edit access rights + use correct display mode (view or edit) when going into a document form view from the calendar. 2014-06-19 12:26:24 +02:00
Christophe Matthieu 14e29ce321 [FIX] tour.js: clear localStorage before testing; add a better log title 2014-06-19 12:19:30 +02:00
xmo-odoo 697a055db7 Merge pull request #643 from xmo-odoo/fix-svg-in-rte
Ignore SVG elements when looking for edition events
2014-06-19 12:09:39 +02:00
Thibault Delavallée 1a639ccd03 Merge pull request #138 from odoo-dev/saas-3-bug_1307341-ptr
[FIX] kanban: ie9: fixed the display of 'show more' button
2014-06-19 12:04:32 +02:00
Richard Mathot 6a4047f47b [REV] ir_actions: Partial revert of 7d4df0b6b2 2014-06-19 11:49:49 +02:00