Commit Graph
22232 Commits
Author SHA1 Message Date
Jay (OpenERP) 3c07ea7582 [FIX] Purchase : conflict removed, thanks to Raphael
bzr revid: jvo@tinyerp.com-20101028173125-afyv9hrt32iw23t8
2010-10-28 23:01:25 +05:30
Thibault Francois db318ff94f [FIX] warning.py : fix bug 11 arg needed 15 given
bzr revid: tfr@openerp.com-20101028135646-jzmn8i1a52uvi9s4
2010-10-28 15:56:46 +02:00
Thibault Francois 194ead1ccd [FIX] warning.py : fix bug 11 arg needed 15 given
bzr revid: tfr@openerp.com-20101028134558-neiqqv7qjk9ahpvc
2010-10-28 15:45:58 +02:00
olt@tinyerp.com 6de4c3eb3a [FIX] base_calendar: use 'onchange_dates' instead of 'onchange_allday' since it also returns duration
bzr revid: olt@tinyerp.com-20101028120920-qb6mg4oxyn8df9x7
2010-10-28 14:09:20 +02:00
Harry (OpenERP) ab9e19e595 [FIX] hr: replace tab char with white space
bzr revid: hmo@tinyerp.com-20101028114843-ujbpmns3ybtqm8s3
2010-10-28 17:18:43 +05:30
Thibault Francois f00a176355 [MERGE] purchase_view.xml : conflict resolved
bzr revid: tfr@openerp.com-20101028113350-fbeha4ln46la0u80
2010-10-28 13:33:50 +02:00
olt@tinyerp.com 2234f40038 [FIX] project: typo: 'Alien' -> 'Aline'
bzr revid: olt@tinyerp.com-20101028111937-bwn6z1r0yv5mnj6t
2010-10-28 13:19:37 +02:00
Thibault Francois fb379188b8 [FIX] hr.py : refactor getPhoto
bzr revid: tfr@openerp.com-20101028094532-to4vauqo1svcypbd
2010-10-28 11:45:32 +02:00
Thibault Francois 9cc07c4ee7 [Merge]
bzr revid: tfr@openerp.com-20101028093934-g6utf8ft8714e1pr
2010-10-28 11:39:34 +02:00
Jay (OpenERP) 670b65336d [FIX] Account : Payment term date calculation corrected
lp bug: https://launchpad.net/bugs/667339 fixed

bzr revid: jvo@tinyerp.com-20101028085751-l7rrg78uyyibkgbk
2010-10-28 14:27:51 +05:30
Harry (OpenERP) 2cf297f028 [FIX] account, point_of_sale: remove force_allow feature due to security issue on opening account cash statement
bzr revid: hmo@tinyerp.com-20101028071827-2nap7ev4f6w8n1fy
2010-10-28 12:48:27 +05:30
jam-openerp 98f3c3334b Test
bzr revid: jam@tinyerp.com-20101028065445-xv11daec9mrcl7ux
2010-10-28 12:24:45 +05:30
Launchpad Translations on behalf of openerp b2dabaed39 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20101028050736-rbj8cdoa89g9gm38
2010-10-28 05:07:36 +00:00
Jay (OpenERP) fd17d15b62 [REF] Purchase : pylint test corrections :thanks to Buildbot
bzr revid: jvo@tinyerp.com-20101027152939-o7lejydn89111tqx
2010-10-27 20:59:39 +05:30
Jay (OpenERP) ca5fd4af7d [Merge] Merged addons-fixes branch
bzr revid: jvo@tinyerp.com-20101027141154-5g36msxuol53mokg
2010-10-27 19:41:54 +05:30
RME (OpenERP) 4147251af5 [MERGE] Merge from the main trunk addons
bzr revid: dhs@tinyerp.com-20101027113853-merdlynj0itjuxff
bzr revid: rme@tinyerp.com-20101027135819-6i3ochsxo3di88j1
2010-10-27 19:28:19 +05:30
Fabien Meghazi e42eeba3e2 [IMP] Sidebar buttons width has changed. Added focus on input.
bzr revid: fme@openerp.com-20101027134139-kfxis1s86f6k53tl
2010-10-27 15:41:39 +02:00
Harry (OpenERP) f5c8d4f9ad [MERGE]
bzr revid: hmo@tinyerp.com-20101027125905-4yxzzfs1y2colr0m
2010-10-27 18:29:05 +05:30
Harry (OpenERP) 77f013e046 [MERGE] merged with openobject-addons
bzr revid: hmo@tinyerp.com-20101027114430-ojh3oy03g65vnh7g
2010-10-27 17:14:30 +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
DHS (OpenERP) 9b2401e5a1 [FIX] purchase, sale:correct domains supplied to partner on sale ,purchase
lp bug: https://launchpad.net/bugs/666754 fixed

