ce3645c9d9
[IMP] Corrections on pull request
2014-06-18 16:33:53 +02:00
6b63d40145
[MERGE] Merge from master and resolve conflict
2014-06-17 16:23:44 +02:00
a7866c12bb
[FIX] master data should return something
2014-06-17 09:54:46 +02:00
96f038a6ab
[IMP] product: all left menu item became product.template's action
2014-06-16 17:16:50 +02:00
eb13d3ee5f
[IMP] Make sure there is a link between purchase order invoice and purchase order
2014-06-16 16:04:04 +02:00
8e223c8aba
[IMP] Invoice_state based on delivery wizard recheck + returns and invoice_state
2014-06-13 17:44:03 +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
f30cf0cf1b
[IMP] Run schedulers and minimum stock rules done by company + purchase order should change date when adding (to) lines
2014-06-11 14:05:13 +02:00
8202561511
Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
2014-06-10 11:43:17 +02:00
1c04f4d3d1
Merge remote-tracking branch 'odoo/master' into master-wmsstaging3-jco
2014-06-10 10:32:36 +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
9376d16938
[IMP] Put cost method only once, make sure extra moves get moves in consequent pickings, default buy route on template
2014-06-02 09:58:09 +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
65d7cc524d
[FIX] purchase: Do not allow to delete a purchase order line which is validated
...
This restriction behavior copied from the sale.order model
Moreover, the purchase.order lines state were not set to cancel when the purchase order was cancelled.
This is now the case, this behavior is also coped from the sale.order model
When the purchase order is reset to draft, we also reset the order lines state to draft
2014-05-28 18:00:11 +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
fd21abd847
[MERGE] Forward-port latest saas-3 bugfixes, up to 30f43da
2014-05-27 17:18:43 +02:00
30f43daa3b
[MERGE] Forward-port of latest 7.0 bugfixes, up to aeaa826
2014-05-27 16:50:02 +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
e6973e2c64
'invoiced' fields help message is wrong
2014-05-26 17:55:26 +08:00
c59427d23f
[FIX] purchase: po email template, the currency could be different than the pricelist currency
2014-05-23 17:13:42 +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
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
6a697bc391
[REM] removed old conflicting files badly merged (?)
...
bzr revid: qdp-launchpad@openerp.com-20140508144751-jhny9a3ozevwz6ja
2014-05-08 16:47:51 +02:00
168b8e1d5e
[REM] removed old conflicting files badly merged (?)
...
bzr revid: qdp-launchpad@openerp.com-20140508143825-owheu6q219d8qbww
2014-05-08 16:38:25 +02:00
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
661c109189
[FIX] procurement.rule._get_action() needs to be translatable
...
bzr revid: qdp-launchpad@openerp.com-20140507171431-jtyz901xmej6elmp
2014-05-07 19:14:31 +02:00
eb1d981435
[FIX] code cleanup (addon purchase)
...
simplify a few _count methods by removing useless try/except/pass and by using search_count when appropriate. It allows us to remove two one2many fields as well.
bzr revid: ged@openerp.com-20140507144532-dgm9mfgt9k5p10jr
2014-05-07 16:45:32 +02:00
c941eb8ca4
[FIX] code cleanup (addon purchase)
...
remove useless one2many field in product.product, and improves the way
purchase_count is computed
bzr revid: ged@openerp.com-20140506150732-e0ztuzqm7hqu183p
2014-05-06 17:07:32 +02:00
c60c1d1a72
[DEL] Delete boards
...
bzr revid: jco@openerp.com-20140502134701-lnoowskaqj9nsaof
2014-05-02 15:47:01 +02:00
5aa2fa150c
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
8b84615de1
[MERGE] Merge from trunk test
...
bzr revid: jco@openerp.com-20140502130352-c3h1fk332eqyd78b
2014-05-02 15:03:52 +02:00
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
52480275c3
[IMP] purchase: invoice creation more modular/extensible through the introduction of a _prepare_invoice method()
...
This is similar to what was previously done for Sales Orders.
bzr revid: odo@openerp.com-20140430140103-hfumie3ndvlodgeh
2014-04-30 16:01:03 +02:00
d0e9ba289f
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140429124452-5cvpmtpyz2daj8w2
2014-04-29 14:44:52 +02:00
65f2db5c21
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140429081937-hhqcg84o7iha78fq
2014-04-29 10:19:37 +02:00
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
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
e077a96cdd
[REF] purchase: cleaning the TODO messages
...
bzr revid: qdp-launchpad@openerp.com-20140425091128-13uuwk7txzjoos6z
2014-04-25 11:11:28 +02:00
7a6b00b651
[MERGE] merged with trunk up to revision 9381
...
bzr revid: qdp-launchpad@openerp.com-20140425090414-vpg4szws9y4fgznc
2014-04-25 11:04:14 +02:00
f402240ade
[MERGE] stock usability improvements
...
bzr revid: qdp-launchpad@openerp.com-20140424143838-a3so6ouc1q3la3ch
2014-04-24 16:38:38 +02:00
Josse Colpaert
Christophe Matthieu
ged-odoo
Fabien Meghazi
Christophe Simonis
Denis Ledoux
Olivier Dony
JoshuaJan
Simon Lejeune
Launchpad Translations on behalf of openerp
Quentin (OpenERP)
Gery Debongnie
Josse Colpaert
Antony Lesuisse
Richard Mathot (OpenERP)