lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
95,925 Commits 43 Branches 150 Tags 886 MiB
2b33bb2d04
Commit Graph

95925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damien BENOIT
2b33bb2d04
Merge pull request #11 from Dolibarr/develop 
Update fork
 2021-03-10 16:53:35 +01:00
Laurent Destailleur
8192349320 Fix migration 2021-03-10 16:49:42 +01:00
Laurent Destailleur
2e4a4b527b Fix migration 2021-03-10 16:45:28 +01:00
Laurent Destailleur
521e3b20dc Rename widget 2021-03-10 16:44:46 +01:00
Damien BENOIT
93675082d7
Update html.form.class.php 2021-03-10 16:42:14 +01:00
Laurent Destailleur
c2200e6ffd Clean code 2021-03-10 16:41:48 +01:00
stickler-ci
d5e6f54b5c Fixing style errors. 2021-03-10 15:33:53 +00:00
Givriz
6e46396b17 Ajout de picto pour le genre et la civilité 2021-03-10 16:31:50 +01:00
Laurent Destailleur
514a9fb96a
Merge pull request #16561 from Hystepik/develop#1 
Close #15917 : Improvement to ticket module
 2021-03-10 15:49:20 +01:00
Damien BENOIT
628d434823
Merge pull request #10 from Dolibarr/develop 
Update fork
 2021-03-10 15:42:49 +01:00
Laurent Destailleur
9ed128c6fa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/core/class/html.formaccounting.class.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
	htdocs/langs/en_US/errors.lang
	htdocs/product/card.php
 2021-03-10 15:35:09 +01:00
Laurent Destailleur
fbe5ec8bb2 Complete test on setup 2021-03-10 13:12:28 +01:00
Laurent Destailleur
9a13ebfdb8 Fix look and feel v13 2021-03-10 11:08:39 +01:00
Laurent Destailleur
680f6257a0 FIX warning if setup of chart of account is not yet done. 2021-03-10 11:04:28 +01:00
Laurent Destailleur
a0c7c6bad9 Fix selection of accounting account 2021-03-10 10:45:01 +01:00
Laurent Destailleur
b1f4c29fde Fix missing alias 2021-03-09 20:12:14 +01:00
Laurent Destailleur
28f54eeb75 Fix translation 2021-03-09 19:55:47 +01:00
Laurent Destailleur
67f5837072 Fix permission to create a holiday when advanced permissions are set 2021-03-09 19:51:11 +01:00
Laurent Destailleur
8babacfe55 Look and feel v14 2021-03-09 19:10:41 +01:00
Laurent Destailleur
e82e812c36 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-09 17:01:53 +01:00
Laurent Destailleur
5b74fefb60 Fix look and feel v13 2021-03-09 17:01:20 +01:00
Laurent Destailleur
b778820fe2
Merge pull request #16596 from FHenry/dev_allowAliasInCommonObject_GetFiledList 
Dev allow alias in common object get filed list
 2021-03-09 16:54:22 +01:00
Laurent Destailleur
5e68eee407 Fix filter 2021-03-09 16:47:38 +01:00
Laurent Destailleur
9cb4dce485 Fix option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN missing 2021-03-09 16:12:30 +01:00
Laurent Destailleur
1fe90091b6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-09 15:35:25 +01:00
Laurent Destailleur
cf30e90b93 Work on inventory 2021-03-09 15:35:10 +01:00
Laurent Destailleur
6b37d392a8
Merge pull request #16597 from ksar-ksar/develop 
FIX #16590
 2021-03-09 15:14:31 +01:00
Laurent Destailleur
3cb072f67a
Update commonobject.class.php 2021-03-09 15:13:20 +01:00
Laurent Destailleur
b822f04cbb
Merge pull request #16593 from frederic34/patch-3 
fix unknown variable
 2021-03-09 15:08:11 +01:00
Laurent Destailleur
1b3aae1984 Fix regression 2021-03-09 12:17:32 +01:00
ksar
429992ee7f FIX #16590 2021-03-09 10:46:11 +01:00
Laurent Destailleur
78588f24b9 Move git hooks pre-commit into dev/setup dir 2021-03-09 10:42:59 +01:00
Laurent Destailleur
53f8ff060a Fix phpcs 2021-03-09 10:40:22 +01:00
Florian HENRY
ce5324c08c Merge HEAD, branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_allowAliasInCommonObject_GetFiledList 2021-03-09 10:24:07 +01:00
Florian HENRY
bcbf8bb72a allow table alias into commonObject getFieldList 2021-03-09 10:21:32 +01:00
Frédéric FRANCE
de1cf54e2f
Update box_members_by_type.php 2021-03-09 00:20:28 +01:00
Laurent Destailleur
c3a047ee06 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/class/api_agendaevents.class.php
 2021-03-08 19:31:47 +01:00
Laurent Destailleur
2f0c4038fb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/action/class/api_agendaevents.class.php
	htdocs/compta/sociales/card.php
	htdocs/societe/consumption.php
 2021-03-08 19:27:34 +01:00
Laurent Destailleur
bada3afebb Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-08 19:18:26 +01:00
Laurent Destailleur
28c04a684f Fix position of field 2021-03-08 19:09:02 +01:00
stickler-ci
5294e10ecf Fixing style errors. 2021-03-08 18:07:15 +00:00
Laurent Destailleur
14d6893c63 Complete fields of product 2021-03-08 18:56:32 +01:00
Givriz
fb54f6912c feature #16570 
Ajout de picto pour le genre et la civilité
 2021-03-08 18:37:03 +01:00
Damien BENOIT
feda146bca
Merge pull request #9 from Dolibarr/develop 
Update fork
 2021-03-08 18:35:13 +01:00
Laurent Destailleur
a3896bd237 Restore default tabs 2021-03-08 16:47:49 +01:00
Laurent Destailleur
3b80b9dd75 Fix regression 2021-03-08 16:37:52 +01:00
Laurent Destailleur
146b57700c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-08 16:34:32 +01:00
Laurent Destailleur
1980ce3b95
Merge pull request #15862 from frederic34/boxindex 
can add box on member index page and user home
 2021-03-08 16:34:13 +01:00
Laurent Destailleur
a79a4e876d
Merge branch 'develop' into boxindex 2021-03-08 16:34:05 +01:00
Laurent Destailleur
7cb10eae2e
Merge pull request #16588 from atm-adrien/FIX/add_nowLink_on_socialCharges_card_creation 
FIX : Add "Now" link on social charges creation card
 2021-03-08 16:31:41 +01:00