Commit Graph

58 Commits

Author SHA1 Message Date
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
Rifakat Haradwala (Open ERP) 4012283805 [IMP] delivery: improved in view and added context
bzr revid: rha@tinyerp.com-20110513104158-dl5nc5t1t9t78rmx
2011-05-13 16:11:58 +05:30
Rifakat Haradwala (Open ERP) 9187f55f0e [IMP] delivery: improvements in view
bzr revid: rha@tinyerp.com-20110513075046-ihnfu39ho7r9bx7j
2011-05-13 13:20:46 +05:30
Rifakat Haradwala (Open ERP) b3f5910c7f [IMP] delivery: created configuratin wizard and improvements in delivery module
bzr revid: rha@tinyerp.com-20110512132534-moj5yapjvjergwpq
2011-05-12 18:55:34 +05:30
uco (OpenERP) b1cf433ecc [MERGE]: Merged with trunk-addons.
bzr revid: uco@tinyerp.com-20101206131102-z2xzz8eshkswo00q
2010-12-06 18:41:02 +05:30
uco (OpenERP) 3700e08ed6 [REF]: Refactored some lines from previous commit.
bzr revid: uco@tinyerp.com-20101123113152-0ue71yg9usp1gklx
2010-11-23 17:01:52 +05:30
uco (OpenERP) 6dd290e824 [REF]: Replace the condition 'if not context' with 'if context is None'.
bzr revid: uco@tinyerp.com-20101123070505-9i2lrqhgxzaii3zn
2010-11-23 12:35:05 +05:30
uco (OpenERP) 12fcd1be2f [IMP] : Added context=None on methods used for _constraints and replaced context={} with context=None.
bzr revid: uco@tinyerp.com-20101119134801-974ev29j4tu46pq2
2010-11-19 19:18:01 +05:30
sbh (Open ERP) 1edeaa9fd7 [Fix] : Fix wrong helptext for field active
bzr revid: sbh@tinyerp.com-20101115131555-xd1jwod6dvomuv9x
2010-11-15 18:45:55 +05:30
sbh (Open ERP) 724c4ebb44 [REF] stock,delivery :Remove the unused import statemnet, and comment code
bzr revid: sbh@tinyerp.com-20100805062157-a6dm6rmqd8nwdqq3
2010-08-05 11:51:57 +05:30
mtr e01f21d045 [IMP] sale_delivery_report,sale,delivery:Improvements made as per the testing
bzr revid: mtr@mtr-20100622093941-04w864f1c8dxh3u7
2010-06-22 15:09:41 +05:30
Fabien Pinckaers a3dd9f05dc [FIX] 3 security rules, [IMP] object names for logs
bzr revid: fp@tinyerp.com-20100519183232-9zieyfnah526r312
2010-05-19 20:32:32 +02:00
mso 90cd229cbb [FIX] delivery: modifications on delivery cost wizard for task 584
bzr revid: mso@mso-20100426053713-6fms6tta3ogb3gv2
2010-04-26 11:07:13 +05:30
mso dd8501d463 [IMP] delivery,sale: Delivery Cost Improvement on sale, Task id-584
bzr revid: mso@mso-20100423115016-feh97hnjecr03m9p
2010-04-23 17:20:16 +05:30
Stephane Wirtel fb3ef7a2f4 [FIX] Change the year of the copyright
bzr revid: stephane@openerp.com-20100112091839-a6p7tenhb4e4zxyx
2010-01-12 10:18:39 +01:00
uco (OpenERP) 8d3fb81f4e [IMP]: Generalization of tooltips: Added tooltips for sequence field
bzr revid: uco@tinyerp.co.in-20091221131412-xv3u9m8556xkyg6t
2009-12-21 18:44:12 +05:30
uco (OpenERP) 10c3b2da7d [IMP]: Generalization of tooltips: Added tooltips for active field
bzr revid: uco@tinyerp.co.in-20091221122132-hkesf2dy48lpdvum
2009-12-21 17:51:32 +05:30
PSO(OpenERP) eb0b928cc0 Changed licencing terms
bzr revid: hda@tinyerp.com-20091014111534-1vtk21rz8byhszzf
2009-10-14 16:45:34 +05:30
ChristopheChauvet(syleam) 41e8ed59ef changed encoding to coding in all py files
lp bug: https://launchpad.net/bugs/357182 fixed

bzr revid: hda@tinyerp.com-20091013055837-3ntnbe8b938xmk97
2009-10-13 11:28:37 +05:30
Stephane Wirtel 21f104a506 [IMP] Update the copyright to 2009
bzr revid: stephane@tinyerp.com-20090104221250-55q32ayj2t8kzb2k
2009-01-04 23:12:50 +01:00
Fabien Pinckaers 6c73581318 improvements
bzr revid: fp@tinyerp.com-20081214164657-gdd0wnr2m8yrpfb2
2008-12-14 17:46:57 +01:00
Stephane Wirtel 0cc9056f9b [FIX] Typo
bzr revid: stephane@tinyerp.com-20081212005557-u8e9u6ai78maeyh4
2008-12-12 01:55:57 +01:00
Stephane Wirtel 4c29b48db7 [FIX] Specify the osv class for the except_osv exception
lp bug: https://launchpad.net/bugs/307319 fixed

bzr revid: stephane@tinyerp.com-20081212005347-o71d4vzfrogih3xs
2008-12-12 01:53:47 +01:00
Christophe Simonis f5fad0ba30 passing modules in GPL-3
bzr revid: christophe@tinyerp.com-20081103191856-jhcivvwb16fvz2os
2008-11-03 20:18:56 +01:00
Fabien Pinckaers 83dc63d268 bugfixes
bzr revid: fp@tinyerp.com-20081027235825-2ugbuwqmk4so431b
2008-10-28 00:58:25 +01:00
Harshad Modi 959c926ae5 Improvement on delivery grid tree view
bzr revid: hmo@tinyerp.com-20080920115120-ew4uk5vu4r10yk3h
2008-09-20 17:21:20 +05:30