Gery Debongnie
2e9ee9c76e
[MERGE] merge from rma branch
...
bzr revid: ged@openerp.com-20140410145131-fj17mdpi13wa5a9m
2014-04-10 16:51:31 +02:00
Christophe Simonis
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
Ravish (Open ERP)
7699504d62
[Add new sale_team module]
2014-03-28 15:28:35 +05:30
Denis Ledoux
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
Denis Ledoux
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
Denis Ledoux
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
Randhir Mayatra rma-openerp
96ea9392aa
[IMP] convert button into stat button for products
...
bzr revid: rma@tinyerp.com-20140324135621-13t191kmnn6t22jk
2014-03-24 19:26:21 +05:30
Yogesh Parekh (OpenERP)
9338207e1f
[IMP]: Improve reference terms for partner
...
bzr revid: ypa@tinyerp.com-20140311094911-7oc1il3jl2ktlb09
2014-03-11 15:19:11 +05:30
Denis Ledoux
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
Denis Ledoux
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
Juan Rial
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
Quentin (OpenERP)
e36b32a661
[MERGE] merged with main trunk (revision 9186)
...
bzr revid: qdp-launchpad@openerp.com-20140228131516-ihigousbe5p1nt68
2014-02-28 14:15:16 +01:00
Simon Lejeune
35b64811e9
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140221095425-9043pbzjy7rtbxd1
2014-02-21 10:54:25 +01:00
Christophe Simonis
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
Denis Ledoux
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
openerp-sle
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
Quentin (OpenERP)
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
Quentin (OpenERP)
860cdf9d34
[MERGE] main trnk-wms branch
...
bzr revid: qdp-launchpad@openerp.com-20140207085946-iwwnyivpsl6r2af8
2014-02-07 09:59:46 +01:00
Quentin (OpenERP)
753f7541db
[MERGE] main trunk
...
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
2014-02-03 18:30:00 +01:00
Cedric Snauwaert
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
Cedric Snauwaert
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
Cedric Snauwaert
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
Quentin (OpenERP)
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
Quentin (OpenERP)
fc93025818
[MERGE] merged trunk
...
bzr revid: qdp-launchpad@openerp.com-20140120144243-5kw535p28t1x7yeg
2014-01-20 15:42:43 +01:00
Denis Ledoux
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
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
Martin Trigaux
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
Cedric Snauwaert
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
Thibault Delavallée
49c0b7a820
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
2014-01-06 14:57:00 +01:00
Quentin (OpenERP)
f5718efa6e
[MERGE] merged with trunk
...
bzr revid: qdp-launchpad@openerp.com-20131230102802-y1ux8470wxnj4yfr
2013-12-30 11:28:02 +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
Quentin (OpenERP)
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
Thibault Delavallée
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
Thibault Delavallée
d9343e2d27
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20131213094016-ylqkilyo4190g81w
2013-12-13 10:40:16 +01:00
Denis Ledoux
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
Quentin (OpenERP)
a5cc6d6aed
[MERGE] merged with main trunk
...
bzr revid: qdp-launchpad@openerp.com-20131211100354-hwlt65vk8p3xih9u
2013-12-11 11:03:54 +01:00
Denis Ledoux
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
Denis Ledoux
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
Denis Ledoux
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
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
Christophe Simonis
0d13df5a57
[MERGE] remove warnings
...
bzr revid: chs@openerp.com-20131127110552-3u2nxwu01gxj9i7m
2013-11-27 12:05:52 +01:00
Christophe Simonis
6b05beecc1
[MERGE] forward port of branch 7.0 up to revid 9651 chs@openerp.com-20131127104459-jb77x7quwcvtifm7
...
bzr revid: dle@openerp.com-20131126171210-jovr7e7efehuq3s2
bzr revid: chs@openerp.com-20131127110046-4ow36dkuuyzgf1pl
2013-11-27 12:00:46 +01:00
Quentin (OpenERP)
7c0c95b1a4
[FIX] sale, purchase: don't copy the customer/supplier reference when copying a SO/PO
...
bzr revid: qdp-launchpad@openerp.com-20131127084625-dqgoloz4q47zlpti
2013-11-27 09:46:25 +01:00
Denis Ledoux
c782692d56
[FIX]sale: quotation/sale order sent by email were not anymore set to state quotation sent, because the workflow was triggered according to a specific value in the context, which was not there anymore(default_model changed to active_mode, default_res_id changed to active_ids
...
bzr revid: dle@openerp.com-20131122150606-ruqe2l0e7gn84upf
2013-11-22 16:06:06 +01:00
Christophe Simonis
6f67143908
[FIX] *: do not call deprecated method LocalService()
...
bzr revid: chs@openerp.com-20131121120611-06h1pki3460tzj1s
2013-11-21 13:06:11 +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
Quentin (OpenERP)
6ec682a59f
[FIX] sale: do not copy procurements when copying a sale order (or a sale order line)
...
bzr revid: qdp-launchpad@openerp.com-20131106075522-36q9vq1ihh6q7lm3
2013-11-06 08:55:22 +01:00
jke-openerp
2c65def713
[FIX] According to [wms] APR's Review from 20131022 - Move lead_time in mrp module, trace back on split delivery
...
bzr revid: jke@openerp.com-20131029074815-mws7cuvqgxr6q2d4
2013-10-29 08:48:15 +01: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
Denis Ledoux
db84e912bd
[MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8781 rev-id: dle@openerp.com-20130923165651-0jt823r5wy37enw6
...
bzr revid: dle@openerp.com-20130923171310-mav1riq3d2rebmv2
2013-09-23 19:13:10 +02:00
Denis Ledoux
274cf1e293
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9475 rev-id: dle@openerp.com-20130923162428-g0s3o9tid09ogfv3
...
bzr revid: dle@openerp.com-20130923165651-0jt823r5wy37enw6
2013-09-23 18:56:51 +02:00
Quentin (OpenERP)
e12c9ab5ec
[FIX] sale, project_mrp, sale_stock: fixed problems related to the procurement workflow
...
bzr revid: qdp-launchpad@openerp.com-20130917064359-jwque36uwouac61p
2013-09-17 08:43:59 +02:00
Cedric Snauwaert
c401c9027c
[FIX]sale: add a condition to avoid creating procurement when we only have sale installed
...
bzr revid: csn@openerp.com-20130913131007-ppku5ppy7oj7vt7y
2013-09-13 15:10:07 +02:00
Cedric Snauwaert
212be5e67c
[WIP]fix sale workflow in the case we only have sale and not stock installed.
...
bzr revid: csn@openerp.com-20130913093815-m6luad9cnhykbcha
2013-09-13 11:38:15 +02:00
Cedric Snauwaert
2452ef4404
[FIX]_prepare_order_line_procurement should not return False (cause problem with super), instead add another function to know if the so can create a procurement or not
...
bzr revid: csn@openerp.com-20130911140034-5so2qbe4rd2m6131
2013-09-11 16:00:34 +02:00
Josse Colpaert
d207edc369
[IMP] Move sale_stock_workflow towards sale_workflow and make sure project_mrp tests pass
...
bzr revid: jco@openerp.com-20130910154822-u2if98d4r32rtibi
2013-09-10 17:48:22 +02:00
Josse Colpaert
30f27b8cbb
[IMP] Move route_ids from product from stock_location to stock and remove supply_method (change with route)
...
bzr revid: jco@openerp.com-20130909115515-7z6ixaxe7bpxxe73
2013-09-09 13:55:15 +02:00
Josse Colpaert
20e762dd24
[IMP] Invoice_state in procurement order defaults
...
bzr revid: jco@openerp.com-20130830152256-npdkrlefn3lxurwn
2013-08-30 17:22:56 +02:00
Josse Colpaert
b38138d555
[IMP] Invoice_state on procurement order should be defined in stock_account
...
bzr revid: jco@openerp.com-20130830151201-6xwnaxymdynaja7h
2013-08-30 17:12:01 +02:00
Bharat R. Devnani (OpenERP)
72e1113082
[IMP] assigned picking_policy of SO in move_type of procurement.group
...
bzr revid: bde@tinyerp.com-20130827101709-8mp60l9rke2rpcqj
2013-08-27 15:47:09 +05:30
Bharat R. Devnani (OpenERP)
cc4764f48f
[REVERT] reverted price_unit changes
...
bzr revid: bde@tinyerp.com-20130827091217-9l7wbz2v6weaxuoz
2013-08-27 14:42:17 +05:30
Bharat R. Devnani (OpenERP)
0f1d5c92c8
[MERGE] merged with parent branch lp:~openerp-dev/openobject-addons/trunk-wmsimplement-seduce-fp
...
bzr revid: bde@tinyerp.com-20130827085750-gvlr9t6kqq2eoetd
2013-08-27 14:27:50 +05:30
Bharat R. Devnani (OpenERP)
30685ddffb
[IMP] overrided _run_move_create method to get standard price of a product
...
bzr revid: bde@tinyerp.com-20130826101914-24jt4eqx8zqpvvbg
2013-08-26 15:49:14 +05:30
Bharat R. Devnani (OpenERP)
7356926180
[ADD] added parameters in various methods in order to get proper output for picking-order-policy-yml test cases of sale_stock module
...
bzr revid: bde@tinyerp.com-20130819062608-o51cjq7s4ayhsttx
2013-08-19 11:56:08 +05:30
Bharat R. Devnani (OpenERP)
2e6415973f
[REM] removed reference of note field from procurement object as it is removed from object
...
bzr revid: bde@tinyerp.com-20130808124151-yfkom98gsdarh04d
2013-08-08 18:11:51 +05:30
Fabien Pinckaers
934be97ff6
[FIX] invoice on shipping wizard, not finished yet
...
bzr revid: fp@openerp.com-20130804161035-ds2tsx9its11fusm
2013-08-04 18:10:35 +02:00
Fabien Pinckaers
c19419b6b6
[FIX] sale_stock
...
bzr revid: fp@openerp.com-20130804141750-vr17iy49764ga2m0
2013-08-04 16:17:50 +02:00
Fabien Pinckaers
16cb4f8b2a
[IMP] cleaning in progress: invoice on picking
...
bzr revid: fp@openerp.com-20130804134014-0xrkwlzhd6zfd6em
2013-08-04 15:40:14 +02:00
Fabien Pinckaers
c522a3d440
[IMP] Invoice on picking cleaned
...
bzr revid: fp@openerp.com-20130804115325-ejsbn2qoawnrgaic
2013-08-04 13:53:25 +02:00
Fabien Pinckaers
9eb29913fa
[IMP] removed old concept: invoice_quantity
...
bzr revid: fp@openerp.com-20130803190359-e3xpl2yye2u15104
2013-08-03 21:03:59 +02:00
Quentin (OpenERP)
56cbc9421d
[FIX] fixing misc bugs due to the removal of stock in the dependancies of sale
...
bzr revid: qdp-launchpad@openerp.com-20130802113308-nicou96ebqtcgdm0
2013-08-02 13:33:08 +02:00
Josse Colpaert
c932b34e11
[WIP] Remove stock_journal, change name and origin of created procurement, remove some remaining picking in/out, add sequence on dropship
...
bzr revid: jco@openerp.com-20130725144335-l48yws3wbqxmstxc
2013-07-25 16:43:35 +02:00
Josse Colpaert
a3cc2f8fdc
[WIP] Link sale and procurement group, run procurement when creating from sale, view delivery order button with shipped field as a calculated field, quants search view, change yml tests in stock_location
...
bzr revid: jco@openerp.com-20130722143747-l680354are7bo0ow
2013-07-22 16:37:47 +02:00
Josse Colpaert
37ab5c83f7
[WIP] Move back packaging from sale to sale_stock, add module sale_stock_location for route on sale order, add route on warehouse
...
bzr revid: jco@openerp.com-20130716153336-irauxby6fd7gs0w2
2013-07-16 17:33:36 +02:00
Josse Colpaert
3563c8ca85
[WIP] Remove stock_fifo_lifo, check group_id gets created with procurement, reconcile negative quants get_quants problem, add group_id/procure_method on stock_move, add assign on confirmed moves for run_scheduler
...
bzr revid: jco@openerp.com-20130711130237-uh0qyib4xtg7o68g
2013-07-11 15:02:37 +02:00
Josse Colpaert
bcf77893af
[WIP] Move from sale_stock what has only to do with procurement to sale and remove stock_location_sale
...
bzr revid: jco@openerp.com-20130710150207-imvyte86hftdd3pq
2013-07-10 17:02:07 +02:00
Thibault Delavallée
bf4ada34b4
[REF] mail_thread: message_track now uses browse records instead of read results.
...
Updated addons accordingly.
Updated tests to test corner cases using False / null browse records.
bzr revid: tde@openerp.com-20130627144647-swbj77i84vo9ii0v
2013-06-27 16:46:47 +02:00
Peter Langenberg
acda6a4d8a
[FIX] copy record must have today date
...
bzr revid: rmu@tinyerp.com-20130626053642-7moae6mkif1ycbgv
2013-06-26 11:06:42 +05:30
Thibault Delavallée
e738adfafe
[FIX] sale, sale_stock: fixed calls to get_company taking an extra uid
...
bzr revid: tde@openerp.com-20130614143317-65mbgfugskxqnxp7
2013-06-14 16:33:17 +02:00
Thibault Delavallée
1a51e9b88d
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130614141720-7qjo6fpkm83jhpm2
2013-06-14 16:17:20 +02:00
Thibault Delavallée
bc58a5a224
[CLEAN] Misc cleaning before merging.
...
bzr revid: tde@openerp.com-20130614141643-29z9zslusyhj4u5j
2013-06-14 16:16:43 +02:00
Christophe Simonis
6a9adbca62
[MERGE] forward port of branch 7.0 up to revid 9236 mat@openerp.com-20130613160953-itt79mu5xrl7suv4
...
bzr revid: chs@openerp.com-20130613181503-82234mo34wxb0oap
2013-06-13 20:15:03 +02:00
Thibault Delavallée
48071be570
[MERGE] Merged branch holding addons-30 misc improvement. FP-style merge for testing purpose.
...
bzr revid: tde@openerp.com-20130613105923-xt7rvj0n3n3egvzj
2013-06-13 12:59:23 +02:00
Christophe Matthieu
9d9e3d2ef8
[IMP] Improve typos in warning (Grammar mistake, Capitalize title, Typos)
...
bzr revid: chm@openerp.com-20130607113829-1mi6jk18c2v3jjhn
2013-06-07 13:38:29 +02:00
sgo@tinyerp.com
2bda4f7b3c
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130607113500-jzhet9cr98c0ss4s
2013-06-07 17:05:00 +05:30
Christophe Matthieu
8c6ff33bef
[IMP] Improve typos in warning (Grammar mistake, Capitalize title, Typos)
...
bzr revid: chm@openerp.com-20130607102359-is19utzap127nwr4
2013-06-07 12:23:59 +02:00
Turkesh Patel (Open ERP)
a65375648b
[MRG] merge with lp:openobject-addons
...
bzr revid: vja@tinyerp.com-20130516054745-lmqr1uuac6wlqi70
bzr revid: tpa@tinyerp.com-20130528122735-ixcewpz9uga5hv86
2013-05-28 17:57:35 +05:30
Thibault Delavallée
71df1a41bc
[FORWARD] Forward port of addons 7.0 until revision 9172
...
bzr revid: tde@openerp.com-20130528104500-ds3irrs2u0qpst37
2013-05-28 12:45:00 +02:00
Najlaâ
361cd5fc40
[FIX] remove index on SO line text field
...
bzr revid: nel@tinyerp.com-20130522130842-whn5n8fbc0gv34jx
2013-05-22 15:08:42 +02:00
Dhruti Shastri (OpenERP)
5db1c8333d
[sale]:Invoice/Deliever Address are not fileterd based on selected Customer(partner) (Case:592166)
...
bzr revid: dhs@tinyerp.com-20130502120207-a7he9qqty54h1xaz
2013-05-02 17:32:07 +05:30
ggh-openerp
3b73e2b2a4
[IMP]Removed space before Exclamation marks [!]
...
bzr revid: ggh@tinyerp.com-20130429071557-vnxo5nni03vc886j
2013-04-29 12:45:57 +05:30
sgo@tinyerp.com
3d0b5aa747
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130423053031-g501q3w9akfiro2d
2013-04-23 11:00:31 +05:30
Quentin (OpenERP)
33f27b362b
[MERGE] forward port of addons v7 up to revision 9045
...
bzr revid: qdp-launchpad@openerp.com-20130422153449-c62emljfa4a49758
2013-04-22 17:34:49 +02:00
Olivier Dony
26dd9bc343
[MERGE] Sync with 7.0
...
bzr revid: odo@openerp.com-20130418172123-2ofzftdo2a923nj1
2013-04-18 19:21:23 +02:00
Quentin (OpenERP)
af33bef989
[FIX] sale: fix in the workflow of the sale order that appeared on invoice deletion
...
bzr revid: qdp-launchpad@openerp.com-20130418163616-ob30cd73vxkoe31a
2013-04-18 18:36:16 +02:00
Cedric Snauwaert
b8d99e7aa3
[FIX]sale: fix workflow problem when deleting an invoice the workflow should go to invoice_exception state
...
bzr revid: csn@openerp.com-20130418090011-dyg175mvwrp8ilij
2013-04-18 11:00:11 +02:00
Vishmita Jadeja (openerp)
e078eeeebe
[Merge]Merge lp:openobject-addons
...
bzr revid: vja@tinyerp.com-20130418074044-xlxquhnls1tccv5g
2013-04-18 13:10:44 +05:30
sgo@tinyerp.com
d1e17fbde0
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130417061434-zry7pxo7fb17063k
2013-04-17 11:44:34 +05:30
Vo Minh Thu
e69326ee3b
[REF] removed explicit model instanciations.
...
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
Thibault Delavallée
4da68cbc22
[FORWARD] Forward port of addons 7.0 until revision 9008
...
bzr revid: tde@openerp.com-20130411124446-73gzyw3eo925w3dv
2013-04-11 14:44:46 +02:00
Olivier Dony
dcac505a5b
[FIX] sale: remove useless code to select commercial entity, now handled by res.partner.address_get directly
...
lp bug: https://launchpad.net/bugs/1160365 fixed
bzr revid: odo@openerp.com-20130407235115-4kovy1jngblrdd5z
2013-04-08 01:51:15 +02:00
Quentin (OpenERP)
3bb51ac696
[MERGE] forward port of bugfixes made in 7.0, up to revision 8969.
...
bzr revid: qdp-launchpad@openerp.com-20130404095257-oek77sijuxjyi0aj
2013-04-04 11:52:57 +02:00
Quentin (OpenERP)
4bdd8252ba
[REF] sale_stock: removing of dead code and correction of documentation (process) linked to the invoicing after delivery of a sale order
...
bzr revid: qdp-launchpad@openerp.com-20130404151451-7fesb178mpijlv29
2013-04-04 17:14:51 +02:00
Vo Minh Thu
9d5115d0ec
[REF] sale: removed openerp.pooler imports.
...
bzr revid: vmt@openerp.com-20130327132105-becdw049vdr72zt7
2013-03-27 14:21:05 +01:00
Quentin (OpenERP)
2b64c79c3d
[MERGE] forward port of fixes made in v7 addons branch up to revision 8872
...
bzr revid: qdp-launchpad@openerp.com-20130318122717-qptmntn26bx4wn8r
2013-03-18 13:27:17 +01:00
sgo@tinyerp.com
b8a33bc393
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130318071519-3pae2jh7nk2iaqpe
2013-03-18 12:45:19 +05:30
Quentin (OpenERP)
513601e641
[FIX] sale: don't try to post messages on SO if there is no sale related to an invoice
...
bzr revid: qdp-launchpad@openerp.com-20130314164413-qv3j3b3tcc4zt6b7
2013-03-14 17:44:13 +01:00
Chris Biersbach
9dd5e354fd
[MERGE] sale: adds id to the sale_order_line _order so that lines sty in the same order when the sale order is created. Patch by Peter langenberg / Agaplan
...
bzr revid: cbi@openerp.com-20130314143705-9mpgrsemorg2l0b1
2013-03-14 15:37:05 +01:00
sgo@tinyerp.com
32cb2a3509
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130312051713-cph3m3pjozii3jwn
bzr revid: sgo@tinyerp.com-20130314130046-3bi97qv1628co8i3
2013-03-14 18:30:46 +05:30
Fabien Pinckaers
c7d709e579
[FIX] misc fixes on contracts, timesheets
...
bzr revid: fp@openerp.com-20130312123321-mly0k9lrh3im78bg
2013-03-12 13:33:21 +01:00
sgo@tinyerp.com
a21b4b9b56
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130311045638-npwv6lb6bc9i3m1y
2013-03-11 10:26:38 +05:30
Peter Langenberg
d79150eefa
sometimes sequence of sales order lines wrong after save (most frequent using debian squeeze)
...
lp bug: https://launchpad.net/bugs/1134365 fixed
bzr revid: pl@agaplan.eu-20130308170608-3zlsrow4rnw2fcqi
2013-03-08 18:06:08 +01:00
Thibault Delavallée
591eb1c74d
[MERGE] [FIX] sale, sale_stock: fixed crash when installing sale because of code belonging to sale_stock that was located in sale.
...
bzr revid: tde@openerp.com-20130307100621-7a5cb3gchkak2num
2013-03-07 11:06:21 +01:00
Anand Patel (OpenERP)
51a3c7a9a8
[IMP]Improved code
...
bzr revid: pan@tinyerp.com-20130306132608-6xm6w5ft9mgms8v5
2013-03-06 18:56:08 +05:30
Thibault Delavallée
9809dd5a43
[MERGE] Task 'OpenChatter: functional usability 1'
...
Creation log: Document created -> <model_name> created
Add some missing notifications in sale order and purchase order
bzr revid: tde@openerp.com-20130305111450-lb59pi9rpzuhhgve
2013-03-05 12:14:50 +01:00
Thibault Delavallée
2e039c3d5c
[CLEAN] Small code cleaning before merging (context management, coding style).
...
bzr revid: tde@openerp.com-20130305104801-d254qf2it3k22xl5
2013-03-05 11:48:01 +01:00
Anand Patel (OpenERP)
1a147be814
[IMP]Improved code as Suggested
...
bzr revid: pan@tinyerp.com-20130305091035-7uikbzuuziy311ra
2013-03-05 14:40:35 +05:30
Anand Patel (OpenERP)
b1a41adb35
[IMP]improved code as per suggation
...
bzr revid: pan@tinyerp.com-20130304095655-r0lf7c5x881bwqwq
2013-03-04 15:26:55 +05:30
Anand Patel (OpenERP)
055fe6804c
[IMP]Improved code as per suggation
...
bzr revid: pan@tinyerp.com-20130304090235-o7i8jt936c2tvoyk
2013-03-04 14:32:35 +05:30
Anand Patel (OpenERP)
b899234680
[MERGE]Trunk
...
bzr revid: pan@tinyerp.com-20130304044603-6bgcxqjyi0yp04ii
2013-03-04 10:16:03 +05:30
Fabien Pinckaers
a9d6cf634f
[IMP] typo
...
bzr revid: fp@tinyerp.com-20130301162806-ylfu9v0jxgfpjs7w
2013-03-01 17:28:06 +01:00
Fabien Pinckaers
a510050ba6
[IMP] default terms and conditions for quotations on companies
...
bzr revid: fp@tinyerp.com-20130301082928-bdxfr57pjdj33kyp
2013-03-01 09:29:28 +01:00
Fabien Pinckaers
bed8a96291
[FIX] misc contracts fixes, timesheets
...
bzr revid: fp@openerp.com-20130312121218-vsvmaj12px4vqpvz
2013-03-12 13:12:18 +01:00
Ajay Chauhan (OpenERP)
5c202a8ba2
[IMP] sale, sale_stock: remove shop_id concept from sale_condition feature
...
bzr revid: cha@tinyerp.com-20130225090236-k9im6bebl5k5s0wa
2013-02-25 14:32:36 +05:30
Bhumi Thakkar (Open ERP)
69fcf7bb62
[IMP] Remove bold and capital in first letter.
...
bzr revid: bth@tinyerp.com-20130220054249-4n3zpwvo767u6h4l
2013-02-20 11:12:49 +05:30
Ajay Chauhan (OpenERP)
5aeb5a885e
[IMP] made changes in code
...
bzr revid: cha@tinyerp.com-20130215133309-0842owye7wersb0o
2013-02-15 19:03:09 +05:30
Bhumi Thakkar (Open ERP)
a388774265
[IMP] Message on chatter Quotation created for SO and RFQ created when PO created when record created.
...
bzr revid: bth@tinyerp.com-20130215131933-moln7gh4563r1gdx
2013-02-15 18:49:33 +05:30
Bhumi Thakkar (Open ERP)
ad6d133d3c
[MERGE] Merge lp:openobeject-addons.
...
bzr revid: bth@tinyerp.com-20130215122526-einsh4wazw2e1lxs
2013-02-15 17:55:26 +05:30
Ajay Chauhan (OpenERP)
98e8e12ffc
[IMP] made changes in code
...
bzr revid: cha@tinyerp.com-20130215084428-s1sxky78rk0tevak
2013-02-15 14:14:28 +05:30
Ajay Chauhan (OpenERP)
c207c7c21b
[MERGE] merge with lp:openobject-addons
...
bzr revid: cha@tinyerp.com-20130214115126-xskif8vw2arurq7r
2013-02-14 17:21:26 +05:30
Quentin (OpenERP)
3fe67314cc
[MERGE] forward port of fixes made in version 7
...
bzr revid: qdp-launchpad@openerp.com-20130214100628-0eaudbqhflpmjjyf
2013-02-14 11:06:28 +01:00
Ajay Chauhan (OpenERP)
34946cf3fe
[IMP] made sale condition based on shop's company
...
bzr revid: cha@tinyerp.com-20130214093738-2r1wiw6zocozadae
2013-02-14 15:07:38 +05:30
Bhumi Thakkar (Open ERP)
e0dc4a8e4c
[IMP] Quotatioin confirmed message displayed only once when click on confirm sale.
...
bzr revid: bth@tinyerp.com-20130214085056-d7oqjmp2d7l892me
2013-02-14 14:20:56 +05:30
Ajay Chauhan (OpenERP)
6b81689749
merge with lp:openobject-addons
...
bzr revid: cha@tinyerp.com-20130214054214-j99w3zpjf0rqi2i7
2013-02-14 11:12:14 +05:30
Bhumi Thakkar (Open ERP)
00c07052ca
[IMP] Improve code for products delivered.
...
bzr revid: bth@tinyerp.com-20130213112125-1cbzelqg659pwc56
2013-02-13 16:51:25 +05:30
Raphael Collet
5f855a1ddb
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20130213083519-3nbg40h5em0gfeu3
2013-02-13 09:35:19 +01:00
Ajay Chauhan (OpenERP)
67d025a4cb
[IMP] sales terms & conditions note per company
...
bzr revid: cha@tinyerp.com-20130211101257-nw5pvqrs841pe2l9
2013-02-11 15:42:57 +05:30
Bhumi Thakkar (Open ERP)
cc8e739771
[IMP] Improve code to check type of stock picking.
...
bzr revid: bth@tinyerp.com-20130207130633-rm3jv5w4edxuhvxd
2013-02-07 18:36:33 +05:30
Bhumi Thakkar (Open ERP)
7210b2ee42
[IMP] Improve code.
...
bzr revid: bth@tinyerp.com-20130207115205-1j46xhbs85i8q6w4
2013-02-07 17:22:05 +05:30
Bhumi Thakkar (Open ERP)
c097b3aa2a
[IMP] Improve code.
...
bzr revid: bth@tinyerp.com-20130207110549-cvn8nnh50a50fitx
2013-02-07 16:35:49 +05:30
Bhumi Thakkar (Open ERP)
a362d7b222
[IMP] In SO message on chatter when so is delivered.
...
bzr revid: bth@tinyerp.com-20130207091219-23w206581muunjrv
2013-02-07 14:42:19 +05:30
csn-openerp
54d4bf413e
[FIX]sale : traceback in product_id_change, cannot concatenate string and dict object
...
bzr revid: csn@openerp.com-20130207084129-6duxkp96svudaj4n
2013-02-07 09:41:29 +01:00
Bhumi Thakkar (Open ERP)
d025bafb81
[IMP] Message on so when invoice is paid.
...
bzr revid: bth@tinyerp.com-20130207070127-2ngqgsla0l796erw
2013-02-07 12:31:27 +05:30
sgo@tinyerp.com
1150aac0fe
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130206124101-vuf5dkdtsr6bfe08
2013-02-06 18:11:01 +05:30
Tejas Tank
9b8d7de0ac
[IMP] Workflow api changes: [account_payment, account_voucher, hr_holidays, hr_payroll, hr_timesheet_sheet, l10n_in_hr_payroll, point_of_sale, procurement, purchase, sale, sale_stock].
...
bzr revid: tta@openerp.com-20130204082943-vfevxeb7za6r4sy7
bzr revid: tta@openerp.com-20130204112949-07l1v3ru215iglut
2013-02-04 16:59:49 +05:30
Ajay Chauhan (OpenERP)
27bd0dbfef
[FIX] sale: did some changes
...
bzr revid: cha@tinyerp.com-20130201065948-oae060lc7f25z1b3
2013-02-01 12:29:48 +05:30
Olivier Dony
ec9859e0a0
[FIX] sale: fix incorrect on_change on sale.order.line resetting the UoM field + added test
...
lp bug: https://launchpad.net/bugs/1082409 fixed
bzr revid: odo@openerp.com-20130131184356-y9ck1dr31nlsp73r
2013-01-31 19:43:56 +01:00
Ajay Chauhan (OpenERP)
19368fb65c
[IMP] sale: use the new signal_xxx methods instead of trg_validate.
...
bzr revid: cha@tinyerp.com-20130131044608-h5dj2xfqyo8ewm6k
2013-01-31 10:16:08 +05:30
Vishmita
a86611f97b
[Merge]Merge lp:openobject-addons
...
bzr revid: vja@tinyerp.com-20130128064925-t7hibhiysoq7x4td
2013-01-28 12:19:25 +05:30