Commit Graph

3039 Commits

Author SHA1 Message Date
Launchpad Translations on behalf of openerp 9863dbe5c8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
2014-03-04 07:52:38 +00:00
Simon Lejeune d64c4a3f17 [FIX] mrp: removed empty files and barcode controller value set to path in order to be able to receive URL
bzr revid: sle@openerp.com-20140224151944-dqi63kjvyejp6xja
2014-02-24 16:19:44 +01:00
Simon Lejeune 62538c61e3 [IMP] Converted mrp BOM Structure to QWeb
bzr revid: sle@openerp.com-20140224103453-0s60blgbk7e3ho5n
2014-02-24 11:34:53 +01:00
Simon Lejeune 35b64811e9 [MERGE] trunk
bzr revid: sle@openerp.com-20140221095425-9043pbzjy7rtbxd1
2014-02-21 10:54:25 +01:00
Christophe Simonis 4b72678bc7 [MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
bzr revid: chs@openerp.com-20140220163815-69sza1kclnh5mavs
2014-02-20 17:38:15 +01:00
Simon Lejeune fabc1cdd40 [FIX] renamed ir.actions.report.paperformat model to report.paperformat, renamed html_skeleton to html_container in report layouts and renamed paperformat.py file to report_paperformat.py
bzr revid: sle@openerp.com-20140218155347-tfxlndg9wgaw0bv1
2014-02-18 16:53:47 +01:00
openerp-sle 2445e9f0bc [MERGE] trunk
bzr revid: openerp-sle@openerp-sle.home-20140216103609-ihf3bz4nf4rds5ue
2014-02-16 11:36:09 +01:00
openerp-sle bccafbdae0 [IMP] Converted the mrp production production order to QWeb
bzr revid: openerp-sle@openerp-sle.home-20140214180052-pbluhvtg0ptl7m2c
2014-02-14 19:00:52 +01:00
Xavier Morel 60adf28fb3 [REM] spurious print in test
bzr revid: xmo@openerp.com-20140214145308-xvcer7yyz582g9g9
2014-02-14 15:53:08 +01:00
Launchpad Translations on behalf of openerp 3eceef7802 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140213054839-bknb7wozzfcl2b5p
bzr revid: launchpad_translations_on_behalf_of_openerp-20140213061121-vm9ot1x4ve6ekaoe
2014-02-13 06:11:21 +00:00
Olivier Dony bbd813e76e [MERGE] Forward-port of latest saas-2 (incl. 7.0) bugfixes, up to rev. 9127 odo@openerp.com-20140212122042-3m2tysmr31mtecnc
bzr revid: odo@openerp.com-20140212175141-i9yz8zlseglrk8sb
2014-02-12 18:51:41 +01:00
Launchpad Translations on behalf of openerp 0bbf709f5c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140212052933-2x7w3n6hxognlz1m
2014-02-12 05:29:33 +00:00
Thibault Delavallée 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
Thibault Delavallée 394b6389f0 [MERGE] Sync with upstream (trunk)
bzr revid: tde@openerp.com-20140211141925-p3sziwkon7jlsq5r
2014-02-11 15:19:25 +01:00
Launchpad Translations on behalf of openerp 06c3efde04 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140211055037-i7s59zrp7mrzmlun
2014-02-11 05:50:37 +00:00
Atul Patel (OpenERP) bdaccb7053 [MERGE]: Merged with addons
bzr revid: atp@tinyerp.com-20140210060020-2kfsig5t3ps14i4k
2014-02-10 11:30:20 +05:30
Denis Ledoux 3e4d932c58 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9801 revid:mat@openerp.com-20140131160304-22mokur2uuo1cw4r
bzr revid: dle@openerp.com-20140131162637-046v995ozpy22qjj
2014-01-31 17:26:37 +01:00
Martin Trigaux 62d72aa238 [FIX] stock: when creating manufacturing order from procurement workflow, do not write location on state (already set previously). (opw 603600)
This avoids having an access rights error when trying to write on a move in done state (eg: in case of force availibility)

bzr revid: mat@openerp.com-20140131160304-22mokur2uuo1cw4r
2014-01-31 17:03:04 +01:00
Christophe Simonis c202dc1c52 merge upstream
bzr revid: chs@openerp.com-20140129190834-xfcat3ulfbg5omhn
2014-01-29 20:08:34 +01:00
Christophe Simonis 731019154a [MERGE] forward port of branch saas-2 up to revid 9109 dle@openerp.com-20140129171022-wf6244k90lpncmah
bzr revid: chs@openerp.com-20140129184703-ypd7iqnor5m5lr3d
2014-01-29 19:47:03 +01:00
Antony Lesuisse 033c38c304 [MERGE] trunk
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
2014-01-29 03:19:16 +01:00
Launchpad Translations on behalf of openerp 3ce5e01eca Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00:00
Frédéric van der Essen 5585a38ecc [MERGE] from trunk, need point_of_sale updates
bzr revid: fva@openerp.com-20140127160946-yeswyv4o7t2tfbqt
2014-01-27 17:09:46 +01:00
Denis Ledoux 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
Denis Ledoux 83677ed6e6 [REVERT] 9401 dle@openerp.com-20130830125155-1vedifnupu2xvth7
This had as side-effect to not allow splitting BOMs
(a manufacturing order for 1 unit of a BOM producing 10 units consumed the lines like it was 10 units, not 1)

This fix was to avoid having a fraction of a unit (for instance, 0.5 unit).

But, finally, it is preferable to allow splitting units:
1. Most users do not use several uoms, and in this case, the unit is the default uom (hidden).
2. At the moment, it is allowed to ask a manufacturing order splitting up the unit uom
(It is allowed to ask the production of 0.5 USB Adapter, for instance)
Thus, we should allow the splitting up of the unit uom in the lines too.

bzr revid: dle@openerp.com-20140124120102-we2yxio553ws2yz4
2014-01-24 13:01:02 +01:00
Denis Ledoux d69ecb8d8f [FIX] mrp, stock: avoid float rounding errors using float_compare
bzr revid: dle@openerp.com-20140122133822-fkt5gqanpptlx9jx
2014-01-22 14:38:22 +01:00
Thibault Delavallée ec2c2d4e86 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140122123237-5rc5fdyau0422fj2
2014-01-22 13:32:37 +01:00
Launchpad Translations on behalf of openerp d5bc07f898 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140122061335-z6h1dn3yd94l8850
2014-01-22 06:13:35 +00:00
Launchpad Translations on behalf of openerp 698e2de138 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140121062040-gq8r12g3ypksxa4t
2014-01-21 06:20:40 +00:00
Launchpad Translations on behalf of openerp 28d79433c3 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070457-rn2tgdxis2fi3nqo
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055822-ajy043mntc4jr407
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055854-z7wtyb24c5t8kcmj
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070538-2xm86ece1aate8u9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055932-sa6vrp2g8ua3u88e
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055948-lwcyqcfutgamwac1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070546-d89xqw56zou7e9p9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055955-6wrdxqy1018mo7jq
2014-01-20 05:59:55 +00:00
Denis Ledoux 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
Thibault Delavallée 9cf78e93cc [MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.
bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk
2014-01-16 11:39:10 +01:00
Christophe Simonis 91aaaec0a5 [MERGE] forward port of branch saas-2 up to revid 9092 dle@openerp.com-20140115165506-yuux9km39gbv7k4n
bzr revid: chs@openerp.com-20140115214454-dhl8xzr429co0j5d
2014-01-15 22:44:54 +01:00
Denis Ledoux 74e0fbae83 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9752 revid:dle@openerp.com-20140110173823-lfekux2jxrj5v9gn
bzr revid: dle@openerp.com-20140110160158-ypr2pp63ld6j5g4l
bzr revid: dle@openerp.com-20140110174038-3yogwf6hwk7kpa8w
2014-01-10 18:40:38 +01:00
Martin Trigaux fd9d8b9ff3 [FIX] mrp: move _prepare_order_line_procurement to module sale_mrp as mrp module does not depends from sale
bzr revid: mat@openerp.com-20140110153133-qozwrixyrwxjr44n
2014-01-10 16:31:33 +01:00
Thibault Delavallée 5139c760d2 [FIX] mrp: added security rule to enable mrp users to compute production orders
bzr revid: tde@openerp.com-20140110142722-3x0zk98aajh0bgxy
2014-01-10 15:27:22 +01:00
Launchpad Translations on behalf of openerp 3ed5b49e7a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140110053216-23qk0vpm4hr5g1ig
2014-01-10 05:32:16 +00:00
Stephane Wirtel bea411bb98 [IMP] Backport one feature from website: this feature allows to specify a file
path on the field tag fetching the right file instead of using the base64
encoded file in the field.

<field name="image" type="base64" file="base/static/img/main_partner-image.png" />

bzr revid: stw@openerp.com-20140109154550-a04qybctzaaqtrlr
2014-01-09 16:45:50 +01:00
Denis Ledoux 05aab83eb1 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9743 revid:qdp-launchpad@openerp.com-20140108160719-9i8xhrat49cn9l5e
bzr revid: chs@openerp.com-20140107141524-xzz39a2ym66swr0t
bzr revid: chs@openerp.com-20140107172248-zic9mqg0rigy2czb
bzr revid: chs@openerp.com-20140108160418-ph17jgy5hlejj9hr
bzr revid: dle@openerp.com-20140108171400-8r0fwv3wi36w2im0
2014-01-08 18:14:00 +01:00
Martin Trigaux 0b7ecf8a21 [FIX] mrp: move _prepare_order_line_procurement to model sale.order instead of procurement.oder. This will add the lost property_ids that was removed at rev 9622.
bzr revid: mat@openerp.com-20140108114639-jc40rfbrbi1s37e3
2014-01-08 12:46:39 +01:00
Thibault Delavallée 49c0b7a820 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
2014-01-06 14:57:00 +01:00
Launchpad Translations on behalf of openerp e0951d6e18 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227053952-0hms21l5679mfv9d
bzr revid: launchpad_translations_on_behalf_of_openerp-20131228053802-9q255pplfsr06jvf
bzr revid: launchpad_translations_on_behalf_of_openerp-20131230050715-gywiu51n8ejcvnkp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231052701-yjrbqgyv2os2z8gt
bzr revid: launchpad_translations_on_behalf_of_openerp-20140101054400-7tz7obdh31v8log8
bzr revid: launchpad_translations_on_behalf_of_openerp-20140102054530-gtwf0yp277zkqm0i
2014-01-02 05:45:30 +00:00
Launchpad Translations on behalf of openerp e6a46a855d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131220053413-o3xa4nlpu9snoiq6
2013-12-20 05:34:13 +00:00
Martin Trigaux 54be818a3b [MERGE] forward port of latest saas-2 until rev 9051 dle@openerp.com-20131217142126-1lbim47d2m2x4bb0
bzr revid: mat@openerp.com-20131218155715-khb909yy99cbmna8
2013-12-18 16:57:15 +01:00
Thibault Delavallée d9343e2d27 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20131213094016-ylqkilyo4190g81w
2013-12-13 10:40:16 +01:00
Denis Ledoux 7f00274384 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9691 rev-id: dle@openerp.com-20131211134120-fco4rlqjh258ba36
bzr revid: dle@openerp.com-20131210184409-cd9wy856v5bg0f17
bzr revid: dle@openerp.com-20131211134317-f0ev1vbinhrkgjf4
2013-12-11 14:43:17 +01:00
Denis Ledoux 89a9dbee75 [FIX] mrp: cost structure report, do not display twice main supplier
bzr revid: dle@openerp.com-20131211134120-fco4rlqjh258ba36
2013-12-11 14:41:20 +01:00
Christophe Matthieu 6652856445 [FIX] website_sale: link; product: clean code and use product.template for supplierinfo
bzr revid: chm@openerp.com-20131209163254-k9dwxw48rcgz1hbs
2013-12-09 17:32:54 +01:00
Martin Trigaux cca8bb4d64 [FIX] font: revert previous (use name and not familly in reportlab), fix reports using spaces
bzr revid: mat@openerp.com-20131209133431-6gjhq1zmrb2ro6eo
2013-12-09 14:34:31 +01:00
Launchpad Translations on behalf of openerp a092227c6e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131207063209-2xi8ba5wu6l6ze00
bzr revid: launchpad_translations_on_behalf_of_openerp-20131208054536-mg4w4d6ljq8ji1nj
bzr revid: launchpad_translations_on_behalf_of_openerp-20131207063232-l64v1fhf1qcpxm2l
bzr revid: launchpad_translations_on_behalf_of_openerp-20131208054646-zixed7abpuze4qt1
bzr revid: launchpad_translations_on_behalf_of_openerp-20131123062625-f7inv72rtg2kel8g
bzr revid: launchpad_translations_on_behalf_of_openerp-20131124054801-1ukcpelfukkvwn60
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125060120-nm8tkfbftg8c88v1
bzr revid: launchpad_translations_on_behalf_of_openerp-20131126060753-jnx5ran2accmo0lh
bzr revid: launchpad_translations_on_behalf_of_openerp-20131127054000-wtg675pf33f3bkar
bzr revid: launchpad_translations_on_behalf_of_openerp-20131129053028-abszdj4y76smnacb
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054555-3u1m1sy1f2og78nn
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055227-mm70khzdfnp4qcj9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131207063237-vza5vb51xmd2ipl6
bzr revid: launchpad_translations_on_behalf_of_openerp-20131208054653-f4zth8j3iczlzcqz
2013-12-08 05:46:53 +00:00