Commit Graph
103218 Commits
Author SHA1 Message Date
Darshan Kalola (OpenERP) ba7b273b18 [MERGE]sync with trunk.
bzr revid: dka@tinyerp.com-20140225045320-e2ukd1snv3yfls0r
2014-02-25 10:23:20 +05:30
Darshan Kalola (OpenERP) 7dc413070c [IMP]mail_follower:closed dropdown when there is no child element in ul.
bzr revid: dka@tinyerp.com-20140225045142-fg6qbnlvl4ylys0k
2014-02-25 10:21:42 +05:30
Kersten Jeremy 2907c8dd66 [TYPO] PEP7 - Module calendar (no E501)
bzr revid: jke@openerp.com-20140224220222-dp26lvbv2bfljxvt
2014-02-24 23:02:22 +01:00
Frédéric van der Essen 4dd0d7c524 [MERGE] hw_proxy: improvements to the posbox documentation
bzr revid: fva@openerp.com-20140224172856-ku0tedluscdzvkjz
2014-02-24 18:28:56 +01:00
Frédéric van der Essen 0368f23b1e [MERGE] from trunk
bzr revid: fva@openerp.com-20140224172822-ehn3xeb7rb1xro07
2014-02-24 18:28:22 +01:00
Frédéric van der Essen b2c89c22bf [IMP] hw_proxy: adding a few troubleshoot info to the manual + add the compiled pdf version to the repo
bzr revid: fva@openerp.com-20140224172547-diov3ubpfspmdfvy
2014-02-24 18:25:47 +01:00
Christophe Simonis cde82643d0 [MERGE] point of sale fixes
bzr revid: chs@openerp.com-20140224172113-gj1t8hi7a8hr60gq
2014-02-24 18:21:13 +01:00
Simon Lejeune 1cf57507c0 [IMP] Added a button on the ir.actions.report.xml form view to allow direct access of the QWeb views associated and edit them
bzr revid: sle@openerp.com-20140224170839-7nqv07vp1tx5ou38
2014-02-24 18:08:39 +01:00
Xavier Morel 198640434f [FIX] injected views need branding distribution too
forgot to set it up after installed injected view skipping during distribution of injectee

bzr revid: xmo@openerp.com-20140224170301-b4ta04zqsd5d2956
2014-02-24 18:03:01 +01:00
Frédéric van der Essen 5c08f38a1b [FIXME] deactivated failed tests to make the runbot green again
bzr revid: fva@openerp.com-20140224164321-7631d3uqu2r2zqyw
2014-02-24 17:43:21 +01:00
Martin Trigaux 4d95d8bf03 [MERGE] [FIX] models: do not drop low level columns (aka 'magic columns') when deleting ir.model.fields
Without this fix, uninstalling modules using id, create_date,... in their field declaration while inheriting from existing module would drop these columns

bzr revid: mat@openerp.com-20140224162512-i5ay1jv7k8lan2rv
2014-02-24 17:25:12 +01:00
Christophe Matthieu 73853f0744 [IMP] website_sale: checkout_values, checkout_parse and checkout_form_validate
bzr revid: chm@openerp.com-20140224162041-rii00m5hs1e4jadz
2014-02-24 17:20:41 +01:00
Martin Trigaux b9f72dae74 [FIX] orm: do not drop low level columns (aka 'magic columns') when deleting ir.model.fields
lp bug: https://launchpad.net/bugs/1262150 fixed

