odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity
94,144 Commits 3 Branches 0 Tags 961 MiB
Commit Graph

1007 Commits

Author SHA1 Message Date
Antony Lesuisse ebc5cd5bef [FIX] delivery stock_move form, weight alignment 
Closes: #954
 2014-12-21 21:21:13 +01:00
gfcapalbo b9a329a8cf [FIX] delivery: pass missing context 
Fixes #4284
 2014-12-17 15:16:05 +01:00
Alexis de Lattre a300b6e3e7 [FIX] delivery: display the label of the field number_of_packages 
Fixes #4011
 2014-12-03 15:34:51 +01:00
Olivier Dony a6d24db305 [I18N] Update translations from Launchpad 8.0 branches 2014-11-19 17:49:12 +01:00
Josse Colpaert 518b2f6a3f [FIX] super of scheduler / delivery method and phantom boms / average price 
[FIX] super of scheduler should have same params + use_new_cursor should be passed to procure orderpoint confirm

[IMP] Make sure the delivery works when doing phantom boms

[FIX] This should update the average price properly when having multiple moves with the same product

[FIX] Average price should take into account the quantities of all variants

[FIX] Make sure purchase picking type in other company works

[IMP] Views of quants and destination locations of moves
 2014-11-13 11:50:01 +01:00
Josse Colpaert 6b9668520c [FIX] Method should pass the correct objects for adding the line for the delivery method when invoicing based on shipments 2014-11-13 11:50:01 +01:00
Josse Colpaert 86f785ae1b [FIX] #3153 Digits in wizard should be those of moves,... / Recreate delivery order from sale / Delivery method on delivery order 
[IMP] Provide better purchase order picking type

[IMP] Possibly a better product uos handling in the sale order line

[FIX] Recreate of delivery order when sales order in shipping exception

[FIX] Delivery method should be passed to delivery order
 2014-11-13 11:50:01 +01:00
Olivier Dony 7439421ad2 [I18N] Update translations from Launchpad 8.0 branches 2014-10-08 17:52:25 +02:00
Olivier Dony 1c5b5e4290 [I18N] Update translations from Launchpad 8.0 branches 
server: rev. 26 rev-id launchpad_translations_on_behalf_of_openerp-20140923072744-tkfs0yinu8msjh09
addons: rev. 39 rev-id launchpad_translations_on_behalf_of_openerp-20140923072715-5j7qvnuvmmb1zzy1
web: rev. 23 rev-id launchpad_translations_on_behalf_of_openerp-20140923072757-jvh9l6r2x0vfcyhb
 2014-09-23 13:42:05 +02:00
Josse Colpaert ac2d50d27a [IMP] Assign all destination moves at once, add packaging 2014-09-22 11:29:39 +02:00
Olivier Dony 53aa92d3c9 [I18N] Update translations from Launchpad branches 2014-09-18 11:47:16 +02:00
Josse Colpaert 636294e1ef [IMP] Scheduled time, weights, remove routing on lines 2014-09-17 21:41:41 +02:00
Olivier Dony fac96241df [I18N] Update 8.0 translations with latest changes from Launchpad 2014-09-08 19:04:25 +02:00
Christophe Simonis 8046b7367d [MERGE] forward port of branch saas-5 up to 7e117b1 2014-08-28 16:51:11 +02:00
Max Mumford d662aeaa27 [FIX] stock: missing quantity parameter from get_price_from_picking 2014-08-27 17:13:14 +02:00
Olivier Dony 50ef63881a [I18N] Update 8.0 translation with latest source code 2014-08-14 17:01:54 +02:00
Olivier Dony 85d2b45aaa [I18N] Update 7.0 translations with latest changes on Launchpad 
See also https://github.com/odoo/odoo/wiki/GitHub-Transition#translations
 2014-08-14 03:38:58 +02:00
Olivier Dony 96c36e895c [I18N] Update all 7.0 translation templates with latest terms and annotations 
Total new terms: 168
Total deleted terms: 95
Total identical terms: 16329
(Some modules skipped, typically all l10n_* modules)
 2014-08-14 02:24:24 +02:00
