From e0d04d5318687d6f7ef65030166c2ba06c85c07d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 26 Aug 2010 12:48:57 +0000 Subject: [PATCH] New: Can set the planed delivery date on shipment creation. New: Can click on image in eldy and empty menu manager. --- ChangeLog | 1 + htdocs/expedition/fiche.php | 19 ++++++++++--------- .../menus/barre_left/auguria_backoffice.php | 10 +++++----- .../menus/barre_left/auguria_frontoffice.php | 10 +++++----- .../menus/barre_left/eldy_backoffice.php | 10 +++++----- .../menus/barre_left/eldy_frontoffice.php | 10 +++++----- htdocs/includes/menus/barre_left/empty.php | 10 +++++----- htdocs/includes/menus/barre_top/empty.php | 6 ++++-- 8 files changed, 40 insertions(+), 36 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92a5fd5dceb..925d4a3aad4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ For users: - New: Add hidden option MAIN_SERVICES_ARE_ECOMMERCE_200238EC. - New: Support NPR in customer product prices. - New: Add more volume units (ounce, gallon, inch, feet, ...) +- New: Delivery date accepts hours and minutes. - Perf: Avoid reading database to determine country code after each page call. - Fix: Better Postgresql compatibility. diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index 074809155cd..77657e28c49 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -81,6 +81,8 @@ if ($_POST["action"] == 'add') $expedition->size_units = $_POST["size_units"]; $expedition->weight_units = $_POST["weight_units"]; + $date_delivery = dol_mktime($_POST["date_deliveryhour"], $_POST["date_deliverymin"], 0, $_POST["date_deliverymonth"], $_POST["date_deliveryday"], $_POST["date_deliveryyear"]); + // On va boucler sur chaque ligne du document d'origine pour completer objet expedition // avec info diverses + qte a livrer $classname = ucfirst($expedition->origin); @@ -90,7 +92,7 @@ if ($_POST["action"] == 'add') $expedition->socid = $object->socid; $expedition->ref_customer = $object->ref_client; - $expedition->date_delivery = $object->date_livraison; // Date delivery planed + $expedition->date_delivery = $date_delivery; // Date delivery planed $expedition->fk_delivery_address = $object->fk_delivery_address; $expedition->expedition_method_id = $_POST["expedition_method_id"]; $expedition->tracking_number = $_POST["tracking_number"]; @@ -206,7 +208,7 @@ if ($_REQUEST["action"] == 'open') if ($_POST['action'] == 'setdate_livraison' && $user->rights->expedition->creer) { //print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year']; - $datelivraison=dol_mktime(0, 0, 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year']); + $datelivraison=dol_mktime($_POST['liv_hour'], $_POST['liv_min'], 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year']); $shipping = new Expedition($db); $shipping->fetch($_GET['id']); @@ -382,8 +384,8 @@ if ($_GET["action"] == 'create') // Date delivery planned print ''.$langs->trans("DateDeliveryPlanned").''; print ''; - print dol_print_date($object->date_livraison,"day"); - //$html->select_date($object->date_livraison,'date_delivery'); + //print dol_print_date($object->date_livraison,"day"); // date_livraison come from order and will be stored into date_delivery planed. + print $html->select_date($object->date_livraison?$object->date_livraison:-1,'date_delivery',1,1); print "\n"; print ''; @@ -400,12 +402,14 @@ if ($_GET["action"] == 'create') print ''."\n"; } + // Note if ($object->note && ! $user->societe_id) { print ''.$langs->trans("NotePrivate").''; print ''.nl2br($object->note).""; } + // Weight print ''; print $langs->trans("Weight"); print ''; @@ -685,7 +689,6 @@ else /* * Confirmation de la suppression - * */ if ($_GET["action"] == 'delete') { @@ -695,7 +698,6 @@ else /* * Confirmation de la validation - * */ if ($_GET["action"] == 'valid') { @@ -704,7 +706,6 @@ else } /* * Confirmation de l'annulation - * */ if ($_GET["action"] == 'annuler') { @@ -789,13 +790,13 @@ else print '
'; print ''; print ''; - $html->select_date($expedition->date_delivery?$expedition->date_delivery:-1,'liv_','','','',"setdate_livraison"); + $html->select_date($expedition->date_delivery?$expedition->date_delivery:-1,'liv_',1,1,'',"setdate_livraison"); print ''; print '
'; } else { - print $expedition->date_delivery ? dol_print_date($expedition->date_delivery,'daytext') : ' '; + print $expedition->date_delivery ? dol_print_date($expedition->date_delivery,'dayhourtext') : ' '; } print ''; print ''; diff --git a/htdocs/includes/menus/barre_left/auguria_backoffice.php b/htdocs/includes/menus/barre_left/auguria_backoffice.php index 3bdb7d8b765..5f281247873 100644 --- a/htdocs/includes/menus/barre_left/auguria_backoffice.php +++ b/htdocs/includes/menus/barre_left/auguria_backoffice.php @@ -45,13 +45,13 @@ class MenuLeft { /** - * \brief Constructor - * \param db Database handler - * \param menu_array Table of menu entries to show before entries of menu handler - * \param menu_array_after Table of menu entries to show after entries of menu handler + * Constructor + * @param db Database handler + * @param menu_array Table of menu entries to show before entries of menu handler + * @param menu_array_after Table of menu entries to show after entries of menu handler * */ - function MenuLeft($db,&$menu_array='',&$menu_array_after='') + function MenuLeft($db,&$menu_array,&$menu_array_after) { $this->db=$db; $this->menu_array=$menu_array; diff --git a/htdocs/includes/menus/barre_left/auguria_frontoffice.php b/htdocs/includes/menus/barre_left/auguria_frontoffice.php index 5ad33345018..0d4c3327868 100644 --- a/htdocs/includes/menus/barre_left/auguria_frontoffice.php +++ b/htdocs/includes/menus/barre_left/auguria_frontoffice.php @@ -45,12 +45,12 @@ class MenuLeft { /** - * \brief Constructor - * \param db Database handler - * \param menu_array Table of menu entries to show before entries of menu handler - * \param menu_array_after Table of menu entries to show after entries of menu handler + * Constructor + * @param db Database handler + * @param menu_array Table of menu entries to show before entries of menu handler + * @param menu_array_after Table of menu entries to show after entries of menu handler */ - function MenuLeft($db,&$menu_array='',&$menu_array_after='') + function MenuLeft($db,&$menu_array,&$menu_array_after) { $this->db=$db; $this->menu_array=$menu_array; diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index e690f0d9055..7525baca40e 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -45,12 +45,12 @@ class MenuLeft { /** - * \brief Constructor - * \param db Database handler - * \param menu_array Table of menu entries to show before entries of menu handler - * \param menu_array_after Table of menu entries to show after entries of menu handler + * Constructor + * @param db Database handler + * @param menu_array Table of menu entries to show before entries of menu handler + * @param menu_array_after Table of menu entries to show after entries of menu handler */ - function MenuLeft($db,&$menu_array='',&$menu_array_after='') + function MenuLeft($db,&$menu_array,&$menu_array_after) { $this->db=$db; $this->menu_array=$menu_array; diff --git a/htdocs/includes/menus/barre_left/eldy_frontoffice.php b/htdocs/includes/menus/barre_left/eldy_frontoffice.php index 1f81bee2ada..ac1b8a6bde5 100644 --- a/htdocs/includes/menus/barre_left/eldy_frontoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_frontoffice.php @@ -44,12 +44,12 @@ class MenuLeft { /** - * \brief Constructor - * \param db Database handler - * \param menu_array Table of menu entries to show before entries of menu handler - * \param menu_array_after Table of menu entries to show after entries of menu handler + * Constructor + * @param db Database handler + * @param menu_array Table of menu entries to show before entries of menu handler + * @param menu_array_after Table of menu entries to show after entries of menu handler */ - function MenuLeft($db,&$menu_array='',&$menu_array_after='') + function MenuLeft($db,&$menu_array,&$menu_array_after) { $this->db=$db; $this->menu_array=$menu_array; diff --git a/htdocs/includes/menus/barre_left/empty.php b/htdocs/includes/menus/barre_left/empty.php index 8fca51210ff..7b86e846448 100644 --- a/htdocs/includes/menus/barre_left/empty.php +++ b/htdocs/includes/menus/barre_left/empty.php @@ -36,12 +36,12 @@ class MenuLeft { /** - * \brief Constructor - * \param db Database handler - * \param menu_array Table of menu entries to show before entries of menu handler - * \param menu_array_after Table of menu entries to show after entries of menu handler + * Constructor + * @param db Database handler + * @param menu_array Table of menu entries to show before entries of menu handler + * @param menu_array_after Table of menu entries to show after entries of menu handler */ - function MenuLeft($db,&$menu_array='',&$menu_array_after='') + function MenuLeft($db,&$menu_array,&$menu_array_after) { $this->db=$db; $this->menu_array=$menu_array; diff --git a/htdocs/includes/menus/barre_top/empty.php b/htdocs/includes/menus/barre_top/empty.php index 3e48ccbcefc..c984af8adea 100644 --- a/htdocs/includes/menus/barre_top/empty.php +++ b/htdocs/includes/menus/barre_top/empty.php @@ -53,11 +53,13 @@ class MenuTop { print_start_menu_array_empty(); - $idsel='none'; + $idsel='home'; $classname='class="tmenu"'; print_start_menu_entry_empty($idsel); - print '
'; + print ''; + print '
'; + print ''; print ''; print_text_menu_entry_empty($langs->trans("Home")); print '';