Commit Graph

1725 Commits

Author SHA1 Message Date
Christophe Simonis 5343c48c5f [MERGE] forward port of branch saas-1 up to revid 8760 chs@openerp.com-20130823143114-83tdjhbsdes0kydr
bzr revid: chs@openerp.com-20130823154655-blm2wyfivmg8qi2z
2013-08-23 17:46:55 +02:00
Christophe Simonis 58868227f9 [MERGE] forward port of branch 7.0 up to revid 9382 chs@openerp.com-20130823131214-ipouwtnz8r16mlvv
bzr revid: chs@openerp.com-20130823143114-83tdjhbsdes0kydr
2013-08-23 16:31:14 +02:00
Martin Trigaux c2dbe028a7 [FIX] account_voucher: generate empty context to avoid traceback
bzr revid: mat@openerp.com-20130821121714-5q5qa56suab0dehs
2013-08-21 14:17:14 +02:00
Olivier Dony c02afb45fa [MERGE] Forward-port of bugfixes from saas-1 series up to rev.8759 rev-id: odo@openerp.com-20130820152607-0p0fx87v1rqhk3vy
bzr revid: odo@openerp.com-20130820165258-3mjzbo990xg44dfu
2013-08-20 18:52:58 +02:00
Olivier Dony 788eb29237 [MERGE] Forward-port of 7.0 bugfixes up to rev.9369 rev-id: launchpad_translations_on_behalf_of_openerp-20130820051502-deoiql3lru7goosd
bzr revid: odo@openerp.com-20130820152607-0p0fx87v1rqhk3vy
2013-08-20 17:26:07 +02:00
Launchpad Translations on behalf of openerp 0e74fd31a4 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130815055122-qjjh1oa8122npkdt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130816060311-osd5epg0pjqggizo
bzr revid: launchpad_translations_on_behalf_of_openerp-20130817061650-b596lee67z2gon1h
bzr revid: launchpad_translations_on_behalf_of_openerp-20130818050503-e1c1ferew0px4k1y
bzr revid: launchpad_translations_on_behalf_of_openerp-20130819045737-ef63g3nwk154ezyw
2013-08-19 04:57:37 +00:00
Launchpad Translations on behalf of openerp 8938503a39 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130806050505-b7g4j329y0heazos
bzr revid: launchpad_translations_on_behalf_of_openerp-20130807050317-4fh5uqmr02dou5ei
bzr revid: launchpad_translations_on_behalf_of_openerp-20130808045927-gmb38spqpaa9lgoa
2013-08-08 04:59:27 +00:00
Foram Katharotiya (OpenERP) 39e5ec3b9a [IMP] improve code
bzr revid: fka@tinyerp.com-20130807064343-gifqjce1bewj0sk5
2013-08-07 12:13:43 +05:30
Foram Katharotiya (OpenERP) 1d2fefb203 [FIX] traceback from journal vouchers
bzr revid: fka@tinyerp.com-20130806125854-txgvpzvkpc928v09
2013-08-06 18:28:54 +05:30
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
Martin Trigaux 44f7a82281 [FIX] account_voucher: evaluate move line account with correct precision
This bug may have generated incorrect account_voucher_line when validating a voucher with amount less than 1. This patch will avoid reproducing the problem on new lines but not fix already existing vouchers. To do so apply the following steps:

1. apply this patch
2. do a manual reconciliation of the account.move.lines with amount less than 1 (use the manual reconciliation menu to see every line, included 0-0 lines)
3. execute the following SQL query

DELETE FROM account_voucher_line WHERE id IN (SELECT l.id FROM account_voucher_line AS l JOIN account_voucher AS v ON (v.id = l.voucher_id) JOIN account_move_line AS ml ON (l.move_line_id = ml.id) WHERE l.amount = 0 AND v.state = 'draft' AND ml.debit = ml.credit AND ml.credit = 0);

that will remove account voucher lines from draft vouchers linked to an empty move lines

bzr revid: mat@openerp.com-20130802120311-oh64d47t8x6t1wf9
2013-08-02 14:03:11 +02:00
Denis Ledoux 1a04d7b128 [FIX]account_voucher: change signature of _get_current_rate according to res_currency from server
bzr revid: dle@openerp.com-20130801131234-p63bhee1aqrs9n8o
2013-08-01 15:12:34 +02: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
Launchpad Translations on behalf of openerp bea114f93a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130730045806-pkwhfwt808zjajg9
2013-07-30 04:58:06 +00: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 30f07ee98d [FIX] account_voucher: better voucher payment screen
revert commit 9310 with incorrect writeoff amount
hide writeoff reconcilation fields when no price difference
hide analytic_id (Write-Off Analytic Account) when not with_writeoff

