Merge branch 'develop' into develop-2
This commit is contained in:
commit
ea112f6e07
75 changed files with 94 additions and 1296 deletions
|
|
@ -18,4 +18,4 @@ mv /tmp/custom htdocs
|
|||
|
||||
Build HTML report from Cron:
|
||||
Example of line to add into a cron to generate a HTML report:
|
||||
0 1 5 * * cd /home/dolibarr/preview.dolibarr.org/dolibarr; chmod -R u+w /home/dolibarr/preview.dolibarr.org/dolibarr; git pull; /home/dolibarr/phpstan/vendor/bin/phpstan -v analyze -a build/phpstan/bootstrap.php --memory-limit 4G --error-format=github | awk ' BEGIN { print "Date "strftime("%Y-%m-%d")"<br>" } { print $0"<br>" } ' > /home/dolibarr/doxygen.dolibarr.org/phpstan/index.html
|
||||
0 1 5 * * cd /home/dolibarr/preview.dolibarr.org/dolibarr; chmod -R u+w /home/dolibarr/preview.dolibarr.org/dolibarr; git pull; /home/dolibarr/phpstan/vendor/bin/phpstan -v analyze -a build/phpstan/bootstrap.php --memory-limit 4G --error-format=github | awk ' BEGIN{ print "Date "strftime("%Y-%m-%d")"<br>" } { print $0"<br>" } END{ print NR } ' > /home/dolibarr/doxygen.dolibarr.org/phpstan/index.html
|
||||
|
|
|
|||
|
|
@ -734,7 +734,7 @@ class AccountingAccount extends CommonObject
|
|||
* @param FactureLigne|SupplierInvoiceLine $factureDet Facture Det
|
||||
* @param array $accountingAccount Array of Accounting account
|
||||
* @param string $type Customer / Supplier
|
||||
* @return array|int Accounting accounts suggested or < 0 if technical error.
|
||||
* @return array|int Array of accounting accounts suggested or < 0 if technical error.
|
||||
* 'suggestedaccountingaccountbydefaultfor'=>Will be used for the label to show on tooltip for account by default on any product
|
||||
* 'suggestedaccountingaccountfor'=>Is the account suggested for this product
|
||||
*/
|
||||
|
|
@ -941,5 +941,7 @@ class AccountingAccount extends CommonObject
|
|||
return $hookmanager->resArray;
|
||||
}
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -133,79 +133,11 @@ class Adherent extends CommonObject
|
|||
*/
|
||||
public $socid;
|
||||
|
||||
/**
|
||||
* @var string Address
|
||||
*/
|
||||
public $address;
|
||||
|
||||
/**
|
||||
* @var string zipcode
|
||||
*/
|
||||
public $zip;
|
||||
|
||||
/**
|
||||
* @var string town
|
||||
*/
|
||||
public $town;
|
||||
|
||||
/**
|
||||
* @var int Id of state
|
||||
*/
|
||||
public $state_id;
|
||||
|
||||
/**
|
||||
* @var string Code of state
|
||||
*/
|
||||
public $state_code;
|
||||
|
||||
/**
|
||||
* @var string Label of state
|
||||
*/
|
||||
public $state;
|
||||
|
||||
/**
|
||||
* @var string email
|
||||
*/
|
||||
public $email;
|
||||
|
||||
/**
|
||||
* @var string url
|
||||
*/
|
||||
public $url;
|
||||
|
||||
/**
|
||||
* @var array array of socialnetworks
|
||||
*/
|
||||
public $socialnetworks;
|
||||
|
||||
/**
|
||||
* @var string skype account
|
||||
* @deprecated
|
||||
* @see $socialnetworks
|
||||
*/
|
||||
public $skype;
|
||||
|
||||
/**
|
||||
* @var string twitter account
|
||||
* @deprecated
|
||||
* @see $socialnetworks
|
||||
*/
|
||||
public $twitter;
|
||||
|
||||
/**
|
||||
* @var string facebook account
|
||||
* @deprecated
|
||||
* @see $socialnetworks
|
||||
*/
|
||||
public $facebook;
|
||||
|
||||
/**
|
||||
* @var string linkedin account
|
||||
* @deprecated
|
||||
* @see $socialnetworks
|
||||
*/
|
||||
public $linkedin;
|
||||
|
||||
/**
|
||||
* @var string Phone number
|
||||
*/
|
||||
|
|
@ -337,16 +269,11 @@ class Adherent extends CommonObject
|
|||
|
||||
public $partnerships = array();
|
||||
|
||||
|
||||
/**
|
||||
* @var Adherent To contains a clone of this when we need to save old properties of object
|
||||
* @var Facture To store the created invoice into subscriptionComplementaryActions()
|
||||
*/
|
||||
public $oldcopy;
|
||||
public $invoice;
|
||||
|
||||
/**
|
||||
* @var int Entity
|
||||
*/
|
||||
public $entity;
|
||||
|
||||
/**
|
||||
* @var array fields
|
||||
|
|
|
|||
|
|
@ -143,9 +143,6 @@ $fieldstosearchall = array(
|
|||
'd.note_public'=>'NotePublic',
|
||||
'd.note_private'=>'NotePrivate',
|
||||
);
|
||||
if ($db->type == 'pgsql') {
|
||||
unset($fieldstosearchall['d.rowid']);
|
||||
}
|
||||
|
||||
$arrayfields = array(
|
||||
'd.ref'=>array('label'=>"Ref", 'checked'=>1),
|
||||
|
|
|
|||
|
|
@ -94,10 +94,8 @@ $picto = array(
|
|||
|
||||
foreach ($modules as $const => $desc) {
|
||||
if ($action == 'enable_'.strtolower($const)) {
|
||||
|
||||
|
||||
dolibarr_set_const($db, "FCKEDITOR_ENABLE_".$const, "1", 'chaine', 0, '', $conf->entity);
|
||||
|
||||
|
||||
// If fckeditor is active in the product/service description, it is activated in the forms
|
||||
if ($const == 'PRODUCTDESC' && getDolGlobalInt('PRODUIT_DESC_IN_FORM_ACCORDING_TO_DEVICE')) {
|
||||
dolibarr_set_const($db, "FCKEDITOR_ENABLE_DETAILS", "1", 'chaine', 0, '', $conf->entity);
|
||||
|
|
@ -106,7 +104,6 @@ foreach ($modules as $const => $desc) {
|
|||
exit;
|
||||
}
|
||||
if ($action == 'disable_'.strtolower($const)) {
|
||||
|
||||
dolibarr_set_const($db, "FCKEDITOR_ENABLE_".$const, "0", 'chaine', 0, '', $conf->entity);
|
||||
header("Location: ".$_SERVER["PHP_SELF"]);
|
||||
exit;
|
||||
|
|
|
|||
|
|
@ -130,7 +130,8 @@ if ($action == 'activate_encryptdbpassconf') {
|
|||
header("Location: security.php");
|
||||
exit;
|
||||
} else {
|
||||
setEventMessages($langs->trans('InstrucToClearPass', $dolibarr_main_db_pass), null, 'warnings');
|
||||
//setEventMessages($langs->trans('InstrucToClearPass', $dolibarr_main_db_pass), null, 'warnings');
|
||||
setEventMessages($langs->trans('InstrucToClearPass', $langs->transnoentitiesnoconv("DatabasePassword")), null, 'warnings');
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1040,6 +1040,7 @@ if (empty($reshook)) {
|
|||
$object->note_public = trim(GETPOST('note_public', 'restricthtml'));
|
||||
$object->note_private = trim(GETPOST('note_private', 'restricthtml'));
|
||||
$object->ref_client = GETPOST('ref_client', 'alphanohtml');
|
||||
$object->ref_customer = GETPOST('ref_client', 'alphanohtml');
|
||||
$object->model_pdf = GETPOST('model', 'alphanohtml');
|
||||
$object->fk_project = GETPOST('projectid', 'int');
|
||||
$object->cond_reglement_id = GETPOST('cond_reglement_id', 'int');
|
||||
|
|
@ -1092,7 +1093,8 @@ if (empty($reshook)) {
|
|||
$object->date_pointoftax = $date_pointoftax;
|
||||
$object->note_public = trim(GETPOST('note_public', 'restricthtml'));
|
||||
$object->note_private = trim(GETPOST('note_private', 'restricthtml'));
|
||||
$object->ref_client = GETPOST('ref_client');
|
||||
$object->ref_client = GETPOST('ref_client', 'alphanohtml');
|
||||
$object->ref_customer = GETPOST('ref_client', 'alphanohtml');
|
||||
$object->model_pdf = GETPOST('model');
|
||||
$object->fk_project = GETPOST('projectid', 'int');
|
||||
$object->cond_reglement_id = 0; // No payment term for a credit note
|
||||
|
|
@ -1662,6 +1664,10 @@ if (empty($reshook)) {
|
|||
|
||||
if ($lines[$i]->subprice < 0 && empty($conf->global->INVOICE_KEEP_DISCOUNT_LINES_AS_IN_ORIGIN)) {
|
||||
// Negative line, we create a discount line
|
||||
if (empty($desc)) {
|
||||
$desc = $label ? $label : $langs->trans('Discount');
|
||||
}
|
||||
|
||||
$discount = new DiscountAbsolute($db);
|
||||
$discount->fk_soc = $object->socid;
|
||||
$discount->amount_ht = abs($lines[$i]->total_ht);
|
||||
|
|
|
|||
|
|
@ -421,7 +421,7 @@ print '</td></tr>';
|
|||
|
||||
if (!empty($object->ext_payment_id)) {
|
||||
// External payment ID
|
||||
print '<tr><td class="tdtop">'.$langs->trans("StripeCustomerId").'</td><td>';
|
||||
print '<tr><td class="tdtop">'.$langs->trans("StripePaymentId").'</td><td>';
|
||||
if (isModEnabled('stripe') && in_array($object->ext_payment_site, array('Stripe', 'StripeLive'))) {
|
||||
$tmp1 = explode('@', $object->ext_payment_id);
|
||||
if (!empty($tmp1[1])) {
|
||||
|
|
|
|||
|
|
@ -840,7 +840,7 @@ class BonPrelevement extends CommonObject
|
|||
* @param string $executiondate Date to execute the transfer
|
||||
* @param int $notrigger Disable triggers
|
||||
* @param string $type 'direct-debit' or 'bank-transfer'
|
||||
* @param int $did ID of an existing payment request. If $did is defined, no entry
|
||||
* @param int $did ID of an existing payment request. If $did is defined, we use the existing payment request.
|
||||
* @param int $fk_bank_account Bank account ID the receipt is generated for. Will use the ID into the setup of module Direct Debit or Credit Transfer if 0.
|
||||
* @return int <0 if KO, No of invoice included into file if OK
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -109,8 +109,6 @@ if ($action == 'add' && !empty($permissiontoadd)) {
|
|||
if (!empty($values_arr)) {
|
||||
$value = implode(',', $values_arr);
|
||||
}
|
||||
var_dump($value);
|
||||
exit;
|
||||
} else {
|
||||
if ($key == 'lang') {
|
||||
$value = GETPOST($key, 'aZ09') ?GETPOST($key, 'aZ09') : "";
|
||||
|
|
|
|||
|
|
@ -109,6 +109,9 @@ abstract class CommonDocGenerator
|
|||
public $option_escompte;
|
||||
public $option_credit_note;
|
||||
|
||||
/**
|
||||
* @var Societe Issuer of document
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
|
|
@ -127,6 +130,12 @@ abstract class CommonDocGenerator
|
|||
*/
|
||||
public $result;
|
||||
|
||||
public $posxref;
|
||||
public $posxpicture; // For picture
|
||||
public $posxdesc; // For description
|
||||
public $posxqty;
|
||||
public $posxpuht;
|
||||
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
|
|
|
|||
|
|
@ -776,7 +776,7 @@ abstract class CommonInvoice extends CommonObject
|
|||
* @param float $amount Amount we request direct debit or credit transfer for. If 0, the remain to pay will be calculated and used.
|
||||
* @param string $type 'direct-debit' or 'bank-transfer'
|
||||
* @param string $sourcetype Source ('facture' or 'supplier_invoice')
|
||||
* @return int <0 if KO, >0 if OK
|
||||
* @return int <0 if KO, 0 if a request already exists, >0 if OK
|
||||
*/
|
||||
public function demande_prelevement($fuser, $amount = 0, $type = 'direct-debit', $sourcetype = 'facture')
|
||||
{
|
||||
|
|
@ -787,7 +787,7 @@ abstract class CommonInvoice extends CommonObject
|
|||
|
||||
dol_syslog(get_class($this)."::demande_prelevement", LOG_DEBUG);
|
||||
|
||||
if ($this->statut > self::STATUS_DRAFT && $this->paye == 0) {
|
||||
if ($this->status > self::STATUS_DRAFT && $this->paye == 0) {
|
||||
require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
|
||||
$bac = new CompanyBankAccount($this->db);
|
||||
$bac->fetch(0, $this->socid);
|
||||
|
|
@ -870,17 +870,17 @@ abstract class CommonInvoice extends CommonObject
|
|||
return 1;
|
||||
} else {
|
||||
$this->error = "A request already exists";
|
||||
dol_syslog(get_class($this).'::demandeprelevement Impossible de creer une demande, demande deja en cours');
|
||||
dol_syslog(get_class($this).'::demandeprelevement Can t create a request to generate a direct debit, a request already exists.');
|
||||
return 0;
|
||||
}
|
||||
} else {
|
||||
$this->error = $this->db->error();
|
||||
dol_syslog(get_class($this).'::demandeprelevement Erreur -2');
|
||||
dol_syslog(get_class($this).'::demandeprelevement Error -2');
|
||||
return -2;
|
||||
}
|
||||
} else {
|
||||
$this->error = "Status of invoice does not allow this";
|
||||
dol_syslog(get_class($this)."::demandeprelevement ".$this->error." $this->statut, $this->paye, $this->mode_reglement_id");
|
||||
dol_syslog(get_class($this)."::demandeprelevement ".$this->error." $this->status, $this->paye, $this->mode_reglement_id");
|
||||
return -3;
|
||||
}
|
||||
}
|
||||
|
|
@ -927,7 +927,7 @@ abstract class CommonInvoice extends CommonObject
|
|||
|
||||
dol_syslog(get_class($this)."::makeStripeSepaRequest start", LOG_DEBUG);
|
||||
|
||||
if ($this->statut > self::STATUS_DRAFT && $this->paye == 0) {
|
||||
if ($this->status > self::STATUS_DRAFT && $this->paye == 0) {
|
||||
// Get the default payment mode for BAN payment of the third party
|
||||
require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
|
||||
$bac = new CompanyBankAccount($this->db); // table societe_rib
|
||||
|
|
@ -939,7 +939,7 @@ abstract class CommonInvoice extends CommonObject
|
|||
return -1;
|
||||
}
|
||||
|
||||
// Load the pending payment requests to process
|
||||
// Load the pending payment request to process (with rowid=$did)
|
||||
$sql = "SELECT rowid, date_demande, amount, fk_facture, fk_facture_fourn, fk_prelevement_bons";
|
||||
$sql .= " FROM ".$this->db->prefix()."prelevement_demande";
|
||||
$sql .= " WHERE rowid = ".((int) $did);
|
||||
|
|
@ -1022,7 +1022,7 @@ abstract class CommonInvoice extends CommonObject
|
|||
$bon = new BonPrelevement($this->db);
|
||||
if (!$error) {
|
||||
if (empty($obj->fk_prelevement_bons)) {
|
||||
// This create record into llx_prelevment_bons and update link with llx_prelevement_demande
|
||||
// This creates a record into llx_prelevement_bons and updates link with llx_prelevement_demande
|
||||
$nbinvoices = $bon->create(0, 0, 'real', 'ALL', '', 0, $type, $did, $fk_bank_account);
|
||||
if ($nbinvoices <= 0) {
|
||||
$error++;
|
||||
|
|
|
|||
|
|
@ -1029,7 +1029,7 @@ abstract class CommonObject
|
|||
* @param int|string $type_contact Type of contact (code or id). Must be id or code found into table llx_c_type_contact. For example: SALESREPFOLL
|
||||
* @param string $source external=Contact extern (llx_socpeople), internal=Contact intern (llx_user)
|
||||
* @param int $notrigger Disable all triggers
|
||||
* @return int <0 if KO, 0 if already added, >0 if OK
|
||||
* @return int <0 if KO, 0 if already added or code not valid, >0 if OK
|
||||
*/
|
||||
public function add_contact($fk_socpeople, $type_contact, $source = 'external', $notrigger = 0)
|
||||
{
|
||||
|
|
@ -1074,9 +1074,8 @@ abstract class CommonObject
|
|||
}
|
||||
|
||||
if ($id_type_contact == 0) {
|
||||
$this->error = 'CODE_NOT_VALID_FOR_THIS_ELEMENT';
|
||||
dol_syslog("CODE_NOT_VALID_FOR_THIS_ELEMENT: Code type of contact '".$type_contact."' does not exists or is not active for element ".$this->element.", we can ignore it");
|
||||
return -3;
|
||||
return 0;
|
||||
}
|
||||
|
||||
$datecreate = dol_now();
|
||||
|
|
|
|||
|
|
@ -49,6 +49,16 @@ trait CommonPeople
|
|||
public $state_code;
|
||||
public $state;
|
||||
|
||||
/**
|
||||
* @var string email
|
||||
*/
|
||||
public $email;
|
||||
|
||||
/**
|
||||
* @var string url
|
||||
*/
|
||||
public $url;
|
||||
|
||||
|
||||
/**
|
||||
* Return full name (civility+' '+name+' '+lastname)
|
||||
|
|
|
|||
|
|
@ -254,7 +254,7 @@ class DiscountAbsolute
|
|||
|
||||
// Check parameters
|
||||
if (empty($this->description)) {
|
||||
$this->error = 'BadValueForPropertyDescription';
|
||||
$this->error = 'BadValueForPropertyDescriptionOfDiscount';
|
||||
dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
|
||||
return -1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -163,7 +163,7 @@ class DolEditor
|
|||
$pluginstodisable = 'elementspath,save,flash,div,anchor';
|
||||
if (!getDolGlobalString('FCKEDITOR_ENABLE_SPECIALCHAR')) {
|
||||
$pluginstodisable .= ',specialchar';
|
||||
}
|
||||
}
|
||||
if (!empty($conf->dol_optimize_smallscreen)) {
|
||||
$pluginstodisable .= ',scayt,wsc,find,undo';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2124,6 +2124,7 @@ class ExtraFields
|
|||
) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$visibility_abs = abs($visibility);
|
||||
// not modify if extra field is not in update form (0 : never, 2 or -2 : list only, 5 or - 5 : list and view only)
|
||||
if (empty($visibility_abs) || $visibility_abs == 2 || $visibility_abs == 5) {
|
||||
|
|
|
|||
|
|
@ -40,12 +40,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
|
|||
*/
|
||||
class doc_generic_asset_odt extends ModelePDFAsset
|
||||
{
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* @var string Dolibarr version of the loaded document
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -74,53 +74,11 @@ class pdf_standard_asset extends ModelePDFAsset
|
|||
*/
|
||||
public $version = 'dolibarr';
|
||||
|
||||
/**
|
||||
* @var int page_largeur
|
||||
*/
|
||||
public $page_largeur;
|
||||
|
||||
/**
|
||||
* @var int page_hauteur
|
||||
*/
|
||||
public $page_hauteur;
|
||||
|
||||
/**
|
||||
* @var array format
|
||||
*/
|
||||
public $format;
|
||||
|
||||
/**
|
||||
* @var int marge_gauche
|
||||
*/
|
||||
public $marge_gauche;
|
||||
|
||||
/**
|
||||
* @var int marge_droite
|
||||
*/
|
||||
public $marge_droite;
|
||||
|
||||
/**
|
||||
* @var int marge_haute
|
||||
*/
|
||||
public $marge_haute;
|
||||
|
||||
/**
|
||||
* @var int marge_basse
|
||||
*/
|
||||
public $marge_basse;
|
||||
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe Object that emits
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* @var bool Situation invoice type
|
||||
*/
|
||||
public $situationinvoice;
|
||||
|
||||
|
||||
/**
|
||||
* @var array of document table columns
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -35,11 +35,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
|
|||
|
||||
class pdf_ban extends ModeleBankAccountDoc
|
||||
{
|
||||
/**
|
||||
* @var Societe Issuer
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* @var string Dolibarr version of the loaded document
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -36,12 +36,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
|
|||
|
||||
class pdf_sepamandate extends ModeleBankAccountDoc
|
||||
{
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* Dolibarr version of the loaded document
|
||||
* @var string
|
||||
|
|
|
|||
|
|
@ -40,12 +40,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
|
|||
*/
|
||||
class doc_generic_bom_odt extends ModelePDFBom
|
||||
{
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* @var string Dolibarr version of the loaded document
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -34,12 +34,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/modules_chequereceipts.php'
|
|||
*/
|
||||
class BordereauChequeBlochet extends ModeleChequeReceipts
|
||||
{
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*
|
||||
|
|
@ -47,7 +41,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
|
|||
*/
|
||||
public function __construct($db)
|
||||
{
|
||||
global $conf, $langs, $mysoc;
|
||||
global $langs, $mysoc;
|
||||
|
||||
// Load traductions files required by page
|
||||
$langs->loadLangs(array("main", "bills"));
|
||||
|
|
|
|||
|
|
@ -40,12 +40,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
|
|||
*/
|
||||
class doc_generic_order_odt extends ModelePDFCommandes
|
||||
{
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* Dolibarr version of the loaded document
|
||||
* @var string
|
||||
|
|
|
|||
|
|
@ -78,47 +78,6 @@ class pdf_einstein extends ModelePDFCommandes
|
|||
*/
|
||||
public $version = 'dolibarr';
|
||||
|
||||
/**
|
||||
* @var int page_largeur
|
||||
*/
|
||||
public $page_largeur;
|
||||
|
||||
/**
|
||||
* @var int page_hauteur
|
||||
*/
|
||||
public $page_hauteur;
|
||||
|
||||
/**
|
||||
* @var array format
|
||||
*/
|
||||
public $format;
|
||||
|
||||
/**
|
||||
* @var int marge_gauche
|
||||
*/
|
||||
public $marge_gauche;
|
||||
|
||||
/**
|
||||
* @var int marge_droite
|
||||
*/
|
||||
public $marge_droite;
|
||||
|
||||
/**
|
||||
* @var int marge_haute
|
||||
*/
|
||||
public $marge_haute;
|
||||
|
||||
/**
|
||||
* @var int marge_basse
|
||||
*/
|
||||
public $marge_basse;
|
||||
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe Object that emits
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
|
|
|
|||
|
|
@ -78,47 +78,6 @@ class pdf_eratosthene extends ModelePDFCommandes
|
|||
*/
|
||||
public $version = 'dolibarr';
|
||||
|
||||
/**
|
||||
* @var int page_largeur
|
||||
*/
|
||||
public $page_largeur;
|
||||
|
||||
/**
|
||||
* @var int page_hauteur
|
||||
*/
|
||||
public $page_hauteur;
|
||||
|
||||
/**
|
||||
* @var array format
|
||||
*/
|
||||
public $format;
|
||||
|
||||
/**
|
||||
* @var int marge_gauche
|
||||
*/
|
||||
public $marge_gauche;
|
||||
|
||||
/**
|
||||
* @var int marge_droite
|
||||
*/
|
||||
public $marge_droite;
|
||||
|
||||
/**
|
||||
* @var int marge_haute
|
||||
*/
|
||||
public $marge_haute;
|
||||
|
||||
/**
|
||||
* @var int marge_basse
|
||||
*/
|
||||
public $marge_basse;
|
||||
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe Object that emits
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* @var array of document table columns
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -38,12 +38,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
|
|||
*/
|
||||
class doc_generic_contract_odt extends ModelePDFContract
|
||||
{
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* @var string Dolibarr version of the loaded document
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -76,47 +76,6 @@ class pdf_strato extends ModelePDFContract
|
|||
*/
|
||||
public $version = 'dolibarr';
|
||||
|
||||
/**
|
||||
* @var int page_largeur
|
||||
*/
|
||||
public $page_largeur;
|
||||
|
||||
/**
|
||||
* @var int page_hauteur
|
||||
*/
|
||||
public $page_hauteur;
|
||||
|
||||
/**
|
||||
* @var array format
|
||||
*/
|
||||
public $format;
|
||||
|
||||
/**
|
||||
* @var int marge_gauche
|
||||
*/
|
||||
public $marge_gauche;
|
||||
|
||||
/**
|
||||
* @var int marge_droite
|
||||
*/
|
||||
public $marge_droite;
|
||||
|
||||
/**
|
||||
* @var int marge_haute
|
||||
*/
|
||||
public $marge_haute;
|
||||
|
||||
/**
|
||||
* @var int marge_basse
|
||||
*/
|
||||
public $marge_basse;
|
||||
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe Object that emits
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* Recipient
|
||||
* @var Societe
|
||||
|
|
|
|||
|
|
@ -70,46 +70,6 @@ class pdf_storm extends ModelePDFDeliveryOrder
|
|||
*/
|
||||
public $version = 'dolibarr';
|
||||
|
||||
/**
|
||||
* @var int page_largeur
|
||||
*/
|
||||
public $page_largeur;
|
||||
|
||||
/**
|
||||
* @var int page_hauteur
|
||||
*/
|
||||
public $page_hauteur;
|
||||
|
||||
/**
|
||||
* @var array format
|
||||
*/
|
||||
public $format;
|
||||
|
||||
/**
|
||||
* @var int marge_gauche
|
||||
*/
|
||||
public $marge_gauche;
|
||||
|
||||
/**
|
||||
* @var int marge_droite
|
||||
*/
|
||||
public $marge_droite;
|
||||
|
||||
/**
|
||||
* @var int marge_haute
|
||||
*/
|
||||
public $marge_haute;
|
||||
|
||||
/**
|
||||
* @var int marge_basse
|
||||
*/
|
||||
public $marge_basse;
|
||||
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe Object that emits
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
|
|
@ -118,7 +78,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
|
|||
*/
|
||||
public function __construct($db)
|
||||
{
|
||||
global $conf, $langs, $mysoc;
|
||||
global $langs, $mysoc;
|
||||
|
||||
// Translations
|
||||
$langs->loadLangs(array("main", "bills", "sendings", "companies"));
|
||||
|
|
@ -147,13 +107,6 @@ class pdf_storm extends ModelePDFDeliveryOrder
|
|||
if (empty($this->emetteur->country_code)) {
|
||||
$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
|
||||
}
|
||||
|
||||
$this->tva = array();
|
||||
$this->tva_array = array();
|
||||
$this->localtax1 = array();
|
||||
$this->localtax2 = array();
|
||||
$this->atleastoneratenotnull = 0;
|
||||
$this->atleastonediscount = 0;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -69,46 +69,10 @@ class pdf_typhon extends ModelePDFDeliveryOrder
|
|||
*/
|
||||
public $version = 'dolibarr';
|
||||
|
||||
/**
|
||||
* @var int page_largeur
|
||||
*/
|
||||
public $page_largeur;
|
||||
public $posxcomm; // For customer comment column
|
||||
public $posxweightvol; // For weight or volume
|
||||
public $posxremainingqty;
|
||||
|
||||
/**
|
||||
* @var int page_hauteur
|
||||
*/
|
||||
public $page_hauteur;
|
||||
|
||||
/**
|
||||
* @var array format
|
||||
*/
|
||||
public $format;
|
||||
|
||||
/**
|
||||
* @var int marge_gauche
|
||||
*/
|
||||
public $marge_gauche;
|
||||
|
||||
/**
|
||||
* @var int marge_droite
|
||||
*/
|
||||
public $marge_droite;
|
||||
|
||||
/**
|
||||
* @var int marge_haute
|
||||
*/
|
||||
public $marge_haute;
|
||||
|
||||
/**
|
||||
* @var int marge_basse
|
||||
*/
|
||||
public $marge_basse;
|
||||
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe Object that emits
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
|
|
@ -149,7 +113,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
|
|||
|
||||
// Define position of columns
|
||||
$this->posxdesc = $this->marge_gauche + 1;
|
||||
$this->posxcomm = 112;
|
||||
$this->posxcomm = 112; // customer comment
|
||||
//$this->posxtva=112;
|
||||
//$this->posxup=126;
|
||||
$this->posxqty = 165;
|
||||
|
|
@ -164,13 +128,6 @@ class pdf_typhon extends ModelePDFDeliveryOrder
|
|||
//$this->posxdiscount-=20;
|
||||
//$this->postotalht-=20;
|
||||
}
|
||||
|
||||
$this->tva = array();
|
||||
$this->tva_array = array();
|
||||
$this->localtax1 = array();
|
||||
$this->localtax2 = array();
|
||||
$this->atleastoneratenotnull = 0;
|
||||
$this->atleastonediscount = 0;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -40,12 +40,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
|
|||
*/
|
||||
class doc_generic_shipment_odt extends ModelePdfExpedition
|
||||
{
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* Dolibarr version of the loaded document
|
||||
* @var string
|
||||
|
|
|
|||
|
|
@ -67,47 +67,6 @@ class pdf_espadon extends ModelePdfExpedition
|
|||
*/
|
||||
public $version = 'dolibarr';
|
||||
|
||||
/**
|
||||
* @var int page_largeur
|
||||
*/
|
||||
public $page_largeur;
|
||||
|
||||
/**
|
||||
* @var int page_hauteur
|
||||
*/
|
||||
public $page_hauteur;
|
||||
|
||||
/**
|
||||
* @var array format
|
||||
*/
|
||||
public $format;
|
||||
|
||||
/**
|
||||
* @var int marge_gauche
|
||||
*/
|
||||
public $marge_gauche;
|
||||
|
||||
/**
|
||||
* @var int marge_droite
|
||||
*/
|
||||
public $marge_droite;
|
||||
|
||||
/**
|
||||
* @var int marge_haute
|
||||
*/
|
||||
public $marge_haute;
|
||||
|
||||
/**
|
||||
* @var int marge_basse
|
||||
*/
|
||||
public $marge_basse;
|
||||
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe object that emits
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
|
|
@ -116,7 +75,7 @@ class pdf_espadon extends ModelePdfExpedition
|
|||
*/
|
||||
public function __construct(DoliDB $db)
|
||||
{
|
||||
global $conf, $langs, $mysoc;
|
||||
global $langs, $mysoc;
|
||||
|
||||
$this->db = $db;
|
||||
$this->name = "espadon";
|
||||
|
|
|
|||
|
|
@ -68,47 +68,6 @@ class pdf_merou extends ModelePdfExpedition
|
|||
*/
|
||||
public $version = 'dolibarr';
|
||||
|
||||
/**
|
||||
* @var int page_largeur
|
||||
*/
|
||||
public $page_largeur;
|
||||
|
||||
/**
|
||||
* @var int page_hauteur
|
||||
*/
|
||||
public $page_hauteur;
|
||||
|
||||
/**
|
||||
* @var array format
|
||||
*/
|
||||
public $format;
|
||||
|
||||
/**
|
||||
* @var int marge_gauche
|
||||
*/
|
||||
public $marge_gauche;
|
||||
|
||||
/**
|
||||
* @var int marge_droite
|
||||
*/
|
||||
public $marge_droite;
|
||||
|
||||
/**
|
||||
* @var int marge_haute
|
||||
*/
|
||||
public $marge_haute;
|
||||
|
||||
/**
|
||||
* @var int marge_basse
|
||||
*/
|
||||
public $marge_basse;
|
||||
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
|
|
@ -117,7 +76,7 @@ class pdf_merou extends ModelePdfExpedition
|
|||
*/
|
||||
public function __construct(DoliDB $db)
|
||||
{
|
||||
global $conf, $langs, $mysoc;
|
||||
global $langs, $mysoc;
|
||||
|
||||
$this->db = $db;
|
||||
$this->name = "merou";
|
||||
|
|
|
|||
|
|
@ -68,46 +68,8 @@ class pdf_rouget extends ModelePdfExpedition
|
|||
*/
|
||||
public $version = 'dolibarr';
|
||||
|
||||
/**
|
||||
* @var int page_largeur
|
||||
*/
|
||||
public $page_largeur;
|
||||
|
||||
/**
|
||||
* @var int page_hauteur
|
||||
*/
|
||||
public $page_hauteur;
|
||||
|
||||
/**
|
||||
* @var array format
|
||||
*/
|
||||
public $format;
|
||||
|
||||
/**
|
||||
* @var int marge_gauche
|
||||
*/
|
||||
public $marge_gauche;
|
||||
|
||||
/**
|
||||
* @var int marge_droite
|
||||
*/
|
||||
public $marge_droite;
|
||||
|
||||
/**
|
||||
* @var int marge_haute
|
||||
*/
|
||||
public $marge_haute;
|
||||
|
||||
/**
|
||||
* @var int marge_basse
|
||||
*/
|
||||
public $marge_basse;
|
||||
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe object that emits
|
||||
*/
|
||||
public $emetteur;
|
||||
public $posxweightvol;
|
||||
public $posxqtyordered;
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -75,12 +75,6 @@ class pdf_standard extends ModeleExpenseReport
|
|||
*/
|
||||
public $version = 'dolibarr';
|
||||
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
public $posxpiece;
|
||||
public $posxcomment;
|
||||
public $posxtva;
|
||||
|
|
|
|||
|
|
@ -39,12 +39,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
|
|||
*/
|
||||
class doc_generic_invoice_odt extends ModelePDFFactures
|
||||
{
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe Object that emits
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* Dolibarr version of the loaded document
|
||||
* @var string
|
||||
|
|
@ -59,7 +53,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
|
|||
*/
|
||||
public function __construct($db)
|
||||
{
|
||||
global $conf, $langs, $mysoc;
|
||||
global $langs, $mysoc;
|
||||
|
||||
// Load translation files required by the page
|
||||
$langs->loadLangs(array("main", "companies"));
|
||||
|
|
|
|||
|
|
@ -75,47 +75,6 @@ class pdf_crabe extends ModelePDFFactures
|
|||
*/
|
||||
public $version = 'dolibarr';
|
||||
|
||||
/**
|
||||
* @var int page_largeur
|
||||
*/
|
||||
public $page_largeur;
|
||||
|
||||
/**
|
||||
* @var int page_hauteur
|
||||
*/
|
||||
public $page_hauteur;
|
||||
|
||||
/**
|
||||
* @var array format
|
||||
*/
|
||||
public $format;
|
||||
|
||||
/**
|
||||
* @var int marge_gauche
|
||||
*/
|
||||
public $marge_gauche;
|
||||
|
||||
/**
|
||||
* @var int marge_droite
|
||||
*/
|
||||
public $marge_droite;
|
||||
|
||||
/**
|
||||
* @var int marge_haute
|
||||
*/
|
||||
public $marge_haute;
|
||||
|
||||
/**
|
||||
* @var int marge_basse
|
||||
*/
|
||||
public $marge_basse;
|
||||
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe Object that emits
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* @var bool Situation invoice type
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -76,42 +76,6 @@ class pdf_sponge extends ModelePDFFactures
|
|||
*/
|
||||
public $version = 'dolibarr';
|
||||
|
||||
/**
|
||||
* @var int page_largeur
|
||||
*/
|
||||
public $page_largeur;
|
||||
|
||||
/**
|
||||
* @var int page_hauteur
|
||||
*/
|
||||
public $page_hauteur;
|
||||
|
||||
/**
|
||||
* @var array format
|
||||
*/
|
||||
public $format;
|
||||
|
||||
/**
|
||||
* @var int marge_gauche
|
||||
*/
|
||||
public $marge_gauche;
|
||||
|
||||
/**
|
||||
* @var int marge_droite
|
||||
*/
|
||||
public $marge_droite;
|
||||
|
||||
/**
|
||||
* @var int marge_haute
|
||||
*/
|
||||
public $marge_haute;
|
||||
|
||||
/**
|
||||
* @var int marge_basse
|
||||
*/
|
||||
public $marge_basse;
|
||||
|
||||
|
||||
/**
|
||||
* @var int heightforinfotot
|
||||
*/
|
||||
|
|
@ -137,12 +101,6 @@ class pdf_sponge extends ModelePDFFactures
|
|||
*/
|
||||
public $tab_top_newpage;
|
||||
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe Object that emits
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* @var bool Situation invoice type
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -70,46 +70,6 @@ class pdf_soleil extends ModelePDFFicheinter
|
|||
*/
|
||||
public $version = 'dolibarr';
|
||||
|
||||
/**
|
||||
* @var int page_largeur
|
||||
*/
|
||||
public $page_largeur;
|
||||
|
||||
/**
|
||||
* @var int page_hauteur
|
||||
*/
|
||||
public $page_hauteur;
|
||||
|
||||
/**
|
||||
* @var array format
|
||||
*/
|
||||
public $format;
|
||||
|
||||
/**
|
||||
* @var int marge_gauche
|
||||
*/
|
||||
public $marge_gauche;
|
||||
|
||||
/**
|
||||
* @var int marge_droite
|
||||
*/
|
||||
public $marge_droite;
|
||||
|
||||
/**
|
||||
* @var int marge_haute
|
||||
*/
|
||||
public $marge_haute;
|
||||
|
||||
/**
|
||||
* @var int marge_basse
|
||||
*/
|
||||
public $marge_basse;
|
||||
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe Object that emits
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
|
|
@ -118,7 +78,7 @@ class pdf_soleil extends ModelePDFFicheinter
|
|||
*/
|
||||
public function __construct($db)
|
||||
{
|
||||
global $conf, $langs, $mysoc;
|
||||
global $langs, $mysoc;
|
||||
|
||||
$this->db = $db;
|
||||
$this->name = 'soleil';
|
||||
|
|
|
|||
|
|
@ -36,11 +36,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
|
|||
*/
|
||||
class doc_generic_member_odt extends ModelePDFMember
|
||||
{
|
||||
/**
|
||||
* @var Societe Issuer
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* Dolibarr version of the loaded document
|
||||
* @var string
|
||||
|
|
|
|||
|
|
@ -42,11 +42,6 @@ class pdf_standard extends ModelePDFMovement
|
|||
*/
|
||||
public $db;
|
||||
|
||||
/**
|
||||
* @var string model name
|
||||
*/
|
||||
public $name;
|
||||
|
||||
/**
|
||||
* @var string model description (short text)
|
||||
*/
|
||||
|
|
@ -68,13 +63,6 @@ class pdf_standard extends ModelePDFMovement
|
|||
*/
|
||||
public $version = 'dolibarr';
|
||||
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe Object that emits
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
|
||||
public $wref;
|
||||
public $posxidref;
|
||||
public $posxdatemouv;
|
||||
|
|
|
|||
|
|
@ -40,12 +40,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
|
|||
*/
|
||||
class doc_generic_mo_odt extends ModelePDFMo
|
||||
{
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* @var string Dolibarr version of the loaded document
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -73,47 +73,6 @@ class pdf_vinci extends ModelePDFMo
|
|||
*/
|
||||
public $version = 'dolibarr';
|
||||
|
||||
/**
|
||||
* @var int page_largeur
|
||||
*/
|
||||
public $page_largeur;
|
||||
|
||||
/**
|
||||
* @var int page_hauteur
|
||||
*/
|
||||
public $page_hauteur;
|
||||
|
||||
/**
|
||||
* @var array format
|
||||
*/
|
||||
public $format;
|
||||
|
||||
/**
|
||||
* @var int marge_gauche
|
||||
*/
|
||||
public $marge_gauche;
|
||||
|
||||
/**
|
||||
* @var int marge_droite
|
||||
*/
|
||||
public $marge_droite;
|
||||
|
||||
/**
|
||||
* @var int marge_haute
|
||||
*/
|
||||
public $marge_haute;
|
||||
|
||||
/**
|
||||
* @var int marge_basse
|
||||
*/
|
||||
public $marge_basse;
|
||||
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe object that emits
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
|
|
@ -122,7 +81,7 @@ class pdf_vinci extends ModelePDFMo
|
|||
*/
|
||||
public function __construct($db)
|
||||
{
|
||||
global $conf, $langs, $mysoc;
|
||||
global $langs, $mysoc;
|
||||
|
||||
// Load translation files required by the page
|
||||
$langs->loadLangs(array("main", "bills"));
|
||||
|
|
|
|||
|
|
@ -37,12 +37,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
|
|||
*/
|
||||
class doc_generic_product_odt extends ModelePDFProduct
|
||||
{
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* Dolibarr version of the loaded document
|
||||
* @var string
|
||||
|
|
|
|||
|
|
@ -63,12 +63,6 @@ class pdf_standard extends ModelePDFProduct
|
|||
*/
|
||||
public $version = 'dolibarr';
|
||||
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
|
|
@ -77,7 +71,7 @@ class pdf_standard extends ModelePDFProduct
|
|||
*/
|
||||
public function __construct($db)
|
||||
{
|
||||
global $conf, $langs, $mysoc;
|
||||
global $langs, $mysoc;
|
||||
|
||||
// Load traductions files required by page
|
||||
$langs->loadLangs(array("main", "companies"));
|
||||
|
|
|
|||
|
|
@ -77,12 +77,6 @@ if (isModEnabled('expedition')) {
|
|||
*/
|
||||
class doc_generic_project_odt extends ModelePDFProjects
|
||||
{
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* Dolibarr version of the loaded document
|
||||
* @var string
|
||||
|
|
|
|||
|
|
@ -69,46 +69,6 @@ class pdf_baleine extends ModelePDFProjects
|
|||
*/
|
||||
public $version = 'dolibarr';
|
||||
|
||||
/**
|
||||
* @var int page_largeur
|
||||
*/
|
||||
public $page_largeur;
|
||||
|
||||
/**
|
||||
* @var int page_hauteur
|
||||
*/
|
||||
public $page_hauteur;
|
||||
|
||||
/**
|
||||
* @var array format
|
||||
*/
|
||||
public $format;
|
||||
|
||||
/**
|
||||
* @var int marge_gauche
|
||||
*/
|
||||
public $marge_gauche;
|
||||
|
||||
/**
|
||||
* @var int marge_droite
|
||||
*/
|
||||
public $marge_droite;
|
||||
|
||||
/**
|
||||
* @var int marge_haute
|
||||
*/
|
||||
public $marge_haute;
|
||||
|
||||
/**
|
||||
* @var int marge_basse
|
||||
*/
|
||||
public $marge_basse;
|
||||
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe Object that emits
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
|
|
@ -117,7 +77,7 @@ class pdf_baleine extends ModelePDFProjects
|
|||
*/
|
||||
public function __construct($db)
|
||||
{
|
||||
global $conf, $langs, $mysoc;
|
||||
global $langs, $mysoc;
|
||||
|
||||
// Translations
|
||||
$langs->loadLangs(array("main", "projects", "companies"));
|
||||
|
|
|
|||
|
|
@ -59,11 +59,6 @@ class pdf_beluga extends ModelePDFProjects
|
|||
*/
|
||||
public $db;
|
||||
|
||||
/**
|
||||
* @var string model name
|
||||
*/
|
||||
public $name;
|
||||
|
||||
/**
|
||||
* @var string model description (short text)
|
||||
*/
|
||||
|
|
@ -85,53 +80,12 @@ class pdf_beluga extends ModelePDFProjects
|
|||
*/
|
||||
public $version = 'dolibarr';
|
||||
|
||||
/**
|
||||
* @var int page_largeur
|
||||
*/
|
||||
public $page_largeur;
|
||||
|
||||
/**
|
||||
* @var int page_hauteur
|
||||
*/
|
||||
public $page_hauteur;
|
||||
|
||||
/**
|
||||
* @var array format
|
||||
*/
|
||||
public $format;
|
||||
|
||||
/**
|
||||
* @var int marge_gauche
|
||||
*/
|
||||
public $marge_gauche;
|
||||
|
||||
/**
|
||||
* @var int marge_droite
|
||||
*/
|
||||
public $marge_droite;
|
||||
|
||||
/**
|
||||
* @var int marge_haute
|
||||
*/
|
||||
public $marge_haute;
|
||||
|
||||
/**
|
||||
* @var int marge_basse
|
||||
*/
|
||||
public $marge_basse;
|
||||
|
||||
/**
|
||||
* Page orientation
|
||||
* @var string 'P' or 'Portait' (default), 'L' or 'Landscape'
|
||||
*/
|
||||
private $orientation;
|
||||
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
public $posxref;
|
||||
public $posxdate;
|
||||
public $posxsociete;
|
||||
|
|
|
|||
|
|
@ -68,46 +68,6 @@ class pdf_timespent extends ModelePDFProjects
|
|||
*/
|
||||
public $version = 'dolibarr';
|
||||
|
||||
/**
|
||||
* @var int page_largeur
|
||||
*/
|
||||
public $page_largeur;
|
||||
|
||||
/**
|
||||
* @var int page_hauteur
|
||||
*/
|
||||
public $page_hauteur;
|
||||
|
||||
/**
|
||||
* @var array format
|
||||
*/
|
||||
public $format;
|
||||
|
||||
/**
|
||||
* @var int marge_gauche
|
||||
*/
|
||||
public $marge_gauche;
|
||||
|
||||
/**
|
||||
* @var int marge_droite
|
||||
*/
|
||||
public $marge_droite;
|
||||
|
||||
/**
|
||||
* @var int marge_haute
|
||||
*/
|
||||
public $marge_haute;
|
||||
|
||||
/**
|
||||
* @var int marge_basse
|
||||
*/
|
||||
public $marge_basse;
|
||||
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe Object that emits
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
|
|
@ -116,7 +76,7 @@ class pdf_timespent extends ModelePDFProjects
|
|||
*/
|
||||
public function __construct($db)
|
||||
{
|
||||
global $conf, $langs, $mysoc;
|
||||
global $langs, $mysoc;
|
||||
|
||||
// Translations
|
||||
$langs->loadLangs(array("main", "projects", "companies"));
|
||||
|
|
|
|||
|
|
@ -76,12 +76,6 @@ if (isModEnabled('agenda')) {
|
|||
*/
|
||||
class doc_generic_task_odt extends ModelePDFTask
|
||||
{
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe Object that emits
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* Dolibarr version of the loaded document
|
||||
* @var string
|
||||
|
|
|
|||
|
|
@ -39,11 +39,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/signature.lib.php';
|
|||
*/
|
||||
class doc_generic_proposal_odt extends ModelePDFPropales
|
||||
{
|
||||
/**
|
||||
* @var Societe Issuer object that emits
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* @var string Dolibarr version of the loaded document
|
||||
*/
|
||||
|
|
@ -57,7 +52,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
|
|||
*/
|
||||
public function __construct($db)
|
||||
{
|
||||
global $conf, $langs, $mysoc;
|
||||
global $langs, $mysoc;
|
||||
|
||||
// Load translation files required by the page
|
||||
$langs->loadLangs(array("main", "companies"));
|
||||
|
|
|
|||
|
|
@ -79,47 +79,6 @@ class pdf_azur extends ModelePDFPropales
|
|||
*/
|
||||
public $version = 'dolibarr';
|
||||
|
||||
/**
|
||||
* @var int page_largeur
|
||||
*/
|
||||
public $page_largeur;
|
||||
|
||||
/**
|
||||
* @var int page_hauteur
|
||||
*/
|
||||
public $page_hauteur;
|
||||
|
||||
/**
|
||||
* @var array format
|
||||
*/
|
||||
public $format;
|
||||
|
||||
/**
|
||||
* @var int marge_gauche
|
||||
*/
|
||||
public $marge_gauche;
|
||||
|
||||
/**
|
||||
* @var int marge_droite
|
||||
*/
|
||||
public $marge_droite;
|
||||
|
||||
/**
|
||||
* @var int marge_haute
|
||||
*/
|
||||
public $marge_haute;
|
||||
|
||||
/**
|
||||
* @var int marge_basse
|
||||
*/
|
||||
public $marge_basse;
|
||||
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe Object that emits
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
|
|
|
|||
|
|
@ -72,47 +72,6 @@ class pdf_cyan extends ModelePDFPropales
|
|||
*/
|
||||
public $version = 'dolibarr';
|
||||
|
||||
/**
|
||||
* @var int page_largeur
|
||||
*/
|
||||
public $page_largeur;
|
||||
|
||||
/**
|
||||
* @var int page_hauteur
|
||||
*/
|
||||
public $page_hauteur;
|
||||
|
||||
/**
|
||||
* @var array format
|
||||
*/
|
||||
public $format;
|
||||
|
||||
/**
|
||||
* @var int marge_gauche
|
||||
*/
|
||||
public $marge_gauche;
|
||||
|
||||
/**
|
||||
* @var int marge_droite
|
||||
*/
|
||||
public $marge_droite;
|
||||
|
||||
/**
|
||||
* @var int marge_haute
|
||||
*/
|
||||
public $marge_haute;
|
||||
|
||||
/**
|
||||
* @var int marge_basse
|
||||
*/
|
||||
public $marge_basse;
|
||||
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe Object that emits
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* @var array of document table columns
|
||||
*/
|
||||
|
|
@ -126,7 +85,7 @@ class pdf_cyan extends ModelePDFPropales
|
|||
*/
|
||||
public function __construct($db)
|
||||
{
|
||||
global $conf, $langs, $mysoc;
|
||||
global $langs, $mysoc;
|
||||
|
||||
// Translations
|
||||
$langs->loadLangs(array("main", "bills"));
|
||||
|
|
|
|||
|
|
@ -36,11 +36,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
|
|||
*/
|
||||
class doc_generic_reception_odt extends ModelePdfReception
|
||||
{
|
||||
/**
|
||||
* @var Societe Issuer object that emits
|
||||
*/
|
||||
public $emetteur; // Objet societe qui emet
|
||||
|
||||
/**
|
||||
* @var string Dolibarr version of the loaded document
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -33,10 +33,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
|
|||
class pdf_squille extends ModelePdfReception
|
||||
{
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe object that emits
|
||||
* @var string Dolibarr version of the loaded document
|
||||
*/
|
||||
public $emetteur;
|
||||
public $version = 'dolibarr';
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -37,10 +37,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
|
|||
class doc_generic_odt extends ModeleThirdPartyDoc
|
||||
{
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe
|
||||
* @var string Dolibarr version of the loaded document
|
||||
*/
|
||||
public $emetteur;
|
||||
public $version = 'dolibarr';
|
||||
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
|
|
|
|||
|
|
@ -37,17 +37,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
|
|||
*/
|
||||
class doc_generic_stock_odt extends ModelePDFStock
|
||||
{
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* @var string Dolibarr version of the loaded document
|
||||
*/
|
||||
public $version = 'dolibarr';
|
||||
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*
|
||||
|
|
|
|||
|
|
@ -64,12 +64,6 @@ class pdf_standard extends ModelePDFStock
|
|||
*/
|
||||
public $version = 'dolibarr';
|
||||
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
public $wref;
|
||||
public $posxdesc;
|
||||
public $posxlabel;
|
||||
|
|
|
|||
|
|
@ -65,47 +65,6 @@ class pdf_eagle extends ModelePDFStockTransfer
|
|||
*/
|
||||
public $version = 'dolibarr';
|
||||
|
||||
/**
|
||||
* @var int page_largeur
|
||||
*/
|
||||
public $page_largeur;
|
||||
|
||||
/**
|
||||
* @var int page_hauteur
|
||||
*/
|
||||
public $page_hauteur;
|
||||
|
||||
/**
|
||||
* @var array format
|
||||
*/
|
||||
public $format;
|
||||
|
||||
/**
|
||||
* @var int marge_gauche
|
||||
*/
|
||||
public $marge_gauche;
|
||||
|
||||
/**
|
||||
* @var int marge_droite
|
||||
*/
|
||||
public $marge_droite;
|
||||
|
||||
/**
|
||||
* @var int marge_haute
|
||||
*/
|
||||
public $marge_haute;
|
||||
|
||||
/**
|
||||
* @var int marge_basse
|
||||
*/
|
||||
public $marge_basse;
|
||||
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe object that emits
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
|
|
|
|||
|
|
@ -74,47 +74,6 @@ class pdf_eagle_proforma extends ModelePDFCommandes
|
|||
*/
|
||||
public $version = 'dolibarr';
|
||||
|
||||
/**
|
||||
* @var int page_largeur
|
||||
*/
|
||||
public $page_largeur;
|
||||
|
||||
/**
|
||||
* @var int page_hauteur
|
||||
*/
|
||||
public $page_hauteur;
|
||||
|
||||
/**
|
||||
* @var array format
|
||||
*/
|
||||
public $format;
|
||||
|
||||
/**
|
||||
* @var int marge_gauche
|
||||
*/
|
||||
public $marge_gauche;
|
||||
|
||||
/**
|
||||
* @var int marge_droite
|
||||
*/
|
||||
public $marge_droite;
|
||||
|
||||
/**
|
||||
* @var int marge_haute
|
||||
*/
|
||||
public $marge_haute;
|
||||
|
||||
/**
|
||||
* @var int marge_basse
|
||||
*/
|
||||
public $marge_basse;
|
||||
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe Object that emits
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
|
|
@ -123,7 +82,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
|
|||
*/
|
||||
public function __construct($db)
|
||||
{
|
||||
global $conf, $langs, $mysoc;
|
||||
global $langs, $mysoc;
|
||||
|
||||
// Translations
|
||||
$langs->loadLangs(array("main", "bills", "products"));
|
||||
|
|
|
|||
|
|
@ -69,48 +69,6 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
|
|||
*/
|
||||
public $version = 'dolibarr';
|
||||
|
||||
/**
|
||||
* @var int page_largeur
|
||||
*/
|
||||
public $page_largeur;
|
||||
|
||||
/**
|
||||
* @var int page_hauteur
|
||||
*/
|
||||
public $page_hauteur;
|
||||
|
||||
/**
|
||||
* @var array format
|
||||
*/
|
||||
public $format;
|
||||
|
||||
/**
|
||||
* @var int marge_gauche
|
||||
*/
|
||||
public $marge_gauche;
|
||||
|
||||
/**
|
||||
* @var int marge_droite
|
||||
*/
|
||||
public $marge_droite;
|
||||
|
||||
/**
|
||||
* @var int marge_haute
|
||||
*/
|
||||
public $marge_haute;
|
||||
|
||||
/**
|
||||
* @var int marge_basse
|
||||
*/
|
||||
public $marge_basse;
|
||||
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe object that emits
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
|
|
|
|||
|
|
@ -72,47 +72,6 @@ class pdf_cornas extends ModelePDFSuppliersOrders
|
|||
*/
|
||||
public $version = 'dolibarr';
|
||||
|
||||
/**
|
||||
* @var int page_largeur
|
||||
*/
|
||||
public $page_largeur;
|
||||
|
||||
/**
|
||||
* @var int page_hauteur
|
||||
*/
|
||||
public $page_hauteur;
|
||||
|
||||
/**
|
||||
* @var array format
|
||||
*/
|
||||
public $format;
|
||||
|
||||
/**
|
||||
* @var int marge_gauche
|
||||
*/
|
||||
public $marge_gauche;
|
||||
|
||||
/**
|
||||
* @var int marge_droite
|
||||
*/
|
||||
public $marge_droite;
|
||||
|
||||
/**
|
||||
* @var int marge_haute
|
||||
*/
|
||||
public $marge_haute;
|
||||
|
||||
/**
|
||||
* @var int marge_basse
|
||||
*/
|
||||
public $marge_basse;
|
||||
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe object that emits
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
|
|
|
|||
|
|
@ -72,47 +72,6 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
|
|||
*/
|
||||
public $version = 'dolibarr';
|
||||
|
||||
/**
|
||||
* @var int page_largeur
|
||||
*/
|
||||
public $page_largeur;
|
||||
|
||||
/**
|
||||
* @var int page_hauteur
|
||||
*/
|
||||
public $page_hauteur;
|
||||
|
||||
/**
|
||||
* @var array format
|
||||
*/
|
||||
public $format;
|
||||
|
||||
/**
|
||||
* @var int marge_gauche
|
||||
*/
|
||||
public $marge_gauche;
|
||||
|
||||
/**
|
||||
* @var int marge_droite
|
||||
*/
|
||||
public $marge_droite;
|
||||
|
||||
/**
|
||||
* @var int marge_haute
|
||||
*/
|
||||
public $marge_haute;
|
||||
|
||||
/**
|
||||
* @var int marge_basse
|
||||
*/
|
||||
public $marge_basse;
|
||||
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe object that emits
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
|
|
|
|||
|
|
@ -70,12 +70,6 @@ class pdf_standard extends ModelePDFSuppliersPayments
|
|||
*/
|
||||
public $version = 'dolibarr';
|
||||
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
public $posxdate;
|
||||
public $posxreffacturefourn;
|
||||
public $posxreffacture;
|
||||
|
|
|
|||
|
|
@ -38,12 +38,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
|
|||
*/
|
||||
class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
|
||||
{
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* Dolibarr version of the loaded document
|
||||
* @var string
|
||||
|
|
|
|||
|
|
@ -69,47 +69,6 @@ class pdf_aurore extends ModelePDFSupplierProposal
|
|||
*/
|
||||
public $version = 'dolibarr';
|
||||
|
||||
/**
|
||||
* @var int page_largeur
|
||||
*/
|
||||
public $page_largeur;
|
||||
|
||||
/**
|
||||
* @var int page_hauteur
|
||||
*/
|
||||
public $page_hauteur;
|
||||
|
||||
/**
|
||||
* @var array format
|
||||
*/
|
||||
public $format;
|
||||
|
||||
/**
|
||||
* @var int marge_gauche
|
||||
*/
|
||||
public $marge_gauche;
|
||||
|
||||
/**
|
||||
* @var int marge_droite
|
||||
*/
|
||||
public $marge_droite;
|
||||
|
||||
/**
|
||||
* @var int marge_haute
|
||||
*/
|
||||
public $marge_haute;
|
||||
|
||||
/**
|
||||
* @var int marge_basse
|
||||
*/
|
||||
public $marge_basse;
|
||||
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
|
|
|
|||
|
|
@ -36,11 +36,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
|
|||
*/
|
||||
class doc_generic_ticket_odt extends ModelePDFTicket
|
||||
{
|
||||
/**
|
||||
* @var Societe Issuer
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* Dolibarr version of the loaded document
|
||||
* @var string
|
||||
|
|
@ -55,7 +50,7 @@ class doc_generic_ticket_odt extends ModelePDFTicket
|
|||
*/
|
||||
public function __construct($db)
|
||||
{
|
||||
global $conf, $langs, $mysoc;
|
||||
global $langs, $mysoc;
|
||||
|
||||
// Load translation files required by the page
|
||||
$langs->loadLangs(array("main", "companies"));
|
||||
|
|
|
|||
|
|
@ -36,11 +36,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
|
|||
*/
|
||||
class doc_generic_user_odt extends ModelePDFUser
|
||||
{
|
||||
/**
|
||||
* @var Societe Issuer
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* Dolibarr version of the loaded document
|
||||
* @var string
|
||||
|
|
@ -55,7 +50,7 @@ class doc_generic_user_odt extends ModelePDFUser
|
|||
*/
|
||||
public function __construct($db)
|
||||
{
|
||||
global $conf, $langs, $mysoc;
|
||||
global $langs, $mysoc;
|
||||
|
||||
// Load translation files required by the page
|
||||
$langs->loadLangs(array("main", "companies"));
|
||||
|
|
|
|||
|
|
@ -38,12 +38,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
|
|||
*/
|
||||
class doc_generic_usergroup_odt extends ModelePDFUserGroup
|
||||
{
|
||||
/**
|
||||
* Issuer
|
||||
* @var Societe
|
||||
*/
|
||||
public $emetteur;
|
||||
|
||||
/**
|
||||
* Dolibarr version of the loaded document
|
||||
* @var string
|
||||
|
|
@ -58,7 +52,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
|
|||
*/
|
||||
public function __construct($db)
|
||||
{
|
||||
global $conf, $langs, $mysoc;
|
||||
global $langs, $mysoc;
|
||||
|
||||
// Load translation files required by the page
|
||||
$langs->loadLangs(array("main", "companies"));
|
||||
|
|
|
|||
|
|
@ -222,11 +222,13 @@ class DataPolicy
|
|||
require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
|
||||
$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1);
|
||||
|
||||
$resultmasssend = '';
|
||||
if ($mailfile->error) {
|
||||
$resultmasssend .= '<div class="error">'.$mailfile->error.'</div>';
|
||||
} else {
|
||||
$result4 = $mailfile->sendfile();
|
||||
if (!$error) {
|
||||
$resultmail = $mailfile->sendfile();
|
||||
|
||||
if ($resultmail) {
|
||||
$resultmasssend .= $langs->trans("MailSent").': '.$sendto."<br>";
|
||||
$contact->array_options['options_datapolicy_send'] = date('Y-m-d', time());
|
||||
$contact->update($contact->id);
|
||||
|
|
@ -294,12 +296,14 @@ class DataPolicy
|
|||
// Send mail
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
|
||||
$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1);
|
||||
|
||||
$resultmasssend = '';
|
||||
if ($mailfile->error) {
|
||||
$resultmasssend .= '<div class="error">'.$mailfile->error.'</div>';
|
||||
} else {
|
||||
$result4 = $mailfile->sendfile();
|
||||
$resultmail = $mailfile->sendfile();
|
||||
|
||||
if (!$error) {
|
||||
if ($resultmail) {
|
||||
$resultmasssend .= $langs->trans("MailSent").': '.$sendto."<br>";
|
||||
$societe->array_options['options_datapolicy_send'] = date('Y-m-d', time());
|
||||
$societe->update($societe->id);
|
||||
|
|
@ -371,9 +375,9 @@ class DataPolicy
|
|||
if ($mailfile->error) {
|
||||
$resultmasssend .= '<div class="error">'.$mailfile->error.'</div>';
|
||||
} else {
|
||||
$result4 = $mailfile->sendfile();
|
||||
$resultmail = $mailfile->sendfile();
|
||||
|
||||
if (!$error) {
|
||||
if ($resultmail) {
|
||||
$resultmasssend .= $langs->trans("MailSent").': '.$sendto."<br>";
|
||||
$adherent->array_options['options_datapolicy_send'] = date('Y-m-d', time());
|
||||
$adherent->update($user);
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@ StripeAccount=Stripe account
|
|||
StripeChargeList=List of Stripe charges
|
||||
StripeTransactionList=List of Stripe transactions
|
||||
StripeCustomerId=Stripe customer id
|
||||
StripePaymentId=Stripe payment id
|
||||
StripePaymentModes=Stripe payment modes
|
||||
LocalID=Local ID
|
||||
StripeID=Stripe ID
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ if (!$rowid) {
|
|||
print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
|
||||
|
||||
print '<tr class="liste_titre">';
|
||||
print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
|
||||
print_liste_field_titre("StripePaymentId", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
|
||||
print_liste_field_titre("StripeCustomerId", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
|
||||
print_liste_field_titre("Customer", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
|
||||
print_liste_field_titre("Origin", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
|
||||
|
|
|
|||
|
|
@ -1064,8 +1064,10 @@ class Stripe extends CommonObject
|
|||
|
||||
// Save the Stripe payment mode ID into the Dolibarr database
|
||||
$sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib";
|
||||
$sql .= " SET stripe_card_ref = '".$this->db->escape($sepa->id)."', card_type = 'sepa_debit',";
|
||||
$sql .= " stripe_account= '" . $this->db->escape($cu->id . "@" . $stripeacc) . "'";
|
||||
$sql .= " SET stripe_card_ref = '".$this->db->escape($sepa->id)."',";
|
||||
$sql .= " card_type = 'sepa_debit',";
|
||||
$sql .= " stripe_account= '" . $this->db->escape($cu->id . "@" . $stripeacc) . "',";
|
||||
$sql .= " ext_payment_site = '".$this->db->escape($service)."'";
|
||||
$sql .= " WHERE rowid = ".((int) $object->id);
|
||||
$sql .= " AND type = 'ban'";
|
||||
$resql = $this->db->query($sql);
|
||||
|
|
|
|||
|
|
@ -107,9 +107,6 @@ if (!$rowid) {
|
|||
|
||||
print '<tr class="liste_titre">';
|
||||
print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
|
||||
//print_liste_field_titre("StripeCustomerId",$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
|
||||
//print_liste_field_titre("CustomerId", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
|
||||
//print_liste_field_titre("Origin", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
|
||||
print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'center ');
|
||||
print_liste_field_titre("DateOperation", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'center ');
|
||||
print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'left ');
|
||||
|
|
|
|||
|
|
@ -107,9 +107,6 @@ if (!$rowid) {
|
|||
|
||||
print '<tr class="liste_titre">';
|
||||
print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
|
||||
//print_liste_field_titre("StripeCustomerId",$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
|
||||
//print_liste_field_titre("CustomerId", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
|
||||
//print_liste_field_titre("Origin", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
|
||||
print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'center ');
|
||||
print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'left ');
|
||||
print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'right ');
|
||||
|
|
|
|||
Loading…
Reference in a new issue