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

49238 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
1ad2aeaf2a Removed baf cut and paste 2015-09-10 01:28:39 +02:00
Laurent Destailleur
a4d0e50175 Merge pull request #3489 from AlainRnet/patch-1 
Update lines.php
 2015-09-10 01:23:13 +02:00
Laurent Destailleur
5c0d90ae97 Merge pull request #3497 from aspangaro/develop-RefundVAT 
New: refund VAT - Thanks to icfr for jquery part !
 2015-09-10 01:17:06 +02:00
Laurent Destailleur
87a73b150a Merge pull request #3498 from gschratzer/develop 
FIX #3425 missing Profid keys in companies.lang
 2015-09-10 01:12:54 +02:00
Guido Schratzer
702edac00a FIX: issue #3425 missing Profid keys in companies.lang 
for Austria issue #3425
 2015-09-09 22:16:03 +02:00
aspangaro
15e50ecdb3 Update work 2015-09-09 21:35:41 +02:00
aspangaro
ae6f547ba5 Merge remote-tracking branch 'Upstream/develop' into develop-62 2015-09-09 20:57:28 +02:00
Laurent Destailleur
41803cd868 Merge pull request #3470 from GPCsolutions/develop-3440 
Fix #3440 Only search for core modules in main path
 2015-09-09 20:53:25 +02:00
Laurent Destailleur
2234d95a7b Merge pull request #3481 from grandoc/develop 
translations missing
 2015-09-09 20:52:36 +02:00
Laurent Destailleur
615734012e Merge pull request #3476 from marcosgdf/refactor 
Refactor: Created hasDelay functions
 2015-09-09 20:50:58 +02:00
Laurent Destailleur
a726cd210b Merge pull request #3483 from GPCsolutions/sentry 
Fix regression introduced by f3c71a9a5a
 2015-09-09 20:10:01 +02:00
Laurent Destailleur
870267316b Merge pull request #3484 from GPCsolutions/https 
Qual: Don't attempt HTTPS redirect if already using HTTPS
 2015-09-09 20:09:38 +02:00
Juanjo Menent
42ac326f07 Merge pull request #3477 from aspangaro/develop-64 
New Accountancy Uniformize code & rename a constant
 2015-09-09 17:38:12 +02:00
Juanjo Menent
d0c2131b09 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-08 21:32:37 +02:00
Juanjo Menent
7d88405058 Fix #3475 RemiseCheque: Undefined variable $date 2015-09-08 21:31:04 +02:00
aspangaro
393d528be7 Merge remote-tracking branch 'Upstream/develop' into develop-64 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-09-08 21:17:54 +02:00
Juanjo Menent
4b031e9e6a Merge pull request #3473 from aspangaro/develop-63 
New: Accountancy rename llx_accountingaccount in llx_accounting_account
 2015-09-08 20:06:00 +02:00
Juanjo Menent
45a94b055a Merge pull request #3488 from GPCsolutions/transifex 
Qual: Fixed translation strings
 2015-09-08 19:55:56 +02:00
Juanjo Menent
0c447d7497 Merge pull request #3487 from GPCsolutions/unused 
Qual: removed unused translation token
 2015-09-08 19:55:08 +02:00
Juanjo Menent
5d401f275c Merge pull request #3486 from GPCsolutions/debug 
Qual: remove debug output
 2015-09-08 19:54:42 +02:00
Laurent Destailleur
24f7100562 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/lib/memory.lib.php
 2015-09-08 10:33:33 +02:00
aspangaro
16585553c1 Merge remote-tracking branch 'Upstream/develop' into develop-64 2015-09-07 21:52:08 +02:00
aspangaro
46b0e259b1 Add constant in modAccounting.class.php 2015-09-07 21:51:48 +02:00
aspangaro
cf869f22b5 Merge remote-tracking branch 'Upstream/develop' into develop-63 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-09-07 21:45:13 +02:00
aspangaro
710e9327bf Update works 2015-09-07 21:42:12 +02:00
Laurent Destailleur
82ad81fc03 Fix picto 2015-09-07 20:56:28 +02:00
Laurent Destailleur
5529ef7a50 Better doc 2015-09-07 20:53:16 +02:00
Laurent Destailleur
9667b6a7c6 Solve conflict of var name 2015-09-07 20:22:44 +02:00
Laurent Destailleur
c9264fa1bc Fix memcached effect was lost because init was done each time. 2015-09-07 20:19:37 +02:00
Laurent Destailleur
0a6451d72c Fix memcached effect was lost because init was done each time. 2015-09-07 20:17:05 +02:00
Raphaël Doursenaud
e85c510b87 Qual: Fixed translation strings 2015-09-07 19:44:10 +02:00
Raphaël Doursenaud
3624ae0ec7 Qual: removed unused translation token 2015-09-07 19:16:44 +02:00
Raphaël Doursenaud
71b98ffc0e Qual: remove debug output 2015-09-07 17:15:41 +02:00
philippe grand
706f62d8f2 better display for code 2015-09-07 17:02:53 +02:00
Raphaël Doursenaud
92c08c77fd Qual: Don't attempt HTTPS redirect if already using HTTPS 2015-09-07 16:43:17 +02:00
Raphaël Doursenaud
1168f0b6ae Fix regression introduced by f3c71a9a5a 2015-09-07 16:20:17 +02:00
philippe grand
ec21916d3b translations missing 2015-09-07 15:55:26 +02:00
philippe grand
9532baf0e5 translations missing 2015-09-07 15:46:57 +02:00
philippe grand
887a4107a1 translations missing 2015-09-07 15:40:55 +02:00
philippe grand
3a6271e714 translations missing 2015-09-07 15:29:51 +02:00
Laurent Destailleur
53a9c93b90 Fix PHPCS 2015-09-07 15:16:43 +02:00
Laurent Destailleur
3ae19375cd Merge pull request #3474 from aspangaro/3.8-16 
Fix Problem with checked input when you edit a survey
 2015-09-07 15:11:18 +02:00
Laurent Destailleur
5d285bf56d Merge pull request #3478 from grandoc/develop 
translations missing
 2015-09-07 15:09:31 +02:00
Laurent Destailleur
9cd5e7cafa Fix some errors into code generator. 2015-09-07 15:03:38 +02:00
Laurent Destailleur
fc35c4e3f0 Add migration script for 3.9 2015-09-07 14:01:59 +02:00
Laurent Destailleur
2de690259a Add migration script for 3.9 2015-09-07 14:01:05 +02:00
Laurent Destailleur
fe60927503 Fix button must appears if box selected 2015-09-07 13:30:02 +02:00
Laurent Destailleur
7f05e19e0d Prepare 3.9 2015-09-07 13:24:52 +02:00
Laurent Destailleur
3333970eb4 Prepare 3.9 2015-09-07 13:23:51 +02:00
Laurent Destailleur
1b3db2ca41 NEW Add none/all selection into list of files for FTP browser module 2015-09-07 13:20:44 +02:00