Commit Graph

970 Commits

Author SHA1 Message Date
Olivier Dony ed355097fe [FIX] sale: avoid resetting groups for editable mode at each update/upgrade (no noupdate flag on this record)
bzr revid: odo@openerp.com-20140218174805-4qak0esqpikt372q
2014-02-18 18:48:05 +01:00
Olivier Dony bbd813e76e [MERGE] Forward-port of latest saas-2 (incl. 7.0) bugfixes, up to rev. 9127 odo@openerp.com-20140212122042-3m2tysmr31mtecnc
bzr revid: odo@openerp.com-20140212175141-i9yz8zlseglrk8sb
2014-02-12 18:51:41 +01:00
Cedric Snauwaert 9b249181e3 [MERGE]merge with latest trunk
bzr revid: csn@openerp.com-20140210161556-qq52vvhdegyda7k6
2014-02-10 17:15:56 +01:00
Denis Ledoux 0043f81e33 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9824 revid:dle@openerp.com-20140210134603-ck0jr56xhl8xgzg2
bzr revid: dle@openerp.com-20140210141704-sjzjwhe7fh5gszxr
2014-02-10 15:17:04 +01:00
Denis Ledoux 6e3d193517 [FIX] sale, sale_stock: send by email button visible when sent, progress or manual
+ remove 'invoiced' from statusbar_visible, as there is no such state
+ proper inherit in sale_stock form view

