pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,761 Commits 1 Branch 0 Tags
132f1ee986f844a38d22efaa0d5be42cdcd56e4e
Commit Graph
88761 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
sve-odoo 132f1ee986 [FIX] Account analytic plan line name.. 
..should not be called plan itself.
 2014-06-06 08:45:02 +02:00
odony 585d38c0a9 Merge pull request #357 from WizKeeD/mrp_subproduct_unlink_fix 
[FIX] Added cascade on subproduct so they get removed with parent bom
 2014-06-06 00:01:39 +02:00
Christophe Simonis bd51bf1e35 Merge pull request #358 from ajite/master-fix-nowww 
[IMP] Db filter %h
 2014-06-05 16:32:32 +02:00
Augustin Cisterne-Kaas 1dfa3946b5 [IMP] Db filter %h 
Db filter %h skips www subdomain.
 2014-06-05 16:09:04 +02:00
xmo-odoo 254c65b0c4 Merge pull request #352 from xmo-odoo/command-shebang 
[FIX] shebang on odoo.py
 2014-06-05 15:53:49 +02:00
Martin Trigaux b64256d56a Merge pull request #348 from sve-odoo/patch-2 
[ADD] Default value for product_supplierinfo.min_qty
 2014-06-05 15:37:21 +02:00
Xavier Morel 767cb9afa1 [FIX] shebang on Python 2014-06-05 13:20:07 +02:00
sve-odoo b33bf57832 [ADD] Default value for supplierinfo.min_qty 
And remove default value for function field "qty"
 2014-06-05 09:55:30 +02:00
Paul Catinean d82779684d [FIX] Added cascade on subproduct so they get removed once the parent boms are removed 2014-06-04 22:17:02 +02:00
Christophe Simonis 0eb602dd61 [MERGE] forward port of branch saas-5 up to 651e5ac 2014-06-04 19:25:40 +02:00
Christophe Simonis 651e5acd5d Merge pull request #344 from odoo-dev/saas-5-fix-mrp.bom-wrong-bom_find-check-chm 
[FIX] mrp.bom: wrong check for bom_find.

If the user defined a bom line type phantom to a product without bom the check is wrong to display the error message.
 2014-06-04 19:22:31 +02:00
Thibault Delavallée 1dc7d4d3d8 [FIX] mass_mailing: fixed computation of mailing domain when having more than 1 mailing list added in the recipients. A bit longer, but less buggy. 2014-06-04 18:54:20 +02:00
Christophe Matthieu fabbcf508f [FIX] mrp.bom: wrong check for bom_find. If the user defined a bom line type phantom to a product without bom the check is wrong to display the error message. 2014-06-04 18:44:02 +02:00
Thibault Delavallée 00b8f5b001 [FIX] mass_mailing: mailing form view: better display of action buttons, avoiding having several 'red action buttons' at the same time. 2014-06-04 18:20:55 +02:00
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
Denis Ledoux 489742873d [FIX] website_sale: backport commit 3cc4785ba6 of master 
This fix aimed saas-5, not master.
original Commit message:
display accessory field in form view and display the good accessory product inside ecommerce
This is related to previous rev 86055fb8cd
 2014-06-04 11:25:51 +02:00
Denis Ledoux 86055fb8cd [FIX] website_sale: accessory_product_ids are product.product, not product.template 
This many2many field should actually have product.template as relation
But, in a stable release, we cannot alter the database
Therefore, when displaying accessory products in the card, it display the product_tmpl_id of the product.product, not itself
This relation should be changed in trunk
+ Actually displaying this field in the backend
 2014-06-04 10:44:56 +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