git.inspyration.org Git - odoo/odoo.git/log

Mustufa Rangwala [Mon, 11 Apr 2011 11:44:15 +0000 (17:14 +0530)]

[MERGE] merge from trunk payroll

bzr revid: mra@mra-laptop-20110411114415-bp4bchwp51i0932i

Mustufa Rangwala [Mon, 11 Apr 2011 11:36:37 +0000 (17:06 +0530)]

[FIX] payroll: grouping of details by salayr head AND domain is not applied on first tab of payslip, we should see there only the payslip lines with appears_on_payslip = True

bzr revid: mra@mra-laptop-20110411113637-qfnxuylu1icn6889

commit | commitdiff | tree

Mustufa Rangwala [Mon, 11 Apr 2011 10:44:37 +0000 (16:14 +0530)]

[REM] unused code

bzr revid: mra@mra-laptop-20110411104437-08y014kaeelpw150

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 11 Apr 2011 10:08:46 +0000 (12:08 +0200)]

[MERGE] merged mra's dev branch containing stuff with refund

bzr revid: qdp-launchpad@openerp.com-20110411100846-4vwlngl6iqb2juvv

commit | commitdiff | tree

Mustufa Rangwala [Mon, 11 Apr 2011 08:42:22 +0000 (14:12 +0530)]

[MERGE] merge from trunk-payroll main branch

bzr revid: mra@mra-laptop-20110411084222-ztm9ackwbvq7v021

commit | commitdiff | tree

Mustufa Rangwala [Mon, 11 Apr 2011 08:40:07 +0000 (14:10 +0530)]

[IMP] Payroll: put back the tab with rules grouped by head

bzr revid: mra@mra-laptop-20110411084007-g5p3gvdcl7z9uh2m

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 11 Apr 2011 08:11:39 +0000 (10:11 +0200)]

[IMP] hr_payroll: improved demo data

bzr revid: qdp-launchpad@openerp.com-20110411081139-7x93kr8v11q19f2x

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 11 Apr 2011 08:09:03 +0000 (10:09 +0200)]

[FIX] hr_payroll: sequence > 100 for deduction demo rules

bzr revid: qdp-launchpad@openerp.com-20110411080903-x44oiaj1ex0m3gwv

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 11 Apr 2011 08:06:54 +0000 (10:06 +0200)]

[FIX] hr_payroll: set the parent of demo structure

bzr revid: qdp-launchpad@openerp.com-20110411080654-sx3ie5pw0seqmnir

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 11 Apr 2011 08:06:24 +0000 (10:06 +0200)]

[FIX] hr_payroll: fixed NET rule in data

bzr revid: qdp-launchpad@openerp.com-20110411080624-okp70ykmmp4gqop1

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 8 Apr 2011 22:38:45 +0000 (00:38 +0200)]

[IMP] hr_payroll: cosmetic imp

bzr revid: qdp-launchpad@openerp.com-20110408223845-8kj51e3uo6ko8gt0

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 8 Apr 2011 17:31:29 +0000 (19:31 +0200)]

[FIX] hr_contract, hr_payroll: fixed installation errors due to previous commit

bzr revid: qdp-launchpad@openerp.com-20110408173129-sqvdowkfuawxjddb

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 8 Apr 2011 16:33:12 +0000 (18:33 +0200)]

[FIX] hr_payroll: fixed default rules

bzr revid: qdp-launchpad@openerp.com-20110408163312-x26jnh5zr6erxmqm

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 8 Apr 2011 16:31:16 +0000 (18:31 +0200)]

[IMP] hr: replaced marital.status object by a fields.selection to ease to use in payroll module

bzr revid: qdp-launchpad@openerp.com-20110408163116-3qmhc4phurtpuzmf

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 8 Apr 2011 15:48:49 +0000 (17:48 +0200)]

[IMP] hr_payroll: default data for base structure

bzr revid: qdp-launchpad@openerp.com-20110408154849-8v42egah6r1ge6vu

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 8 Apr 2011 14:55:54 +0000 (16:55 +0200)]

[FIX] hr_payroll, computation engine: the heads have to be summed recursively

bzr revid: qdp-launchpad@openerp.com-20110408145554-q09v8sud2jf63l3j

commit | commitdiff | tree

Mustufa Rangwala [Fri, 8 Apr 2011 13:04:34 +0000 (18:34 +0530)]

[MERGE] merge from same branch

