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
8ac8281a7f
[MERGE] forward port of branch saas-3 up to d3e7a8e
2015-04-10 18:35:34 +02:00
d3e7a8ef5e
[MERGE] forward port of branch 7.0 up to 856bc6f
2015-04-10 18:24:46 +02:00
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
fddab4c20d
[FIX]delivery: price of a delivery method not correct
...
get_price must check the total_amount price without the delivery amount
to compute the delivery prices.
opw:629233
2015-03-11 10:18:51 +01:00
4ad329de55
[FIX] delivery: shipping invoice line depending on amount total
...
The delivery module overrode the method _create_invoice_from_picking
to add the shipping costs according to the invoice and the shipping.
The issue is that the method _create_invoice_from_picking creates an empty
invoice, without any line. The lines are added afterwards, using the method
_create_invoice_line_from_vals, within the method _invoice_create_line.
So, after having called _create_invoice_from_picking, the invoice is indeed
created, but without lines, and therefore without the amount total value.
Adding the shipping costs there will thus prevent the shipping costs
based on the total price of the invoice (e.g. free for an order of 500€)
This rev. overrides the method _invoice_create_line instead, as, after
the call to this method, the invoice will be completely set, with all
its lines, and with a correct amount total. The side effect
is that we need to recompute the taxes a second time, using button_compute.
This is not the cleanest way to solve this issue. Indeed, a cleaner patch
would be to change the method _create_invoice_from_picking so it creates
the invoice along with its invoice lines, using the ORM command
(0, _, values) to creates the lines directly within the invoice creation:
invoice['invoice_line'] = [(0, _, values) for values in invoice_lines_vals].
Nevertheless, this is a bigger change, that will probably require API changes,
and therefore should be done in master.
opw-626226
opw-628517
2015-02-20 12:44:11 +01:00
dd23586e16
[FIX] delivery:avoid a crash when editing a delivery.carrier
...
opw:626603
2015-02-02 13:29:54 +01:00
8e03852fd4
[I18N] Update translations from Launchpad 8.0 branches
2015-01-26 16:36:51 +01:00
495ec92251
[I18N] Update translations from Launchpad 8.0 branches
2015-01-21 15:36:54 +01:00
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
87dd06c941
[MERGE] forward port of branch saas-3 up to 8c150c6
2015-01-15 14:43:32 +01:00
a692c6e934
[MERGE] forward port of branch 7.0 up to f406847
2015-01-15 11:49:28 +01:00
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
d0cd92bb9f
[I18N] Sync updated 7.0 translations from Launchpad
2015-01-07 17:57:28 +01:00
ba37ae3cf3
[DEL] Cleaning: key 'images' removed from all __openerp__.py
2015-01-06 14:20:38 +01:00
ebc5cd5bef
[FIX] delivery stock_move form, weight alignment
...
Closes : #954
2014-12-21 21:21:13 +01:00
b9a329a8cf
[FIX] delivery: pass missing context
...
Fixes #4284
2014-12-17 15:16:05 +01:00
a300b6e3e7
[FIX] delivery: display the label of the field number_of_packages
...
Fixes #4011
2014-12-03 15:34:51 +01:00
a6d24db305
[I18N] Update translations from Launchpad 8.0 branches
2014-11-19 17:49:12 +01:00
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
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
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
7439421ad2
[I18N] Update translations from Launchpad 8.0 branches
2014-10-08 17:52:25 +02:00
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
ac2d50d27a
[IMP] Assign all destination moves at once, add packaging
2014-09-22 11:29:39 +02:00
53aa92d3c9
[I18N] Update translations from Launchpad branches
2014-09-18 11:47:16 +02:00
636294e1ef
[IMP] Scheduled time, weights, remove routing on lines
2014-09-17 21:41:41 +02:00
fac96241df
[I18N] Update 8.0 translations with latest changes from Launchpad
2014-09-08 19:04:25 +02:00
8046b7367d
[MERGE] forward port of branch saas-5 up to 7e117b1
2014-08-28 16:51:11 +02:00
d662aeaa27
[FIX] stock: missing quantity parameter from get_price_from_picking
2014-08-27 17:13:14 +02:00
50ef63881a
[I18N] Update 8.0 translation with latest source code
2014-08-14 17:01:54 +02:00
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
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
fd4fd35e32
[MERGE] forward port of branch saas-5 up to e4cb520
2014-07-30 20:52:14 +02:00
e4cb5202a0
[MERGE] forward port of branch saas-4 up to fa07bc8
2014-07-30 20:30:14 +02:00
88c022dfc8
[MERGE] forward port of branch 7.0 up to bbb8d8f25a
2014-07-29 11:42:10 +02:00
ef53a831c6
[MERGE] Forward-port saas-5 up to a5f7891
2014-07-23 16:58:00 +02:00
b5918cb55c
[MERGE] forward port of branch 7.0 up to 67cca3f
2014-07-23 16:23:22 +02:00
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
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
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
026e38b48f
[REM] Unnecessary `size` parameters on char fields
2014-06-25 17:13:43 +02:00
ad4c6caecf
[MERGE] Forward-port of saas-3 bugfixes up to 9f0ecb3
2014-06-12 13:52:35 +02:00
9f0ecb3572
[MERGE] Forward-port of 7.0 bugfixes up to 4d3a5df
2014-06-12 13:49:32 +02:00
faa09da325
Removed version="7.0" from form views
2014-06-12 09:09:59 +02:00
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
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
ac117ac220
[FIX] delivery: propagate additional fields in chained pickings
...
closes #367
2014-06-06 14:18:37 +02:00
b1c0bc0b46
[MERGE] forward port of branch saas-4 up to 65f68c1
2014-06-03 19:45:19 +02:00
65f68c1f65
[MERGE] forward port of branch saas-3 up to 7dd6954
2014-06-03 19:14:22 +02:00
7dd69540e8
[MERGE] forward port of branch 7.0 up to 0c4bc1c
2014-06-03 19:11:44 +02:00
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
04211015fc
[MERGE] Forward-port of latest saas-4 fixes, up to 0452851
2014-05-27 20:49:49 +02:00
fd21abd847
[MERGE] Forward-port latest saas-3 bugfixes, up to 30f43da
2014-05-27 17:18:43 +02:00
30f43daa3b
[MERGE] Forward-port of latest 7.0 bugfixes, up to aeaa826
2014-05-27 16:50:02 +02:00
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
2af03e1b6e
[MERGE] Forward-port latest 7.0 bugfixes, up to f8671cb
2014-05-22 16:44:33 +02:00
0efc066aa6
Add sequence field with handle in tree view
2014-05-22 14:56:33 +02:00
4e34e3bce5
Add < and > operators to allow rules without gap (eg: until 100 & above 100)
2014-05-22 14:55:26 +02:00
02035b27b8
[RESTORE] Restore *.sxw files, skipped during bzr-to-git conversion to discard older binary blobs
2014-05-22 14:07:15 +02:00
fd223b1d5d
Add quantity in variable factor too...
...
I forgot to add the changes before committing
2014-05-17 16:02:15 +02:00
65cd88d216
[IMP] Added quantity as type and variable_factor + sequence for flexibility to delivery grid line
2014-05-17 09:08:25 +02:00
f173d926c8
Launchpad automatic translations update.
2014-05-13 06:28:52 +00:00
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
8b84615de1
[MERGE] Merge from trunk test
...
bzr revid: jco@openerp.com-20140502130352-c3h1fk332eqyd78b
2014-05-02 15:03:52 +02:00
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
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
fdfcb6bf47
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140429064121-xnusb4mb3r8vgtzh
2014-04-29 06:41:21 +00:00
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
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
c7565cd540
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140424063249-gwnojb5kvlq544nz
2014-04-24 06:32:49 +00:00
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
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
71560225a9
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140422093002-5mset34e3o1jkadr
2014-04-22 11:30:02 +02:00
57cebaaac6
[MERGE] merged trunk up to revision 9365.
...
bzr revid: qdp-launchpad@openerp.com-20140422092815-f4tlfmo8zj1nogbl
2014-04-22 11:28:15 +02:00
fa60b90c1f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
b8d4387d33
[MERGE] merged with main addons branch
...
bzr revid: bde@tinyerp.com-20140418061256-n53rymt5j8krzvr5
2014-04-18 11:42:56 +05:30
398d96f273
[MERGE] merged trunk up to revision 9327
...
bzr revid: qdp-launchpad@openerp.com-20140414094743-hv0u7qhigv1to2uc
2014-04-14 11:47:43 +02:00
e82fbf7d91
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
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
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
368afae722
[FIX] website_sale: order data refresh problem
...
bzr revid: dle@openerp.com-20140404102512-72x74ys4k6whk8ss
2014-04-04 12:25:12 +02:00
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
ff4726ea7d
[MERGE] merged trunk up to revision 9281
...
bzr revid: qdp-launchpad@openerp.com-20140403081427-7xpn57wdfv08v2al
2014-04-03 10:14:27 +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
51aa261b44
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
2014-03-27 07:35:04 +00:00
801d6201b2
[IMP] Remove yml test for report
...
bzr revid: jco@openerp.com-20140318135346-0mv3b8ieuky0rp0m
2014-03-18 14:53:46 +01:00
58cef1286f
[ADD] Shipping report extension
...
bzr revid: jco@openerp.com-20140318125154-k0a0bc031lb4g2us
2014-03-18 13:51:54 +01:00
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
596cc96b7e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140318062135-gqvoka8hm41pe762
2014-03-18 06:21:35 +00:00
da210e4b5e
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20140311132813-0gmbof2u8nmgv9p3
2014-03-11 14:28:13 +01:00
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
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
9863dbe5c8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
2014-03-04 07:52:38 +00:00
97004a22d1
[FIX]undo delete attribute name on delivery view
...
bzr revid: csn@openerp.com-20140213124036-7grmw3aq0os2qtft
2014-02-13 13:40:36 +01:00
50b2c041aa
[FIX]delivery form view + some label
...
bzr revid: csn@openerp.com-20140212141302-g08x29wejo2om79o
2014-02-12 15:13:02 +01:00
9e102b6b24
[MERGE] merged with main addons
...
bzr revid: bde@tinyerp.com-20140212064422-4thlmyk5psff9lth
2014-02-12 12:14:22 +05:30
9502276166
[FIX]work on view for better usability
...
bzr revid: csn@openerp.com-20140210100727-1q2q61t3c3nxfd10
2014-02-10 11:07:27 +01:00
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
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
Guewen Baconnier
Christophe Simonis
Rucha Dave
Goffin Simon
Denis Ledoux
Olivier Dony
Martin Trigaux
Aaron Bohy
Antony Lesuisse
gfcapalbo
Alexis de Lattre
Josse Colpaert
Max Mumford
Martin Trigaux
Raphael Collet
Jaydeep Barot
Fabien Meghazi
Martin Trigaux
Somesh Khare(OpenERP)
Alexandre Fayolle
Denis Ledoux
buke
Wolfgang Taferner
Launchpad Translations on behalf of openerp
Josse Colpaert
Quentin (OpenERP)
Bharat Devnani (Open ERP)
Richard Mathot (OpenERP)
Rakesh Sindhav (OpenERP)
Christophe Simonis
Cedric Snauwaert