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

conflict resolution

Browse Source
This commit is contained in:
Philippe GRAND 2018-09-01 12:38:22 +02:00
commit 1944ef0dc3
411 changed files with 209 additions and 740 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.tx/config
View File

@ -38,6 +38,12 @@ source_file = htdocs/langs/en_US/bills.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[dolibarr.blockedlog]
file_filter = htdocs/langs/<lang>/blockedlog.lang
source_file = htdocs/langs/en_US/blockedlog.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[dolibarr.bookmarks]
file_filter = htdocs/langs/<lang>/bookmarks.lang
source_file = htdocs/langs/en_US/bookmarks.lang

4
ChangeLog
View File

@ -13,6 +13,10 @@ NEW: Dolibarr can provide information in page title when multicompany is enabled
Android application like DoliDroid able to provide native features for multicompany module
For developers:
Code changes to be more compatible with PSR2
***** ChangeLog for 8.0.0 compared to 7.0.0 *****

3
dev/setup/codesniffer/ruleset.xml
View File

@ -374,6 +374,9 @@
</rule>
<rule ref="PEAR.NamingConventions.ValidVariableName" />
<rule ref="PSR2.Classes.ClassDeclaration" />
<rule ref="PSR2.Methods.FunctionClosingBrace" />
<!-- This is not in PSR2 -->
<rule ref="PEAR.NamingConventions.ValidVariableName.PrivateNoUnderscore">
<severity>0</severity>

2
dev/translation/autotranslator.class.php
View File

@ -65,7 +65,6 @@ class autoTranslator
//ini_set('default_charset','UTF-8');
ini_set('default_charset',$this->_outputpagecode);
$this->parse_refLangTranslationFiles();
}
/**
@ -346,5 +345,4 @@ class autoTranslator
return $rep;
}
}

5
htdocs/accountancy/class/accountancycategory.class.php
View File

@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
/**
* Class to manage categories of an accounting account
*/
class AccountancyCategory // extends CommonObject
class AccountancyCategory // extends CommonObject
{
/**
* @var DoliDB Database handler.
@ -66,7 +66,7 @@ class AccountancyCategory // extends CommonObject
*/
public $code;
/**
/**
* @var string proper name for given parameter
*/
public $label;
@ -874,5 +874,4 @@ class AccountancyCategory // extends CommonObject
return -1;
}
}
}

35
htdocs/accountancy/class/accountingaccount.class.php
View File

@ -79,26 +79,25 @@ class AccountingAccount extends CommonObject
var $account_number;
var $account_parent;
var $account_category;
/**
* @var string Label of account
*/
public $label;
/**
* @var int ID
*/
public $fk_user_author;
/**
* @var int ID
*/
public $fk_user_modif;
var $active; // duplicate with status
var $status;
/**
* @var string Label of account
*/
public $label;
/**
* @var int ID
*/
public $fk_user_author;
/**
* @var int ID
*/
public $fk_user_modif;
var $active; // duplicate with status
/**
* Constructor

16
htdocs/accountancy/class/accountingjournal.class.php
View File

@ -30,25 +30,25 @@ class AccountingJournal extends CommonObject
* @var string ID to identify managed object
*/
public $element='accounting_journal';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='accounting_journal';
public $fk_element = '';
public $ismultientitymanaged = 0; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
public $picto = 'generic';
var $rowid;
public $rowid;
public $code;
/**
* @var string proper name for given parameter
*/
public $label;
* @var string proper name for given parameter
*/
public $label;
public $nature; // 1:various operations, 2:sale, 3:purchase, 4:bank, 5:expense-report, 8:inventory, 9: has-new
public $active;

1
htdocs/adherents/canvas/actions_adherentcard_common.class.php
View File

@ -277,5 +277,4 @@ abstract class ActionsAdherentCardCommon
}
}
}
}

1
htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
View File

@ -117,7 +117,6 @@ class ActionsAdherentCardDefault extends ActionsAdherentCardCommon
{
$this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
}
}

3
htdocs/adherents/class/adherent.class.php
View File

