fmarcet
|
cafe148f72
|
FIX: Email templates not compatible with Multicompany
|
2016-01-04 09:12:27 +01:00 |
|
fmarcet
|
cebb996120
|
FIX: Email templates not compatible with Multicompany
|
2015-12-29 11:22:18 +01:00 |
|
fmarcet
|
f8e156ea30
|
FIX: Email templates not compatible with Multicompany
|
2015-12-29 10:35:10 +01:00 |
|
Laurent Destailleur
|
f13df0f952
|
Prepare 3.7.3
|
2015-12-27 20:17:46 +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
|
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 |
|
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 |
|
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
|
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
|
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
|
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
|
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 |
|
fmarcet
|
21f7271e51
|
FIX: Not deleting contrats on element_element table
|
2015-12-17 12:36:43 +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
|
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 |
|
Laurent Destailleur
|
1978eebb69
|
Fix bad merge
|
2015-12-13 17:33:20 +01:00 |
|
Laurent Destailleur
|
4a88c9ea9f
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/product/class/product.class.php
|
2015-12-13 15:53:57 +01:00 |
|
Laurent Destailleur
|
3fea57f83b
|
Merge pull request #4192 from GPCsolutions/3.6-3930
Fix #3930 Removed executable bit
|
2015-12-11 16:42:25 +01:00 |
|
Raphaël Doursenaud
|
4e9b339439
|
[Qual] Removed PHP closing tag
|
2015-12-09 13:28:45 +01:00 |
|
Raphaël Doursenaud
|
c0862762a5
|
Fix #3930 Removed executable bit
These files doesn't contain executable code and may pose a security
threat.
|
2015-12-09 13:28:36 +01:00 |
|
Laurent Destailleur
|
a209d18649
|
FIX Can use formated float number on old expense report module.
|
2015-12-06 19:51:28 +01:00 |
|
Laurent Destailleur
|
b3ed99ddc1
|
Merge pull request #4146 from fmarcet/3.6
FIX: Not delete a product when have customer price
|
2015-12-04 18:24:37 +01:00 |
|
Laurent Destailleur
|
00aa5aace7
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
dev/codesniffer/ruleset.xml
|
2015-12-04 12:14:24 +01:00 |
|
Laurent Destailleur
|
d2b221cfd1
|
Upgrade PHPCS rules
|
2015-12-04 10:22:27 +01:00 |
|
fmarcet
|
eb98bd1e78
|
FIX: Not delete a product when have customer price
|
2015-12-03 14:02:26 +01:00 |
|
Laurent Destailleur
|
7105fabb79
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/langs/en_US/users.lang
htdocs/product/stock/class/mouvementstock.class.php
|
2015-12-03 12:51:49 +01:00 |
|
Laurent Destailleur
|
1694481df8
|
Merge pull request #4134 from FHenry/3.7
FIX : Use "WHERE true" instead of "WHERE 1" #4132
|
2015-12-03 11:58:23 +01:00 |
|