bzr revid: dhs@tinyerp.com-20101027104247-z7nanjo54nby8d5f
2010-10-27 16:12:47 +05:30
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
DHS (OpenERP) 7013718aaa [MERGE] Merged main branch
bzr revid: dhs@tinyerp.com-20101027101750-dx7rqtjx9mkoonv3
2010-10-27 15:47:50 +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
Thibault Francois f20e34ac9d [FIX] purchase_line_invoice : uncomment origin + clean comment and print
bzr revid: tfr@openerp.com-20101027090845-g8ery0xmqe8zvver
2010-10-27 11:08:45 +02:00
Thibault Francois 146e284f4e [FIX] clean comment and print
bzr revid: tfr@openerp.com-20101027085100-xele86ggyidr359m
2010-10-27 10:51:00 +02:00
Thibault Francois 217be76e61 [FIX] account_voucher : clean comment
bzr revid: tfr@openerp.com-20101027084857-hd7sxyw27t2khkn8
2010-10-27 10:48:57 +02:00
Thibault Francois 24d5a30d6b [FIX] account_voucher : clean comment
bzr revid: tfr@openerp.com-20101027083658-avyoomagq9q60nf8
2010-10-27 10:36:58 +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
Thibault Francois 520224a502 [FIX] stock_partial_move : remove debug
bzr revid: tfr@openerp.com-20101027080529-zuwe2qy53dqmoue2
2010-10-27 10:05:29 +02:00
uco (OpenERP) 5640c5b96b [FIX] hr_timesheet_sheet, project_timesheet: Corrected typo.
bzr revid: uco@tinyerp.com-20101027070324-akahll2obchnn8fi
2010-10-27 12:33:24 +05:30
uco (OpenERP) 979055362f [FIX] project_planning: Corrected 'File not found' error for --log-level=test.
bzr revid: uco@tinyerp.com-20101027065854-hkltmzi8jahcmqfm
2010-10-27 12:28:54 +05:30
DHS (OpenERP) 73d818f71a [FIX] purchase: fiscal_position from PO in invoice
lp bug: https://launchpad.net/bugs/666617 fixed

bzr revid: dhs@tinyerp.com-20101027055522-g5tfw4nxfbx72qd5
2010-10-27 11:25:22 +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
DHS (OpenERP) c95603512e [MERGE] Merged main branch
bzr revid: dhs@tinyerp.com-20101027053152-6xah23bf9at43cf3
2010-10-27 11:01:52 +05:30
uco (OpenERP) ff7600025f [MERGE]: Merged with trunk-addons.
bzr revid: uco@tinyerp.com-20101027050908-7c1cch1nirk10ubd
2010-10-27 10:39:08 +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
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
uco (OpenERP) b681cb4261 [FIX] : Removed tools.config['addons_path'] for bug 666714.
lp bug: https://launchpad.net/bugs/666714 fixed

bzr revid: uco@tinyerp.com-20101026132254-5gkcrrxaskc3aczf
2010-10-26 18:52:54 +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