lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
100,672 Commits 43 Branches 150 Tags 886 MiB
068622bced
Commit Graph

88839 Commits

Author SHA1 Message Date
Laurent Destailleur
e62ed28701 Debug v14 2021-06-26 15:39:52 +02:00
Laurent Destailleur
f4a512fa7b
Merge pull request #18004 from OPEN-DSI/new-export-parent-compnay-document-lines 
NEW parent company on exports
 2021-06-26 12:30:57 +02:00
Laurent Destailleur
97f5a0e541
Merge pull request #18018 from frederic34/patch-7 
export value of checkbox instead id with EXPORT_LABEL_FOR_SELECT
 2021-06-26 12:24:01 +02:00
Laurent Destailleur
781df5a8a8
Merge pull request #18016 from fappels/13_fix_klaas 
FIX #17919 pictures in docs.
 2021-06-26 12:22:57 +02:00
Laurent Destailleur
eb6415c374
Merge pull request #18024 from frederic34/patch-11 
fix warnings in propal list
 2021-06-26 12:19:17 +02:00
Laurent Destailleur
5dc82ccb71
Merge pull request #18023 from frederic34/patch-8 
fix inexistent right
 2021-06-26 12:18:42 +02:00
Laurent Destailleur
012f326168
Merge pull request #18020 from Hystepik/develop#1 
Fix : error display fr phone number
 2021-06-26 12:18:16 +02:00
Laurent Destailleur
a64100f277
Merge pull request #18026 from frederic34/patch-13 
fix warnings
 2021-06-26 12:17:14 +02:00
Laurent Destailleur
877252521e
Merge pull request #18025 from frederic34/patch-12 
fix warnings in propal list
 2021-06-26 12:16:50 +02:00
Laurent Destailleur
61761876a4
Merge pull request #18027 from frederic34/patch-14 
fix warning
 2021-06-26 12:02:11 +02:00
Laurent Destailleur
49688f327c
Merge pull request #18028 from frederic34/patch-15 
fix warnings
 2021-06-26 12:02:04 +02:00
Laurent Destailleur
df6d160374 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-26 12:00:42 +02:00
Laurent Destailleur
cc65e4bb38 FIX #18030 2021-06-26 12:00:25 +02:00
Laurent Destailleur
67e7556f70
Merge pull request #18032 from OPEN-DSI/new-invoice-create-from-clone-errors 
NEW get errors on create invoice from clone
 2021-06-26 11:53:45 +02:00
