lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
107,531 Commits 43 Branches 150 Tags 886 MiB
348c54680e
Commit Graph

6648 Commits

Author SHA1 Message Date
Laurent Destailleur
32bf4a993d
Merge pull request #19955 from bb2a/patch-1 
FIX - Holiday trigger
 2022-01-28 17:07:59 +01:00
Laurent Destailleur
ef70777cf1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/reception/card.php
 2022-01-28 15:57:09 +01:00
Anthony Berton
6fdbda93f8
Update 14.0.0-15.0.0.sql 2022-01-28 02:28:55 +01:00
Anthony Berton
dcb7e39bd2
Update llx_c_action_trigger.sql 2022-01-28 02:27:09 +01:00
Laurent Destailleur
2e525a719d Fix selection of migration script 2022-01-26 19:12:02 +01:00
Laurent Destailleur
4b00ddb0b5
Merge pull request #19866 from atm-gauthier/FIX_hrm_divers 
FIX : rankorder + vacant positions
 2022-01-25 14:02:44 +01:00
Laurent Destailleur
daca510fa6 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	build/docker/docker-compose.yml
 2022-01-23 18:52:47 +01:00
Laurent Destailleur
1dcfb88ad4 Debug v15 2022-01-21 13:44:40 +01:00
Cserveny, Tamás
259c94e320 fix docker build setup 2022-01-20 17:57:21 +01:00
Anthony Berton
f093e01cec
Update 14.0.0-15.0.0.sql 2022-01-18 19:34:18 +01:00
Anthony Berton
16ca2d68b6
Update llx_c_action_trigger.sql 2022-01-18 19:31:51 +01:00
Gauthier PC portable 024
255d8ba753 FIX : rankorder + vacant positions 2022-01-18 10:59:10 +01:00
Laurent Destailleur
63df7ba0d4 Clean code 2022-01-15 21:10:33 +01:00
Laurent Destailleur
744296a43a FIX Permission on holiday and expensereport. 2022-01-14 13:52:08 +01:00
Laurent Destailleur
00108589fd Fix creation of fields tms into sql scripts 2022-01-11 01:00:31 +01:00
Laurent Destailleur
cfec02aaae Debug v15 2022-01-10 14:27:43 +01:00
Laurent Destailleur
3a6b5199ec Debug module intracomm 2022-01-08 01:19:04 +01:00
Laurent Destailleur
60b2479389 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/list.php
 2022-01-07 16:00:19 +01:00
Laurent Destailleur
7618966f81 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/list.php
	htdocs/core/class/utils.class.php
	htdocs/install/mysql/data/llx_20_c_departements.sql
 2022-01-07 15:56:21 +01:00
Laurent Destailleur
451fa396aa Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
 2022-01-07 15:50:30 +01:00
Laurent Destailleur
b23b82bd6f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2022-01-07 15:49:09 +01:00
daraelmin
1f6e9a1a9e
Fix install - Belgium provinces incorrect mapping 2022-01-04 18:46:29 +01:00
Laurent Destailleur
ef56631c80 FIX #yogosha8186 2022-01-03 18:15:19 +01:00
Laurent Destailleur
b2c008244e Doc 2021-12-30 19:34:02 +01:00
Laurent Destailleur
809c8f993b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/modPropale.class.php
	htdocs/filefunc.inc.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
 2021-12-30 19:03:46 +01:00
Maxime Kohlhaas
4b3289ed84 Fix #19666 : missing quotes in SQL statement 2021-12-28 16:20:01 +01:00
Maxime Kohlhaas
b54e7bd861 Fix #19691 : wrong table name in sql file 2021-12-28 12:23:15 +01:00
Laurent Destailleur
0fd386a450 css 2021-12-23 11:32:12 +01:00
Laurent Destailleur
fbce09f21b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/compta/facture/card.php
	htdocs/reception/card.php
 2021-12-19 00:36:22 +01:00
