odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity
88,832 Commits 3 Branches 0 Tags 961 MiB
Commit Graph

909 Commits

Author SHA1 Message Date
Fabien Meghazi faa09da325 Removed version="7.0" from form views 2014-06-12 09:09:59 +02:00
Christophe Simonis a7c2125735 [MERGE] forward port of branch saas-4 up to 6b8e972 2014-06-10 13:15:46 +02:00
Christophe Simonis 6b8e9727e5 [MERGE] forward port of branch saas-3 up to 4601d85 2014-06-10 12:29:47 +02:00
Denis Ledoux 76d909bb46 [FIX] account_analytic_analysis: Only allow to select sale pricelist for contracts 2014-06-05 10:45:14 +02:00
Denis Ledoux 9c9cacd1d0 [FIX] account_analytic_analysis: Recurring invoice lines price if pricelist does not match 
If the price according to price list is False, use default sale price in the recurring invoice lines
 2014-06-05 10:42:02 +02:00
Xavier Morel 46712acaec [FIX] bunch of changes lost in incorrect merge f4d78ae738 2014-05-30 17:00:52 +02:00
Xavier Morel d325c0caef [REV] attempt to revert incorrect removals in f4d78ae738 2014-05-30 16:00:28 +02:00
Olivier Dony 04211015fc [MERGE] Forward-port of latest saas-4 fixes, up to 0452851 2014-05-27 20:49:49 +02:00
Olivier Dony fd21abd847 [MERGE] Forward-port latest saas-3 bugfixes, up to 30f43da 2014-05-27 17:18:43 +02:00
Denis Ledoux be0ce80f5f [FIX] account_analytic_analysis: set false to price_unit in product_id_change in form view, so the price unit is reset when the product id is changed 2014-05-23 17:58:00 +02:00
Denis Ledoux 7a3b7f7fe2 [FIX] account_analytic_analysis: recurring invoice line description and yearly interval 
the product_id_change name is reset if name is not passed to method args
the product_id_change call in account_analytic_view set name as false so it is reset each time the product is change
the yearly interval add a year to the next recurring date instead of one month
 2014-05-23 11:16:46 +02:00
