lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
51,574 Commits 43 Branches 150 Tags 886 MiB
165b553a79
Commit Graph

51574 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frédéric FRANCE
1aa232c4a7 Update CSMSFile.class.php 2015-12-13 21:14:53 +01:00
Frédéric FRANCE
65cebe37f3 Update sms.php 2015-12-13 21:12:08 +01:00
Laurent Destailleur
dc6ec91b2c Merge pull request #4183 from IonAgorria/patch-3 
JS error preventing hiding of dates at object line
 2015-12-13 19:57:37 +01:00
Laurent Destailleur
c5054c41cf Merge pull request #4211 from aspangaro/3.8-3879 
Fix #3879 Wrong translation in the new expense report module
 2015-12-13 19:56:55 +01:00
Laurent Destailleur
da8e38b253 Merge pull request #4213 from grandoc/develop 
[Qual] Uniformize code
 2015-12-13 19:56:43 +01:00
Laurent Destailleur
b949468b75 Merge pull request #4210 from IonAgorria/pricesel-fix 
Price expression selector fix
 2015-12-13 19:56:32 +01:00
Laurent Destailleur
4d11c8b733 Merge pull request #4212 from frederic34/patch-7 
typo
 2015-12-13 19:40:08 +01:00
Laurent Destailleur
646a198399 Merge pull request #4214 from frederic34/patch-8 
typo
 2015-12-13 19:39:56 +01:00
Laurent Destailleur
e37fc87cd5 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-12-13 17:34:06 +01:00
Laurent Destailleur
1978eebb69 Fix bad merge 2015-12-13 17:33:20 +01:00
Laurent Destailleur
ef13bd43b0 Fix bad merge 2015-12-13 17:27:55 +01:00
Laurent Destailleur
3b595f0247 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/report.lib.php
	htdocs/langs/en_US/accountancy.lang
 2015-12-13 16:23:33 +01:00
Laurent Destailleur
4b741c6b9c Fix permissions 2015-12-13 16:16:30 +01:00
Laurent Destailleur
a462cd232d Merge remote-tracking branch 'origin/3.7' into 3.8 2015-12-13 16:09:09 +01:00
Laurent Destailleur
4a88c9ea9f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/product/class/product.class.php
 2015-12-13 15:53:57 +01:00
Laurent Destailleur
7db6ac592f FIX Option start tls of ldap was not correctly supported. 2015-12-13 15:51:52 +01:00
Laurent Destailleur
ef33691818 FIX Removed hard coded parameters for asterisk setup 2015-12-13 15:21:46 +01:00
Laurent Destailleur
3680202c1c Fix do not share color for title of table and title of pages 2015-12-13 14:39:12 +01:00
Frédéric FRANCE
9cc77787c5 typo 2015-12-12 16:10:36 +01:00
Laurent Destailleur
2a6fbe3526 Fix debug shipment doc generation (bad position of fields, code 
differences, text size, ...)
 2015-12-12 14:55:32 +01:00
Laurent Destailleur
0330d8237f Fix: Color too dark 2015-12-12 14:13:45 +01:00
Laurent Destailleur
84205b5be4 Fix: text too long 2015-12-12 14:12:53 +01:00
Laurent Destailleur
5f4be14dd2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-12 13:19:55 +01:00
philippe grand
de0a13ae8f [Qual] Uniformize code 2015-12-12 10:59:02 +01:00
Frédéric FRANCE
442f669dc7 typo 2015-12-12 10:45:33 +01:00
aspangaro
c3acee56e2 Fix #3879 Wrong translation in the new expense report module 2015-12-12 10:06:11 +01:00
Ion Agorria
57102aefde Price expression selector fix 2015-12-12 01:38:24 +01:00
Juanjo Menent
4b9e87367f Merge pull request #4206 from grandoc/develop 
[Qual] Close database handler should be after Footer
 2015-12-11 21:35:14 +01:00
Juanjo Menent
9e2a056221 Merge pull request #4205 from FHenry/3.8_accountancy 
work on accounting
 2015-12-11 19:43:54 +01:00
philippe grand
2cd49043a6 [Qual] Close database handler should be after Footer 2015-12-11 19:37:12 +01:00
Ion Agorria
26b85d7cac Remove unnecesary variable 2015-12-11 18:28:55 +01:00
Laurent Destailleur
f71225742a Merge pull request #4178 from GPCsolutions/dolibarr-3953 
Better javascript rounding
 2015-12-11 17:59:34 +01:00
Laurent Destailleur
519e022c98 Merge pull request #4191 from braito4/patch-1 
Update list.php
 2015-12-11 17:28:40 +01:00
Laurent Destailleur
da5aa0cd36 Merge pull request #4200 from GPCsolutions/dolibarr-php7 
[Qual] OOP constructor
 2015-12-11 17:26:08 +01:00
Laurent Destailleur
1a58624775 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-11 17:05:38 +01:00
Laurent Destailleur
f1374625f0 git push origin developMerge branch 'FHenry-develop' into develop 2015-12-11 17:04:58 +01:00
Laurent Destailleur
47fce16778 Merge branch 'develop' of https://github.com/FHenry/dolibarr into 
FHenry-develop

Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-12-11 17:04:19 +01:00
Laurent Destailleur
8ac189a1c3 Merge pull request #4199 from grandoc/develop 
[Qual] Uniformize code
 2015-12-11 16:59:25 +01:00
Laurent Destailleur
793e6e2a8f Example mut be excluded of packages 2015-12-11 16:56:25 +01:00
Laurent Destailleur
42436a37f4 Merge pull request #4194 from GPCsolutions/dolibarr-hidepass 
[Security] Hide click to dial password
 2015-12-11 16:46:04 +01:00
Laurent Destailleur
b85dd6647d Merge pull request #4175 from frederic34/patch-3 
Update paypal.lib.php
 2015-12-11 16:44:25 +01:00
Laurent Destailleur
3fea57f83b Merge pull request #4192 from GPCsolutions/3.6-3930 
Fix #3930 Removed executable bit
 2015-12-11 16:42:25 +01:00
Laurent Destailleur
9c20694668 Merge pull request #4203 from frederic34/patch-5 
Update CSMSFile.class.php
 2015-12-11 16:39:51 +01:00
Laurent Destailleur
335530b496 Merge pull request #4189 from apachler/develop 
added social charges for Austria
 2015-12-11 16:39:16 +01:00
philippe grand
30eb08151d [Qual] Close database handler should be after Footer 2015-12-11 14:19:38 +01:00
philippe grand
9b0dd8159e [Qual] Close database handler should be after Footer 2015-12-11 12:29:19 +01:00
Florian HENRY
8edf3c65c6 work on accounting 2015-12-11 11:46:22 +01:00
Florian HENRY
71d0024b27 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-11 11:31:37 +01:00
philippe grand
8ccafc6e36 [Qual] Uniformize code 2015-12-11 09:54:30 +01:00
Ion Agorria
f34fb0d82d More consistent check 2015-12-11 03:09:09 +01:00