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

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into

Browse Source 
develop

Merge Cron module
This commit is contained in:
fhenry 2013-03-23 20:24:28 +01:00
commit d84cd86a50
31 changed files with 458 additions and 353 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -4,6 +4,7 @@ English Dolibarr ChangeLog
***** ChangeLog for 3.4 compared to 3.3 ***** ***** ChangeLog for 3.4 compared to 3.3 *****
For users: For users:
- New: Support revenue stamp onto invoices.
- New: Add a tab "consumption" on thirdparties to list products bought/sells. - New: Add a tab "consumption" on thirdparties to list products bought/sells.
- New: Some performance enhancements. - New: Some performance enhancements.
- New: Can attach files onto trip and expenses modules. - New: Can attach files onto trip and expenses modules.

8
htdocs/admin/company.php
View File

@ -547,7 +547,7 @@ if ($action == 'edit' || $action == 'updateedit')
/* /*
* Local Taxes * Local Taxes
*/ */
if ($mysoc->hasLocalTax(1)) if ($mysoc->useLocalTax(1))
{ {
// Local Tax 1 // Local Tax 1
print '<br>'; print '<br>';
@ -579,7 +579,7 @@ if ($action == 'edit' || $action == 'updateedit')
print "</td></tr>\n"; print "</td></tr>\n";
print "</table>"; print "</table>";
} }
if ($mysoc->hasLocalTax(2)) if ($mysoc->useLocalTax(2))
{ {
// Local Tax 2 // Local Tax 2
print '<br>'; print '<br>';
@ -927,7 +927,7 @@ else
/* /*
* Local Taxes * Local Taxes
*/ */
if ($mysoc->hasLocalTax(1)) if ($mysoc->useLocalTax(1))
{ {
// Local Tax 1 // Local Tax 1
print '<br>'; print '<br>';
@ -960,7 +960,7 @@ else
print "</table>"; print "</table>";
} }
if ($mysoc->hasLocalTax(2)) if ($mysoc->useLocalTax(2))
{ {
// Local Tax 2 // Local Tax 2
print '<br>'; print '<br>';

2
htdocs/commande/fiche.php
View File

@ -1487,7 +1487,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
else else
{ {
print '<td colspan="2">'; print '<td colspan="2">';
print $form->select_company('','socid','s.client = 1',1); print $form->select_company('','socid','s.client = 1 OR s.client = 3',1);
print '</td>'; print '</td>';
} }
print '</tr>'."\n"; print '</tr>'."\n";

2
htdocs/compta/bank/rappro.php
View File

@ -84,7 +84,7 @@ if ($action == 'rappro' && $user->rights->banque->consolidate)
if (! $error) if (! $error)
{ {
header('Location: '.DOL_URL_ROOT.'/compta/bank/rappro?account='.$id); // To avoid to submit twice and allow back header('Location: '.DOL_URL_ROOT.'/compta/bank/rappro.php?account='.$id); // To avoid to submit twice and allow back
exit; exit;
} }
} }

81
htdocs/compta/facture.php
View File

@ -302,6 +302,14 @@ else if ($action == 'setpaymentterm' && $user->rights->facture->creer)
$result=$object->update($user); $result=$object->update($user);
if ($result < 0) dol_print_error($db,$object->error); if ($result < 0) dol_print_error($db,$object->error);
} }
else if ($action == 'setrevenuestamp' && $user->rights->facture->creer)
{
$object->fetch($id);
$object->revenuestamp=GETPOST('revenuestamp');
$result=$object->update($user);
$object->update_price(1);
if ($result < 0) dol_print_error($db,$object->error);
}
else if ($action == 'setremisepercent' && $user->rights->facture->creer) else if ($action == 'setremisepercent' && $user->rights->facture->creer)
{ {
$object->fetch($id); $object->fetch($id);
@ -369,22 +377,22 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->factu
$object->fetch_thirdparty(); $object->fetch_thirdparty();
// Check parameters // Check parameters
// Check for mandatory prof id // Check for mandatory prof id
for ($i = 1; $i < 5; $i++) for ($i = 1; $i < 5; $i++)
{ {
$idprof_mandatory ='SOCIETE_IDPROF'.($i).'_INVOICE_MANDATORY'; $idprof_mandatory ='SOCIETE_IDPROF'.($i).'_INVOICE_MANDATORY';
$idprof='idprof'.$i; $idprof='idprof'.$i;
if (! $object->thirdparty->$idprof && ! empty($conf->global->$idprof_mandatory)) if (! $object->thirdparty->$idprof && ! empty($conf->global->$idprof_mandatory))
{ {
if (! $error) $langs->load("errors"); if (! $error) $langs->load("errors");
$error++; $error++;
setEventMessage($langs->trans('ErrorProdIdIsMandatory',$langs->transcountry('ProfId'.$i, $object->thirdparty->country_code)),'errors'); setEventMessage($langs->trans('ErrorProdIdIsMandatory',$langs->transcountry('ProfId'.$i, $object->thirdparty->country_code)),'errors');
} }
} }
//Check for warehouse //Check for warehouse
if ($object->type != 3 && ! empty($conf->global->STOCK_CALCULATE_ON_BILL) && $object->hasProductsOrServices(1)) if ($object->type != 3 && ! empty($conf->global->STOCK_CALCULATE_ON_BILL) && $object->hasProductsOrServices(1))
{ {
@ -395,7 +403,7 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->factu
$action=''; $action='';
} }
} }
if (! $error) if (! $error)
{ {
$result = $object->validate($user,'',$idwarehouse); $result = $object->validate($user,'',$idwarehouse);
@ -617,7 +625,7 @@ else if ($action == 'add' && $user->rights->facture->creer)
$db->begin(); $db->begin();
$error=0; $error=0;
// Get extra fields // Get extra fields
foreach($_POST as $key => $value) foreach($_POST as $key => $value)
{ {
@ -1630,7 +1638,7 @@ else if ($action == 'builddoc') // En get ou en post
if (GETPOST('model')) $object->setDocModel($user, GETPOST('model')); if (GETPOST('model')) $object->setDocModel($user, GETPOST('model'));
if (GETPOST('fk_bank')) $object->fk_bank=GETPOST('fk_bank'); if (GETPOST('fk_bank')) $object->fk_bank=GETPOST('fk_bank');
// Define output language // Define output language
$outputlangs = $langs; $outputlangs = $langs;
$newlang=''; $newlang='';
@ -1916,7 +1924,7 @@ if ($action == 'create')
else else
{ {
print '<td colspan="2">'; print '<td colspan="2">';
print $form->select_company('','socid','s.client = 1',1); print $form->select_company('','socid','s.client = 1 OR s.client = 3',1);
print '</td>'; print '</td>';
} }
print '</tr>'."\n"; print '</tr>'."\n";
@ -2272,10 +2280,10 @@ else if ($id > 0 || ! empty($ref))
*/ */
$result=$object->fetch($id,$ref); $result=$object->fetch($id,$ref);
// fetch optionals attributes and labels // fetch optionals attributes and labels
$extralabels=$extrafields->fetch_name_optionals_label('facture'); $extralabels=$extrafields->fetch_name_optionals_label('facture');
if ($result > 0) if ($result > 0)
{ {
if ($user->societe_id>0 && $user->societe_id!=$object->socid) accessforbidden('',0); if ($user->societe_id>0 && $user->societe_id!=$object->socid) accessforbidden('',0);
@ -2284,11 +2292,12 @@ else if ($id > 0 || ! empty($ref))
$soc = new Societe($db); $soc = new Societe($db);
$soc->fetch($object->socid); $soc->fetch($object->socid);
$selleruserevenustamp=$mysoc->useRevenueStamp();
$totalpaye = $object->getSommePaiement(); $totalpaye = $object->getSommePaiement();
$totalcreditnotes = $object->getSumCreditNotesUsed(); $totalcreditnotes = $object->getSumCreditNotesUsed();
$totaldeposits = $object->getSumDepositsUsed(); $totaldeposits = $object->getSumDepositsUsed();
//print "totalpaye=".$totalpaye." totalcreditnotes=".$totalcreditnotes." totaldeposts=".$totaldeposits; //print "totalpaye=".$totalpaye." totalcreditnotes=".$totalcreditnotes." totaldeposts=".$totaldeposits." selleruserrevenuestamp=".$selleruserevenustamp;
// We can also use bcadd to avoid pb with floating points // We can also use bcadd to avoid pb with floating points
// For example print 239.2 - 229.3 - 9.9; does not return 0. // For example print 239.2 - 229.3 - 9.9; does not return 0.
@ -2752,10 +2761,9 @@ else if ($id > 0 || ! empty($ref))
$nbrows=8; $nbcols=2; $nbrows=8; $nbcols=2;
if (! empty($conf->projet->enabled)) $nbrows++; if (! empty($conf->projet->enabled)) $nbrows++;
if (! empty($conf->banque->enabled)) $nbcols++; if (! empty($conf->banque->enabled)) $nbcols++;
//Local taxes
if($mysoc->localtax1_assuj=="1") $nbrows++; if($mysoc->localtax1_assuj=="1") $nbrows++;
if($mysoc->localtax2_assuj=="1") $nbrows++; if($mysoc->localtax2_assuj=="1") $nbrows++;
if ($selleruserevenustamp) $nbrows++;
print '<td rowspan="'.$nbrows.'" colspan="2" valign="top">'; print '<td rowspan="'.$nbrows.'" colspan="2" valign="top">';
@ -3031,17 +3039,44 @@ else if ($id > 0 || ! empty($ref))
print '</tr>'; print '</tr>';
// Amount Local Taxes // Amount Local Taxes
if ($mysoc->localtax1_assuj=="1") //Localtax1 RE if ($mysoc->localtax1_assuj=="1" && $mysoc->useLocalTax(1)) //Localtax1 (example RE)
{ {
print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->country_code).'</td>'; print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->country_code).'</td>';
print '<td align="right" colspan="3" nowrap>'.price($object->total_localtax1,1,'',1,-1,-1,$conf->currency).'</td></tr>'; print '<td align="right" colspan="3" nowrap>'.price($object->total_localtax1,1,'',1,-1,-1,$conf->currency).'</td></tr>';
} }
if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF if ($mysoc->localtax2_assuj=="1" && $mysoc->useLocalTax(2)) //Localtax2 (example IRPF)
{ {
print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->country_code).'</td>'; print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->country_code).'</td>';
print '<td align="right" colspan="3" nowrap>'.price($object->total_localtax2,1,'',1,-1,-1,$conf->currency).'</td></tr>'; print '<td align="right" colspan="3" nowrap>'.price($object->total_localtax2,1,'',1,-1,-1,$conf->currency).'</td></tr>';
} }
// Revenue stamp
if ($selleruserevenustamp) // Test company use revenue stamp
{
print '<tr><td>';
print '<table class="nobordernopadding" width="100%"><tr><td>';
print $langs->trans('RevenueStamp');
print '</td>';
if ($action != 'editrevenuestamp' && ! empty($object->brouillon) && $user->rights->facture->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editrevenuestamp&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetRevenuStamp'),1).'</a></td>';
print '</tr></table>';
print '</td><td colspan="3" align="right">';
if ($action == 'editrevenuestamp')
{
print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="setrevenuestamp">';
print '<input type="text" class="flat" size="4" name="revenuestamp" value="'.price2num($object->revenuestamp).'">';
print ' <input type="submit" class="button" value="'.$langs->trans('Modify').'">';
print '</form>';
}
else
{
print price($object->revenuestamp,1,'',1,-1,-1,$conf->currency);
}
print '</td></tr>';
}
// Total with tax
print '<tr><td>'.$langs->trans('AmountTTC').'</td><td align="right" colspan="3" nowrap>'.price($object->total_ttc,1,'',1,-1,-1,$conf->currency).'</td></tr>'; print '<tr><td>'.$langs->trans('AmountTTC').'</td><td align="right" colspan="3" nowrap>'.price($object->total_ttc,1,'',1,-1,-1,$conf->currency).'</td></tr>';
// Statut // Statut
@ -3078,14 +3113,14 @@ else if ($id > 0 || ! empty($ref))
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
} }
// Other attributes // Other attributes
$res=$object->fetch_optionals($object->id,$extralabels); $res=$object->fetch_optionals($object->id,$extralabels);
$parameters=array('colspan' => ' colspan="2"'); $parameters=array('colspan' => ' colspan="2"');
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
if (empty($reshook) && ! empty($extrafields->attribute_label)) if (empty($reshook) && ! empty($extrafields->attribute_label))
{ {
if ($action == 'edit_extras') if ($action == 'edit_extras')
{ {
print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formsoc">'; print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formsoc">';
@ -3093,8 +3128,8 @@ else if ($id > 0 || ! empty($ref))
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="id" value="'.$object->id.'">'; print '<input type="hidden" name="id" value="'.$object->id.'">';
} }
foreach($extrafields->attribute_label as $key=>$label) foreach($extrafields->attribute_label as $key=>$label)
{ {
$value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$object->array_options["options_".$key]); $value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$object->array_options["options_".$key]);
@ -3118,16 +3153,16 @@ else if ($id > 0 || ! empty($ref))
print '</td></tr>'."\n"; print '</td></tr>'."\n";
} }
} }
if(count($extrafields->attribute_label) > 0) { if(count($extrafields->attribute_label) > 0) {
if ($action == 'edit_extras' && $user->rights->facture->creer) if ($action == 'edit_extras' && $user->rights->facture->creer)
{ {
print '<tr><td></td><td colspan="5">'; print '<tr><td></td><td colspan="5">';
print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">'; print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
print '</form>'; print '</form>';
print '</td></tr>'; print '</td></tr>';
} }
else { else {
if ($object->statut == 0 && $user->rights->facture->creer) if ($object->statut == 0 && $user->rights->facture->creer)

6
htdocs/compta/facture/class/facture.class.php
View File

@ -75,6 +75,7 @@ class Facture extends CommonInvoice
var $total_ht=0; var $total_ht=0;
var $total_tva=0; var $total_tva=0;
var $total_ttc=0; var $total_ttc=0;
var $revenuestamp;
var $note; // deprecated var $note; // deprecated
var $note_private; var $note_private;
var $note_public; var $note_public;
@ -795,7 +796,8 @@ class Facture extends CommonInvoice
if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($ref_int)) return -1; if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($ref_int)) return -1;
$sql = 'SELECT f.rowid,f.facnumber,f.ref_client,f.ref_ext,f.ref_int,f.type,f.fk_soc,f.amount,f.tva, f.localtax1, f.localtax2, f.total,f.total_ttc,f.remise_percent,f.remise_absolue,f.remise'; $sql = 'SELECT f.rowid,f.facnumber,f.ref_client,f.ref_ext,f.ref_int,f.type,f.fk_soc,f.amount,f.tva, f.localtax1, f.localtax2, f.total, f.total_ttc, f.revenuestamp';
$sql.= ', f.remise_percent, f.remise_absolue, f.remise';
$sql.= ', f.datef as df'; $sql.= ', f.datef as df';
$sql.= ', f.date_lim_reglement as dlr'; $sql.= ', f.date_lim_reglement as dlr';
$sql.= ', f.datec as datec'; $sql.= ', f.datec as datec';
@ -841,6 +843,7 @@ class Facture extends CommonInvoice
$this->total_localtax1 = $obj->localtax1; $this->total_localtax1 = $obj->localtax1;
$this->total_localtax2 = $obj->localtax2; $this->total_localtax2 = $obj->localtax2;
$this->total_ttc = $obj->total_ttc; $this->total_ttc = $obj->total_ttc;
$this->revenuestamp = $obj->revenuestamp;
$this->paye = $obj->paye; $this->paye = $obj->paye;
$this->close_code = $obj->close_code; $this->close_code = $obj->close_code;
$this->close_note = $obj->close_note; $this->close_note = $obj->close_note;
@ -1050,6 +1053,7 @@ class Facture extends CommonInvoice
$sql.= " localtax2=".(isset($this->total_localtax2)?$this->total_localtax2:"null").","; $sql.= " localtax2=".(isset($this->total_localtax2)?$this->total_localtax2:"null").",";
$sql.= " total=".(isset($this->total_ht)?$this->total_ht:"null").","; $sql.= " total=".(isset($this->total_ht)?$this->total_ht:"null").",";
$sql.= " total_ttc=".(isset($this->total_ttc)?$this->total_ttc:"null").","; $sql.= " total_ttc=".(isset($this->total_ttc)?$this->total_ttc:"null").",";
$sql.= " revenuestamp=".((isset($this->revenuestamp) && $this->revenuestamp != '')?$this->revenuestamp:"null").",";
$sql.= " fk_statut=".(isset($this->statut)?$this->statut:"null").","; $sql.= " fk_statut=".(isset($this->statut)?$this->statut:"null").",";
$sql.= " fk_user_author=".(isset($this->user_author)?$this->user_author:"null").","; $sql.= " fk_user_author=".(isset($this->user_author)?$this->user_author:"null").",";
$sql.= " fk_user_valid=".(isset($this->fk_user_valid)?$this->fk_user_valid:"null").","; $sql.= " fk_user_valid=".(isset($this->fk_user_valid)?$this->fk_user_valid:"null").",";

2
htdocs/contrat/fiche.php
View File

@ -827,7 +827,7 @@ if ($action == 'create')
else else
{ {
print '<td colspan="2">'; print '<td colspan="2">';
print $form->select_company('','socid','s.client = 1',1); print $form->select_company('','socid','s.client = 1 OR s.client = 3',1);
print '</td>'; print '</td>';
} }
print '</tr>'."\n"; print '</tr>'."\n";

28
htdocs/core/class/commondocgenerator.class.php
View File

@ -185,11 +185,11 @@ abstract class CommonDocGenerator
} }
$array_thirdparty=array_merge($array_thirdparty,array('company_options_'.$key => $object->array_options['options_'.$key])); $array_thirdparty=array_merge($array_thirdparty,array('company_options_'.$key => $object->array_options['options_'.$key]));
} }
} }
return $array_thirdparty; return $array_thirdparty;
} }
/** /**
* Define array with couple substitution key => substitution value * Define array with couple substitution key => substitution value
* *
@ -201,7 +201,7 @@ abstract class CommonDocGenerator
function get_substitutionarray_propal($object,$outputlangs,$array_key='object') function get_substitutionarray_propal($object,$outputlangs,$array_key='object')
{ {
global $conf; global $conf;
$array_propal=array( $array_propal=array(
$array_key.'_id'=>$object->id, $array_key.'_id'=>$object->id,
$array_key.'_ref'=>$object->ref, $array_key.'_ref'=>$object->ref,
@ -224,14 +224,14 @@ abstract class CommonDocGenerator
$array_key.'_note_private'=>$object->note, $array_key.'_note_private'=>$object->note,
$array_key.'_note'=>$object->note_public, $array_key.'_note'=>$object->note_public,
); );
// Add vat by rates // Add vat by rates
foreach ($object->lines as $line) foreach ($object->lines as $line)
{ {
if (empty($array_propal[$array_key.'_total_vat_'.$line->tva_tx])) $array_propal[$array_key.'_total_vat_'.$line->tva_tx]=0; if (empty($array_propal[$array_key.'_total_vat_'.$line->tva_tx])) $array_propal[$array_key.'_total_vat_'.$line->tva_tx]=0;
$array_propal[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva; $array_propal[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva;
} }
// Retrieve extrafields // Retrieve extrafields
if(is_array($object->array_options) && count($object->array_options)) if(is_array($object->array_options) && count($object->array_options))
{ {
@ -240,12 +240,12 @@ abstract class CommonDocGenerator
$extrafields = new ExtraFields($this->db); $extrafields = new ExtraFields($this->db);
$extralabels = $extrafields->fetch_name_optionals_label('propal',true); $extralabels = $extrafields->fetch_name_optionals_label('propal',true);
$object->fetch_optionals($object->id,$extralabels); $object->fetch_optionals($object->id,$extralabels);
$array_propal = $this->fill_substitutionarray_with_extrafields($object,$array_propal,$extrafields,$array_key,$outputlangs); $array_propal = $this->fill_substitutionarray_with_extrafields($object,$array_propal,$extrafields,$array_key,$outputlangs);
} }
return $array_propal; return $array_propal;
} }
/** /**
* Define array with couple substitution key => substitution value * Define array with couple substitution key => substitution value
@ -257,7 +257,7 @@ abstract class CommonDocGenerator
function get_substitutionarray_propal_lines($line,$outputlangs) function get_substitutionarray_propal_lines($line,$outputlangs)
{ {
global $conf; global $conf;
return array( return array(
'line_fulldesc'=>doc_getlinedesc($line,$outputlangs), 'line_fulldesc'=>doc_getlinedesc($line,$outputlangs),
'line_product_ref'=>$line->product_ref, 'line_product_ref'=>$line->product_ref,
@ -274,7 +274,7 @@ abstract class CommonDocGenerator
'line_date_end'=>$line->date_end 'line_date_end'=>$line->date_end
); );
} }
/** /**
* Fill array with couple extrafield key => extrafield value * Fill array with couple extrafield key => extrafield value
* *
@ -309,14 +309,14 @@ abstract class CommonDocGenerator
{ {
$object->array_options['options_'.$key] = ($object->array_options['options_'.$key]!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhour'):''); $object->array_options['options_'.$key] = ($object->array_options['options_'.$key]!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhour'):'');
} }
$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key => $object->array_options['options_'.$key])); $array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key => $object->array_options['options_'.$key]));
} }
return $array_to_fill; return $array_to_fill;
} }
/** /**
* Rect pdf * Rect pdf
* *

3
htdocs/core/class/commonobject.class.php
View File

@ -1556,6 +1556,9 @@ abstract class CommonObject
$i++; $i++;
} }
// Add revenue stamp to total
$this->total_ttc += isset($this->revenuestamp)?$this->revenuestamp:0;
$this->db->free($resql); $this->db->free($resql);
// Now update global field total_ht, total_ttc and tva // Now update global field total_ht, total_ttc and tva

2
htdocs/core/class/html.form.class.php
View File

@ -678,7 +678,7 @@ class Form
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE s.entity IN (".getEntity('societe', 1).")"; $sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
if (! empty($user->societe_id)) $sql.= " AND s.rowid = ".$user->societe_id; if (! empty($user->societe_id)) $sql.= " AND s.rowid = ".$user->societe_id;
if ($filter) $sql.= " AND ".$filter; if ($filter) $sql.= " AND (".$filter.")";
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
$sql.= " ORDER BY nom ASC"; $sql.= " ORDER BY nom ASC";

16
htdocs/core/class/html.formcron.class.php
View File

@ -41,7 +41,7 @@ class FormCron extends Form
return 1; return 1;
} }
/** /**
* Display On Off selector * Display On Off selector
* *
@ -53,7 +53,7 @@ class FormCron extends Form
function select_typejob($htmlname,$selected=0,$readonly=0) function select_typejob($htmlname,$selected=0,$readonly=0)
{ {
global $langs; global $langs;
$langs->load('cron@cron'); $langs->load('cron@cron');
if (!empty($readonly)) { if (!empty($readonly)) {
if ($selected=='command') { if ($selected=='command') {
@ -68,26 +68,26 @@ class FormCron extends Form
$out.='</SELECT>'; $out.='</SELECT>';
} }
}else { }else {
$out='<SELECT name="'.$htmlname.'" id="'.$htmlname.'" />'; $out='<SELECT class="flat" name="'.$htmlname.'" id="'.$htmlname.'" />';
if ($selected=='command') { if ($selected=='command') {
$selected_attr=' selected=\"selected\" '; $selected_attr=' selected=\"selected\" ';
} else { } else {
$selected_attr=''; $selected_attr='';
} }
$out.= '<OPTION value="command" '.$selected_attr.'>'.$langs->trans('CronType_command').'</OPTION>'; $out.= '<OPTION value="command" '.$selected_attr.'>'.$langs->trans('CronType_command').'</OPTION>';
if ($selected=='method') { if ($selected=='method') {
$selected_attr=' selected=\"selected\" '; $selected_attr=' selected=\"selected\" ';
} else { } else {
$selected_attr=''; $selected_attr='';
} }
$out.= '<OPTION value="method" '.$selected_attr.'>'.$langs->trans('CronType_method').'</OPTION>'; $out.= '<OPTION value="method" '.$selected_attr.'>'.$langs->trans('CronType_method').'</OPTION>';
$out.='</SELECT>'; $out.='</SELECT>';
} }
return $out; return $out;
} }
} }

25
htdocs/core/lib/cron.lib.php
View File

@ -15,19 +15,18 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** /**
* \file cron/lib/cron.lib.php * \file cron/lib/cron.lib.php
* \brief Ensemble de fonctions de base pour le module jobs * \brief Function for module cron
* \ingroup jobs * \ingroup cron
*/ */
/** /**
* Return array of tabs to used on pages for third parties cards. * Return array of tabs to used on pages to setup cron module.
* *
* @param Object $object Object company shown
* @return array Array of tabs * @return array Array of tabs
*/ */
function cronadmin_prepare_head() function cronadmin_prepare_head()
{ {
global $langs, $conf, $user; global $langs, $conf, $user;
@ -35,18 +34,24 @@ function cronadmin_prepare_head()
$head = array(); $head = array();
$head[$h][0] = dol_buildpath('/cron/admin/cron.php', 1); $head[$h][0] = dol_buildpath('/cron/admin/cron.php', 1);
$head[$h][1] = $langs->trans("CronSetup"); $head[$h][1] = $langs->trans("Miscellanous");
$head[$h][2] = 'setup'; $head[$h][2] = 'setup';
$h++; $h++;
complete_head_from_modules($conf, $langs, $object, $head, $h, 'cronadmin'); complete_head_from_modules($conf, $langs, $object, $head, $h, 'cronadmin');
complete_head_from_modules($conf, $langs, $object, $head, $h, 'cronadmin', 'remove'); complete_head_from_modules($conf, $langs, $object, $head, $h, 'cronadmin', 'remove');
return $head; return $head;
} }
/**
* Return array of tabs to used on a cron job
*
* @param Object $object Object cron
* @return array Array of tabs
*/
function cron_prepare_head($object) function cron_prepare_head($object)
{ {
global $langs, $conf, $user; global $langs, $conf, $user;
@ -59,7 +64,7 @@ function cron_prepare_head($object)
$h++; $h++;
$head[$h][0] = dol_buildpath('/cron/info.php', 1).'?id='.$object->id; $head[$h][0] = dol_buildpath('/cron/info.php', 1).'?id='.$object->id;
$head[$h][1] = $langs->trans("CronInfoPage"); $head[$h][1] = $langs->trans("Info");
$head[$h][2] = 'info'; $head[$h][2] = 'info';
$h++; $h++;

25
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
View File

@ -121,16 +121,16 @@ class doc_generic_invoice_odt extends ModelePDFFactures
'object_payment_mode'=>($outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code)!='PaymentType'.$object->mode_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code):$object->mode_reglement), 'object_payment_mode'=>($outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code)!='PaymentType'.$object->mode_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code):$object->mode_reglement),
'object_payment_term_code'=>$object->cond_reglement_code, 'object_payment_term_code'=>$object->cond_reglement_code,
'object_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code)!='PaymentCondition'.$object->cond_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code):$object->cond_reglement), 'object_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code)!='PaymentCondition'.$object->cond_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code):$object->cond_reglement),
'object_total_ht'=>price2num($object->total_ht,2), 'object_total_ht'=>price2num($object->total_ht),
'object_total_vat'=>price2num($object->total_tva,2), 'object_total_vat'=>price2num($object->total_tva),
'object_total_ttc'=>price2num($object->total_ttc,2), 'object_total_ttc'=>price2num($object->total_ttc),
'object_total_discount_ht' => price2num($object->getTotalDiscount(), 0, $outputlangs), 'object_total_discount_ht' => price2num($object->getTotalDiscount(), 0, $outputlangs),
'object_vatrate'=>(isset($object->tva)?vatrate($object->tva):''), 'object_vatrate'=>(isset($object->tva)?vatrate($object->tva):''),
'object_note_private'=>$object->note, 'object_note_private'=>$object->note,
'object_note'=>$object->note_public, 'object_note'=>$object->note_public,
// Payments // Payments
'object_already_payed'=>$alreadypayed, 'object_already_payed'=>$alreadypayed,
'object_remain_to_pay'=>price2num($object->total_ttc - $sumpayed,2) 'object_remain_to_pay'=>price2num($object->total_ttc - $sumpayed)
); );
// Add vat by rates // Add vat by rates
@ -139,7 +139,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
if (empty($resarray['object_total_vat_'.$line->tva_tx])) $resarray['object_total_vat_'.$line->tva_tx]=0; if (empty($resarray['object_total_vat_'.$line->tva_tx])) $resarray['object_total_vat_'.$line->tva_tx]=0;
$resarray['object_total_vat_'.$line->tva_tx]+=$line->total_tva; $resarray['object_total_vat_'.$line->tva_tx]+=$line->total_tva;
} }
// Retrieve extrafields // Retrieve extrafields
if(is_array($object->array_options) && count($object->array_options)) if(is_array($object->array_options) && count($object->array_options))
{ {
@ -148,7 +148,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
$extrafields = new ExtraFields($this->db); $extrafields = new ExtraFields($this->db);
$extralabels = $extrafields->fetch_name_optionals_label('facture',true); $extralabels = $extrafields->fetch_name_optionals_label('facture',true);
$object->fetch_optionals($object->id,$extralabels); $object->fetch_optionals($object->id,$extralabels);
$resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key='object',$outputlangs); $resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key='object',$outputlangs);
} }
return $resarray; return $resarray;
@ -174,9 +174,9 @@ class doc_generic_invoice_odt extends ModelePDFFactures
'line_up'=>price($line->subprice, 0, $outputlangs), 'line_up'=>price($line->subprice, 0, $outputlangs),
'line_qty'=>$line->qty, 'line_qty'=>$line->qty,
'line_discount_percent'=>($line->remise_percent?$line->remise_percent.'%':''), 'line_discount_percent'=>($line->remise_percent?$line->remise_percent.'%':''),
'line_price_ht'=>price2num($line->total_ht, 2), 'line_price_ht'=>price2num($line->total_ht),
'line_price_ttc'=>price2num($line->total_ttc, 2), 'line_price_ttc'=>price2num($line->total_ttc),
'line_price_vat'=>price2num($line->total_tva, 2), 'line_price_vat'=>price2num($line->total_tva),
'line_date_start'=>dol_print_date($line->date_start, 'day', false, $outputlangs), 'line_date_start'=>dol_print_date($line->date_start, 'day', false, $outputlangs),
'line_date_end'=>dol_print_date($line->date_end, 'day', false, $outputlangs), 'line_date_end'=>dol_print_date($line->date_end, 'day', false, $outputlangs),
); );
@ -358,14 +358,13 @@ class doc_generic_invoice_odt extends ModelePDFFactures
{ {
$socobject=$object->client; $socobject=$object->client;
} }
// Fetch info for linked propal // Fetch info for linked propal
$linked_propal = $object->fetchObjectLinked('','','',''); $linked_propal = $object->fetchObjectLinked('','','','');
print '<pre>';
//print_r($object->linkedObjects['propal']); exit; //print_r($object->linkedObjects['propal']); exit;
$propal_object = $object->linkedObjects['propal'][0]; $propal_object = $object->linkedObjects['propal'][0];
// Make substitution // Make substitution
$substitutionarray=array( $substitutionarray=array(
'__FROM_NAME__' => $this->emetteur->nom, '__FROM_NAME__' => $this->emetteur->nom,
@ -415,7 +414,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs); $array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs); $array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
$array_objet=$this->get_substitutionarray_object($object,$outputlangs); $array_objet=$this->get_substitutionarray_object($object,$outputlangs);
$array_propal=$this->get_substitutionarray_propal($propal_object,$outputlangs,'propal'); $array_propal=is_object($propal_object)?$this->get_substitutionarray_propal($propal_object,$outputlangs,'propal'):array();
$tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_objet,$array_propal); $tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_objet,$array_propal);
complete_substitutions_array($tmparray, $outputlangs, $object); complete_substitutions_array($tmparray, $outputlangs, $object);

