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

Correct management when delivery date is universal time format.

Browse Source
This commit is contained in:
Laurent Destailleur 2015-02-17 17:21:41 +01:00
parent 685b8d722d
commit ad67fe50a3
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
View File

@ -1011,7 +1011,9 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
} }
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
if (! empty($object->date_livraison)) $pdf->MultiCell(190, 3, $outputlangs->transnoentities("DateDeliveryPlanned")." : " . dol_print_date($object->date_livraison,"day",false,$outputlangs,true), '', 'R'); $usehourmin='day';
if ( empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) $usehourmin='dayhour';
if (! empty($object->date_livraison)) $pdf->MultiCell(190, 3, $outputlangs->transnoentities("DateDeliveryPlanned")." : " . dol_print_date($object->date_livraison,$usehourmin,false,$outputlangs,true), '', 'R');
$posy+=5; $posy+=5;
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);

6
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -1609,9 +1609,9 @@ class CommandeFournisseur extends CommonOrder
/** /**
* Set the planned delivery date * Set the planned delivery date
* *
* @param User $user Objet utilisateur qui modifie * @param User $user Objet user making change
* @param timestamp $date_livraison Date de livraison * @param timestamp $date_livraison Planned delivery date
* @return int <0 si ko, >0 si ok * @return int <0 if KO, >0 if OK
*/ */
function set_date_livraison($user, $date_livraison) function set_date_livraison($user, $date_livraison)
{ {

10
htdocs/fourn/commande/card.php
View File

@ -144,7 +144,7 @@ if ($action == 'setbankaccount' && $user->rights->fournisseur->commande->creer)
// date de livraison // date de livraison
if ($action == 'setdate_livraison' && $user->rights->fournisseur->commande->creer) if ($action == 'setdate_livraison' && $user->rights->fournisseur->commande->creer)
{ {
$datelivraison=dol_mktime(0, 0, 0, GETPOST('liv_month','int'), GETPOST('liv_day','int'),GETPOST('liv_year','int')); $datelivraison=dol_mktime(GETPOST('liv_hour','int'), GETPOST('liv_min','int'), GETPOST('liv_sec','int'), GETPOST('liv_month','int'), GETPOST('liv_day','int'),GETPOST('liv_year','int'));
$result=$object->set_date_livraison($user,$datelivraison); $result=$object->set_date_livraison($user,$datelivraison);
if ($result < 0) if ($result < 0)
@ -1588,13 +1588,17 @@ elseif (! empty($object->id))
print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">'; print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="setdate_livraison">'; print '<input type="hidden" name="action" value="setdate_livraison">';
$form->select_date($object->date_livraison?$object->date_livraison:-1,'liv_','','','',"setdate_livraison"); $usehourmin=0;
if (! empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) $usehourmin=1;
$form->select_date($object->date_livraison?$object->date_livraison:-1,'liv_',$usehourmin,$usehourmin,'',"setdate_livraison");
print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">'; print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
print '</form>'; print '</form>';
} }
else else
{ {
print $object->date_livraison ? dol_print_date($object->date_livraison,'daytext') : '&nbsp;'; $usehourmin='day';
if (! empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) $usehourmin='dayhour';
print $object->date_livraison ? dol_print_date($object->date_livraison, $usehourmin) : '&nbsp;';
} }
print '</td></tr>'; print '</td></tr>';

2
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
View File

@ -210,6 +210,8 @@ ALTER TABLE llx_product_price ADD INDEX idx_product_price_fk_product (fk_produc
DELETE from llx_product_price where fk_product NOT IN (SELECT rowid from llx_product); DELETE from llx_product_price where fk_product NOT IN (SELECT rowid from llx_product);
ALTER TABLE llx_product_price ADD CONSTRAINT fk_product_price_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid); ALTER TABLE llx_product_price ADD CONSTRAINT fk_product_price_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid);
ALTER TABLE llx_commande_fournisseur MODIFY COLUMN date_livraison datetime;
ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_account integer AFTER date_livraison; ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_account integer AFTER date_livraison;
ALTER TABLE llx_facture_fourn ADD COLUMN fk_account integer AFTER fk_projet; ALTER TABLE llx_facture_fourn ADD COLUMN fk_account integer AFTER fk_projet;

4
htdocs/install/mysql/tables/llx_commande_fournisseur.sql
View File

@ -55,11 +55,11 @@ create table llx_commande_fournisseur
note_public text, note_public text,
model_pdf varchar(255), model_pdf varchar(255),
date_livraison date default NULL, date_livraison datetime default NULL,
fk_account integer, -- bank account fk_account integer, -- bank account
fk_cond_reglement integer, -- condition de reglement fk_cond_reglement integer, -- condition de reglement
fk_mode_reglement integer, -- mode de reglement fk_mode_reglement integer, -- mode de reglement
fk_input_method integer default 0, fk_input_method integer default 0,
import_key varchar(14), import_key varchar(14),
extraparams varchar(255) -- for stock other parameters with json format extraparams varchar(255) -- for stock other parameters with json format