diff --git a/htdocs/admin/propale.php b/htdocs/admin/propale.php index 9f212b99056..ca74e8673c3 100644 --- a/htdocs/admin/propale.php +++ b/htdocs/admin/propale.php @@ -85,6 +85,20 @@ if ($_POST["action"] == 'setdefaultduration') exit; } +if ($_POST["action"] == 'addshippingdate') +{ + dolibarr_set_const($db, "PROPALE_ADD_SHIPPING_DATE",$_POST["value"]); + Header("Location: propale.php"); + exit; +} + +if ($_POST["action"] == 'adddeliveryaddress') +{ + dolibarr_set_const($db, "PROPALE_ADD_DELIVERY_ADDRESS",$_POST["value"]); + Header("Location: propale.php"); + exit; +} + if ($_POST["action"] == 'setclassifiedinvoiced') { dolibarr_set_const($db, "PROPALE_CLASSIFIED_INVOICED_WITH_ORDER",$_POST["value"]); @@ -391,6 +405,25 @@ print '"; +print ""; +print ""; +print ''.$langs->trans("AddShippingDateAbility").''; +print ''.$html->selectyesno('value',$conf->global->PROPALE_ADD_SHIPPING_DATE,1).''; +print ''; +print ''; +print ''; + +$var=!$var; +print "
"; +print ""; +print ""; +print ''.$langs->trans("AddDeliveryAddressAbility").''; +print ''.$html->selectyesno('value',$conf->global->PROPALE_ADD_DELIVERY_ADDRESS,1).''; +print ''; +print ''; +print '
'; if ($conf->commande->enabled) { @@ -422,7 +455,7 @@ print "\n"; print " ".$langs->trans("Name")."\n"; print " ".$langs->trans("Value")."\n"; print "\n"; -print "\n ".$langs->trans("Directory")."\n ".$conf->propal->dir_output."\n\n"; +print "\n ".$langs->trans("PathDirectory")."\n ".$conf->propal->dir_output."\n\n"; print "\n
"; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 166d6fe8b4f..66158c8f22a 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -524,6 +524,8 @@ ProposalsPDFModules=Commercial proposal documents models ClassifiedInvoiced=Classified invoiced ClassifiedInvoicedWithOrder=Classify invoiced proposal at the same time as the order HideTreadedPropal=Hide the treated commercial proposals in the list +AddShippingDateAbility=Add shipping date ability +AddDeliveryAddressAbility=Add delivery date ability ##### Orders ##### OrdersSetup=Orders' management setup OrdersNumberingModules=Orders numbering modules diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 5790daf79b1..8f9dddb127a 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -526,6 +526,8 @@ ProposalsPDFModules=Mod ClassifiedInvoiced=Classé facturée ClassifiedInvoicedWithOrder=Classé facturée la propale en même temps que la commande HideTreadedPropal=Cacher les propositions commerciales traitées de la liste +AddShippingDateAbility=Possibilité de déterminer une date de livraison +AddDeliveryAddressAbility=Possibilité de sélectionner une adresse de livraison ##### Orders ##### OrdersSetup=Configuration du module Commandes OrdersNumberingModules=Modules de numérotation des commandes