Commit Graph

4613 Commits

Author SHA1 Message Date
Fabien Pinckaers 8aca457e34 [IMP] Updated website urls on modules and info page 2014-08-26 21:40:18 +02:00
qdc f57787e07e [IMP] Cleaning of reporting (group_by, filters), adding new favourites and default views, some renaming (py and xml files) 2014-08-26 11:56:49 +02:00
Christophe Simonis 5a5f811d23 [REVERT] commit 5e5c73e
Branch 8.0 is a **stable** branch. This mean no database schema
changes.
2014-08-22 13:59:22 +02:00
qdc 5e5c73e7ba [IMP] Cleaning of reporting (group_by, filters), adding new favourites and default views, some renaming (py and xml files) 2014-08-22 09:49:09 +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
Olivier Dony 50ef63881a [I18N] Update 8.0 translation with latest source code 2014-08-14 17:01:54 +02:00
Olivier Dony 85d2b45aaa [I18N] Update 7.0 translations with latest changes on Launchpad
See also https://github.com/odoo/odoo/wiki/GitHub-Transition#translations
2014-08-14 03:38:58 +02:00
Olivier Dony 96c36e895c [I18N] Update all 7.0 translation templates with latest terms and annotations
Total new terms: 168
Total deleted terms: 95
Total identical terms: 16329
(Some modules skipped, typically all l10n_* modules)
2014-08-14 02:24:24 +02:00
Fabien Pinckaers ef944dcd55 [IMP] Maifest for Github README.md on main apps 2014-08-12 11:33:15 +02:00
Denis Ledoux ae65be2b2a [MERGE] forward port of branch saas-5 up to 0739bc4 2014-08-11 15:58:02 +02:00
Denis Ledoux 7c647ec876 [MERGE] forward port of branch saas-4 up to 0a1e4a0 2014-08-08 17:27:29 +02:00
Denis Ledoux 0a1e4a05b2 [MERGE] forward port of branch saas-3 up to 81a902a 2014-08-08 17:06:39 +02:00
Denis Ledoux 978fd47261 [MERGE] forward port of branch 7.0 up to 095be21 2014-08-06 13:06:20 +02:00
Anael Closson f09e11f55b [FIX] sale: quote character in company name is converted to html entity
Avoid to get company names such as "L'abc" to be transformed as "L'abc" opw 607221
2014-08-05 11:15:28 +02:00
Denis Ledoux 1bb219907f [MERGE] forward port of branch saas-5 up to 655a5b9 2014-08-04 16:56:10 +02:00
Denis Ledoux 655a5b948d [MERGE] forward port of branch saas-4 up to 8c0c743 2014-08-04 16:14:31 +02:00
Simon Lejeune 834dfc00eb [FIX] sale/website_quote: inherit the sale order report to show the validity date 2014-08-04 14:45:38 +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
Denis Ledoux 873dc0370d [FIX] sale: config, timesheet if module account_analytic_analysis
In Settings > Sales, the onchange_timesheet ensure that if you check timesheet, it checks module_account_analytic_analysis.

Therefore, if module_account_analytic_analysis is installed, timesheet should be checked by default
Until now, it worked "luckily", because the onchange_timesheet of the field module_account_analytic_analysis was triggered before the onchange_timesheet of the timesheet field. Nevertheless, we shouldn't trust the onchange calls order.
2014-07-30 15:26:43 +02:00
Olivier Dony 6c4cf84ce8 [IMP] sale, crm: remove remaining interval filters, continuing 366a30d 2014-07-30 15:13:38 +02:00
Olivier Dony 57f79f9fa1 [REM] fields: remove fields.Any, temporary artifact for ill-typed fields
This was added in master-apiculture at f1f16a8 to
permit special function fields that return
structured JSON-like data.
This is unnecessary and caused typing problems, for
example for the type field of ir.model.fields, or
when you decide to store them.

