Commit Graph
26956 Commits
Author SHA1 Message Date
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
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
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
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
psi (Open ERP) 0c5d50937b [FIX] account: Selection of multi-company products account in invoices lines
lp bug: https://launchpad.net/bugs/705043 fixed

bzr revid: psi@tinyerp.co.in-20110125095854-nsj8c3g64ay1m1ui
2011-01-25 15:28:54 +05:30
Harry (OpenERP) ee2b1b8aa9 [FIX] backport product_visible_discout fix from stable/6.0 at rev#4350
bzr revid: hmo@tinyerp.com-20110125095111-9ke4m8tq8g3tvyul
2011-01-25 15:21:11 +05:30
rpa (Open ERP) edf0c07db4 [FIX]: stock: Fixed domain of act_window in order to work with webclient
lp bug: https://launchpad.net/bugs/706776 fixed

bzr revid: rpa@tinyerp.com-20110125093723-33508cbtwd6xvwx3
2011-01-25 15:07:23 +05:30
rpa (Open ERP) 0befcb4fb8 [MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
bzr revid: rpa@tinyerp.com-20110125093142-s1pugzqxws9hwl00
2011-01-25 15:01:42 +05:30
Mustufa Rangwala 390974ede8 [MERGE] Sale: sale bug for picked progress bar
[MERGE] hr_payroll: typo on payroll advice report

bzr revid: mra@mra-laptop-20110125090844-j0up2utcshvie213
2011-01-25 14:38:44 +05:30
Mustufa Rangwala 3ac67d58d5 [MERGE] l10n_ch: Error creating a DTA
bzr revid: mra@mra-laptop-20110125085450-98y063xopdf2zxhp
2011-01-25 14:24:50 +05:30
Jay Vora (OpenERP) cf5462b933 [FIX] Product_visible_discount : correction on onchange_product_id (Ref: Maintenance case 3871)
bzr revid: jvo@tinyerp.com-20110125072903-95hxg6u53w2exwf8
2011-01-25 12:59:03 +05:30
Mustufa Rangwala fec5257ffa [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20110125072743-9dlsj3lnn4owa6v8
2011-01-25 12:57:43 +05:30
mtr 091b1b5d22 [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
bzr revid: mtr@mtr-20110125071456-0a5yjxu7tset1752
bzr revid: mtr@mtr-20110125071851-bybica1kadv6r3c1
2011-01-25 12:48:51 +05:30
Mustufa Rangwala 407c58d8fb [FIX] Account: Reconcile with Write-Off
lp bug: https://launchpad.net/bugs/706107 fixed

bzr revid: mra@mra-laptop-20110125071133-gu9z7nftu7u7zr4q
2011-01-25 12:41:33 +05:30
Launchpad Translations on behalf of openerp f432535386 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110125070908-zuisvtekjxpi6dny
2011-01-25 07:09:08 +00:00
mtr c65210bf09 [FIX] hr_payroll:removed extra table from report and changed the label
lp bug: https://launchpad.net/bugs/707144 fixed

bzr revid: mtr@mtr-20110125070516-4ochldcpbbywi201
2011-01-25 12:35:16 +05:30
Launchpad Translations on behalf of openerp 3d4a03d845 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110121055828-58dc2mksw0l3tsea
bzr revid: launchpad_translations_on_behalf_of_openerp-20110125060451-odllrb8doqa559kr
2011-01-25 06:04:51 +00:00
Sbh (OpenERP) 4624e5279a [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20110121050406-riqq1t3bqddz9exr
bzr revid: sbh@tinyerp.com-20110124042003-5jhccwrwtqs2w5zh
bzr revid: sbh@tinyerp.com-20110125050259-qktlkl3d88jd7zsp
2011-01-25 10:32:59 +05:30
rpa (Open ERP) 08495da6ee [MERGE]: Merge with lp:openobject-addons
bzr revid: rpa@tinyerp.com-20110121050040-879tvhdigocodknq
bzr revid: rpa@tinyerp.com-20110124045347-vx06vdbqimi168xu
bzr revid: rpa@tinyerp.com-20110125045855-dkxsggwl5680vq56
2011-01-25 10:28:55 +05:30
Launchpad Translations on behalf of openerp 217e21b620 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110125045659-am7jb132fuddnag8
2011-01-25 04:56:59 +00:00
Antony Lesuisse 3472424988 [FIX] project_issue analysis remove where clause from version 5
bzr revid: al@openerp.com-20110125014330-z37iftr6fhlaisdd
2011-01-25 02:43:30 +01:00
Thibault Francois c19a47838e [FIX] backport thunderbird fix
bzr revid: tfr@openerp.com-20110124161346-xqueto2yy357rz0x
2011-01-24 17:13:46 +01:00
Thibault Francois aacb8b8460 [FIX] thunderbird : connection refused when dabase is not list
bzr revid: tfr@openerp.com-20110124160208-val9s8das9njr0he
2011-01-24 17:02:08 +01:00
ARA (OpenERP) e1200140d4 [MERGE] merge from dev3
bzr revid: ara@tinyerp.com-20110124132436-agnh3snu83g94cm0
2011-01-24 18:54:36 +05:30
ARA (OpenERP) 6472a97362 [FIX] account: Error creating a DTA
lp bug: https://launchpad.net/bugs/705675 fixed

bzr revid: ara@tinyerp.com-20110124132129-hqwsd5stpgmyc87v
2011-01-24 18:51:29 +05:30
Mustufa Rangwala 8919c81eaa [FIX] Account: correct balance sheet, P&L, Trial balance report with options => with movements, with bal is not equal to 0
lp bug: https://launchpad.net/bugs/706287 fixed

bzr revid: mra@mra-laptop-20110124121112-w3j38xkhuq6dszza
2011-01-24 17:41:12 +05:30
P. Christeas 0022af690d debian: update changelog
bzr revid: p_christ@hol.gr-20110124115035-ivvcv0vahs0d1a1b
2011-01-24 13:50:35 +02:00
P. Christeas 9ee15e908e Merge official-6.0 into fixes26
bzr revid: p_christ@hol.gr-20110124114622-m2o2jh27u8wik4oy
2011-01-24 13:46:22 +02:00