@ -693,7 +693,6 @@ class Adherent extends CommonObject
$this->db->rollback();
return -1;
}
}
/**
@ -2110,7 +2109,6 @@ class Adherent extends CommonObject
$this->error=$this->db->error();
return -1;
}
}
/**
@ -2674,5 +2672,4 @@ class Adherent extends CommonObject
return 0;
}
}

1
htdocs/adherents/class/adherent_type.class.php
View File

@ -555,5 +555,4 @@ class AdherentType extends CommonObject
return '';
}
}

1
htdocs/adherents/class/adherentstats.class.php
View File

@ -181,5 +181,4 @@ class AdherentStats extends Stats
return $this->_getAllByYear($sql);
}
}

1
htdocs/adherents/class/api_members.class.php
View File

@ -409,5 +409,4 @@ class Members extends DolibarrApi
return $result;
}
}

1
htdocs/adherents/class/api_memberstypes.class.php
View File

@ -320,5 +320,4 @@ class MembersTypes extends DolibarrApi
return $object;
}
}

1
htdocs/admin/tools/eaccelerator.php
View File

@ -181,7 +181,6 @@ function create_script_table($list)
print '</tr>';
}
print '</table>';
}
/**

1
htdocs/api/class/api_access.class.php
View File

@ -196,6 +196,5 @@ class DolibarrApiAccess implements iAuthenticate
return $requires
? static::$role == 'admin' || in_array(static::$role, (array) $requires)
: true;
}
}

1
htdocs/api/class/api_setup.class.php
View File

@ -918,5 +918,4 @@ class Setup extends DolibarrApi
return array('resultcode'=>$resultcode, 'resultcomment'=>$resultcomment, 'expectedchecksum'=> $outexpectedchecksum, 'currentchecksum'=> $outcurrentchecksum, 'out'=>$out);
}
}

1
htdocs/asset/class/asset_type.class.php
View File

@ -437,5 +437,4 @@ class AssetType extends CommonObject
{
return '';
}
}

8
htdocs/blockedlog/class/authority.class.php
View File

@ -54,7 +54,6 @@ class BlockedLogAuthority
{
$this->db = $db;
}
/**
@ -90,7 +89,6 @@ class BlockedLogAuthority
{
return md5($this->signature.$this->blockchain);
}
/**
@ -103,7 +101,6 @@ class BlockedLogAuthority
{
return ($hash === $this->getBlockchainHash() );
}
/**
@ -116,7 +113,6 @@ class BlockedLogAuthority
{
$this->blockchain.=$block;
}
/**
@ -197,7 +193,6 @@ class BlockedLogAuthority
$this->error=$this->db->error();
return -1;
}
}
/**
@ -252,7 +247,6 @@ class BlockedLogAuthority
$this->db->rollback();
return -1;
}
}
/**
@ -291,7 +285,6 @@ class BlockedLogAuthority
$this->db->rollback();
return -1;
}
}
/**
@ -340,5 +333,4 @@ class BlockedLogAuthority
return 1;
}
}

5
htdocs/blockedlog/class/blockedlog.class.php
View File

@ -283,7 +283,6 @@ class BlockedLog
}
return '<i class="opacitymedium">'.$langs->trans('ImpossibleToReloadObject', $this->element, $this->fk_object).'</i>';
}
/**
@ -676,7 +675,6 @@ class BlockedLog
$this->error=$this->db->error();
return -1;
}
}
@ -716,8 +714,6 @@ class BlockedLog
if($res===false) return false;
return true;
}
/**
@ -1060,5 +1056,4 @@ class BlockedLog
return $result;
}
}

2
htdocs/bookmarks/class/bookmark.class.php
View File

@ -230,7 +230,6 @@ class Bookmark extends CommonObject
$this->error=$this->db->lasterror();
return -1;
}
}
/**
@ -260,5 +259,4 @@ class Bookmark extends CommonObject
{
return '';
}
}

1
htdocs/cashdesk/class/Auth.class.php
View File

@ -138,6 +138,5 @@ class Auth
return $ret;
}
}

14
htdocs/cashdesk/class/Facturation.class.php
View File

@ -167,7 +167,6 @@ class Facturation
$_SESSION['poscart']=$newcartarray;
$this->raz();
}
/**
@ -269,7 +268,6 @@ class Facturation
$this->prixTotalHt('RESET');
$this->montantTva('RESET');
$this->prixTotalTtc('RESET');
}
@ -324,7 +322,6 @@ class Facturation
{
$this->ref = $aRef;
}
}
/**
@ -348,7 +345,6 @@ class Facturation
{
$this->qte = $aQte;
}
}
/**
@ -372,7 +368,6 @@ class Facturation
{
$this->stock = $aStock;
}
}
/**
@ -396,7 +391,6 @@ class Facturation
{
$this->remise_percent = $aRemisePercent;
}
}
/**
@ -421,7 +415,6 @@ class Facturation
$this->montant_remise = $aMontantRemise;
}
}
/**
@ -446,7 +439,6 @@ class Facturation
$this->prix = $aPrix;
}
}
/**
@ -470,7 +462,6 @@ class Facturation
$this->tva = $aTva;
}
}
/**
@ -518,7 +509,6 @@ class Facturation
$this->mode_reglement = $aModeReglement;
}
}
/**
@ -543,7 +533,6 @@ class Facturation
$this->montant_encaisse = $aMontantEncaisse;
}
}
/**
@ -567,7 +556,6 @@ class Facturation
$this->montant_rendu = $aMontantRendu;
}
}
/**
@ -637,7 +625,6 @@ class Facturation
$this->montant_tva = $aMontantTva;
}
}
/**
@ -661,5 +648,4 @@ class Facturation
$this->prix_total_ttc = $aTotalTtc;
}
}
}

3
htdocs/comm/action/class/actioncomm.class.php
View File

@ -437,7 +437,6 @@ class ActionComm extends CommonObject
$this->error=$this->db->lasterror();
return -1;
}
}
/**
@ -648,7 +647,6 @@ class ActionComm extends CommonObject
}
return $num;
}
/**
@ -1690,5 +1688,4 @@ class ActionComm extends CommonObject
return $error;
}
}

1
htdocs/comm/action/class/actioncommreminder.class.php
View File

@ -232,6 +232,5 @@ class ActionCommReminder extends CommonObject
{
$this->initAsSpecimenCommon();
}
}

1
htdocs/comm/action/class/api_agendaevents.class.php
View File

@ -293,7 +293,6 @@ class AgendaEvents extends DolibarrApi
'message' => 'Agenda Event deleted'
)
);
}
/**

1
htdocs/comm/action/class/cactioncomm.class.php
View File

@ -225,5 +225,4 @@ class CActionComm
$transcode=$langs->trans("Action".$this->code);
if ($transcode != "Action".$this->code) return $transcode;
}
}

1
htdocs/comm/action/class/ical.class.php
View File

@ -44,7 +44,6 @@ class ICal
*/
public function __construct()
{
}
/**

7
htdocs/comm/mailing/cibles.php
View File

@ -66,7 +66,6 @@ $modulesdir = dolGetModulesDirs('/mailings');
$object = new Mailing($db);
/*
* Actions
*/
@ -330,16 +329,14 @@ if ($object->fetch($id) >= 0)
// Si le module mailing est qualifie
if ($qualified)
{
$var = ! $var;
if ($allowaddtarget)
{
print '<form '.$bctag[$var].' name="'.$modulename.'" action="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&module='.$modulename.'" method="POST" enctype="multipart/form-data">';
print '<form class="oddeven tagtr" name="'.$modulename.'" action="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&module='.$modulename.'" method="POST" enctype="multipart/form-data">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
}
else
{
print '<div '.$bctag[$var].'>';
print '<div class="oddeven tagtr">';
}
print '<div class="tagtd">';

2
htdocs/comm/mailing/class/advtargetemailing.class.php
View File

@ -970,6 +970,4 @@ class AdvanceTargetingMailing extends CommonObject
return $return_sql_criteria;
}
}

