Commit Graph

771 Commits

Author SHA1 Message Date
Launchpad Translations on behalf of openerp 752df5acbd Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110905055933-cld0r3vv3jmiu5bx
bzr revid: launchpad_translations_on_behalf_of_openerp-20110906044018-ajk9u7zfqoiatufs
2011-09-06 04:40:18 +00:00
Launchpad Translations on behalf of openerp 007886e531 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110903053625-8ap3ez7bes0anwfj
2011-09-03 05:36:25 +00:00
Launchpad Translations on behalf of openerp 7fe942991c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110807043729-g8qz14f69cr0wpi6
bzr revid: launchpad_translations_on_behalf_of_openerp-20110808043648-93fd7m8c1sgdeu97
2011-08-08 04:36:48 +00:00
Antony Lesuisse 65c43a1946 [MERGE] trunk
bzr revid: al@openerp.com-20110805211034-hc8z53m6zzwksipu
2011-08-05 23:10:34 +02:00
Raphael Collet e1e3d117a5 [MERGE] more demo data
bzr revid: rco@openerp.com-20110804132859-pvrkmzkeglj2cq9t
2011-08-04 15:28:59 +02:00
Raphael Collet 87f239fb33 [MERGE] remove extended filters
bzr revid: rco@openerp.com-20110804102635-2ixo1tmogsulj83u
2011-08-04 12:26:35 +02:00
Xavier Morel 09cf4d40d0 [FIX] convert ir.actions.todo fields to match model definition changes
* type = special => type = automatic
* type = recurring | normal => type = normal
* default type special => normal
* state = hidden => state = done

bzr revid: xmo@openerp.com-20110729140324-0nxus4p8ufj46z9y
2011-07-29 16:03:24 +02:00
Xavier Morel cc13113641 [REF] reformat xml files before applying automated search&replace on them
bzr revid: xmo@openerp.com-20110729134810-oiqptqs2omvo7o7c
2011-07-29 15:48:10 +02:00
Xavier Morel 5a41a68bc2 [MERGE] from trunk
bzr revid: xmo@openerp.com-20110726111218-umzudy6z5wrn63j9
2011-07-26 13:12:18 +02:00
Hardik Ansodariy (OpenERP) 35f247bc7a [IMP]: inserted demo data in several objects
bzr revid: han@tinyerp.com-20110722113147-6mg9cjmkasdpn8ma
2011-07-22 17:01:47 +05:30
Tejas (OpenERP) ba62b19daf usability
bzr revid: tta@openerp.com-20110720091819-s49ianh7xgrf3eim
2011-07-20 14:48:19 +05:30
Xavier Morel a5fdb75ad6 [FIX] ir.actions.todo are now unskippable
bzr revid: xmo@openerp.com-20110714103725-6r6j35qegobhvx5u
2011-07-14 12:37:25 +02:00
Raphael Collet 292b4683b6 [MERGE] add field 'complexity' in modules
bzr revid: rco@openerp.com-20110708100307-5axn5hnn92qm8qiw
2011-07-08 12:03:07 +02:00
Raphael Collet adafbc707a [MERGE] from trunk
bzr revid: rco@openerp.com-20110708092232-mlezo4330k2j8vvw
2011-07-08 11:22:32 +02:00
Quentin (OpenERP) 9c9516d21c [MERGE] merged with main addons trunk
bzr revid: qdp-launchpad@openerp.com-20110706145644-merwy0setzzb8c9w
2011-07-06 16:56:44 +02:00
Hardik Ansodariy (OpenERP) 1f5aa0643f [IMP]: module is defined by its complexity
bzr revid: han@tinyerp.com-20110706122928-xvcpdu5inpkganfy
2011-07-06 17:59:28 +05:30
Olivier Dony 06fb14130a [IMP] removed method=True params from all fields.function
Server revision 3495 odo@openerp.com-20110701232328-flgxulxva70vnyxr
removed the need for passing method=True to function fields,
so this is the equivalent addons fix, removing it everywhere.
Please be careful from now on, and do not pass it anymore!

