Skip to content

Commit

Permalink
Rename custom code into customs code
Browse files Browse the repository at this point in the history
  • Loading branch information
eldy committed Jan 30, 2012
1 parent 52b522e commit 8c934d3
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 40 deletions.
4 changes: 4 additions & 0 deletions build/launchpad/README
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,17 @@ a package onto LaunchPad
- Create Project
- Link project to official SCM server
- Upload SSH public key onto account
- Upload you GPG sign key
- Run from command line:
bzr launchpad-login yourlogin
bzr whoami "Your Name <email@email.com>"
- Create a file /.pbuilderrc with content
COMPONENTS="main universe multiverse restricted"
- Create chroot ubuntu env
sudo pbuilder create [--distribution sid|squeeze]
- Edit file ~/.bashrc ti add
DEBFULLNAME="<Your name>"
DEBEMAIL="<Your email address>"

# Init package tools for launchpad
- Create a Bazaar directory
Expand Down
34 changes: 0 additions & 34 deletions htdocs/langs/el_GR/products.lang
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,12 @@ ContractStatusClosed=Κλειστό
ContractStatusRunning=Ενεργό
ContractStatusExpired=Ληγμένο
ContractStatusOnHold=Ανενεργό
ContractStatusToRun=A mettre en service
ContractNotRunning=Το Συμβόλαιο είναι Ανενεργό
ErrorProductAlreadyExists=Ένα προϊόν με κωδικό %s υπάρχει ήδη.
ErrorProductBadRefOrLabel=Wrong value for reference or label.
Suppliers=Προμηθευτές
SupplierRef=Κωδ. Προμηθευτή
ShowProduct=Εμφάνιση προϊόντων
ShowService=Εμφάνιση Υπηρεσίας
ProductsAndServicesArea=Product and Services area
ProductsArea=Περιοχή Προϊόντων
ServicesArea=Περιοχή Υπηρεσιών
AddToMyProposals=Προσθήκη στις Προτάσεις μου
Expand All @@ -95,19 +92,15 @@ NoPhotoYet=Δεν υπάρχει φωτογραφία
BuiingPrice=Τιμή Αγοράς
SupplierCard=Κάρτα προμηθευτή
CommercialCard=Εμπορική Κάρτα
AllWays=Path to find your product in stock
NoCat=Το προϊόν σας, δεν ανήκει σε κάποια κατηγορία
PrimaryWay=Κύρια διαδρομή
DeleteFromCat=Αφαίρεση από την κατηγορία
PriceRemoved=Η τιμή αφαιρέθηκε
BarCode=Barcode
BarcodeType=τύπος Barcode
SetDefaultBarcodeType=Ορισμός τύπου barcode
BarcodeValue=ΤΙμή Barcode
GenbarcodeLocation=Bar code generation command line tool (used by phpbarcode engine for some bar code types)
NoteNotVisibleOnBill=Σημείωση (μη ορατή σε τιμολόγια, προτάσεις...)
CreateCopy=Δημιουργία Αντιγράφου
ServiceLimitedDuration=If product is a service with limited duration:
MultiPricesAbility=Ενεργοποίηση πολυ-τιμών
MultiPricesNumPrices=Αριθμός τιμής
MultiPriceLevelsName=Κατηγορίες τιμών
Expand All @@ -122,48 +115,21 @@ ProductToAddSearch=Εύρεση προϊόντως προς προσθήκη
AddDel=Προσθήκη/Διαγραφή
Quantity=Ποσότητα
NoMatchFound=Δεν βρέθηκε κατάλληλη εγγραφή
ProductAssociationList=List of related products/services: name of product/service (quantity affected)
ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
DeleteProduct=Διαγραφή προϊόντος/υπηρεσίας
ConfirmDeleteProduct=Are you sure you want to delete this product/service?
ProductDeleted=Product/Service "%s" deleted from database.
DeletePicture=Διαγραφή εικόνας
ConfirmDeletePicture=Είστε σίγουροι ότι θέλετε να διαγράψετε την εικόνα;
ExportDataset_produit_1=Προϊόντα
ExportDataset_service_1=Υπηρεσίες
ImportDataset_produit_1=Προϊόντα
ImportDataset_service_1=Υπηρεσίες
DeleteProductLine=Delete product line
ConfirmDeleteProductLine=Are you sure you want to delete this product line?
NoProductMatching=No product/service match your criteria
MatchingProducts=Matching products/services
NoStockForThisProduct=No stock for this product
NoStock=Χωρίς απόθεμα
Restock=Restock
ProductSpecial=Special
QtyMin=Quantity minimum
PriceQty=Price for this quantity
PriceQtyMin=Price quantity min.
NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product
NoSupplierPriceDefinedForThisProduct=No supplier price/qty defined for this product
RecordedProducts=Products recorded
RecordedProductsAndServices=Products/services recorded
GenerateThumb=Δημιουργία μικρογραφίας
ProductCanvasAbility=Use special "canvas" addons
ServiceNb=Υπηρεσία #%s
ListProductServiceByPopularity=List of products/services by popularity
ListProductByPopularity=List of products by popularity
ListServiceByPopularity=List of services by popularity
Finished=Κατασκευασμένο Προϊόν
RowMaterial=Πρώτη ύλη
CloneProduct=Κλώνοποίηση προϊόντος ή υπηρεσίας
ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
CloneContentProduct=Clone all main informations of product/service
ClonePricesProduct=Clone main informations and prices
ProductIsUsed=Μεταχειρισμένο
NewRefForClone=Ref. of new product/service
CustomerPrices=Τιμές πελατών
SuppliersPrices=Τιμές προμηθευτών
CustomCode=Custom code
CountryOrigin=Χώρα προέλευσης
HiddenIntoCombo=Hidden into select lists
2 changes: 1 addition & 1 deletion htdocs/langs/en_US/products.lang
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,6 @@ ProductIsUsed=This product is used
NewRefForClone=Ref. of new product/service
CustomerPrices=Customers prices
SuppliersPrices=Suppliers prices
CustomCode=Custom code
CustomCode=Customs code
CountryOrigin=Origin country
HiddenIntoCombo=Hidden into select lists
4 changes: 2 additions & 2 deletions htdocs/product/class/product.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class Product extends CommonObject
// Statut indique si le produit est un produit fini '1' ou une matiere premiere '0'
var $finished;

