Commit Graph

382 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 35b64811e9 [MERGE] trunk
bzr revid: sle@openerp.com-20140221095425-9043pbzjy7rtbxd1
2014-02-21 10:54:25 +01:00
openerp-sle 271f350268 [FIX] Sale Stock: remove print sale order test
bzr revid: openerp-sle@openerp-sle.home-20140212221254-whmb4uw3ztl6g34w
2014-02-12 23:12:54 +01: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
Denis Ledoux 0043f81e33 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9824 revid:dle@openerp.com-20140210134603-ck0jr56xhl8xgzg2
bzr revid: dle@openerp.com-20140210141704-sjzjwhe7fh5gszxr
2014-02-10 15:17:04 +01:00
Denis Ledoux 6e3d193517 [FIX] sale, sale_stock: send by email button visible when sent, progress or manual
+ remove 'invoiced' from statusbar_visible, as there is no such state
+ proper inherit in sale_stock form view

bzr revid: dle@openerp.com-20140210134603-ck0jr56xhl8xgzg2
2014-02-10 14:46:03 +01:00
Launchpad Translations on behalf of openerp 8d85c23e4a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140209065003-9soyulgvssk8n5ci
bzr revid: launchpad_translations_on_behalf_of_openerp-20140208071621-b018rnkhyxmmm5jk
bzr revid: launchpad_translations_on_behalf_of_openerp-20140209065224-kih7tx56elds0zok
bzr revid: launchpad_translations_on_behalf_of_openerp-20140210055324-raxopm5ej680oc73
2014-02-10 05:53:24 +00:00
Launchpad Translations on behalf of openerp ffabcd257c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140206062321-j6cpns6xz3f81net
bzr revid: launchpad_translations_on_behalf_of_openerp-20140206062510-x502ahdwzezvea54
2014-02-06 06:25:10 +00:00
Launchpad Translations on behalf of openerp 2bebb9cd4d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140201065304-8md3g4d14l1b51ii
bzr revid: launchpad_translations_on_behalf_of_openerp-20140202060105-bnt8nw1mcbg2c3m3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140203055609-uxdqgnistwilvo2v
bzr revid: launchpad_translations_on_behalf_of_openerp-20140204064835-qdcrcxldc5zsutio
2014-02-04 06:48:35 +00: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
Olivier Dony 39c27c72d0 [MERGE] Sync with trunk rev. 9064 rev-id ged@openerp.com-20140127161718-uo6pperke86pqq5v
bzr revid: odo@openerp.com-20140128175835-jannyh3cv3gi1sxn
2014-01-28 18:58:35 +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
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
Launchpad Translations on behalf of openerp c5dd038011 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140124062506-2xq1lhj82n923dbl
2014-01-24 06:25:06 +00:00
Denis Ledoux 27224c9b9e [FIX] sale, purchase, sale_stock: on orders lines, on product changed, change the uom (even if the uom is in the same category)
bzr revid: dle@openerp.com-20140123103505-7pm9526ot2f5u7wa
2014-01-23 11:35:05 +01:00
Launchpad Translations on behalf of openerp 805d3757e9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140123055732-ggft6ftma1kfpaq6
2014-01-23 05:57:32 +00: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
Gery Debongnie 00c6d55ac9 [MERGE] merge trunk into local branch
bzr revid: ged@openerp.com-20140116144326-8kwqab71zp8s7a8e
2014-01-16 15:43:26 +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
Christophe Matthieu 320a0bc28c [IMP] website/website_sale: Use group to display shipping address in frontend like the backend. Use group for product facet caracteristique (backend/frontend). Customize templates is displayed function of groups of ir.ui.view templates.
bzr revid: chm@openerp.com-20140115110547-v0nllq0f800tlhpg
2014-01-15 12:05:47 +01:00
Denis Ledoux 4305522776 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9728 rev-id: dle@openerp.com-20140102161149-x268xj7bzvvsit2h
bzr revid: dle@openerp.com-20140102164522-og7f932e50kzz7z6
2014-01-02 17:45:22 +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
Gery Debongnie 9477cacd5f [IMP] removes old tree view in reporting (sales, sales_crm, sales_stock) and replaces them by the new graph view in pivot mode by default (addon sale, sale_crm, sale_stock)
bzr revid: ged@openerp.com-20131231111824-1altk73m9l4iszkq
2013-12-31 12:18:24 +01:00
Thibault Delavallée 327f0fdb40 [MERGE] [FIX] sale_stock: invoice services when invoicing on delivery order
bzr revid: tde@openerp.com-20131226100605-wk4nht7msupkyuj9
2013-12-26 11:06:05 +01:00
Launchpad Translations on behalf of openerp 94b4618c13 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131215054553-py8zfwrk3bir6m1l
bzr revid: launchpad_translations_on_behalf_of_openerp-20131212055820-zh0fqpweezvphdc6
bzr revid: launchpad_translations_on_behalf_of_openerp-20131213064308-hil3cycv38im8qds
bzr revid: launchpad_translations_on_behalf_of_openerp-20131215054616-uyc9y42oetvmq1cs
bzr revid: launchpad_translations_on_behalf_of_openerp-20131216053557-w3gf0jlw5wrtzllr
2013-12-16 05:35:57 +00:00
Launchpad Translations on behalf of openerp 45e34f2f6b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131211053249-7onr7u94z5rfg60p
bzr revid: launchpad_translations_on_behalf_of_openerp-20131212051525-n6q6vsucee027ihr
2013-12-12 05:15:25 +00:00
Launchpad Translations on behalf of openerp 767207aa23 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131211062724-zxcigdht6w71xy7v
bzr revid: launchpad_translations_on_behalf_of_openerp-20131211062802-mh61vodnsw0sr8im
bzr revid: launchpad_translations_on_behalf_of_openerp-20131211062808-o9fkpg2cg9cb403z
2013-12-11 06:28:08 +00:00
Thibault Delavallée 4b96e85a30 [MERGE] [FORWARD] Forward port of saas-2 branch until revision 9036 (revid tde@openerp.com-20131209102019-kjeg0rx2au1d5e5v)
bzr revid: tde@openerp.com-20131209105031-17920wsidpqrwmxj
2013-12-09 11:50:31 +01:00
Denis Ledoux 2888ad5772 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9677 rev-id: dle@openerp.com-20131206111336-dg01y92jvjnxy5oi
bzr revid: dle@openerp.com-20131206112312-g5vzrrna05iit5ka
2013-12-06 12:23:12 +01:00
Denis Ledoux ac0e22bd6c [FIX] sale_stock,stock: change model to stock.picking.out of deliveries to invoice view in sales
Deliveries to invoice in sales menu should display delivery order only (no incoming shipment). This was already the case thanks to the domain [('type','=','out')], but since the refactor of the module stock, and the division of stock.picking to stock.picking.in and stock.picking.out, the model of this view should be stock.picking.out instead of stock.picking (for instance, to get the actions binding (ir.values) of stock.picking.out model).
+ typo fix in action binding

