Commit Graph

938 Commits

Author SHA1 Message Date
Quentin (OpenERP) 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
chm@openerp.com 9eb7a78866 [MERGE] from trunk
bzr revid: chm@openerp.com-20140505112314-1zbn7ae61mg8xavl
2014-05-05 13:23:14 +02:00
chm@openerp.com 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
Gery Debongnie 5aa2fa150c [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
Josse Colpaert 8b84615de1 [MERGE] Merge from trunk test
bzr revid: jco@openerp.com-20140502130352-c3h1fk332eqyd78b
2014-05-02 15:03:52 +02:00
Antony Lesuisse 7e25b9ae55 [MERGE] saas-4 report_webkit missing dependency on report
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
2014-05-01 18:11:56 +02:00
Christophe Simonis 7a7d7febf8 [MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
2014-04-24 15:45:33 +02:00
Denis Ledoux b6255eb55d [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10005 revid:dle@openerp.com-20140422150710-mr9x3vyq0wcg31l5
bzr revid: dle@openerp.com-20140422162028-2icoebrb5q4tg3t3
2014-04-22 18:20:28 +02:00
Denis Ledoux b981f3f8ef [FIX] *: in search views, use operator=child_of instead of filter_domain with a child_of domain
operator child_of has the advantage to do exact ID matching for many2one, and not just matching on the name

bzr revid: dle@openerp.com-20140422150710-mr9x3vyq0wcg31l5
2014-04-22 17:07:10 +02:00
Quentin (OpenERP) 57cebaaac6 [MERGE] merged trunk up to revision 9365.
bzr revid: qdp-launchpad@openerp.com-20140422092815-f4tlfmo8zj1nogbl
2014-04-22 11:28:15 +02:00
Gery Debongnie a17c16a660 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140417110726-8w4oktk7ml416ld7
bzr revid: ged@openerp.com-20140417130144-42bkw3f55xosxnks
2014-04-17 15:01:44 +02:00
DJ Patel c20483a1dd [FIX] sale : Don't allow line creation in confirmed sale oder.
bzr revid: mdi@tinyerp.com-20140408053552-ovo33f2nkhaj6goe
2014-04-08 11:05:52 +05:30
Quentin (OpenERP) e0b27b4ee8 [MERGE] merged trunk up to revision 9251
bzr revid: qdp-launchpad@openerp.com-20140326152751-b6bo0fawrzmd71f0
2014-03-26 16:27:51 +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
Christophe Simonis d504764eff [MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
2014-03-11 15:52:05 +01:00
Denis Ledoux 6deae9e9ea [FIX] *: replace various widgets selection by option no_create, as the purpose of these widgets selection were to actually hide the create and edit and quick create
bzr revid: dle@openerp.com-20140306113021-r280g41vkdyf5ew8
2014-03-06 12:30:21 +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
Christophe Simonis 4b72678bc7 [MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
bzr revid: chs@openerp.com-20140220163815-69sza1kclnh5mavs
2014-02-20 17:38:15 +01:00
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