pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,629 Commits 1 Branch 0 Tags
bef99e2b16ffec4883d84eaac5b0d2bb9e3fd543
Commit Graph
72364 Commits
Author SHA1 Message Date
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 285e1d5c38 [FIX] website_sale: so javascipt does not like tuples. use a list instead 2014-05-31 15:37:23 +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 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 c05584a4d9 [FIX] website_sale and website_event imports 
missing import prevent cli help display
 2014-05-29 23:19:24 +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 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
Christophe Matthieu 138274e30d [FIX] point_of_sale: fix product view layout 2014-05-28 20:50:20 +02:00
Christophe Matthieu 0017d02469 [FIX] membership: increase priority of product view (don't take this view by default). 2014-05-28 20:49:51 +02:00
Christophe Matthieu 435b5b9ca3 [IMP] product: rename fields variant_ids into attribute_line_ids on the template and attribute_value_ids on the product. 2014-05-28 19:42:15 +02:00
Pariket Trivedi 09dd6e3da6 [IMP] event_sale: extra QWeb report for printing event badges, with HTML fields for custom content 2014-05-28 19:05:11 +02:00
Christophe Matthieu 152ec5bf50 [FIX] product: revert change for price_extra. Need to filter by template to apply the price_extra. 2014-05-28 19:04:23 +02:00
Christophe Simonis d42840a6f8 Merge pull request #226 from odoo-dev/master-website_sale-add-vat-chm 
[IMP] website_sale: add vat field on checkout + validate it if base_vat module is installed
 2014-05-28 18:45:12 +02:00
Christophe Matthieu 6958d56a66 [IMP] product: fixes for review 2014-05-28 18:30:03 +02:00
Olivier Dony e276ac33f6 [MERGE] Forward-port saas-4 up to bf135ad 2014-05-28 17:45:31 +02:00
Richard Mathot bf135ad057 [FIX] website_blog: display properly (very) long words in comments 2014-05-28 17:23:28 +02:00
Denis Ledoux 6ed774de61 [FIX] web: on new ir actions act_window target current, change the active* params from context for the dataset only 
This fix is related to a37bad205b
This previous fix did solved the issue of its purpose, but had a side effect for actions using these active* params, e.g. search views
For instance, Go to Project > Projects, click on any project, you are than redirected to tasks/issues of this project
If you reload the page, an error pops up, complaining that active_id cannot be found
 2014-05-28 15:50:02 +02:00
Denis Ledoux f085274d5f [MERGE] Forward-port of latest saas-3 bugfixes, up to rev. df0ae7e4d1 2014-05-28 14:53:32 +02:00
Thibault Delavallée 57c85a8b7a Merge pull request #251 from odoo-dev/saas-4-follower-route-tde 
[FIX] website_mail_group: discussion group snippet
- moved into website_mail_group, instead of having the snippet in website_mail and the archives in website_mail_group
- fixed routes to avoid security issues
- better display of email on groups and archive
 2014-05-28 14:10:05 +02:00
Denis Ledoux df0ae7e4d1 [FIX] payment_paypal: wrong handling fees computation formula 2014-05-28 14:02:56 +02:00
Christophe Matthieu 3f1e459430 [FIX] mrp_sale: move explode product with wrong bom; change product id 2014-05-28 12:29:56 +02:00
Christophe Matthieu be8e10097d [FIX] mrp: demo data is wrong don't produce ipad but pc 2014-05-28 12:26:57 +02:00