Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
45,669 Commits 36 Branches 189 Tags
1a2bde14fb2fad0fab128f25a172579c8667cb15
Commit Graph

6772 Commits

Author SHA1 Message Date
Laurent Destailleur
782aaf52ae Add method setEventMessages (can deal this->error and this->errors) 2014-09-04 14:39:18 +02:00
Laurent Destailleur
32fd2e03ce More log into notify class 2014-09-04 14:38:30 +02:00
aspangaro
102e85e1e7 Merge branch 'Upstream/develop' 2014-09-04 04:34:04 +02:00
aspangaro
354aee2457 Modify eldy menu 2014-09-03 21:01:24 +02:00
aspangaro
1389f75933 Don't show journals of module comptabilite when accounting expert module is enabled 2014-09-03 20:32:38 +02:00
Laurent Destailleur
7021f4fb01 Fix: Message show when dir is out of sync with database cache was wrong. 2014-09-03 16:09:14 +02:00
Laurent Destailleur
be0c7ba28f Fix: Bad title 2014-09-03 09:55:06 +02:00
Laurent Destailleur
ca322942ae I remove the extend into commonobjectline to common object. 
For the moment, if we need a method for line already into object, i
prefer to see method duplicated.
 2014-09-03 09:49:50 +02:00
aspangaro
9d08f4c5f5 Patch Accounting Expert module 2014-09-03 07:22:59 +02:00
Laurent Destailleur
0254edb426 Merge pull request #1858 from ndrosis/patch-4 
Can change size of Logo picture
 2014-09-02 19:15:59 +02:00
Laurent Destailleur
adc96cc826 Merge pull request #1853 from aspangaro/develop-accounting 
Integration of module Accounting Expert
 2014-09-02 19:14:21 +02:00
Laurent Destailleur
4fdfe05168 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-02 12:46:57 +02:00
Florian HENRY
9b40cc9e89 fix 2014-09-02 12:09:43 +02:00
BENKE Charles
05ed96f7fa Update modContrat.class.php 
add export contract/service feature
 2014-09-02 10:45:53 +02:00
Juanjo Menent
e6a387cb65 Merge pull request #1856 from aspangaro/develop-patch1 
Typo
 2014-09-01 18:44:09 +02:00
Laurent Destailleur
f245f43a3f Doxygen 2014-08-31 23:18:09 +02:00
Laurent Destailleur
f2affade35 Doxygen 2014-08-31 23:06:58 +02:00
Laurent Destailleur
de548ba610 Doxygen 2014-08-31 23:01:49 +02:00
Laurent Destailleur
6e54577167 Better error management 2014-08-31 15:09:10 +02:00
aspangaro
def53d92bd Correct error menu 2014-08-31 14:10:48 +02:00
aspangaro
6d3b166340 Update dynamics menu 2014-08-31 13:58:42 +02:00
aspangaro
f9076162b6 Add dynamic link into accountancy menu to bank journal 2014-08-31 08:56:22 +02:00
aspangaro
9f92446dba Merge branch 'Upstream/develop' 2014-08-31 07:44:46 +02:00
Drosis Nikos
445bac25fe Can change size of Logo picture 2014-08-30 23:57:37 +03:00
Laurent Destailleur
154d1520fb Generalize $inputalsopricewithtax instead of MAIN_FEATURES_LEVEL>1 2014-08-30 20:36:53 +02:00
Laurent Destailleur
20475ba3e8 Fix: sql request not compatible with pgsql 
Conflicts:
	htdocs/core/ajax/ziptown.php
 2014-08-30 20:19:27 +02:00
Laurent Destailleur
0ccd29c6cd Doxygen 2014-08-30 20:05:16 +02:00
Laurent Destailleur
5738d6de98 Fix: sql request not compatible with pgsql 2014-08-30 20:04:53 +02:00
Laurent Destailleur
2d14e53b45 Fix: Pb with pgsql 2014-08-30 20:00:42 +02:00
Laurent Destailleur
f6be7d7930 Fix: Pb with pgsql 2014-08-30 19:58:38 +02:00
aspangaro
d6b2cb0b31 Correct travis 2014-08-30 06:05:02 +02:00
aspangaro
cc9f26a035 Correct travis 2014-08-30 05:44:12 +02:00
aspangaro
b27cf2cbd6 Merge branch 'Upstream/develop' 2014-08-30 05:30:53 +02:00
aspangaro
b25db97c28 Typo 2014-08-30 05:30:37 +02:00
aspangaro
1a7c88751c Correct travis 2014-08-30 05:19:48 +02:00
aspangaro
07377e7156 Merge branch 'Upstream/develop' 2014-08-30 04:42:36 +02:00
Laurent Destailleur
47339d0e62 Fix: Missing field tobuy into service export. 
Fix: Filter on date into export.
Fix: Tooltip help.
 2014-08-29 20:26:27 +02:00
Laurent Destailleur
5dc35ec137 Fix: Missing field tobuy into service export. 
Fix: Filter on date into export.
Fix: Tooltip help.
 2014-08-29 20:25:54 +02:00
aspangaro
bc686a7995 Test Correct travis 2014-08-29 06:43:05 +02:00
aspangaro
bb7aa9f29c Merge branch 'Upstream/develop' 2014-08-29 06:33:00 +02:00
Regis Houssin
ff04729a07 Fix: strict mode 2014-08-28 19:38:18 +02:00
Regis Houssin
1aad1b6acd Fix: strict mode 2014-08-28 19:32:41 +02:00
Laurent Destailleur
711e7e6fc6 Fix: phpunit test 
Fix: debian readme to upgrade tcpdf lib.
 2014-08-28 16:59:10 +02:00
Regis Houssin
48f9ef2574 Fix: php strict mode saga 2014-08-28 15:53:29 +02:00
Regis Houssin
2c46c20dfb Fix: php strict mode saga 2014-08-28 15:52:58 +02:00
Regis Houssin
139cf10c7c Fix: php strict mode saga 2014-08-28 15:52:20 +02:00
Regis Houssin
615122bf37 Fix: another strict mode alert 2014-08-28 15:36:57 +02:00
Regis Houssin
714da05034 Fix: another strict mode alert 2014-08-28 15:36:22 +02:00
Regis Houssin
4fdd98c4a7 Fix: another strict mode alert 2014-08-28 15:34:50 +02:00
Laurent Destailleur
1505ade3db Fix error management: When an error is returned by hooks into 
dol_move_uploaded_file, message must be returned by function as if it
were an error for any other reason.

Conflicts:
	htdocs/core/lib/files.lib.php
 2014-08-28 15:14:06 +02:00