From df765fab238930d09ed7358f7241a3ef5a498151 Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Wed, 24 Oct 2012 22:22:42 -0400 Subject: [PATCH 01/31] [FIX] Account chart templates [ADD] Dependency, accounts, default settings for real time inventory bzr revid: maxime.chambreuil@savoirfairelinux.com-20121025022242-exictblb8myshq9t --- addons/l10n_ca/__openerp__.py | 9 +++- addons/l10n_ca/account_chart_en.xml | 40 ++++++++++++---- addons/l10n_ca/account_chart_fr.xml | 48 +++++++++++++------- addons/l10n_ca/account_chart_template_en.xml | 19 +++++++- addons/l10n_ca/account_chart_template_fr.xml | 20 +++++++- 5 files changed, 108 insertions(+), 28 deletions(-) diff --git a/addons/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py index 9c3cfea2fb1..05279b6ef8e 100644 --- a/addons/l10n_ca/__openerp__.py +++ b/addons/l10n_ca/__openerp__.py @@ -30,7 +30,14 @@ This is the module to manage the English and French - Canadian accounting chart Canadian accounting charts and localizations. """, - 'depends': ['base', 'account', 'base_iban', 'base_vat', 'account_chart'], + 'depends': [ + 'base', + 'account', + 'base_iban', + 'base_vat', + 'account_chart', + 'account_anglo_saxon' + ], 'data': [ 'account_chart_en.xml', 'account_tax_code_en.xml', diff --git a/addons/l10n_ca/account_chart_en.xml b/addons/l10n_ca/account_chart_en.xml index acb4fa4802b..27f06985fbd 100644 --- a/addons/l10n_ca/account_chart_en.xml +++ b/addons/l10n_ca/account_chart_en.xml @@ -36,14 +36,6 @@ CASH - - 1111 - - liquidity - - Checking Account - - 112 @@ -68,6 +60,22 @@ STOCKS + + 1141 + + other + + Stock In Hand + + + + 1145 + + other + + Stock Delivered But Not Billed + + 115 @@ -270,6 +278,22 @@ CURRENT FINANCIAL DEBTS + + 214 + + view + + STOCK LIABILITIES + + + + 2141 + + other + + Stock Received But Not Billed + + 25 diff --git a/addons/l10n_ca/account_chart_fr.xml b/addons/l10n_ca/account_chart_fr.xml index dbf4f9aad7c..8adfbb5eab6 100644 --- a/addons/l10n_ca/account_chart_fr.xml +++ b/addons/l10n_ca/account_chart_fr.xml @@ -36,22 +36,6 @@ ENCAISSE - - 1111 - - liquidity - - Compte chèque - - - - 1112 - - liquidity - - Petite caisse - - 112 @@ -76,6 +60,22 @@ STOCKS + + 1141 + + other + + Stock + + + + 1145 + + other + + Stock expédié non-facturé + + 115 @@ -294,6 +294,22 @@ PASSIFS LIÉS AUX ACTIFS DÉTENUS EN VUE DE LEUR CESSION + + 216 + + view + + PASSIFS DE STOCK + + + + 2161 + + other + + Stock reçu non facturé + + 25 diff --git a/addons/l10n_ca/account_chart_template_en.xml b/addons/l10n_ca/account_chart_template_en.xml index 6ddfa567d98..ad566c5add8 100644 --- a/addons/l10n_ca/account_chart_template_en.xml +++ b/addons/l10n_ca/account_chart_template_en.xml @@ -8,11 +8,26 @@ Canada - Chart of Accounts for english-speaking provinces - + - + + + + + + + + + + + + + property_stock_valuation_account_id + + + diff --git a/addons/l10n_ca/account_chart_template_fr.xml b/addons/l10n_ca/account_chart_template_fr.xml index 02f4deee714..b680ddad7ae 100644 --- a/addons/l10n_ca/account_chart_template_fr.xml +++ b/addons/l10n_ca/account_chart_template_fr.xml @@ -7,12 +7,30 @@ Canada - Plan comptable pour les provinces francophones - + + + + + + + + + + + + + property_stock_valuation_account_id + + + + + + From 64f21c82781cf831267565912b0162ae48b44cd2 Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Tue, 30 Oct 2012 11:12:47 -0400 Subject: [PATCH 02/31] [FIX] Relation with product category bzr revid: maxime.chambreuil@savoirfairelinux.com-20121030151247-1qiwar11sommvhfl --- addons/l10n_ca/account_chart_template_fr.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/l10n_ca/account_chart_template_fr.xml b/addons/l10n_ca/account_chart_template_fr.xml index b680ddad7ae..55c3fb1552d 100644 --- a/addons/l10n_ca/account_chart_template_fr.xml +++ b/addons/l10n_ca/account_chart_template_fr.xml @@ -16,12 +16,12 @@ - + - + @@ -29,7 +29,7 @@ - + From 7320093e0c21db32e89dc28616d82d99465ab586 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Thu, 22 Nov 2012 12:32:12 +0530 Subject: [PATCH 03/31] [IMP]tracked res partner fields bzr revid: sgo@tinyerp.com-20121122070212-9vejb0bltb4ffeff --- openerp/addons/base/res/res_partner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index df42bb81521..4a3cb4b9676 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -195,7 +195,7 @@ class res_partner(osv.osv, format_address): help="The partner's timezone, used to output proper date and time values inside printed reports. " "It is important to set a value for this field. You should use the same timezone " "that is otherwise used to pick and render date and time values: your computer's timezone."), - 'user_id': fields.many2one('res.users', 'Salesperson', help='The internal user that is in charge of communicating with this contact if any.'), + 'user_id': fields.many2one('res.users', 'Salesperson', tracked=True, help='The internal user that is in charge of communicating with this contact if any.'), 'vat': fields.char('TIN', size=32, help="Tax Identification Number. Check the box if this contact is subjected to taxes. Used by the some of the legal statements."), 'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'), 'website': fields.char('Website', size=64, help="Website of Partner or Company"), From f38f9c1c8af8e7cc4ee0de8a08ad8a919e3bc800 Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Tue, 27 Nov 2012 10:10:26 -0500 Subject: [PATCH 04/31] [IMP] TVQ changes for 2013 http://www.revenuquebec.ca/fr/entreprise/taxes/tvq_tps/modifications-regime-tvq.aspx bzr revid: maxime.chambreuil@savoirfairelinux.com-20121127151026-1h4l7z829u5ir7aq --- addons/l10n_ca/account_tax_en.xml | 10 ++++------ addons/l10n_ca/account_tax_fr.xml | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/addons/l10n_ca/account_tax_en.xml b/addons/l10n_ca/account_tax_en.xml index f185f7f9198..31aaf95e1bf 100644 --- a/addons/l10n_ca/account_tax_en.xml +++ b/addons/l10n_ca/account_tax_en.xml @@ -118,7 +118,6 @@ 0.050000 percent 1 - @@ -130,10 +129,10 @@ - TVQ for sales - 9.5% + TVQ for sales - 9.975% TVQ sale - 0.095000 + 0.099750 percent 2 @@ -388,7 +387,6 @@ 0.050000 percent 1 - @@ -400,10 +398,10 @@ - TVQ for purchases - 9.5% + TVQ for purchases - 9.975% TVQ purchase - 0.095000 + 0.099750 percent 2 diff --git a/addons/l10n_ca/account_tax_fr.xml b/addons/l10n_ca/account_tax_fr.xml index 169bfe4f20b..b344feeec83 100644 --- a/addons/l10n_ca/account_tax_fr.xml +++ b/addons/l10n_ca/account_tax_fr.xml @@ -118,7 +118,6 @@ 0.050000 percent 1 - @@ -130,10 +129,10 @@ - TVQ sur les ventes - 9.5% + TVQ sur les ventes - 9.975% TVQ sale - 0.095000 + 0.099750 percent 2 @@ -388,7 +387,6 @@ 0.050000 percent 1 - @@ -400,10 +398,10 @@ - TVQ sur les achats - 9.5% + TVQ sur les achats - 9.975% TVQ purchase - 0.095000 + 0.099750 percent 2 From 13dacd11c10dac853def763432829b8976604a7d Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Thu, 6 Dec 2012 09:36:04 -0500 Subject: [PATCH 05/31] [IMP] Copy charts from 6.1 to trunk bzr revid: maxime.chambreuil@savoirfairelinux.com-20121206143604-gt0h2rf3toiif8cy --- addons/l10n_ca/account_chart_en.xml | 1262 +++++++++++---------- addons/l10n_ca/account_chart_fr.xml | 1386 +++++++++++++----------- addons/l10n_ca/fiscal_templates_fr.xml | 8 +- 3 files changed, 1488 insertions(+), 1168 deletions(-) diff --git a/addons/l10n_ca/account_chart_en.xml b/addons/l10n_ca/account_chart_en.xml index 27f06985fbd..9c52f3ca346 100644 --- a/addons/l10n_ca/account_chart_en.xml +++ b/addons/l10n_ca/account_chart_en.xml @@ -6,417 +6,570 @@ 0 Account Chart CA EN + view - + - - 1 - - view - - ASSETS - - - - 11 - - view - - CURRENT ASSETS - - - - 111 - - view - - CASH - + + 1 + + view + + ASSETS + + + + 11 + + view + + CURRENT ASSETS + + + + 111 + + view + + CASH + - - 112 - - view - - TREASURY OR TREASURY EQUIVALENTS - + + 112 + + view + + TREASURY OR TREASURY EQUIVALENTS + - - 113 - - view - - CERTIFICATES OF DEPOSITS - + + 113 + + view + + CERTIFICATES OF DEPOSITS + - - 114 - - view - - STOCKS - + + 114 + + view + + STOCKS + - - 1141 - - other - - Stock In Hand - + + 1141 + + other + + Stock In Hand + - - 1145 - - other - - Stock Delivered But Not Billed - + + 1145 + + other + + Stock Delivered But Not Billed + - - 115 - - view - - ACCOUNTS RECEIVABLES - + + 115 + + view + + ACCOUNTS RECEIVABLES + - - 1151 - - receivable - - - Customers Account - + + 1151 + + receivable + + + Customers Account + - - 1152 - - view - - ALLOWANCE FOR DOUBTFUL ACCOUNTS - + + 1152 + + view + + ALLOWANCE FOR DOUBTFUL ACCOUNTS + - - 116 - - view - - PREPAID EXPENSES - + + 116 + + view + + PREPAID EXPENSES + - - 117 - - view - - INVESTMENTS HELD FOR TRADING - + + 117 + + view + + INVESTMENTS HELD FOR TRADING + - - 118 - - view - - TAXES RECEIVABLES - + + 118 + + view + + TAXES RECEIVABLES + - - 1181 - - other - - - GST receivable - + + 1181 + + other + + + GST receivable + - - 1182 - - other - - - PST/QST receivable - + + 1182 + + other + + + PST/QST receivable + - - 1183 - - other - - - HST receivable - + + 1183 + + other + + + HST receivable + - - 15 - - view - - NON-CURRENT ASSETS - + + 15 + + view + + NON-CURRENT ASSETS + - - 151 - - view - - INVESTMENTS AVAILABLE FOR SALE - + + 151 + + view + + INVESTMENTS AVAILABLE FOR SALE + - - 152 - - view - - TANGIBLE ASSETS - + + 152 + + view + + TANGIBLE ASSETS + - - 1527 - - view - - ACCUMULATED DEPRECIATIONS - + + 1527 + + view + + ACCUMULATED DEPRECIATIONS + - - 153 - - view - - INTANGIBLE ASSETS - + + 153 + + view + + INTANGIBLE ASSETS + - - 1531 - - view - - PATENTS, TRADEMARKS AND COPYRIGHTS - + + 1531 + + view + + PATENTS, TRADEMARKS AND COPYRIGHTS + - + - - 2 - - view - - LIABILITIES - + + 2 + + view + + LIABILITIES + - - 21 - - view - - CURRENT LIABILITIES - + + 21 + + view + + CURRENT LIABILITIES + - - 211 - - view - - ACCOUNTS PAYABLES - + + 211 + + view + + ACCOUNTS PAYABLES + - - 2111 - - payable - - - Suppliers Account - + + 2111 + + payable + + + Suppliers Account + - - 212 - - view - - TAXES PAYABLES - + + 212 + + view + + OTHER ACCOUNTS PAYABLES + - - 2121 - - other - - - GST to pay - + + 213 + + view + + TAXES PAYABLES + - - 2122 - - other - - - PST/QST to pay - + + 2131 + + other + + + GST to pay + - - 2123 - - other - - - HST to pay - + + 2132 + + other + + + PST/QST to pay + - - 213 - - view - - CURRENT FINANCIAL DEBTS - + + 2133 + + other + + + HST to pay + - - 214 - - view - - STOCK LIABILITIES - + + 214 + + view + + LABOUR TAXES TO PAY + - - 2141 - - other - - Stock Received But Not Billed - + + 2141 + + view + + CANADIAN REVENU AGENCY + - - 25 - - view - - NON-CURRENT LIABILITIES - + + 21411 + + view + + Employment Insurance to pay + - - 251 - - view - - NON-CURRENT FINANCIAL DEBTS - + + 214111 + + other + + EI - Employees Contribution + - - 252 - - view - - PROVISIONS FOR PENSIONS AND OTHER POST-EMPLOYMENT ADVANTAGES - + + 214112 + + other + + EI - Employer Contribution + - - 253 - - view - - DEFERRED TAXES - + + 21412 + + other + + Federal Income Tax + - - 259 - - view - - OTHER NON-CURRENT LIABILITIES - + + 2142 + + view + + REVENU QUÉBEC + - + + 21421 + + other + + Health Services Fund to pay + - - 3 - - view - - EQUITY - + + 21422 + + view + + ANNUITIES TO PAY + - - 31 - - view - - SHARE CAPITAL - + + 214221 + + other + + Annuities - Employees Contribution + - - 32 - - view - - PREMIUMS - + + 214222 + + other + + Annuities - Employer Contribution + - - 33 - - view - - RETAINED EARNINGS - + + 21423 + + view + + PARENTAL INSURANCE PLAN TO PAY + - - 34 - - view - - DIVIDENDS - + + 214231 + + other + + PAP - Employee Contribution + - - 35 - - view - - TRANSLATION ADJUSTMENTS - + + 214232 + + other + + PAP - Employer Contribution + - - 36 - - view - - CONTRIBUTED SURPLUS - + + 21424 + + other + + Labour Health and Safety to pay + - + + 21425 + + other + + Labour Standards to pay + - - 4 - - view - - INCOMES - + + 21426 + + other + + Provincial Income Tax + - - 41 - - view - - OPERATING INCOMES - + + 215 + + view + + CURRENT FINANCIAL DEBTS + - - 411 - - other - - Inside Sales - + + 216 + + view + + LIABILITIES ASSETS HELD FOR TRANSFER + + + + 217 + + view + + STOCK LIABILITIES + + + + 2171 + + other + + Stock Received But Not Billed + + + + 25 + + view + + NON-CURRENT LIABILITIES + + + + 251 + + view + + NON-CURRENT FINANCIAL DEBTS + + + + 252 + + view + + PROVISIONS FOR PENSIONS AND OTHER POST-EMPLOYMENT ADVANTAGES + + + + 254 + + view + + DEFERRED TAXES + + + + 259 + + view + + OTHER NON-CURRENT LIABILITIES + + + + + + 3 + + view + + EQUITY + + + + 31 + + view + + SHARE CAPITAL + + + + 32 + + view + + PREMIUMS + + + + 33 + + view + + RETAINED EARNINGS + + + + 34 + + view + + DIVIDENDS + + + + 35 + + view + + TRANSLATION ADJUSTMENTS + + + + 36 + + view + + CONTRIBUTED SURPLUS + + + + + + 4 + + view + + INCOMES + + + + 41 + + view + + OPERATING INCOMES + + + + 411 + + other + + Inside Sales + 412 @@ -442,223 +595,238 @@ International Sales - - 419 - - view - - OTHER OPERATING INCOMES - + + 419 + + view + + OTHER OPERATING INCOMES + - - 42 - - view - - NON-OPERATING INCOMES - + + 42 + + view + + NON-OPERATING INCOMES + - - 421 - - view - - INTERESTS - + + 425 + + view + + INTERESTS + - - 429 - - view - - OTHER NON-OPERATING INCOMES - + + 429 + + view + + OTHER NON-OPERATING INCOMES + - + - - 5 - - view - - EXPENSES - + + 5 + + view + + EXPENSES + - - 51 - - view - - OPERATING EXPENSES - + + 51 + + view + + OPERATING EXPENSES + - - 511 - - view - - COST OF GOODS SOLD - + + 511 + + view + + COST OF GOODS SOLD + - - 5111 - - other - - Inside Purchases - + + 5111 + + other + + Inside Purchases + - - 5112 - - other - - Purchases in harmonized provinces - + + 5112 + + other + + Purchases in harmonized provinces + - - 5113 - - other - - Purchases in non-harmonized provinces - + + 5113 + + other + + Purchases in non-harmonized provinces + - - 5114 - - other - - International Purchases - + + 5114 + + other + + International Purchases + - - 512 - - view - - LABOUR EXPENSES - + + 512 + + view + + LABOUR EXPENSES + - - 5121 - - other - - Salaries, wages and commissions - + + 51201 + + other + + Salaries, wages and commissions + - - 5122 - - other - - Holidays - + + 51202 + + other + + Holidays + - - 5123 - - other - - Employment Insurance - + + 51203 + + other + + Employment Insurance + - - 5124 - - other - - Health Services Fund - + + 51204 + + other + + Health Services Fund + - - 5125 - - other - - Annuities - + + 51205 + + other + + Annuities + - - 5126 - - other - - Parental Insurance - + + 51206 + + other + + Parental Insurance + - - 5127 - - other - - Labour Health and Safety - + + 51207 + + other + + Labour Health and Safety + - - 5128 - - other - - Labour Standards - + + 51208 + + other + + Labour Standards + - - 513 - - view - - SALES EXPENSES - + + 51209 + + other + + Federal Income Tax + - - 514 - - view - - GENERAL EXPENSES - + + 51210 + + other + + Provincial Income Tax + + + 513 + + view + + SALES EXPENSES + - - 515 - - view - - RESEARCH AND DEVELOPMENT EXPENSES - + + 514 + + view + + GENERAL EXPENSES + - - 519 - - view - - OTHER OPERATING EXPENSES - + + 515 + + view + + RESEARCH AND DEVELOPMENT EXPENSES + - - 55 - - view - - NON-OPERATING EXPENSES - + + 519 + + view + + OTHER OPERATING EXPENSES + - - 551 - - view - - INTEREST EXPENSES - + + 55 + + view + + NON-OPERATING EXPENSES + - - 559 - - view - - OTHER NON-OPERATING EXPENSES - + + 551 + + view + + INTERESTS EXPENSES + + + + 559 + + view + + OTHER NON-OPERATING EXPENSES + diff --git a/addons/l10n_ca/account_chart_fr.xml b/addons/l10n_ca/account_chart_fr.xml index 8adfbb5eab6..2628a641f08 100644 --- a/addons/l10n_ca/account_chart_fr.xml +++ b/addons/l10n_ca/account_chart_fr.xml @@ -2,7 +2,7 @@ - + 0 view @@ -10,679 +10,831 @@ Account Chart CA FR - + - - 1 - - view - - ACTIF - + + 1 + + view + + ACTIF + + + + 11 + + view + + ACTIFS COURANTS + + + + 111 + + view + + ENCAISSE + + + + 112 + + view + + TRÉSORERIE OU ÉQUIVALENTS DE TRÉSORERIE + + + + 113 + + view + + CERTIFICATS DE DÉPÔTS + + + + 114 + + view + + STOCKS + + + + 1141 + + other + + Stock + + + + 1145 + + other + + Stock expédié non-facturé + + + + 115 + + view + + COMPTES CLIENTS + + + + 1151 + + receivable + + + Comptes clients + + + + 1152 + + view + + PROVISION POUR CRÉANCES DOUTEUSES + + + + 116 + + view + + FRAIS PAYÉS D'AVANCE + + + + 117 + + view + + PLACEMENTS DÉTENUS À DES FINS DE TRANSACTION + + + + 118 + + view + + IMPÔTS À RECEVOIR + + + + 1181 + + other + + + TPS à recevoir + + + + 1182 + + other + + + TVP/TVQ à recevoir + + + + 1183 + + other + + + TVH à recevoir + + + + 15 + + view + + ACTIFS NON-COURANTS + + + + 151 + + view + + PLACEMENTS DISPONIBLES À LA VENTE + + + + 152 + + view + + IMMOBILISATIONS CORPORELLES + + + + 1527 + + view + + AMORTISSEMENTS CUMULÉS + + + + 153 + + view + + IMMOBILISATIONS INCORPORELLES + + + + 1531 + + view + + BREVETS, MARQUES DE COMMERCE ET DROITS D'AUTEURS + + + + + + 2 + + view + + PASSIF + + + + 21 + + view + + PASSIFS COURANTS + + + + 211 + + view + + FOURNISSEURS ET COMPTES RATTACHÉS + + + + 2111 + + payable + + + Comptes fournisseurs + + + + 212 + + view + + AUTRES COMPTES CRÉDITEURS + + + + 213 + + view + + IMPÔTS À PAYER + + + + 2131 + + other + + + TPS à payer + + + + 2132 + + other + + + TVP/TVQ à payer + + + + 2133 + + other + + + TVH à payer + + + + 214 + + view + + IMPÔTS LIÉS AUX SALAIRES À PAYER + + + + 2141 + + view + + AGENCE DU REVENU DU CANADA + + + + 21411 + + view + + ASSURANCE EMPLOI À PAYER + + + + 214111 + + other + + AE - Contribution des employés + + + + 214112 + + other + + AE - Contribution de l'employeur + + + + 21412 + + other + + Impôt fédéral sur les revenus + + + + 2142 + + view + + REVENU QUÉBEC + + + + 21421 + + other + + Fond des Services de Santé à payer + + + + 21422 + + view + + RENTES À PAYER + + + + 214221 + + other + + Rentes - Contribution des employés + + + + 214222 + + other + + Rentes - Contribution de l'employeur + + + + 21423 + + view + + ASSURANCE PARENTALE À PAYER + - - 11 - - view - - ACTIFS COURANTS - + + 214231 + + other + + AP - Contribution des employés + - - 111 - - view - - ENCAISSE - + + 214232 + + other + + AP - Contribution de l'employeur + - - 112 - - view - - TRÉSORERIE OU ÉQUIVALENTS DE TRÉSORERIE - + + 21424 + + other + + Santé et Sécurité au Travail à payer + - - 113 - - view - - CERTIFICATS DE DÉPÔTS - + + 21425 + + other + + Normes du Travail à payer + - - 114 - - view - - STOCKS - + + 21426 + + other + + Impôt provincial sur les revenus + - - 1141 - - other - - Stock - + + 215 + + view + + DETTES FINANCIÈRES COURANTES + - - 1145 - - other - - Stock expédié non-facturé - + + 216 + + view + + PASSIFS LIÉS AUX ACTIFS DÉTENUS EN VUE DE LEUR CESSION + - - 115 - - view - - COMPTES CLIENTS - + + 217 + + view + + PASSIFS DE STOCK + - - 1151 - - receivable - - - Comptes clients - + + 2171 + + other + + Stock reçu non facturé + - - 1152 - - view - - PROVISION POUR CRÉANCES DOUTEUSES - + + 25 + + view + + PASSIFS NON-COURANTS + - - 116 - - view - - FRAIS PAYÉS D'AVANCE - + + 251 + + view + + DETTES FINANCIÈRES NON-COURANTES + - - 117 - - view - - PLACEMENTS DÉTENUS À DES FINS DE TRANSACTION - + + 252 + + view + + PROVISIONS POUR RETRAITES ET AUTRES AVANTAGES POSTÉRIEURS À L'EMPLOI + - - 118 - - view - - IMPÔTS À RECEVOIR - + + 253 + + view + + IMPÔTS DIFFÉRÉS + + + + 254 + + view + + AUTRES PASSIFS NON-COURANTS + - - 1181 - - other - - - TPS à recevoir - + - - 1182 - - other - - - TVP/TVQ à recevoir - + + 3 + + view + + CAPITAUX PROPRES + - - 1183 - - other - - - TVH à recevoir - + + 31 + + view + + CAPITAL-ACTIONS + - - 15 - - view - - ACTIFS NON-COURANTS - + + 32 + + view + + PRIMES + - - 151 - - view - - PLACEMENTS DISPONIBLES À LA VENTE - + + 33 + + view + + BÉNÉFICES NON RÉPARTIS + - - 152 - - view - - IMMOBILISATIONS CORPORELLES - + + 34 + + view + + DIVIDENDES + - - 1527 - - view - - AMORTISSEMENTS CUMULÉS - + + 35 + + view + + ÉCARTS DE CONVERSION + - - 153 - - view - - IMMOBILISATIONS INCORPORELLES - + + 36 + + view + + SURPLUS D'APPORT + - - 1531 - - view - - BREVETS, MARQUES DE COMMERCE ET DROITS D'AUTEURS - - - - - - 2 - - view - - PASSIF - - - - 21 - - view - - PASSIFS COURANTS - - - - 211 - - view - - FOURNISSEURS ET COMPTES RATTACHÉS - - - - 2111 - - payable - - - Comptes fournisseurs - - - - 212 - - view - - AUTRES COMPTES CRÉDITEURS - - - - 213 - - view - - IMPÔTS À PAYER - - - - 2131 - - other - - - TPS à payer - - - - 2132 - - other - - - TVP/TVQ à payer - - - - 2133 - - other - - - TVH à payer - - - - 214 - - view - - DETTES FINANCIÈRES COURANTES - - - - 215 - - view - - PASSIFS LIÉS AUX ACTIFS DÉTENUS EN VUE DE LEUR CESSION - - - - 216 - - view - - PASSIFS DE STOCK - - - - 2161 - - other - - Stock reçu non facturé - - - - 25 - - view - - PASSIFS NON-COURANTS - - - - 251 - - view - - DETTES FINANCIÈRES NON-COURANTES - - - - 252 - - view - - PROVISIONS POUR RETRAITES ET AUTRES AVANTAGES POSTÉRIEURS À L'EMPLOI - - - - 253 - - view - - IMPÔTS DIFFÉRÉS - - - - 254 - - view - - AUTRES PASSIFS NON-COURANTS - - - - - - 3 - - view - - CAPITAUX PROPRES - - - - 31 - - view - - CAPITAL-ACTIONS - - - - 32 - - view - - PRIMES - - - - 33 - - view - - BÉNÉFICES NON RÉPARTIS - - - - 34 - - view - - DIVIDENDES - - - - 35 - - view - - ÉCARTS DE CONVERSION - - - - 36 - - view - - SURPLUS D'APPORT - - - - 39 - - view - - AUTRES ÉLÉMENTS DU RÉSULTAT GLOBAL - + + 39 + + view + + AUTRES ÉLÉMENTS DU RÉSULTAT GLOBAL + - - 4 - - view - - PRODUITS - + + 4 + + view + + PRODUITS + - - 41 - - view - - PRODUITS D'EXPLOITATION - + + 41 + + view + + PRODUITS D'EXPLOITATION + - - 411 - - other - - Ventes - + + 411 + + other + + Ventes + - - 412 - - other - - Ventes avec des provinces harmonisées - - - - 413 - - other - - Ventes avec des provinces non-harmonisées - + + 412 + + other + + Ventes avec des provinces harmonisées + + + + 413 + + other + + Ventes avec des provinces non-harmonisées + - - 414 - - other - - Ventes à l'étranger - + + 414 + + other + + Ventes à l'étranger + - - 419 - - view - - AUTRES PRODUITS D'EXPLOITATION - + + 419 + + view + + AUTRES PRODUITS D'EXPLOITATION + - - 42 - - view - - PRODUITS NON LIÉS À L'EXPLOITATION - + + 42 + + view + + PRODUITS NON LIÉS À L'EXPLOITATION + - - 425 - - view - - INTÉRÊTS - + + 425 + + view + + INTÉRÊTS + - - 429 - - view - - AUTRES PRODUITS NON LIÉS À L'EXPLOITATION - + + 429 + + view + + AUTRES PRODUITS NON LIÉS À L'EXPLOITATION + - + - - 5 - - view - - CHARGES - + + 5 + + view + + CHARGES + - - 51 - - view - - CHARGES D'EXPLOITATION - + + 51 + + view + + CHARGES D'EXPLOITATION + - - 511 - - view - - COÛT DES PRODUITS VENDUS - - + + 511 + + view + + COÛT DES PRODUITS VENDUS + + - 5111 - - other - - Achats - + 5111 + + other + + Achats + - - 5112 - - other - - Achats dans des provinces harmonisées - - - - 5113 - - other - - Achats dans des provinces non-harmonisées - + + 5112 + + other + + Achats dans des provinces harmonisées + + + + 5113 + + other + + Achats dans des provinces non-harmonisées + - - 5114 - - other - - Achats à l'étranger - + + 5114 + + other + + Achats à l'étranger + - - 512 - - view - - SALAIRES ET CHARGES SOCIALES - + + 512 + + view + + SALAIRES ET CHARGES SOCIALES + - - 51201 - - other - - Salaires - + + 51201 + + other + + Salaires + - - 51202 - - other - - Vacances - + + 51202 + + other + + Vacances + - - 51203 - - other - - Assurance Emploi - + + 51203 + + other + + Assurance Emploi + - - 51204 - - other - - Fonds des services de santé - + + 51204 + + other + + Fonds des services de santé + - - 51205 - - other - - Rentes - + + 51205 + + other + + Rentes + - - 51206 - - other - - Assurance parental - + + 51206 + + other + + Assurance parentale + - - 51207 - - other - - Santé et sécurité au travail - + + 51207 + + other + + Santé et sécurité au travail + - - 51208 - - other - - Normes du travail - + + 51208 + + other + + Normes du travail + - - 513 - - view - - FRAIS SUR VENTE - + + 51209 + + other + + Impôt fédéral + - - 514 - - view - - FRAIS GÉNÉRAUX - + + 51210 + + other + + Impôt provincial + - - 515 - - view - - FRAIS DE RECHERCHE ET DÉVELOPPEMENT - + + 513 + + view + + FRAIS SUR VENTE + - - 519 - - view - - AUTRES FRAIS D'EXPLOITATION - + + 514 + + view + + FRAIS GÉNÉRAUX + - - 52 - - view - - FRAIS NON LIÉS À L'EXPLOITATION - + + 515 + + view + + FRAIS DE RECHERCHE ET DÉVELOPPEMENT + - - 521 - - view - - INTÉRÊTS DÉBITEURS - + + 519 + + view + + AUTRES FRAIS D'EXPLOITATION + - - 529 - - view - - AUTRES FRAIS NON LIÉS À L'EXPLOITATION - + + 52 + + view + + FRAIS NON LIÉS À L'EXPLOITATION + + + + 521 + + view + + INTÉRÊTS DÉBITEURS + + + + 529 + + view + + AUTRES FRAIS NON LIÉS À L'EXPLOITATION + diff --git a/addons/l10n_ca/fiscal_templates_fr.xml b/addons/l10n_ca/fiscal_templates_fr.xml index 722517366a8..3ba13d6642e 100644 --- a/addons/l10n_ca/fiscal_templates_fr.xml +++ b/addons/l10n_ca/fiscal_templates_fr.xml @@ -10,22 +10,22 @@ - Régime Provinces Harmonisées (12%) + Régime Provinces Harmonisées à 12% (BC) - Régime Provinces Harmonisées (13%) + Régime Provinces Harmonisées à 13% (NB, ON, NL) - Régime Provinces Harmonisées (13.5%) + Régime Provinces Harmonisées à 13.5% () - Régime Provinces Harmonisées (15%) + Régime Provinces Harmonisées à 15% (NS) From 8de8537c1e616deb203de865a8f6f70770da4fdc Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Mon, 10 Dec 2012 18:41:00 +0530 Subject: [PATCH 06/31] [IMP]add tracked attribute on fields bzr revid: sgo@tinyerp.com-20121210131100-v88knep1or2s5o03 --- openerp/osv/fields.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py index ea84cae978e..9e438f74c29 100644 --- a/openerp/osv/fields.py +++ b/openerp/osv/fields.py @@ -80,7 +80,7 @@ class _column(object): # used to hide a certain field type in the list of field types _deprecated = False - def __init__(self, string='unknown', required=False, readonly=False, domain=None, context=None, states=None, priority=0, change_default=False, size=None, ondelete=None, translate=False, select=False, manual=False, **args): + def __init__(self, string='unknown', required=False, readonly=False, domain=None, context=None, states=None, priority=0, change_default=False, size=None, ondelete=None, translate=False, select=False, manual=False,tracked=False, **args): """ The 'manual' keyword argument specifies if the field is a custom one. @@ -109,6 +109,7 @@ class _column(object): self.select = select self.manual = manual self.selectable = True + self.tracked = tracked self.group_operator = args.get('group_operator', False) self.groups = False # CSV list of ext IDs of groups that can access this field self.deprecated = False # Optional deprecation warning From 9ea98938cd3ccce780a3bb02134f0845851a9cef Mon Sep 17 00:00:00 2001 From: Michael Telahun Makonnen Date: Fri, 14 Dec 2012 19:52:54 +0300 Subject: [PATCH 07/31] Add Ethiopian localization for SMEs. bzr revid: mmakonnen@gmail.com-20121214165254-22zt55kqb90rjn3j --- addons/l10n_et/__init__.py | 20 +++ addons/l10n_et/__openerp__.py | 59 ++++++++ .../l10n_et/data/account.account.template.csv | 138 ++++++++++++++++++ addons/l10n_et/data/account.account.type.csv | 14 ++ .../l10n_et/data/account.chart.template.csv | 2 + .../data/account.tax.code.template.csv | 31 ++++ addons/l10n_et/data/account.tax.template.csv | 14 ++ addons/l10n_et/data/res.country.state.csv | 12 ++ addons/l10n_et/l10n_et_wizard.xml | 8 + addons/l10n_et/static/src/img/icon.png | Bin 0 -> 4032 bytes 10 files changed, 298 insertions(+) create mode 100644 addons/l10n_et/__init__.py create mode 100644 addons/l10n_et/__openerp__.py create mode 100644 addons/l10n_et/data/account.account.template.csv create mode 100644 addons/l10n_et/data/account.account.type.csv create mode 100644 addons/l10n_et/data/account.chart.template.csv create mode 100644 addons/l10n_et/data/account.tax.code.template.csv create mode 100644 addons/l10n_et/data/account.tax.template.csv create mode 100644 addons/l10n_et/data/res.country.state.csv create mode 100644 addons/l10n_et/l10n_et_wizard.xml create mode 100644 addons/l10n_et/static/src/img/icon.png diff --git a/addons/l10n_et/__init__.py b/addons/l10n_et/__init__.py new file mode 100644 index 00000000000..506fada4738 --- /dev/null +++ b/addons/l10n_et/__init__.py @@ -0,0 +1,20 @@ +#-*- coding:utf-8 -*- +############################################################################## +# +# Copyright (C) 2012 Michael Telahun Makonnen . +# All Rights Reserved. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## diff --git a/addons/l10n_et/__openerp__.py b/addons/l10n_et/__openerp__.py new file mode 100644 index 00000000000..f788e9c52d5 --- /dev/null +++ b/addons/l10n_et/__openerp__.py @@ -0,0 +1,59 @@ +#-*- coding:utf-8 -*- +############################################################################## +# +# Copyright (C) 2012 Michael Telahun Makonnen . +# All Rights Reserved. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +{ + 'name': 'Ethiopia - Accounting', + 'version': '1.0', + 'category': 'Localization/Account Charts', + 'description': """ +Base Module for Ethiopian Localization +====================================== + +This is the latest Ethiopian OpenERP localization and consists of: + - Chart of Accounts + - VAT tax structure + - Withholding tax structure + - Regional State listings + """, + 'author':'Michael Telahun Makonnen ', + 'website':'http://miketelahun.wordpress.com', + 'depends': [ + 'base_vat', + 'account_chart', + ], + 'init_xml': [ + 'data/account.account.type.csv', + 'data/account.account.template.csv', + 'data/account.tax.code.template.csv', + 'data/account.chart.template.csv', + 'data/account.tax.template.csv', + 'data/res.country.state.csv', + ], + 'update_xml': [ + 'l10n_et_wizard.xml', + ], + 'test': [ + ], + 'demo_xml': [ + ], + 'installable': True, + 'active': False, +} \ No newline at end of file diff --git a/addons/l10n_et/data/account.account.template.csv b/addons/l10n_et/data/account.account.template.csv new file mode 100644 index 00000000000..42b20174d74 --- /dev/null +++ b/addons/l10n_et/data/account.account.template.csv @@ -0,0 +1,138 @@ +"id","code","name","type","user_type:id","parent_id:id","reconcile" +"l10n_et0","0","Ethiopia","view","l10n_et_view","","" +"l10n_et1000","1000","REVENUE","view","l10n_et_view","l10n_et0","" +"l10n_et1100","1100","Sales of Goods and Services","other","l10n_et_income","l10n_et1000","" +"l10n_et2000","2000","ASSETS","view","l10n_et_view","l10n_et0","" +"l10n_et2100","2100-2199","Cash and Cash Equivalents","view","l10n_et_view","l10n_et2000","" +"l10n_et2102","2102","Cash at bank in foreigh currency","liquidity","l10n_et_current_assets","l10n_et2100","" +"l10n_et2104","2104","Letter of Credit restricted account","liquidity","l10n_et_current_assets","l10n_et2100","" +"l10n_et2440","2105","Investments current assets","view","l10n_et_view","l10n_et2100","" +"l10n_et2110","2110","Cash on hand and at bank","view","l10n_et_view","l10n_et2100","" +"l10n_et2200","2200-2299","Receivables","view","l10n_et_view","l10n_et2000","" +"l10n_et220119","2201-2219","Accounts Receivable","view","l10n_et_view","l10n_et2200","" +"l10n_et2201","2201","Suspense","receivable","l10n_et_receivable","l10n_et220119","" +"l10n_et2202","2202","Cash shortage","receivable","l10n_et_receivable","l10n_et220119","" +"l10n_et2203","2203","Advance to staff","receivable","l10n_et_receivable","l10n_et220119","" +"l10n_et2204","2204","Cash Registers","receivable","l10n_et_receivable","l10n_et220119","" +"l10n_et2211","2211","Trade Debtors","receivable","l10n_et_receivable","l10n_et220119","True" +"l10n_et2212","2212","VAT Receivable on Purchases","receivable","l10n_et_input_tax","l10n_et220119","" +"l10n_et2213","2213","Withholding Receivable on Sales","receivable","l10n_et_input_tax","l10n_et220119","" +"l10n_et2214","2214","VAT Withholding Receivable on Sales","receivable","l10n_et_input_tax","l10n_et220119","" +"l10n_et2250","2250","Prepayments","view","l10n_et_view","l10n_et2200","" +"l10n_et2251","2251","Advance to contractors","other","l10n_et_current_assets","l10n_et2250","" +"l10n_et2252","2252","Advance to consultant","other","l10n_et_current_assets","l10n_et2250","" +"l10n_et2253","2253","Advance to supplier","other","l10n_et_current_assets","l10n_et2250","" +"l10n_et2274","2254","Other Debtors","other","l10n_et_current_assets","l10n_et2200","" +"l10n_et2301","2301","Goods in Transit","other","l10n_et_current_assets","l10n_et2000","" +"l10n_et2351","2351","Stock","other","l10n_et_current_assets","l10n_et2000","" +"l10n_et2400","2400-2499","Production Stock","view","l10n_et_view","l10n_et2000","" +"l10n_et2411","2411","Work in Progress","other","l10n_et_current_assets","l10n_et2400","" +"l10n_et2412","2412","Finished Goods","other","l10n_et_current_assets","l10n_et2400","" +"l10n_et2500","2500","Fixed Assets","view","l10n_et_view","l10n_et2000","" +"l10n_et250019","2501-2519","Construction in Progress","view","l10n_et_view","l10n_et2500","" +"l10n_et2501","2501","Construction of buildings","other","l10n_et_asset","l10n_et250019","" +"l10n_et2503","2503","Construction of infrastructure","other","l10n_et_asset","l10n_et250019","" +"l10n_et2520","2520-2599","Property and Equipment","view","l10n_et_view","l10n_et2500","" +"l10n_et2521","2521","Vehicles and other vehicular transport","other","l10n_et_asset","l10n_et2520","" +"l10n_et2522","2522","Aircraft, boats, etc","other","l10n_et_asset","l10n_et2520","" +"l10n_et2523","2523","Plant machinery and equipment","other","l10n_et_asset","l10n_et2520","" +"l10n_et2525","2525","Buildings","other","l10n_et_asset","l10n_et2520","" +"l10n_et2527","2527","Infrastructure","other","l10n_et_asset","l10n_et2520","" +"l10n_et2529","2529","Furnishings and fixtures","other","l10n_et_asset","l10n_et2520","" +"l10n_et2530","2530","Livestock and tansport animals","other","l10n_et_asset","l10n_et2520","" +"l10n_et2700","2700","Long Term Loans","view","l10n_et_view","l10n_et2000","" +"l10n_et2800","2800","Investments","view","l10n_et_view","l10n_et2000","" +"l10n_et3000","3000","LIABILITIES","view","l10n_et_view","l10n_et0","" +"l10n_et300099","3000-3099","Payables","view","l10n_et_view","l10n_et3000","" +"l10n_et300019","3000-3019","Accounts Payable","view","l10n_et_view","l10n_et300099","" +"l10n_et3001","3001","Grace period payables","payable","l10n_et_payable","l10n_et300019","" +"l10n_et3002","3002","Trade Creditors","payable","l10n_et_payable","l10n_et300019","True" +"l10n_et3003","3003","Pension contribution payable","payable","l10n_et_payable","l10n_et300019","" +"l10n_et3004","3004","Salary payable","payable","l10n_et_payable","l10n_et300019","" +"l10n_et3006","3006","Witholding Payable","payable","l10n_et_output_tax","l10n_et300019","" +"l10n_et3007","3007","VAT Payable","Payable","l10n_et_output_tax","l10n_et300019","" +"l10n_et3008","3008","Federal Income Tax","payable","l10n_et_output_tax","l10n_et300019","" +"l10n_et3050","3050","Deposits","view","l10n_et_view","l10n_et300099","" +"l10n_et3054","3054","Other deposits","other","l10n_et_current_liabilities","l10n_et3050","" +"l10n_et3060","3060","Retentions","view","l10n_et_view","l10n_et300099","" +"l10n_et3061","3061","Retention on contract","other","l10n_et_current_liabilities","l10n_et3060","" +"l10n_et3100","3100","Long-Term Debt","view","l10n_et_view","l10n_et3000","" +"l10n_et310049","3100-3149","Local Loans","view","l10n_et_view","l10n_et3100","" +"l10n_et3103","3103","Commercial Loan","other","l10n_et_liability","l10n_et310049","" +"l10n_et3150","3150-3179","Foreign Loans","view","l10n_et_view","l10n_et3100","" +"l10n_et3153","3153","Commercial Loan","other","l10n_et_liability","l10n_et3150","" +"l10n_et4000","4000","NET ASSETS/EQUITY","view","l10n_et_view","l10n_et0","" +"l10n_et4001","4010","Share capital / equity","other","l10n_et_equity","l10n_et4000","" +"l10n_et4004","4020","Reserves","other","l10n_et_equity","l10n_et4000","" +"l10n_et4100","4100","Profit and loss account","other","l10n_et_profit_and_loss","l10n_et4000","" +"l10n_et5000","5000","COST OF GOODS SOLD","view","l10n_et_view","l10n_et0","" +"l10n_et5111","5111","Cost of Goods and Services","other","l10n_et_expense","l10n_et5000","" +"l10n_et5901","5901","Inventory Adjustments","other","l10n_et_expense","l10n_et5000","" +"l10n_et5911","5911","Purchase Returns and Allowances","other","l10n_et_expense","l10n_et5000","" +"l10n_et5921","5921","Other","other","l10n_et_expense","l10n_et5000","" +"l10n_et6000","6000","EXPENSES","view","l10n_et_view","l10n_et0","" +"l10n_et6100","6100","PERSONNEL SERVICES","view","l10n_et_view","l10n_et6000","" +"l10n_et6110","6110","Compensation","view","l10n_et_view","l10n_et6100","" +"l10n_et6111","6111","Salaries to permanent staff","other","l10n_et_expense","l10n_et6110","" +"l10n_et6113","6113","Wages to contract staff","other","l10n_et_expense","l10n_et6110","" +"l10n_et6114","6114","Wages to casual staff","other","l10n_et_expense","l10n_et6110","" +"l10n_et6115","6115","Wages to external contract staff","other","l10n_et_expense","l10n_et6110","" +"l10n_et6116","6116","Miscellaneous payments to staff","other","l10n_et_expense","l10n_et6110","" +"l10n_et6120","6120","Allowances/benefits","view","l10n_et_view","l10n_et6100","" +"l10n_et6121","6121","Allowances to permanent staff","other","l10n_et_expense","l10n_et6120","" +"l10n_et6123","6123","Allowances to contract staff","other","l10n_et_expense","l10n_et6120","" +"l10n_et6124","6124","Allowances to external contract staff","other","l10n_et_expense","l10n_et6120","" +"l10n_et6130","6130","Pension Contributions","view","l10n_et_view","l10n_et6100","" +"l10n_et6131","6131","Contribution to permanent staff pensions","other","l10n_et_expense","l10n_et6130","" +"l10n_et6200","6200","GOODS AND SERVICES","view","l10n_et_view","l10n_et6000","" +"l10n_et6210","6210-20","Goods and Supplies","view","l10n_et_view","l10n_et6200","" +"l10n_et6211","6211","Uniforms, clothing, bedding","other","l10n_et_expense","l10n_et6210","" +"l10n_et6212","6212","Office supplies","other","l10n_et_expense","l10n_et6210","" +"l10n_et6213","6213","Printing","other","l10n_et_expense","l10n_et6210","" +"l10n_et6214","6214","Medical supplies","other","l10n_et_expense","l10n_et6210","" +"l10n_et6215","6215","Educational supplies","other","l10n_et_expense","l10n_et6210","" +"l10n_et6216","6216","Food","other","l10n_et_expense","l10n_et6210","" +"l10n_et6217","6217","Fuel and lubricants","other","l10n_et_expense","l10n_et6210","" +"l10n_et6218","6218","Other material and supplies","other","l10n_et_expense","l10n_et6210","" +"l10n_et6219","6219","Miscellaneous equipment","other","l10n_et_expense","l10n_et6210","" +"l10n_et6221","6221","Agriculture, forestry and marine inputs","other","l10n_et_expense","l10n_et6210","" +"l10n_et6222","6222","Veterinary supplies and drugs","other","l10n_et_expense","l10n_et6210","" +"l10n_et6223","6223","Research and development supplies","other","l10n_et_expense","l10n_et6210","" +"l10n_et6230","6230","Travelling and Official Entertainment Services","view","l10n_et_view","l10n_et6200","" +"l10n_et6231","6231","Per diem","other","l10n_et_expense","l10n_et6230","" +"l10n_et6232","6232","Transport fees","other","l10n_et_expense","l10n_et6230","" +"l10n_et6233","6233","Official entertainment","other","l10n_et_expense","l10n_et6230","" +"l10n_et6240","6240","Maintenance and Repair Services","view","l10n_et_view","l10n_et6200","" +"l10n_et6241","6241","Maintenance and repair of vehicles and other transport","other","l10n_et_expense","l10n_et6240","" +"l10n_et6243","6243","Maintenance and repair of plant, machinery, and equipment","other","l10n_et_expense","l10n_et6240","" +"l10n_et6244","6244","Maintenance and repair of buildings, furnishings and fixtures","other","l10n_et_expense","l10n_et6240","" +"l10n_et6245","6245","Maintenance and repair of infrastructure","other","l10n_et_expense","l10n_et6240","" +"l10n_et6250","6250","Contracted Services","view","l10n_et_view","l10n_et6200","" +"l10n_et6251","6251","Contracted professional services","other","l10n_et_expense","l10n_et6250","" +"l10n_et6252","6252","Rent","other","l10n_et_expense","l10n_et6250","" +"l10n_et6253","6253","Advertising","other","l10n_et_expense","l10n_et6250","" +"l10n_et6254","6254","Insurance","other","l10n_et_expense","l10n_et6250","" +"l10n_et6255","6255","Freight","other","l10n_et_expense","l10n_et6250","" +"l10n_et6256","6256","Fees and charges","other","l10n_et_expense","l10n_et6250","" +"l10n_et6257","6257","Electricity charges","other","l10n_et_expense","l10n_et6250","" +"l10n_et6258","6258","Telecommunication charges","other","l10n_et_expense","l10n_et6250","" +"l10n_et6259","6259","Water and other utilities","other","l10n_et_expense","l10n_et6250","" +"l10n_et6270","6270","Training Services","view","l10n_et_view","l10n_et6200","" +"l10n_et6271","6271","Local training","other","l10n_et_expense","l10n_et6270","" +"l10n_et6272","6272","External training","other","l10n_et_expense","l10n_et6270","" +"l10n_et6300","6300","FIXED ASSETS AND CONSTRUCTION","view","l10n_et_view","l10n_et6000","" +"l10n_et6310","6310","Fixed Assets","view","l10n_et_view","l10n_et6300","" +"l10n_et6311","6311","Depreciation of vehicles and other vehicular transport","other","l10n_et_expense","l10n_et6310","" +"l10n_et6313","6313","Depreciation of plant, machinery and equipment","other","l10n_et_expense","l10n_et6310","" +"l10n_et6314","6314","Depreciation of buildings, furnishings and fixtures","other","l10n_et_expense","l10n_et6310","" +"l10n_et6315","6315","Depreciation of livestock and transport animals","other","l10n_et_expense","l10n_et6310","" +"l10n_et6320","6320","Construction","view","l10n_et_view","l10n_et6300","" +"l10n_et6321","6321","Pre-construction activities","other","l10n_et_expense","l10n_et6320","" +"l10n_et6322","6322","Construction of buildings","other","l10n_et_expense","l10n_et6320","" +"l10n_et6324","6324","Construction of infrastructure","other","l10n_et_expense","l10n_et6320","" +"l10n_et6400","6400","OTHER PAYMENTS","view","l10n_et_view","l10n_et6000","" +"l10n_et6430","6430","Debt Payments","view","l10n_et_view","l10n_et6400","" +"l10n_et6431","6431","Payments on the principal of foreign debt","other","l10n_et_expense","l10n_et6430","" +"l10n_et6432","6432","Payments of interest and bank charges on foreign debt","other","l10n_et_expense","l10n_et6430","" +"l10n_et6433","6433","Payments on the principal of local debt","other","l10n_et_expense","l10n_et6430","" +"l10n_et6434","6434","Payments of interest and bank charges on local debt","other","l10n_et_expense","l10n_et6430","" diff --git a/addons/l10n_et/data/account.account.type.csv b/addons/l10n_et/data/account.account.type.csv new file mode 100644 index 00000000000..5eac2c92e73 --- /dev/null +++ b/addons/l10n_et/data/account.account.type.csv @@ -0,0 +1,14 @@ +"id","name","code","close_method","report_type" +"l10n_et_asset","Fixed Assets","fixed_assets","Balance","asset" +"l10n_et_current_assets","Current Assets","current_assets","Balance","asset" +"l10n_et_equity","Equity","equity","Balance","liability" +"l10n_et_expense","Expense","expense","None","expense" +"l10n_et_income","Income","income","None","income" +"l10n_et_liability","Long-Term Liabilities","liability","Balance","liability" +"l10n_et_current_liabilities","Current Liabilities","current_liabilities","Balance","liability" +"l10n_et_payable","Payable","payable","unreconciled","liability" +"l10n_et_receivable","Receivable","receivable","unreconciled","asset" +"l10n_et_output_tax","Output Tax","output_tax","unreconciled","liability" +"l10n_et_input_tax","Input Tax","input_tax","unreconciled","asset" +"l10n_et_profit_and_loss","Profit and Loss","profit_and_loss","None","none" +"l10n_et_view","View","view","None","/" diff --git a/addons/l10n_et/data/account.chart.template.csv b/addons/l10n_et/data/account.chart.template.csv new file mode 100644 index 00000000000..de24c43bad2 --- /dev/null +++ b/addons/l10n_et/data/account.chart.template.csv @@ -0,0 +1,2 @@ +"id","name","account_root_id:id","tax_code_root_id:id","bank_account_view_id:id","property_account_receivable:id","property_account_payable:id","property_account_expense_categ:id","property_account_income_categ:id" +"l10n_et","Ethiopia Tax and Account Chart Template","l10n_et0","tc_01","l10n_et2110","l10n_et2211","l10n_et3002","l10n_et2301","l10n_et1100" diff --git a/addons/l10n_et/data/account.tax.code.template.csv b/addons/l10n_et/data/account.tax.code.template.csv new file mode 100644 index 00000000000..25986a5d9e8 --- /dev/null +++ b/addons/l10n_et/data/account.tax.code.template.csv @@ -0,0 +1,31 @@ +"id","code","name","parent_id:id","notprintable","sign" +"tc_01",0,"FDRE",,,1.0 +"tc_02",100,"Taxable Purchases - VAT","tc_01",False,1.0 +"tc_03",110,"Taxable Purchase VAT Out of Scope","tc_02",False,1.0 +"tc_04",120,"Taxable Purchase VAT Exempt","tc_02",False,1.0 +"tc_05",130,"Taxable Purchase VAT Rated 0%","tc_02",False,1.0 +"tc_06",140,"Taxable Purchase VAT Rated 15%","tc_02",False,1.0 +"tc_07",200,"Taxable Purchases - Witholding","tc_01",False,1.0 +"tc_08",220,"Taxable 2% Withholding on Purchases","tc_07",False,1.0 +"tc_09",225,"Taxable 35% Withholding on Purchases","tc_07",False,1.0 +"tc_10",250,"Taxable Sales - VAT","tc_01",False,1.0 +"tc_11",255,"Taxable Sales VAT Out of Scope (Sales)","tc_10",False,1.0 +"tc_12",260,"Taxable Sales VAT Exempt","tc_10",False,1.0 +"tc_13",265,"Taxable Sales VAT Rated 0%","tc_10",False,1.0 +"tc_14",270,"Taxable Sales VAT Rated 15%","tc_10",False,1.0 +"tc_15",280,"Taxable Sales - Withholding","tc_01",False,1.0 +"tc_16",285,"Taxable 2% Withholding on Sales","tc_15",False,1.0 +"tc_17",290,"Taxable 35% Withholding on Sales","tc_15",False,1.0 +"tc_18",295,"Taxable VAT Withholding on Sales","tc_15",False,1.0 +"tc_19",300,"Net VAT to be Paid/Reclaimed","tc_01",False,1.0 +"tc_20",310,"Purchase VAT","tc_19",False,1.0 +"tc_21",311,"Purchase VAT Rated 15%","tc_20",False,-1.0 +"tc_22",320,"Sales VAT","tc_19",False,1.0 +"tc_23",321,"Sales VAT Rated 15%","tc_22",False,1.0 +"tc_24",400,"Withholding on Purchases","tc_01",False,1.0 +"tc_25",410,"2% Withholding on Purchases","tc_24",False,-1.0 +"tc_26",420,"35% Withholding on Purchases","tc_24",False,-1.0 +"tc_27",500,"Withholding on Sales","tc_01",False,1.0 +"tc_28",510,"2% Withheld on Sales","tc_27",False,1.0 +"tc_29",520,"35% Withheld on Sales","tc_27",False,1.0 +"tc_30",530,"VAT Withheld on Sales","tc_27",False,1.0 diff --git a/addons/l10n_et/data/account.tax.template.csv b/addons/l10n_et/data/account.tax.template.csv new file mode 100644 index 00000000000..39f71126de0 --- /dev/null +++ b/addons/l10n_et/data/account.tax.template.csv @@ -0,0 +1,14 @@ +"id","description","chart_template_id:id","type_tax_use","name","base_code_id:id","tax_code_id:id","ref_base_code_id:id","ref_tax_code_id:id","amount","account_collected_id:id","account_paid_id:id","base_sign","tax_sign","ref_base_sign","ref_tax_sign","type" +"id_tax03","","l10n_et","sale","VAT 15% rated sales","tc_14","tc_23","tc_14","tc_23","0.15","l10n_et3007","l10n_et3007","1.0","1.0","-1.0","-1.0","percent" +"id_tax04","","l10n_et","sale","VAT 0% rated sales","tc_13",,"tc_13",,"","l10n_et3007","l10n_et3007","1.0","1.0","-1.0","-1.0","percent" +"id_tax06","","l10n_et","sale","VAT Exempt rated sales","tc_12",,"tc_12",,"","l10n_et3007","l10n_et3007","1.0","1.0","-1.0","-1.0","percent" +"id_tax11","","l10n_et","sale","VAT Out of Scope rated sales","tc_11",,"tc_11",,"","l10n_et3007","l10n_et3007","1.0","1.0","-1.0","-1.0","percent" +"id_tax02","","l10n_et","sale","Withholding 2% rated sales","tc_16","tc_28","tc_16","tc_28","-0.02","l10n_et3006","l10n_et3006","1.0","1.0","-1.0","-1.0","percent" +"id_tax13","","l10n_et","sale","Withholding 35% rated sales","tc_17","tc_29","tc_17","tc_29","-0.35","l10n_et3006","l10n_et3006","1.0","1.0","-1.0","-1.0","percent" +"id_tax14","","l10n_et","sale","Withholding VAT 15% rated sales","tc_18","tc_30","tc_18","tc_30","-0.15","l10n_et3006","l10n_et3006","1.0","1.0","-1.0","-1.0","percent" +"id_tax08","","l10n_et","purchase","VAT 15% rated purchases","tc_06","tc_21","tc_06","tc_21","0.15","l10n_et2212","l10n_et2212","1.0","1.0","-1.0","-1.0","percent" +"id_tax07","","l10n_et","purchase","VAT 0% rated purchases","tc_05",,"tc_05",,"","l10n_et2212","l10n_et2212","1.0","1.0","-1.0","-1.0","percent" +"id_tax10","","l10n_et","purchase","VAT Exempt rated purchases","tc_04",,"tc_04",,"","l10n_et2212","l10n_et2212","1.0","1.0","-1.0","-1.0","percent" +"id_tax09","","l10n_et","purchase","VAT Out of Scope rated purchases","tc_03",,"tc_03",,"","l10n_et2212","l10n_et2212","1.0","1.0","-1.0","-1.0","percent" +"id_tax05","","l10n_et","purchase","Withholding 2% rated purchases","tc_08","tc_25","tc_08","tc_25","-0.02","l10n_et2213","l10n_et2213","1.0","1.0","-1.0","-1.0","percent" +"id_tax12","","l10n_et","purchase","Withholding 35% rated purchases","tc_09","tc_26","tc_09","tc_26","-0.35","l10n_et2213","l10n_et2213","1.0","1.0","-1.0","-1.0","percent" diff --git a/addons/l10n_et/data/res.country.state.csv b/addons/l10n_et/data/res.country.state.csv new file mode 100644 index 00000000000..5f4019593bc --- /dev/null +++ b/addons/l10n_et/data/res.country.state.csv @@ -0,0 +1,12 @@ +"id","country_id:id","code","name" +"state_et_1","base.et","AA","Addis Ababa" +"state_et_2","base.et","AF","Afar" +"state_et_3","base.et","AM","Amhara" +"state_et_4","base.et","BN","Benishangul-Gumuz" +"state_et_5","base.et","DR","Dire Dawa" +"state_et_6","base.et","GM","Gambella Peoples" +"state_et_7","base.et","HR","Harrari Peoples" +"state_et_8","base.et","OR","Oromia" +"state_et_9","base.et","SM","Somalia" +"state_et_10","base.et","SP","Southern Peoples, Nations, and Nationalities" +"state_et_11","base.et","TG","Tigray" diff --git a/addons/l10n_et/l10n_et_wizard.xml b/addons/l10n_et/l10n_et_wizard.xml new file mode 100644 index 00000000000..cbbb56b7989 --- /dev/null +++ b/addons/l10n_et/l10n_et_wizard.xml @@ -0,0 +1,8 @@ + + + + + open + + + diff --git a/addons/l10n_et/static/src/img/icon.png b/addons/l10n_et/static/src/img/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..bfc193709062acbc35c2c2f284bbaf5cd441878e GIT binary patch literal 4032 zcmb7HS5Ono8chPBhYmrCfPfI`MLI`U>>{w*?+o8ASt z`*t%(>~*x%0e}BpxnGOl+#uxc+Gbui3f#X1R29hby#YzR5qcV=3sh7T_xXiB%xD4t zGn3O^SpDI!(#3NCX9*@6$#?BHE8tF8EoY+8-7P=)svyJYh_RA>dUj62IM*)aD@GMp@5 zx9ya1z79-9o0i(V?*eE zXeJ*muust~-efNDl09l8zO_`+2{pBZoD%cY7t7}3;+mRq^VSCfgUe|<0(j-;)q~0{KXg3cjP;*%A z5-sem2ZxijOz_lW>E0RFK))^(m;M8~doK8%YnC85gd8h7spK96#69VW5k zWK$NP*~<}YE!Em1(5TPjsHp@|l?-%Mkn@}dkg3a>n>^(sw97mCl{;cWugYef3XADb zO3>l`06E#i&!kDJckWY$Tyxc4xzRRroGg@6*5`Bo+>dtZmUf!iJrAge~FO_sB^dp1-IKa-+*+W6KA@@(||SqL3^^zeIAi zW0&=Je?`vnU%L6VAi0JG%Y1_Z#t5M|Z=;3_ZfMA~0BGo#Wo^(evHD|@W%UXK`4axk z7B_eiQx49##8zGiOF8NSX37JNx~1Gk zp-?^SqG}F|;Q_m@=0jme<=Cg&Yj9sEe#a@cWWLt9I(%qqIxEG7y93pCyu!c_T?YVPen-h zD@ep@&u(uHb(%2u;U(Q45JK1NJGPH>$nh{M zqmyiTV)(b2%iqb7&9(4|4||g^gO_{drIBr6w88f9_Kd-m8{FD@X?X!RlB&! ztWyW4M!~ecG7*u{8DENC5gFo?g2q!fR@M$g^xm{wYoN^wcYlVNumKSs0?FKFI;U$F z$0-q@n;m!%6cF`9I8Qc(Ok2dMF4SZ*z&FSkE%ob(qju0vhZrJXdT{q-%>DHU6e-Jh8)RQBQlf2NEq zX0$RxG4QVG$SEZvbZ_7ba`ES^zNpGZTCq9!J&YJZ&iNC4*ENG!S5PF5VR{b$g2(F= zClb=EIaeFyP_bBzZMhz;6a0)%r{b2w*x9$S`_VV&{7W@S_x)~}9kqlVEZG=1W&~!3 zhy;zC%}Cx6Yq1aPs`L%;VJ2_YRv4SSAHCx>v)stKLX1ozGjThEj6#CqS~x8xTb6;D zMNA-fsg(Z2PED%q)|jkk*j%4g#q332G~`d=nt@n`8!6jl$(cz+l8_mmx^Eh&@x9kMl_$DJKJ?GF?juG$vi4Nj7@= z(eIdRt3)Qn-z(%N(=BZzyJam&OiH!OZ!UHT?#>dXqnDI+-@3;HFFQWGkXLEfO!4Po zqdlG>-UQRoR#UMiq=%P$*$;%9|BSc3o-N*8U#YiYsMlNnyhCTfh#WXZuF{z4q$?bP zw`el-tJ|m=kf~z!SqpR94l}Ou@jmhvM*9M)m{pe+*&T$Zgy}(Vwe`Z`M88vMQ(%J1 z=V03htfcR6>$X=aE&~-9h*7b|EB8>JVy`79#`MPu&hO-T()y9$yq%a`PNTxc~PG; z6vDF7gO{L9(bYD&QFgb5uYv-nkiOSLYaKnTUd|sVWMPEZ8tE4TuzatD; zGP~L-(?Th4T#nreZ>pyq2F81nK+EOOOz=f+bf-Ws#5dJ>*G6sq)R{4@-~*-E(TeILa|JdE|Pj%T~8dm1i8^S=|3swHC zlacoFtUXVG)#f3iorVk<-(QGSeD2rO)YY^;5Mkr|a^o32)5K$9h3OoV(MZ;R05IRD z8ZT~d$-Irszx#UnJRt5Hs7m8*_27e2LFEbAI&JbLLeaGIMZOO3N#yw8qYm3{btv`h zt+OFkc=#}OQTMG0Ta)uKndWfwyJbZs$N7#)XOF&br;zyJ$><3sFK{AdUQ9<_#V9UrK9L*5ieu=7>9S+il3M%g~)DWR8u}@;VdViyE({!S-dHCT5}yQ z9$UMXubZxvj^MOZd#yBgiGUE#ia!?%FIpH4t0Uya#yQB9x4-m$O~f7L7}ObHgSPvd zd@c^uE{CJ}M5%K&Gmw@1MF8&hdcE?^>TKI?s6`de_mBeksPL6yn!}2WTdl){2_HKJtQt$KEh_>{mj1Y z!A577L2(nqRF&)nd^HBDS5mZ_Qfk ziGqr;2`6V2n=K%WpC7b0FlsIQ%k4X*UFPr2e8CrS6B~i+n&sCyqz=oR&|LWWKqHzTrdy1g|W3q$Uj)*R+UDc zz1m=fVnezW&T>S47sjqvy6o}GDX$2v34eh>%EpxdfCxtZSuM)d4ndS33^JY*f2rxuvfL13>P4fmwkhM3T3; z#v!JOBT4iRyWq?}u4uKofF#$uiu=au##;OP#LAaVm>9Q%E#XP+gUJ32=``Muf)$pk zSop^?zh4(xP8QX|bJWLkwyYUR5*=QjG$y1hG29#`Go$TEC`*8mtT;v%)>779r!}7IaI75W1-0l9z=uPI$rr<$I7l;(nh=ydj2n0Y%5uO+cvG>Mck<$dtUOR%1jHia65DJ zGd%0ca&b7AZt=-^(X+;ndpez&x6s3?WKs#{7sveD&m*{AevZ5EXg9oe66vRlKcu2t zRQGSx+A#yB;148t+NXv`#XSjMi0_AZkB=elt^jQ!loxceWx=VSuuQD{%Mn8C@aQ8) z;?rk*MPcnBGYkOLhg6$;#)D=Hms#>vQbc-#=8M%SwtXL7s(C#>SwgN*gl^6$wAqnx zU{Sqv{@y?O=6$UJee0`H-sw~JTrUdIT7YKnzcx|#plLi(ykXZDN)AKExXQ@jh4XOw zcF}e=E?d zkvsa-F2{#yq>DWUN%6vQD>b#pLas>z2j^}N?0Kh~LlnQHpfvEFW_BWrGz5lm-G#@i zB_gd-wIk%Yn&N<>=gF?o-w73?sK3sPnI$RCM!j_jre0h(0PT!Xk{Tmz~0x13`PyXNO^uL0S;g_7S5y7Wb T4bYOCtPMbD{G(p3Y8&<+i-?pI literal 0 HcmV?d00001 From ef4bc9b9c67ee750107a28350aed8a3008d5e8a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 17 Dec 2012 20:10:59 +0100 Subject: [PATCH 08/31] [IMP] tracked: models now have a _track attribute, telling the subtype to use for logging tracked fields. tracked attribute on columns become _track_visibility, telling if a field must always be logged or only when changed (to keep context value in logging message). bzr revid: tde@openerp.com-20121217191059-g5jdm0yjee1gttta --- openerp/osv/fields.py | 13 +++++++------ openerp/osv/orm.py | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py index 95b0ef67199..b7dff94b3f1 100644 --- a/openerp/osv/fields.py +++ b/openerp/osv/fields.py @@ -80,11 +80,12 @@ class _column(object): _symbol_f = _symbol_set _symbol_set = (_symbol_c, _symbol_f) _symbol_get = None - # used to hide a certain field type in the list of field types _deprecated = False + # used for automatic logging system if mail installed (should be 'on_change' or 'always') + _track_visibility = False - def __init__(self, string='unknown', required=False, readonly=False, domain=None, context=None, states=None, priority=0, change_default=False, size=None, ondelete=None, translate=False, select=False, manual=False, tracked=False, **args): + def __init__(self, string='unknown', required=False, readonly=False, domain=None, context=None, states=None, priority=0, change_default=False, size=None, ondelete=None, translate=False, select=False, manual=False, track_visibility=False, **args): """ The 'manual' keyword argument specifies if the field is a custom one. @@ -103,7 +104,7 @@ class _column(object): self.help = args.get('help', '') self.priority = priority self.change_default = change_default - self.ondelete = ondelete.lower() if ondelete else None # defaults to 'set null' in ORM + self.ondelete = ondelete.lower() if ondelete else None # defaults to 'set null' in ORM self.translate = translate self._domain = domain self._context = context @@ -113,14 +114,14 @@ class _column(object): self.select = select self.manual = manual self.selectable = True - self.tracked = tracked # Automatic logging system if mail installed + self._track_visibility = track_visibility self.group_operator = args.get('group_operator', False) self.groups = False # CSV list of ext IDs of groups that can access this field - self.deprecated = False # Optional deprecation warning + self.deprecated = False # Optional deprecation warning for a in args: if args[a]: setattr(self, a, args[a]) - + def restart(self): pass diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index eb5b9f29955..f5e46f71d1b 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -677,6 +677,23 @@ class BaseModel(object): _description = None _needaction = False + # Automatic logging system if mail installed + # _track = { + # 'field': { + # 'module.subtype_xml': lambda self, cr, uid, obj, context=None: obj.state == done, + # 'module.subtype_xml2': lambda self, cr, uid, obj, context=None: obj.state != done, + # }, + # 'field2': { + # ... + # }, + # } + # where + # :param string field: field name + # :param module.subtype_xml: xml_id of a mail.message.subtype (i.e. mail.mt_comment) + # :param obj: is a browse_record + # :param function lambda: returns whether the tracking should record using this subtype + _track = {} + # dict of {field:method}, with method returning the (name_get of records, {id: fold}) # to include in the _read_group, if grouped on this field _group_by_full = {} From 826a6d813369070cc39216e8f11d5d09b4017757 Mon Sep 17 00:00:00 2001 From: Niko Date: Tue, 18 Dec 2012 11:59:54 +0100 Subject: [PATCH 09/31] [FIX] status bar for ie9 bzr revid: nwi@openerp.com-20121218105954-jbhhl99f126o564m --- addons/web/static/src/css/base.css | 39 ++++++++++++++++++++++++++++- addons/web/static/src/css/base.sass | 39 +++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index c76403a1443..c82c28191c1 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,4 +1,4 @@ -@charset "utf-8"; +@charset "UTF-8"; @font-face { font-family: "mnmliconsRegular"; src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot"); @@ -3205,3 +3205,40 @@ div.ui-widget-overlay { background-color: black; opacity: 0.6; } + +.openerp_ie img { + border: none; +} +.openerp_ie .oe_topbar { + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#646060', endColorstr='#262626'); +} +.openerp_ie ul.oe_form_status li, .openerp_ie ul.oe_form_status_clickable li { + display: inline-block; +} +.openerp_ie ul.oe_form_status li:last-child, .openerp_ie ul.oe_form_status_clickable li:last-child { + margin-right: -24px; + border-right: 1px solid #cacaca; +} +.openerp_ie ul.oe_form_status li:last-child .label, .openerp_ie ul.oe_form_status_clickable li:last-child .label { + padding-right: 14px; + border-right: none; +} +.openerp_ie ul.oe_form_status li:last-child .arrow, .openerp_ie ul.oe_form_status_clickable li:last-child .arrow { + display: inline-block; + opacity: 0; + filter: alpha(opacity=0); + border: none; + width: 0; +} +.openerp_ie ul.oe_form_status .label, .openerp_ie ul.oe_form_status_clickable .label { + border-bottom: 1px solid #cacaca; +} +.openerp_ie ul.oe_form_status .arrow span, .openerp_ie ul.oe_form_status_clickable .arrow span { + background-color: #fefefe !important; +} +.openerp_ie ul.oe_form_status li.oe_active .label, .openerp_ie ul.oe_form_status_clickable li.oe_active .label { + border-bottom: 1px solid #729fcf; +} +.openerp_ie ul.oe_form_status li.oe_active .arrow span, .openerp_ie ul.oe_form_status_clickable li.oe_active .arrow span { + background-color: #729fcf !important; +} diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index bf0ff4cece4..357ff2bd1d6 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2041,6 +2041,7 @@ $sheet-padding: 16px padding-right: 14px .arrow display: none + .label color: #4c4c4c text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede @@ -2540,5 +2541,43 @@ div.ui-widget-overlay background-color: black opacity: 0.6000000238418579 +// fix for ie {{{ +.openerp_ie + img + border: none + .oe_topbar + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#646060', endColorstr='#262626') + ul.oe_form_status, ul.oe_form_status_clickable + li + display: inline-block + padding + &:last-child + margin-right: -24px + border-right: 1px solid #cacaca + .label + padding-right: 14px + border-right: none + .arrow + display: inline-block + opacity: 0 + filter: alpha(opacity = 0) + border: none + width: 0 + + .label + border-bottom: 1px solid #cacaca + .arrow + span + background-color: #fefefe !important + li.oe_active + .label + border-bottom: 1px solid #729fcf + .arrow span + background-color: #729fcf !important + + + +// }}} + // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers > "%:p:r.css" // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: From 8ff4af977f324b84580702fd277a5c242b15f09d Mon Sep 17 00:00:00 2001 From: Niko Date: Tue, 18 Dec 2012 12:00:52 +0100 Subject: [PATCH 10/31] [FIX] status bar for ie9 bzr revid: nwi@openerp.com-20121218110052-pufcjnp2850zbp74 --- addons/web/static/src/css/base.sass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 357ff2bd1d6..e56dde62613 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2550,9 +2550,8 @@ div.ui-widget-overlay ul.oe_form_status, ul.oe_form_status_clickable li display: inline-block - padding &:last-child - margin-right: -24px + margin-right: -24px border-right: 1px solid #cacaca .label padding-right: 14px From 83d1374321528ebf3176edc85984e64dcb3aed22 Mon Sep 17 00:00:00 2001 From: Niko Date: Tue, 18 Dec 2012 12:56:52 +0100 Subject: [PATCH 11/31] [FIX] fix color button ( modal box jquey ui) bzr revid: nwi@openerp.com-20121218115652-mkgoezb6y7yhyho4 --- addons/web/static/src/css/base.css | 5 +++++ addons/web/static/src/css/base.sass | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index c82c28191c1..f983236a56e 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3214,6 +3214,7 @@ div.ui-widget-overlay { } .openerp_ie ul.oe_form_status li, .openerp_ie ul.oe_form_status_clickable li { display: inline-block; + clear: both; } .openerp_ie ul.oe_form_status li:last-child, .openerp_ie ul.oe_form_status_clickable li:last-child { margin-right: -24px; @@ -3242,3 +3243,7 @@ div.ui-widget-overlay { .openerp_ie ul.oe_form_status li.oe_active .arrow span, .openerp_ie ul.oe_form_status_clickable li.oe_active .arrow span { background-color: #729fcf !important; } + +.openerp_ie .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button { + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#EFEFEF', endColorstr='#D8D8D8'); +} diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e56dde62613..648b6db132b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2550,6 +2550,7 @@ div.ui-widget-overlay ul.oe_form_status, ul.oe_form_status_clickable li display: inline-block + clear: both &:last-child margin-right: -24px border-right: 1px solid #cacaca @@ -2573,8 +2574,10 @@ div.ui-widget-overlay border-bottom: 1px solid #729fcf .arrow span background-color: #729fcf !important - +// jquery ui for ie +.openerp_ie .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#EFEFEF', endColorstr='#D8D8D8') // }}} From aea874dac7d0e376c391a63c0f0bec6b9fd6e33f Mon Sep 17 00:00:00 2001 From: Niko Date: Tue, 18 Dec 2012 14:29:13 +0100 Subject: [PATCH 12/31] =?UTF-8?q?[FIX]=20=C2=96=C2=96Bug=20#1090982?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bzr revid: nwi@openerp.com-20121218132913-66d57c4x0q6ari04 --- addons/web/static/src/css/base.css | 7 +++++++ addons/web/static/src/css/base.sass | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index f983236a56e..4e40ca62be4 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1355,6 +1355,7 @@ } .openerp .oe_application { width: 100%; + height: 100%; } .openerp .oe_application a { color: #7c7bad; @@ -3212,6 +3213,12 @@ div.ui-widget-overlay { .openerp_ie .oe_topbar { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#646060', endColorstr='#262626'); } +.openerp_ie .oe_popup_form { + width: 99% !important; +} +.openerp_ie .oe_form_label { + white-space: normal !important; +} .openerp_ie ul.oe_form_status li, .openerp_ie ul.oe_form_status_clickable li { display: inline-block; clear: both; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 648b6db132b..180c4e277a9 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1089,6 +1089,7 @@ $sheet-padding: 16px // ActionManager {{{ .oe_application width: 100% + height: 100% a color: $link-color &:hover @@ -2546,7 +2547,11 @@ div.ui-widget-overlay img border: none .oe_topbar - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#646060', endColorstr='#262626') + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#646060', endColorstr='#262626') + .oe_popup_form + width: 99% !important + .oe_form_label + white-space: normal !important ul.oe_form_status, ul.oe_form_status_clickable li display: inline-block From 97e23c83f5f1e4cedbc15b16a8fff8b79e3affb4 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 18 Dec 2012 18:47:54 +0100 Subject: [PATCH 13/31] [IMP] company form view improved for logo bzr revid: fp@tinyerp.com-20121218174754-l5bxqao9xarr3ohk --- openerp/addons/base/res/res_company_view.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml index 7cb461b2b68..06775d159ac 100644 --- a/openerp/addons/base/res/res_company_view.xml +++ b/openerp/addons/base/res/res_company_view.xml @@ -32,6 +32,11 @@ +
+

