Commit Graph
83232 Commits
Author SHA1 Message Date
Quentin (OpenERP) 9f29618b46 [MERGE] stock: procurement created from orderpoint now correclty set the warehouse
lp bug: https://launchpad.net/bugs/1273316 fixed

bzr revid: qdp-launchpad@openerp.com-20140130082646-hd50ajhhsc98eg5s
2014-01-30 09:26:46 +01:00
Quentin (OpenERP) 5ee4aff11a [MERGE] stock: fixed graph view of quants
lp bug: https://launchpad.net/bugs/1274023 fixed

bzr revid: qdp-launchpad@openerp.com-20140130082241-2aufxukcddkiwimp
2014-01-30 09:22:41 +01:00
Quentin (OpenERP) f6c7d86566 [MERGE] stock: fixed flows with negative quantities in inventory
lp bug: https://launchpad.net/bugs/1271244 fixed

bzr revid: qdp-launchpad@openerp.com-20140130080835-wn3u27sgt1y06kl3
2014-01-30 09:08:35 +01:00
Quentin (OpenERP) 15dc06788f [FIX] stock: merge prop correction
bzr revid: qdp-launchpad@openerp.com-20140130080713-uf4onnuvto9mnlyc
2014-01-30 09:07:13 +01:00
Quentin (OpenERP) 5729de6a62 [MERGE] trunk-wms
bzr revid: qdp-launchpad@openerp.com-20140130080603-bew8zegu609d7rdi
2014-01-30 09:06:03 +01:00
Antony Lesuisse ec45bc96f9 [IMP] safe_eval add int float range, rename public user
bzr revid: al@openerp.com-20140130034238-qlgbu41d7mg9ns6i
2014-01-30 04:42:38 +01:00
Christophe Simonis ec14f457c1 [FIX] website_event: correct ui test
bzr revid: chs@openerp.com-20140129213621-ynbxys4hmw0avhaw
2014-01-29 22:36:21 +01:00
Christophe Simonis 3d80e31012 [FIX] website: url_for() does not mess up anchor links
bzr revid: chs@openerp.com-20140129195025-i2ey682o6marp8k1
2014-01-29 20:50:25 +01:00
Christophe Simonis c202dc1c52 merge upstream
bzr revid: chs@openerp.com-20140129190834-xfcat3ulfbg5omhn
2014-01-29 20:08:34 +01:00
Christophe Simonis 947fe0da24 [FIX] calendar: use correct xmlid
bzr revid: chs@openerp.com-20140129185229-d75g5fsv77468tih
2014-01-29 19:52:29 +01:00
Christophe Simonis 731019154a [MERGE] forward port of branch saas-2 up to revid 9109 dle@openerp.com-20140129171022-wf6244k90lpncmah
bzr revid: chs@openerp.com-20140129184703-ypd7iqnor5m5lr3d
2014-01-29 19:47:03 +01:00
Olivier Dony 3d1b879049 [IMP] qweb.render: t-esc/t-raw rendered as False or None replaced by empty strings
bzr revid: odo@openerp.com-20140129180600-0c155g520gpvnqqf
2014-01-29 19:06:00 +01:00
Christophe Matthieu 55fdaf0dd0 [FIX] website_sale: activate test tour
bzr revid: chm@openerp.com-20140129175038-663iuxiv0os6f9xt
2014-01-29 18:50:38 +01:00
Christophe Simonis 958ecb84b0 [FIX] ir.model.data: correct cache clearing
bzr revid: chs@openerp.com-20140129172949-tmwd17c2ofsqj94t
2014-01-29 18:29:49 +01:00
Martin Trigaux a27251fbda [MERGE] [FIX] account_voucher: forward port of fixes from 6.1 (rev 6966)
When importing invoices to a bank statement the bank statement lines are created with statement date instead of today
Set the date on the created voucher in the same wizard to the statement date instead of invoice date (problematic if different period)
When creating the account moves (at bank statement confirmation), make sur the date and period of the vouncher are synchronised

