Laurent Destailleur преди 4 години
родител
ревизия
fa4786a3f6
променени са 35 файла, в които са добавени 35 реда и са изтрити 36 реда
  1. 1 1
      htdocs/adherents/document.php
  2. 1 1
      htdocs/asset/document.php
  3. 1 1
      htdocs/bom/bom_document.php
  4. 1 1
      htdocs/comm/action/document.php
  5. 1 1
      htdocs/comm/propal/document.php
  6. 1 1
      htdocs/commande/document.php
  7. 1 1
      htdocs/compta/bank/account_statement_document.php
  8. 1 1
      htdocs/compta/bank/document.php
  9. 1 1
      htdocs/compta/bank/various_payment/document.php
  10. 1 1
      htdocs/compta/deplacement/document.php
  11. 1 1
      htdocs/compta/facture/document.php
  12. 1 1
      htdocs/compta/sociales/document.php
  13. 1 1
      htdocs/compta/tva/document.php
  14. 1 1
      htdocs/contact/document.php
  15. 1 1
      htdocs/contrat/document.php
  16. 1 1
      htdocs/don/document.php
  17. 1 1
      htdocs/expedition/document.php
  18. 1 1
      htdocs/expensereport/document.php
  19. 1 1
      htdocs/fichinter/document.php
  20. 1 1
      htdocs/fourn/commande/document.php
  21. 1 1
      htdocs/holiday/document.php
  22. 1 1
      htdocs/loan/document.php
  23. 2 2
      htdocs/modulebuilder/template/myobject_document.php
  24. 1 1
      htdocs/mrp/mo_document.php
  25. 0 1
      htdocs/product/stock/productlot_document.php
  26. 1 1
      htdocs/projet/document.php
  27. 1 1
      htdocs/projet/tasks/document.php
  28. 1 1
      htdocs/recruitment/recruitmentcandidature_document.php
  29. 1 1
      htdocs/recruitment/recruitmentjobposition_document.php
  30. 1 1
      htdocs/resource/document.php
  31. 1 1
      htdocs/salaries/document.php
  32. 1 1
      htdocs/societe/document.php
  33. 1 1
      htdocs/supplier_proposal/document.php
  34. 1 1
      htdocs/ticket/document.php
  35. 1 1
      htdocs/user/document.php

+ 1 - 1
htdocs/adherents/document.php

