83486cd725
[MERGE] manual merge of the branch from noviat lp:~noviat/openobject-addons/trunk-account_coda. The bzr merge commande was going crazy because of an initial wrong merge between this branch and the trunk, an extra .bzr folder and because of wrongly removed translations files...
...
bzr revid: qdp-launchpad@openerp.com-20111223103637-ltq8x53f4tjbmd8b
2011-12-23 11:36:37 +01:00
f87971efc6
[IMP] leaves kanban improvement
...
bzr revid: fp@tinyerp.com-20111223091744-ze375m6s7ho4myle
2011-12-23 10:17:44 +01:00
cbdf42d104
[FIX] hr_holidays: fix domain in determination of employee leave status
...
bzr revid: rco@openerp.com-20111223090210-v9rmu26fa3mfklp6
2011-12-23 10:02:10 +01:00
ae0eddfcbb
[FIX] account: fix malformed domain
...
bzr revid: rco@openerp.com-20111223083108-i8exaqx5ha7af5fh
2011-12-23 09:31:08 +01:00
542486ab95
[FIX] purchase_requisition, l10n_cr: remove non-existent field from data
...
bzr revid: rco@openerp.com-20111223083019-y4hztzgy46vxidgt
2011-12-23 09:30:19 +01:00
bd37a99045
[FIX] account: fix warning about nonexistent field 'display_type'
...
bzr revid: rco@openerp.com-20111223081354-hn3pv4eawi385zro
2011-12-23 09:13:54 +01:00
a6c649dd4e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20111223054503-il515335tdfkghbw
bzr revid: launchpad_translations_on_behalf_of_openerp-20111223073609-mpe8e232ykba47y0
2011-12-23 07:36:09 +00:00
8e66fe7f89
[IMP] employee view
...
bzr revid: fp@fp-laptop-20111222221031-6vcsojhlxj48yan0
2011-12-22 23:10:31 +01:00
25599f2093
[MERGE] sql_db: try to reconnect after db failure, courtesy of Florent Xicluna
...
bzr revid: odo@openerp.com-20111222214816-brv6iohfblzg2mli
2011-12-22 22:48:16 +01:00
a58a2a5e18
[MERGE] orm: dead code removal, courtesy of Olivier Macchioni
...
bzr revid: odo@openerp.com-20111222212859-z8svmrd3yosduelo
2011-12-22 22:28:59 +01:00
6f09a2b467
[MERGE] Introduction of field.sparse, courtesy of Sebastien Beau (Akretion)
...
bzr revid: odo@openerp.com-20111222205754-0nsrqyeyrzhyakiy
2011-12-22 21:57:54 +01:00
be9a509e58
[MERGE] sync with latest trunk
...
bzr revid: odo@openerp.com-20111222202356-6u22um5kc9yuusxc
2011-12-22 21:23:56 +01:00
3bf839996c
[I18N] base: updated translation template
...
bzr revid: odo@openerp.com-20111222202225-bfyk0uzmakgt1tle
2011-12-22 21:22:25 +01:00
cb28f8de07
[I18N] all: update translation templates
...
bzr revid: odo@openerp.com-20111222185539-9gn06tu38ynoc416
2011-12-22 19:55:39 +01:00
f0cb64cb77
[MERGE] hr employee kanban, improved demo data, by mit, fixed by rco
...
bzr revid: al@openerp.com-20111222183018-2y8seq4sq0mo6tem
2011-12-22 19:30:18 +01:00
482aee1951
[IMP] fields.sparse: custom sparse field creation now working + handle deleted resources properly
...
bzr revid: odo@openerp.com-20111222182405-425rzyl6idg9aocu
2011-12-22 19:24:05 +01:00
24b283567d
[FIX] orm: typos
...
bzr revid: odo@openerp.com-20111222182023-kspwaukocijhh4cq
2011-12-22 19:20:23 +01:00
06e0392d6a
[IMP] Employee Addressbook shouold be an application
...
bzr revid: fp@tinyerp.com-20111222172327-rgm8aiyh6xon1miu
2011-12-22 18:23:27 +01:00
88d79ba82b
[FIX] Add readonly text_html widget css rule for text wrapping
...
bzr revid: fme@openerp.com-20111222170934-ieotrp5thwfh7hd1
2011-12-22 18:09:34 +01:00
07da2abe26
[MERGE] event.registration: fixed bug 907665: correct state changes and method calls when adding a note and changing registration state via wizard in emails tab of event.registration
...
bzr revid: tde@openerp.com-20111222170205-bfpf6t7skyz1883z
2011-12-22 18:02:05 +01:00
f974bc2c62
[IMP] stock: typo in tooltip + useless lambda
...
bzr revid: odo@openerp.com-20111222165422-5nlkvg8hj6w7ecli
2011-12-22 17:54:22 +01:00
a78897f636
[MERGE] merged the dev branch with enhancement of vat intra report in l10n_be module
...
bzr revid: qdp-launchpad@openerp.com-20111222164619-xki24to7w9rvmh87
2011-12-22 17:46:19 +01:00
a7bd2da414
[MERGE] trunk
...
bzr revid: rco@openerp.com-20111222162924-644yfj4213b6z7pk
2011-12-22 17:29:24 +01:00
c1585141ea
[FIX] hr: add employee categories
...
bzr revid: rco@openerp.com-20111222161622-gija5yzvi9xio9dc
2011-12-22 17:16:22 +01:00
4ed9442dcb
[FIX] sale_crm: fix test in the case where the main company has no sale shop
...
bzr revid: rco@openerp.com-20111222160104-n8xt7qfgfa2c1di5
2011-12-22 17:01:04 +01:00
bb3331680f
[FIX] hr_attendance: fix mismatch between user and employee in test
...
bzr revid: rco@openerp.com-20111222153911-olkpskmw23mbmyed
2011-12-22 16:39:11 +01:00
f1ef473250
[IMP] reselect right menu item after reloading the menu, open sub-menu after installing a module
...
bzr revid: xmo@openerp.com-20111222153449-8vdzb4wubwlqw7td
2011-12-22 16:34:49 +01:00
e2ab4de3e0
[FIX] Fix the uninstaller path
...
bzr revid: stw@openerp.com-20111222153217-pfau2ngnbn4g1kq0
2011-12-22 16:32:17 +01:00
1fd5cf94e5
[MERGE] merged the dev branch with us letter format support for RML files
...
bzr revid: qdp-launchpad@openerp.com-20111222151758-1t7ixg0p770j2mli
2011-12-22 16:17:58 +01:00
a1e8dc5f12
[MERGE] merged the dev branch with us letter format support for RML files
...
bzr revid: qdp-launchpad@openerp.com-20111222151559-1jmgkd1ykkj6iuau
2011-12-22 16:15:59 +01:00
2c60bd8f42
[MERGE] crm.case.categ: fixed bug 907510: bug fix in creating issues categories
...
bzr revid: tde@openerp.com-20111222150731-uduh48ixz3au1vzp
2011-12-22 16:07:31 +01:00
da81033958
[FIX] hr_attendance: adapt employee name in tests
...
bzr revid: rco@openerp.com-20111222144353-ulypwxol2kbhh1ys
2011-12-22 15:43:53 +01:00
c4907c9f33
[MERGE] sale: fixed bug 907715: passing context in product_id_change call in product_uom_change
...
bzr revid: tde@openerp.com-20111222142512-5pb2311k9xtkj949
2011-12-22 15:25:12 +01:00
591b929f5d
[IMP] employee leave status info
...
bzr revid: fp@tinyerp.com-20111222142402-bwxyy2xihu76d4p7
2011-12-22 15:24:02 +01:00
479af749b9
[FIX] hr_payroll, hr_payroll_account, hr_recruitment: fix missing ref in tests
...
bzr revid: rco@openerp.com-20111222142257-2w8y8ocplzllv9rw
2011-12-22 15:22:57 +01:00
20dd20447e
[FIX] base_action_rule: missing context = {} initialization.
...
bzr revid: vmt@openerp.com-20111222141018-u6by4ht7x4zvvxts
2011-12-22 15:10:18 +01:00
41c2ffb480
[FIX] edi qweb template loading
...
bzr revid: al@openerp.com-20111222140931-smsmbpna3g9na1fn
2011-12-22 15:09:31 +01:00
4a99f28a02
[FIX] share email warning and menu tips
...
bzr revid: al@openerp.com-20111222140135-2gh7pwmr4ir2qb04
2011-12-22 15:01:35 +01:00
faf29c38d0
[FIX] hr_recruitment: fix missing ref in tests
...
bzr revid: rco@openerp.com-20111222135214-bnmud5doqwoa0fvg
2011-12-22 14:52:14 +01:00
b18b2b7603
[IMP] project: use same user ids as in hr
...
bzr revid: rco@openerp.com-20111222134815-pshxwf6u7wfw55t4
2011-12-22 14:48:15 +01:00
48c8f9a47a
[FIX] stock: only apply transformations to form fields of stock.change.product.qty when fields_view_get is on a form view
...
Also remove useless & bonkers conditionals (checking that a key exists
in a dict and then setting one of its sub-keys whether or not the test
succeeded is going to blow up either way), and simplify the code since
if condition:
some_value = True
else:
some_value = False
can just be written as:
some_value = condition
lp bug: https://launchpad.net/bugs/905188 fixed
bzr revid: xmo@openerp.com-20111222134620-bpi9d24msbia4ymm
2011-12-22 14:46:20 +01:00
fe56720ee9
[fix] small problem with payment button
...
bzr revid: nicolas.vanhoren@openerp.com-20111222134350-utrh2qqexeh103bh
2011-12-22 14:43:50 +01:00
8e029465e7
[FIX] hr: missing ref in tests
...
bzr revid: rco@openerp.com-20111222133814-e80cid84xjq372dl
2011-12-22 14:38:14 +01:00
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
13e46ecebf
[fix] problem with list view o2m: not refreshing the view after we clicked
...
bzr revid: nicolas.vanhoren@openerp.com-20111222132447-rkcieookqbnanyas
2011-12-22 14:24:47 +01:00
ff513b476c
[MERGE] hr_evaluation.evaluation: fixed bug 897580: interviews cancelled when cancelling appraisal
...
bzr revid: tde@openerp.com-20111222132224-e6j8mq3yutr1ft2i
2011-12-22 14:22:24 +01:00
2c4265133b
[IMP] hr: use better xml ids in demo data
...
bzr revid: rco@openerp.com-20111222131638-wj5qmddust70ghu3
2011-12-22 14:16:38 +01:00
123781fb9f
[FIX] point_of_sale: removed hard-coded name matching a name generated (later)
...
by a sequence, thus throwing a unique name constraint error.
bzr revid: vmt@openerp.com-20111222130947-ixumokp3b2bkap96
2011-12-22 14:09:47 +01:00
18494dd693
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20111222130000-0j8mizyj3sbik5ot
2011-12-22 14:00:00 +01:00
e05b605dca
[fix] problem with list view in o2m and buttons that should be disabled in some cases
...
lp bug: https://launchpad.net/bugs/884207 fixed
bzr revid: nicolas.vanhoren@openerp.com-20111222124913-fezv69rxh7xoulkm
2011-12-22 13:49:13 +01:00
Quentin (OpenERP)
Fabien Pinckaers
Raphael Collet
Launchpad Translations on behalf of openerp
fp
Olivier Dony
Antony Lesuisse
Fabien Meghazi
Thibault Delavallée
Xavier Morel
Stephane Wirtel
Vo Minh Thu
niv-openerp