bzr revid: dle@openerp.com-20140210134603-ck0jr56xhl8xgzg2
2014-02-10 14:46:03 +01:00
Thibault Delavallée 1b13217838 [MERGE] sales/crm: minor improvements in account_analytic_analysis, crm, event_sale, hr_timesheet_invoice, sale views
bzr revid: tde@openerp.com-20140205160347-nptajwoxfl5ylfa9
2014-02-05 17:03:47 +01:00
Quentin (OpenERP) 753f7541db [MERGE] main trunk
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
2014-02-03 18:30:00 +01:00
Christophe Simonis 731019154a [MERGE] forward port of branch saas-2 up to revid 9109 dle@openerp.com-20140129171022-wf6244k90lpncmah
bzr revid: chs@openerp.com-20140129184703-ypd7iqnor5m5lr3d
2014-01-29 19:47:03 +01:00
Denis Ledoux 1fb1a6f2af [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9789 revid:dle@openerp.com-20140124120102-we2yxio553ws2yz4
bzr revid: dle@openerp.com-20140120174449-tui0a24zgn9bien2
bzr revid: dle@openerp.com-20140121125538-ke7i6kaz486hwgl8
bzr revid: dle@openerp.com-20140122134115-0ogjemlqe327xoac
bzr revid: dle@openerp.com-20140123103655-mf2zslfbgue97ed2
bzr revid: dle@openerp.com-20140124121027-uk9zy4dx9tqlsblr
2014-01-24 13:10:27 +01:00
Denis Ledoux 27224c9b9e [FIX] sale, purchase, sale_stock: on orders lines, on product changed, change the uom (even if the uom is in the same category)
bzr revid: dle@openerp.com-20140123103505-7pm9526ot2f5u7wa
2014-01-23 11:35:05 +01:00
Gery Debongnie ae13bea0d8 [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon sale)
bzr revid: ged@openerp.com-20131224102942-5g4gchmgyloo2s06
2013-12-24 11:29:42 +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 2cba6a5355 [MERGE] Forward-port of latest 7.0 fixes up to rev 9629 rev-id odo@openerp.com-20131121153230-keie85rmes2zh2o8
bzr revid: chs@openerp.com-20131121112139-aw2ara1i1xymue62
bzr revid: odo@openerp.com-20131121154205-ul9hf9tz3h0x2n7m
2013-11-21 16:42:05 +01:00
Mohammed Shekha (OpenERP) f3ff6b4bfb [FIX]Fixed the issue of active state does not get highlighted in sale order line, the issue raised due to double state field in the view.
bzr revid: msh@openerp.com-20131106072745-5ssemxhquw2343by
2013-11-06 12:57:45 +05:30
Atul Patel (OpenERP) 89c428bd84 [MERGE]: Merged with addons
bzr revid: atp@tinyerp.com-20131029133906-xrxccq8zm285m2zw
2013-10-29 19:09:06 +05:30
Quentin (OpenERP) 65966940c8 [MERGE] merged with main trunk
bzr revid: qdp-launchpad@openerp.com-20131010133212-t058auv973pvvmjm
2013-10-10 15:32:12 +02:00
Frédéric van der Essen 0554984deb [FIX] sale.shop: The pricelist should be a required field
bzr revid: fva@openerp.com-20130913125748-x5wa2zsyc7rijim2
2013-09-13 14:57:48 +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
Thibault Delavallée 8b48cc9520 [MERGE] addons: added groups when quick creating user in various addons.
bzr revid: tde@openerp.com-20130904141122-uaxlnu7qxzri4q3a
2013-09-04 16:11:22 +02:00
Thibault Delavallée ed0a829cb3 [MERGE] [IMP] addons: improved name and tooltips of groupby date in various addons.
bzr revid: tde@openerp.com-20130904141053-yustqiuzynbettq8
2013-09-04 16:10:53 +02:00
Josse Colpaert 5ef4e485ff [FIX] Add extra base menu for invoicing
bzr revid: jco@openerp.com-20130903161651-he9hvw18yetykocq
2013-09-03 18:16:51 +02:00
Josse Colpaert 9e15fb27b6 [WIP] rereserve + store on remaining qty in move + remove route_id
bzr revid: jco@openerp.com-20130822122103-a4qgvukgho8vuwv9
2013-08-22 14:21:03 +02:00
Josse Colpaert ee59841b3d [WIP] Rereserve function for button + route_id on sales order line form view
bzr revid: jco@openerp.com-20130822094813-jnvpa7rzsj6obr1p
2013-08-22 11:48:13 +02:00
Atul Patel (OpenERP) 4887732bdd [MERGE]: Merged with addons
bzr revid: atp@tinyerp.com-20130617043951-xukg3kojn8p6f8e2
2013-06-17 10:09:51 +05:30
Atul Patel (OpenERP) a003381647 [MERGE]: Merged with addons
bzr revid: atp@tinyerp.com-20130612115836-cvsgd903an5szcy1
2013-06-12 17:28:36 +05:30
sgo@tinyerp.com 1202f9c6d5 [MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130605072213-cwxmjtzt36434mgt
2013-06-05 12:52:13 +05:30
Christophe Matthieu a26c8d76b9 [MERGE] from trunk
bzr revid: chm@openerp.com-20130503140029-vv7u9gjmax73qyta
2013-05-03 16:00:29 +02:00
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
Olivier Dony 451f8df250 [FIX] sale: orders/quotations action should not force `display_address` flag
Doing so affects autocompletion of search results, etc.
while the fields on the form view are already properly
displayed anyway.

bzr revid: odo@openerp.com-20130418172022-e3lu35xq191jxcyu
2013-04-18 19:20:22 +02:00
Christophe Matthieu d388383adb [IMP] salesteams: gauge label color, action context
bzr revid: chm@openerp.com-20130418103015-si1vjq1scivoqxfu
2013-04-18 12:30:15 +02:00
sgo@tinyerp.com d1e17fbde0 [MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130417061434-zry7pxo7fb17063k
2013-04-17 11:44:34 +05:30
Olivier Dony 41d3c2ae88 [FIX] sale: use invoicing partner rather than main one for analytic account context, spotted by Raphael Valyi on bug 1160365
lp bug: https://launchpad.net/bugs/1160365 fixed

bzr revid: odo@openerp.com-20130408030052-xgk5p8zkagu21scs
2013-04-08 05:00:52 +02:00
Olivier Dony ed62e36691 [FIX] account_voucher,sale,purchase: include contacts matches when searching for company documents
This implements part E of the solution described on bug 1160365

lp bug: https://launchpad.net/bugs/1160365 fixed

bzr revid: odo@openerp.com-20130408005526-7124r7u39yhh9la3
2013-04-08 02:55:26 +02:00
Thibault Delavallée 040ceb0125 [IMP] crm, project: fixed css issues preventing alias to be displayed in readonly mode; improved form view of salesteams and project about aliases; improved sequence of menus to display salesteam as first menu entry.
bzr revid: tde@openerp.com-20130404115627-3vw1uv4xrmeu13k2
2013-04-04 13:56:27 +02:00
Thibault Delavallée ba9412cb5d [CLEAN] addons: various linkt cleanup (indentation, spaces, ...).
bzr revid: tde@openerp.com-20130403081009-jy35sm7dl4pq7eyu
2013-04-03 10:10:09 +02:00
Christophe Matthieu 547343e3af [IMP] crm.case.section: salesteams view and search
bzr revid: chm@openerp.com-20130325115438-xofnoi1ua6tk1dxr
2013-03-25 12:54:38 +01:00
Christophe Matthieu ae30f8fff3 [MERGE] from trunk
bzr revid: chm@openerp.com-20130320125517-jv2ot85iypncoesj
2013-03-20 13:55: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
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
Quentin (OpenERP) be05b374a1 [MERGE] forwardport of bugfixes made in v7 up to revision 8854.
bzr revid: qdp-launchpad@openerp.com-20130314112740-s01t51p4m7mxcumz
2013-03-14 12:27:40 +01:00
Christophe Matthieu b255703166 [MERGE] from trunk
bzr revid: chm@openerp.com-20130313141718-dw76m7fvy0co3rfi
2013-03-13 15:17:18 +01:00
Fabien Pinckaers c7d709e579 [FIX] misc fixes on contracts, timesheets
bzr revid: fp@openerp.com-20130312123321-mly0k9lrh3im78bg
2013-03-12 13:33:21 +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
sgo@tinyerp.com a21b4b9b56 [MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130311045638-npwv6lb6bc9i3m1y
2013-03-11 10:26:38 +05:30
Olivier Dony 8453234ead [FIX] all: change confusing labels on Cancel buttons in form views
bzr revid: odo@openerp.com-20130304184431-1p8byycyl0nv26qx
2013-03-04 19:44:31 +01:00
Thibault Delavallée a7a7868a3a [IMP] various: removed custom placeholders for chatter, because default message should be sufficient in most cases.
bzr revid: tde@openerp.com-20130304125534-u3zoe730jd1ry3ng
2013-03-04 13:55:34 +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
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
Ajay Chauhan (OpenERP) b183a34341 [MERGE] merge with lp:openobject-addons
bzr revid: cha@tinyerp.com-20130225070804-tkt5b8m5zuohfuf5
2013-02-25 12:38:04 +05:30
Fabien Pinckaers b90829f3ea [IMP] buttons in forms, instead of related actions
bzr revid: fp@openerp.com-20130224112142-p9g0p7yg3hmq59eb
2013-02-24 12:21:42 +01:00
Olivier Dony af065f1dfc [FIX] sale: change confusing labels on Cancel buttons
bzr revid: odo@openerp.com-20130221150412-m4dqjuctf980zc6p
2013-02-21 16:04:12 +01:00
Vishmita 3222e81ef6 [IMP]Improve product actions
bzr revid: vja@tinyerp.com-20130220104104-91l7ox1rie02ap3p
2013-02-20 16:11:04 +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) 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
Christophe Matthieu b76f4c7a45 [IMP] salesteams: add sales order and quotation
bzr revid: chm@openerp.com-20130206094414-8f7kp19dam6su991
2013-02-06 10:44:14 +01:00
sgo@tinyerp.com cf6595baf2 [IMP]remove total sale.shop from sales
bzr revid: sgo@tinyerp.com-20130121100542-36qmkrd82md97phv
2013-01-21 15:35:42 +05:30
Randhir Mayatra (OpenERP) 5c1a414983 [IMP] make changes of usablity in event and sale
bzr revid: rma@tinyerp.com-20130118113212-x0c1a21w9bledpot
2013-01-18 17:02:12 +05:30
Fabien Pinckaers 19b34c4908 [IMP] default analytic account type from so=contract
bzr revid: fp@tinyerp.com-20121226142524-7gdor0b13fvg0515
2012-12-26 15:25:24 +01:00
dle@openerp.com e5e8d2fbe0 [FIX]in leads form view, invisible Escalate button, when sales team is blank,in sale order form view, visible update button in Quotation Sent status
bzr revid: dle@openerp.com-20121226110141-fxrkpkbgh6bwy7j1
2012-12-26 12:01:41 +01:00
Olivier Dony 49597f0e66 [MERGE] *: improved english wording, suggestions courtesy of OpenERP Community
bzr revid: odo@openerp.com-20121221164808-kdjrtcbgma4dr3on
2012-12-21 17:48:08 +01:00
Khushboo Bhatt (Open ERP) a9cb75a811 [FIX]sale:string updated
bzr revid: kbh@tinyerp.com-20121220124346-2wp20yd7fe2dz12g
2012-12-20 18:13:46 +05:30
Khushboo Bhatt (Open ERP) ac4442df60 [FIX]sale:help updated
bzr revid: kbh@tinyerp.com-20121220114356-q7w7oodmv83no6n9
2012-12-20 17:13:56 +05:30
Khushboo Bhatt (Open ERP) 7fb3086296 [FIX]sale:string updated
bzr revid: kbh@tinyerp.com-20121219094942-6dkketgcdtxktvrl
2012-12-19 15:19:42 +05:30
Antony Lesuisse 045c04a3a2 [MERGE] trunk
bzr revid: al@openerp.com-20121208174511-a4dhw2odli43ftfp
2012-12-08 18:45:11 +01:00
Fabien Pinckaers 40ad98bee1 [FIX] product_id in SO line tree
bzr revid: fp@tinyerp.com-20121208110533-jnatovmnhe007y77
2012-12-08 12:05:33 +01:00
Fabien Pinckaers fae0f2e539 [MERGE] fix account asset, event, purchase
bzr revid: fp@tinyerp.com-20121208103338-5cm3knhiaijvgks4
2012-12-08 11:33:38 +01:00
Rajesh Prajapati (OpenERP) 2c130707a7 [IMP] General : Mark Read and Mark Unread removed from all objects
bzr revid: rpr@tinyerp.com-20121130095239-e60l299dut71x5ng
2012-11-30 15:22:39 +05:30
Nimesh (Open ERP) 2f3d541801 [IMP] add prodcut_id field in view to filter by product.
bzr revid: nco@tinyerp.com-20121130075535-hclf733wzodbeqgt
2012-11-30 13:25:35 +05:30
Rucha (Open ERP) ca668a8acb [MERGE]: Merged with latest trunk-addons
bzr revid: rpa@tinyerp.com-20121130055252-9lu0qeabe2zcndcj
2012-11-30 11:22:52 +05:30
Atul Patel (OpenERP) 5aee5bf58d [FIX]: Fix for event sale module.
bzr revid: atp@tinyerp.com-20121129130856-cy0z91i36idorpbh
2012-11-29 18:38:56 +05:30
vta vta@openerp.com 07a7e7c81c [FIX] Hide 'Invoice' button on sale.order.line form view.
bzr revid: vta@openerp.com-20121129123831-64axxpxficmkyvp7
2012-11-29 13:38:31 +01:00
vta vta@openerp.com 76417f249f [MERGE] trunk-improve_portal-vta.
bzr revid: vta@openerp.com-20121129090801-mheiq7yb3h24onqf
2012-11-29 10:08:01 +01:00
Thibault Delavallée 4e2c317c28 [FIX] Accuracy of the various server actions 'mark read' and 'mark unread': updated their name by adding the model name to be more precise when seing them in a list.
lp bug: https://launchpad.net/bugs/1082199 fixed

bzr revid: tde@openerp.com-20121128145159-d1b2j6swvhdnnl0i
2012-11-28 15:51:59 +01:00
Fabien Pinckaers 854284b6af [MERGE] fgi improve
bzr revid: fp@openerp.com-20121127215908-q5yt8nwna6gmdu88
2012-11-27 22:59:08 +01:00
Christophe Matthieu 5b714460ba [FIX] accuracy of the mail server action 'mark read' and 'mark unread'
bzr revid: chm@openerp.com-20121126103804-yhcvekt0ruq4fef1
2012-11-26 11:38:04 +01:00
Quentin (OpenERP) 02f55a72f7 [FIX] sale, account: fixed the invoicing flow for the following use case 'i make a SO for "joel@c2c", at the confirmation the invoice is sent to "accounting department@c2c" and finally the journal items created are for "c2c"'
bzr revid: qdp-launchpad@openerp.com-20121126092658-g981dg91gcjp1tvl
2012-11-26 10:26:58 +01:00
Saurang Suthar 7962dd0fef [IMP]sale:align Create Invoice button left side
bzr revid: ssu@tinyerp.com-20121122094447-7d4025qkamy8ema2
2012-11-22 15:14:47 +05:30
vta vta@openerp.com 9a15327d52 [MERGE] Latest trunk.
bzr revid: vta@openerp.com-20121121091133-svpmfiurclr7n69e
2012-11-21 10:11:33 +01:00
vta vta@openerp.com c4d1a21007 [IMP] Improved portal autofollow system in sale orders and invoices. Minor fixes in views.
bzr revid: vta@openerp.com-20121120074552-f8h64e3d2jcc03bm
2012-11-20 08:45:52 +01:00
Olivier Dony 1829317730 [IMP] typo: uniform naming of Send By Email
bzr revid: odo@openerp.com-20121116170330-tzz613767wnayzsr
2012-11-16 18:03:30 +01:00
Olivier Dony c558ac6272 [MERGE] Sync with trunk
bzr revid: odo@openerp.com-20121114172252-q1xj3hdugqhky532
bzr revid: odo@openerp.com-20121115135141-ia8uf5649rapj0v7
2012-11-15 14:51:41 +01:00
Fabien Pinckaers 0cca84f1f7 [IMP] views
bzr revid: fp@tinyerp.com-20121115083400-i18b1yxfkq6j7y70
2012-11-15 09:34:00 +01:00
Olivier Dony da27871dae [IMP] sale,portal_sale: make action xids more explicit, for use in signup URLs as #action=action_xid
bzr revid: odo@openerp.com-20121114113823-38i21sacrqlzk9id
2012-11-14 12:38:23 +01:00
Turkesh Patel (Open ERP) 1d49a96089 [IMP] change name of method.
bzr revid: tpa@tinyerp.com-20121109063531-ywqipjlza24tl48x
2012-11-09 12:05:31 +05:30
Turkesh Patel (Open ERP) e3ad0798bd [IMP] sale:Add a button 'New Copy of Quotation' that is visible in cancel state only and opens new so.
bzr revid: tpa@tinyerp.com-20121109052748-bgwqr3vwnhjkl93y
2012-11-09 10:57:48 +05:30
Fabien Pinckaers a19b7ceb27 [IMP] project reevaluate task when reopening
bzr revid: fp@tinyerp.com-20121108100947-tktayv1tt0by059z
2012-11-08 11:09:47 +01:00
Amit Patel a049c1e05b [MERGE]:trunk
bzr revid: apa@tinyerp.com-20121030045457-4hyfaqx3xwx6jqhe
2012-10-30 10:24:57 +05:30
Khushboo Bhatt (Open ERP) d922d61c90 [IMP]sale:typo(button string changed)
bzr revid: kbh@tinyerp.com-20121029065157-swqmxxkgtreyw8tm
2012-10-29 12:21:57 +05:30
Khushboo Bhatt (Open ERP) e48a9a3029 [IMP]when sale order is cancelled,now it can be reset as draft
bzr revid: kbh@tinyerp.com-20121029062903-13oxndmzs3r7ti2p
2012-10-29 11:59:03 +05:30
Fabien Pinckaers 4f0c5bf19c [IMP] contract useability and invoicing
bzr revid: fp@openerp.com-20121028151537-98wz6qiosmumbqvg
2012-10-28 16:15:37 +01:00
Fabien Pinckaers e6159de18f [IMP] useability
bzr revid: fp@tinyerp.com-20121026153436-v3y2i49iarpoknok
2012-10-26 17:34:36 +02:00
Fabien Pinckaers a7368145ca [MERGE] typo
bzr revid: fp@openerp.com-20121024201424-98la8f2wkhfjrtae
2012-10-24 22:14:24 +02:00
Fabien Pinckaers 65c2193e33 [MERGE] fix breadcrum bouncing issue
bzr revid: fp@tinyerp.com-20121022173520-zr373cyq3nvrhvrv
2012-10-22 19:35:20 +02:00
Fabien Pinckaers cffa0d1ee4 [MERGE] misc fixes: expenses, products, crm, sale
bzr revid: fp@tinyerp.com-20121022172639-u4l0ed99wr6znjew
2012-10-22 19:26:39 +02:00
Mayur Maheshwari (OpenERP) 1901cda266 [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20121019052334-zgq8u774xdrns0pd
2012-10-19 10:53:34 +05:30
Atul Patel (OpenERP) 9b01d57864 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20121016172329-23rl227ea0822ucr
2012-10-16 22:53:29 +05:30
Atul Patel (OpenERP) 94bca52631 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20121016171502-ldl0i75wv50sgdyy
2012-10-16 22:45:02 +05:30
Mayur Maheshwari (OpenERP) 866a761177 [IMP]sale : improve strings
bzr revid: mma@tinyerp.com-20121016102134-j4qa22us07at9ivw
2012-10-16 15:51:34 +05:30