pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,745 Commits 1 Branch 0 Tags
de2f57435eece84c90fab5c3cea3ede867ac0ae7
Commit Graph
88745 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Trigaux de2f57435e [MERGE] l10n_es: Complete refactoring of l10n_es, courtesy of @pedrobaeza 
See also:
- https://code.launchpad.net/~pedro.baeza/openobject-addons/7.0-l10n_es-refactorized/+merge/196809
- http://serviciosbaeza.com/blog/43-refactorizacion-de-l10n-es-para-openerp-v7
 2014-06-04 15:53:28 +02:00
antonylesuisse c6445e0fe6 Merge pull request #333 from odoo-dev/master-improve-scaffold-deploy-fme 
Change scaffolding's controller template
 2014-06-04 01:33:59 +02:00
Fabien Meghazi 27af219b5e Change scaffolding's controller template 2014-06-04 01:27:59 +02:00
Fabien Meghazi c91c5ec164 Merge pull request #332 from odoo-dev/master-improve-scaffold-deploy-fme 
Improve `odoo scaffold` and fix `odoo deploy`
 2014-06-04 01:00:59 +02:00
Fabien Meghazi a52a426de3 Do not check SSL certificate by default 
(requested by al)
 2014-06-04 00:58:32 +02:00
Fabien Meghazi 8a4511277c Fix error on url scheme for odoo deploy 2014-06-04 00:58:23 +02:00
Fabien Meghazi c5129fcfe5 Add __init__.py when createing module. Also add templates.xml in 
manifest
 2014-06-04 00:58:05 +02:00
Antony Lesuisse 1261a3ce36 [FIX] website_crm_partner_assign infinite crawling 2014-06-04 00:46:46 +02:00
Richard Mathot 8eeaabf694 [FIX] website_crm_partner_assign: buggy url 2014-06-03 22:15:24 +02:00
Richard Mathot 623912e477 Revert "[FIX] website_crm_partner_assign infinite crawling" 
This reverts commit 267cc63027.
 2014-06-03 21:53:51 +02:00
Christophe Simonis 3f85d4b493 [FIX] product: correct SyntaxError made by kdiff3 (once again) during previous forward port 2014-06-03 21:45:21 +02:00
Antony Lesuisse 267cc63027 [FIX] website_crm_partner_assign infinite crawling 
disable url query fragment
 2014-06-03 21:09:28 +02:00
Christophe Simonis a5908c5812 [MERGE] forward port of branch saas-5 up to b1c0bc0 2014-06-03 20:02:00 +02:00
Antony Lesuisse c3275e346a [MERGE] mail.thread as an AbstractModel 2014-06-03 19:56:43 +02:00
Christophe Simonis b1c0bc0b46 [MERGE] forward port of branch saas-4 up to 65f68c1 2014-06-03 19:45:19 +02:00
Antony Lesuisse bfcb5595b8 [MERGE] odoo command: scaffold, start, deploy 2014-06-03 19:44:20 +02:00
Christophe Simonis 65f68c1f65 [MERGE] forward port of branch saas-3 up to 7dd6954 2014-06-03 19:14:22 +02:00
Christophe Simonis 7dd69540e8 [MERGE] forward port of branch 7.0 up to 0c4bc1c 2014-06-03 19:11:44 +02:00
Christophe Matthieu 7770ca8013 Merge pull request #320 from odoo-dev/saas-5-website_sale-product-layout-chm 
[FIX] website_sale: change template for product and variant selector (type color)
 2014-06-03 18:07:43 +02:00
Christophe Simonis 70041a5f1b [FIX] routing_map: correct subclasses detection. 
Subclass detection didn't include the class itself if all it's subclasses
were invalid. As we create a new regrouping subclass, that was always the
case after a registry reloading, causing subclassed controllers to not be
taken in account.

[IMP] routing_map: clean code a little bit
 2014-06-03 17:55:34 +02:00
Raphael Collet a54caabbcb [FIX] website_mail: model 'mail.thread' must be abstract 2014-06-03 17:29:49 +02:00
Martin Trigaux 0c4bc1cf72 [FIX] sale: keep customer reference in grouped invoice (opw 606523) 2014-06-03 17:15:08 +02:00
Denis Ledoux 7a157dd35e [FIX] delivery: allow to add delivery method in quotation if quotation in quotation sent stage 
opw-607920
 2014-06-03 17:12:07 +02:00
Christophe Matthieu 057d26f860 [IMP] product: set at false one product variant of ipad 2014-06-03 16:58:26 +02:00
Martin Trigaux a07af9e715 Merge pull request #322 from guewen/product-write-fix 
[FIX] product: write() should accept both int/long and tuple/list
 2014-06-03 16:48:40 +02:00
Richard Mathot f04e6de2e7 [FIX][IMP] Make partner maps work properly 
[FIX] website*: unfuck buggy controllers
[IMP] website*: display GoogleMap in a human-usable interface
[IMP] website_google_map: large module cleaning
      - There is now only one controller, data is sent once for all!
      - Map is now fully resizable in its hosting template
      - HTML/CSS cleaning
      - JavaScript is now human-readable ;-)
 2014-06-03 16:34:30 +02:00
Denis Ledoux eafa5ff0b5 [MERGE] Forward-port of latest saas-3 bugfixes, up to rev. e7a0b1bb90 2014-06-03 16:28:06 +02:00
Guewen Baconnier 79f2b47576 Wrong variable name. The write() method should accept both int/long and tuple/list 2014-06-03 16:13:54 +02:00
Pedro Manuel Baeza d2bcbc2352 [IMP] l10n_es: Complete refactorisation of l10n_es, removing duplicities of the three current charts using charts inheritance. Details of the work done in this blog post (in spanish): 
http://serviciosbaeza.com/blog/43-refactorizacion-de-l10n-es-para-openerp-v7
 2014-06-03 16:02:21 +02:00
