pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,391 Commits 1 Branch 0 Tags
92b8aafe97d94deacb06b37503a05d80b25dbba8
Commit Graph
81391 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ajay javiya (OpenERP) 9fe226b6ce [IMP]: validation 
bzr revid: aja@tinyerp.com-20140124122929-aakyqkzqus87c4ql
 2014-01-24 17:59:29 +05:30
Gery Debongnie 3d6a575d03 [IMP] changes the crm_lead graph view in reporting, to use the new groupby interval features of graph view (addon crm) 
bzr revid: ged@openerp.com-20140124122439-t8vvgy9zebbhhy2a
 2014-01-24 13:24:39 +01:00
Thibault Delavallée 5758e729ce [REM] payment_*: removed unnecessary doc directories 
bzr revid: tde@openerp.com-20140124121646-1j6pbc9nmlvis443
 2014-01-24 13:16:46 +01:00
Denis Ledoux 1fb1a6f2af [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9789 revid:dle@openerp.com-20140124120102-we2yxio553ws2yz4 
bzr revid: dle@openerp.com-20140120174449-tui0a24zgn9bien2
bzr revid: dle@openerp.com-20140121125538-ke7i6kaz486hwgl8
bzr revid: dle@openerp.com-20140122134115-0ogjemlqe327xoac
bzr revid: dle@openerp.com-20140123103655-mf2zslfbgue97ed2
bzr revid: dle@openerp.com-20140124121027-uk9zy4dx9tqlsblr
 2014-01-24 13:10:27 +01:00
Thibault Delavallée 43deedcdf6 [MERGE] Sync with website-al 
bzr revid: tde@openerp.com-20140124120925-gyysjhkokizynsd8
 2014-01-24 13:09:25 +01:00
Thibault Delavallée e93a3b1880 [MERGE] [ADD] product_email_template new module. It allows ot send template-based emails when validating invoices. This allows to send description, user guides, technical datasheets, ... when selling products. 
product_template inheritance: added email_template_id field, link to an optional email.template

invoice inheritance: when validating the invoice, send an email for each product that has a linked email.template.

email_template inheritance: defined a new simplified form view with only attachment_ids and body, to ease the quick edition of email templates. This simplified form view is used for the email_template_id field on the product.template form view.

email_template: when having default_model in default_get, use it to prefetch model_id. Indeed model is a related file, we have to redirect its default to the right model_id field.

bzr revid: tde@openerp.com-20140124120652-vxp0jwf14sl1frme
 2014-01-24 13:06:52 +01:00
Denis Ledoux 83677ed6e6 [REVERT] 9401 dle@openerp.com-20130830125155-1vedifnupu2xvth7 
This had as side-effect to not allow splitting BOMs
(a manufacturing order for 1 unit of a BOM producing 10 units consumed the lines like it was 10 units, not 1)

This fix was to avoid having a fraction of a unit (for instance, 0.5 unit).

But, finally, it is preferable to allow splitting units:
1. Most users do not use several uoms, and in this case, the unit is the default uom (hidden).
2. At the moment, it is allowed to ask a manufacturing order splitting up the unit uom
(It is allowed to ask the production of 0.5 USB Adapter, for instance)
Thus, we should allow the splitting up of the unit uom in the lines too.

bzr revid: dle@openerp.com-20140124120102-we2yxio553ws2yz4
 2014-01-24 13:01:02 +01:00
Christophe Matthieu 6f859860e9 [FIX] website_sale_delivery: don't raise (for the website customer) if they are no carrier; return true if they aren't need of carrier or if the carrier is good 
bzr revid: chm@openerp.com-20140124115723-nblyb3qknxym9817
 2014-01-24 12:57:23 +01:00
Thibault Delavallée b845b708af [CLEAN] email_template: cleaned code 
bzr revid: tde@openerp.com-20140124114743-m6s8d1byabl78l63
 2014-01-24 12:47:43 +01:00
Christophe Matthieu 33eeff4448 [IMP] website_crm, website_sale: add a Website sale team and new lead and order to this sale team 
[FIX] website_sale: remove auto assignation to administrator from website lead and order

bzr revid: chm@openerp.com-20140124114224-w80wd2ea0bx20ldk
 2014-01-24 12:42:24 +01:00
Thibault Delavallée 5d17667bb1 [RENAME] account_product_template -> product_email_template, to avoid 
confusion with product templates. The main feature are email template on product
therefore renaming the module.

bzr revid: tde@openerp.com-20140124110802-unn4u75ad4jt0bb2
 2014-01-24 12:08:02 +01:00
ddm@openerp.com cc978e1490 [FIX] event tour edit 
bzr revid: ddm@openerp.com-20140124110552-ai7bfobl72n97bz1
 2014-01-24 12:05:52 +01:00
Thibault Delavallée c98acc4919 [CLEAN] account_product_template: cleaned demo data 
bzr revid: tde@openerp.com-20140124110510-k1czgon57idv4hct
 2014-01-24 12:05:10 +01:00
Thibault Delavallée e374abeba6 [FIX] account_product_template: handle attachments of the template. 
bzr revid: tde@openerp.com-20140124110012-lpf79nvmcqjhzuvv
 2014-01-24 12:00:12 +01:00
Thibault Delavallée 9478019191 [IMP] account_product_template: cleaned code of email sending. 
Now based on a composer, trigerring the onchange with the template, then
sending the email. This replicates the email sending with the composer using
a template.
TODO: fix attachments not being send

bzr revid: tde@openerp.com-20140124105406-09gndxy3izhdyq2n
 2014-01-24 11:54:06 +01:00
Thibault Delavallée 79b36c68ee [IMP] account_product_template: improved 
email template simplified form view

bzr revid: tde@openerp.com-20140124105214-i0fgxj2ibwgezqau
 2014-01-24 11:52:14 +01:00
Thibault Delavallée a5b8a1b3db [CLEAN] account_product_template: some cleaning for eadability 
bzr revid: tde@openerp.com-20140124105150-xg8r52n6vpxg807t
 2014-01-24 11:51:50 +01:00
Frédéric van der Essen 8bfc149e7b [MERGE] point_of_sale: further point of sale and hardware integration improvements 
bzr revid: fva@openerp.com-20140124105115-uxalr0xt52zzhd5t
 2014-01-24 11:51:15 +01:00
Fabien Meghazi 15c1d052e3 [IMP] Ensure slug validity otherwise redirect 
bzr revid: fme@openerp.com-20140124104610-lzsomdyl10ens0av
 2014-01-24 11:46:10 +01:00
Fabien Meghazi 2b6ac77f11 [IMP] move dispatch()'s post processing code into a method 
bzr revid: fme@openerp.com-20140124103546-h8an7dehqdc412cn
 2014-01-24 11:35:46 +01:00
ajay javiya (OpenERP) 898d888209 [REM]: unwanted code 
bzr revid: aja@tinyerp.com-20140124102500-vs4ix1vlcjgqlqj7
 2014-01-24 15:55:00 +05:30
Thibault Delavallée 0d21e37728 [CLEAN] account_product_template: moved email sending into its own method. 
bzr revid: tde@openerp.com-20140124102201-dkh2n7odwxvg4lsv
 2014-01-24 11:22:01 +01:00
Thibault Delavallée b187d1873f [CLEAN] account_product_template: added help and docstrings in the product template inheritance 
bzr revid: tde@openerp.com-20140124102031-9gyq19ehxgtdvxxz
 2014-01-24 11:20:31 +01:00
Gery Debongnie 09706b5dff [IMP] adds 'W' in front of the week number when formatting date grouped by weeks (method read_group) (orm.py) 
bzr revid: ged@openerp.com-20140124100921-w5gq1fwidm01xx5l
 2014-01-24 11:09:21 +01:00
Thibault Delavallée ee692b43e2 [REF] account_product_template: reorganized the module, according to the 
new module guildelines :
- model files in model directory, with product and template addition
- view files in views directory, with product and template view addition
- demo file in data directory

bzr revid: tde@openerp.com-20140124095056-v18lfk9wex5y00d7
 2014-01-24 10:50:56 +01:00
Thibault Delavallée c9260b90a8 [CLEAN] account_product_template: openerp and init files cleaning 
bzr revid: tde@openerp.com-20140124094514-o50cxzlm348p1vpc
 2014-01-24 10:45:14 +01:00
Christophe Matthieu 8a5844d191 [IMP] website_sale: hide test tour from help menu 
bzr revid: chm@openerp.com-20140124094241-z1pf5895w2f2sfrh
 2014-01-24 10:42:41 +01:00
Thibault Delavallée 9c74cab9a5 [REVIEW] account: wording of the new config field 
bzr revid: tde@openerp.com-20140124093947-kbz534udanag4v14
 2014-01-24 10:39:47 +01:00
Christophe Matthieu 41210f45df [FIX] website snippet: When you click on the drag and drop arrow of a block without actually dragging, you shouldn't go to the top of the page. 
bzr revid: chm@openerp.com-20140124093421-o1rhe3p44ewwek9u
 2014-01-24 10:34:21 +01:00
Christophe Matthieu 8c5dda2480 [FIX] website css: rev/fix: Page under construction css; Add a choice 'non' for background snippet 
bzr revid: chm@openerp.com-20140124092853-taal585yz4v7fh20
 2014-01-24 10:28:53 +01:00
ajay javiya (OpenERP) 9b43b4de76 [IMP]: send link with token to customer 
bzr revid: aja@tinyerp.com-20140124091930-16vwji8rgni1ad59
 2014-01-24 14:49:30 +05:30
Gery Debongnie 02f7760063 [IMP] adds an 'interval' attribute to 'field' in the rng file (view.rng) 
bzr revid: ged@openerp.com-20140124084319-g4al01wlwnxf8irh
 2014-01-24 09:43:19 +01:00
Gery Debongnie 29d08d9a6b [IMP] graph_view now properly honors the 'interval' attribute of field names in the xml description (addon web_graph) 
bzr revid: ged@openerp.com-20140124084222-dq1gpg1tg8rinozx
 2014-01-24 09:42:22 +01:00
Darshan Kalola (OpenERP) 40d0af06b2 [MERGE]sync with trunk. 
bzr revid: dka@tinyerp.com-20140124064653-f92c75suuyzru0eq
 2014-01-24 12:16:53 +05:30
ajay javiya (OpenERP) 9fa6060a0a [IMP]: code 
bzr revid: aja@tinyerp.com-20140124063310-900f8l5dewjsizt1
 2014-01-24 12:03:10 +05:30
Launchpad Translations on behalf of openerp c5dd038011 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140124062506-2xq1lhj82n923dbl
 2014-01-24 06:25:06 +00:00
Turkesh Patel (Open ERP) 0ad36cf35f [IMP] improved code and send template only on cutomer invoice 
bzr revid: tpa@tinyerp.com-20140124060945-zn1bpzt41xwkh3p7
 2014-01-24 11:39:45 +05:30
Christophe Matthieu f45e0198a5 [FIX] website: tour 
bzr revid: chm@openerp.com-20140123183548-3s842ye1whbvmrq0
 2014-01-23 19:35:48 +01:00
Christophe Simonis 2cf97c76d3 [IMP] product: correct copy() of products variants 
bzr revid: chs@openerp.com-20140123183208-jg76zjt7tzd1fl75
 2014-01-23 19:32:08 +01:00
Frédéric van der Essen c1ef35931a [MERGE] from trunk 
bzr revid: fva@openerp.com-20140123183154-5ju4r404kfcz5gp4
 2014-01-23 19:31:54 +01:00
Denis Ledoux c76e580da5 [ADD] crm: mass assign apply deduplication 
bzr revid: dle@openerp.com-20140123180211-o1ebik36wegmi8mc
 2014-01-23 19:02:11 +01:00
Frédéric van der Essen fe5b70fa52 [FIX] hw_scanner: start scanner thread on first use to prevent start during unit tests 
bzr revid: fva@openerp.com-20140123180138-1g342p7y2aiakr76
 2014-01-23 19:01:38 +01:00
Christophe Simonis a7e920aee2 [FIX] edi: only catch ValueError when getting record from xmlid 
bzr revid: chs@openerp.com-20140123175054-r2zq9elx23t6p0cv
 2014-01-23 18:50:54 +01:00
Christophe Simonis 2090330b67 [FIX] move function field amount_delivery from delivery module to website_sale_delivery module 
bzr revid: chs@openerp.com-20140123174208-yzlod98ez4xn72lv
 2014-01-23 18:42:08 +01:00
ddm@openerp.com e42d639c87 [FIX] indentation 
bzr revid: ddm@openerp.com-20140123172714-0fumk1t7hjoz1506
 2014-01-23 18:27:14 +01:00
ddm@openerp.com 0aba10073e [IMP] add 'Website Settings' to customize menu 
bzr revid: ddm@openerp.com-20140123172543-3k7w0221ssjsserr
 2014-01-23 18:25:43 +01:00
ddm@openerp.com 8c8b20bc66 [IMP] add link to payment acquirers in website settings 
bzr revid: ddm@openerp.com-20140123172455-7prrhpxfakgg0zv4
 2014-01-23 18:24:55 +01:00
Christophe Simonis eb0a81dc93 [IMP] delivery: _delivery_unset make only one call to unlink. 
[IMP] delivery: do not browse grid as superuser.
[IMP] delivery: code clean: remove unused import, remove commented code, use osv.Model instead of deprecated osv.osv class

bzr revid: chs@openerp.com-20140123172302-ran1vpfibeixv9xe
 2014-01-23 18:23:02 +01:00
Frédéric van der Essen a656cc07ef [FIX] hw_scanner: prevent the keyboard capture thread from starting during unit testing 
bzr revid: fva@openerp.com-20140123171744-r36h0a2pkwp5kqlk
 2014-01-23 18:17:44 +01:00
Christophe Simonis 457d661ae0 [FIX] test: correct Mock of search_read 
[IMP] search_read: build order index using dict comprehension

bzr revid: chs@openerp.com-20140123170836-4qu0ei6zucaprwxs
 2014-01-23 18:08:36 +01:00