It is simpler to explicitly declare these fields
as fields.Char and have them serialize their results
to JSON strings, or to declate them as fields.Binary
and return any opaque data they want.
2014-07-30 13:24:39 +02:00
Ravish 98ddec4fb8 [ADD] sale: validity date in sale order report 2014-07-25 13:23:11 +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 5739aebfb1 [MERGE] forward port of branch saas-3 up to 474eae9a43 2014-07-23 12:14:14 +02:00
Denis Ledoux d9339e1e2d [FIX] sale, crm_claim, crm_helpdesk: report menus
crm claims and helpdesk reports should be in Sales Report menu, not in project
The sales report menu is now defined in sales_team, which is a common dependance between crm and sales, instead of redefining this menu in each modules
2014-07-22 19:13:13 +02:00
Martin Trigaux 1f878f152a [MERGE] forward port of branch 7.0 up to 680f955 2014-07-22 13:39:15 +02:00
Denis Ledoux ae678d9e05 [FIX] sale: only propose services for pay advances
When creating an invoice from a sale order, if the user choose to invoice a fixed price (deposit), he has the possibility to choose an advance product. As described in the help message, this product should be a service product. Therefore, we add a domain so only services are displayed in the dropdown list
2014-07-18 17:26:48 +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
rlu-odoo 8b67a7202d [REF] OpenERP --> Odoo in various UI texts
Rebranding has been done in:
- data/demo files
- html templates
- help notices
- comments
- logger messages
- and other various messages

(Commit taken from odoo-dev:8.0-improve-openerp-odoo-rlu at rev 7deaa08)

Closes #1260
2014-07-18 13:45:41 +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 32dd003d60 [MERGE] Resolve conflicts 8.0 2014-07-13 09:27:20 +02:00
Raphael Collet 2398f480cd [IMP] addons: add _depends on models backed up by an sql view and used by other models 2014-07-08 15:32:38 +02:00
Josse Colpaert beb12f71f1 Merge branch 'odoo/8.0' into master-wmsstaging4-jco 2014-07-07 23:34:42 +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 130f890215 Merge pull request #964 from odoo-dev/8.0-remove-getattr-rco
[REM] models: remove the magic methods signal_XXX()
2014-07-07 14:49:49 +02:00
hugosdsantos 831b85778c [I18N] sale: fix pt translations
"Ordem de Vendas" changed to "Ordem de Venda"

