Laurent Destailleur
e272130a6a
Fix phpcs
2020-11-26 08:40:08 +01:00
Laurent Destailleur
74605cec12
Fix warning
2020-11-25 18:07:52 +01:00
Laurent Destailleur
4d90fb22de
Fix sql syntax error
2020-11-25 15:07:26 +01:00
Laurent Destailleur
5030f0c587
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/opensurvey/wizard/create_survey.php
2020-11-25 14:55:31 +01:00
Laurent Destailleur
bf7b6ee00d
Fix delete of proposal
2020-11-25 14:15:59 +01:00
Frédéric FRANCE
c09a6d1435
Merge remote-tracking branch 'upstream/develop' into patch-10
2020-11-25 12:59:32 +01:00
Frédéric FRANCE
0d24fc56b9
doxygen
2020-11-24 22:40:41 +01:00
Frédéric FRANCE
66ad0e5b13
add note on ecm files
2020-11-24 18:54:59 +01:00
Laurent Destailleur
81566289cd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
2020-11-24 11:07:35 +01:00
Laurent Destailleur
bc1d286673
Merge pull request #15495 from Givriz/dev
...
Feature : creation of a "button-cancel" class
2020-11-23 21:53:45 +01:00
Laurent Destailleur
5822fcfbed
FIX several warning with the barcode use in ODT templates
2020-11-23 21:38:45 +01:00
Laurent Destailleur
efc539c4b4
Fix css
2020-11-23 19:53:58 +01:00
Givriz
dca4cf5987
Feature : ajout de la class "button-cancel"
...
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
2020-11-23 15:12:52 +01:00
Laurent Destailleur
2f6f242d99
CSS
2020-11-23 12:29:38 +01:00
Laurent Destailleur
7d1b84d482
Fix warning
2020-11-22 22:58:14 +01:00
Laurent Destailleur
af2eabb24d
Fix warning
2020-11-22 15:06:53 +01:00
Laurent Destailleur
f6d6efa288
CSS
2020-11-22 13:23:56 +01:00
Laurent Destailleur
986f918436
Fix image edition when gravatar module is on
2020-11-22 01:47:17 +01:00
Laurent Destailleur
a30e842521
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-11-21 23:48:34 +01:00
Laurent Destailleur
60bfbe2e57
Merge pull request #15448 from Givriz/dev
...
Feature : creation of a "button-save" class
2020-11-21 23:44:30 +01:00
Laurent Destailleur
782e3b4c23
Merge pull request #15458 from frederic34/patch-23
...
doxygen
2020-11-21 23:42:56 +01:00
Laurent Destailleur
9004be1df2
Debug feature to send remind by email
2020-11-21 17:42:07 +01:00
Laurent Destailleur
3534555909
Fix setup of scheduled jobs
2020-11-21 14:14:53 +01:00
Damien BENOIT
ebd64d5e57
Merge pull request #5 from Dolibarr/develop
...
Update fork
2020-11-20 13:53:43 +01:00
Laurent Destailleur
07c192efb8
Merge pull request #15457 from frederic34/patch-22
...
Update ldap.class.php
2020-11-20 13:37:24 +01:00
Frédéric FRANCE
b4a5134a7f
doxygen
2020-11-19 22:25:02 +01:00
Frédéric FRANCE
5d4d7c99d6
Update ldap.class.php
...
The variable $result seems to be never defined.
2020-11-19 22:07:32 +01:00
Frédéric FRANCE
efa5c89c45
Update rssparser.class.php
...
The variable $**** does not seem to be defined for all execution paths leading up to this point.
2020-11-19 22:03:13 +01:00
Givriz
c48129e279
Ajout de la class "button-save"
...
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
2020-11-19 20:23:38 +01:00
Florian HENRY
46326d7659
merge from develop
2020-11-19 13:53:34 +01:00
Laurent Destailleur
83eaf16a22
Fix css
2020-11-18 16:23:08 +01:00
Laurent Destailleur
e78b9a421d
Fix sql
2020-11-18 13:14:29 +01:00
Laurent Destailleur
17f35e16b9
Merge pull request #15436 from OPEN-DSI/add_extended_infos_on_select_contacts
...
NEW: Add new option for displaying Contact email (or phones if not defined) and town info list (select list or combobox)
2020-11-18 13:12:03 +01:00
Laurent Destailleur
ce173d7b39
Merge pull request #15424 from Tim-Otte/fix-15423
...
Fix for #15423
2020-11-18 12:46:41 +01:00
Laurent Destailleur
a5a7197506
Update extrafields.class.php
2020-11-18 12:45:37 +01:00
Laurent Destailleur
166bb5cc75
Merge pull request #15421 from frederic34/patch-8
...
fix dir for member photo in odt tag
2020-11-18 12:37:03 +01:00
Laurent Destailleur
889a5d0be1
Update commondocgenerator.class.php
2020-11-18 12:04:41 +01:00
kamel
73b35f334e
NEW: Add new option for displaying Contact email (or phones if not defined) and town info list (select list or combobox)
...
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
2020-11-18 09:41:42 +01:00
Laurent Destailleur
17f78f9cec
FIX Protection to avoid duplicate submit when creating a payment.
2020-11-17 18:39:34 +01:00
Laurent Destailleur
6bbeb6d3a0
Fix debug creation of shipment with virtual product.
2020-11-16 16:31:05 +01:00
Laurent Destailleur
ac5fa6c6df
Clean code
2020-11-16 12:54:16 +01:00
Laurent Destailleur
65144f4d5a
fix warning
2020-11-16 11:37:28 +01:00
Tim Otte
4a1f61d759
Fix for #15423
2020-11-16 11:12:43 +01:00
Frédéric FRANCE
8cff0222cd
Update commondocgenerator.class.php
2020-11-15 23:58:35 +01:00
Frédéric FRANCE
35653bb855
fix dir for member photo in odt tag
2020-11-15 23:45:13 +01:00
Laurent Destailleur
89a77fad2c
Fix warning
2020-11-15 16:56:30 +01:00
Laurent Destailleur
2e0e42e918
Fix warning
2020-11-15 14:37:21 +01:00
Frédéric FRANCE
0a5e041775
Merge remote-tracking branch 'upstream/develop' into odtformembers
2020-11-14 00:56:21 +01:00
Laurent Destailleur
7da2d6cda2
Merge pull request #15391 from frederic34/patch-8
...
doxygen
2020-11-14 00:48:52 +01:00
Frédéric FRANCE
4ca3c0aa95
Add odt for members
2020-11-14 00:48:13 +01:00
