Niklas Spanring
2f08ddef54
Fix: travis-ci error actions_sendmails.inc.php
...
error line="124""The use of function sizeof() is forbidden; use count() instead"
error line="229" "The use of function sizeof() is forbidden; use count() instead"
2015-08-26 15:04:50 +02:00
gschratzer
99e679ec39
Merge https://github.com/gschratzer/dolibarr into develop
2015-08-25 17:07:15 +02:00
gschratzer
16268e9f0a
New: function calculate_byte
2015-08-25 17:05:08 +02:00
Guido Schratzer
6b85a49068
Merge pull request #1 from Dolibarr/develop
...
get new version
2015-08-25 16:42:52 +02:00
Laurent Destailleur
09355b0c7b
Fix filtering
2015-08-24 16:40:43 +02:00
Guido Schratzer
0aabf5eb08
Update actions_sendmails.inc.php
2015-08-24 16:35:08 +02:00
Laurent Destailleur
2cf10ac05d
Fix filtering
2015-08-24 16:32:43 +02:00
gschratzer
bf00b5d795
New: IMAP dolimail Support
2015-08-24 16:22:21 +02:00
gschratzer
7c550fdba5
New: IMAP dolimail Support
2015-08-24 16:05:15 +02:00
Laurent Destailleur
8061ec9084
Fix translation
2015-08-24 15:59:17 +02:00
Laurent Destailleur
1a55159e35
Fix filter on prospect status
2015-08-24 14:59:46 +02:00
Laurent Destailleur
80fc4743c9
Fix the property "list" was not used.
2015-08-24 14:42:07 +02:00
Laurent Destailleur
4541d189ac
Fix #3400
2015-08-20 15:50:00 +02:00
Laurent Destailleur
d409568442
Format code
2015-08-20 15:07:16 +02:00
Laurent Destailleur
e24fd6fa37
Merge remote-tracking branch 'origin/develop' into 3.8
...
Conflicts:
htdocs/expedition/class/expedition.class.php
2015-08-20 14:36:32 +02:00
Laurent Destailleur
936f912216
Fix filter on category
2015-08-20 04:07:07 +02:00
Laurent Destailleur
26e3fcc636
Try a better fix to replace PR #3297
2015-08-20 03:38:21 +02:00
Laurent Destailleur
9a6e13d253
Fix test if empty was inverted
2015-08-19 19:45:24 +02:00
Laurent Destailleur
b11642a7f4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-08-19 18:27:22 +02:00
Laurent Destailleur
5f30ad3b63
Fix no link to show if id empty
2015-08-19 18:27:12 +02:00
philippe grand
3743c7460d
FIX : pdf_writeLinkedObjects use foreach instead of for($i..) because
...
now linked objects return by fetchLinkedObject are associative array
with ID as key.
2015-08-19 16:36:44 +02:00
Juanjo Menent
7befa78223
Merge pull request #3386 from grandoc/grandoc_fixes_20150815
...
the form should be outside table to avoid errors
2015-08-18 20:07:38 +02:00
Laurent Destailleur
fabd751be4
Fix Server hang with long loop when reading specimen pdf and high number
...
of tasks.
2015-08-17 20:07:14 +02:00
Laurent Destailleur
76ce98630f
Fix translation
2015-08-17 19:42:19 +02:00
philippe grand
61f6da0210
the form should be outside table to avoid errors
2015-08-15 16:07:59 +02:00
Laurent Destailleur
f3c4e20db2
Fix centering of message on logon page
2015-08-15 03:41:57 +02:00
Laurent Destailleur
52240eec9a
Fix removed warnings
2015-08-15 02:44:05 +02:00
Laurent Destailleur
d9b3069813
Fix: When validation and approval where done in same step, label of
...
action used always label for validation.
2015-08-15 02:34:15 +02:00
Laurent Destailleur
10d3c41358
Fix Bad value into popup
2015-08-14 20:07:11 +02:00
Laurent Destailleur
6c01403ef3
Merge branch 'resources-fixes' of https://github.com/IonAgorria/dolibarr
...
into IonAgorria-resources-fixes
Conflicts:
htdocs/core/tpl/resource_add.tpl.php
htdocs/resource/element_resource.php
2015-08-14 17:53:52 +02:00
Laurent Destailleur
2abb90713e
Fix list of resource not visible
2015-08-14 17:35:05 +02:00
Laurent Destailleur
84d4cbdbcc
Merge remote-tracking branch 'origin/3.7' into develop
2015-08-14 15:14:33 +02:00
Laurent Destailleur
343f4086bc
Remove dead code
2015-08-14 15:12:40 +02:00
Laurent Destailleur
d13b8b8284
Fix better translation
2015-08-14 13:04:35 +02:00
Laurent Destailleur
0226f53098
Fix When selecting another email template, the topic was not replaced.
2015-08-13 05:09:26 +02:00
Laurent Destailleur
fc8a822f1d
Merge remote-tracking branch 'origin/3.7' into develop
2015-08-13 04:03:23 +02:00
Laurent Destailleur
c73fe965d2
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
2015-08-13 03:58:32 +02:00
Laurent Destailleur
1595765ec8
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2015-08-13 03:18:02 +02:00
Laurent Destailleur
811169b2ae
Fix: do not show desc if empty
2015-08-13 01:26:25 +02:00
Laurent Destailleur
4a124c6ee9
Merge pull request #3350 from tomours/develop
...
FIX #3349 Checking a VAT number with spaces
2015-08-12 23:51:37 +02:00
Laurent Destailleur
25e729cf4d
Revert "Fix #3322 Use title for alt if no alt is provided"
...
This reverts commit 2cf9d9f583
2015-08-12 23:18:07 +02:00
Laurent Destailleur
2c791e528d
Revert "unit price not used if qty = 1"
...
This reverts commit fb25f479f2
2015-08-12 23:15:32 +02:00
Laurent Destailleur
f1e87478ff
Fix translation of printing menu
2015-08-12 23:12:15 +02:00
Laurent Destailleur
d4aabf99db
Fix permission of module
2015-08-12 22:32:29 +02:00
Ion Agorria
2e1e9017c6
Missed the file
2015-08-12 22:00:51 +02:00
Juanjo Menent
78d1dfae11
Merge remote-tracking branch 'origin/3.7' into develop
2015-08-12 18:41:44 +02:00
Juanjo Menent
993037ec9e
Merge pull request #3371 from atm-gauthier/new_add_event_type_on_third_party_card_agenda_tab
...
NEW : print event type on third party card tab agenda list (only if A…
2015-08-12 18:25:20 +02:00
Regis Houssin
ebe4969723
Fix: missing entity in cache files names
2015-08-11 10:22:06 +02:00
Juanjo Menent
6964f80d8f
Merge remote-tracking branch 'origin/3.8' into develop
2015-08-10 21:06:27 +02:00
Juanjo Menent
95e8148f78
Merge pull request #3294 from GPCsolutions/totalvalidator
...
Totalvalidator
2015-08-10 20:56:31 +02:00
