diff --git a/dmi/run1/Kundendaten.ktr b/dmi/run1/Kundendaten.ktr index 087867ca..1683b8b3 100644 --- a/dmi/run1/Kundendaten.ktr +++ b/dmi/run1/Kundendaten.ktr @@ -68,7 +68,7 @@ - 2014/12/19 13:36:06.719 - - 2015/02/27 13:21:38.420 + 2015/07/02 16:04:59.394 @@ -1114,7 +1114,7 @@ N - info + eu String @@ -1126,27 +1126,36 @@ - BGbase.bgBelgien - CHbase.chSchweiz - CNbase.cnChina - CZbase.czTschechien - DEbase.deDeutschland - DKbase.dkDenmark - GBbase.ukGroß Britanien - GRbase.grGriechenland - HKbase.hkHong Kung - HRbase.hrKroatien - HUbase.huUngarn - ITbase.itItalien - NLbase.nlNiederlande - PLbase.plPolen - RObase.roRumänien - SIbase.siSlovenien - SKbase.skSlowakei - BAbase.baBosnien Herzigovina - BIHbase.baBosnien Herzigovina - ESbase.seSpanien - SEbase.seSchweden + base.atbase.at1 + base.debase.de1 + base.twbase.tw + base.slbase.sl + base.skbase.sk1 + base.czbase.cz1 + base.nlbase.nl1 + base.hubase.hu1 + base.ukbase.uk1 + base.hrbase.hr1 + base.mebase.me + base.babase.ba + base.mkbase.mk + base.bgbase.bg + base.plbase.pl + BGbase.bg + CSbase.sk1 + Dbase.de1 + Ebase.es1 + Fbase.fr1 + GBbase.uk1 + Hbase.bg + Ibase.it1 + Jbase.de1 + Lbase.fr1 + NLbase.nl1 + PLbase.pl + Rbase.ro + RCbase.cn + SLObase.si1 @@ -1210,6 +1219,12 @@ None + + eu + help_eu + + None + @@ -1246,6 +1261,12 @@ None + + eu + help_eu + + None + @@ -1414,6 +1435,16 @@ -1 + + + state_id/id + + String + + -1 + + -1 + zip @@ -1604,6 +1635,16 @@ -1 + + + property_product_pricelist/id + + String + + -1 + + -1 + property_payment_term/id @@ -1704,6 +1745,66 @@ -1 + + + property_account_position + + String + + -1 + + -1 + + + + bank_ids/state + + String + + -1 + + -1 + + + + bank_ids/acc_number + + String + + -1 + + -1 + + + + bank_ids/bank_name + + String + + -1 + + -1 + + + + bank_ids/bank_bic + + String + + -1 + + -1 + + + + user_id/id + + String + + -1 + + -1 + Y @@ -1885,6 +1986,16 @@ -1 + + + state_id/id + + String + + -1 + + -1 + zip @@ -2075,6 +2186,16 @@ -1 + + + property_product_pricelist/id + + String + + -1 + + -1 + property_payment_term/id @@ -2175,6 +2296,66 @@ -1 + + + property_account_position + + String + + -1 + + -1 + + + + bank_ids/state + + String + + -1 + + -1 + + + + bank_ids/acc_number + + String + + -1 + + -1 + + + + bank_ids/bank_name + + String + + -1 + + -1 + + + + bank_ids/bank_bic + + String + + -1 + + -1 + + + + user_id/id + + String + + -1 + + -1 + Y @@ -2333,8 +2514,8 @@ Y - 297 - 340 + 164 + 335 Y @@ -2779,8 +2960,8 @@ - 293 - 516 + 151 + 509 Y @@ -4541,8 +4722,8 @@ - 317 - 77 + 179 + 132 Y diff --git a/dmi/run1/Produktdaten.ktr b/dmi/run1/Produktdaten.ktr index 5b364d9e..084c8457 100644 --- a/dmi/run1/Produktdaten.ktr +++ b/dmi/run1/Produktdaten.ktr @@ -67,7 +67,7 @@ - 2014/12/30 09:51:06.375 - - 2015/02/27 13:21:12.596 + 2015/07/02 16:09:22.719 @@ -76,7 +76,6 @@ MengeneinheitenMEY Transform 2product.category.csvY Transform - Orderpointstock.warehouse.orderpoint.csvN - Lieferantendatenproduct.supplierinfoN MELieferantendatenN ItemCategory.csvTransform 2Y artikel_20150126.csvFilter rowsY @@ -96,6 +95,10 @@ Inventurauftrag 2stock.inventory.csvN Lagerstandstock.inventory.line.csvN MELagerstandN + res.partner.csv 2Data Validator 3 2 2Y + LieferantendatenData Validator 3 2 2Y + Data Validator 3 2 2product.supplierinfoY + Data Validator 3 2 2supplierinfo_errors.csvY Dummy (do nothing) 2 @@ -4381,8 +4384,8 @@ public boolean processRow(StepMetaInterface smi, StepDataInterface sdi) throws K - 1073 - 656 + 1076 + 781 Y @@ -4878,7 +4881,708 @@ public boolean processRow(StepMetaInterface smi, StepDataInterface sdi) throws K + + supplierinfo_errors.csv + TextFileOutput + + Y + + 1 + + none + + + , + " + N + N +
Y
+
N
+ DOS + None + UTF-8 + + N + + Y + + ${dmi_dir}/errors/supplierinfo_errors + N + N + N + csv + N + N + N + N + N + N + + Y + N + N + 0 + + + + id + String + + + + + + none + -1 + -1 + + + name/id + String + + + + + + none + -1 + -1 + + + product_name + String + + + + + + none + -1 + -1 + + + product_code + String + + + + + + none + -1 + -1 + + + sequence + String + + + + + + none + -1 + -1 + + + product_uom/id + String + + + + + + none + -1 + -1 + + + min_qty + String + + + + + + none + -1 + -1 + + + product_tmpl_id/id + String + + + + + + none + -1 + -1 + + + delay + String + + + + + + none + -1 + -1 + + + pricelist_ids/min_quantity + String + + + + + + none + -1 + -1 + + + pricelist_ids/price + String + + + + + + none + -1 + -1 + + + ERROR_CODE + String + + + + + + none + -1 + -1 + + + + + 1248 + 863 + Y + + + + + Data Validator 3 2 2 + Validator + + N + + 1 + + none + + +Y +N +| + name/id +partner_id + + +N +N +N +None +N + + + + + + + + + + + +NO_PARTNER_FOUND + +Y +res.partner.csv +id + + pricelist_ids/price +price + + +N +N +N +None +N + + + + + + + + + + + + + +N + + + + + + 1075 + 673 + Y + + + + + res.partner.csv 2 + CsvInput + + N + + 1 + + none + + + /home/andreas/gitrepos/litalex/dev/dmi/run1/cam_dmi/res.partner.csv + + + N + , + " +
Y
+ 50000 + N + N + N + N + + + + id + String + + + + + -1 + -1 + none + + + name + String + + + + + -1 + -1 + none + + + parent_id/id + String + + + + + -1 + -1 + none + + + street + String + + + + + -1 + -1 + none + + + street2 + String + + + + + -1 + -1 + none + + + city + String + + + + + -1 + -1 + none + + + zip + String + + + + + -1 + -1 + none + + + website + String + + + + + -1 + -1 + none + + + phone + String + + + + + -1 + -1 + none + + + mobile + String + + + + + -1 + -1 + none + + + fax + String + + + + + -1 + -1 + none + + + email + String + + + + + -1 + -1 + none + + + comment + String + + + + + -1 + -1 + none + + + ref + String + + + + + -1 + -1 + none + + + lang + String + + + + + -1 + -1 + none + + + vat + String + + + + + -1 + -1 + none + + + date + String + + + + + -1 + -1 + none + + + is_company + String + + + + + -1 + -1 + none + + + function + String + + + + + -1 + -1 + none + + + use_parent_address + String + + + + + -1 + -1 + none + + + country_id/id + String + + + + + -1 + -1 + none + + + customer + String + + + + + -1 + -1 + none + + + supplier + String + + + + + -1 + -1 + none + + + notify_email + String + + + + + -1 + -1 + none + + + property_product_pricelist_purchase/id + String + + + + + -1 + -1 + none + + + property_payment_term/id + String + + + + + -1 + -1 + none + + + property_supplier_payment_term/id + String + + + + + -1 + -1 + none + + + sale_warn + String + + + + + -1 + -1 + none + + + sale_warn_msg + String + + + + + -1 + -1 + none + + + purchase_warn + String + + + + + -1 + -1 + none + + + purchase_warn_msg + String + + + + + -1 + -1 + none + + + picking_warn + String + + + + + -1 + -1 + none + + + picking_warn_msg + String + + + + + -1 + -1 + none + + + invoice_warn + String + + + + + -1 + -1 + none + + + invoice_warn_msg + String + + + + + -1 + -1 + none + + + + + 982 + 631 + Y + + + + + Data Validator 3 2 + supplierinfo_errors.csv + Y + + + + ERROR_CODE + + + + diff --git a/dmi/run1/Rabatte.ktr b/dmi/run1/Rabatte.ktr new file mode 100644 index 00000000..0c8ace7a --- /dev/null +++ b/dmi/run1/Rabatte.ktr @@ -0,0 +1,1646 @@ + + + Rabatte + + + + Normal + 0 + / + + + + + + + + + +ID_BATCHYID_BATCHCHANNEL_IDYCHANNEL_IDTRANSNAMEYTRANSNAMESTATUSYSTATUSLINES_READYLINES_READLINES_WRITTENYLINES_WRITTENLINES_UPDATEDYLINES_UPDATEDLINES_INPUTYLINES_INPUTLINES_OUTPUTYLINES_OUTPUTLINES_REJECTEDYLINES_REJECTEDERRORSYERRORSSTARTDATEYSTARTDATEENDDATEYENDDATELOGDATEYLOGDATEDEPDATEYDEPDATEREPLAYDATEYREPLAYDATELOG_FIELDYLOG_FIELDEXECUTING_SERVERNEXECUTING_SERVEREXECUTING_USERNEXECUTING_USERCLIENTNCLIENT + + +
+ + +ID_BATCHYID_BATCHSEQ_NRYSEQ_NRLOGDATEYLOGDATETRANSNAMEYTRANSNAMESTEPNAMEYSTEPNAMESTEP_COPYYSTEP_COPYLINES_READYLINES_READLINES_WRITTENYLINES_WRITTENLINES_UPDATEDYLINES_UPDATEDLINES_INPUTYLINES_INPUTLINES_OUTPUTYLINES_OUTPUTLINES_REJECTEDYLINES_REJECTEDERRORSYERRORSINPUT_BUFFER_ROWSYINPUT_BUFFER_ROWSOUTPUT_BUFFER_ROWSYOUTPUT_BUFFER_ROWS + + +
+ +ID_BATCHYID_BATCHCHANNEL_IDYCHANNEL_IDLOG_DATEYLOG_DATELOGGING_OBJECT_TYPEYLOGGING_OBJECT_TYPEOBJECT_NAMEYOBJECT_NAMEOBJECT_COPYYOBJECT_COPYREPOSITORY_DIRECTORYYREPOSITORY_DIRECTORYFILENAMEYFILENAMEOBJECT_IDYOBJECT_IDOBJECT_REVISIONYOBJECT_REVISIONPARENT_CHANNEL_IDYPARENT_CHANNEL_IDROOT_CHANNEL_IDYROOT_CHANNEL_ID + + +
+ +ID_BATCHYID_BATCHCHANNEL_IDYCHANNEL_IDLOG_DATEYLOG_DATETRANSNAMEYTRANSNAMESTEPNAMEYSTEPNAMESTEP_COPYYSTEP_COPYLINES_READYLINES_READLINES_WRITTENYLINES_WRITTENLINES_UPDATEDYLINES_UPDATEDLINES_INPUTYLINES_INPUTLINES_OUTPUTYLINES_OUTPUTLINES_REJECTEDYLINES_REJECTEDERRORSYERRORSLOG_FIELDNLOG_FIELD + + +
+ +ID_BATCHYID_BATCHCHANNEL_IDYCHANNEL_IDLOG_DATEYLOG_DATEMETRICS_DATEYMETRICS_DATEMETRICS_CODEYMETRICS_CODEMETRICS_DESCRIPTIONYMETRICS_DESCRIPTIONMETRICS_SUBJECTYMETRICS_SUBJECTMETRICS_TYPEYMETRICS_TYPEMETRICS_VALUEYMETRICS_VALUE + + + +
+ + 0.0 + 0.0 + + 10000 + 50 + 50 + N + Y + 50000 + Y + + N + 1000 + 100 + + + + + + + + + - + 2015/07/02 16:04:01.526 + - + 2015/07/02 16:04:56.903 + + + + + Ersetze 0Sort rowsY + Ersetze 0Transform 3 2 3Y + Prioritize streams 2product.pricelist.csvY + Prioritize streams 2 2product.pricelist.version.csvY + Prioritize streams 2 3Validate CategoryY + Sort rowsUnique rowsY + Transform 3 2 2Prioritize streams 2Y + Transform 3 2 2 2Prioritize streams 2 2Y + Transform 3 2 3Prioritize streams 2 3Y + Unique rowsTransform 3 2 2Y + Unique rowsTransform 3 2 2 2Y + Validate CategoryERROR_product.category.csvY + Validate Categoryproduct.pricelist.item.csvY + product.category.csvValidate CategoryY + product.pricelist.csv 2Prioritize streams 2Y + product.pricelist.item.csv 2 2 2Prioritize streams 2 3Y + product.pricelist.version.csv 2 2Prioritize streams 2 2Y + Rabattte.csvErsetze 0Y + + + ERROR_product.category.csv + TextFileOutput + + Y + + 1 + + none + + + , + " + Y + N +
Y
+
N
+ DOS + None + UTF-8 + + N + + Y + + ${dmi_dir}/errors/ERROR_product.category + N + N + N + csv + N + N + N + N + N + N + + Y + N + N + 0 + + + + id + String + + + + + + none + -1 + -1 + + + name + String + + + + + + none + -1 + -1 + + + price_version_id/id + String + + + + + + none + -1 + -1 + + + base + String + + + + + + none + -1 + -1 + + + product_id/id + String + + + + + + none + -1 + -1 + + + categ_id/id + String + + + + + + none + -1 + -1 + + + min_quantity + String + + + + + + none + -1 + -1 + + + price_discount + String + + + + + + none + -1 + -1 + + + + + 1000 + 549 + Y + + + + + Ersetze 0 + ReplaceString + + N + + 1 + + none + + + + + WaGru + + yes + ^[0]$ + + N + + no + no + + + Name + + yes + ^[0]$ + + N + TabNr. + no + no + + + Artikelnummer + + yes + ^[0]$ + + N + + no + no + + + WaGru + + yes + ^[0]$ + + N + + no + no + + + + + 592 + 135 + Y + + + + + Prioritize streams 2 + PrioritizeStreams + + N + + 1 + + none + + + + + product.pricelist.csv 2 + + + Transform 3 2 2 + + + + + 221 + 388 + Y + + + + + Prioritize streams 2 2 + PrioritizeStreams + + N + + 1 + + none + + + + + product.pricelist.version.csv 2 2 + + + Transform 3 2 2 2 + + + + + 539 + 479 + Y + + + + + Prioritize streams 2 3 + PrioritizeStreams + + N + + 1 + + none + + + + + product.pricelist.item.csv 2 2 2 + + + Transform 3 2 3 + + + + + 760 + 391 + Y + + + + + Sort rows + SortRows + + Y + + 1 + + none + + + %%java.io.tmpdir%% + out + 1000000 + + N + + N + + + TabNr. + Y + N + N + + + Name + Y + N + N + + + + + 507 + 232 + Y + + + + + Transform 3 2 2 + UserDefinedJavaClass + + N + + 1 + + none + + + + + + TRANSFORM_CLASS + + Processor + + + + + + + id + + String + + -1 + + -1 + + + + name + + String + + -1 + + -1 + + + + currency_id/id + + String + + -1 + + -1 + + + + type + + String + + -1 + + -1 + + + Y + + + 325 + 319 + Y + + + + + Transform 3 2 2 2 + UserDefinedJavaClass + + N + + 1 + + none + + + + + + TRANSFORM_CLASS + + Processor + + + + + + + id + + String + + -1 + + -1 + + + + name + + String + + -1 + + -1 + + + + pricelist_id/id + + String + + -1 + + -1 + + + Y + + + 544 + 391 + Y + + + + + Transform 3 2 3 + UserDefinedJavaClass + + N + + 1 + + none + + + + + + TRANSFORM_CLASS + + Processor + + 0) + get(Fields.Out, "product_id/id").setValue(out, "pp_" + product_id); + } + if(categ_id != null) + { + categ_id = categ_id.trim(); + categ_id = categ_id.replaceAll("[^\\p{L}\\p{Nd}]",""); + if(categ_id.length()>0) + get(Fields.Out, "categ_id/id").setValue(out, "pc_" + categ_id); + } + if(staffelmenge != null) + { + staffelmenge = staffelmenge.replaceAll(",","."); + get(Fields.Out, "min_quantity").setValue(out, (int) Double.parseDouble(staffelmenge)); + } + if(rabatt != null) + { + rabatt = rabatt.replaceAll(",","."); + Double decimal = Double.parseDouble(rabatt)%100; + + get(Fields.Out, "price_discount").setValue(out, -decimal/100); + } + + long incrementLinesInput = incrementLinesInput(); + + get(Fields.Out, "id").setValue(out, "pli_" + id + "_" +incrementLinesInput ); + get(Fields.Out, "name").setValue(out, "default"); + get(Fields.Out, "base").setValue(out, "1"); + get(Fields.Out, "price_version_id/id").setValue(out, "plv_" + id); + + putRow(data.outputRowMeta, out); + + + + return true; +}]]> + + + + + id + + String + + -1 + + -1 + + + + name + + String + + -1 + + -1 + + + + price_version_id/id + + String + + -1 + + -1 + + + + base + + String + + -1 + + -1 + + + + product_id/id + + String + + -1 + + -1 + + + + categ_id/id + + String + + -1 + + -1 + + + + min_quantity + + String + + -1 + + -1 + + + + price_discount + + String + + -1 + + -1 + + + Y + + + 750 + 306 + Y + + + + + Unique rows + Unique + + N + + 1 + + none + + + N + + N + + TabNr. + N + Name + N + + + 507 + 303 + Y + + + + + Validate Category + Validator + + N + + 1 + + none + + +Y +N +| + categ_id/id +categ_id + + +Y +N +N +None +N + + + + + + + + + + + +CATEGORY_NOT_FOUND + +Y +product.category.csv +id + + + + 887 + 437 + Y + + + + + product.category.csv + CsvInput + + N + + 1 + + none + + + ${dmi_dir}/cam_dmi/product.category.csv + + + N + , + " +
Y
+ 50000 + N + N + N + N + + + + id + String + + + + + -1 + -1 + none + + + name + String + + + + + -1 + -1 + none + + + + + 1024 + 425 + Y + + + + + product.pricelist.csv + TextFileOutput + + Y + + 1 + + none + + + , + " + Y + N +
Y
+
N
+ DOS + None + UTF-8 + + N + + Y + + ${dmi_dir}/cam_dmi/product.pricelist + N + N + N + csv + N + N + N + N + N + N + + Y + N + N + 0 + + + + id + String + + + + + + none + -1 + -1 + + + name + String + + + + + + none + -1 + -1 + + + currency_id/id + String + + + + + + none + -1 + -1 + + + type + String + + + + + + none + -1 + -1 + + + + + 222 + 488 + Y + + + + + product.pricelist.csv 2 + CsvInput + + N + + 1 + + none + + + ${dmi_dir}/tmp/product.pricelist.csv + + + N + , + " +
Y
+ 50000 + Y + N + N + N + ISO-8859-1 + + + id + String + + + + + -1 + -1 + none + + + name + String + + + + + -1 + -1 + none + + + currency_id/id + String + + + + + -1 + -1 + none + + + type + String + + + + + -1 + -1 + none + + + + + 191 + 306 + Y + + + + + product.pricelist.item.csv + TextFileOutput + + Y + + 1 + + none + + + , + " + Y + N +
Y
+
N
+ DOS + None + UTF-8 + + N + + Y + + ${dmi_dir}/cam_dmi/product.pricelist.item + N + N + N + csv + N + N + N + N + N + N + + Y + N + N + 0 + + + + id + String + + + + + + none + -1 + -1 + + + name + String + + + + + + none + -1 + -1 + + + price_version_id/id + String + + + + + + none + -1 + -1 + + + base + String + + + + + + none + -1 + -1 + + + product_id/id + String + + + + + + none + -1 + -1 + + + categ_id/id + String + + + + + + none + -1 + -1 + + + price_discount + String + + + + + + none + -1 + -1 + + + min_quantity + String + + + + + + none + -1 + -1 + + + + + 766 + 567 + Y + + + + + product.pricelist.item.csv 2 2 2 + CsvInput + + N + + 1 + + none + + + ${dmi_dir}/tmp/product.pricelist.item.csv + + + N + , + " +
Y
+ 50000 + N + N + N + N + ISO-8859-1 + + + id + String + + + + + -1 + -1 + none + + + name + String + + + + + -1 + -1 + none + + + price_version_id/id + String + + + + + -1 + -1 + none + + + base + String + + + + + -1 + -1 + none + + + product_id/id + String + + + + + -1 + -1 + none + + + categ_id/id + String + + + + + -1 + -1 + none + + + min_quantity + String + + + + + -1 + -1 + none + + + price_discount + String + + + + + -1 + -1 + none + + + + + 905 + 315 + Y + + + + + product.pricelist.version.csv + TextFileOutput + + Y + + 1 + + none + + + , + " + Y + N +
Y
+
N
+ DOS + None + UTF-8 + + N + + Y + + ${dmi_dir}/cam_dmi/product.pricelist.version + N + N + N + csv + N + N + N + N + N + N + + Y + N + N + 0 + + + + id + String + + + + + + none + -1 + -1 + + + name + String + + + + + + none + -1 + -1 + + + pricelist_id/id + String + + + + + + none + -1 + -1 + + + + + 539 + 581 + Y + + + + + product.pricelist.version.csv 2 2 + CsvInput + + N + + 1 + + none + + + ${dmi_dir}/tmp/product.pricelist.version.csv + + + N + , + " +
Y
+ 50000 + Y + N + N + N + ISO-8859-1 + + + id + String + + + + + -1 + -1 + none + + + name + String + + + + + -1 + -1 + none + + + pricelist_id/id + String + + + + + -1 + -1 + none + + + + + 411 + 404 + Y + + + + + Rabattte.csv + CsvInput + + N + + 1 + + none + + + ${dmi_dir}/input/rRabattte.csv + + + N + , + " +
Y
+ 50000 + N + N + N + N + ISO-8859-1 + + + TabNr. + String + + + + + -1 + -1 + none + + + Name + String + + + + + -1 + -1 + none + + + Artikelnummer + String + + + + + -1 + -1 + none + + + WaGru + String + + + + + -1 + -1 + none + + + Staffelmg + String + + + + + -1 + -1 + none + + + Rabatt1 + String + + + + + -1 + -1 + none + + + + + 630 + 44 + Y + + + + + + + + N + + diff --git a/dmi/run1/checksums.sh b/dmi/run1/checksums.sh new file mode 100755 index 00000000..b594bb72 --- /dev/null +++ b/dmi/run1/checksums.sh @@ -0,0 +1,30 @@ +#!/bin/bash +# Get number of all lines of all files in panther_dmi + +date=`date +"%Y%m%d_%H%M"` +out="checksums_${date}.csv" + +for i in `ls cam_dmi/*.csv` +do + lines=`wc "${i}" 2>/dev/null | awk '{print $1 - 1}' ` + echo "${i},${lines}" >> $out + +done + +for i in `ls errors/*.csv` +do + lines=`wc "${i}" 2>/dev/null | awk '{print $1 - 1}' ` + echo "${i},${lines}" >> $out + +done + +for i in `ls input/*.csv` +do + lines=`wc "${i}" 2>/dev/null | awk '{print $1 - 1}' ` + echo "${i},${lines}" >> $out + +done + + + + diff --git a/ext/custom-addons/cam_custom/__openerp__.py b/ext/custom-addons/cam_custom/__openerp__.py index 69c395af..a57893b5 100644 --- a/ext/custom-addons/cam_custom/__openerp__.py +++ b/ext/custom-addons/cam_custom/__openerp__.py @@ -27,7 +27,7 @@ 'description': """Individuelle Anpassungen""", 'author': 'camadeus GmbH', 'website': 'http://www.camadeus.at', - 'depends': ['knowledge','crm','sale','mail','product','account','knowledge'], + 'depends': ['sale','mail','product','account','knowledge'], 'data': [ 'cam_custom_view.xml', 'cam_custom_data.xml', diff --git a/ext/custom-addons/cam_custom/cam_custom.py b/ext/custom-addons/cam_custom/cam_custom.py index 026933ca..11265c25 100644 --- a/ext/custom-addons/cam_custom/cam_custom.py +++ b/ext/custom-addons/cam_custom/cam_custom.py @@ -20,7 +20,7 @@ # ############################################################################## -from openerp.osv import fields, osv +from openerp import fields, models from openerp import api from openerp.tools.translate import _ from openerp import SUPERUSER_ID @@ -30,7 +30,7 @@ from lxml import etree DISABLED_MENUS = [ ] -class ir_ui_menu(osv.osv): +class ir_ui_menu(models.Model): _inherit = 'ir.ui.menu' @tools.ormcache(skiparg=2) @@ -54,7 +54,7 @@ class ir_ui_menu(osv.osv): ids = super(ir_ui_menu, self)._filter_visible_menus(cr, uid, ids, context) return ids -class res_partner(osv.osv): +class res_partner(models.Model): _inherit = 'res.partner' @api.model @@ -62,17 +62,8 @@ class res_partner(osv.osv): """ verhindert das Überschreiben von address_format """ return arch -class product_product(osv.osv): - _inherit = 'product.product' - - def name_get(self, cr, user, ids, context=None): - if context is None: - context = {} - c = context.copy() - c.update({'display_default_code': False}) - return super(product_product, self).name_get(cr, user, ids, context=c) - -class mail_notification(osv.Model): + +class mail_notification(models.Model): _inherit = 'mail.notification' # override original function @@ -151,4 +142,8 @@ class product_product(models.Model): if not c.get('quantity', False): c.update({'display_default_code': False}) return super(product_product, self).name_get(cr, user, ids, context=c) - \ No newline at end of file + +class res_country(models.Model): + _inherit = 'res.country' + + active = fields.Boolean('Aktiv', default=True) \ No newline at end of file diff --git a/ext/custom-addons/cam_custom/security/ir.model.access.csv b/ext/custom-addons/cam_custom/security/ir.model.access.csv index 52d55274..0343f29f 100644 --- a/ext/custom-addons/cam_custom/security/ir.model.access.csv +++ b/ext/custom-addons/cam_custom/security/ir.model.access.csv @@ -1,2 +1 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"crm_opportunity_report_show","crm_opportunity_report_show","crm.model_crm_opportunity_report","base.group_sale_salesman",1,,,