bzr revid: mra@mra-laptop-20110408130434-lgsdbrfl95j6cxwo

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 8 Apr 2011 13:03:13 +0000 (15:03 +0200)]

[MERGE] merged the ara branch containing bugfix on reset to draft button

bzr revid: qdp-launchpad@openerp.com-20110408130313-ldaslut65hcb9l3s

commit | commitdiff | tree

Mustufa Rangwala [Fri, 8 Apr 2011 13:01:36 +0000 (18:31 +0530)]

[FIX] Payroll: strcut_id on contract now compulsory

bzr revid: mra@mra-laptop-20110408130136-y4g2m87dzo0zei51

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 8 Apr 2011 12:59:30 +0000 (14:59 +0200)]

[MERGE] merged the branch with input available in computation engine and better error messages

bzr revid: qdp-launchpad@openerp.com-20110408125930-bo2szaqo9r048usc

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 8 Apr 2011 12:56:16 +0000 (14:56 +0200)]

[IMP] hr_payroll: cosmetic changes + small code optimization

bzr revid: qdp-launchpad@openerp.com-20110408125616-4k6phaduqbfzv88c

commit | commitdiff | tree

Mustufa Rangwala [Fri, 8 Apr 2011 12:31:56 +0000 (18:01 +0530)]

[IMP] hr payroll: use worked_days['NORM100'] in the computation engine

bzr revid: mra@mra-laptop-20110408123156-dwcg5rnlwo4i8lyq

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 8 Apr 2011 12:19:36 +0000 (14:19 +0200)]

[FIX] hr_payroll, computation engine: added a blacklist to avoid computing rules for which an ancestor has failed to satisfy_condition()

bzr revid: qdp-launchpad@openerp.com-20110408121936-nqivku1zh45p4ipc

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 8 Apr 2011 12:17:59 +0000 (14:17 +0200)]

[REF] hr_payroll: moved recursive_search_of_rule function in hr.salary.rule class

bzr revid: qdp-launchpad@openerp.com-20110408121759-zok1ml5ff1ix1lkr

commit | commitdiff | tree

Mustufa Rangwala [Fri, 8 Apr 2011 10:34:12 +0000 (16:04 +0530)]

[IMP] Payroll: refund button will open refund payslip => todo: need to directly open form instead of tree

bzr revid: mra@mra-laptop-20110408103412-hmijd7i9q3a62fkl

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 8 Apr 2011 10:10:59 +0000 (12:10 +0200)]

[IMP] hr_payroll: view improvements

bzr revid: qdp-launchpad@openerp.com-20110408101059-mnfv1v4xabha6ob0

commit | commitdiff | tree

ARA (OpenERP) [Fri, 8 Apr 2011 09:38:29 +0000 (15:08 +0530)]

[FIX] hr_payroll: set to draft button not working in cancel state

bzr revid: ara@tinyerp.com-20110408093829-b62t39d3heuk3mnh

commit | commitdiff | tree

Mustufa Rangwala [Fri, 8 Apr 2011 09:30:10 +0000 (15:00 +0530)]

[IMP] Payroll: define a new field.boolean on payslip: 'credit note'
on a 'done' payslip, add a button 'make a credite note' that will duplicate the current payslip with 'credit note' = True, confirm and done it.

bzr revid: mra@mra-laptop-20110408093010-qgkeiy7wud1exwgd

commit | commitdiff | tree

Mustufa Rangwala [Fri, 8 Apr 2011 05:48:41 +0000 (11:18 +0530)]

[FIX] Payroll: Installation error on csv access

bzr revid: mra@mra-laptop-20110408054841-7vpltohm639ov7u5

commit | commitdiff | tree

Mustufa Rangwala [Thu, 7 Apr 2011 13:06:34 +0000 (18:36 +0530)]

[FIX] Payroll: Remove contribution reg lines in xml and in .csv

bzr revid: mra@mra-laptop-20110407130634-syjdvcme17nwhdhe

commit | commitdiff | tree

Quentin (OpenERP) [Thu, 7 Apr 2011 12:40:50 +0000 (14:40 +0200)]

[FIX] hr_payroll: fixed localdict in satisfy_condition

bzr revid: qdp-launchpad@openerp.com-20110407124050-3qvf3zyzxff6ctim

commit | commitdiff | tree

Mustufa Rangwala [Thu, 7 Apr 2011 11:45:52 +0000 (17:15 +0530)]

