19b83511c3
[MERGE] merge from trunk addons
...
bzr revid: mra@mra-laptop-20101209121447-4fosmap0x3abp7b0
2010-12-09 17:44:47 +05:30
c8f985e831
[MERGE] merged the xrg branch containing some bugfixes
...
bzr revid: qdp-launchpad@tinyerp.com-20101209105707-uifumqic7znndr3n
2010-12-09 11:57:07 +01:00
10adc172f3
[MERGE] merge from trunk addons
...
bzr revid: mra@mra-laptop-20101209074039-zfrjvsk503pv3h0t
2010-12-09 13:10:39 +05:30
e719e2f053
[FIX] Sale: https://bugs.launchpad.net/openobject-addons/+bug/674420
...
[ADD] account_analytic_plan: if user installs account_analytic_plans, the group Usability / Analytic accounting should be attributed to the administrator by default.
bzr revid: mra@mra-laptop-20101209064813-fcdqkknx4bggojk4
2010-12-09 12:18:13 +05:30
e2d025c961
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101209045022-g1ar37i6xtnr0jtq
bzr revid: launchpad_translations_on_behalf_of_openerp-20101209045802-ari4r0g7oouy55c8
2010-12-09 04:58:02 +00:00
e37f0384f8
sale: pack the warning message in one string (i18n), allow utf8 [Bug 684616]
...
As reported by Jacara, str(type_ul.name) would bork with unicode. In
addition, the concatenated string would be harder to translate.
bzr revid: p_christ@hol.gr-20101207133657-7tk732027zuj9whs
2010-12-07 15:36:57 +02:00
2a31884f70
[FIX] Sale: Wrong help text for sale.order.picking_id
...
lp bug: https://launchpad.net/bugs/683229 fixed
bzr revid: mra@mra-laptop-20101207120938-yhva8q6puh4yv9b5
2010-12-07 17:39:38 +05:30
3a10434a1e
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
...
bzr revid: mtr@mtr-20101207041823-4v40c0jcq73ndztv
2010-12-07 09:48:23 +05:30
5350ab0c19
[I18N] all: copy Serbian (sr.po) translations to Serbian Latin (sr@latin.po)
...
The idea is to keep all current Latin alphabet translations in the new SerbianLatin language before changing the default Serbian translations to Cyrillic alphabet
bzr revid: odo@openerp.com-20101206093208-jiqnceg5zx7xvzjk
2010-12-06 10:32:08 +01:00
73466af353
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
...
bzr revid: mtr@mtr-20101206072449-hq8204i2fgu7u9ml
2010-12-06 12:54:49 +05:30
50be667595
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101204051645-1r4dxlktdeeiy2fn
bzr revid: launchpad_translations_on_behalf_of_openerp-20101205045319-cr1iy0be5p2hljje
2010-12-05 04:53:19 +00:00
c95efe7997
[I18N] all: updated PO templates after latest cleanup
...
bzr revid: odo@openerp.com-20101203155533-bda40vcxelidfse9
2010-12-03 16:55:33 +01:00
0e4023932b
[MERGE] merged the xrg branch, containing several small fixes
...
bzr revid: qdp-launchpad@tinyerp.com-20101203120543-fp3k1adikqs45bjc
2010-12-03 13:05:43 +01:00
ded6d87b0a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101202045120-2vnixg047yc43xoe
bzr revid: launchpad_translations_on_behalf_of_openerp-20101203050840-9zljmoeq0kphj3ow
2010-12-03 05:08:40 +00:00
e28cd5bdaf
Merge commit '905f8b1d6c9e' into patch13
...
Conflicts:
crm_claim/crm_claim_demo.xml
project/board_project_manager_view.xml
bzr revid: p_christ@hol.gr-20101202201937-akh200wknpt9958h
2010-12-02 22:19:37 +02:00
1ed60063bf
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101130045411-k143t0b660w19cc7
bzr revid: launchpad_translations_on_behalf_of_openerp-20101201050327-5uo6676r282yjb1l
2010-12-01 05:03:27 +00:00
bd9f7cf426
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101128045514-606cbqkwad1pi9z0
bzr revid: launchpad_translations_on_behalf_of_openerp-20101129045431-lxah7i1wwaqmvjdu
2010-11-29 04:54:31 +00:00
7c5d0e6aba
delivery, purchase, sale, stock_location: minor fixes, mutable args
...
bzr revid: p_christ@hol.gr-20101127201616-fq46x1c2uo7s7b62
2010-11-27 22:16:16 +02:00
882e176a8a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101127045528-74pnr913nxfe6luv
2010-11-27 04:55:28 +00:00
382779126a
[MERGE] merged the dev team2 branch
...
bzr revid: qdp-launchpad@tinyerp.com-20101126161359-s02ik0bmz3l8lt9u
2010-11-26 17:13:59 +01:00
352bb205aa
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101126044921-9446pqhg2fetkj9v
bzr revid: launchpad_translations_on_behalf_of_openerp-20101126045439-w5rxmd2f3eukcno6
2010-11-26 04:54:39 +00:00
6fe87d7ea4
[FIX] sale:'Recreate procurement' on shipping exception now works for multiple sale order line
...
bzr revid: mtr@mtr-20101125100355-0a1b7m792t63mssv
2010-11-25 15:33:55 +05:30
cc7031ec28
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: rpa@tinyerp.com-20101125053205-1ttc6aqfdmw3543y
2010-11-25 11:02:05 +05:30
9ab34ed691
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101125045745-sqwvemtqcmgijfwk
2010-11-25 04:57:45 +00:00
49bf593d78
[REF]: sale/stock.py: Put proper variable name to make code properly readable for uos
...
bzr revid: rpa@tinyerp.com-20101124121133-pyo7ifgdd80l38lx
2010-11-24 17:41:33 +05:30
432d5ceeae
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: rpa@tinyerp.com-20101123131531-xux3r8ss858aztt6
bzr revid: rpa@tinyerp.com-20101124053028-7pclpk0y5egj5jpb
2010-11-24 11:00:28 +05:30
946e03d64c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101124050727-9r80w33i8dkvyp4d
2010-11-24 05:07:27 +00:00
4195027810
[MERGE] merged the report team branch
...
bzr revid: qdp-launchpad@tinyerp.com-20101123120816-koqpir628xdoxtkd
2010-11-23 13:08:16 +01:00
cc849ed706
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: rpa@tinyerp.com-20101123052024-cnfcs010ds7aeswc
2010-11-23 10:50:24 +05:30
192810c7e5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101123050442-0990cj01i5c2fhlt
2010-11-23 05:04:42 +00:00
02533c117a
[I18N] all: additional translations courtesy of swedish translation team (Anders Erikkson <ae@mobilasystem.se>)
...
bzr revid: odo@openerp.com-20101122162607-o4zklu2vo2raq4cj
2010-11-22 17:26:07 +01:00
93d742392f
[MERGE]: Merge with lp:~openerp-commiter/openobject-addons/trunk-addons-aag
...
bzr revid: rpa@tinyerp.com-20101122135153-0hu11k06zk4xm5a3
2010-11-22 19:21:53 +05:30
864423b1f4
[IMP] inmprovement in sale for Logistics and in sale/stock.py
...
bzr revid: aag@tinyerp.co.in-20101122130829-y2vwtrtndgy1s4ne
2010-11-22 18:38:29 +05:30
1442f13817
[MERGE]
...
bzr revid: hmo@tinyerp.com-20101122110334-rsh6dqq9p2in012u
2010-11-22 16:33:34 +05:30
823f6042f3
[Merge]: Merge from lp:openobject-addons.
...
bzr revid: rch@tinyerp.com-20101122045750-d4g9pwmy4vg9zv98
2010-11-22 10:27:50 +05:30
c4dcf78c5c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101120050854-smocbr71l96xrsvh
bzr revid: launchpad_translations_on_behalf_of_openerp-20101121045047-c59v2fg760t2kznf
bzr revid: launchpad_translations_on_behalf_of_openerp-20101122045229-yue08u836l0poqpv
2010-11-22 04:52:29 +00:00
8db844d712
[Merge]: Merge from trunk.
...
bzr revid: rch@tinyerp.com-20101119134029-g7s9fotsw59mx9ww
2010-11-19 19:10:29 +05:30
314aba5757
[IMP]: Group by works correctly when zoom on graph view of Sale Manager Dashboard.
...
bzr revid: rch@tinyerp.com-20101119121739-uz7pyth9i8dj23mf
2010-11-19 17:47:39 +05:30
713bcd7fe5
[MERGE] merge from trunk addons
...
bzr revid: mra@mra-laptop-20101119111622-sntfz3zmgrjn1lx4
2010-11-19 16:46:22 +05:30
6caca89f87
[IMP]: Moved reference of demo user from *_security.xml to demo file
...
bzr revid: rpa@tinyerp.com-20101119102525-8gyj1gmm1w29rwxu
2010-11-19 15:55:25 +05:30
ceb3d9e1d6
[FIX]: sale: logistic => logistics
...
bzr revid: rpa@tinyerp.com-20101119101905-6iof3s63axv8mgis
2010-11-19 15:49:05 +05:30
a81ecff2c4
[MERGE]: Merge with lp:~openerp-commiter/openobject-addons/trunk-addons-aag
...
bzr revid: rpa@tinyerp.com-20101119072430-0rgszlgidvyezsvd
2010-11-19 12:54:30 +05:30
f39976fd44
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: rpa@tinyerp.com-20101119061009-ifb550mjz3ei8hoa
2010-11-19 11:40:09 +05:30
1422edad60
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20101119045123-tyc766imazo8nemj
2010-11-19 04:51:23 +00:00
2600e122b9
[MERGE] merge from trunk addons
...
bzr revid: mra@mra-laptop-20101119043416-oa72n6rpurg0dljd
2010-11-19 10:04:16 +05:30
8e9e0586e7
[I18N] all: Updated translations templates to latest terms, after cleanup
...
bzr revid: odo@openerp.com-20101118162512-t98lj2h5r52k0e59
2010-11-18 17:25:12 +01:00
4f07379397
[IMP]: Added <pto> for report column headers
...
bzr revid: vro@tinyerp.com-20101116055731-qhkongmgqv52df5d
2010-11-16 11:27:31 +05:30
58c93f841a
[MERGE]: Merge with lp:openobject-trunk-dev-addons2
...
bzr revid: aag@tinyerp.co.in-20101115072327-t05wyy17bnnsuy45
2010-11-15 12:53:27 +05:30
af3c12649e
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: rpa@tinyerp.com-20101115062357-ergodyxlts4o8sek
2010-11-15 11:53:57 +05:30
010426cbe6
[MERGE] merge from trunk addons
...
bzr revid: mra@mra-laptop-20101115052533-hnl1u1l0dnuy3xsc
2010-11-15 10:55:33 +05:30
Mustufa Rangwala
qdp-launchpad@tinyerp.com
P. Christeas
mtr
Olivier Dony
rpa (Open ERP)
aag (OpenERP)
Harry (OpenERP)
rch-openerp
vro