Commit Graph
60139 Commits
Author SHA1 Message Date
Jiten (OpenERP) f5f1a47c24 [MERGE] Merged trunk.
bzr revid: jra@tinyerp.com-20120920080935-2y2cfc18e65g7a4y
2012-09-20 13:39:35 +05:30
Jiten (OpenERP) 4e28c04c12 [MERGE] Merge trunk.
bzr revid: jra@tinyerp.com-20120920080815-orqimgnvzelu0ef6
2012-09-20 13:38:15 +05:30
Thibault Delavallée 1b79a43833 [FIX] hr_rcruitment: fixed error in xml file.
bzr revid: tde@openerp.com-20120920075622-mn10nv2vu7rkiddx
2012-09-20 09:56:22 +02:00
Thibault Delavallée 3170751a15 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120920075608-t4lvaya9xgttcmhp
2012-09-20 09:56:08 +02:00
Christophe Matthieu 8fbdd9c9bc [MERGE] from trunk
bzr revid: chm@openerp.com-20120920075229-pvr3cnjqpftsjfad
2012-09-20 09:52:29 +02:00
Christophe Matthieu 3863e439d8 [IMP]note: remove options tags, tags for all user inside header bar
bzr revid: chm@openerp.com-20120920075031-lx6k382cd8kcyct9
2012-09-20 09:50:31 +02:00
Thibault Delavallée 7300ba62fe [MERGE] Merged with server/trunk.
bzr revid: tde@openerp.com-20120920074932-7w0zb5o979wffom5
2012-09-20 09:49:32 +02:00
Thibault Delavallée bcbae5e277 [MERGE] Merged with addons/trunk, with lots of conflicts to solve...
bzr revid: tde@openerp.com-20120920074850-7p7or1ze8555fya5
2012-09-20 09:48:50 +02:00
Thibault Delavallée 52b33a8044 [FIX] Followers widget: fixed is_follower bug.
bzr revid: tde@openerp.com-20120920073950-wyrf8pads5j6hgqh
2012-09-20 09:39:50 +02:00
Fabien Pinckaers 8e6135b43a [MERGE] crm fixes
bzr revid: fp@tinyerp.com-20120920073824-tvu3u0khtvqw2eka
2012-09-20 09:38:24 +02:00
Atul Patel (OpenERP) e7eec72ae9 [IMP]: Change pot file
bzr revid: atp@tinyerp.com-20120920073342-7a7diamuqj3no3h7
2012-09-20 13:03:42 +05:30
Fabien Pinckaers 5bee393bc8 [MERGE] fix calendar
bzr revid: fp@tinyerp.com-20120920072641-ur5gl71k8dunzwos
2012-09-20 09:26:41 +02:00
Fabien Pinckaers daed0694a5 [MERGE] fix partial picking wizard
bzr revid: fp@tinyerp.com-20120920072522-skrdqufbgjfcfqcn
2012-09-20 09:25:22 +02:00
Harry (OpenERP) 14a1819fa7 [FIX] stock: fix problem of context to open partial delivery form
bzr revid: hmo@tinyerp.com-20120920050524-7q5swtdm54ry2fkr
2012-09-20 10:35:24 +05:30
Atul Patel (OpenERP) 6da5840e13 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120920045948-9nmja6nmo2kqx53b
2012-09-20 10:29:48 +05:30
Launchpad Translations on behalf of openerp 0ea5dd48a7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120920044355-d5c4cbnt72y3p1so
bzr revid: launchpad_translations_on_behalf_of_openerp-20120920044903-y4xa3t9d4q0d35on
2012-09-20 04:49:03 +00:00
Launchpad Translations on behalf of openerp 44f09718c9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120920044345-m8zcgpnyq7r4iued
2012-09-20 04:43:45 +00:00
Atul Patel (OpenERP) af4e61bb53 [FIX]: Fix some assert problem in yaml as per new sale order.
bzr revid: atp@tinyerp.com-20120920042433-3rgs13orq10x2h9p
2012-09-20 09:54:33 +05:30
Divyesh Makwana (Open ERP) 671bf71505 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120920040456-8c7y5ix7es9mnia9
2012-09-20 09:34:56 +05:30
Divyesh Makwana (Open ERP) ced42b6b07 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120920040343-o7n7otcsufy1y18l
2012-09-20 09:33:43 +05:30
Frédéric van der Essen 53c64544ef [FIX] fixes for note's css
bzr revid: fva@openerp.com-20120919162402-9ai0ckct1cs3jii7
2012-09-19 18:24:02 +02:00
Frédéric van der Essen 04728a30ff [FIX] some fixes for the notes css
bzr revid: fva@openerp.com-20120919162115-2l20lu0r65hyfarb
2012-09-19 18:21:15 +02:00
Olivier Dony 2d0052d77e [MERGE] Sync with trunk
bzr revid: odo@openerp.com-20120919155339-htv0joe24djdcgp2
2012-09-19 17:53:39 +02:00
Antonin Bourguignon cae00c851a [IMP] needaction handling for crm_contact_us model
don't display the needactions anymore next to the 'contact' portal menuitem

