diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index a9167c43c32..916143b896a 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -322,7 +322,7 @@ if ($object->id > 0) print ''; + if (($action != 'editconditions') && $user->rights->societe->creer) print ''; print '
'; print $langs->trans('PaymentConditions'); print ''; - if (($action != 'editconditions') && $user->rights->societe->creer) print 'id.'">'.img_edit($langs->trans('SetConditions'),1).'id.'">'.img_edit($langs->trans('SetConditions'),1).'
'; print ''; if ($action == 'editconditions') @@ -341,7 +341,7 @@ if ($object->id > 0) print ''; + if (($action != 'editmode') && $user->rights->societe->creer) print ''; print '
'; print $langs->trans('PaymentMode'); print ''; - if (($action != 'editmode') && $user->rights->societe->creer) print 'id.'">'.img_edit($langs->trans('SetMode'),1).'id.'">'.img_edit($langs->trans('SetMode'),1).'
'; print ''; if ($action == 'editmode') @@ -362,7 +362,7 @@ if ($object->id > 0) print ''; + if (($action != 'editbankaccount') && $user->rights->societe->creer) print ''; print '
'; print $langs->trans('PaymentBankAccount'); print ''; - if (($action != 'editbankaccount') && $user->rights->societe->creer) print 'id.'">'.img_edit($langs->trans('SetBankAccount'),1).'id.'">'.img_edit($langs->trans('SetBankAccount'),1).'
'; print ''; if ($action == 'editbankaccount') @@ -381,7 +381,7 @@ if ($object->id > 0) print ''; print '
'; print $langs->trans("CustomerRelativeDiscountShort"); - print ''; + print ''; if ($user->rights->societe->creer && !$user->societe_id > 0) { print ''.img_edit($langs->trans("Modify")).''; @@ -395,7 +395,7 @@ if ($object->id > 0) print ''; print '
'; print $langs->trans("CustomerAbsoluteDiscountShort"); - print ''; + print ''; if ($user->rights->societe->creer && !$user->societe_id > 0) { print ''.img_edit($langs->trans("Modify")).''; @@ -447,7 +447,7 @@ if ($object->id > 0) print '
'; print '
'; print $langs->trans("PriceLevel"); - print ''; + print ''; if ($user->rights->societe->creer) { print ''.img_edit($langs->trans("Modify")).''; @@ -467,7 +467,7 @@ if ($object->id > 0) print ''; + if (($action != 'editshipping') && $user->rights->societe->creer) print ''; print '
'; print $langs->trans('SendingMethod'); print ''; - if (($action != 'editshipping') && $user->rights->societe->creer) print 'id.'">'.img_edit($langs->trans('SetMode'),1).'id.'">'.img_edit($langs->trans('SetMode'),1).'
'; print '
'; if ($action == 'editshipping') @@ -535,7 +535,7 @@ if ($object->id > 0) print ''; + if ($action != 'editlevel' && $user->rights->societe->creer) print ''; print '
'; print $langs->trans('ProspectLevel'); print ''; - if ($action != 'editlevel' && $user->rights->societe->creer) print 'id.'">'.img_edit($langs->trans('Modify'),1).'id.'">'.img_edit($langs->trans('Modify'),1).'
'; print '
'; if ($action == 'editlevel') @@ -691,8 +691,8 @@ if ($object->id > 0) print ''; print ''; - print '
'; - print ''; + print ''; print ''; } @@ -714,9 +714,9 @@ if ($object->id > 0) if ( ($db->jdate($objp->datelimite) < ($now - $conf->propal->cloture->warning_delay)) && $objp->fk_statut == 1 ) { print " ".img_warning(); } - print '\n"; - print ''; - print ''; + print '\n"; + print ''; + print ''; $i++; } $db->free($resql); @@ -776,10 +776,10 @@ if ($object->id > 0) print '
'.$langs->trans("LastPropals",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllPropals").' '.$num.''.img_picto($langs->trans("Statistics"),'stats').''; + print ''; print '
'.$langs->trans("LastPropals",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllPropals").' '.$num.''.img_picto($langs->trans("Statistics"),'stats').'
'.dol_print_date($db->jdate($objp->dp),'day')."'.price($objp->total_ht).''.$propal_static->LibStatut($objp->fk_statut,5).'
'.dol_print_date($db->jdate($objp->dp),'day')."'.price($objp->total_ht).''.$propal_static->LibStatut($objp->fk_statut,5).'
'; print ''; - print '
'; - print ''; - //if($num2 > 0) print ''; - //else print ''; + print ''; print ''; } @@ -800,9 +800,9 @@ if ($object->id > 0) print ''; print '\n"; - print ''; - print ''; + print '\n"; + print ''; + print ''; $i++; } $db->free($resql); @@ -852,8 +852,8 @@ if ($object->id > 0) print '
'.$langs->trans("LastCustomerOrders",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllOrders").' '.$num.''.img_picto($langs->trans("Statistics"),'stats').''.img_picto($langs->trans("CreateInvoiceForThisCustomer"),'object_bill').''.img_picto($langs->trans("NoOrdersToInvoice"),'object_bill').''; + print ''; + //if($num2 > 0) print ''; + //else print ''; print '
'.$langs->trans("LastCustomerOrders",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllOrders").' '.$num.''.img_picto($langs->trans("Statistics"),'stats').''.img_picto($langs->trans("CreateInvoiceForThisCustomer"),'object_bill').''.img_picto($langs->trans("NoOrdersToInvoice"),'object_bill').'
'; print $commande_static->getNomUrl(1); - print ''.dol_print_date($db->jdate($objp->dc),'day')."'.price($objp->total_ht).''.$commande_static->LibStatut($objp->fk_statut,$objp->facture,5).'
'.dol_print_date($db->jdate($objp->dc),'day')."'.price($objp->total_ht).''.$commande_static->LibStatut($objp->fk_statut,$objp->facture,5).'
'; print ''; - print '
'; - print ''; + print ''; print ''; } @@ -871,9 +871,9 @@ if ($object->id > 0) print $sendingstatic->getNomUrl(1); print ''; if ($objp->date_creation > 0) { - print ''; + print ''; } else { - print ''; + print ''; } print ''; @@ -917,8 +917,8 @@ if ($object->id > 0) print ''; print ''; print ''; } @@ -939,8 +939,8 @@ if ($object->id > 0) print $contrat->getNomUrl(1,12); print "\n"; print '\n"; - print '\n"; - print '\n"; + print '\n"; + print '\n"; print ''; print '
'.$langs->trans("LastSendings",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllSendings").' '.$num.''.img_picto($langs->trans("Statistics"),'stats').''; + print ''; print '
'.$langs->trans("LastSendings",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllSendings").' '.$num.''.img_picto($langs->trans("Statistics"),'stats').'
'.dol_print_date($db->jdate($objp->date_creation),'day').''.dol_print_date($db->jdate($objp->date_creation),'day').'!!!!!!' . $sendingstatic->LibStatut($objp->statut, 5) . '
'; - print ''; - //print ''; + print ''; + //print ''; print '
'.$langs->trans("LastContracts",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllContracts").' '.$num.''.img_picto($langs->trans("Statistics"),'stats').''.$langs->trans("AllContracts").' '.$num.''.img_picto($langs->trans("Statistics"),'stats').'
'.dol_trunc($objp->refsup,12)."'.dol_print_date($db->jdate($objp->dc),'day')."'.dol_print_date($db->jdate($objp->dcon),'day')."'.dol_print_date($db->jdate($objp->dc),'day')."'.dol_print_date($db->jdate($objp->dcon),'day')." '; print $contrat->getLibStatut(4); @@ -986,8 +986,8 @@ if ($object->id > 0) print ''; print ''; - print '
'; - print ''; + print ''; print ''; } @@ -1002,8 +1002,8 @@ if ($object->id > 0) print ''; print ''."\n"; - //print ''."\n"; - print ''."\n"; + //print ''."\n"; + print ''."\n"; print ''."\n"; print ''; @@ -1059,7 +1059,7 @@ if ($object->id > 0) print '
'.$langs->trans("LastInterventions",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllInterventions").' '.$num.''.img_picto($langs->trans("Statistics"),'stats').''; + print ''; print '
'.$langs->trans("LastInterventions",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllInterventions").' '.$num.''.img_picto($langs->trans("Statistics"),'stats').'
'.img_object($langs->trans("ShowPropal"),"propal").' '.$objp->ref.''.dol_print_date($db->jdate($objp->startdate)).''.convertSecondToTime($objp->duration).''.dol_print_date($db->jdate($objp->startdate)).''.convertSecondToTime($objp->duration).''.$fichinter_static->getLibStatut(5).'
'; print ''; - print '
'; + print ''; print ''; } @@ -1086,26 +1086,26 @@ if ($object->id > 0) print ''; if ($objp->frequency && $objp->date_last_gen > 0) { - print ''; + print ''; } else { if ($objp->dc > 0) { - print ''; + print ''; } else { - print ''; + print ''; } } - print ''; if (! empty($conf->global->MAIN_SHOW_PRICE_WITH_TAX_IN_SUMMARIES)) { - print ''; } @@ -1164,8 +1164,8 @@ if ($object->id > 0) print '
'.$langs->trans("LatestCustomerTemplateInvoices",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllCustomerTemplateInvoices").' '.$num.''; print '
'.$langs->trans("LatestCustomerTemplateInvoices",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllCustomerTemplateInvoices").' '.$num.'
'.dol_print_date($db->jdate($objp->date_last_gen),'day').''.dol_print_date($db->jdate($objp->date_last_gen),'day').''.dol_print_date($db->jdate($objp->dc),'day').''.dol_print_date($db->jdate($objp->dc),'day').'!!!!!!'; + print ''; print price($objp->total_ht); print ''; + print ''; print price($objp->total_ttc); print '
'; print ''; - print '"; $i++;
'; - print ''; + print ''; print ''; } @@ -1188,19 +1188,19 @@ if ($object->id > 0) print ''; if ($objp->df > 0) { - print ''; + print ''; } else { - print ''; + print ''; } - print ''; if (! empty($conf->global->MAIN_SHOW_PRICE_WITH_TAX_IN_SUMMARIES)) { - print ''; } diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php index 53176c8b76f..5acc81b0cf6 100644 --- a/htdocs/comm/prospect/index.php +++ b/htdocs/comm/prospect/index.php @@ -100,7 +100,7 @@ if ($resql) print ''; print img_action($langs->trans("Show"),$obj->id).' '; print $langs->trans("StatusProspect".$obj->id); - print ''; + print ''; $i++; } print "
'.$langs->trans("LastCustomersBills",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllBills").' '.$num.''.img_picto($langs->trans("Statistics"),'stats').''; + print ''; print '
'.$langs->trans("LastCustomersBills",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllBills").' '.$num.''.img_picto($langs->trans("Statistics"),'stats').'
'.dol_print_date($db->jdate($objp->df),'day').''.dol_print_date($db->jdate($objp->df),'day').'!!!!!!'; + print ''; print price($objp->total_ht); print ''; + print ''; print price($objp->total_ttc); print ''.$obj->cc.'
'.$obj->cc.'

"; @@ -140,7 +140,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire) print '
'; print ''.img_object($langs->trans("ShowPropal"),"propal").' '.$obj->ref.''; - print ''; + print ''; print price($obj->price); print "