Laurent Destailleur
|
f25a9030eb
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
.travis.yml
htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
htdocs/core/modules/commande/doc/pdf_proforma.modules.php
htdocs/includes/adodbtime/adodb-time.inc.php
htdocs/langs/en_US/accountancy.lang
|
2015-12-18 22:12:03 +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
|
05ea9afa02
|
Fix to manage de_CH thousand separator
|
2015-12-18 20:53:04 +01:00 |
|
Laurent Destailleur
|
b47dc8a394
|
Fix to use new travis setup
|
2015-12-18 20:10:11 +01:00 |
|
Laurent Destailleur
|
116bdf47a3
|
Debug travis
|
2015-12-18 20:02:28 +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
|
dc9c5ed5ef
|
Enhance transifex sync
|
2015-12-18 18:25:09 +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
|
484dc5937b
|
Fix regression in sorting
|
2015-12-18 18:05:07 +01:00 |
|
Laurent Destailleur
|
43044bbb4f
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-12-18 17:32:54 +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 |
|
Laurent Destailleur
|
4998516835
|
Code comment
|
2015-12-18 17:31:50 +01:00 |
|
Laurent Destailleur
|
724817b966
|
Merge pull request #4259 from aschio/develop_sunimport
Adding extrafields to shipments module
|
2015-12-18 17:28:35 +01:00 |
|
Laurent Destailleur
|
dc8e5f45ae
|
Merge pull request #4254 from grandoc/develop
[Qual] Uniformize code
|
2015-12-18 17:13:22 +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
|
c328860af0
|
Merge pull request #4250 from GPCsolutions/dolibarr-4242
FIX #4242 Allow disabling dashes in documents
|
2015-12-18 17:07:00 +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 |
|
Laurent Destailleur
|
74293cd7cc
|
git push origin developMerge branch 'GPCsolutions-dolibarr-cifix' into develop
|
2015-12-18 17:05:19 +01:00 |
|
Laurent Destailleur
|
d0ec3f1152
|
Merge branch 'dolibarr-cifix' of
https://github.com/GPCsolutions/dolibarr into
GPCsolutions-dolibarr-cifix
Conflicts:
htdocs/product/card.php
|
2015-12-18 17:05:04 +01:00 |
|
Regis Houssin
|
70354def7c
|
Fix: Disable "main.inc.php" hooks with ajax return
|
2015-12-18 13:27:51 +01:00 |
|
Laurent Destailleur
|
98cd4f8307
|
Fix message so it is more clear what the feature can do or not.
Fix list of email templates must be hidden for templates of disabled
modules.
|
2015-12-18 12:48:20 +01:00 |
|
cla
|
cb96618460
|
Merge branch 'develop' into develop_sunimport
|
2015-12-18 10:49:57 +01:00 |
|
Laurent Destailleur
|
b10f9d4ca3
|
Fix: when doing an export of extrafields, we must use different table
alias for each extrafield table.
|
2015-12-17 20:40:33 +01:00 |
|
Laurent Destailleur
|
5eea1ce7d9
|
Fix several warnings
|
2015-12-17 19:37:24 +01:00 |
|
philippe grand
|
6e45ad92fa
|
fix some issue within setEventMessages attribut
|
2015-12-17 17:35:30 +01:00 |
|
philippe grand
|
b91031b693
|
fix some issue within my last commit
|
2015-12-17 17:20:28 +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 |
|
philippe grand
|
367d9de0b7
|
fix some translation
|
2015-12-17 17:12:28 +01:00 |
|
philippe grand
|
93845ffa69
|
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
|
2015-12-17 16:58:05 +01:00 |
|
philippe grand
|
c9d6607b04
|
[Qual] Uniformize code
|
2015-12-17 14:14:44 +01:00 |
|
Laurent Destailleur
|
92343901d6
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-12-17 14:01:34 +01:00 |
|
Laurent Destailleur
|
ba3c8de785
|
Update doc comment to make things cleaner to avoid confusion between old
deprecated doActions of canvas and doActions of triggers.
|
2015-12-17 14:01:22 +01:00 |
|
fmarcet
|
21f7271e51
|
FIX: Not deleting contrats on element_element table
|
2015-12-17 12:36:43 +01:00 |
|
Raphaël Doursenaud
|
4f9ab7da24
|
FIX #4242 Allow disabling dashes in documents
3.9 specific fix since document have moved
|
2015-12-17 10:39:55 +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 |
|