+ Click to set your company logo. +

+
From af9d8053646d9a5f69021d679cff1c868e5da366 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 18 Dec 2012 23:39:59 +0100 Subject: [PATCH 14/31] [REVERT] revert changes in the server bzr revid: fp@tinyerp.com-20121218223959-jstszixwv464umqj --- openerp/osv/fields.py | 13 ++++++------- openerp/osv/orm.py | 17 ----------------- 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py index 1565d4c9b85..bc7fefa1713 100644 --- a/openerp/osv/fields.py +++ b/openerp/osv/fields.py @@ -80,12 +80,11 @@ class _column(object): _symbol_f = _symbol_set _symbol_set = (_symbol_c, _symbol_f) _symbol_get = None + # used to hide a certain field type in the list of field types _deprecated = False - # used for automatic logging system if mail installed (should be 'on_change' or 'always') - _track_visibility = False - def __init__(self, string='unknown', required=False, readonly=False, domain=None, context=None, states=None, priority=0, change_default=False, size=None, ondelete=None, translate=False, select=False, manual=False, track_visibility=False, **args): + def __init__(self, string='unknown', required=False, readonly=False, domain=None, context=None, states=None, priority=0, change_default=False, size=None, ondelete=None, translate=False, select=False, manual=False, tracked=False, **args): """ The 'manual' keyword argument specifies if the field is a custom one. @@ -104,7 +103,7 @@ class _column(object): self.help = args.get('help', '') self.priority = priority self.change_default = change_default - self.ondelete = ondelete.lower() if ondelete else None # defaults to 'set null' in ORM + self.ondelete = ondelete.lower() if ondelete else None # defaults to 'set null' in ORM self.translate = translate self._domain = domain self._context = context @@ -114,14 +113,14 @@ class _column(object): self.select = select self.manual = manual self.selectable = True - self._track_visibility = track_visibility + self.tracked = tracked # Automatic logging system if mail installed self.group_operator = args.get('group_operator', False) self.groups = False # CSV list of ext IDs of groups that can access this field - self.deprecated = False # Optional deprecation warning + self.deprecated = False # Optional deprecation warning for a in args: if args[a]: setattr(self, a, args[a]) - + def restart(self): pass diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index e2dada4e381..92eb8dad776 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -677,23 +677,6 @@ class BaseModel(object): _description = None _needaction = False - # Automatic logging system if mail installed - # _track = { - # 'field': { - # 'module.subtype_xml': lambda self, cr, uid, obj, context=None: obj.state == done, - # 'module.subtype_xml2': lambda self, cr, uid, obj, context=None: obj.state != done, - # }, - # 'field2': { - # ... - # }, - # } - # where - # :param string field: field name - # :param module.subtype_xml: xml_id of a mail.message.subtype (i.e. mail.mt_comment) - # :param obj: is a browse_record - # :param function lambda: returns whether the tracking should record using this subtype - _track = {} - # dict of {field:method}, with method returning the (name_get of records, {id: fold}) # to include in the _read_group, if grouped on this field _group_by_full = {} From b5382291f7a84fcb4932281508a20ee1c5e3a3b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 19 Dec 2012 10:36:55 +0100 Subject: [PATCH 15/31] [REV] Reverted some changes that should not be present in server. bzr revid: tde@openerp.com-20121219093655-ts20h4rhu5whrdwm --- openerp/addons/base/res/res_partner.py | 2 +- openerp/osv/fields.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index c8eab491fc8..faf9ad16be7 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -202,7 +202,7 @@ class res_partner(osv.osv, format_address): "It is important to set a value for this field. You should use the same timezone " "that is otherwise used to pick and render date and time values: your computer's timezone."), 'tz_offset': fields.function(_get_tz_offset, type='char', size=5, string='Timezone offset', invisible=True), - 'user_id': fields.many2one('res.users', 'Salesperson', tracked=True, help='The internal user that is in charge of communicating with this contact if any.'), + 'user_id': fields.many2one('res.users', 'Salesperson', track_visibility=1, help='The internal user that is in charge of communicating with this contact if any.'), 'vat': fields.char('TIN', size=32, help="Tax Identification Number. Check the box if this contact is subjected to taxes. Used by the some of the legal statements."), 'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'), 'website': fields.char('Website', size=64, help="Website of Partner or Company"), diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py index bc7fefa1713..bcbdad081ad 100644 --- a/openerp/osv/fields.py +++ b/openerp/osv/fields.py @@ -84,7 +84,7 @@ class _column(object): # used to hide a certain field type in the list of field types _deprecated = False - def __init__(self, string='unknown', required=False, readonly=False, domain=None, context=None, states=None, priority=0, change_default=False, size=None, ondelete=None, translate=False, select=False, manual=False, tracked=False, **args): + def __init__(self, string='unknown', required=False, readonly=False, domain=None, context=None, states=None, priority=0, change_default=False, size=None, ondelete=None, translate=False, select=False, manual=False, **args): """ The 'manual' keyword argument specifies if the field is a custom one. @@ -113,7 +113,6 @@ class _column(object): self.select = select self.manual = manual self.selectable = True - self.tracked = tracked # Automatic logging system if mail installed self.group_operator = args.get('group_operator', False) self.groups = False # CSV list of ext IDs of groups that can access this field self.deprecated = False # Optional deprecation warning From 4936f0b6833725d8de5cb82a79fd097faa4a9d87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 19 Dec 2012 11:25:39 +0100 Subject: [PATCH 16/31] [REM] partner: do not track user_id. bzr revid: tde@openerp.com-20121219102539-lvlbl2vh828602ra --- openerp/addons/base/res/res_partner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index faf9ad16be7..d236d867795 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -202,7 +202,7 @@ class res_partner(osv.osv, format_address): "It is important to set a value for this field. You should use the same timezone " "that is otherwise used to pick and render date and time values: your computer's timezone."), 'tz_offset': fields.function(_get_tz_offset, type='char', size=5, string='Timezone offset', invisible=True), - 'user_id': fields.many2one('res.users', 'Salesperson', track_visibility=1, help='The internal user that is in charge of communicating with this contact if any.'), + 'user_id': fields.many2one('res.users', 'Salesperson', help='The internal user that is in charge of communicating with this contact if any.'), 'vat': fields.char('TIN', size=32, help="Tax Identification Number. Check the box if this contact is subjected to taxes. Used by the some of the legal statements."), 'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'), 'website': fields.char('Website', size=64, help="Website of Partner or Company"), From b3bc0e0de70f662fd6dc05311ac16868db223468 Mon Sep 17 00:00:00 2001 From: Niko Date: Thu, 20 Dec 2012 09:51:59 +0100 Subject: [PATCH 17/31] [IE] see https://github.com/fgnass/spin.js/commit/1eb65a92df28675d52acbeeb33f85f2fc403c0c3 bzr revid: nwi@openerp.com-20121220085159-0dmdfit530vn01g0 --- addons/web/static/lib/spinjs/spin.js | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/web/static/lib/spinjs/spin.js b/addons/web/static/lib/spinjs/spin.js index d8e21786a1f..e848c55c55f 100644 --- a/addons/web/static/lib/spinjs/spin.js +++ b/addons/web/static/lib/spinjs/spin.js @@ -39,6 +39,7 @@ */ var sheet = function() { var el = createEl('style'); + var el = createEl('style', {type : 'text/css'}); ins(document.getElementsByTagName('head')[0], el); return el.sheet || el.styleSheet; }(); From 86cb1a334ff876a54fa61b5dab835dfa549aab15 Mon Sep 17 00:00:00 2001 From: Niko Date: Thu, 20 Dec 2012 09:56:49 +0100 Subject: [PATCH 18/31] [IE] fix oe_kanban_column bzr revid: nwi@openerp.com-20121220085649-2w7dfcldf421r1su --- addons/web_kanban/static/src/css/kanban.css | 1 + addons/web_kanban/static/src/css/kanban.sass | 1 + 2 files changed, 2 insertions(+) diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 2eac8370487..bac06c2fa53 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -103,6 +103,7 @@ } .openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_group_header { width: 1%; + height: 1%; } .openerp .oe_kanban_view .oe_form .oe_kanban_column { padding: 0px; diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index 84de3e32842..ff8feffa5d5 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -129,6 +129,7 @@ &.oe_kanban_grouped .oe_kanban_group_header width: 1% + height: 1% .oe_form .oe_kanban_column From 988b89a02ce7cdd129a5e7ee05e2be18dd6347c9 Mon Sep 17 00:00:00 2001 From: Niko Date: Thu, 20 Dec 2012 09:58:07 +0100 Subject: [PATCH 19/31] [IE] fix buttons problems bzr revid: nwi@openerp.com-20121220085807-qoal2n8exedp7j61 --- .bzrignore | 1 + addons/web/static/src/css/base.css | 107 +++++++++++++++------------- addons/web/static/src/css/base.sass | 99 +++++++++++++------------ 3 files changed, 111 insertions(+), 96 deletions(-) diff --git a/.bzrignore b/.bzrignore index 1e0564801ab..3dc39eb6479 100644 --- a/.bzrignore +++ b/.bzrignore @@ -12,3 +12,4 @@ RE:^man/ RE:^lib/ RE:^addons/\w+/doc/_build/ +sa2.bat diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 4e40ca62be4..93fae7ce3a5 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3158,8 +3158,63 @@ div.ui-widget-overlay { padding-top: 0; padding-bottom: 0; } -.openerp_ie .oe_form_field.oe_tags { - float: left; +.openerp_ie img { + border: none; +} +.openerp_ie .oe_dropdown_arrow { + line-height: 1.7em; +} +.openerp_ie .oe_form_buttons button, .openerp_ie .oe_view_manager_buttons button { + line-height: 1.7em; +} +.openerp_ie .oe_form_buttons .oe_highlight, .openerp_ie .oe_view_manager_buttons .oe_highlight { + line-height: 1.7em; +} +.openerp_ie .oe_topbar { + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#646060', endColorstr='#262626'); +} +.openerp_ie .oe_popup_form { + width: 99% !important; +} +.openerp_ie .oe_form_label { + white-space: normal !important; +} +.openerp_ie ul.oe_form_status li, .openerp_ie ul.oe_form_status_clickable li { + display: inline-block; + clear: both; +} +.openerp_ie ul.oe_form_status li:last-child, .openerp_ie ul.oe_form_status_clickable li:last-child { + overflow: hidden; + border-right: 1px solid #cacaca; +} +.openerp_ie ul.oe_form_status li:last-child .label, .openerp_ie ul.oe_form_status_clickable li:last-child .label { + padding-right: 14px; + border-right: none; +} +.openerp_ie ul.oe_form_status li:last-child .arrow, .openerp_ie ul.oe_form_status_clickable li:last-child .arrow { + display: inline-block; + opacity: 0; + filter: alpha(opacity=0); + border: none; + width: 0; + border-right: none; +} +.openerp_ie ul.oe_form_status .label, .openerp_ie ul.oe_form_status_clickable .label { + border-bottom: 1px solid #cacaca; + background: transparent; +} +.openerp_ie ul.oe_form_status .arrow span, .openerp_ie ul.oe_form_status_clickable .arrow span { + background-color: #fefefe !important; +} +.openerp_ie ul.oe_form_status li.oe_active .label, .openerp_ie ul.oe_form_status_clickable li.oe_active .label { + border-bottom: 1px solid #729fcf; +} +.openerp_ie ul.oe_form_status li.oe_active .arrow span, .openerp_ie ul.oe_form_status_clickable li.oe_active .arrow span { + background-color: #729fcf !important; +} + +.openerp_ie .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button { + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#EFEFEF', endColorstr='#D8D8D8'); } @media print { @@ -3206,51 +3261,3 @@ div.ui-widget-overlay { background-color: black; opacity: 0.6; } - -.openerp_ie img { - border: none; -} -.openerp_ie .oe_topbar { - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#646060', endColorstr='#262626'); -} -.openerp_ie .oe_popup_form { - width: 99% !important; -} -.openerp_ie .oe_form_label { - white-space: normal !important; -} -.openerp_ie ul.oe_form_status li, .openerp_ie ul.oe_form_status_clickable li { - display: inline-block; - clear: both; -} -.openerp_ie ul.oe_form_status li:last-child, .openerp_ie ul.oe_form_status_clickable li:last-child { - margin-right: -24px; - border-right: 1px solid #cacaca; -} -.openerp_ie ul.oe_form_status li:last-child .label, .openerp_ie ul.oe_form_status_clickable li:last-child .label { - padding-right: 14px; - border-right: none; -} -.openerp_ie ul.oe_form_status li:last-child .arrow, .openerp_ie ul.oe_form_status_clickable li:last-child .arrow { - display: inline-block; - opacity: 0; - filter: alpha(opacity=0); - border: none; - width: 0; -} -.openerp_ie ul.oe_form_status .label, .openerp_ie ul.oe_form_status_clickable .label { - border-bottom: 1px solid #cacaca; -} -.openerp_ie ul.oe_form_status .arrow span, .openerp_ie ul.oe_form_status_clickable .arrow span { - background-color: #fefefe !important; -} -.openerp_ie ul.oe_form_status li.oe_active .label, .openerp_ie ul.oe_form_status_clickable li.oe_active .label { - border-bottom: 1px solid #729fcf; -} -.openerp_ie ul.oe_form_status li.oe_active .arrow span, .openerp_ie ul.oe_form_status_clickable li.oe_active .arrow span { - background-color: #729fcf !important; -} - -.openerp_ie .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button { - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#EFEFEF', endColorstr='#D8D8D8'); -} diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 180c4e277a9..30f88678c79 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2472,6 +2472,8 @@ div.ui-widget-overlay button .oe_form_button_create padding-top: 0 padding-bottom: 0 + .field_boolean + background: #fff .oe_kanban_image border: none .oe_msg_icon @@ -2484,7 +2486,8 @@ div.ui-widget-overlay filter: none .oe_link filter: none - + .oe_kanban_grouped .oe_kanban_group_header + height: 1% .oe_kanban_show_more clear: both text-align: center @@ -2498,9 +2501,55 @@ div.ui-widget-overlay .oe_sidebar button padding-top: 0 padding-bottom: 0 + img + border: none + //buttons. + .oe_dropdown_arrow + line-height: 1.7em + .oe_form_buttons, .oe_view_manager_buttons + button + line-height: 1.7em + .oe_highlight + line-height: 1.7em + .oe_topbar + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#646060', endColorstr='#262626') + .oe_popup_form + width: 99% !important + .oe_form_label + white-space: normal !important + ul.oe_form_status, ul.oe_form_status_clickable + li + display: inline-block + clear: both + &:last-child + overflow: hidden + border-right: 1px solid #cacaca + .label + padding-right: 14px + border-right: none + .arrow + display: inline-block + opacity: 0 + filter: alpha(opacity = 0) + border: none + width: 0 + border-right: none + .label + border-bottom: 1px solid #cacaca + background: transparent + .arrow + span + background-color: #fefefe !important + li.oe_active + .label + border-bottom: 1px solid #729fcf + .arrow span + background-color: #729fcf !important + +// jquery ui for ie +.openerp_ie .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#EFEFEF', endColorstr='#D8D8D8') - .oe_form_field.oe_tags - float: left // }}} // @media print {{{ @@ -2542,49 +2591,7 @@ div.ui-widget-overlay background-color: black opacity: 0.6000000238418579 -// fix for ie {{{ -.openerp_ie - img - border: none - .oe_topbar - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#646060', endColorstr='#262626') - .oe_popup_form - width: 99% !important - .oe_form_label - white-space: normal !important - ul.oe_form_status, ul.oe_form_status_clickable - li - display: inline-block - clear: both - &:last-child - margin-right: -24px - border-right: 1px solid #cacaca - .label - padding-right: 14px - border-right: none - .arrow - display: inline-block - opacity: 0 - filter: alpha(opacity = 0) - border: none - width: 0 - - .label - border-bottom: 1px solid #cacaca - .arrow - span - background-color: #fefefe !important - li.oe_active - .label - border-bottom: 1px solid #729fcf - .arrow span - background-color: #729fcf !important - -// jquery ui for ie -.openerp_ie .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#EFEFEF', endColorstr='#D8D8D8') - -// }}} + // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers > "%:p:r.css" // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: From 644f4a0d14043eac00a43d945821f472a7a6a2cb Mon Sep 17 00:00:00 2001 From: Niko Date: Thu, 20 Dec 2012 11:04:17 +0100 Subject: [PATCH 20/31] [IE] Fix fold cols bzr revid: nwi@openerp.com-20121220100417-g1l1i015ieuvl91y --- addons/web_kanban/static/src/css/kanban.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index df2ca01f615..510c91d916e 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -517,7 +517,7 @@ .oe_kanban_group_title_vertical -ms-writing-mode: lr-tb !important background: rgb(240, 238, 238) - top: -5px !important + top: -5px !important @media print .openerp .oe_kanban_groups From 355dac7356652bde1b5cf2ea7cb132df53b10b76 Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Thu, 20 Dec 2012 11:15:11 +0100 Subject: [PATCH 21/31] [FIX]Kanban view js not loaded when db created through command line bzr revid: dle@openerp.com-20121220101511-679v8e6ijsbaxj0y --- openerp/tools/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/tools/config.py b/openerp/tools/config.py index 9717792a82a..e80b58ed998 100644 --- a/openerp/tools/config.py +++ b/openerp/tools/config.py @@ -484,7 +484,7 @@ class configmanager(object): if opt.server_wide_modules: openerp.conf.server_wide_modules = map(lambda m: m.strip(), opt.server_wide_modules.split(',')) else: - openerp.conf.server_wide_modules = ['web'] + openerp.conf.server_wide_modules = ['web','web_kanban'] if complete: openerp.modules.module.initialize_sys_path() openerp.modules.loading.open_openerp_namespace() From b2d9daa0090218e454f7d64390c0ab72b775dca4 Mon Sep 17 00:00:00 2001 From: Niko Date: Thu, 20 Dec 2012 11:36:53 +0100 Subject: [PATCH 22/31] [IE] Fix bzr revid: nwi@openerp.com-20121220103653-26nauus9awk1sojk --- addons/web/static/src/css/base.css | 3 +++ addons/web/static/src/css/base.sass | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index c43a2ba10d2..1f0eb4639a8 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3156,6 +3156,9 @@ div.ui-widget-overlay { padding-top: 0; padding-bottom: 0; } +.openerp_ie .oe_view_manager_buttons .field_boolean { + background: white; +} .openerp_ie .oe_kanban_image { border: none; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 5ab7332be7f..5a522b9d2d3 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2509,8 +2509,6 @@ div.ui-widget-overlay filter: none .oe_link filter: none - .oe_kanban_grouped .oe_kanban_group_header - height: 1% .oe_kanban_show_more clear: both text-align: center From d84a100dd6d7de014703ede4ca290611bdec5cdd Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Thu, 20 Dec 2012 11:43:45 +0100 Subject: [PATCH 23/31] [ADD]form in action quick journal items and CSS Class to handle switcher bzr revid: dle@openerp.com-20121220104345-yrj9w6demtlba00l --- addons/account/__openerp__.py | 4 +++- addons/account/account_view.xml | 2 +- addons/account/static/src/css/account_move_line_quickadd.css | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 addons/account/static/src/css/account_move_line_quickadd.css diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index 7fffc4f07d4..43aaa2f58c1 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -133,7 +133,9 @@ for a particular financial year and for preparation of vouchers there is a modul "static/src/xml/account_move_reconciliation.xml", "static/src/xml/account_move_line_quickadd.xml", ], - 'css':['static/src/css/account_move_reconciliation.css' + 'css':[ + 'static/src/css/account_move_reconciliation.css', + 'static/src/css/account_move_line_quickadd.css' ], 'demo': [ 'demo/account_demo.xml', diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index adf7ac05067..9af57cca247 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1155,7 +1155,7 @@ Journal Items account.move.line - tree_account_move_line_quickadd + tree_account_move_line_quickadd,form

