Quentin (OpenERP)
da210e4b5e
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20140311132813-0gmbof2u8nmgv9p3
2014-03-11 14:28:13 +01:00
9863dbe5c8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
2014-03-04 07:52:38 +00:00
Cedric Snauwaert
97004a22d1
[FIX]undo delete attribute name on delivery view
...
bzr revid: csn@openerp.com-20140213124036-7grmw3aq0os2qtft
2014-02-13 13:40:36 +01:00
Cedric Snauwaert
50b2c041aa
[FIX]delivery form view + some label
...
bzr revid: csn@openerp.com-20140212141302-g08x29wejo2om79o
2014-02-12 15:13:02 +01:00
Cedric Snauwaert
9502276166
[FIX]work on view for better usability
...
bzr revid: csn@openerp.com-20140210100727-1q2q61t3c3nxfd10
2014-02-10 11:07:27 +01:00
Quentin (OpenERP)
753f7541db
[MERGE] main trunk
...
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
2014-02-03 18:30:00 +01: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
Antony Lesuisse
033c38c304
[MERGE] trunk
...
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
2014-01-29 03:19:16 +01:00
3ce5e01eca
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00:00
Christophe Simonis
2090330b67
[FIX] move function field amount_delivery from delivery module to website_sale_delivery module
...
bzr revid: chs@openerp.com-20140123174208-yzlod98ez4xn72lv
2014-01-23 18:42:08 +01:00
Christophe Simonis
eb0a81dc93
[IMP] delivery: _delivery_unset make only one call to unlink.
...
[IMP] delivery: do not browse grid as superuser.
[IMP] delivery: code clean: remove unused import, remove commented code, use osv.Model instead of deprecated osv.osv class
bzr revid: chs@openerp.com-20140123172302-ran1vpfibeixv9xe
2014-01-23 18:23:02 +01:00
Christophe Matthieu
4e68fff52e
[FIX] website_sale: demo data, test, delivery, context pricelist
...
bzr revid: chm@openerp.com-20140123104705-679zt0odq0pseu7p
2014-01-23 11:47:05 +01:00
Quentin (OpenERP)
fc93025818
[MERGE] merged trunk
...
bzr revid: qdp-launchpad@openerp.com-20140120144243-5kw535p28t1x7yeg
2014-01-20 15:42:43 +01:00
Christophe Matthieu
379f3fa3ff
[FIX] website_sale: auto set or remove carrier in function of product (service or not)
...
bzr revid: chm@openerp.com-20140117173836-s5mpospo9g5xifew
2014-01-17 18:38:36 +01:00
Thibault Delavallée
9cf78e93cc
[MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.
...
bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk
2014-01-16 11:39:10 +01:00
Stephane Wirtel
bea411bb98
[IMP] Backport one feature from website: this feature allows to specify a file
...
path on the field tag fetching the right file instead of using the base64
encoded file in the field.
<field name="image" type="base64" file="base/static/img/main_partner-image.png" />
bzr revid: stw@openerp.com-20140109154550-a04qybctzaaqtrlr
2014-01-09 16:45:50 +01:00
Christophe Matthieu
63e2da36a6
[FIX] website: some access right
...
bzr revid: chm@openerp.com-20140106141817-2tf0dpfchi5x6kjw
2014-01-06 15:18:17 +01:00
Thibault Delavallée
e883b15c48
[FIX] sale, delivery: _amount_all function used in function field is now wrapper. Indeed as
...
we give the function pointer when creating the fields, inheritance is not taken into
account. This is done by adding a wrapper that calls _amount_all, using this time correct
inheritance.
bzr revid: tde@openerp.com-20131218131942-9lzrxbscb4lu4rj8
2013-12-18 14:19:42 +01:00
Thibault Delavallée
3805a86302
[IMP] website_sale_delivery: make the module effectively works.
...
- added JS / HTML to handle the choice of the carrier
- added override of payment controller in website_sale_delivery to handle the carrier
and recompute the amount and details
- some code cleaning
- added amount_delivery field in sale.order, that is the amount related to the
delivery
bzr revid: tde@openerp.com-20131217152605-0xoulnnlo0nn7j9o
2013-12-17 16:26:05 +01:00
Jitendra Prajapati (OpenERP)
f2eb6ef7b7
[MISC]typo
...
bzr revid: prajapatijitendra7969@gmail.com-20131216074149-f8zlecw100ws935d
2013-12-16 13:11:49 +05:30
Jitendra Prajapati (OpenERP)
325ab27f27
[IMP]improve delivery_cost.yml: create sales order
...
bzr revid: prajapatijitendra7969@gmail.com-20131216071035-vbtvolw7l6xfw9wk
2013-12-16 12:40:35 +05:30
Jitendra Prajapati (OpenERP)
5def46a073
[FIX]runbot: delivery_cost.yml
...
bzr revid: prajapatijitendra7969@gmail.com-20131213132843-v5fk59afkslhnv8c
2013-12-13 18:58:43 +05:30
Jitendra Prajapati (OpenERP)
3163c94da8
[IMP]remove the set default in quotation
...
bzr revid: prajapatijitendra7969@gmail.com-20131213122300-jy541ebqh1m8v5ts
2013-12-13 17:53:00 +05:30
Jitendra Prajapati (OpenERP)
e3b0664ff8
[IMP]Set Delivery Method field default value in res.partner
...
bzr revid: prajapatijitendra7969@gmail.com-20131213120052-wck2hrsqxk3cstv0
2013-12-13 17:30:52 +05:30
Christophe Matthieu
26220814b2
[FIX] delivery: tests raise for wrong depends (sale, stock). Tests use picking_ids but sale_stock does not already install. Change sale and stock depends to sale_stock (who depends of sale and stock)
...
bzr revid: chm@openerp.com-20131209101738-ng9q329w9gchvtib
2013-12-09 11:17:38 +01:00
Christophe Matthieu
fd2821086f
[MERGE] sync with trunk
...
bzr revid: chm@openerp.com-20131202150925-eqsi0uu0fqtwimhj
2013-12-02 16:09:25 +01:00
Quentin (OpenERP)
df2d5e148e
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20131129165644-fx0m3ok07l41o507
2013-11-29 17:56:44 +01:00
Olivier Dony
44664076da
[MERGE] Forward-port of latest 7.0 fixes up to rev 9618 rev-id: dle@openerp.com-20131120142131-s333lyva85cyn41o
...
bzr revid: odo@openerp.com-20131120144059-yyh7emvgdarff09b
bzr revid: odo@openerp.com-20131120144318-11nmn1zj00zmi10z
2013-11-20 15:43:18 +01:00
Olivier Dony
c79b600b1d
[FIX] delivery: the stock.picking.{in,out} workaround was only partial
...
Due to a framework limitation the virtual stock.picking.in
and stock.picking.out models need to duplicate the extra
columns added to the stock.picking master model.
This was only partially done, leading to errors in
some cases when stock.picking.{in,out} were directly
used by business methods.
bzr revid: odo@openerp.com-20131119181855-cciozs8fv3ll9bd8
2013-11-19 19:18:55 +01:00
Fabien Pinckaers
b61ac1998e
[FIX] access right with sale with event crashed [NEW] website_sale_delivery module
...
bzr revid: fp@openerp.com-20131116224306-7is2hawhhpzazie3
2013-11-16 23:43:06 +01:00
2160342cea
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131116062538-hsi3j63m1pw01qem
bzr revid: launchpad_translations_on_behalf_of_openerp-20131117054515-0jw3bd84wk546u6j
bzr revid: launchpad_translations_on_behalf_of_openerp-20131118055319-wz4qa3cxwowlonxt
2013-11-18 05:53:19 +00:00
1d354694cf
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131115063223-eu9nf550yqn4iu0g
2013-11-15 06:32:23 +00:00
108ccbf108
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114062958-ies8xa3pft7n59ms
bzr revid: launchpad_translations_on_behalf_of_openerp-20131106055135-r0xt2vr04710jh1t
bzr revid: launchpad_translations_on_behalf_of_openerp-20131107055120-r8z445ergt50erlx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131108062620-bvfofx1jl1wb1csh
bzr revid: launchpad_translations_on_behalf_of_openerp-20131110064525-ioceogsmu0nmx2qj
bzr revid: launchpad_translations_on_behalf_of_openerp-20131111053908-gbrp09ast5fhr6iw
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112062316-5uf2bvbzdhkq1b7k
bzr revid: launchpad_translations_on_behalf_of_openerp-20131113060841-bkjcuz4e9rtzn6f9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114063058-rrm2q5lxkyawuvpz
2013-11-14 06:30:58 +00:00
9d4c7f4db9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131101062724-823uztz81d48e7zk
bzr revid: launchpad_translations_on_behalf_of_openerp-20131102062340-1guhkeb34orj1d77
bzr revid: launchpad_translations_on_behalf_of_openerp-20131103054341-mg7xr0dkzd2rp6rx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131104060249-fio493wxgjvvlthm
2013-11-04 06:02:49 +00:00
40c309024c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131026062529-74ir3upguunr9mw3
bzr revid: launchpad_translations_on_behalf_of_openerp-20131027061317-d9s440jzv1juvswi
bzr revid: launchpad_translations_on_behalf_of_openerp-20131028054233-15znliqv2eh2jq0i
bzr revid: launchpad_translations_on_behalf_of_openerp-20131029051429-rcytejyrg2s4t9db
bzr revid: launchpad_translations_on_behalf_of_openerp-20131030055438-gp0hyend0jooi941
2013-10-30 05:54:38 +00:00
Quentin (OpenERP)
65966940c8
[MERGE] merged with main trunk
...
bzr revid: qdp-launchpad@openerp.com-20131010133212-t058auv973pvvmjm
2013-10-10 15:32:12 +02:00
Cedric Snauwaert
ba60391f07
[FIX]work on picking reception view, remove some fields and improvement in usability
...
bzr revid: csn@openerp.com-20130923153756-mg9euscs0kvoixnr
2013-09-23 17:37:56 +02:00
Josse Colpaert
e3c5b48264
[FIX] Prints dropship
...
bzr revid: jco@openerp.com-20130917102301-hqjwoq92w1km8mod
2013-09-17 12:23:01 +02:00
9dba69ba48
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912064018-3vecn03jcu9fm1m8
2013-09-12 06:40:18 +00:00
Quentin (OpenERP)
15dd2573d5
[FIX] better split of onshipping invoice (some code needed to be moved in sale_stock\!) + misc fixes in delivery (yaml test fixed as well)
...
bzr revid: qdp-launchpad@openerp.com-20130909142350-axvodv298wnmm7ox
2013-09-09 16:23:50 +02:00
Pooja Zankhariya (OpenERP)
7cace1fb20
[IMP]Improved Delivery Code
...
bzr revid: pza@tinyerp.com-20130906131637-sdg9kik868ia2pbu
2013-09-06 18:46:37 +05:30
Pooja Zankhariya (OpenERP)
4899e29bd2
[IMP]Improved Code
...
bzr revid: pza@tinyerp.com-20130906101728-wr9oi2wv54jhgzux
2013-09-06 15:47:28 +05:30
Cedric Snauwaert
6b68b2e704
[FIX]action_invoice_create return a list and not a dict + fix dependencies for delivery
...
bzr revid: csn@openerp.com-20130905153317-tledb2ht933pwt28
2013-09-05 17:33:17 +02:00
cb8f9c5a0d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130903054857-i15nhvtthlho7chm
2013-09-03 05:48:57 +00:00
0e74fd31a4
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130815055122-qjjh1oa8122npkdt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130816060311-osd5epg0pjqggizo
bzr revid: launchpad_translations_on_behalf_of_openerp-20130817061650-b596lee67z2gon1h
bzr revid: launchpad_translations_on_behalf_of_openerp-20130818050503-e1c1ferew0px4k1y
bzr revid: launchpad_translations_on_behalf_of_openerp-20130819045737-ef63g3nwk154ezyw
2013-08-19 04:57:37 +00:00
Fabien Pinckaers
a8253023de
[FIX] delivery orders
...
bzr revid: fp@openerp.com-20130802173700-gxygm9kpw6017lbo
2013-08-02 19:37:00 +02:00
Fabien Pinckaers
fdcc1d80bc
[FIX] delivery view
...
bzr revid: fp@openerp.com-20130802172643-zuyponin45uc7pug
2013-08-02 19:26:43 +02:00
110e74f46f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130802055826-b3m62j0sjc05lbns
2013-08-02 05:58:26 +00:00
Quentin (OpenERP)