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

wip invoice

Browse Source
This commit is contained in:
Dorian Vabre 2021-04-15 16:57:41 +02:00
parent ae69cc93be
commit 2cbe5b188e
3 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,4 +108,5 @@ SubscriptionOk = Your subscription to this conference has been validated
# #
# Payment page # Payment page
# #
Attendee = Participant
PaymentConferenceAttendee = Paiement de participation à une conférence PaymentConferenceAttendee = Paiement de participation à une conférence

46
htdocs/public/eventorganization/attendee_subscription.php
View File

@ -68,6 +68,7 @@ require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class
require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php'; require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/paymentterm.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
// Init vars // Init vars
@ -189,6 +190,7 @@ function llxFooterVierge()
/* /*
* Actions * Actions
*/ */
global $mysoc;
$parameters = array(); $parameters = array();
// Note that $action and $object may have been modified by some hooks // Note that $action and $object may have been modified by some hooks
$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
@ -302,16 +304,48 @@ if (empty($reshook) && $action == 'add') {
$errmsg .= $productforinvoicerow->error; $errmsg .= $productforinvoicerow->error;
} else { } else {
$facture = new Facture($db); $facture = new Facture($db);
$facture->type = 0; $facture->type = Facture::TYPE_STANDARD;
$facture->socid = $thirdparty->id; $facture->socid = $thirdparty->id;
$facture->paye = 0; $facture->paye = 0;
// @todo complete
//$baseprice = $productforinvoicerow->
$facture->total_ht = 10;
$facture->total_vat = $productforinvoicerow->tva_tx*10;
$facture->total_ttc = $facture->total_ht + $facture->total_ttc;
$facture->date = dol_now(); $facture->date = dol_now();
$facture->cond_reglement_id = $confattendee->cond_reglement_id;
if (empty($facture->cond_reglement_id)) {
$paymenttermstatic = new PaymentTerm($confattendee->db);
$facture->cond_reglement_id = $paymenttermstatic->getDefaultId();
if (empty($facture->cond_reglement_id)) {
$error++;
$confattendee->error = 'ErrorNoPaymentTermRECEPFound';
$confattendee->errors[] = $confattendee->error;
}
}
$resultfacture = $facture->create($user); $resultfacture = $facture->create($user);
if ($resultfacture <= 0) {
$confattendee->error = $facture->error;
$confattendee->errors = $facture->errors;
$error++;
}
}
if (!$error) {
// Add line to draft invoice
$idprodsubscription = 0;
if (!empty($conf->global->SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION) && (!empty($conf->product->enabled) || !empty($conf->service->enabled))) {
$idprodsubscription = $conf->global->SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION;
}
$vattouse = get_default_tva($mysoc, $thirdparty, $idprodsubscription);
$result = $facture->addline($label, 0, 1, $vattouse, 0, 0, $idprodsubscription, 0, $datesubscription, '', 0, 0, '', 'TTC', $amount, 1);
if ($result <= 0) {
$confattendee->error = $confattendee->error;
$confattendee->errors = $confattendee->errors;
$error++;
}
var_dump('a');
$resultfacture = $facture->create($user);
var_dump('b');
var_dump($resultfacture);
if ($resultfacture < 0) { if ($resultfacture < 0) {
$error++; $error++;
$errmsg .= $facture->error; $errmsg .= $facture->error;

2
htdocs/public/payment/newpayment.php
View File

@ -1804,7 +1804,7 @@ if ($source == 'conferencesubscription') {
print '</td></tr>'."\n"; print '</td></tr>'."\n";
// Debitor // Debitor
print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Member"); print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Attendee");
print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>'; print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>';
print $thirdparty->name; print $thirdparty->name;
print '</b>'; print '</b>';