Commit Graph
81391 Commits
Author SHA1 Message Date
pso (OpenERP) e8a3d11ba3 [MERGE] Merged with main branch
bzr revid: pso@tinyerp.com-20120820050142-81nb86dbv328rp13
2012-08-20 10:31:42 +05:30
Foram Katharotiya (OpenERP) 57c0a8b202 [MERGE] merge with parent branch
bzr revid: fka@tinyerp.com-20120817053302-buq76ju4k9xohtb7
bzr revid: fka@tinyerp.com-20120820050108-ln0mpvud03ebf9tr
2012-08-20 10:31:08 +05:30
Amit Patel (OpenERP) 56f55ff563 [MERGE]:merged with trunk
bzr revid: apa@tinyerp.com-20120817051648-4p0a7nf36v5li5tr
bzr revid: apa@tinyerp.com-20120820045351-lfchsrsjpaj0mabn
2012-08-20 10:23:51 +05:30
Fabien Pinckaers 6741e7a653 imp
bzr revid: fp@openerp.com-20120819204421-mbcxtc9uxx0zjcra
2012-08-19 22:44:21 +02:00
Fabien Pinckaers 26881fb462 [DUMMY] temporary add TODO.txt to keep track of remaining cleanings
bzr revid: fp@openerp.com-20120819204045-wz4r82kmh87j0s3b
2012-08-19 22:40:45 +02:00
Fabien Pinckaers 432740bf60 [DUMMY] temporary add TODO.txt to keep track of remaining cleanings
bzr revid: fp@openerp.com-20120819203941-8yllg5g3i9mmorsl
2012-08-19 22:39:41 +02:00
Fabien Pinckaers 17c295a964 [IMP] removing some options and requirement of ds_thread
bzr revid: fp@openerp.com-20120819175309-9c3bl70yg10mmkqr
2012-08-19 19:53:09 +02:00
Fabien Pinckaers 229096453c [IMP] remove formatting code and unused method
bzr revid: fp@openerp.com-20120819165039-kgs71kkn436753tz
2012-08-19 18:50:39 +02:00
Fabien Pinckaers 1b8d190829 [IMP] merging _get_pushed_messages and message_read, still have to add a domain on message_read based on notifications
bzr revid: fp@openerp.com-20120819162832-ffzlm7zej7qrn11l
2012-08-19 18:28:32 +02:00
Fabien Pinckaers 1a4f68554d [IMP] needaciton + mail
bzr revid: fp@openerp.com-20120819150038-u6519dee90enzui4
2012-08-19 17:00:38 +02:00
Fabien Pinckaers 03f4b992ad [IMP] need action & mails
bzr revid: fp@openerp.com-20120819145928-5bw5lo6dn4ni4gl7
2012-08-19 16:59:28 +02:00
Antony Lesuisse 9988c468f9 [MERGE] diagram view label
bzr revid: al@openerp.com-20120819124631-guc52cy0xs0n8363
2012-08-19 14:46:31 +02:00
Antony Lesuisse 516f7afbf3 [MERGE] diagram view label
bzr revid: al@openerp.com-20120819124607-85jndw0al3yr0m9g
2012-08-19 14:46:07 +02:00
Antony Lesuisse 7e7c583d24 [FIX] web_api example, renamed from web_rpc
bzr revid: al@openerp.com-20120819010646-ujct3dwe9j0pmjq6
2012-08-19 03:06:46 +02:00
Antony Lesuisse d43eb323f1 [FIX] form field statusbar clickable class
bzr revid: al@openerp.com-20120818225151-y2nymkwwn10uvo7u
2012-08-19 00:51:51 +02:00
Antony Lesuisse e9d39f98a0 [FIX] form field statusbar clean version
bzr revid: al@openerp.com-20120818221035-zue58v11r1qmbcbo
2012-08-19 00:10:35 +02:00
Antony Lesuisse a730933cdb [IMP] abstractfield options replace getter by attribute
bzr revid: al@openerp.com-20120818201859-xjpvcmipg59f0p3e
2012-08-18 22:18:59 +02:00
Antony Lesuisse ccfa1eb252 [IMP] abstractfield options replace getter by attribute
bzr revid: al@openerp.com-20120818201632-5aoioz8mhu62im3p
2012-08-18 22:16:32 +02:00
Antony Lesuisse 87bba93d4b [REM] unused files from calendar
bzr revid: al@openerp.com-20120818173505-6i414945p102fp0c
2012-08-18 19:35:05 +02:00
Antony Lesuisse 0b2d038be6 [IMP] on the mini fly. With gzip openerp 7 js is around 500kb.
bzr revid: al@openerp.com-20120818173437-7ua4hjbswob6byh7
2012-08-18 19:34:37 +02:00
Antony Lesuisse 11c6cabf19 [FIX] auth_oauth remove console.log
bzr revid: al@openerp.com-20120818171914-fuvq7wh33nkdavli
2012-08-18 19:19:14 +02:00
Antony Lesuisse 297cff0449 [MERGE] auth_config
bzr revid: al@openerp.com-20120818164932-tt7mpm1p5k3i5unu
2012-08-18 18:49:32 +02:00
Antony Lesuisse 4f76c4e8d9 improve config wizard labels
bzr revid: al@openerp.com-20120818164636-ue0fljh45smzskb9
2012-08-18 18:46:36 +02:00
Antony Lesuisse b10545edf2 typo
bzr revid: al@openerp.com-20120818133607-ex57qifuysqmvao8
2012-08-18 15:36:07 +02:00
Antony Lesuisse 01c56cbb92 oauth config wizard
bzr revid: al@openerp.com-20120818130411-auxfh3lc0r801kym
2012-08-18 15:04:11 +02:00
Launchpad Translations on behalf of openerp 6cce0bd9fc Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120818045843-s3w3d71x75m26ww8
2012-08-18 04:58:43 +00:00
Antonin Bourguignon 92b32aa767 [FIX] note: properly override the 'Feeds' top level item with 'Home'. also add a menu section and sub menuitems with temporary actions
bzr revid: abo@openerp.com-20120817163953-3aaoe31xlxdnn7vd
2012-08-17 18:39:53 +02:00
Minh Tran fff594348a fixed the 'more' dropdown menu
bzr revid: mit@openerp.com-20120817155551-4eq9lumqderd09rl
2012-08-17 17:55:51 +02:00
Frédéric van der Essen 69578a30c2 [MERGE] from stw
bzr revid: fva@openerp.com-20120817154315-yj19b39s2693apze
2012-08-17 17:43:15 +02:00
Frédéric van der Essen da93d8b440 [IMP] point_of_sale: all images are app-cached now
bzr revid: fva@openerp.com-20120817154248-z86i0a838wd9ul92
2012-08-17 17:42:48 +02:00
Stephane Wirtel 62ffc54bf2 [MERGE] improve the point of sale
bzr revid: stw@openerp.com-20120817151933-ztflsr992l8ixze8
2012-08-17 17:19:33 +02:00
Stephane Wirtel 890371d982 [IMP] point_of_sale: fix some typo
[FIX] point_of_sale: add some groups

