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 |
|
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
|
67462a81a8
|
Fix link to issues and dependencies
|
2015-12-21 12:22:31 +01:00 |
|
Laurent Destailleur
|
b0b5e95c7f
|
Backport travis change
|
2015-12-21 03:04:01 +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
|
6ed87f43de
|
Fix indent
|
2015-12-19 01:15:08 +01:00 |
|
Laurent Destailleur
|
b1b2038d71
|
Merge remote-tracking branch 'origin/3.6' into 3.7
|
2015-12-19 01:11:01 +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
|
41cdb65521
|
Test to solve travis error
|
2015-12-18 21:44:18 +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
|
c1c0fa88c2
|
Fix for new travis setup
|
2015-12-18 20:56:27 +01:00 |
|
Laurent Destailleur
|
b47dc8a394
|
Fix to use new travis setup
|
2015-12-18 20:10:11 +01:00 |
|
Laurent Destailleur
|
61df71cc64
|
Fix travis
|
2015-12-18 19:57:09 +01:00 |
|
Laurent Destailleur
|
11042fe499
|
Restore data missin help debug
|
2015-12-18 19:54:54 +01:00 |
|
Laurent Destailleur
|
064fad136e
|
Try to solve travis pb
|
2015-12-18 19:28:17 +01:00 |
|
Laurent Destailleur
|
0dc4130a17
|
Add debug
|
2015-12-18 18:59:20 +01:00 |
|
Laurent Destailleur
|
056ab63680
|
Try to fix travis error using new setup
|
2015-12-18 18:46:35 +01:00 |
|
Laurent Destailleur
|
480111c6b1
|
Try to fix travis error using new setup
|
2015-12-18 18:31:51 +01:00 |
|
Laurent Destailleur
|
5c8731b197
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2015-12-18 18:29:51 +01:00 |
|
Laurent Destailleur
|
aa7e74f4c8
|
Try to fix travis error using the new setup
|
2015-12-18 18:29:33 +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 |
|
Laurent Destailleur
|
2a137cd126
|
Merge pull request #4248 from GPCsolutions/3.7-4242
FIX #4242 Allow disabling dashes in documents
|
2015-12-18 17:06:40 +01:00 |
|
Laurent Destailleur
|
3d6f1d911a
|
Merge pull request #4247 from GPCsolutions/3.6-4242
FIX #4242 Allow disabling dashes in documents
|
2015-12-18 17:06:23 +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 |
|
Laurent Destailleur
|
1435a3eec7
|
Merge pull request #4226 from defrance/patch-88
Fix add missing translations for export feature
|
2015-12-16 19:11:07 +01:00 |
|
Laurent Destailleur
|
198e2cdcfa
|
Merge pull request #4237 from hregis/3.7_bug
Fix: PHP 7 - Fatal error: 'break' not in the 'loop' or 'switch' context
|
2015-12-16 18:11: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 |
|
Laurent Destailleur
|
b9aa80c4ca
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2015-12-14 10:33:32 +01:00 |
|
Laurent Destailleur
|
84ee18a11b
|
Fix bad management of second level approvement
|
2015-12-14 10:33:18 +01:00 |
|