Stephane Wirtel
bea411bb98
[IMP] Backport one feature from website: this feature allows to specify a file
...
path on the field tag fetching the right file instead of using the base64
encoded file in the field.
<field name="image" type="base64" file="base/static/img/main_partner-image.png" />
bzr revid: stw@openerp.com-20140109154550-a04qybctzaaqtrlr
2014-01-09 16:45:50 +01:00
Thibault Delavallée
1a6eb52a32
[MERGE] [IMP] hr_payroll: improved demo data and yml tests demo data
...
bzr revid: tde@openerp.com-20130904141110-svlfpvl3ddu12al7
2013-09-04 16:11:10 +02:00
Ajay Chauhan (OpenERP)
71ebeae6af
[IMP] added employee demo data & update photos
...
bzr revid: cha@tinyerp.com-20130222132807-iu1qsrlbvm7aj9nx
2013-02-22 18:58:07 +05:30
Mayur Maheshwari (OpenERP)
81560c12fa
[FIX]hr_payroll : improved some code
...
bzr revid: mma@tinyerp.com-20121105101900-bg5pjmsc5pt957pl
2012-11-05 15:49:00 +05:30
Nehal Panchal (OpenERP)
9a6e7799fe
[FIX]hr_payroll : Fixed Salary Rules Python Code and Quantity for payslip computation
...
bzr revid: mma@tinyerp.com-20121105062807-byz6d0kd7scxq3r3
2012-11-05 11:58:07 +05:30
Rucha (Open ERP)
d729b44e5f
[IMP]: hr_payroll: Improved creation of new partner for emplyee and changed proper references
...
bzr revid: rpa@tinyerp.com-20120718131952-mj0zk3nx7ifwft2n
2012-07-18 18:49:52 +05:30
Raphael Collet
a078b524c7
[FIX] missing definitions of xml ids hr.employee1, etc.
...
bzr revid: rco@openerp.com-20111222133559-mq58fblnrkhykguu
2011-12-22 14:35:59 +01:00
Vo Minh Thu
f20cdb19f5
[FIX] clean some warnings.
...
bzr revid: vmt@openerp.com-20111206121955-tbv84nfcni0c0q8k
2011-12-06 13:19:55 +01:00
Vo Minh Thu
7c63902af8
[FIX] clean some warnings.
...
bzr revid: vmt@openerp.com-20111205150311-6xkx4eytvxnkvdck
2011-12-05 16:03:11 +01: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
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
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
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
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)
6f5c7b8227
[IMP] hr_payroll: Added demo data for contribution register and updated the demo data
...
bzr revid: psi@tinyerp.co.in-20110629084855-ah2889z5oucv6ssg
2011-06-29 14:18:55 +05:30
mtr
ad6b2593c2
[IMP] hr_payroll: renamed the field 'quantity' to 'amount'
...
bzr revid: mtr@mtr-20110524060202-z58x324zvkugddd1
2011-05-24 11:32:02 +05:30
Quentin (OpenERP)
da8281001a
[IMP] hr_payroll: better demo data
...
bzr revid: qdp-launchpad@openerp.com-20110523141423-5x5e6curv55gpdej
2011-05-23 16:14:23 +02:00
mtr
16228651c6
[IMP] hr_payroll: changed amount in the demo data for 'Meal voucher' rule
...
bzr revid: mtr@mtr-20110523071328-ngvq8z1somz7bomt
2011-05-23 12:43:28 +05:30
Mustufa Rangwala
62c0ddad78
[IMP] Payroll: demo and default string improvements
...
bzr revid: mra@mra-laptop-20110513062405-pf57a2ntrsze36mp
2011-05-13 11:54:05 +05:30
psi (Open ERP)
c600603f3a
[ADD] improve code and add demo rule for sales
...
bzr revid: psi@tinyerp.co.in-20110510111931-4v21peqft66hblpp
2011-05-10 16:49:31 +05:30
mtr
3c877bb4c7
[IMP] hr_payroll:removed qty from demo,improved search engine,made qty mandatory and added tooltip
...
bzr revid: mtr@mtr-20110425095537-ewmhlikkh5i50jyg
2011-04-25 15:25:37 +05:30
mtr
51543fa458
[IMP] hr_payroll:added field 'quantity' on salary rules,modified computation engine and demo data
...
bzr revid: mtr@mtr-20110425072510-9f7tbuo9w3q3qq30
2011-04-25 12:55:10 +05:30
Quentin (OpenERP)
2dad28d4fd
[IMP] hr_payroll: misc improvements among
...
* remove typo in hr.contribution.register object name
* fix engine: a rule with same code must overwrite the previous value
* improved demo data: set same code for Conveyance Allowance for Paolino and parent rule
* improved tree/search views
bzr revid: qdp-launchpad@openerp.com-20110412170128-xlf1r1tfsm8ke7e5
2011-04-12 19:01:28 +02:00
mtr
cbb45ef370
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll
...
bzr revid: mtr@mtr-20110412085111-f47gcnu21e2s6433
2011-04-12 14:21:11 +05:30
mtr
6448821818
[IMP] hr_payroll: corrected m2m field rule_ids in demo data
...
bzr revid: mtr@mtr-20110412084435-e9wmpo4c0thm9954
2011-04-12 14:14:35 +05:30
Mustufa Rangwala
d900e9768b
[FIX] Payroll: Meal voucher correct the sequnce
...
bzr revid: mra@mra-laptop-20110412084427-12jupz8i6s6lol6d
2011-04-12 14:14:27 +05:30
mtr
3c3d8349c9
[IMP] hr_payroll: improved demo data i.e. sequence on salary rules
...
bzr revid: mtr@mtr-20110411130803-fp5gfz4plxap6h59
2011-04-11 18:38:03 +05:30
mtr
a325842fc3
[IMP] hr_payroll: improved demo data
...
bzr revid: mtr@mtr-20110411105747-w76xe1ylr9e14r42
2011-04-11 16:27:47 +05:30
Quentin (OpenERP)
69f697b7ef
[IMP] hr_payroll: improved demo data
...
bzr revid: qdp-launchpad@openerp.com-20110411081139-7x93kr8v11q19f2x
2011-04-11 10:11:39 +02:00
Quentin (OpenERP)
a85f8c2b72
[FIX] hr_payroll: sequence > 100 for deduction demo rules
...
bzr revid: qdp-launchpad@openerp.com-20110411080903-x44oiaj1ex0m3gwv
2011-04-11 10:09:03 +02:00
Quentin (OpenERP)
20485cdb2a
[FIX] hr_payroll: set the parent of demo structure
...
bzr revid: qdp-launchpad@openerp.com-20110411080654-sx3ie5pw0seqmnir
2011-04-11 10:06:54 +02:00
Quentin (OpenERP)
a79f6fe7a5
[FIX] hr_contract, hr_payroll: fixed installation errors due to previous commit
...
bzr revid: qdp-launchpad@openerp.com-20110408173129-sqvdowkfuawxjddb
2011-04-08 19:31:29 +02:00
Quentin (OpenERP)
60c64c6cff
[REF] hr_payroll: removed commented code (for 'the sake of clarity' and because bazaar is your historian ^^)
...
bzr revid: qdp-launchpad@openerp.com-20110406141645-rbn5zu51jm5tipmm
2011-04-06 16:16:45 +02:00
Quentin (OpenERP)
230e12b5c4
[IMP] hr_payroll: major improvements (fill input, compute only on button pressed, code cleaning, improved computation engine...)
...
bzr revid: qdp-launchpad@openerp.com-20110406122845-au66vdlm7i39mh1c
2011-04-06 14:28:45 +02:00
mtr
55739910e7
[IMP] hr_payroll:improved code,demo data and Details by salary head
...
bzr revid: mtr@mtr-20110405115528-p78zhmgfr87q6ifd
2011-04-05 17:25:28 +05:30
mtr
794e3ee8b2
[IMP] hr_payroll: added NET rule in data file and removed 'sequence' field
...
bzr revid: mtr@mtr-20110401051048-f20cz98tdqmlrewd
2011-04-01 10:40:48 +05:30
psi (Open ERP)
8b1895b8e8
[IMP] hr_payroll: Improve demo data(set negative value for deduction)
...
bzr revid: psi@tinyerp.co.in-20110309103758-x4kzt9kn5krogre3
2011-03-09 16:07:58 +05:30
mtr
971a91390a
[IMP] hr_payroll:improvements in salary rules,salary head,salary structure and demo data
...
bzr revid: mtr@mtr-20110307071829-rluk1idcxjtbw43u
2011-03-07 12:48:29 +05:30
mtr
d840425793
[IMP] hr_payroll:renamed 'hr.allounce.deduction.categoty' to 'hr.salary.head' and improved its object and fields
...
bzr revid: mtr@mtr-20110303095226-kga2d2ulq0mhb4ne
2011-03-03 15:22:26 +05:30
mtr
017c72127b
[IMP] hr_payroll:improved demo data and the structure of 'Salary Head'
...
bzr revid: mtr@mtr-20110301132938-rt8nqcwndgj0gefp
2011-03-01 18:59:38 +05:30
mtr
deec616aa5
[IMP] hr_payroll: improved Salary Head,added 'salary.head.type' object and 'salary rule' as m2m on employee,removed one2many 'Child Salary Structure'
...
bzr revid: mtr@mtr-20110225130726-5bc1b5hf2cgefeo3
2011-02-25 18:37:26 +05:30
qdp-launchpad@tinyerp.com
2df4a68377
[MERGE] merged the dev3 branch
...
bzr revid: qdp-launchpad@tinyerp.com-20110114001101-wk77opsrvslh7pak
2011-01-14 01:11:01 +01:00
psi (Open ERP)
7a795aa8f6
[FIX] hr_payroll: speling correction of lables
...
lp bug: https://launchpad.net/bugs/702027 fixed
bzr revid: psi@tinyerp.co.in-20110113075536-q1gjfq0mu3a26hd0
2011-01-13 13:25:36 +05:30
husen
f433b959c2
merged with trunk
...
bzr revid: husen@husen-laptop-20101230095809-cl6dkve1odgdtqtv
2010-12-30 15:28:09 +05:30
vra
67d5a0c3a8
[IMP]hr_payroll: Improved the hr payroll demo xml file.
...
bzr revid: vra@tinyerp.com-20101014120429-bfcf6o96hbe1odjv
2010-10-14 17:34:29 +05:30
Mantavya Gajjar
e74b9a6f31
[FIX]: fix a problem of type in the demo data
...
bzr revid: mga@tinyerp.com-20101007073832-colu8w7g4fik545b
2010-10-07 13:08:32 +05:30
Mantavya Gajjar
52462287f3
[IMP]L improvement and fix to the payroll module
...
bzr revid: mga@tinyerp.com-20101007063156-tijiyci4w5r0v29w
2010-10-07 12:01:56 +05:30
Mantavya Gajjar
15792bb9fa
[IMP]: improve the hr_payroll module make it fully independent of account and hr_expanse module
...
Accounting functionalities to payroll will be added by the hr_payroll_account module.
bzr revid: mga@tinyerp.com-20101006124454-t1vgn6879dnu62ou
2010-10-06 18:14:54 +05:30
AMP (OpenERP)
01d5194378
[Merge]
...
bzr revid: amp@tinyerp.com-20100918053839-c1ob3r2pf54frh7s
2010-09-18 11:08:39 +05:30