Répartition opérations details/amortization

amortization.html

@@ -110,11 +110,6 @@
 
 <nav style="margin-bottom: 1em;">
 <aside> {{* class="right">*}}
-	{{if $total_amort == 0}}
-		{{:linkbutton label="Modifier les paramètres" href="modify_infos.html?immo_doc_id=%s"|args:$_GET.immo_doc_id shape="edit" target="_dialog"}}
-		{{:linkbutton label="Supprimer les paramètres" href="delete_infos.html?immo_doc_id=%s"|args:$_GET.immo_doc_id shape="delete" target="_dialog"}}
-		{{:linkbutton label="Attacher une écriture d'avoir" href="link_immo.html?immo_doc_id=%s"|args:$_GET.immo_doc_id shape="link" target="_dialog"}}
-	{{/if}}
 	{{if $free_amort_lines}}
 		{{:linkbutton
 			label="Attacher un amortissement"
@@ -145,7 +140,9 @@
 						<td>{{$line.date|date_short}}</td>
 						<td class="money">{{"%f"|math:$line.amount|money_currency_html:false|raw}}</td>
 						<td>
-							{{:linkbutton label="Détacher" href="detach_credit.html?immo_doc_id=%s&credit_line_id=%s"|args:$_GET.immo_doc_id:$line.credit_line_id shape="minus"}}
+							{{if $total_amort == 0}}
+								{{:linkbutton label="Détacher" href="detach_credit.html?immo_doc_id=%s&credit_line_id=%s"|args:$_GET.immo_doc_id:$line.credit_line_id shape="minus"}}
+							{{/if}}
 						</td>
 					</tr>
 				{{/foreach}}

attach_credit.html

@@ -127,9 +127,9 @@
 {{if $_GET.from == "exit"}}
 	{{:redirect force="exit_step1.html?immo_doc_id=%s&ok=1&msg=attach_avoir"|args:$_GET.immo_doc_id}}
 {{else}}
-	{{:redirect force="amortization.html?immo_doc_id=%s&ok=1&msg=attach_avoir"|args:$_GET.immo_doc_id}}
+	{{:redirect force="details_immo.html?immo_doc_id=%s&ok=1&msg=attach_credit"|args:$_GET.immo_doc_id}}
+	{{*:redirect force="amortization.html?immo_doc_id=%s&ok=1&msg=attach_avoir"|args:$_GET.immo_doc_id*}}
 {{/if}}
-{{*:redirect to="details_immo.html?immo_doc_id=%s&ok=1&msg=attach_credit"|args:$_GET.immo_doc_id*}}
 {{/form}}
 
 {{:admin_header title="Écritures au crédit du compte d'immobilisation" custom_css="./style.css" current="module_amortization"}}

detach_credit.html

@@ -27,6 +27,6 @@
 {{if $_GET.from == "exit"}}
 	{{:redirect force="exit_step1.html?immo_doc_id=%s&ok=1&msg=detach_avoir"|args:$_GET.immo_doc_id}}
 {{else}}
-	{{:redirect	force="amortization.html?immo_doc_id=%s&ok=1&msg=detach_avoir"|args:$_GET.immo_doc_id}}
+	{{:redirect force="details_immo.html?immo_doc_id=%s&ok=1&msg=detach&"|args:$_GET.immo_doc_id}}
+	{{*:redirect force="amortization.html?immo_doc_id=%s&ok=1&msg=detach_avoir"|args:$_GET.immo_doc_id*}}
 {{/if}}
-{{*:redirect to="details_immo.html?immo_doc_id=%s&ok=1&msg=detach&"|args:$_GET.immo_doc_id*}}

details_immo.html

@@ -31,25 +31,19 @@
 
 {{:admin_header title="Détails de l'immobilisation" custom_css="./style.css" current="module_amortization"}}
 
-{{*
 {{if ! $dialog}}
 	{{:assign subsubcurrent=null}}
-	{{if $total_credits == 0 && $total_amort == 0}}
-		{{:assign subsubcurrent="credit"}}
-	{{/if}}
 	{{if $total_amort == 0}}
-		{{:assign subsubcurrent=$subsubcurrent|cat:"-modif"}}
+		{{:assign subsubcurrent="credit"}}
 	{{/if}}
 	{{:include file="_nav.html" current="index" subcurrent="details" subsubcurrent=$subsubcurrent}}
 {{/if}}
-*}}
 {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.trans_id}}
 
+{{*
 <nav class="tabs">
 	<aside>
-		{{*if $total_credits == 0*}}
 		{{:linkbutton label="Rattacher une écriture d'avoir" href="link_immo.html?immo_doc_id=%s"|args:$_GET.immo_doc_id shape="link" target="_dialog"}}
-		{{*/if*}}
 	</aside>
 	<nav style="margin-bottom: 1em;">
 		{{:linkbutton shape="left" label="Retour à la liste des immobilisations" href="index.html}}
@@ -59,6 +53,7 @@
 		{{/if}}
 	</nav>
 </nav>
+*}}
 
 {{if $_GET.ok}}
 	{{if $_GET.msg|match:"attach_amort"}}
@@ -96,7 +91,9 @@
 						<td>{{$line.date|date_short}}</td>
 						<td class="money">{{"%f"|math:$line.amount|money_currency_html:false|raw}}</td>
 						<td>
-							{{:linkbutton label="Détacher" href="detach_credit.html?immo_doc_id=%s&credit_line_id=%s"|args:$_GET.immo_doc_id:$line.credit_line_id shape="minus"}}
+							{{if $total_amort == 0}}
+								{{:linkbutton label="Détacher" href="detach_credit.html?immo_doc_id=%s&credit_line_id=%s"|args:$_GET.immo_doc_id:$line.credit_line_id shape="minus"}}
+							{{/if}}
 						</td>
 					</tr>
 				{{/foreach}}

modify_infos.html

@@ -168,7 +168,7 @@
 	{{else}}
 		{{:assign type_immo="other"}}
 	{{/if}}
-	{{:redirect force="index.html?ok=1&msg=infos&type_immo=%s"|args:$type_immo}}
+	{{:redirect force="details_immo.html?immo_doc_id=%s&type_immo=%s&ok=1&msg=infos"|args:$_GET.immo_doc_id:$type_immo}}
 
 {{/form}}
 
@@ -219,6 +219,7 @@
 				{{/if}}
 				{{:input type="date" name="date_achat" label="Date d'acquisition" default=$info_immo.date_achat}}
 				{{:input type="date" name="date_mes" label="Date de mise en service" default=$info_immo.date_mes}}
+{{*
 				{{if $linked_immos != null}}
 					<dt><label>Écritures d'avoir liées à l'immobilisation</label></dt>
 					<dd>
@@ -233,6 +234,7 @@
 						</span>
 					</dd>
 				{{/if}}
+*}}
 			</div>
 		</dl>
 	</fieldset>