Commit Graph

11089 Commits

Author SHA1 Message Date
Ion
9270b2c54c Add supplier order/invoice to elementproperties 2017-01-20 10:57:41 +01:00
Laurent Destailleur
4047de82bd Fix navigation on projects 2017-01-20 10:27:37 +01:00
gauthier
a944c82d86 FIX : $progress_width initialized 2017-01-19 09:11:06 +01:00
Laurent Destailleur
03c1521cde Merge pull request #6271 from altatof/fix_extra_input
FIX: extrafield input for varchar was not working with special char
2017-01-18 16:53:43 +01:00
Laurent Destailleur
227b616ca3 Fix bad default value 2017-01-18 16:51:42 +01:00
Laurent Destailleur
ed98227303 Merge pull request #6292 from marcosgdf/remove-pdf-create-functions
NEW Removed deprecated pdf_create functions
2017-01-18 16:48:23 +01:00
Laurent Destailleur
562bdbc9f5 Merge pull request #6291 from gnovaro/patch-1
Improve code style
2017-01-18 16:44:56 +01:00
Laurent Destailleur
47c37855b1 Merge pull request #6287 from grandoc/develop
update code for next php versions
2017-01-18 16:36:39 +01:00
Laurent Destailleur
9d6f84c3a0 FIX Try a better fif for #6074 2017-01-18 16:27:23 +01:00
Laurent Destailleur
2566df8252 Merge pull request #6298 from benlo06/fix_shipping_contactid
FIX getIdContact for shipping
2017-01-18 15:53:32 +01:00
Laurent Destailleur
3336943ff2 Fix responsive 2017-01-18 15:49:12 +01:00
Benoit
73852beb4e FIX contactid for shipping pdf 2017-01-17 21:55:21 +01:00
Laurent Destailleur
82492dc023 Fix oauth2 token generation for Google. The refresh token was not
received.
2017-01-17 20:05:10 +01:00
Laurent Destailleur
bb95f139a8 Fix responsive 2017-01-17 20:04:41 +01:00
arnaud
39f35bbaab FIX all dolibarr versions about project list and ajax completion bug 2017-01-17 11:17:40 +01:00
Laurent Destailleur
16779be162 Fix missing email/multicompany field 2017-01-17 10:51:30 +01:00
Laurent Destailleur
1ded1bd52a Fix: missing email 2017-01-17 10:34:35 +01:00
Marcos García de La Fuente
8225b06018 NEW Removed commande_pdf_create, contract_pdf_create,expedition_pdf_create, facture_pdf_create, delivery_order_pdf_create, task_pdf_create, project_pdf_create, propale_pdf_create, supplier_invoice_pdf_create, supplier_order_pdf_create, supplier_proposal_pdf_create deprecated functions 2017-01-16 21:59:02 +01:00
Gustavo Novaro
0f6cb52376 Improve code style
Replace var for public and private.
2017-01-16 17:40:13 -03:00
Philippe GRAND
2525a6e3a4 update code for next php versions 2017-01-16 17:24:50 +01:00
Juanjo Menent
9674bdef54 Best directory for img 2017-01-16 13:40:57 +01:00
Juanjo Menent
e232c1c408 Merge remote-tracking branch 'upstream/develop' into develop 2017-01-16 13:37:01 +01:00
Laurent Destailleur
7ebb5f7d92 FIX #6270 2017-01-16 13:06:26 +01:00
Laurent Destailleur
43cb9c30b2 Fix var_dump 2017-01-16 12:21:37 +01:00
Laurent Destailleur
da64d4d398 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-16 10:58:45 +01:00
Laurent Destailleur
1b1bab94ca More complete commit for #6114 2017-01-16 10:43:22 +01:00
Laurent Destailleur
ac80d4057d Fix several running time errors 2017-01-16 09:30:28 +01:00
altatof
3dd160c663 use dol_escape_htmltag 2017-01-16 09:17:37 +01:00
Laurent Destailleur
36bd63c1a7 NEW PHP 7.1 compatibility 2017-01-16 09:05:18 +01:00
Laurent Destailleur
a05132d26e Fix PHP 7.1 error 2017-01-16 09:05:09 +01:00
Laurent Destailleur
6bfd534a36 NEW PHP 7.1 compatibility 2017-01-16 01:21:33 +01:00
Laurent Destailleur
9d72f1df62 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-16 01:12:11 +01:00
Laurent Destailleur
a07a77e323 Not yet ready for php 7.1 2017-01-16 01:11:38 +01:00
Laurent Destailleur
846e827e09 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-16 00:49:11 +01:00
Laurent Destailleur
f5458b4337 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/admin/modules.php
	htdocs/core/class/html.formfile.class.php
	htdocs/product/stats/card.php
2017-01-16 00:48:37 +01:00
Laurent Destailleur
d95ac3bbdd Fix warning 2017-01-16 00:16:20 +01:00
Laurent Destailleur
4ecd657f34 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-16 00:02:43 +01:00
Laurent Destailleur
0671f75417 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-01-16 00:01:37 +01:00
Laurent Destailleur
0fe844aa00 FIX usage of tag {y} in numbering modules 2017-01-16 00:01:06 +01:00
Laurent Destailleur
7bccaff28a Fix remove warnings 2017-01-15 23:32:14 +01:00
Laurent Destailleur
d14e4dbaba Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on 2017-01-15 20:49:20 +01:00
Juanjo Menent
58c25a68a8 NEW: Event notifications in browser 2017-01-15 18:48:32 +01:00
Regis Houssin
fd4a19855d Fix: preview image not show with multicompany product sharing 2017-01-15 12:09:26 +01:00
Marcos García de La Fuente
d09a3628c5 Merge branch 'develop' into prod-attr
# Conflicts:
#	htdocs/compta/facture.php
2017-01-14 23:59:14 +01:00
Laurent Destailleur
1fd9f5e1fb Fix: host was twice into message id for smtp driver and swiftmailer was
not using dol_getprefix() to build host.
2017-01-14 13:27:44 +01:00
Juanjo Menent
d18c8e3a14 NEW: Event notifications in browser 2017-01-14 01:25:33 +01:00
Laurent Destailleur
29f07d3e89 The tutorial to add cron is sometimes false. Quick hack for a solution
to hide it.
2017-01-13 16:39:35 +01:00
Juanjo Menent
6cc3ef0c99 NEW: Events notifications in browser 2017-01-13 16:08:49 +01:00
altatof
55c0a99bce fix was not at the right place 2017-01-13 15:42:07 +01:00
altatof
487b5b25db FIX: extrafield input for varchar was not working with special char
within (ie double quotes)
2017-01-13 15:37:33 +01:00