bzr revid: dle@openerp.com-20131206111336-dg01y92jvjnxy5oi
2013-12-06 12:13:36 +01:00
Thibault Delavallée f28d5f47b8 [MERGE] Sync with trunk, notably for bootstrap that landed in trunk
bzr revid: tde@openerp.com-20131205102352-ncx6whb8r0fejgcc
2013-12-05 11:23:52 +01:00
Christophe Simonis 4ab77759cc [MERGE] forward port of branch saas-2 up to revid 9029 chs@openerp.com-20131204125051-dexejzwigpu0z1yy
bzr revid: chs@openerp.com-20131204130023-lgravuoxwlt39pek
2013-12-04 14:00:23 +01:00
Launchpad Translations on behalf of openerp 379dc8bf98 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054445-5fy8zd7lvnn9mjp2
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055138-hq05otjnuktjpa48
bzr revid: launchpad_translations_on_behalf_of_openerp-20131204055601-tbzqqhperzffjbjt
bzr revid: launchpad_translations_on_behalf_of_openerp-20131204055642-0rwynvhgvs0r14b3
2013-12-04 05:56:42 +00:00
Denis Ledoux 64c0ff21d5 [FIX]sale_stock: do not raise if not able to find any warehouse (for the get default warehouse), it can prevent the user of doing anything (if he does an upgrade of sale_stock module while having no warehouse set, the user will not be able to sign in in his instance again).
bzr revid: dle@openerp.com-20131203095544-i5vmow007dgjbiza
2013-12-03 10:55:44 +01:00
Launchpad Translations on behalf of openerp 4fd98907ce Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131130053134-6u83vcd1133xs8yf
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054550-w0k8alfqs2bigurx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055222-2u7o99e48254dceu
bzr revid: launchpad_translations_on_behalf_of_openerp-20131203061621-hyqqh11jt7g0ilqh
2013-12-03 06:16:21 +00:00
Christophe Simonis 289023d92f [MERGE] forward port of branch saas-2 up to revid 9024 chs@openerp.com-20131130130014-hi5h5a00kjx0dbvp
It’s over NINE THOUSAAAAAAAND!

