Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-29 04:03:20 +01:00
Code Issues Packages Projects Releases Wiki Activity
145,227 Commits 38 Branches 191 Tags
0de4e225fb702681d7e9d19ecda1c1da170a357e
Commit Graph

39551 Commits

Author SHA1 Message Date
Laurent Destailleur
1496043967 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-18 19:17:46 +02:00
Laurent Destailleur
97c83c2cbb Debug v20 2024-07-18 19:17:15 +02:00
Laurent Destailleur
9e45367826 Code comment 2024-07-18 17:26:18 +02:00
Laurent Destailleur
6213c167fd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-18 02:44:55 +02:00
Laurent Destailleur
a39d55474f Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-18 02:44:35 +02:00
Laurent Destailleur
b303be54fd Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-07-18 02:41:28 +02:00
lamrani abdelwadoud
56667da139 New Export stock inventory (#30401) 
* New Export stock with correction

* Fix Travis CI errors
 2024-07-18 00:45:23 +02:00
Laurent Destailleur
3141d69d7b Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-07-17 20:33:08 +02:00
Laurent Destailleur
a2c46d4e1f Fix for port socket 2024-07-17 20:31:36 +02:00
Laurent Destailleur
33e377e2c7 QUAL: Clean code 2024-07-17 19:47:13 +02:00
Laurent Destailleur
7a57b704cc Fix phan 2024-07-17 14:53:14 +02:00
Laurent Destailleur
948fecb9b5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2024-07-17 14:01:44 +02:00
Alexandre SPANGARO
26eb9b4948 Situation invoice - Fix column title (#30406) 2024-07-17 13:45:51 +02:00
Sami Filali
22def4f35a Fix #30298 - billing contact in supplier proposal (#30404) 
* add external contact with billing code in supplier_proposal pdf

* update with pr returns

* Update pdf_other.php

* fix inversing condition

* Update pdf_other.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-07-16 22:35:09 +02:00
Sami Filali
4aa5e4578a NEW : add option to add external billing contact on the supplier_proposal pdf (#30298) 
* add external contact with billing code in supplier_proposal pdf

* update with pr returns

* Update pdf_other.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-07-16 22:09:39 +02:00
Laurent Destailleur
d9962e22ee FIX Import of date with type field from excel files does not work. 2024-07-16 21:38:40 +02:00
Laurent Destailleur
19462bf5d5 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-16 14:49:25 +02:00
Bahfir Abbes
c4b21bf741 Fix: position of select key is 2 not 4 (#30374) 
Fix: position of select key is 2 not 4
 2024-07-16 13:01:08 +02:00
Bahfir Abbes
6d52e55702 Fix: position of select key is 2 not 4 (#30374) 
Fix: position of select key is 2 not 4
 2024-07-16 13:00:02 +02:00
Laurent Destailleur
791741cc71 Debug v20 - fix param for filter on boolean 2024-07-16 10:27:51 +02:00
Laurent Destailleur
bd57bcf617 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-15 19:52:31 +02:00
Laurent Destailleur
78ac402856 Fix css for etrafields text 2024-07-15 18:50:26 +02:00
Laurent Destailleur
fcd2aeb026 Debug v20 2024-07-15 18:00:45 +02:00
Laurent Destailleur
7c6fbf21bb Fix menu link 2024-07-15 17:29:08 +02:00
Laurent Destailleur
ac1704ec49 Clean menu for AI generation modes 2024-07-15 13:40:55 +02:00
Laurent Destailleur
2588406898 FIX Use of cache for file in filemanager was broken 2024-07-14 19:56:55 +02:00
Laurent Destailleur
29fbbca010 Debug v20 2024-07-14 18:41:24 +02:00
Laurent Destailleur
c1cd6e288d Debug v20 2024-07-14 18:40:56 +02:00
Laurent Destailleur
f15d3a1147 Look and feel v21 2024-07-14 18:40:45 +02:00
Laurent Destailleur
16572677fa Clean code for vat check popup 2024-07-14 17:23:42 +02:00
Laurent Destailleur
19a8344962 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-07-13 18:35:29 +02:00
Laurent Destailleur
b58c93833e Fix phan warning 2024-07-13 18:35:03 +02:00
Laurent Destailleur
150e162022 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-13 18:22:59 +02:00
Alexandre SPANGARO
388ac640f6 Situation invoice - Missing Category of operations in Octopus head (#30356) 2024-07-13 18:14:36 +02:00
Laurent Destailleur
20eef11950 Fix phan 2024-07-13 18:04:13 +02:00
Laurent Destailleur
5661a381ee Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/projet/tasks/time.php
 2024-07-13 17:47:55 +02:00
Laurent Destailleur
305406d802 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2024-07-13 17:45:13 +02:00
Laurent Destailleur
88ee5ec89a Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-07-13 17:41:37 +02:00
lvessiller-opendsi
09fdb887bb FIX expedition PDF models using units labels (#30358) 2024-07-13 17:18:05 +02:00
Laurent Destailleur
085a56fab4 Fix phpunit 2024-07-13 17:16:18 +02:00
Laurent Destailleur
d48b976966 Fix phpunit 2024-07-13 02:32:31 +02:00
Laurent Destailleur
f00f82a3b6 Fix phpunit 2024-07-13 02:23:55 +02:00
Laurent Destailleur
d90ae09a52 FIX Bad format of amount in invoice create page 2024-07-13 01:59:22 +02:00
Laurent Destailleur
ba08148ffa Clean code 2024-07-13 01:38:02 +02:00
Laurent Destailleur
13e8ae7bb9 FIX Bad format of amount in invoice create page 2024-07-13 01:19:39 +02:00
Florent Poinsaut
38b2da8f0a Fix indent #10789 2024-07-12 21:56:38 +02:00
Laurent Destailleur
e3d858692e Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-12 01:54:11 +02:00
Laurent Destailleur
7661b87f80 QUAL Removed inclusion of the file json.lib.php 2024-07-12 01:53:47 +02:00
Laurent Destailleur
07483c90d4 Add deprecated mention 2024-07-12 01:46:43 +02:00
Laurent Destailleur
d3ebd3fbe7 SEC: Possible RCE when php module json off. +Warning in security page. 2024-07-12 01:43:53 +02:00