11
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

@ -1020,6 +1020,17 @@ class pdf_crabe extends ModelePDFFactures
//} //}
} }
// Revenue stamp
if (price2num($object->revenuestamp) != 0)
{
$index++;
$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RevenueStamp"), $useborder, 'L', 1);
$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->revenuestamp), $useborder, 'R', 1);
}
// Total TTC // Total TTC
$index++; $index++;
$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index); $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);

16
htdocs/core/modules/modCron.class.php
View File

@ -43,7 +43,7 @@ class modCron extends DolibarrModules
// Family can be 'crm','financial','hr','projects','products','ecm','technic','other' // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
// It is used to group modules in module setup page // It is used to group modules in module setup page
$this->family = "technic"; $this->family = "base";
// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module) // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
$this->name = preg_replace('/^mod/i','',get_class($this)); $this->name = preg_replace('/^mod/i','',get_class($this));
$this->description = "Enable the Dolibarr cron service"; $this->description = "Enable the Dolibarr cron service";
@ -70,9 +70,9 @@ class modCron extends DolibarrModules
// Constantes // Constantes
//----------- //-----------
$this->const = array( $this->const = array(
0=>array( 0=>array(
'MAIN_CRON_KEY', 'CRON_KEY',
'chaine', 'chaine',
'', '',
'CRON KEY', 'CRON KEY',
@ -93,25 +93,25 @@ class modCron extends DolibarrModules
$this->rights = array(); // Permission array used by this module $this->rights = array(); // Permission array used by this module
$this->rights_class = 'cron'; $this->rights_class = 'cron';
$r=0; $r=0;
$this->rights[$r][0] = 23001; $this->rights[$r][0] = 23001;
$this->rights[$r][1] = 'Read cron jobs'; $this->rights[$r][1] = 'Read cron jobs';
$this->rights[$r][3] = 1; $this->rights[$r][3] = 1;
$this->rights[$r][4] = 'read'; $this->rights[$r][4] = 'read';
$r++; $r++;
$this->rights[$r][0] = 23002; $this->rights[$r][0] = 23002;
$this->rights[$r][1] = 'Create cron Jobs'; $this->rights[$r][1] = 'Create cron Jobs';
$this->rights[$r][3] = 0; $this->rights[$r][3] = 0;
$this->rights[$r][4] = 'create'; $this->rights[$r][4] = 'create';
$r++; $r++;
$this->rights[$r][0] = 23003; $this->rights[$r][0] = 23003;
$this->rights[$r][1] = 'Delete cron Jobs'; $this->rights[$r][1] = 'Delete cron Jobs';
$this->rights[$r][3] = 0; $this->rights[$r][3] = 0;
$this->rights[$r][4] = 'delete'; $this->rights[$r][4] = 'delete';
$r++; $r++;
$this->rights[$r][0] = 23004; $this->rights[$r][0] = 23004;
$this->rights[$r][1] = 'Execute cron Jobs'; $this->rights[$r][1] = 'Execute cron Jobs';
$this->rights[$r][3] = 0; $this->rights[$r][3] = 0;
@ -131,7 +131,7 @@ class modCron extends DolibarrModules
'target'=>'', 'target'=>'',
'user'=>2); // 0=Menu for internal users, 1=external users, 2=both 'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
$r++; $r++;
$this->menu[$r]=array( 'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=modulesadmintools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode $this->menu[$r]=array( 'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=modulesadmintools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
'type'=>'left', // This is a Left menu entry 'type'=>'left', // This is a Left menu entry
'titre'=>'CronListInactive', 'titre'=>'CronListInactive',

79
htdocs/cron/admin/cron.php
View File

@ -1,28 +1,28 @@
<?php <?php
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2013 Laurent Destailleur <eldy@users.sourceforge.org> * Copyright (C) 2005-2013 Laurent Destailleur <eldy@users.sourceforge.org>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro> * Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** /**
* \file cron/admin/cron.php * \file cron/admin/cron.php
* \ingroup cron * \ingroup cron
*/ */
// Dolibarr environment // Dolibarr environment
$res = @include("../../main.inc.php"); // From htdocs directory $res = @include("../../main.inc.php"); // From htdocs directory
@ -44,7 +44,7 @@ if (!empty($actionsave))
$db->begin(); $db->begin();
$i+=dolibarr_set_const($db,'MAIN_CRON_KEY',trim(GETPOST("MAIN_CRON_KEY")),'chaine',0,'',0); $i+=dolibarr_set_const($db,'CRON_KEY',trim(GETPOST("CRON_KEY")),'chaine',0,'',0);
if ($i >= 1) if ($i >= 1)
{ {
@ -61,7 +61,7 @@ if (!empty($actionsave))
/* /*
* View * View
*/ */
llxHeader(); llxHeader();
@ -70,6 +70,7 @@ print_fiche_titre($langs->trans("CronSetup"),$linkback,'setup');
// Configuration header // Configuration header
$head = cronadmin_prepare_head(); $head = cronadmin_prepare_head();
dol_fiche_head($head,'setup',$langs->trans("Module2300Name"),0,'cron'); dol_fiche_head($head,'setup',$langs->trans("Module2300Name"),0,'cron');
print "<br>\n"; print "<br>\n";
@ -86,7 +87,7 @@ print "</tr>";
print '<tr class="impair">'; print '<tr class="impair">';
print '<td class="fieldrequired">'.$langs->trans("KeyForCronAccess").'</td>'; print '<td class="fieldrequired">'.$langs->trans("KeyForCronAccess").'</td>';
print '<td><input type="text" class="flat" id="MAIN_CRON_KEY" name="MAIN_CRON_KEY" value="'. (GETPOST('MAIN_CRON_KEY')?GETPOST('MAIN_CRON_KEY'):(! empty($conf->global->MAIN_CRON_KEY)?$conf->global->MAIN_CRON_KEY:'')) . '" size="40">'; print '<td><input type="text" class="flat" id="CRON_KEY" name="CRON_KEY" value="'. (GETPOST('CRON_KEY')?GETPOST('CRON_KEY'):(! empty($conf->global->CRON_KEY)?$conf->global->CRON_KEY:'')) . '" size="40">';
if (! empty($conf->use_javascript_ajax)) if (! empty($conf->use_javascript_ajax))
print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"'); print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
print '</td>'; print '</td>';
@ -101,38 +102,42 @@ print '</center>';
print '</form>'; print '</form>';
dol_fiche_end();
print '<br><br>'; print '<br><br>';
// Define $urlwithroot
$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
//$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current
// Cron launch // Cron launch
print '<u>'.$langs->trans("URLToLaunchCronJobs").':</u><br>'; print '<u>'.$langs->trans("URLToLaunchCronJobs").':</u><br>';
$url=dol_buildpath('/public/cron/cron_run_jobs.php',1).(empty($conf->global->MAIN_CRON_KEY)?'':'?securitykey='.$conf->global->MAIN_CRON_KEY.'&').'userlogin='.$user->login; $url=$urlwithroot.'/public/cron/cron_run_jobs.php'.(empty($conf->global->CRON_KEY)?'':'?securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login;
print img_picto('','object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n"; print img_picto('','object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
print ' '.$langs->trans("OrToLaunchASpecificJob").'<br>'; print ' '.$langs->trans("OrToLaunchASpecificJob").'<br>';
$url=dol_buildpath('/public/cron/cron_run_jobs.php',1).(empty($conf->global->MAIN_CRON_KEY)?'':'?securitykey='.$conf->global->MAIN_CRON_KEY.'&').'userlogin='.$user->login.'&id=cronjobid'; $url=$urlwithroot.'/public/cron/cron_run_jobs.php'.(empty($conf->global->CRON_KEY)?'':'?securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login.'&id=cronjobid';
print img_picto('','object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n"; print img_picto('','object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
print '<br>'; print '<br>';
print '<br>';
$linuxlike=1; $linuxlike=1;
if (preg_match('/^win/i',PHP_OS)) $linuxlike=0; if (preg_match('/^win/i',PHP_OS)) $linuxlike=0;
if (preg_match('/^mac/i',PHP_OS)) $linuxlike=0; if (preg_match('/^mac/i',PHP_OS)) $linuxlike=0;
if ($linuxlike) {
print $langs->trans("CronExplainHowToRunUnix");
} else {
print $langs->trans("CronExplainHowToRunWin");
}
print '<br>'; print '<br>';
print '<u>'.$langs->trans("FileToLaunchCronJobs").':</u><br>'; print '<u>'.$langs->trans("FileToLaunchCronJobs").':</u><br>';
$file='/scripts/cron/cron_run_jobs.php'.' '.(empty($conf->global->MAIN_CRON_KEY)?'securitykey':''.$conf->global->MAIN_CRON_KEY.'').' '.$user->login.' cronjobid(optionnal)';
if ($linuxlike) { $file='/scripts/cron/cron_run_jobs.php'.' '.(empty($conf->global->CRON_KEY)?'securitykey':''.$conf->global->CRON_KEY.'').' '.$user->login.' [cronjobid]';
print 'user@host:'.DOL_DOCUMENT_ROOT.'$ php ..'.$file."<br>\n"; print '<textarea rows="'.ROWS_2.'" cols="120">..'.$file."</textarea><br>\n";
} else {
print DOL_DOCUMENT_ROOT.'> php ..'.$file."<br>\n";
}
print '<br>'; print '<br>';
print $langs->trans("Note").': ';
if ($linuxlike) {
print $langs->trans("CronExplainHowToRunUnix");
} else {
print $langs->trans("CronExplainHowToRunWin");
}
@ -149,7 +154,7 @@ if (! empty($conf->use_javascript_ajax))
generic: true generic: true
}, },
function(token) { function(token) {
$("#MAIN_CRON_KEY").val(token); $("#CRON_KEY").val(token);
}); });
}); });
});'; });';

