Commit Graph
22193 Commits
Author SHA1 Message Date
Mustufa Rangwala 87d2828c61 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20101027093700-qux86he71bccr7ly
2010-10-27 15:07:00 +05:30
Harry (OpenERP) 8774ef11af [MERGE] merged with openerp-dev-addons2 branch
bzr revid: hmo@tinyerp.com-20101027081224-g17ejxwbr02hdig7
2010-10-27 13:42:24 +05:30
Mustufa Rangwala 12a7bc627a [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20101027043546-z3qxosg1eq9oee9u
bzr revid: mra@mra-laptop-20101027075948-02xz8cs4qanqavzb
2010-10-27 13:29:48 +05:30
Harry (OpenERP) 3d4cec9024 [MERGE] merged openerp-dev-addons1 branch
bzr revid: hmo@tinyerp.com-20101027055155-eu05206phmwa9ulw
2010-10-27 11:21:55 +05:30
Harry (OpenERP) e42ec27394 [MERGE] merged from openobject-addons branch
bzr revid: hmo@tinyerp.com-20101027055119-nbquo0yywszt6ts1
2010-10-27 11:21:19 +05:30
Harry (OpenERP) cbc52ce458 [MERGE] merged from openobject-addons branch
bzr revid: hmo@tinyerp.com-20101027053819-if1wltlbyizl4n5r
2010-10-27 11:08:19 +05:30
Launchpad Translations on behalf of openerp 15e29993ba Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20101027045958-rsoogevs33siq1kv
2010-10-27 04:59:58 +00:00
Mustufa Rangwala 8b0db0ccc4 [REF] Event, Membership, pos: Cleaning and code improved
bzr revid: mra@mra-laptop-20101027042913-y963rgrq3bcog1qs
2010-10-27 09:59:13 +05:30
qdp-launchpad@tinyerp.com 02d922e395 [FIX] account, bank/cash statement: fixed a bug on account.move numbering when created from account.bank.statement
[IMP] account, bank/cash statement: replaced onchange_patrner_id with onchange_type: we don't want to change the amount automatically anymore
[IMP] account, bank/cash statement: usability improvements

bzr revid: qdp-launchpad@tinyerp.com-20101026161652-ynwwunbspigqfsfc
2010-10-26 18:16:52 +02:00
qdp-launchpad@tinyerp.com 0b8f9e27fe [FIX] account_voucher: added the column voucher_id on cash statement + removed amount_reconciled column (useless)
bzr revid: qdp-launchpad@tinyerp.com-20101026160713-9fxnuqz2gjmnsjg4
2010-10-26 18:07:13 +02:00
qdp-launchpad@tinyerp.com 563ef33b6f [IMP] account: renamed 'Validate Journal Entries' with 'Post Journal Entries'
bzr revid: qdp-launchpad@tinyerp.com-20101026160604-uzm6utbafond9915
2010-10-26 18:06:04 +02:00
qdp-launchpad@tinyerp.com f105ff6155 [MERGE] merged the team 3 branch
bzr revid: qdp-launchpad@tinyerp.com-20101026160435-gqay6le2c5w35rke
2010-10-26 18:04:35 +02:00
Harry (OpenERP) 31429c0688 [MERGE]
bzr revid: hmo@tinyerp.com-20101026135302-wyh8fycsp13mtb7e
2010-10-26 19:23:02 +05:30
Christophe Simonis b68dda729b [FIX] document_ftp: fix server shutdown
bzr revid: chs@openerp.com-20101026134449-mfan2d5pfj9m0pqx
2010-10-26 15:44:49 +02:00
psi (Open ERP) 71460802a5 [IMP] point_of_sale: code cleaning
bzr revid: psi@tinyerp.co.in-20101026134031-ee7geo6vzj1npv5r
2010-10-26 19:10:31 +05:30
ARA (OpenERP) bd5d891417 [IMP] account_voucher: code cleaning
bzr revid: ara@tinyerp.com-20101026133352-0tb4fmrby1yv8vyg
2010-10-26 19:03:52 +05:30
Mustufa Rangwala 597d60d49e [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20101026131831-rygvcicz3vi3hk39
2010-10-26 18:48:31 +05:30
Mustufa Rangwala 481c50471e [REF, REM] Membership: Cleaning remove demo file
bzr revid: mra@mra-laptop-20101026130337-n0wnsw4pz76dvhir
2010-10-26 18:33:37 +05:30
psi (Open ERP) 09badf3375 [IMP] point_of_sale: code cleaning
bzr revid: psi@tinyerp.co.in-20101026130012-olfktqj5qr578lpb
2010-10-26 18:30:12 +05:30
Jacara 26edcb80e4 [FIX] Account : Usability change
lp bug: https://launchpad.net/bugs/666709 fixed

bzr revid: jvo@tinyerp.com-20101026124154-la1x697mpxrjkpdk
2010-10-26 18:11:54 +05:30
Mustufa Rangwala 68dc715dfa [REF] event
bzr revid: mra@mra-laptop-20101026124014-gm1iqua5s01ql9ty
2010-10-26 18:10:14 +05:30
jas 90e8a2a9ac [FIX] hr_payroll :added cancel_sheet and set_to_draft function
bzr revid: jas@tinyerp.com-20101026122332-9olfswqdnjgqxeye
2010-10-26 17:53:32 +05:30
mtr 21b05dafac [IMP] point_of_sale:-renamed files
bzr revid: mtr@mtr-20101026121259-tbowld1yx3skezpr
2010-10-26 17:42:59 +05:30
Mustufa Rangwala aeddd5e664 [REM] partner_geo_assign
bzr revid: mra@mra-laptop-20101026121122-u9uq5s4mmwk3g4tr
2010-10-26 17:41:22 +05:30
psi (Open ERP) 19a6dd08c0 [IMP] sale_analytic_plans: Add group and domain of field
bzr revid: psi@tinyerp.co.in-20101026115546-wessdjlr3g3ejjmw
2010-10-26 17:25:46 +05:30
Harry (OpenERP) b9eb67c65b [MERGE]
bzr revid: hmo@tinyerp.com-20101026115037-elfqoej32fnteh12
2010-10-26 17:20:37 +05:30
psi (Open ERP) 0d00f5770d [IMP] sale_analytic_plans: Used xpath in inherited view
bzr revid: psi@tinyerp.co.in-20101026114903-fmtz6dnjb9oyqmdy
2010-10-26 17:19:03 +05:30
Jay (OpenERP) f47cd9f6c5 [MERGE] Merged Addons fixes branch
bzr revid: jvo@tinyerp.com-20101026113257-5vu05j7n3r5w0gai
2010-10-26 17:02:57 +05:30
Mustufa Rangwala 35d7dc473b [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20101026111215-jikruav9qf8kysso
2010-10-26 16:42:15 +05:30
jas dcf1587852 [MERGE]
bzr revid: jas@tinyerp.com-20101026110917-u5fh6n2cn1uo0g5u
2010-10-26 16:39:17 +05:30
Mustufa Rangwala 4458bad51b [FIX] pos: Add user on cash statement journal demo
bzr revid: mra@mra-laptop-20101026110619-30qdpn0r4quk9dbo
2010-10-26 16:36:19 +05:30
vth 2b6bde7f71 [REF] point_of_sales: ref in yml
bzr revid: vth@tinyerp.com-20101026104306-707j6nzsndvtng20
2010-10-26 16:13:06 +05:30
DHS (OpenERP) d49ef5795e [FIX] account:account_tax_chart form name corrected
lp bug: https://launchpad.net/bugs/666101 fixed

bzr revid: dhs@tinyerp.com-20101026102726-n2phrs3jxzgbu462
2010-10-26 15:57:26 +05:30
mtr 623dfd17d5 [IMP] point_of_sale:-removed unused imported files and corrected warning
bzr revid: mtr@mtr-20101026102400-j8pocgfwpmce2cbt
2010-10-26 15:54:00 +05:30
mtr 6514ed5aae [IMP] survey:-improvements in fields_view_get() of survey.question.wiz
bzr revid: mtr@mtr-20101026094223-jf0ej2bawwpbist4
2010-10-26 15:12:23 +05:30
DHS (OpenERP) 6d3ed5f3df [MERGE] Merged main branch
bzr revid: dhs@tinyerp.com-20101026093436-lxntznhfikv09akv
2010-10-26 15:04:36 +05:30
Mustufa Rangwala 4b09311a73 [FIX] account anlalytic plan: correct _ca_invoiced_calc, _total_cost_calc for total costs and total inoviced (now it will work with amount instead on amount currency)
bzr revid: mra@mra-laptop-20101026091128-v17ftfamhi3exc6b
2010-10-26 14:41:28 +05:30
Harry (OpenERP) cd19af0bf5 [MERGE]
bzr revid: hmo@tinyerp.com-20101026090610-vxjd0qtd75i04yd4
2010-10-26 14:36:10 +05:30
psi (Open ERP) c73e17329c [FIX] email_template: email_template.preview.fields_view_get() is broken
bzr revid: psi@tinyerp.co.in-20101026084722-00oyp8j3d92yxqkh
2010-10-26 14:17:22 +05:30
Nicolas Vanhoren 8b1ef6ba2b [MERGE] account,l10n_be: improved sale and purchase tax config for chart template wizard
hr: fixed resource loading for multiple addons paths

bzr revid: odo@openerp.com-20101026081830-qm3zbwt4quhqz2qu
2010-10-26 10:18:30 +02:00
DHS (OpenERP) 1a1197101f [MERGE] Merged main branch
bzr revid: dhs@tinyerp.com-20101026071633-v9t8xjhwx71i4zwo
2010-10-26 12:46:33 +05:30
Harry (OpenERP) 1769bc9476 [MERGE]
bzr revid: hmo@tinyerp.com-20101026055347-yxz72wusdbhty34e
2010-10-26 11:23:47 +05:30
Mustufa Rangwala 2cc265aaef [REF] Account: Remove some warnings from buildbot
bzr revid: mra@mra-laptop-20101026054351-68olcwfpq81rinr2
2010-10-26 11:13:51 +05:30
psi (Open ERP) dfea5584e7 [REF] point_of_sale: Code cleaning
bzr revid: psi@tinyerp.co.in-20101026053743-kdti4mq98m1iriod
2010-10-26 11:07:43 +05:30
Mustufa Rangwala 1197af2134 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20101026051754-ou0xv1usmxlnyt7m
2010-10-26 10:47:54 +05:30
ksa (Open ERP) ffe3ffc6ee [MERGE]: Merge with lp:openobject-addons-trunk
bzr revid: ksa@tinyerp.co.in-20101026050904-n0i2lmz89cx4t0cx
2010-10-26 10:39:04 +05:30
Launchpad Translations on behalf of openerp beae37adb0 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20101026044038-5c6szph4ycp588u8
2010-10-26 04:40:38 +00:00
qdp-launchpad@tinyerp.com bc9f45252d [MERGE] merged the team 3 branch
bzr revid: qdp-launchpad@tinyerp.com-20101025155110-emudjsv1nk6x15gs
2010-10-25 17:51:10 +02:00
qdp-launchpad@tinyerp.com 5a377aaa6f [FIX] analytic: replaced tabs in sql query with 4 spaces
bzr revid: qdp-launchpad@tinyerp.com-20101025152834-5u49o7j0yeom0a4r
2010-10-25 17:28:34 +02:00
qdp-launchpad@tinyerp.com 4aaa3a4354 [FIX] account: fixed an untranslated term
bzr revid: qdp-launchpad@tinyerp.com-20101025152333-bl8btjwqne2qagfh
2010-10-25 17:23:33 +02:00