Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-09 19:18:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
108,088 Commits 36 Branches 190 Tags
cb15a21e41f9af36d14247fbb3f5da8ff4c05588
Commit Graph

335 Commits

Author SHA1 Message Date
Laurent Destailleur
8b7e790130 Merge pull request #19677 from Hystepik/develop#1 
NEW : Import with select boxes
 2022-04-11 17:35:23 +02:00
Laurent Destailleur
b0f538387e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
 2022-02-18 21:50:08 +01:00
lvessiller
1107a60b58 FIX compute rule in FEC import 2022-02-18 16:53:55 +01:00
lmarcouiller
8e11b1c996 import with select boxes 2021-12-23 11:25:57 +01:00
lmarcouiller
c4efac891a remove warning 2021-12-20 16:10:07 +01:00
lmarcouiller
11eac8eee9 Merge branch 'develop#1' of github.com:Hystepik/dolibarr into develop#1 2021-12-20 14:41:08 +01:00
lmarcouiller
981cfe18a9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-12-20 14:40:53 +01:00
Christian Foellmann
6608f5f0d8 update all script tags to be uniform. language="javascript" removed 
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
 2021-11-29 15:09:18 +01:00
Laurent Destailleur
441af6b6fb Fix add rel="noopener noreferrer" 2021-11-22 02:35:55 +01:00
Laurent Destailleur
d891dd8ddc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/stocks.lang
	htdocs/product/stats/card.php
	htdocs/projet/element.php
	htdocs/salaries/card.php
 2021-10-31 16:19:10 +01:00
Laurent Destailleur
82a35f82b4 CSS 2021-10-28 11:33:22 +02:00
Laurent Destailleur
d1794d7948 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modAdherent.class.php
 2021-10-28 11:05:38 +02:00
Laurent Destailleur
4bde20dd8d Can make update during import of members 2021-10-27 09:23:03 +02:00
Laurent Destailleur
fcdfd370ba Fix css 2021-10-26 14:31:55 +02:00
Lucas Marcouiller
5dfb496bad update import.php to start import to line 2 2021-10-23 17:16:19 +02:00
Lucas Marcouiller
b3e9aeef7a Fix : PHP 8.0 warnings 2021-10-23 16:12:44 +02:00
lmarcouiller
aae79a1d0e WIP import select 2021-10-13 14:56:10 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Laurent Destailleur
9811569b2b FIX #18289 #18294 2021-07-31 16:22:50 +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
Laurent Destailleur
31db1dc412 Fix management of visibility of export/import templates. 2021-06-21 15:03:45 +02:00
Laurent Destailleur
e99355a0c2 Clean html 2021-04-30 15:22:17 +02:00
UT from dolibit
769f052618 Delete index.html 2021-04-12 19:25:19 +02:00
Laurent Destailleur
04536f9ec8 Fix import 2021-04-08 17:49:13 +02:00
Laurent Destailleur
625ade1a53 Clean log 2021-03-31 12:41:44 +02:00
Frédéric FRANCE
aefc3bcef8 fix php8 warnings 2021-03-16 18:13:02 +01:00
UT from dolibit
914702fa8f Update import.php 
$help_url = 'EN:Module_Imports_En|FR:Module_Imports|ES:Módulo_Importaciones';

use of  $help_url
 2021-03-16 14:00:25 +01:00
Alexandre SPANGARO
6960f0dc25 Uniformize translation 2021-03-16 04:22:55 +01:00
Laurent Destailleur
cc10106a21 Fix protection on int 2021-03-14 12:20:23 +01:00
Frédéric FRANCE
6cef78befb code syntax hrm imports install intracommreport loan directory 2021-02-26 18:20:21 +01:00
Philippe GRAND
f96f100c37 standardization, internationalisation 2021-02-09 14:25:41 +01:00
Philippe GRAND
046affcd0d standardization, internationalisation 2021-02-09 14:24:53 +01:00
Philippe GRAND
a827a9ee6d standardization, internationalisation 2021-02-09 14:22:47 +01:00
Laurent Destailleur
dbfeba661d Fix value show 0 if empty 2021-02-05 14:53:57 +01:00
Laurent Destailleur
ac83cea83a Fix avoid to run import twice by clicking on tab step6 
Fix timeout for real import step
 2021-02-05 14:34:04 +01:00
Laurent Destailleur
c9e232f2ff Try to fix import/export timeout by dynamic increase 2021-02-03 18:00:27 +01:00
Laurent Destailleur
40ae1808de Look and fell v13 2020-12-16 16:06:33 +01:00
Laurent Destailleur
acb73966f7 Clean code. Removed phpexcel library. 2020-12-13 16:27:44 +01:00
Stephane Lesage
bcf4f65cc9 Fix & sync import/export entity icons/labels translation 2020-12-10 14:15:33 +01:00
Laurent Destailleur
aa853f9259 Debug v13 2020-12-04 20:02:04 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Frédéric FRANCE
5a3780e062 end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Frédéric FRANCE
9a470fa42d replace deprecated 2020-10-22 22:50:03 +02:00
Laurent Destailleur
b8681c0b41 css 2020-10-08 11:59:33 +02:00
Laurent Destailleur
24d35ff9b5 CSS 2020-10-08 11:52:58 +02:00
Laurent Destailleur
580df3d503 Merge pull request #14880 from rabib-metroworks/import-proposal 
NEW Can import proposals
 2020-10-01 19:09:14 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Ahmad Jamaly Rabib
0b35a07290 NEW ADDED IMPORT TOOL FOR PROPOSAL MODULE 
Added proposal import functionality in import module
 2020-10-01 11:52:56 +06:00
Laurent Destailleur
3f1c9999db urlencode 2020-09-30 18:44:26 +02:00