Commit Graph
26690 Commits
Author SHA1 Message Date
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
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
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
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
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
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
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
Mustufa Rangwala 4934fe8608 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20110127045842-24js556fpq1t2es1
2011-01-27 10:28:42 +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
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
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
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
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
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