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
32dd003d60
[MERGE] Resolve conflicts 8.0
2014-07-13 09:27:20 +02:00
0a6d63b82c
[FIX] product: unfuck templates and products in views
...
product.product reuses most of the product.template views however some parts need to be excluded or replaced.
Instead of adding template only parts in base view and removing it for product, split the views in 'common' (product_template_form_view), 'template only' (product_template_only_form_view) and 'product only' (product_normal_form_view) where the first is inherited by the other two. The attribute mode='primary' on both second views allows to make sure that future inheritance of product_template_form_view and product_template_only_form_view will work with the full rendered product_template_form_view view.
This allows us to have valid buttons in crm for bill of material (filters based on active_id).
Also cleaning the mess with circular dependencies.
2014-07-11 17:03:04 +02:00
bdfdba0de4
[IMP] Update manufacturing
2014-07-07 23:33:47 +02:00
b414e05a41
[IMP] Adapt views of product template start
2014-06-30 09:26:49 +02:00
bdda11ab40
[IMP] Update views and production_delay and track_production should go to product_template
2014-06-26 17:52:37 +02:00
6b63d40145
[MERGE] Merge from master and resolve conflict
2014-06-17 16:23:44 +02:00
96f038a6ab
[IMP] product: all left menu item became product.template's action
2014-06-16 17:16:50 +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
ac943b0307
[IMP] Change mrp lots to depend on lots and not on packing
2014-06-03 09:21:57 +02:00
080b473d1d
[FIX] fix wrong conflict resolution in merge
...
The merge #5142037 from odoo/master in local branch was wrong.
I basically overwrote the changes from master. This commit resolves
the issue correctly.
2014-05-30 11:03:06 +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
435b5b9ca3
[IMP] product: rename fields variant_ids into attribute_line_ids on the template and attribute_value_ids on the product.
2014-05-28 19:42:15 +02:00
6958d56a66
[IMP] product: fixes for review
2014-05-28 18:30:03 +02:00
256a17d419
[IMP] product: rename field variants_ids to respect odoo typo; add demo data for mrp
2014-05-28 11:46:32 +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
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
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
5aa2fa150c
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
cba2365d95
[MERGE] branch of jco fixing shipping exception in mrp + cancellation in chained moves
...
bzr revid: qdp-launchpad@openerp.com-20140425132449-s7e8duh884rirrqz
2014-04-25 15:24:49 +02:00
5807343602
[MERGE] Merge from trunk-wms
...
bzr revid: jco@openerp.com-20140423095528-h4dpd9gdmh8lmk6j
2014-04-23 11:55:28 +02:00
af0468c418
[WIP] Remove picking except state on mrp order
...
bzr revid: jco@openerp.com-20140423094807-za7855wkx2vlr0di
2014-04-23 11:48:07 +02:00
57cebaaac6
[MERGE] merged trunk up to revision 9365.
...
bzr revid: qdp-launchpad@openerp.com-20140422092815-f4tlfmo8zj1nogbl
2014-04-22 11:28:15 +02:00
a7d4e518ae
[IMP] Action assign button on production order + quant_ids readonly on serial number
...
bzr revid: jco@openerp.com-20140422085831-yt7hdb3catb5w00q
2014-04-22 10:58:31 +02:00
4c0f7b1be8
[IMP] improve strings and project view
...
bzr revid: rma@tinyerp.com-20140404112926-716zimuh3p2ec80k
2014-04-04 16:59:26 +05:30
c5d92d9e1f
[REF] mrp: some code cleaning since procure_method and supply_method doesn't exist on the product anymore
...
bzr revid: qdp-launchpad@openerp.com-20140401132233-2odtndrvudu5ka7q
2014-04-01 15:22:33 +02:00
96ea9392aa
[IMP] convert button into stat button for products
...
bzr revid: rma@tinyerp.com-20140324135621-13t191kmnn6t22jk
2014-03-24 19:26:21 +05:30
35e9dd0aa5
[MERGE]with main branch
...
bzr revid: jpr@tinyerp.com-20140319063549-7jjr6i5tdqitq2jy
2014-03-19 12:05:49 +05:30
d5cdec9e16
[MERGE] Merge from trunk-wms
...
bzr revid: jco@openerp.com-20140219145719-snazgq9oe9q0idrs
2014-02-19 15:57:19 +01:00
4ad9811a90
[FIX] mrp: fixed phantom bom
...
lp bug: https://launchpad.net/bugs/1278891 fixed
bzr revid: qdp-launchpad@openerp.com-20140214150330-an2my0n8vjdf38vx
2014-02-14 16:03:30 +01:00
1277c16dd7
[MERGE] Merge from trunk
...
bzr revid: jco@openerp.com-20140214100157-1vbjgifkouh0h4ix
2014-02-14 11:01:57 +01:00
d93fce56b6
[MERGE] mrp: small usability fixes
...
- updated groups on some fields of bom
- removed some icons in form view, to be coherent with other form views
- BOM form view: updated onchange_product_id that now takes product_qty into account to compute
uos and uos quantity.
bzr revid: tde@openerp.com-20140211152116-niwt0pak4r0n8jst
2014-02-11 16:21:16 +01:00
bdaccb7053
[MERGE]: Merged with addons
...
bzr revid: atp@tinyerp.com-20140210060020-2kfsig5t3ps14i4k
2014-02-10 11:30:20 +05:30
31348b1e4a
[FIX]sale_order with product using phantom bom
...
bzr revid: csn@openerp.com-20140207112606-k0cxzhpytlodjd1y
2014-02-07 12:26:06 +01:00
19501096f5
[MERGE] main trunk-wms branch
...
bzr revid: qdp-launchpad@openerp.com-20140204110840-iur4q0t9rz5v2y5i
2014-02-04 12:08:40 +01:00
bbe5811e56
[FIX] fix needed after the previous merge with trunk: produce_delay field doesn't belong to product module anymore
...
bzr revid: qdp-launchpad@openerp.com-20140203184520-5p1j2y3sk1asu8hj
2014-02-03 19:45:20 +01:00
753f7541db
[MERGE] main trunk
...
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
2014-02-03 18:30:00 +01:00
10123ce0c5
[IMP] Revert commit 9498 to have split between tracking of packages and tracking of serial numbers / lots /...
...
bzr revid: jco@openerp.com-20140130174711-2sl1rvnkx2ju2tef
2014-01-30 18:47:11 +01:00
d76083087d
[MERGE]Sync with Trunk
...
bzr revid: pza@tinyerp.com-20140130055452-dntwofrc41897k1f
2014-01-30 10:54:52 +05:00
4a7a79779d
[IMP] Consume only products when already assigned and
...
bzr revid: jco@openerp.com-20140129131046-r8yv3h8l679c3m3s
2014-01-29 14:10:46 +01:00
68f0f8db8f
[FIX] Use correct wizard and solve infinite loop
...
bzr revid: jco@openerp.com-20140128164048-43ptahppk2w2tyn7
2014-01-28 17:40:48 +01:00
1fb1a6f2af
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9789 revid:dle@openerp.com-20140124120102-we2yxio553ws2yz4
...
bzr revid: dle@openerp.com-20140120174449-tui0a24zgn9bien2
bzr revid: dle@openerp.com-20140121125538-ke7i6kaz486hwgl8
bzr revid: dle@openerp.com-20140122134115-0ogjemlqe327xoac
bzr revid: dle@openerp.com-20140123103655-mf2zslfbgue97ed2
bzr revid: dle@openerp.com-20140124121027-uk9zy4dx9tqlsblr
2014-01-24 13:10:27 +01:00
b50247109c
[IMP] Basic version working with lots
...
bzr revid: jco@openerp.com-20140117164232-8gu0bb8qbbk67yrx
2014-01-17 17:42:32 +01:00
16109f37cd
[MERGE] mrp: in work orders duration is displayed in decimal numbers instead of time
...
bzr revid: dle@openerp.com-20140116180459-6psj1f0uq4ihxzc2
2014-01-16 19:04:59 +01:00
05da75b823
[REF] stock: reduced the number of options to track or not serial numbers to 1
...
bzr revid: qdp-launchpad@openerp.com-20140107152358-uwwfufkg3y1eob8l
2014-01-07 16:23:58 +01:00
6da122d071
[FIX] mrp installation (wrong xml reference)
...
bzr revid: qdp-launchpad@openerp.com-20140107125143-yhlxkos76s0u57ih
2014-01-07 13:51:43 +01:00
a0558ad4fd
[IMP] stock: rehabilited the constraint check on traceability of lots. Improved it by allowing to track all operations (included the internal -> internal ones). Refactored in order to move the track_production field in mrp, where it's meaningful. Removed also a unused/deprecated wizard to change qty on a move
...
bzr revid: qdp-launchpad@openerp.com-20140107103915-bx9spjoclrlhalbr
2014-01-07 11:39:15 +01:00
3972c0948c
[IMP] mrp, project_mrp, stock: usbility of product form view
...
bzr revid: qdp-launchpad@openerp.com-20131220103333-3sftj95kg56637rz
2013-12-20 11:33:33 +01:00
ee9aa9ffd4
[IMP] mrp, product, stock, project_mrp: usability of product form view
...
bzr revid: qdp-launchpad@openerp.com-20131220095806-16siwncivyuokrym
2013-12-20 10:58:06 +01:00
rlu-odoo
Josse Colpaert
Martin Trigaux
Christophe Matthieu
ged-odoo
Fabien Meghazi
Quentin (OpenERP)
Gery Debongnie
Josse Colpaert
Randhir Mayatra rma-openerp
Jitendra Prajapati (OpenERP)
Thibault Delavallée
Atul Patel (OpenERP)
Cedric Snauwaert
Pooja Zankhariya (OpenERP)
Denis Ledoux