';
- if ($total != $object->amount) print img_warning("AmountOfFileDiffersFromSumOfInvoices");
+ if (empty($offset) && $num <= $limit) // If we have all record on same page, then the following test/warning can be done
+ {
+ if ($total != $object->amount) print img_warning("TotalAmountOfdirectDebitOrderDiffersFromSumOfLines");
+ }
print price($total);
print "
\n";
print '
';
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index a60330270d4..92ba7f621cb 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -739,14 +739,13 @@ class BonPrelevement extends CommonObject
$sql = "SELECT count(f.rowid) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
$sql.= ", ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
- $sql.= " WHERE f.fk_statut = 1";
+ $sql.= " WHERE f.fk_statut = ".Facture::STATUS_VALIDATED;
$sql.= " AND f.entity IN (".getEntity('invoice').")";
$sql.= " AND f.rowid = pfd.fk_facture";
- $sql.= " AND f.paye = 0";
$sql.= " AND pfd.traite = 0";
$sql.= " AND f.total_ttc > 0";
- dol_syslog(get_class($this)."::SommeAPrelever");
+ dol_syslog(get_class($this)."::NbFactureAPrelever");
$resql = $this->db->query($sql);
if ( $resql )
@@ -759,7 +758,7 @@ class BonPrelevement extends CommonObject
}
else
{
- $this->error=get_class($this)."::SommeAPrelever Erreur -1 sql=".$this->db->error();
+ $this->error=get_class($this)."::NbFactureAPrelever Erreur -1 sql=".$this->db->error();
return -1;
}
}
@@ -798,8 +797,6 @@ class BonPrelevement extends CommonObject
$month = strftime("%m", $datetimeprev);
$year = strftime("%Y", $datetimeprev);
- $puser = new User($this->db, $conf->global->PRELEVEMENT_USER);
-
$this->invoice_in_error = array();
$this->thirdparty_in_error = array();
@@ -1631,8 +1628,8 @@ class BonPrelevement extends CommonObject
public static function buildRumNumber($row_code_client, $row_datec, $row_drum)
{
global $langs;
- $pre = $langs->trans('RUM').'-';
- return $pre.$row_code_client.'-'.$row_drum.'-'.date('U', $row_datec);
+ $pre = substr(dol_string_nospecial(dol_string_unaccent($langs->transnoentitiesnoconv('RUM'))), 0, 3); // Must always be on 3 char ('RUM' or 'UMR'. This is a protection against bad translation)
+ return $pre.'-'.$row_code_client.'-'.$row_drum.'-'.date('U', $row_datec);
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index eaef92a1abc..dce08c5c66b 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
// Load translation files required by the page
-$langs->loadLangs(array('banks', 'categories', 'widthdrawals', 'companies', 'bills'));
+$langs->loadLangs(array('banks', 'categories', 'withdrawals', 'companies', 'bills'));
// Security check
if ($user->societe_id) $socid=$user->societe_id;
@@ -105,6 +105,7 @@ if (empty($reshook))
/*
* View
*/
+
$form = new Form($db);
$thirdpartystatic=new Societe($db);
@@ -207,9 +208,11 @@ $sql.= " ".MAIN_DB_PREFIX."societe as s,";
$sql.= " ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
$sql.= " WHERE s.rowid = f.fk_soc";
$sql.= " AND f.entity IN (".getEntity('invoice').")";
+$sql.= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
+$sql.= " AND f.total_ttc > 0";
$sql.= " AND pfd.traite = 0";
$sql.= " AND pfd.fk_facture = f.rowid";
-if ($socid) $sql.= " AND f.fk_soc = ".$socid;
+if ($socid > 0) $sql.= " AND f.fk_soc = ".$socid;
$nbtotalofrecords = '';
if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
@@ -293,7 +296,7 @@ if ($resql)
$i++;
}
}
- else print '
'.$langs->trans("None").'
';
+ else print '
'.$langs->trans("None").'
';
print "";
print "";
print " \n";
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index 8f9df284291..a34fde042e5 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -35,31 +35,43 @@ $langs->loadLangs(array('banks', 'categories', 'withdrawals', 'companies'));
// Security check
$socid = GETPOST('socid', 'int');
+$status = GETPOST('status', 'int');
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'prelevement', '', '', 'bons');
-// Get supervariables
-$page = GETPOST('page', 'int');
-$sortorder = GETPOST('sortorder', 'alpha');
-$sortfield = GETPOST('sortfield', 'alpha');
+$contextpage= GETPOST('contextpage', 'aZ')?GETPOST('contextpage', 'aZ'):'myobjectlist'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
+$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+// Load variable for pagination
$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield", 'alpha');
$sortorder = GETPOST("sortorder", 'alpha');
$page = GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; } // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
$offset = $limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
if (! $sortorder) $sortorder="DESC";
if (! $sortfield) $sortfield="f.ref";
+$massactionbutton = '';
+
/*
* View
*/
-llxHeader();
+if (!$status)
+{
+ $title = $langs->trans("RequestStandingOrderToTreat");
+}
+else
+{
+ $title = $langs->trans("RequestStandingOrderTreated");
+}
+
+llxHeader('', $title);
$thirdpartystatic=new Societe($db);
$invoicestatic=new Facture($db);
@@ -78,95 +90,126 @@ $sql.= " WHERE s.rowid = f.fk_soc";
$sql.= " AND f.entity IN (".getEntity('invoice').")";
if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
if ($socid) $sql.= " AND f.fk_soc = ".$socid;
-if (!$statut) $sql.= " AND pfd.traite = 0";
-if ($statut) $sql.= " AND pfd.traite = ".$statut;
+if (!$status) $sql.= " AND pfd.traite = 0";
+if ($status) $sql.= " AND pfd.traite = ".$status;
+$sql.= " AND f.total_ttc > 0";
+$sql.= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
$sql.= " AND pfd.fk_facture = f.rowid";
if (dol_strlen(trim(GETPOST('search_societe', 'alpha'))))
{
$sql.= natural_search("s.nom", 'search_societe');
}
-$sql.= " ORDER BY $sortfield $sortorder ";
-$sql.= $db->plimit($limit+1, $offset);
+$sql.=$db->order($sortfield, $sortorder);
-$resql=$db->query($sql);
-if ($resql)
+
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
{
- $num = $db->num_rows($resql);
- $i = 0;
-
- if (!$statut)
+ $resql = $db->query($sql);
+ $nbtotalofrecords = $db->num_rows($resql);
+ if (($page * $limit) > $nbtotalofrecords) // if total of record found is smaller than page * limit, goto and load page 0
{
- print_barre_liste($langs->trans("RequestStandingOrderToTreat"), $page, "demandes.php", $urladd, $sortfield, $sortorder, '', $num);
+ $page = 0;
+ $offset = 0;
}
- else
- {
- print_barre_liste($langs->trans("RequestStandingOrderTreated"), $page, "demandes.php", $urladd, $sortfield, $sortorder, '', $num);
- }
-
- print '';
+}
+// if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
+if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
+{
+ $num = $nbtotalofrecords;
}
else
{
- dol_print_error($db);
+ $sql.= $db->plimit($limit+1, $offset);
+
+ $resql=$db->query($sql);
+ if (! $resql)
+ {
+ dol_print_error($db);
+ exit;
+ }
+
+ $num = $db->num_rows($resql);
}
+
+
+$newcardbutton = ''.$langs->trans("Back").'';
+
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic', 0, $newcardbutton, '', $limit);
+
+print '';
+
+
// End of page
llxFooter();
$db->close();
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 1be716f8f61..44db7dd2625 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -71,6 +71,7 @@ $thirdpartystatic=new Societe($db);
$invoicestatic=new Facture($db);
$bprev = new BonPrelevement($db);
+
print '
';
print '
'.$langs->trans("Statistics").'
';
@@ -100,6 +101,8 @@ if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX
$sql.= " , ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
$sql.= " WHERE s.rowid = f.fk_soc";
$sql.= " AND f.entity IN (".getEntity('invoice').")";
+$sql.= " AND f.total_ttc > 0";
+$sql.= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
$sql.= " AND pfd.traite = 0 AND pfd.fk_facture = f.rowid";
if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
if ($socid) $sql.= " AND f.fk_soc = ".$socid;
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index 86dda559061..c17724e2de5 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -184,7 +184,7 @@ class PaymentSocialContribution extends CommonObject
$remaintopay=price2num($contrib->amount - $paiement - $creditnotes - $deposits, 'MT');
if ($remaintopay == 0)
{
- $result=$contrib->set_paid($user, '', '');
+ $result=$contrib->set_paid($user);
}
else dol_syslog("Remain to pay for conrib ".$contribid." not null. We do nothing.");
}
diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example
index 4d26fef7965..84fc87d35f8 100644
--- a/htdocs/conf/conf.php.example
+++ b/htdocs/conf/conf.php.example
@@ -152,7 +152,9 @@ $dolibarr_main_db_collation='utf8_unicode_ci';
// dolibarr_main_instance_unique_id
-// An ID that is unique for each installation.
+// An secret ID that is unique for each installation.
+// This value is also visible and never propagated outside of Dolibarr, so it can be used as a salt / key for some encryption.
+// To propagate a unique key, you propagate the value concatenated with a string with a hash function. Example: md5('dolibarr'+dolibarr_main_instance_unique_id)
// Default value: randomly defined during installation
// Examples:
// $dolibarr_main_instance_unique_id='84b5bc91f83b56e458db71e0adac2b62';
diff --git a/htdocs/contrat/class/api_contracts.class.php b/htdocs/contrat/class/api_contracts.class.php
index 4735f840582..194e145210f 100644
--- a/htdocs/contrat/class/api_contracts.class.php
+++ b/htdocs/contrat/class/api_contracts.class.php
@@ -108,7 +108,7 @@ class Contracts extends DolibarrApi
$obj_ret = array();
// case of external user, $thirdparty_ids param is ignored and replaced by user's socid
- $socids = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : $thirdparty_ids;
+ $socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
// If the internal user must only see his customers, force searching by him
$search_sale = 0;
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index eabe0440dca..43ad52b5f47 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -428,7 +428,7 @@ class CMailFile
foreach ($this->images_encoded as $img)
{
//$img['fullpath'],$img['image_encoded'],$img['name'],$img['content_type'],$img['cid']
- $attachment = Swift_Image::fromPath($img['fullpath'], $img['content_type']);
+ $attachment = Swift_Image::fromPath($img['fullpath']);
// embed image
$imgcid = $this->message->embed($attachment);
// replace cid by the one created by swiftmail in html message
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 1a1b5c597ce..f71e0c93739 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4587,10 +4587,15 @@ abstract class CommonObject
*/
protected function commonGenerateDocument($modelspath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams = null)
{
- global $conf, $langs, $user;
+ global $conf, $langs, $user, $hookmanager;
$srctemplatepath='';
+ $parameters = array('modelspath'=>$modelspath,'modele'=>$modele,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'hidedesc'=>$hidedesc,'hideref'=>$hideref, 'moreparams'=>$moreparams);
+ $reshook = $hookmanager->executeHooks('commonGenerateDocument', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+
+ if(empty($reshook))
+ {
dol_syslog("commonGenerateDocument modele=".$modele." outputlangs->defaultlang=".(is_object($outputlangs)?$outputlangs->defaultlang:'null'));
// Increase limit for PDF build
@@ -4835,6 +4840,8 @@ abstract class CommonObject
dol_print_error('', $this->error);
return -1;
}
+ }
+ else return $reshook;
}
/**
@@ -6608,9 +6615,12 @@ abstract class CommonObject
}
else
{
- $csstyle='';
$class=(!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');
+ $csstyle='';
if (is_array($params) && count($params)>0) {
+ if (array_key_exists('class', $params)) {
+ $class.=$params['class'].' ';
+ }
if (array_key_exists('style', $params)) {
$csstyle=$params['style'];
}
@@ -6647,16 +6657,19 @@ abstract class CommonObject
$labeltoshow = $langs->trans($label);
- $out .= '
';
print "\n";
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 2207148e4ea..204d832a94c 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -55,13 +55,6 @@ $langs->load("holiday");
$childids = $user->getAllChildIds(1);
-$cancreate = 0;
-if (! empty($user->rights->holiday->write_all)) $cancreate=1;
-if (! empty($user->rights->holiday->write) && in_array($fuserid, $childids)) $cancreate=1;
-
-$candelete = 0;
-if (! empty($user->rights->holiday->delete)) $candelete=1;
-
$morefilter = 'AND employee = 1';
if (! empty($conf->global->HOLIDAY_FOR_NON_SALARIES_TOO)) $morefilter = '';
@@ -82,6 +75,13 @@ if ($id > 0)
}
}
+$cancreate = 0;
+if (! empty($user->rights->holiday->write_all)) $cancreate=1;
+if (! empty($user->rights->holiday->write) && in_array($fuserid, $childids)) $cancreate=1;
+
+$candelete = 0;
+if (! empty($user->rights->holiday->delete)) $candelete=1;
+if ($object->statut == Holiday::STATUS_DRAFT && $user->rights->holiday->write && in_array($object->fk_user, $childids)) $candelete=1;
/*
* Actions
@@ -1435,7 +1435,7 @@ else
{
print ''.$langs->trans("SetToDraft").'';
}
- if ($user->rights->holiday->delete && ($object->statut == Holiday::STATUS_DRAFT || $object->statut == Holiday::STATUS_CANCELED || $object->statut == Holiday::STATUS_REFUSED)) // If draft or canceled or refused
+ if ($candelete && ($object->statut == Holiday::STATUS_DRAFT || $object->statut == Holiday::STATUS_CANCELED || $object->statut == Holiday::STATUS_REFUSED)) // If draft or canceled or refused
{
print ''.$langs->trans("DeleteCP").'';
}
diff --git a/htdocs/install/mysql/data/llx_c_hrm_public_holiday.sql b/htdocs/install/mysql/data/llx_c_hrm_public_holiday.sql
index 5b6f4bf3f0c..312c30210c8 100644
--- a/htdocs/install/mysql/data/llx_c_hrm_public_holiday.sql
+++ b/htdocs/install/mysql/data/llx_c_hrm_public_holiday.sql
@@ -41,3 +41,4 @@ INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, year, month, day
INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, year, month, day, active) VALUES('FRASSOMPTION', 0, 1, 0, 8, 15, 1);
INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, year, month, day, active) VALUES('FRTOUSSAINT', 0, 1, 0, 11, 1, 1);
INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, year, month, day, active) VALUES('FRARMISTICE', 0, 1, 0, 11, 11, 1);
+--INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('EASTER', 0, 1, 'easter', 0, 0, 0, 1);
diff --git a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
index 7ef80e9b5b6..4bf4cef6bba 100644
--- a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
+++ b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
@@ -106,6 +106,7 @@ ALTER TABLE llx_societe_contacts ADD CONSTRAINT fk_societe_contacts_fk_c_type_co
ALTER TABLE llx_societe_contacts ADD CONSTRAINT fk_societe_contacts_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe(rowid);
ALTER TABLE llx_societe_contacts ADD CONSTRAINT fk_societe_contacts_fk_socpeople FOREIGN KEY (fk_socpeople) REFERENCES llx_socpeople(rowid);
+ALTER TABLE llx_accounting_account MODIFY COLUMN rowid bigint AUTO_INCREMENT;
create table llx_c_hrm_public_holiday
(
@@ -121,4 +122,6 @@ create table llx_c_hrm_public_holiday
import_key varchar(14)
)ENGINE=innodb;
+ALTER TABLE llx_supplier_proposaldet ADD COLUMN date_start datetime DEFAULT NULL;
+ALTER TABLE llx_supplier_proposaldet ADD COLUMN date_end datetime DEFAULT NULL;
diff --git a/htdocs/install/mysql/tables/llx_accounting_account.sql b/htdocs/install/mysql/tables/llx_accounting_account.sql
index 727965f6a9d..fd1962b6c09 100644
--- a/htdocs/install/mysql/tables/llx_accounting_account.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_account.sql
@@ -21,7 +21,7 @@
create table llx_accounting_account
(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
+ rowid bigint AUTO_INCREMENT PRIMARY KEY,
entity integer DEFAULT 1 NOT NULL,
datec datetime,
tms timestamp,
diff --git a/htdocs/install/mysql/tables/llx_supplier_proposaldet.sql b/htdocs/install/mysql/tables/llx_supplier_proposaldet.sql
index 211502686ee..b735046a340 100644
--- a/htdocs/install/mysql/tables/llx_supplier_proposaldet.sql
+++ b/htdocs/install/mysql/tables/llx_supplier_proposaldet.sql
@@ -40,6 +40,8 @@ CREATE TABLE llx_supplier_proposaldet (
total_localtax2 double(24,8) DEFAULT 0,
total_ttc double(24,8) DEFAULT 0,
product_type integer DEFAULT 0,
+ date_start datetime DEFAULT NULL, -- date debut si service
+ date_end datetime DEFAULT NULL, -- date fin si service
info_bits integer DEFAULT 0,
buy_price_ht double(24,8) DEFAULT 0,
fk_product_fournisseur_price integer DEFAULT NULL,
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 494e7d4a8a3..a8f7f9643ce 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -218,7 +218,7 @@ DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external
DoliPartnersDesc=List of companies providing custom-developed modules or features. Note: since Dolibarr is an open source application, anyone experienced in PHP programming may develop a module.
WebSiteDesc=External websites for more add-on (non-core) modules...
DevelopYourModuleDesc=Some solutions to develop your own module...
-URL=Link
+URL=URL
BoxesAvailable=Widgets available
BoxesActivated=Widgets activated
ActivateOn=Activate on
@@ -1940,4 +1940,5 @@ RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allow
RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
BaseOnSabeDavVersion=Based on the library SabreDAV version
NotAPublicIp=Not a public IP
-MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
\ No newline at end of file
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
+FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang
index aee4d7bb988..1de1251831a 100644
--- a/htdocs/langs/en_US/cron.lang
+++ b/htdocs/langs/en_US/cron.lang
@@ -81,3 +81,4 @@ JobDisabled=Job disabled
MakeLocalDatabaseDumpShort=Local database backup
MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 64ebfc40b32..c4611836a51 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -825,6 +825,7 @@ Mandatory=Mandatory
Hello=Hello
GoodBye=GoodBye
Sincerely=Sincerely
+ConfirmDeleteObject=Are you sure you want to delete this object?
DeleteLine=Delete line
ConfirmDeleteLine=Are you sure you want to delete this line?
NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
diff --git a/htdocs/langs/en_US/mrp.lang b/htdocs/langs/en_US/mrp.lang
index 360f4303f07..96efb3be55f 100644
--- a/htdocs/langs/en_US/mrp.lang
+++ b/htdocs/langs/en_US/mrp.lang
@@ -15,3 +15,5 @@ ManufacturingEfficiency=Manufacturing efficiency
ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
DeleteBillOfMaterials=Delete Bill Of Materials
ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+MenuMRP=Manufacturing Orders
+NewMO=New Manufacturing Order
\ No newline at end of file
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index 256bd2a7d4d..3197cc12bca 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -37,7 +37,6 @@ StatusOrderDeliveredShort=Delivered
StatusOrderToBillShort=Delivered
StatusOrderApprovedShort=Approved
StatusOrderRefusedShort=Refused
-StatusOrderBilledShort=Billed
StatusOrderToProcessShort=To process
StatusOrderReceivedPartiallyShort=Partially received
StatusOrderReceivedAllShort=Products received
@@ -50,7 +49,6 @@ StatusOrderProcessed=Processed
StatusOrderToBill=Delivered
StatusOrderApproved=Approved
StatusOrderRefused=Refused
-StatusOrderBilled=Billed
StatusOrderReceivedPartially=Partially received
StatusOrderReceivedAll=All products received
ShippingExist=A shipment exists
@@ -156,3 +154,31 @@ OptionToSetOrderBilledNotEnabled=Option (from module Workflow) to set order to '
IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
SetShippingMode=Set shipping mode
+
+#### supplier orders status
+StatusSupplierOrderCanceledShort=Canceled
+StatusSupplierOrderDraftShort=Draft
+StatusSupplierOrderValidatedShort=Validated
+StatusSupplierOrderSentShort=In process
+StatusSupplierOrderSent=Shipment in process
+StatusSupplierOrderOnProcessShort=Ordered
+StatusSupplierOrderProcessedShort=Processed
+StatusSupplierOrderDelivered=Delivered
+StatusSupplierOrderDeliveredShort=Delivered
+StatusSupplierOrderToBillShort=Delivered
+StatusSupplierOrderApprovedShort=Approved
+StatusSupplierOrderRefusedShort=Refused
+StatusSupplierOrderToProcessShort=To process
+StatusSupplierOrderReceivedPartiallyShort=Partially received
+StatusSupplierOrderReceivedAllShort=Products received
+StatusSupplierOrderCanceled=Canceled
+StatusSupplierOrderDraft=Draft (needs to be validated)
+StatusSupplierOrderValidated=Validated
+StatusSupplierOrderOnProcess=Ordered - Standby reception
+StatusSupplierOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusSupplierOrderProcessed=Processed
+StatusSupplierOrderToBill=Delivered
+StatusSupplierOrderApproved=Approved
+StatusSupplierOrderRefused=Refused
+StatusSupplierOrderReceivedPartially=Partially received
+StatusSupplierOrderReceivedAll=All products received
\ No newline at end of file
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index 88e5eaf128c..b1d6e30e329 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -76,7 +76,7 @@ WithdrawalFile=Withdrawal file
SetToStatusSent=Set to status "File Sent"
ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
StatisticsByLineStatus=Statistics by status of lines
-RUM=Unique Mandate Reference (UMR)
+RUM=UMR
DateRUM=Mandate signature date
RUMLong=Unique Mandate Reference
RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index bbbeb2638e8..a2c6fa1ea82 100644
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -156,3 +156,33 @@ OptionToSetOrderBilledNotEnabled=L'option (issue du module Workflow) pour défin
IfValidateInvoiceIsNoOrderStayUnbilled=Si la validation de facture est à "Non", la commande restera au statut "Non facturé" jusqu'à ce que la facture soit validée.
CloseReceivedSupplierOrdersAutomatically=Fermer la commande au statut "%s" automatiquement si tous les produits ont été reçus.
SetShippingMode=Définir la méthode d'expédition
+
+###### statuts commandes fournisseurs
+StatusSupplierOrderCanceledShort=Annulée
+StatusSupplierOrderDraftShort=Brouillon
+StatusSupplierOrderValidatedShort=Validée
+StatusSupplierOrderSentShort=En cours
+StatusSupplierOrderSent=Envoi en cours
+StatusSupplierOrderOnProcessShort=Commandé
+StatusSupplierOrderProcessedShort=Traitée
+StatusSupplierOrderDelivered=Livrée
+StatusSupplierOrderDeliveredShort=Livrée
+StatusSupplierOrderToBillShort=Livré
+StatusSupplierOrderApprovedShort=Approuvée
+StatusSupplierOrderRefusedShort=Refusée
+StatusSupplierOrderBilledShort=Facturée
+StatusSupplierOrderToProcessShort=À traiter
+StatusSupplierOrderReceivedPartiallyShort=Reçue partiellement
+StatusSupplierOrderReceivedAllShort=Produits reçus
+StatusSupplierOrderCanceled=Annulée
+StatusSupplierOrderDraft=Brouillon (à valider)
+StatusSupplierOrderValidated=Validée
+StatusSupplierOrderOnProcess=Commandé - en attente de réception
+StatusSupplierOrderOnProcessWithValidation=Commandé - en attente de réception ou validation
+StatusSupplierOrderProcessed=Traitée
+StatusSupplierOrderToBill=Livrée
+StatusSupplierOrderApproved=Approuvée
+StatusSupplierOrderRefused=Refusée
+StatusSupplierOrderBilled=Facturée
+StatusSupplierOrderReceivedPartially=Reçue partiellement
+StatusSupplierOrderReceivedAll=Tous les produits reçus
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 1c3c899b19c..4b7efffdfed 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -2195,7 +2195,7 @@ elseif (! empty($module))
print '