79e1813d6e
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140314151011-xhhsovbsg1r0sbwk
2014-03-14 16:10:11 +01:00
264186541b
[IMP] website: remove css .fa and write important in font fa in web branch
...
bzr revid: chm@openerp.com-20140314150446-9g4n4ixws4cedfxp
2014-03-14 16:04:46 +01:00
Olivier Dony
6a14fddc35
[MERGE] Forward port of saas-2 fixes up to rev 9152 rev-id odo@openerp.com-20140314143519-x6rzcfkkqxwc0e1g
...
bzr revid: odo@openerp.com-20140314143911-c2mxesg31xezeyr9
2014-03-14 15:39:11 +01:00
Denis Ledoux
02459f8d4a
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9929 revid:dle@openerp.com-20140325104921-x8zjx5p71l1o3uif
...
bzr revid: dle@openerp.com-20140310133913-465x5t3n1bo7fu98
bzr revid: dle@openerp.com-20140311164146-2s599kogbqj8e94l
bzr revid: dle@openerp.com-20140312111149-u6y036aej3ywq7et
bzr revid: dle@openerp.com-20140312121145-06s1jvct9v4m7l6s
bzr revid: mat@openerp.com-20140313084409-c0kckxemy3in0mlo
bzr revid: chs@openerp.com-20140313163420-ifa4hyixj722d6jo
bzr revid: chs@openerp.com-20140314102034-g0nzryvwhrpzdas9
bzr revid: chs@openerp.com-20140314104803-19c5snl2fcuih91o
bzr revid: odo@openerp.com-20140314143519-x6rzcfkkqxwc0e1g
bzr revid: chs@openerp.com-20140318110229-y8098w3shdpmoig2
bzr revid: dle@openerp.com-20140318151824-sscl4m8p87emjl8s
bzr revid: dle@openerp.com-20140320112618-yfyihlwz66ryeqf5
bzr revid: dle@openerp.com-20140320161003-j01cc6sqves2wnp2
bzr revid: dle@openerp.com-20140320181252-4gqcog22p1ex0pz7
bzr revid: dle@openerp.com-20140321140450-8ulnhr76qybiadks
bzr revid: dle@openerp.com-20140324104743-ubvu8st7emq9pg1q
bzr revid: dle@openerp.com-20140325112413-xs5z7y81rhyjt0rd
2014-03-25 12:24:13 +01:00
Denis Ledoux
6d60e0ee29
[FIX] project: on project template duplication, keep original tasks stages
...
bzr revid: dle@openerp.com-20140325104921-x8zjx5p71l1o3uif
2014-03-25 11:49:21 +01:00
Martin Trigaux
91c3673949
[MERGE] [FIX] purchase_requisition: when getting the price based on the pricelist for a supplier, pass the missing supplier id (useful for pricelist based on supplier price) (opw 601890)
...
bzr revid: mat@openerp.com-20140325104613-t79wxl4y38ll82h0
2014-03-25 11:46:13 +01:00
Olivier Dony
38c255627e
[MERGE] l10n_fr: remove obsolete French taxes, following 2014 rate update, courtesy of Alexis de Lattre (Akretion)
...
bzr revid: odo@openerp.com-20140325104323-xtxthbopkhk350r4
2014-03-25 11:43:23 +01:00
Denis Ledoux
8310cd1920
[FIX] sale: make invoice for SO grouped by partner based on partner_invoice_id instead of just partner_id
...
For two sale order, if the partner_id were different but the partner_invoice_id were identical, the make invoice grouped by partner created two different invoices
bzr revid: dle@openerp.com-20140325103226-vusygdpd74yha91m
2014-03-25 11:32:26 +01:00
a8d14c47df
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140318062141-rdiqz2ptnz3qmxd0
bzr revid: launchpad_translations_on_behalf_of_openerp-20140325072122-d9jgtji9dmmytg8d
2014-03-25 07:21:22 +00:00
Denis Ledoux
04f632820b
[FIX] sale: trigger signal manual invoice for make invoices wizard (not advance)
...
bzr revid: dle@openerp.com-20140324103427-yckncrnynvs5si8i
2014-03-24 11:34:27 +01:00
Simon Lejeune
245e83d43b
[FIX] last version of wkhtmltopdf expects all file to have a doctype, inject one if not present
...
bzr revid: sle@openerp.com-20140324101731-eqzqins3s8uak1yd
2014-03-24 11:17:31 +01:00
6472e4155a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140322070453-bbx8zxmppthwar0s
bzr revid: launchpad_translations_on_behalf_of_openerp-20140323064412-l97e4rap18b68ab0
2014-03-23 06:44:12 +00:00
Denis Ledoux
0871d10503
[FIX] survey: avoid duplicate partners on new users creation
...
bzr revid: dle@openerp.com-20140321135705-lrnxu3gsnkt4r5cd
2014-03-21 14:57:05 +01:00
2fa6706037
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140321065150-vovy9a0q2y6vkwm4
2014-03-21 06:51:50 +00:00
7b0b8a0790
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140320061913-o2fp3m104dzeb2ky
bzr revid: launchpad_translations_on_behalf_of_openerp-20140321065115-srp2g1l3twjabmcq
2014-03-21 06:51:15 +00:00
Kersten Jeremy
9bf6f0310e
[FIX] Move default value in the _defaults of model and not in default_get.
...
Don't override the location_id if the super get_default don't retrun a value.
Else it is impossible to set a default value, because the ir_values is always overrided with stock_location_stock as location_id
bzr revid: jke@openerp.com-20140320180240-un42lptu3pjnsmxq
2014-03-20 19:02:40 +01:00
Denis Ledoux
be81326ee3
[FIX] survey: report not stored on filesystem
...
bzr revid: dle@openerp.com-20140320174835-kdha7ivs64vsvizt
2014-03-20 18:48:35 +01:00
Denis Ledoux
84eeb79875
[FIX] point_of_sale: add multi-companies rules on pos.config
...
bzr revid: dle@openerp.com-20140320154436-ygqhvvyhe6otv70p
2014-03-20 16:44:36 +01:00
Christophe Simonis
03c31de4dd
[FIX] web: when filtering out context, also strip *_view_ref keys
...
bzr revid: chs@openerp.com-20140320131014-3v5qfjxq9unqu5fs
2014-03-20 14:10:14 +01:00
Denis Ledoux
287aae3942
[FIX] stock: force form_view_ref to False in context of actions track_line and scrap_move to avoid context propagation of stock picking views
...
bzr revid: dle@openerp.com-20140320110741-pg8se5c02p87yi1y
2014-03-20 12:07:41 +01:00
Olivier Dony
42518c339a
[FIX] subscription: missing required dependency on base
...
bzr revid: odo@openerp.com-20140320091349-74zykqzf2ols3ja1
2014-03-20 10:13:49 +01:00
1f3c4f852f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140319063002-sd17jxb37ycogrrz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140320061944-bwpy0lt1bp5ee0y2
2014-03-20 06:19:44 +00:00
Kersten Jeremy
903270996f
[FIX] Fix the yml test with option --test-file.
...
1 -
There was a confusing between kind and mode.
Due to the mode 'test', there are many part of code who was not executed.
The right value is kind='test', and arbitrary mode='init' (or 'update')
2 -
The yml test was always roolbacked, without check that command line had '--test-commit'.
It's has been fixed, now we check if param --test-commit is existing, else we roolback the transaction.
Rem for forward: function in trunk=saas-4 has been moved in : openerp/service/server.py - def load_test_file_yml
bzr revid: jke@openerp.com-20140319104847-6r2c70gapocn2wxq
2014-03-19 11:48:47 +01:00
Denis Ledoux
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
Christophe Simonis
acb010a985
[MERGE] forward port of branch 7.0 up to revid 4162 launchpad_translations_on_behalf_of_openerp-20140318062141-rdiqz2ptnz3qmxd0
...
bzr revid: chs@openerp.com-20140129095637-mbfz82r5pyz4dctc
bzr revid: dle@openerp.com-20140210140818-5mtk1qhheo219bm1
bzr revid: dle@openerp.com-20140214114445-krexrwm9o2nrxepk
bzr revid: mat@openerp.com-20140219111353-cxo860z7ctz7om30
bzr revid: dle@openerp.com-20140221120519-1pj3wc8kqgkr5uda
bzr revid: chs@openerp.com-20140318112743-tqv492026y2pnbff
2014-03-18 12:27:43 +01:00
596cc96b7e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140318062135-gqvoka8hm41pe762
2014-03-18 06:21:35 +00:00
Denis Ledoux
112fe22347
[FIX] point_of_sale: prevent duplicated order posting
...
bzr revid: dle@openerp.com-20140317164131-eewyqmzz5niebz2a
2014-03-17 17:41:31 +01:00
9965b2c434
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140315072920-dmiymtbhrgu87wm0
bzr revid: launchpad_translations_on_behalf_of_openerp-20140316060652-akf1fti2hc1a9vmm
bzr revid: launchpad_translations_on_behalf_of_openerp-20140317050959-2xx2aoylhn6a28fo
2014-03-17 05:09:59 +00:00
Martin Trigaux
4bf3a10056
[MERGE] [FIX] stock: add some missing context, courtesy of Lionel Sausin (Numérigraphe)
...
bzr revid: mat@openerp.com-20140314160938-px91g81280qff635
2014-03-14 17:09:38 +01:00
8820d9f188
[FIX] website: can't edit baner image. Add contentEditable on image tag.
...
bzr revid: chm@openerp.com-20140314143049-8sp1q32i4x4q76ga
2014-03-14 15:30:49 +01:00
10af6ef168
[rev] website: remove js fix from this branch
...
bzr revid: chm@openerp.com-20140314142244-efpgx9cohx3k337s
2014-03-14 15:22:44 +01:00
62f0b963af
[ADD] missing css file
...
bzr revid: chm@openerp.com-20140314141910-f19pz5js5yatw2y4
2014-03-14 15:19:10 +01:00
8b94f855b6
[FIX] website theme css
...
bzr revid: chm@openerp.com-20140314134642-2yhbgcd5gxb4xw0r
2014-03-14 14:46:42 +01:00
Martin Trigaux
53922c9593
[FIX] pager: revert of revision 4159, the pager was disapearing when going in editable mode (which is more problematic that the issue rev 4159 was trying to fix)
...
bzr revid: mat@openerp.com-20140314132854-8ie8sosx9xecuww4
2014-03-14 14:28:54 +01:00
Olivier Dony
a9f98e4990
[FIX] pad: improve pad bootstrap, prevent creating useless empty pads, avoid edition warning in read-only mode for new pads, translate messages
...
Added a small method to detect the proper server configuration,
and make it degrade gracefully if the method is not present.
This avoids having to force a pad URL generation in order to
test the config (possibly creating useless pads).
Add a user-friendly message when the pad has not yet been
initialized for a given record, in read-only mode.
bzr revid: odo@openerp.com-20140314131849-rnjvk1pqpiyvtc1c
2014-03-14 14:18:49 +01:00
Christophe Simonis
b93ae13482
[FIX] share wizard: delete wizard lines in cascade
...
bzr revid: chs@openerp.com-20140314115936-8y6eg51tzmsdlb85
2014-03-14 12:59:36 +01:00
Christophe Simonis
5af434260f
[FIX] calendar: correct test: select1 field has been renamed
...
bzr revid: chs@openerp.com-20140314113955-acyplukwyu2f7142
2014-03-14 12:39:55 +01:00
Martin Trigaux
08e07af590
[FIX] pager: do not try to toggle the visibility if the pager do not exists yet
...
bzr revid: mat@openerp.com-20140314112709-0sqq6tcpmza34q1e
2014-03-14 12:27:09 +01:00
Christophe Simonis
b3bb47076b
[MERGE] forward port of branch saas-2 up to revid 9151 chs@openerp.com-20140314104803-19c5snl2fcuih91o
...
bzr revid: chs@openerp.com-20140314105753-7a7wh9a1z99azgfj
2014-03-14 11:57:53 +01:00
Olivier Dony
9e002d9233
[FIX] mail.thread: avoid error if message_unread_count has been popped 1 line earlier
...
bzr revid: odo@openerp.com-20140314104605-qi7eqj2g37dvxvc3
2014-03-14 11:46:05 +01:00
Christophe Simonis
44a99c0976
[FIX] calendar: correct recurrency end date computation
...
bzr revid: chs@openerp.com-20140314094809-0wuus62tob8vtyi0
2014-03-14 10:48:09 +01:00
aba3459889
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140314065823-xdw7aa9ye4j200pp
bzr revid: launchpad_translations_on_behalf_of_openerp-20140314065836-tn2fv9smot0omj8f
2014-03-14 06:58:36 +00:00
Denis Ledoux
477a87e2b1
[FIX] web: widget selection on many2one in search view is deprecated, it was used in some cases but it is now pointless as the basic many2one handle these cases
...
bzr revid: dle@openerp.com-20140313182004-symalqn8m9offm14
2014-03-13 19:20:04 +01:00
Kersten Jeremy
90af5e0d3a
[FIX] Change password wizard: reload webclient after changing your own password. Because your session is dead after the changing !
...
bzr revid: jke@openerp.com-20140313181415-3rwlxhpevev3tlsq
2014-03-13 19:14:15 +01:00
Christophe Simonis
c4a6bb75ff
[FIX] calendar: rename leftover crm.meeting into calendar.event forgotten during previous commit
...
bzr revid: chs@openerp.com-20140313175427-wbzt8innt0d874xy
2014-03-13 18:54:27 +01:00
Christophe Simonis
ee8174806e
[MERGE] forward port of branch saas-2 up to revid 9149 chs@openerp.com-20140313163420-ifa4hyixj722d6jo
...
bzr revid: mat@openerp.com-20140313091920-bahej198pu339e28
bzr revid: chs@openerp.com-20140313170940-yoqg6izfw74s2i3a
2014-03-13 18:09:40 +01:00
Martin Trigaux
5fa7e40a9f
[MERGE] [FIX] base_calendar: correct the set method for rrule (opw 605088)
...
- create hook method to fix the invalid call while keeping the signature of the old methdo
- remove undeclared variable
- force the 'byday' field (type selection) to be a string value instead of an integer
bzr revid: mat@openerp.com-20140313155131-e90stgoh8bz8tgvg
2014-03-13 16:51:31 +01:00
Martin Trigaux
32befa63e8
[FIX] pager show the pagger earlier in the loading process to avoid to mix the list and form pagers when fast switching (and slow network)
...
bzr revid: mat@openerp.com-20140313154228-70jytisdwlf3sfbo
2014-03-13 16:42:28 +01:00
Martin Trigaux
219e1a6218
[IMP] add test
...
bzr revid: mat@openerp.com-20140313153757-nj9nn52u7kxpfg8i
2014-03-13 16:37:57 +01:00
Christophe Simonis
b43ffa52c2
[FIX] pad: use server to get pad content
...
bzr revid: chs@openerp.com-20140313153535-ogyip9tfm2hkwn1f
2014-03-13 16:35:35 +01:00
chm@openerp.com