Commit Graph

898 Commits

Author SHA1 Message Date
Stephane Wirtel 3dc8168974 [FIX] Set the categories
bzr revid: stw@openerp.com-20111005141902-72du0lku4x176ix9
2011-10-05 16:19:02 +02:00
Fabien Pinckaers 1ae77effae merge
bzr revid: fp@tinyerp.com-20110924141651-lzlmllxy5np7eb90
2011-09-24 16:16:51 +02:00
Fabien Pinckaers 78f60c63f2 fix
bzr revid: fp@tinyerp.com-20110917145731-h0woi9z87i9b14fn
2011-09-17 16:57:31 +02:00
Fabien Pinckaers 523be42bd1 merge
bzr revid: fp@tinyerp.com-20110917141929-2goj9ifzidq8g6rk
2011-09-17 16:19:29 +02:00
Fabien Pinckaers 05d6d35cc8 [Merge]
bzr revid: fp@tinyerp.com-20110917110317-34apz3spz1h9azjl
2011-09-17 13:03:17 +02:00
ARA (OpenERP) 5724622376 [IMP] remove hr salary securty and merge into hr_payroll
bzr revid: ara@tinyerp.com-20110916101826-xf2ynbxg1o6zkfwh
2011-09-16 15:48:26 +05:30
Quentin (OpenERP) ffd416e00e [MERGE[ hr_payroll: usability enhancement
bzr revid: qdp-launchpad@openerp.com-20110915163050-n2ueot8ee2vb0ljq
2011-09-15 18:30:50 +02:00
Quentin (OpenERP) d4c1e8ad34 [MERGE[ hr_payroll: fix payslip detail report
bzr revid: qdp-launchpad@openerp.com-20110915162818-wupvt4i1n3wwxpxr
2011-09-15 18:28:18 +02:00
Quentin (OpenERP) d7dc402fee [MERGE[ hr_payroll_account: journal_id on payslip run
bzr revid: qdp-launchpad@openerp.com-20110915162603-psjo4r9m6869v2ny
2011-09-15 18:26:03 +02:00
Meera Trambadia (OpenERP) ba5341a5e6 [MERGE] branch merged with lp:openobject-addons
bzr revid: mtr@tinyerp.com-20110915130151-7uxiju44u28o7b9h
2011-09-15 18:31:51 +05:30
Purnendu Singh (OpenERP) 6caf40c88b [IMP] hr_payroll: add act window button on contribution register which will give all payslip lines of that register
bzr revid: psi@tinyerp.com-20110915063446-qsfr61kqosv2l5rx
2011-09-15 12:04:46 +05:30
Purnendu Singh (OpenERP) 4960c39193 [IMP] hr_payroll:label improvment
bzr revid: psi@tinyerp.com-20110915060953-zslf0b4pdcg03oya
2011-09-15 11:39:53 +05:30
Purnendu Singh (OpenERP) f763635a53 [FIX] hr_payroll: shifed the worked days and input tab to first position and rename Payslip Lines act window to Payslip Computation Detail
bzr revid: psi@tinyerp.com-20110915052737-541rkobli69etr2g
2011-09-15 10:57:37 +05:30
Mustufa Rangwala (OpenERP) bddfe1cd5a [IMP] hr_payroll, hr_payroll_account: Payslip Run => add journal_id field on payslip run, improve search view, fix for done button on payslip run, usibility improvements
bzr revid: mra@tinyerp.com-20110915051636-54xj84eams3fvyu5
2011-09-15 10:46:36 +05:30
Quentin (OpenERP) 7dfc61350c [IMP] hr_payroll: default value for scheduled pay field
bzr revid: qdp-launchpad@openerp.com-20110914142450-au5t6fkg6h420qwg
2011-09-14 16:24:50 +02:00
Quentin (OpenERP) 0dff60cf26 [FIX] hr_payroll: fixed rule in demo data
bzr revid: qdp-launchpad@openerp.com-20110914140557-nkm6j1fjpo34nfd2
2011-09-14 16:05:57 +02:00
Purnendu Singh (OpenERP) 971ffbd5cc [FIX] hr_payroll: payslip details report fails while we install hr_payroll_l10n_be module
bzr revid: psi@tinyerp.com-20110914131106-4743bpey6vtvtbxz
2011-09-14 18:41:06 +05:30
Quentin (OpenERP) 3b8ebe0615 [IMP] hr_payroll: usability improvements
bzr revid: qdp-launchpad@openerp.com-20110914123108-k5xtjxau4zc50sv8
2011-09-14 14:31:08 +02:00
Quentin (OpenERP) 514dfa0748 [IMP] hr_payroll: added tree view on payroll structures and rule categories. + few renaming of stupid copied/pasted xml_id meaningless
bzr revid: qdp-launchpad@openerp.com-20110914085311-nfg3sg0cdi5jv9y6
2011-09-14 10:53:11 +02:00
Quentin (OpenERP) dac8a9e4fb [MERGE] merged with main addons branch
bzr revid: qdp-launchpad@openerp.com-20110913120012-339iigyjojh89sy3
2011-09-13 14:00:12 +02:00
Quentin (OpenERP) a5b2f68edb [IMP] hr_payroll: demo data improvement
bzr revid: qdp-launchpad@openerp.com-20110913074705-ai34g7g6wcwou4aw
2011-09-13 09:47:05 +02:00
Xavier Morel 178fec5c64 [FIX] str 'in' str (singletons missing tuple-building comma), in @colors attributes. Replace by string equality
bzr revid: xmo@openerp.com-20110911135025-v9yct8pnjfj21tyj
2011-09-11 15:50:25 +02:00
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 ae7b1699cb Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110823050537-7q5lx6k2wq8n70ld
bzr revid: launchpad_translations_on_behalf_of_openerp-20110824043728-ri9o75i5hp2tss1x
2011-08-24 04:37:28 +00:00
mtr b3d4085714 [FIX] account,hr,hr_recruitment,hr_payroll,product:- enforced _sql_constraint to maintain uniqueness
lp bug: https://launchpad.net/bugs/789019 fixed

bzr revid: mtr@mtr-20110805052025-3w0w7ccnnlrish2b
2011-08-05 10:50:25 +05:30
Raphael Collet f24b3536fb [MERGE] from trunk
bzr revid: rco@openerp.com-20110722150257-3s6caa3c2mn5et4o
2011-07-22 17:02:57 +02:00
Launchpad Translations on behalf of openerp d844fd133b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110720043721-c35fwfpelcbp1jbk
bzr revid: launchpad_translations_on_behalf_of_openerp-20110721043532-p7f537lm5otnbht8
bzr revid: launchpad_translations_on_behalf_of_openerp-20110722044222-ntao98t3fw2ldjgb
2011-07-22 04:42:22 +00:00
Raphael Collet 81a1eb18a1 [MERGE] from trunk
bzr revid: rco@openerp.com-20110718083424-kdaesx3gflza142a
2011-07-18 10:34:24 +02:00
Quentin (OpenERP) cc5639bbac [IMP] usaiblity improvements
bzr revid: qdp-launchpad@openerp.com-20110711160549-n2rgb060zuo51g65
2011-07-11 18:05:49 +02:00
Quentin (OpenERP) 4f77873577 [IMP] payroll: small usabiltiy improvements
bzr revid: qdp-launchpad@openerp.com-20110711150309-z1j2780kijojmzep
2011-07-11 17:03:09 +02:00
Quentin (OpenERP) ecb85380ad [IMP] hr_payrolll: usability improvements
bzr revid: qdp-launchpad@openerp.com-20110711121525-88cz0kag3s6qim68
2011-07-11 14:15:25 +02:00
Quentin (OpenERP) d53a9f55ec [MERGE] payroll yaml test
bzr revid: qdp-launchpad@openerp.com-20110711104448-2xsw62pmfxzv1gv9
2011-07-11 12:44:48 +02:00
Quentin (OpenERP) 243d19b89e [MERGE] payroll: fixed error in schema of hr_contract
bzr revid: qdp-launchpad@openerp.com-20110711103326-rti0sjuex2a6mcmq
2011-07-11 12:33:26 +02:00
mtr 418265d252 [IMP] hr_payroll,hr_payroll_account: improved yaml and demo data for payroll_account
bzr revid: mtr@mtr-20110711102754-1qw17zempu4e32ol
2011-07-11 15:57:54 +05:30
mtr 781ebda8f9 [MERGE] branch merged with trunk-payroll
bzr revid: mtr@mtr-20110711102131-gecb7yb6og0x8ac4
2011-07-11 15:51:31 +05:30
Quentin (OpenERP) f9464f5ee4 [MERGE] payroll:usabilty
bzr revid: qdp-launchpad@openerp.com-20110710013833-s07r2l6zlyxg8t6f
2011-07-10 03:38:33 +02:00
Quentin (OpenERP) 0f89d90573 [MERGE] payroll: report cleaning
bzr revid: qdp-launchpad@openerp.com-20110710013710-efrp7hsz1hfp87ux
2011-07-10 03:37:10 +02:00
Quentin (OpenERP) ccac68b4a0 [MERGE] payroll: usability
bzr revid: qdp-launchpad@openerp.com-20110710013513-hvu3brjm502nn2hv
2011-07-10 03:35:13 +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
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 f36e724804 [IMP] removed remaining method=True params from fields.function
Server revision 3495 odo@openerp.com-20110701232328-flgxulxva70vnyxr
removed the need for passing method=True to function fields.

bzr revid: odo@openerp.com-20110705122857-zvzpamu0n24zst1q
2011-07-05 14:28:57 +02:00
Antony Lesuisse de41ee470e [FIX] hr payroll attrs, remove trailing comma
bzr revid: al@openerp.com-20110705110728-ihwts1v4ot06kimt
2011-07-05 13:07:28 +02:00
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
mtr 9dbd0df043 [MERGE] branch merged with trunk-payroll
bzr revid: mtr@mtr-20110630115822-u0rnk1w1auk7s583
2011-06-30 17:28:22 +05:30
psi (Open ERP) 7890f2f080 [FIX] hr_payroll: fixes YML trace back as struct_id field was required on hr.contract object
bzr revid: psi@tinyerp.co.in-20110630091533-al5ei2f202aw5q7a
2011-06-30 14:45:33 +05:30
psi (Open ERP) fff45e7a17 [IMP] hr_payroll: added a button relate on the payslip to get all the payslip lines applied grouped by contribution register
bzr revid: psi@tinyerp.co.in-20110629122727-1hfynocjx7kxjefd
2011-06-29 17:57:27 +05:30
psi (Open ERP) 606ebf8781 [IMP] hr_payroll: Added button for contribution register in group by search for payslip search view
bzr revid: psi@tinyerp.co.in-20110629111122-13e8l8fwyorjmjqc
2011-06-29 16:41:22 +05:30
psi (Open ERP) 4c37aafc45 [IMP] hr_payroll: remove abs from contribution report
bzr revid: psi@tinyerp.co.in-20110629103110-kjqz620ybuwxxswb
2011-06-29 16:01:10 +05:30
psi (Open ERP) 167b5b0686 [IMP] hr_payroll: Improvement in demo data
bzr revid: psi@tinyerp.co.in-20110629102801-wx3i2rcpy5ols9pg
2011-06-29 15:58:01 +05:30
psi (Open ERP) 82b0249a9d [IMP] hr_payroll: Improve the contribution register report so it will now show the lines of confirmed payslips only
bzr revid: psi@tinyerp.co.in-20110629092032-2uq3i90evylxy8zu
2011-06-29 14:50:32 +05:30