Laurent Destailleur
bc816f253c Fix tooltip 2021-06-26 02:07:18 +02:00
Laurent Destailleur
720ea16bb1 css 2021-06-26 02:00:30 +02:00
Laurent Destailleur
2fd47615eb Fix load of conf when using alternative $db 2021-06-26 01:46:14 +02:00
Laurent Destailleur
12d591b848 css 2021-06-26 00:18:46 +02:00
Laurent Destailleur
ccffb36a37 CSS 2021-06-26 00:14:53 +02:00
Laurent Destailleur
6e3647af2c Debug v14 2021-06-26 00:08:19 +02:00
Laurent Destailleur
c7b03da7e6 Fix bad object used 2021-06-25 23:43:22 +02:00
Laurent Destailleur
d2485033d7 Fix deletion of template invoice 2021-06-25 23:10:42 +02:00
lvessiller
2cb2ec02d6 NEW parent compnay in order supplier lines export 2021-06-25 17:04:19 +02:00
lvessiller
24acc82ca6 NEW get errors on create invoice from clone 2021-06-25 16:40:39 +02:00
Laurent Destailleur
c4e9e1c8df Comment 2021-06-25 10:50:58 +02:00
Laurent Destailleur
46ae7180f8 Fix phpunit. Refused @@ char in sql. 2021-06-25 10:47:31 +02:00
Francis Appels
ec805d36fe Remove deprecated level parameter. 2021-06-25 10:02:23 +02:00
Frédéric FRANCE
438e37ed59
fix warnings 2021-06-24 21:12:32 +02:00
Frédéric FRANCE
06522d5b2e
fix warning 2021-06-24 21:01:23 +02:00
Frédéric FRANCE
6e1c4ed980
fix warnings 2021-06-24 20:30:11 +02:00
Frédéric FRANCE
fde23632ce
Update list.php 2021-06-24 20:20:50 +02:00
Frédéric FRANCE
aad45a8157
fix warnings in propal list 2021-06-24 20:15:57 +02:00
Frédéric FRANCE
f92cc8f5a3
fix warnings in propal list 2021-06-24 20:11:40 +02:00
Frédéric FRANCE
7a2ec389a1
fix inexistent right 2021-06-24 18:57:22 +02:00
lmarcouiller
98244a5e44 Fix : error display fr phone number 2021-06-24 14:20:19 +02:00
Laurent Destailleur
a4e6eb12a8 Fix migration pgsql 2021-06-24 12:46:50 +02:00
Laurent Destailleur
b47fa50d05 Try postgresl migration fix 2021-06-24 12:46:04 +02:00
Francis Appels
88f7ca9214 Fix MAIN_GENERATE_RECEPTION_WITH_PICTURE 2021-06-24 12:27:39 +02:00
Laurent Destailleur
cfc5646059 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-24 12:18:30 +02:00
Laurent Destailleur
a2d451dbfb Missing extrafield on report 2021-06-24 12:17:32 +02:00
Francis Appels
dc9e71084b Fix missing posYAfterImage for nexy for espadon and squille 2021-06-24 12:15:29 +02:00
Laurent Destailleur
2859ff46b5 Fix link of type of membership 2021-06-24 12:08:11 +02:00
Frédéric FRANCE
47b1d2b7df
export value of checkbox instead id with EXPORT_LABEL_FOR_SELECT 2021-06-24 11:54:05 +02:00
Laurent Destailleur
2c4fd9e409 Debug ENTREPOT_EXTRA_STATUS 2021-06-24 11:51:10 +02:00
Francis Appels
d20bd5bcf6 fix ctrl-y 2021-06-24 10:18:21 +02:00
Francis Appels
09382e0505 FIX #17919 pictures in docs. 
Supplier order and proposal worked for me.
Supplier invoice not implemented need new feature request.
 2021-06-24 10:12:34 +02:00
Laurent Destailleur
e23ce0bb97 Trans 2021-06-24 09:57:54 +02:00
Laurent Destailleur
594f7c8e9e Fix code for v14 2021-06-24 09:54:30 +02:00
Laurent Destailleur
8d3b156d47 Fix php8 2021-06-23 19:07:42 +02:00
Laurent Destailleur
c03958a867 Fix look and feel v14 2021-06-23 19:02:14 +02:00
atm-lena
7eddf43aef FIX List and Create Companies Left Menus 2021-06-23 17:33:02 +02:00
Laurent Destailleur
743474513b Fix option SOCIETE_ASK_FOR_WAREHOUSE 2021-06-23 16:53:26 +02:00
Laurent Destailleur
4327d53c60 Fix closing linkto section when js on. 2021-06-23 14:38:24 +02:00
Laurent Destailleur
a657fe2fca Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-23 13:31:40 +02:00
Laurent Destailleur
6db44e66d6 FIX #18006 2021-06-23 13:30:00 +02:00
Laurent Destailleur
293b67a693 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/compta/cashcontrol/report.php
 2021-06-23 13:08:05 +02:00
Laurent Destailleur
acce226c05 Debug cash fence feature (missing report per vat rate) 2021-06-23 13:00:50 +02:00
Laurent Destailleur
3a30d41fbf Fix missing properties 2021-06-23 11:44:10 +02:00
Laurent Destailleur
11a71d8d2f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
 2021-06-23 11:41:30 +02:00
Laurent Destailleur
c46097ccd9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/main.inc.php
 2021-06-23 11:39:17 +02:00
Laurent Destailleur
034906a129 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
	htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
 2021-06-23 11:30:44 +02:00
Laurent Destailleur
f24d8a31af Fix migration 2021-06-23 11:14:28 +02:00
Laurent Destailleur
eb9be15c4c Fix php8 2021-06-23 10:52:05 +02:00
Laurent Destailleur
c9d4ccd40a
Merge pull request #17845 from atm-gauthier/fix_libstatus_invoice_in_linked_objects_block 
FIX : need to add payment sum to getlibstatus function in object linked block (bug still exists in 13.0)
 2021-06-23 10:48:22 +02:00