bzr revid: mat@openerp.com-20130724094023-fbd1hqwe9hdh28id
2013-07-24 11:40:23 +02:00
Martin Trigaux 3b61eb8627 [FIX] account_voucher: writeoff amount on unreconciled amount instead of price to allow negative writeoff (eg: negative currency change rate difference) (opw #593977)
bzr revid: mat@openerp.com-20130723141734-8wtbyn4ubz8rwfj1
2013-07-23 16:17:34 +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
Christophe Simonis df8d972057 [IMP] */static/description/index.html: link to /start include app name
bzr revid: chs@openerp.com-20130715162504-9ntu1dj222rgv9ek
2013-07-15 18:25:04 +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
Launchpad Translations on behalf of openerp f38ef93a05 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130710052627-eedl9mcxycz4m264
bzr revid: launchpad_translations_on_behalf_of_openerp-20130711051719-uejqvkwl3w8nli1l
2013-07-11 05:17:19 +00:00
Antony Lesuisse fc70550ca2 [IMP] move html module description and icon
bzr revid: al@openerp.com-20130628100441-swpanf2jwcojygh4
2013-06-28 12:04:41 +02:00
Martin Trigaux 90350b5618 [FIX] account_voucher: while canceling avoid removing twice the same reconciled move
bzr revid: mat@openerp.com-20130710082743-mfimnve33j06hgu0
2013-07-10 10:27:43 +02:00
Launchpad Translations on behalf of openerp 60f945182a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130628063230-vimvbe89j2208dpl
2013-06-28 06:32:30 +00:00
Launchpad Translations on behalf of openerp 89bc6e5e73 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130622062505-fobx7ncp6bkpouyt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130623055452-s77jlu7z6kvjbdlz
bzr revid: launchpad_translations_on_behalf_of_openerp-20130624052557-hsaix5c3fu6opbva
2013-06-24 05:25:57 +00:00
Launchpad Translations on behalf of openerp 4cb1127306 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130621060722-3y4nu7t4kzg3zjua
2013-06-21 06:07:22 +00: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
Launchpad Translations on behalf of openerp 15a1e676e6 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130614053848-ivpev077e3o7v78m
2013-06-14 05:38:48 +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
Launchpad Translations on behalf of openerp 75595cc55b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130611063100-w95zvev0e2wme31v
bzr revid: launchpad_translations_on_behalf_of_openerp-20130611063242-nvli6wf9xoxol1i9
bzr revid: launchpad_translations_on_behalf_of_openerp-20130611063247-ed0nk3aer2b28d41
2013-06-11 06:32:47 +00:00
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
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
Christophe Matthieu d86f6f24c0 [IMP] suppress button oe_demo_play
bzr revid: chm@openerp.com-20130603154158-7k9tvdwmn6ukp5x3
2013-06-03 17:41:58 +02:00
Vo Minh Thu 38d9325f66 [MERGE] views: removed unnecessary `model` attribute used with `ref`.
bzr revid: vmt@openerp.com-20130603144446-ara6oli0her5rdm3
2013-06-03 16:44:46 +02:00
Launchpad Translations on behalf of openerp 816e9713ed Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130530054519-ritlff842k1rzy3c
2013-05-30 05:45:19 +00:00
Fabien Pinckaers 36cd14400a [IMP] manifest modules
bzr revid: fp@openerp.com-20130529180527-x2uxuqdblkkpzeix
2013-05-29 20:05:27 +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
Fabien Pinckaers 0dc0d9f83c [IMP] modules manifest
bzr revid: fp@openerp.com-20130526205613-k4d8b5gb0mrxpm2f
2013-05-26 22:56:13 +02:00
Fabien Pinckaers 92eda4d460 [IMP] customer quotes
bzr revid: fp@tinyerp.com-20130525135501-ecmr63atek6632m2
2013-05-25 15:55:01 +02:00
Fabien Pinckaers afa307f9e7 [IMP] Invoicing manifest
bzr revid: fp@tinyerp.com-20130525131515-zy1778t7e2xpjkfa
2013-05-25 15:15:15 +02:00
Thibault Delavallée 8aa85c2523 [FORWARD] Forward port of addons until revision 8711
bzr revid: tde@openerp.com-20130521133807-5n97jep45f3lf6uq
bzr revid: tde@openerp.com-20130522083012-4yry4ht2943sjatn
2013-05-22 10:30:12 +02:00
Thibault Delavallée a05b0bebbe [FORWARD] Forward port of 7.0 branch until revision 9143.
bzr revid: tde@openerp.com-20130521122359-b5vii7gv8arluz06
2013-05-21 14:23:59 +02:00
Launchpad Translations on behalf of openerp 50da4f37ab Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130516055522-vvzc9h3p43b3zkwb
2013-05-16 05:55:22 +00:00
Quentin (OpenERP) bcf32c6d64 [MERGE] forward port of bugfixes made in addons v7 up to revision 9098.
bzr revid: qdp-launchpad@openerp.com-20130514120341-cvxysuez350hy9s2
2013-05-14 14:03:41 +02:00
Quentin (OpenERP) 5a367b4c9a [IMP] account_voucher, usability: added currency_help_label to help at the understanding when using the payment rate fields
bzr revid: qdp-launchpad@openerp.com-20130514115213-cklf7s6r889ahen7
2013-05-14 13:52:13 +02:00
Quentin (OpenERP) 9b01552b79 [IMP] account_voucher, usability: reset the amount to 0 in the 'pay invoice wizard' if the currency is not the same than the invoice currency to avoid a common mistake
bzr revid: qdp-launchpad@openerp.com-20130513142116-wyuud8n9fcnafc7l
2013-05-13 16:21:16 +02:00