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
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
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
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
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
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
Vo Minh Thu
e69326ee3b
[REF] removed explicit model instanciations.
...
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
Cecile Tonglet
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
Vo Minh Thu
e7f4891d46
[IMP] use the openerp namespace.
...
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
Quentin (OpenERP)
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
Antonin Bourguignon
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
Ajay Chauhan (OpenERP)
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
Benoit Guillot
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
Benoit Guillot
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
Benoit Guillot
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
Raphael Collet
017c5f8290
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20120403082756-egpot17iztniu8tr
2012-04-03 10:27:56 +02:00
Sbh (Openerp)
09483d7449
[Fix] auction,delivery remove ref of .address
...
bzr revid: sbh@tinyerp.com-20120322104124-ferh00aj1gpqowlf
2012-03-22 16:11:24 +05:30
Ujjvala Collins (OpenERP)
2fdbb02ee8
[IMP]: Removed unnecessary changes.
...
bzr revid: uco@tinyerp.com-20120305054120-ctletmvngymuke3v
2012-03-05 11:11:20 +05:30
Turkesh Patel (Open ERP)
187b0d3532
[IMP] changes for sale configuration view
...
bzr revid: tpa@tinyerp.com-20120223094626-7vt2ufe2qjeoudc2
2012-02-23 15:16:26 +05:30
Thibault Delavallée
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
Thibault Delavallée
4da82cdfc9
[MERGE] Merged with main addons
...
bzr revid: tde@openerp.com-20120214130700-ednaydgc1my2ktw5
2012-02-14 14:07:00 +01:00
Olivier Dony
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
Mayur Maheshwari (OpenERP)
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
Raphael Collet
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
Mayur Maheshwari (OpenERP)
be6cddfb99
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20120125115246-xi9v4m85ik0gilsm
2012-01-25 17:22:46 +05:30
Raphael Collet
87f8049c56
[MERGE] delivery: increase size of character field
...
bzr revid: rco@openerp.com-20120124131206-1gn7n3o6l3n4mrh0
2012-01-24 14:12:06 +01:00
Mayur Maheshwari (OpenERP)
45d3b74350
[FIX]delivery:remove a if line
...
bzr revid: mma@tinyerp.com-20120117111333-eogxcf539s3rb4o2
2012-01-17 16:43:33 +05:30
Mayur Maheshwari (OpenERP)
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
Raphael Collet
aa6987297f
[MERGE] delivery: clean yml tests
...
bzr revid: rco@openerp.com-20120106131137-2ux6b68q50zeskhi
2012-01-06 14:11:37 +01:00
Mayur Maheshwari (OpenERP)
3d54f08565
[IMP]delivery:add size 64 on name field
...
bzr revid: mma@tinyerp.com-20120106101850-qubjt41c739ky7fu
2012-01-06 15:48:50 +05:30
Harry (OpenERP)
24664a21a1
[MERGE] delivery: cleanup yml
...
bzr revid: hmo@tinyerp.com-20120105171315-u4j0x1ftc2426g1l
2012-01-05 22:43:15 +05:30
Kirti Savalia (OpenERP)
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
fp
8aff5209ea
[IMP] improved error message, constraints must allways propose a solution
...
bzr revid: fp@fp-laptop-20111231075720-4kak7o320td4wxqc
2011-12-31 08:57:20 +01:00
Fabien Pinckaers
751bb006c9
[FIX] delivery
...
bzr revid: fp@tinyerp.com-20111002160804-wmr1usci1x7m9g2z
2011-10-02 18:08:04 +02:00
Fabien Pinckaers
709bdcf3e9
[IMP] better useability
...
bzr revid: fp@tinyerp.com-20111002160410-l7db0cwv2j1173tt
2011-10-02 18:04:10 +02:00
Fabien Pinckaers
4c7e390891
[FIX] delivery methods
...
bzr revid: fp@tinyerp.com-20111001222809-kv3za5932qfajrv0
2011-10-02 00:28:09 +02:00
Fabien Pinckaers
142313d012
[FIX] delivery methods
...
bzr revid: fp@tinyerp.com-20111001221803-d5dchaux0pzjozqo
2011-10-02 00:18:03 +02:00
Stephane Wirtel
9046fc6869
[IMP] delivery: Add the 'Setup your Delivery Steps' wizard
...
bzr revid: stw@openerp.com-20110923133030-83kkxdu7kb3e8l6f
2011-09-23 15:30:30 +02:00
Hardik Ansodariy (OpenERP)
45ddb1f0b7
[IMP]: improved view and provide access right accordingly
...
bzr revid: han@tinyerp.com-20110818115520-5hp5zoydw467jrwj
2011-08-18 17:25:20 +05:30
Quentin (OpenERP)
9c9516d21c
[MERGE] merged with main addons trunk
...
bzr revid: qdp-launchpad@openerp.com-20110706145644-merwy0setzzb8c9w
2011-07-06 16:56:44 +02:00
Olivier Dony
06fb14130a
[IMP] removed method=True params from all fields.function
...
Server revision 3495 odo@openerp.com-20110701232328-flgxulxva70vnyxr
removed the need for passing method=True to function fields,
so this is the equivalent addons fix, removing it everywhere.
Please be careful from now on, and do not pass it anymore!
bzr revid: odo@openerp.com-20110701234124-a61zl0idvdfz3hyb
2011-07-02 01:41:24 +02:00
Quentin (OpenERP)
b95ff688da
[IMP] code improvement in delivery
...
bzr revid: qdp-launchpad@openerp.com-20110610091137-brspfkkk5l1dn1x3
2011-06-10 11:11:37 +02:00
mayur maheshwari (Open ERP)
185a3bf824
[IMP]delivery,hr_timesheet,hr_holidays:Improvement is Done
...
bzr revid: mma@tinyerp.com-20110606055814-xa0t1idnl6zuyxy0
2011-06-06 11:28:14 +05:30
mayur maheshwari (Open ERP)
e18c5667f5
[IMP]delivery:Improvement is Done
...
bzr revid: mma@tinyerp.com-20110517083618-p2yohhm6reny4cmi
2011-05-17 14:06:18 +05:30