var $customcode; // Custom code
var $customcode; // Customs code
var $country_id; // Country origin id
var $country_code; // Country origin code (US, FR, ...)

Expand Down Expand Up @@ -479,7 +479,7 @@ function update($id, $user, $notrigger=false)
return -2;
}
}

if (! $notrigger)
{
// Appel des triggers
Expand Down
6 changes: 3 additions & 3 deletions htdocs/product/fiche.php
Original file line number Diff line number Diff line change
Expand Up @@ -771,7 +771,7 @@
print '</td></tr>';
}

// Custom code
// Customs code
print '<tr><td>'.$langs->trans("CustomCode").'</td><td><input name="customcode" size="10" value="'.$_POST["customcode"].'"></td></tr>';

// Origin country
Expand Down Expand Up @@ -961,7 +961,7 @@
print '</td></tr>';
}

// Custom code
// Customs code
print '<tr><td>'.$langs->trans("CustomCode").'</td><td colspan="2"><input name="customcode" size="10" value="'.$object->customcode.'"></td></tr>';

// Origin country
Expand Down Expand Up @@ -1177,7 +1177,7 @@
print "</td></tr>\n";
}

// Custom code
// Customs code
print '<tr><td>'.$langs->trans("CustomCode").'</td><td colspan="2">'.$object->customcode.'</td>';

// Origin country code
Expand Down

0 comments on commit 8c934d3

Please sign in to comment.