Laurent Destailleur
9c657206b3
Update linkedobjectblock.tpl.php 2021-06-23 10:47:51 +02:00
Laurent Destailleur
56212508e7
Update linkedobjectblock.tpl.php 2021-06-23 10:47:23 +02:00
Laurent Destailleur
82ee5c2825 Clean code 2021-06-23 10:42:27 +02:00
Laurent Destailleur
d57699b7d7 css 2021-06-23 10:22:51 +02:00
Laurent Destailleur
3bc1f90589 Fix rounding 2021-06-23 02:51:31 +02:00
Laurent Destailleur
5c6c708531 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-23 02:45:22 +02:00
Laurent Destailleur
40b35cc44a Fix upload file form has disappear 2021-06-23 02:45:06 +02:00
Laurent Destailleur
95680a585c
Merge pull request #17997 from frederic34/patch-9 
move admin warnings on top instead bottom
 2021-06-23 02:33:00 +02:00
Laurent Destailleur
30087bd16a
Merge pull request #18001 from aspangaro/14b15 
Fix Forget information in tooltip for direct download
 2021-06-23 02:31:45 +02:00
Laurent Destailleur
cf28fcc8cd CSS 2021-06-23 02:22:49 +02:00
Laurent Destailleur
62822c424c Fix php8 2021-06-23 01:34:14 +02:00
Laurent Destailleur
28d416a00d Try fix of phpunit 2021-06-23 00:58:27 +02:00
Laurent Destailleur
de7df8ad9f Fix lang 2021-06-22 19:11:58 +02:00
Laurent Destailleur
c08255657e Fix pgsql 2021-06-22 18:59:14 +02:00
Laurent Destailleur
12748640a5 Add log 2021-06-22 18:04:06 +02:00
Laurent Destailleur
ecd028d124 Clean code 2021-06-22 17:33:43 +02:00
Laurent Destailleur
bcffbe3d67 Test fix 2021-06-22 17:09:02 +02:00
Laurent Destailleur
f6eb5b76f5 css 2021-06-22 15:45:47 +02:00
Laurent Destailleur
2f6a91f506 Look and feel v14 2021-06-22 15:25:49 +02:00
Alexandre SPANGARO
26c5875f97 Uniformize accounting dyiplays 2021-06-22 14:20:08 +02:00
lvessiller
21ebfb6094 NEW parent company on exports 2021-06-22 14:13:18 +02:00
Alexandre SPANGARO
f1a5d4009f Merge remote-tracking branch 'upstream/develop' into 14b15 2021-06-22 14:07:52 +02:00
Laurent Destailleur
d6e9947cd4 CSS 2021-06-22 12:30:50 +02:00
Laurent Destailleur
312968eeac Clean code 2021-06-22 11:38:02 +02:00
Laurent Destailleur
8887f71c26 Doc 2021-06-22 10:57:16 +02:00
Laurent Destailleur
05c0bc4fac css 2021-06-22 10:44:49 +02:00
Alexandre SPANGARO
23f6e183d3 Forget information in tooltip for direct download 2021-06-21 21:51:41 +02:00
Laurent Destailleur
6702a452e3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-21 20:58:58 +02:00
Laurent Destailleur
6014e4407f Clean code 2021-06-21 20:50:56 +02:00
Laurent Destailleur
a0b594fbdc Debug emailcollector 2021-06-21 19:47:43 +02:00
damien clochard
05bb2c720d FIX #17996: Avoid implicit type casts for llx_adherent_type.subscription 
The llx_adherent_type.subscription column is VARCHAR so we need to
compare it with a string, not an int.
 2021-06-21 18:24:52 +02:00
Laurent Destailleur
31db1dc412 Fix management of visibility of export/import templates. 2021-06-21 15:03:45 +02:00
Laurent Destailleur
5697e86c09 Fix columns for export/import profile 2021-06-21 14:12:33 +02:00
Laurent Destailleur
ac8564dc34 Fix disable token renewal on .css.php, .js.php and .json.php 2021-06-21 13:06:40 +02:00
Laurent Destailleur
aca190d977 Fix css 2021-06-21 12:46:24 +02:00
Laurent Destailleur
9c0ab1960b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-21 12:46:15 +02:00