Commit Graph
44193 Commits
Author SHA1 Message Date
Quentin (OpenERP) 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
Olivier Dony 2b82a004dc [I18N] account,l10n_*: update translation template, remove spurious terms
Due to the presence of the new l10n_multilang module,
a lot of spurious terms where introduced in the account
template and all l10n_* templates. This should now be
cleaned up

bzr revid: odo@openerp.com-20111223102710-1dbii84mesfgchy9
2011-12-23 11:27:10 +01:00
MVA 32bffc2330 [CLEAN] cleaning the plugin
bzr revid: mva@openerp.com-20111223102253-yievl616vlyx85kf
2011-12-23 11:22:53 +01:00
Raphael Collet 79c32508cd [IMP] hr_holidays: employee kanban view
bzr revid: rco@openerp.com-20111223101143-zyz4c23yb7bpqlea
2011-12-23 11:11:43 +01:00
Raphael Collet b62f6625fb [IMP] hr_holidays: add color on leave status in kanban view
bzr revid: rco@openerp.com-20111223100100-rc0z07ighrj22a0e
2011-12-23 11:01:00 +01:00
Fabien Pinckaers 12d854f48e [FIX] on project, timesheets
bzr revid: fp@tinyerp.com-20111223100053-pi9qw3tt5i1a7r2c
2011-12-23 11:00:53 +01:00
Thibault Delavallée 04d66b2de8 [MERGE] stock: purchase analysis: fixed bug 906857: wrong icon in view
bzr revid: tde@openerp.com-20111223095607-e3s605ntol2ujl4v
2011-12-23 10:56:07 +01:00
Kuldeep Joshi (OpenERP) 0cc45c9454 [FIX] base_calendar: unlink the attendee of event
lp bug: https://launchpad.net/bugs/907664 fixed

bzr revid: kjo@tinyerp.com-20111223094343-9wfdhflsnsxqbqky
2011-12-23 15:13:43 +05:30
Antoine Huvelle 8c60adf5a9 [merge]
bzr revid: ahu@openerp.com-20111223093816-zv7qjjb38c9ajxcy
2011-12-23 10:38:16 +01:00
Fabien Pinckaers f87971efc6 [IMP] leaves kanban improvement
bzr revid: fp@tinyerp.com-20111223091744-ze375m6s7ho4myle
2011-12-23 10:17:44 +01:00
Antoine Huvelle df4f35ae35 [imp] fixing closing <div> missing
bzr revid: ahu@openerp.com-20111223090612-31e7nsk6kx82no5m
2011-12-23 10:06:12 +01:00
Raphael Collet 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
Raphael Collet ae0eddfcbb [FIX] account: fix malformed domain
bzr revid: rco@openerp.com-20111223083108-i8exaqx5ha7af5fh
2011-12-23 09:31:08 +01:00
Raphael Collet 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
Raphael Collet 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
Launchpad Translations on behalf of openerp 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
Turkesh Patel (Open ERP) b740d75d56 [MRG] merge main addons
bzr revid: tpa@tinyerp.com-20111223065633-j9g8n831hjxknhrf
2011-12-23 12:26:33 +05:30
Turkesh Patel (Open ERP) 27714f2fd2 [IMP]Improved YML test cases of delivery module
bzr revid: tpa@tinyerp.com-20111223065354-avs0gandnbflwd13
2011-12-23 12:23:54 +05:30
fp 01555b28a9 [IMP] PoS menus
bzr revid: fp@fp-laptop-20111223065049-11t5glcrznx753te
2011-12-23 07:50:49 +01:00
fp bfbfc939b2 merge
lp bug: https://launchpad.net/bugs/907692 fixed

bzr revid: fp@fp-laptop-20111223062655-qjxwtxt28pfe36t3
2011-12-23 07:26:55 +01:00
Divyesh Makwana (Open ERP) cf2d2e879f [FIX] account_voucher : can't open a form view of Journal Vouchers
lp bug: https://launchpad.net/bugs/907692 fixed

