Commit Graph
618 Commits
Author SHA1 Message Date
Fabien Pinckaers b93a857304 [FIX]
bzr revid: fp@tinyerp.com-20121026165737-ndqb9qzrur1szt2j
2012-10-26 18:57:37 +02:00
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
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
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
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