bzr revid: mat@openerp.com-20140129172009-vbp5n1nco51kaly8
2014-01-29 18:20:09 +01:00
Fabien Meghazi 04a52645c0 [REM] auth="admin" removed
bzr revid: fme@openerp.com-20140129171933-e61qp9p5xfdwyw89
2014-01-29 18:19:33 +01:00
Denis Ledoux 255fe082bd [FIX] website_membership: membership displayed order depending on website_sequence
bzr revid: dle@openerp.com-20140129171554-h76n4579xquhdxxv
2014-01-29 18:15:54 +01:00
Fabien Meghazi c4e48e2388 [REM] Removed auth='admin' from modules
bzr revid: fme@openerp.com-20140129171520-wkz8ot4pa63utoi3
2014-01-29 18:15:20 +01:00
Christophe Matthieu d546e0db2f [fIX] ir_qweb: fix groups inside t-call (use request.cr and request.uid and don't use None, None)
bzr revid: chm@openerp.com-20140129171138-zwuj2vyzu7l853np
2014-01-29 18:11:38 +01:00
Denis Ledoux 6cc096aebc [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9798 revid:dle@openerp.com-20140129163238-1s1t9oc814z4z7f3
bzr revid: dle@openerp.com-20140129171022-wf6244k90lpncmah
2014-01-29 18:10:22 +01:00
Olivier Dony e6e8bb3789 [IMP] website_*: remove useless % chars surrounding ilike operand, this is the default
bzr revid: odo@openerp.com-20140129163557-0bb86mx8it57mcvi
2014-01-29 17:35:57 +01:00
Frédéric van der Essen 64822bd188 [MERGE] hw_escpos: moving list of supported printers to a separate file
bzr revid: fva@openerp.com-20140129163503-tvd69qd5u5nktjb9
2014-01-29 17:35:03 +01:00
Frédéric van der Essen d88b10fd07 [IMP] hw_escpos: moved list of supported printers to a separate file
bzr revid: fva@openerp.com-20140129163259-xdarcaw4qcqprvt6
2014-01-29 17:32:59 +01:00
Denis Ledoux 08dfda9ec6 [FIX] purchase: on po confirm, avoid to write location_id on the chained stock move if the move is done
On purchase order confirmation, if the order_line comes from a procurement order created by a sale order,
it tried to write on the location_id, whatever the move state was, even done.

Or, sometimes, the stock move associated to the procurement order (from the so) was already done, for example because we forced the availability of the stock move.
It makes sense to not write the location_id if the move is already done, because the location_id is already good.

bzr revid: dle@openerp.com-20140129163238-1s1t9oc814z4z7f3
2014-01-29 17:32:38 +01:00
Olivier Dony a09fa10c49 [FIX] website_mail: useless and expensive DISTINCT
bzr revid: odo@openerp.com-20140129162532-os3lzjyf87hg1ouc
2014-01-29 17:25:32 +01:00
Olivier Dony 0ac11b430f [IMP] website_sale: spellchecking
bzr revid: odo@openerp.com-20140129162331-sjmquzz172h9dkp4
2014-01-29 17:23:31 +01:00
Christophe Matthieu b7f88a58fb [FIX] website:_mail: fix followers
bzr revid: chm@openerp.com-20140129170829-abmv73xswzl6ccm9
2014-01-29 18:08:29 +01:00
Antony Lesuisse 632c014b76 [FIX] fix werkzeug dependency on debian, misc changes
- add an more friendly syntax for images /website/image/<model>/<id>/<field>
- reorder methods based on their use case
- move new page to /website namespace

bzr revid: al@openerp.com-20140129163809-d4z4f8t3h11n5ozv
2014-01-29 17:38:09 +01:00
Frédéric van der Essen 83196be65e [MERGE] from trunk
bzr revid: fva@openerp.com-20140129161802-14patbv206pqj68j
2014-01-29 17:18:02 +01:00
Christophe Matthieu 499f9164b8 [FIX] website: tour banner
bzr revid: chm@openerp.com-20140129161434-s5razyi3eqeq30vn
2014-01-29 17:14:34 +01:00
Christophe Matthieu 876b61f42c [FIX] website: test tour and website_sale tour. Add ajax trigger to display popover when the ajax is complete and hmlt is loaded
bzr revid: chm@openerp.com-20140129160839-ijdcnuiny6ys8z6p
2014-01-29 17:08:39 +01:00
Gery Debongnie d07bb7e870 [IMP] improves the reporting view Asset Analysis in accounting module (adds some relevent measures to the pivot table) (addon account_asset)
bzr revid: ged@openerp.com-20140129160709-t5e4c9h91y0jug6e
2014-01-29 17:07:09 +01:00
Gery Debongnie 4b3076e955 [IMP] improves the reporting views in account module (work on the Pivot tables, and remove some useless day/month/year attributes) (addon account)
bzr revid: ged@openerp.com-20140129160348-230nvcutbdqh1hx1
2014-01-29 17:03:48 +01:00
Josse Colpaert e89b9b8539 [WIP] Take into account already returned moves
bzr revid: jco@openerp.com-20140129155638-q9nfmm728y2l03ae
2014-01-29 16:56:38 +01:00
Fabien Meghazi f31ddba8b3 [MERGE] upstream
bzr revid: fme@openerp.com-20140129153718-b86vsyogxkr8lk19
2014-01-29 16:37:18 +01:00
Fabien Meghazi 9860ddd352 [REM] POS: Replaced auth="admin" by auth="none"
bzr revid: fme@openerp.com-20140129153408-d8zkyty1rcvvzqx3
2014-01-29 16:34:08 +01:00
Gery Debongnie 906f28109c [IMP] improves the task analysis reporting view by adding measures to the pivot table (num paid) and changes the view in dashboard project (addon project)
bzr revid: ged@openerp.com-20140129152440-ibi9ity10onbi3st
2014-01-29 16:24:40 +01:00
openerp-sle be6b038fb7 [FIX] website_customer: removed redundant template 'customer_contact', fixed the country-filtering and avoid showing 'false' when partner has not website_short_description
bzr revid: openerp-sle@openerp-sle.home-20140129150838-pj9hmexxl3sk89tp
2014-01-29 16:08:38 +01:00
Fabien Meghazi 07235017aa [REM] Remove single auth="admin" left
bzr revid: fme@openerp.com-20140129144623-a8fy4xx3hmvcww0j
2014-01-29 15:46:23 +01:00
Gery Debongnie 8dba681c69 [IMP] improves the membership reporting view by adding a measure to the pivot table (num paid) (addon membership)
bzr revid: ged@openerp.com-20140129144233-4flp69bq188kdy05
2014-01-29 15:42:33 +01:00
Gery Debongnie ddc1d840e7 [IMP] improves the Work Order Analysis reporting view, removes old Day, Month, Year field from the postgres view (addon mrp_operations)
bzr revid: ged@openerp.com-20140129143055-2qtivjtkpzyb13zw
2014-01-29 15:30:55 +01:00
Cedric Snauwaert ab0a42756f [FIX]orderpoint: when running scheduler, newly create procurement didn't had information about orderpoint warehouse
lp bug: https://launchpad.net/bugs/1273316 fixed

bzr revid: csn@openerp.com-20140129142613-zg3ysaklhf1r33w6
2014-01-29 15:26:13 +01:00
openerp-sle 4183310021 [FIX] website_blog: correct comments anchors
bzr revid: openerp-sle@openerp-sle.home-20140129142034-6hl5s3vfzi5nuozj
2014-01-29 15:20:34 +01:00
Martin Trigaux 3a07e0a012 [FIX] attachement: display error message (removed inexistant template) and redraw the window (to avoid getting stucked)
bzr revid: mat@openerp.com-20140129141438-3883hhzdiwyoo19t
2014-01-29 15:14:38 +01:00
Christophe Simonis 378c908d4c [MERGE] forward port of branch saas-2 up to revid 5006 chs@openerp.com-20140129140159-9vwkpr078shoonum
bzr revid: chs@openerp.com-20140129094847-4rsg0kjio0ed0rjk
bzr revid: chs@openerp.com-20140129141002-4p8fttm8ii0ogsse
2014-01-29 15:10:02 +01:00
Denis Ledoux a3b7279ff6 [FIX] account: set purchase analytic journal when creating purchase accounting journal
bzr revid: dle@openerp.com-20140129140625-ywxraf0ix040a0b5
2014-01-29 15:06:25 +01:00
Frédéric van der Essen 1f2900aa7c [MERGE] point_of_sale: regression fix
bzr revid: fva@openerp.com-20140129133339-myxow8s1jyppg3zp
bzr revid: fva@openerp.com-20140129140026-87ehph86jx9ya263
2014-01-29 15:00:26 +01:00
Cedric Snauwaert f2d62ab2a4 [FIX]stock_warehouse: raise of error for default_resupply_id != warehouse_id should not be in a sql_constraint since it will not rollback the creation of routes.
lp bug: https://launchpad.net/bugs/1273591 fixed

bzr revid: csn@openerp.com-20140129140005-efomi7gdmcf1pi1q
2014-01-29 15:00:05 +01:00
Frédéric van der Essen 4e73dce8d3 [FIX] point_of_sale: loading screen was not waiting until posbox connection
bzr revid: fva@openerp.com-20140129135710-vobqzjyq12d7io3v
2014-01-29 14:57:10 +01:00
Gery Debongnie 23f4aca0a8 [IMP] improves the Reception Analysis reporting view, removes old Day, Month, Year field from the postgres view and updates the dashboard graph view (addon stock)
bzr revid: ged@openerp.com-20140129135519-uo98mu24qy2h29pq
2014-01-29 14:55:19 +01:00