Commit Graph
37875 Commits
Author SHA1 Message Date
Sbh (OpenERP) 5974788bb8 [MERGE] Merge lp:~openerp-dev/openobject-addons/jam-dev-addons1
bzr revid: sbh@tinyerp.com-20110128061216-uzhs38ltyxis3pxo
2011-01-28 11:42:16 +05:30
Sbh (OpenERP) 7a11d7d6f2 [MERGE] Merge lp:~openerp-dev/openobject-addons/uco-dev-addons1
bzr revid: sbh@tinyerp.com-20110128055706-wwnzpmm3uvwm6lj2
2011-01-28 11:27:06 +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 ecb6b6f527 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110128053653-049dtejg2tclii63
bzr revid: launchpad_translations_on_behalf_of_openerp-20110126055017-ulxyki7050s7grep
bzr revid: launchpad_translations_on_behalf_of_openerp-20110127054451-b5yoejbvso0zunmz
bzr revid: launchpad_translations_on_behalf_of_openerp-20110128053714-zb3yb4h7fkbmlqk9
2011-01-28 05:37:14 +00:00
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
Ujjvala Collins (OpenERP) 87ae3bb4eb [MERGE]
bzr revid: uco@tinyerp.com-20110128050304-brmu6n6hdghggbi6
2011-01-28 10:33:04 +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
Sbh (OpenERP) 57d8752254 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20110128044047-il9c6373ljd4y5ev
2011-01-28 10:10:47 +05:30
Olivier Dony 412d1766e2 [FIX] ir_attachment: typo introduced in previous fix (3319) (backport of trunk)
Original revision: 3319 - olt@tinyerp.com-20110125142329-x1sf2qlazfiy6bdw
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-20110127155158-p9cn2vtqaqb914jn
2011-01-27 16:51:58 +01: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
Ujjvala Collins (OpenERP) fdd8a68cf2 [REF] crm: Code optimization on next/previous stages for lead and opportunities.
bzr revid: uco@tinyerp.com-20110127125829-1oc4dexmi48tggr2
2011-01-27 18:28:29 +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
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