Denis Ledoux ecce35bc6e [MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 6958d47694 2014-05-21 13:05:41 +02:00
Denis Ledoux 6958d47694 [FIX] account_analytic_analysis: recurring invoices prepare and product_id_change 
product_id_change set the description with the same behavior as sale orders
product_id_change set the price unit according to the pricelist
_prepare_invoice is split into two sub methods, _prepare_invoice_data and _prepare_invoice_line
_prepare_invoice actually prepare the invoice values instead of directly creating the invoice
 2014-05-21 12:57:28 +02:00
Christophe Simonis a756b82372 [MERGE] forward port of branch saas-4 up to revid bb26dea 2014-05-20 20:19:55 +02:00
Denis Ledoux 40abb97136 [FIX] account_analytic_analysis: use product.price if pricelist is passed, else list_price 2014-05-20 16:08:03 +02:00
Antoine Perdaens 4dbaa116ee [FIX] account_analytic_analysis: recurring invoices 
Properly support yearly recurring invoices
 2014-05-19 17:44:51 +02:00
Denis Ledoux cfefd04871 [FIX] account_analytic_analysis: recurring invoices, product_id_change wasnt returning the price get from the pricelist 2014-05-14 23:51:18 +02:00
Denis Ledoux 2bcbebb0d5 [FIX] account_analysis_account: Keep price_unit to 0.0 if passed 2014-05-14 21:36:34 +02:00
Martin Trigaux 7d36f54288 [FIX] account_analytic_analysis: revert method signature change made at rev 9277 
The additional parameters were made to avoid overwriting values when changing of template.
As we can not add parameters in only one module, we overwrite values only for not saved records.
This mitigates the overwrite while not changing the API.

bzr revid: mat@openerp.com-20140508083948-gkk7d1250a8znhlt
 2014-05-08 10:39:48 +02:00
Christophe Simonis b8089a1521 [MERGE] forward port of branch saas-4 up to revid 9410 chs@openerp.com-20140507164207-kmme4tsrd4w1m7l1 
bzr revid: chs@openerp.com-20140507170112-bjeltv2b0coy60am
 2014-05-07 19:01:12 +02:00
Denis Ledoux d1bba709b4 [FIX] account_analytic_analysis: recurring invoices, map_tax and map_account methods of fiscal position model expect a browse record 
bzr revid: dle@openerp.com-20140506153459-0vv6rcttihl628l3
 2014-05-06 17:34:59 +02:00
Denis Ledoux ae6a0fcb73 [FIX] account_analytic_analysis: split _prepare_invoice into two methods, one for the 'generic' data for invoices (customers, fiscal position, etc) and one for generate the recurring invoice line, so they can be reused in other methods 
bzr revid: dle@openerp.com-20140506090649-141s4io4329ybu69
 2014-05-06 11:06:49 +02:00
Denis Ledoux 41e6840169 [FIX] account_analytic_analysis: recurring invoices, prepare_invoice method actually prepare the invoice, without creating it. _recurring_create_invoice return value is the list of created invoices ids 
bzr revid: dle@openerp.com-20140505130226-ylcycmzmj0hm35w6
 2014-05-05 15:02:26 +02:00
Antony Lesuisse 7e25b9ae55 [MERGE] saas-4 report_webkit missing dependency on report 
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
 2014-05-01 18:11:56 +02:00
Denis Ledoux 79d4c57877 [MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 9439 revid:dle@openerp.com-20140429112147-hqfqd0y487s817n7 
bzr revid: dle@openerp.com-20140429112738-y2el246dmd2o2zy9
 2014-04-29 13:27:38 +02:00
Denis Ledoux b2e56a0128 [FIX] account_analytic_analysis: recurring invoice line, use the name passed in the product_id_change method 
In addition, do not set the line description as the product name + product description, only the product description: same behavior than in invoices and sale orders

bzr revid: dle@openerp.com-20140429112147-hqfqd0y487s817n7
 2014-04-29 13:21:47 +02:00
Denis Ledoux 1b45edab23 [FIX] account_analytic_analysis: recurring invoices lines, use the passed price_unit in product_id_change 
bzr revid: dle@openerp.com-20140429100137-4jvs37e1j4lqeioe
 2014-04-29 12:01:37 +02:00
Fabien Meghazi 1c4e2cfd22 [IMP] bundlify addons (except website) 
bzr revid: fme@openerp.com-20140424172129-ze74eaz2eaidmxhm
 2014-04-24 19:21:29 +02:00
Christophe Simonis 7a7d7febf8 [MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1 
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
 2014-04-24 15:45:33 +02:00
Launchpad Translations on behalf of openerp fa60b90c1f Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
 2014-04-22 07:52:47 +00:00
Denis Ledoux 93cca5eb1d [FIX] account_analytic_analysis: test, the recurring invoices are generated for analytic accounts of type contract only (no template...) 
bzr revid: dle@openerp.com-20140418144538-paqas7j8cbjyi11t
 2014-04-18 16:45:38 +02:00
Denis Ledoux 4c68f32fad [FIX] account_analytic_analysis: test recurring_create_invoice, ids is mandatory 
bzr revid: dle@openerp.com-20140418141527-jxc4l7amuj7weu0a
 2014-04-18 16:15:27 +02:00
Denis Ledoux d0cf305618 [FIX] account_analytic_analysis: avoid create recurring invoices for contract templates 
bzr revid: dle@openerp.com-20140418134740-dv39ffwcdqh4np0g
 2014-04-18 15:47:40 +02:00
Denis Ledoux 6e04c0c5eb [FIX] account_analytic_analysis: prevent enable recurring invoices if not of type contract. Avoid cron to not continue if one of the contract failed to create its recurring invoices 
bzr revid: dle@openerp.com-20140418132917-ztvzinwn3kt786m2
 2014-04-18 15:29:17 +02:00
Launchpad Translations on behalf of openerp e82fbf7d91 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
 2014-04-12 08:31:53 +00:00
Denis Ledoux 2695cacea4 [FIX] account_analytic_analysis, analytic, hr_timesheet: do not override existing data of analytic account on template on_change 
bzr revid: dle@openerp.com-20140401123657-ozh4ycx36jojpg51
 2014-04-01 14:36:57 +02:00
Launchpad Translations on behalf of openerp 51aa261b44 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
 2014-03-27 07:35:04 +00:00
Launchpad Translations on behalf of openerp 9863dbe5c8 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
 2014-03-04 07:52:38 +00:00
Christophe Simonis 4b72678bc7 [MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr 
bzr revid: chs@openerp.com-20140220163815-69sza1kclnh5mavs
 2014-02-20 17:38:15 +01:00
Olivier Dony bbd813e76e [MERGE] Forward-port of latest saas-2 (incl. 7.0) bugfixes, up to rev. 9127 odo@openerp.com-20140212122042-3m2tysmr31mtecnc 
bzr revid: odo@openerp.com-20140212175141-i9yz8zlseglrk8sb
 2014-02-12 18:51:41 +01:00
Thibault Delavallée 1b13217838 [MERGE] sales/crm: minor improvements in account_analytic_analysis, crm, event_sale, hr_timesheet_invoice, sale views 
bzr revid: tde@openerp.com-20140205160347-nptajwoxfl5ylfa9
 2014-02-05 17:03:47 +01:00
Denis Ledoux 5aedbce448 [FIX] account_analytic_analysis: currency were wrong when preparing recurring invoices 
The id of the sale pricelist of the customer was set as currency_id, instead of using the id of the currency of the pricelist. (Obviously)
Furthermore, the currency of the contract pricelist takes the lead.
Then, if none of these two are set, we choose the currency of the company, finally.

bzr revid: dle@openerp.com-20140204115226-rowmbr5223fcu08k
 2014-02-04 12:52:26 +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
Denis Ledoux cbba7eb4da [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9796 revid:launchpad_translations_on_behalf_of_openerp-20140128070310-721zmkmw0ocyz6im 
bzr revid: dle@openerp.com-20140128100949-mfa2geyx6rklwtcg
 2014-01-28 11:09:49 +01:00
Launchpad Translations on behalf of openerp 3ce5e01eca Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
 2014-01-28 06:41:39 +00:00
Launchpad Translations on behalf of openerp d9cdc8564c Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140122061252-9jm03vlbr13ofqo9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140123055652-0p71divui34v1c1q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140124062440-hx0z2e4sd6nz7exc
bzr revid: launchpad_translations_on_behalf_of_openerp-20140126051449-rlunde7qysqsh1b1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140125064003-v340hiykcngjg9ue
bzr revid: launchpad_translations_on_behalf_of_openerp-20140126051541-9fnyw12nex5poeth
bzr revid: launchpad_translations_on_behalf_of_openerp-20140127054606-1jb6usf6pj7gy1xl
 2014-01-27 05:46:06 +00:00
Antony Lesuisse b7895c99d6 [FIX] contract search view typo 
bzr revid: al@openerp.com-20140125000444-14nkccg6vyu5nmv5
 2014-01-25 01:04:44 +01:00
Launchpad Translations on behalf of openerp 28d79433c3 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070457-rn2tgdxis2fi3nqo
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055822-ajy043mntc4jr407
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055854-z7wtyb24c5t8kcmj
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070538-2xm86ece1aate8u9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055932-sa6vrp2g8ua3u88e
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055948-lwcyqcfutgamwac1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070546-d89xqw56zou7e9p9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055955-6wrdxqy1018mo7jq
 2014-01-20 05:59:55 +00:00
Launchpad Translations on behalf of openerp c2794d0e85 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140111062610-ld24q55cbxo6di5q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140112054746-j34qg10ipyb6kj8g
bzr revid: launchpad_translations_on_behalf_of_openerp-20140113055853-5oqpffj3szw1yrpl
bzr revid: launchpad_translations_on_behalf_of_openerp-20140111062637-m0t50cu2cr5d6yw7
bzr revid: launchpad_translations_on_behalf_of_openerp-20140112054824-hm7ylgrauivbj7h2
bzr revid: launchpad_translations_on_behalf_of_openerp-20140113055913-wo2i3sd1rnblragc
 2014-01-13 05:59:13 +00:00
Launchpad Translations on behalf of openerp b1af63310c Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131219061324-aw7yvvnjapbx5x1i
bzr revid: launchpad_translations_on_behalf_of_openerp-20131220053354-9ybfurq6yvrliqge
bzr revid: launchpad_translations_on_behalf_of_openerp-20131223054728-1db5iqqokg67bcyr
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231052619-5szmeohg88k0m4xt
bzr revid: launchpad_translations_on_behalf_of_openerp-20140101054325-pww3zkiyzxll4qy7
bzr revid: launchpad_translations_on_behalf_of_openerp-20140102054504-671epcsd8458kil8
bzr revid: launchpad_translations_on_behalf_of_openerp-20140103062350-h5v8idg6hlix6rnx
bzr revid: launchpad_translations_on_behalf_of_openerp-20140104061853-bndte11d6k8po640
bzr revid: launchpad_translations_on_behalf_of_openerp-20140105054743-exo0ixnpjkfwfstl
bzr revid: launchpad_translations_on_behalf_of_openerp-20140106050440-fme1x3f2g4s1dxqk
bzr revid: launchpad_translations_on_behalf_of_openerp-20140103062427-4v5wusiplrcj4jjd
bzr revid: launchpad_translations_on_behalf_of_openerp-20140104061934-r5xq4gfoy22w6nll
bzr revid: launchpad_translations_on_behalf_of_openerp-20140105054800-delmrxbtcvm3xxyw
bzr revid: launchpad_translations_on_behalf_of_openerp-20140106050503-xu0r3lopkkfn20ca
 2014-01-06 05:05:03 +00:00