Commit Graph

962 Commits

Author SHA1 Message Date
Hardik 06d98bcbbc [IMP]Improvement in different modules
bzr revid: hsa@tinyerp.com-20121105070408-jygn8tx77lvkzqnb
2012-11-05 12:34:08 +05:30
Fabien Pinckaers 367edaad26 [IMP] order of invoice types
bzr revid: fp@openerp.com-20121103134512-mwkqzsnz3ndy5fsb
2012-11-03 14:45:12 +01:00
Fabien Pinckaers 726a8e6c10 [MERGE] useability improvement
bzr revid: fp@tinyerp.com-20121102083612-xb2qvaqhgxunfipg
2012-11-02 09:36:12 +01:00
Olivier Dony eefc873a4b [MERGE] hr_timesheet_invoice: fix bug 1048305 + add regression test, courtesy of Stephane Bidoul (Acsone)
The semantics for invoice taxes in OpenERP is to use
the product taxes if the product has any (and if there
is a specific product), and otherwise use those on the
G/L account that is used. This is how taxes are determined
when creating invoices.

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

bzr revid: odo@openerp.com-20121030162443-rn18sl1twp2t1mex
2012-10-30 17:24:43 +01:00
Stéphane Bidoul ad811bf48e [FIX] hr_timesheet_invoice: make tax test more independent of master data
bzr revid: stephane.bidoul@acsone.eu-20121030145537-u4jdutaw2mzdur39
2012-10-30 15:55:37 +01:00
Stéphane Bidoul c186d01d8e [FIX] invoice tasks work: default to account tax when product has no tax
lp bug: https://launchpad.net/bugs/1048305 fixed

bzr revid: stephane.bidoul@acsone.eu-20121030112632-7cbfv7xgzqnua6i5
2012-10-30 12:26:32 +01:00
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
Saurang Suthar a0e65cecc8 [MERGE]:merged with main addons
bzr revid: ssu@tinyerp.com-20121025101308-4h46y6lgyaxctz2m
2012-10-25 15:43:08 +05:30
Fabien Pinckaers bde73ca622 [MERGE] hr improvements in board
bzr revid: fp@tinyerp.com-20121022163949-m1yv3b7sysgu3951
2012-10-22 18:39:49 +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
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
Saurang Suthar 809c4f1ed8 [IMP]hr_timesheet_invoice:fixed the issue of traceback while closing or canceling the contract
bzr revid: ssu@tinyerp.com-20121016132012-l8cmrr873syfvr1q
2012-10-16 18:50:12 +05:30
Saurang Suthar 27ea8ab7a4 [IMP]hr_timesheet_invoice:renamed buttons Close to Contract Finished and Cancel to Cancel Contract
bzr revid: ssu@tinyerp.com-20121016063847-vpwt26fwme7reryx
2012-10-16 12:08:47 +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
Fabien Pinckaers 75e76aef95 [IMP] filter timesheets to invoice
bzr revid: fp@openerp.com-20121028152419-sufllvbm16q1nuw5
2012-10-28 16:24:19 +01:00
Fabien Pinckaers 4f0c5bf19c [IMP] contract useability and invoicing
bzr revid: fp@openerp.com-20121028151537-98wz6qiosmumbqvg
2012-10-28 16:15:37 +01:00
Fabien Pinckaers eff45f038d [IMP] invoice on timesheet using user price
bzr revid: fp@openerp.com-20121028121730-1sbhsoyxa220oktn
2012-10-28 13:17:30 +01:00
Fabien Pinckaers 67a66d0ca4 [IMP] Useability: contracts
bzr revid: fp@openerp.com-20121028103328-qjqeznq9a95mcdpe
2012-10-28 11:33:28 +01: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