Christophe Simonis fd4fd35e32 [MERGE] forward port of branch saas-5 up to e4cb520 2014-07-30 20:52:14 +02:00
Christophe Simonis e4cb5202a0 [MERGE] forward port of branch saas-4 up to fa07bc8 2014-07-30 20:30:14 +02:00
Denis Ledoux 88c022dfc8 [MERGE] forward port of branch 7.0 up to bbb8d8f25a 2014-07-29 11:42:10 +02:00
Olivier Dony ef53a831c6 [MERGE] Forward-port saas-5 up to a5f7891 2014-07-23 16:58:00 +02:00
Martin Trigaux b5918cb55c [MERGE] forward port of branch 7.0 up to 67cca3f 2014-07-23 16:23:22 +02:00
Martin Trigaux 36fcfc66c4 [FIX] website_sale_delivery: avoid selecting unavailable delivery method 
If somebody selects a delivery method not matching any criteria, the server would crash (500 for the user). This is due to error raised in get_price_from_picking which is triggered by the function field 'price' on the 'delivery.carrier' object.
To avoid this, add field 'available' on the carrier that will be False when no delivery gird is found or when the error is raised. In this case, the delivery choice is disabled. opw 610210
 2014-07-22 17:03:02 +02:00
Martin Trigaux f7dfcd5d98 [FIX] delivery: use unit of measure and not unit of stock to compute price of delivery 
The computation expects uom and it was wrongly passing uos qunatities.
 2014-07-22 16:38:52 +02:00
Raphael Collet cbe2dbb672 [MERGE] new v8 api by rco 
A squashed merge is required as the conversion of the apiculture branch from
bzr to git was not correctly done. The git history contains irrelevant blobs
and commits. This branch brings a lot of changes and fixes, too many to list
exhaustively.

- New orm api, objects are now used instead of ids
- Environements to encapsulates cr uid context while maintaining backward compatibility
- Field compute attribute is a new object oriented way to define function fields
- Shared browse record cache
- New onchange protocol
- Optional copy flag on fields
- Documentation update
- Dead code cleanup
- Lots of fixes
 2014-07-06 17:05:41 +02:00
Jaydeep Barot 026e38b48f [REM] Unnecessary `size` parameters on char fields 2014-06-25 17:13:43 +02:00
Olivier Dony ad4c6caecf [MERGE] Forward-port of saas-3 bugfixes up to 9f0ecb3 2014-06-12 13:52:35 +02:00
Olivier Dony 9f0ecb3572 [MERGE] Forward-port of 7.0 bugfixes up to 4d3a5df 2014-06-12 13:49:32 +02:00
Fabien Meghazi faa09da325 Removed version="7.0" from form views 2014-06-12 09:09:59 +02:00
Martin Trigaux 67d127de83 Merge pull request #413 from gurneyalex/7.0-fix_lp1025703-afe 
[FIX] delivery: add missing information in chained pickings
 2014-06-11 15:22:47 +02:00
Somesh Khare(OpenERP) 81a3a4fcbb [FIX]Delivery: carrier information not propagated from sale order to pickings (Case: ref 595240) 
closes lp:1192115
 2014-06-06 14:34:23 +02:00
Alexandre Fayolle ac117ac220 [FIX] delivery: propagate additional fields in chained pickings 
closes #367
 2014-06-06 14:18:37 +02:00
Christophe Simonis b1c0bc0b46 [MERGE] forward port of branch saas-4 up to 65f68c1 2014-06-03 19:45:19 +02:00
Christophe Simonis 65f68c1f65 [MERGE] forward port of branch saas-3 up to 7dd6954 2014-06-03 19:14:22 +02:00
Christophe Simonis 7dd69540e8 [MERGE] forward port of branch 7.0 up to 0c4bc1c 2014-06-03 19:11:44 +02:00
Denis Ledoux 7a157dd35e [FIX] delivery: allow to add delivery method in quotation if quotation in quotation sent stage 
opw-607920
 2014-06-03 17:12:07 +02:00
Olivier Dony 04211015fc [MERGE] Forward-port of latest saas-4 fixes, up to 0452851 2014-05-27 20:49:49 +02:00
Olivier Dony fd21abd847 [MERGE] Forward-port latest saas-3 bugfixes, up to 30f43da 2014-05-27 17:18:43 +02:00
Olivier Dony 30f43daa3b [MERGE] Forward-port of latest 7.0 bugfixes, up to aeaa826 2014-05-27 16:50:02 +02:00
buke 1971141dc5 Fixed delivery grid get_price 
It's wrong for cal weight in delivery gird . It's use product.weight * qty.
 2014-05-26 17:12:38 +08:00