bzr revid: odo@openerp.com-20110701234124-a61zl0idvdfz3hyb
2011-07-02 01:41:24 +02:00
Quentin (OpenERP) 664ba7bba3 [MERGE] merge with main addons branch
bzr revid: qdp-launchpad@openerp.com-20110630133009-i0qxzrn9up9e0bog
2011-06-30 15:30:09 +02:00
Rucha (Open ERP) 8dc08fabe7 [REM,FIX]: hr_holidays: Removed checking for leave types in the get_remaining days function as it was giving error at the time of module installation, no need to put any exception in the function which compute data, it will return 0 if no leave type found
bzr revid: rpa@tinyerp.com-20110622125314-mn4jllnsbjwy2sd8
2011-06-22 18:23:14 +05:30
Mantavya Gajjar 9e8eea64c7 [CHANGE]: better to have self then obj
bzr revid: mga@tinyerp.com-20110620060434-xu1ds231oyn339kb
2011-06-20 11:34:34 +05:30
Quentin (OpenERP) 9c2bc84b0e [MERGE] improvements on config wizards
bzr revid: qdp-launchpad@openerp.com-20110610102723-0bexzin6fcg1m3hg
2011-06-10 12:27:23 +02:00
Quentin (OpenERP) 833a99d777 [IMP] hr_holidays: code improvements
bzr revid: qdp-launchpad@openerp.com-20110610091728-e49r3pq8tey78dhx
2011-06-10 11:17:28 +02:00
Quentin (OpenERP) 837f2a4a69 [MERGE] merged aag branch with hr_holidays usability improvements
bzr revid: qdp-launchpad@openerp.com-20110608144616-k80dn77ii0f3dlj5
2011-06-08 16:46:16 +02:00
Quentin (OpenERP) 092ed01347 [MERGE] merged rpa's branch with few small usablity improvements
bzr revid: qdp-launchpad@openerp.com-20110608090417-9bormjn5oa4b41j8
2011-06-08 11:04:17 +02:00
Rucha (Open ERP) 90aaaa3c89 [IMP]: hr_holidays: Improved warning message and added proper tooltip for remaining_leaves field
bzr revid: rpa@tinyerp.com-20110607115447-ktyc2dufwgzt7rmp
2011-06-07 17:24:47 +05:30
mayur maheshwari (Open ERP) 185a3bf824 [IMP]delivery,hr_timesheet,hr_holidays:Improvement is Done
bzr revid: mma@tinyerp.com-20110606055814-xa0t1idnl6zuyxy0
2011-06-06 11:28:14 +05:30
Launchpad Translations on behalf of openerp 552afb10c5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110603044017-yoke5zwvpebyo93o
bzr revid: launchpad_translations_on_behalf_of_openerp-20110604045342-rkt8o6e65uyj8kjd
bzr revid: launchpad_translations_on_behalf_of_openerp-20110605043539-vvllkcbozllrdlg7
bzr revid: launchpad_translations_on_behalf_of_openerp-20110606043718-0i2770ro7c0oho9t
2011-06-06 04:37:18 +00:00
aag (OpenERP) cb6e9d7e13 [IMP]hr_holidays:Assign Legal Leaves to Employees in HR Management -5 categ
bzr revid: aag@tinyerp.co.in-20110603131117-iylt0fehko6cj71w
2011-06-03 18:41:17 +05:30
aag (OpenERP) a7fe59285a [ADD]hr_holidays:Assign Legal Leaves to Employees add to Human Resource -4 seq category
bzr revid: aag@tinyerp.co.in-20110602105049-gdpdhlrth95t649g
2011-06-02 16:20:49 +05:30
mayur maheshwari (Open ERP) e1d6ace654 [MERGE]Merge with lp:~openerp-dev/openobject-addons/trunk-configuration-rework
bzr revid: mma@tinyerp.com-20110601125239-xe32ajnl2fkkwd3c
2011-06-01 18:22:39 +05:30
aag (OpenERP) 9d969a1564 [IMP]hr,hr_holidays: Rename saprator "position" into "job information and inherit remaining legal leaves field to hr.employee form
bzr revid: aag@tinyerp.co.in-20110530121307-ykwl0qfjf9k5ihdj
2011-05-30 17:43:07 +05:30
Quentin (OpenERP) de91919e21 [MERGE] hr_holidays: set legal leaves to employee. merged the branch from aag + improved error message and allow leave request too
bzr revid: qdp-launchpad@openerp.com-20110527130904-kfk41z65ghwv97fq
2011-05-27 15:09:04 +02:00
aag (OpenERP) 8c5726ef5f [IMP]hr_holidayse: raise an error if there are more than 1 leave type with "allow to override limit" = False, also if there is no such leave type
bzr revid: aag@tinyerp.co.in-20110527122656-rouugxlm417tj5fp
2011-05-27 17:56:56 +05:30
aag (OpenERP) cb46f35091 [IMP]hr_holidayse: Rename column "Remaining leaves" into "remaining legal leaves"
bzr revid: aag@tinyerp.co.in-20110527113919-40be1anwsqhntfu5
2011-05-27 17:09:19 +05:30
mayur maheshwari (Open ERP) 67998c4c64 [IMP]base_setup,hr_holidays,POS:Improvement is Done
bzr revid: mma@tinyerp.com-20110516125031-wgqpw1lgrk0wv3ew
2011-05-16 18:20:31 +05:30
Rucha (Open ERP) 33d9a30005 [IMP, REF]: base_setup, hr_holidays: Code improvement and refactoring in assign legal leave wizard
bzr revid: rpa@tinyerp.com-20110512123920-m82iqsnw0c2v6gqj
2011-05-12 18:09:20 +05:30
aag (OpenERP) 7483f436cf [ADD]hr_holidays:aad new config wiz -Assign Legal Leaves to Employees
bzr revid: aag@tinyerp.co.in-20110512112629-it13t2lgtupum6gk
2011-05-12 16:56:29 +05:30
Quentin (OpenERP) cfa9e170ac [MERGE] lp: 751299 (+change priority of new view)
bzr revid: qdp-launchpad@openerp.com-20110504075525-edkp4hcu3guxj3kz
2011-05-04 09:55:25 +02:00
Launchpad Translations on behalf of openerp d553615695 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110429055618-q15rvfmlvfsl2im5
bzr revid: launchpad_translations_on_behalf_of_openerp-20110430045341-qzlphdlvqf2aa1zx
bzr revid: launchpad_translations_on_behalf_of_openerp-20110501045420-py2vl38b1o3mfs7o
bzr revid: launchpad_translations_on_behalf_of_openerp-20110502043731-ym2tvgj2djoitk8f
2011-05-02 04:37:31 +00:00
Quentin (OpenERP) f9a1e706a8 [MERGE] lp:767238
bzr revid: qdp-launchpad@openerp.com-20110427080332-qdwytwgd97ekj35v
2011-04-27 10:03:32 +02:00
pso (OpenERP) 6812297887 [IMP] hr_holidays: Improved search, tree view of holiday and onchange method
bzr revid: pso@tinyerp.com-20110426064116-47pn4y5yuifsbjmg
2011-04-26 12:11:16 +05:30
pso (OpenERP) 428944635f [IMP] hr_holidays: Improved Indentation
bzr revid: pso@tinyerp.com-20110426060513-nxbcemw0cfbkpdga
2011-04-26 11:35:13 +05:30
pso (OpenERP) bcbccd8eb8 [FIX] hr_holidays: Wrong allocation request created when allocating holidays per category of employee
lp bug: https://launchpad.net/bugs/767238 fixed

