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

42284 Commits

Author SHA1 Message Date
Laurent Destailleur
62a1d1c4a2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-09-04 18:35:32 +02:00
Laurent Destailleur
f992c2091f Add ignore 2015-09-04 18:35:18 +02:00
Juanjo Menent
a720f30335 Merge pull request #3194 from defrance/patch-71 
NEW add hook addMoreActionsButtons on adherent Card
 2015-09-04 18:33:19 +02:00
Laurent Destailleur
3d6488d91e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-09-04 18:32:14 +02:00
Laurent Destailleur
55752610dc Exclude dir 2015-09-04 18:27:25 +02:00
Juanjo Menent
81caf74360 Merge pull request #3464 from grandoc/develop 
NEW: : add doActions hook method call in contract card
 2015-09-04 18:25:33 +02:00
Juanjo Menent
b3f3e57852 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-04 18:24:18 +02:00
Juanjo Menent
de3f1b5559 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-09-04 18:23:33 +02:00
Juanjo Menent
ecf80249d1 Merge pull request #3454 from hregis/3.7_bug3 
Fix: problem with pagination
 2015-09-04 18:22:23 +02:00
Juanjo Menent
0016f48fac Merge pull request #3424 from atm-aurelien/3.7 
FIX ref_supplier to object property on supplier ref change
 2015-09-04 18:00:05 +02:00
Laurent Destailleur
dcaef54f9b Fix can't disable a module that were removed. 2015-09-04 16:47:43 +02:00
Laurent Destailleur
9422b22edb Fix translation 2015-09-04 00:12:45 +02:00
Laurent Destailleur
d19ec89bf1 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/modules/modHoliday.class.php
	htdocs/holiday/card.php
 2015-09-03 23:27:47 +02:00
Laurent Destailleur
2e3d25c055 Merge pull request #3462 from grandoc/3.7 
fix : Typo
 2015-09-03 19:15:31 +02:00
Laurent Destailleur
c7b7dff0ed Merge branch 'bug-3460' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-3460

Conflicts:
	ChangeLog
 2015-09-03 19:14:37 +02:00
Laurent Destailleur
54214cfddf Merge branch 'bug-3383' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-3383

Conflicts:
	ChangeLog
 2015-09-03 19:12:01 +02:00
Laurent Destailleur
be9d5b030d Merge branch 'bug-3358' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-3358

Conflicts:
	ChangeLog
 2015-09-03 19:08:08 +02:00
Laurent Destailleur
b0f604da14 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 
Conflicts:
	ChangeLog
 2015-09-03 17:05:02 +02:00
philippe grand
e9bb296a4f NEW: : add doActions hook method call in contract card 2015-09-03 13:57:38 +02:00
philippe grand
fed70b1376 translation missing 2015-09-03 12:57:57 +02:00
Marcos García de La Fuente
ded6e7d6d9 Merge branch '3.7' into bug-3358 
# Conflicts:
#	ChangeLog
 2015-09-03 12:32:03 +02:00
