Commit Graph

88635 Commits

Author SHA1 Message Date
Antony Lesuisse 872842ff9e [IMP] odoo.py git options 2014-06-02 14:20:40 +02:00
Christophe Simonis 67bff17ecb Merge pull request #287 from odoo-dev/saas-5-fix-website_sale-accessory-chm
[FIX] website_sale: display accessory field in form view and display the good accessory product inside ecommerce
2014-06-02 14:02:10 +02:00
Christophe Matthieu 3cc4785ba6 [FIX] website_sale: display accessory field in form view and display the good accessory product inside ecommerce 2014-06-02 12:11:54 +02:00
Christophe Matthieu e3bd7d953a [FIX] website_sale: tour about customize don't check last step 2014-06-02 12:11:04 +02:00
Christophe Simonis ea69325466 [MERGE] forward port of branch saas-5 up to revid c19bb8c 2014-06-01 14:35:54 +02:00
Christophe Simonis c19bb8ce48 [FIX] website: correct "/" redirect to first menu 2014-06-01 14:30:15 +02:00
Christophe Simonis bef99e2b16 [MERGE] forward port of branch saas-5 up to revid 587084f 2014-06-01 11:21:35 +02:00
Christophe Simonis 587084f682 [MERGE] forward port of branch saas-4 up to revid c319dc4 2014-06-01 11:19:03 +02:00
Christophe Simonis c319dc40e7 [FIX] mail: view_mode "list" does not exists, it's "tree" 2014-06-01 11:17:09 +02:00
Christophe Simonis 36f9af78aa [MERGE] forward port of branch saas-3 up to revid faace84 2014-06-01 10:56:39 +02:00
Christophe Simonis faace8493d [FIX] email_template: partners ids are integers, not strings 2014-06-01 10:52:02 +02:00
Christophe Simonis 651614db57 [MERGE] forward port of branch saas-5 up to revid 285e1d5 2014-05-31 16:09:03 +02:00
Christophe Simonis 285e1d5c38 [FIX] website_sale: so javascipt does not like tuples. use a list instead 2014-05-31 15:37:23 +02:00
Christophe Simonis f8714aca02 [MERGE] forward port of branch saas-5 up to revid 960b866 2014-05-31 14:16:10 +02:00
Christophe Simonis 960b86611e [FIX] website_sale: remove invalid (and stupid) function field 2014-05-31 14:05:48 +02:00
Olivier Dony 52501dde7a [FIX] website_mail_group: duplicate preventDefault() call (called before onclick already)
Plus it fails because `event` is not defined nor passed there (e.g. in Firefox)
2014-05-31 01:48:55 +02:00
Christophe Simonis b8d7a1b332 [REL] saas-5 2014-05-30 23:05:34 +02:00
Christophe Simonis 7dd79cb183 Merge pull request #278 from odoo-dev/master-bank-reconcile-ama
[IMP] account: bank statement reconciliation widget
2014-05-30 22:54:05 +02:00
qdp-odoo ee92839465 [FIX] account: fixed inconsistence in yaml test since some demo data was added 2014-05-30 22:25:52 +02:00
Fabien Pinckaers 84d194d7a1 Merge pull request #269 from sve-odoo/patch-1
[ADD] "Model" Column in base_action_rule tree view.
2014-05-30 21:26:13 +02:00
Christophe Simonis 7ce927ab46 [FIX] account_bank_statement_extensions: do not extend dropped form view 2014-05-30 20:34:56 +02:00
qdp-odoo f839621f52 [FIX] account_bank_statement_extension: fixed xml path in view 2014-05-30 19:28:40 +02:00
qdp-odoo 07460d7191 [IMP] account: bank statement reconciliation widget (part 3: missing files lost during manual merge (renamed)) 2014-05-30 19:04:13 +02:00
qdp-odoo e3491ccb71 [IMP] account: bank statement reconciliation widget (part 2) 2014-05-30 18:47:50 +02:00
qdp-odoo 7580b6510b [IMP] account: bank statement reconciliation widget 2014-05-30 18:34:13 +02:00
qdp-odoo 52b799d8d0 [MERGE] master-wmsstaging-jco with fixes on WMS + new barcode reports 2014-05-30 18:09:05 +02:00
Christophe Simonis ee304fa65f [IMP] replace OpenERP by Odoo in backend + change company default logo. 2014-05-30 17:30:36 +02:00
qdp-odoo 0fa755bc89 [MERGE] master 2014-05-30 17:05:44 +02:00
Xavier Morel 46712acaec [FIX] bunch of changes lost in incorrect merge f4d78ae738 2014-05-30 17:00:52 +02:00
Xavier Morel d325c0caef [REV] attempt to revert incorrect removals in f4d78ae738 2014-05-30 16:00:28 +02:00
Richard Mathot 8d822419e7 [FIX] website: fix incomplete refactoring 2014-05-30 15:35:59 +02:00
Richard Mathot 29387c518e [REV][FIX] Reverting regression introduced in forward-port
04211015fc
2014-05-30 15:20:18 +02:00
Thibault Delavallée 0b54d8fb3c [FIX] website_mail_group: fixed discussion group data, wrongly forward-ported 2014-05-30 11:22:00 +02:00
Josse Colpaert 742cfe83e0 Merge remote-tracking branch 'odoo/master' into master-wmsstaging-jco 2014-05-30 11:15:51 +02:00
Josse Colpaert 45dc3db6cc Merge branch 'master-wmssecurity3-jco' into master-wmsstaging-jco 2014-05-30 10:37:26 +02:00
Josse Colpaert 231278997e Merge branch 'master-wmsstatbut-jco' into master-wmsstaging-jco 2014-05-30 10:24:31 +02:00
Christophe Simonis fb650ee92e [MERGE] product: refactoring of product variants.
close PR #222
2014-05-30 10:22:36 +02:00
Christophe Simonis b8af4775e3 [IMP] product: improve field labels about variant/attributes distinction 2014-05-30 10:00:54 +02:00
Antony Lesuisse 1f7a2eaf30 [FIX] odoo.py git_locate 2014-05-30 09:55:30 +02:00
Antony Lesuisse 2f4984b838 [IMP] packaging v8 part1, tgz deb and rpm 2014-05-30 01:54:20 +02:00
Antony Lesuisse c05584a4d9 [FIX] website_sale and website_event imports
missing import prevent cli help display
2014-05-29 23:19:24 +02:00
Antony Lesuisse 6e9edeeb46 [FIX] odoo.py setup deps and readme.md 2014-05-29 22:29:38 +02:00
Antony Lesuisse d4624fa826 [IMP] repository cleanup
- move packaging stuff to setup
- remove historical stuff
- remove oe, odoo-cmd-fme will be merged with the convered commands
- add an odoo.py script to run odo and boostrap it
- simplify README
- prepare to move documentation to the github wiki
2014-05-29 18:33:04 +02:00
sve-odoo 6c89284ec6 [ADD] "Model" Column in base_action_rule tree view. 2014-05-29 15:48:10 +02:00
Antony Lesuisse 130c889348 [FIX] ir.attachment mess, restore list view 2014-05-29 15:02:27 +02:00
Josse Colpaert 7b890e138a [IMP] Location barcode 2014-05-29 14:58:48 +02:00
Olivier Dony 045ecc603e [FIX] website_mail_group: restore missing snippet icon
The file was originally added in website_mail at 59b934
in saas-4 but was lost in master since.
2014-05-29 02:07:18 +02:00
Olivier Dony 248107d11a [FIX] website_mail*: fix + bundlify changes of 0c89ca: move subscription widget from website_mail to website_mail_group 2014-05-29 01:59:47 +02:00
Fabien Meghazi 7dd10060df Merge pull request #263 from odoo-dev/master-fix-asset-fme
[FIX] website_mail.editor.js moved but still referenced

Commit 0c89ca0 moves
website_mail.editor.js but is still referenced in website_mail.xml
2014-05-29 00:27:54 +02:00
Fabien Meghazi c9e12161c9 [FIX] website_mail.editor.js moved but still referenced
Commit 0c89ca0f8f moves
website_mail.editor.js but is still referenced in website_mail.xml
2014-05-28 23:13:38 +02:00