[FIX] Payroll: problem with the onchange_contract in payslip => contract_id is not saved

bzr revid: mra@mra-laptop-20110407114552-nxvwbfg7nbjxo1ma

commit | commitdiff | tree

Mustufa Rangwala [Thu, 7 Apr 2011 11:13:58 +0000 (16:43 +0530)]

[MERGE] merge same branch

bzr revid: mra@mra-laptop-20110407111358-j8wriz4vu4mlrg26

commit | commitdiff | tree

Mustufa Rangwala [Thu, 7 Apr 2011 11:08:44 +0000 (16:38 +0530)]

[FIX] payroll: Not open employee form

bzr revid: mra@mra-laptop-20110407110844-5bchm1c4mrkoomtt

commit | commitdiff | tree

Quentin (OpenERP) [Thu, 7 Apr 2011 10:16:59 +0000 (12:16 +0200)]

[MERGE] merged dev branch

bzr revid: qdp-launchpad@openerp.com-20110407101659-szon9zgxz9bclrz2

commit | commitdiff | tree

Quentin (OpenERP) [Thu, 7 Apr 2011 10:12:26 +0000 (12:12 +0200)]

[IMP] hr_payroll: removed hr.contibution.register.line object

bzr revid: qdp-launchpad@openerp.com-20110407101226-9gworw70i6rvqlp2

commit | commitdiff | tree

mtr [Thu, 7 Apr 2011 05:29:46 +0000 (10:59 +0530)]

[ADD] hr_payroll: added new payslip report

bzr revid: mtr@mtr-20110407052946-c7nrhw9yx939o1pj

commit | commitdiff | tree

psi (Open ERP) [Thu, 7 Apr 2011 05:25:28 +0000 (10:55 +0530)]

[FIX] hr_contract: Fix yml test

bzr revid: psi@tinyerp.co.in-20110407052528-uxz29uxwyjj5kf03

commit | commitdiff | tree

Quentin (OpenERP) [Wed, 6 Apr 2011 15:14:29 +0000 (17:14 +0200)]

[MERGE] merged the dev branch of payroll with clean code as work basis

bzr revid: qdp-launchpad@openerp.com-20110406151429-z3sgsbe9mugb58qt

commit | commitdiff | tree

Quentin (OpenERP) [Wed, 6 Apr 2011 14:20:06 +0000 (16:20 +0200)]

[FIX] hr_payroll: fixed typo in filename

bzr revid: qdp-launchpad@openerp.com-20110406142006-qmiyipvpnb0fcodu

commit | commitdiff | tree

Quentin (OpenERP) [Wed, 6 Apr 2011 14:16:45 +0000 (16:16 +0200)]

