Commit Graph
585 Commits
Author SHA1 Message Date
Launchpad Translations on behalf of openerp 88c25488a5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120218050004-fsjgcm68ejwkyila
bzr revid: launchpad_translations_on_behalf_of_openerp-20120219054401-1933r0e5ukykqh0h
bzr revid: launchpad_translations_on_behalf_of_openerp-20120220054126-hug47vk8c43pxbqk
bzr revid: launchpad_translations_on_behalf_of_openerp-20120221055612-pdqteum51dyapu2e
2012-02-21 05:56:12 +00:00
Launchpad Translations on behalf of openerp 9f65e1565e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120217050201-xlguleciidhnkxln
bzr revid: launchpad_translations_on_behalf_of_openerp-20120217051344-6opxazcgg875mypq
2012-02-17 05:13:44 +00:00
Launchpad Translations on behalf of openerp 2094148de5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120216050419-fgzhvlogc71u42qe
bzr revid: launchpad_translations_on_behalf_of_openerp-20120216050718-lf9hgvr1p33jpm2h
bzr revid: launchpad_translations_on_behalf_of_openerp-20120216052148-ta5bwtqg3bzmvp3i
2012-02-16 05:21:48 +00:00
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
Launchpad Translations on behalf of openerp 74b3b0bc69 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120214054303-2gawtr1s4zulhhhs
bzr revid: launchpad_translations_on_behalf_of_openerp-20120214054630-925y7kotw7axa7z4
bzr revid: launchpad_translations_on_behalf_of_openerp-20120214061906-2g5kxwe0xle5u54c
2012-02-14 06:19:06 +00:00
Launchpad Translations on behalf of openerp 2aa2378015 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120211050953-f8t9zos3qjzmnj3t
bzr revid: launchpad_translations_on_behalf_of_openerp-20120212044319-nxuw0h7g5aqrqy4s
bzr revid: launchpad_translations_on_behalf_of_openerp-20120213045042-jyku2inv3wkcae91
2012-02-13 04:50:42 +00: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
Launchpad Translations on behalf of openerp 5d4664f823 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120210044704-ffxh1ikqgom660lz
bzr revid: launchpad_translations_on_behalf_of_openerp-20120210045028-kbviilp8xdby42fi
2012-02-10 04:50:28 +00:00
Launchpad Translations on behalf of openerp 0e2e9ddd78 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120209055558-qfwy9bg1km791dys
bzr revid: launchpad_translations_on_behalf_of_openerp-20120209071015-0jykfhbo8iamzpzk
bzr revid: launchpad_translations_on_behalf_of_openerp-20120209072746-stmwycdircyzrxn4
2012-02-09 07:27:46 +00:00
Carlos Vásquez 3afecc7604 [ADD] es_CR.po: added po to all modules, copy from es.po or from pot
bzr revid: carlos.vasquez@clearcorp.co.cr-20120208145917-aaai0irh68omlzmb
2012-02-08 08:59:17 -06:00
Launchpad Translations on behalf of openerp 320b2d2e2e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120208060921-wir47e717rh04xxn
bzr revid: launchpad_translations_on_behalf_of_openerp-20120208063913-vg9qdu30tx09ojrl
2012-02-08 06:39:13 +00:00
Olivier Dony 0a63ecb0cf [I18N] all: updated translation template
This should be the last major template sync
before the final release of 6.1.