2
htdocs/comm/mailing/class/mailing.class.php
View File

@ -93,7 +93,6 @@ class Mailing extends CommonObject
$this->statut_dest[1] = 'MailingStatusSent';
$this->statut_dest[2] = 'MailingStatusRead';
$this->statut_dest[3] = 'MailingStatusReadAndUnsubscribe'; // Read but ask to not be contacted anymore
}
/**
@ -644,6 +643,5 @@ class Mailing extends CommonObject
if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3');
}
}
}

1
htdocs/comm/propal/class/api_proposals.class.php
View File

@ -491,7 +491,6 @@ class Proposals extends DolibarrApi
'message' => 'Commercial Proposal deleted'
)
);
}
/**

1
htdocs/comm/propal/class/propal.class.php
View File

@ -4236,6 +4236,5 @@ class PropaleLigne extends CommonObjectLine
return -2;
}
}
}

1
htdocs/commande/class/api_orders.class.php
View File

@ -473,7 +473,6 @@ class Orders extends DolibarrApi
'message' => 'Order deleted'
)
);
}
/**

1
htdocs/commande/class/commande.class.php
View File

@ -3411,7 +3411,6 @@ class Commande extends CommonOrder
if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderProcessed').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6');
if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderDelivered').' </span>'.img_picto($langs->trans('StatusOrderDelivered'),'statut6');
}
}

1
htdocs/commande/class/commandestats.class.php
View File

@ -222,6 +222,5 @@ class CommandeStats extends Stats
return $this->_getAllByProduct($sql);
}
}

5
htdocs/compta/bank/class/account.class.php
View File

@ -1170,7 +1170,6 @@ class Account extends CommonObject
}
return $solde;
}
/**
@ -1513,7 +1512,6 @@ class Account extends CommonObject
*/
function info($id)
{
}
/**
@ -1558,7 +1556,6 @@ class Account extends CommonObject
//Get the order the properties are shown
return $fieldarray;
}
/**
@ -1632,7 +1629,6 @@ class Account extends CommonObject
$this->owner_address = 'Owner address';
$this->country_id = 1;
}
}
@ -2319,5 +2315,4 @@ class AccountLine extends CommonObject
}
return 0;
}
}

9
htdocs/compta/bank/class/bankcateg.class.php
View File

@ -33,11 +33,11 @@ class BankCateg // extends CommonObject
public $picto='generic';
public $id;
/**
* @var string proper name for given parameter
*/
public $label;
* @var string proper name for given parameter
*/
public $label;
/**
@ -343,5 +343,4 @@ class BankCateg // extends CommonObject
$this->id = 0;
$this->label = '';
}
}

1
htdocs/compta/bank/class/paymentvarious.class.php
View File

@ -603,5 +603,4 @@ class PaymentVarious extends CommonObject
dol_print_error($this->db);
}
}
}

2
htdocs/compta/deplacement/class/deplacement.class.php
View File

@ -159,7 +159,6 @@ class Deplacement extends CommonObject
$this->db->rollback();
return -1;
}
}
/**
@ -458,6 +457,5 @@ class Deplacement extends CommonObject
dol_print_error($this->db);
}
}
}

1
htdocs/compta/facture/class/api_invoices.class.php
View File

@ -1259,5 +1259,4 @@ class Invoices extends DolibarrApi
}
return $invoice;
}
}

2
htdocs/compta/facture/class/facture-rec.class.php
View File

@ -1858,7 +1858,5 @@ class FactureLigneRec extends CommonInvoiceLine
$this->db->rollback();
return -2;
}
}
}

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

@ -1551,7 +1551,6 @@ class Facture extends CommonInvoice
}
}
}
}
/**

2
htdocs/compta/facture/class/facturestats.class.php
View File

@ -224,7 +224,5 @@ class FactureStats extends Stats
return $this->_getAllByProduct($sql);
}
}

1
htdocs/compta/facture/class/paymentterm.class.php
View File

@ -482,5 +482,4 @@ class PaymentTerm // extends CommonObject
$this->nbjour='';
$this->decalage='';
}
}

1
htdocs/compta/localtax/class/localtax.class.php
View File

@ -648,5 +648,4 @@ class Localtax extends CommonObject
return '';
}
}

1
htdocs/compta/paiement/cheque/class/remisecheque.class.php
View File

@ -1104,5 +1104,4 @@ class RemiseCheque extends CommonObject
}
return $langs->trans('Unknown');
}
}

3
htdocs/compta/paiement/class/cpaiement.class.php
View File

@ -369,8 +369,5 @@ class Cpaiement
$this->active = '';
$this->accountancy_code = '';
$this->module = '';
}
}

4
htdocs/compta/prelevement/class/bonprelevement.class.php
View File

@ -164,7 +164,6 @@ class BonPrelevement extends CommonObject
}
return $result;
}
/**
@ -1457,7 +1456,6 @@ class BonPrelevement extends CommonObject
if (! empty($conf->global->MAIN_UMASK))
@chmod($this->file, octdec($conf->global->MAIN_UMASK));
return $result;
}
@ -1687,7 +1685,6 @@ class BonPrelevement extends CommonObject
fputs($this->file, substr(" ",0,5));
fputs($this->file, "\n");
}
/**
@ -1940,6 +1937,5 @@ class BonPrelevement extends CommonObject
if ($statut==2) return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut],'statut6');
}
}
}

4
htdocs/compta/prelevement/class/rejetprelevement.class.php
View File

@ -69,7 +69,6 @@ class RejetPrelevement
$this->facturer[0]=$langs->trans("NoInvoiceRefused");
$this->facturer[1]=$langs->trans("InvoiceRefused");
}
/**
@ -198,7 +197,6 @@ class RejetPrelevement
dol_syslog("RejetPrelevement::Create Rollback");
$this->db->rollback();
}
}
/**
@ -327,7 +325,6 @@ class RejetPrelevement
}
return $arr;
}
/**
@ -371,6 +368,5 @@ class RejetPrelevement
return -2;
}
}
}

1
htdocs/compta/salaries/class/paymentsalary.class.php
View File

@ -637,5 +637,4 @@ class PaymentSalary extends CommonObject
}*/
return '';
}
}