bzr revid: abo@openerp.com-20120919145557-p6285mrhw82cv2l6
2012-09-19 16:55:57 +02:00
Antonin Bourguignon 6d7c30af85 [IMP] indentation
bzr revid: abo@openerp.com-20120919145110-81ucvhpf9jcf867y
2012-09-19 16:51:10 +02:00
Fabien Pinckaers c439f18168 [MERGE] notes
bzr revid: fp@tinyerp.com-20120919144607-ylnhfms86wvl2ap7
2012-09-19 16:46:07 +02:00
Fabien Pinckaers e4a91b4900 merge
bzr revid: fp@tinyerp.com-20120919144449-au27d611umh2fr1w
2012-09-19 16:44:49 +02:00
Christophe Matthieu 8e3aa494f1 [MERGE] from trunk
bzr revid: chm@openerp.com-20120919143918-r3sk2cl4ro19i3lm
2012-09-19 16:39:18 +02:00
Christophe Matthieu 245002e48d [IMG] base_calendar, note_pad
bzr revid: chm@openerp.com-20120919143553-lmlvshitpkkftyln
2012-09-19 16:35:53 +02:00
Thibault Delavallée e560a74cb5 [CLEAN] project: cleaned subtypes.
bzr revid: tde@openerp.com-20120919135423-ldfd3fx4wtyss7ae
2012-09-19 15:54:23 +02:00
Thibault Delavallée d85ca655ad [REV] account_voucher: reverted change in notification of account_voucher, somebody took away the message and set back the old message_post way of doing it.
bzr revid: tde@openerp.com-20120919134347-0tp2r52dfzddcuh5
2012-09-19 15:43:47 +02:00
Thibault Delavallée e30e406458 [CLEAN] hr_timesheet_invoice: cleaned subtypes, moved analytic account subtypes to the related module.
bzr revid: tde@openerp.com-20120919133950-upc80g20b711t8c0
2012-09-19 15:39:50 +02:00
Harry (OpenERP) 29e288d2a5 [FIX] sale: now mail.mail
bzr revid: hmo@tinyerp.com-20120919133634-9tj3wqvi6pdr7unk
2012-09-19 19:06:34 +05:30
Thibault Delavallée 10458eb098 [CLEAN] mrp_operation, analytic, account, account_voucher: cleaned subtypes.
bzr revid: tde@openerp.com-20120919133540-e0d8huak2g3v915o
2012-09-19 15:35:40 +02:00
Atul Patel (OpenERP) 9df0234185 [ADD]: Add i18n in sale_stock module with sale_stock.pot module. change sale.pot file into sale module.
bzr revid: atp@tinyerp.com-20120919132931-ff55mghduptc13sr
2012-09-19 18:59:31 +05:30
Bharat Devnani (OpenERP) f46b934a7a [IMP] removed same buttons from More button located at top
bzr revid: bde@tinyerp.com-20120919132454-vic77ff22hjro39t
2012-09-19 18:54:54 +05:30
Divyesh Makwana (Open ERP) 2218b02926 [FIX] product : Improved the test cases.
bzr revid: mdi@tinyerp.com-20120919131305-gyn847qpagdujq0h
2012-09-19 18:43:05 +05:30
Thibault Delavallée b9820db8f0 [CLEAN] hr_holidays, hr_recruitment, idea, mrp: cleaned subtypes.
bzr revid: tde@openerp.com-20120919131240-7cc61fqg5eoom9zt
2012-09-19 15:12:40 +02:00
Quentin (OpenERP) bd06e2f3f4 [IMP] sale, edi: removed auto-email sending at sale.order confirmation (not needed anymore since the email sending is included in the workflow) + removed the stuff related to delay field (moved to sale_stock, but not needed anyway)
bzr revid: qdp-launchpad@openerp.com-20120919131049-ccbplqqum4c7eah4
2012-09-19 15:10:49 +02:00
Thibault Delavallée 378966f9f1 [FIX] event: fixed xml_id not existing.
bzr revid: tde@openerp.com-20120919130514-oeto9qfiujd3v71e
2012-09-19 15:05:14 +02:00
Harry (OpenERP) 7b8d6acf8b [FIX] purchase: use mail.mail model
bzr revid: hmo@tinyerp.com-20120919130412-v9q4hb3pcanjkptk
2012-09-19 18:34:12 +05:30
Fabien Meghazi 16f52fcdb8 [FIX] Kanban quick create should send false if input is empty thus triggering slow create
bzr revid: fme@openerp.com-20120919130239-f7wcd91ng9x6kpo7
2012-09-19 15:02:39 +02:00
Mayur Maheshwari (OpenERP) 933bbca948 [IMP]hr_payroll : little improvement
bzr revid: mma@tinyerp.com-20120919125702-3t0lbcirsiylgu34
2012-09-19 18:27:02 +05:30
Frédéric van der Essen cc733fd0c1 [FIX] some css fixes in notes
bzr revid: fva@openerp.com-20120919125616-lhmx1cjx58f7m8a8
2012-09-19 14:56:16 +02:00
Mayur Maheshwari (OpenERP) 23a5c5ea3f [IMP]hr_payroll : improve domian
bzr revid: mma@tinyerp.com-20120919125540-vawtnggc1xx4u1qf
2012-09-19 18:25:40 +05:30
Hardik 1650c991af [IMP]Product Form, set postion of fields and set label
bzr revid: hsa@tinyerp.com-20120919125059-82uazhvyng025jwd
2012-09-19 18:20:59 +05:30
Fabien Meghazi 3896111478 [IMP] Make kanban quick create button a toggler
bzr revid: fme@openerp.com-20120919124859-l5fci8nwxf2jtu18
2012-09-19 14:48:59 +02:00
Raphael Collet b0b4b4b252 [MERGE] trunk-portal-access-manager-hmo:
- simplify the portal model, now reduced to a group with a flag
- remove groups Portal/Manager and Portal/Officer
- the portal wizard now shows which contacts are in a given portal, and allows to add/remove users to/from it

bzr revid: rco@openerp.com-20120919124137-1ete2abin1pvg13s
2012-09-19 14:41:37 +02:00
Fabien Meghazi d3a1e1fa14 [FIX] form's bounce effect steals click event
bzr revid: fme@openerp.com-20120919123957-03w10n76011to6q0
2012-09-19 14:39:57 +02:00
Thibault Delavallée 4312649fb5 [FIX] mail_thread: moved get_object_reference into if exist.
bzr revid: tde@openerp.com-20120919123318-k2wax6npnm1tw1mm
2012-09-19 14:33:18 +02:00