Marcos García de La Fuente
2d5331b8f8 FIX [ #3460 ] Selected bank account was not saved when an error happened when trying to create a customer invoice 
Close #3460
 2015-09-03 12:13:03 +02:00
philippe grand
8bf093a7ce fix : Typo 2015-09-03 12:12:10 +02:00
Marcos García de La Fuente
67b7162c59 Merge branch '3.7' into bug-3383 
# Conflicts:
#	ChangeLog
 2015-09-03 12:05:19 +02:00
Marcos García de La Fuente
86dd751f29 Merge branch '3.7' into bug-incorrect-pdf-bank 
# Conflicts:
#	ChangeLog
 2015-09-03 12:03:24 +02:00
Marcos García de La Fuente
0955432de3 Merge branch '3.7' into bug-iban-whitespaces-37 
# Conflicts:
#	ChangeLog
 2015-09-03 12:02:23 +02:00
Laurent Destailleur
ce2e5e7862 Little debug of accounting module 2015-09-03 11:54:03 +02:00
Laurent Destailleur
36ed1c9a88 Fix error management 
Fix look
 2015-09-03 11:00:53 +02:00
Laurent Destailleur
5d34f787a3 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/class/conf.class.php
 2015-09-03 10:51:17 +02:00
Laurent Destailleur
19ac160696 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/facture/impayees.php
	htdocs/compta/index.php
	htdocs/core/boxes/box_prospect.php
	htdocs/includes/tcpdf/fonts/dejavusanscondensed.ctg.z
	htdocs/includes/tcpdf/fonts/dejavusanscondensed.z
	htdocs/includes/tcpdf/fonts/dejavusanscondensedb.ctg.z
	htdocs/includes/tcpdf/fonts/dejavusanscondensedb.z
	htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.ctg.z
	htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.z
	htdocs/includes/tcpdf/fonts/dejavusanscondensedi.ctg.z
	htdocs/includes/tcpdf/fonts/dejavusanscondensedi.z
	htdocs/includes/tcpdf/fonts/dejavusansextralight.ctg.z
	htdocs/includes/tcpdf/fonts/dejavusansextralight.z
	htdocs/includes/tcpdf/fonts/dejavusansmono.ctg.z
	htdocs/includes/tcpdf/fonts/dejavusansmono.z
	htdocs/includes/tcpdf/fonts/dejavusansmonob.ctg.z
	htdocs/includes/tcpdf/fonts/dejavusansmonob.z
	htdocs/includes/tcpdf/fonts/dejavusansmonobi.ctg.z
	htdocs/includes/tcpdf/fonts/dejavusansmonobi.z
	htdocs/includes/tcpdf/fonts/dejavusansmonoi.ctg.z
	htdocs/includes/tcpdf/fonts/dejavusansmonoi.z
 2015-09-03 10:49:41 +02:00
Laurent Destailleur
d64a87d980 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/index.php
 2015-09-03 10:44:40 +02:00
Laurent Destailleur
001f1b4c31 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/filefunc.inc.php
 2015-09-03 10:41:44 +02:00
Laurent Destailleur
7640abe6fc Merge pull request #3453 from hregis/3.7_bug 
Fix: wrong logical operator
 2015-09-03 10:40:10 +02:00
Laurent Destailleur
cda681ac6a Merge pull request #3451 from atm-gauthier/3.8_fix_right_on_asksupplierprice 
FIX : on asksupplierprice module, order creation button must be avail…
 2015-09-03 10:36:30 +02:00
Laurent Destailleur
124f068364 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-03 10:34:39 +02:00
Laurent Destailleur
897686a752 Merge pull request #3447 from fmarcet/3.5 
FIX: The hours of date filter aren't correct
 2015-09-03 10:33:00 +02:00
Laurent Destailleur
6ea31d87f8 Merge pull request #3445 from GPCsolutions/3.7-2863 
Fix #2863 Sensible defaults for ChromePHP path
 2015-09-03 10:32:22 +02:00
Laurent Destailleur
9efecbf52b Merge pull request #3443 from GPCsolutions/3.5-3442 
Fix #3442 Remove useless syslog
 2015-09-03 10:30:42 +02:00
Laurent Destailleur
563c434fcf Fix injection 2015-09-03 09:56:33 +02:00
Laurent Destailleur
c024578ca1 Fix bad link and remove a break 2015-09-02 19:41:54 +02:00
Laurent Destailleur
e3af0b90ec Fix hidden feature to send remind by email 2015-09-02 18:09:29 +02:00
Regis Houssin
1a08f65942 Fix: problem with pagination 2015-09-02 17:22:19 +02:00
Laurent Destailleur
df3f29ee96 Fix hidden feature to send remind by email 2015-09-02 16:26:56 +02:00
Laurent Destailleur
5ef3c517bc Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-09-02 16:26:09 +02:00
Laurent Destailleur
c4fa4fc931 Fix hidden feature to send remind by email 2015-09-02 16:25:21 +02:00
Regis Houssin
fbf13ec2c7 Fix: wrong logical operator 2015-09-02 14:09:19 +02:00
Gauthier
c2c394ed8d FIX : on asksupplierprice module, order creation button must be available if user is allowed to create supplier order and not if he's allowed to create customer order 2015-09-02 11:07:30 +02:00
Laurent Destailleur
f57284f507 Fix stats opportunities 2015-09-01 16:52:20 +02:00
Laurent Destailleur
a84696230b Fix the translation page must be visible for all languages, except 
en_US.
 2015-09-01 16:11:58 +02:00
Laurent Destailleur
7d4602f2c4 Fix payment mode type 2015-09-01 15:59:11 +02:00