Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
99,661 Commits 36 Branches 189 Tags
6d049f5c2e018603ec04219fa4586f544952ce60
Commit Graph

24418 Commits

Author SHA1 Message Date
Gauthier PC portable 024
134d7e00ec Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-17 16:56:50 +01:00
Laurent Destailleur
9161c34f51 Fix logs 2021-02-17 15:21:52 +01:00
Laurent Destailleur
68637c3104 Better log for hook 2021-02-17 15:17:24 +01:00
Laurent Destailleur
bfe71e8509 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-17 14:28:19 +01:00
Laurent Destailleur
c8824ccea0 Look and feel v14 2021-02-16 17:05:38 +01:00
Laurent Destailleur
a81e4d4daa Fix bad picto 2021-02-16 13:21:18 +01:00
Laurent Destailleur
6f25f7c2cb Clean code 2021-02-16 11:43:26 +01:00
Laurent Destailleur
d16276ea2c Clean code 2021-02-16 11:15:42 +01:00
Alexandre SPANGARO
8079105aaf NEW: VAT report - Optimisation & collapse by rate 2021-02-16 04:28:55 +01:00
Laurent Destailleur
54640199af Fix deletion if permission on dir is not write. 2021-02-15 23:43:56 +01:00
Laurent Destailleur
5b42bce149 Add more complete info on change of opportunity status. 2021-02-15 22:43:27 +01:00
Laurent Destailleur
dabf9d796a FIX Rename title of template invoice 2021-02-15 22:16:01 +01:00
Laurent Destailleur
44b3221aaf FIX Rename title of template invoice 2021-02-15 22:15:14 +01:00
Laurent Destailleur
4ffdfe110a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-15 22:07:11 +01:00
Laurent Destailleur
00642ffb48 Fix label of invoice 2021-02-15 22:04:35 +01:00
Laurent Destailleur
7bbb603859 Fix default template for contract can be empty 2021-02-15 21:46:07 +01:00
Laurent Destailleur
32370bf63d Look and feel v14 2021-02-15 20:13:38 +01:00
Laurent Destailleur
be3703a05b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-02-15 16:46:55 +01:00
Laurent Destailleur
0bac454f25 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-15 16:40:45 +01:00
Laurent Destailleur
7b383b58c6 Trans 2021-02-15 16:35:51 +01:00
Laurent Destailleur
d183a7eedf Merge pull request #16288 from FHenry/dev_EventOrganisation_setuppage 
wip : Event Organization module - PR-1 - setup page  #FoundationFunding
 2021-02-15 15:59:19 +01:00
Laurent Destailleur
3ec515e106 Fix default value 2021-02-15 15:53:46 +01:00
Laurent Destailleur
9c1d76aaaa Merge pull request #16294 from frederic34/patch-3 
define variable for all execution paths
 2021-02-15 15:53:12 +01:00
Laurent Destailleur
b98a654321 NEW The setup for mandatory field can be done on combo list too. 2021-02-15 15:37:43 +01:00
Laurent Destailleur
fd5fe5b427 Look and feel 2021-02-15 14:38:28 +01:00
Laurent Destailleur
7e7d393f30 Look and feel v14 2021-02-15 14:19:05 +01:00
Laurent Destailleur
026259ebd7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/product/fournisseurs.php
 2021-02-15 13:12:27 +01:00
Laurent Destailleur
1b69456216 Complete response 2021-02-15 13:00:21 +01:00
Laurent Destailleur
49f8ff5708 FIX #16286 2021-02-15 12:18:09 +01:00
Florian HENRY
1427f66e10 Merge branch 'dev_EventOrganisation' into dev_EventOrganisation_setuppage 2021-02-15 11:20:07 +01:00
Florian HENRY
e1f503a8cf Merge branch 'develop' into dev_EventOrganisation 2021-02-15 11:19:08 +01:00
Frédéric FRANCE
382123b64a define variable for all execution paths 
The variable $filelog does not seem to be defined for all execution paths leading up to this point.
 2021-02-15 08:36:40 +01:00
Laurent Destailleur
25230fb4bb Merge pull request #16284 from andreubisquerra/develop 
Improve logo printing compatibility with TakePOS connector
 2021-02-14 21:41:45 +01:00
Laurent Destailleur
e802dd87f4 Merge branch 'develop' into dev_EventOrganisation_setuppage 2021-02-14 21:37:45 +01:00
Laurent Destailleur
4d526569a7 Merge pull request #16292 from frederic34/patch-5 
Use dictionary to display social network icon
 2021-02-14 21:34:13 +01:00
Laurent Destailleur
2cc4632a39 Fix js error 2021-02-14 21:32:19 +01:00
Frédéric FRANCE
917f15a781 Use dictionary to display social network icon 2021-02-14 21:30:54 +01:00
Laurent Destailleur
9e16cd5b77 Look and feel v14 2021-02-14 20:47:57 +01:00
Laurent Destailleur
66c7770146 Factorize some common code for type of event 2021-02-14 20:12:43 +01:00
abb
e6d35039c9 fix:Handle constant MAIN_SHOW_SOCIETE2EXTERN in checkUserAccessToObject 2021-02-14 18:02:30 +01:00
Florian HENRY
5958373f47 set icon fa 2021-02-14 17:31:30 +01:00
Florian HENRY
02b698c128 move files to real diredtory 2021-02-14 17:09:23 +01:00
Florian HENRY
21a8d4d470 ok for setup pages 2021-02-14 17:06:49 +01:00
Florian HENRY
b5055a5edb config pages ok 2021-02-14 16:41:57 +01:00
Florian HENRY
07984d9a6e Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-02-14 15:02:29 +01:00
Florian HENRY
d7dfb9138a working on setup 2021-02-14 15:00:20 +01:00
andreubisquerra
abda9eeb93 Improve compatibility with logo printing with TakePOS connector 2021-02-14 00:02:03 +01:00
abb
d82c62c40d New:Constant MAIN_SHOW_SOCIETE2EXTERN to allow access to any thirdparty for external users 2021-02-12 23:53:45 +01:00
Laurent Destailleur
cd4d790d2b Add parameters of batch into comment description 2021-02-12 17:15:23 +01:00
Florian HENRY
f063606f27 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-02-12 11:32:07 +01:00