Commit Graph

52842 Commits

Author SHA1 Message Date
Antony Lesuisse 4040b8caa6 [IMP] testjs command
To tun the tests:

  createdb t
  /server/openerp-server --addons-path=addons,web/addons server -d t -i web_tests_demo

Once the server is ready, run, in an other shell:

  /server/openerp-server --addons-path=addons,web/addons testjs

bzr revid: al@openerp.com-20121209024810-cdi2s9ftr97x8l5p
2012-12-09 03:48:10 +01:00
Antony Lesuisse fb0ded57ff [MERGE] portal fixes groups, payments, shortcut
portal_stock has been removed from this merge, sale_order state is enough.

bzr revid: al@openerp.com-20121208230309-2rajdsjfrb5ddlch
2012-12-09 00:03:09 +01:00
Antony Lesuisse 045c04a3a2 [MERGE] trunk
bzr revid: al@openerp.com-20121208174511-a4dhw2odli43ftfp
2012-12-08 18:45:11 +01:00
Fabien Pinckaers 1645327f8d [IMP] graph dropdown menu css
bzr revid: fp@tinyerp.com-20121208173103-oq6s8gokh31f7uyh
2012-12-08 18:31:03 +01:00
Fabien Pinckaers 06b798fc5a [IMP] layout ftp config
bzr revid: fp@tinyerp.com-20121208163613-gab8j0acnz2c1iy1
2012-12-08 17:36:13 +01:00
Fabien Pinckaers 513153169a [IMP] better form view
bzr revid: fp@tinyerp.com-20121208162820-vr7spma5ldymi4rb
2012-12-08 17:28:20 +01:00
Fabien Pinckaers cce5289809 [IMP] button in MO
bzr revid: fp@tinyerp.com-20121208162724-hd9mdh64ncqn0lah
2012-12-08 17:27:24 +01:00
Fabien Pinckaers c270aa7693 [MERGE]
bzr revid: fp@tinyerp.com-20121208162456-f544eem3hs4sm8i7
2012-12-08 17:24:56 +01:00
Fabien Pinckaers dbe6afcb65 [MERGE] stock improvement in views + misc typo
bzr revid: fp@tinyerp.com-20121208162031-l29o82hcd3bw1fb5
2012-12-08 17:20:31 +01:00
Antony Lesuisse e6efcaeabc [MERGE] improve_crm_leads_flux by abo
bzr revid: al@openerp.com-20121208144139-o9zr10b7qbij48d5
2012-12-08 15:41:39 +01:00
Fabien Pinckaers 85b0acf700 [IMP] typo
bzr revid: fp@tinyerp.com-20121208143135-djb4umfk5o6jiib4
2012-12-08 15:31:35 +01:00
Fabien Pinckaers f78acc003d [IMP] purchase min qty useability
bzr revid: fp@tinyerp.com-20121208142819-zy5vn9z12aigbur0
2012-12-08 15:28:19 +01:00
Antony Lesuisse d30c3a32db crm change stupid base action rule, this will be completed in the base action rule branch
bzr revid: al@openerp.com-20121208141610-o5driggb14sx7e1s
2012-12-08 15:16:10 +01:00
Fabien Pinckaers 94d94a9d54 [IMP] implification of payment terms, it even works without balance line
bzr revid: fp@tinyerp.com-20121208135723-ori198g559b1sxsu
2012-12-08 14:57:23 +01:00
Fabien Pinckaers 56f5c12020 fix
bzr revid: fp@tinyerp.com-20121208133604-w17o1fd3gn4uxe1s
2012-12-08 14:36:04 +01:00
Fabien Pinckaers c412faac93 [IMP] better demo data for contracts
bzr revid: fp@tinyerp.com-20121208132156-njzmw57hkp8d7cdj
2012-12-08 14:21:56 +01:00
Fabien Pinckaers 01b1ee9e3f [MERGE] Misc Fixes
bzr revid: fp@tinyerp.com-20121208131449-4mly488l1o5benuw
2012-12-08 14:14:49 +01:00
Fabien Pinckaers e128f7f5d8 [MERGE] fixes + cleaning hr_evaluation
bzr revid: fp@tinyerp.com-20121208124319-wyrc3udl3mau2963
2012-12-08 13:43:19 +01:00
Fabien Pinckaers 1ba06876db [MERGE] improvements in projects
bzr revid: fp@tinyerp.com-20121208111857-9q0f7v09z2mvdu8v
2012-12-08 12:18:57 +01:00
Fabien Pinckaers 40ad98bee1 [FIX] product_id in SO line tree
bzr revid: fp@tinyerp.com-20121208110533-jnatovmnhe007y77
2012-12-08 12:05:33 +01:00
Fabien Pinckaers 5c98593604 [IMP] fields name
bzr revid: fp@tinyerp.com-20121208104558-2jr4j84go4gcemrb
2012-12-08 11:45:58 +01:00
Fabien Pinckaers fae0f2e539 [MERGE] fix account asset, event, purchase
bzr revid: fp@tinyerp.com-20121208103338-5cm3knhiaijvgks4
2012-12-08 11:33:38 +01:00
Antony Lesuisse a2508290c2 [DOC] qweb rationale
bzr revid: al@openerp.com-20121208084846-1g1oksufswazkvko
2012-12-08 09:48:46 +01:00
Antony Lesuisse 0cc0dda679 crm non translatable string
bzr revid: al@openerp.com-20121208083038-9hm7uausdmbgclc2
2012-12-08 09:30:38 +01:00
Antony Lesuisse 3fa8c94859 [MERGE] trunk
bzr revid: al@openerp.com-20121208082814-qftvqsdht91lxvcc
2012-12-08 09:28:14 +01:00
Launchpad Translations on behalf of openerp a325343c42 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121208045847-0s126yjr8uwtmumb
bzr revid: launchpad_translations_on_behalf_of_openerp-20121208045953-wihh2b6ioie9o11i
bzr revid: launchpad_translations_on_behalf_of_openerp-20121208052110-nf16120fhniyh9zh
2012-12-08 05:21:10 +00:00
Olivier Dony e7b30b164e [MERGE] Another batch of Bugfixes from 6.1
Up to 6.1 revision 6800 olt@tinyerp.com-20120516065727-ghvzjttnncj8ryj0