Olivier Dony 2af03e1b6e [MERGE] Forward-port latest 7.0 bugfixes, up to f8671cb 2014-05-22 16:44:33 +02:00
Martin Trigaux 0efc066aa6 Add sequence field with handle in tree view 2014-05-22 14:56:33 +02:00
Martin Trigaux 4e34e3bce5 Add < and > operators to allow rules without gap (eg: until 100 & above 100) 2014-05-22 14:55:26 +02:00
Olivier Dony 02035b27b8 [RESTORE] Restore *.sxw files, skipped during bzr-to-git conversion to discard older binary blobs 2014-05-22 14:07:15 +02:00
Wolfgang Taferner fd223b1d5d Add quantity in variable factor too... 
I forgot to add the changes before committing
 2014-05-17 16:02:15 +02:00
Wolfgang Taferner 65cd88d216 [IMP] Added quantity as type and variable_factor + sequence for flexibility to delivery grid line 2014-05-17 09:08:25 +02:00
Launchpad Translations on behalf of openerp f173d926c8 Launchpad automatic translations update. 2014-05-13 06:28:52 +00:00
Olivier Dony 083108a624 [IMP] delivery,stock,mrp: minor cleanup/spellchecking/nit-picking while reviewing 
bzr revid: odo@openerp.com-20140507165951-th4iqsrp6l67dvve
 2014-05-07 18:59:51 +02:00
Josse Colpaert 8b84615de1 [MERGE] Merge from trunk test 
bzr revid: jco@openerp.com-20140502130352-c3h1fk332eqyd78b
 2014-05-02 15:03:52 +02:00
Antony Lesuisse 7e25b9ae55 [MERGE] saas-4 report_webkit missing dependency on report 
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
 2014-05-01 18:11:56 +02:00
