70eb74a260
[MERGE] merged with trunk up to revision 9425. Needs to find another icon for Traceability on lot, though
...
bzr revid: qdp-launchpad@openerp.com-20140507182917-erjammra4okyei1c
2014-05-07 20:29:17 +02:00
56eeefdfda
[MERGE] trunk-websit-al-refactor by chm
...
- allow fiscal position change on sale orders
- public user on website
- simplify website_sale sale.order and shopping cart code
- remove preprocess_request
bzr revid: al@openerp.com-20140507153223-q73u5lhyrfw98o3a
2014-05-07 17:32:23 +02:00
2d924f3e22
[FIX] code cleanup (addon sale)
...
improves the _sales_count method in product.product by removing try/catch and by using better logic. Also, removes now useless sales_ids one2many field.
bzr revid: ged@openerp.com-20140507092303-a2g4gq2mq3obelye
2014-05-07 11:23:03 +02:00
8065294976
[IMP] sale: add comment on onchange_fiscal_position and update taxes of order lines only if a product is defined
...
bzr revid: chm@openerp.com-20140506080525-4scwvtk7os8b63d0
2014-05-06 10:05:25 +02:00
9eb7a78866
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140505112314-1zbn7ae61mg8xavl
2014-05-05 13:23:14 +02:00
9e176a977e
[FIX] website_sale: apply tax position on checkout signup
...
bzr revid: chm@openerp.com-20140505092300-l29tc4pum31nqd1h
2014-05-05 11:23:00 +02:00
1a9f3165ce
[FIX] sale: change fiscal_position don't change order line taxes; Add onchange_fiscal_position method on sale.order
...
bzr revid: chm@openerp.com-20140505085755-wewn9xm8bp08ywnd
2014-05-05 10:57:55 +02:00
bb2ebf7cb9
[FIX] website_sale: apply fiscal position on change product id and update cart.
...
[IMP] sale: apply fiscal position of the partner if they are not fiscal position defined
bzr revid: chm@openerp.com-20140428093609-8z8my9vj322shcll
2014-04-28 11:36:09 +02:00
fbd3255e37
[MERGE] merged trunk up to revision 9350
...
bzr revid: qdp-launchpad@openerp.com-20140416150551-lxpscdd74mgv99r1
2014-04-16 17:05:51 +02:00
f57b767361
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140415150146-5ovdjzta58t5dhd2
2014-04-15 17:01:46 +02:00
398d96f273
[MERGE] merged trunk up to revision 9327
...
bzr revid: qdp-launchpad@openerp.com-20140414094743-hv0u7qhigv1to2uc
2014-04-14 11:47:43 +02:00
15725997dd
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140414090336-vc5283odv5f612es
2014-04-14 11:03:36 +02:00
2e9ee9c76e
[MERGE] merge from rma branch
...
bzr revid: ged@openerp.com-20140410145131-fj17mdpi13wa5a9m
2014-04-10 16:51:31 +02:00
0fad8159f3
[MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx
...
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
2014-04-07 18:33:18 +02:00
e61d12bfa7
[MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9160 revid:dle@openerp.com-20140325112413-xs5z7y81rhyjt0rd
...
bzr revid: dle@openerp.com-20140325112909-zpfi67tx8yfxwnqe
2014-03-25 12:29:09 +01:00
02459f8d4a
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9929 revid:dle@openerp.com-20140325104921-x8zjx5p71l1o3uif
...
bzr revid: dle@openerp.com-20140310133913-465x5t3n1bo7fu98
bzr revid: dle@openerp.com-20140311164146-2s599kogbqj8e94l
bzr revid: dle@openerp.com-20140312111149-u6y036aej3ywq7et
bzr revid: dle@openerp.com-20140312121145-06s1jvct9v4m7l6s
bzr revid: mat@openerp.com-20140313084409-c0kckxemy3in0mlo
bzr revid: chs@openerp.com-20140313163420-ifa4hyixj722d6jo
bzr revid: chs@openerp.com-20140314102034-g0nzryvwhrpzdas9
bzr revid: chs@openerp.com-20140314104803-19c5snl2fcuih91o
bzr revid: odo@openerp.com-20140314143519-x6rzcfkkqxwc0e1g
bzr revid: chs@openerp.com-20140318110229-y8098w3shdpmoig2
bzr revid: dle@openerp.com-20140318151824-sscl4m8p87emjl8s
bzr revid: dle@openerp.com-20140320112618-yfyihlwz66ryeqf5
bzr revid: dle@openerp.com-20140320161003-j01cc6sqves2wnp2
bzr revid: dle@openerp.com-20140320181252-4gqcog22p1ex0pz7
bzr revid: dle@openerp.com-20140321140450-8ulnhr76qybiadks
bzr revid: dle@openerp.com-20140324104743-ubvu8st7emq9pg1q
bzr revid: dle@openerp.com-20140325112413-xs5z7y81rhyjt0rd
2014-03-25 12:24:13 +01:00
8310cd1920
[FIX] sale: make invoice for SO grouped by partner based on partner_invoice_id instead of just partner_id
...
For two sale order, if the partner_id were different but the partner_invoice_id were identical, the make invoice grouped by partner created two different invoices
bzr revid: dle@openerp.com-20140325103226-vusygdpd74yha91m
2014-03-25 11:32:26 +01:00
96ea9392aa
[IMP] convert button into stat button for products
...
bzr revid: rma@tinyerp.com-20140324135621-13t191kmnn6t22jk
2014-03-24 19:26:21 +05:30
9338207e1f
[IMP]: Improve reference terms for partner
...
bzr revid: ypa@tinyerp.com-20140311094911-7oc1il3jl2ktlb09
2014-03-11 15:19:11 +05:30
4235dc8e88
[REVERT]9882 revid:jri@openerp.com-20140307160945-r2t5pbl2bb7yaw9n
...
While it seems right to only show the partner addresses in invoice and shipping addresses, this fix will prevent to use sibling addresses (the address of another contact in the same company), which is a requirement for several users. Therefore, this fix causes more problems than it resolves.
Moreover, these addresses are displayed on the invoice form as following: Company Name / Partner Name / Address Name. Therefore, if you want to change the address while seeing only the partner addresses, you just have to remove the "Address Name", leaving "Company Name / Partner Name".
bzr revid: dle@openerp.com-20140310133314-5mv4h2h5zmqlw4d2
2014-03-10 14:33:14 +01:00
c2ba11e72e
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9885 revid:dle@openerp.com-20140310114026-r0ijm0m36su19wn7
...
bzr revid: dle@openerp.com-20140310122101-gicombyc5ii0yz6a
2014-03-10 13:21:01 +01:00
f631757f37
[FIX] [MERGE] [SALE] Filter invoice and ship address on sales order to contacts of the selected customer ( #592166 )
...
bzr revid: jri@openerp.com-20140307160945-r2t5pbl2bb7yaw9n
2014-03-07 17:09:45 +01:00
e36b32a661
[MERGE] merged with main trunk (revision 9186)
...
bzr revid: qdp-launchpad@openerp.com-20140228131516-ihigousbe5p1nt68
2014-02-28 14:15:16 +01:00
35b64811e9
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140221095425-9043pbzjy7rtbxd1
2014-02-21 10:54:25 +01:00
d5106a4d34
[MERGE] forward port of branch saas-2 up to revid 9136 dle@openerp.com-20140219170746-3yjvjyc2wwrb7rvd
...
bzr revid: chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
2014-02-20 16:45:17 +01:00
8edb7c556b
[FIX]sale: post message of mail_thread only accept 0, False, an ID or a list with one ID
...
bzr revid: dle@openerp.com-20140219170746-3yjvjyc2wwrb7rvd
2014-02-19 18:07:46 +01:00
a2805ee6d7
[FIX] Sale: QWeb action returned when clicking on print button on form view
...
bzr revid: openerp-sle@openerp-sle.home-20140212230002-4e1rsmeutg45h237
2014-02-13 00:00:02 +01:00
f9d3e8a39e
[REF] some refactoring, bug fixes made during code review
...
bzr revid: qdp-launchpad@openerp.com-20140207111349-2zjysk3w1p0daeaj
2014-02-07 12:13:49 +01:00
860cdf9d34
[MERGE] main trnk-wms branch
...
bzr revid: qdp-launchpad@openerp.com-20140207085946-iwwnyivpsl6r2af8
2014-02-07 09:59:46 +01:00
753f7541db
[MERGE] main trunk
...
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
2014-02-03 18:30:00 +01:00
08cf92d5a8
[FIX]sale order workflow: fix problem when clicking on ignore delivery exception
...
bzr revid: csn@openerp.com-20140124092758-tur7cs4d6br30x48
2014-01-24 10:27:58 +01:00
1e662896fe
[FIX]when copy sale_order, don't copy procurement_group_id
...
bzr revid: csn@openerp.com-20140123162141-rjd2vyml1d65ayn3
2014-01-23 17:21:41 +01:00
8c00eddd04
[FIX]sale order, when in shipping exception, don't cancel procurement, re-run it instead. Also run of procurement should take into account previously done move for quantities
...
bzr revid: csn@openerp.com-20140123160638-4dgq1h1yugt6m6zt
2014-01-23 17:06:38 +01:00
3f8ec15bbe
[MERGE] stock, sale, sale_stock: several usability problem fixed.
...
lp bug: https://launchpad.net/bugs/1269045 fixed
bzr revid: qdp-launchpad@openerp.com-20140120160303-v5hmfmb6roeg56v6
2014-01-20 17:03:03 +01:00
fc93025818
[MERGE] merged trunk
...
bzr revid: qdp-launchpad@openerp.com-20140120144243-5kw535p28t1x7yeg
2014-01-20 15:42:43 +01:00
5649e0bbf2
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9770 revid:chs@openerp.com-20140116154645-sy4zhdgqc48xaqbx
...
bzr revid: dle@openerp.com-20131224112612-5gjit5uu1aaaqstx
bzr revid: dle@openerp.com-20140103094532-mbczi9ssr3gc90o1
bzr revid: dle@openerp.com-20140108105833-gblxqdw3if1gt35k
bzr revid: dle@openerp.com-20140115121441-bskbyxxbc09ubavh
bzr revid: dle@openerp.com-20140115165506-yuux9km39gbv7k4n
bzr revid: dle@openerp.com-20140116161415-0y9m0kgavcytzj9z
2014-01-16 17:14:15 +01:00
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
2aa8a38447
[IMP] sale,purchase order: order the field based on date_order instead of name
...
This avoids getting irrelevent order based on sequences without padding (eg: SO10 between SO1 and SO2)
bzr revid: mat@openerp.com-20140115140527-pztwh3kl6y9y7jbe
2014-01-15 15:05:27 +01:00
d0cea6ac39
[FIX]rename group_stock_production_lot to match correct group, remove few extra spaces to match standard.
...
Fix traceback on onchange: product_packaging_change and remove setting default package when creating SOL
lp bug: https://launchpad.net/bugs/1269045 fixed
bzr revid: csn@openerp.com-20140115130123-3ragkt93ukfrfhmq
2014-01-15 14:01:23 +01:00
49c0b7a820
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
2014-01-06 14:57:00 +01:00
f5718efa6e
[MERGE] merged with trunk
...
bzr revid: qdp-launchpad@openerp.com-20131230102802-y1ux8470wxnj4yfr
2013-12-30 11:28:02 +01:00
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
b2fed7e0b2
[FIX] sale: after a shipping exception, when recreating the procurements from a SO, cancel first existing ones (if any)
...
bzr revid: qdp-launchpad@openerp.com-20131218101717-c4womsacvkkzmr37
2013-12-18 11:17:17 +01:00
fab63158a1
[CLEAN] sale: removed code that should not lie here. website code has nothing to do in the base sale module. website_sale: renamed website_sale file into sale_order and added the get_website_data method.
...
bzr revid: tde@openerp.com-20131213110629-rhgpqpy2dj03ng8h
2013-12-13 12:06:29 +01:00
d9343e2d27
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20131213094016-ylqkilyo4190g81w
2013-12-13 10:40:16 +01:00
942a10f2b3
[REVERT] rev 9007 dle@openerp.com-20131122150606-ruqe2l0e7gn84upf
...
default_model and default_res_id were not present when doing this fix, because in the web client, we prevented the propagation of the context keys beginning with "_default" in some cases.
The fact is that, in this specific case, the keys "default_" should not have been removed. This has been fix in web client in
rev 3892 revid:chs@openerp.com-20131211163609-i3s2mlncf5n91uda
Besides, active_model cannot be used here, as active_model is not 'sale.order' but the model of the wizard.
bzr revid: dle@openerp.com-20131211171429-6bxuh7o4ueiy9dd1
2013-12-11 18:14:29 +01:00
a5cc6d6aed
[MERGE] merged with main trunk
...
bzr revid: qdp-launchpad@openerp.com-20131211100354-hwlt65vk8p3xih9u
2013-12-11 11:03:54 +01:00
5200639f39
[FIX]sale: on sale order creation, apply on_change if needed (if required value are not set and can be computed from other values (onchange)
...
bzr revid: dle@openerp.com-20131206135111-nh31jgspelvwnhat
2013-12-06 14:51:11 +01:00
f653a7e7da
[REVERT] revision 9031, dle@openerp.com-20131205170917-7cdzghsa5690xvux
...
Because the xml parser needs to be fixed before this fix can be commited
bzr revid: dle@openerp.com-20131206112738-wu35g157v6myipbx
2013-12-06 12:27:38 +01:00
cbe553505e
[FIX]sale: on sale order creation, apply on_change if needed (if required value are not set and can be computed from other values (onchange)
...
bzr revid: dle@openerp.com-20131205170917-7cdzghsa5690xvux
2013-12-05 18:09:17 +01:00
Quentin (OpenERP)
Antony Lesuisse
Gery Debongnie
chm@openerp.com
Richard Mathot (OpenERP)
Christophe Simonis
Denis Ledoux
Randhir Mayatra rma-openerp
Yogesh Parekh (OpenERP)
Juan Rial
Simon Lejeune
openerp-sle
Cedric Snauwaert
Thibault Delavallée
Martin Trigaux