Commit Graph

1083 Commits

Author SHA1 Message Date
Christophe Simonis 41afeec7f1 [MERGE] forward port of branch saas-5 up to 9363bc9 2014-09-04 18:03:24 +02:00
Christophe Simonis 9363bc9182 [MERGE] forward port of branch saas-3 up to 3d80dc2 2014-09-04 17:51:42 +02:00
Christophe Simonis 3d80dc2bbf [MERGE] forward port of branch 7.0 up to 59b76ee 2014-09-04 17:46:51 +02:00
Your Name 59b76ee927 [FIX] sale: keep page when confirming a sale order
To keep the pager and view changer after confirmation of a sale order, do not reload the view (quotation and sale order view are the same anyway)
Fixes #250
2014-09-04 17:34:46 +02:00
Josse Colpaert 12d9333f48 [IMP] Clean 2014-09-03 19:18:17 +02:00
Josse Colpaert bd5550e832 [FIX] Services type procurements are also important to trigger sale wkf 2014-09-03 19:18:16 +02:00
Josse Colpaert 86b8e73482 [IMP] Clean need_procurement and add partner on procurement for Phantom with service 2014-09-03 19:18:16 +02:00
Christophe Simonis 8046b7367d [MERGE] forward port of branch saas-5 up to 7e117b1 2014-08-28 16:51:11 +02:00
Christophe Simonis 7e117b18a0 [MERGE] forward port of branch saas-3 up to ada9724 2014-08-28 16:21:27 +02:00
Nicolas Seinlet 23df2ec28a [FIX] sale: on create, set taxes if product_id_change called 2014-08-27 11:48:40 +02:00
Christophe Simonis 5dff035878 [MERGE] forward port of branch saas-5 up to 39bee35 2014-08-20 20:33:17 +02:00
Christophe Simonis c3131317d7 [MERGE] forward port of branch saas-4 up to ddef2dd 2014-08-20 17:57:22 +02:00
Christophe Simonis ddef2dd10a [MERGE] forward port of branch saas-3 up to 8f13e83 2014-08-20 17:51:20 +02:00
Denis Ledoux cee1f0457d [FIX] sale: define sale_note field before using it as a default value for sale.order
When uninstalling/installing sale module, this can be problematic
2014-08-19 09:48:05 +02:00
Christophe Simonis fd4fd35e32 [MERGE] forward port of branch saas-5 up to e4cb520 2014-07-30 20:52:14 +02:00
Christophe Simonis e4cb5202a0 [MERGE] forward port of branch saas-4 up to fa07bc8 2014-07-30 20:30:14 +02:00
Christophe Simonis fa07bc8532 [MERGE] forward port of branch saas-3 up to 310d3fe 2014-07-30 19:09:33 +02:00
Christophe Simonis 310d3fe4c4 [MERGE] forward port of branch 7.0 up to 39f3e40 2014-07-30 18:55:31 +02:00
Guewen Baconnier 39f3e40329 [FIX] sale: copy_quotation must propagate the context 2014-07-30 16:47:51 +02:00
Olivier Dony ef53a831c6 [MERGE] Forward-port saas-5 up to a5f7891 2014-07-23 16:58:00 +02:00
Denis Ledoux a5f7891b68 [MERGE] forward port of branch saas-4 up to 5739aebfb1 2014-07-23 13:18:30 +02:00
Denis Ledoux 6801a3f505 [FIX] sale: do not propagate context on send email
Otherwise, active_id, active_ids, active_model params are propagated, and it leads to inconsistencies.
For instances, go to Sales > Customers, choose a customer which has quotations.
On the form, hit the "Quotations and sales" Button
Choose a quotation. Hit the "send by email" button.
The template preview should be displayed correctly. Now send the email, than
 - Either, you have no traceback: The email sent is the email of another quotation, the quotation having as id the id of the partner you chose
 - Either, you have a traceback: There is no quotation having as id the id of the partner you chose.
2014-07-18 16:49:45 +02:00
qdp-odoo d35d47165e Merge pull request #1124 from odoo-dev/master-wmsstaging4-jco
fixes related to WMS, product variants and templates... from Josse
2014-07-17 18:18:16 +02:00
Josse Colpaert 0aad6b0498 [IMP] Check other comments on pull request: xmlid, no split in context + continue improve receipts instead of receptions 2014-07-16 11:58:22 +02:00
Josse Colpaert e23a36c1a5 [FIX] Make sure that when cancelling a move the linked procurements are checked the right way 2014-07-16 10:06:15 +02:00
Josse Colpaert 3b636a5df0 [WIP] Simplify procurement check and sales order workflow and that way phantom boms will work 2014-07-15 18:38:06 +02:00
Denis Ledoux c363451f95 [FIX] sale: no warn onchange pricelist and no line
The popup warning that changing the pricelist will not update the existing order lines should not be diplayed it there is no order line set.