(Rebase of PR #883)
2014-07-07 13:16:31 +02:00
Raphael Collet 33eb3dffb2 [REM] models: remove the magic methods signal_XXX() 2014-07-07 11:50:30 +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
Olivier Dony 34bfa1b44f [MERGE] Forward-port saas-5 up to d9cda97 2014-07-05 01:45:45 +02:00
Thibault Delavallée 27fa618882 [REV] Partial revert of search view changes: indeed the graph view is not already capable of handling group_by on any field, declaring them is still necessary. 2014-07-04 16:44:55 +02:00
Thibault Delavallée f0ef8ac446 [FIX] web_kanban_sparkline, sales_team, stock: use char function field to transmit sparkline data; the data is now correctly dumped into json, and parsed in the widget. 2014-07-04 14:42:38 +02:00
Thibault Delavallée 81a305a018 [FIX] sale: sales_team: fixed use_quotations field named 'opportunities' instead of 'quotations', copy and paste error probably 2014-07-04 08:02:54 +02:00
Thibault Delavallée 44a5268c00 [IMP] addons: search view cleaning / improvements due to the new search view display 2014-07-01 11:28:08 +02:00
Simon Lejeune af4cd36c83 [MERGE] upstream 2014-06-30 17:48:08 +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
Simon Lejeune fc8592adf2 [FIX] Report: translation fixed, use of 'primary clone' of web.layout and website.layout, minimal template is now a QWeb template 2014-06-27 12:00:49 +02:00
Christophe Simonis 8cbaf52fd3 Revert "Saas 5 report translation fix sle" 2014-06-26 18:14:44 +02:00
Simon Lejeune 42263b814e Merge remote-tracking branch 'odoo/saas-5' into saas-5-report-translation-fix-sle 2014-06-26 17:05:24 +02:00
Simon Lejeune d984bff9cb [IMP] cosmetic changes 2014-06-26 15:56:18 +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
ged-odoo 74168c4e9d Merge pull request #272 from odoo-dev/master-inline-searchview-ged
[MERGP] Inline Searchview

This task split the searchview in two parts: SearchView and SearchViewDrawer. The drawer is displayed inside the main view and the searchview stays in place.  It also changes the scrolling behavior of the web client: the main view area can scroll without affecting the UI (so the various menus stays in place)

Because of this, other large changes have been made:

the drawer has been redesigned,
the Custom Filter widget has been split in two (Custom Report and SaveCurrentFilter),
the main view is now scrollable, so the UI stays in place and only the view can change
The text 'Group By...' has been changed into 'Group By' (most addons had to be modified)
bootstrap classes are used when it makes sense (for example, badge)
the left menu is also scrollable (separately from the main view)

It is likely that some stupid bugs have been introduced.  Please don't hurt me.
2014-06-12 16:27:11 +02:00
Fabien Meghazi faa09da325 Removed version="7.0" from form views 2014-06-12 09:09:59 +02:00
Géry Debongnie 8202561511 Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged 2014-06-10 11:43:17 +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
Géry Debongnie 514203743d Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
Conflicts:
	addons/mrp/mrp_view.xml
2014-05-30 10:29:30 +02:00
Christophe Simonis fb650ee92e [MERGE] product: refactoring of product variants.
close PR #222
2014-05-30 10:22:36 +02:00
Géry Debongnie 5cc8f9ca42 Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged 2014-05-28 10:37:16 +02:00
Olivier Dony 04211015fc [MERGE] Forward-port of latest saas-4 fixes, up to 0452851 2014-05-27 20:49:49 +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
Géry Debongnie 62900fe01b Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
Conflicts:
	addons/crm/crm_case_section_view.xml
2014-05-26 10:06:31 +02:00
Olivier Dony 2af03e1b6e [MERGE] Forward-port latest 7.0 bugfixes, up to f8671cb 2014-05-22 16:44:33 +02:00
Olivier Dony 02035b27b8 [RESTORE] Restore *.sxw files, skipped during bzr-to-git conversion to discard older binary blobs 2014-05-22 14:07:15 +02:00
Géry Debongnie 555677f14d [IMP] replace all 'Group By...' by 'Group By'
in all searchview, the 'Group By...' looks weird, next to the Custom
Reports and Filters.  This change was requested by the upper management
2014-05-22 11:44:35 +02:00
Simon Lejeune 35c5e56718 [FIX] address div more to the left on external reports 2014-05-21 11:57:45 +02:00
Christophe Simonis a756b82372 [MERGE] forward port of branch saas-4 up to revid bb26dea 2014-05-20 20:19:55 +02:00
Christophe Simonis bb26dea60b [MERGE] forward port of branch saas-3 up to revid 38abc8a 2014-05-20 19:00:50 +02:00
Christophe Simonis 38abc8a006 [MERGE] forward port of branch 7.0 up to revid b09b6a0 2014-05-20 18:57:04 +02:00
Martin Trigaux d88ecfa970 [FIX] sale: in paypal, the encoding of the url should be done with werkzeug instead of urllib for better handeling of unicode (opw 607866) 2014-05-20 10:16:17 +02:00
Launchpad Translations on behalf of openerp c2584c8cb0 Launchpad automatic translations update. 2014-05-18 05:53:48 +00:00
Launchpad Translations on behalf of openerp 6ab0f645bc Launchpad automatic translations update. 2014-05-17 07:10:37 +00:00
Thibault Delavallée ae89496bbc [MERGE] Sync with trunk 2014-05-14 17:21:54 +02:00
Thibault Delavallée a5311e6900 [MOV] crm: moved css / js related to salesteam to sales_team module; sale_crm: moved data and demo data into
sale and sales_team module.
2014-05-14 14:30:26 +02:00
Thibault Delavallée b24986d8e6 [MERGE] Sync with trunk 2014-05-14 12:51:42 +02:00
Martin Trigaux 583fe74ba2 Forward-port of latest saas-3, up to revision 9455 (rev-id mat@openerp.com-20140514080416-m4t23y0rxx2ot7y6) 2014-05-14 10:37:54 +02:00
Launchpad Translations on behalf of openerp 0159a72661 Launchpad automatic translations update. 2014-05-14 06:20:49 +00:00
Launchpad Translations on behalf of openerp 7564f528e0 Launchpad automatic translations update. 2014-05-14 05:45:54 +00:00
Denis Ledoux 709e22c32a [FIX] sale: sale report view, wrong domain
Quotations are sale.order with state draft and sent
Sale orders are sale.order with state other than draft, sent and cancel
2014-05-13 10:15:01 +02:00
Launchpad Translations on behalf of openerp f173d926c8 Launchpad automatic translations update. 2014-05-13 06:28:52 +00:00
Launchpad Translations on behalf of openerp 65736e0644 Launchpad automatic translations update. 2014-05-13 05:59:29 +00:00
Thibault Delavallée e53cadcf2a [FIX] sale: fixed import error about relativedelta 2014-05-12 15:47:12 +02:00
Thibault Delavallée 919bd97509 [MERGE] Sync with upstream (trunk) 2014-05-12 14:56:31 +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
Cedric Snauwaert 9d9cfd585f [FIX]sale_report: change type of field date from date to datetime to match field date on sale_order
bzr revid: csn@openerp.com-20140512114532-726a1z0wqbpz96t8
2014-05-12 13:45:32 +02:00
Thibault Delavallée 443c830bfc [RENAME] sale_team renamed to sales_team. Update module name, file name and reference to the module. 2014-05-12 10:37:47 +02:00
Launchpad Translations on behalf of openerp 1397b7aa34 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140510075539-empsrh7k5l6q44ln
bzr revid: launchpad_translations_on_behalf_of_openerp-20140510075505-nu0zmfg57i2352lz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140511070820-8xp1e2jxonp4i750
bzr revid: launchpad_translations_on_behalf_of_openerp-20140503064840-v6n2wyrm1l162bh4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140504062728-9tmsk2r01vvs3avi
bzr revid: launchpad_translations_on_behalf_of_openerp-20140506072722-8xpshoxb4um6ef30
bzr revid: launchpad_translations_on_behalf_of_openerp-20140511070841-lboiasc73m8h3fb2
2014-05-11 07:08:41 +00:00
Prashant Panchal (OpenERP) 138ffedbf0 [MERGE]: Merged with addons 2014-05-09 18:47:56 +05:30
Prashant Panchal (OpenERP) ca2bee0865 [IMP]add groups 'base.group_multi_salesteams' 2014-05-09 16:16:07 +05:30
Prashant Panchal (OpenERP) 6c0389279a [IMP]add groups 'base.group_multi_salesteams' on sales team dependent module 2014-05-09 13:13:13 +05:30
Prashant Panchal (OpenERP) b420dc37d3 [MERGE]merge with trunk 2014-05-08 19:14:33 +05:30
Launchpad Translations on behalf of openerp 5f1bd401f8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140508063251-ztdomqygi2izm2o3
2014-05-08 06:32:51 +00:00
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
Prashant Panchal (OpenERP) e511de45cb [ADD]crm_case_section (view & py file) add in sale module, that file split from sale.py & sale_view.xml 2014-05-07 11:50:06 +05:30
Ravi Gadhia a3e44373d0 Merge with trunk 2014-05-06 14:58:46 +05:30
chm@openerp.com 8065294976 [IMP] sale: add comment on onchange_fiscal_position and update taxes of order lines only if a product is defined
bzr revid: chm@openerp.com-20140506080525-4scwvtk7os8b63d0
2014-05-06 10:05:25 +02:00
chm@openerp.com 9eb7a78866 [MERGE] from trunk
bzr revid: chm@openerp.com-20140505112314-1zbn7ae61mg8xavl
2014-05-05 13:23:14 +02:00
chm@openerp.com 9e176a977e [FIX] website_sale: apply tax position on checkout signup
bzr revid: chm@openerp.com-20140505092300-l29tc4pum31nqd1h
2014-05-05 11:23:00 +02:00
chm@openerp.com 1a9f3165ce [FIX] sale: change fiscal_position don't change order line taxes; Add onchange_fiscal_position method on sale.order
bzr revid: chm@openerp.com-20140505085755-wewn9xm8bp08ywnd
2014-05-05 10:57:55 +02:00
Gery Debongnie 5aa2fa150c [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
Josse Colpaert 8b84615de1 [MERGE] Merge from trunk test
bzr revid: jco@openerp.com-20140502130352-c3h1fk332eqyd78b
2014-05-02 15:03:52 +02:00
Ravi Gadhia 6ccbd2cd82 [IMP] no need to inherit sale.order report we are already in sale/report +change file name for invoice report 2014-05-02 17:23:18 +05:30
chm@openerp.com ee16b014b1 [MERGE] from trunk
bzr revid: chm@openerp.com-20140502095132-kfx40xou73mukr2y
2014-05-02 11:51:32 +02:00
Ravi Gadhia 78204703b0 [IMP] split crm_case_section + create alias from lead 2014-05-02 14:27:50 +05:30
Antony Lesuisse 7e25b9ae55 [MERGE] saas-4 report_webkit missing dependency on report
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
2014-05-01 18:11:56 +02:00
Ravi Gadhia 3bfdd859e2 Merge with trunk 2014-05-01 13:12:03 +05:30
Richard Mathot (OpenERP) d0e9ba289f [MERGE] from trunk
bzr revid: rim@openerp.com-20140429124452-5cvpmtpyz2daj8w2
2014-04-29 14:44:52 +02:00
Richard Mathot (OpenERP) d7d6833965 [FIX] sale: layout of description page
bzr revid: rim@openerp.com-20140429090502-32u7vf7zntxnoruk
2014-04-29 11:05:02 +02:00
Richard Mathot (OpenERP) 65f2db5c21 [MERGE] from trunk
bzr revid: rim@openerp.com-20140429081937-hhqcg84o7iha78fq
2014-04-29 10:19:37 +02:00
Quentin (OpenERP) 7ed26f1e07 [REF] product refactoring: prices.history model renamed into product.price.history + passed 'date' as real parameter instead of contextual one in get_history_price() because it makes more sense.
bzr revid: qdp-launchpad@openerp.com-20140428153355-vbuam1hfnah7m4wp
2014-04-28 17:33:55 +02:00
chm@openerp.com bb2ebf7cb9 [FIX] website_sale: apply fiscal position on change product id and update cart.
[IMP] sale: apply fiscal position of the partner if they are not fiscal position defined

bzr revid: chm@openerp.com-20140428093609-8z8my9vj322shcll
2014-04-28 11:36:09 +02:00
Christophe Simonis 7a7d7febf8 [MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
2014-04-24 15:45:33 +02:00
Denis Ledoux b6255eb55d [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10005 revid:dle@openerp.com-20140422150710-mr9x3vyq0wcg31l5
bzr revid: dle@openerp.com-20140422162028-2icoebrb5q4tg3t3
2014-04-22 18:20:28 +02:00
Denis Ledoux b981f3f8ef [FIX] *: in search views, use operator=child_of instead of filter_domain with a child_of domain
operator child_of has the advantage to do exact ID matching for many2one, and not just matching on the name

bzr revid: dle@openerp.com-20140422150710-mr9x3vyq0wcg31l5
2014-04-22 17:07:10 +02:00
Martin Trigaux 322eebf3f7 [FIX] sale: move demo data from sale to sale_stock
A better fix would be to create a sale_procurement module (sale_stock has sale, procurement and stock as dependecies) but a bit overkill for simple demo data

bzr revid: mat@openerp.com-20140422105039-vqvxejd123cmtc0s
2014-04-22 12:50:39 +02:00
Quentin (OpenERP) 57cebaaac6 [MERGE] merged trunk up to revision 9365.
bzr revid: qdp-launchpad@openerp.com-20140422092815-f4tlfmo8zj1nogbl
2014-04-22 11:28:15 +02:00
Randhir Mayatra rma-openerp 62cd1a6487 [MERGE] merge with latest trunk 2014-04-22 14:21:34 +05:30
Launchpad Translations on behalf of openerp fa60b90c1f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
Randhir Mayatra rma-openerp 27ee024847 [IMP] optimize code 2014-04-22 12:53:03 +05:30
Darshan Kalola (OpenERP) cccc7a3d0c [MERGE]sync with trunk.
bzr revid: dka@tinyerp.com-20140417132329-sd2skyprb3nt88uw
2014-04-17 18:53:29 +05:30
Gery Debongnie a17c16a660 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140417110726-8w4oktk7ml416ld7
bzr revid: ged@openerp.com-20140417130144-42bkw3f55xosxnks
2014-04-17 15:01:44 +02:00
Quentin (OpenERP) fbd3255e37 [MERGE] merged trunk up to revision 9350
bzr revid: qdp-launchpad@openerp.com-20140416150551-lxpscdd74mgv99r1
2014-04-16 17:05:51 +02:00
DJ Patel 4c1a345ad4 [Merge] Merged with trunk.
bzr revid: mdi@tinyerp.com-20140416043234-ygtv29jxhiq1io0e
2014-04-16 10:02:34 +05:30
Gery Debongnie f57b767361 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140415150146-5ovdjzta58t5dhd2
2014-04-15 17:01:46 +02:00
Randhir Mayatra rma-openerp e25229a6da [IMP] update depends on sale_team and sale 2014-04-15 16:08:37 +05:30
Randhir Mayatra rma-openerp 733f344ff6 [IMP] add 'report' in sale dependancy
bzr revid: rma@tinyerp.com-20140414120915-3huithw6481rss0j
2014-04-14 17:39:15 +05:30
Randhir Mayatra rma-openerp c399e1daaf [MERGE] merge with latest trunk and resolve conflicts
bzr revid: rma@tinyerp.com-20140414110149-r3l00xr8l08ex7oc
2014-04-14 16:31:49 +05:30
Quentin (OpenERP) 398d96f273 [MERGE] merged trunk up to revision 9327
bzr revid: qdp-launchpad@openerp.com-20140414094743-hv0u7qhigv1to2uc
2014-04-14 11:47:43 +02:00
Richard Mathot (OpenERP) 15725997dd [MERGE] Sync with trunk
bzr revid: rim@openerp.com-20140414090336-vc5283odv5f612es
2014-04-14 11:03:36 +02:00
Randhir Mayatra rma-openerp e8f488065a [MERGE] merge with latest trunk and resolve conflicts 2014-04-14 14:06:31 +05:30
Launchpad Translations on behalf of openerp 001a034e58 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412094159-mhy3v2prb3ctx32k
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412094217-3u3f03f0wjhbzyo4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140413062047-z833pejjrtuhfygs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140414055948-intynzk8l823ukei
2014-04-14 05:59:48 +00:00
Launchpad Translations on behalf of openerp e82fbf7d91 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
Randhir Mayatra rma-openerp 6da28202f3 [MERGE] merge with latest trunk 2014-04-11 12:36:24 +05:30
Randhir Mayatra rma-openerp 85714eabb6 [MERGE] merge with latest trunk
bzr revid: rma@tinyerp.com-20140411062328-srzutp1ln9xe7sxq
2014-04-11 11:53:28 +05:30
Launchpad Translations on behalf of openerp 63e9150cff Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140411055930-7coykr7rveqsucp3
2014-04-11 05:59:30 +00:00
Gery Debongnie 2e9ee9c76e [MERGE] merge from rma branch
bzr revid: ged@openerp.com-20140410145131-fj17mdpi13wa5a9m
2014-04-10 16:51:31 +02:00
Denis Ledoux 7715bf1823 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9969 revid:dle@openerp.com-20140409162932-y5fxd5wbojing2t2
bzr revid: dle@openerp.com-20140409163132-n3apqh6nvfg2qof9
2014-04-09 18:31:32 +02:00
Ravish (Open ERP) 31c7c33260 [imp]improve the code 2014-04-09 19:10:28 +05:30
Denis Ledoux 32f4824434 [MERGE][FIX] sale: sale order report, pto in invoice template should not cover the whole document
Courtesy of Stefan Rijnhart (Therp)

bzr revid: dle@openerp.com-20140408193910-2vztatyowndyasj9
2014-04-08 21:39:10 +02:00
DJ Patel c20483a1dd [FIX] sale : Don't allow line creation in confirmed sale oder.
bzr revid: mdi@tinyerp.com-20140408053552-ovo33f2nkhaj6goe
2014-04-08 11:05:52 +05:30
Christophe Simonis 0fad8159f3 [MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
2014-04-07 18:33:18 +02:00
Randhir Mayatra rma-openerp 9dbaa58694 [MERGE] merge with latest trunk
bzr revid: rma@tinyerp.com-20140407102440-ngtr58o2w2ypqrol
2014-04-07 15:54:40 +05:30
Simon Lejeune e1bf5bd97c [IMP] Report: renamed 'render_doc' method as 'translate_doc' for better understanding and added it a 'lang_field' attribute to explicitely set the lang. Adapted report_invoice, report_saleorder, report_overdue and report_intrastatinvoice this way.
bzr revid: sle@openerp.com-20140408134953-vql9ft8cosoanixt
2014-04-08 15:49:53 +02:00
Simon Lejeune 4983f86d81 [MERGE] trunk
bzr revid: sle@openerp.com-20140407174534-pk6b5lozvik78fom
2014-04-07 19:45:34 +02:00
Simon Lejeune dc8246eb03 [ADD] sale_layout module allowing to set categories and subtotals on invoice and sale order
bzr revid: sle@openerp.com-20140404112308-aopihnefnf55b4er
2014-04-04 13:23:08 +02:00
Launchpad Translations on behalf of openerp 8f174e13bd Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140404070722-99m3lomg172fzapc
bzr revid: launchpad_translations_on_behalf_of_openerp-20140404070759-302tyo6k09v8arhz
2014-04-04 07:07:59 +00:00
Christophe Simonis db6fb31870 [MERGE] forward port of branch 7.0 up to revid 9954 chs@openerp.com-20140403153129-jq9zc7ityoy25c73
bzr revid: chs@openerp.com-20140403155904-ya5mas5s3g7ivihb
2014-04-03 17:59:04 +02:00
Simon Lejeune 33471e966f [FIX] missing dependancies of report module
bzr revid: sle@openerp.com-20140403091818-6evr0k4r2k4818j1
2014-04-03 11:18:18 +02:00
Quentin (OpenERP) ff4726ea7d [MERGE] merged trunk up to revision 9281
bzr revid: qdp-launchpad@openerp.com-20140403081427-7xpn57wdfv08v2al
2014-04-03 10:14:27 +02:00
Launchpad Translations on behalf of openerp 4612b417af Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140403060213-netdplm9jzfr9yy6
2014-04-03 06:02:13 +00:00
Ravish (Open ERP) 194005512d [update with trunk] 2014-04-01 12:54:14 +05:30
Martin Trigaux 7ee65aa181 [FIX] sale: remove useless write call (problematic when invoice on delivery order)
bzr revid: mat@openerp.com-20140331104448-4omzqnist6wlmakd
2014-03-31 12:44:48 +02:00
Launchpad Translations on behalf of openerp 16ce262c33 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140329073038-m7q4sxpb8tprh00r
bzr revid: launchpad_translations_on_behalf_of_openerp-20140330061549-r3t0pecngy76c2rw
bzr revid: launchpad_translations_on_behalf_of_openerp-20140331064021-x3wjc8s4oa0ncq95
bzr revid: launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis
bzr revid: launchpad_translations_on_behalf_of_openerp-20140402064459-d7e3d8nwo8famjh6
2014-04-02 06:44:59 +00:00
Yogesh Parekh (OpenERP) 9aadda1e1e [MERGE]: Merge with addons branch
bzr revid: ypa@tinyerp.com-20140331095310-wkmxt02x6l85zho0
2014-03-31 15:23:10 +05:30
Randhir Mayatra rma-openerp 77ff3a69b8 [IMP] improve icons and views
bzr revid: rma@tinyerp.com-20140328133051-2amm63n2vy3bj3xe
2014-03-28 19:00:51 +05:30
Ravish (Open ERP) 7699504d62 [Add new sale_team module] 2014-03-28 15:28:35 +05:30
Launchpad Translations on behalf of openerp 598cf8d9b3 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140328064440-1ja0p23itklkg7yk
2014-03-28 06:44:40 +00:00
Launchpad Translations on behalf of openerp 51aa261b44 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
2014-03-27 07:35:04 +00:00
Quentin (OpenERP) e0b27b4ee8 [MERGE] merged trunk up to revision 9251
bzr revid: qdp-launchpad@openerp.com-20140326152751-b6bo0fawrzmd71f0
2014-03-26 16:27:51 +01:00
Randhir Mayatra rma-openerp c086291ddd [MERGE] merge with latest trunk
bzr revid: rma@tinyerp.com-20140325135635-rev8asknqwk08svy
2014-03-25 19:26:35 +05:30
Denis Ledoux e61d12bfa7 [MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9160 revid:dle@openerp.com-20140325112413-xs5z7y81rhyjt0rd
bzr revid: dle@openerp.com-20140325112909-zpfi67tx8yfxwnqe
2014-03-25 12:29:09 +01:00
Denis Ledoux 02459f8d4a [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9929 revid:dle@openerp.com-20140325104921-x8zjx5p71l1o3uif
bzr revid: dle@openerp.com-20140310133913-465x5t3n1bo7fu98
bzr revid: dle@openerp.com-20140311164146-2s599kogbqj8e94l
bzr revid: dle@openerp.com-20140312111149-u6y036aej3ywq7et
bzr revid: dle@openerp.com-20140312121145-06s1jvct9v4m7l6s
bzr revid: mat@openerp.com-20140313084409-c0kckxemy3in0mlo
bzr revid: chs@openerp.com-20140313163420-ifa4hyixj722d6jo
bzr revid: chs@openerp.com-20140314102034-g0nzryvwhrpzdas9
bzr revid: chs@openerp.com-20140314104803-19c5snl2fcuih91o
bzr revid: odo@openerp.com-20140314143519-x6rzcfkkqxwc0e1g
bzr revid: chs@openerp.com-20140318110229-y8098w3shdpmoig2
bzr revid: dle@openerp.com-20140318151824-sscl4m8p87emjl8s
bzr revid: dle@openerp.com-20140320112618-yfyihlwz66ryeqf5
bzr revid: dle@openerp.com-20140320161003-j01cc6sqves2wnp2
bzr revid: dle@openerp.com-20140320181252-4gqcog22p1ex0pz7
bzr revid: dle@openerp.com-20140321140450-8ulnhr76qybiadks
bzr revid: dle@openerp.com-20140324104743-ubvu8st7emq9pg1q
bzr revid: dle@openerp.com-20140325112413-xs5z7y81rhyjt0rd
2014-03-25 12:24:13 +01:00
Denis Ledoux 8310cd1920 [FIX] sale: make invoice for SO grouped by partner based on partner_invoice_id instead of just partner_id
For two sale order, if the partner_id were different but the partner_invoice_id were identical, the make invoice grouped by partner created two different invoices

bzr revid: dle@openerp.com-20140325103226-vusygdpd74yha91m
2014-03-25 11:32:26 +01:00
Randhir Mayatra rma-openerp 96ea9392aa [IMP] convert button into stat button for products
bzr revid: rma@tinyerp.com-20140324135621-13t191kmnn6t22jk
2014-03-24 19:26:21 +05:30
Christophe Simonis d93b79e6f4 [MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349-e82t1bmmtjqbl85k
bzr revid: chs@openerp.com-20140324133811-4az1kvbznd26seow
2014-03-24 14:38:11 +01:00
Denis Ledoux f4b1d23cf2 [MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9159 revid:dle@openerp.com-20140324104743-ubvu8st7emq9pg1q
bzr revid: dle@openerp.com-20140324110349-e82t1bmmtjqbl85k
2014-03-24 12:03:49 +01:00
Denis Ledoux 04f632820b [FIX] sale: trigger signal manual invoice for make invoices wizard (not advance)
bzr revid: dle@openerp.com-20140324103427-yckncrnynvs5si8i
2014-03-24 11:34:27 +01:00
Randhir Mayatra rma-openerp b51066b500 [IMP] convert button into stat button for customer
bzr revid: rma@tinyerp.com-20140320134414-mk1ie8okynrtudsq
2014-03-20 19:14:14 +05:30
Launchpad Translations on behalf of openerp 948799e259 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140315070651-iyi1g70tarcqvhdc
bzr revid: launchpad_translations_on_behalf_of_openerp-20140315064235-n9sb0125g9bboyb4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140316054224-hr4a70bglfizxqyy
2014-03-16 05:42:24 +00:00
Yogesh Parekh (OpenERP) c4424b597d [MERGE]: Merge with addons
bzr revid: ypa@tinyerp.com-20140312095556-d0pmfd7kw9fyy7u2
2014-03-12 15:25:56 +05:30
Christophe Simonis d504764eff [MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
2014-03-11 15:52:05 +01:00
Quentin (OpenERP) da210e4b5e [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20140311132813-0gmbof2u8nmgv9p3
2014-03-11 14:28:13 +01:00
Yogesh Parekh (OpenERP) 9338207e1f [IMP]: Improve reference terms for partner
bzr revid: ypa@tinyerp.com-20140311094911-7oc1il3jl2ktlb09
2014-03-11 15:19:11 +05:30
Denis Ledoux 4235dc8e88 [REVERT]9882 revid:jri@openerp.com-20140307160945-r2t5pbl2bb7yaw9n
While it seems right to only show the partner addresses in invoice and shipping addresses, this fix will prevent to use sibling addresses (the address of another contact in the same company), which is a requirement for several users. Therefore, this fix causes more problems than it resolves. 

Moreover, these addresses are displayed on the invoice form as following: Company Name / Partner Name / Address Name. Therefore, if you want to change the address while seeing only the partner addresses, you just have to remove the "Address Name", leaving "Company Name / Partner Name".

bzr revid: dle@openerp.com-20140310133314-5mv4h2h5zmqlw4d2
2014-03-10 14:33:14 +01:00
Denis Ledoux c2ba11e72e [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9885 revid:dle@openerp.com-20140310114026-r0ijm0m36su19wn7
bzr revid: dle@openerp.com-20140310122101-gicombyc5ii0yz6a
2014-03-10 13:21:01 +01:00
Juan Rial f631757f37 [FIX] [MERGE] [SALE] Filter invoice and ship address on sales order to contacts of the selected customer (#592166)
bzr revid: jri@openerp.com-20140307160945-r2t5pbl2bb7yaw9n
2014-03-07 17:09:45 +01:00
Launchpad Translations on behalf of openerp e231045095 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140306061409-nvr56r44q6smklxz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140305055718-w3c9kzsncncpu12w
bzr revid: launchpad_translations_on_behalf_of_openerp-20140306061519-n2qbjt3fe7l104aw
2014-03-06 06:15:19 +00:00