Mustufa Rangwala (OpenERP)
95c0fec699
[MERGE] l10n_in_hr_payroll: Improve salary rules
...
bzr revid: mra@tinyerp.com-20120829121912-rhsuygls3ot6yn9s
2012-08-29 17:49:12 +05:30
Khushboo Bhatt (Open ERP)
699720066b
[FIX]l10n_in_hr_payroll:description added
...
bzr revid: kbh@tinyerp.com-20120829110528-mcvijjnfzt5xj594
2012-08-29 16:35:28 +05:30
Khushboo Bhatt (Open ERP)
c42ba7020b
[FIX]l10n_in_hr_payroll:All company contribution will not appear on the payslip excepts if company deduction from employee salary
...
bzr revid: kbh@tinyerp.com-20120829102834-o52m2hyq69783ao1
2012-08-29 15:58:34 +05:30
Khushboo Bhatt (Open ERP)
b1724905d4
[FIX]l10n_in_hr_payroll:rules improved,help updated
...
bzr revid: kbh@tinyerp.com-20120829094252-wzdygt5muwcuochl
2012-08-29 15:12:52 +05:30
Mustufa Rangwala (OpenERP)
6aa5ea647f
[IMP] l10n_in_hr_payroll: typo
...
bzr revid: mra@tinyerp.com-20120827052843-tx702vetryimkldk
2012-08-27 10:58:43 +05:30
Mustufa Rangwala (OpenERP)
ee80611902
[IMP] l10n_in_hr_payroll: typo
...
bzr revid: mra@tinyerp.com-20120827051507-d6jpql116j7s8q3k
2012-08-27 10:45:07 +05:30
Mustufa Rangwala (OpenERP)
2658682b32
[MERGE] Merge from main addons
...
bzr revid: mra@tinyerp.com-20120827043902-6e5u3v77oporquab
2012-08-27 10:09:02 +05:30
niv-openerp
65f532e001
[IMP] made a whole-application replace of $element by $el
...
bzr revid: nicolas.vanhoren@openerp.com-20120824182743-1d9cii7kigc7exer
2012-08-24 20:27:43 +02:00
niv-openerp
5e338c591a
[IMP] made a whole-application replace of $element by $el
...
bzr revid: nicolas.vanhoren@openerp.com-20120824182707-vt91ef40ieeudwyw
2012-08-24 20:27:07 +02:00
niv-openerp
9818cf073f
[IMP] crm: added create_name_field on partner_id in leads
...
bzr revid: nicolas.vanhoren@openerp.com-20120824172729-4botx8doui5iw1er
2012-08-24 19:27:29 +02:00
niv-openerp
9780532da1
[IMP] changed the way create from m2o works, added option create_name_field
...
bzr revid: nicolas.vanhoren@openerp.com-20120824172622-evcz7011wlagep4z
2012-08-24 19:26:22 +02:00
niv-openerp
0068c09358
[IMP] web_linkedin: put the wizard into the sales wizard
...
bzr revid: nicolas.vanhoren@openerp.com-20120824170111-j64d4l8xc6403a2m
2012-08-24 19:01:11 +02:00
niv-openerp
49b3c7b753
[IMP] made the loading messages translatable
...
bzr revid: nicolas.vanhoren@openerp.com-20120824165449-mfb4ftxnq3vd0p84
2012-08-24 18:54:49 +02:00
Thibault Delavallée
1a3091d10e
[MERGE] Merged branch holding a cleaning of code for mail.alias
...
installation hook for res.users and hr.recruitment
is now delegatede to mail.alias, using the
migrate_to_alias method. The purpose is to
set the alias_id column as required even if
the models are already present in the DB.
Behavior has not been modified; this branch
is only about some code relocation in mail.alias
to avoid duplication.
bzr revid: tde@openerp.com-20120824161556-pf95siqd24e2dlht
2012-08-24 18:15:56 +02:00
Thibault Delavallée
f6fc11c48b
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120824144007-4r11uoy3sux5f7cv
2012-08-24 16:40:07 +02:00
Thibault Delavallée
7423196143
[REVIEW] Updated some variable names to try to be more explicit.
...
bzr revid: tde@openerp.com-20120824143944-cjm0zwfaldbfztq1
2012-08-24 16:39:44 +02:00
Stephane Wirtel
45cf233538
[FIX] point_of_sale: Hide the has_XXX_control fields in the session
...
bzr revid: stw@openerp.com-20120824130730-8dqrjjqr7z1stwl5
2012-08-24 15:07:30 +02:00
Stephane Wirtel
fe4f647996
[MERGE] point_of_sale: Fix a problem with the buttons in the pos session object, we can close a session if we don't have a closing control
...
bzr revid: stw@openerp.com-20120824125443-6y4816v3pep1yuxm
2012-08-24 14:54:43 +02:00
Quentin (OpenERP)
6f58426c10
[MERGE] lp: 1015697
...
bzr revid: qdp-launchpad@openerp.com-20120824124058-pvug7v1auro79w2h
2012-08-24 14:40:58 +02:00
Minh Tran
4ac06cf5b0
merge from mit-trunk
...
bzr revid: mit@openerp.com-20120824115821-5fp4ks5ch6czs5vf
2012-08-24 13:58:21 +02:00
Mustufa Rangwala (OpenERP)
239012ff9d
[FIX] l10n_in_hr_payroll: small fix
...
bzr revid: mra@tinyerp.com-20120824114341-cah1258419d439ge
2012-08-24 17:13:41 +05:30
Stephane Wirtel
ec6bd9c649
[FIX] point_of_sale: Review the buttons for the pos.session object
...
bzr revid: stw@openerp.com-20120824114300-jdax2175w9mbcb2n
2012-08-24 13:43:00 +02:00
niv-openerp
589eee5f8b
[IMP] web_linkedin: changed wizard to have better html output
...
bzr revid: nicolas.vanhoren@openerp.com-20120824114253-8vbyhlh83vjaf85z
2012-08-24 13:42:53 +02:00
niv-openerp
7c334cfb5a
[IMP] Improved css to support semantic html
...
bzr revid: nicolas.vanhoren@openerp.com-20120824114204-i6qprxhwczkkem6z
2012-08-24 13:42:04 +02:00
Mustufa Rangwala (OpenERP)
47e33a1d70
[FIX] l10n_in_hr_payroll: small fix
...
bzr revid: mra@tinyerp.com-20120824110146-n70knsb0c1fn5sfe
2012-08-24 16:31:46 +05:30
Mustufa Rangwala (OpenERP)
599ef6b960
[FIX] l10n_in_hr_payroll:access for payslip report object
...
bzr revid: mra@tinyerp.com-20120824105441-zpmeznbhwkdznr3e
2012-08-24 16:24:41 +05:30
Mustufa Rangwala (OpenERP)
76bbd83c30
[MERGE] l10n_in_hr_payrol: typo
...
bzr revid: mra@tinyerp.com-20120824105120-vzp8avej8tyofwx5
2012-08-24 16:21:20 +05:30
niv-openerp
ee8b4c6c64
[IMP] web_linkedin: Added server domain and corrected html display
...
bzr revid: nicolas.vanhoren@openerp.com-20120824104730-f7p8lqibovjzo3vz
2012-08-24 12:47:30 +02:00
niv-openerp
e28ec55117
[IMP] added oe_semantic_html
...
bzr revid: nicolas.vanhoren@openerp.com-20120824104436-er3w1zdijvcv9j04
2012-08-24 12:44:36 +02:00
Vo Minh Thu
0b464f0882
[FIX] custom models: avoid calling twice __init__, use a correct _rec_name (calling twice __init__ caused the _rec_name to be name which does not exist on a custom model, and caused the assert on the _rec_name to fail.
...
bzr revid: vmt@openerp.com-20120824104242-wa5jq8h47im79ayd
2012-08-24 12:42:42 +02:00
Mustufa Rangwala (OpenERP)
8335b55e87
[FIX] l10n_in_hr_payrol: Remove food coupan register for dedcution
...
bzr revid: mra@tinyerp.com-20120824104031-0je3kogotvsh7i64
2012-08-24 16:10:31 +05:30
Khushboo Bhatt (Open ERP)
bcf9ef416e
[FIX]l10n_in_hr_payroll:changed name of inputs
...
bzr revid: kbh@tinyerp.com-20120824103410-lvecrt1ov2szsjvw
2012-08-24 16:04:10 +05:30
Mustufa Rangwala (OpenERP)
9d96cf77b0
[MERGE] l10n_in_hr_payroll: Add payslip analysis report
...
bzr revid: mra@tinyerp.com-20120824103056-x0ag10f4ih6awrcl
2012-08-24 16:00:56 +05:30
Khushboo Bhatt (Open ERP)
d3eac6d18a
[ADD]l10n_in_hr_payroll:added postgres report for payslip and palyslip lines
...
bzr revid: kbh@tinyerp.com-20120824093657-dlw1d0bh39cg7h79
2012-08-24 15:06:57 +05:30
Quentin (OpenERP)
25dd249ecb
[MERGE] lp:1034799
...
bzr revid: qdp-launchpad@openerp.com-20120824090849-v7imbkj2q74ywq3q
2012-08-24 11:08:49 +02:00
Antonin Bourguignon
59f37f712f
[MERGE] module: improve modules' descriptions rendering and keep it translatable
...
bzr revid: abo@openerp.com-20120824085944-ocfg80ve695ipdm7
2012-08-24 10:59:44 +02:00
Antonin Bourguignon
85dffc18df
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120824085801-0tr9lajdtiwtpvwr
2012-08-24 10:58:01 +02:00
Quentin (OpenERP)
0255e6f221
[MERGE] demo data branch
...
bzr revid: qdp-launchpad@openerp.com-20120824085223-qeri3eoqage6hwzs
2012-08-24 10:52:23 +02:00
Vo Minh Thu
b218f74b28
[FIX] uninstall: delete all given ir_model_relation/ir_model_constraint (still making sure the protected resource is not deleted if still referenced elsewhere).
...
bzr revid: vmt@openerp.com-20120824085201-a0ucfta7jwgph0ke
2012-08-24 10:52:01 +02:00
Mustufa Rangwala (OpenERP)
7902111733
[MERGE] Merge from main addons
...
bzr revid: mra@tinyerp.com-20120823112104-5d4bx6cypst26zr0
bzr revid: mra@tinyerp.com-20120824064641-7jn10i1ykbndaywr
2012-08-24 12:16:41 +05:30
Antonin Bourguignon
b28a956248
[IMP] module: properly translate module's description
...
bzr revid: abo@openerp.com-20120823173418-1qed27su2x0jy1ku
2012-08-23 19:34:18 +02:00
Antonin Bourguignon
c43b1f298b
[IMP] module: set two distinct fields for module's description: one for the RST and the other for the HTML
...
this way, we keep translatable the text field
bzr revid: abo@openerp.com-20120823161959-3hewgtegb5h1yw93
2012-08-23 18:19:59 +02:00
Minh Tran
decab66e70
added hover effect to menu counter
...
bzr revid: mit@openerp.com-20120823161953-h5sc0npkpz5drgq1
2012-08-23 18:19:53 +02:00
Vo Minh Thu
33e9e66f71
[FIX] uninstall: pass IDs instead of names to _module_data_uninstall().
...
bzr revid: vmt@openerp.com-20120823161008-is5xqfe4et8xx51k
2012-08-23 18:10:08 +02:00
niv-openerp
5b6c4072fd
[FIX] problem with m2o
...
bzr revid: nicolas.vanhoren@openerp.com-20120823153710-0wjh1248zp42dh9b
2012-08-23 17:37:10 +02:00
Antonin Bourguignon
9aff056e73
[MERGE] minor improvements on @noupdate
...
also fix some indentation
bzr revid: abo@openerp.com-20120823153322-30rp469l5xlgff0v
2012-08-23 17:33:22 +02:00
Antonin Bourguignon
6ebb35dc02
[MERGE] minor improvements on @noupdate
...
bzr revid: abo@openerp.com-20120823153243-1iv8cfqoeg9qt95f
2012-08-23 17:32:43 +02:00
Thibault
cd4a62996a
[REF] mail_alias: moved _auto_init code from res_users and hr_recruitment to mail_alias, using a kewl call to migrate_to_alias.
...
bzr revid: odo@openerp.com-20120823153203-8tm3lbqah6vwd7co
2012-08-23 17:32:03 +02:00
Quentin (OpenERP)
f6a4aae8c2
[FIX] lp: 1038173
...
bzr revid: qdp-launchpad@openerp.com-20120823143521-3517gexkbqkljnp1
2012-08-23 16:35:21 +02:00
Quentin (OpenERP)
afa60ebc74
[FIX] lp: 1039013, where an id is given to name_get instead of a list of ids
...
lp bug: https://launchpad.net/bugs/1039013 fixed
bzr revid: qdp-launchpad@openerp.com-20120823142656-nsqml3jnyylpgzxu
2012-08-23 16:26:56 +02:00
Mustufa Rangwala (OpenERP)