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

891 Commits

Author SHA1 Message Date
Christophe Simonis 31f2a1bc38 [MERGE] forward port of branch 7.0 up to 1c0bc7c 2015-06-30 12:47:27 +02:00
Denis Ledoux ba46732744 [FIX] delivery: allow carrier with 0.0 as normal price 
Before this rev.,
if you define a carrier
 - without advanced price rules
 - with a normal price set to 0.0
 - Free if more than amount unchecked

When you try to invoice a delivery order
(coming from a sales order with as invoicing policy
"on delivery order)
No grid was found, while there was one, with as price 0.0

Closes #1364
 2015-06-25 14:53:02 +02:00
Martin Trigaux 409ca3e009 [I18N] Update translations from Transifex 
Now I am become Death, the destroyer of worlds
 2015-05-29 18:28:10 +02:00
Olivier Dony b17c7d66c7 [I18N] Final sync + cleanup of Launchpad Translations, moving to Transifex 
See https://github.com/odoo/odoo/wiki/Translations
 2015-05-29 11:22:32 +02:00
Olivier Dony 3c3581e19f [I18N] Sync latest translations from Launchpad (not the final one) 2015-05-21 18:01:57 +02:00
Christophe Simonis e20dcda50d [MERGE] forward port of branch 7.0 up to 99c87b6 2015-05-21 16:33:45 +02:00
Olivier Dony 53980b7c52 [FIX] account, mail, etc.: uniformize evaluated expressions 
opw-626694
 2015-05-21 16:07:21 +02:00
Denis Ledoux 2c3c2b57db [MERGE] forward port of branch 7.0 up to f2f4391 2015-04-30 10:50:51 +02:00
Nicolas Martinelli fa01054ae0 [FIX] delivery: delivery price uses pricelist currency instead of company currency 
opw-632574
 2015-04-29 17:17:20 +02:00
Christophe Simonis d3e7a8ef5e [MERGE] forward port of branch 7.0 up to 856bc6f 2015-04-10 18:24:46 +02:00
Rucha Dave 2a3ce719bc [FIX] delivery: do not use canceled lines in weight computation 
Canceling a line on a delivery order was not updating the weight of the package.
opw 618532
 2015-04-09 14:45:38 +02:00
Denis Ledoux a692c6e934 [MERGE] forward port of branch 7.0 up to f406847 2015-01-15 11:49:28 +01:00
Martin Trigaux f406847613 [FIX] delivery: reset delivery info on duplicate/backorder 
The tracking reference and other delivery references are not relevant to
duplicated pickings. Overwrite copy to remove carrier_tracking_ref, volume and
number_of_packages.

Add fallback on stock.picking.in and out to use copy method of stock.picking.

For partial delivery, the duplicated picking is the delivered order and
the existing picking is the backorder of the delivery (why so much hate?).
This means we have to switch the delivery info between the backorder and
the delivered picking.
Combo opw 615593 and 618802
 2015-01-14 17:44:37 +01:00
Olivier Dony d0cd92bb9f [I18N] Sync updated 7.0 translations from Launchpad 2015-01-07 17:57:28 +01: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
Martin Trigaux b5918cb55c [MERGE] forward port of branch 7.0 up to 67cca3f 2014-07-23 16:23:22 +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
Olivier Dony 9f0ecb3572 [MERGE] Forward-port of 7.0 bugfixes up to 4d3a5df 2014-06-12 13:49:32 +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 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 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
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
Launchpad Translations on behalf of openerp f173d926c8 Launchpad automatic translations update. 2014-05-13 06:28:52 +00: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
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
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
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 596cc96b7e Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140318062135-gqvoka8hm41pe762
 2014-03-18 06:21:35 +00: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 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
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