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
4cb5381dee
[MERGE] forward port of branch saas-4 up to 1f20f61
2014-06-22 15:33:22 +02:00
1f20f61ab4
[MERGE] forward port of branch saas-3 up to 75884c3
2014-06-22 15:30:57 +02:00
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
b0a5e9286d
[IMP]rename project_mrp to sale_service
2014-06-17 17:12:49 +02:00
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
faa09da325
Removed version="7.0" from form views
2014-06-12 09:09:59 +02:00
8202561511
Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
2014-06-10 11:43:17 +02:00
b1c0bc0b46
[MERGE] forward port of branch saas-4 up to 65f68c1
2014-06-03 19:45:19 +02:00
65f68c1f65
[MERGE] forward port of branch saas-3 up to 7dd6954
2014-06-03 19:14:22 +02:00
7dd69540e8
[MERGE] forward port of branch 7.0 up to 0c4bc1c
2014-06-03 19:11:44 +02:00
0c4bc1cf72
[FIX] sale: keep customer reference in grouped invoice (opw 606523)
2014-06-03 17:15:08 +02:00
271885716f
[FIX] sale: cannot filter on paid = False
2014-06-03 16:19:05 +02:00
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
fb650ee92e
[MERGE] product: refactoring of product variants.
...
close PR #222
2014-05-30 10:22:36 +02:00
5cc8f9ca42
Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
2014-05-28 10:37:16 +02:00
04211015fc
[MERGE] Forward-port of latest saas-4 fixes, up to 0452851
2014-05-27 20:49:49 +02:00
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
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
2af03e1b6e
[MERGE] Forward-port latest 7.0 bugfixes, up to f8671cb
2014-05-22 16:44:33 +02:00
02035b27b8
[RESTORE] Restore *.sxw files, skipped during bzr-to-git conversion to discard older binary blobs
2014-05-22 14:07:15 +02:00
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
35c5e56718
[FIX] address div more to the left on external reports
2014-05-21 11:57:45 +02:00
a756b82372
[MERGE] forward port of branch saas-4 up to revid bb26dea
2014-05-20 20:19:55 +02:00
bb26dea60b
[MERGE] forward port of branch saas-3 up to revid 38abc8a
2014-05-20 19:00:50 +02:00
38abc8a006
[MERGE] forward port of branch 7.0 up to revid b09b6a0
2014-05-20 18:57:04 +02:00
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
c2584c8cb0
Launchpad automatic translations update.
2014-05-18 05:53:48 +00:00
6ab0f645bc
Launchpad automatic translations update.
2014-05-17 07:10:37 +00:00
ae89496bbc
[MERGE] Sync with trunk
2014-05-14 17:21:54 +02:00
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
b24986d8e6
[MERGE] Sync with trunk
2014-05-14 12:51:42 +02:00
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
0159a72661
Launchpad automatic translations update.
2014-05-14 06:20:49 +00:00
7564f528e0
Launchpad automatic translations update.
2014-05-14 05:45:54 +00:00
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
f173d926c8
Launchpad automatic translations update.
2014-05-13 06:28:52 +00:00
65736e0644
Launchpad automatic translations update.
2014-05-13 05:59:29 +00:00
e53cadcf2a
[FIX] sale: fixed import error about relativedelta
2014-05-12 15:47:12 +02:00
919bd97509
[MERGE] Sync with upstream (trunk)
2014-05-12 14:56:31 +02:00
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
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
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
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
138ffedbf0
[MERGE]: Merged with addons
2014-05-09 18:47:56 +05:30
ca2bee0865
[IMP]add groups 'base.group_multi_salesteams'
2014-05-09 16:16:07 +05:30
6c0389279a
[IMP]add groups 'base.group_multi_salesteams' on sales team dependent module
2014-05-09 13:13:13 +05:30
b420dc37d3
[MERGE]merge with trunk
2014-05-08 19:14:33 +05:30
5f1bd401f8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140508063251-ztdomqygi2izm2o3
2014-05-08 06:32:51 +00:00
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
Christophe Simonis
Martin Trigaux
Amit Vora
ged-odoo
Fabien Meghazi
Martin Trigaux
Anaël Closson
Olivier Dony
Christophe Matthieu
Simon Lejeune
Launchpad Translations on behalf of openerp
Thibault Delavallée
Denis Ledoux
Cedric Snauwaert
Prashant Panchal (OpenERP)
Quentin (OpenERP)