[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

commit | commitdiff | tree

Quentin (OpenERP) [Wed, 6 Apr 2011 14:15:32 +0000 (16:15 +0200)]

[REF] hr_payroll: removed commented code (for 'the sake of clarity' and because bazaar is your historian ^^)

bzr revid: qdp-launchpad@openerp.com-20110406141532-d6f2r49dbtr95rzf

commit | commitdiff | tree

Quentin (OpenERP) [Wed, 6 Apr 2011 13:11:49 +0000 (15:11 +0200)]

[REF] hr_contract: removed commented code (for 'the sake of clarity' and because bazaar is your historian ^^)

bzr revid: qdp-launchpad@openerp.com-20110406131149-i1135jaom7vhny8z

commit | commitdiff | tree

Quentin (OpenERP) [Wed, 6 Apr 2011 13:07:21 +0000 (15:07 +0200)]

[REF] hr_contract: removed commented code (for 'the sake of clarity' and because bazaar is your historian ^^)

bzr revid: qdp-launchpad@openerp.com-20110406130721-ttg9xgrkq5n3ry3d

commit | commitdiff | tree

Quentin (OpenERP) [Wed, 6 Apr 2011 12:54:21 +0000 (14:54 +0200)]

[REF] hr_payroll: small code refactoring in compute_sheet() method

bzr revid: qdp-launchpad@openerp.com-20110406125421-owo9vuxjldb9ddoo

commit | commitdiff | tree

Quentin (OpenERP) [Wed, 6 Apr 2011 12:46:24 +0000 (14:46 +0200)]

[IMP] hr_contract: enable back the yaml test (why was it disable?)

bzr revid: qdp-launchpad@openerp.com-20110406124624-iv16tm1egw1i2yvn

commit | commitdiff | tree

Quentin (OpenERP) [Wed, 6 Apr 2011 12:28:45 +0000 (14:28 +0200)]

[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

commit | commitdiff | tree

psi (Open ERP) [Wed, 6 Apr 2011 05:55:19 +0000 (11:25 +0530)]

[FIX] small fix in compute_sheet method so it will delete the old payslip lines

bzr revid: psi@tinyerp.co.in-20110406055519-u9a1joiyp8f3f2m0

commit | commitdiff | tree

psi (Open ERP) [Wed, 6 Apr 2011 05:39:48 +0000 (11:09 +0530)]

[FIX] small fix in compute_sheet method

bzr revid: psi@tinyerp.co.in-20110406053948-mg7uc3mo23vaat0d

commit | commitdiff | tree

Quentin (OpenERP) [Tue, 5 Apr 2011 16:46:17 +0000 (18:46 +0200)]

[IMP] hr_payroll: improvements on framework and code cleaning

bzr revid: qdp-launchpad@openerp.com-20110405164617-j0zbg9m7ue9eqftx

commit | commitdiff | tree

mtr [Tue, 5 Apr 2011 13:38:34 +0000 (19:08 +0530)]

[IMP] hr_payroll: minor changes on payslip report, still major changes are yet to be completed

bzr revid: mtr@mtr-20110405133834-u5u2k3toqfn2brej

commit | commitdiff | tree

mtr [Tue, 5 Apr 2011 11:55:28 +0000 (17:25 +0530)]

[IMP] hr_payroll:improved code,demo data and Details by salary head

bzr revid: mtr@mtr-20110405115528-p78zhmgfr87q6ifd

commit | commitdiff | tree

mtr [Tue, 5 Apr 2011 06:21:32 +0000 (11:51 +0530)]

[IMP] hr_payroll:improved ir.model.access.csv file

bzr revid: mtr@mtr-20110405062132-fswk1fn73341866x

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 4 Apr 2011 21:28:11 +0000 (23:28 +0200)]

[IMP] hr_payroll: major improvements (redesign computation machina and code cleaning, mostly)

bzr revid: qdp-launchpad@openerp.com-20110404212811-2abh9j4i6tg4ob5w

commit | commitdiff | tree

Mustufa Rangwala [Mon, 4 Apr 2011 13:00:33 +0000 (18:30 +0530)]

[FIX] payroll

bzr revid: mra@mra-laptop-20110404130033-rxhyg3jpwga7xaof

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 4 Apr 2011 11:32:19 +0000 (13:32 +0200)]

[IMP] hr_payroll: several major improvements among
   * removed hr.payroll.register object
   * removed hr.salary.head.type object, now replaced by a m2o(hr.salary.head) named parent_id on the salary head
   * removed unused fields state and user_id on hr.salary.head
   * defined new object hr.salary.input (and commented the references to hr.holidays)
   * added condition 'Always True' on the hr.salary.rule
   * improved view of hr.salary.rule

bzr revid: qdp-launchpad@openerp.com-20110404113219-nc949ndu1hvtiobl

commit | commitdiff | tree

mtr [Mon, 4 Apr 2011 10:48:31 +0000 (16:18 +0530)]

[IMP] hr_payroll:improved code to display salary rules as per the sequence of salary head

bzr revid: mtr@mtr-20110404104831-zb30sau1ikzuufjl

commit | commitdiff | tree

psi (Open ERP) [Mon, 4 Apr 2011 10:06:37 +0000 (15:36 +0530)]

[FIX] hr_payroll

bzr revid: psi@tinyerp.co.in-20110404100637-ljba7flsrrawhxdp

commit | commitdiff | tree

Mustufa Rangwala [Mon, 4 Apr 2011 10:01:36 +0000 (15:31 +0530)]

[FIX] payrol;

bzr revid: mra@mra-laptop-20110404100136-usw6fe76l64bph8u

commit | commitdiff | tree

psi (Open ERP) [Mon, 4 Apr 2011 09:06:56 +0000 (14:36 +0530)]

[IMP] Improve verify_sheet method of hr.payslip object so it will consider the child rules and holidays

bzr revid: psi@tinyerp.co.in-20110404090656-mq92felignt05nq5

commit | commitdiff | tree

psi (Open ERP) [Mon, 4 Apr 2011 06:50:26 +0000 (12:20 +0530)]

