Rucha (Open ERP)
dd7a2972d8
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120813051411-5no0xcudwbkw07c5
2012-08-13 10:44:11 +05:30
Fabien Pinckaers
c17b2443e7
[IMP] improved UI for PoS - mainly forms version=7.0
...
bzr revid: fp@openerp.com-20120811133406-jvso3qhmozmgnj3j
2012-08-11 15:34:06 +02:00
Antonin Bourguignon
72fdeea2d8
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120810153957-asszi74t9dxrzhx7
2012-08-10 17:39:57 +02:00
Quentin (OpenERP)
8b47fc9a32
[MERGE] branch with improvements of refunds handling in account_voucher + whipping of some dead code (in account_voucher too)
...
bzr revid: qdp-launchpad@openerp.com-20120810152331-h837mhhvdq8x0j1y
2012-08-10 17:23:31 +02:00
Antonin Bourguignon
f2fd44d85b
[MERGE] latust trunk
...
bzr revid: abo@openerp.com-20120810140856-xl6sj3xu9t4bee6c
2012-08-10 16:08:56 +02:00
Quentin (OpenERP)
29bd7ba2db
[IMP] account: invoice form view usability improvement (display 'Refund' in place of 'Invoice' when needed)
...
bzr revid: qdp-launchpad@openerp.com-20120810122621-dbhx84hse3fylajw
2012-08-10 14:26:21 +02:00
Stephane Wirtel
5b4dadc773
[MERGE]
...
bzr revid: stw@openerp.com-20120810083733-hm0fq46jeonb4eaq
2012-08-10 10:37:33 +02:00
Fabien Pinckaers
9dd3e6476f
[IMP] PoS backend
...
bzr revid: fp@tinyerp.com-20120809212311-q2b86eww9ppvdv8s
2012-08-09 23:23:11 +02:00
Antonin Bourguignon
ee4fd16e94
[FIX] remove the option from the user_id fields
...
we want users to be openable !
also improve indentation and remove some useless whitespaces
bzr revid: abo@openerp.com-20120809163529-8adlpszt3n6lhszi
2012-08-09 18:35:29 +02:00
Antonin Bourguignon
24f6e09c45
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120809143919-qrn9nm5ut5vlm8hw
2012-08-09 16:39:19 +02:00
Quentin (OpenERP)
af32150ad8
[REV] reverted previous commit (7212) that removes footer field on res.partner.bank, because specs changed
...
bzr revid: qdp-launchpad@openerp.com-20120809120409-lmubwp2k7wig83hz
2012-08-09 14:04:09 +02:00
Stephane Wirtel
6aad16cf6b
[FIX] account: show the product on the account.invoice.line
...
bzr revid: stw@openerp.com-20120809102431-mxzx6c2iagwjp28f
2012-08-09 12:24:31 +02:00
Stephane Wirtel
db1fe326e5
[MERGE] lp:~openerp-dev/openobject-addons/trunk-res_bank_remove_footer-mdi
...
bzr revid: stw@openerp.com-20120809091227-rit1oj5vqzppo5q6
2012-08-09 11:12:27 +02:00
Olivier Dony
3fd9a77c83
[REVERT] Cancel PO Template changes from rev.2702 - to be fully re-generated before next release
...
We'll also attempt to replace the master strings in the
translated .po files before replacing the master strings,
to avoid losing translations just because of mere typo fixes.
bzr revid: odo@openerp.com-20120808144613-wtz50tcz5n7kvcza
2012-08-08 16:46:13 +02:00
Stephane Wirtel
4ae8ce4516
[MERGE]
...
bzr revid: stw@openerp.com-20120808140846-ay7qn0bymtdbwj9q
2012-08-08 16:08:46 +02:00
Stephane Wirtel
cc126a342e
[MERGE] lp:~openerp-dev/openobject-addons/trunk-addons_issue_account-cha
...
bzr revid: stw@openerp.com-20120808140645-p6q5cmap16wv69oa
2012-08-08 16:06:45 +02:00
Antonin Bourguignon
b5fdcedbc9
[FIX] remove the weird balance_check method in account (what was it doing there ?)
...
bzr revid: abo@openerp.com-20120808120856-r5qxpxigaehdbfyt
2012-08-08 14:08:56 +02:00
Rucha (Open ERP)
1fd0cd8200
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120808103917-0xxio0ugprx6y4r2
2012-08-08 16:09:17 +05:30
Quentin (OpenERP)
de3513e602
[FIX] account: reload already printed invoices that are stored as attachment instead of generating the report again
...
bzr revid: qdp-launchpad@openerp.com-20120808101419-bd1hmpp3nv7byp2o
2012-08-08 12:14:19 +02:00
Mayur Maheshwari (OpenERP)
ff612f9d02
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20120808094005-o7v0l6u15ide75za
2012-08-08 15:10:05 +05:30
Antonin Bourguignon
4388ace499
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120808091048-hr1r4vn9milozexf
2012-08-08 11:10:48 +02:00
Fabien Pinckaers
a2eea7db85
[IMP] layout form view wizard CoA
...
bzr revid: fp@tinyerp.com-20120808074436-yg5t0ctdgiwn5ccz
2012-08-08 09:44:36 +02:00
Rucha (Open ERP)
d597437dd7
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120808063503-ymsvwnerxakqbcbx
2012-08-08 12:05:03 +05:30
d58b36a8a3
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120808043651-egwkmt6jun55wr8g
bzr revid: launchpad_translations_on_behalf_of_openerp-20120808044644-idxbpx3utx816s2p
2012-08-08 04:46:44 +00:00
Divyesh Makwana (Open ERP)
11ef76794f
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20120808043059-4o3sg9o8fm3dsxcp
2012-08-08 10:00:59 +05:30
Fabien Pinckaers
4935ac7395
[IMP] subtotal visible on SO lines
...
bzr revid: fp@tinyerp.com-20120807171101-4cg1ivz0dksug05t
2012-08-07 19:11:01 +02:00
Antonin Bourguignon
a97687a420
[MERGE] latest trunk
...
also replace the error message title 'Operation Not Permitted' by 'Invalid Action'
bzr revid: abo@openerp.com-20120807120451-zdrrecilfh82obhl
2012-08-07 14:04:51 +02:00
Antonin Bourguignon
59aa37f0e4
[IMP] all the warning messages now start with 'Warning\!' (not 'Warning' or 'Warning \!')
...
bzr revid: abo@openerp.com-20120807113414-7mryqyt3jnq8shsa
2012-08-07 13:34:14 +02:00
Antonin Bourguignon
8a64e7580a
[IMP] all the error messages now start with 'Error\!' (not 'Error' or 'Error \!')
...
bzr revid: abo@openerp.com-20120807113137-44vehm0mthqawlo3
2012-08-07 13:31:37 +02:00
Antonin Bourguignon
b0e8ae4c7d
[IMP] error messages
...
fix errors ending with an exclamation point; use a point instead
remove uniques (or almost) error messages titles, like 'Encoding Error' (1 occurrence in addons), 'Integrity Error' (1 occurrence in addons), 'Report Name' (1 occurrence in addons), 'Value Error' (1 occurrence in addons), 'Wrong Period Code' (1 occurrence in addons); replace these with 'Error'
add newline character after some messages titles, when necessary
fix 'UserError': should be 'User Error'
remove spaces before exclamation marks
add capital letters to messages titles words (e.g.: 'Invalid action' becomes 'Invalid Action')
bzr revid: abo@openerp.com-20120807110616-u3nlnybtgaebro18
2012-08-07 13:06:16 +02:00
Divyesh Makwana (Open ERP)
10b26a9edf
[IMP] account, edi : Removed 'footer' boolean from 'res.partner.bank' because 'rml_footer2' is now fully editable since server revision 4198 and its related changes.
...
bzr revid: mdi@tinyerp.com-20120807110257-sy98hpliumlhtwis
2012-08-07 16:32:57 +05:30
Antonin Bourguignon
fe5956057a
[FIX] spelling: 'insufficient data' instead of 'data insufficient'
...
bzr revid: abo@openerp.com-20120807102326-sro2nxr4zn95zhs1
2012-08-07 12:23:26 +02:00
Ajay Chauhan (OpenERP)
ae6be26e3a
[IMP]account : revert the changes for demo file
...
bzr revid: cha@tinyerp.com-20120807064810-dbh4dywgsbuy0a81
2012-08-07 12:18:10 +05:30
Ajay Chauhan (OpenERP)
dea2f543e5
[Merge] Merge with main addons.
...
bzr revid: cha@tinyerp.com-20120807062225-1nc3wf630cblz3c6
2012-08-07 11:52:25 +05:30
3cfd65b43d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120807053928-8131c98edycpivlb
2012-08-07 05:39:28 +00:00
Rucha (Open ERP)
7a112a0af7
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120807051730-yorimgtra9a5kss3
2012-08-07 10:47:30 +05:30
Fabien Pinckaers
6ff3e790ec
[IMP] config wizards small improvements in layout
...
bzr revid: fp@openerp.com-20120806195620-sozifrvbjockq33u
2012-08-06 21:56:20 +02:00
Fabien Pinckaers
63f2b492f5
[MERGE] improvement placeholders
...
bzr revid: fp@openerp.com-20120806190527-gb3gs4cexnijaezk
2012-08-06 21:05:27 +02:00
Antonin Bourguignon
48e0915804
[IMP] rephrase some error and warning messages in account
...
remove exclamation marks at the end of messages
remove first person usage ('I' and 'We')
remove unjustified capital letters
rephrase the clumsy form 'No <some attribute> is defined'
bzr revid: abo@openerp.com-20120806154410-kbf9aai2uzq2b0c4
2012-08-06 17:44:10 +02:00
pso (OpenERP)
122dcbd7bf
[IMP] account: Skipped set option wizard after installation of belgium COA
...
bzr revid: pso@tinyerp.com-20120806132440-4w2fj0xyk99kno1s
2012-08-06 18:54:40 +05:30
Pinakin Nayi (OpenERP)
3aab9f4f56
[IMP]accounting-option-wizard
...
bzr revid: pna@tinyerp.com-20120806121722-w2r8givb32dl0mn3
2012-08-06 17:47:22 +05:30
Mayur Maheshwari (OpenERP)
7c51b1811d
[FIX]all :set a no_open widget in this filed(country_id,state_id,title,context_id,timebox_id,user_id)
...
bzr revid: mma@tinyerp.com-20120806110307-nj7qipixr14puhub
2012-08-06 16:33:07 +05:30
Stephane Wirtel
3155c9b075
[MERGE] lp:~openerp-dev/openobject-addons/trunk-addons-issues3-account-pso
...
bzr revid: stw@openerp.com-20120806110035-mkegg0b6x5oom1mr
2012-08-06 13:00:35 +02:00
pso (OpenERP)
389f8d6803
[MERGE] Merge with main branch
...
bzr revid: pso@tinyerp.com-20120806094234-1b145yrjixy5yrsg
2012-08-06 15:12:34 +05:30
Stephane Wirtel
2f4d4320e2
[MERGE]
...
bzr revid: stw@openerp.com-20120806075624-ukz8lrnp1li67zft
2012-08-06 09:56:24 +02:00
pso (OpenERP)
c7581d70ac
[MERGE] Merge with main branch
...
bzr revid: pso@tinyerp.com-20120806055519-5mtg1amkn6qeeqq3
2012-08-06 11:25:19 +05:30
Ajay Chauhan (OpenERP)
bd19887191
[IMP]account : remove conflicts
...
bzr revid: cha@tinyerp.com-20120806053447-shfvzo9i26xmalx1
2012-08-06 11:04:47 +05:30
Ajay Chauhan (OpenERP)
fe54bc7b88
[Merge] Merge with main addons.
...
bzr revid: cha@tinyerp.com-20120806052353-8tp9p3bbood6b8pj
2012-08-06 10:53:53 +05:30
Rucha (Open ERP)
b7daa1fb31
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120803045532-wsgei101ogh0o44d
bzr revid: rpa@tinyerp.com-20120806050952-xecwmyhg4p2fs4id
2012-08-06 10:39:52 +05:30
Ajay Chauhan (OpenERP)
e366a1b665
[Merge] Merge with main addons.
...
bzr revid: cha@tinyerp.com-20120803065532-nq2e9w41ezbgvoya
bzr revid: cha@tinyerp.com-20120806050406-g2qof1qhvp8v0hkv
2012-08-06 10:34:06 +05:30
Rucha (Open ERP)