Laurent Destailleur
7952207474 Comment 2021-12-18 23:56:45 +01:00
Laurent Destailleur
fcb10df570 Fix size of origintype 2021-12-17 09:54:03 +01:00
Laurent Destailleur
517355972a Fix duplicate table for online signature 2021-12-16 19:01:11 +01:00
Laurent Destailleur
43e682b56f Fix several pb with down payments 2021-12-16 12:33:45 +01:00
Frédéric FRANCE
dddeddfe79
check for mbstring extension at install 2021-12-14 22:45:33 +01:00
Laurent Destailleur
3abb3f5018 Debug inventory feature 2021-12-12 00:05:31 +01:00
Laurent Destailleur
8cdc5726a0 Fix column length 2021-12-10 10:26:20 +01:00
Laurent Destailleur
eacc5f0f0a Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/repair.php
 2021-12-09 18:03:27 +01:00
Laurent Destailleur
783ddcc671 Fix phpcs 2021-12-09 18:01:44 +01:00
Laurent Destailleur
d6ab7ab953 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ihm.php
	htdocs/install/repair.php
	htdocs/user/class/user.class.php
 2021-12-09 11:15:40 +01:00
Laurent Destailleur
92a0c9e4fb Fix sql error in repair.php 2021-12-09 10:00:42 +01:00
Laurent Destailleur
0e7d23e169 Fix constraint and loading on module activation. 2021-12-07 14:14:13 +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
7b68ef1fb8 Clean/Debug module hrm. 2021-11-27 14:46:47 +01:00
Laurent Destailleur
734c9871ad Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2021-11-27 01:07:32 +01:00
Laurent Destailleur
dc5a1ceb28 FIX size of field multicurrency_code (contains the 3 char ISO code) 2021-11-22 03:12:40 +01:00
Laurent Destailleur
863a7d4d02 Fix bad column name 2021-11-22 02:50:54 +01:00
Laurent Destailleur
441af6b6fb Fix add rel="noopener noreferrer" 2021-11-22 02:35:55 +01:00
Laurent Destailleur
9789ae23d7
Update llx_c_paiement.sql 2021-11-18 20:12:46 +01:00
Laurent Destailleur
2fef57b31f
Merge branch 'develop' into patch-453 2021-11-18 20:12:10 +01:00
Laurent Destailleur
9b9b63c794 Prepare database for future 2021-11-18 10:20:05 +01:00
Laurent Destailleur
e549afe50a Prepare database 2021-11-17 01:07:56 +01:00
ptibogxiv
336e5628b9
Update 14.0.0-15.0.0.sql 2021-11-15 20:39:39 +01:00
ptibogxiv
d3c7ab5a82
Update llx_c_paiement.sql 2021-11-15 20:38:46 +01:00
ptibogxiv
2625c8fea5
ADD new stripe provider in dictionnary 
For  better informations in Dolibarr and on object/pdf (order, invoice....)
 2021-11-12 17:56:59 +01:00
Laurent Destailleur
0021381201 Fix #yogosha7605 2021-11-11 17:08:35 +01:00
Laurent Destailleur
47dd7335a9 Debug v15 2021-11-10 21:34:41 +01:00
Alexandre SPANGARO
d611b99d95 GNU version 3 2021-11-09 03:01:48 +01:00
Laurent Destailleur
cb65903537 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/langs/en_US/bills.lang
 2021-11-08 03:09:30 +01:00