bzr revid: mat@openerp.com-20140224161918-9pe1x3jeno8t82p1
2014-02-24 17:19:18 +01:00
Quentin (OpenERP) 45aae002ea [MERGE] stock: recompute quantities reordered
bzr revid: qdp-launchpad@openerp.com-20140224161916-ctbnvw83aui3t3f6
2014-02-24 17:19:16 +01:00
Frédéric van der Essen c1d5d858eb [MERGE] from upstream
bzr revid: fva@openerp.com-20140224160909-ezk3re38imtq2eo1
2014-02-24 17:09:09 +01:00
Frédéric van der Essen 3d4f063e51 [FIX] point_of_sale: accept ean13 barcodes with a stripped leading zero
bzr revid: fva@openerp.com-20140224160118-44bnm5kxs53n6siy
2014-02-24 17:01:18 +01:00
Quentin (OpenERP) 762248f8d7 [FIX] stock: packing yaml tests fixed
bzr revid: qdp-launchpad@openerp.com-20140224153755-m9n1efw5h8c2ihgf
2014-02-24 16:37:55 +01:00
Josse Colpaert 23d5154e33 [IMP] Check UoM category move of move
bzr revid: jco@openerp.com-20140224152956-kvwuo0mozpwnwwks
2014-02-24 16:29:56 +01:00
Simon Lejeune d64c4a3f17 [FIX] mrp: removed empty files and barcode controller value set to path in order to be able to receive URL
bzr revid: sle@openerp.com-20140224151944-dqi63kjvyejp6xja
2014-02-24 16:19:44 +01:00
Josse Colpaert 07276fbed6 [IMP] Remove check location of quant
bzr revid: jco@openerp.com-20140224151030-f5mn5uocjvpa47hh
2014-02-24 16:10:30 +01:00
Frédéric van der Essen 8d5398d661 [FIX] point_of_sale: if an order fails to mark as PAID, leave it at NEW so that the pos client can process new orders. The error has to be manually corrected by the user before session closing
bzr revid: fva@openerp.com-20140224150830-5uddv7i1djff2aip
2014-02-24 16:08:30 +01:00
Josse Colpaert 3bb1e2d64d [IMP] Check purchase order line in reception to invoice
bzr revid: jco@openerp.com-20140224144835-0zvnrjv2dftf6vhg
2014-02-24 15:48:35 +01:00
Frédéric van der Essen 95f2c5537d [IMP] point_of_sale: make the order flush timeout dependant on the number of orders to be flushed
bzr revid: fva@openerp.com-20140224144143-4fhlswjk2y4skd6j
2014-02-24 15:41:43 +01:00
Christophe Matthieu 055f73322d [FIX] website: 'window.location.origin' is not found in IE browser thats why generated manually.
bzr revid: chm@openerp.com-20140224143828-wq1k4931lmmm8leh
2014-02-24 15:38:28 +01:00
Christophe Matthieu 60c75d38bf [FIX] website placeholder; website_hr_recruitment required for ie
bzr revid: chm@openerp.com-20140224142751-7bolxomy2nc717w0
2014-02-24 15:27:51 +01:00
Thibault Delavallée dd99c96ca2 [CLEAN] mail: some code cleaning in the modifications
bzr revid: tde@openerp.com-20140224142236-l61eqddc4vq9y861
2014-02-24 15:22:36 +01:00
Quentin (OpenERP) 96ffae6e63 [FIX] stock: typos
bzr revid: qdp-launchpad@openerp.com-20140224140512-2r4ogs6ku1frtp3c
2014-02-24 15:05:12 +01:00
Frédéric van der Essen 31cb4b8423 [MERGE] from upstream
bzr revid: fva@openerp.com-20140224135038-3l6p5ebb5klmw8yr
2014-02-24 14:50:38 +01:00
Thibault Delavallée 47b1500c4b [CLEAN] email_template: cleaned modified code to lessen the diff
bzr revid: tde@openerp.com-20140224135008-b43mf3fqw0ib13r6
2014-02-24 14:50:08 +01:00
Simon Lejeune 901172a194 [FIX] Workaround to get printing done with 1 worker
bzr revid: sle@openerp.com-20140224134732-imptqwtzyoyml2qq
2014-02-24 14:47:32 +01:00
Josse Colpaert ed978bb905 [IMP] Only check pickings of purchases when state goes to done and optimize query
bzr revid: jco@openerp.com-20140224134126-jmk38b3gxtvbh1ru
2014-02-24 14:41:26 +01:00
Mahendra Barad (OpenERP) eb30747335 [IMP]improved animation for drodown
bzr revid: mba@tinyerp.com-20140224133959-idr1pqp5imhudldv
2014-02-24 19:09:59 +05:30
Quentin (OpenERP) f003be4fea [MERGE] merged the branch of jco with usability improvement (option to use packages split apart from use of serial numbers)
bzr revid: qdp-launchpad@openerp.com-20140224132812-ehi91z8nbdm2jg83
2014-02-24 14:28:12 +01:00
Thibault Delavallée 2641d09c79 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140224132100-w9pw5z32hz41mqcw
2014-02-24 14:21:00 +01:00
Thibault Delavallée 4739eb138b [IMP] mail, email_template: still continuing work to improve performances of mass mailing.
main differences :
- record_name is not a function field anymore, but a char field + a method in create
if not given (default-like, but dependent of other values). This allows the composer
to give a value for record_name (False for email mass mailing) to avoid browsing
records and having their access rights issues in the way
- author_id, email_from coming from composer instead of called in every mail.message
creation
- moved code dealing with attachments from send_mail to get_mail-values, to that at
the end of this method we know all values of the email

