ed2743f755
merge upstream
...
bzr revid: chm@openerp.com-20140318161114-4t331xpt4xeitgxo
2014-03-18 17:11:14 +01:00
17956befd7
[FIX] do not rolback cursor in test mode
...
bzr revid: chm@openerp.com-20140318160941-w4c8r15sl0vag0sa
2014-03-18 17:09:41 +01:00
cb6af2b2f0
merge upstream
...
bzr revid: chm@openerp.com-20140318160653-2l1t1ntzr1lpuwo9
2014-03-18 17:06:53 +01:00
c0a97887b4
[WIP] rev me
...
bzr revid: chm@openerp.com-20140318153525-uhimflitcgk16rlk
2014-03-18 16:35:25 +01:00
42ba805cc8
[WIP] rev me
...
bzr revid: chm@openerp.com-20140318153456-gwz47zs8il23rwii
2014-03-18 16:34:56 +01:00
cac0c9600a
[MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9154 revid:dle@openerp.com-20140318151824-sscl4m8p87emjl8s
...
bzr revid: chs@openerp.com-20140318120024-mcxmkncn1xktjs7v
bzr revid: dle@openerp.com-20140318152621-l6jxc0bbbofm7fzg
2014-03-18 16:26:21 +01:00
1225c8b530
[FIX] purchase: for drop shipping po, the supplier of the picking was the customer address, which is obviously wrong, it should be the supplier of the po
...
bzr revid: dle@openerp.com-20140318151456-qw896i1t55wgwhkm
2014-03-18 16:14:56 +01:00
9d65ff69da
[FIX] Hack css for graph view
...
The best way will be to set svg height, but IE9 does not understand height="xxx". So we override the overflow set by bootstrap.css to fix it.
bzr revid: jke@openerp.com-20140318150059-nd6bdd58uvr1s4um
2014-03-18 16:00:59 +01:00
99a3c45976
[MERGE] forward port of branch saas-3 up to revid 9328 chs@openerp.com-20140318120024-mcxmkncn1xktjs7v
...
bzr revid: chs@openerp.com-20140318132741-aur3q1k7t9iympri
2014-03-18 14:27:41 +01:00
ac8b0fcfc5
[IMP] improved code as suggested
...
bzr revid: dizzy.zala@gmail.com-20140318130903-6u2t94bfvh98jby7
2014-03-18 18:39:03 +05:30
af8147fc95
[FIX] Display placeholder on IE9.
...
The hack was not working since we migrate jQuery 1.8 to 1.9 because $.browser has been removed.
bzr revid: jke@openerp.com-20140318130655-yqgj851enc0293hr
2014-03-18 14:06:55 +01:00
1395c9ee0e
[IMP] website: snippet editor: change size automatic button into a cross between resize handler
...
bzr revid: chm@openerp.com-20140318130414-yb29wtm7oo4bammz
2014-03-18 14:04:14 +01:00
8f8ca3bd84
[MERGE] forward port of branch saas-3 up to revid 5093 chs@openerp.com-20140318114540-l50kmo4azb57g31x
...
bzr revid: chs@openerp.com-20140318124112-cj65l3wysk2rhwlw
2014-03-18 13:41:12 +01:00
a2f9619e26
[MERGE] forward port of branch saas-3 up to revid 3975 chs@openerp.com-20140318115516-sn3laxqseam1oz3f
...
bzr revid: chs@openerp.com-20140318124050-ul3reev0vvmgqxz8
2014-03-18 13:40:50 +01:00
5b722a036a
[PATCH] sle
...
bzr revid: chm@openerp.com-20140318123225-zgn83zslr65z0wej
2014-03-18 13:32:25 +01:00
bbca8bd17e
[PATCH] sle
...
bzr revid: chm@openerp.com-20140318122250-22bt2bcfzvxowkvf
2014-03-18 13:22:50 +01:00
f9c68abfb5
[FIX] website_sale: test must inject tour
...
bzr revid: chm@openerp.com-20140318115631-aiifjcqmtubiofb0
2014-03-18 12:56:31 +01:00
541a5d3f82
[MERGE] forward port of branch saas-2 up to revid 3904 chs@openerp.com-20140318112743-tqv492026y2pnbff
...
bzr revid: chs@openerp.com-20140318115516-sn3laxqseam1oz3f
2014-03-18 12:55:16 +01:00
a7cdda3ba6
[MERGE] forward port of branch saas-2 up to revid 5021 chs@openerp.com-20140318105837-53vsx5g7fm517cuc
...
bzr revid: chs@openerp.com-20140318114540-l50kmo4azb57g31x
2014-03-18 12:45:40 +01:00
1c3ee251f0
[MERGE] forward port of branch 7.0 up to revid 5270 chs@openerp.com-20140403084524-9rb174osjrbmhgwc
...
bzr revid: chs@openerp.com-20140402083506-w4cywcf0kxxx9xmk
bzr revid: chs@openerp.com-20140312174526-a5rhh83g0fw8djuc
bzr revid: chs@openerp.com-20140318105837-53vsx5g7fm517cuc
bzr revid: dle@openerp.com-20140326092548-bu4bqinhvco8j5wj
bzr revid: chs@openerp.com-20140402092735-3a23yjl169vvt0iv
bzr revid: chs@openerp.com-20140402112825-ky8rcb3p467ikitc
bzr revid: chs@openerp.com-20140403084808-slnj7uis17kwi9js
2014-04-03 10:48:08 +02:00
6fca27626a
[FIX] expression: do not double quote column names
...
bzr revid: chs@openerp.com-20140403084524-9rb174osjrbmhgwc
2014-04-03 10:45:24 +02:00
4612b417af
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140403060213-netdplm9jzfr9yy6
2014-04-03 06:02:13 +00:00
1cdf8ac3f2
[FIX] crm.lead: missing index on stage_id/type/state
...
bzr revid: odo@openerp.com-20140402122023-detokob7c6a06rux
2014-04-02 14:20:23 +02:00
19993ab1d5
[FIX] expression: translated search as params are flatten, we need to expand "%s" placeholders when using the `in` operator
...
bzr revid: chs@openerp.com-20140402112730-eoqxt0pu7lvcq5yg
2014-04-02 13:27:30 +02:00
4fe43d9ac6
[FIX] project,project_issue: missing indexes on stage/state/project_id/user_id
...
bzr revid: odo@openerp.com-20140402110700-h3ryoroibj1m92ig
2014-04-02 13:07:00 +02:00
9a02917bdc
[MERGE] [IMP] project: avoid showing closed projects when creating a new task (opw #605218 )
...
bzr revid: mat@openerp.com-20140402091755-u3wua9456yiwmqbh
2014-04-02 11:17:55 +02:00
ccc0820348
[FIX] account_report_company: missing index on `display_name`
...
bzr revid: odo@openerp.com-20140402090537-aozassn5in2qgd92
2014-04-02 11:05:37 +02:00
f0731045ab
[FIX] hr_payroll: when computing pyslip lines, avoid previous rules to corrupt result_rate info in localdict and other contracts
...
lp bug: https://launchpad.net/bugs/1298469 fixed
bzr revid: mat@openerp.com-20140402085043-n8jl2hlwh5zi6dic
2014-04-02 10:50:43 +02:00
e8775beded
[FIX] account_voucher: it is authorized to enter invoice with negative amount, therefore the check amount constraint must take that into account
...
bzr revid: dle@openerp.com-20140402083713-tayk4r76bmrp9luf
2014-04-02 10:37:13 +02:00
5fb77bd6c5
[IMP] hr_payroll: ensure localdict is not shared between contracts
...
bzr revid: mat@openerp.com-20140402082954-05zzk1k3ued4go5a
2014-04-02 10:29:54 +02:00
3bf57cbbdc
[FIX] sale: remove unnecessary write call changing state when creating invoice in 'Order Lines to Invoice' menu (opw 600073).
...
If sale order was with invoice based on delivery order mode, a done sale order would be put back to progress state.
bzr revid: mat@openerp.com-20140402082004-rc6pcg3igrw9achj
2014-04-02 10:20:04 +02:00
16ce262c33
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140329073038-m7q4sxpb8tprh00r
bzr revid: launchpad_translations_on_behalf_of_openerp-20140330061549-r3t0pecngy76c2rw
bzr revid: launchpad_translations_on_behalf_of_openerp-20140331064021-x3wjc8s4oa0ncq95
bzr revid: launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis
bzr revid: launchpad_translations_on_behalf_of_openerp-20140402064459-d7e3d8nwo8famjh6
2014-04-02 06:44:59 +00:00
822ef4a621
[MERGE] forward port of branch 7.0 up to revid 9943 launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis
...
bzr revid: chs@openerp.com-20140401184913-5hi2h11lnmadbozr
2014-04-01 20:49:13 +02:00
6488521529
[FIX] l10n_pa: remove duplicated "data" key in manifest
...
bzr revid: chs@openerp.com-20140401184204-e8tr0fnc5x053w6l
2014-04-01 20:42:04 +02:00
dfe28ec31f
[FIX] expression: use unaccent() for translated search
...
lp bug: https://launchpad.net/bugs/1049653 fixed
bzr revid: chs@openerp.com-20140331123012-dq3hsw2bc368zvgq
2014-03-31 14:30:12 +02:00
7ee65aa181
[FIX] sale: remove useless write call (problematic when invoice on delivery order)
...
bzr revid: mat@openerp.com-20140331104448-4omzqnist6wlmakd
2014-03-31 12:44:48 +02:00
9f9ed4ff6a
[FIX] task: added domain in project_id field on task view to restrict user for selecting closed project
...
bzr revid: ado@tinyerp.com-20140331054938-sq6xbwtmtnlx01y5
2014-03-31 11:19:38 +05:30
09600a9969
[FIX]hr_payroll : initialize result_rate in localdict to avoid next execution problem
...
bzr revid: pna@tinyerp.com-20140331050122-kqfw152vcippdl52
2014-03-31 10:31:22 +05:30
8752221ac2
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140328064447-upr58gkij5ne9rm3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140329073044-67cql7rohzkmuub9
2014-03-29 07:30:44 +00:00
89ea4f839d
[MERGE] [FIX] procurement: cancelling purchase order should trigger action_assign on the stock move to correctly handle linked picking
...
lp bug: https://launchpad.net/bugs/1290509 fixed
bzr revid: mat@openerp.com-20140328130305-ozcdq0jft24p5n1i
2014-03-28 14:03:05 +01:00
be0a802e64
[FIX] task: added domain in project_id field on task view to restrict user for selecting closed project
...
bzr revid: ado@tinyerp.com-20140328125215-2xypsdnn84nln171
2014-03-28 18:22:15 +05:30
830e2d00a9
[MERGE] [FIX] project: function field 'doc_count' is of type integer, not int, courtesy of Yanina Aular (Vauxoo)
...
bzr revid: mat@openerp.com-20140328114737-bk29fqfdyabx4r65
2014-03-28 12:47:37 +01:00
d17ba501ef
[FIX] task: added domain in project_id field on task view to restrict user for selecting closed project
...
bzr revid: ado@tinyerp.com-20140328113218-v9gxvylwdtefuj80
2014-03-28 17:02:18 +05:30
172ec1679d
[FIX] account_voucher: bank statement reconciliation for refund invoice
...
bzr revid: dle@openerp.com-20140328110052-m4t49u6ayd5l0m0g
2014-03-28 12:00:52 +01:00
598cf8d9b3
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140328064440-1ja0p23itklkg7yk
2014-03-28 06:44:40 +00:00
56894a58cf
[MERGE][IMP] account: Set the order of the sequence by date while posting journal entries from wizard Periodical Processing> Draft Entries> Post Journal Entries
...
bzr revid: dle@openerp.com-20140327140304-9oyq6ebl48aasia8
2014-03-27 15:03:04 +01:00
64ecfa40ec
[IMP] cookies: when retrieving session cookie, catch eventual parsing errors and remove cookie if incorrect (opw 605648)
...
In case of unparsable cookie (modified, corrupted,...), openerp would not load and crash with white screen until expiration.
With the fix goes back to login screen.
bzr revid: mat@openerp.com-20140327120826-2p6ebnojtmdl1wpm
2014-03-27 13:08:26 +01:00
a04f73ee80
[IMP] cookies: when retrieving session cookie, catch eventual errors and remove malformed cookie
...
bzr revid: mat@openerp.com-20140327113401-s3ee7fnexhre9mwb
2014-03-27 12:34:01 +01:00
85805282b6
[FIX] fields: when executing (4, *) operations on o2m fields, check the existence based on the sql model of the table.
...
If the o2m field linked to the o2m is stored on a different table (eg: model with _inherit), previous request would crash as the field do not exists in the '_table' sql table
bzr revid: mat@openerp.com-20140327111241-klftr0s8v8i68nxp
2014-03-27 12:12:41 +01:00
391037db85
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327081257-qru0hbrfsyepb2s2
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327081313-vs355ra8b74c35d8
2014-03-27 08:13:13 +00:00
chm@openerp.com
Denis Ledoux
Kersten Jeremy
Christophe Simonis
Dharmraj Jhala (OpenERP)
Olivier Dony
Martin Trigaux
Amit Dodiya
Pinakin Nayi (OpenERP)