Commit Graph

947 Commits

Author SHA1 Message Date
Fabien Pinckaers bde73ca622 [MERGE] hr improvements in board
bzr revid: fp@tinyerp.com-20121022163949-m1yv3b7sysgu3951
2012-10-22 18:39:49 +02:00
Fabien Pinckaers 6c15bcce12 [MERGE] HR
bzr revid: fp@openerp.com-20121021195925-sbsfni9i10r2o2bw
2012-10-21 21:59:25 +02:00
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
pankita shah (Open ERP) e48e2a42dc [IMP] warning mesage and fix traceback ehen click chanwork button
bzr revid: atp@tinyerp.com-20121015054845-myi61ts7o2p4bg1e
bzr revid: atp@tinyerp.com-20121016175913-lbq3ymr9y7qz0tae
bzr revid: shp@tinyerp.com-20121018105933-c40om6nmwjw2xz7s
2012-10-18 16:29:33 +05:30
Launchpad Translations on behalf of openerp 7f23ad5de5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121014043940-206nffs2h36wt170
2012-10-14 04:39:40 +00:00
Launchpad Translations on behalf of openerp bcfee955da Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121013043627-kst9vjslj6iqp6wq
bzr revid: launchpad_translations_on_behalf_of_openerp-20121013044941-k1vrd8hcxn5tqr0i
2012-10-13 04:49:41 +00:00
Atul Patel (OpenERP) 87e8959205 [FIX]
bzr revid: atp@tinyerp.com-20121011174126-lii90i9fnfhfsy9v
2012-10-11 23:11:26 +05:30
Atul Patel (OpenERP) 53c70856c3 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20121011153329-nssuw7jzxzfjyhm7
2012-10-11 21:03:29 +05:30
Atul Patel (OpenERP) b27b12db1b [FIX]: Fix onchange account id problem
bzr revid: atp@tinyerp.com-20121011121201-h6030emuz00t55nv
2012-10-11 17:42:01 +05:30
Fabien Pinckaers 5c4348f7fe [FIX] HR useability improvements
bzr revid: fp@openerp.com-20121010192927-6ud5e3zvhp5gabip
2012-10-10 21:29:27 +02:00
Atul Patel (OpenERP) e2a28b011a [FIX]: Fix on_change_analytic_id problem
bzr revid: atp@tinyerp.com-20121010150849-u4cldadvfjzmw8mj
2012-10-10 20:38:49 +05:30
Atul Patel (OpenERP) 98eaf2c2bc [FIX]: Fix on_change_account_id() argument problem
bzr revid: atp@tinyerp.com-20121010103450-n4gt4ikp05t6b8yu
2012-10-10 16:04:50 +05:30
Jalpesh Patel (OpenERP) 4b88980282 [IMP]hr dashboard and fix problem of creating timesheet lines (user is employee + partner manager + sales manager)
bzr revid: pja@tinyerp.com-20121009115928-t7cnt9pox8hy2cs6
2012-10-09 17:29:28 +05:30
Atul Patel (OpenERP) fbe1e7f913 [FIX]: analytic account onchange problem.
bzr revid: atp@tinyerp.com-20121009104842-njdr868dtc4ly1w9
2012-10-09 16:18:42 +05:30
Ajay Chauhan (OpenERP) 05fc9d4baf [MERGE] merge with lp:openobject-addons
bzr revid: cha@tinyerp.com-20121005052059-6pshnhosxtr3xi8r
2012-10-05 10:50:59 +05:30
Fabien Pinckaers c93d70e919 [MERGE] chm - improved subtype - fixes
bzr revid: fp@openerp.com-20121002204023-8v3jf2n84xe2jol9
2012-10-02 22:40:23 +02:00
Antonin Bourguignon 2b2288a3bd [FIX] a few problems introduced with the last merge
bzr revid: abo@openerp.com-20121002111231-zo41jejkrm8afavu
2012-10-02 13:12:31 +02:00
Antonin Bourguignon 1653332080 [MERGE] trunk
bzr revid: abo@openerp.com-20121002102915-424prxd74izb1szw
2012-10-02 12:29:15 +02:00
Ajay Chauhan (OpenERP) e033f2f1ae [MERGE] merge with lp:openobject-addons
bzr revid: cha@tinyerp.com-20121001084641-li6apbpimfbyllo3
2012-10-01 14:16:41 +05:30
Antony Lesuisse 6dd16f2613 [MERGE] trunk
bzr revid: al@openerp.com-20120930141638-bw50m7b5a8wnu2yh
2012-09-30 16:16:38 +02:00
Fabien Pinckaers 0bebad7133 [MERGE] fix right company on multi-company timesheeets
bzr revid: fp@tinyerp.com-20120929132907-a618eqxz97jgnzoy
2012-09-29 15:29:07 +02:00
Fabien Pinckaers 00e8128412 [MERGE]
bzr revid: fp@tinyerp.com-20120928083213-7iiif73rxb2m1kxv
2012-09-28 10:32:13 +02:00
Ajay Chauhan (OpenERP) 254aacbd01 [MERGE] merge with main addons
bzr revid: cha@tinyerp.com-20120928055404-hwwdjkqod93pcbk5
2012-09-28 11:24:04 +05:30
Ajay Chauhan (OpenERP) 425d285e2e [IMP] hr_timesheet_invoice: made little change in condition
bzr revid: cha@tinyerp.com-20120928054445-ayg474ppng31318r
2012-09-28 11:14:45 +05:30
Fabien Pinckaers fc9f8491fe [MERGE] related not in 'More...'
bzr revid: fp@tinyerp.com-20120927173641-i503k4kycnwjyefj
2012-09-27 19:36:41 +02:00
Ajay Chauhan (OpenERP) b478be2675 [IMP] hr_timesheet_sheet, hr_timesheet_invoice : made changes for warning message
bzr revid: cha@tinyerp.com-20120927121948-iqrtxdijiknwggh6
2012-09-27 17:49:48 +05:30
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
Foram Katharotiya (OpenERP) 942c10775d [IMP] rename quantity field into Time Quantity in timesheets
bzr revid: fka@tinyerp.com-20120921092139-v0zivzne452qc8h1
2012-09-21 14:51:39 +05:30
Bharat Devnani (OpenERP) 2bd84c5d96 [IMP] removed redundant buttons from more and kept some buttons in form view
bzr revid: bde@tinyerp.com-20120921065300-d4pcpordc4xmczd3
2012-09-21 12:23:00 +05:30
Thibault Delavallée cb806332be [FIX] subtype_xml_id -> subtype in message_post.
bzr revid: tde@openerp.com-20120920145405-vwi1kt1ttkd2w8sz
2012-09-20 16:54:05 +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
Sanjay Gohel (Open ERP) 66e8595b01 [IMP]changed in all hr module for subtype
bzr revid: sgo@tinyerp.com-20120913065854-7y5jkls3q2jebduv
2012-09-13 12:28:54 +05:30
Stéphane Bidoul 38dfccaaa0 hr_timesheet_invoice: in invoice task work, use the account default tax if the product has no taxes defined
lp bug: https://launchpad.net/bugs/1048305 fixed

