Commit Graph
22209 Commits
Author SHA1 Message Date
Harry (OpenERP) 214fddfc4c [MERGE]
bzr revid: hmo@tinyerp.com-20101028113641-vhuqs53ocp930zi5
2010-10-28 17:06:41 +05:30
Harry (OpenERP) fef0c2caf9 [MERGE]
bzr revid: hmo@tinyerp.com-20101028111138-1ehjb4lxylp3yqns
2010-10-28 16:41:38 +05:30
ron@tinyerp.com 70d2b044c4 [FIX]Invoice Control in Purchase Order: change Tooltip
lp bug: https://launchpad.net/bugs/667324 fixed

bzr revid: ron@tinyerp.com-20101028082204-1ishats06a14b5p1
2010-10-28 13:52:04 +05:30
ron@tinyerp.com 8f0095a006 [FIX] avoid negative wording
lp bug: https://launchpad.net/bugs/666362 fixed

bzr revid: ron@tinyerp.com-20101028072011-19v0gxf5dr3kqbpa
2010-10-28 12:50:11 +05:30
ron@tinyerp.com 686c88898b [MERGE] Merged:trunk-dev-addons2
bzr revid: ron@tinyerp.com-20101028070647-sv5z2byw6nr79ch4
2010-10-28 12:36:47 +05:30
rpa (Open ERP) d6ba50f386 [FIX]: Fixed translation of warning messages
lp bug: https://launchpad.net/bugs/660494 fixed

bzr revid: rpa@tinyerp.com-20101027133524-2mijip7zskzwevnh
2010-10-27 19:05:24 +05:30
Harry (OpenERP) bc2707e65d [MERGE] merged with openobject-addons
bzr revid: hmo@tinyerp.com-20101027131925-6399ot77ovmvdcon
2010-10-27 18:49:25 +05:30
Harry (OpenERP) a91878d868 [FIX] project: fixed yml issue
bzr revid: hmo@tinyerp.com-20101027113715-b6973r91ravjljjg
2010-10-27 17:07:15 +05:30
Thibault Francois 529163fd9e [MERGE]
bzr revid: tfr@openerp.com-20101027110742-bb1ni6x60ct2byvc
2010-10-27 13:07:42 +02:00
Harry (OpenERP) abc40474e0 [FIX] account: fixed yml issue of account cash statement
bzr revid: hmo@tinyerp.com-20101027103208-xvtzje41n2rb5kl1
2010-10-27 16:02:08 +05:30
Harry (OpenERP) 8cebff4d9f [FIX] stock_invoice_directly: fixed yml issue
bzr revid: hmo@tinyerp.com-20101027100624-4c14kfvzrwxmp7j0
2010-10-27 15:36:24 +05:30
Thibault Francois c6df9c4b1d [FIX] deadline_change.yml : fix date format deadline
bzr revid: tfr@openerp.com-20101027100605-b6xsqvwfvvgbt3x3
2010-10-27 12:06:05 +02:00
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
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
ron@tinyerp.com b9d7c185f8 [MERGE] Merged:trunk-dev-addons2
bzr revid: ron@tinyerp.com-20101027054454-7n5asyxx403id6jb
2010-10-27 11:14:54 +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
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
ron@tinyerp.com d8d5a56398 [FIX] BUG:-666362 sale Invoice Control Status Rename "Not from Picking" to From Ordered Quantities
bzr revid: ron@tinyerp.com-20101026135622-d57kelps5grfr6b5
2010-10-26 19:26:22 +05:30
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