It was the case until 8.0. The change of behavior of on changes has broken this feature: Now, the on change return [(6, 0, [])] for an empy order line list, instead of just [].
2014-07-15 16:30:38 +02:00
Josse Colpaert 2518767005 [IMP] Start of extra primary view on product template that is not inherited by product_product 2014-07-07 21:45:11 +02:00
Raphael Collet acb1420fb9 Revert "[IMP] addons: use the magic methods signal_XXX() instead of signal_workflow('XXX')"
This reverts commit beea451e54.
2014-07-07 11:23:06 +02:00
Raphael Collet beea451e54 [IMP] addons: use the magic methods signal_XXX() instead of signal_workflow('XXX') 2014-07-07 09:42:27 +02:00
Raphael Collet cbe2dbb672 [MERGE] new v8 api by rco
A squashed merge is required as the conversion of the apiculture branch from
bzr to git was not correctly done. The git history contains irrelevant blobs
and commits. This branch brings a lot of changes and fixes, too many to list
exhaustively.

- New orm api, objects are now used instead of ids
- Environements to encapsulates cr uid context while maintaining backward compatibility
- Field compute attribute is a new object oriented way to define function fields
- Shared browse record cache
- New onchange protocol
- Optional copy flag on fields
- Documentation update
- Dead code cleanup
- Lots of fixes
2014-07-06 17:05:41 +02:00
Antony Lesuisse 22f4c315a3 [IMP] automatic fiscal positions for simple cases
Add group of countries res.country.group
Add get_fiscal_position method a method to compute a fiscal position based on company_id, partner_id, delivery_id
The meaning of res.partner.fiscal_position is now a forced a fiscal position.
The default implementation should handle simple cases, like VAT in UE and sales
tax in the US, but the method can be overriden to handle more complex ficals
rules.
2014-06-30 02:12:41 +02:00
Jaydeep Barot 026e38b48f [REM] Unnecessary `size` parameters on char fields 2014-06-25 17:13:43 +02:00
Christophe Simonis e862ff7033 [MERGE] forward port of branch saas-5 up to 4cb5381
Conflicts:
	openerp/addons/base/module/wizard/base_module_upgrade_view.xml
2014-06-22 15:36:10 +02:00
Christophe Simonis 4cb5381dee [MERGE] forward port of branch saas-4 up to 1f20f61 2014-06-22 15:33:22 +02:00
Christophe Simonis 1f20f61ab4 [MERGE] forward port of branch saas-3 up to 75884c3 2014-06-22 15:30:57 +02:00
Martin Trigaux f855f1c162 Merge pull request #325 from odoo-dev/saas-3-opw-608186-acl
[FIX] sale: cannot filter on paid = False (opw 608186)
2014-06-19 16:01:23 +02:00
Amit Vora b0a5e9286d [IMP]rename project_mrp to sale_service 2014-06-17 17:12:49 +02:00
Christophe Simonis b1c0bc0b46 [MERGE] forward port of branch saas-4 up to 65f68c1 2014-06-03 19:45:19 +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
Martin Trigaux 0c4bc1cf72 [FIX] sale: keep customer reference in grouped invoice (opw 606523) 2014-06-03 17:15:08 +02:00
Anaël Closson 271885716f [FIX] sale: cannot filter on paid = False 2014-06-03 16:19:05 +02:00
Christophe Matthieu 43977deb71 [IMP] product: refactoring of product variant. The main view became the view of product template and the product product (or product variant) are created with the variant values combinaison. Bom is splitted into bom and bom line and can use the variant combinaison. 2014-05-27 09:42:52 +02:00
Thibault Delavallée 3406b6db39 [CLEAN] sale, sale_crm: cleaning before merging. Cleaned calculation
of default section id + removed duplicated code.
2014-05-12 14:56:01 +02:00
Prashant Panchal (OpenERP) 138ffedbf0 [MERGE]: Merged with addons 2014-05-09 18:47:56 +05:30
Prashant Panchal (OpenERP) b420dc37d3 [MERGE]merge with trunk 2014-05-08 19:14:33 +05:30
Quentin (OpenERP) 70eb74a260 [MERGE] merged with trunk up to revision 9425. Needs to find another icon for Traceability on lot, though
bzr revid: qdp-launchpad@openerp.com-20140507182917-erjammra4okyei1c
2014-05-07 20:29:17 +02:00
Antony Lesuisse 56eeefdfda [MERGE] trunk-websit-al-refactor by chm
- allow fiscal position change on sale orders
- public user on website
- simplify website_sale sale.order and shopping cart code
- remove preprocess_request

bzr revid: al@openerp.com-20140507153223-q73u5lhyrfw98o3a
2014-05-07 17:32:23 +02:00
Gery Debongnie 2d924f3e22 [FIX] code cleanup (addon sale)
improves the _sales_count method in product.product by removing try/catch and by using better logic.  Also, removes now useless sales_ids one2many field.

bzr revid: ged@openerp.com-20140507092303-a2g4gq2mq3obelye
2014-05-07 11:23:03 +02:00