Laurent Destailleur
|
c63cbe34c6
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-12-31 12:02:36 +01:00 |
|
Laurent Destailleur
|
5a49b8ce53
|
Fix: error when running install twice
Fix: a minor error was locking the full upgrade process.
|
2015-12-31 12:02:22 +01:00 |
|
Juanjo Menent
|
d07cb62cf0
|
Merge pull request #4318 from mrsof/patch-3
FIX: Field cost_price does not exist and typos
|
2015-12-30 21:57:59 +01:00 |
|
Sof
|
c04eef35d5
|
FIX: Field cost_price does not exist and typos
|
2015-12-28 19:07:25 +01:00 |
|
Laurent Destailleur
|
41516093bb
|
Syn transifex
|
2015-12-28 12:21:24 +01:00 |
|
Laurent Destailleur
|
ed3f0ce86b
|
Fix totalnboflines not correctly managed
|
2015-12-28 00:20:48 +01:00 |
|
Laurent Destailleur
|
6f474c403c
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/filefunc.inc.php
htdocs/product/list.php
htdocs/societe/notify/card.php
htdocs/societe/price.php
|
2015-12-27 19:15:20 +01:00 |
|
Laurent Destailleur
|
e536e10269
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
build/makepack-howto.txt
htdocs/filefunc.inc.php
|
2015-12-27 19:06:31 +01:00 |
|
Laurent Destailleur
|
06754068ff
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
build/debian/changelog
build/makepack-dolibarr.pl
build/makepack-howto.txt
htdocs/filefunc.inc.php
|
2015-12-27 19:02:19 +01:00 |
|
Laurent Destailleur
|
96bc2023f3
|
Prepare package 3.6.6
|
2015-12-27 18:56:15 +01:00 |
|
Laurent Destailleur
|
40963f2f2a
|
FIX #4207
|
2015-12-27 18:46:21 +01:00 |
|
Laurent Destailleur
|
bf15ff56e7
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-12-27 18:26:31 +01:00 |
|
Laurent Destailleur
|
0645938283
|
FIX #4230 PHP7 error
|
2015-12-27 18:26:21 +01:00 |
|
Laurent Destailleur
|
46d122c43a
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2015-12-27 18:20:58 +01:00 |
|
Laurent Destailleur
|
97030b05ce
|
FIX #4281
|
2015-12-27 18:20:39 +01:00 |
|
Laurent Destailleur
|
70b73f2d51
|
Merge pull request #4306 from marcosgdf/bug-3980
FIX #3980 Search field in "product by supplier" list sends empty result 3.8 and 3.7
|
2015-12-27 17:38:33 +01:00 |
|
Laurent Destailleur
|
5afed31265
|
Merge pull request #4305 from marcosgdf/bug-4036
FIX #4036 Direct printing module without any driver configured, shows an unformatted error message
|
2015-12-27 17:37:29 +01:00 |
|
Laurent Destailleur
|
80989fd2c9
|
Merge pull request #4304 from marcosgdf/bug-4302
FIX #4302 Undefined variable $conf in Commande::LibStatut
|
2015-12-27 17:37:02 +01:00 |
|
Laurent Destailleur
|
ff6dc32827
|
Merge pull request #4303 from marcosgdf/bug-4282
FIX #4282 Defined shipping time were not shown in Customer order's PDF documents
|
2015-12-27 17:36:48 +01:00 |
|
Laurent Destailleur
|
299e34f3ee
|
Merge pull request #4294 from marcosgdf/bug-4287
FIX #4287 SQL error when accessing an unexisting proposal
|
2015-12-27 17:33:09 +01:00 |
|
Laurent Destailleur
|
68ee482915
|
Merge pull request #4293 from marcosgdf/patch-2
Little typo in commit 8b633ae
|
2015-12-27 17:32:02 +01:00 |
|
Laurent Destailleur
|
e93ec106bc
|
Merge pull request #4290 from defrance/patch-92
add odt info function call if present in class
|
2015-12-27 17:26:26 +01:00 |
|
Laurent Destailleur
|
a9b52f36e6
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-12-27 17:06:05 +01:00 |
|
Laurent Destailleur
|
c64eac5e72
|
Fix doc and mysql min version
|
2015-12-27 17:05:56 +01:00 |
|
Laurent Destailleur
|
7d84dd8f52
|
Merge pull request #4269 from FHenry/develop
FIX : Working on accountancy
|
2015-12-27 17:03:51 +01:00 |
|
Marcos García de La Fuente
|
ebdaf7dfa6
|
FIX #3980 Search field in "product by supplier" list sends empty result 3.8 and 3.7
|
2015-12-27 15:12:02 +01:00 |
|
Marcos García de La Fuente
|
c40c695d20
|
FIX #4036 Direct printing module without any driver configured, shows an unformatted error message
|
2015-12-27 14:58:33 +01:00 |
|
Marcos García de La Fuente
|
98351d6fec
|
FIX #4302 Undefined variable $conf in Commande::LibStatut
|
2015-12-27 13:15:05 +01:00 |
|
Marcos García de La Fuente
|
67bdfa2617
|
FIX #4282 Defined shipping time were not shown in Customer order's PDF documents
|
2015-12-27 13:10:33 +01:00 |
|
bobby
|
e557c002c8
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-12-26 11:56:10 +01:00 |
|
Marcos García de La Fuente
|
686348a0d6
|
FIX #4287 SQL error when accessing an unexisting proposal
|
2015-12-25 11:47:48 +01:00 |
|
Marcos García
|
da959c5cf0
|
Little typo in commit 8b633ae
|
2015-12-25 11:32:13 +01:00 |
|
Juanjo Menent
|
c6093fff3e
|
Merge pull request #4289 from marcosgdf/bug-4285
FIX #4285 SQL query shown when accessing an unexisting invoice
|
2015-12-24 22:00:00 +01:00 |
|
Juanjo Menent
|
d4466a652a
|
Merge pull request #4288 from marcosgdf/bug-4182
FIX #4182 SQL error when deleting an unexisting bank entry
|
2015-12-24 21:59:16 +01:00 |
|
Juanjo Menent
|
c9e8c362a5
|
Merge pull request #4286 from marcosgdf/bug-4055
FIX #4055 SQL error when trying to access a non-existing expedition
|
2015-12-24 21:58:56 +01:00 |
|
Juanjo Menent
|
cdd1641b66
|
Merge pull request #4284 from frederic34/patch-7
typo
|
2015-12-24 15:50:24 +01:00 |
|
BENKE Charlie
|
ed501cec46
|
add odt info is present in class
|
2015-12-24 15:44:56 +01:00 |
|
Juanjo Menent
|
b9d0fc5aaf
|
Merge pull request #4271 from grandoc/develop
[Qual] Uniformize code
|
2015-12-24 15:43:14 +01:00 |
|
BENKE Charlie
|
9c78b083bd
|
add display odt info if method present in class
|
2015-12-24 15:42:47 +01:00 |
|
Marcos García de La Fuente
|
de1625b9de
|
FIX #4285 SQL query shown when accessing an unexisting invoice
|
2015-12-24 14:46:01 +01:00 |
|
Marcos García de La Fuente
|
8b633aee66
|
FIX #4182 SQL error when deleting an unexisting bank entry
|
2015-12-24 14:39:28 +01:00 |
|
Marcos García de La Fuente
|
d30c64413d
|
FIX #4055 SQL error when trying to access a non-existing expedition
|
2015-12-24 14:27:12 +01:00 |
|
Laurent Destailleur
|
a4d5e022cf
|
Fix pagination on limit failed when limit was forced on url
|
2015-12-24 12:52:11 +01:00 |
|
Laurent Destailleur
|
8c1f271356
|
Maxi debug of module leave requests.
|
2015-12-24 12:37:38 +01:00 |
|
Laurent Destailleur
|
66e0c1285e
|
Disable a bugged box
|
2015-12-24 11:38:30 +01:00 |
|
Laurent Destailleur
|
74e8738ca7
|
Fix: if option to select thirdparties using a combo box after n chars
was on, it was no more possible to clear the filter.
|
2015-12-24 11:24:56 +01:00 |
|
Frédéric FRANCE
|
45b60c7800
|
typo
|
2015-12-24 00:01:05 +01:00 |
|
Laurent Destailleur
|
18fdb75c98
|
Missing global
|
2015-12-23 20:02:15 +01:00 |
|
Laurent Destailleur
|
a9db42ddc1
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-12-23 20:00:16 +01:00 |
|
Laurent Destailleur
|
559e621fd2
|
Fix conflict with trigger to delete payment customer and supplier.
|
2015-12-23 19:54:56 +01:00 |
|