lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New: Can set the planed delivery date on shipment creation.

Browse Source 
New: Can click on image in eldy and empty menu manager.
This commit is contained in:
Laurent Destailleur 2010-08-26 12:48:57 +00:00
parent 241c4e76cd
commit e0d04d5318
8 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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.

19
htdocs/expedition/fiche.php
View File

@ -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 '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
print '<td colspan="3">';
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 "</td>\n";
print '</tr>';
@ -400,12 +402,14 @@ if ($_GET["action"] == 'create')
print '</td></tr>'."\n";
}
// Note
if ($object->note && ! $user->societe_id)
{
print '<tr><td>'.$langs->trans("NotePrivate").'</td>';
print '<td colspan="3">'.nl2br($object->note)."</td></tr>";
}
// Weight
print '<tr><td>';
print $langs->trans("Weight");
print '</td><td><input name="weight" size="4" value="'.$_POST["weight"].'"></td><td>';
@ -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 '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$expedition->id.'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="setdate_livraison">';
$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 '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
print '</form>';
}
else
{
print $expedition->date_delivery ? dol_print_date($expedition->date_delivery,'daytext') : '&nbsp;';
print $expedition->date_delivery ? dol_print_date($expedition->date_delivery,'dayhourtext') : '&nbsp;';
}
print '</td>';
print '</tr>';

10
htdocs/includes/menus/barre_left/auguria_backoffice.php
View File

@ -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;

10
htdocs/includes/menus/barre_left/auguria_frontoffice.php
View File

@ -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;

10
htdocs/includes/menus/barre_left/eldy_backoffice.php
View File

@ -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;

10
htdocs/includes/menus/barre_left/eldy_frontoffice.php
View File

@ -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;

10
htdocs/includes/menus/barre_left/empty.php
View File

@ -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;

6
htdocs/includes/menus/barre_top/empty.php
View File

@ -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 '<div class="mainmenu '.$idsel.'"><span class="mainmenu_'.$idsel.'" id="mainmenuspan_'.$idsel.'"></span></div>';
print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/index.php?mainmenu=home&amp;leftmenu="'.($atarget?" target=$atarget":"").'>';
print '<div class="mainmenu '.$idsel.'"><span class="mainmenu_'.$idsel.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
print '</a>';
print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":($atarget?" target=$atarget":"")).'>';
print_text_menu_entry_empty($langs->trans("Home"));
print '</a>';