0efec5d004
[REM]Complete services fields
...
bzr revid: dle@openerp.com-20120924130843-tpnhes50q7rryg5l
2012-09-24 15:08:43 +02:00
Cedric Snauwaert
a9d4bf30bb
[MERGE]removed some conflicts in view
...
bzr revid: csn@openerp.com-20120924130335-vvkhdz9jexcnsqrq
2012-09-24 15:03:35 +02:00
3d2607669f
[ADD][FIX]Add services logs and fix relation between driver and his vehicles
...
bzr revid: dle@openerp.com-20120924125111-7g3wheu0689pw4nv
2012-09-24 14:51:11 +02:00
5e30915ed2
[ADD]OpenChatter and replace account.invoice by a simple reference number
...
bzr revid: dle@openerp.com-20120924115739-nbpo80ugq6w0dl32
2012-09-24 13:57:39 +02:00
9d4d16263e
[ADD] Amount field for fuel log, with get_price function and associated on_change
...
bzr revid: dle@openerp.com-20120924101720-69eqj01p39irbj09
2012-09-24 12:17:20 +02:00
c94b5016a5
[ADD]Invoice link for fuel log
...
bzr revid: dle@openerp.com-20120924092048-ux61kn6howa0yaoe
2012-09-24 11:20:48 +02:00
Cedric Snauwaert
87673678ad
[RESOLVED]solved conflicts in log object and removed log type object
...
bzr revid: csn@openerp.com-20120924091426-i57amm2p6t1fskc1
2012-09-24 11:14:26 +02:00
64cc594d23
[ADD] Default value for log type and function name for vehicles
...
bzr revid: dle@openerp.com-20120924090705-ndlk3uvn7tslggny
2012-09-24 11:07:05 +02:00
Cedric Snauwaert
45e76287a2
[ADD]add some fields for fuel logs and also create the form
...
bzr revid: csn@openerp.com-20120924074239-862w7lqvkkafd48e
2012-09-24 09:42:39 +02:00
Rifakat
70f6e847f3
[FIX] stock: wrong stock accounting entries while doing return of any purchase/sales
...
Accounting entries should be reverse while doing any return
bzr revid: rha@tinyerp.com-20120924074036-0h7sybkwaegvg4tz
2012-09-24 13:10:36 +05:30
198d87ade9
[MERGE]Latest trunk
...
bzr revid: dle@openerp.com-20120924073909-pnlwh8t5h2uo55yu
2012-09-24 09:39:09 +02:00
Antony Lesuisse
d61bae80e5
[MERGE] wsgi overhaul, native arbiter, service and startup cleanups
...
add a generic wsgi entry point openrp-wsgi.py that should work for all wsgi servers (gunicorn, uwsgi, ...)
add a simple native multiprocessing arbiter option --workers=num
add limits options (cpu, memory, time) for the native aribter --limit-*
bzr revid: al@openerp.com-20120922114750-obpf7ydtupem9ke9
2012-09-22 13:47:50 +02:00
Antony Lesuisse
2fdccd40c3
fix command line installation
...
bzr revid: al@openerp.com-20120922111714-moxkguy729vout9x
2012-09-22 13:17:14 +02:00
Antony Lesuisse
ac2ad9aa84
fix deps
...
bzr revid: al@openerp.com-20120922111033-jzxjr8fpm15a3510
2012-09-22 13:10:33 +02:00
Antony Lesuisse
7833ed2137
typo
...
bzr revid: al@openerp.com-20120922105515-hk2fcc4ux5rb1xz1
2012-09-22 12:55:15 +02:00
Antony Lesuisse
4679680dba
manual merge of multicorn
...
bzr revid: al@openerp.com-20120922105107-q02ogtsfudphzkl6
2012-09-22 12:51:07 +02:00
921661b4e8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120922045750-3lynjh5pm6n6q9rb
2012-09-22 04:57:50 +00:00
Antonin Bourguignon
76c378333e
[MERGE] trunk-bug-1033687-amp: better error messages for erroneous stock locations
...
thanks to Ferdinand from Camptocamp
lp bug: https://launchpad.net/bugs/1033687 fixed
bzr revid: abo@openerp.com-20120921155724-gd9jnqlcd5br0gou
2012-09-21 17:57:24 +02:00
a4b56f7455
[ADD]Concatenate function to give Brand + model as complete name
...
bzr revid: dle@openerp.com-20120921154244-g7hv96uljkfvyevz
2012-09-21 17:42:44 +02:00
Antonin Bourguignon
9d8af665a0
[MERGE] trunk-bug-707359-amp: clearly mark a freshly duplicated analytic journal by adding '(copy)' to its name
...
also add l10n support of 'copy' to the same functionality in product.py
lp bug: https://launchpad.net/bugs/707359 fixed
bzr revid: abo@openerp.com-20120921152928-jm9b1107y3ny9qhq
2012-09-21 17:29:28 +02:00
Cedric Snauwaert
70b5da1183
[ADD]add log object for fuel, insurance, services
...
bzr revid: csn@openerp.com-20120921151022-yjp2vtpic6vl18kl
2012-09-21 17:10:22 +02:00
Antonin Bourguignon
f604d0184e
[IMP] error messages
...
also remove a useless return False (it has nothing to do there, right after a 'raise')
bzr revid: abo@openerp.com-20120921150206-unr684hzjzc123il
2012-09-21 17:02:06 +02:00
niv-openerp
e6f6c93afa
[IMP] account: Now uses a customized view to display manual reconciliations.
...
bzr revid: nicolas.vanhoren@openerp.com-20120921145235-pixrb3hqo4d19rkl
2012-09-21 16:52:35 +02:00
Cedric Snauwaert
059f36dd89
[FIX]correct bug when trying to create a new vehicle and add its log, remove the vehicle field
...
bzr revid: csn@openerp.com-20120921144744-c9h5t2dq129rt3yr
2012-09-21 16:47:44 +02:00
Antonin Bourguignon
9e370d99ce
[MERGE] trunk
...
bzr revid: abo@openerp.com-20120921144538-gs91yju7z9s1mt39
2012-09-21 16:45:38 +02:00
0582e61140
[REM]Removing of models type, versions and engine. Too much complexity.
...
bzr revid: dle@openerp.com-20120921143415-6fiuv49wanwhc75v
2012-09-21 16:34:15 +02:00
Antonin Bourguignon
009e06e547
[IMP] add l10n support for 'copy'
...
bzr revid: abo@openerp.com-20120921133924-w2i62a6tpxlfezet
2012-09-21 15:39:24 +02:00
niv-openerp
68499fbb8b
merge trunk
...
bzr revid: nicolas.vanhoren@openerp.com-20120921133748-7rfw8h8x38z2wjdp
2012-09-21 15:37:48 +02:00
niv-openerp
76d14d08fa
put back filter
...
bzr revid: nicolas.vanhoren@openerp.com-20120921133016-v006os3ecx6zuzra
2012-09-21 15:30:16 +02:00
73400dac7b
[IMP] Make term changed to version, and change of relationship between version and its model
...
bzr revid: dle@openerp.com-20120921131602-5rtzewizms4c353j
2012-09-21 15:16:02 +02:00
Antonin Bourguignon
c3a346fed0
[IMP] skip a verification on a mandatory field and add l10n support for 'copy'
...
since the analytic account's name is mandatory, it's not necessary to check whether or not it's empty
bzr revid: abo@openerp.com-20120921131424-92c5vsz3s5kzog8i
2012-09-21 15:14:24 +02:00
niv-openerp
14accccc1e
fixed bug when there is nothing to show
...
bzr revid: nicolas.vanhoren@openerp.com-20120921130816-j7hdewsxp3za3itx
2012-09-21 15:08:16 +02:00
niv-openerp
29ee985a61
detail
...
bzr revid: nicolas.vanhoren@openerp.com-20120921130318-xq1syqeehgbxtopm
2012-09-21 15:03:18 +02:00
niv-openerp
3a435b8b9a
Added last reconciliation date
...
bzr revid: nicolas.vanhoren@openerp.com-20120921125917-40q92ja21osaixrx
2012-09-21 14:59:17 +02:00
Antonin Bourguignon
3a83c2903d
[MERGE] trunk
...
bzr revid: abo@openerp.com-20120921125604-4jxe4jxlqfzx1bqc
2012-09-21 14:56:04 +02:00
Cedric Snauwaert
80b84053d9
[ADD]view for configuration menu
...
bzr revid: csn@openerp.com-20120921121237-dh09b3gh9c6b8is6
2012-09-21 14:12:37 +02:00
Cedric Snauwaert
1855301530
[ADD]add help messages to each field and removed the message field in vehicle object
...
bzr revid: csn@openerp.com-20120921113228-75qsgqfyenpzegll
2012-09-21 13:32:28 +02:00
52c00df8d2
[ADD]Add horsepower_tax field
...
bzr revid: dle@openerp.com-20120921112051-qmv79v6v0r0eumuc
2012-09-21 13:20:51 +02:00
Cedric Snauwaert
1ab5e7e100
[CORRECT]correction of the name computation field in model object
...
bzr revid: csn@openerp.com-20120921105643-j1hatbzx3odrqazo
2012-09-21 12:56:43 +02:00
niv-openerp
c63ac8ca5a
wip
...
bzr revid: nicolas.vanhoren@openerp.com-20120921101122-0jnxba0u5qtogcmm
2012-09-21 12:11:22 +02:00
bf589e6a24
[ADD]Complete model name function
...
bzr revid: dle@openerp.com-20120921095715-q3wl2w7wnemv0vc9
2012-09-21 11:57:15 +02:00
Quentin (OpenERP)
bc72e3da24
[MERGE] merged the branch that split sale and sale_stock
...
bzr revid: qdp-launchpad@openerp.com-20120921095518-leorwvtc5kppv6dz
2012-09-21 11:55:18 +02:00
Quentin (OpenERP)
69abb48428
[FIX] sale_stock: added missing argument 'context' to the signature of methods _get_line_uom() and _get_line_qty()
...
bzr revid: qdp-launchpad@openerp.com-20120921093520-q3awtbrzeqf1jfgb
2012-09-21 11:35:20 +02:00
Quentin (OpenERP)
eabcb8b14f
[FIX] sale_stock: fixed wrong type when calling super()
...
bzr revid: qdp-launchpad@openerp.com-20120921090149-cxk5a0ve5dv35evq
2012-09-21 11:01:49 +02:00
Quentin (OpenERP)
76b1702a21
[IMP] sale, sale_stock: better inheritancy for advance payment wizard
...
bzr revid: qdp-launchpad@openerp.com-20120921085908-5o2gc5mou8qys2cp
2012-09-21 10:59:08 +02:00
Fabien Pinckaers
57cf973eab
[IMP] usability
...
bzr revid: fp@tinyerp.com-20120921084250-k3vsmvgg7y4abewj
2012-09-21 10:42:50 +02:00
7f581c3193
[ADD]Year fields for vehicle model and renaming power (kW) label
...
bzr revid: dle@openerp.com-20120921083326-eciail9u934t1o81
2012-09-21 10:33:26 +02:00
05172d18d7
[ADD]Sheet style to view for models and new models fields
...
bzr revid: dle@openerp.com-20120921082825-somoslhvu78fnafg
2012-09-21 10:28:25 +02:00
Fabien Pinckaers
ba351e76b7
[IMP] usability in journal items, manual reconciliation
...
bzr revid: fp@tinyerp.com-20120921082614-br02i8b39jgh38d2
2012-09-21 10:26:14 +02:00
Quentin (OpenERP)
7a51acf204
[REF] sale, sale_stock: code refactoring to reduce the diff with trunk + some identation fixes
...
bzr revid: qdp-launchpad@openerp.com-20120921081339-njau8vv40bxn251b
2012-09-21 10:13:39 +02:00
Denis Ledoux dle@openerp.com