bzr revid: odo@openerp.com-20121207183024-adx8vnq9cytxi2lu
2012-12-07 19:30:24 +01:00
Olivier Dony f5fd0fc081 [FIX] report_webkit: fix incorrect usage of get_module_resource()
As of 7.0 get_module_resource() enforces that its first argument
should be a module name, followed by extra path components.

+ minimal lint cleanup

bzr revid: odo@openerp.com-20121207175047-ghv0ic3auq8owt0t
2012-12-07 18:50:47 +01:00
Olivier Dony ec9aceb72d [IMP] report_webkit: remove deprecated/unused lib_path for wkhtmltopdf
Replaced by autodetection on system PATH + optional
system config parameters via ir.config.parameter

bzr revid: odo@openerp.com-20121207174632-xkizj5hf83aymgxe
2012-12-07 18:46:32 +01:00
Quentin (OpenERP) 8d8a8e5185 [MERGE] staging branch
bzr revid: qdp-launchpad@openerp.com-20121207155336-n26m87wnuevqtuv4
2012-12-07 16:53:36 +01:00
niv-openerp d2863fbd59 [IMP] added "disabled" on buttons in list view during execution of asynchrnous operation
bzr revid: nicolas.vanhoren@openerp.com-20121207154640-609iwn2y093kw171
2012-12-07 16:46:40 +01:00
Raphael Collet 635d5cbf0e [REV] undo revid:rco@openerp.com-20121207124917-cy3hz9x7aymd1cdt, because a potentially better patch is in line
bzr revid: rco@openerp.com-20121207150836-vsmee753v1w6yw6j
2012-12-07 16:08:36 +01:00
Quentin (OpenERP) 87e36fb9f7 [FIX] project_timesheet: fixing the redbot
bzr revid: qdp-launchpad@openerp.com-20121207145448-2vgdjrekxt2cp4gn
2012-12-07 15:54:48 +01:00
Quentin (OpenERP) 87644c5c3d [FIX] account: traceback when opening the report 'general ledger' on a given list of account.account + fixed the fields_view_get
bzr revid: qdp-launchpad@openerp.com-20121207144317-vgm0gjf0y4iliv78
2012-12-07 15:43:17 +01:00
Quentin (OpenERP) 1626eca850 [IMP] product: set the product.uom names to be optionnaly plural, so that you can display the field after a value without having to care for the singular/plural
bzr revid: qdp-launchpad@openerp.com-20121207134110-xx0482e7kiemsl4s
2012-12-07 14:41:10 +01:00
vta vta@openerp.com e94bc89077 [MERGE] lp:~openerp-dev/openobject-addons/trunk-bug-1086918-aja
lp bug: https://launchpad.net/bugs/1086918 fixed

