Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-23 09:51:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
81,180 Commits 36 Branches 190 Tags
0a125f73b5ae8ef858ec3a901b2f68045ddbb16c
Commit Graph

81180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
5dee861f7d Fix typo 2019-08-19 18:39:40 +02:00
Laurent Destailleur
fb8e66a662 Trans 2019-08-19 18:34:54 +02:00
Laurent Destailleur
6d60b53dbb Enhance export/import of web sites 2019-08-19 18:25:27 +02:00
Laurent Destailleur
28c18afbb6 Enhance export of website 2019-08-19 18:06:27 +02:00
Laurent Destailleur
def0311f9d Fix translation 2019-08-19 17:26:13 +02:00
florian HENRY
4c61e3e381 merge develop 2019-08-19 17:23:47 +02:00
Laurent Destailleur
998c25f8d6 Translation 2019-08-19 17:08:58 +02:00
BENKE Charlene
7f6c29fd65 bad converting on php 7 is totalpaid is null 
display a warning error
 2019-08-19 15:27:21 +02:00
Laurent Destailleur
15a765a79a Fix responsive 2019-08-19 13:28:24 +02:00
Laurent Destailleur
99fcab80d8 Fix icon size 2019-08-19 12:52:41 +02:00
Laurent Destailleur
cb0bb55b3a Label centered 2019-08-19 10:29:59 +02:00
Laurent Destailleur
d304749eca Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-19 10:19:14 +02:00
Laurent Destailleur
21fc089f58 FIX Translation of month 2019-08-19 10:18:38 +02:00
Laurent Destailleur
cc3fd0f1f6 Merge pull request #11679 from atm-john/develop_new_task_progress_bar 
FIX/NEW task widget and add task progress bar
 2019-08-19 10:05:16 +02:00
Laurent Destailleur
6abfd8b145 Fix use short labels for workboard 2019-08-19 10:01:42 +02:00
Laurent Destailleur
2587dc041f Minor CSS fix 2019-08-19 09:46:22 +02:00
Laurent Destailleur
18886c701d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/core/lib/company.lib.php
 2019-08-19 00:02:26 +02:00
Laurent Destailleur
3a0057f6a3 FIX too many record in sql request. Whena criteria is a filter, we must 
use an inner join.
 2019-08-18 23:59:24 +02:00
Laurent Destailleur
71be9f5b3f Fix test on terminal for 'cashdesk' module 2019-08-18 21:01:17 +02:00
Laurent Destailleur
c989a63360 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/langs/en_US/cashdesk.lang
 2019-08-18 20:54:06 +02:00
Laurent Destailleur
cef88283b3 Fix missing error message 2019-08-18 20:52:18 +02:00
Laurent Destailleur
783e01588c FIX It was possible to create cashfence without entering data. 2019-08-18 20:47:40 +02:00
andreubisquerra
bbc1dfb0f7 Cashcontrol TakePOS fixes 2019-08-18 20:40:31 +02:00
Laurent Destailleur
f39e8ef835 Merge pull request #11703 from andreubisquerra/master 
Cashcontrol TakePOS fixes
 2019-08-18 20:39:57 +02:00
Laurent Destailleur
f27bea9497 Fix phpcs 2019-08-18 20:39:02 +02:00
Laurent Destailleur
4fd68798a3 Fix phpcs 2019-08-18 20:38:51 +02:00
Laurent Destailleur
477384105f FIX missing test on permission on button to delete ledger record 2019-08-18 19:25:36 +02:00
Laurent Destailleur
d8d927547f Fix option ACCOUNTANCY_SHOW_EXPORT_FILES_MENU 2019-08-18 19:09:53 +02:00
Laurent Destailleur
ad5f2dbe9d Fix update on id 2019-08-18 18:56:58 +02:00
Laurent Destailleur
8cf0671804 FIX Missing transaction 2019-08-18 18:56:21 +02:00
Laurent Destailleur
2f46b40da2 Prepare feature "Never show this message again" 2019-08-18 18:36:18 +02:00
Laurent Destailleur
729340420f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-18 17:03:48 +02:00
Laurent Destailleur
2ddf7c1d1f Fix responsive 2019-08-18 17:03:20 +02:00
andreubisquerra
063f19fe67 Cashcontrol TakePOS fixes 2019-08-18 09:33:02 +02:00
Laurent Destailleur
40f5bbc4bb Fix css 2019-08-18 07:05:49 +02:00
Laurent Destailleur
58573632ab Fix css 2019-08-18 06:00:33 +02:00
Laurent Destailleur
7e4cf224ec Merge branch 'develop' into develop_new_task_progress_bar 2019-08-18 05:38:45 +02:00
Laurent Destailleur
75792ea42c Fix css 2019-08-18 05:33:40 +02:00
Laurent Destailleur
3f105a97bf Debug the new workboard 2019-08-18 04:56:48 +02:00
Laurent Destailleur
b8e1cc8d16 Enhance #11643 2019-08-18 03:42:38 +02:00
Laurent Destailleur
2285e0d780 Make colors less aggressive 2019-08-18 02:07:40 +02:00
Laurent Destailleur
c4361c7737 Merge pull request #11643 from atm-john/develop_new_dashboard 
NEW dashboard for opened elements
 2019-08-18 01:27:03 +02:00
Laurent Destailleur
5351d78a96 Merge branch 'develop' into develop_new_dashboard 2019-08-18 01:26:56 +02:00
Laurent Destailleur
b1be6bf4f2 FIX #11422 Can't edit his own events with standard rights 2019-08-18 01:24:54 +02:00
Laurent Destailleur
2dbf98283a Merge pull request #11700 from andreubisquerra/master 
If user has not used change control in TakePOS, add total invoice payment
 2019-08-18 01:02:46 +02:00
Laurent Destailleur
334e2759a2 Update SECURITY.md 2019-08-17 23:35:48 +02:00
Laurent Destailleur
789de97b4c Update SECURITY.md 2019-08-17 23:35:27 +02:00
Laurent Destailleur
dd6007781a Update SECURITY.md 2019-08-17 23:35:05 +02:00
Laurent Destailleur
18eb2a83fe FIX #11671 CVE-2019-15062 2019-08-17 22:17:27 +02:00
Laurent Destailleur
d21e557100 FIX #11671 CVE-2019-15062 2019-08-17 22:16:27 +02:00