Compare commits

...

37 Commits

Author SHA1 Message Date
narindraezway
5a880677c4 Merge branch 'staging' into production 2025-07-09 13:50:01 +03:00
Tiavina
f2f737d6f8 Merge branch 'staging' into production 2025-06-10 17:01:09 +03:00
Tiavina
024df6bcd8 Merge branch 'staging' into production 2025-06-10 15:30:32 +03:00
narindraezway
2b867f27ea Merge branch 'staging' into production 2025-06-05 10:56:58 +03:00
Tiavina
416f4b030a Merge branch 'staging' into production 2025-06-02 15:08:10 +03:00
Tiavina
2d3196ffe4 Merge branch 'staging' into production 2025-05-20 10:21:57 +03:00
narindraezway
fc37e8583d Merge branch 'staging' into production 2025-05-07 15:04:42 +03:00
Tiavina
db6839451b Merge branch 'staging' into production 2025-05-06 16:21:58 +03:00
narindraezway
625e81ac30 Merge branch 'staging' into production 2025-05-05 13:45:31 +03:00
Tiavina
fbce8789c1 Merge branch 'staging' into production 2025-04-30 18:10:30 +03:00
Tiavina
5396c6ad1b Merge branch 'staging' into production 2025-04-30 18:05:52 +03:00
Tiavina
01f9176d32 Merge branch 'staging' into production 2025-04-30 17:51:15 +03:00
Tiavina
f5d1426d12 Merge remote-tracking branch 'origin/staging' into production 2025-04-25 17:30:53 +03:00
Tiavina
8f13e48206 Merge branch 'staging' into production 2025-04-25 15:06:17 +03:00
Tiavina Handrianina
459fda7106 Merge branch 'staging' into 'production'
HOTFIXESdevis list group facturation redirect

See merge request sottye/hytha35!6
2025-04-15 12:27:05 +00:00
Tiavina Handrianina
45f0f81c03 Merge branch 'staging' into 'production'
HOTFIXES OVERRIDE TEMPLATE TYPE CODE

See merge request sottye/hytha35!5
2025-04-15 11:16:07 +00:00
Tiavina Handrianina
1c4a972222 Merge branch 'staging' into 'production'
Deploying facturation at any date for HYTHA 35

See merge request sottye/hytha35!4
2025-04-15 10:16:44 +00:00
Tiavina Handrianina
d065671291 Merge branch 'staging' into 'production'
Deploying compte comptable into production

See merge request sottye/hytha35!3
2025-04-14 13:07:56 +00:00
Tiavina Handrianina
5512c23004 Merge branch 'staging' into 'production'
Merge staging into production

See merge request sottye/hytha35!2
2025-04-10 15:23:52 +00:00
Tiavina
3ea9d4ed52 Merge remote-tracking branch 'origin/staging' into releases/release-hytha-prod 2025-04-07 16:53:43 +03:00
Tiavina
602466d9a9 Merge branch 'staging' into releases/release-hytha-prod 2025-04-04 19:43:40 +03:00
Tiavina
b1fabe9804 Merge branch 'staging' into releases/release-hytha-prod 2025-03-27 08:51:59 +03:00
Tiavina
2bbfe390eb Merge branch 'staging' into releases/release-hytha-prod 2025-03-26 19:55:15 +03:00
Tiavina
12a751c1c3 Merge branch 'staging' into releases/release-hytha-prod 2025-03-26 19:43:51 +03:00
Tiavina
0276655040 Merge branch 'features/feature-devis-group' into releases/release-hytha-prod 2025-03-26 13:06:50 +03:00
Tiavina
5ab91d4be7 Merge branch 'staging' into releases/release-hytha-prod 2025-03-25 13:34:15 +03:00
Tiavina
91c67452c2 Merge branch 'staging' into releases/release-hytha-prod 2025-03-21 09:29:13 +03:00
Tiavina
31633b04d9 Merge branch 'hotfixes/hotfix-update-client' into releases/release-hytha-prod 2025-03-19 11:38:00 +03:00
Tiavina
dc3da8d425 Merge branch 'hotfixes/hotfix-update-client' into releases/release-hytha-prod 2025-03-19 10:50:02 +03:00
Tiavina
ea119f5c73 Merge branch 'hotfixes/hotfix-update-client' into releases/release-hytha-prod 2025-03-19 10:43:24 +03:00
Tiavina
4bd86ae762 Merge branch 'hotfixes/hotfix-update-client' into releases/release-hytha-prod 2025-03-19 10:30:55 +03:00
Tiavina
2c1e771472 Merge branch 'hotfixes/hotfix-update-client' into releases/release-hytha-prod 2025-03-19 10:13:45 +03:00
Tiavina
c07c4aaf88 Merge branch 'staging' into releases/release-hytha-prod 2025-03-18 10:19:21 +03:00
Tiavina
95be6e4827 Merge branch 'staging' into releases/release-hytha-prod 2025-03-17 16:16:16 +03:00
Tiavina
e7c51a4d73 Merge branch 'fixes/fix-rapport-bijoux-text' into releases/release-hytha-prod 2025-03-13 12:06:47 +03:00
Tiavina
f509f5e988 Merge branch 'staging' into releases/release-hytha-prod 2025-03-13 10:53:37 +03:00
Tiavina
f8ff4c6b3e Merge branch 'hotfixes/hotfixe-show-facture-case-and-order-number' into releases/release-hytha-prod 2025-03-07 13:17:00 +03:00
3 changed files with 39 additions and 39 deletions

View File

@ -40,7 +40,7 @@ class DevisPdfHandler extends FPDF {
function Header()
{
if($this->logo != "nothing"){
$this->Image($this->logoPath."logo.png", 2, 2, 50,35);
$this->Image($this->logoPath."logo.png", 10, 10, 75, 25);
}
else{
$this->Cell(55,30,'');

View File

@ -171,7 +171,7 @@ class InvoiceRecapService {
// logo : 80 de largeur et 55 de hauteur
if($doesLogoExist){
$pdf->Image($this->defaultImagePath."logo.png", 2, 2, 50,35);
$pdf->Image($this->defaultImagePath."logo.png", 10, 10, 75, 25);
}
//adresse de mon entreprise
@ -276,7 +276,7 @@ class InvoiceRecapService {
$pdf->SetMargins(0,0,10);
if($doesLogoExist){
$pdf->Image($this->defaultImagePath."logo.png", 2, 2, 50,35);
$pdf->Image($this->defaultImagePath."logo.png", 10, 10, 75, 25);
}
//adresse de mon entreprise
@ -589,7 +589,7 @@ class InvoiceRecapService {
// logo : 80 de largeur et 55 de hauteur
if($doesLogoExist){
$pdf->Image($this->defaultImagePath."logo.png", 2, 2, 50,35);
$pdf->Image($this->defaultImagePath."logo.png", 10, 10, 75, 25);
}
//adresse de mon entreprise
@ -692,7 +692,7 @@ class InvoiceRecapService {
$pdf->SetAutoPagebreak(False);
$pdf->SetMargins(0,0,10);
if($doesLogoExist){
$pdf->Image($this->defaultImagePath."logo.png", 2, 2, 50,35);
$pdf->Image($this->defaultImagePath."logo.png", 10, 10, 75, 25);
}
//adresse de mon entreprise