bzr revid: chs@openerp.com-20131130130725-9ntxdr5r7r04uoht
2013-11-30 14:07:25 +01:00
Christophe Simonis 0ac4a8f696 [MERGE] forward port of branch 7.0 up to revid 9668 launchpad_translations_on_behalf_of_openerp-20131130053134-6u83vcd1133xs8yf
bzr revid: chs@openerp.com-20131130130014-hi5h5a00kjx0dbvp
2013-11-30 14:00:14 +01:00
Denis Ledoux fc4eca01e7 [FIX] {account, sale_stock}: res_config: set_default as SUPERUSER_ID. check user group to avoid passthrough access rights security
bzr revid: dle@openerp.com-20131129154714-pogix71b73nz11qp
2013-11-29 16:47:14 +01:00
Martin Trigaux 791d43714f [MERGE] [FIX] sale_stock: pass missing context when retrieving product uom (opw 594350)
bzr revid: mat@openerp.com-20131128114019-6rfcq9z235kh7ot7
2013-11-28 12:40:19 +01:00
Turkesh Patel (Open ERP) b08503e373 [MRG] merge with lp:openobject-addons
bzr revid: tpa@tinyerp.com-20131126052924-xn4qn67lehe6x2pj
2013-11-26 10:59:24 +05:30
Christophe Simonis bb1e256f5b [MERGE] forward port of branch saas-2 up to revid 9010 dle@openerp.com-20131125143003-vjtzj1c5051pdnk3
bzr revid: chs@openerp.com-20131125150054-b135qshkx6icakgk
2013-11-25 16:00:54 +01:00
Launchpad Translations on behalf of openerp 5f21b4bff9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131123062620-6obt60lwob64hi98
bzr revid: launchpad_translations_on_behalf_of_openerp-20131124054757-4w9nik6wieeqf0yg
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125060111-rf445xxiinvazinv
2013-11-25 06:01:11 +00:00
Olivier Dony 2cba6a5355 [MERGE] Forward-port of latest 7.0 fixes up to rev 9629 rev-id odo@openerp.com-20131121153230-keie85rmes2zh2o8
bzr revid: chs@openerp.com-20131121112139-aw2ara1i1xymue62
bzr revid: odo@openerp.com-20131121154205-ul9hf9tz3h0x2n7m
2013-11-21 16:42:05 +01:00
Launchpad Translations on behalf of openerp 271ed43e7b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121054848-007arsnnoa8fs65e
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121063838-blqn6j0yfmrlw5vp
2013-11-21 06:38:38 +00:00
Christophe Simonis 82da5541e2 [MERGE] remove warnings
bzr revid: chs@openerp.com-20131120161051-pk7n0itjcxx06uwm
2013-11-20 17:10:51 +01:00
Olivier Dony 44664076da [MERGE] Forward-port of latest 7.0 fixes up to rev 9618 rev-id: dle@openerp.com-20131120142131-s333lyva85cyn41o
bzr revid: odo@openerp.com-20131120144059-yyh7emvgdarff09b
bzr revid: odo@openerp.com-20131120144318-11nmn1zj00zmi10z
2013-11-20 15:43:18 +01:00
Christophe Simonis 05378ede0b [FIX] {project_mrp,sale_stock}: attach common process node xmlid to nearest common module, procurement.
We need this change to allow update of project_mrp module if sale_stock is not installed.

bzr revid: chs@openerp.com-20131115235815-zm4wgqxrsk7iiqpp
2013-11-16 00:58:15 +01:00