diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index f2ef90677c5..16dcedc3035 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -30,6 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; /** @@ -83,7 +84,20 @@ class FactureRec extends Facture // Clean parameters $this->titre=trim($this->titre); $this->usenewprice=empty($this->usenewprice)?0:$this->usenewprice; - + + // No frequency defined then no next date to execution + if (empty($this->frequency)) + { + $this->frequency=0; + $this->date_when=NULL; + } + + + $this->frequency=abs($this->frequency); + $this->nb_gen_done=0; + $this->nb_gen_max=empty($this->nb_gen_max)?0:$this->nb_gen_max; + $this->auto_validate=empty($this->auto_validate)?0:$this->auto_validate; + $this->db->begin(); // Charge facture modele @@ -105,9 +119,17 @@ class FactureRec extends Facture $sql.= ", note_public"; $sql.= ", fk_user_author"; $sql.= ", fk_projet"; + $sql.= ", fk_account"; $sql.= ", fk_cond_reglement"; $sql.= ", fk_mode_reglement"; $sql.= ", usenewprice"; + $sql.= ", frequency"; + $sql.= ", unit_frequency"; + $sql.= ", date_when"; + $sql.= ", date_last_gen"; + $sql.= ", nb_gen_done"; + $sql.= ", nb_gen_max"; + $sql.= ", auto_validate"; $sql.= ") VALUES ("; $sql.= "'".$this->titre."'"; $sql.= ", ".$facsrc->socid; @@ -119,9 +141,17 @@ class FactureRec extends Facture $sql.= ", ".(!empty($this->note_public)?("'".$this->db->escape($this->note_public)."'"):"NULL"); $sql.= ", '".$user->id."'"; $sql.= ", ".(! empty($facsrc->fk_project)?"'".$facsrc->fk_project."'":"null"); + $sql.= ", ".(! empty($facsrc->fk_account)?"'".$facsrc->fk_account."'":"null"); $sql.= ", '".$facsrc->cond_reglement_id."'"; $sql.= ", '".$facsrc->mode_reglement_id."'"; $sql.= ", ".$this->usenewprice; + $sql.= ", ".$this->frequency; + $sql.= ", '".$this->db->escape($this->unit_frequency)."'"; + $sql.= ", ".(!empty($this->date_when)?"'".$this->db->idate($this->date_when)."'":'NULL'); + $sql.= ", ".(!empty($this->date_last_gen)?"'".$this->db->idate($this->date_last_gen)."'":'NULL'); + $sql.= ", ".$this->nb_gen_done; + $sql.= ", ".$this->nb_gen_max; + $sql.= ", ".$this->auto_validate; $sql.= ")"; if ($this->db->query($sql)) @@ -197,7 +227,9 @@ class FactureRec extends Facture $sql = 'SELECT f.titre,f.fk_soc,f.amount,f.tva,f.total,f.total_ttc,f.remise_percent,f.remise_absolue,f.remise'; $sql.= ', f.date_lim_reglement as dlr'; $sql.= ', f.note_private, f.note_public, f.fk_user_author'; - $sql.= ', f.fk_mode_reglement, f.fk_cond_reglement'; + $sql.= ', f.fk_mode_reglement, f.fk_cond_reglement, f.fk_projet'; + $sql.= ', f.fk_account'; + $sql.= ', f.frequency, f.unit_frequency, f.date_when, f.date_last_gen, f.nb_gen_done, f.nb_gen_max, f.usenewprice, f.auto_validate'; $sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle'; $sql.= ', c.code as cond_reglement_code, c.libelle as cond_reglement_libelle, c.libelle_facture as cond_reglement_libelle_doc'; $sql.= ', el.fk_source'; @@ -248,6 +280,7 @@ class FactureRec extends Facture $this->cond_reglement = $obj->cond_reglement_libelle; $this->cond_reglement_doc = $obj->cond_reglement_libelle_doc; $this->fk_project = $obj->fk_projet; + $this->fk_account = $obj->fk_account; $this->fk_facture_source = $obj->fk_facture_source; $this->note_private = $obj->note_private; $this->note_public = $obj->note_public; @@ -255,6 +288,14 @@ class FactureRec extends Facture $this->modelpdf = $obj->model_pdf; $this->rang = $obj->rang; $this->special_code = $obj->special_code; + $this->frequency = $obj->frequency; + $this->unit_frequency = $obj->unit_frequency; + $this->date_when = $obj->date_when; + $this->date_last_gen = $obj->date_last_gen; + $this->nb_gen_done = $obj->nb_gen_done; + $this->nb_gen_max = $obj->nb_gen_max; + $this->usenewprice = $obj->usenewprice; + $this->auto_validate = $obj->auto_validate; if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1; @@ -468,7 +509,7 @@ class FactureRec extends Facture $total_ht = $tabprice[0]; $total_tva = $tabprice[1]; $total_ttc = $tabprice[2]; - + $product_type=$type; if ($fk_product) { @@ -529,6 +570,63 @@ class FactureRec extends Facture } } + /** + * Return the next date of + * + * @return timestamp false if KO, timestamp if OK + */ + function getNextDate() + { + if (empty($this->date_when)) return false; + return dol_time_plus_duree(strtotime($this->date_when), $this->frequency, $this->unit_frequency); + } + + /** + * Create all recurrents invoices + * + * @return int number of created invoices + */ + function createRecurringInvoices() + { + global $db,$user; + + $nb_create=0; + + $today = date('Y-m-d 23:59:59'); + + $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'facture_rec'; + $sql.= ' WHERE date_when IS NOT NULL AND frequency > 0'; + $sql.= ' AND date_when <= "'.$db->escape($today).'"'; + $sql.= ' AND nb_gen_done < nb_gen_max'; + + $resql = $db->query($sql); + if ($resql) + { + while ($line = $db->fetch_object($resql)) + { + $facturerec = new FactureRec($db); + $facturerec->fetch($line->rowid); + + $facture = new Facture($db); + $result = $facture->createFromRec($user, $facturerec); + + // >0 create and validate if auto_validate + // =0 create but not validate if auto_validate + // <0 broken + if ($result >= 0) + { + $next_date = $facturerec->getNextDate(); + $facturerec->setNextDate($next_date,1); + + $nb_create++; + } + + } + } + + return $nb_create; + } + /** * Return clicable name (with picto eventually) * @@ -601,4 +699,144 @@ class FactureRec extends Facture return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables); } + + /** + * Update frequency and unit + * + * @param int $frequency value of frequency + * @param string $unit unit of frequency (d, m, y) + * @return int <0 if KO, >0 if OK + */ + function setFrequencyAndUnit($frequency=0,$unit='') + { + if (! $this->table_element) + { + dol_syslog(get_class($this)."::setFrequencyAndUnit was called on objet with property table_element not defined",LOG_ERR); + return -1; + } + + if (empty($frequency) && empty($unit)) + { + dol_syslog(get_class($this)."::setFrequencyAndUnit was called on objet with params frequency and unit not defined",LOG_ERR); + return -2; + } + + $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element; + if (!empty($frequency)) $sql.= ' SET frequency = '.$frequency; + if (!empty($unit)) + { + if (!empty($frequency)) $sql .= ','; + else $sql .= ' SET'; + $sql.= ' unit_frequency = "'.$this->db->escape($unit).'"'; + } + $sql.= ' WHERE rowid = '.$this->id; + + dol_syslog(get_class($this)."::setFrequencyAndUnit", LOG_DEBUG); + if ($this->db->query($sql)) + { + if (!empty($frequency)) $this->frequency = $frequency; + if (!empty($unit)) $this->unit_frequency = $unit; + return 1; + } + else + { + dol_print_error($this->db); + return -1; + } + } + + /** + * Update the next date of execution + * + * @param datetime $date date of execution + * @param int $increment_nb_gen_done 0 do nothing more, >0 increment nb_gen_done + * @return int <0 if KO, >0 if OK + */ + function setNextDate($date, $increment_nb_gen_done=0) + { + if (! $this->table_element) + { + dol_syslog(get_class($this)."::setNextDate was called on objet with property table_element not defined",LOG_ERR); + return -1; + } + $date = $this->db->idate($date); + $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element; + $sql.= ' SET date_when = "'.$date.'"'; + if ($increment_nb_gen_done>0) $sql.= ', nb_gen_done = nb_gen_done + 1'; + $sql.= ' WHERE rowid = '.$this->id; + + dol_syslog(get_class($this)."::setNextDate", LOG_DEBUG); + if ($this->db->query($sql)) + { + $this->date_when = $date; + return 1; + } + else + { + dol_print_error($this->db); + return -1; + } + } + + /** + * Update the maximum period + * + * @param int $nb number of maximum period + * @return int <0 if KO, >0 if OK + */ + function setMaxPeriod($nb) + { + if (! $this->table_element) + { + dol_syslog(get_class($this)."::setMaxPeriod was called on objet with property table_element not defined",LOG_ERR); + return -1; + } + + $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element; + $sql.= ' SET nb_gen_max = '.$nb; + $sql.= ' WHERE rowid = '.$this->id; + + dol_syslog(get_class($this)."::setMaxPeriod", LOG_DEBUG); + if ($this->db->query($sql)) + { + $this->nb_gen_max = $nb; + return 1; + } + else + { + dol_print_error($this->db); + return -1; + } + } + + /** + * Update the auto validate invoice + * + * @param int $validate 0 to create in draft, 1 to create and validate invoice + * @return int <0 if KO, >0 if OK + */ + function setAutoValidate($validate) + { + if (! $this->table_element) + { + dol_syslog(get_class($this)."::setAutoValidate was called on objet with property table_element not defined",LOG_ERR); + return -1; + } + + $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element; + $sql.= ' SET auto_validate = '.$validate; + $sql.= ' WHERE rowid = '.$this->id; + + dol_syslog(get_class($this)."::setAutoValidate", LOG_DEBUG); + if ($this->db->query($sql)) + { + $this->auto_validate = $validate; + return 1; + } + else + { + dol_print_error($this->db); + return -1; + } + } } diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index fe38c17ff0d..dd1d9b6ca8c 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -278,6 +278,8 @@ class Facture extends CommonInvoice $result=$_facrec->fetch($this->fac_rec); $this->fk_project = $_facrec->fk_project; + $this->fk_account = $_facrec->fk_account; + $this->note_private = $_facrec->note_private; $this->cond_reglement_id = $_facrec->cond_reglement_id; $this->mode_reglement_id = $_facrec->mode_reglement_id; $this->remise_absolue = $_facrec->remise_absolue; @@ -917,6 +919,60 @@ class Facture extends CommonInvoice else return -1; } + /** + * Create a new invoice in database from facturerec + * + * @param User $user Object user that ask creation + * @param FactureRec $facturerec Object facturerec source + * @return int <0 if KO, 0 if not validate, >0 if OK + */ + function createFromRec($user, $facturerec) + { + + // Clean parameters + $this->type = self::TYPE_STANDARD; + $this->brouillon = 1; + + // Charge facture source + $facture=new Facture($facturerec->db); + + $facture->socid = $facturerec->socid; + $facture->date = dol_mktime(12, 0, 0, date('m'), date('d'), date('Y')); + $facture->note_public = $facturerec->note_public; + $facture->note_private = $facturerec->note_private; + $facture->fk_project = $facturerec->fk_project; + $facture->fk_account = $facturerec->fk_account; + $facture->cond_reglement_id = $facturerec->cond_reglement_id; + $facture->mode_reglement_id = $facturerec->mode_reglement_id; + + $new_date_lim_reglement = $facture->calculate_date_lim_reglement(); + $facture->date_lim_reglement = $new_date_lim_reglement; + + $facture->remise_absolue = $facturerec->remise_absolue; + $facture->remise_percent = $facturerec->remise_percent; + + $facture->lines = $facturerec->lines; // Tableau des lignes de factures + + // Loop on each line of new invoice + foreach($facture->lines as $i => $line) + { + $facture->lines[$i]->fk_prev_id = $facturerec->lines[$i]->rowid; + } + + dol_syslog(get_class($this)."::createFromRec socid=".$this->socid." nboflines=".count($facture->lines)); + + $facid = $facture->create($user); + if ($facid <= 0) return -1; + + if ($facturerec->auto_validate) + { + $result = $facture->validate($user); + if ($result<=0) return 0; + } + + return $facid; + } + /** * Return clicable link of object (with eventually picto) * diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index 5f17c5d49bb..0d462d25066 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -58,7 +58,14 @@ if ($sortfield == "") $sortfield="f.datef"; $object = new FactureRec($db); - +if ($id > 0 && $action != 'create' && $action != 'add') +{ + $ret = $object->fetch($id); + if (!$ret) + { + setEventMessages($langs->trans("ErrorRecordNotFound"), null, 'errors'); + } +} /* * Actions @@ -75,16 +82,47 @@ if ($action == 'add') $error++; } + $frequency=GETPOST('frequency', 'int'); + $reyear=GETPOST('reyear'); + $remonth=GETPOST('remonth'); + $reday=GETPOST('reday'); + $nb_gen_max=GETPOST('nb_gen_max', 'int'); + + if (GETPOST('frequency')) + { + if (empty($reyear) || empty($remonth) || empty($reday)) + { + setEventMessages($langs->transnoentities("ErrorFieldRequired",$langs->trans("Date")), null, 'errors'); + $action = "create"; + $error++; + } + if (empty($nb_gen_max)) + { + setEventMessages($langs->transnoentities("ErrorFieldRequired",$langs->trans("MaxPeriodNumber")), null, 'errors'); + $action = "create"; + $error++; + } + } + if (! $error) { $object->titre = GETPOST('titre', 'alpha'); $object->note_private = GETPOST('note_private'); $object->usenewprice = GETPOST('usenewprice'); - + + $object->frequency = $frequency; + $object->unit_frequency = GETPOST('unit_frequency', 'alpha'); + $object->nb_gen_max = $nb_gen_max; + $object->auto_validate = GETPOST('auto_validate', 'int'); + + $date_next_execution = dol_mktime(12, 0, 0, $remonth, $reday, $reyear); + $object->date_when = $date_next_execution; + if ($object->create($user, $id) > 0) { $id = $object->id; - $action = ''; + header("Location: " . $_SERVER['PHP_SELF'] . '?facid=' . $id); + exit; } else { @@ -97,12 +135,59 @@ if ($action == 'add') // Delete if ($action == 'delete' && $user->rights->facture->supprimer) { - $object->fetch($id); $object->delete(); - $id = 0 ; + header("Location: " . $_SERVER['PHP_SELF'] ); + exit; } +// Update field +// Set condition +if ($action == 'setconditions' && $user->rights->facture->creer) +{ + $result=$object->setPaymentTerms(GETPOST('cond_reglement_id', 'int')); + +} +// Set mode +elseif ($action == 'setmode' && $user->rights->facture->creer) +{ + $result=$object->setPaymentMethods(GETPOST('mode_reglement_id', 'int')); +} +// Set project +elseif ($action == 'classin' && $user->rights->facture->creer) +{ + $object->setProject(GETPOST('projectid', 'int')); +} +// Set bank account +elseif ($action == 'setbankaccount' && $user->rights->facture->creer) +{ + $result=$object->setBankAccount(GETPOST('fk_account', 'int')); +} +// Set frequency and unit frequency +elseif ($action == 'setfrequency' && $user->rights->facture->creer) +{ + $object->setFrequencyAndUnit(GETPOST('frequency', 'int'), GETPOST('unit_frequency', 'alpha')); +} +// Set next date of execution +elseif ($action == 'setdate_when' && $user->rights->facture->creer) +{ + $date = dol_mktime(12, 0, 0, GETPOST('date_whenmonth'), GETPOST('date_whenday'), GETPOST('date_whenyear')); + if (!empty($date)) $object->setNextDate($date); +} +// Set max period +elseif ($action == 'setnb_gen_max' && $user->rights->facture->creer) +{ + $object->setMaxPeriod(GETPOST('nb_gen_max', 'int')); +} +// Set auto validate +elseif ($action == 'setauto_validate' && $user->rights->facture->creer) +{ + $object->setAutoValidate(GETPOST('auto_validate', 'int')); +} +// Set note +$permissionnote=$user->rights->facture->creer; // Used by the include of actions_setnotes.inc.php +include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once + /* * View @@ -134,6 +219,7 @@ if ($action == 'create') $rowspan=4; if (! empty($conf->projet->enabled) && $object->fk_project > 0) $rowspan++; + if ($object->fk_account > 0) $rowspan++; print ''; @@ -181,6 +267,46 @@ if ($action == 'create') print ""; } + // Project + if ($object->fk_account > 0) + { + print ""; + } + + print "
".$langs->trans('BankAccount').""; + $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none'); + print "
"; + + print '
'; + + + // Recurrence + $title = $langs->trans("Recurrence"); + print load_fiche_titre($title); + + print ''; + + // Frequency + print ""; + + // First date of execution for cron + print ""; + + // Number max of generation + print ""; + + // Auto validate the invoice + print ""; + print "
".$form->textwithpicto($langs->trans("Frequency"), $langs->transnoentitiesnoconv('toolTipFrequency')).""; + print " ".$form->selectarray('unit_frequency', array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), (GETPOST('unit_frequency')?GETPOST('unit_frequency'):'m')); + print "
".$langs->trans('NextDateToExecution').""; + $date_next_execution = isset($date_next_execution) ? $date_next_execution : dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')); + print $form->select_date($date_next_execution, '', 0, 0, '', "add", 1, 1, 1); + print "
".$langs->trans("MaxPeriodNumber").""; + print ""; + print "
".$langs->trans("InvoiceAutoValidate").""; + print $form->selectyesno('auto_validate', 0, 1); + print "
"; print '
'; @@ -394,178 +520,323 @@ else /* * View mode */ - if ($id > 0) + if ($object->id > 0) { - if ($object->fetch($id) > 0) + $object->fetch_thirdparty(); + + $author = new User($db); + $author->fetch($object->user_author); + + $head=array(); + $h=0; + $head[$h][0] = $_SERVER["PHP_SELF"].'?id='.$object->id; + $head[$h][1] = $langs->trans("CardBill"); + $head[$h][2] = 'card'; + + dol_fiche_head($head, 'card', $langs->trans("PredefinedInvoices"),0,'bill'); // Add a div + + print ''; + + print ''; + print ''; + + print ''; + print ''; + + print ""; + + print ''; + print ''; + print ''; + + print ''; + print ''; + print ''; + print ''; + + // Payment term + print ''; + + + print ''; + print ''; + + // Project + if (! empty($conf->projet->enabled)) { + $langs->load('projects'); + print ''; + print ''; + print ''; + } + + // Bank Account + print '"; + print ''; + + + print "
'.$langs->trans("Ref").''.$object->titre.'
'.$langs->trans("Customer").''.$object->thirdparty->getNomUrl(1,'customer').'
".$langs->trans("Author").''.$author->getFullName($langs)."
'.$langs->trans("AmountHT").''.price($object->total_ht,'',$langs,1,-1,-1,$conf->currency).'
'.$langs->trans("AmountVAT").''.price($object->total_tva,'',$langs,1,-1,-1,$conf->currency).'
'.$langs->trans("AmountTTC").''.price($object->total_ttc,'',$langs,1,-1,-1,$conf->currency).'
'; + print ''; + if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer) + print ''; + print '
'; + print $langs->trans('PaymentConditionsShort'); + print 'id . '">' . img_edit($langs->trans('SetConditions'), 1) . '
'; + print '		'; + if ($object->type != Facture::TYPE_CREDIT_NOTE) { - $object->fetch_thirdparty(); - - $author = new User($db); - $author->fetch($object->user_author); - - $head=array(); - $h=0; - $head[$h][0] = $_SERVER["PHP_SELF"].'?id='.$object->id; - $head[$h][1] = $langs->trans("CardBill"); - $head[$h][2] = 'card'; - - dol_fiche_head($head, 'card', $langs->trans("PredefinedInvoices"),0,'bill'); // Add a div - - print ''; - - print ''; - print ''; - - print ''; - print ''; - - print ""; - - print ''; - print ''; - print ''; - - print ''; - print ''; - print ''; - print ''; - - // Payment term - print '"; - - // Payment mode - print '"; - - print '"; - - print "
'.$langs->trans("Ref").''.$object->titre.'
'.$langs->trans("Customer").''.$object->thirdparty->getNomUrl(1,'customer').'
".$langs->trans("Author").''.$author->getFullName($langs)."
'.$langs->trans("AmountHT").''.price($object->total_ht,'',$langs,1,-1,-1,$conf->currency).'
'.$langs->trans("AmountVAT").''.price($object->total_tva,'',$langs,1,-1,-1,$conf->currency).'
'.$langs->trans("AmountTTC").''.price($object->total_ttc,'',$langs,1,-1,-1,$conf->currency).'
'.$langs->trans("PaymentConditions").''; - $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id,'none'); - print "
'.$langs->trans("PaymentMode").''; - $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id,'none'); - print "
'.$langs->trans("Comment").''.nl2br($object->note_private)."
"; - - print ''; - - /* - * Lines - */ - - $title = $langs->trans("ProductsAndServices"); - if (empty($conf->service->enabled)) - $title = $langs->trans("Products"); - else if (empty($conf->product->enabled)) - $title = $langs->trans("Services"); - - print load_fiche_titre($title); - - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - if ($conf->global->PRODUCT_USE_UNITS) { - print ''; + if ($action == 'editconditions') { + $form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->cond_reglement_id, 'cond_reglement_id'); + } else { + $form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->cond_reglement_id, 'none'); } - print ''; + } else { + print ' '; + } + print ''; - $num = count($object->lines); - $i = 0; - $var=true; - while ($i < $num) - { - $var=!$var; - - $product_static=new Product($db); - - // Show product and description - $type=(isset($object->lines[$i]->product_type)?$object->lines[$i]->product_type:$object->lines[$i]->fk_product_type); - // Try to enhance type detection using date_start and date_end for free lines when type - // was not saved. - if (! empty($objp->date_start)) $type=1; - if (! empty($objp->date_end)) $type=1; - - // Show line - print ""; - if ($object->lines[$i]->fk_product > 0) - { - print ''; - } - else - { - print ''; - } - print ''; - print ''; - print ''; - if ($conf->global->PRODUCT_USE_UNITS) { - print ""; - } - print "\n"; - $i++; - } - print '
'.$langs->trans("Description").''.$langs->trans("Price").''.$langs->trans("ReductionShort").''.$langs->trans("Qty").''.$langs->trans("Unit").'
'; - print ''; // ancre pour retourner sur la ligne - - // Show product and description - $product_static->type=$object->lines[$i]->fk_product_type; - $product_static->id=$object->lines[$i]->fk_product; - $product_static->ref=$object->lines[$i]->product_ref; - $text=$product_static->getNomUrl(1); - $text.= ' - '.(! empty($object->lines[$i]->label)?$object->lines[$i]->label:$object->lines[$i]->product_label); - $description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($object->lines[$i]->desc)); - print $form->textwithtooltip($text,$description,3,'','',$i); - - // Show range - print_date_range($object->lines[$i]->date_start, $object->lines[$i]->date_end); - - // Add description in form - if (! empty($conf->global->PRODUIT_DESC_IN_FORM)) - print (! empty($object->lines[$i]->desc) && $object->lines[$i]->desc!=$fac->lines[$i]->product_label)?'
'.dol_htmlentitiesbr($object->lines[$i]->desc):''; - - print '		'; - - if ($type==1) $text = img_object($langs->trans('Service'),'service'); - else $text = img_object($langs->trans('Product'),'product'); - - if (! empty($object->lines[$i]->label)) { - - $text.= ' '.$object->lines[$i]->label.''; - print $form->textwithtooltip($text,dol_htmlentitiesbr($object->lines[$i]->desc),3,'','',$i); - - } else { - - print $text.' '.nl2br($object->lines[$i]->desc); - } - - // Show range - print_date_range($object->lines[$i]->date_start, $object->lines[$i]->date_end); - - print ''.price($object->lines[$i]->price).''.$object->lines[$i]->remise_percent.' %'.$object->lines[$i]->qty.'".$object->lines[$i]->getLabelOfUnit()."
'; - - - - /** - * Barre d'actions - */ - print '
'; - - if ($object->statut == Facture::STATUS_DRAFT && $user->rights->facture->creer) - { - echo '
'.$langs->trans("CreateBill").'
'; - } - - if ($object->statut == Facture::STATUS_DRAFT && $user->rights->facture->supprimer) - { - print '
'.$langs->trans('Delete').'
'; - } - - print '
'; + // Payment mode + print '
'; + print ''; + if ($action != 'editmode' && ! empty($object->brouillon) && $user->rights->facture->creer) + print ''; + print '
'; + print $langs->trans('PaymentMode'); + print 'id . '">' . img_edit($langs->trans('SetMode'), 1) . '
'; + print '		'; + if ($action == 'editmode') + { + $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT'); } else { - print $langs->trans("ErrorRecordNotFound"); + $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'none', 'CRDT'); } + print '
'; + print $form->editfieldkey($langs->trans("NotePrivate"), 'note_private', $object->note_private, $object, $user->rights->facture->creer); + print ''; + print $form->editfieldval($langs->trans("NotePrivate"), 'note_private', $object->note_private, $object, $user->rights->facture->creer, 'textarea:'.ROWS_4.':60'); + print '
'; + + print ''; + if ($action != 'classify') { + print ''; + } + print '
'; + print $langs->trans('Project'); + print 'id . '">'; + print img_edit($langs->trans('SetProject'), 1); + print '
'; + + print '		'; + if ($action == 'classify') { + $form->form_project($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1); + } else { + $form->form_project($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0); + } + print '
'; + print ''; + print '
'; + print $langs->trans('BankAccount'); + print ''; + if (($action != 'editbankaccount') && $user->rights->commande->creer && ! empty($object->brouillon)) + print 'id.'">'.img_edit($langs->trans('SetBankAccount'),1).'
'; + print '		'; + if ($action == 'editbankaccount') + { + $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1); + } + else + { + $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none'); + } + print "
"; + + print ''; + + /* + * Recurrence + */ + $title = $langs->trans("Recurrence"); + print load_fiche_titre($title); + + print '
'; + print ''; + + // if "frequency" is empty or = 0, the reccurence is disabled + print ''; + + // Date when + print ''; + print ''; + + + // Max period / Rest period + print ''; + print ''; + print ''; + print ''; + + // Auto validate + print ''; + print ''; + + print '
'; + print ''; + if ($action != 'editfrequency' && ! empty($object->brouillon) && $user->rights->facture->creer) + print ''; + print '
'; + print $langs->trans('Frequency'); + print 'id . '">' . img_edit($langs->trans('Edit'), 1) . '
'; + print '		'; + if ($action == 'editfrequency') + { + print '
'; + print ''; + print ''; + print ''; + print ''; + print ''; + print '
'; + print " ".$form->selectarray('unit_frequency', array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), ($object->unit_frequency?$object->unit_frequency:'m')); + print '
'; + } + else + { + print $langs->trans('FrequencyPer_'.$object->unit_frequency, $object->frequency); + } + print '
'; + print $form->editfieldkey($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer); + print ''; + print $form->editfieldval($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer, 'datepicker'); + print '
'; + print $form->editfieldkey($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer); + print ''; + print $form->editfieldval($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer); + print '
'.$langs->trans("RestPeriodNumber").''.($object->nb_gen_max-$object->nb_gen_done).'
'; + print $form->editfieldkey($langs->trans("InvoiceAutoValidate"), 'auto_validate', $object->auto_validate, $object, $user->rights->facture->creer); + print ''; + $select = 'select;0:'.$langs->trans('No').',1:'.$langs->trans('Yes'); + print $form->editfieldval($langs->trans("InvoiceAutoValidate"), 'auto_validate', $object->auto_validate, $object, $user->rights->facture->creer, $select); + print '
'; + print '
'; + print '
'; + + /* + * Lines + */ + + $title = $langs->trans("ProductsAndServices"); + if (empty($conf->service->enabled)) + $title = $langs->trans("Products"); + else if (empty($conf->product->enabled)) + $title = $langs->trans("Services"); + + print load_fiche_titre($title); + + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + if ($conf->global->PRODUCT_USE_UNITS) { + print ''; + } + print ''; + + $num = count($object->lines); + $i = 0; + $var=true; + while ($i < $num) + { + $var=!$var; + + $product_static=new Product($db); + + // Show product and description + $type=(isset($object->lines[$i]->product_type)?$object->lines[$i]->product_type:$object->lines[$i]->fk_product_type); + // Try to enhance type detection using date_start and date_end for free lines when type + // was not saved. + if (! empty($objp->date_start)) $type=1; + if (! empty($objp->date_end)) $type=1; + + // Show line + print ""; + if ($object->lines[$i]->fk_product > 0) + { + print ''; + } + else + { + print ''; + } + print ''; + print ''; + print ''; + if ($conf->global->PRODUCT_USE_UNITS) { + print ""; + } + print "\n"; + $i++; + } + print '
'.$langs->trans("Description").''.$langs->trans("Price").''.$langs->trans("ReductionShort").''.$langs->trans("Qty").''.$langs->trans("Unit").'
'; + print ''; // ancre pour retourner sur la ligne + + // Show product and description + $product_static->type=$object->lines[$i]->fk_product_type; + $product_static->id=$object->lines[$i]->fk_product; + $product_static->ref=$object->lines[$i]->product_ref; + $text=$product_static->getNomUrl(1); + $text.= ' - '.(! empty($object->lines[$i]->label)?$object->lines[$i]->label:$object->lines[$i]->product_label); + $description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($object->lines[$i]->desc)); + print $form->textwithtooltip($text,$description,3,'','',$i); + + // Show range + print_date_range($object->lines[$i]->date_start, $object->lines[$i]->date_end); + + // Add description in form + if (! empty($conf->global->PRODUIT_DESC_IN_FORM)) + print (! empty($object->lines[$i]->desc) && $object->lines[$i]->desc!=$fac->lines[$i]->product_label)?'
'.dol_htmlentitiesbr($object->lines[$i]->desc):''; + + print '		'; + + if ($type==1) $text = img_object($langs->trans('Service'),'service'); + else $text = img_object($langs->trans('Product'),'product'); + + if (! empty($object->lines[$i]->label)) { + + $text.= ' '.$object->lines[$i]->label.''; + print $form->textwithtooltip($text,dol_htmlentitiesbr($object->lines[$i]->desc),3,'','',$i); + + } else { + + print $text.' '.nl2br($object->lines[$i]->desc); + } + + // Show range + print_date_range($object->lines[$i]->date_start, $object->lines[$i]->date_end); + + print ''.price($object->lines[$i]->price).''.$object->lines[$i]->remise_percent.' %'.$object->lines[$i]->qty.'".$object->lines[$i]->getLabelOfUnit()."
'; + + + + /** + * Barre d'actions + */ + print '
'; + + if ($object->statut == Facture::STATUS_DRAFT && $user->rights->facture->creer) + { + echo '
'.$langs->trans("CreateBill").'
'; + } + + if ($object->statut == Facture::STATUS_DRAFT && $user->rights->facture->supprimer) + { + print '
'.$langs->trans('Delete').'
'; + } + + print '
'; + } else { diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index f7cb1ff7881..f17be59d0db 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -2322,7 +2322,7 @@ abstract class CommonObject { $error++; $this->error=$this->db->lasterror(); - $this->error[]=$this->db->lasterror(); + $this->errors[]=$this->db->lasterror(); } } diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql index 1806a969928..482a21470a6 100644 --- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql +++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql @@ -212,4 +212,23 @@ ALTER TABLE llx_propaldet ADD COLUMN multicurrency_subprice double(24,8) DEFAULT ALTER TABLE llx_propaldet ADD COLUMN multicurrency_total_ht double(24,8) DEFAULT 0; ALTER TABLE llx_propaldet ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0; ALTER TABLE llx_propaldet ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0; - \ No newline at end of file + + + +ALTER TABLE llx_facture_rec ADD COLUMN auto_validate integer DEFAULT 0; +ALTER TABLE llx_facture_rec ADD COLUMN fk_account integer DEFAULT 0; + +ALTER TABLE llx_facture_rec ADD COLUMN fk_multicurrency integer; +ALTER TABLE llx_facture_rec ADD COLUMN multicurrency_code varchar(255); +ALTER TABLE llx_facture_rec ADD COLUMN multicurrency_tx double(24,8) DEFAULT 1; +ALTER TABLE llx_facture_rec ADD COLUMN multicurrency_total_ht double(24,8) DEFAULT 0; +ALTER TABLE llx_facture_rec ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0; +ALTER TABLE llx_facture_rec ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0; + +ALTER TABLE llx_facturedet_rec ADD COLUMN fk_multicurrency integer; +ALTER TABLE llx_facturedet_rec ADD COLUMN multicurrency_code varchar(255); +ALTER TABLE llx_facturedet_rec ADD COLUMN multicurrency_subprice double(24,8) DEFAULT 0; +ALTER TABLE llx_facturedet_rec ADD COLUMN multicurrency_total_ht double(24,8) DEFAULT 0; +ALTER TABLE llx_facturedet_rec ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0; +ALTER TABLE llx_facturedet_rec ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0; + diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql index 7c1151f36ca..4a65f4389b5 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.sql @@ -46,10 +46,17 @@ create table llx_facture_rec fk_cond_reglement integer DEFAULT 0, -- condition de reglement fk_mode_reglement integer DEFAULT 0, -- mode de reglement (Virement, Prelevement) date_lim_reglement date, -- date limite de reglement - + fk_account integer, -- bank account id note_private text, note_public text, + fk_multicurrency integer, + multicurrency_code varchar(255), + multicurrency_tx double(24,8) DEFAULT 1, + multicurrency_total_ht double(24,8) DEFAULT 0, + multicurrency_total_tva double(24,8) DEFAULT 0, + multicurrency_total_ttc double(24,8) DEFAULT 0, + usenewprice integer DEFAULT 0, -- update invoice with current price of product instead of recorded price frequency integer, -- frequency (for example: 3 for every 3 month) unit_frequency varchar(2) DEFAULT 'm', -- 'm' for month (date_when must be a day <= 28), 'y' for year, ... @@ -57,5 +64,6 @@ create table llx_facture_rec date_when datetime DEFAULT NULL, -- date for next gen (when an invoice is generated, this field must be updated with next date) date_last_gen datetime DEFAULT NULL, -- date for last gen (date with last successfull generation of invoice) nb_gen_done integer DEFAULT NULL, -- nb of generation done (when an invoice is generated, this field must incremented) - nb_gen_max integer DEFAULT NULL -- maximum number of generation + nb_gen_max integer DEFAULT NULL, -- maximum number of generation + auto_validate integer DEFAULT 0 -- 0 to create in draft, 1 to create and validate the new invoice )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql index 164dc2f94d5..e0e7358af0c 100644 --- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql +++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql @@ -48,5 +48,12 @@ create table llx_facturedet_rec special_code integer UNSIGNED DEFAULT 0, -- code pour les lignes speciales rang integer DEFAULT 0, -- ordre d'affichage fk_contract_line integer NULL, -- id of contract line when predefined invoice comes from contract lines - fk_unit integer DEFAULT NULL + fk_unit integer DEFAULT NULL, + + fk_multicurrency integer, + multicurrency_code varchar(255), + multicurrency_subprice double(24,8) DEFAULT 0, + multicurrency_total_ht double(24,8) DEFAULT 0, + multicurrency_total_tva double(24,8) DEFAULT 0, + multicurrency_total_ttc double(24,8) DEFAULT 0 )ENGINE=innodb; diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 4e94136e44d..2b5c5e3d241 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -306,7 +306,14 @@ AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice PaymentNote=Payment note ListOfPreviousSituationInvoices=List of previous situation invoices ListOfNextSituationInvoices=List of next situation invoices - +FrequencyPer_d=Every %s days +FrequencyPer_m=Every %s months +FrequencyPer_y=Every %s years +toolTipFrequency=Examples:
Set 7 / day: give a new invoice every 7 days
Set 3 / month: give a new invoice every 3 month +NextDateToExecution=Next date to execution +MaxPeriodNumber=Max period number +RestPeriodNumber=Rest period number +InvoiceAutoValidate=Automatically validate invoice # PaymentConditions PaymentConditionShortRECEP=Immediate PaymentConditionRECEP=Immediate