odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity
26,709 Commits 3 Branches 0 Tags 961 MiB
Commit Graph

26709 Commits

Author SHA1 Message Date
mtr f010d48772 [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3 
bzr revid: mtr@mtr-20110128114807-qs32ugav77gg93wu
bzr revid: mtr@mtr-20110131045621-ktfvsrg307miy9vo
 2011-01-31 10:26:21 +05:30
Mustufa Rangwala 67415ffd26 [MERGE] merge from trunk addons 
bzr revid: mra@mra-laptop-20110131044501-vulyvknn2zhjrzat
 2011-01-31 10:15:01 +05:30
Launchpad Translations on behalf of openerp 61a62b1dfe Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20110129045401-1zezcgk719d3dm0t
bzr revid: launchpad_translations_on_behalf_of_openerp-20110130044958-yshcathln43o1wdz
bzr revid: launchpad_translations_on_behalf_of_openerp-20110131045457-rzhwci5po7ea72bd
bzr revid: launchpad_translations_on_behalf_of_openerp-20110129045641-xfn2nij4y67wyq3h
bzr revid: launchpad_translations_on_behalf_of_openerp-20110130045141-vh5ecttx8tj5vdg4
bzr revid: launchpad_translations_on_behalf_of_openerp-20110131045711-41727n3c4e3wi0t9
 2011-01-31 04:57:11 +00:00
Olivier Dony 880b89a343 [FIX] orm: incorrect braces when processing default values for o2m/m2m 
lp bug: https://launchpad.net/bugs/704311 fixed

bzr revid: odo@openerp.com-20110128160322-loi7i2te6d1rsn6p
 2011-01-28 17:03:22 +01:00
Mustufa Rangwala 8f1a232916 [IMP] hr_payroll: add pto header on pay advice rml 
bzr revid: mra@mra-laptop-20110128133640-4zu70ghbsisp0oes
 2011-01-28 19:06:40 +05:30
Mustufa Rangwala b32167875e [REVERT] account voucher changes 
bzr revid: mra@mra-laptop-20110128133254-iljzm4pavbzqwk7a
 2011-01-28 19:02:54 +05:30
mtr c70e22c1a2 [FIX] account: allows duplication of account 
lp bug: https://launchpad.net/bugs/708603 fixed

bzr revid: mtr@mtr-20110128114450-998ho3olsdfno7yw
 2011-01-28 17:14:50 +05:30
qdp-launchpad@tinyerp.com 828481bc6a [MERGE] merged dev2 branch 
bzr revid: qdp-launchpad@tinyerp.com-20110128112532-b2te782ia9ku7g94
 2011-01-28 12:25:32 +01:00
qdp-launchpad@tinyerp.com 7864489978 [REF] account, invoice.py: refactored the product_id_change of invoice lines. Removed filthy code that was choosing the account based on the company passed in context and it should be the one currently set in the current user preferences 
bzr revid: qdp-launchpad@tinyerp.com-20110128112410-ql9457hfwxj4pejd
 2011-01-28 12:24:10 +01:00
qdp-launchpad@tinyerp.com 9fb4e60e68 [FIX] hr, access rights: a simple employee should be able to see the list of departments 
bzr revid: qdp-launchpad@tinyerp.com-20110128092939-u6lpij6zexv6qztl
 2011-01-28 10:29:39 +01:00
Mustufa Rangwala 2ee59acd64 [MERGE] merge from trunk addons 
bzr revid: mra@mra-laptop-20110128083036-yd77dhpcilqw0ns9
 2011-01-28 14:00:36 +05:30
Mustufa Rangwala 72b31da539 [MERGE] account_payment: import payment lines from invoice button not working fixed 
bzr revid: mra@mra-laptop-20110128063345-6ytq4gpivpj2ji4k
 2011-01-28 12:03:45 +05:30
ARA (OpenERP) 375b07ba7a [REF] l10n_fr:revert this account type = view whose child 
bzr revid: ara@tinyerp.com-20110128062740-2uvxk1w1sh6s299r
 2011-01-28 11:57:40 +05:30
Mustufa Rangwala 5235c605cd [FIX] Account: Residual Value miscalculated 
lp bug: https://launchpad.net/bugs/708405 fixed

bzr revid: mra@mra-laptop-20110128054549-srjxoazwo73cmv92
 2011-01-28 11:15:49 +05:30
rpa (Open ERP) 8a6d2875fb [MERGE]: Merge with lp:openobject-addons 
bzr revid: rpa@tinyerp.com-20110128053114-ei5ru08mrv1nqvy9
 2011-01-28 11:01:14 +05:30
Launchpad Translations on behalf of openerp f25fb5f4d4 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20110128044458-rmemxsynuxmrp9pl
bzr revid: launchpad_translations_on_behalf_of_openerp-20110128044655-31s27yl2cpkov2g5
 2011-01-28 04:46:55 +00:00
Olivier Dony 79cd0848c1 [FIX] ir_attachment: typo introduced in previous fix (3318) 
Original revision: 3318 - nel@tinyerp.com-20110121084241-10kfmgd16vt19vkv
The consequence is that access rights on attachments would be incorrectly checked, using the
intersection of the attachment IDs and the resource IDs.

bzr revid: odo@openerp.com-20110127154532-v18l28qk8ysi02sb
 2011-01-27 16:45:32 +01:00
ARA (OpenERP) 51accb561a [MERGE] merge from dev3 
bzr revid: ara@tinyerp.com-20110127133705-ihlzl462tbn3te43
 2011-01-27 19:07:05 +05:30
ARA (OpenERP) 59fdbf0236 [FIX] Account_payment: Select Invoices to Pay button on payment order not working 
lp bug: https://launchpad.net/bugs/707398 fixed

bzr revid: ara@tinyerp.com-20110127133457-65ndqaxbawiti2ca
 2011-01-27 19:04:57 +05:30
rpa (Open ERP) a3a191bc0d [MERGE]: Merge with lp:~openerp-dev/openobject-addons/ron-dev-addons2 
bzr revid: rpa@tinyerp.com-20110127132839-s7joeoppr0ozom1e
 2011-01-27 18:58:39 +05:30
Mustufa Rangwala 764247c29a [MERGE] Account: [trunk][account][low] Inversion of two columns in a many2many field on bank statement line 
bzr revid: mra@mra-laptop-20110127123725-lrqp95wn20ydwr5i
 2011-01-27 18:07:25 +05:30
ron@tinyerp.com 8644377cd9 [MERGE]Merged with trunk-dev-addons2 
bzr revid: ron@tinyerp.com-20110127123624-5v656see7lq24a2c
 2011-01-27 18:06:24 +05:30
mtr ef68aff2fd [MERGE] branch merged with lp:~tempo-openerp/openobject-addons/trunk-bugfix-705797 
bzr revid: mtr@mtr-20110127121721-j3i1np6ku2craczs
 2011-01-27 17:47:21 +05:30
ron@tinyerp.com 949b71a0c9 [FIX]stock :UnicodeEncodeError in stock_change_product_qty.py 
lp bug: https://launchpad.net/bugs/707809 fixed

bzr revid: ron@tinyerp.com-20110127114701-yilw96l2f3bxnbh2
 2011-01-27 17:17:01 +05:30
Mustufa Rangwala 51236d9c24 [MERGE] Account: typos 
bzr revid: mra@mra-laptop-20110127114525-xyp9plo9mc3e082o
 2011-01-27 17:15:25 +05:30
Mustufa Rangwala 08e8c9dc76 [MERGE] merge from trunk addons 
bzr revid: mra@mra-laptop-20110127113651-r4f3o8b5bbhzaza1
 2011-01-27 17:06:51 +05:30
mtr a955e43980 [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3 
bzr revid: mtr@mtr-20110127113018-pndbu1ygwlogpcpi
 2011-01-27 17:00:18 +05:30
Mustufa Rangwala c9fee124ca [FIX] Account_voucher: Reconcile with Write-Off => For write off option now it will consider amount_reconciled instead of amount on voucher line and if you pay via write off option and your amount=0 then it will consider voucher line now 
lp bug: https://launchpad.net/bugs/706107 fixed

bzr revid: mra@mra-laptop-20110127112619-89hvzyc4ct3e34ws
 2011-01-27 16:56:19 +05:30
Olivier Dony ce4675876f [FIX] project_retro_planning: correct invalid yml test data, that does not work at the end of the month 
bzr revid: odo@openerp.com-20110127104103-q9zfadnjurtxkl19
 2011-01-27 11:41:03 +01:00
Olivier Dony 01669a452a [I18N] es_CL: attempt to reset translations, as requested by es_CL translation team 
bzr revid: odo@openerp.com-20110127101331-1j1z974pr41q2617
 2011-01-27 11:13:31 +01:00
Olivier Dony 4ebc3b55f0 [FIX] addons: restore proper loading of custom osv models (manual customizations) 
bzr revid: odo@openerp.com-20110127095505-6wiq7jwkzylsc2i6
 2011-01-27 10:55:05 +01:00
mtr 3e15579e3f [IMP] account:remove the print statement 
bzr revid: mtr@mtr-20110127072635-c3r0f3qndwk69pcc
 2011-01-27 12:56:35 +05:30
ARA (OpenERP) 8b89d50152 [MERGE] merge from dev3 
bzr revid: ara@tinyerp.com-20110127064011-pltc1ulfngze6qvo
 2011-01-27 12:10:11 +05:30
ARA (OpenERP) 8bb8e9f2c3 [REF] account: fix buildbot warning 
bzr revid: ara@tinyerp.com-20110127063226-2bvb74jfkjql3d29
 2011-01-27 12:02:26 +05:30
Mustufa Rangwala e8f9223b68 [MERGE] Account: useless variable in button_confirm_bank: 707404 
bzr revid: mra@mra-laptop-20110127060123-30gni5cb30bpru87
 2011-01-27 11:31:23 +05:30
ARA (OpenERP) 2add57ba57 [FIX] account: [trunk][account] useless variable in button_confirm_bank 
lp bug: https://launchpad.net/bugs/707404 fixed

bzr revid: ara@tinyerp.com-20110127053937-sbk2lu0qle04w60x
 2011-01-27 11:09:37 +05:30
mtr c5f5933a1f [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3 
bzr revid: mtr@mtr-20110127053658-x3d7w69qu9zzqxr7
 2011-01-27 11:06:58 +05:30
ARA (OpenERP) 803bf74466 [MERGE] merge from dev3 
bzr revid: ara@tinyerp.com-20110127045911-3w39j5cqsr4we4iv
bzr revid: ara@tinyerp.com-20110127051435-818pewk9tqpmetmk
 2011-01-27 10:44:35 +05:30
rpa (Open ERP) 918a399c22 [MERGE]: Merge with lp:openobject-addons 
bzr revid: rpa@tinyerp.com-20110127050432-1crz6pkqo77v0ejw
 2011-01-27 10:34:32 +05:30
Mustufa Rangwala 4934fe8608 [MERGE] merge from trunk addons 
bzr revid: mra@mra-laptop-20110127045842-24js556fpq1t2es1
 2011-01-27 10:28:42 +05:30
ron@tinyerp.com 3925c26765 [MERGE]Merged with trunk-dev-addons2 
bzr revid: ron@tinyerp.com-20110121044011-erf15lv18jizhaig
bzr revid: ron@tinyerp.com-20110124052212-r4wjx2he3ozsrik1
bzr revid: ron@tinyerp.com-20110125065901-6mp9qwac69evgdw5
bzr revid: ron@tinyerp.com-20110127044809-psfq2zs37fk3xwzg
 2011-01-27 10:18:09 +05:30
Launchpad Translations on behalf of openerp c456ff0d76 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20110127043453-7iocd8dbvj0edxzt
bzr revid: launchpad_translations_on_behalf_of_openerp-20110126044003-z1ltdzbzu9trb8qo
bzr revid: launchpad_translations_on_behalf_of_openerp-20110127043733-5jad7vpuuti1my8y
 2011-01-27 04:37:33 +00:00
Olivier Dony c57ab8210f [REVERT] revisions 3324, 3325, 3326, to be merged globally after complete cleanup 
This corresponds to revids:
 - vmt@openerp.com-20110126142219-18j842m60diwsdph (3324)
 - vmt@openerp.com-20110126144255-t8p6g1ggjb7f1dmt (3325)
 - vmt@openerp.com-20110126151717-tf0q2mx2inj21jls (3326)

bzr revid: odo@openerp.com-20110126165030-su3zeobaj7v9d95f
 2011-01-26 17:50:30 +01:00
Vo Minh Thu e52c477dfe [IMP] parse_config is called in openerp-server.py, the direct cycle in convert.py is removed 
bzr revid: vmt@openerp.com-20110126151717-tf0q2mx2inj21jls
 2011-01-26 16:17:17 +01:00
Vo Minh Thu 0e39f07490 [IMP] tools/netsvc: removed direct dependency of tools on netsvc 
bzr revid: vmt@openerp.com-20110126144255-t8p6g1ggjb7f1dmt
 2011-01-26 15:42:55 +01:00
Vo Minh Thu 7bf401381d [IMP] netsvc/tools.config: the part of netsvc tools.config needs is moved in a new loglevels module. 
bzr revid: vmt@openerp.com-20110126142219-18j842m60diwsdph
 2011-01-26 15:22:19 +01:00
Launchpad Translations on behalf of openerp b0bdfb1c24 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20110122045105-6bb15gpfqxvqoqhp
bzr revid: launchpad_translations_on_behalf_of_openerp-20110123045627-dg9tpwjxlisdl3ge
bzr revid: launchpad_translations_on_behalf_of_openerp-20110124045322-s2fdn393vljjl85m
bzr revid: launchpad_translations_on_behalf_of_openerp-20110125045312-dfqahig9ymkhcyg2
bzr revid: launchpad_translations_on_behalf_of_openerp-20110126043658-k5o2c5r7ymqxv844
 2011-01-26 04:36:58 +00:00
nel@tinyerp.com e902f2ac86 [FIX] wizard stock partial picking: when no currency defined on product 
bzr revid: nel@tinyerp.com-20110125162815-xk5ymun6nx0ud3jz
 2011-01-25 17:28:15 +01:00
qdp-launchpad@tinyerp.com afca671b1b [FIX] account: invoice analysis enhanced in order to avoid having crashes because of zero division (if a line has qtty = 0..) 
bzr revid: qdp-launchpad@tinyerp.com-20110125162808-v8c5y97800szf741
 2011-01-25 17:28:08 +01:00
nel@tinyerp.com d9985ed3b6 [FIX] account_payment: openerp file 
bzr revid: nel@tinyerp.com-20110125141950-2tmmidixnfjtky4h
 2011-01-25 15:19:50 +01:00