[IMP] onchange will clear the field details_by_salary_head

bzr revid: psi@tinyerp.co.in-20110404065026-6klls1fkg3mt8j41

commit | commitdiff | tree

mtr [Mon, 4 Apr 2011 06:44:53 +0000 (12:14 +0530)]

[IMP] hr_payroll:improved code to calculate total_payment for multiple contract

bzr revid: mtr@mtr-20110404064453-sd7a9pecamnt80fn

commit | commitdiff | tree

psi (Open ERP) [Mon, 4 Apr 2011 06:29:30 +0000 (11:59 +0530)]

[IMP] add help on state field of hr.payslip and view improvement

bzr revid: psi@tinyerp.co.in-20110404062930-bf2onlnsmjb5mm43

commit | commitdiff | tree

Mustufa Rangwala [Mon, 4 Apr 2011 04:49:53 +0000 (10:19 +0530)]

[MERGE] merge from trunk-payroll branch

bzr revid: mra@mra-laptop-20110404044953-hi0lrxppki4nekr2

commit | commitdiff | tree

Mustufa Rangwala [Mon, 4 Apr 2011 04:48:27 +0000 (10:18 +0530)]

[MERGE] merge from trunk addons

bzr revid: mra@mra-laptop-20110317044632-q2idnbo10137sp20
bzr revid: mra@mra-laptop-20110318090655-j34s9q5qu3iika49
bzr revid: mra@mra-laptop-20110321091456-nn8ydasget5h400r
bzr revid: mra@mra-laptop-20110322130110-e4q5os11b2aphfk6
bzr revid: mra@mra-laptop-20110323043940-490q3q9lnwwvduy0
bzr revid: mra@mra-laptop-20110328045527-rih3g38wcgonx05m
bzr revid: mra@mra-laptop-20110329045144-vclevl8cvq05ga8c
bzr revid: mra@mra-laptop-20110330044007-iiokjyv6ap6k94ak
bzr revid: mra@mra-laptop-20110401043719-mtgl4wwz90mi5rac
bzr revid: mra@mra-laptop-20110404044827-rqbqf6jdaf9o5unc

commit | commitdiff | tree

Launchpad Translations on behalf of openerp [Tue, 5 Apr 2011 04:47:06 +0000 (04:47 +0000)]

Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110401044755-ox0af9npzekocmtk
bzr revid: launchpad_translations_on_behalf_of_openerp-20110402045547-u88jxku3jz7ejycg
bzr revid: launchpad_translations_on_behalf_of_openerp-20110403044009-x9bqq57ukyqvp6ia
bzr revid: launchpad_translations_on_behalf_of_openerp-20110404044757-3uw7ib92gpv7ezu1
bzr revid: launchpad_translations_on_behalf_of_openerp-20110405044706-ew5moemiz1wxra7h

commit | commitdiff | tree

Antony Lesuisse [Mon, 4 Apr 2011 20:08:29 +0000 (22:08 +0200)]

jquery patch to get stack trace back in webkit

bzr revid: al@openerp.com-20110404200829-61780xapqq043pcr

commit | commitdiff | tree

Antony Lesuisse [Mon, 4 Apr 2011 19:52:16 +0000 (21:52 +0200)]

cosmetic changes, remove debug div

bzr revid: al@openerp.com-20110404195216-mp01qygi4er4k9yh

commit | commitdiff | tree

Fabien Meghazi [Mon, 4 Apr 2011 16:09:36 +0000 (18:09 +0200)]

[ADD] Partial pager in form view

bzr revid: fme@openerp.com-20110404160936-4uk9pywwdbv6qj9f

commit | commitdiff | tree

Antony Lesuisse [Mon, 4 Apr 2011 15:52:09 +0000 (17:52 +0200)]

base_diagram

bzr revid: al@openerp.com-20110404155209-muckezl9xvm8ocxl

commit | commitdiff | tree

Fabien Meghazi [Mon, 4 Apr 2011 15:34:26 +0000 (17:34 +0200)]

[ADD] Added do_show and do_hide in views

bzr revid: fme@openerp.com-20110404153426-2vlz4n0s4v69b5o5

commit | commitdiff | tree

Fabien Meghazi [Mon, 4 Apr 2011 15:06:19 +0000 (17:06 +0200)]

[FIX] Simplified dataset. Plugged form view.

bzr revid: fme@openerp.com-20110404150619-z8tc382ujdfw89ji

