pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] merged with lp:openobject-addons

Browse Source 
bzr revid: shp@tinyerp.com-20121019050821-6e0dbnsxxzg0zocf
This commit is contained in:
pankita shah (Open ERP)
2012-10-19 10:38:21 +05:30
parent a098bdc7f1 c4104503d6
commit c25c19a4f4
5 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/l10n_us/account.account.template.csv
+23 -23
View File
@@ -69,29 +69,29 @@
"51800_advertising","51800","Merchant Account Fees","other","l10n_us.user_type_cogs","cost_of_goods_sold","FALSE","l10n_us.account_chart_template_advertising"
"53500_advertising","53500","Subcontracted Services","other","l10n_us.user_type_cogs","cost_of_goods_sold","FALSE","l10n_us.account_chart_template_advertising"
"64200_advertising","64200","Marketing Expense","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_advertising"
"41200_agriculture","41200","Agricultural Program Payments","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
"42500_agriculture","42500","Commodity Credit Loans","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
"42800_agriculture","42800","Cooperative Distributions","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
"42900_agriculture","42900","Crop Insurance Proceeds","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
"43000_agriculture","43000","Crop Sales","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
"43100_agriculture","43100","Custom Hire Income","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
"43600_agriculture","43600","Farmers Market Sales","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
"44100_agriculture","44100","Fuel Tax Credits and Other Inc.","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
"45500_agriculture","45500","Livestock Sales","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
"47400_agriculture","47400","Rental Income","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
"61100_agriculture","61100","Car and Truck Expenses","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
"61500_agriculture","61500","Chemicals Purchased","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
"61900_agriculture","61900","Conservation Expenses","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
"62300_agriculture","62300","Custom Hire and Contract Labor","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
"62900_agriculture","62900","Feed Purchased","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
"63000_agriculture","63000","Fertilizers and Lime","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
"63100_agriculture","63100","Freight and Trucking","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
"63200_agriculture","63200","Gasoline, Fuel and Oil","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
"67500_agriculture","67500","Seeds and Plants Purchased","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
"67800_agriculture","67800","Small Tools and Equipment","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
"67900_agriculture","67900","Storage and Warehousing","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
"68500_agriculture","68500","Uniforms","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
"68800_agriculture","68800","Veterinary, Breeding, Medicine","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
"41200_agriculture","41200","Agricultural Program Payments","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agriculture"
"42500_agriculture","42500","Commodity Credit Loans","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agriculture"
"42800_agriculture","42800","Cooperative Distributions","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agriculture"
"42900_agriculture","42900","Crop Insurance Proceeds","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agriculture"
"43000_agriculture","43000","Crop Sales","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agriculture"
"43100_agriculture","43100","Custom Hire Income","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agriculture"
"43600_agriculture","43600","Farmers Market Sales","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agriculture"
"44100_agriculture","44100","Fuel Tax Credits and Other Inc.","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agriculture"
"45500_agriculture","45500","Livestock Sales","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agriculture"
"47400_agriculture","47400","Rental Income","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agriculture"
"61100_agriculture","61100","Car and Truck Expenses","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
"61500_agriculture","61500","Chemicals Purchased","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
"61900_agriculture","61900","Conservation Expenses","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
"62300_agriculture","62300","Custom Hire and Contract Labor","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
"62900_agriculture","62900","Feed Purchased","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
"63000_agriculture","63000","Fertilizers and Lime","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
"63100_agriculture","63100","Freight and Trucking","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
"63200_agriculture","63200","Gasoline, Fuel and Oil","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
"67500_agriculture","67500","Seeds and Plants Purchased","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
"67800_agriculture","67800","Small Tools and Equipment","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
"67900_agriculture","67900","Storage and Warehousing","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
"68500_agriculture","68500","Uniforms","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
"68800_agriculture","68800","Veterinary, Breeding, Medicine","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
"24600_construction_trades","24600","Customer Deposits Received","other","l10n_us.user_type_other_current_liability","other_current_liability","FALSE","l10n_us.account_chart_template_construction"
"45100_construction_trades","45100","Job Income","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_construction"
"50800_construction_trades","50800","Commissions Paid","other","l10n_us.user_type_cogs","cost_of_goods_sold","FALSE","l10n_us.account_chart_template_construction"
1 id code name type user_type:id parent_id:id reconcile chart_template_id:id
69 51800_advertising 51800 Merchant Account Fees other l10n_us.user_type_cogs cost_of_goods_sold FALSE l10n_us.account_chart_template_advertising
70 53500_advertising 53500 Subcontracted Services other l10n_us.user_type_cogs cost_of_goods_sold FALSE l10n_us.account_chart_template_advertising
71 64200_advertising 64200 Marketing Expense other l10n_us.user_type_expense expense FALSE l10n_us.account_chart_template_advertising
72 41200_agriculture 41200 Agricultural Program Payments other l10n_us.user_type_income income FALSE l10n_us.account_chart_template_agricultar l10n_us.account_chart_template_agriculture
73 42500_agriculture 42500 Commodity Credit Loans other l10n_us.user_type_income income FALSE l10n_us.account_chart_template_agricultar l10n_us.account_chart_template_agriculture
74 42800_agriculture 42800 Cooperative Distributions other l10n_us.user_type_income income FALSE l10n_us.account_chart_template_agricultar l10n_us.account_chart_template_agriculture
75 42900_agriculture 42900 Crop Insurance Proceeds other l10n_us.user_type_income income FALSE l10n_us.account_chart_template_agricultar l10n_us.account_chart_template_agriculture
76 43000_agriculture 43000 Crop Sales other l10n_us.user_type_income income FALSE l10n_us.account_chart_template_agricultar l10n_us.account_chart_template_agriculture
77 43100_agriculture 43100 Custom Hire Income other l10n_us.user_type_income income FALSE l10n_us.account_chart_template_agricultar l10n_us.account_chart_template_agriculture
78 43600_agriculture 43600 Farmers Market Sales other l10n_us.user_type_income income FALSE l10n_us.account_chart_template_agricultar l10n_us.account_chart_template_agriculture
79 44100_agriculture 44100 Fuel Tax Credits and Other Inc. other l10n_us.user_type_income income FALSE l10n_us.account_chart_template_agricultar l10n_us.account_chart_template_agriculture
80 45500_agriculture 45500 Livestock Sales other l10n_us.user_type_income income FALSE l10n_us.account_chart_template_agricultar l10n_us.account_chart_template_agriculture
81 47400_agriculture 47400 Rental Income other l10n_us.user_type_income income FALSE l10n_us.account_chart_template_agricultar l10n_us.account_chart_template_agriculture
82 61100_agriculture 61100 Car and Truck Expenses other l10n_us.user_type_expense expense FALSE l10n_us.account_chart_template_agricultar l10n_us.account_chart_template_agriculture
83 61500_agriculture 61500 Chemicals Purchased other l10n_us.user_type_expense expense FALSE l10n_us.account_chart_template_agricultar l10n_us.account_chart_template_agriculture
84 61900_agriculture 61900 Conservation Expenses other l10n_us.user_type_expense expense FALSE l10n_us.account_chart_template_agricultar l10n_us.account_chart_template_agriculture
85 62300_agriculture 62300 Custom Hire and Contract Labor other l10n_us.user_type_expense expense FALSE l10n_us.account_chart_template_agricultar l10n_us.account_chart_template_agriculture
86 62900_agriculture 62900 Feed Purchased other l10n_us.user_type_expense expense FALSE l10n_us.account_chart_template_agricultar l10n_us.account_chart_template_agriculture
87 63000_agriculture 63000 Fertilizers and Lime other l10n_us.user_type_expense expense FALSE l10n_us.account_chart_template_agricultar l10n_us.account_chart_template_agriculture
88 63100_agriculture 63100 Freight and Trucking other l10n_us.user_type_expense expense FALSE l10n_us.account_chart_template_agricultar l10n_us.account_chart_template_agriculture
89 63200_agriculture 63200 Gasoline, Fuel and Oil other l10n_us.user_type_expense expense FALSE l10n_us.account_chart_template_agricultar l10n_us.account_chart_template_agriculture
90 67500_agriculture 67500 Seeds and Plants Purchased other l10n_us.user_type_expense expense FALSE l10n_us.account_chart_template_agricultar l10n_us.account_chart_template_agriculture
91 67800_agriculture 67800 Small Tools and Equipment other l10n_us.user_type_expense expense FALSE l10n_us.account_chart_template_agricultar l10n_us.account_chart_template_agriculture
92 67900_agriculture 67900 Storage and Warehousing other l10n_us.user_type_expense expense FALSE l10n_us.account_chart_template_agricultar l10n_us.account_chart_template_agriculture
93 68500_agriculture 68500 Uniforms other l10n_us.user_type_expense expense FALSE l10n_us.account_chart_template_agricultar l10n_us.account_chart_template_agriculture
94 68800_agriculture 68800 Veterinary, Breeding, Medicine other l10n_us.user_type_expense expense FALSE l10n_us.account_chart_template_agricultar l10n_us.account_chart_template_agriculture
95 24600_construction_trades 24600 Customer Deposits Received other l10n_us.user_type_other_current_liability other_current_liability FALSE l10n_us.account_chart_template_construction
96 45100_construction_trades 45100 Job Income other l10n_us.user_type_income income FALSE l10n_us.account_chart_template_construction
97 50800_construction_trades 50800 Commissions Paid other l10n_us.user_type_cogs cost_of_goods_sold FALSE l10n_us.account_chart_template_construction
addons/l10n_us/account_chart_template.xml
+2 -2
View File
@@ -19,8 +19,8 @@
<field name="complete_tax_set" eval="False" />
<field name="parent_id" ref="account_chart_template_cogs"/>
</record>
<record id="account_chart_template_agricultar" model="account.chart.template">
<field name="name">Agricultar</field>
<record id="account_chart_template_agriculture" model="account.chart.template">
<field name="name">Agriculture</field>
<field name="complete_tax_set" eval="False" />
<field name="parent_id" ref="account_chart_template_basic"/>
</record>
addons/l10n_us/account_chart_template_after.xml
+1 -1
View File
@@ -11,7 +11,7 @@
<field name="bank_account_view_id" ref="cash_expenditure"/>
</record>
<record id="account_chart_template_agricultar" model="account.chart.template">
<record id="account_chart_template_agriculture" model="account.chart.template">
<field name="bank_account_view_id" ref="cash_expenditure"/>
</record>
addons/mail/static/src/js/mail.js
+1 -1
View File
@@ -1244,7 +1244,7 @@ openerp.mail = function(session) {
var self = this;
this.searchview = new session.web.SearchView(this, this.ds_msg, false, defaults || {}, hidden || false);
return this.searchview.appendTo(this.$('.oe_view_manager_view_search')).then(function () {
self.searchview.on_search.add(self.do_searchview_search);
self.searchview.on('search_data', self, self.do_searchview_search);
});
},
addons/mail/static/src/js/mail_followers.js
+1
View File
@@ -139,6 +139,7 @@ openerp_mail_followers = function(session, mail) {
/** Display the followers */
display_followers: function (records) {
var self = this;
records = records || [];
this.message_is_follower = this.set_is_follower(records);
// clean and display title
var node_user_list = this.$('ul.oe_mail_followers_display').empty();