Commit Graph

347 Commits

Author SHA1 Message Date
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
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
Christophe Simonis 6b9822626b [FIX] sale_stock: procuremenr.order object does not have a `property_ids` field. This field is added by `mrp` module, which we do not depend of.
bzr revid: chs@openerp.com-20131112115635-tgbdeocn9awtbxkq
2013-11-12 12:56:35 +01:00
Christophe Simonis 636ac0f61e merge upstream
bzr revid: chs@openerp.com-20131108215612-e5f01a1kvyevlry9
2013-11-08 22:56:12 +01:00
Launchpad Translations on behalf of openerp 108ccbf108 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114062958-ies8xa3pft7n59ms
bzr revid: launchpad_translations_on_behalf_of_openerp-20131106055135-r0xt2vr04710jh1t
bzr revid: launchpad_translations_on_behalf_of_openerp-20131107055120-r8z445ergt50erlx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131108062620-bvfofx1jl1wb1csh
bzr revid: launchpad_translations_on_behalf_of_openerp-20131110064525-ioceogsmu0nmx2qj
bzr revid: launchpad_translations_on_behalf_of_openerp-20131111053908-gbrp09ast5fhr6iw
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112062316-5uf2bvbzdhkq1b7k
bzr revid: launchpad_translations_on_behalf_of_openerp-20131113060841-bkjcuz4e9rtzn6f9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114063058-rrm2q5lxkyawuvpz
2013-11-14 06:30:58 +00:00
Launchpad Translations on behalf of openerp 2160342cea Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131116062538-hsi3j63m1pw01qem
bzr revid: launchpad_translations_on_behalf_of_openerp-20131117054515-0jw3bd84wk546u6j
bzr revid: launchpad_translations_on_behalf_of_openerp-20131118055319-wz4qa3cxwowlonxt
2013-11-18 05:53:19 +00:00
Martin Trigaux 1fe9b19c83 [FIX] sale_stock: take into account the value of the customer reference on grouped invoice (opw #599716)
bzr revid: mat@openerp.com-20131115134335-qsu8ceyx86zyfj8j
2013-11-15 14:43:35 +01:00
Olivier Dony 0f7099bb30 [FIX] sale,sale_stock: sales analysis view using incorrect JOIN and group by clause
Similarly to the recent fixes in Purchase Analysis,
the Sales Analysis view must not group on the quantity
field. It is one of the columns that must be aggregated,
not used to fold PO lines into the same
result row.
The line count was also incorrect because of this, and
had to be corrected to actually count() the underlying
SO lines.

In addition, the JOINs were done in the wrong order,
which could cause problems (e.g. if an empty SO ever
landed in the database, all the SO line columns
would be empty in the JOIN, and cause errors)

bzr revid: odo@openerp.com-20131105103011-vkix07lsb6q3y9fd
2013-11-05 11:30:11 +01:00
Launchpad Translations on behalf of openerp 9d4c7f4db9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131101062724-823uztz81d48e7zk
bzr revid: launchpad_translations_on_behalf_of_openerp-20131102062340-1guhkeb34orj1d77
bzr revid: launchpad_translations_on_behalf_of_openerp-20131103054341-mg7xr0dkzd2rp6rx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131104060249-fio493wxgjvvlthm
2013-11-04 06:02:49 +00:00
Chandni Machchhar (OpenERP) a5a4a81391 [FIX] [sale_stock]: When we create group invoice from delivery order, it is taking customer reference only one which is defined while creating sale order.
bzr revid: cac@openerp.com-20131031054756-qgx2wmyf5o0cs2fp
2013-10-31 11:17:56 +05:30
Launchpad Translations on behalf of openerp 40c309024c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131026062529-74ir3upguunr9mw3
bzr revid: launchpad_translations_on_behalf_of_openerp-20131027061317-d9s440jzv1juvswi
bzr revid: launchpad_translations_on_behalf_of_openerp-20131028054233-15znliqv2eh2jq0i
bzr revid: launchpad_translations_on_behalf_of_openerp-20131029051429-rcytejyrg2s4t9db
bzr revid: launchpad_translations_on_behalf_of_openerp-20131030055438-gp0hyend0jooi941
2013-10-30 05:54:38 +00:00
Launchpad Translations on behalf of openerp 8bc457816f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131024052057-4ai7sltsmuoke8l5
bzr revid: launchpad_translations_on_behalf_of_openerp-20131025060100-ua2rf6g9urivk8bm
2013-10-25 06:01:00 +00:00
Launchpad Translations on behalf of openerp 16fd47c3e1 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131019052801-ouw53m70o0eabxnv
bzr revid: launchpad_translations_on_behalf_of_openerp-20131020050509-ar8koyz20p82rdjq
bzr revid: launchpad_translations_on_behalf_of_openerp-20131021045723-bkmqoimoalwb3lzq
2013-10-21 04:57:23 +00:00
Launchpad Translations on behalf of openerp 566af6033f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131011052941-f4x7ued38x0siu4u
bzr revid: launchpad_translations_on_behalf_of_openerp-20131013053842-x6nja74l8by5vd1q
bzr revid: launchpad_translations_on_behalf_of_openerp-20131014053313-j22u5qen55na9js8
2013-10-14 05:33:13 +00:00
Turkesh Patel (Open ERP) 0d840256c5 [MRG] merge with lp:openobject-addons
bzr revid: tpa@tinyerp.com-20131011061203-z13xuqw5fzznr6qc
2013-10-11 11:42:03 +05:30
Launchpad Translations on behalf of openerp 6ad09a8b40 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131004054526-wrer2m4h9u0lpvmm
2013-10-04 05:45:26 +00:00
Martin Trigaux 11308f37dd [FIX] test: avoid getting error when trying to send an email to the newly created user (email replaced by login)
bzr revid: mat@openerp.com-20131003143234-8tu732aa4rmycoif
2013-10-03 16:32:34 +02:00
Launchpad Translations on behalf of openerp 3a4a093ba7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130930054304-7r885mda98p411ax
bzr revid: launchpad_translations_on_behalf_of_openerp-20130928055410-zlzdspq6yjqrkq33
bzr revid: launchpad_translations_on_behalf_of_openerp-20130929054547-erco56ru1eyc6iq7
bzr revid: launchpad_translations_on_behalf_of_openerp-20130930054318-brbtsqs7pdngwg51
2013-09-30 05:43:18 +00:00
Launchpad Translations on behalf of openerp c7471d1bff Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130919045624-x71znzpi3rpnvpcs
bzr revid: launchpad_translations_on_behalf_of_openerp-20130920060145-80h8zse3uw3jg2fx
2013-09-20 06:01:45 +00:00
Darshan Kalola (OpenERP) d1a23edd2e [IMP]align multi-line string
bzr revid: dka@tinyerp.com-20130917130814-wikgcy25594gk8dx
2013-09-17 18:38:14 +05:30
Darshan Kalola (OpenERP) 21876a5810 [MERGE]merged with main addons
bzr revid: dka@tinyerp.com-20130917123814-wqx07inh0ckcqdgw
2013-09-17 18:08:14 +05:30
Turkesh Patel (Open ERP) a2b6b5df02 [MRG] merge with lp:openobejct-addons contains changes on justguage and sparklinebar library.
bzr revid: tpa@tinyerp.com-20130916070618-l59jaz9tbrmv5y6r
2013-09-16 12:36:18 +05:30
Martin Trigaux ab7d8c4ccf [MERGE] refactoring of tests to be executed as normal users instead of administrator, fixed some security rules
bzr revid: mat@openerp.com-20130912085812-xvmjoa5fjis0l2ws
2013-09-12 10:58:12 +02:00
Launchpad Translations on behalf of openerp 9dba69ba48 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912064018-3vecn03jcu9fm1m8
2013-09-12 06:40:18 +00:00
Martin Trigaux c48504fdba [MERGE] sync with trunk (state -> stage removed some test)
bzr revid: mat@openerp.com-20130911110755-zf3ytf9m27im6x9k
2013-09-11 13:07:55 +02:00
Fabien Meghazi f58b15af48 [IMP] Remove deprecated manifest keys
bzr revid: fme@openerp.com-20130909110330-kl71n1km00gew1oo
2013-09-09 13:03:30 +02:00
Launchpad Translations on behalf of openerp 1b3e67fc72 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130908050306-6ff4thsz8hd67x3z
bzr revid: launchpad_translations_on_behalf_of_openerp-20130909045922-jrx0xd00p3nszc9r
2013-09-09 04:59:22 +00:00
Turkesh Patel (Open ERP) b867a9b800 [MRG] merge with lp:openobject-addons
bzr revid: tpa@tinyerp.com-20130904062219-c067v8v866syvz0b
2013-09-04 11:52:19 +05:30
Launchpad Translations on behalf of openerp cb8f9c5a0d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130903054857-i15nhvtthlho7chm
2013-09-03 05:48:57 +00:00
Darshan Kalola (OpenERP) 80da7ddd60 [IMP]Add - before the the sentence This installs the module in help
bzr revid: dka@tinyerp.com-20130830094512-n3nqjtt1g0w8m94v
2013-08-30 15:15:12 +05:30
Darshan Kalola 9d29902fa5 [MERGE]merged with main addons
bzr revid: darshankalola@gmail.com-20130829063416-3zo337keanlemwe2
2013-08-29 12:04:16 +05:30