Olivier Dony
ebb5ddcd65
[I18N] Sync latest translations from Launchpad (not the final one)
2015-05-21 14:42:20 +02:00
Olivier Dony
622e00baa5
[I18N] Sync 8.0 translations from Launchpad
2015-04-28 09:45:53 +02:00
Goffin Simon
a90b94f291
[FIX] sale_margin: product margin
...
The product margin computed on each line of a sale order must be
rounded according to the currency of the order pricelist.
Inspired from the field 'price_subtotal' in addons/sale/sale.py
2015-04-27 15:38:01 +02:00
Guewen Baconnier
3a314780c0
[FIX] sale_*, delivery: more consistent ignore of cancelled SO lines
...
Sales Order lines have a cancelled state, but this state is not
always considered when looping over lines. This check is
done in some places already and this patch's aim is to do it in the
remaining places.
- Cancel the procurement of a sale line in sale.order.line
instead of sale.order, so a line canceled individually with
sale_order_line.button_cancel will properly cancel it
procurement.
- Sale report: uses the state of lines instead of Sales order,
so canceled lines of not-canceled orders are correctly represented
in the analysis.
- test: do not create invoices lines for canceled sale lines
- test: creation of moves with canceled lines
- test: check if lines are still canceled when sale order is done
Closes #6036
2015-04-24 17:29:51 +02:00
Goffin Simon
0d74dce709
[FIX] sale_margin: sale margin accuracy
...
Unit Price, Cost Price and Margin must have the same accuracy.
opw:632511
2015-04-24 09:08:53 +02:00
Christophe Simonis
ba54a668d4
[MERGE] forward port of branch saas-3 up to 2ffbb5f
2015-04-14 12:12:39 +02:00
Christophe Simonis
2ffbb5f93d
[MERGE] forward port of branch 7.0 up to d246e36
2015-04-14 11:40:23 +02:00
Nicolas Martinelli
d246e36c82
Revert commit "[FIX] sale_margin: purchase price calculated using the currency of the price type"
...
Reasons:
- the currency conversion is done assuming that the cost price currency is the company currency
- we support only one price type per field. Defining several price types on the same field using
different price types is not supported.
2015-04-13 19:09:20 +02:00
Christophe Simonis
8ac8281a7f
[MERGE] forward port of branch saas-3 up to d3e7a8e
2015-04-10 18:35:34 +02:00
Christophe Simonis
d3e7a8ef5e
[MERGE] forward port of branch 7.0 up to 856bc6f
2015-04-10 18:24:46 +02:00
Nicolas Martinelli
7b7b0d148a
[FIX] sale_margin: purchase price calculated using the currency of the price type
...
When the margin is calculated, the purchase price is calculated using the currency of the price
type 'standard_price' instead of the currency of the company, since they can be different.
opw: 631884
2015-04-09 08:20:36 +02:00
Olivier Dony
8e03852fd4
[I18N] Update translations from Launchpad 8.0 branches
2015-01-26 16:36:51 +01:00
Olivier Dony
495ec92251
[I18N] Update translations from Launchpad 8.0 branches
2015-01-21 15:36:54 +01:00
Olivier Dony
39f00b3637
[I18N] Update translation templates with latest terms
...
Total new terms: 270
Total deleted terms: 82
Total identical terms: 19653
Old total number of terms: 19735
New total number of terms: 19923
2015-01-21 15:31:22 +01:00
Olivier Dony
d0cd92bb9f
[I18N] Sync updated 7.0 translations from Launchpad
2015-01-07 17:57:28 +01:00
Aaron Bohy
ba37ae3cf3
[DEL] Cleaning: key 'images' removed from all __openerp__.py
2015-01-06 14:20:38 +01:00
Denis Ledoux
8ef286a12c
[MERGE] forward port of branch saas-3 up to 162eb84
2014-12-12 15:46:54 +01:00
Denis Ledoux
162eb84438
[MERGE] forward port of branch 7.0 up to f46fa1d
2014-12-12 15:44:44 +01:00
Denis Ledoux
f46fa1d026
[FIX] sale_margin: margin handle included taxes for sale
...
Another fix should probably be build for purchase price, but it isn't that easy, we need to know the partner to which the product has been purchased, as taxes are partner/country dependent.
Besides, included taxes in purchase prices happen less often.
2014-12-12 15:41:37 +01:00
Denis Ledoux
117d0d0ca2
[FIX] sale_margin: stored field functions cannot trigger other stored field functions
...
the update of sale.order margin field was trigger with the margin stored field of sale.order.line: This cannot work with the old api
2014-11-27 12:06:19 +01:00
Christophe Simonis
8e637bac92
[MERGE] forward port of branch saas-3 up to 21b1203
2014-10-29 19:33:02 +01:00
Denis Ledoux
a6024a6376
[MERGE] forward port of branch 7.0 up to 00ec786
2014-10-28 13:40:17 +01:00
Martin Trigaux
79787084ff
[FIX] sale_margin: cost price uom
...
When computing the cost price to display, take the uom into account. The cost of 1 Unit or 1 dozen should not be the same. opw 599727
2014-10-27 18:09:46 +01:00
Denis Ledoux
be21986c8d
[FIX] sale_margin: stored field functions cannot trigger other stored field functions
...
the update of sale.order margin field was trigger with the margin stored field of sale.order.line: This cannot work with the old api
2014-09-30 17:19:00 +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
Christophe Simonis
7e117b18a0
[MERGE] forward port of branch saas-3 up to ada9724
2014-08-28 16:21:27 +02:00
Christophe Simonis
ada9724655
[MERGE] forward port of branch 7.0 up to 3509e15
2014-08-28 16:12:55 +02:00
Daniel Dico
f880d89cc4
[FIX] sale_order_line: use order date to compute currency instead of current date
2014-08-25 18:04:43 +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
Launchpad Translations on behalf of openerp
c2584c8cb0
Launchpad automatic translations update.
2014-05-18 05:53:48 +00:00
Launchpad Translations on behalf of openerp
6ab0f645bc
Launchpad automatic translations update.
2014-05-17 07:10:37 +00: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
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
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
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
9863dbe5c8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
2014-03-04 07:52:38 +00:00
Launchpad Translations on behalf of openerp
5d2f1c68ac
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140216064134-tam102h50au851o1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140215073800-2219ymc7ijxq57aa
bzr revid: launchpad_translations_on_behalf_of_openerp-20140216064223-17h9wz07b2siswzs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140217060328-7qh928zk8ro30qzb
2014-02-17 06:03:28 +00:00
Launchpad Translations on behalf of openerp
8d85c23e4a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140209065003-9soyulgvssk8n5ci
bzr revid: launchpad_translations_on_behalf_of_openerp-20140208071621-b018rnkhyxmmm5jk
bzr revid: launchpad_translations_on_behalf_of_openerp-20140209065224-kih7tx56elds0zok
bzr revid: launchpad_translations_on_behalf_of_openerp-20140210055324-raxopm5ej680oc73
2014-02-10 05:53:24 +00:00
Quentin (OpenERP)
753f7541db
[MERGE] main trunk
...
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
2014-02-03 18:30:00 +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
Launchpad Translations on behalf of openerp
e0951d6e18
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227053952-0hms21l5679mfv9d
bzr revid: launchpad_translations_on_behalf_of_openerp-20131228053802-9q255pplfsr06jvf
bzr revid: launchpad_translations_on_behalf_of_openerp-20131230050715-gywiu51n8ejcvnkp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231052701-yjrbqgyv2os2z8gt
bzr revid: launchpad_translations_on_behalf_of_openerp-20140101054400-7tz7obdh31v8log8
bzr revid: launchpad_translations_on_behalf_of_openerp-20140102054530-gtwf0yp277zkqm0i
2014-01-02 05:45:30 +00:00
Launchpad Translations on behalf of openerp
67e479e96e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131225060225-zss93rqqqz3holkp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131226060540-odnnltlm0bobiqp9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227052235-xq201ghozcgucfuq
bzr revid: launchpad_translations_on_behalf_of_openerp-20131228051943-jo247cfuiyx4w767
bzr revid: launchpad_translations_on_behalf_of_openerp-20131230043947-d1jcf2vpf9go93ec
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231044745-8v24a0fydnvde3js
2013-12-31 04:47:45 +00:00
Quentin (OpenERP)
f5718efa6e
[MERGE] merged with trunk
...
bzr revid: qdp-launchpad@openerp.com-20131230102802-y1ux8470wxnj4yfr
2013-12-30 11:28:02 +01:00
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