Christophe Simonis
273face907
[MERGE] forward port of branch saas-1 up to revid 8791 chs@openerp.com-20131009175454-j06y1ngylfbqyrpj
...
bzr revid: chs@openerp.com-20131009180337-cxgdt6zzd1z68ga9
2013-10-09 20:03:37 +02:00
Olivier Dony
8ac110c4dd
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5098 rev-id: odo@openerp.com-20131011123914-7zuvd9mch21yxgj8
...
bzr revid: dle@openerp.com-20131009131902-a93nsbou4w8y0vlx
bzr revid: chs@openerp.com-20131009175454-j06y1ngylfbqyrpj
bzr revid: dle@openerp.com-20130918160049-fo88fl7uyhfoofkv
bzr revid: dle@openerp.com-20130924130544-kmkyr0d73cusvdav
bzr revid: odo@openerp.com-20131011134433-nyfjipvlql4xu127
2013-10-11 15:44:33 +02:00
Olivier Dony
306b2295c6
[IMP] hr_timesheet_invoice: cleanup/simplify previous commit
...
bzr revid: odo@openerp.com-20131003104355-2ttyu8wnactkawmn
2013-10-03 12:43:55 +02:00
Launchpad Translations on behalf of openerp
9dba69ba48
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912064018-3vecn03jcu9fm1m8
2013-09-12 06:40:18 +00:00
Moises Lopez
9f33f77f3e
[REF][hr_timesheet_invoice] Add if exists domain and pep8 in modify lines.
...
bzr revid: moylop260@vauxoo.com-20130908212817-sxx8n2iaqoqpwpgj
2013-09-08 14:28:17 -07:00
Moises Lopez
e37f1e0f26
[FIX][account_payment/test/payment_order_process.yml] Fix test/test_hr_timesheet_invoice.yml too
...
bzr revid: moylop260@vauxoo.com-20130908205724-uylcetl1e4xy908t
2013-09-08 13:57:24 -07:00
Moises Lopez
50492bb349
[FIX][hr_timesheet_invoice] Fix global->particular invoice search to test_hr_timesheet_invoice_no_prod_tax
...
bzr revid: moylop260@vauxoo.com-20130907161501-9uip7h4simwv8ccz
2013-09-07 09:15:01 -07:00
Launchpad Translations on behalf of openerp
cb8f9c5a0d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130903054857-i15nhvtthlho7chm
2013-09-03 05:48:57 +00:00
Launchpad Translations on behalf of openerp
bb90e51a78
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130803061336-i8noij4hjz9nxoow
bzr revid: launchpad_translations_on_behalf_of_openerp-20130804053709-rxcnnh17adwk94b4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130805063055-v6y7lrx7lcoemmk0
2013-08-05 06:30:55 +00:00
Launchpad Translations on behalf of openerp
110e74f46f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130802055826-b3m62j0sjc05lbns
2013-08-02 05:58:26 +00:00
Denis Ledoux
a99b5786d1
[MERGE] Forward-port of 7.0 bugfixes up to rev. 9337 (dle@openerp.com-20130731153129-8hmqrgsg3e9d533f)
...
bzr revid: mat@openerp.com-20130726073123-6buqe3rg321gj5rw
bzr revid: odo@openerp.com-20130730110536-a74ea14pwb2y03ay
bzr revid: dle@openerp.com-20130801123703-frjhpeqwocsjo7ge
2013-08-01 14:37:03 +02:00
Martin Trigaux
81dd0b77f0
[FIX] hr_timesheet_invoice: better invoice price management
...
- if force product, use its sale price
- if on a journal of type 'general' (eg: expenses) and has a product, use its sale price
- else (eg: expenses) use the total amount on analytic lines
bzr revid: mat@openerp.com-20130725100402-gk201bqvwo2g9137
2013-07-25 12:04:02 +02:00
Launchpad Translations on behalf of openerp
205be82943
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130725054417-yilro7a52nwsb91r
2013-07-25 05:44:17 +00:00
Martin Trigaux
6365f69b4d
[FIX] hr_timesheet_invoice: use product price on invoice even when not forcing
...
bzr revid: mat@openerp.com-20130724115907-i61nvau0d5jd5jrc
2013-07-24 13:59:07 +02:00
Launchpad Translations on behalf of openerp
08bf51a608
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130719063647-ajybj58frejzmzi1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130720062338-fgevfrm113ns9ohh
bzr revid: launchpad_translations_on_behalf_of_openerp-20130722055949-auzq29nv6b2f3o10
2013-07-22 05:59:49 +00:00
Christophe Simonis
bf29a2ebc7
[MERGE] forward port of branch 7.0 up to revid 9302 chs@openerp.com-20130718111616-apacuhc2qhquobtc
...
bzr revid: dle@openerp.com-20130627104833-b9zgtu8urj43f12b
bzr revid: mat@openerp.com-20130702135856-kmg7d8anw17nkbd8
bzr revid: chs@openerp.com-20130718115928-wpa84dqh8tcq31zt
2013-07-18 13:59:28 +02:00
Launchpad Translations on behalf of openerp
d1a4e0aef0
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130711062622-v4muic3uqckueux5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130712063505-m63repwd0zokfibu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130713063525-b30s09rh63t3zox4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714055943-xf6jvk2dpoemt6qx
bzr revid: launchpad_translations_on_behalf_of_openerp-20130715051357-59o0nkhplh3e58mi
bzr revid: launchpad_translations_on_behalf_of_openerp-20130704054706-ace1fcr1vtruoc4s
bzr revid: launchpad_translations_on_behalf_of_openerp-20130705061311-4735gtnj7xjmuprg
bzr revid: launchpad_translations_on_behalf_of_openerp-20130712063510-g2yq0kxqgrx9x1df
bzr revid: launchpad_translations_on_behalf_of_openerp-20130713063533-7mjj5a7226xhtob6
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714055945-h6jn755mtdcubvei
bzr revid: launchpad_translations_on_behalf_of_openerp-20130715051400-rra06yzfd7zw4bt0
2013-07-15 05:14:00 +00:00
Martin Trigaux
b3bba607e6
allow using price of 0 or less for expense
...
bzr revid: mat@openerp.com-20130621124737-zo01u5jbafnb0ges
2013-06-21 14:47:37 +02:00
Martin Trigaux
9caf5ef64c
[FIX] hr_timehseet_invoice: allow use force product
...
bzr revid: mat@openerp.com-20130621122639-sfcb7q1pwquiz46l
2013-06-21 14:26:39 +02:00
Martin Trigaux
ca2d1a1c37
[MERGE] sync
...
bzr revid: mat@openerp.com-20130621115631-9hsdpopro9enj5eu
2013-06-21 13:56:31 +02:00
Launchpad Translations on behalf of openerp
3e269d1572
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130614070428-by6oo1fc0hvfoqc8
bzr revid: launchpad_translations_on_behalf_of_openerp-20130615061319-hikvcj42kmv0fwla
bzr revid: launchpad_translations_on_behalf_of_openerp-20130616053220-l2jj1f2bfhr8s95f
bzr revid: launchpad_translations_on_behalf_of_openerp-20130617062045-ydm23y8oyqt85r6d
bzr revid: launchpad_translations_on_behalf_of_openerp-20130618065045-8n040l4nl7inbsho
bzr revid: launchpad_translations_on_behalf_of_openerp-20130619061621-p7u5tapogm5ao1o2
bzr revid: launchpad_translations_on_behalf_of_openerp-20130620063408-j244y20qpy61d6dn
bzr revid: launchpad_translations_on_behalf_of_openerp-20130615062054-6zhgccaoectf2c0d
bzr revid: launchpad_translations_on_behalf_of_openerp-20130616053235-3eimstk0anu72x9m
bzr revid: launchpad_translations_on_behalf_of_openerp-20130617062114-7wts3fyy6vgqzt8v
bzr revid: launchpad_translations_on_behalf_of_openerp-20130618065127-8w5xbiwnnza5vlo1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130619061719-63jsadfrb1yoqtgz
bzr revid: launchpad_translations_on_behalf_of_openerp-20130620063509-1xk30ymo1f7nn4h0
2013-06-20 06:35:09 +00:00
Christophe Simonis
6a9adbca62
[MERGE] forward port of branch 7.0 up to revid 9236 mat@openerp.com-20130613160953-itt79mu5xrl7suv4
...
bzr revid: chs@openerp.com-20130613181503-82234mo34wxb0oap
2013-06-13 20:15:03 +02:00
Pinakin Nayi (OpenERP)
490a86d21b
[IMP]hr_timesheet_invoice : product is not mandatory at the time of creation invoice of expenses and in invoice set product price on the basic of analytic line not on the basis of product price
...
bzr revid: pna@tinyerp.com-20130612084504-dmgz3t3vlyruooje
2013-06-12 14:15:04 +05:30
Launchpad Translations on behalf of openerp
3a296f5386
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608070127-tu3wr0ejaojeuizk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061554-vunz3dsqv73j8io4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608074839-suk66wcjidodrzyu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061704-e1t9mv2alygf4g38
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608075116-643xgspj93t8g1y9
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061708-y08i6exqm5v36qg7
2013-06-09 06:17:08 +00:00
Olivier Dony
b4976938d2
[MERGE] [I18N] Many translation bugfixes + resync of translation templates with latest source
...
lp bug: https://launchpad.net/bugs/1165321 fixed
bzr revid: odo@openerp.com-20130607194733-27oiskc6q4fnp476
2013-06-07 21:47:33 +02:00
Olivier Dony
8c33eb76e1
[I18N] Synchronize translation templates with latest source code
...
bzr revid: odo@openerp.com-20130607194309-eysyrkxpr0dukm07
2013-06-07 21:43:09 +02:00
Christophe Matthieu
9d9e3d2ef8
[IMP] Improve typos in warning (Grammar mistake, Capitalize title, Typos)
...
bzr revid: chm@openerp.com-20130607113829-1mi6jk18c2v3jjhn
2013-06-07 13:38:29 +02:00
Launchpad Translations on behalf of openerp
bbb628be2a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130606062901-5gh1mnjepy36whkh
2013-06-06 06:29:01 +00:00
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
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
Quentin (OpenERP)
d50b081191
[MERGE] account_analytic_analysis, hr_timsheet_invoice: fix made in the computation of the 'Invoiced Amount' computed field + removal of wizard to invoice timesheets that was giving wrong results, and which is now replaced by a simple redirection on the lines to invoice
...
bzr revid: qdp-launchpad@openerp.com-20130423105427-yrs3g9x6nigdl20j
2013-04-23 12:54:27 +02:00
Vo Minh Thu
e69326ee3b
[REF] removed explicit model instanciations.
...
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
Launchpad Translations on behalf of openerp
c13ceba6b9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130412060536-q07q8ed9v8ldi2kv
bzr revid: launchpad_translations_on_behalf_of_openerp-20130414055031-dgknuaf8a4dhgt16
bzr revid: launchpad_translations_on_behalf_of_openerp-20130413063110-rtd3r7hxe54yb8eq
bzr revid: launchpad_translations_on_behalf_of_openerp-20130414054933-k6o13mitp3dl62xq
bzr revid: launchpad_translations_on_behalf_of_openerp-20130415060648-klbxmc1afr5jq4vb
bzr revid: launchpad_translations_on_behalf_of_openerp-20130412060533-fq4nwi1i6h39y7pl
bzr revid: launchpad_translations_on_behalf_of_openerp-20130413063146-745583mwivnzgjqj
bzr revid: launchpad_translations_on_behalf_of_openerp-20130414055028-v2dnk713g9ydbvpo
bzr revid: launchpad_translations_on_behalf_of_openerp-20130415060722-gvarcrrppfcq777a
2013-04-15 06:07:22 +00:00
Launchpad Translations on behalf of openerp
494c0f8bca
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130411144357-92txcwycw3kgyd5k
2013-04-11 14:43:57 +00:00
Launchpad Translations on behalf of openerp
75997ddc1c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130410055452-4saqwvwv6cgtil6s
2013-04-10 05:54:52 +00:00
Launchpad Translations on behalf of openerp
665cd6c6ea
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130403150332-0q7u1so0j76xbo3n
bzr revid: launchpad_translations_on_behalf_of_openerp-20130403150338-iksqy6aim64hko1m
2013-04-03 15:03:38 +00:00
Launchpad Translations on behalf of openerp
252bcc802f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130330060824-pc5f2pj14gj0ak27
bzr revid: launchpad_translations_on_behalf_of_openerp-20130331055726-frtzw3gc9ut4wx4y
bzr revid: launchpad_translations_on_behalf_of_openerp-20130401053127-tolr13p1b3bhjny1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130402054749-t3x0zc7qk3n4man2
bzr revid: launchpad_translations_on_behalf_of_openerp-20130330060920-k0cnlpk0rxcli841
bzr revid: launchpad_translations_on_behalf_of_openerp-20130331055741-loojniiz6du9upat
bzr revid: launchpad_translations_on_behalf_of_openerp-20130401053211-yvt1h32v41rs6jje
bzr revid: launchpad_translations_on_behalf_of_openerp-20130402054814-fwg742kzhsupr6kc
bzr revid: launchpad_translations_on_behalf_of_openerp-20130329051100-3ul1k4qwwm2f49gt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130330060923-wch1f8ndmb15nu6x
bzr revid: launchpad_translations_on_behalf_of_openerp-20130331055759-aj1nc93t9420lov0
bzr revid: launchpad_translations_on_behalf_of_openerp-20130401053215-kqqgqefzp95fa1tk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130402054817-k33rri349nc2ioiz
2013-04-02 05:48:17 +00:00
Launchpad Translations on behalf of openerp
7a8d71be6d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130329050903-yuxb08q83hlvg6ok
2013-03-29 05:09:03 +00:00
Vo Minh Thu
5639a52431
[MERGE] use new report API.
...
bzr revid: vmt@openerp.com-20130328121009-r3n63gmhfkv0dnby
2013-03-28 13:10:09 +01:00
Launchpad Translations on behalf of openerp
fc04522286
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130328060500-yc40z00ubsz154vw
2013-03-28 06:05:00 +00: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
7bf78a7097
[FIX] Clean up: wipe of timeinvoicecreateviewfinal wizard
...
bzr revid: jco@openerp.com-20130327133645-ax49xrxvt5svh4b1
2013-03-27 14:36:45 +01:00
Vo Minh Thu
efdb907a84
[REF] hr_timesheet_invoice: rml_parse has already a self.pool, not need to call pooler.get_pool().
...
bzr revid: vmt@openerp.com-20130327131307-41op9ddfyi54t0b9
2013-03-27 14:13:07 +01:00
Launchpad Translations on behalf of openerp
7d61ca8ce4
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130323115615-krcv2a9xc7p7lee2
bzr revid: launchpad_translations_on_behalf_of_openerp-20130324051143-eb5ailcthtjlwt9u
bzr revid: launchpad_translations_on_behalf_of_openerp-20130325052408-askn9sxc1bzk1366
2013-03-25 05:24:08 +00:00
Vo Minh Thu
9b0ced610f
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20130322134958-jhe6m0222jq7wo41
2013-03-22 14:49:58 +01:00
Thibault Delavallée
40a5dda617
[MERGE] Forward port of addons until 8903
...
bzr revid: tde@openerp.com-20130321093716-3nt7h2xunl8lusqh
2013-03-21 10:37:16 +01:00
Quentin (OpenERP)
748ebf0ab0
[MERGE] analytic_contract_hr_expense: functional field computation fixed + added some helping info in hr_timesheet_invoice in the reinvoicing wizard
...
bzr revid: qdp-launchpad@openerp.com-20130319125028-59jnnfc7tiixag4b
2013-03-19 13:50:28 +01:00
Josse Colpaert
fffc371f96
[FIX] Fix wrong amounts in contract form and add grey text message in Create Invoice wizard
...
bzr revid: jco@openerp.com-20130318153049-myvqzvv1c2zqgna8
2013-03-18 16:30:49 +01:00
Launchpad Translations on behalf of openerp
9485c49f4f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130316063604-hv8xtn4g8e76no72
bzr revid: launchpad_translations_on_behalf_of_openerp-20130317053030-q0f5iyfhv4qtah18
bzr revid: launchpad_translations_on_behalf_of_openerp-20130318052217-ua2ev323qlvhi8l2
2013-03-18 05:22:17 +00:00