Marcos García de La Fuente
|
039039bb00
|
FIX #3798 #2519 Cron jobs would never be executed
|
2015-12-28 15:17:53 +01:00 |
|
Laurent Destailleur
|
6905842794
|
Update list of module in demo with new 3.8 modules
|
2015-12-27 20:31:39 +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
|
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
|
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 |
|
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 |
|
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 |
|
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
|
2d3915b88c
|
Fix hook implementation on some thirdparty pages
|
2015-12-23 14:31:42 +01:00 |
|
Laurent Destailleur
|
932c3f9172
|
Fix init of situation_percent
|
2015-12-21 12:37:58 +01:00 |
|
Laurent Destailleur
|
7e03aaee23
|
Merge remote-tracking branch 'origin/3.7' into 3.8
|
2015-12-21 12:25:47 +01:00 |
|
Laurent Destailleur
|
96b6f0d8fb
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
composer.json
htdocs/product/ajax/products.php
htdocs/product/class/product.class.php
|
2015-12-21 12:24:24 +01:00 |
|
Laurent Destailleur
|
9334cf8fd1
|
FIX #4243 sql injection
|
2015-12-19 18:03:08 +01:00 |
|
Laurent Destailleur
|
ba9796a438
|
Merge pull request #4082 from atm-maxime/fix_situation_percent
Fix : situation percent should be 100 by default
|
2015-12-19 17:49:04 +01:00 |
|
Laurent Destailleur
|
298396a57e
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
test/phpunit/AllTests.php
|
2015-12-19 01:27:19 +01:00 |
|
Laurent Destailleur
|
0df45f10c1
|
Fix travis
|
2015-12-19 01:09:42 +01:00 |
|
Laurent Destailleur
|
a136e90749
|
Fix travis
|
2015-12-19 01:06:11 +01:00 |
|
Laurent Destailleur
|
dd3f5a32d3
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
.travis.yml
composer.json
htdocs/accountancy/admin/card.php
|
2015-12-18 21:20:12 +01:00 |
|
Laurent Destailleur
|
ebf68ecbe0
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
.travis.yml
htdocs/contrat/class/contrat.class.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/modules/project/pdf/pdf_baleine.modules.php
|
2015-12-18 21:03:57 +01:00 |
|
Laurent Destailleur
|
1b67a9faf1
|
Merge pull request #4262 from atm-ph/fix_3.8_create_order_from_propal
FIX label of line is set in description field if empty
|
2015-12-18 18:21:20 +01:00 |
|
Laurent Destailleur
|
eaacfabdf6
|
Merge pull request #4261 from hregis/3.8_bug
Fix: Disable "main.inc.php" hooks with ajax return
|
2015-12-18 17:32:45 +01:00 |
|
phf
|
c215898c52
|
FIX label of line is set in description field if empty
|
2015-12-18 17:11:14 +01:00 |
|
Laurent Destailleur
|
7af4d91828
|
Merge pull request #4251 from fmarcet/3.6
FIX: Not deleting contracts on element_element table
|
2015-12-18 17:07:42 +01:00 |
|
Laurent Destailleur
|
452feca64a
|
Merge pull request #4249 from GPCsolutions/3.8-4242
FIX #4242 Allow disabling dashes in documents
|
2015-12-18 17:06:51 +01:00 |
|
Regis Houssin
|
70354def7c
|
Fix: Disable "main.inc.php" hooks with ajax return
|
2015-12-18 13:27:51 +01:00 |
|
Laurent Destailleur
|
5f4947e3c1
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2015-12-17 17:16:37 +01:00 |
|
Laurent Destailleur
|
cdc408a84c
|
Fix: button "now" was not working on date using no javascript
|
2015-12-17 17:16:26 +01:00 |
|
fmarcet
|
21f7271e51
|
FIX: Not deleting contrats on element_element table
|
2015-12-17 12:36:43 +01:00 |
|
Raphaël Doursenaud
|
7e98cfd5b6
|
FIX #4242 Allow disabling dashes in documents
3.8 specific fix for new documents
|
2015-12-17 10:33:17 +01:00 |
|
Raphaël Doursenaud
|
02e053acc6
|
FIX #4242 Allow disabling dashes in documents
3.7 specific fix since document files have moved
|
2015-12-17 10:26:27 +01:00 |
|
Raphaël Doursenaud
|
e6ec797af8
|
FIX #4242 Allow disabling dashes in documents
|
2015-12-17 10:21:44 +01:00 |
|
Laurent Destailleur
|
7c1fc2fee1
|
Merge pull request #4233 from aspangaro/3.7-accountancy1
Fix: Accountancy Add an empty field for list of parent account - This value can be null
|
2015-12-16 19:14:45 +01:00 |
|
Regis Houssin
|
cb7f29b332
|
Fix: PHP 7 - Fatal error: 'break' not in the 'loop' or 'switch' context
|
2015-12-16 13:32:44 +01:00 |
|
aspangaro
|
dfbc2814e7
|
Fix: Add an empty field for list of parent account - This value can be null
|
2015-12-15 21:10:53 +01:00 |
|
BENKE Charlie
|
23e727048e
|
Add some new translations for export feature
|
2015-12-15 10:35:11 +01:00 |
|
Laurent Destailleur
|
3e3dbf850f
|
Fix: bad case for function
|
2015-12-15 09:44:17 +01:00 |
|