Laurent Destailleur
cd4f59bb2a FIX bad sign of amount stored for multicurrency columns on credit notes 2021-11-08 03:01:18 +01:00
Laurent Destailleur
e8b3875e2e FIX bad sign of amount stored for multicurrency columns on credit notes 2021-11-08 02:57:21 +01:00
Laurent Destailleur
bbd3293c3c Data ref 2021-11-08 01:42:38 +01:00
Laurent Destailleur
2234522519 Debug module parnership. Add the type of partnership. 2021-11-07 13:51:31 +01:00
Laurent Destailleur
09d9d1ac42 Add missing unique key 2021-11-07 12:38:44 +01:00
Maxime Kohlhaas
3508aa92d6 Fix : uk and index on element_tag table 2021-11-01 10:24:19 +01:00
Maxime Kohlhaas
8858b2ba55 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_element_tag_table 2021-11-01 10:06:42 +01:00
Laurent Destailleur
3e46d58129 FIX Type of field progression in ticket must be integer 2021-11-01 03:14:54 +01:00
Frédéric FRANCE
9a68a97fc6
replace commentaire_abandon by abort_comment 2021-10-31 21:18:59 +01:00
Frédéric FRANCE
bc972554c6
replace reseved word rank 2021-10-31 21:13:15 +01:00
Maxime Kohlhaas
d4107fcc4e Fix wrong column name 2021-10-31 16:14:13 +01:00
Maxime Kohlhaas
9bc419f2dd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_element_tag_table 2021-10-31 09:19:48 +01:00
Laurent Destailleur
97d97af932 Clean: Remove fields for social networks (merged into "socialnetworks") 2021-10-27 16:39:34 +02:00
Scrutinizer Auto-Fixer
5567310e44 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-10-25 20:07:31 +00:00
Laurent Destailleur
f5562177e7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-25 13:06:33 +02:00
Laurent Destailleur
98f4f0b1c9 Merge 2021-10-25 11:52:24 +02:00
Laurent Destailleur
4ab759b067 Fix check/uncheck of ping 2021-10-24 14:23:35 +02:00
Laurent Destailleur
ad3297b0ef Use of MAIN_FIRST_PING_OK_ID = 'disabled' works when forcing reinstall. 2021-10-24 14:01:38 +02:00
Laurent Destailleur
404a889910 Fix migration 2021-10-23 12:10:12 +02:00
Laurent Destailleur
ef0b527379 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-22 15:57:16 +02:00
Laurent Destailleur
c81bf68578 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/compta/cashcontrol/cashcontrol_list.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/modulebuilder/index.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/class/api_products.class.php
 2021-10-22 15:56:44 +02:00
Lucas Marcouiller
75b1518611 Merge branch 'develop' of github.com:Dolibarr/dolibarr into scrutinizerfix 2021-10-22 12:02:33 +02:00
Lucas Marcouiller
33e4d750d7 Fix: scrutinizer errors + boxes activation 2021-10-22 12:01:46 +02:00
Maxime Kohlhaas
75f579c3ad New table element_tag 2021-10-22 00:59:09 +02:00
Nicolas SILOBRE
9630b07b42
Update 14.0.0-15.0.0.sql 2021-10-21 22:49:02 +02:00
Nicolas SILOBRE
09c8b96696
Fix can't generate pdf last_main_doc 2021-10-21 22:44:57 +02:00
Regis Houssin
3029804db7 FIX compatibility with Multicompany 2021-10-20 19:21:18 +02:00
Laurent Destailleur
e43b33028c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
 2021-10-20 15:06:10 +02:00
Regis Houssin
f38fca8174 FIX wrong array key value 2021-10-20 13:35:30 +02:00
Laurent Destailleur
e4d0bf7a91
Merge pull request #18967 from aspangaro/15a23 
NEW Add sortorder on units list
 2021-10-20 12:50:32 +02:00
Laurent Destailleur
b9540c3eb6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	ChangeLog
	htdocs/adherents/card.php
	htdocs/filefunc.inc.php
	htdocs/install/repair.php
 2021-10-20 03:38:10 +02:00
atm-florian
d0d5955fb1 FIX 13.0: sometimes firstname was mistyped as fistname 2021-10-18 12:09:33 +02:00
Florian HENRY
5f4410468d add filed budget in task 2021-10-15 10:24:56 +02:00
Alexandre SPANGARO
41d6a96342 Merge remote-tracking branch 'upstream/develop' into 15a23 2021-10-13 03:29:57 +02:00
Alexandre SPANGARO
3a04a0115b Add data sortorder 2021-10-13 03:26:39 +02:00
Laurent Destailleur
e3045f24cd
Merge pull request #18923 from aspangaro/15a24 
NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account
 2021-10-11 15:20:27 +02:00
Alexandre SPANGARO
754b13a83f NEW Add sortorder on units list 2021-10-11 08:58:00 +02:00
Alexandre SPANGARO
c7fd9328cd NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-08 06:29:22 +02:00
Laurent Destailleur
2cb0edb5eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/project/suggestbooth.php
	htdocs/public/project/suggestconference.php
 2021-10-07 11:01:53 +02:00
Laurent Destailleur
9b5909300e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/card.php
	htdocs/fourn/facture/card.php
 2021-10-07 11:00:00 +02:00
Alexandre SPANGARO
24e3dd0992 Prepare sql 2021-10-07 06:05:36 +02:00
Laurent Destailleur
ec545f8967 Fix data 2021-10-07 02:58:51 +02:00