lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
76,194 Commits 43 Branches 150 Tags 886 MiB
280a034199
Commit Graph

66749 Commits

Author SHA1 Message Date
Laurent Destailleur
280a034199 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-29 13:15:57 +02:00
Laurent Destailleur
a7dccf1617
Merge pull request #11255 from aspangaro/10.0_accountancy2 
FIX Lost functionnality - Add category to bank transaction with various payment
 2019-05-29 13:15:47 +02:00
Laurent Destailleur
cafb3840b7 Fix look and feel v10 2019-05-29 12:56:11 +02:00
Laurent Destailleur
6a84dfe29e
Update card.php 2019-05-29 12:34:54 +02:00
Laurent Destailleur
ae597e7b63
Merge pull request #11252 from KlaasOl/patch-2 
Create llx_accounting_account_nl.sql
 2019-05-29 12:25:42 +02:00
Laurent Destailleur
8c97fc164f
Merge pull request #11253 from KlaasOl/patch-3 
Update llx_accounting_abc.sql
 2019-05-29 12:25:08 +02:00
Laurent Destailleur
b6f4cab20d
Merge pull request #11247 from aspangaro/develop 
Accountancy - Use Ansi on Agiris model export & indent
 2019-05-29 12:23:25 +02:00
Laurent Destailleur
05063016e8 FIX #11244 Enhance repair tool 2019-05-29 12:21:51 +02:00
Laurent Destailleur
cf70b26db7 Add distinct id 2019-05-29 10:27:03 +02:00
Laurent Destailleur
a524fd17ce Fix phpcs 2019-05-29 10:03:05 +02:00
Laurent Destailleur
fd0eb47b35 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/holiday/card.php
 2019-05-29 09:57:48 +02:00
Laurent Destailleur
a26c8c0714 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-29 09:55:55 +02:00
Laurent Destailleur
6e9cd819c1 Fix phpcs 2019-05-29 09:55:09 +02:00
Laurent Destailleur
35b021f203 Fix phpcs 2019-05-29 09:53:54 +02:00
Laurent Destailleur
2218994958 FIX Duplicate encoding on error message 2019-05-29 09:51:45 +02:00
Laurent Destailleur
b024c288b8 Fix duplicate translation 2019-05-29 09:46:39 +02:00
Laurent Destailleur
42306835d2 Fix CSS 2019-05-29 09:38:19 +02:00
Laurent Destailleur
716722c711 Fix filter on status 2019-05-29 00:17:07 +02:00
Laurent Destailleur
3841fb5a85 Fix doxygen 2019-05-28 22:18:46 +02:00
Laurent Destailleur
454316a5fa Fix getDomainFromURL 2019-05-28 22:18:22 +02:00
Laurent Destailleur
cd32734c58 CSS 2019-05-28 16:10:11 +02:00
Alexandre SPANGARO
af81779f38 Merge remote-tracking branch 'upstream/develop' into develop 2019-05-28 15:19:05 +02:00
Laurent Destailleur
2352463c21 Fix link to change validator is on validate status only 2019-05-28 13:23:12 +02:00
Laurent Destailleur
1c3f519b1a Remove warnings 2019-05-28 12:54:35 +02:00
Laurent Destailleur
2404e6a521 Fix cast to int 2019-05-28 12:38:21 +02:00
Laurent Destailleur
5539b07bc5 Fix missing title 2019-05-28 12:15:30 +02:00
Laurent Destailleur
1ed7c225d7 Fix status of holiday 2019-05-27 20:25:40 +02:00
Laurent Destailleur
2aa19e469d Fix edit validator 2019-05-27 20:23:40 +02:00
Laurent Destailleur
b691b3e883 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-27 20:22:42 +02:00
Laurent Destailleur
666e4fdb5f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-27 20:22:21 +02:00
Laurent Destailleur
991e247e30 Fix edit of validator 2019-05-27 20:21:50 +02:00
Laurent Destailleur
4c3a056dbe Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/holiday/card.php
 2019-05-27 20:19:23 +02:00
Laurent Destailleur
f5d51dab5f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/holiday/card.php
 2019-05-27 20:14:37 +02:00
Laurent Destailleur
02fc896612 FIX Even with permission, can't validate leave once validator defined. 2019-05-27 20:12:33 +02:00
Laurent Destailleur
15de8a9497 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/mailing/card.php
 2019-05-27 19:25:53 +02:00
Laurent Destailleur
1c6ddd25c4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-27 19:23:54 +02:00
Laurent Destailleur
7db643fff0 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-05-27 19:23:09 +02:00
Laurent Destailleur
93c395fe10 FIX confirmation of mass email sending + option MAILING_NO_USING_PHPMAIL 2019-05-27 19:22:51 +02:00
Laurent Destailleur
8510a846f4 Tooltip 2019-05-27 19:04:31 +02:00
Laurent Destailleur
848b8f9bc4 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/cron/cron_run_jobs.php
	htdocs/public/payment/newpayment.php
	scripts/cron/cron_run_jobs.php
 2019-05-27 19:01:28 +02:00
Laurent Destailleur
4596ec7d38 FIX Use of cron with multicompany 2019-05-27 18:11:15 +02:00
Laurent Destailleur
71da27f333 Add error message 2019-05-27 16:40:06 +02:00
Laurent Destailleur
a138c05457 Fix colspan 2019-05-27 13:28:10 +02:00
Alexandre SPANGARO
19b275f2d1 Fix bankline cat with various payment 2019-05-26 22:33:35 +02:00
Laurent Destailleur
b81c3a6d2b Fix look and feel v10 2019-05-26 18:23:30 +02:00
KlaasOl
4301cd5b7a
Update llx_accounting_abc.sql 
Adding chart of account NL VERKORT
 2019-05-26 15:40:44 +02:00
KlaasOl
f879225032
Create llx_accounting_account_nl.sql 
First accounting account scheme for Dutch accounting
 2019-05-26 15:29:50 +02:00
Laurent Destailleur
08a731ab39 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-26 15:25:37 +02:00
Laurent Destailleur
45aaafd4d6 Fix email not set in paybox payment 2019-05-26 15:25:26 +02:00
Laurent Destailleur
b5b5e1f6db More completepaybox integration with HMAC 2019-05-26 14:37:31 +02:00