Denis Ledoux 79d4c57877 [MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 9439 revid:dle@openerp.com-20140429112147-hqfqd0y487s817n7 
bzr revid: dle@openerp.com-20140429112738-y2el246dmd2o2zy9
 2014-04-29 13:27:38 +02:00
Launchpad Translations on behalf of openerp fdfcb6bf47 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140429064121-xnusb4mb3r8vgtzh
 2014-04-29 06:41:21 +00:00
Denis Ledoux b54e49b291 [FIX] website_sale, website_sale_delivery, delivery: price computation on quantity change 
bzr revid: dle@openerp.com-20140425152541-qiabb4sa7y2skgql
 2014-04-25 17:25:41 +02:00
Quentin (OpenERP) 7a6b00b651 [MERGE] merged with trunk up to revision 9381 
bzr revid: qdp-launchpad@openerp.com-20140425090414-vpg4szws9y4fgznc
 2014-04-25 11:04:14 +02:00
Launchpad Translations on behalf of openerp c7565cd540 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140424063249-gwnojb5kvlq544nz
 2014-04-24 06:32:49 +00:00
Launchpad Translations on behalf of openerp d64b172b3b Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140423065826-x7fmgc85ckhi9s8u
bzr revid: launchpad_translations_on_behalf_of_openerp-20140423070300-k249yxs2ghd1vaof
 2014-04-23 07:03:00 +00:00
Bharat Devnani (Open ERP) 3a0c820dfd [MERGE][IMP] More explicit error messages (in delivery, hr_timesheet_sheet, purchase, purchase_requisition, sale_stock, stock) 
bzr revid: rim@openerp.com-20140422123022-22zef462lts0qyqi
 2014-04-22 14:30:22 +02:00
Richard Mathot (OpenERP) 71560225a9 [MERGE] from trunk 
bzr revid: rim@openerp.com-20140422093002-5mset34e3o1jkadr
 2014-04-22 11:30:02 +02:00
Quentin (OpenERP) 57cebaaac6 [MERGE] merged trunk up to revision 9365. 
bzr revid: qdp-launchpad@openerp.com-20140422092815-f4tlfmo8zj1nogbl
 2014-04-22 11:28:15 +02:00
Launchpad Translations on behalf of openerp fa60b90c1f Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
 2014-04-22 07:52:47 +00:00
Bharat R. Devnani (OpenERP) b8d4387d33 [MERGE] merged with main addons branch 
bzr revid: bde@tinyerp.com-20140418061256-n53rymt5j8krzvr5
 2014-04-18 11:42:56 +05:30
Quentin (OpenERP) 398d96f273 [MERGE] merged trunk up to revision 9327 
bzr revid: qdp-launchpad@openerp.com-20140414094743-hv0u7qhigv1to2uc
 2014-04-14 11:47:43 +02:00
Launchpad Translations on behalf of openerp e82fbf7d91 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
 2014-04-12 08:31:53 +00:00
Rakesh Sindhav (OpenERP) f081a5e441 [IMP]account,purchse,warehouse,sale: view improvement in addons modules 
bzr revid: rsi@tinyerp.com-20140411131842-9zppvrs2szqa4o47
 2014-04-11 18:48:42 +05:30
Christophe Simonis 0fad8159f3 [MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx 
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
 2014-04-07 18:33:18 +02:00
Denis Ledoux 368afae722 [FIX] website_sale: order data refresh problem 
bzr revid: dle@openerp.com-20140404102512-72x74ys4k6whk8ss
 2014-04-04 12:25:12 +02:00
Launchpad Translations on behalf of openerp 8f174e13bd Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140404070722-99m3lomg172fzapc
bzr revid: launchpad_translations_on_behalf_of_openerp-20140404070759-302tyo6k09v8arhz
 2014-04-04 07:07:59 +00:00
Quentin (OpenERP) ff4726ea7d [MERGE] merged trunk up to revision 9281 
bzr revid: qdp-launchpad@openerp.com-20140403081427-7xpn57wdfv08v2al
 2014-04-03 10:14:27 +02:00
Launchpad Translations on behalf of openerp 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
Launchpad Translations on behalf of openerp 51aa261b44 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
 2014-03-27 07:35:04 +00:00
Josse Colpaert 801d6201b2 [IMP] Remove yml test for report 
bzr revid: jco@openerp.com-20140318135346-0mv3b8ieuky0rp0m
 2014-03-18 14:53:46 +01:00
Josse Colpaert 58cef1286f [ADD] Shipping report extension 
bzr revid: jco@openerp.com-20140318125154-k0a0bc031lb4g2us
 2014-03-18 13:51:54 +01:00
Josse Colpaert 90b2be3676 [IMP] Delivery module report implementation in the existing picking report 
bzr revid: jco@openerp.com-20140318121823-12d36hihg7yyfejl
 2014-03-18 13:18:23 +01:00
Launchpad Translations on behalf of openerp 596cc96b7e Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140318062135-gqvoka8hm41pe762
 2014-03-18 06:21:35 +00:00
Quentin (OpenERP) da210e4b5e [MERGE] trunk 
bzr revid: qdp-launchpad@openerp.com-20140311132813-0gmbof2u8nmgv9p3
 2014-03-11 14:28:13 +01:00
Launchpad Translations on behalf of openerp f166daf065 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140308065427-0he29w0cqe07xmc8
bzr revid: launchpad_translations_on_behalf_of_openerp-20140308065421-4udfyb7xcfq5h1zy
bzr revid: launchpad_translations_on_behalf_of_openerp-20140309060314-64jktl10pkq3inv4
 2014-03-09 06:03:14 +00:00
Launchpad Translations on behalf of openerp b201dc79b7 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140218054104-8egkh4jj7hiiwuih
bzr revid: launchpad_translations_on_behalf_of_openerp-20140219054048-688twg0fubtm2x2q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140220054214-237ri67t9rw3l4fu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140221063855-wniw42r27gyg3h6y
bzr revid: launchpad_translations_on_behalf_of_openerp-20140222073328-xpn7nwqz407yzumq
bzr revid: launchpad_translations_on_behalf_of_openerp-20140223074516-0r09cpmma58ylqji
bzr revid: launchpad_translations_on_behalf_of_openerp-20140224060319-535oheaq2w9u2ye3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140225062420-zl7curej0e0warhz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140226073146-3vzhw4hddr81olbs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140227062959-24e2rn98rqb9afpr
bzr revid: launchpad_translations_on_behalf_of_openerp-20140228072152-f9gm4ud1wu19ge27
bzr revid: launchpad_translations_on_behalf_of_openerp-20140301055205-r0df0fqz9yf5z66i
bzr revid: launchpad_translations_on_behalf_of_openerp-20140302052638-bjf11oumy7w15oco
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304082704-k1z2te1tfud43zy3
 2014-03-04 08:27:04 +00:00
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
Cedric Snauwaert 97004a22d1 [FIX]undo delete attribute name on delivery view 
bzr revid: csn@openerp.com-20140213124036-7grmw3aq0os2qtft
 2014-02-13 13:40:36 +01:00
Cedric Snauwaert 50b2c041aa [FIX]delivery form view + some label 
bzr revid: csn@openerp.com-20140212141302-g08x29wejo2om79o
 2014-02-12 15:13:02 +01:00
Bharat R. Devnani (OpenERP) 9e102b6b24 [MERGE] merged with main addons 
bzr revid: bde@tinyerp.com-20140212064422-4thlmyk5psff9lth
 2014-02-12 12:14:22 +05:30
Cedric Snauwaert 9502276166 [FIX]work on view for better usability 
bzr revid: csn@openerp.com-20140210100727-1q2q61t3c3nxfd10
 2014-02-10 11:07:27 +01: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
Quentin (OpenERP) 753f7541db [MERGE] main trunk 
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
 2014-02-03 18:30:00 +01:00
jke-openerp f1204ee9c3 [FIX] Fix bug with demo data from delivery module. We create a grid, but without specify to "use_detailed_pricelist" 
bzr revid: jke@openerp.com-20140130214944-c5fg5mp8bitt86uy
 2014-01-30 22:49:44 +01:00
jke-openerp 895088a91a [FIX] Remove delivery amount from get_price. Else some codes use the delivery amount in the total to compute itself. 
Eg: An order of 290$ wih delivery amount of 20$ --> Delivery free if getPrice>300$ -> Delivery = 0$

bzr revid: jke@openerp.com-20140130211649-0x9ryb3349vn7ubh
 2014-01-30 22:16:49 +01:00
jke-openerp 420e819b1f [FIX] Recompute price at each updates of cart, Fix bug with carrier at payment. 
bzr revid: jke@openerp.com-20140130173705-wevz607c5djid9ux
 2014-01-30 18:37:05 +01:00
Launchpad Translations on behalf of openerp 4d3a623af7 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128070310-721zmkmw0ocyz6im
bzr revid: launchpad_translations_on_behalf_of_openerp-20140129060326-647er2mw0mfn2j5s
 2014-01-29 06:03:26 +00: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
Christophe Simonis 2090330b67 [FIX] move function field `amount_delivery` from delivery module to website_sale_delivery module 
bzr revid: chs@openerp.com-20140123174208-yzlod98ez4xn72lv
 2014-01-23 18:42:08 +01:00
Christophe Simonis eb0a81dc93 [IMP] delivery: _delivery_unset make only one call to unlink. 
[IMP] delivery: do not browse grid as superuser.
[IMP] delivery: code clean: remove unused import, remove commented code, use osv.Model instead of deprecated osv.osv class

bzr revid: chs@openerp.com-20140123172302-ran1vpfibeixv9xe
 2014-01-23 18:23:02 +01:00
Christophe Matthieu 4e68fff52e [FIX] website_sale: demo data, test, delivery, context pricelist 
bzr revid: chm@openerp.com-20140123104705-679zt0odq0pseu7p
 2014-01-23 11:47:05 +01:00
Bharat R. Devnani (OpenERP) 4da0f5460d [MERGE] merged with main addons 
bzr revid: bde@tinyerp.com-20140123063749-6lqhwdh34ln69pqu
 2014-01-23 12:07:49 +05:30
Quentin (OpenERP) fc93025818 [MERGE] merged trunk 
bzr revid: qdp-launchpad@openerp.com-20140120144243-5kw535p28t1x7yeg
 2014-01-20 15:42:43 +01:00
Christophe Matthieu 379f3fa3ff [FIX] website_sale: auto set or remove carrier in function of product (service or not) 
bzr revid: chm@openerp.com-20140117173836-s5mpospo9g5xifew
 2014-01-17 18:38:36 +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
Launchpad Translations on behalf of openerp c2794d0e85 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140111062610-ld24q55cbxo6di5q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140112054746-j34qg10ipyb6kj8g
bzr revid: launchpad_translations_on_behalf_of_openerp-20140113055853-5oqpffj3szw1yrpl
bzr revid: launchpad_translations_on_behalf_of_openerp-20140111062637-m0t50cu2cr5d6yw7
bzr revid: launchpad_translations_on_behalf_of_openerp-20140112054824-hm7ylgrauivbj7h2
bzr revid: launchpad_translations_on_behalf_of_openerp-20140113055913-wo2i3sd1rnblragc
 2014-01-13 05:59:13 +00:00