85
htdocs/cron/card.php
View File

@ -56,13 +56,13 @@ if(!empty($cancel)) {
}else { }else {
Header ( "Location: ".dol_buildpath('/cron/cron/list.php',1).'?status=1'); Header ( "Location: ".dol_buildpath('/cron/cron/list.php',1).'?status=1');
} }
} }
// Delete jobs // Delete jobs
if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->cron->delete){ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->cron->delete){
$result = $object->delete($user); $result = $object->delete($user);
if ($result < 0) { if ($result < 0) {
@ -105,7 +105,7 @@ if ($action=='add') {
$object->dateend=dol_mktime(GETPOST('dateendhour','int'), GETPOST('dateendmin','int'), 0, GETPOST('dateendmonth','int'), GETPOST('dateendday','int'), GETPOST('dateendyear','int')); $object->dateend=dol_mktime(GETPOST('dateendhour','int'), GETPOST('dateendmin','int'), 0, GETPOST('dateendmonth','int'), GETPOST('dateendday','int'), GETPOST('dateendyear','int'));
$object->unitfrequency=GETPOST('unitfrequency','int'); $object->unitfrequency=GETPOST('unitfrequency','int');
$object->frequency=$object->unitfrequency * GETPOST('nbfrequency','int'); $object->frequency=$object->unitfrequency * GETPOST('nbfrequency','int');
//Ajout de la tache cron //Ajout de la tache cron
$result = $object->create($user); $result = $object->create($user);
@ -138,7 +138,7 @@ if ($action=='update') {
$object->dateend=dol_mktime(GETPOST('dateendhour','int'), GETPOST('dateendmin','int'), 0, GETPOST('dateendmonth','int'), GETPOST('dateendday','int'), GETPOST('dateendyear','int')); $object->dateend=dol_mktime(GETPOST('dateendhour','int'), GETPOST('dateendmin','int'), 0, GETPOST('dateendmonth','int'), GETPOST('dateendday','int'), GETPOST('dateendyear','int'));
$object->unitfrequency=GETPOST('unitfrequency','int'); $object->unitfrequency=GETPOST('unitfrequency','int');
$object->frequency=$object->unitfrequency * GETPOST('nbfrequency','int'); $object->frequency=$object->unitfrequency * GETPOST('nbfrequency','int');
//Ajout de la tache cron //Ajout de la tache cron
$result = $object->update($user); $result = $object->update($user);
@ -187,9 +187,10 @@ if ($action=='inactive') {
} }
/* /*
* View * View
*/ */
llxHeader('',$langs->trans("CronAdd")); llxHeader('',$langs->trans("CronAdd"));
@ -243,14 +244,15 @@ if ($action == 'execute'){
/* /*
* Create Template * Create Template
*/ */
if (empty($object->status)) { if (empty($object->status) && $action != 'create')
{
dol_htmloutput_mesg($langs->trans("CronTaskInactive"),'','warning',1); dol_htmloutput_mesg($langs->trans("CronTaskInactive"),'','warning',1);
} }
if (($action=="create") || ($action=="edit")) { if (($action=="create") || ($action=="edit")) {
print '<form name="cronform" action="'.$_SERVER["PHP_SELF"].'" method="post">'; print '<form name="cronform" action="'.$_SERVER["PHP_SELF"].'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n"; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
if (!empty($object->id)) { if (!empty($object->id)) {
@ -259,7 +261,7 @@ if (($action=="create") || ($action=="edit")) {
} else { } else {
print '<input type="hidden" name="action" value="add">'."\n"; print '<input type="hidden" name="action" value="add">'."\n";
} }
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td width="30%">'; print '<tr><td width="30%">';
@ -269,7 +271,7 @@ if (($action=="create") || ($action=="edit")) {
print "<td>"; print "<td>";
print "</td>"; print "</td>";
print "</tr>\n"; print "</tr>\n";
print "<tr><td>"; print "<tr><td>";
print $langs->trans('CronType')."</td><td>"; print $langs->trans('CronType')."</td><td>";
print $formCron->select_typejob('jobtype',$object->jobtype); print $formCron->select_typejob('jobtype',$object->jobtype);
@ -290,7 +292,7 @@ if (($action=="create") || ($action=="edit")) {
print "<td>"; print "<td>";
print "</td>"; print "</td>";
print "</tr>\n"; print "</tr>\n";
print "<tr><td>"; print "<tr><td>";
print $langs->trans('CronDtEnd')."</td><td>"; print $langs->trans('CronDtEnd')."</td><td>";
if(!empty($object->dateend)){ if(!empty($object->dateend)){
@ -303,7 +305,7 @@ if (($action=="create") || ($action=="edit")) {
print "<td>"; print "<td>";
print "</td>"; print "</td>";
print "</tr>\n"; print "</tr>\n";
print "<tr><td>"; print "<tr><td>";
print $langs->trans('CronPriority')."</td>"; print $langs->trans('CronPriority')."</td>";
$priority=0; $priority=0;
@ -315,7 +317,7 @@ if (($action=="create") || ($action=="edit")) {
print "<td>"; print "<td>";
print "</td>"; print "</td>";
print "</tr>\n"; print "</tr>\n";
print "<tr><td>"; print "<tr><td>";
print $langs->trans('CronEvery')."</td>"; print $langs->trans('CronEvery')."</td>";
print "<td><select name=\"nbfrequency\">"; print "<td><select name=\"nbfrequency\">";
@ -370,8 +372,7 @@ if (($action=="create") || ($action=="edit")) {
print "<td>"; print "<td>";
print "</td>"; print "</td>";
print "</tr>\n"; print "</tr>\n";
print '<tr class="blockmethod"><td>'; print '<tr class="blockmethod"><td>';
print $langs->trans('CronModule')."</td><td>"; print $langs->trans('CronModule')."</td><td>";
print "<input type=\"text\" size=\"20\" name=\"module_name\" value=\"".$object->module_name."\" /> "; print "<input type=\"text\" size=\"20\" name=\"module_name\" value=\"".$object->module_name."\" /> ";
@ -416,7 +417,7 @@ if (($action=="create") || ($action=="edit")) {
print $form->textwithpicto('',$langs->trans("CronArgsHelp"),1,'help'); print $form->textwithpicto('',$langs->trans("CronArgsHelp"),1,'help');
print "</td>"; print "</td>";
print "</tr>\n"; print "</tr>\n";
print '<tr class="blockcommand"><td>'; print '<tr class="blockcommand"><td>';
print $langs->trans('CronCommand')."</td><td>"; print $langs->trans('CronCommand')."</td><td>";
print "<input type=\"text\" size=\"50\" name=\"command\" value=\"".$object->command."\" /> "; print "<input type=\"text\" size=\"50\" name=\"command\" value=\"".$object->command."\" /> ";
@ -425,7 +426,7 @@ if (($action=="create") || ($action=="edit")) {
print $form->textwithpicto('',$langs->trans("CronCommandHelp"),1,'help'); print $form->textwithpicto('',$langs->trans("CronCommandHelp"),1,'help');
print "</td>"; print "</td>";
print "</tr>\n"; print "</tr>\n";
print '<tr><td>'; print '<tr><td>';
print $langs->trans('CronNote')."</td><td>"; print $langs->trans('CronNote')."</td><td>";
$doleditor = new DolEditor('note', $object->note, '', 160, 'dolibarr_notes', 'In', true, false, 0, 4, 90); $doleditor = new DolEditor('note', $object->note, '', 160, 'dolibarr_notes', 'In', true, false, 0, 4, 90);
@ -435,7 +436,7 @@ if (($action=="create") || ($action=="edit")) {
print "</td>"; print "</td>";
print "</tr>\n"; print "</tr>\n";
print '<tr><td colspan="2" align="center">'; print '<tr><td colspan="2" align="center">';
print "<input type=\"submit\" name=\"save\" class=\"button\" value=\"".$langs->trans("Save")."\">"; print "<input type=\"submit\" name=\"save\" class=\"button\" value=\"".$langs->trans("Save")."\">";
print "<input type=\"submit\" name=\"cancel\" class=\"button\" value=\"".$langs->trans("Cancel")."\">"; print "<input type=\"submit\" name=\"cancel\" class=\"button\" value=\"".$langs->trans("Cancel")."\">";
@ -443,20 +444,20 @@ if (($action=="create") || ($action=="edit")) {
print "<td>"; print "<td>";
print "</td>"; print "</td>";
print "</tr>\n"; print "</tr>\n";
print '</table>'; print '</table>';
print "</form>\n"; print "</form>\n";
}else { }else {
/* /*
* view Template * view Template
*/ */
// box add_jobs_box // box add_jobs_box
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td width="30%">'; print '<tr><td width="30%">';
print $langs->trans('CronId')."</td>"; print $langs->trans('CronId')."</td>";
print "<td>".$form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'id'); print "<td>".$form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'id');
@ -466,7 +467,7 @@ if (($action=="create") || ($action=="edit")) {
print $langs->trans('CronLabel')."</td>"; print $langs->trans('CronLabel')."</td>";
print "<td>".$object->label; print "<td>".$object->label;
print "</td></tr>"; print "</td></tr>";
print "<tr><td>"; print "<tr><td>";
print $langs->trans('CronType')."</td><td>"; print $langs->trans('CronType')."</td><td>";
print $formCron->select_typejob('jobtype',$object->jobtype,1); print $formCron->select_typejob('jobtype',$object->jobtype,1);
@ -476,32 +477,32 @@ if (($action=="create") || ($action=="edit")) {
print $langs->trans('CronHourStart')."</td><td>"; print $langs->trans('CronHourStart')."</td><td>";
if(!empty($object->datestart)) {print dol_print_date($object->datestart,'dayhourtext');} else {print $langs->trans('CronNone');} if(!empty($object->datestart)) {print dol_print_date($object->datestart,'dayhourtext');} else {print $langs->trans('CronNone');}
print "</td></tr>"; print "</td></tr>";
print "<tr><td>"; print "<tr><td>";
print $langs->trans('CronDtEnd')."</td><td>"; print $langs->trans('CronDtEnd')."</td><td>";
if(!empty($object->dateend)) {print dol_print_date($object->dateend,'dayhourtext');} else {print $langs->trans('CronNone');} if(!empty($object->dateend)) {print dol_print_date($object->dateend,'dayhourtext');} else {print $langs->trans('CronNone');}
print "</td></tr>"; print "</td></tr>";
print "<tr><td>"; print "<tr><td>";
print $langs->trans('CronPriority')."</td>"; print $langs->trans('CronPriority')."</td>";
print "<td>".$object->priority; print "<td>".$object->priority;
print "</td></tr>"; print "</td></tr>";
print "<tr><td>"; print "<tr><td>";
print $langs->trans('CronNbRun')."</td>"; print $langs->trans('CronNbRun')."</td>";
print "<td>".$object->nbrun; print "<td>".$object->nbrun;
print "</td></tr>"; print "</td></tr>";
print "<tr><td>"; print "<tr><td>";
print $langs->trans('CronEvery')."</td>"; print $langs->trans('CronEvery')."</td>";
print "<td>"; print "<td>";
if($object->unitfrequency == "60") print $langs->trans('CronEach')." ".($object->frequency/$object->unitfrequency)." ".$langs->trans('Minutes'); if($object->unitfrequency == "60") print $langs->trans('CronEach')." ".($object->frequency/$object->unitfrequency)." ".$langs->trans('Minutes');
if($object->unitfrequency == "3600") print $langs->trans('CronEach')." ".($object->frequency/$object->unitfrequency)." ".$langs->trans('Hours'); if($object->unitfrequency == "3600") print $langs->trans('CronEach')." ".($object->frequency/$object->unitfrequency)." ".$langs->trans('Hours');
if($object->unitfrequency == "86400") print $langs->trans('CronEach')." ".($object->frequency/$object->unitfrequency)." ".$langs->trans('Days'); if($object->unitfrequency == "86400") print $langs->trans('CronEach')." ".($object->frequency/$object->unitfrequency)." ".$langs->trans('Days');
if($object->unitfrequency == "604800") print $langs->trans('CronEach')." ".($object->frequency/$object->unitfrequency)." ".$langs->trans('Weeks'); if($object->unitfrequency == "604800") print $langs->trans('CronEach')." ".($object->frequency/$object->unitfrequency)." ".$langs->trans('Weeks');
print "</td></tr>"; print "</td></tr>";
print '<tr class="blockmethod"><td>'; print '<tr class="blockmethod"><td>';
print $langs->trans('CronModule')."</td><td>"; print $langs->trans('CronModule')."</td><td>";
print $object->module_name; print $object->module_name;
@ -526,44 +527,44 @@ if (($action=="create") || ($action=="edit")) {
print $langs->trans('CronArgs')."</td><td>"; print $langs->trans('CronArgs')."</td><td>";
print $object->params; print $object->params;
print "</td></tr>"; print "</td></tr>";
print '<tr class="blockcommand"><td>'; print '<tr class="blockcommand"><td>';
print $langs->trans('CronCommand')."</td><td>"; print $langs->trans('CronCommand')."</td><td>";
print $object->command; print $object->command;
print "</td></tr>"; print "</td></tr>";
print '<tr><td>'; print '<tr><td>';
print $langs->trans('CronNote')."</td><td>"; print $langs->trans('CronNote')."</td><td>";
print $object->note; print $object->note;
print "</td></tr>"; print "</td></tr>";
print '<tr><td>'; print '<tr><td>';
print $langs->trans('CronDtLastLaunch')."</td><td>"; print $langs->trans('CronDtLastLaunch')."</td><td>";
if(!empty($object->datelastrun)) {print dol_print_date($object->datelastrun,'dayhourtext');} else {print $langs->trans('CronNone');} if(!empty($object->datelastrun)) {print dol_print_date($object->datelastrun,'dayhourtext');} else {print $langs->trans('CronNone');}
print "</td></tr>"; print "</td></tr>";
print '<tr><td>'; print '<tr><td>';
print $langs->trans('CronDtNextLaunch')."</td><td>"; print $langs->trans('CronDtNextLaunch')."</td><td>";
if(!empty($object->datenextrun)) {print dol_print_date($object->datenextrun,'dayhourtext');} else {print $langs->trans('CronNone');} if(!empty($object->datenextrun)) {print dol_print_date($object->datenextrun,'dayhourtext');} else {print $langs->trans('CronNone');}
print "</td></tr>"; print "</td></tr>";
print '<tr><td>'; print '<tr><td>';
print $langs->trans('CronDtLastResult')."</td><td>"; print $langs->trans('CronDtLastResult')."</td><td>";
if(!empty($object->datelastresult)) {print dol_print_date($object->datelastresult,'dayhourtext');} else {print $langs->trans('CronNone');} if(!empty($object->datelastresult)) {print dol_print_date($object->datelastresult,'dayhourtext');} else {print $langs->trans('CronNone');}
print "</td></tr>"; print "</td></tr>";
print '<tr><td>'; print '<tr><td>';
print $langs->trans('CronLastResult')."</td><td>"; print $langs->trans('CronLastResult')."</td><td>";
print $object->lastresult; print $object->lastresult;
print "</td></tr>"; print "</td></tr>";
print '<tr><td>'; print '<tr><td>';
print $langs->trans('CronLastOutput')."</td><td>"; print $langs->trans('CronLastOutput')."</td><td>";
print nl2br($object->lastoutput); print nl2br($object->lastoutput);
print "</td></tr>"; print "</td></tr>";
print '</table>'; print '</table>';
print "\n\n<div class=\"tabsAction\">\n"; print "\n\n<div class=\"tabsAction\">\n";
if (! $user->rights->cron->create) { if (! $user->rights->cron->create) {
print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("Edit").'</a>'; print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("Edit").'</a>';

159
htdocs/cron/class/cronjob.class.php
View File

@ -37,7 +37,7 @@ class Cronjob extends CommonObject
var $table_element='cronjob'; //!< Name of table without prefix where object is stored var $table_element='cronjob'; //!< Name of table without prefix where object is stored
var $id; var $id;
var $ref; //Use for prevnext_ref var $ref; //Use for prevnext_ref
var $jobtype; var $jobtype;
var $tms=''; var $tms='';
@ -65,10 +65,10 @@ class Cronjob extends CommonObject
var $fk_user_mod; var $fk_user_mod;
var $note; var $note;
var $nbrun; var $nbrun;
var $lines; var $lines;
/** /**
@ -96,7 +96,7 @@ class Cronjob extends CommonObject
$error=0; $error=0;
// Clean parameters // Clean parameters
if (isset($this->label)) $this->label=trim($this->label); if (isset($this->label)) $this->label=trim($this->label);
if (isset($this->jobtype)) $this->jobtype=trim($this->jobtype); if (isset($this->jobtype)) $this->jobtype=trim($this->jobtype);
if (isset($this->command)) $this->command=trim($this->command); if (isset($this->command)) $this->command=trim($this->command);
@ -152,7 +152,7 @@ class Cronjob extends CommonObject
// Insert request // Insert request
$sql = "INSERT INTO ".MAIN_DB_PREFIX."cronjob("; $sql = "INSERT INTO ".MAIN_DB_PREFIX."cronjob(";
$sql.= "datec,"; $sql.= "datec,";
$sql.= "jobtype,"; $sql.= "jobtype,";
$sql.= "label,"; $sql.= "label,";
@ -179,9 +179,9 @@ class Cronjob extends CommonObject
$sql.= "note,"; $sql.= "note,";
$sql.= "nbrun"; $sql.= "nbrun";
$sql.= ") VALUES ("; $sql.= ") VALUES (";
$sql.= " ".$this->db->idate(dol_now()).","; $sql.= " ".$this->db->idate(dol_now()).",";
$sql.= " ".(! isset($this->jobtype)?'NULL':"'".$this->db->escape($this->jobtype)."'").","; $sql.= " ".(! isset($this->jobtype)?'NULL':"'".$this->db->escape($this->jobtype)."'").",";
$sql.= " ".(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").","; $sql.= " ".(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").",";
@ -208,16 +208,16 @@ class Cronjob extends CommonObject
$sql.= " ".(! isset($this->note)?'NULL':"'".$this->db->escape($this->note)."'").","; $sql.= " ".(! isset($this->note)?'NULL':"'".$this->db->escape($this->note)."'").",";
$sql.= " ".(! isset($this->nbrun)?'0':"'".$this->db->escape($this->nbrun)."'").""; $sql.= " ".(! isset($this->nbrun)?'0':"'".$this->db->escape($this->nbrun)."'")."";
$sql.= ")"; $sql.= ")";
$this->db->begin(); $this->db->begin();
dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG); dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); } if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
if (! $error) if (! $error)
{ {
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."cronjob"); $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."cronjob");
@ -266,7 +266,7 @@ class Cronjob extends CommonObject
global $langs; global $langs;
$sql = "SELECT"; $sql = "SELECT";
$sql.= " t.rowid,"; $sql.= " t.rowid,";
$sql.= " t.tms,"; $sql.= " t.tms,";
$sql.= " t.datec,"; $sql.= " t.datec,";
$sql.= " t.jobtype,"; $sql.= " t.jobtype,";
@ -294,7 +294,7 @@ class Cronjob extends CommonObject
$sql.= " t.note,"; $sql.= " t.note,";
$sql.= " t.nbrun"; $sql.= " t.nbrun";
$sql.= " FROM ".MAIN_DB_PREFIX."cronjob as t"; $sql.= " FROM ".MAIN_DB_PREFIX."cronjob as t";
$sql.= " WHERE t.rowid = ".$id; $sql.= " WHERE t.rowid = ".$id;
@ -308,7 +308,7 @@ class Cronjob extends CommonObject
$this->id = $obj->rowid; $this->id = $obj->rowid;
$this->ref = $obj->rowid; $this->ref = $obj->rowid;
$this->tms = $this->db->jdate($obj->tms); $this->tms = $this->db->jdate($obj->tms);
$this->datec = $this->db->jdate($obj->datec); $this->datec = $this->db->jdate($obj->datec);
$this->label = $obj->label; $this->label = $obj->label;
@ -336,7 +336,7 @@ class Cronjob extends CommonObject
$this->note = $obj->note; $this->note = $obj->note;
$this->nbrun = $obj->nbrun; $this->nbrun = $obj->nbrun;
} }
$this->db->free($resql); $this->db->free($resql);
@ -349,7 +349,7 @@ class Cronjob extends CommonObject
return -1; return -1;
} }
} }
/** /**
* Load object in memory from the database * Load object in memory from the database
* *
@ -392,8 +392,8 @@ class Cronjob extends CommonObject
$sql.= " t.fk_user_mod,"; $sql.= " t.fk_user_mod,";
$sql.= " t.note,"; $sql.= " t.note,";
$sql.= " t.nbrun"; $sql.= " t.nbrun";
$sql.= " FROM ".MAIN_DB_PREFIX."cronjob as t"; $sql.= " FROM ".MAIN_DB_PREFIX."cronjob as t";
$status = (empty($status))?'0':'1'; $status = (empty($status))?'0':'1';
$sql.= " WHERE t.status=".$status; $sql.= " WHERE t.status=".$status;
@ -403,43 +403,43 @@ class Cronjob extends CommonObject
$sql.= ' AND '.$key.' LIKE \'%'.$value.'%\''; $sql.= ' AND '.$key.' LIKE \'%'.$value.'%\'';
} }
} }
$sql.= " ORDER BY $sortfield $sortorder "; $sql.= " ORDER BY $sortfield $sortorder ";
if (!empty($limit) && !empty($offset)) { if (!empty($limit) && !empty($offset)) {
$sql.= $this->db->plimit( $limit + 1 ,$offset); $sql.= $this->db->plimit( $limit + 1 ,$offset);
} }
$sqlwhere = array(); $sqlwhere = array();
if (!empty($module_name)) { if (!empty($module_name)) {
$sqlwhere[]='(t.module_name='.$module_name.')'; $sqlwhere[]='(t.module_name='.$module_name.')';
} }
if (count($sqlwhere)>0) { if (count($sqlwhere)>0) {
$sql.= " WHERE ".implode(' AND ',$sqlwhere); $sql.= " WHERE ".implode(' AND ',$sqlwhere);
} }
dol_syslog(get_class($this)."::fetch_all sql=".$sql, LOG_DEBUG); dol_syslog(get_class($this)."::fetch_all sql=".$sql, LOG_DEBUG);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
$num=$this->db->num_rows($resql); $num=$this->db->num_rows($resql);
$i=0; $i=0;
if ($num) if ($num)
{ {
$this->lines=array(); $this->lines=array();
while ($i < $num) while ($i < $num)
{ {
$line = new Cronjobline(); $line = new Cronjobline();
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);
$line->id = $obj->rowid; $line->id = $obj->rowid;
$line->ref = $obj->rowid; $line->ref = $obj->rowid;
$line->tms = $this->db->jdate($obj->tms); $line->tms = $this->db->jdate($obj->tms);
$line->datec = $this->db->jdate($obj->datec); $line->datec = $this->db->jdate($obj->datec);
$line->label = $obj->label; $line->label = $obj->label;
@ -466,15 +466,15 @@ class Cronjob extends CommonObject
$line->fk_user_mod = $obj->fk_user_mod; $line->fk_user_mod = $obj->fk_user_mod;
$line->note = $obj->note; $line->note = $obj->note;
$line->nbrun = $obj->nbrun; $line->nbrun = $obj->nbrun;
$this->lines[]=$line; $this->lines[]=$line;
$i++; $i++;
} }
} }
$this->db->free($resql); $this->db->free($resql);
return 1; return 1;
} }
else else
@ -496,13 +496,13 @@ class Cronjob extends CommonObject
function update($user=0, $notrigger=0) function update($user=0, $notrigger=0)
{ {
global $conf, $langs; global $conf, $langs;
$langs->load('cron'); $langs->load('cron');
$error=0; $error=0;
// Clean parameters // Clean parameters
if (isset($this->label)) $this->label=trim($this->label); if (isset($this->label)) $this->label=trim($this->label);
if (isset($this->jobtype)) $this->jobtype=trim($this->jobtype); if (isset($this->jobtype)) $this->jobtype=trim($this->jobtype);
if (isset($this->command)) $this->command=trim($this->command); if (isset($this->command)) $this->command=trim($this->command);
@ -558,11 +558,11 @@ class Cronjob extends CommonObject
$this->errors[]=$langs->trans('CronFieldMandatory',$langs->trans('CronObject')); $this->errors[]=$langs->trans('CronFieldMandatory',$langs->trans('CronObject'));
$error++; $error++;
} }
// Update request // Update request
$sql = "UPDATE ".MAIN_DB_PREFIX."cronjob SET"; $sql = "UPDATE ".MAIN_DB_PREFIX."cronjob SET";
$sql.= " label=".(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").","; $sql.= " label=".(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
$sql.= " jobtype=".(isset($this->jobtype)?"'".$this->db->escape($this->jobtype)."'":"null").","; $sql.= " jobtype=".(isset($this->jobtype)?"'".$this->db->escape($this->jobtype)."'":"null").",";
$sql.= " command=".(isset($this->command)?"'".$this->db->escape($this->command)."'":"null").","; $sql.= " command=".(isset($this->command)?"'".$this->db->escape($this->command)."'":"null").",";
@ -587,7 +587,7 @@ class Cronjob extends CommonObject
$sql.= " note=".(isset($this->note)?"'".$this->db->escape($this->note)."'":"null").","; $sql.= " note=".(isset($this->note)?"'".$this->db->escape($this->note)."'":"null").",";
$sql.= " nbrun=".(isset($this->nbrun)?$this->nbrun:"null"); $sql.= " nbrun=".(isset($this->nbrun)?$this->nbrun:"null");
$sql.= " WHERE rowid=".$this->id; $sql.= " WHERE rowid=".$this->id;
$this->db->begin(); $this->db->begin();
@ -595,7 +595,7 @@ class Cronjob extends CommonObject
dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG); dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); } if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
if (! $error) if (! $error)
{ {
if (! $notrigger) if (! $notrigger)
@ -755,7 +755,7 @@ class Cronjob extends CommonObject
{ {
$this->id=0; $this->id=0;
$this->ref=0; $this->ref=0;
$this->tms=''; $this->tms='';
$this->datec=''; $this->datec='';
$this->label=''; $this->label='';
@ -780,24 +780,24 @@ class Cronjob extends CommonObject
$this->status=''; $this->status='';
$this->fk_user_author=''; $this->fk_user_author='';
$this->fk_user_mod=''; $this->fk_user_mod='';
$this->note=''; $this->note='';
$this->nbrun=''; $this->nbrun='';
} }
/** /**
* Load object information * Load object information
* *
* @return void * @return void
*/ */
function info() function info()
{ {
global $langs; global $langs;
$sql = "SELECT"; $sql = "SELECT";
$sql.= " f.rowid, f.datec, f.tms, f.fk_user_mod, f.fk_user_author"; $sql.= " f.rowid, f.datec, f.tms, f.fk_user_mod, f.fk_user_author";
$sql.= " FROM ".MAIN_DB_PREFIX."cronjob as f"; $sql.= " FROM ".MAIN_DB_PREFIX."cronjob as f";
$sql.= " WHERE f.rowid = ".$this->id; $sql.= " WHERE f.rowid = ".$this->id;
dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG); dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
@ -812,7 +812,7 @@ class Cronjob extends CommonObject
$this->user_creation = $obj->fk_user_author; $this->user_creation = $obj->fk_user_author;
} }
$this->db->free($resql); $this->db->free($resql);
return 1; return 1;
} }
else else
@ -822,26 +822,26 @@ class Cronjob extends CommonObject
return -1; return -1;
} }
} }
/** /**
* Run a job * Run a job
* *
* @param string $userlogin User login * @param string $userlogin User login
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
function run_jobs($userlogin) function run_jobs($userlogin)
{ {
global $langs, $conf; global $langs, $conf;
$langs->load('cron'); $langs->load('cron');
if (empty($userlogin)) { if (empty($userlogin)) {
$this->error="User login is mandatory"; $this->error="User login is mandatory";
dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
return -1; return -1;
} }
require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
$user=new User($this->db); $user=new User($this->db);
$result=$user->fetch('',$userlogin); $result=$user->fetch('',$userlogin);
@ -856,12 +856,12 @@ class Cronjob extends CommonObject
return -1; return -1;
} }
} }
dol_syslog(get_class($this)."::run_jobs userlogin:$userlogin", LOG_DEBUG); dol_syslog(get_class($this)."::run_jobs userlogin:$userlogin", LOG_DEBUG);
$error=0; $error=0;
$now=dol_now(); $now=dol_now();
if ($this->jobtype=='method') { if ($this->jobtype=='method') {
// load classes // load classes
$ret=dol_include_once("/".$this->module_name."/class/".$this->classesname,$this->objectname); $ret=dol_include_once("/".$this->module_name."/class/".$this->classesname,$this->objectname);
@ -870,18 +870,19 @@ class Cronjob extends CommonObject
dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
return -1; return -1;
} }
// Load langs // Load langs
$result=$langs->load($this->module_name.'@'.$this->module_name); $result=$langs->load($this->module_name.'@'.$this->module_name);
if ($result<0) { if ($result<0) {
dol_syslog(get_class($this)."::run_jobs Cannot load module langs".$langs->error, LOG_ERR); dol_syslog(get_class($this)."::run_jobs Cannot load module langs".$langs->error, LOG_ERR);
return -1; return -1;
} }
dol_syslog(get_class($this)."::run_jobs ".$this->objectname."->".$this->methodename."(".$this->params.");", LOG_DEBUG); dol_syslog(get_class($this)."::run_jobs ".$this->objectname."->".$this->methodename."(".$this->params.");", LOG_DEBUG);
// Create Object for the call module // Create Object for the call module
$object = new $this->objectname($this->db); $object = new $this->objectname($this->db);
//Update launch start date //Update launch start date
$this->datelastrun=$now; $this->datelastrun=$now;
@ -892,6 +893,7 @@ class Cronjob extends CommonObject
return -1; return -1;
} }
$params_arr = array(); $params_arr = array();
$params_arr=explode(", ",$this->params); $params_arr=explode(", ",$this->params);
if (!is_array($params_arr)) { if (!is_array($params_arr)) {
@ -899,7 +901,7 @@ class Cronjob extends CommonObject
}else { }else {
$result = call_user_func_array(array($object, $this->methodename), $params_arr); $result = call_user_func_array(array($object, $this->methodename), $params_arr);
} }
if ($result===false) { if ($result===false) {
dol_syslog(get_class($this)."::run_jobs ".$object->error, LOG_ERR); dol_syslog(get_class($this)."::run_jobs ".$object->error, LOG_ERR);
return -1; return -1;
@ -907,7 +909,7 @@ class Cronjob extends CommonObject
$this->lastoutput=var_export($result,true); $this->lastoutput=var_export($result,true);
$this->lastresult=var_export($result,true); $this->lastresult=var_export($result,true);
} }
} elseif ($this->jobtype=='command') { } elseif ($this->jobtype=='command') {
dol_syslog(get_class($this)."::run_jobs system:".$this->command, LOG_DEBUG); dol_syslog(get_class($this)."::run_jobs system:".$this->command, LOG_DEBUG);
$output_arr=array(); $output_arr=array();
@ -920,11 +922,11 @@ class Cronjob extends CommonObject
dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
return -1; return -1;
} }
exec($this->command, $output_arr,$retval); exec($this->command, $output_arr,$retval);
dol_syslog(get_class($this)."::run_jobs output_arr:".var_export($output_arr,true), LOG_DEBUG); dol_syslog(get_class($this)."::run_jobs output_arr:".var_export($output_arr,true), LOG_DEBUG);
$this->lastoutput=''; $this->lastoutput='';
if (is_array($output_arr) && count($output_arr)>0) { if (is_array($output_arr) && count($output_arr)>0) {
foreach($output_arr as $val) { foreach($output_arr as $val) {
@ -943,23 +945,22 @@ class Cronjob extends CommonObject
}else { }else {
return 1; return 1;
} }
} }
/** /**
* Reprogram a job * Reprogram a job
* *
* @param string $userlogin User login * @param string $userlogin User login
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
* *
*/ */
function reprogram_jobs($userlogin) function reprogram_jobs($userlogin)
{ {
global $langs, $conf; global $langs, $conf;
dol_syslog(get_class($this)."::reprogram_jobs userlogin:$userlogin", LOG_DEBUG); dol_syslog(get_class($this)."::reprogram_jobs userlogin:$userlogin", LOG_DEBUG);
require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
$user=new User($this->db); $user=new User($this->db);
$result=$user->fetch('',$userlogin); $result=$user->fetch('',$userlogin);
@ -974,9 +975,9 @@ class Cronjob extends CommonObject
return -1; return -1;
} }
} }
dol_syslog(get_class($this)."::reprogram_jobs ", LOG_DEBUG); dol_syslog(get_class($this)."::reprogram_jobs ", LOG_DEBUG);
if (empty($this->datenextrun)) { if (empty($this->datenextrun)) {
$this->datenextrun=dol_now()+$this->frequency; $this->datenextrun=dol_now()+$this->frequency;
} else { } else {
@ -985,15 +986,15 @@ class Cronjob extends CommonObject
} else { } else {
$this->datenextrun=$this->datenextrun+$this->frequency; $this->datenextrun=$this->datenextrun+$this->frequency;
} }
} }
$result = $this->update($user); $result = $this->update($user);
if ($result<0) { if ($result<0) {
dol_syslog(get_class($this)."::reprogram_jobs ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::reprogram_jobs ".$this->error, LOG_ERR);
return -1; return -1;
} }
return 1; return 1;
} }
} }
@ -1002,10 +1003,10 @@ class Cronjob extends CommonObject
* Crob Job line class * Crob Job line class
*/ */
class Cronjobline{ class Cronjobline{
var $id; var $id;
var $ref; var $ref;
var $tms=''; var $tms='';
var $datec=''; var $datec='';
var $label; var $label;
@ -1031,7 +1032,7 @@ class Cronjobline{
var $fk_user_mod; var $fk_user_mod;
var $note; var $note;
var $nbrun; var $nbrun;
/** /**
* Constructor * Constructor
* *
@ -1040,4 +1041,4 @@ class Cronjobline{
{ {
return 1; return 1;
} }
} }

13
htdocs/install/mysql/data/llx_c_revenuestamp.sql
View File

@ -1,13 +1,4 @@
-- Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
-- Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> -- Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
-- Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
-- Copyright (C) 2004 Guillaume Delecourt <guillaume.delecourt@opensides.be>
-- Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
-- Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
-- Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
-- Copyright (C) 2012 Sebastian Neuwert <sebastian.neuwert@modula71.de>
-- Copyright (C) 2012 Ricardo Schluter <info@ripasch.nl>
-- --
-- This program is free software; you can redistribute it and/or modify -- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by -- it under the terms of the GNU General Public License as published by
@ -35,5 +26,5 @@
delete from llx_c_revenuestamp; delete from llx_c_revenuestamp;
-- TUNISIA -- -- TUNISIA (id country=10) --
insert into llx_c_revenuestamp(rowid,fk_pays,taux,note,active) values (101, 10, '0.4', 'Timbre fiscal', 1); insert into llx_c_revenuestamp(rowid,fk_pays,taux,note,active) values (101, 10, 0.4, 'Revenue stamp tunisia', 1);

14
htdocs/install/mysql/data/llx_c_tva.sql
View File

@ -219,13 +219,13 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 6
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 64, 6, '0','0','VAT Rate 0', 1); insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 64, 6, '0','0','VAT Rate 0', 1);
-- TUNISIA (id country=10) -- TUNISIA (id country=10)
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,localtax1,localtax1_type,localtax2,localtax2_type) values (101,10, '6','0','VAT 6%', 1, 1, '4', 0.4, '7'); insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,localtax1,localtax1_type,localtax2,localtax2_type) values (101,10, '6','0','VAT 6%', 1, 1, '4', 0, null);
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,localtax1,localtax1_type,localtax2,localtax2_type) values (102,10, '12','0','VAT 12%',1, 1, '4', 0.4, '7'); insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,localtax1,localtax1_type,localtax2,localtax2_type) values (102,10, '12','0','VAT 12%',1, 1, '4', 0, null);
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,localtax1,localtax1_type,localtax2,localtax2_type) values (103,10, '18','0','VAT 18%',1, 1, '4', 0.4, '7'); insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,localtax1,localtax1_type,localtax2,localtax2_type) values (103,10, '18','0','VAT 18%',1, 1, '4', 0, null);
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,localtax1,localtax1_type,localtax2,localtax2_type) values (104,10, '7.5','0','VAT 6% Majoré à 25% (7.5%)',1, 1, '4', 0.4, '7'); insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,localtax1,localtax1_type,localtax2,localtax2_type) values (104,10, '7.5','0','VAT 6% Majoré à 25% (7.5%)',1, 1, '4', 0, null);
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,localtax1,localtax1_type,localtax2,localtax2_type) values (105,10, '15','0','VAT 12% Majoré à 25% (15%)',1, 1, '4', 0.4, '7'); insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,localtax1,localtax1_type,localtax2,localtax2_type) values (105,10, '15','0','VAT 12% Majoré à 25% (15%)',1, 1, '4', 0, null);
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,localtax1,localtax1_type,localtax2,localtax2_type) values (106,10, '22.5','0','VAT 18% Majoré à 25% (22.5%)',1, 1, '4', 0.4, '7'); insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,localtax1,localtax1_type,localtax2,localtax2_type) values (106,10, '22.5','0','VAT 18% Majoré à 25% (22.5%)',1, 1, '4', 0, null);
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,localtax1,localtax1_type,localtax2,localtax2_type) values (107,10, '0','0','VAT Rate 0', 1, 1, '4', 0.4, '7'); insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,localtax1,localtax1_type,localtax2,localtax2_type) values (107,10, '0','0','VAT Rate 0', 1, 1, '4', 0, null);
-- UKRAINE (id country=226) -- UKRAINE (id country=226)
INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2261,226, '20','0','VAT standart rate',1); INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2261,226, '20','0','VAT standart rate',1);

15
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
View File

@ -130,8 +130,6 @@ CREATE TABLE llx_c_revenuestamp
insert into llx_c_revenuestamp(rowid,fk_pays,taux,note,active) values (101, 10, '0.4', 'Timbre fiscal', 1); insert into llx_c_revenuestamp(rowid,fk_pays,taux,note,active) values (101, 10, '0.4', 'Timbre fiscal', 1);
ALTER TABLE llx_actioncomm ADD COLUMN code varchar(32) NULL after fk_action;
ALTER TABLE llx_c_tva MODIFY COLUMN localtax1_type varchar(10) NOT NULL DEFAULT '0'; ALTER TABLE llx_c_tva MODIFY COLUMN localtax1_type varchar(10) NOT NULL DEFAULT '0';
ALTER TABLE llx_c_tva MODIFY COLUMN localtax2_type varchar(10) NOT NULL DEFAULT '0'; ALTER TABLE llx_c_tva MODIFY COLUMN localtax2_type varchar(10) NOT NULL DEFAULT '0';
ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN localtax1_type varchar(10) NOT NULL DEFAULT '0'; ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN localtax1_type varchar(10) NOT NULL DEFAULT '0';
@ -148,6 +146,13 @@ ALTER TABLE llx_facturedet MODIFY COLUMN localtax1_type varchar(10) NOT NULL DEF
ALTER TABLE llx_facturedet MODIFY COLUMN localtax2_type varchar(10) NOT NULL DEFAULT '0'; ALTER TABLE llx_facturedet MODIFY COLUMN localtax2_type varchar(10) NOT NULL DEFAULT '0';
ALTER TABLE llx_propaldet MODIFY COLUMN localtax1_type varchar(10) NOT NULL DEFAULT '0'; ALTER TABLE llx_propaldet MODIFY COLUMN localtax1_type varchar(10) NOT NULL DEFAULT '0';
ALTER TABLE llx_propaldet MODIFY COLUMN localtax2_type varchar(10) NOT NULL DEFAULT '0'; ALTER TABLE llx_propaldet MODIFY COLUMN localtax2_type varchar(10) NOT NULL DEFAULT '0';
-- No more use type 7, use revenuse stamp instead
UPDATE llx_c_tva set localtax1=0, localtax1_type='0' where localtax1_type = '7';
UPDATE llx_c_tva set localtax2=0, localtax2_type='0' where localtax2_type = '7';
ALTER TABLE llx_actioncomm ADD COLUMN code varchar(32) NULL after fk_action;
ALTER TABLE llx_holiday ADD COLUMN note text; ALTER TABLE llx_holiday ADD COLUMN note text;
ALTER TABLE llx_holiday ADD COLUMN note_public text; ALTER TABLE llx_holiday ADD COLUMN note_public text;
@ -197,5 +202,9 @@ ALTER TABLE llx_societe MODIFY COLUMN zip varchar(25);
ALTER TABLE llx_user ADD COLUMN address varchar(255); ALTER TABLE llx_user ADD COLUMN address varchar(255);
ALTER TABLE llx_user ADD COLUMN zip varchar(25); ALTER TABLE llx_user ADD COLUMN zip varchar(25);
ALTER TABLE llx_user ADD COLUMN town varchar(50); ALTER TABLE llx_user ADD COLUMN town varchar(50);
ALTER TABLE llx_user ADD COLUMN fk_state integer DEFAULT 0; -- ALTER TABLE llx_user ADD COLUMN fk_state integer DEFAULT 0;
ALTER TABLE llx_user ADD COLUMN fk_country integer DEFAULT 0; ALTER TABLE llx_user ADD COLUMN fk_country integer DEFAULT 0;

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

@ -24,9 +24,9 @@ create table llx_c_tva
fk_pays integer NOT NULL, fk_pays integer NOT NULL,
taux double NOT NULL, taux double NOT NULL,
localtax1 double NOT NULL DEFAULT 0, localtax1 double NOT NULL DEFAULT 0,
localtax1_type varchar(10) NOT NULL DEFAULT '0', localtax1_type varchar(10) NOT NULL DEFAULT '0',
localtax2 double NOT NULL DEFAULT 0, localtax2 double NOT NULL DEFAULT 0,
localtax2_type varchar(10) NOT NULL DEFAULT '0', localtax2_type varchar(10) NOT NULL DEFAULT '0',
recuperableonly integer NOT NULL DEFAULT 0, recuperableonly integer NOT NULL DEFAULT 0,
note varchar(128), note varchar(128),
active tinyint DEFAULT 1 NOT NULL, active tinyint DEFAULT 1 NOT NULL,

1
htdocs/langs/en_US/bills.lang
View File

@ -390,6 +390,7 @@ AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be
ToMakePayment=Pay ToMakePayment=Pay
ToMakePaymentBack=Pay back ToMakePaymentBack=Pay back
ListOfYourUnpaidInvoices=List of unpaid invoices ListOfYourUnpaidInvoices=List of unpaid invoices
RevenueStamp=Revenue stamp
##### Types de contacts ##### ##### Types de contacts #####
TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice
TypeContact_facture_external_BILLING=Customer invoice contact TypeContact_facture_external_BILLING=Customer invoice contact

1
htdocs/langs/fr_FR/bills.lang
View File

@ -387,6 +387,7 @@ AllCompletelyPayedInvoiceWillBeClosed=Toutes les factures avec un reste à payer
ToMakePayment=Payer ToMakePayment=Payer
ToMakePaymentBack=Rembourser ToMakePaymentBack=Rembourser
ListOfYourUnpaidInvoices=Liste des factures impayées ListOfYourUnpaidInvoices=Liste des factures impayées
RevenueStamp=Timbre fiscal
##### Types de contacts ##### ##### Types de contacts #####
TypeContact_facture_internal_SALESREPFOLL=Responsable suivi facture client TypeContact_facture_internal_SALESREPFOLL=Responsable suivi facture client
TypeContact_facture_external_BILLING=Contact client facturation TypeContact_facture_external_BILLING=Contact client facturation

4
htdocs/langs/fr_FR/cron.lang
View File

@ -9,8 +9,8 @@ URLToLaunchCronJobs=URL pour lancer les taches automatiques
OrToLaunchASpecificJob=Ou pour lancer une tache spécifique OrToLaunchASpecificJob=Ou pour lancer une tache spécifique
KeyForCronAccess=Clé de sécurité pour l'URL de lancement des taches automatiques KeyForCronAccess=Clé de sécurité pour l'URL de lancement des taches automatiques
FileToLaunchCronJobs=Commande pour lancer les taches automatiques FileToLaunchCronJobs=Commande pour lancer les taches automatiques
CronExplainHowToRunUnix=Sur un environement Unix vous pouvez paramétré CronTab pour executer cette commande toute les minutes CronExplainHowToRunUnix=Sur un environement Unix vous pouvez paramétrer CronTab pour executer cette commande toute les minutes.
CronExplainHowToRunWin=Sur un environement Microsoft(tm) Windows vous pouvez utilisr le planificateur de tache pour lancer cette commande toute les minutes CronExplainHowToRunWin=Sur un environement Microsoft(tm) Windows vous pouvez utiliser le planificateur de tache pour lancer cette commande toute les minutes.
# #
# Menu # Menu

2
htdocs/langs/zh_CN/members.lang
View File

@ -157,7 +157,7 @@ ShowTypeCard=显示类型'％s'
HTPasswordExport=htpassword文件生成 HTPasswordExport=htpassword文件生成
NoThirdPartyAssociatedToMember=无关联的第三方该会员 NoThirdPartyAssociatedToMember=无关联的第三方该会员
ThirdPartyDolibarr=Dolibarr第三者 ThirdPartyDolibarr=Dolibarr第三者
MembersAndSubscriptions=议员和Suscriptions MembersAndSubscriptions=议员和Subscriptions
// STOP - Lines generated via autotranslator.php tool (2010-06-08 21:22:55). // STOP - Lines generated via autotranslator.php tool (2010-06-08 21:22:55).

12
htdocs/public/cron/cron_run_jobs.php
View File

@ -49,7 +49,7 @@ if (empty($key)) {
echo 'securitykey is require'; echo 'securitykey is require';
exit; exit;
} }
if($key != $conf->global->MAIN_CRON_KEY) if($key != $conf->global->CRON_KEY)
{ {
echo 'securitykey is wrong'; echo 'securitykey is wrong';
exit; exit;
@ -104,13 +104,13 @@ if(is_array($object->lines) && (count($object->lines)>0)){
foreach($object->lines as $line){ foreach($object->lines as $line){
dol_syslog("cron_run_jobs.php:: fetch cronjobid:".$line->id, LOG_ERR); dol_syslog("cron_run_jobs.php:: fetch cronjobid:".$line->id, LOG_ERR);
//If date_next_jobs is less of current dat, execute the program, and store the execution time of the next execution in database //If date_next_jobs is less of current dat, execute the program, and store the execution time of the next execution in database
if ((($line->datenextrun <= $now) && $line->dateend < $now) if ((($line->datenextrun <= $now) && $line->dateend < $now)
|| ((empty($line->datenextrun)) && (empty($line->dateend)))){ || ((empty($line->datenextrun)) && (empty($line->dateend)))){
dol_syslog("cron_run_jobs.php:: torun line->datenextrun:".dol_print_date($line->datenextrun,'dayhourtext')." line->dateend:".dol_print_date($line->dateend,'dayhourtext')." now:".dol_print_date($now,'dayhourtext'), LOG_ERR); dol_syslog("cron_run_jobs.php:: torun line->datenextrun:".dol_print_date($line->datenextrun,'dayhourtext')." line->dateend:".dol_print_date($line->dateend,'dayhourtext')." now:".dol_print_date($now,'dayhourtext'), LOG_ERR);
$cronjob=new Cronjob($db); $cronjob=new Cronjob($db);
$result=$cronjob->fetch($line->id); $result=$cronjob->fetch($line->id);
if ($result<0) { if ($result<0) {
@ -125,7 +125,7 @@ if(is_array($object->lines) && (count($object->lines)>0)){
dol_syslog("cron_run_jobs.php:: run_jobs Error".$cronjob->error, LOG_ERR); dol_syslog("cron_run_jobs.php:: run_jobs Error".$cronjob->error, LOG_ERR);
exit; exit;
} }
// we re-program the next execution and stores the last execution time for this job // we re-program the next execution and stores the last execution time for this job
$result=$cronjob->reprogram_jobs($userlogin); $result=$cronjob->reprogram_jobs($userlogin);
if ($result<0) { if ($result<0) {
@ -133,7 +133,7 @@ if(is_array($object->lines) && (count($object->lines)>0)){
dol_syslog("cron_run_jobs.php:: reprogram_jobs Error".$cronjob->error, LOG_ERR); dol_syslog("cron_run_jobs.php:: reprogram_jobs Error".$cronjob->error, LOG_ERR);
exit; exit;
} }
} }
} }
echo "OK"; echo "OK";

67
htdocs/societe/class/societe.class.php
View File

@ -82,7 +82,9 @@ class Societe extends CommonObject
var $idprof1; // IdProf1 (Ex: Siren in France) var $idprof1; // IdProf1 (Ex: Siren in France)
var $idprof2; // IdProf2 (Ex: Siret in France) var $idprof2; // IdProf2 (Ex: Siret in France)
var $idprof3; // IdProf3 (Ex: Ape in France) var $idprof3; // IdProf3 (Ex: Ape in France)
var $idprof4; // IdProf4 (Ex: RCS in France) var $idprof4; // IdProf4 (Ex: RCS in France)
var $idprof5; // IdProf5
var $idprof6; // IdProf6
var $prefix_comm; var $prefix_comm;
@ -2599,40 +2601,53 @@ class Societe extends CommonObject
} }
/** /**
* Check if localtax define for company * Check if thirdparty may using localtax or not
* Used to build previews or test instances.
* id must be 0 if object instance is a specimen.
* *
* @param localTaxNum $localTaxNum 1 or 2 * @param int $localTaxNum To get info for only localtax1 or localtax2
* @return boolean true / false * @return array array(0=>boolean, 1=>boolean)
*/ */
function hasLocalTax($localTaxNum) { function useLocalTax($localTaxNum=0)
global $user,$langs,$conf; {
$sql = "SELECT t.localtax1, t.localtax2";
$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
$sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$this->country_code."'";
$sql .= " AND t.active = 1";
if (empty($localTaxNum)) $sql .= " AND (t.localtax1_type <> '0' OR t.localtax2_type <> '0')";
elseif ($localTaxNum == 1) $sql .= " AND t.localtax1_type <> '0'";
elseif ($localTaxNum == 2) $sql .= " AND t.localtax2_type <> '0'";
// check parameter dol_syslog("useLocalTax sql=".$sql);
if ($localTaxNum != 1 && $localTaxNum != 2) $resql=$this->db->query($sql);
return false; if ($resql)
{
return ($this->db->num_rows($resql) > 0);
}
else return false;
}
// Search local taxes /**
$sql = "SELECT t.localtax1, t.localtax2"; * Check if thirdparty is from a country using revenue stamps
$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p"; *
$sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$this->country_code."'"; * @return boolean Yes or no
$sql .= " AND t.active = 1"; */
if ($localTaxNum == 1) function useRevenueStamp()
$sql .= " AND t.localtax1 <> 0"; {
elseif ($localTaxNum == 2) $sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."c_revenuestamp as r, ".MAIN_DB_PREFIX."c_pays as p";
$sql .= " AND t.localtax2 <> 0"; $sql .= " WHERE r.fk_pays = p.rowid AND p.code = '".$this->country_code."'";
$sql .= " AND r.active = 1";
dol_syslog("get_localtax sql=".$sql); dol_syslog("useRevenueStamp sql=".$sql);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
return ($this->db->num_rows($resql) > 0); $obj=$this->db->fetch_object($resql);
return (($obj->nb > 0)?true:false);
} }
else else
return false; {
$this->error=$this->db->lasterror();
return false;
}
} }
/** /**
@ -2752,7 +2767,7 @@ class Societe extends CommonObject
/** /**
* Set commnunication level * Set commnunication level
* *
* @param User $user Utilisateur qui definie la remise * @param User $user User making change
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
function set_commnucation_level($user) function set_commnucation_level($user)

0
htdocs/theme/eldy/img/menus/object_cron.png → htdocs/theme/eldy/img/object_cron.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 655 B

After

Width:  |  Height:  |  Size: 655 B

25
htdocs/user/class/user.class.php
View File

@ -912,6 +912,11 @@ class User extends CommonObject
$this->office_phone = $contact->phone_pro; $this->office_phone = $contact->phone_pro;
$this->office_fax = $contact->fax; $this->office_fax = $contact->fax;
$this->user_mobile = $contact->phone_mobile; $this->user_mobile = $contact->phone_mobile;
$this->address = $contact->address;
$this->zip = $contact->zip;
$this->town = $contact->town;
$this->state_id = $contact->state_id;
$this->country_id = $contact->country_id;
if (empty($login)) $login=strtolower(substr($contact->firstname, 0, 4)) . strtolower(substr($contact->lastname, 0, 4)); if (empty($login)) $login=strtolower(substr($contact->firstname, 0, 4)) . strtolower(substr($contact->lastname, 0, 4));
$this->login = $login; $this->login = $login;
@ -974,11 +979,16 @@ class User extends CommonObject
// Positionne parametres // Positionne parametres
$this->admin = 0; $this->admin = 0;
$this->lastname = $member->lastname; $this->lastname = $member->lastname;
$this->firstname = $member->firstname; $this->firstname = $member->firstname;
$this->email = $member->email; $this->email = $member->email;
$this->fk_member = $member->id; $this->fk_member = $member->id;
$this->pass = $member->pass; $this->pass = $member->pass;
$this->address = $member->address;
$this->zip = $member->zip;
$this->town = $member->town;
$this->state_id = $member->state_id;
$this->country_id = $member->country_id;
if (empty($login)) $login=strtolower(substr($member->firstname, 0, 4)) . strtolower(substr($member->lastname, 0, 4)); if (empty($login)) $login=strtolower(substr($member->firstname, 0, 4)) . strtolower(substr($member->lastname, 0, 4));
$this->login = $login; $this->login = $login;
@ -1120,6 +1130,11 @@ class User extends CommonObject
$sql.= ", firstname = '".$this->db->escape($this->firstname)."'"; $sql.= ", firstname = '".$this->db->escape($this->firstname)."'";
$sql.= ", login = '".$this->db->escape($this->login)."'"; $sql.= ", login = '".$this->db->escape($this->login)."'";
$sql.= ", admin = ".$this->admin; $sql.= ", admin = ".$this->admin;
$sql.= ", address = '".$this->db->escape($this->address)."'";
$sql.= ", zip = '".$this->db->escape($this->zip)."'";
$sql.= ", town = '".$this->db->escape($this->town)."'";
$sql.= ", fk_state = '".$this->db->escape($this->state_id)."'";
$sql.= ", fk_country = '".$this->db->escape($this->country_id)."'";
$sql.= ", office_phone = '".$this->db->escape($this->office_phone)."'"; $sql.= ", office_phone = '".$this->db->escape($this->office_phone)."'";
$sql.= ", office_fax = '".$this->db->escape($this->office_fax)."'"; $sql.= ", office_fax = '".$this->db->escape($this->office_fax)."'";
$sql.= ", user_mobile = '".$this->db->escape($this->user_mobile)."'"; $sql.= ", user_mobile = '".$this->db->escape($this->user_mobile)."'";

102
scripts/cron/cron_run_jobs.php Normal file → Executable file
View File

@ -27,72 +27,74 @@ if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1');
if (! defined('NOLOGIN')) define('NOLOGIN','1'); if (! defined('NOLOGIN')) define('NOLOGIN','1');
//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
$sapi_type = php_sapi_name();
$script_file = basename(__FILE__);
$path=dirname(__FILE__).'/';
// Test if batch mode
if (substr($sapi_type, 0, 3) == 'cgi') {
echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
exit;
}
$sapi_type = php_sapi_name();
$script_file = basename(__FILE__);
$path=dirname(__FILE__).'/';
// Test if batch mode
if (substr($sapi_type, 0, 3) == 'cgi') {
echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
exit;
}
if (! isset($argv[1]) || ! $argv[1]) { if (! isset($argv[1]) || ! $argv[1]) {
print "Usage: ".$script_file." securitykey userlogin cronjobid(optional)\n"; print "Usage: ".$script_file." securitykey userlogin cronjobid(optional)\n";
exit; exit;
} }
$key=$argv[1]; $key=$argv[1];
if (! isset($argv[2]) || ! $argv[2]) { if (! isset($argv[2]) || ! $argv[2]) {
print "Usage: ".$script_file." securitykey userlogin cronjobid(optional)\n"; print "Usage: ".$script_file." securitykey userlogin cronjobid(optional)\n";
exit; exit;
} else { } else {
$userlogin=$argv[2]; $userlogin=$argv[2];
} }
require_once ($path."../../htdocs/master.inc.php");
require_once (DOL_DOCUMENT_ROOT."/cron/class/cronjob.class.php");
require_once (DOL_DOCUMENT_ROOT.'/user/class/user.class.php');
require_once (DOL_DOCUMENT_ROOT."/cron/class/cronjob.class.php");
$res=@include("../../master.inc.php"); // For root directory /*
if (! $res) $res=@include("../../../master.inc.php"); // For "custom" directory * Main
if (! $res) die("Include of master.inc.php fails"); */
// Check security key
// librarie jobs if ($key != $conf->global->CRON_KEY)
require_once (DOL_DOCUMENT_ROOT_ALT."/cron/class/cronjob.class.php");
//Check security key
if($key != $conf->global->MAIN_CRON_KEY)
{ {
echo 'securitykey is wrong'; print "Error: securitykey is wrong\n";
exit; exit;
} }
//Check user login // Check user login
require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
$user=new User($db); $user=new User($db);
$result=$user->fetch('',$userlogin); $result=$user->fetch('',$userlogin);
if ($result<0) { if ($result < 0)
echo "User Error:".$user->error; {
echo "User Error: ".$user->error;
dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR); dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
exit; exit;
}else { }
if (empty($user->id)) { else
echo " User user login:".$userlogin." do not exists"; {
if (empty($user->id))
{
echo " User user login: ".$userlogin." do not exists";
dol_syslog(" User user login:".$userlogin." do not exists", LOG_ERR); dol_syslog(" User user login:".$userlogin." do not exists", LOG_ERR);
exit; exit;
} }
} }
if (isset($argv[3]) || $argv[3]) { if (isset($argv[3]) || $argv[3])
{
$id = $argv[3]; $id = $argv[3];
} }
// librarie jobs
require_once (DOL_DOCUMENT_ROOT_ALT."/cron/class/cronjob.class.php");
// create a jobs object // create a jobs object
$object = new Cronjob($db); $object = new Cronjob($db);
@ -103,18 +105,21 @@ if (empty($id)) {
} }
$result = $object->fetch_all('DESC','t.rowid', 0, 0, 1, $filter); $result = $object->fetch_all('DESC','t.rowid', 0, 0, 1, $filter);
if ($result<0) { if ($result<0)
echo "Error:".$cronjob->error; {
dol_syslog("cron_run_jobs.php:: fetch Error".$cronjob->error, LOG_ERR); echo "Error: ".$object->error;
dol_syslog("cron_run_jobs.php:: fetch Error ".$object->error, LOG_ERR);
exit; exit;
} }
// current date // current date
$now=dol_now(); $now=dol_now();
if(is_array($object->lines) && (count($object->lines)>0)){ if(is_array($object->lines) && (count($object->lines)>0))
{
// Loop over job // Loop over job
foreach($object->lines as $line){ foreach($object->lines as $line)
{
//If date_next_jobs is less of current dat, execute the program, and store the execution time of the next execution in database //If date_next_jobs is less of current dat, execute the program, and store the execution time of the next execution in database
if (($line->datenextrun < $now) && $line->dateend < $now){ if (($line->datenextrun < $now) && $line->dateend < $now){
@ -132,7 +137,7 @@ if(is_array($object->lines) && (count($object->lines)>0)){
dol_syslog("cron_run_jobs.php:: run_jobs Error".$cronjob->error, LOG_ERR); dol_syslog("cron_run_jobs.php:: run_jobs Error".$cronjob->error, LOG_ERR);
exit; exit;
} }
// we re-program the next execution and stores the last execution time for this job // we re-program the next execution and stores the last execution time for this job
$result=$cronjob->reprogram_jobs($userlogin); $result=$cronjob->reprogram_jobs($userlogin);
if ($result<0) { if ($result<0) {
@ -140,7 +145,10 @@ if(is_array($object->lines) && (count($object->lines)>0)){
dol_syslog("cron_run_jobs.php:: reprogram_jobs Error".$cronjob->error, LOG_ERR); dol_syslog("cron_run_jobs.php:: reprogram_jobs Error".$cronjob->error, LOG_ERR);
exit; exit;
} }
} }
} }
} }
$db->close();
?>