Christophe Matthieu c5ab412acc [FIX] website_sale: change template for product and variant selector (type color) 2014-06-03 15:38:11 +02:00
Thibault Delavallée 4be1ba8b6f [FIX] mass_mailing: newsletter snippet: 
- fixed subscription, was always subscribing to the last created list;
- slightly improved the snippet display, now displaying a 'thanks' when subscribed instead of just making everything disabled;
- removed unnecessary JS line
 2014-06-03 15:21:29 +02:00
Denis Ledoux 1c4825294b [FIX] product: product_variant group does not exist anymore 
Therefore, the pricelist item view must show the field product_tmpl_id in any case
 2014-06-03 15:03:13 +02:00
Martin Trigaux c1ae43c807 Merge pull request #292 from guewen/product-missing-report-dependency 
[FIX] product: add module 'report' module in its dependencies

The product pricelist report model inherit from report.abstract_report but report was not present in dependencies.
 2014-06-03 14:25:18 +02:00
Guewen Baconnier b4f72fba96 [FIX] product: fix _set_price_extra method 
avoid crash is context is None
create call does not have ids parameter
 2014-06-03 14:19:51 +02:00
Christophe Matthieu a306480408 Merge pull request #310 from odoo-dev/master-product-move-packaging-field-chm 
[IMP] product: move product packaging field from product.product to product.template
 2014-06-03 13:18:31 +02:00
Christophe Matthieu f911d213b0 Merge pull request #298 from odoo-dev/saas-5-fixes-product-chm 
[FIX] product
Context in _set_standard_price and many2one in product.packaging;
Set required at false for product template field when creating a product product;
Remove wrong field on product.template. TODO: move packaging field form product.product to product.template
 2014-06-03 13:16:27 +02:00
Denis Ledoux e7a0b1bb90 [FIX] event_sale: stored seats_max field 
seats_max is a stored field in event, and should remain stored when overrided in event_sale
 2014-06-03 12:21:34 +02:00
Thibault Delavallée c1b2b657fa Merge pull request #288 from odoo-dev/saas-4-mass_mailing_fixes-tde 
[FIX] mass_mailing: fixes
- backport (+ cleaning) of eb22d202e4 (saas-5): mail_thread: routing: instead of exclusive routing heuristics, use each case as a fallback of the previous.
- better fix for dd36a0e509 (saas-5): mail_thread: routing: fixed replies always choosen even when replying to emails with a specified reply_to (using ref_match in the algorithm)
- backport of d6a2ae642b (saas-5): avoid evaluating a False /  None domain
- fixed keeping the original message for routing, only when choosing to reply in the original thread (notification=True)
- mail_thread: routing: fixed replies always chosen even when replying to emails with a specified reply_to (using ref_match in the algorithm)
 2014-06-03 12:03:42 +02:00
Christophe Matthieu 36cdac48b7 [IMP] product: move product packaging field from product.product to product.template 2014-06-03 11:53:41 +02:00
Christophe Matthieu 91cb75babd [FIX] product: remove wrong field on product.template. TODO: move packaging field form product.product to product.template 2014-06-03 11:15:17 +02:00
Christophe Matthieu da6f02027a [FIX] product: set required at false for product template field when creating a product product. 2014-06-03 11:13:50 +02:00
Thibault Delavallée e02759a58e [FIX] website_mail: fixed template choice and body duplication in the email designer that was buddy; added some css to the page to make it more look like an email designer; also added a demo data for a template for mass mailing contacts in mass_mailing module. 2014-06-03 10:56:05 +02:00
Martin Trigaux aa1165441c [FIX] gamification: do not group on agregated field for sum 
The read_group behaviour has changed and read_group no longer sum on the field you are grouping.
Instead agregate on the field we want to sum and use no groupby.
For future version, grouping on a user such as what is done in batch mode is a better way to process.
 2014-06-03 10:48:26 +02:00
Martin Trigaux 88a26795ba Merge pull request #266 from neps1192/master 
l10n_tr: Turkish lira iso code has changed from TRL to TRY in 2005, use the new one in the chart of account
 2014-06-03 10:37:31 +02:00
Martin Trigaux 3cb551bf50 [FIX] read_group: do not change the return format of the read group in case of no groupby_fields and keep the same return format as with groupby fields (a list of dict) 2014-06-03 10:20:55 +02:00
Thibault Delavallée 257631e331 [FIX] sales_team, crm: fixed sales_team form view: alias data was not displayed due to wrongly done inheritance + fixed a typo hidden in the view 2014-06-03 08:55:00 +02:00
Richard Mathot da9f6e6b92 Merge pull request #299 from odoo-dev/master-footer-mess-rim 
[IMP] website: move automatic footer to independent view
 2014-06-03 08:14:07 +02:00
Antony Lesuisse a96fab05b3 scaffold fix, add a sample page and snippet 2014-06-03 01:00:23 +02:00
Olivier Dony d9ff7c4efc [FIX] procurement: restore fixes for background procurement from rev.9b6f5dc, accidentally reverted by v8 WMS branch 
Probably forgotten during a sync with master, as the
fixes belong to a different file now.
This is the second part of the fix in previous commit.
 2014-06-02 19:47:03 +02:00
Olivier Dony 1e9b41e2a4 [FIX] procurement: restore fix for background procurement from 9b6f5dc, accidentally reverted by WMS branch for v8 
Probably forgotten during a sync with master, as the
fix belongs to a different file now.
 2014-06-02 19:21:23 +02:00