Commit Graph

791 Commits

Author SHA1 Message Date
Priyesh (OpenERP) d7504b7f20 [FIX]project_timesheet: Fix KeyError: user_id coming due to not creation unique id from postgres view
bzr revid: mma@tinyerp.com-20121129112039-fz7jzsdza48z631c
2012-11-29 16:50:39 +05:30
Launchpad Translations on behalf of openerp 4b464deeee Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121129051532-an3wp6f216pkzxiz
bzr revid: launchpad_translations_on_behalf_of_openerp-20121129052158-2gjacp96ppgmvr5t
2012-11-29 05:21:58 +00:00
Divyesh Makwana (Open ERP) 5a99f89428 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121129042714-bnoz2lppywpiygb8
2012-11-29 09:57:14 +05:30
Divyesh Makwana (Open ERP) 08eb7c44cc [IMP] project_timesheet : Hide the Contracts to Renew from the project/user.
bzr revid: mdi@tinyerp.com-20121128051659-r3b2x7fngn5bai4x
2012-11-28 10:46:59 +05:30
Launchpad Translations on behalf of openerp 09eccd07dc Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121128044150-jz3ll5wdeuxmt0uq
bzr revid: launchpad_translations_on_behalf_of_openerp-20121128045740-q3cav2rhekdy6gq8
2012-11-28 04:57:40 +00:00
Divyesh Makwana (Open ERP) 8b3042e584 [IMP] project_timesheet : Hide the Invoice Tasks Work from the project/user.
bzr revid: mdi@tinyerp.com-20121127095241-p0qg1kdssm201ff5
2012-11-27 15:22:41 +05:30
Launchpad Translations on behalf of openerp 828cce9be0 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121125063324-fjz8k77annh364u7
bzr revid: launchpad_translations_on_behalf_of_openerp-20121126044235-u20vi1440dgppikf
bzr revid: launchpad_translations_on_behalf_of_openerp-20121125064209-s515ia18188hl147
bzr revid: launchpad_translations_on_behalf_of_openerp-20121126045508-rm6d2mx71a0sjqh9
2012-11-26 04:55:08 +00:00
Launchpad Translations on behalf of openerp 117bf937b9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124055830-p04ni2o2ogsch9zc
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124065500-zwtkurcb1ic9ktqb
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124070752-itto1xb6r6oao3z5
2012-11-24 07:07:52 +00:00
Olivier Dony 771b216118 [I18N] Update translation templates in preparation for 7.0 release
bzr revid: odo@openerp.com-20121124030804-9dvr1qwec830p8fc
2012-11-24 04:08:04 +01:00
Fabien Pinckaers 47cc5201a1 [MERGE]
bzr revid: fp@tinyerp.com-20121102094035-1z0lyf8dcr99a6i1
2012-11-02 10:40:35 +01:00
Fabien Pinckaers 726a8e6c10 [MERGE] useability improvement
bzr revid: fp@tinyerp.com-20121102083612-xb2qvaqhgxunfipg
2012-11-02 09:36:12 +01:00
Amit Patel 6595c6e831 [MERGE]:trunk
bzr revid: apa@tinyerp.com-20121101060947-3a7trzeiiuij9nt1
2012-11-01 11:39:47 +05:30
Launchpad Translations on behalf of openerp 87d3caa50f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121030053700-w841c92uvirpii9h
2012-10-30 05:37:00 +00:00
Amit Patel 21cfcb67a1 [MERGE]:trunk
bzr revid: apa@tinyerp.com-20121030044810-lmfplts8cd5cua1v
2012-10-30 10:18:10 +05:30
Fabien Pinckaers 2d3c672d93 [IMP] margin-right on hours for timesheets
bzr revid: fp@tinyerp.com-20121029165138-4i0rgh9ayyw2qq5m
2012-10-29 17:51:38 +01:00
Amit Patel 92ca470488 [MERGE]:trunk
bzr revid: apa@tinyerp.com-20121029054552-y4phiotzqirk0q1k
2012-10-29 11:15:52 +05:30
Fabien Pinckaers b93a857304 [FIX]
bzr revid: fp@tinyerp.com-20121026165737-ndqb9qzrur1szt2j
2012-10-26 18:57:37 +02:00
Saurang Suthar a0e65cecc8 [MERGE]:merged with main addons
bzr revid: ssu@tinyerp.com-20121025101308-4h46y6lgyaxctz2m
2012-10-25 15:43:08 +05:30
Randhir Mayatra (OpenERP) 21bd09e017 [MERGE] merge with parent branch
bzr revid: rma@tinyerp.com-20121023092900-4wq51tm4w51cpdp5
2012-10-23 14:59:00 +05:30
ajay javiya (OpenERP) ce3882d8d7 [FIX]:Task issue in project module
bzr revid: aja@tinyerp.com-20121023065037-2i16k4xlsczqj04y
2012-10-23 12:20:37 +05:30
Fabien Pinckaers a21cc373bf [MERGE] project cleanup
bzr revid: fp@tinyerp.com-20121022175311-9dqift6jop58qw7m
2012-10-22 19:53:11 +02:00
Saurang Suthar 602d96b45e [MERGE] merge with lp:openobject-addons
bzr revid: ssu@tinyerp.com-20121022084635-lun43msy3ljr4srt
2012-10-22 14:16:35 +05:30
Amit Patel cb3ec02e38 [MERGE]:trunk
bzr revid: apa@tinyerp.com-20121016092623-k9eoa8d35qnoihla
bzr revid: apa@tinyerp.com-20121017071203-bf3fgejxon2cnp8u
bzr revid: apa@tinyerp.com-20121022051737-ke16gc4y6rl8fqs9
2012-10-22 10:47:37 +05:30
Divyesh Makwana (Open ERP) 5298d6637f [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121011045645-nsiuvux0j9igxru3
bzr revid: mdi@tinyerp.com-20121012060126-113po2nfpy6a8q1q
bzr revid: mdi@tinyerp.com-20121015053410-idw2wqvlzg9v0bcr
bzr revid: mdi@tinyerp.com-20121016044311-u4zg2w80s2hhqpqb
bzr revid: mdi@tinyerp.com-20121017044217-hoapjilvumacax7r
bzr revid: mdi@tinyerp.com-20121019044134-976dakm07ctv6e3k
bzr revid: mdi@tinyerp.com-20121022041651-7xvytrksn1t8r0p7
2012-10-22 09:46:51 +05:30
Randhir Mayatra (OpenERP) 383040231a [IMP]change the string of exception in project_timesheet
bzr revid: rma@tinyerp.com-20121019104826-lm2qi3lhs1ov769j
2012-10-19 16:18:26 +05:30
Launchpad Translations on behalf of openerp 5bfa3c5a7d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121019053933-51d6oob5aw0ujz40
2012-10-19 05:39:33 +00:00
Saurang Suthar 164df45813 [IMP]project_timesheet:added domain for visible analytic accounts in which to_invoice is true
bzr revid: ssu@tinyerp.com-20121016115943-qljcyw8afcgrh9g3
2012-10-16 17:29:43 +05:30
Saurang Suthar cba880c3ec [IMP]:added menu tip for Time & Costs to Invoices and Invoices Task Work
bzr revid: ssu@tinyerp.com-20121016113725-a59hmietre5hf9td
2012-10-16 17:07:25 +05:30
Amit Patel b2772b2f15 [FIX]:When creating a task work to invoice:
- the product and journal must be set by default according to the user
 - the invoicing 100% must be set by default too and the uom, journal

bzr revid: apa@tinyerp.com-20121015104402-u8ht0hbfsvez00j8
2012-10-15 16:14:02 +05:30
Khushboo Bhatt (Open ERP) b34aad01eb [FIX]project_timesheet:if condition for record
bzr revid: kbh@tinyerp.com-20121015101049-vj69950ccpmvwa24
2012-10-15 15:40:49 +05:30
Khushboo Bhatt (Open ERP) a35b5a7f02 [ADD]added on_change on field
bzr revid: kbh@tinyerp.com-20121015094057-n4l3xei6o417dh1o
2012-10-15 15:10:57 +05:30
Khushboo Bhatt (Open ERP) 7ca9a1294a [IMP]project_timesheet:implemented method for setting default values.
bzr revid: kbh@tinyerp.com-20121015072014-st4aavfgw4pve3ad
2012-10-15 12:50:14 +05:30
Khushboo Bhatt (Open ERP) 06ae4d8913 [IMP]project_timesheet:added method for setting default type of invoicing
bzr revid: kbh@tinyerp.com-20121012090527-zn9ngz25ylbio2nx
2012-10-12 14:35:27 +05:30
Khushboo Bhatt (Open ERP) fce8bb9c29 [IMP]project_timesheet:added method for setting default product uom.
bzr revid: kbh@tinyerp.com-20121012083906-3ab8ephqoc09dx7z
2012-10-12 14:09:06 +05:30
Khushboo Bhatt (Open ERP) 86676cf1c9 [IMP]project_timesheet:added method for setting default product.
bzr revid: kbh@tinyerp.com-20121012082525-y600x8lv0xteej6a
2012-10-12 13:55:25 +05:30
Divyesh Makwana (Open ERP) 1c31287162 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121010043229-bqz4gq67ix25jww2
2012-10-10 10:02:29 +05:30
Divyesh Makwana (Open ERP) 2bacc70085 [IMP] project_timesheet : Improved the code.
bzr revid: mdi@tinyerp.com-20121009111124-sdii9no8mui4zopz
2012-10-09 16:41:24 +05:30
niv-openerp 94c8ca08b0 merge trunk
bzr revid: nicolas.vanhoren@openerp.com-20121005092119-gylxvyo0k6yip0lk
2012-10-05 11:21:19 +02:00
Divyesh Makwana (Open ERP) b273232b71 [FIX] project_timesheet : Fix the integrity error when we embeded 'Timesheet Line' created through project.
bzr revid: mdi@tinyerp.com-20121004114021-rgbzhr84uditlhhj
2012-10-04 17:10:21 +05:30
Divyesh Makwana (Open ERP) c5c6c289a9 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121004044022-fqrhpeb37jdpid5t
2012-10-04 10:10:22 +05:30
Antonin Bourguignon 1786beefa0 [IMP] add a few comments
bzr revid: abo@openerp.com-20121003143809-621gfqzcc2099ph2
2012-10-03 16:38:09 +02:00
Antonin Bourguignon 19a70c9d2c [IMP] code style
bzr revid: abo@openerp.com-20121003142859-tdskhyqzfwthy9sl
2012-10-03 16:28:59 +02:00
Antonin Bourguignon 77b29a2493 [IMP] variable name and code style
lp bug: https://launchpad.net/bugs/953006 fixed

bzr revid: abo@openerp.com-20121003133639-pd1dhlbdwg5fltya
2012-10-03 15:36:39 +02:00
Antonin Bourguignon 1de8b63e9d [IMP] variable name, remove unused variables
bzr revid: abo@openerp.com-20121003130840-33cf4seornv3jxq6
2012-10-03 15:08:40 +02:00
Antonin Bourguignon e9571326e2 [IMP] variable name
bzr revid: abo@openerp.com-20121003130155-s5xw33xcix8pthgc
2012-10-03 15:01:55 +02:00
Antonin Bourguignon c0cc5b01d7 [IMP] code style
bzr revid: abo@openerp.com-20121003121639-uv0x4n8j9vyinbrc
2012-10-03 14:16:39 +02:00
Divyesh Makwana (Open ERP) fd6da42e30 [IMP] project_timesheet : Click on timesheet button from a new project. You will get this 'Record your timesheets for the project '%s''.Instead of name of the project.
bzr revid: mdi@tinyerp.com-20121003112319-ancbub1h7u5mtylk
2012-10-03 16:53:19 +05:30
Antonin Bourguignon 6ce2edb54b [MERGE] trunk
bzr revid: abo@openerp.com-20121003104416-r2qxoe8vbbg9zqps
2012-10-03 12:44:16 +02:00
niv-openerp 66b62190c7 Removed date_current more
bzr revid: nicolas.vanhoren@openerp.com-20121002151520-q1m2tpgbfmcvxzux
2012-10-02 17:15:20 +02:00
Antonin Bourguignon 1653332080 [MERGE] trunk
bzr revid: abo@openerp.com-20121002102915-424prxd74izb1szw
2012-10-02 12:29:15 +02:00
Fabien Pinckaers bf33153a58 [IMP] useability of project view
bzr revid: fp@openerp.com-20120929201326-nt6s4vicmr9ebuu2
2012-09-29 22:13:26 +02:00
Fabien Pinckaers 816f50974a [MERGE] optionnal attendances visible
bzr revid: fp@tinyerp.com-20120927174758-zp58w2phycwm30l7
2012-09-27 19:47:58 +02:00
Fabien Pinckaers e9f4840c93 [IMP] emoving bad code, no invitation system on events
[IMP] no more certifiate, will be managed in apps.openerp.com directly

bzr revid: fp@tinyerp.com-20120926121627-60isym4hdjkaxe9p
2012-09-26 14:16:27 +02:00
Pinakin Nayi (OpenERP) 4550c4ced8 [IMP]attendance related fields and menu hide
bzr revid: pna@tinyerp.com-20120924081934-2e2bj1fa4pstrg91
2012-09-24 13:49:34 +05:30
Antonin Bourguignon 1d8007f03c [FIX] an error from the last merge
bzr revid: abo@openerp.com-20120917122821-0kfcipo5nw5gps08
2012-09-17 14:28:21 +02:00
Amit Parik ca9c797275 [FIX]:project_timesheet impossible to edit task work
bzr revid: pja@tinyerp.com-20120905113313-c2cbi37xqr6mnvrc
2012-09-05 17:03:13 +05:30
Cecile Tonglet 7fc09a8298 .
bzr revid: cto@openerp.com-20120831172538-2lp2sv2g6g5lh9n0
2012-08-31 19:25:38 +02:00
Cecile Tonglet 4da6c7b2bc [FIX] make tests works
bzr revid: cto@openerp.com-20120831165521-6h5q0r2abgt0nlpt
2012-08-31 18:55:21 +02:00
Fabien Pinckaers 8b0f2cfd71 [IMP] cleaning project/contracts and removing unused code
bzr revid: fp@tinyerp.com-20120830074903-m8yiovofd2891p7i
2012-08-30 09:49:03 +02:00
Minh Tran 3053d26382 fixed project_timesheet with the new project xml
bzr revid: mit@openerp.com-20120829154535-z3qr72o9usnt9piv
2012-08-29 17:45:35 +02:00
Launchpad Translations on behalf of openerp 4e31d1be93 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828064335-bftlutj6aiymztbp
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828072410-7ndsu3tnyrjhtuor
2012-08-28 07:24:10 +00:00
Antonin Bourguignon 121b351b59 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120822175756-ypym270e6cklpbds
2012-08-22 19:57:56 +02:00
Antonin Bourguignon 68e7540330 [IMP] simplify menuitems refering to actions others than act_window
also remove project_timesheet_data.xml which content was entirely commented

bzr revid: abo@openerp.com-20120822144329-dk3y3e3z4k2pdd3l
2012-08-22 16:43:29 +02:00
Hardik 8f9f860323 [IMP]Update __openerp__.py for all modules
bzr revid: hsa@tinyerp.com-20120820125644-px287o03bxrx8h3o
2012-08-20 18:26:44 +05:30
Hardik b040d2706d [IMP]update __openerp__.py in all modules
bzr revid: hsa@tinyerp.com-20120817111540-rfql0ifsvbx5nz7g
2012-08-17 16:45:40 +05:30
Thibault Delavallée aac03b547d [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120814152634-ix63oxwcyrfkku4t
2012-08-14 17:26:34 +02:00
Thibault Delavallée bc7ad9c405 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120814084936-04v0hywe2drc9qum
2012-08-14 10:49:36 +02:00
Vo Minh Thu 9822629548 [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
Thibault Delavallée c2c27b1858 [FIX$] This time, it's the good fix.
bzr revid: tde@openerp.com-20120813111521-uws1uophrd39krfg
2012-08-13 13:15:21 +02:00
Thibault Delavallée f80c247812 [FIX] Still fixing stpid bugs.
bzr revid: tde@openerp.com-20120813105420-stxm7cjc981bj8fq
2012-08-13 12:54:20 +02:00
Thibault Delavallée e120d9a699 [REV] Reverted last fixes. Think it comes from outer space.
bzr revid: tde@openerp.com-20120813091719-6551uziq8ts4kj6a
2012-08-13 11:17:19 +02:00
Thibault Delavallée db7e49ca91 [FIX] project_timesheet tests: user creation should also have its partner.
bzr revid: tde@openerp.com-20120813081054-csyaq8p7lf7e1nvh
2012-08-13 10:10:54 +02:00
Thibault Delavallée 18aaed7f4f [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120813073105-pz2vdiz7gc27triz
2012-08-13 09:31:05 +02:00
Rucha (Open ERP) 5fd7ad04c1 [REM]: hr: Removed duplicate employee and department from demo
bzr revid: rpa@tinyerp.com-20120813072738-temucs10vhcubepv
2012-08-13 12:57:38 +05:30
Rucha (Open ERP) dd7a2972d8 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120813051411-5no0xcudwbkw07c5
2012-08-13 10:44:11 +05:30
Thibault Delavallée 8e6cc3a924 [REF] addons: propagated change about context_lang and context_tz.
bzr revid: tde@openerp.com-20120810102257-g9r21nesh799kf7u
2012-08-10 12:22:57 +02:00
Stephane Wirtel 91f8b5439c [FIX] project*: Replace the labels with 'Partner' by Contact
bzr revid: stw@openerp.com-20120809105009-0f7mw99dnavgs01s
2012-08-09 12:50:09 +02:00
Twinkle Christian (OpenERP) fc1b1749a8 [IMP]Remove type field from the modules
bzr revid: tch@tinyerp.com-20120809060516-zgx3gdyv6wdshfyw
2012-08-09 11:35:16 +05:30
Launchpad Translations on behalf of openerp e970ecd62c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120809050051-p6f437n80grsr5vz
2012-08-09 05:00:51 +00:00
Olivier Dony 3fd9a77c83 [REVERT] Cancel PO Template changes from rev.2702 - to be fully re-generated before next release
We'll also attempt to replace the master strings in the
translated .po files before replacing the master strings,
to avoid losing translations just because of mere typo fixes.

bzr revid: odo@openerp.com-20120808144613-wtz50tcz5n7kvcza
2012-08-08 16:46:13 +02:00
Rucha (Open ERP) 2347f44ab2 [FIX,IMP]: hr: Fixes and improvements for employee-user relation
bzr revid: rpa@tinyerp.com-20120808101305-dsqn337ngmcysm4z
2012-08-08 15:43:05 +05:30
Rucha (Open ERP) d597437dd7 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120808063503-ymsvwnerxakqbcbx
2012-08-08 12:05:03 +05:30
Antonin Bourguignon a97687a420 [MERGE] latest trunk
also replace the error message title 'Operation Not Permitted' by 'Invalid Action'

bzr revid: abo@openerp.com-20120807120451-zdrrecilfh82obhl
2012-08-07 14:04:51 +02:00
Antonin Bourguignon b0e8ae4c7d [IMP] error messages
fix errors ending with an exclamation point; use a point instead
remove uniques (or almost) error messages titles, like 'Encoding Error' (1 occurrence in addons), 'Integrity Error' (1 occurrence in addons), 'Report Name' (1 occurrence in addons), 'Value Error' (1 occurrence in addons), 'Wrong Period Code' (1 occurrence in addons); replace these with 'Error'
add newline character after some messages titles, when necessary
fix 'UserError': should be 'User Error'
remove spaces before exclamation marks
add capital letters to messages titles words (e.g.: 'Invalid action' becomes 'Invalid Action')

bzr revid: abo@openerp.com-20120807110616-u3nlnybtgaebro18
2012-08-07 13:06:16 +02:00
Launchpad Translations on behalf of openerp 3cfd65b43d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120807053928-8131c98edycpivlb
2012-08-07 05:39:28 +00:00
pso (OpenERP) 389f8d6803 [MERGE] Merge with main branch
bzr revid: pso@tinyerp.com-20120806094234-1b145yrjixy5yrsg
2012-08-06 15:12:34 +05:30
Rucha (Open ERP) b7daa1fb31 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120803045532-wsgei101ogh0o44d
bzr revid: rpa@tinyerp.com-20120806050952-xecwmyhg4p2fs4id
2012-08-06 10:39:52 +05:30
Fabien Pinckaers ea52cfae17 [IMP] introducing new file type: html
bzr revid: fp@openerp.com-20120804143556-457q040g6q30x3fu
2012-08-04 16:35:56 +02:00
Fabien Pinckaers b363b1f622 fix
bzr revid: fp@openerp.com-20120804135631-9qqfgcz9513qsyzp
2012-08-04 15:56:31 +02:00
Fabien Pinckaers 4e69bdd6fc [IMP] improved menu tips - 10 firsts clicks
bzr revid: fp@openerp.com-20120804132136-2b18cfkwv0njsglj
2012-08-04 15:21:36 +02:00
Rucha (Open ERP) 01bea180bb [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120801064738-vcjdjnt3s57i2hgc
2012-08-01 12:17:38 +05:30
pso (OpenERP) 773c2d5c63 [MERGE] Merge with main branch
bzr revid: pso@tinyerp.com-20120801064711-y90iik5ialfdnfft
2012-08-01 12:17:11 +05:30
Quentin (OpenERP) e1b50e304d [MEGUEZ] merged the clean search view branch
bzr revid: qdp-launchpad@openerp.com-20120731150358-jqd3eoz06imzlx01
2012-07-31 17:03:58 +02:00
Stephane Wirtel 8ab0a77cad [FIX] project_timesheet: Define the task_hrs field in the SQL view instead of function field
bzr revid: stw@openerp.com-20120731144704-8rvur011ycpc7w4f
2012-07-31 16:47:04 +02:00
vta vta@openerp.com 264d2c3365 [MERGE] Trunk.
bzr revid: vta@openerp.com-20120730123628-49rirhupbwqfzr0r
2012-07-30 14:36:28 +02:00
Alexis de Lattre f9fe637803 Remplace all occurences of my_browse_rec.product_id.product_tmpl_id.field to my_browse_rec.product_id.field
bzr revid: alexis@via.ecp.fr-20120727015202-7fylff5jr26sgxez
2012-07-27 03:52:02 +02:00
Rucha (Open ERP) 780bdb4a29 [IMP]: product: Changed xml_id of product in data file from product_product_0 to product_product_consultant to identify this record easily when accessing from py
bzr revid: rpa@tinyerp.com-20120726113914-gvpo9rx7fan77w3f
2012-07-26 17:09:14 +05:30
Rucha (Open ERP) 4eb76030a6 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120726053855-8j8c70xqc0ynikx1
2012-07-26 11:08:55 +05:30
pso (OpenERP) e5da0e191b [MERGE] Merged with main branch
bzr revid: pso@tinyerp.com-20120725125332-7qe6b3l0fjryast2
2012-07-25 18:23:32 +05:30
Saurang Suthar(OpenERP) c7060ffa18 [IMP] Improved warning messages for project* modules
bzr revid: pso@tinyerp.com-20120725121605-rvid4ebeomtr0zzo
2012-07-25 17:46:05 +05:30
Turkesh Patel (Open ERP) a95e3ad66e [IMP] project_timesheet: improved search view.
bzr revid: tpa@tinyerp.com-20120723071003-snkgc4qt068ap9z2
2012-07-23 12:40:03 +05:30
pso (OpenERP) 8be94b1e93 [MERGE] Merge with main branch
bzr revid: pso@tinyerp.com-20120722082152-l24vpuuxjb34126g
2012-07-22 13:51:52 +05:30
Purnendu Singh (OpenERP) ec27d7e44f [MERGE] merge with main branch
bzr revid: psi@tinyerp.com-20120720061203-c6cpwc7f8uaa939n
2012-07-20 11:42:03 +05:30
Quentin (OpenERP) 7b8c3788b1 [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20120719095420-llgnafgasfcwbwu9
2012-07-19 11:54:20 +02:00
Purnendu Singh (OpenERP) c45d68d6b8 [MERGE] Merge with main addons
bzr revid: psi@tinyerp.com-20120718055558-03lss1ha0tcdi2dk
2012-07-18 11:25:58 +05:30
Harry (OpenERP) 5ca4e7a371 [MERGE] upstream
bzr revid: hmo@tinyerp.com-20120716111343-z05o5wes4wj1apbo
2012-07-16 16:43:43 +05:30
Purnendu Singh (OpenERP) 2e2f7188d3 [MERGE, IMP] improve and merge cha branch to update desc formatting
bzr revid: psi@tinyerp.com-20120716094548-xx1ip3eljal3ffvl
2012-07-16 15:15:48 +05:30
pso (OpenERP) 8a1c029e1c [IMP] Improved warning messages/exceptions of project modules
bzr revid: pso@tinyerp.com-20120716093128-5m3683kojty2hs0n
2012-07-16 15:01:28 +05:30
Rucha (Open ERP) 64137a63cf [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120716090657-r7mlld3rsufel2ge
2012-07-16 14:36:57 +05:30
Launchpad Translations on behalf of openerp 8028996327 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120714062750-arh47r4vgtj7zlwu
2012-07-14 06:27:50 +00:00
Ajay Chauhan (OpenERP) 01981534f6 [IMP] : Update Description for modules
bzr revid: cha@tinyerp.com-20120713093114-wzrprgaeo34tzjbx
2012-07-13 15:01:14 +05:30
Pinakin Nayi (OpenERP) ab00152169 [IMP]project-warning-message
bzr revid: pna@tinyerp.com-20120712095441-4xwox1hhog7je8oz
2012-07-12 15:24:41 +05:30
Rucha (Open ERP) 9dc752d788 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120712062623-cvhg4a2ewwqp9hcv
2012-07-12 11:56:23 +05:30
Launchpad Translations on behalf of openerp b0b5a5988f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120712044116-gnxo3c234xwbzacm
bzr revid: launchpad_translations_on_behalf_of_openerp-20120712045848-qoy4f00epmiytqw2
2012-07-12 04:58:48 +00:00
Launchpad Translations on behalf of openerp 6cbb04758a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120711051515-k67xt5ps6oe853qg
2012-07-11 05:15:15 +00:00
Kuldeep Joshi (OpenERP) b1dc0beb35 [IMP]account: change account.analytic.line view
bzr revid: kjo@tinyerp.com-20120709100903-da6v6cu2ekorm2o2
2012-07-09 15:39:03 +05:30
Rucha (Open ERP) a6ff1de18a [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120709065757-9myg5025dqps8q65
2012-07-09 12:27:57 +05:30
Fabien Pinckaers 2ed6acfea1 [MERGE] fix in access rights
bzr revid: fp@tinyerp.com-20120706150817-s01gbb4gga6dxybm
2012-07-06 17:08:17 +02:00
Rucha (Open ERP) 4217b46c0d [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120704113856-vytxzu1zf6x6mnip
2012-07-04 17:08:56 +05:30
Rucha (Open ERP) d259c31449 [IMP]: product: Improved reference name for UoM hour and day to make it consistent with other demo reference name
bzr revid: rpa@tinyerp.com-20120703104559-3yew39vtv7ayop64
2012-07-03 16:15:59 +05:30
Rucha (Open ERP) 2558625eba [IMP]: product: Improved reference of product_consultant
bzr revid: rpa@tinyerp.com-20120703062321-w81hoysgssgwktbj
2012-07-03 11:53:21 +05:30
Kuldeep Joshi (OpenERP) 8ad41e791d [IMP] change menu sequence
bzr revid: kjo@tinyerp.com-20120702103111-blnzv4b6jb6xola0
2012-07-02 16:01:11 +05:30
Rucha (Open ERP) 953dff0367 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120702054353-ertcuzo8gmqu98wp
2012-07-02 11:13:53 +05:30
Dharti Ratani (OpenERP) a1b98b37a9 [IMP]merge with latest trunk
bzr revid: dhr@tinyerp.com-20120702050506-5vfw6o0ahrbbof5g
2012-07-02 10:35:06 +05:30
Rucha (Open ERP) 3c285a6194 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120629070441-o61czak5knl0adgy
2012-06-29 12:34:41 +05:30
Dharti Ratani (OpenERP) a1b4d74f32 [MERGE]
bzr revid: dhr@tinyerp.com-20120629060714-iwdnbocw1ygt3pwz
2012-06-29 11:37:14 +05:30
Dharti Ratani (OpenERP) 93727a6c19 [IMP]Read access of sale order to project groups when contract is installed
bzr revid: dhr@tinyerp.com-20120629060334-mlzdvc1aii0jm26p
2012-06-29 11:33:34 +05:30
Quentin (OpenERP) 08d25cb352 [MERGE] merged with main trunk
bzr revid: qdp-launchpad@openerp.com-20120628123618-wyfrmfiw68xlt1aw
2012-06-28 14:36:18 +02:00
Quentin (OpenERP) 46f2c2c9ca [IMP] improvements during code review
bzr revid: qdp-launchpad@openerp.com-20120628121820-r8bxfzq38fy8pcgt
2012-06-28 14:18:20 +02:00
Rucha (Open ERP) 237173eeff [IMP]: product: Improvement in product category demo, improved xml_id refereneces (work in progress)
bzr revid: rpa@tinyerp.com-20120628093001-k113siqn5sbp3xf2
2012-06-28 15:00:01 +05:30
Sanjay Gohel (Open ERP) 1702b2335d [IMP]remove tabs and add spaces instead of them
bzr revid: sgo@tinyerp.com-20120628064005-zuerrpazumf5lf1q
2012-06-28 12:10:05 +05:30
Sanjay Gohel (Open ERP) 7ed6f5052d [IMP]remove all select=1 and select=2
bzr revid: sgo@tinyerp.com-20120628061736-ujwe0swulvrcrkjt
2012-06-28 11:47:36 +05:30
Quentin (OpenERP) f90612ec3b [MERGE] lp: 953006
bzr revid: qdp-launchpad@openerp.com-20120627135425-cs8q2cdsiarwvguw
2012-06-27 15:54:25 +02:00
Quentin (OpenERP) 83836784c7 [MERGE] merged with main trunk
bzr revid: qdp-launchpad@openerp.com-20120626152634-jsufymnj3i5biar0
2012-06-26 17:26:34 +02:00
Quentin (OpenERP) fd9bdbb688 [IMP] projecT_timesheet: at the installation, automatically imply that all members of the 'employee' group are also members of the group that allows to see the 'work task' field, on a task.
bzr revid: qdp-launchpad@openerp.com-20120625123034-d0b3qnk08l39vq72
2012-06-25 14:30:34 +02:00
Quentin (OpenERP) c2b6c35dd9 [IMP] Clean Modules name: there are 3 modules named Contracts Management.
bzr revid: qdp-launchpad@openerp.com-20120625095448-hzpekh2x5gls0t8o
2012-06-25 11:54:48 +02:00
Launchpad Translations on behalf of openerp 0a22debf5f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120623050212-tvzx03gj3h8f0ool
bzr revid: launchpad_translations_on_behalf_of_openerp-20120624052822-84nt172gva6prhqk
bzr revid: launchpad_translations_on_behalf_of_openerp-20120625051509-c432dvk4aqn3vjj9
2012-06-25 05:15:09 +00:00
Amit Patel (OpenERP) 3c7cd469e6 [MERGE]
bzr revid: apa@tinyerp.com-20120622090553-lkvmsz12ooao1lug
bzr revid: apa@tinyerp.com-20120625050407-vfjnqgnqexrfvr8d
2012-06-25 10:34:07 +05:30
Quentin (OpenERP) 4c104ca727 [IMP] search views: made some small usability changes
bzr revid: qdp-launchpad@openerp.com-20120622130506-pzz8wqo5p5y902qc
2012-06-22 15:05:06 +02:00
Purnendu Singh (OpenERP) 55633a22a2 [REF] search views: removed filterr_domain if only one element was inside
bzr revid: psi@tinyerp.com-20120622111251-nykd53nolythqhu2
2012-06-22 16:42:51 +05:30
Quentin (OpenERP) 9d705e8081 [FIX] project form view: moved open_timesheets() method from project_timesheet to analytic_contract_project, where the view that call this action belongs
bzr revid: qdp-launchpad@openerp.com-20120618171633-h4zyjvqojuau6bal
2012-06-18 19:16:33 +02:00
Purnendu Singh (OpenERP) ca7d45dc6b [IMP] project_*: Update search views
bzr revid: psi@tinyerp.com-20120618132437-2yuhcs84vmc768go
2012-06-18 18:54:37 +05:30
Quentin (OpenERP) c0f54153c7 [FIX] project, hr_timesheet_invoice, project_timesheet: fixed flow to invoice on timesheets + some code cleaning
bzr revid: qdp-launchpad@openerp.com-20120618115634-eos7eq6gdvxqoyn6
2012-06-18 13:56:34 +02:00
Quentin (OpenERP) 9a6036f38d [FIX+IMP] project_timesheet:fixed bad reference; project= usabilty improvements
bzr revid: qdp-launchpad@openerp.com-20120615152544-yy9zdx3pxeyol4bc
2012-06-15 17:25:44 +02:00
Quentin (OpenERP) efdbaf4088 [IMP] project: version 7.0 for the project form view
bzr revid: qdp-launchpad@openerp.com-20120615144835-189jbt84u2z3si8u
2012-06-15 16:48:35 +02:00
Quentin (OpenERP) 66c3093fee [IMP] contract management: misc improvements
bzr revid: qdp-launchpad@openerp.com-20120615081254-rhh9nwmz3bqn7e9d
2012-06-15 10:12:54 +02:00
Divyesh Makwana (Open ERP) 1fce603c66 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120613094849-yzcf7073kgiq93rh
bzr revid: mdi@tinyerp.com-20120615050845-dp6wxcvs8xx8g3d3
2012-06-15 10:38:45 +05:30
Launchpad Translations on behalf of openerp d4271f66c8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120613045614-nvpnoumt1aazscag
bzr revid: launchpad_translations_on_behalf_of_openerp-20120614043456-3m7u51qfu23c0qhx
bzr revid: launchpad_translations_on_behalf_of_openerp-20120614044123-deayo2v3jjc74u8f
2012-06-14 04:41:23 +00:00
Quentin (OpenERP) c44790c56d [MERGE] merged with main trunk
bzr revid: qdp-launchpad@openerp.com-20120613090855-9tpft9kutxzgwyze
2012-06-13 11:08:55 +02:00
Divyesh Makwana (Open ERP) 0b188a31cc [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120612065329-oys1eh8q3gitdx06
2012-06-12 12:23:29 +05:30
Amit Patel (OpenERP) deec2bda0d [MERGE]:resolved conflicts and merged with trunk
bzr revid: apa@tinyerp.com-20120612063539-japenzf86hh59541
2012-06-12 12:05:39 +05:30
Launchpad Translations on behalf of openerp b871639070 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120612045555-2irdwxgtdcfdho23
2012-06-12 04:55:55 +00:00
Quentin (OpenERP) 269af2189d [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20120712085654-sdkvz3b596r1gfer
2012-07-12 10:56:54 +02:00
Quentin (OpenERP) 5a7e06c4a4 [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20120710124253-eu7h88iss7lbcrw6
2012-07-10 14:42:53 +02:00
Atul Patel (OpenERP) 64bd1cdd87 [FIX]: Add currency_id field
bzr revid: atp@tinyerp.com-20120706074215-4225u3zkx00gtfw5
2012-07-06 13:12:15 +05:30
Atul Patel (OpenERP) 369b5d8d51 [MERGE]: Merged trunk-addons with
quantity and Uom should be on the same line in analytic account extended view.
Amount and Amount currency in separate group.
Account Currenty typo.

bzr revid: atp@tinyerp.com-20120706034553-djpszu1dzn67hpr5
2012-07-06 09:15:53 +05:30
Amit Patel (OpenERP) d30d000ae3 [IMP]:added icons on buttons.
bzr revid: apa@tinyerp.com-20120608072054-lrcr5jhnpg9jgyil
2012-06-08 12:50:54 +05:30
Amit Patel (OpenERP) 10ffd100e1 [IMP]:improved project view
bzr revid: apa@tinyerp.com-20120531101845-ee015dc62seai6va
2012-05-31 15:48:45 +05:30
Amit Patel (OpenERP) 04d5c34200 [IMP]:improved project view as new style and format
bzr revid: apa@tinyerp.com-20120530085024-ngddwwoiyonc875c
2012-05-30 14:20:24 +05:30
Amit Patel (OpenERP) 63cf0f6190 [IMP]:project:improved view and code.
bzr revid: apa@tinyerp.com-20120530073728-1rij0covlh0odtl5
2012-05-30 13:07:28 +05:30
Amit Patel (OpenERP) 4fc454658f improved project view
bzr revid: apa@tinyerp.com-20120530071541-yyriflh6u737zd9b
2012-05-30 12:45:41 +05:30
Amit Patel (OpenERP) 87040b2390 [IMP]:project:improved project view
bzr revid: apa@tinyerp.com-20120530065934-qpo4hsv4pcyhngjr
2012-05-30 12:29:34 +05:30
Divyesh Makwana (Open ERP) e8bf2fda8e [IMP] project_timesheet : Removed all filters related to a date field and added the related date field in the search view.
bzr revid: mdi@tinyerp.com-20120529045509-garnh9vhb68fph0v
2012-05-29 10:25:09 +05:30
Fabien Meghazi 5ee2a8abde [WIP] Kanban project cleanup
bzr revid: fme@openerp.com-20120522155815-y23ps3bs32i9vqlu
2012-05-22 17:58:15 +02:00
Raphael Collet 36346f081e [IMP] project_timesheet: improve field names for project kanban view
bzr revid: rco@openerp.com-20120509082451-jfsd0pgn7o4vddf5
2012-05-09 10:24:51 +02:00
Raphael Collet 85e4f9c4f2 [IMP] project_timesheet: code cleanup for project kanban view
bzr revid: rco@openerp.com-20120509081955-2p5u2z4xkycbmpdd
2012-05-09 10:19:55 +02:00
Sanjay Gohel (Open ERP) a6a7276d89 [IMP]remove open_model method from project related module and add action as per required
bzr revid: sgo@tinyerp.com-20120508092143-ah3siaudwp7jixc8
2012-05-08 14:51:43 +05:30
Sanjay Gohel (Open ERP) bfd96de42b [IMP]rename all fields which r required in project and another module and improve code and
bzr revid: sgo@tinyerp.com-20120507072049-u00lsqra9x34nf73
2012-05-07 12:50:49 +05:30
Amit Patel (OpenERP) 0153dd344b [MERGE]:lp:~openerp-dev/openobject-addons/trunk-project-gallery-apa-improvement-sgo
bzr revid: apa@tinyerp.com-20120430111521-7u8fww50c18qm2ax
2012-04-30 16:45:21 +05:30
Sanjay Gohel (Open ERP) d2b70d38c3 [IMP]change color and improved as per said
bzr revid: sgo@tinyerp.com-20120430104934-34tsnkf24rms9izx
2012-04-30 16:19:34 +05:30
Amit Patel (OpenERP) f8e076e9a4 [IMP]:improved code.
bzr revid: apa@tinyerp.com-20120427062725-0lpfbxs0xkdmm7zf
2012-04-27 11:57:25 +05:30
Amit Patel (OpenERP) f8917d90db [MERGE]
bzr revid: apa@tinyerp.com-20120426044927-12rd6ervm605pzad
2012-04-26 10:19:27 +05:30
Raphael Collet 6a4d6efc30 [IMP] project*, resource: remove group_extended
bzr revid: rco@openerp.com-20120425140212-cmzxx0oduz5al6bj
2012-04-25 16:02:12 +02:00
Amit (OpenERP) a3d768a3cd [FIX] Correction on above fix
bzr revid: amp@tinyerp.com-20120424125952-60z1bclva62j8qxt
2012-04-24 18:29:52 +05:30
Mayur Maheshwari (OpenERP) 7ea9856d0e [IMP] Improve css and py fiel
bzr revid: mma@tinyerp.com-20120424113321-n9b5076z7v8pcfu5
2012-04-24 17:03:21 +05:30
Amit Patel (OpenERP) b38ba6637b [IMP]
bzr revid: apa@tinyerp.com-20120411093652-32fldjnoophainuw
2012-04-11 15:06:52 +05:30
Amit Patel (OpenERP) 169c8f829c [IMP]
bzr revid: apa@tinyerp.com-20120410124414-lpr8pciqso1hs5pj
2012-04-10 18:14:14 +05:30
Amit Patel (OpenERP) 2d8773b569 [IMP]
bzr revid: apa@tinyerp.com-20120410124225-j0cnku20zpx76cbh
2012-04-10 18:12:25 +05:30
Amit Patel (OpenERP) 89194da727 [IMP]
bzr revid: apa@tinyerp.com-20120409093132-lxrojybxcy3u4bb1
2012-04-09 15:01:32 +05:30
Sanjay Gohel (Open ERP) 36a433ddcd [IMP]
bzr revid: sgo@tinyerp.com-20120406122307-iqdyfnqsyljy17rs
2012-04-06 17:53:07 +05:30
Sanjay Gohel (Open ERP) 6baa76220e [IMP]
bzr revid: sgo@tinyerp.com-20120406110852-b4z3nj5k47kbnh21
2012-04-06 16:38:52 +05:30
Amit Patel (OpenERP) 7ae9bacc4d [ADD]
bzr revid: apa@tinyerp.com-20120406083727-hnyyhyx676b9ce44
2012-04-06 14:07:27 +05:30
Amit Patel (OpenERP) f342375bd3 [MERGE]
bzr revid: apa@tinyerp.com-20120406045342-387xmqybl21er1mh
2012-04-06 10:23:42 +05:30
Amit Patel (OpenERP) 9c0f7a2836 [IMP]
bzr revid: apa@tinyerp.com-20120404123105-oe7jqrs7ym2uy2r7
2012-04-04 18:01:05 +05:30
Amit Patel (OpenERP) ba0d6ac4c5 [IMP]
bzr revid: apa@tinyerp.com-20120404113146-ls123w7pp1uvokzs
2012-04-04 17:01:46 +05:30
Sanjay Gohel (Open ERP) b997ac0758 [IMP]
bzr revid: sgo@tinyerp.com-20120404093346-l5rcgpbf7u9evq3z
2012-04-04 15:03:46 +05:30
Sanjay Gohel (Open ERP) 27dd8054fa [IMP]improve
bzr revid: sgo@tinyerp.com-20120404090114-qhq64kye343ahw7r
2012-04-04 14:31:14 +05:30
Sanjay Gohel (Open ERP) 196564ffa2 [IMP]
bzr revid: sgo@tinyerp.com-20120404070809-lntog45xrxy8g3xs
2012-04-04 12:38:09 +05:30
Sanjay Gohel (Open ERP) 5b083bcad1 [MERGE]
bzr revid: sgo@tinyerp.com-20120404061833-49341pzzktkhtgai
bzr revid: sgo@tinyerp.com-20120404065319-0igm9w8j8riz4f19
2012-04-04 12:23:19 +05:30
Sanjay Gohel (Open ERP) 66daeff774 [IMP]
bzr revid: sgo@tinyerp.com-20120404061617-r463yhakhd49ren7
2012-04-04 11:46:17 +05:30
Amit Patel (OpenERP) 43b46a1623 [IMP]
bzr revid: apa@tinyerp.com-20120404060933-ejaapcvswhrisoou
2012-04-04 11:39:33 +05:30
Sanjay Gohel (Open ERP) fddbe73881 [IMP]
bzr revid: sgo@tinyerp.com-20120404054204-vlkhhvrxp0ka15d7
2012-04-04 11:12:04 +05:30
Sanjay Gohel (Open ERP) 96c334b5ac [IMP]remove extra spaces from kanban view
bzr revid: sgo@tinyerp.com-20120403132753-jv1n4kyaxwh0yxtm
2012-04-03 18:57:53 +05:30
Sanjay Gohel (Open ERP) f4bfc54202 [IMP]
bzr revid: sgo@tinyerp.com-20120403130852-w7809ri5tq805vay
2012-04-03 18:38:52 +05:30
Amit (OpenERP) f038f70eea [FIX] project_timesheet : Fixes the keyerror of journal_id when edit worklog entry on task
lp bug: https://launchpad.net/bugs/953006 fixed

bzr revid: amp@tinyerp.com-20120403130336-iprq12cr21q7ykji
2012-04-03 18:33:36 +05:30
Sanjay Gohel (Open ERP) 8e782f5584 [IMP]change kanban view
bzr revid: sgo@tinyerp.com-20120403110346-cy9ogts14lmxwa7t
2012-04-03 16:33:46 +05:30
Raphael Collet 017c5f8290 [MERGE] from trunk
bzr revid: rco@openerp.com-20120403082756-egpot17iztniu8tr
2012-04-03 10:27:56 +02:00
Sanjay Gohel (Open ERP) 67ae1b0b83 [IMP]improve view
bzr revid: sgo@tinyerp.com-20120402133048-6s9gseld1v7u0dq0
2012-04-02 19:00:48 +05:30
Amit Patel (OpenERP) 22ff6fd7f9 [IMP]
bzr revid: apa@tinyerp.com-20120330131252-zxfp4oy7p0bli5my
2012-03-30 18:42:52 +05:30
Amit Patel (OpenERP) 955169f260 [IMP]
bzr revid: apa@tinyerp.com-20120330130020-d9bv300ur5x8e40z
2012-03-30 18:30:20 +05:30