Commit Graph
68208 Commits
Author SHA1 Message Date
Antony Lesuisse 5fc754b5d3 [MERGE] manually merge customizable web logo, by chs
bzr revid: al@openerp.com-20121215192606-9p66tpo1f4344e20
2012-12-15 20:26:06 +01:00
Antony Lesuisse 6d4b753632 [FIX] res.partner.address missing line from merge
bzr revid: al@openerp.com-20121215191540-ldo8blfy2lud56if
2012-12-15 20:15:40 +01:00
Antony Lesuisse 0a35f78974 [MERGE] remove res.partner.address by chs
it also removes an ugly hack in the orm.

bzr revid: al@openerp.com-20121215182836-y15v2mwgdg9wyubi
2012-12-15 19:28:36 +01:00
Antony Lesuisse f332548205 [MERGE] remove res.partner.address by chs
bzr revid: al@openerp.com-20121215182645-a45w9ydn56rzmsty
2012-12-15 19:26:45 +01:00
Fabien Pinckaers 9651852c7c [MERGE] product_margin
bzr revid: fp@tinyerp.com-20121215182355-pmmdmb5uezejgk4a
2012-12-15 19:23:55 +01:00
Fabien Pinckaers 1b33e7488a [IMP] revert bad commit l10n_ro
bzr revid: fp@tinyerp.com-20121215181544-geuk2fldpykwcxbg
2012-12-15 19:15:44 +01:00
Fabien Pinckaers fd002daed5 [MERGE] mrp byprodyct with uom conversion
bzr revid: fp@tinyerp.com-20121215180313-tc367avv1rl4bsj6
2012-12-15 19:03:13 +01:00
Fabien Pinckaers 9c090f63a2 [MERGE] missing sxw file
bzr revid: fp@tinyerp.com-20121215175213-znlkz1rnot3zf0e9
2012-12-15 18:52:13 +01:00
Fabien Pinckaers 769a275158 fix
bzr revid: fp@tinyerp.com-20121215175033-1hr5un0gk1b4qxmw
2012-12-15 18:50:33 +01:00
Fabien Pinckaers a9b2569219 [MERGE] duplicate of lots
bzr revid: fp@tinyerp.com-20121215174743-uwadx7l92s5h0wal
2012-12-15 18:47:43 +01:00
Fabien Pinckaers 1aae18691f [IMP] l10n_ro account type
bzr revid: fp@tinyerp.com-20121215174305-a3q62cgxkx4z3vax
2012-12-15 18:43:05 +01:00
Fabien Pinckaers 3799863eda [MERGE] fix invoice state for refunds
bzr revid: fp@tinyerp.com-20121215173711-hw4expisg9i0su8f
2012-12-15 18:37:11 +01:00
Fabien Pinckaers e45ce2e846 [MERGE] fix timeshet user report
bzr revid: fp@tinyerp.com-20121215172837-haxqsk93eosw311y
2012-12-15 18:28:37 +01:00
Fabien Pinckaers 160cafa249 [MERGE] fix: do not reinvoice customer invoices
bzr revid: fp@tinyerp.com-20121215171202-841po7g5xjqgmwy7
2012-12-15 18:12:02 +01:00
Fabien Pinckaers 67bdf29938 [IMP] date invoice in sale
bzr revid: fp@tinyerp.com-20121215170559-6qq3xwawj0p1bies
2012-12-15 18:05:59 +01:00
Fabien Pinckaers 2bcf2bcec0 [FIX] empty lists
bzr revid: fp@tinyerp.com-20121215165929-kqaz4dpuk2z4zy46
2012-12-15 17:59:29 +01:00
Fabien Pinckaers da2054e7a7 [MERGE] fix in warning
bzr revid: fp@tinyerp.com-20121215165510-cn0ps21rfwrtz22l
2012-12-15 17:55:10 +01:00
Fabien Pinckaers 6028d39466 [IMP] analytic account not required on budgets
bzr revid: fp@tinyerp.com-20121215164718-yodnoep77obff2ul
2012-12-15 17:47:18 +01:00
Fabien Pinckaers 16b00196d1 [MERGE] unpaid invoices from journal, clean domain
bzr revid: fp@tinyerp.com-20121215164449-ddocbdolel5ufyb8
2012-12-15 17:44:49 +01:00
Fabien Pinckaers e6478eb9f1 [MERGE] fix base_calendar
bzr revid: fp@tinyerp.com-20121215163556-dunic7yj2yoa7av9
2012-12-15 17:35:56 +01:00
Fabien Pinckaers 070d39bf2f [MERGE] fix in report designer with no admin rights
bzr revid: fp@tinyerp.com-20121215163323-wspya3a5i7lrey4t
2012-12-15 17:33:23 +01:00
Fabien Pinckaers 5449102e85 [MERGE] improved email for contract renewal if no phone number
bzr revid: fp@tinyerp.com-20121215163204-0k0gzws8c8kjc9s4
2012-12-15 17:32:04 +01:00
Fabien Pinckaers 29421ba8a0 [MERGE] clean invoice view from mrp_repair
bzr revid: fp@tinyerp.com-20121215163101-m1pkeca4bdk4557j
2012-12-15 17:31:01 +01:00
Fabien Pinckaers 1b966e5bfd [MERGE] translated terms in share wizard
bzr revid: fp@tinyerp.com-20121215162857-9ai03h2nedmfvrag
2012-12-15 17:28:57 +01:00
Fabien Pinckaers 24ad388ccc [MERGE] fix in hr leave report
bzr revid: fp@tinyerp.com-20121215162615-sfrwcy66xw7tfcm1
2012-12-15 17:26:15 +01:00
Fabien Pinckaers d9b7d8155e [IMP] multi-currency stuff
bzr revid: fp@tinyerp.com-20121215162309-yav3g8hu50bp9wvv
2012-12-15 17:23:09 +01:00
Fabien Pinckaers eabbbd247b [IMP] typo
bzr revid: fp@tinyerp.com-20121215133047-n2t7q58gckfbjfci
2012-12-15 14:30:47 +01:00
Fabien Pinckaers 4ae90a7206 [IMP] fancy note by default
bzr revid: fp@tinyerp.com-20121215130053-4q72g3z2nvu6h7zq
2012-12-15 14:00:53 +01:00
Fabien Pinckaers b0cb3ed3fe [IMP] small css fixes
bzr revid: fp@tinyerp.com-20121215125849-0gtgfjpmnnwdkjrb
2012-12-15 13:58:49 +01:00
Fabien Pinckaers ecb085fff6 [IMP] project form view save space for etherpad
bzr revid: fp@tinyerp.com-20121215121549-gh6baznv34isvy18
2012-12-15 13:15:49 +01:00
Fabien Pinckaers 52ba63d94a [IMP] css modifs
bzr revid: fp@tinyerp.com-20121215110829-u3nahqtwckg0qxjx
2012-12-15 12:08:29 +01:00
Fabien Pinckaers bdc7dcd539 [IMP] CSS of etherpad
bzr revid: fp@tinyerp.com-20121215110758-3ahwmk20uh5kt6g7
2012-12-15 12:07:58 +01:00
Fabien Pinckaers b8008dc7e4 [IMP] better thumbnail generation
bzr revid: fp@tinyerp.com-20121215104647-p4xnj04v5hxdz5wb
2012-12-15 11:46:47 +01:00
Fabien Pinckaers 1be0da09b3 [FIX] project small stuff: star, search on tags, #documents
bzr revid: fp@tinyerp.com-20121215101227-jb4z7hu57p2q11b4
2012-12-15 11:12:27 +01:00
Launchpad Translations on behalf of openerp 809c92fdef Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121214053618-1gz9xun2cb10afle
bzr revid: launchpad_translations_on_behalf_of_openerp-20121215050358-th0pl9jeams3pwkr
bzr revid: launchpad_translations_on_behalf_of_openerp-20121215050620-y27swfcuh62k8u32
bzr revid: launchpad_translations_on_behalf_of_openerp-20121215051723-6cnx1julk94gkm66
2012-12-15 05:17:23 +00:00
Quentin (OpenERP) 82eb22c536 [FIX] purchase: fix
bzr revid: qdp-launchpad@openerp.com-20121214191123-uj8bvvp18kive0aw
2012-12-14 20:11:23 +01:00
Quentin (OpenERP) 7b126c9ff4 [FIX] procurement: xml tag mismatch fixed
bzr revid: qdp-launchpad@openerp.com-20121214184446-lfckoyd9hio2c1vk
2012-12-14 19:44:46 +01:00
Michael Telahun Makonnen 9ea98938cd Add Ethiopian localization for SMEs.
bzr revid: mmakonnen@gmail.com-20121214165254-22zt55kqb90rjn3j
2012-12-14 19:52:54 +03:00
Quentin (OpenERP) 0c0c081676 [FIX] purchase, procurement: workflow of procurement order fixed
bzr revid: qdp-launchpad@openerp.com-20121214163921-hevj7um2n7jf8e1p
2012-12-14 17:39:21 +01:00
dle@openerp.com 70a0215a30 [IMP]String edit in view instead of overwrite inherited field
bzr revid: dle@openerp.com-20121214160736-zu7u5xct2h1xgs37
2012-12-14 17:07:36 +01:00
Quentin (OpenERP) 3c7cd8f24d [FIX] project_mrp: fixed wrong refence in procurement workflow
bzr revid: qdp-launchpad@openerp.com-20121214160721-tqmrqyh45d0kly8t
2012-12-14 17:07:21 +01:00
Christophe Simonis c4e89c651a [FIX] hr_attendance: do not show slider widget if user is not an employee
bzr revid: chs@openerp.com-20121214155430-h6u3l9jlutm1dclw
2012-12-14 16:54:30 +01:00
Vo Minh Thu 91ee5eae52 [IMP] orm/acl: proper message instead of TODO.
bzr revid: vmt@openerp.com-20121214155313-76lncslpx7ugrp6x
2012-12-14 16:53:13 +01:00
Christophe Simonis 2c8f4f7572 [FIX] hr_attendance: invert condition
bzr revid: chs@openerp.com-20121214155225-olze66svgx4hwqvg
2012-12-14 16:52:25 +01:00
Quentin (OpenERP) 65eb409d7d [FIX] mrp, project_mrp: fixed the refences to procurement workflow
bzr revid: qdp-launchpad@openerp.com-20121214153402-ckufkt6003hy7mv1
2012-12-14 16:34:02 +01:00
Vo Minh Thu 9ebbe7d230 [IMP] doc/security: removed note stating the groups attribute was partially implemented.
bzr revid: vmt@openerp.com-20121214153048-pehjjfp05uc9gdu4
2012-12-14 16:30:48 +01:00
Xavier Morel d6087e208f [FIX] flow control annoyances
bzr revid: xmo@openerp.com-20121214152957-izvuo2u0uvpuv2ho
2012-12-14 16:29:57 +01:00
Christophe Simonis 539af8a8f0 [FIX] hr_attendance: check the user is an employee by checking if (s)he belongs to the "Employee" group
bzr revid: chs@openerp.com-20121214152453-tvtjuvvmefw9qcrp
2012-12-14 16:24:53 +01:00
dle@openerp.com 1c2365da5d [MERGE]Latest trunk
bzr revid: dle@openerp.com-20121214151138-4nsawprqbka0dc5y
2012-12-14 16:11:38 +01:00
dle@openerp.com 9c977cbff1 [FIX]default weight uom measure was set to kgs all the time. Now depends of the configuration of uom (to handle uom of different countries
bzr revid: dle@openerp.com-20121214151108-38sjk0r506j2sdh0
2012-12-14 16:11:08 +01:00