Commit Graph
34754 Commits
Author SHA1 Message Date
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
Ujjvala Collins (OpenERP) 41fafc4ae7 [FIX] project_retro_planning: Fixed yml.
bzr revid: uco@tinyerp.com-20110127110513-bo02efgj3jr4qjdg
2011-01-27 16:35:13 +05:30
Sbh (OpenERP) d5d18ea957 [Fix] fix buildbot warning
bzr revid: sbh@tinyerp.com-20110127105333-ufjh65jmz21uzdsu
2011-01-27 16:23:33 +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 d20312211d [FIX] addons: restore proper loading of custom osv models (manual customizations) - backport from trunk
bzr revid: odo@openerp.com-20110127095654-z5c87abnzpjqsnag
2011-01-27 10:56:54 +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
Ujjvala Collins (OpenERP) 4bac6d8969 [FIX] all: Fixed incomplete behavior of act_window.
lp bug: https://launchpad.net/bugs/708467 fixed

bzr revid: uco@tinyerp.com-20110127094939-v8gugx666pakihva
2011-01-27 15:19:39 +05:30
Ujjvala Collins (OpenERP) 1f9880c01d [MERGE]
bzr revid: uco@tinyerp.com-20110127094040-zpi4lv8ztbgtz7om
2011-01-27 15:10:40 +05:30
jam-openerp 0109ea2adb [FIX] outlook : If server is running with --no-database-list than outllook shoud show the Blank text box for database input
bzr revid: jam@tinyerp.com-20110127093757-38e32v8fk1eigbal
2011-01-27 15:07:57 +05:30
jam-openerp 3381127292 [MERGE]with trink-dev-addons1
bzr revid: jam@tinyerp.com-20110125052727-x29zkiabdgt55uqj
bzr revid: jam@tinyerp.com-20110127091642-uj8zetxdd07zi9fx
2011-01-27 14:46:42 +05:30
Ujjvala Collins (OpenERP) 07cd879c3e [FIX] analytic: Fixed analytic chart of accounts problem defined on lp:681463 using suggested patch.
bzr revid: uco@tinyerp.com-20110127091553-8fn70mh3tyqaxdax
2011-01-27 14:45:53 +05:30
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
Ujjvala Collins (OpenERP) b4cb096a84 [MERGE]
bzr revid: uco@tinyerp.com-20110127061033-1p7i3ci81l3157c5
2011-01-27 11:40:33 +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
Launchpad Translations on behalf of openerp c1c5909f2d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110126054943-lzfn9m8gszjly9mp
bzr revid: launchpad_translations_on_behalf_of_openerp-20110127054419-mldra6zs7zr5fkic
2011-01-27 05:44:19 +00:00
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
psi (Open ERP) e45d6bbe05 [MERGE] merge with dev-addons3
bzr revid: psi@tinyerp.co.in-20110125112132-q0udjjsk2r6qea8v
bzr revid: psi@tinyerp.co.in-20110127053105-19shbnmq1gmu3c8r
2011-01-27 11:01:05 +05:30
Ujjvala Collins (OpenERP) 317c7f038a [MERGE] Merge with lp:openobject-addons
bzr revid: uco@tinyerp.com-20110127052023-qb8h4flfjj9c7xed
2011-01-27 10:50:23 +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
rha@tinyerp.com f580221024 [MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
bzr revid: rha@tinyerp.com-20110121043733-l8sr7niqgov2yylv
bzr revid: rha@tinyerp.com-20110125044711-i64ji1w6r2a1cghx
bzr revid: rha@tinyerp.com-20110127042418-npgjiow3y4ittt2g
2011-01-27 09:54:18 +05:30
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
Bogdan Stanciu 4832c55df9 [FIX] COA correction (account_account_type data was missing) for BS and P&L reporting
lp bug: https://launchpad.net/bugs/707314 fixed

bzr revid: bogdanovidiu.stanciu@gmail.com-20110126125755-urjp29cl0yibs5ur
2011-01-26 13:57:55 +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
olt@tinyerp.com be6165db94 [FIX] base: backport from trunk (r3318): fixed ir.attachment
bzr revid: olt@tinyerp.com-20110125142329-x1sf2qlazfiy6bdw
2011-01-25 15:23:29 +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
qdp-launchpad@tinyerp.com da2b68f725 [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-20110125141833-0ih3owdepldifts3
2011-01-25 15:18:33 +01:00
Sbh (OpenERP) efc7696624 [FIX] crm: Revert back change of Task ID-1796
bzr revid: sbh@tinyerp.com-20110125132051-lqol7xcqi6ozibpv
2011-01-25 18:50:51 +05:30
Thibault Francois 0aa7654d6d [FIX] Thunderbird false negative testing connection
bzr revid: tfr@openerp.com-20110125125111-sumkqbrljcn3ayiu
2011-01-25 13:51:11 +01:00
Mustufa Rangwala e0045953b6 [MERGE] l10n_ch: mtr branch for yml fix
bzr revid: mra@mra-laptop-20110125104528-eq2sg9nht91wehoq
2011-01-25 16:15:28 +05:30
Mustufa Rangwala 6997c3a62d [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20110125103502-gzmfcgbqn9o1jjl0
2011-01-25 16:05:02 +05:30
Mustufa Rangwala aea1580e38 [MERGE] Account: multi company: Selection of multi-company products account in invoices lines=> https://bugs.launchpad.net/openobject-addons/+bug/705043
bzr revid: mra@mra-laptop-20110125103106-pqletov82kn1i86k
2011-01-25 16:01:06 +05:30
mtr b8f60eb71f [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
bzr revid: mtr@mtr-20110125102625-pvhwnoj4std2w3fs
2011-01-25 15:56:25 +05:30
mtr a7d9e9975c [IMP] l10n_ch:solved the integrity error i.e. null value in column address_invoice_id violates not-null constraintin the yaml.
bzr revid: mtr@mtr-20110125101843-wwjdetjdckugcucj
2011-01-25 15:48:43 +05:30
Thibault Francois 5a20b4cf7b [FIX] crm : stage well assign according to the sales team if there is one, or according all stage if no sales team
bzr revid: tfr@openerp.com-20110125101505-08sisemudvj7xsi2
2011-01-25 11:15:05 +01:00
rpa (Open ERP) bc6beff902 [MERGE]: Merge with lp:~openerp-dev/openobject-addons/rpa-dev-addons2
bzr revid: rpa@tinyerp.com-20110125100635-a1gyqpbj1d1nbolf
2011-01-25 15:36:35 +05:30