bzr revid: stephane.bidoul@acsone.eu-20120909165919-xgxu45ugq3944gvu
2012-09-09 18:59:19 +02:00
Stéphane Bidoul 4deb1f84e7 hr_timesheet_invoice, bill task work: use the analytic account company for the generated invoice_cost_create
This makes life much easiers for people generating billings for several companies.

lp bug: https://launchpad.net/bugs/1047826 fixed

bzr revid: stephane.bidoul@acsone.eu-20120909152438-qax5pv4ij76asmbv
2012-09-09 17:24:38 +02:00
Amit Patel (OpenERP) 0a5ebb52e1 [MERGE]:trunk-mail-cleaning-fp
bzr revid: apa@tinyerp.com-20120904104409-w9zl98qjpem10pan
2012-09-04 16:14:09 +05:30
Thibault Delavallée 48c081f271 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120904075142-4xnbxyf52ph0jezj
2012-09-04 09:51:42 +02:00
Randhir Mayatra (OpenERP) df3aa41ac4 [IMP] add subtype data in hr module
bzr revid: rma@tinyerp.com-20120904071754-d99h6iey5nzrjf08
2012-09-04 12:47:54 +05:30
Fabien Pinckaers da7c583359 [IMP] contracts
bzr revid: fp@tinyerp.com-20120901072137-le4el67es4zhw8n7
2012-09-01 09:21:37 +02:00
Thibault Delavallée 8b910c1f1d [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120829074244-x6u8dnw4owiw93pv
2012-08-29 09:42:44 +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
Thibault Delavallée 4b0d1be1c0 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120827083705-p2edynkzch7hszrd
2012-08-27 10:37:05 +02:00
Saurang Suthar(OpenERP) 095843797c [IMP] Improved _openerp__.py of all modules by replacing demo_xml with demo, init_xml and update_xml with data and adding noupdate
bzr revid: pso@tinyerp.com-20120822130232-un52dks3sclyx8m5
2012-08-22 18:32:32 +05:30
Fabien Pinckaers b62858e83e [IMP] Merging different ways of posting a message:
message_append_note
  message_append_dict
  message_append
  --> merged all to message_post

bzr revid: fp@tinyerp.com-20120817100302-bqsqv23ogrchslew
2012-08-17 12:03:02 +02:00
Quentin (OpenERP) 1232812cc6 [MERGE] merged branch that corrects the decimal precision on fields. Courtesy of Akretion
bzr revid: qdp-launchpad@openerp.com-20120814141040-oaf7d56thhi2s9rm
2012-08-14 16:10:40 +02:00
Vo Minh Thu 9822629548 [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
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
Twinkle Christian (OpenERP) 3b4f98df43 [IMP]Remove type field from the modules
bzr revid: tch@tinyerp.com-20120809072321-fix11926u4pw3to6
2012-08-09 12:53:21 +05:30
Twinkle Christian (OpenERP) 721adad01e [IMP]Remove type field from the whole hr module
bzr revid: tch@tinyerp.com-20120808124839-ecd1uic8mscg3s7f
2012-08-08 18:18:39 +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