diff --git a/include/template/status_operation_event-display_operation.php b/include/template/status_operation_event-display_operation.php index 0342b46a4..8ce9d0bbb 100644 --- a/include/template/status_operation_event-display_operation.php +++ b/include/template/status_operation_event-display_operation.php @@ -21,9 +21,7 @@ * \file * \brief */ - -?> -dialog_box_id,"close","","y") ?> @@ -33,6 +31,7 @@ echo HtmlInput::title_box($p_title, $this->dialog_box_id,"close","","y") + @@ -41,6 +40,17 @@ echo HtmlInput::title_box($p_title, $this->dialog_box_id,"close","","y") get_value("select distinct qp_supplier from quant_purchase JOIN JRNX using (j_id) join jrn on (jr_grpt_id=j_grpt) where jrn.jr_id=$1" + ,[$p_array[$i]['jr_id']])); + } else { + $card_tiers=new \Fiche($cn + ,$cn->get_value("select distinct qs_client from quant_sold JOIN JRNX using (j_id) join jrn on (jr_grpt_id=j_grpt) where jrn.jr_id=$1" + ,[$p_array[$i]['jr_id']])); + + } ?> @@ -52,6 +62,14 @@ echo HtmlInput::title_box($p_title, $this->dialog_box_id,"close","","y") + + get_quick_code()); + } + ?> + diff --git a/include/widget/invoice/invoice-display.php b/include/widget/invoice/invoice-display.php index 6a38b2f4b..d736445a4 100644 --- a/include/widget/invoice/invoice-display.php +++ b/include/widget/invoice/invoice-display.php @@ -36,6 +36,12 @@ foreach ($array as $item): if ( $aParam['time_limit'] == 'P' && $today->format('ymd')>$ech->format('ymd') ) continue; $p++; + $card_tiers=false; + if ( $ledger_type=="ACH") { + $card_tiers=new \Fiche($this->db,$this->db->get_value("select distinct qp_supplier from quant_purchase JOIN JRNX using (j_id) join jrn on (jr_grpt_id=j_grpt) where jrn.jr_id=$1",[$item['jr_id']])); + } else { + $card_tiers=new \Fiche($this->db,$this->db->get_value("select distinct qs_client from quant_sold JOIN JRNX using (j_id) join jrn on (jr_grpt_id=j_grpt) where jrn.jr_id=$1",[$item['jr_id']])); + } $class=($p&1)?' odd ':'even'; ?>
@@ -45,6 +51,13 @@ foreach ($array as $item):
+
+ get_quick_code()); + } + ?> +
diff --git a/include/widget/invoice/invoice.php b/include/widget/invoice/invoice.php index 1f7467dc8..2c0552ea0 100644 --- a/include/widget/invoice/invoice.php +++ b/include/widget/invoice/invoice.php @@ -41,7 +41,7 @@ class Invoice extends Widget * @return array */ static function getConstantLimit() :array { - return ['P' => _("Prochaines factures"), "R" => "facture en retard",'T'=>_("Aujourd'hui")]; + return ['P' => _("Prochaines factures"), "R" => _("facture en retard"),'T'=>_("Aujourd'hui")]; } /** @@ -113,6 +113,7 @@ class Invoice extends Widget $array = $acc_ledger->get_operation_date(date('d.m.Y'), $ledger_type, '='); break; } + include "invoice-display.php"; $this->close_div();