8ea9bff314
[IMP] Adapt barcodes on picking report, warehouse should be passed from move picking type if not defined, prodlot in mrp_repair, picking types
2014-06-10 16:06:52 +02:00
1c04f4d3d1
Merge remote-tracking branch 'odoo/master' into master-wmsstaging3-jco
2014-06-10 10:32:36 +02:00
2b9735f83a
[WIP] Change reports for barcodes (not fixed yet) + group lots
2014-06-10 10:22:00 +02:00
aa0e831626
Merge pull request #157 from odoo-dev/master-improve-import-ypa
...
Add div tag and oe_padding class to display the question
2014-06-06 13:40:21 +02:00
05cca7eeab
[FIX] website_forum_doc: wrong link text
2014-06-06 13:32:21 +02:00
929ca342e2
Merge pull request #394 from nbessi/restore-setup.py
...
Move setup.py in previous root in order not to break community tools based on it.
2014-06-06 12:47:25 +02:00
24141a64b7
Merge pull request #338 from savoirfairelinux/scaffold-pep8
...
[FIX] pep8 errors generated by odoo.py scaffold
2014-06-06 11:52:41 +02:00
81da5a9016
Merge pull request #408 from sergeifilippov/patch-1
...
Update README.md
2014-06-06 11:51:00 +02:00
e583fccf44
Merge pull request #353 from xmo-odoo/unrestrict-view-write
...
[IMP] views: don't prevent always -> disabled writes
2014-06-06 11:48:09 +02:00
93a77bab41
Update README.md
...
fixed typo
2014-06-06 21:39:54 +12:00
d72dae796b
Merge pull request #401 from odoo-dev/master-website_sale-change-pictures-chm
...
[IMP] website_sale: display image function of the selected product variant
2014-06-06 11:32:33 +02:00
ef48c4d440
[FIX] website_sale: disable button does'nt work in the product template.
2014-06-06 10:57:50 +02:00
5f43d87a33
[IMP] website_sale: display image function of the selected product variant
2014-06-06 10:40:50 +02:00
36a2615965
Merge pull request #360 from odoo-dev/master-sortable-kanban-sequence-chm
...
[IMP] website: Kanban is sortable for one column if the field sequence is available inside the kanban view (or one2many kanban view).
2014-06-06 10:07:32 +02:00
5e05c028f4
[IMP] website: Kanban is sortable for one column if the field sequence is available inside the kanban view (or one2many kanban view).
2014-06-06 09:12:11 +02:00
9a8cdf49b0
Move setup.py in previous root in order not to break community tools based on it.
...
It should not causes any trouble as it is not used in odoo.py
2014-06-06 09:08:03 +02:00
666ea5f98a
[FIX] pep8 errors generated by odoo.py scaffold
...
Signed-off-by: Sandy Carter <sandy.carter@savoirfairelinux.com>
2014-06-06 09:03:10 +02:00
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
bd51bf1e35
Merge pull request #358 from ajite/master-fix-nowww
...
[IMP] Db filter %h
2014-06-05 16:32:32 +02:00
1dfa3946b5
[IMP] Db filter %h
...
Db filter %h skips www subdomain.
2014-06-05 16:09:04 +02:00
e5560a2785
[REM] test for removed 'feature' of refusing always -> disabled writes on views
2014-06-05 16:08:42 +02:00
254c65b0c4
Merge pull request #352 from xmo-odoo/command-shebang
...
[FIX] shebang on odoo.py
2014-06-05 15:53:49 +02:00
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
767cb9afa1
[FIX] shebang on Python
2014-06-05 13:20:07 +02:00
b973e27da5
[IMP] views: don't prevent always -> disabled writes in views, is confusing and not very useful
2014-06-05 12:22:37 +02:00
b33bf57832
[ADD] Default value for supplierinfo.min_qty
...
And remove default value for function field "qty"
2014-06-05 09:55:30 +02:00
d82779684d
[FIX] Added cascade on subproduct so they get removed once the parent boms are removed
2014-06-04 22:17:02 +02:00
0eb602dd61
[MERGE] forward port of branch saas-5 up to 651e5ac
2014-06-04 19:25:40 +02:00
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
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
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
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
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
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
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
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
27af219b5e
Change scaffolding's controller template
2014-06-04 01:27:59 +02:00
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
a52a426de3
Do not check SSL certificate by default
...
(requested by al)
2014-06-04 00:58:32 +02:00
8a4511277c
Fix error on url scheme for odoo deploy
2014-06-04 00:58:23 +02:00
c5129fcfe5
Add __init__.py when createing module. Also add templates.xml in
...
manifest
2014-06-04 00:58:05 +02:00
1261a3ce36
[FIX] website_crm_partner_assign infinite crawling
2014-06-04 00:46:46 +02:00
8eeaabf694
[FIX] website_crm_partner_assign: buggy url
2014-06-03 22:15:24 +02:00
623912e477
Revert "[FIX] website_crm_partner_assign infinite crawling"
...
This reverts commit 267cc63027
2014-06-03 21:53:51 +02:00
3f85d4b493
[FIX] product: correct SyntaxError made by kdiff3 (once again) during previous forward port
2014-06-03 21:45:21 +02:00
267cc63027
[FIX] website_crm_partner_assign infinite crawling
...
disable url query fragment
2014-06-03 21:09:28 +02:00
a5908c5812
[MERGE] forward port of branch saas-5 up to b1c0bc0
2014-06-03 20:02:00 +02:00
c3275e346a
[MERGE] mail.thread as an AbstractModel
2014-06-03 19:56:43 +02:00
b1c0bc0b46
[MERGE] forward port of branch saas-4 up to 65f68c1
2014-06-03 19:45:19 +02:00
bfcb5595b8
[MERGE] odoo command: scaffold, start, deploy
2014-06-03 19:44:20 +02:00
Josse Colpaert
xmo-odoo
Richard Mathot
Sergei Filippov
Christophe Matthieu
Nicolas Bessi
Sandy Carter
odony
Christophe Simonis
Augustin Cisterne-Kaas
Xavier Morel
Martin Trigaux
sve-odoo
Paul Catinean
Christophe Simonis
Thibault Delavallée
Martin Trigaux
Denis Ledoux
antonylesuisse
Fabien Meghazi
Fabien Meghazi
Antony Lesuisse