@@ -182,7 +182,7 @@ if ($id > 0) {
 		print dol_get_fiche_end();
 
 		$modulepart = 'member';
-		$permission = $user->rights->adherent->creer;
+		$permissiontoadd = $user->rights->adherent->creer;
 		$permtoedit = $user->rights->adherent->creer;
 		$param = '&id='.$object->id;
 		include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';

+ 1 - 1
htdocs/asset/document.php

@@ -128,7 +128,7 @@ if ($id > 0 || !empty($ref)) {
 		print dol_get_fiche_end();
 
 		$modulepart = 'asset';
-		$permission = $user->rights->asset->write;
+		$permissiontoadd = $user->rights->asset->write;
 		$permtoedit = $user->rights->asset->write;
 		$param = '&id='.$object->id;
 		include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';

+ 1 - 1
htdocs/bom/bom_document.php

@@ -147,7 +147,7 @@ if ($object->id) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'bom';
-	$permission = $user->rights->bom->write;
+	$permissiontoadd = $user->rights->bom->write;
 	$permtoedit = $user->rights->bom->write;
 	$param = '&id='.$object->id;
 

+ 1 - 1
htdocs/comm/action/document.php

@@ -287,7 +287,7 @@ if ($object->id > 0) {
 
 
 	$modulepart = 'actions';
-	$permission = $user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create;
+	$permissiontoadd = $user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {

+ 1 - 1
htdocs/comm/propal/document.php

@@ -189,7 +189,7 @@ if ($object->id > 0) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'propal';
-	$permission = $user->rights->propal->creer;
+	$permissiontoadd = $user->rights->propal->creer;
 	$permtoedit = $user->rights->propal->creer;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';

+ 1 - 1
htdocs/commande/document.php

@@ -184,7 +184,7 @@ if ($id > 0 || !empty($ref)) {
 		print dol_get_fiche_end();
 
 		$modulepart = 'commande';
-		$permission = $user->rights->commande->creer;
+		$permissiontoadd = $user->rights->commande->creer;
 		$permtoedit = $user->rights->commande->creer;
 		$param = '&id='.$object->id.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity);
 		include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';

+ 1 - 1
htdocs/compta/bank/account_statement_document.php

@@ -183,7 +183,7 @@ if ($id > 0 || !empty($ref)) {
 
 
 		$modulepart = 'bank';
-		$permission = $user->rights->banque->modifier;
+		$permissiontoadd = $user->rights->banque->modifier;
 		$permtoedit = $user->rights->banque->modifier;
 		$param = '&id='.$object->id.'&num='.urlencode($numref);
 		$moreparam = '&num='.urlencode($numref);

+ 1 - 1
htdocs/compta/bank/document.php

@@ -136,7 +136,7 @@ if ($id > 0 || !empty($ref)) {
 
 
 		$modulepart = 'bank';
-		$permission = $user->rights->banque->modifier;
+		$permissiontoadd = $user->rights->banque->modifier;
 		$permtoedit = $user->rights->banque->modifier;
 		$param = '&id='.$object->id;
 		include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';

+ 1 - 1
htdocs/compta/bank/various_payment/document.php

@@ -150,7 +150,7 @@ if ($object->id) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'banque';
-	$permission = $user->rights->banque->modifier;
+	$permissiontoadd = $user->rights->banque->modifier;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {

+ 1 - 1
htdocs/compta/deplacement/document.php

@@ -126,7 +126,7 @@ if ($object->id) {
 	print '</div>';
 
 	$modulepart = 'deplacement';
-	$permission = $user->rights->deplacement->creer;
+	$permissiontoadd = $user->rights->deplacement->creer;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {

+ 1 - 1
htdocs/compta/facture/document.php

@@ -181,7 +181,7 @@ if ($id > 0 || !empty($ref)) {
 		print dol_get_fiche_end();
 
 		$modulepart = 'facture';
-		$permission = $user->rights->facture->creer;
+		$permissiontoadd = $user->rights->facture->creer;
 		$permtoedit = $user->rights->facture->creer;
 		$param = '&id='.$object->id;
 		include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';

+ 1 - 1
htdocs/compta/sociales/document.php

@@ -164,7 +164,7 @@ if ($object->id) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'tax';
-	$permission = $user->rights->tax->charges->creer;
+	$permissiontoadd = $user->rights->tax->charges->creer;
 	$permtoedit = $user->rights->tax->charges->creer;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';

+ 1 - 1
htdocs/compta/tva/document.php

@@ -150,7 +150,7 @@ if ($object->id) {
 
 	print dol_get_fiche_end();
 
-	$permission = $user->rights->tax->charges->creer;
+	$permissiontoadd = $user->rights->tax->charges->creer;
 	$permtoedit = $user->rights->tax->charges->creer;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';

+ 1 - 1
htdocs/contact/document.php

@@ -182,7 +182,7 @@ if ($object->id) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'contact';
-	$permission = $user->rights->societe->contact->creer;
+	$permissiontoadd = $user->rights->societe->contact->creer;
 	$permtoedit = $user->rights->societe->contact->creer;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';

+ 1 - 1
htdocs/contrat/document.php

@@ -192,7 +192,7 @@ if ($object->id) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'contract';
-	$permission = $user->rights->contrat->creer;
+	$permissiontoadd = $user->rights->contrat->creer;
 	$permtoedit = $user->rights->contrat->creer;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';

+ 1 - 1
htdocs/don/document.php

@@ -188,7 +188,7 @@ if ($object->id) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'don';
-	$permission = $user->rights->don->creer;
+	$permissiontoadd = $user->rights->don->creer;
 	$permtoedit = $user->rights->don->creer;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';

+ 1 - 1
htdocs/expedition/document.php

@@ -177,7 +177,7 @@ if ($id > 0 || !empty($ref)) {
 		print dol_get_fiche_end();
 
 		$modulepart = 'expedition';
-		$permission = $user->rights->expedition->creer;
+		$permissiontoadd = $user->rights->expedition->creer;
 		$permtoedit = $user->rights->expedition->creer;
 		$param = '&id='.$object->id;
 		include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';

+ 1 - 1
htdocs/expensereport/document.php

@@ -154,7 +154,7 @@ if ($object->id) {
 
 
 	$modulepart = 'expensereport';
-	$permission = $user->rights->expensereport->creer;
+	$permissiontoadd = $user->rights->expensereport->creer;
 	$permtoedit = $user->rights->expensereport->creer;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';

+ 1 - 1
htdocs/fichinter/document.php

@@ -170,7 +170,7 @@ if ($object->id) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'ficheinter';
-	$permission = $user->rights->ficheinter->creer;
+	$permissiontoadd = $user->rights->ficheinter->creer;
 	$permtoedit = $user->rights->ficheinter->creer;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';

+ 1 - 1
htdocs/fourn/commande/document.php

@@ -178,7 +178,7 @@ if ($object->id > 0) {
 
 
 	$modulepart = 'commande_fournisseur';
-	$permission = ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer);
+	$permissiontoadd = ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer);
 	$permtoedit = ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer);
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';

+ 1 - 1
htdocs/holiday/document.php

@@ -349,7 +349,7 @@ if ($object->id) {
 
 
 	$modulepart = 'holiday';
-	$permission = $user->rights->holiday->write;
+	$permissiontoadd = $user->rights->holiday->write;
 	$permtoedit = $user->rights->holiday->write;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';

+ 1 - 1
htdocs/loan/document.php

@@ -160,7 +160,7 @@ if ($object->id) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'loan';
-	$permission = $user->rights->loan->write;
+	$permissiontoadd = $user->rights->loan->write;
 	$permtoedit = $user->rights->loan->write;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';

+ 2 - 2
htdocs/modulebuilder/template/myobject_document.php

@@ -233,8 +233,8 @@ if ($object->id) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'mymodule';
-	//$permission = $user->rights->mymodule->myobject->write;
-	$permission = 1;
+	//$permissiontoadd = $user->rights->mymodule->myobject->write;
+	$permissiontoadd = 1;
 	//$permtoedit = $user->rights->mymodule->myobject->write;
 	$permtoedit = 1;
 	$param = '&id='.$object->id;

+ 1 - 1
htdocs/mrp/mo_document.php

@@ -179,7 +179,7 @@ if ($object->id) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'mrp';
-	$permission = $user->rights->mrp->write;
+	$permissiontoadd = $user->rights->mrp->write;
 	$permtoedit = $user->rights->mrp->write;
 	$param = '&id='.$object->id;
 

+ 0 - 1
htdocs/product/stock/productlot_document.php

@@ -193,7 +193,6 @@ if ($object->id) {
 
 	print dol_get_fiche_end();
 
-	$permission = ($user->rights->produit->creer);
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {

+ 1 - 1
htdocs/projet/document.php

@@ -165,7 +165,7 @@ if ($object->id > 0) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'project';
-	$permission = ($userWrite > 0);
+	$permissiontoadd = ($userWrite > 0);
 	$permtoedit = ($userWrite > 0);
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {

+ 1 - 1
htdocs/projet/tasks/document.php

@@ -324,7 +324,7 @@ if ($object->id > 0) {
 		$param .= '&withproject=1';
 	}
 	$modulepart = 'project_task';
-	$permission = $user->rights->projet->creer;
+	$permissiontoadd = $user->rights->projet->creer;
 	$permtoedit = $user->rights->projet->creer;
 	$relativepathwithnofile = dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($object->ref).'/';
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';

+ 1 - 1
htdocs/recruitment/recruitmentcandidature_document.php

@@ -212,7 +212,7 @@ if ($object->id) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'recruitment';
-	$permission = $user->rights->recruitment->recruitmentjobposition->write;
+	$permissiontoadd = $user->rights->recruitment->recruitmentjobposition->write;
 	$permtoedit = $user->rights->recruitment->recruitmentjobposition->write;
 	$param = '&id='.$object->id;
 

+ 1 - 1
htdocs/recruitment/recruitmentjobposition_document.php

@@ -211,7 +211,7 @@ if ($object->id) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'recruitment';
-	$permission = $user->rights->recruitment->recruitmentjobposition->write;
+	$permissiontoadd = $user->rights->recruitment->recruitmentjobposition->write;
 	$permtoedit = $user->rights->recruitment->recruitmentjobposition->write;
 	$param = '&id='.$object->id;
 

+ 1 - 1
htdocs/resource/document.php

@@ -139,7 +139,7 @@ if ($object->id > 0) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'dolresource';
-	$permission = $user->rights->resource->write;
+	$permissiontoadd = $user->rights->resource->write;
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {

+ 1 - 1
htdocs/salaries/document.php

@@ -149,7 +149,7 @@ if ($object->id) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'salaries';
-	$permission = $user->rights->salaries->write;
+	$permissiontoadd = $user->rights->salaries->write;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {

+ 1 - 1
htdocs/societe/document.php

@@ -176,7 +176,7 @@ if ($object->id) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'societe';
-	$permission = $user->rights->societe->creer;
+	$permissiontoadd = $user->rights->societe->creer;
 	$permtoedit = $user->rights->societe->creer;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';

+ 1 - 1
htdocs/supplier_proposal/document.php

@@ -163,7 +163,7 @@ if ($object->id > 0) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'supplier_proposal';
-	$permission = $user->rights->supplier_proposal->creer;
+	$permissiontoadd = $user->rights->supplier_proposal->creer;
 	$permtoedit = $user->rights->supplier_proposal->creer;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';

+ 1 - 1
htdocs/ticket/document.php

@@ -203,7 +203,7 @@ if ($object->id) {
 
 	//$object->ref = $object->track_id;	// For compatibility we use track ID for directory
 	$modulepart = 'ticket';
-	$permission = $user->rights->ticket->write;
+	$permissiontoadd = $user->rights->ticket->write;
 	$permtoedit = $user->rights->ticket->write;
 	$param = '&id='.$object->id;
 

+ 1 - 1
htdocs/user/document.php

@@ -176,7 +176,7 @@ if ($object->id) {
 
 
 	$modulepart = 'user';
-	$permission = $user->rights->user->user->creer;
+	$permissiontoadd = $user->rights->user->user->creer;
 	$permtoedit = $user->rights->user->user->creer;
 	$param = '&id='.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';