Trans

htdocs/comm/propal.php

@@ -1278,6 +1278,7 @@ if ($id > 0 || ! empty($ref))
 	print '<tr><td>';
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('AvailabilityPeriod');
+	if ($conf->commande->enabled) print ' ('.$langs->trans('AfterOrder').')';
 	print '</td>';
 	if ($_GET['action'] != 'editavailability' && $object->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editavailability&amp;id='.$object->id.'">'.img_edit($langs->trans('SetAvailability'),1).'</a></td>';
 	print '</tr></table>';

htdocs/install/mysql/data/llx_c_availability.sql

@@ -27,7 +27,7 @@
 --
 
 delete from llx_c_availability;
-insert into llx_c_availability (rowid,code,label,active) values (1, 'DSP', 'Disponible', 1);
-insert into llx_c_availability (rowid,code,label,active) values (2, 'USM', 'Une semaine', 1);
-insert into llx_c_availability (rowid,code,label,active) values (3, 'DSM', 'Deux semaines', 1);
-insert into llx_c_availability (rowid,code,label,active) values (4, 'TSM', 'Trois semaines', 1);
+INSERT INTO llx_c_availability (rowid,code,label,active) VALUES (1, 'AV_NOW', 'Immediate', 1);
+INSERT INTO llx_c_availability (rowid,code,label,active) VALUES (2, 'AV_1W',  '1 week', 1);
+INSERT INTO llx_c_availability (rowid,code,label,active) VALUES (3, 'AV_2W',  '2 weeks', 1);
+INSERT INTO llx_c_availability (rowid,code,label,active) VALUES (4, 'AV_3W',  '3 weeks', 1);

htdocs/install/mysql/migration/3.0.0-3.1.0.sql

@@ -62,9 +62,9 @@ ALTER TABLE llx_propal CHANGE COLUMN delivery fk_availability integer DEFAULT 0;
 ALTER TABLE llx_availability CHANGE COLUMN libelle label varchar(60) NOT NULL;
 
 INSERT INTO llx_c_availability (rowid,code,label,active) VALUES (1, 'AV_NOW', 'Immediate', 1);
-INSERT INTO llx_c_availability (rowid,code,label,active) VALUES (2, 'AV_1W',  'One week', 1);
-INSERT INTO llx_c_availability (rowid,code,label,active) VALUES (3, 'AV_2W',  'Two weeks', 1);
-INSERT INTO llx_c_availability (rowid,code,label,active) VALUES (4, 'AV_3W',  'Three weeks', 1);
+INSERT INTO llx_c_availability (rowid,code,label,active) VALUES (2, 'AV_1W',  '1 week', 1);
+INSERT INTO llx_c_availability (rowid,code,label,active) VALUES (3, 'AV_2W',  '2 weeks', 1);
+INSERT INTO llx_c_availability (rowid,code,label,active) VALUES (4, 'AV_3W',  '3 weeks', 1);
 
 ALTER TABLE llx_actioncomm ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER id;
 

htdocs/langs/en_US/propal.lang

@@ -80,6 +80,15 @@ ClonePropal=Clone commercial proposal
 ConfirmClonePropal=Are you sure you want to clone this commercial proposal <b>%s</b> ?
 ProposalsAndProposalsLines=Commercial proposal and lines
 ProposalLine=Proposal line
+AvailabilityPeriod=Availability delay
+SetAvailability=Set availability delay
+AfterOrder=after order
+##### Availability #####
+AvailabilityTypeAV_NOW=Immediate
+AvailabilityTypeAV_1W=1 week
+AvailabilityTypeAV_2W=2 weeks
+AvailabilityTypeAV_3W=3 weeks
+AvailabilityTypeAV_1M=1 month
 ##### Types de contacts #####
 TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
 TypeContact_propal_external_BILLING=Customer invoice contact

htdocs/langs/fr_FR/propal.lang

@@ -80,8 +80,15 @@ ClonePropal=Cloner proposition commerciale
 ConfirmClonePropal=Êtes-vous sûr de vouloir cloner cette proposition commerciale <b>%s</b> ?
 ProposalsAndProposalsLines=Propositions commerciales clientes et lignes de propositions
 ProposalLine=Ligne de proposition
-AvailabilityPeriod=Délai de livraison (à réception de commande)
+AvailabilityPeriod=Délai de livraison
 SetAvailability=Définir le délai de livraison
+AfterOrder=après commande
+##### Availability #####
+AvailabilityTypeAV_NOW=Immediate
+AvailabilityTypeAV_1W=1 semaine
+AvailabilityTypeAV_2W=2 semaines
+AvailabilityTypeAV_3W=3 semaines
+AvailabilityTypeAV_1M=1 mois
 ##### Types de contacts #####
 TypeContact_propal_internal_SALESREPFOLL=Commercial suivi propale
 TypeContact_propal_external_BILLING=Contact client facturation propale