commit | commitdiff | tree

Antony Lesuisse [Mon, 4 Apr 2011 11:38:03 +0000 (13:38 +0200)]

typo

bzr revid: al@openerp.com-20110404113803-hme1ls2rxahxa64w

commit | commitdiff | tree

Antony Lesuisse [Mon, 4 Apr 2011 11:25:35 +0000 (13:25 +0200)]

[MERGE] xmo viewmanager

bzr revid: al@openerp.com-20110404112535-pa3ss7ymj6mr97r1

commit | commitdiff | tree

mtr [Fri, 1 Apr 2011 13:32:26 +0000 (19:02 +0530)]

[IMP] hr_payroll:improved code to calculate total_payment using 'NET' rule

bzr revid: mtr@mtr-20110401133226-pbhv7xbr5n7bwwji

commit | commitdiff | tree

psi (Open ERP) [Fri, 1 Apr 2011 13:17:35 +0000 (18:47 +0530)]

[IMP] clean the code

bzr revid: psi@tinyerp.co.in-20110401131735-pwddzzgf21ie4hcj

commit | commitdiff | tree

Mustufa Rangwala [Fri, 1 Apr 2011 12:59:59 +0000 (18:29 +0530)]

[IMP] payroll: code clean, add date argument on onchnage-employee from holidays to get it latest contract

bzr revid: mra@mra-laptop-20110401125959-hsuwv6ms31v4it75

commit | commitdiff | tree

Mustufa Rangwala [Fri, 1 Apr 2011 12:26:43 +0000 (17:56 +0530)]

[FIX] payroll: fix on payroll register

bzr revid: mra@mra-laptop-20110401122643-mbuqzap5emjzxvg3

commit | commitdiff | tree

Mustufa Rangwala [Fri, 1 Apr 2011 12:23:14 +0000 (17:53 +0530)]

[MERGE] merge from same branch

bzr revid: mra@mra-laptop-20110401122314-i08827x7u2ebeffo

commit | commitdiff | tree

Mustufa Rangwala [Fri, 1 Apr 2011 12:21:32 +0000 (17:51 +0530)]

[FIX] payroll

bzr revid: mra@mra-laptop-20110401122132-5rdibau7jngyeeal

commit | commitdiff | tree

mtr [Fri, 1 Apr 2011 12:14:34 +0000 (17:44 +0530)]

[IMP] hr_payroll:uncommented the sequence on salary head in data file

bzr revid: mtr@mtr-20110401121434-u0s1kdmwodyary4m

commit | commitdiff | tree

Xavier Morel [Fri, 1 Apr 2011 11:50:05 +0000 (13:50 +0200)]

[FIX] race condition on auto_search due to desynchronized loading of search view and {any default main view}

If loading of search view completes before loading of content view, do_search is immediately called on search view and forwarded to content view which is *not* ready yet and therefore blows up.

Solved by having start() methods return a promise object (or a non-promise object taken as a fulfilled promise) which the viewmanager can use (from both search view and initial content view) to synchronize when both are ready and it's possible to start a search

bzr revid: xmo@openerp.com-20110401115005-inceqsj7qn4k3b8e

commit | commitdiff | tree

Mustufa Rangwala [Fri, 1 Apr 2011 11:35:06 +0000 (17:05 +0530)]

[MERGE] merge

bzr revid: mra@mra-laptop-20110401113506-274l4aoq3nu1jb9w

commit | commitdiff | tree

Mustufa Rangwala [Fri, 1 Apr 2011 11:32:11 +0000 (17:02 +0530)]

[FIX] Payroll: Add seq field on salary head

bzr revid: mra@mra-laptop-20110401113211-4qcdob9xi0xq30xi

commit | commitdiff | tree

psi (Open ERP) [Fri, 1 Apr 2011 11:25:11 +0000 (16:55 +0530)]

[IMP] improve Holidays and Details by Salary Head tab view of payslip

bzr revid: psi@tinyerp.co.in-20110401112511-dxidmww1ujzxgrg2

commit | commitdiff | tree

Mustufa Rangwala [Fri, 1 Apr 2011 11:01:05 +0000 (16:31 +0530)]

[FIX] Payroll: Small fix

bzr revid: mra@mra-laptop-20110401110105-8i6rmnxd4rdz8qr4

commit | commitdiff | tree

