diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 66927c9eb8f..a4b2f2b5a18 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1278,6 +1278,7 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; if ($_GET['action'] != 'editavailability' && $object->brouillon) print ''; print '
'; print $langs->trans('AvailabilityPeriod'); + if ($conf->commande->enabled) print ' ('.$langs->trans('AfterOrder').')'; print 'id.'">'.img_edit($langs->trans('SetAvailability'),1).'
'; @@ -1290,7 +1291,7 @@ if ($id > 0 || ! empty($ref)) { $html->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->availability_id,'none'); } - + print ''; print ''; diff --git a/htdocs/install/mysql/data/llx_c_availability.sql b/htdocs/install/mysql/data/llx_c_availability.sql index 89081dbd139..1dd3cb59a62 100644 --- a/htdocs/install/mysql/data/llx_c_availability.sql +++ b/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); diff --git a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql index 9901f287259..3ecbcdfccbc 100755 --- a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql +++ b/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; diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang index 2ebbc6edbda..cccc6c2741a 100644 --- a/htdocs/langs/en_US/propal.lang +++ b/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 %s ? 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 diff --git a/htdocs/langs/fr_FR/propal.lang b/htdocs/langs/fr_FR/propal.lang index 44200f70107..ff7cf834c17 100644 --- a/htdocs/langs/fr_FR/propal.lang +++ b/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 %s ? 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