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

61440 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
fb634725df Merge #7266 2017-09-14 15:21:13 +02:00
Laurent Destailleur
ed9c401ca6 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-14 12:20:26 +02:00
Laurent Destailleur
53c73054f4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-09-14 12:19:50 +02:00
Laurent Destailleur
6aeeb0bd73 Merge pull request #7388 from reeperbahnause/patch-3 
FIX #7349 Change Class from Invoices to SupplierInvoices
 2017-09-14 12:16:59 +02:00
Laurent Destailleur
b80b7bbcb9 Merge pull request #7384 from atm-ph/fix_6.0_get_class_self 
Fix get_class(self) instead of get_class($this)
 2017-09-14 12:16:16 +02:00
Laurent Destailleur
225d78c767 Merge pull request #7383 from inoveaconseil/patch-8 
add translation publisher
 2017-09-14 12:15:32 +02:00
Laurent Destailleur
a38bbdcc05 Merge pull request #7382 from hregis/6.0_bug3 
Fix: hide bank account field if module disabled
 2017-09-14 12:14:45 +02:00
Laurent Destailleur
51d1c35399 Merge pull request #7380 from tysauron/patch-8 
$soc->getAvailableDiscounts .   where soc not set.
 2017-09-14 12:12:20 +02:00
Laurent Destailleur
047f01888a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-09-14 12:08:52 +02:00
Laurent Destailleur
f2d092c815 Merge pull request #7377 from hregis/6.0_bug2 
Fix: missing select2 combobox
 2017-09-14 12:08:28 +02:00
Laurent Destailleur
8392158ee3 Update remisecheque.class.php 2017-09-14 12:06:41 +02:00
Stéphane BERTHELOT
93defa5f59 Fix dates in commande and remisecheque for PostgreSQL (should be treated like strings) 2017-09-14 12:06:25 +02:00
Laurent Destailleur
165c3ac112 Merge pull request #7374 from EmisFR/develop 
Fix dates in commande and remisecheque for PostgreSQL
 2017-09-14 12:05:51 +02:00
Laurent Destailleur
1cab73b605 Update remisecheque.class.php 2017-09-14 12:05:34 +02:00
Laurent Destailleur
24436b550d Update time.php 2017-09-14 12:03:36 +02:00
arnaud
ed8e08b78a FIX time.php crashed without project id in param 2017-09-14 12:03:27 +02:00
Laurent Destailleur
fd7602382c Merge pull request #7373 from atm-arnaud/FIX_time_without_projectid 
FIX time.php crashed without project id in param if project isn't linked to a company
 2017-09-14 12:02:16 +02:00
Laurent Destailleur
14d000f011 Update time.php 2017-09-14 12:01:32 +02:00
Laurent Destailleur
74b55d8e8d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-14 11:49:43 +02:00
Laurent Destailleur
2d7916f77d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/core/lib/json.lib.php
 2017-09-14 11:49:02 +02:00
Laurent Destailleur
7d5dc08a0a Fix PHP7.2 2017-09-14 11:47:27 +02:00
Laurent Destailleur
fe1ce5b3ac Fix php 7.2 compatibility 2017-09-14 11:44:47 +02:00
Laurent Destailleur
9523bf5fbd Remove useless code 2017-09-14 10:23:17 +02:00
Laurent Destailleur
ed013c1b7e Compatibilty php 7.2 2017-09-14 10:21:04 +02:00
Laurent Destailleur
aafc108260 Remove hhvm 2017-09-14 10:08:49 +02:00
Laurent Destailleur
defb01c551 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-14 09:56:14 +02:00
Laurent Destailleur
2390d20232 Update travis 2017-09-14 09:56:02 +02:00
Laurent Destailleur
76f94f32ae Fix deletion of company 2017-09-14 09:53:39 +02:00
Laurent Destailleur
3b56663e4d Reduce travis load 2017-09-14 09:40:10 +02:00
Laurent Destailleur
93cfde15b2 Try to reduce travis load 2017-09-14 09:37:57 +02:00
Laurent Destailleur
b7c8b30fac Try to reduce travis load 2017-09-14 09:36:38 +02:00
Laurent Destailleur
e51dd970d3 Try to reduce travis load 2017-09-14 09:34:52 +02:00
Laurent Destailleur
3cd4aa434d Try to reduce travis load 2017-09-14 09:33:10 +02:00
Laurent Destailleur
6a650be43d Try to reduce travis load 2017-09-14 09:24:17 +02:00
Laurent Destailleur
205989b64b Fix phpunit 2017-09-14 09:16:57 +02:00
Laurent Destailleur
51e5959765 Fix travis 2017-09-14 08:26:13 +02:00
Laurent Destailleur
322af9e2df Fix travis 2017-09-14 08:25:04 +02:00
Laurent Destailleur
d225cce446 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-14 08:23:42 +02:00
Laurent Destailleur
d7b84bd35f Fix responsive 2017-09-13 22:56:24 +02:00
Laurent Destailleur
b3b00f63e4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-13 22:30:43 +02:00
Laurent Destailleur
4b8862c1ec Remove useless import 2017-09-13 21:54:16 +02:00
Laurent Destailleur
fed3165b53 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/core/lib/price.lib.php
 2017-09-13 21:53:03 +02:00
Laurent Destailleur
6d40f797d2 Fix regression 2017-09-13 21:50:14 +02:00
Laurent Destailleur
eadfbfe2bd Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/lib/functions2.lib.php
 2017-09-13 20:57:53 +02:00
Laurent Destailleur
f2cd96b9c0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	ChangeLog
	htdocs/adherents/class/adherent.class.php
	htdocs/core/lib/price.lib.php
	htdocs/filefunc.inc.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/supplier_proposal/list.php
 2017-09-13 20:55:22 +02:00
Laurent Destailleur
dc38ec5051 Fix regression 2017-09-13 20:48:24 +02:00
Laurent Destailleur
38621b622e Fix specimen not complete for multicompany 2017-09-13 20:11:51 +02:00
Laurent Destailleur
9b22f046f5 FIX multicompany better accuracy in rounding and with revenue stamp. 2017-09-13 19:31:32 +02:00
Laurent Destailleur
a5a08006e9 FIX multicompany better accuracy in rounding and with revenue stamp. 2017-09-13 19:27:21 +02:00
Laurent Destailleur
e0eef2080e FIX PDF output was sharing 2 different currencies in same total 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/product/doc/pdf_standard.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
 2017-09-13 18:13:43 +02:00