Select the period and the journal you want to fill. diff --git a/addons/account/static/src/css/account_move_line_quickadd.css b/addons/account/static/src/css/account_move_line_quickadd.css new file mode 100644 index 00000000000..6d7690c4490 --- /dev/null +++ b/addons/account/static/src/css/account_move_line_quickadd.css @@ -0,0 +1,4 @@ +.openerp .oe_vm_switch_tree_account_move_line_quickadd:after { + padding: 2px; + content: "i"; +} From ee937272d13bd6e77563c9d66d6cdd0da37b27ae Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 20 Dec 2012 12:01:27 +0100 Subject: [PATCH 24/31] [FIX] Updated spin.js to version v1.2.7 (w/fix for IE) bzr revid: fme@openerp.com-20121220110127-iw2e13n4mj79i8zv --- addons/web/static/lib/spinjs/spin.js | 288 ++++++++++++++------------- 1 file changed, 151 insertions(+), 137 deletions(-) diff --git a/addons/web/static/lib/spinjs/spin.js b/addons/web/static/lib/spinjs/spin.js index d8e21786a1f..434d76a6870 100644 --- a/addons/web/static/lib/spinjs/spin.js +++ b/addons/web/static/lib/spinjs/spin.js @@ -1,47 +1,45 @@ -//fgnass.github.com/spin.js#v1.2.5 -(function(window, document, undefined) { +//fgnass.github.com/spin.js#v1.2.7 +!function(window, document, undefined) { -/** - * Copyright (c) 2011 Felix Gnass [fgnass at neteye dot de] - * Licensed under the MIT license - */ + /** + * Copyright (c) 2011 Felix Gnass [fgnass at neteye dot de] + * Licensed under the MIT license + */ - var prefixes = ['webkit', 'Moz', 'ms', 'O']; /* Vendor prefixes */ - var animations = {}; /* Animation rules keyed by their name */ - var useCssAnimations; + var prefixes = ['webkit', 'Moz', 'ms', 'O'] /* Vendor prefixes */ + , animations = {} /* Animation rules keyed by their name */ + , useCssAnimations /** * Utility function to create elements. If no tag name is given, * a DIV is created. Optionally properties can be passed. */ function createEl(tag, prop) { - var el = document.createElement(tag || 'div'); - var n; + var el = document.createElement(tag || 'div') + , n - for(n in prop) { - el[n] = prop[n]; - } - return el; + for(n in prop) el[n] = prop[n] + return el } /** * Appends children and returns the parent. */ function ins(parent /* child1, child2, ...*/) { - for (var i=1, n=arguments.length; i> 1) : o.left+mid) + 'px', - top: (o.top == 'auto' ? tp.y-ep.y + (target.offsetHeight >> 1) : o.top+mid) + 'px' - }); + left: (o.left == 'auto' ? tp.x-ep.x + (target.offsetWidth >> 1) : parseInt(o.left, 10) + mid) + 'px', + top: (o.top == 'auto' ? tp.y-ep.y + (target.offsetHeight >> 1) : parseInt(o.top, 10) + mid) + 'px' + }) } - el.setAttribute('aria-role', 'progressbar'); - self.lines(el, self.opts); + el.setAttribute('aria-role', 'progressbar') + self.lines(el, self.opts) if (!useCssAnimations) { // No CSS animation support, use setTimeout() instead - var i = 0; - var fps = o.fps; - var f = fps/o.speed; - var ostep = (1-o.opacity)/(f*o.trail / 100); - var astep = f/o.lines; + var i = 0 + , fps = o.fps + , f = fps/o.speed + , ostep = (1-o.opacity) / (f*o.trail / 100) + , astep = f/o.lines - !function anim() { + ;(function anim() { i++; for (var s=o.lines; s; s--) { - var alpha = Math.max(1-(i+s*astep)%f * ostep, o.opacity); - self.opacity(el, o.lines-s, alpha, o); + var alpha = Math.max(1-(i+s*astep)%f * ostep, o.opacity) + self.opacity(el, o.lines-s, alpha, o) } - self.timeout = self.el && setTimeout(anim, ~~(1000/fps)); - }(); + self.timeout = self.el && setTimeout(anim, ~~(1000/fps)) + })() } - return self; + return self }, + stop: function() { - var el = this.el; + var el = this.el if (el) { - clearTimeout(this.timeout); - if (el.parentNode) el.parentNode.removeChild(el); - this.el = undefined; + clearTimeout(this.timeout) + if (el.parentNode) el.parentNode.removeChild(el) + this.el = undefined } - return this; + return this }, + lines: function(el, o) { - var i = 0; - var seg; + var i = 0 + , seg function fill(color, shadow) { return css(createEl(), { @@ -208,9 +210,10 @@ boxShadow: shadow, transformOrigin: 'left', transform: 'rotate(' + ~~(360/o.lines*i+o.rotate) + 'deg) translate(' + o.radius+'px' +',0)', - borderRadius: (o.width>>1) + 'px' - }); + borderRadius: (o.corners * o.width>>1) + 'px' + }) } + for (; i < o.lines; i++) { seg = css(createEl(), { position: 'absolute', @@ -218,16 +221,20 @@ transform: o.hwaccel ? 'translate3d(0,0,0)' : '', opacity: o.opacity, animation: useCssAnimations && addAnimation(o.opacity, o.trail, i, o.lines) + ' ' + 1/o.speed + 's linear infinite' - }); - if (o.shadow) ins(seg, css(fill('#000', '0 0 4px ' + '#000'), {top: 2+'px'})); - ins(el, ins(seg, fill(o.color, '0 0 1px rgba(0,0,0,.1)'))); + }) + + if (o.shadow) ins(seg, css(fill('#000', '0 0 4px ' + '#000'), {top: 2+'px'})) + + ins(el, ins(seg, fill(o.color, '0 0 1px rgba(0,0,0,.1)'))) } - return el; + return el }, + opacity: function(el, i, val) { - if (i < el.childNodes.length) el.childNodes[i].style.opacity = val; + if (i < el.childNodes.length) el.childNodes[i].style.opacity = val } - }); + + }) ///////////////////////////////////////////////////////////////////////// // VML rendering for IE @@ -236,36 +243,41 @@ /** * Check and init VML support */ - !function() { + ;(function() { function vml(tag, attr) { - return createEl('<' + tag + ' xmlns="urn:schemas-microsoft.com:vml" class="spin-vml">', attr); + return createEl('<' + tag + ' xmlns="urn:schemas-microsoft.com:vml" class="spin-vml">', attr) } - var s = css(createEl('group'), {behavior: 'url(#default#VML)'}); + var s = css(createEl('group'), {behavior: 'url(#default#VML)'}) if (!vendor(s, 'transform') && s.adj) { // VML support detected. Insert CSS rule ... - sheet.addRule('.spin-vml', 'behavior:url(#default#VML)'); + sheet.addRule('.spin-vml', 'behavior:url(#default#VML)') Spinner.prototype.lines = function(el, o) { - var r = o.length+o.width; - var s = 2*r; + var r = o.length+o.width + , s = 2*r function grp() { - return css(vml('group', {coordsize: s +' '+s, coordorigin: -r +' '+-r}), {width: s, height: s}); + return css( + vml('group', { + coordsize: s + ' ' + s, + coordorigin: -r + ' ' + -r + }), + { width: s, height: s } + ) } - var margin = -(o.width+o.length)*2+'px'; - var g = css(grp(), {position: 'absolute', top: margin, left: margin}); - - var i; + var margin = -(o.width+o.length)*2 + 'px' + , g = css(grp(), {position: 'absolute', top: margin, left: margin}) + , i function seg(i, dx, filter) { ins(g, ins(css(grp(), {rotation: 360 / o.lines * i + 'deg', left: ~~dx}), - ins(css(vml('roundrect', {arcsize: 1}), { + ins(css(vml('roundrect', {arcsize: o.corners}), { width: r, height: o.width, left: o.radius, @@ -276,31 +288,33 @@ vml('stroke', {opacity: 0}) // transparent stroke to fix color bleeding upon opacity change ) ) - ); + ) } - if (o.shadow) { - for (i = 1; i <= o.lines; i++) { - seg(i, -2, 'progid:DXImageTransform.Microsoft.Blur(pixelradius=2,makeshadow=1,shadowopacity=.3)'); - } - } - for (i = 1; i <= o.lines; i++) seg(i); - return ins(el, g); - }; + if (o.shadow) + for (i = 1; i <= o.lines; i++) + seg(i, -2, 'progid:DXImageTransform.Microsoft.Blur(pixelradius=2,makeshadow=1,shadowopacity=.3)') + + for (i = 1; i <= o.lines; i++) seg(i) + return ins(el, g) + } + Spinner.prototype.opacity = function(el, i, val, o) { - var c = el.firstChild; - o = o.shadow && o.lines || 0; + var c = el.firstChild + o = o.shadow && o.lines || 0 if (c && i+o < c.childNodes.length) { - c = c.childNodes[i+o]; c = c && c.firstChild; c = c && c.firstChild; - if (c) c.opacity = val; + c = c.childNodes[i+o]; c = c && c.firstChild; c = c && c.firstChild + if (c) c.opacity = val } - }; + } } - else { - useCssAnimations = vendor(s, 'animation'); - } - }(); + else + useCssAnimations = vendor(s, 'animation') + })() - window.Spinner = Spinner; + if (typeof define == 'function' && define.amd) + define(function() { return Spinner }) + else + window.Spinner = Spinner -})(window, document); \ No newline at end of file +}(window, document); From c4e768b430cf34d8d8e40f648e3b55d1f721158a Mon Sep 17 00:00:00 2001 From: Niko Date: Thu, 20 Dec 2012 12:13:28 +0100 Subject: [PATCH 25/31] [IE] Change css rules bzr revid: nwi@openerp.com-20121220111328-dxwuet3ir6fdzkw1 --- addons/web/static/src/css/base.css | 7 +++---- addons/web/static/src/css/base.sass | 5 ++--- addons/web/static/src/css/full.css | 4 ++++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 1f0eb4639a8..812e3e3fd11 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1384,7 +1384,6 @@ } .openerp .oe_application { width: 100%; - height: 100%; } .openerp .oe_application a { color: #7c7bad; @@ -3128,6 +3127,9 @@ div.ui-widget-overlay { border-radius: 3px; } +.openerp_ie .oe_form_group .field_boolean input { + background: white; +} .openerp_ie input[type='checkbox'] { border: none; background: none; @@ -3156,9 +3158,6 @@ div.ui-widget-overlay { padding-top: 0; padding-bottom: 0; } -.openerp_ie .oe_view_manager_buttons .field_boolean { - background: white; -} .openerp_ie .oe_kanban_image { border: none; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 5a522b9d2d3..41bda681246 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1112,7 +1112,6 @@ $sheet-padding: 16px // ActionManager {{{ .oe_application width: 100% - height: 100% a color: $link-color &:hover @@ -2471,6 +2470,8 @@ div.ui-widget-overlay // Internet Explorer 9+ specifics {{{ .openerp_ie + .oe_form_group .field_boolean input + background: #fff input[type='checkbox'] border: none background: none @@ -2495,8 +2496,6 @@ div.ui-widget-overlay button .oe_form_button_create padding-top: 0 padding-bottom: 0 - .field_boolean - background: #fff .oe_kanban_image border: none .oe_msg_icon diff --git a/addons/web/static/src/css/full.css b/addons/web/static/src/css/full.css index 2692792d46d..52616db3301 100644 --- a/addons/web/static/src/css/full.css +++ b/addons/web/static/src/css/full.css @@ -10,3 +10,7 @@ body { overflow-y: scroll; height: 100%; } + +.openerp .oe_application { + height: 100% +} From 9a2ea2fc98f1c1807bad8cab7caf22bb27634b94 Mon Sep 17 00:00:00 2001 From: Niko Date: Thu, 20 Dec 2012 12:15:36 +0100 Subject: [PATCH 26/31] [MERGE] with trunk bzr revid: nwi@openerp.com-20121220111536-z8d07d11g9z2ziyv --- addons/web/static/lib/spinjs/spin.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 addons/web/static/lib/spinjs/spin.js diff --git a/addons/web/static/lib/spinjs/spin.js b/addons/web/static/lib/spinjs/spin.js old mode 100644 new mode 100755 From eac779ce356aa8e46d1f15ef2249be8d5612d9c4 Mon Sep 17 00:00:00 2001 From: Niko Date: Thu, 20 Dec 2012 12:20:13 +0100 Subject: [PATCH 27/31] [REVERT] remove ignore bzr revid: nwi@openerp.com-20121220112013-0lkrutijnpq4ljde --- .bzrignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.bzrignore b/.bzrignore index 3dc39eb6479..1e0564801ab 100644 --- a/.bzrignore +++ b/.bzrignore @@ -12,4 +12,3 @@ RE:^man/ RE:^lib/ RE:^addons/\w+/doc/_build/ -sa2.bat From 36cd0b866ec491867f0b40dd0107e887614c30c1 Mon Sep 17 00:00:00 2001 From: "olt@tinyerp.com" <> Date: Thu, 20 Dec 2012 12:25:28 +0100 Subject: [PATCH 28/31] [FIX] anonymization: fix for obsolete models bzr revid: olt@tinyerp.com-20121220112528-um4m3crn0enhcplj --- addons/anonymization/anonymization.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/anonymization/anonymization.py b/addons/anonymization/anonymization.py index a455bc835ce..c7f9ab016c4 100644 --- a/addons/anonymization/anonymization.py +++ b/addons/anonymization/anonymization.py @@ -543,7 +543,7 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory): fixes = group(fixes, ('model_name', 'field_name')) for line in data: - table_name = self.pool.get(line['model_id'])._table + table_name = self.pool.get(line['model_id'])._table if self.pool.get(line['model_id']) else None # check if custom sql exists: key = (line['model_id'], line['field_id']) From d090cbdc9491aad49d29f83014c2159d0a2d435f Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Thu, 20 Dec 2012 12:28:37 +0100 Subject: [PATCH 29/31] [FIX] Contact form issue when anonymous bzr revid: vta@openerp.com-20121220112837-jx4koxl7l3dwx1po --- addons/portal_anonymous/security/ir.model.access.csv | 2 +- addons/portal_crm/contact.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/portal_anonymous/security/ir.model.access.csv b/addons/portal_anonymous/security/ir.model.access.csv index 24c29200230..a26b600288d 100644 --- a/addons/portal_anonymous/security/ir.model.access.csv +++ b/addons/portal_anonymous/security/ir.model.access.csv @@ -1,3 +1,3 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_mail_message_portal,mail.message.portal,mail.model_mail_message,portal.group_anonymous,1,0,1,0 +access_mail_message_portal,mail.message.portal,mail.model_mail_message,portal.group_anonymous,1,0,0,0 access_res_partner,res.partner,base.model_res_partner,portal.group_anonymous,1,0,0,0 diff --git a/addons/portal_crm/contact.py b/addons/portal_crm/contact.py index 1cc10344d67..3d2ef024de1 100644 --- a/addons/portal_crm/contact.py +++ b/addons/portal_crm/contact.py @@ -105,7 +105,7 @@ class crm_contact_us(osv.TransientModel): leads to a message_subscribe_user, that triggers access right issues. """ empty_values = dict((k, False) if k != 'name' else (k, '') for k, v in values.iteritems()) - return super(crm_contact_us, self).create(cr, uid, empty_values, {'mail_nosubscribe': True}) + return super(crm_contact_us, self).create(cr, SUPERUSER_ID, empty_values, {'mail_nosubscribe': True}) def submit(self, cr, uid, ids, context=None): """ When the form is submitted, redirect the user to a "Thanks" message """ From e29f0565c984148019547992b10765ec71c5bf74 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 20 Dec 2012 14:16:06 +0100 Subject: [PATCH 30/31] [IMP] res.partner: form view: show phone numbers in embedded contacts kanban; search view: less confusing label `Partner` -> `Name` for default search criterion bzr revid: odo@openerp.com-20121220131606-fiuo04pn1s66bmk1 --- openerp/addons/base/res/res_partner_view.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml index 1cbfd818d28..bd518c08aab 100644 --- a/openerp/addons/base/res/res_partner_view.xml +++ b/openerp/addons/base/res/res_partner_view.xml @@ -201,6 +201,7 @@ + @@ -222,6 +223,9 @@

+
Phone:
+
Mobile:
+
Fax:
@@ -285,8 +289,7 @@ + filter_domain="['|','|',('name','ilike',self),('parent_id','ilike',self),('ref','=',self)]"/> From 4008268d7676f1bcac57e043b7af00f9fae6caca Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Thu, 20 Dec 2012 14:43:54 +0100 Subject: [PATCH 31/31] [IMP] typo bzr revid: fp@tinyerp.com-20121220134354-ca7exk9aln0copx1 --- addons/portal_hr_employees/hr_employee_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/portal_hr_employees/hr_employee_view.xml b/addons/portal_hr_employees/hr_employee_view.xml index 0d8ca0676b6..a3182cd5b1c 100644 --- a/addons/portal_hr_employees/hr_employee_view.xml +++ b/addons/portal_hr_employees/hr_employee_view.xml @@ -44,7 +44,7 @@ - Meet the team + Our Team hr.employee kanban @@ -60,7 +60,7 @@ - Meet the team + Our Team