Mustufa Rangwala [Fri, 1 Apr 2011 10:58:07 +0000 (16:28 +0530)]

[FIX] Payroll: Small but if we have no stcture defined for contract and try to make onchanges

bzr revid: mra@mra-laptop-20110401105807-1l1z3gvg1top1wei

commit | commitdiff | tree

psi (Open ERP) [Fri, 1 Apr 2011 10:49:32 +0000 (16:19 +0530)]

[IMP] improve Other Information tab view of payslip

bzr revid: psi@tinyerp.co.in-20110401104932-v71cdub1pse5543h

commit | commitdiff | tree

Xavier Morel [Fri, 1 Apr 2011 10:45:00 +0000 (12:45 +0200)]

[IMP] show and hide search view based on whether the currently displayed view is searchable

Note: searchability is *opt-out*, a view is searchable until it unambiguously states 'do not search me'

bzr revid: xmo@openerp.com-20110401104500-n7g6so01xb8oow3n

commit | commitdiff | tree

Antony Lesuisse [Fri, 1 Apr 2011 10:44:54 +0000 (12:44 +0200)]

action handling proposal

bzr revid: al@openerp.com-20110401104454-djtm0728azy66g76

commit | commitdiff | tree

Fabien Meghazi [Mon, 4 Apr 2011 09:00:47 +0000 (11:00 +0200)]

[IMP] Improved date widget styling

bzr revid: fme@openerp.com-20110404090047-yvmbfnnt910b553n

commit | commitdiff | tree

Fabien Meghazi [Mon, 4 Apr 2011 08:28:42 +0000 (10:28 +0200)]

[FIX] Fix dataset testsuite that I broke in rev #4648

bzr revid: fme@openerp.com-20110404082842-i95u0pg31xj8vy1t

commit | commitdiff | tree

Xavier Morel [Fri, 1 Apr 2011 15:28:33 +0000 (17:28 +0200)]

[IMP] nicely style search date field (with little calendar icon)

bzr revid: xmo@openerp.com-20110401152833-p4f4r1vecdfkae4i

commit | commitdiff | tree

Xavier Morel [Fri, 1 Apr 2011 15:26:49 +0000 (17:26 +0200)]

[FIX] correctly format result of date picker, otherwise search blows up

bzr revid: xmo@openerp.com-20110401152649-mpjug9jdp4qvap0i

commit | commitdiff | tree

Xavier Morel [Fri, 1 Apr 2011 15:17:35 +0000 (17:17 +0200)]

[ADD] date search widget

bzr revid: xmo@openerp.com-20110401151735-hdxo0289ilmik1go

commit | commitdiff | tree

Xavier Morel [Fri, 1 Apr 2011 12:53:13 +0000 (14:53 +0200)]

[REF] move custom fields search below normal fields and inputs

bzr revid: xmo@openerp.com-20110401125313-xizmsalj4gf1mjur

commit | commitdiff | tree

Olivier Dony [Fri, 1 Apr 2011 12:48:52 +0000 (14:48 +0200)]

[FIX] ir.actions: fixed and documented a bit the function field computing views for actions

The previous implementation had numerous flaws and edge cases where it would
not have any useful result. The new implementation is backwards compatible
with the valid combinations of view_id, view_modes and view_id.
A unique constraint was also added to make sure that it is not possible to
specify multiple views of the same type for the same action. This was never
used, but should be prevented completely so that clients can rely on this
fact. Also a little bit of documentation was added to explain what the field
is doing.

bzr revid: odo@openerp.com-20110401124852-r0i6cclc80acoegj

commit | commitdiff | tree

mtr [Fri, 1 Apr 2011 10:38:32 +0000 (16:08 +0530)]

[IMP] hr_payroll: improved company contribution

bzr revid: mtr@mtr-20110401103832-vla2it1171yumm8w

commit | commitdiff | tree

psi (Open ERP) [Fri, 1 Apr 2011 10:07:50 +0000 (15:37 +0530)]

[IMP] Details by salary head will show the salary head related to holidays also

bzr revid: psi@tinyerp.co.in-20110401100750-uxlggpoxumej3ihf

commit | commitdiff | tree

Xavier Morel [Fri, 1 Apr 2011 09:48:35 +0000 (11:48 +0200)]

[FIX] some domains and contexts have leading or trailing slashes, need to strip them before evaluation

bzr revid: xmo@openerp.com-20110401094835-k1w7xlgdcyppt7io

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom