5087612d1d
[MERGE] forward port of branch saas-3 up to bf53aed
2014-06-19 15:44:07 +02:00
c8be66739d
[FIX] account_analytic_analysis: recurring_create_invoice
...
If no contract found, just pass, to avoid making the sql request
2014-06-19 10:55:17 +02:00
8d282f3b4f
[FIX] account_analytic_analysis: force company of contract when creating recurring invoices
...
When creating the recurring invoices of the contracts, the invoices accounts(ir.property) must be set according to the company of the contract, not according to the company of the user creating the invoices
2014-06-18 13:02:00 +02:00
6b00257595
[FIX] account_analytic_analysis: product_id_change, variable price referenced before assignment in some cases
2014-06-16 17:44:15 +02:00
6b8e9727e5
[MERGE] forward port of branch saas-3 up to 4601d85
2014-06-10 12:29:47 +02:00
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
fd21abd847
[MERGE] Forward-port latest saas-3 bugfixes, up to 30f43da
2014-05-27 17:18:43 +02:00
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
ecce35bc6e
[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 6958d47694
2014-05-21 13:05:41 +02:00
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
40abb97136
[FIX] account_analytic_analysis: use product.price if pricelist is passed, else list_price
2014-05-20 16:08:03 +02:00
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
2bcbebb0d5
[FIX] account_analysis_account: Keep price_unit to 0.0 if passed
2014-05-14 21:36:34 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
89a6771f6a
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9698, revision-id: odo@openerp.com-20131216142049-xh9gxy5cir3p2i09
...
bzr revid: dle@openerp.com-20131216111534-0w0jdod25ff3iapc
bzr revid: odo@openerp.com-20131216142246-unt6qqb23uq53we1
2013-12-16 15:22:46 +01:00
af22a1c5b7
[FIX] account_analytic_analysis: is_overdue_quantity was not updated when quantity max was changed
...
is_overdue_quantity is a stored function field which was updated only when analytic lines where updated. Or, when the quantity_max field is updated, this field should be recomputed and restored. This is now the case
bzr revid: dle@openerp.com-20131216111218-zcz8qwa7zn3iwvye
2013-12-16 12:12:18 +01:00
89c428bd84
[MERGE]: Merged with addons
...
bzr revid: atp@tinyerp.com-20131029133906-xrxccq8zm285m2zw
2013-10-29 19:09:06 +05:30
5cba82e2c9
[MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8788 dle@openerp.com-20131003094541-ro29hhkas03rdvw8
...
bzr revid: odo@openerp.com-20131003111222-upt1ytb92db50zay
2013-10-03 13:12:22 +02:00
87ca8ad41b
[FIX] account_analytic_analysis: fix the traceback, AttributeError: 'long' object has no attribute 'account_ids' when automatic recurring invoice is enabled.(Maintenance Case : 597966)
...
bzr revid: rgo@tinyerp.com-20130924105728-gtmc1862gcazs7lb
2013-09-24 16:27:28 +05:30
4ccbbba7c8
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20130826045058-4ipsemxtca1rdagy
2013-08-26 10:20:58 +05:30
cc23db19a7
[IMP] improve contract usability
...
bzr revid: darshankalola@gmail.com-20130729054047-z73ocu5isfqc0b3v
2013-07-29 11:10:47 +05:30
1d85d13a73
[IMP] when you uncheck the to_invoice at that time upper timesheet value is not uncheked.
...
bzr revid: nco@tinyerp.com-20130711060751-vllvxwpb0awptpom
2013-07-11 11:37:51 +05:30
13ac97438d
[IMP]make ratio null and untick timesheet when untick invoice on timesheet option on contract
...
bzr revid: darshankalola@gmail.com-20130614134423-7itt49kbf09nq36t
2013-06-14 19:14:23 +05:30
8c6ff33bef
[IMP] Improve typos in warning (Grammar mistake, Capitalize title, Typos)
...
bzr revid: chm@openerp.com-20130607102359-is19utzap127nwr4
2013-06-07 12:23:59 +02:00
8f0b106e47
[MERGE] account_analytic_analysis: better tooltip on remaining time field
...
bzr revid: mat@openerp.com-20130530114426-u508zvb7zw5aj1fg
2013-05-30 13:44:26 +02:00
24848a8dcc
[MERGE] merge with latest trunk
...
bzr revid: bde@tinyerp.com-20130522095432-1sl1b6uu6ewod4md
bzr revid: amb@tinyerp.com-20130528091941-wak8fnembuvewwjf
2013-05-28 14:49:41 +05:30
94d1af294c
[FIX]revert code.
...
bzr revid: bth@tinyerp.com-20130517055655-9fscfd08aaom0wyt
2013-05-17 11:26:55 +05:30
9c08e12962
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9085
...
revision-id: odo@openerp.com-20130429105458-r89mnkx8okdxsdld
bzr revid: odo@openerp.com-20130429151410-54y94063gijyk16o
2013-04-29 17:14:10 +02:00
3b73e2b2a4
[IMP]Removed space before Exclamation marks [!]
...
bzr revid: ggh@tinyerp.com-20130429071557-vnxo5nni03vc886j
2013-04-29 12:45:57 +05:30
1e344dbc53
[FIX] account_analytic_analysis, hr_timesheet_invoice: partial replay of the fix made in revno 9056. The fix effect is the same, but more appropriate to a stable version (the wizard will be removed in v8 only)
...
bzr revid: qdp-launchpad@openerp.com-20130423151810-lcwo7abivbaoog0s
2013-04-23 17:18:10 +02:00
e13dc082e5
[REV] revert revision 9056 that was deleting a whole wizard. The patch is good but not applicable as it in the v7
...
bzr revid: qdp-launchpad@openerp.com-20130423144948-unekni1ztjwv71fb
2013-04-23 16:49:48 +02:00
334faeb843
[REV] Revert code for wrong value in invoiced in fixed price.
...
bzr revid: bth@tinyerp.com-20130417050900-mri6vhcb1v9i5lya
2013-04-17 10:39:00 +05:30
30b847fbf0
[REM] Remove unwanted changes.
...
bzr revid: bth@tinyerp.com-20130416072248-qtn1ajo89i4wt048
2013-04-16 12:52:48 +05:30
8caa5bae8d
[IMP] Improve tooltip on field.
...
bzr revid: bth@tinyerp.com-20130415072053-5zyrp09xf9bd2ivf
2013-04-15 12:50:53 +05:30
d6fcb3ec65
[IMP]FIX:Wrong value coming in invoiced on fixed price.
...
bzr revid: bth@tinyerp.com-20130412071937-b23oux3oabqgoywz
2013-04-12 12:49:37 +05:30
79a335f2f4
[IMP] date start & end taken from template.
...
bzr revid: bth@tinyerp.com-20130411133351-z8zypiywjbgwt7by
2013-04-11 19:03:51 +05:30
ae4900a278
[IMP] Modify tooltip for remaining on timesheet.
...
bzr revid: bth@tinyerp.com-20130409104807-jme2059quueouns8
2013-04-09 16:18:07 +05:30
Christophe Simonis
Denis Ledoux
Denis Ledoux
Olivier Dony
Martin Trigaux
Christophe Simonis
Thibault Delavallée
Atul Patel (OpenERP)
Ravi Gohil (OpenERP)
Darshan Kalola
Nimesh Contractor (OpenERP)
Christophe Matthieu
Amit Bhavsar (Open ERP)
bth-openerp
ggh-openerp
Quentin (OpenERP)