bzr revid: pso@tinyerp.com-20110426053714-i0jpn1fh620mk1j4
2011-04-26 11:07:14 +05:30
Husen Daudi 29e05874b6 merged with trunk
bzr revid: hda@hda-laptop-20110421052650-rtn75wn5o3ue87wp
bzr revid: hda@hda-laptop-20110426053533-gn68qmvhikeefike
2011-04-26 11:05:33 +05:30
skh c6cc93fcb0 [FIX] [PS] List view of leaves type contains different fields as the form view
lp bug: https://launchpad.net/bugs/751299 fixed

bzr revid: skh@tinyerp.com-20110421121226-40h4sahiuoydnjgt
2011-04-21 17:42:26 +05:30
skh 8b2d082ff9 [FIX] [PS] List view of leaves type contains different fields as the form view
lp bug: https://launchpad.net/bugs/751299 fixed

bzr revid: skh@tinyerp.com-20110421072031-r6l3uxk91bewcfrk
2011-04-21 12:50:31 +05:30
skh 309493382d [FIX] [PS] List view of leaves type contains different fields as the form view
lp bug: https://launchpad.net/bugs/751299 fixed

bzr revid: skh@tinyerp.com-20110421063936-a2k70vufxdvt3efm
2011-04-21 12:09:36 +05:30
Husen Daudi 2819a946b7 fixed typo and constraint
bzr revid: hda@hda-laptop-20110419065236-ugsbpsnu0myg3qs6
2011-04-19 12:22:36 +05:30
psi (Open ERP) 3e2d509684 [FIX] hr_holidays: Improve _sql_constraint and help
bzr revid: psi@tinyerp.co.in-20110419054451-7ien3mqbaqooozj3
2011-04-19 11:14:51 +05:30
Husen Daudi baf94ebf97 fixed workflow instance problem in hr_holidays
bzr revid: hda@hda-laptop-20110418110437-875ee2zci9s09ghk
2011-04-18 16:34:37 +05:30