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
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
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
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
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
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
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
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
Olivier Dony
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
Denis Ledoux
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
Atul Patel (OpenERP)
89c428bd84
[MERGE]: Merged with addons
...
bzr revid: atp@tinyerp.com-20131029133906-xrxccq8zm285m2zw
2013-10-29 19:09:06 +05:30
Olivier Dony
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
Ravi Gohil (OpenERP)
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
Atul Patel (OpenERP)
4ccbbba7c8
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20130826045058-4ipsemxtca1rdagy
2013-08-26 10:20:58 +05:30
Darshan Kalola
cc23db19a7
[IMP] improve contract usability
...
bzr revid: darshankalola@gmail.com-20130729054047-z73ocu5isfqc0b3v
2013-07-29 11:10:47 +05:30
Nimesh Contractor (OpenERP)
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
Darshan Kalola (OpenERP Trainee)
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
Christophe Matthieu
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
Martin Trigaux
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
Amit Bhavsar (Open ERP)
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
bth-openerp
94d1af294c
[FIX]revert code.
...
bzr revid: bth@tinyerp.com-20130517055655-9fscfd08aaom0wyt
2013-05-17 11:26:55 +05:30
Olivier Dony
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
ggh-openerp
3b73e2b2a4
[IMP]Removed space before Exclamation marks [!]
...
bzr revid: ggh@tinyerp.com-20130429071557-vnxo5nni03vc886j
2013-04-29 12:45:57 +05:30
Quentin (OpenERP)
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
Quentin (OpenERP)
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
bth-openerp
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
bth-openerp
30b847fbf0
[REM] Remove unwanted changes.
...
bzr revid: bth@tinyerp.com-20130416072248-qtn1ajo89i4wt048
2013-04-16 12:52:48 +05:30
bth-openerp
8caa5bae8d
[IMP] Improve tooltip on field.
...
bzr revid: bth@tinyerp.com-20130415072053-5zyrp09xf9bd2ivf
2013-04-15 12:50:53 +05:30
bth-openerp
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
bth-openerp
79a335f2f4
[IMP] date start & end taken from template.
...
bzr revid: bth@tinyerp.com-20130411133351-z8zypiywjbgwt7by
2013-04-11 19:03:51 +05:30
bth-openerp
ae4900a278
[IMP] Modify tooltip for remaining on timesheet.
...
bzr revid: bth@tinyerp.com-20130409104807-jme2059quueouns8
2013-04-09 16:18:07 +05:30
Quentin (OpenERP)
3bb51ac696
[MERGE] forward port of bugfixes made in 7.0, up to revision 8969.
...
bzr revid: qdp-launchpad@openerp.com-20130404095257-oek77sijuxjyi0aj
2013-04-04 11:52:57 +02:00
Josse Colpaert
23d2c6d634
[FIX] Remove also import and correct total invoiced on so by calculation of invoice lines
...
bzr revid: jco@openerp.com-20130327171243-zzagfabhf5i0bb90
2013-03-27 18:12:43 +01:00
Josse Colpaert
8548a69f73
[FIX] Timesheets invoiced as expenses are and correction removed in invoiced calculation
...
bzr revid: jco@openerp.com-20130327103833-ekjzi3e0alkpod35
2013-03-27 11:38:33 +01:00
Quentin (OpenERP)
4fca70b0b2
[FIX] account_analytic_analysis: wrong computation of remaining to invoice field (should not take into consideration lines for which it exists a draft invoice)
...
bzr revid: qdp-launchpad@openerp.com-20130326170456-p4j54ar9272n05no
2013-03-26 18:04:56 +01:00
Olivier Dony
914a97f329
[FIX] account_analytic_analysis: remove duplicate method kept by mistake while porting 7.0 fixes to trunk in rev.8620
...
bzr revid: odo@openerp.com-20130315113120-xsmfoxw6a6kaylzm
2013-03-15 12:31:20 +01:00
Quentin (OpenERP)
be05b374a1
[MERGE] forwardport of bugfixes made in v7 up to revision 8854.
...
bzr revid: qdp-launchpad@openerp.com-20130314112740-s01t51p4m7mxcumz
2013-03-14 12:27:40 +01:00
Fabien Pinckaers
c7d709e579
[FIX] misc fixes on contracts, timesheets
...
bzr revid: fp@openerp.com-20130312123321-mly0k9lrh3im78bg
2013-03-12 13:33:21 +01:00
Fabien Pinckaers
e519da72a0
[MERGE] recurring invoices on contracts
...
bzr revid: fp@openerp.com-20130312154529-1bu8lwfobrvk7zqa
2013-03-12 16:45:29 +01:00
Fabien Pinckaers
bed8a96291
[FIX] misc contracts fixes, timesheets
...
bzr revid: fp@openerp.com-20130312121218-vsvmaj12px4vqpvz
2013-03-12 13:12:18 +01:00
sgo@tinyerp.com
cb6b856d04
[MERGE]merge fka branch for changes in contract
...
bzr revid: sgo@tinyerp.com-20130307131039-u0d2wchfrwuhtky1
2013-03-07 18:40:39 +05:30
DBR (OpenERP)
7b2b623ff4
[IMP] Set False in analtic account for new analytic line
...
bzr revid: dbr@tinyerp.com-20130307085053-im3yk2akhg95ksyd
2013-03-07 14:20:53 +05:30
DBR (OpenERP)
148b43ca3f
Minore changes
...
bzr revid: dbr@tinyerp.com-20130307074432-k1v9z8yvkmccydm2
2013-03-07 13:14:32 +05:30
DBR (OpenERP)
c98d7dad22
[IMP]Remove write and use append
...
bzr revid: dbr@tinyerp.com-20130307062020-49zgr9rni4ovuf7p
2013-03-07 11:50:20 +05:30