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

76155 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
7964bb12ce FIX Use of cron with multicompany 2019-05-27 18:13:33 +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
Laurent Destailleur
b81c3a6d2b Fix look and feel v10 2019-05-26 18:23:30 +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
Laurent Destailleur
410932f3f2 Trans 2019-05-26 12:01:08 +02:00
Laurent Destailleur
19ff0120ff # WARNING: head commit changed in the meantime 
Removed uselesss files (replaced by DebugBar)
 2019-05-26 11:42:00 +02:00
Laurent Destailleur
a40e5ca66c Fix phpcs 2019-05-26 11:36:16 +02:00
Laurent Destailleur
f2e03b3909 Removed useless files (replaced with DebugBar) 2019-05-26 11:24:57 +02:00
Laurent Destailleur
d3318e6d60 CSS 2019-05-26 11:21:08 +02:00
Laurent Destailleur
cbb20a3587 CSS 2019-05-26 02:08:44 +02:00
Laurent Destailleur
b62c229efc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/9.0.0-10.0.0.sql
	htdocs/install/mysql/tables/llx_bom_bomline.sql
 2019-05-26 01:32:55 +02:00
Laurent Destailleur
b7a3cdd7c6 Debug BOM module 2019-05-26 01:31:54 +02:00
Laurent Destailleur
bd61c1f7f5 Debug BOM module 2019-05-26 01:16:06 +02:00
Laurent Destailleur
9f9f3bda63 Debug BOM module 2019-05-26 01:06:19 +02:00
Laurent Destailleur
a5865d3e4a Debug BOM 2019-05-25 19:29:33 +02:00
Laurent Destailleur
b67363d769 Fix rename export php lib to avoi duplicate with old library. 2019-05-25 18:54:43 +02:00
Laurent Destailleur
d6aef89719 Fix css 2019-05-25 12:42:12 +02:00
Laurent Destailleur
728e270307 Fix css 2019-05-24 23:11:05 +02:00
Laurent Destailleur
c04d082ad1 FIX Import of chart of account 2019-05-24 18:14:15 +02:00
Laurent Destailleur
bad565cc64 Fix syntax error 2019-05-24 18:13:24 +02:00
Laurent Destailleur
0fc7ad7c1f Add one param to fetch of accounting account to solve chart import 2019-05-24 18:05:29 +02:00
Laurent Destailleur
769fbdb429 FIX the id was not loaded in fetch of accounting system 2019-05-24 17:39:37 +02:00
Laurent Destailleur
49991eabf8 Fix import of accounting account from ref in import profiles 2019-05-24 17:09:18 +02:00
Laurent Destailleur
63824861a6 Fix import of chart of account. The account parent was not managed. 2019-05-24 16:58:06 +02:00
Laurent Destailleur
826e3fabf1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-24 15:00:23 +02:00
Laurent Destailleur
ccfb4f575b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2019-05-24 15:00:14 +02:00
Laurent Destailleur
89455672a2 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2019-05-24 14:58:21 +02:00
Laurent Destailleur
8c6f2c1a5b
Merge pull request #11243 from andreubisquerra/master 
Fix TakePOS terminal bug
 2019-05-24 12:58:51 +02:00
Laurent Destailleur
1ac54cfaa9
Merge pull request #11241 from OPEN-DSI/fix-order-deleteline-in-shipment 
Fix check if order line is not in a shipment line before deleting
 2019-05-24 12:58:09 +02:00
Laurent Destailleur
7a0c6859bd
Merge pull request #11240 from ATM-Marc/FIX_8.0_crabe_situation_vat 
FIX: crabe pdf: bad detailed VAT for situation invoices, in situations S2 and above
 2019-05-24 12:57:01 +02:00
Laurent Destailleur
5d6e4a444a
Merge pull request #11237 from ATM-Marc/FIX_8.0_situation_discount 
FIX: situation invoices: block progress percentage change for discount lines
 2019-05-24 12:53:34 +02:00
Laurent Destailleur
bca5a56db1
Merge pull request #11236 from a-schild/develop 
Add accountancy export option for Sage50 Swiss
 2019-05-24 12:52:51 +02:00
Laurent Destailleur
c760a5a8b9 FIX #11233 2019-05-24 12:48:44 +02:00
andreubisquerra
99a96bffe2 Fix TakePOS terminal bug 2019-05-24 08:36:43 +02:00