bzr revid: vta@openerp.com-20121207133812-0pwrkvfg3lwqwxp5
2012-12-07 14:38:12 +01:00
Quentin (OpenERP) a778faec7c [MERGE] part of addons 28: review some filters in phonecalls and account_analytic_analysis
bzr revid: qdp-launchpad@openerp.com-20121207133010-ma7a32po5om13blr
2012-12-07 14:30:10 +01:00
vta vta@openerp.com 95fbdf24a8 [MERGE] lp:~openerp-dev/openobject-addons/trunk-bug-1076374-hip
lp bug: https://launchpad.net/bugs/1076374 fixed

bzr revid: vta@openerp.com-20121207131155-syrjgyf497g85hko
2012-12-07 14:11:55 +01:00
Quentin (OpenERP) c082f008ac [MERGE] removal of 'mark as read/unread' actions
bzr revid: qdp-launchpad@openerp.com-20121207130808-kdxocx9pdi2a47d7
2012-12-07 14:08:08 +01:00
Quentin (OpenERP) 2764525127 [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121207125706-zva1ub193qqkqyja
2012-12-07 13:57:06 +01:00
Raphael Collet 68e94d2f61 [MERGE] lp:~vrt-openerp/openobject-addons/trunk-bug-932584 (manage working times as local times)
bzr revid: rco@openerp.com-20121207124917-cy3hz9x7aymd1cdt
2012-12-07 13:49:17 +01:00
vta vta@openerp.com 22f6caef4f [MERGE] lp:~openerp-dev/openobject-addons/trunk-bug-1085017-psa
lp bug: https://launchpad.net/bugs/1085017 fixed

bzr revid: vta@openerp.com-20121207124501-glhnaqon2tv7af22
2012-12-07 13:45:01 +01:00
Raphael Collet aff07dfa3b [IMP] resource: improve code that computes working hours in local times
bzr revid: rco@openerp.com-20121207122351-eitc7zej6ss2035j
2012-12-07 13:23:51 +01:00
Raphael Collet 6ed367c093 [IMP] resource: small code improvements
bzr revid: rco@openerp.com-20121207121925-ju6mdv66k4zsw5yk
2012-12-07 13:19:25 +01:00
Tejas Tank 43d209104a [FIX] Corrected latest merge issue, For fleet.
bzr revid: tta@openerp.com-20121207115818-ycyrswd38ybtdn9j
2012-12-07 16:58:18 +05:00
vta vta@openerp.com c9a64c1735 [FIX] web_shortcuts issue when anonymous user
bzr revid: vta@openerp.com-20121207113153-unndur6iiwdqnxip
2012-12-07 12:31:53 +01:00
Tejas Tank 392f1913f3 Merged Latest.
bzr revid: tta@openerp.com-20121207112002-jtes7j1er6leyd89
2012-12-07 16:20:02 +05:00
Xavier Morel 58e256093d [FIX] board: missed JS-ification of context and domains evaluations
various contexts and domains would remain unevaluated during the loading of board actions, leading to errors down the line

bzr revid: xmo@openerp.com-20121207104933-p1fmog7ohljs9wfc
2012-12-07 11:49:33 +01:00
Arnaud Pineux 4defeed889 [MERGE] with purchase_double_validation fix
bzr revid: api@openerp.com-20121207103057-zkb3tzec7yopuwcl
2012-12-07 11:30:57 +01:00
Raphael Collet ecd2cd1e05 [IMP] resource: improve conversion function hours (float) -> datetime.time
bzr revid: rco@openerp.com-20121207102718-jxojya78wnb8jmgc
2012-12-07 11:27:18 +01:00