3
htdocs/compta/sociales/class/cchargesociales.class.php
View File

@ -523,8 +523,5 @@ class Cchargesociales
$this->fk_pays = '';
$this->module = '';
$this->accountancy_code = '';
}
}

1
htdocs/compta/sociales/class/chargesociales.class.php
View File

@ -289,7 +289,6 @@ class ChargeSociales extends CommonObject
$this->db->rollback();
return -1;
}
}

26
htdocs/compta/sociales/class/paymentsocialcontribution.class.php
View File

@ -43,22 +43,22 @@ class PaymentSocialContribution extends CommonObject
public $picto = 'payment';
var $fk_charge;
var $datec='';
var $tms='';
var $datep='';
public $fk_charge;
public $datec='';
public $tms='';
public $datep='';
/**
* @deprecated
* @see amount
*/
var $total;
var $amount; // Total amount of payment
var $amounts=array(); // Array of amounts
var $fk_typepaiement;
var $num_paiement;
var $fk_bank;
var $fk_user_creat;
var $fk_user_modif;
public $total;
public $amount; // Total amount of payment
public $amounts=array(); // Array of amounts
public $fk_typepaiement;
public $num_paiement;
public $fk_bank;
public $fk_user_creat;
public $fk_user_modif;
/**
* Constructor
@ -501,8 +501,6 @@ class PaymentSocialContribution extends CommonObject
$this->fk_bank='';
$this->fk_user_creat='';
$this->fk_user_modif='';
}

1
htdocs/contact/canvas/actions_contactcard_common.class.php
View File

@ -316,6 +316,5 @@ abstract class ActionsContactCardCommon
$this->object->country = $langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->label;
}
}
}

1
htdocs/contact/canvas/default/actions_contactcard_default.class.php
View File

@ -116,7 +116,6 @@ class ActionsContactCardDefault extends ActionsContactCardCommon
{
$this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
}
}

13
htdocs/contrat/class/api_contracts.class.php
View File

@ -55,13 +55,13 @@ class Contracts extends DolibarrApi
}
/**
* Get properties of a contrat object
* Get properties of a contract object
*
* Return an array with contrat informations
* Return an array with contract informations
*
* @param int $id ID of contract
* @return array|mixed data without useless information
*
*
* @throws RestException
*/
function get($id)
@ -457,7 +457,7 @@ class Contracts extends DolibarrApi
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
// TODO Check the lineid $lineid is a line of ojbect
// TODO Check the lineid $lineid is a line of object
$updateRes = $this->contract->deleteline($lineid, DolibarrApiAccess::$user);
if ($updateRes > 0) {
@ -472,7 +472,7 @@ class Contracts extends DolibarrApi
/**
* Update contract general fields (won't touch lines of contract)
*
* @param int $id Id of contrat to update
* @param int $id Id of contract to update
* @param array $request_data Datas
*
* @return int
@ -537,11 +537,10 @@ class Contracts extends DolibarrApi
'message' => 'Contract deleted'
)
);
}
/**
* Validate an contract
* Validate a contract
*
* @param int $id Contract ID
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers

32
htdocs/contrat/class/contrat.class.php
View File

@ -241,8 +241,8 @@ class Contrat extends CommonObject
*
* @param User $user Objet User who activate contract
* @param int $line_id Id of line to activate
* @param int $date Date d'ouverture
* @param int|string $date_end Date fin prevue
* @param int $date Opening date
* @param int|string $date_end Expected end date
* @param string $comment A comment typed by user
* @return int <0 if KO, >0 if OK
*/
@ -263,7 +263,7 @@ class Contrat extends CommonObject
*
* @param User $user Objet User who close contract
* @param int $line_id Id of line to close
* @param int $date_end Date end
* @param int $date_end End date
* @param string $comment A comment typed by user
* @return int <0 if KO, >0 if OK
*/
@ -520,13 +520,12 @@ class Contrat extends CommonObject
$this->db->rollback();
return -1;
}
}
/**
* Unvalidate a contract
*
* @param User $user Objet User
* @param User $user Object User
* @param int $notrigger 1=Does not execute triggers, 0=execute triggers
* @return int <0 if KO, >0 if OK
*/
@ -568,7 +567,7 @@ class Contrat extends CommonObject
// End call triggers
}
// Set new ref and define current statut
// Set new ref and define current status
if (! $error)
{
$this->statut=0;
@ -666,7 +665,7 @@ class Contrat extends CommonObject
$this->db->free($resql);
// Retreive all extrafield
// Retreive all extrafields
// fetch optionals attributes and labels
$this->fetch_optionals();
@ -699,7 +698,6 @@ class Contrat extends CommonObject
$this->error=$this->db->error();
return -1;
}
}
/**
@ -729,7 +727,7 @@ class Contrat extends CommonObject
$this->lines=array();
$pos = 0;
// Selectionne les lignes contrats liees a un produit
// Selects contract lines related to a product
$sql = "SELECT p.label as product_label, p.description as product_desc, p.ref as product_ref,";
$sql.= " d.rowid, d.fk_contrat, d.statut, d.description, d.price_ht, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.localtax1_type, d.localtax2_type, d.qty, d.remise_percent, d.subprice, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht,";
$sql.= " d.total_ht,";
@ -763,7 +761,7 @@ class Contrat extends CommonObject
$line->id = $objp->rowid;
$line->ref = $objp->rowid;
$line->fk_contrat = $objp->fk_contrat;
$line->desc = $objp->description; // Description ligne
$line->desc = $objp->description; // Description line
$line->qty = $objp->qty;
$line->vat_src_code = $objp->vat_src_code ;
$line->tva_tx = $objp->tva_tx;
@ -794,9 +792,9 @@ class Contrat extends CommonObject
$line->fk_unit = $objp->fk_unit;
$line->ref = $objp->product_ref; // deprecated
$line->product_ref = $objp->product_ref; // Ref product
$line->product_desc = $objp->product_desc; // Description product
$line->product_label = $objp->product_label; // Label product
$line->product_ref = $objp->product_ref; // Product Ref
$line->product_desc = $objp->product_desc; // Product Description
$line->product_label = $objp->product_label; // Product Label
$line->description = $objp->description;
@ -814,7 +812,7 @@ class Contrat extends CommonObject
$line->date_fin_prevue = $this->db->jdate($objp->date_fin_validite);
$line->date_fin_reel = $this->db->jdate($objp->date_cloture);
// Retreive all extrafield for contract
// Retreive all extrafields for contract
// fetch optionals attributes and labels
$line->fetch_optionals();
@ -920,7 +918,7 @@ class Contrat extends CommonObject
$modCodeContract = new $module();
if (!empty($modCodeContract->code_auto)) {
// Mise a jour ref
// Update ref
$sql = 'UPDATE '.MAIN_DB_PREFIX."contrat SET ref='(PROV".$this->id.")' WHERE rowid=".$this->id;
if ($this->db->query($sql))
{
@ -944,14 +942,14 @@ class Contrat extends CommonObject
}
}
// Insert contacts commerciaux ('SALESREPSIGN','contrat')
// Insert business contacts ('SALESREPSIGN','contrat')
if (! $error)
{
$result=$this->add_contact($this->commercial_signature_id,'SALESREPSIGN','internal');
if ($result < 0) $error++;
}
// Insert contacts commerciaux ('SALESREPFOLL','contrat')
// Insert business contacts ('SALESREPFOLL','contrat')
if (! $error)
{
$result=$this->add_contact($this->commercial_suivi_id,'SALESREPFOLL','internal');

1
htdocs/core/boxes/box_actions.php
View File

@ -260,6 +260,5 @@ class box_actions extends ModeleBoxes
return '';
}
}

1
htdocs/core/boxes/box_bookmarks.php
View File

@ -161,6 +161,5 @@ class box_bookmarks extends ModeleBoxes
{
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

2
htdocs/core/boxes/box_clients.php
View File

@ -163,7 +163,6 @@ class box_clients extends ModeleBoxes
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}
}
/**
@ -178,6 +177,5 @@ class box_clients extends ModeleBoxes
{
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_commandes.php
View File

@ -202,6 +202,5 @@ class box_commandes extends ModeleBoxes
{
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

2
htdocs/core/boxes/box_comptes.php
View File

@ -174,7 +174,6 @@ class box_comptes extends ModeleBoxes
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}
}
/**
@ -189,6 +188,5 @@ class box_comptes extends ModeleBoxes
{
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_contacts.php
View File

@ -189,6 +189,5 @@ class box_contacts extends ModeleBoxes
{
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_contracts.php
View File

@ -185,6 +185,5 @@ class box_contracts extends ModeleBoxes
{
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_external_rss.php
View File

@ -198,6 +198,5 @@ class box_external_rss extends ModeleBoxes
{
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_factures.php
View File

@ -206,5 +206,4 @@ class box_factures extends ModeleBoxes
{
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_factures_fourn.php
View File

@ -218,6 +218,5 @@ class box_factures_fourn extends ModeleBoxes
{
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

2
htdocs/core/boxes/box_factures_fourn_imp.php
View File

@ -191,7 +191,6 @@ class box_factures_fourn_imp extends ModeleBoxes
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}
}
/**
@ -206,6 +205,5 @@ class box_factures_fourn_imp extends ModeleBoxes
{
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_factures_imp.php
View File

@ -209,5 +209,4 @@ class box_factures_imp extends ModeleBoxes
{
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_ficheinter.php
View File

@ -170,6 +170,5 @@ class box_ficheinter extends ModeleBoxes
{
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

2
htdocs/core/boxes/box_fournisseurs.php
View File

@ -150,7 +150,6 @@ class box_fournisseurs extends ModeleBoxes
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}
}
/**
@ -165,6 +164,5 @@ class box_fournisseurs extends ModeleBoxes
{
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_goodcustomers.php
View File

@ -159,7 +159,6 @@ class box_goodcustomers extends ModeleBoxes
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}
}
/**

1
htdocs/core/boxes/box_graph_invoices_permonth.php
View File

@ -280,6 +280,5 @@ class box_graph_invoices_permonth extends ModeleBoxes
{
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
View File

@ -279,6 +279,5 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
{
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_graph_orders_permonth.php
View File

@ -278,6 +278,5 @@ class box_graph_orders_permonth extends ModeleBoxes
{
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_graph_orders_supplier_permonth.php
View File

@ -277,6 +277,5 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
{
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

2
htdocs/core/boxes/box_graph_product_distribution.php
View File

@ -401,7 +401,6 @@ class box_graph_product_distribution extends ModeleBoxes
'text' => $mesg
);
}
}
/**
@ -416,6 +415,5 @@ class box_graph_product_distribution extends ModeleBoxes
{
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_graph_propales_permonth.php
View File

@ -281,6 +281,5 @@ class box_graph_propales_permonth extends ModeleBoxes
{
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_lastlogin.php
View File

@ -98,7 +98,6 @@ class box_lastlogin extends ModeleBoxes
'td' => '',
'text' => $tmp,
);
}

2
htdocs/core/boxes/box_members.php
View File

@ -168,7 +168,6 @@ class box_members extends ModeleBoxes
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}
}
/**
@ -183,6 +182,5 @@ class box_members extends ModeleBoxes
{
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_produits.php
View File

@ -230,6 +230,5 @@ class box_produits extends ModeleBoxes
{
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_produits_alerte_stock.php
View File

@ -242,6 +242,5 @@ class box_produits_alerte_stock extends ModeleBoxes
{
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_project.php
View File

@ -184,7 +184,6 @@ class box_project extends ModeleBoxes
'td' => '',
'text' => "&nbsp;",
);
}
/**

1
htdocs/core/boxes/box_propales.php
View File

@ -192,6 +192,5 @@ class box_propales extends ModeleBoxes
{
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_prospect.php
View File

@ -180,6 +180,5 @@ class box_prospect extends ModeleBoxes
{
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

2
htdocs/core/boxes/box_services_contracts.php
View File

@ -222,7 +222,6 @@ class box_services_contracts extends ModeleBoxes
'text' => $langs->trans("ReadPermissionNotAllowed")
);
}
}
/**
@ -237,6 +236,5 @@ class box_services_contracts extends ModeleBoxes
{
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

3
htdocs/core/boxes/box_services_expired.php
View File

@ -184,6 +184,5 @@ class box_services_expired extends ModeleBoxes
{
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}
}

1
htdocs/core/boxes/box_supplier_orders.php
View File

@ -188,6 +188,5 @@ class box_supplier_orders extends ModeleBoxes
{
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_task.php
View File

@ -137,7 +137,6 @@ class box_task extends ModeleBoxes
$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot,'all',25200,5));
$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot,'all',25200,5));
$this->info_box_contents[$i][] = array('td' => '', 'text' => "");
}
/**

4
htdocs/core/boxes/modules_boxes.php
View File

@ -31,7 +31,7 @@
*
* Boxes parent class
*/
class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" boxes
class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" boxes
{
/**
* @var DoliDB Database handler
@ -503,8 +503,6 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty"
}
return $widget;
}
}

1
htdocs/core/class/CMailFile.class.php
View File

@ -471,7 +471,6 @@ class CMailFile
// --------------------------------------
$this->error = 'Bad value for sendmode';
}
}

1
htdocs/core/class/CSMSFile.class.php
View File

@ -244,6 +244,5 @@ class CSMSFile
@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
}
}
}

1
htdocs/core/class/antivir.class.php
View File

@ -179,6 +179,5 @@ class AntiVir
return $ret;
}
}

1
htdocs/core/class/canvas.class.php
View File

@ -208,5 +208,4 @@ class Canvas
return $ret;
}
}
}

1
htdocs/core/class/ccountry.class.php
View File

@ -333,5 +333,4 @@ class Ccountry // extends CommonObject
return 1;
}
}
}

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

@ -767,7 +767,6 @@ abstract class CommonDocGenerator
}
return $array_to_fill;
}

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

@ -1063,7 +1063,6 @@ abstract class CommonObject
dol_print_error($this->db);
return -1;
}
}
/**
@ -2026,7 +2025,6 @@ abstract class CommonObject
$this->db->commit();
return 1;
}
}
@ -4622,7 +4620,6 @@ abstract class CommonObject
if (isset($conf->global->$keyforfieldname)) return $conf->global->$keyforfieldname;
// TODO Ad here a scan into table llx_overwrite_default with a filter on $this->element and $fieldname
}
@ -7243,5 +7240,4 @@ abstract class CommonObject
{
return count($this->comments);
}
}

1
htdocs/core/class/commonorder.class.php
View File

@ -144,6 +144,5 @@ abstract class CommonOrderLine extends CommonObjectLine
public $info_bits = 0;
public $special_code = 0;
}

1
htdocs/core/class/commonstickergenerator.class.php
View File

@ -266,5 +266,4 @@ abstract class CommonStickerGenerator
$this->_Height = $this->_Convert_Metric($format['height'], $this->_Metric, $this->_Metric_Doc);
$this->Set_Char_Size($pdf, $format['font-size']);
}
}

Some files were not shown because too many files have changed in this diff Show More