bzr revid: stw@openerp.com-20120817151529-1kkm9m5g5ob291ur
2012-08-17 17:15:29 +02:00
Antonin Bourguignon b34138bbeb [FIX] note: forgot to add note_data.xml to the descriptor
bzr revid: abo@openerp.com-20120817151312-4y2mdrimw8xu4uhy
2012-08-17 17:13:12 +02:00
Minh Tran 65ac532462 darker purple and config view alignment
bzr revid: mit@openerp.com-20120817151229-iuujaaw5aflujgzq
2012-08-17 17:12:29 +02:00
Fabien Pinckaers 2756495b4f fix
bzr revid: fp@tinyerp.com-20120817145010-lnh2496hi1o90eu5
2012-08-17 16:50:10 +02:00
Fabien Pinckaers 07c5ee86d6 fix
bzr revid: fp@tinyerp.com-20120817144949-wrqo086h3dx6f3kx
2012-08-17 16:49:49 +02:00
Minh Tran cd61e064d9 merge from trunk
bzr revid: mit@openerp.com-20120817144404-sxy9g3druktsu579
2012-08-17 16:44:04 +02:00
Minh Tran 11fcfa2b07 fix removed a useless line in sass
bzr revid: mit@openerp.com-20120817143735-hverq9jb72kn2zdb
2012-08-17 16:37:35 +02:00
Stephane Wirtel 4230baf35a [FIX] point_of_sale: set the 'False' value to opening_control and closing_control
bzr revid: stw@openerp.com-20120817143134-v9vjzvgh5kddeduc
2012-08-17 16:31:34 +02:00
Minh Tran f4723d16d0 merge mit-trunk
bzr revid: mit@openerp.com-20120817142917-31iuftau2gwno9e8
2012-08-17 16:29:17 +02:00
Stephane Wirtel 211a9d0904 [FIX] point_of_sale: Typo
bzr revid: stw@openerp.com-20120817142838-rc2zu2xa57xoty7f
2012-08-17 16:28:38 +02:00
Quentin (OpenERP) e1cd328909 [FIX] base: the label of vat field now displays 'TIN' instead of 'TVA'. A US term consistent with the default value of the language used.
bzr revid: qdp-launchpad@openerp.com-20120817142748-3qpytqt5s9dthjcb
2012-08-17 16:27:48 +02:00
Frédéric van der Essen f3cc34175b [MERGE] from trunk
bzr revid: fva@openerp.com-20120817142625-z8f4sjcvoy4d2wyn
2012-08-17 16:26:25 +02:00
Quentin (OpenERP) e327c8a663 [FIX] purchase: PO report now display 'TIN' instead of 'TVA'. A US term consistent with the default value of the language used.
bzr revid: qdp-launchpad@openerp.com-20120817142617-50jzahsxq1bz004x
2012-08-17 16:26:17 +02:00
Frédéric van der Essen e47792d9bf [IMP] point_of_sale: category pictures are back and cached
bzr revid: fva@openerp.com-20120817142415-3k9cdc1mc68n8shk
2012-08-17 16:24:15 +02:00
Minh Tran 86f04a8726 darker link color and padding fix
bzr revid: mit@openerp.com-20120817142229-v8pvwnysx8vpqyl0
2012-08-17 16:22:29 +02:00
Antonin Bourguignon 9a7cc1436d [IMP] note: rename the to level menu 'Feeds' into 'Home'
bzr revid: abo@openerp.com-20120817135749-yr9pg3hc2u5mo62q
2012-08-17 15:57:49 +02:00
Antony Lesuisse 651b7baf5f [FIX] header padding
bzr revid: al@openerp.com-20120817135713-vyvu8scxttsy04rr
2012-08-17 15:57:13 +02:00
Olivier Dony 6b18295b80 [MERGE] OPW 578181: fix missing column in hr.holiday list, making group by date_from fail miserably
bzr revid: odo@openerp.com-20120817135555-clyc6lxnnx7zjbw0
2012-08-17 15:55:55 +02:00
Antonin Bourguignon 9c811fb481 [FIX] note: extract demo data in note_demo.xml
bzr revid: abo@openerp.com-20120817135249-mg1eovpwt3u4lli2
2012-08-17 15:52:49 +02:00