Some tests have been updated / temporarily disabled.

bzr revid: tde@openerp.com-20140224132038-txdi0g30a7fzbnxp
2014-02-24 14:20:38 +01:00
Quentin (OpenERP) 8a7d139a41 [FIX] stock: fixed errors introduced during merge with trunk-wms
bzr revid: qdp-launchpad@openerp.com-20140224131918-azyc8y3eonqafxdm
2014-02-24 14:19:18 +01:00
Turkesh Patel (Open ERP) d183eae422 [IMP] improved code to show total questions and improved domain show perfect values in pager
bzr revid: tpa@tinyerp.com-20140224123644-2b9rm5zl14u0vkii
2014-02-24 18:06:44 +05:30
Turkesh Patel (Open ERP) d2c447c80f [ADD] added pager in bottom of list
bzr revid: tpa@tinyerp.com-20140224122726-g87zfwm5jlq5k2dc
2014-02-24 17:57:26 +05:30
ajay javiya (OpenERP) 1e9664d74c [IMP]: code
bzr revid: aja@tinyerp.com-20140224121420-fdq7ht4j0syxjqir
2014-02-24 17:44:20 +05:30
Thibault Delavallée bff00ec6df [FIX] res_partner: avoid duplicating users when duplicating partners, because
I think your database wil hate you.

bzr revid: tde@openerp.com-20140224121004-lgy2rsszsomy7mji
2014-02-24 13:10:04 +01:00
Mahendra Barad (OpenERP) 20a50c791c [REV]remove unwanted changes
bzr revid: mba@tinyerp.com-20140224120826-s7m08sljp5mhrqke
2014-02-24 17:38:26 +05:30
Simon Lejeune 5557a1152c [IMP] Report controller: little changes to get the barcode route working with reportlab 2.5
bzr revid: sle@openerp.com-20140224120749-nlg3n95vgghxv63y
2014-02-24 13:07:49 +01:00
Turkesh Patel (Open ERP) 45f6505bce [IMP] improved template names
bzr revid: tpa@tinyerp.com-20140224113300-9teri24n3xjitwpn
2014-02-24 17:03:00 +05:30
Darshan Kalola (OpenERP) a2cbf7ee1b [MERGE]sync with trunk.
bzr revid: dka@tinyerp.com-20140224112504-3b0f36x0nw3rmj7e
2014-02-24 16:55:04 +05:30
Josse Colpaert 18b02ee71e [IMP] Change store = True of product_qty of move
bzr revid: jco@openerp.com-20140224112437-if4nkqaj9balf580
2014-02-24 12:24:37 +01:00
Quentin (OpenERP) 9df9382f12 [REF] stock: refactoring made during code review
bzr revid: qdp-launchpad@openerp.com-20140224112112-go4uj37htcv3zo4k
2014-02-24 12:21:12 +01:00
Quentin (OpenERP) 9d41bcbc3a [MERGE] trunk-wms
bzr revid: qdp-launchpad@openerp.com-20140224112005-a7kww6t880xuvz9t
2014-02-24 12:20:05 +01:00
Turkesh Patel (Open ERP) f6cd4a3d67 [IMP] add template for shorting.
bzr revid: tpa@tinyerp.com-20140224111927-bqmdjd5fyhev30k3
2014-02-24 16:49:27 +05:30
Mahendra Barad (OpenERP) 8a95bef8df [IMP]resolve conflict
bzr revid: mba@tinyerp.com-20140224111118-ckxktrew1da6qh9n
2014-02-24 16:41:18 +05:30
Gery Debongnie f94f50c7e8 [FIX] fixes a crash caused by incorrect use of date/datetime fields of the form 'date:interval': the list view in some case tried to format the strings as a date, and it could not parse it.
lp bug: https://launchpad.net/bugs/1279382 fixed

bzr revid: ged@openerp.com-20140224110554-y007810prx7qg5yi
2014-02-24 12:05:54 +01:00