8d745f9f50
[FIX] account, mail, etc.: uniformize evaluated expressions
...
opw-626694
2015-05-21 15:26:35 +02:00
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
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
dd23586e16
[FIX] delivery:avoid a crash when editing a delivery.carrier
...
opw:626603
2015-02-02 13:29:54 +01: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
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
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
04211015fc
[MERGE] Forward-port of latest saas-4 fixes, up to 0452851
2014-05-27 20:49:49 +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
4e34e3bce5
Add < and > operators to allow rules without gap (eg: until 100 & above 100)
2014-05-22 14:55:26 +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
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
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
9e102b6b24
[MERGE] merged with main addons
...
bzr revid: bde@tinyerp.com-20140212064422-4thlmyk5psff9lth
2014-02-12 12:14:22 +05:30
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
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
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
baa430d237
[IMP] improved warning messages
...
bzr revid: bde@tinyerp.com-20131202084204-r0br5ytoc12ysjrl
2013-12-02 14:12:04 +05:30
e69326ee3b
[REF] removed explicit model instanciations.
...
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
a3939acfa5
[FIX] replace from/import decimal_precision by from/import openerp.addons.decimal_precision
...
bzr revid: cto@openerp.com-20121217152303-8e3b1x30rlw9cb0d
2012-12-17 16:23:03 +01:00
e7f4891d46
[IMP] use the openerp namespace.
...
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
1232812cc6
[MERGE] merged branch that corrects the decimal precision on fields. Courtesy of Akretion
...
bzr revid: qdp-launchpad@openerp.com-20120814141040-oaf7d56thhi2s9rm
2012-08-14 16:10:40 +02:00
206252d606
[IMP] fix a first batch of typos and spelling mistakes (listed by UCO on the 2012-08-01)
...
bzr revid: abo@openerp.com-20120803172636-s23g6yturpb5chd6
2012-08-03 19:26:36 +02:00
4d847243d1
[IMP] delivery: change label for free_if_more_than field
...
bzr revid: cha@tinyerp.com-20120723124348-kb1yiatdsnc969t3
2012-07-23 18:13:48 +05:30
dc3ae0488b
[IMP] replace 'Price Unit name by 'Product Price'
...
bzr revid: benoit.guillot@akretion.com.br-20120711130615-25ascb8dfllo4r7j
2012-07-11 15:06:15 +02:00
58b4fdb096
[FIX] fix forgetting of import decimal_precision, reported by the runbot !
...
bzr revid: benoit.guillot@akretion.com.br-20120711100802-mo5qlxwzrf3v8mnb
2012-07-11 12:08:02 +02:00
65cde7728e
[ADD] add decimal precision on price fields in the module delivery
...
bzr revid: benoit.guillot@akretion.com.br-20120710231847-9ni8g0bbn380l3m3
2012-07-11 01:18:47 +02:00
017c5f8290
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20120403082756-egpot17iztniu8tr
2012-04-03 10:27:56 +02:00
09483d7449
[Fix] auction,delivery remove ref of .address
...
bzr revid: sbh@tinyerp.com-20120322104124-ferh00aj1gpqowlf
2012-03-22 16:11:24 +05:30
2fdbb02ee8
[IMP]: Removed unnecessary changes.
...
bzr revid: uco@tinyerp.com-20120305054120-ctletmvngymuke3v
2012-03-05 11:11:20 +05:30
187b0d3532
[IMP] changes for sale configuration view
...
bzr revid: tpa@tinyerp.com-20120223094626-7vt2ufe2qjeoudc2
2012-02-23 15:16:26 +05:30
6ec72e3ad4
[IMP] Readded the unlink. Instead of removing unlinking, the method now differentiates if it uses advanced pricing per destination or not. It using it, the user is responsible of the delivery grid and lines. None will be overrided. If not using it, the default behavior is used, unlinking previous lines to set normal_price and free_if_more_than.
...
bzr revid: tde@openerp.com-20120214140825-7hdggsctk8s3twat
2012-02-14 15:08:25 +01:00
4da82cdfc9
[MERGE] Merged with main addons
...
bzr revid: tde@openerp.com-20120214130700-ednaydgc1my2ktw5
2012-02-14 14:07:00 +01:00
83785b1eef
[FIX] delivery.carrier: write() failed to handle ids=int case
...
lp bug: https://launchpad.net/bugs/930127 fixed
bzr revid: odo@openerp.com-20120210151649-xfwkf7xk1zv3s3nx
2012-02-10 16:16:49 +01:00
7516c43555
[FIX]delivery: remove a unlink code for fix lp 927415
...
lp bug: https://launchpad.net/bugs/927415 fixed
bzr revid: mma@tinyerp.com-20120206123230-sbjr80akukq2co0g
2012-02-06 18:02:30 +05:30
1d55fa41f3
[MERGE] lp:915404 (delivery price does not take into account the 'free if more than' amount)
...
bzr revid: rco@openerp.com-20120125132146-df7zz8eru90ztogr
2012-01-25 14:21:46 +01:00
be6cddfb99
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20120125115246-xi9v4m85ik0gilsm
2012-01-25 17:22:46 +05:30
87f8049c56
[MERGE] delivery: increase size of character field
...
bzr revid: rco@openerp.com-20120124131206-1gn7n3o6l3n4mrh0
2012-01-24 14:12:06 +01:00
45d3b74350
[FIX]delivery:remove a if line
...
bzr revid: mma@tinyerp.com-20120117111333-eogxcf539s3rb4o2
2012-01-17 16:43:33 +05:30
79ceef507d
[FIX]delivery:added a normal price field in demo data and set a variable
...
lp bug: https://launchpad.net/bugs/915404 fixed
bzr revid: mma@tinyerp.com-20120117110550-u8g36mguxeh53fgg
2012-01-17 16:35:50 +05:30
aa6987297f
[MERGE] delivery: clean yml tests
...
bzr revid: rco@openerp.com-20120106131137-2ux6b68q50zeskhi
2012-01-06 14:11:37 +01:00
3d54f08565
[IMP]delivery:add size 64 on name field
...
bzr revid: mma@tinyerp.com-20120106101850-qubjt41c739ky7fu
2012-01-06 15:48:50 +05:30
24664a21a1
[MERGE] delivery: cleanup yml
...
bzr revid: hmo@tinyerp.com-20120105171315-u4j0x1ftc2426g1l
2012-01-05 22:43:15 +05:30
6b2eac69ff
[FIX]:wrong delivery cost
...
lp bug: https://launchpad.net/bugs/908020 fixed
bzr revid: ksa@tinyerp.com-20120102110556-i58dhl6nahb5a7ot
2012-01-02 16:35:56 +05:30
Olivier Dony
Guewen Baconnier
Goffin Simon
Christophe Simonis
Denis Ledoux
Martin Trigaux
Raphael Collet
Jaydeep Barot
buke
Wolfgang Taferner
Antony Lesuisse
Denis Ledoux
Bharat R. Devnani (OpenERP)
jke-openerp
Vo Minh Thu
Cecile Tonglet
Quentin (OpenERP)
Antonin Bourguignon
Ajay Chauhan (OpenERP)
Benoit Guillot
Sbh (Openerp)
Ujjvala Collins (OpenERP)
Turkesh Patel (Open ERP)
Thibault Delavallée
Mayur Maheshwari (OpenERP)
Harry (OpenERP)
Kirti Savalia (OpenERP)