bzr revid: mdi@tinyerp.com-20111223061621-l31dd3bdcud2btv2
2011-12-23 11:46:21 +05:30
Bhumi Thakkar (Open ERP) 6d6ec99bc1 [IMP] Invisible fields should be hidden.
bzr revid: bth@tinyerp.com-20111223053731-qc93a9xaqblh116w
2011-12-23 11:07:31 +05:30
Harry (OpenERP) c543a324dc [MERGE] merged with trunk-development-branch
bzr revid: hmo@tinyerp.com-20111223051631-rvuwu2bvl32bch0o
2011-12-23 10:46:31 +05:30
fp 8e66fe7f89 [IMP] employee view
bzr revid: fp@fp-laptop-20111222221031-6vcsojhlxj48yan0
2011-12-22 23:10:31 +01:00
Olivier Dony 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
Olivier Dony 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
Olivier Dony 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
Olivier Dony be9a509e58 [MERGE] sync with latest trunk
bzr revid: odo@openerp.com-20111222202356-6u22um5kc9yuusxc
2011-12-22 21:23:56 +01:00
Olivier Dony 3bf839996c [I18N] base: updated translation template
bzr revid: odo@openerp.com-20111222202225-bfyk0uzmakgt1tle
2011-12-22 21:22:25 +01:00
Olivier Dony cb28f8de07 [I18N] all: update translation templates
bzr revid: odo@openerp.com-20111222185539-9gn06tu38ynoc416
2011-12-22 19:55:39 +01:00
Antony Lesuisse 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
Olivier Dony 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
Olivier Dony 24b283567d [FIX] orm: typos
bzr revid: odo@openerp.com-20111222182023-kspwaukocijhh4cq
2011-12-22 19:20:23 +01:00
Fabien Pinckaers 06e0392d6a [IMP] Employee Addressbook shouold be an application
bzr revid: fp@tinyerp.com-20111222172327-rgm8aiyh6xon1miu
2011-12-22 18:23:27 +01:00
Fabien Meghazi 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
Thibault Delavallée 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
Olivier Dony f974bc2c62 [IMP] stock: typo in tooltip + useless lambda
bzr revid: odo@openerp.com-20111222165422-5nlkvg8hj6w7ecli
2011-12-22 17:54:22 +01:00
Quentin (OpenERP) 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
Raphael Collet a7bd2da414 [MERGE] trunk
bzr revid: rco@openerp.com-20111222162924-644yfj4213b6z7pk
2011-12-22 17:29:24 +01:00
Raphael Collet c1585141ea [FIX] hr: add employee categories
bzr revid: rco@openerp.com-20111222161622-gija5yzvi9xio9dc
2011-12-22 17:16:22 +01:00
Benoit Guillot 45b98c21f5 [REF] refactor to use procurement object
bzr revid: benoit.guillot@akretion.com.br-20111222160143-imuns5olo2r23crj
2011-12-22 17:01:43 +01:00
Raphael Collet 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
Antoine Huvelle f646bfb151 [imp] displaying/hiding oe-view-manager-logs
bzr revid: ahu@openerp.com-20111222155450-p94lfqx5nlx0dvvg
2011-12-22 16:54:50 +01:00
Raphael Collet 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
Xavier Morel 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
Stephane Wirtel e2ab4de3e0 [FIX] Fix the uninstaller path
bzr revid: stw@openerp.com-20111222153217-pfau2ngnbn4g1kq0
2011-12-22 16:32:17 +01:00
Quentin (OpenERP) 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
MVA fb306bd2bb [CLEAN] Button open and create in push dialog
bzr revid: mva@openerp.com-20111222151753-2qwkoywvvdh8wvtc
2011-12-22 16:17:53 +01:00
Quentin (OpenERP) 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
Thibault Delavallée 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