bzr revid: odo@openerp.com-20120208010830-zchnkg48u7s40nw2
2012-02-08 02:08:30 +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
Vo Minh Thu ad4b6fcc21 [IMP] manifest: renamed active to auto_install.
bzr revid: vmt@openerp.com-20120130101837-zyebtyhfjypg2b4w
2012-01-30 11:18:37 +01:00
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
Launchpad Translations on behalf of openerp 846cd871b6 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120125052605-te0tdl9chnuj1riv
2012-01-25 05:26:05 +00:00
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
Launchpad Translations on behalf of openerp 8ffb0a310f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120121054148-0jtsy55iwkhewr4r
bzr revid: launchpad_translations_on_behalf_of_openerp-20120122053059-j2aa26epvk6o1s3o
bzr revid: launchpad_translations_on_behalf_of_openerp-20120123052051-qlxloap8u2xcv0fa
2012-01-23 05:20:51 +00: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
Launchpad Translations on behalf of openerp 5b10b7022d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120115052053-qy9rgrxe745vw4zw
bzr revid: launchpad_translations_on_behalf_of_openerp-20120116051929-9hq3xgbkj3t90wvt
bzr revid: launchpad_translations_on_behalf_of_openerp-20120114054042-idria8u0iiizg9xu
bzr revid: launchpad_translations_on_behalf_of_openerp-20120115053522-rki2r1zjt8544t0c
bzr revid: launchpad_translations_on_behalf_of_openerp-20120116052722-mb4w266h2j8som8q
2012-01-16 05:27:22 +00:00
Launchpad Translations on behalf of openerp a61762c71f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120114051310-6sj2xkv5gwq8cr0p
2012-01-14 05:13:10 +00:00
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
Raphael Collet 00d6915a23 [MERGE] from trunk
bzr revid: rco@openerp.com-20120105101400-21xlc4c2n0dq2jur
2012-01-05 11:14:00 +01:00
Raphael Collet 49ab30a502 [DUMMY] delivery: style fixes
bzr revid: rco@openerp.com-20120105101019-zyzg9exq3kld66ac
2012-01-05 11:10:19 +01:00
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
Launchpad Translations on behalf of openerp 93ac82f51e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120101053159-5dx01axxhdglljye
bzr revid: launchpad_translations_on_behalf_of_openerp-20120102050142-ywoq5o7zdtyke3gi
2012-01-02 05:01:42 +00:00
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
Turkesh Patel (Open ERP) ddc528e7b5 [IMP] Improved YML string in Delivery module
bzr revid: tpa@tinyerp.com-20111227131433-ps9xb2so1apo4jv0
2011-12-27 18:44:33 +05:30
Turkesh Patel (Open ERP) d4ef80a4e3 [MRG] Merge with main addons.
bzr revid: tpa@tinyerp.com-20111226111817-6cekukiw8rjzo0oz
2011-12-26 16:48:17 +05:30
Launchpad Translations on behalf of openerp a6c649dd4e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20111223054503-il515335tdfkghbw
bzr revid: launchpad_translations_on_behalf_of_openerp-20111223073609-mpe8e232ykba47y0
2011-12-23 07:36:09 +00:00
Turkesh Patel (Open ERP) b740d75d56 [MRG] merge main addons
bzr revid: tpa@tinyerp.com-20111223065633-j9g8n831hjxknhrf
2011-12-23 12:26:33 +05:30
Turkesh Patel (Open ERP) 27714f2fd2 [IMP]Improved YML test cases of delivery module
bzr revid: tpa@tinyerp.com-20111223065354-avs0gandnbflwd13
2011-12-23 12:23:54 +05:30
Olivier Dony cb28f8de07 [I18N] all: update translation templates
bzr revid: odo@openerp.com-20111222185539-9gn06tu38ynoc416
2011-12-22 19:55:39 +01:00
Quentin (OpenERP) 1fd5cf94e5 [MERGE] merged the dev branch with us letter format support for RML files
bzr revid: qdp-launchpad@openerp.com-20111222151758-1t7ixg0p770j2mli
2011-12-22 16:17:58 +01:00
Turkesh Patel (Open ERP) f2836bbb5f [ADD] added carrier_cost_delivery.yml in delivery module
bzr revid: tpa@tinyerp.com-20111222070517-tzkg4mvdtt93t6re
2011-12-22 12:35:17 +05:30
Olivier Dony f8e1ddfbc1 [IMP] delivery: refactor shipping cost invoicing to be more modular
This will make modular extensions easier and
cleaner to implement.

bzr revid: odo@openerp.com-20111221181149-a4xus72g3h4x3lko
2011-12-21 19:11:49 +01:00
Olivier Dony 48eaf61c01 [IMP] delivery,project_mrp,sale_journal: use the new extensible API of sale/purchase picking creation
This also updates the code to use the new API with
the conventional context passing

bzr revid: odo@openerp.com-20111221151639-q9nnxurg9v4vvtnr
2011-12-21 16:16:39 +01:00
Rucha (Open ERP) 84a517a6d7 [IMP]: Removed pageSize from report rml as it will be taken from company paper format;
bzr revid: rpa@tinyerp.com-20111221090811-tg1vbfqs303f8yvq
2011-12-21 14:38:11 +05:30
Fabien Pinckaers f27318c8af [IMP] Security Rule: removed duplicates due to inheritancies of groups
bzr revid: fp@tinyerp.com-20111212181113-mhnnbps3ip8ls6pp
2011-12-12 19:11:13 +01:00
Quentin (OpenERP) 645e15577d [IMP] changed the use of display_address function in reports
bzr revid: qdp-launchpad@openerp.com-20111201154505-ps3b3m56dza0vjfl
2011-12-01 16:45:05 +01:00
Quentin (OpenERP) 40037e238f [MERGE] merged with main addons trunk
bzr revid: qdp-launchpad@openerp.com-20111201153857-qq99hs12nubiwzkm
2011-12-01 16:38:57 +01:00
Launchpad Translations on behalf of openerp 847bddb3e5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20111126055025-zf1bvsdxa5sw7cn4
2011-11-26 05:50:25 +00:00
Vo Minh Thu 2e1023ddbe [IMP] domain to context:
Use explicitely default_xxx in the context instead of
relying on the domain to fill form views.

bzr revid: vmt@openerp.com-20111124121433-z5du2yeu319ea1ax
2011-11-24 13:14:33 +01:00
Fabien Pinckaers 6cbf19d815 [Merge] es_MX from Vauxoo
bzr revid: fp@tinyerp.com-20111111144930-5o37idpxdvyhtfri
2011-11-11 15:49:30 +01:00
Launchpad Translations on behalf of openerp a13a501e94 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20111110045830-fq54u6adwb1vbzqw
2011-11-10 04:58:30 +00:00